Unverified Commit 63b96b18 authored by Gerald Monaco's avatar Gerald Monaco Committed by GitHub

Stop mutating `resolvedAsPath` (#23705)

Follow up to #23614. `resolvedAsPath` isn't actually even being used as an output, we're just mutating it for convenience. If we do want to output it in the future, we can do it a different way (i.e. via return).
parent 8fdcc528
...@@ -496,6 +496,8 @@ export async function renderToHTML( ...@@ -496,6 +496,8 @@ export async function renderToHTML(
) )
} }
let asPath: string = renderOpts.resolvedAsPath || (req.url as string)
if (dev) { if (dev) {
const { isValidElementType } = require('react-is') const { isValidElementType } = require('react-is')
if (!isValidElementType(Component)) { if (!isValidElementType(Component)) {
...@@ -525,7 +527,7 @@ export async function renderToHTML( ...@@ -525,7 +527,7 @@ export async function renderToHTML(
} }
: {}), : {}),
} }
renderOpts.resolvedAsPath = `${pathname}${ asPath = `${pathname}${
// ensure trailing slash is present for non-dynamic auto-export pages // ensure trailing slash is present for non-dynamic auto-export pages
req.url!.endsWith('/') && pathname !== '/' && !pageIsDynamic ? '/' : '' req.url!.endsWith('/') && pathname !== '/' && !pageIsDynamic ? '/' : ''
}` }`
...@@ -561,7 +563,6 @@ export async function renderToHTML( ...@@ -561,7 +563,6 @@ export async function renderToHTML(
} }
// url will always be set // url will always be set
const asPath: string = renderOpts.resolvedAsPath || (req.url as string)
const routerIsReady = !!(getServerSideProps || hasPageGetInitialProps) const routerIsReady = !!(getServerSideProps || hasPageGetInitialProps)
const router = new ServerRouter( const router = new ServerRouter(
pathname, pathname,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment