Unverified Commit 027aa72f authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Fix catch-all edge app route (#50313)

This ensures we properly normalize app pages in the `web-server` so that
it doesn't fail to match/interpolate properly.

Fixes: https://github.com/vercel/next.js/issues/43384
parent 12e22edd
...@@ -100,7 +100,7 @@ const edgeSSRLoader: webpack.LoaderDefinitionFunction<EdgeSSRLoaderQuery> = ...@@ -100,7 +100,7 @@ const edgeSSRLoader: webpack.LoaderDefinitionFunction<EdgeSSRLoaderQuery> =
enhanceGlobals() enhanceGlobals()
const pageType = ${JSON.stringify(pagesType)} const pagesType = ${JSON.stringify(pagesType)}
${ ${
isAppDir isAppDir
? ` ? `
...@@ -145,7 +145,7 @@ const edgeSSRLoader: webpack.LoaderDefinitionFunction<EdgeSSRLoaderQuery> = ...@@ -145,7 +145,7 @@ const edgeSSRLoader: webpack.LoaderDefinitionFunction<EdgeSSRLoaderQuery> =
const nextFontManifest = self.__NEXT_FONT_MANIFEST const nextFontManifest = self.__NEXT_FONT_MANIFEST
const render = getRender({ const render = getRender({
pageType, pagesType,
dev: ${dev}, dev: ${dev},
page: ${JSON.stringify(page)}, page: ${JSON.stringify(page)},
appMod, appMod,
...@@ -154,6 +154,7 @@ const edgeSSRLoader: webpack.LoaderDefinitionFunction<EdgeSSRLoaderQuery> = ...@@ -154,6 +154,7 @@ const edgeSSRLoader: webpack.LoaderDefinitionFunction<EdgeSSRLoaderQuery> =
error500Mod, error500Mod,
Document, Document,
buildManifest, buildManifest,
isAppPath: ${!!isAppDir},
prerenderManifest, prerenderManifest,
appRenderToHTML, appRenderToHTML,
pagesRenderToHTML, pagesRenderToHTML,
......
...@@ -13,6 +13,7 @@ import { ...@@ -13,6 +13,7 @@ import {
} from '../../../../server/base-http/web' } from '../../../../server/base-http/web'
import { SERVER_RUNTIME } from '../../../../lib/constants' import { SERVER_RUNTIME } from '../../../../lib/constants'
import { PrerenderManifest } from '../../..' import { PrerenderManifest } from '../../..'
import { normalizeAppPath } from '../../../../shared/lib/router/utils/app-paths'
export function getRender({ export function getRender({
dev, dev,
...@@ -78,6 +79,7 @@ export function getRender({ ...@@ -78,6 +79,7 @@ export function getRender({
minimalMode: true, minimalMode: true,
webServerConfig: { webServerConfig: {
page, page,
normalizedPage: isAppPath ? normalizeAppPath(page) : page,
pagesType, pagesType,
prerenderManifest, prerenderManifest,
extendRenderOpts: { extendRenderOpts: {
...@@ -93,8 +95,6 @@ export function getRender({ ...@@ -93,8 +95,6 @@ export function getRender({
pagesRenderToHTML, pagesRenderToHTML,
incrementalCacheHandler, incrementalCacheHandler,
loadComponent: async (pathname) => { loadComponent: async (pathname) => {
if (isAppPath) return null
if (pathname === page) { if (pathname === page) {
return { return {
...baseLoadComponentResult, ...baseLoadComponentResult,
......
...@@ -28,6 +28,7 @@ import { PrerenderManifest } from '../build' ...@@ -28,6 +28,7 @@ import { PrerenderManifest } from '../build'
interface WebServerOptions extends Options { interface WebServerOptions extends Options {
webServerConfig: { webServerConfig: {
page: string page: string
normalizedPage: string
pagesType: 'app' | 'pages' | 'root' pagesType: 'app' | 'pages' | 'root'
loadComponent: ( loadComponent: (
pathname: string pathname: string
...@@ -128,12 +129,15 @@ export default class NextWebServer extends BaseServer<WebServerOptions> { ...@@ -128,12 +129,15 @@ export default class NextWebServer extends BaseServer<WebServerOptions> {
} }
protected getPagesManifest() { protected getPagesManifest() {
return { return {
[this.serverOptions.webServerConfig.page]: '', // keep same theme but server path doesn't need to be accurate
[this.serverOptions.webServerConfig
.normalizedPage]: `server${this.serverOptions.webServerConfig.page}.js`,
} }
} }
protected getAppPathsManifest() { protected getAppPathsManifest() {
const page = this.serverOptions.webServerConfig.page
return { return {
[this.serverOptions.webServerConfig.page]: '', [this.serverOptions.webServerConfig.page]: `app${page}.js`,
} }
} }
protected getFilesystemPaths() { protected getFilesystemPaths() {
...@@ -282,8 +286,10 @@ export default class NextWebServer extends BaseServer<WebServerOptions> { ...@@ -282,8 +286,10 @@ export default class NextWebServer extends BaseServer<WebServerOptions> {
// interpolate query information into page for dynamic route // interpolate query information into page for dynamic route
// so that rewritten paths are handled properly // so that rewritten paths are handled properly
if (pathname !== this.serverOptions.webServerConfig.page) { const normalizedPage = this.serverOptions.webServerConfig.normalizedPage
pathname = this.serverOptions.webServerConfig.page
if (pathname !== normalizedPage) {
pathname = normalizedPage
if (isDynamicRoute(pathname)) { if (isDynamicRoute(pathname)) {
const routeRegex = getNamedRouteRegex(pathname, false) const routeRegex = getNamedRouteRegex(pathname, false)
......
export const runtime = 'edge'
export default function Page({ params }) {
return (
<>
<p>catch-all edge page</p>
<p id="params">{JSON.stringify(params)}</p>
</>
)
}
...@@ -37,6 +37,15 @@ createNextDescribe( ...@@ -37,6 +37,15 @@ createNextDescribe(
}) })
} }
it('should work for catch-all edge page', async () => {
const html = await next.render('/catch-all-edge/hello123')
const $ = cheerio.load(html)
expect(JSON.parse($('#params').text())).toEqual({
slug: ['hello123'],
})
})
it('should have correct searchParams and params (server)', async () => { it('should have correct searchParams and params (server)', async () => {
const html = await next.render('/dynamic/category-1/id-2?query1=value2') const html = await next.render('/dynamic/category-1/id-2?query1=value2')
const $ = cheerio.load(html) const $ = cheerio.load(html)
......
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