Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip pre-rendering the default param when no params are provided #46265

Merged
merged 6 commits into from
Feb 22, 2023
Merged

Skip pre-rendering the default param when no params are provided #46265

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
931a0ea
skip prerendering default slug
shuding Feb 22, 2023
68d335d
Merge branch 'canary' into shuding/next-607-update-app-prerendering-t…
ijjk Feb 22, 2023
b854804
fix prerendering
shuding Feb 22, 2023
2b3158f
fix
shuding Feb 22, 2023
342c653
Merge branch 'canary' into shuding/next-607-update-app-prerendering-t…
kodiakhq[bot] Feb 22, 2023
46c77c1
Merge branch 'canary' into shuding/next-607-update-app-prerendering-t…
kodiakhq[bot] Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 29 additions & 12 deletions packages/next/src/build/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,24 +1434,41 @@ export default async function build(
ssgPageRoutes = workerResult.prerenderRoutes
isSsg = true
}
if (
(!isDynamicRoute(page) ||
!workerResult.prerenderRoutes?.length) &&
workerResult.appConfig?.revalidate !== 0
) {
appStaticPaths.set(originalAppPath, [page])
appStaticPathsEncoded.set(originalAppPath, [page])
isStatic = true

const appConfig = workerResult.appConfig || {}
if (workerResult.appConfig?.revalidate !== 0) {
const isDynamic = isDynamicRoute(page)
const hasGenerateStaticParams =
!!workerResult.prerenderRoutes?.length

if (
// Mark the app as static if:
// - It has no dynamic param
// - It doesn't have generateStaticParams but `dynamic` is set to
// `error` or `force-static`
!isDynamic
) {
appStaticPaths.set(originalAppPath, [page])
appStaticPathsEncoded.set(originalAppPath, [page])
isStatic = true
} else if (
isDynamic &&
!hasGenerateStaticParams &&
(appConfig.dynamic === 'error' ||
appConfig.dynamic === 'force-static')
) {
appStaticPaths.set(originalAppPath, [])
appStaticPathsEncoded.set(originalAppPath, [])
isStatic = true
}
}

if (workerResult.prerenderFallback) {
// whether or not to allow requests for paths not
// returned from generateStaticParams
appDynamicParamPaths.add(originalAppPath)
}
appDefaultConfigs.set(
originalAppPath,
workerResult.appConfig || {}
)
appDefaultConfigs.set(originalAppPath, appConfig)
}
} else {
if (isEdgeRuntime(pageRuntime)) {
Expand Down
43 changes: 0 additions & 43 deletions test/e2e/app-dir/app-static/app-static.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,8 @@ createNextDescribe(
'blog/tim.rsc',
'blog/tim/first-post.html',
'blog/tim/first-post.rsc',
'dynamic-error/[id].html',
'dynamic-error/[id].rsc',
'dynamic-error/[id]/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',
'force-dynamic-no-prerender/[id]/page.js',
'force-static/[slug]/page.js',
Expand Down Expand Up @@ -79,11 +75,7 @@ createNextDescribe(
'ssr-auto/cache-no-store/page.js',
'ssr-auto/fetch-revalidate-zero/page.js',
'ssr-forced/page.js',
'static-to-dynamic-error-forced/[id].html',
'static-to-dynamic-error-forced/[id].rsc',
'static-to-dynamic-error-forced/[id]/page.js',
'static-to-dynamic-error/[id].html',
'static-to-dynamic-error/[id].rsc',
'static-to-dynamic-error/[id]/page.js',
'variable-revalidate-edge/no-store/page.js',
'variable-revalidate-edge/revalidate-3/page.js',
Expand Down Expand Up @@ -217,16 +209,6 @@ createNextDescribe(
fallback: null,
routeRegex: '^\\/dynamic\\-error\\/([^\\/]+?)(?:\\/)?$',
},
'/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]': {
dataRoute: '/hooks/use-pathname/[slug].rsc',
dataRouteRegex: normalizeRegEx(
Expand Down Expand Up @@ -267,16 +249,6 @@ createNextDescribe(
'^\\/static\\-to\\-dynamic\\-error\\-forced\\/([^\\/]+?)(?:\\/)?$'
),
},
'/static-to-dynamic-error/[id]': {
dataRoute: '/static-to-dynamic-error/[id].rsc',
dataRouteRegex: normalizeRegEx(
'^\\/static\\-to\\-dynamic\\-error\\/([^\\/]+?)\\.rsc$'
),
fallback: null,
routeRegex: normalizeRegEx(
'^\\/static\\-to\\-dynamic\\-error\\/([^\\/]+?)(?:\\/)?$'
),
},
})
})

Expand Down Expand Up @@ -324,21 +296,6 @@ createNextDescribe(
expect($2('#page-data').text()).not.toBe(pageData)
})
} else {
it('should properly error when static page switches to dynamic at runtime', async () => {
const res = await next.fetch(
'/static-to-dynamic-error/static-bailout-1'
)

expect(res.status).toBe(500)

if (isNextStart) {
await check(
() => stripAnsi(next.cliOutput),
/Page changed from static to dynamic at runtime \/static-to-dynamic-error\/static-bailout-1, reason: cookies/
)
}
})

it('should not error with dynamic server usage with force-static', async () => {
const res = await next.fetch(
'/static-to-dynamic-error-forced/static-bailout-1'
Expand Down