Unverified Commit 25b5845a authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Fix app ISR handling with no generateStaticParams (#44787)

parent 91677d7d
...@@ -1494,7 +1494,8 @@ export default async function build( ...@@ -1494,7 +1494,8 @@ export default async function build(
isSsg = true isSsg = true
} }
if ( if (
!isDynamicRoute(page) && (!isDynamicRoute(page) ||
!workerResult.prerenderRoutes?.length) &&
workerResult.appConfig?.revalidate !== 0 workerResult.appConfig?.revalidate !== 0
) { ) {
appStaticPaths.set(originalAppPath, [page]) appStaticPaths.set(originalAppPath, [page])
...@@ -2360,6 +2361,8 @@ export default async function build( ...@@ -2360,6 +2361,8 @@ export default async function build(
let hasDynamicData = appConfig.revalidate === 0 let hasDynamicData = appConfig.revalidate === 0
routes.forEach((route) => { routes.forEach((route) => {
if (isDynamicRoute(page) && route === page) return
let revalidate = exportConfig.initialPageRevalidationMap[route] let revalidate = exportConfig.initialPageRevalidationMap[route]
if (typeof revalidate === 'undefined') { if (typeof revalidate === 'undefined') {
......
...@@ -1191,7 +1191,10 @@ export async function buildAppStaticPaths({ ...@@ -1191,7 +1191,10 @@ export async function buildAppStaticPaths({
if (!hadGenerateParams) { if (!hadGenerateParams) {
return { return {
paths: undefined, paths: undefined,
fallback: undefined, fallback:
process.env.NODE_ENV === 'production' && isDynamicRoute(page)
? true
: undefined,
encodedPaths: undefined, encodedPaths: undefined,
} }
} }
......
...@@ -43,6 +43,8 @@ createNextDescribe( ...@@ -43,6 +43,8 @@ createNextDescribe(
'dynamic-error.rsc', 'dynamic-error.rsc',
'dynamic-error/page.js', 'dynamic-error/page.js',
'dynamic-no-gen-params-ssr/[slug]/page.js', 'dynamic-no-gen-params-ssr/[slug]/page.js',
'dynamic-no-gen-params/[slug].html',
'dynamic-no-gen-params/[slug].rsc',
'dynamic-no-gen-params/[slug]/page.js', 'dynamic-no-gen-params/[slug]/page.js',
'force-static/[slug]/page.js', 'force-static/[slug]/page.js',
'force-static/first.html', 'force-static/first.html',
...@@ -201,6 +203,16 @@ createNextDescribe( ...@@ -201,6 +203,16 @@ createNextDescribe(
fallback: false, fallback: false,
routeRegex: normalizeRegEx('^\\/blog\\/([^\\/]+?)(?:\\/)?$'), routeRegex: normalizeRegEx('^\\/blog\\/([^\\/]+?)(?:\\/)?$'),
}, },
'/dynamic-no-gen-params/[slug]': {
dataRoute: '/dynamic-no-gen-params/[slug].rsc',
dataRouteRegex: normalizeRegEx(
'^\\/dynamic\\-no\\-gen\\-params\\/([^\\/]+?)\\.rsc$'
),
fallback: null,
routeRegex: normalizeRegEx(
'^\\/dynamic\\-no\\-gen\\-params\\/([^\\/]+?)(?:\\/)?$'
),
},
'/hooks/use-pathname/[slug]': { '/hooks/use-pathname/[slug]': {
dataRoute: '/hooks/use-pathname/[slug].rsc', dataRoute: '/hooks/use-pathname/[slug].rsc',
dataRouteRegex: '^\\/hooks\\/use\\-pathname\\/([^\\/]+?)\\.rsc$', dataRouteRegex: '^\\/hooks\\/use\\-pathname\\/([^\\/]+?)\\.rsc$',
......
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