Unverified Commit a1b8a960 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

refactor: merge duplicated render page logic (#37897)

Simplify rendering page logic (render page and match dynamic routes) in `renderToResponse`
parent 5b854f31
...@@ -1754,49 +1754,65 @@ export default abstract class Server<ServerOptions extends Options = Options> { ...@@ -1754,49 +1754,65 @@ export default abstract class Server<ServerOptions extends Options = Options> {
return path return path
} }
private async renderToResponse( protected async renderPageComponent(
ctx: RequestContext ctx: RequestContext,
): Promise<ResponsePayload | null> { bubbleNoFallback: boolean
const { res, query, pathname } = ctx ) {
let page = pathname
const bubbleNoFallback = !!query._nextBubbleNoFallback
delete query._nextBubbleNoFallback
// map the route to the actual bundle name // map the route to the actual bundle name
const getOriginalappPath = (appPath: string) => { const getOriginalAppPath = (appPath: string) => {
if (this.nextConfig.experimental.appDir) { if (this.nextConfig.experimental.appDir) {
const originalappPath = this.appPathRoutes?.[appPath] const originalAppPath = this.appPathRoutes?.[appPath]
if (!originalappPath) { if (!originalAppPath) {
return null return null
} }
return originalappPath return originalAppPath
} }
return null return null
} }
try { const { query, pathname } = ctx
// Ensure a request to the URL /accounts/[id] will be treated as a dynamic const appPath = getOriginalAppPath(pathname)
// route correctly and not loaded immediately without parsing params.
if (!isDynamicRoute(pathname)) {
const appPath = getOriginalappPath(pathname)
if (typeof appPath === 'string') { let page = pathname
page = appPath if (typeof appPath === 'string') {
} page = appPath
const result = await this.findPageComponents(page, query) }
if (result) { const result = await this.findPageComponents(
try { page,
return await this.renderToResponseWithComponents(ctx, result) query,
} catch (err) { ctx.renderOpts.params
const isNoFallbackError = err instanceof NoFallbackError )
if (result) {
try {
return await this.renderToResponseWithComponents(ctx, result)
} catch (err) {
const isNoFallbackError = err instanceof NoFallbackError
if (!isNoFallbackError || (isNoFallbackError && bubbleNoFallback)) { if (!isNoFallbackError || (isNoFallbackError && bubbleNoFallback)) {
throw err throw err
}
}
} }
} }
}
return null
}
private async renderToResponse(
ctx: RequestContext
): Promise<ResponsePayload | null> {
const { res, query, pathname } = ctx
let page = pathname
const bubbleNoFallback = !!query._nextBubbleNoFallback
delete query._nextBubbleNoFallback
try {
// Ensure a request to the URL /accounts/[id] will be treated as a dynamic
// route correctly and not loaded immediately without parsing params.
if (!isDynamicRoute(page)) {
const result = await this.renderPageComponent(ctx, bubbleNoFallback)
if (result) return result
}
if (this.dynamicRoutes) { if (this.dynamicRoutes) {
for (const dynamicRoute of this.dynamicRoutes) { for (const dynamicRoute of this.dynamicRoutes) {
...@@ -1805,41 +1821,18 @@ export default abstract class Server<ServerOptions extends Options = Options> { ...@@ -1805,41 +1821,18 @@ export default abstract class Server<ServerOptions extends Options = Options> {
continue continue
} }
page = dynamicRoute.page page = dynamicRoute.page
const appPath = getOriginalappPath(page) const result = await this.renderPageComponent(
{
if (typeof appPath === 'string') { ...ctx,
page = appPath pathname: page,
} renderOpts: {
...ctx.renderOpts,
const dynamicRouteResult = await this.findPageComponents( params,
page, },
query, },
params bubbleNoFallback
) )
if (dynamicRouteResult) { if (result) return result
try {
return await this.renderToResponseWithComponents(
{
...ctx,
pathname: page,
renderOpts: {
...ctx.renderOpts,
params,
},
},
dynamicRouteResult
)
} catch (err) {
const isNoFallbackError = err instanceof NoFallbackError
if (
!isNoFallbackError ||
(isNoFallbackError && bubbleNoFallback)
) {
throw err
}
}
}
} }
} }
} catch (error) { } catch (error) {
......
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