Unverified Commit acb17445 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Fix generateStaticParams check in app dir (#47051)

This ensures our `params` checking works properly with `app` dir. 

x-ref: [slack thread](https://vercel.slack.com/archives/C03KAR5DCKC/p1678659475821299)
parent 0bee9e6f
...@@ -1005,7 +1005,7 @@ export async function buildStaticPaths({ ...@@ -1005,7 +1005,7 @@ export async function buildStaticPaths({
// If from appDir and not all params were provided from // If from appDir and not all params were provided from
// generateStaticParams we can just filter this entry out // generateStaticParams we can just filter this entry out
// as it's meant to be generated at runtime // as it's meant to be generated at runtime
if (appDir) { if (appDir && typeof paramValue === 'undefined') {
builtPage = '' builtPage = ''
encodedBuiltPage = '' encodedBuiltPage = ''
return return
...@@ -1014,7 +1014,7 @@ export async function buildStaticPaths({ ...@@ -1014,7 +1014,7 @@ export async function buildStaticPaths({
throw new Error( throw new Error(
`A required parameter (${validParamKey}) was not provided as ${ `A required parameter (${validParamKey}) was not provided as ${
repeat ? 'an array' : 'a string' repeat ? 'an array' : 'a string'
} in ${ } received ${typeof paramValue} in ${
appDir ? 'generateStaticParams' : 'getStaticPaths' appDir ? 'generateStaticParams' : 'getStaticPaths'
} for ${page}` } for ${page}`
) )
......
...@@ -32,6 +32,24 @@ createNextDescribe( ...@@ -32,6 +32,24 @@ createNextDescribe(
} }
}) })
if (isDev) {
it('should error correctly for invalid params from generateStaticParams', async () => {
await next.patchFile(
'app/invalid/[slug]/page.js',
`
export function generateStaticParams() {
return [{slug: { invalid: true }}]
}
`
)
const html = await next.render('/invalid/first')
await next.deleteFile('app/invalid/[slug]/page.js')
expect(html).toContain(
'A required parameter (slug) was not provided as a string received object'
)
})
}
if (isNextStart) { if (isNextStart) {
it('should output HTML/RSC files for static paths', async () => { it('should output HTML/RSC files for static paths', async () => {
const files = ( const files = (
......
...@@ -305,7 +305,7 @@ describe('Dynamic Optional Routing', () => { ...@@ -305,7 +305,7 @@ describe('Dynamic Optional Routing', () => {
) )
const { stderr } = await nextBuild(appDir, [], { stderr: true }) const { stderr } = await nextBuild(appDir, [], { stderr: true })
await expect(stderr).toMatch( await expect(stderr).toMatch(
'A required parameter (slug) was not provided as an array in getStaticPaths for /invalid/[[...slug]]' 'A required parameter (slug) was not provided as an array received undefined in getStaticPaths for /invalid/[[...slug]]'
) )
} finally { } finally {
await fs.unlink(invalidRoute) await fs.unlink(invalidRoute)
......
...@@ -10,7 +10,7 @@ describe('Invalid Prerender Catchall Params', () => { ...@@ -10,7 +10,7 @@ describe('Invalid Prerender Catchall Params', () => {
const out = await nextBuild(appDir, [], { stderr: true }) const out = await nextBuild(appDir, [], { stderr: true })
expect(out.stderr).toMatch(`Build error occurred`) expect(out.stderr).toMatch(`Build error occurred`)
expect(out.stderr).toMatch( expect(out.stderr).toMatch(
'A required parameter (slug) was not provided as an array in getStaticPaths for /[...slug]' 'A required parameter (slug) was not provided as an array received string in getStaticPaths for /[...slug]'
) )
}) })
}) })
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