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 getStaticPaths check for non-dynamic app routes #54351

Merged
merged 6 commits into from
Aug 21, 2023
Merged

Skip getStaticPaths check for non-dynamic app routes #54351

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
022c452
Skip getStaticPaths check for non-dynamic app routes
ijjk Aug 21, 2023
0d667fa
Merge branch 'canary' into optimize/gsp-dev-check
ijjk Aug 21, 2023
713051e
tweak
ijjk Aug 21, 2023
d9b85a1
Merge branch 'canary' into optimize/gsp-dev-check
ijjk Aug 21, 2023
f8bc61d
Apply suggestions from code review
ijjk Aug 21, 2023
7652125
hoist
ijjk Aug 21, 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
56 changes: 27 additions & 29 deletions packages/next/src/server/base-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1443,8 +1443,10 @@ export default abstract class Server<ServerOptions extends Options = Options> {
let staticPaths: string[] | undefined

let fallbackMode: FallbackMode
let hasFallback = false
const isDynamic = isDynamicRoute(components.pathname)

if (isAppPath) {
if (isAppPath && isDynamic) {
const pathsResult = await this.getStaticPaths({
pathname,
originalAppPath: components.pathname,
Expand All @@ -1453,44 +1455,40 @@ export default abstract class Server<ServerOptions extends Options = Options> {

staticPaths = pathsResult.staticPaths
fallbackMode = pathsResult.fallbackMode

const hasFallback = typeof fallbackMode !== 'undefined'
hasFallback = typeof fallbackMode !== 'undefined'

if (this.nextConfig.output === 'export') {
const page = components.pathname
const isDynamic = isDynamicRoute(page)
if (isDynamic) {
if (fallbackMode !== 'static') {
throw new Error(
`Page "${page}" is missing exported function "generateStaticParams()", which is required with "output: export" config.`
)
}
const resolvedWithoutSlash = removeTrailingSlash(resolvedUrlPathname)
if (!staticPaths?.includes(resolvedWithoutSlash)) {
throw new Error(
`Page "${page}" is missing param "${resolvedWithoutSlash}" in "generateStaticParams()", which is required with "output: export" config.`
)
}

if (fallbackMode !== 'static') {
throw new Error(
`Page "${page}" is missing exported function "generateStaticParams()", which is required with "output: export" config.`
)
}
const resolvedWithoutSlash = removeTrailingSlash(resolvedUrlPathname)
if (!staticPaths?.includes(resolvedWithoutSlash)) {
throw new Error(
`Page "${page}" is missing param "${resolvedWithoutSlash}" in "generateStaticParams()", which is required with "output: export" config.`
)
}
}

if (hasFallback) {
hasStaticPaths = true
}
}

if (
hasFallback ||
staticPaths?.includes(resolvedUrlPathname) ||
// this signals revalidation in deploy environments
// TODO: make this more generic
req.headers['x-now-route-matches']
) {
isSSG = true
} else if (!this.renderOpts.dev) {
const manifest = this.getPrerenderManifest()
isSSG =
isSSG || !!manifest.routes[pathname === '/index' ? '/' : pathname]
}
if (
hasFallback ||
staticPaths?.includes(resolvedUrlPathname) ||
// this signals revalidation in deploy environments
// TODO: make this more generic
req.headers['x-now-route-matches']
) {
isSSG = true
} else if (!this.renderOpts.dev) {
const manifest = this.getPrerenderManifest()
isSSG = isSSG || !!manifest.routes[pathname === '/index' ? '/' : pathname]
}

// Toggle whether or not this is a Data request
Expand Down