Unverified Commit 3ed9f4b3 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Respect reexports from metadata API routes (#70508)

parent 154dd240
...@@ -14,6 +14,27 @@ function errorOnBadHandler(resourcePath: string) { ...@@ -14,6 +14,27 @@ function errorOnBadHandler(resourcePath: string) {
` `
} }
/* re-export the userland route configs */
async function createReExportsCode(
resourcePath: string,
loaderContext: webpack.LoaderContext<any>
) {
const exportNames = await getLoaderModuleNamedExports(
resourcePath,
loaderContext
)
// Re-export configs but avoid conflicted exports
const reExportNames = exportNames.filter(
(name) => name !== 'default' && name !== 'generateSitemaps'
)
return reExportNames.length > 0
? `export { ${reExportNames.join(', ')} } from ${JSON.stringify(
resourcePath
)}\n`
: ''
}
const cacheHeader = { const cacheHeader = {
none: 'no-cache, no-store', none: 'no-cache, no-store',
longCache: 'public, immutable, no-transform, max-age=31536000', longCache: 'public, immutable, no-transform, max-age=31536000',
...@@ -85,7 +106,10 @@ export const dynamic = 'force-static' ...@@ -85,7 +106,10 @@ export const dynamic = 'force-static'
return code return code
} }
function getDynamicTextRouteCode(resourcePath: string) { async function getDynamicTextRouteCode(
resourcePath: string,
loaderContext: webpack.LoaderContext<any>
) {
return `\ return `\
/* dynamic asset route */ /* dynamic asset route */
import { NextResponse } from 'next/server' import { NextResponse } from 'next/server'
...@@ -96,6 +120,7 @@ const contentType = ${JSON.stringify(getContentType(resourcePath))} ...@@ -96,6 +120,7 @@ const contentType = ${JSON.stringify(getContentType(resourcePath))}
const fileType = ${JSON.stringify(getFilenameAndExtension(resourcePath).name)} const fileType = ${JSON.stringify(getFilenameAndExtension(resourcePath).name)}
${errorOnBadHandler(resourcePath)} ${errorOnBadHandler(resourcePath)}
${await createReExportsCode(resourcePath, loaderContext)}
export async function GET() { export async function GET() {
const data = await handler() const data = await handler()
...@@ -112,7 +137,10 @@ export async function GET() { ...@@ -112,7 +137,10 @@ export async function GET() {
} }
// <metadata-image>/[id]/route.js // <metadata-image>/[id]/route.js
function getDynamicImageRouteCode(resourcePath: string) { async function getDynamicImageRouteCode(
resourcePath: string,
loaderContext: webpack.LoaderContext<any>
) {
return `\ return `\
/* dynamic image route */ /* dynamic image route */
import { NextResponse } from 'next/server' import { NextResponse } from 'next/server'
...@@ -124,6 +152,7 @@ const handler = imageModule.default ...@@ -124,6 +152,7 @@ const handler = imageModule.default
const generateImageMetadata = imageModule.generateImageMetadata const generateImageMetadata = imageModule.generateImageMetadata
${errorOnBadHandler(resourcePath)} ${errorOnBadHandler(resourcePath)}
${await createReExportsCode(resourcePath, loaderContext)}
export async function GET(_, ctx) { export async function GET(_, ctx) {
const { __metadata_id__, ...params } = ctx.params || {} const { __metadata_id__, ...params } = ctx.params || {}
...@@ -162,10 +191,6 @@ async function getDynamicSitemapRouteCode( ...@@ -162,10 +191,6 @@ async function getDynamicSitemapRouteCode(
resourcePath, resourcePath,
loaderContext loaderContext
) )
// Re-export configs but avoid conflicted exports
const reExportNames = exportNames.filter(
(name) => name !== 'default' && name !== 'generateSitemaps'
)
const hasGenerateSitemaps = exportNames.includes('generateSitemaps') const hasGenerateSitemaps = exportNames.includes('generateSitemaps')
...@@ -195,15 +220,7 @@ const contentType = ${JSON.stringify(getContentType(resourcePath))} ...@@ -195,15 +220,7 @@ const contentType = ${JSON.stringify(getContentType(resourcePath))}
const fileType = ${JSON.stringify(getFilenameAndExtension(resourcePath).name)} const fileType = ${JSON.stringify(getFilenameAndExtension(resourcePath).name)}
${errorOnBadHandler(resourcePath)} ${errorOnBadHandler(resourcePath)}
${await createReExportsCode(resourcePath, loaderContext)}
${'' /* re-export the userland route configs */}
${
reExportNames.length > 0
? `export { ${reExportNames.join(', ')} } from ${JSON.stringify(
resourcePath
)}\n`
: ''
}
export async function GET(_, ctx) { export async function GET(_, ctx) {
const { __metadata_id__: id, ...params } = ctx.params || {} const { __metadata_id__: id, ...params } = ctx.params || {}
...@@ -253,11 +270,11 @@ const nextMetadataRouterLoader: webpack.LoaderDefinitionFunction<MetadataRouteLo ...@@ -253,11 +270,11 @@ const nextMetadataRouterLoader: webpack.LoaderDefinitionFunction<MetadataRouteLo
let code = '' let code = ''
if (isDynamicRouteExtension === '1') { if (isDynamicRouteExtension === '1') {
if (fileBaseName === 'robots' || fileBaseName === 'manifest') { if (fileBaseName === 'robots' || fileBaseName === 'manifest') {
code = getDynamicTextRouteCode(filePath) code = await getDynamicTextRouteCode(filePath, this)
} else if (fileBaseName === 'sitemap') { } else if (fileBaseName === 'sitemap') {
code = await getDynamicSitemapRouteCode(filePath, this) code = await getDynamicSitemapRouteCode(filePath, this)
} else { } else {
code = getDynamicImageRouteCode(filePath) code = await getDynamicImageRouteCode(filePath, this)
} }
} else { } else {
code = await getStaticAssetRouteCode(filePath, fileBaseName) code = await getStaticAssetRouteCode(filePath, fileBaseName)
......
import type { MetadataRoute } from 'next'
export default function manifest(): MetadataRoute.Manifest {
return {
name: 'Next.js App',
short_name: 'Next.js App',
description: 'Next.js App',
start_url: '/',
display: 'standalone',
background_color: '#fff',
theme_color: '#fff',
icons: [
{
src: '/favicon.ico',
sizes: 'any',
type: 'image/x-icon',
},
],
}
}
export const revalidate = 5
import { ImageResponse } from 'next/og'
/* without generateImageMetadata */
export default function og() {
return new ImageResponse(
(
<div
style={{
width: '100%',
height: '100%',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
fontSize: 128,
background: 'lavender',
}}
>
Open Graph
</div>
)
)
}
export const revalidate = 5
import type { MetadataRoute } from 'next'
export default function robots(): MetadataRoute.Robots {
return {
rules: {
userAgent: '*',
allow: '/',
disallow: '/private/',
},
sitemap: 'https://acme.com/sitemap.xml',
}
}
export const revalidate = 5
export default function sitemap() {
return [
{
url: 'https://acme.com',
lastModified: new Date(),
changeFrequency: 'yearly',
priority: 1,
},
]
}
export const revalidate = 5
import { nextTestSetup } from 'e2e-utils'
describe('app-dir - metadata-revalidate', () => {
const { next } = nextTestSetup({
files: __dirname,
})
it('should contain the routes in prerender manifest', async () => {
const manifestContent = await next.readFile('.next/prerender-manifest.json')
const prerenderManifest = JSON.parse(manifestContent)
expect(
prerenderManifest.routes['/revalidate/og/opengraph-image']
.initialRevalidateSeconds
).toBe(5)
expect(
prerenderManifest.routes['/manifest.webmanifest'].initialRevalidateSeconds
).toBe(5)
expect(
prerenderManifest.routes['/robots.txt'].initialRevalidateSeconds
).toBe(5)
expect(
prerenderManifest.routes['/sitemap.xml'].initialRevalidateSeconds
).toBe(5)
})
})
...@@ -16302,6 +16302,15 @@ ...@@ -16302,6 +16302,15 @@
"flakey": [], "flakey": [],
"runtimeError": false "runtimeError": false
}, },
"test/production/app-dir/metadata-revalidate/metadata-revalidate.test.ts": {
"passed": [],
"failed": [
"app-dir - metadata-revalidate should contain the routes in prerender manifest"
],
"pending": [],
"flakey": [],
"runtimeError": false
},
"test/production/middleware-typescript/test/index.test.ts": { "test/production/middleware-typescript/test/index.test.ts": {
"passed": ["middleware-typescript should have built and started"], "passed": ["middleware-typescript should have built and started"],
"failed": [], "failed": [],
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