Unverified Commit 580d01a2 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

[metadata] remove falsy dynamicParams approach (#84405)

parent 28b64e2f
...@@ -291,26 +291,24 @@ async fn dynamic_sitemap_route_with_generate_source( ...@@ -291,26 +291,24 @@ async fn dynamic_sitemap_route_with_generate_source(
const paramsPromise = ctx.params const paramsPromise = ctx.params
const idPromise = paramsPromise.then(params => params?.__metadata_id__) const idPromise = paramsPromise.then(params => params?.__metadata_id__)
if (process.env.NODE_ENV !== 'production') {{ const id = await idPromise
const id = await idPromise const hasXmlExtension = id ? id.endsWith('.xml') : false
const hasXmlExtension = id ? id.endsWith('.xml') : false const sitemaps = await generateSitemaps()
const sitemaps = await generateSitemaps() let foundId
let foundId for (const item of sitemaps) {{
for (const item of sitemaps) {{ if (item?.id == null) {{
if (item?.id == null) {{ throw new Error('id property is required for every item returned from generateSitemaps')
throw new Error('id property is required for every item returned from generateSitemaps')
}}
const baseId = id && hasXmlExtension ? id.slice(0, -4) : undefined
if (item.id.toString() === baseId) {{
foundId = item.id
}}
}} }}
if (foundId == null) {{ const baseId = id && hasXmlExtension ? id.slice(0, -4) : undefined
return new NextResponse('Not Found', {{ if (item.id.toString() === baseId) {{
status: 404, foundId = item.id
}})
}} }}
}} }}
if (foundId == null) {{
return new NextResponse('Not Found', {{
status: 404,
}})
}}
const targetIdPromise = idPromise.then(id => {{ const targetIdPromise = idPromise.then(id => {{
const hasXmlExtension = id ? id.endsWith('.xml') : false const hasXmlExtension = id ? id.endsWith('.xml') : false
...@@ -329,7 +327,6 @@ async fn dynamic_sitemap_route_with_generate_source( ...@@ -329,7 +327,6 @@ async fn dynamic_sitemap_route_with_generate_source(
export * from {resource_path} export * from {resource_path}
export const dynamicParams = false
export async function generateStaticParams() {{ export async function generateStaticParams() {{
const sitemaps = await generateSitemaps() const sitemaps = await generateSitemaps()
const params = [] const params = []
...@@ -445,24 +442,22 @@ async fn dynamic_image_route_with_metadata_source( ...@@ -445,24 +442,22 @@ async fn dynamic_image_route_with_metadata_source(
const {{ __metadata_id__, ...rest }} = params const {{ __metadata_id__, ...rest }} = params
return rest return rest
}}) }})
if (process.env.NODE_ENV !== 'production') {{ const restParams = await restParamsPromise
const restParams = await restParamsPromise const __metadata_id__ = await idPromise
const __metadata_id__ = await idPromise const imageMetadata = await generateImageMetadata({{ params: restParams }})
const imageMetadata = await generateImageMetadata({{ params: restParams }}) const id = imageMetadata.find((item) => {{
const id = imageMetadata.find((item) => {{ if (item?.id == null) {{
if (item?.id == null) {{ throw new Error('id property is required for every item returned from generateImageMetadata')
throw new Error('id property is required for every item returned from generateImageMetadata')
}}
return item.id.toString() === __metadata_id__
}})?.id
if (id == null) {{
return new NextResponse('Not Found', {{
status: 404,
}})
}} }}
return item.id.toString() === __metadata_id__
}})?.id
if (id == null) {{
return new NextResponse('Not Found', {{
status: 404,
}})
}} }}
return handler({{ params: restParamsPromise, id: idPromise }}) return handler({{ params: restParamsPromise, id: idPromise }})
...@@ -470,7 +465,6 @@ async fn dynamic_image_route_with_metadata_source( ...@@ -470,7 +465,6 @@ async fn dynamic_image_route_with_metadata_source(
export * from {resource_path} export * from {resource_path}
export const dynamicParams = false
export async function generateStaticParams({{ params }}) {{ export async function generateStaticParams({{ params }}) {{
const imageMetadata = await generateImageMetadata({{ params }}) const imageMetadata = await generateImageMetadata({{ params }})
const staticParams = [] const staticParams = []
......
...@@ -176,31 +176,27 @@ export async function GET(_, ctx) { ...@@ -176,31 +176,27 @@ export async function GET(_, ctx) {
const { __metadata_id__, ...rest } = params const { __metadata_id__, ...rest } = params
return rest return rest
}) })
${/* we need a dev assertion for id since dynamicParams=false won't work well in dev */ ''}
if (process.env.NODE_ENV !== 'production') {
const restParams = await restParamsPromise
const __metadata_id__ = await idPromise
const imageMetadata = await generateImageMetadata({ params: restParams })
const id = imageMetadata.find((item) => {
if (item?.id == null) {
throw new Error('id property is required for every item returned from generateImageMetadata')
}
return item.id.toString() === __metadata_id__
})?.id
if (id == null) { const restParams = await restParamsPromise
return new NextResponse('Not Found', { const __metadata_id__ = await idPromise
status: 404, const imageMetadata = await generateImageMetadata({ params: restParams })
}) const id = imageMetadata.find((item) => {
if (item?.id == null) {
throw new Error('id property is required for every item returned from generateImageMetadata')
} }
return item.id.toString() === __metadata_id__
})?.id
if (id == null) {
return new NextResponse('Not Found', {
status: 404,
})
} }
return handler({ params: restParamsPromise, id: idPromise }) return handler({ params: restParamsPromise, id: idPromise })
} }
export const dynamicParams = false
export async function generateStaticParams({ params }) { export async function generateStaticParams({ params }) {
const imageMetadata = await generateImageMetadata({ params }) const imageMetadata = await generateImageMetadata({ params })
const staticParams = [] const staticParams = []
...@@ -303,27 +299,25 @@ export async function GET(_, ctx) { ...@@ -303,27 +299,25 @@ export async function GET(_, ctx) {
const paramsPromise = ctx.params const paramsPromise = ctx.params
const idPromise = paramsPromise.then(params => params?.__metadata_id__) const idPromise = paramsPromise.then(params => params?.__metadata_id__)
if (process.env.NODE_ENV !== 'production') { const id = await idPromise
const id = await idPromise const hasXmlExtension = id ? id.endsWith('.xml') : false
const hasXmlExtension = id ? id.endsWith('.xml') : false const sitemaps = await generateSitemaps()
const sitemaps = await generateSitemaps() let foundId
let foundId for (const item of sitemaps) {
for (const item of sitemaps) { if (item?.id == null) {
if (item?.id == null) { throw new Error('id property is required for every item returned from generateSitemaps')
throw new Error('id property is required for every item returned from generateSitemaps')
}
const baseId = id && hasXmlExtension ? id.slice(0, -4) : undefined
if (item.id.toString() === baseId) {
foundId = item.id
}
} }
if (foundId == null) {
return new NextResponse('Not Found', { const baseId = id && hasXmlExtension ? id.slice(0, -4) : undefined
status: 404, if (item.id.toString() === baseId) {
}) foundId = item.id
} }
} }
if (foundId == null) {
return new NextResponse('Not Found', {
status: 404,
})
}
const targetIdPromise = idPromise.then(id => { const targetIdPromise = idPromise.then(id => {
const hasXmlExtension = id ? id.endsWith('.xml') : false const hasXmlExtension = id ? id.endsWith('.xml') : false
...@@ -340,7 +334,6 @@ export async function GET(_, ctx) { ...@@ -340,7 +334,6 @@ export async function GET(_, ctx) {
}) })
} }
export const dynamicParams = false
export async function generateStaticParams() { export async function generateStaticParams() {
const sitemaps = await generateSitemaps() const sitemaps = await generateSitemaps()
const params = [] const params = []
......
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