Unverified Commit 79bc150e authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Fix missing await of params in metadata route (#70900)

parent 5276321a
......@@ -82,7 +82,7 @@ pub async fn dynamic_image_metadata_source(
const imageModule = {{ {exported_fields_excluding_default} }}
export default async function (props) {{
const {{ __metadata_id__: _, ...params }} = props.params
const {{ __metadata_id__: _, ...params }} = await props.params
const imageUrl = fillMetadataSegment({pathname_prefix}, params, {page_segment})
const {{ generateImageMetadata }} = imageModule
......
......@@ -303,7 +303,7 @@ async fn dynamic_site_map_route_source(
}}
export async function GET(_, ctx) {{
const {{ __metadata_id__: id, ...params }} = ctx.params || {{}}
const {{ __metadata_id__: id, ...params }} = await ctx.params || {{}}
const hasXmlExtension = id ? id.endsWith('.xml') : false
if (id && !hasXmlExtension) {{
return new NextResponse('Not Found', {{
......@@ -371,12 +371,14 @@ async fn dynamic_image_route_source(path: Vc<FileSystemPath>) -> Result<Vc<Box<d
}}
export async function GET(_, ctx) {{
const {{ __metadata_id__, ...params }} = ctx.params || {{}}
const params = await ctx.params
const {{ __metadata_id__, ...rest }} = params || {{}}
const restParams = params ? rest : undefined
const targetId = __metadata_id__
let id = undefined
if (generateImageMetadata) {{
const imageMetadata = await generateImageMetadata({{ params }})
const imageMetadata = await generateImageMetadata({{ params: restParams }})
id = imageMetadata.find((item) => {{
if (process.env.NODE_ENV !== 'production') {{
if (item?.id == null) {{
......@@ -393,7 +395,7 @@ async fn dynamic_image_route_source(path: Vc<FileSystemPath>) -> Result<Vc<Box<d
}}
}}
return handler({{ params: ctx.params ? params : undefined, id }})
return handler({{ params: restParams, id }})
}}
"#,
resource_path = StringifyJs(&format!("./{}.{}", stem, ext)),
......
......@@ -175,12 +175,14 @@ ${errorOnBadHandler(resourcePath)}
${await createReExportsCode(resourcePath, loaderContext)}
export async function GET(_, ctx) {
const { __metadata_id__, ...params } = ctx.params || {}
const params = await ctx.params
const { __metadata_id__, ...rest } = params || {}
const restParams = params ? rest : undefined
const targetId = __metadata_id__
let id = undefined
if (generateImageMetadata) {
const imageMetadata = await generateImageMetadata({ params })
const imageMetadata = await generateImageMetadata({ params: restParams })
id = imageMetadata.find((item) => {
if (process.env.NODE_ENV !== 'production') {
if (item?.id == null) {
......@@ -196,7 +198,7 @@ export async function GET(_, ctx) {
}
}
return handler({ params: ctx.params ? params : undefined, id })
return handler({ params: restParams, id })
}
`
}
......@@ -243,7 +245,7 @@ ${errorOnBadHandler(resourcePath)}
${await createReExportsCode(resourcePath, loaderContext)}
export async function GET(_, ctx) {
const { __metadata_id__: id, ...params } = ctx.params || {}
const { __metadata_id__: id, ...params } = await ctx.params || {}
const hasXmlExtension = id ? id.endsWith('.xml') : false
if (id && !hasXmlExtension) {
......
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