Unverified Commit 118bdaf6 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: lazy require metadata and handle TLA (#91705)

A regression from #88487

1. Make metadata import lazy with `() => require()`, just like for the layout segments
2. Properly await the return value to better handle TLA modules

This align with Webpack which does this:

<img width="1535" height="509" alt="Bildschirmfoto 2026-03-20 um 11 58 00" src="https://github.com/user-attachments/assets/f2864c86-ccce-4884-8417-c8ae06c05f78" />


Closes PACK-6927
Closes #91700
Closes https://github.com/vercel/next.js/issues/91676
parent 04cc2f2e
...@@ -189,7 +189,7 @@ impl AppPageLoaderTreeBuilder { ...@@ -189,7 +189,7 @@ impl AppPageLoaderTreeBuilder {
// when mixing ESM imports and requires). // when mixing ESM imports and requires).
self.base.imports.push( self.base.imports.push(
format!( format!(
"const {identifier} = require(/*turbopackChunkingType: \ "const {identifier} = () => require(/*turbopackChunkingType: \
shared*/\"{inner_module_id}\");" shared*/\"{inner_module_id}\");"
) )
.into(), .into(),
...@@ -208,7 +208,10 @@ impl AppPageLoaderTreeBuilder { ...@@ -208,7 +208,10 @@ impl AppPageLoaderTreeBuilder {
.insert(inner_module_id.into(), module); .insert(inner_module_id.into(), module);
let s = " "; let s = " ";
writeln!(self.loader_tree_code, "{s}{identifier}.default,")?; writeln!(
self.loader_tree_code,
"{s}async (props) => interopDefault(await {identifier}())(props),"
)?;
} }
} }
Ok(()) Ok(())
...@@ -239,7 +242,7 @@ impl AppPageLoaderTreeBuilder { ...@@ -239,7 +242,7 @@ impl AppPageLoaderTreeBuilder {
// requires). // requires).
self.base.imports.push( self.base.imports.push(
format!( format!(
"const {identifier} = require(/*turbopackChunkingType: \ "const {identifier} = () => require(/*turbopackChunkingType: \
shared*/\"{inner_module_id}\");" shared*/\"{inner_module_id}\");"
) )
.into(), .into(),
...@@ -254,8 +257,51 @@ impl AppPageLoaderTreeBuilder { ...@@ -254,8 +257,51 @@ impl AppPageLoaderTreeBuilder {
.inner_assets .inner_assets
.insert(inner_module_id.into(), module); .insert(inner_module_id.into(), module);
let alt = if let Some(alt_path) = alt_path {
let identifier = magic_identifier::mangle(&format!("{name} alt text #{i}"));
let inner_module_id = format!("METADATA_ALT_{i}");
// This should use the same importing mechanism as create_module_tuple_code, so that the
// relative order of items is retained (which isn't the case when mixing ESM imports and
// requires).
self.base.imports.push(
format!(
"const {identifier} = () => require(/*turbopackChunkingType: \
shared*/\"{inner_module_id}\");"
)
.into(),
);
let module = self
.base
.process_source(Vc::upcast(TextContentFileSource::new(Vc::upcast(
FileSource::new(alt_path),
))))
.to_resolved()
.await?;
self.base
.inner_assets
.insert(inner_module_id.into(), module);
Some(identifier)
} else {
None
};
let s = " "; let s = " ";
writeln!(self.loader_tree_code, "{s}(async (props) => [{{")?; writeln!(self.loader_tree_code, "{s}(async (props) => {{")?;
writeln!(
self.loader_tree_code,
"{s} const mod = interopDefault(await {identifier}());"
)?;
if let Some(alt) = &alt {
writeln!(
self.loader_tree_code,
"{s} const alt = interopDefault(await {alt}());"
)?;
}
writeln!(self.loader_tree_code, "{s} return [{{")?;
let pathname_prefix = if let Some(base_path) = &self.base_path { let pathname_prefix = if let Some(base_path) = &self.base_path {
format!("{base_path}/{app_page}") format!("{base_path}/{app_page}")
} else { } else {
...@@ -264,68 +310,37 @@ impl AppPageLoaderTreeBuilder { ...@@ -264,68 +310,37 @@ impl AppPageLoaderTreeBuilder {
let metadata_route = &*get_metadata_route_name(item.clone().into()).await?; let metadata_route = &*get_metadata_route_name(item.clone().into()).await?;
writeln!( writeln!(
self.loader_tree_code, self.loader_tree_code,
"{s} url: fillMetadataSegment({}, await props.params, {}, true) + \ "{s} url: fillMetadataSegment({}, await props.params, {}, true) + \
`?${{{identifier}.default.src.split(\"/\").splice(-1)[0]}}`,", `?${{mod.src.split(\"/\").splice(-1)[0]}}`,",
StringifyJs(&pathname_prefix), StringifyJs(&pathname_prefix),
StringifyJs(metadata_route), StringifyJs(metadata_route),
)?; )?;
let numeric_sizes = name == "twitter" || name == "openGraph"; let numeric_sizes = name == "twitter" || name == "openGraph";
if numeric_sizes { if numeric_sizes {
writeln!( writeln!(self.loader_tree_code, "{s} width: mod.width,")?;
self.loader_tree_code, writeln!(self.loader_tree_code, "{s} height: mod.height,")?;
"{s} width: {identifier}.default.width,"
)?;
writeln!(
self.loader_tree_code,
"{s} height: {identifier}.default.height,"
)?;
} else { } else {
// For SVGs, skip sizes and use "any" to let it scale automatically based on viewport, // For SVGs, skip sizes and use "any" to let it scale automatically based on viewport,
// For the images doesn't provide the size properly, use "any" as well. // For the images doesn't provide the size properly, use "any" as well.
// If the size is presented, use the actual size for the image. // If the size is presented, use the actual size for the image.
let sizes = if path.has_extension(".svg") { let sizes = if path.has_extension(".svg") {
"any".to_string() "any"
} else { } else {
format!("${{{identifier}.default.width}}x${{{identifier}.default.height}}") "${mod.width}x${mod.height}"
}; };
writeln!(self.loader_tree_code, "{s} sizes: `{sizes}`,")?; writeln!(self.loader_tree_code, "{s} sizes: `{sizes}`,")?;
} }
let content_type = get_content_type(path).await?; let content_type = get_content_type(path).await?;
writeln!(self.loader_tree_code, "{s} type: `{content_type}`,")?; writeln!(self.loader_tree_code, "{s} type: `{content_type}`,")?;
if let Some(alt_path) = alt_path {
let identifier = magic_identifier::mangle(&format!("{name} alt text #{i}"));
let inner_module_id = format!("METADATA_ALT_{i}");
// This should use the same importing mechanism as create_module_tuple_code, so that the
// relative order of items is retained (which isn't the case when mixing ESM imports and
// requires).
self.base.imports.push(
format!(
"const {identifier} = require(/*turbopackChunkingType: \
shared*/\"{inner_module_id}\");"
)
.into(),
);
let module = self
.base
.process_source(Vc::upcast(TextContentFileSource::new(Vc::upcast(
FileSource::new(alt_path),
))))
.to_resolved()
.await?;
self.base
.inner_assets
.insert(inner_module_id.into(), module);
writeln!(self.loader_tree_code, "{s} alt: {identifier}.default,")?; if alt.is_some() {
writeln!(self.loader_tree_code, "{s} alt,")?;
} }
writeln!(self.loader_tree_code, "{s}}}]),")?; writeln!(self.loader_tree_code, "{s} }}];")?;
writeln!(self.loader_tree_code, "{s}}}),")?;
Ok(()) Ok(())
} }
......
...@@ -41,7 +41,6 @@ import { ...@@ -41,7 +41,6 @@ import {
getComponentTypeModule, getComponentTypeModule,
getLayoutOrPageModule, getLayoutOrPageModule,
} from '../../server/lib/app-dir-module' } from '../../server/lib/app-dir-module'
import { interopDefault } from '../interop-default'
import { import {
resolveAlternates, resolveAlternates,
resolveAppleWebApp, resolveAppleWebApp,
...@@ -572,11 +571,11 @@ async function collectStaticImagesFiles( ...@@ -572,11 +571,11 @@ async function collectStaticImagesFiles(
const iconPromises = metadata[type as 'icon' | 'apple'].map( const iconPromises = metadata[type as 'icon' | 'apple'].map(
async (imageModule: (p: any) => Promise<MetadataImageModule[]>) => async (imageModule: (p: any) => Promise<MetadataImageModule[]>) =>
await interopDefault(imageModule)(props) await imageModule(props)
) )
return iconPromises?.length > 0 return iconPromises?.length > 0
? (await Promise.all(iconPromises))?.flat() ? (await Promise.all(iconPromises)).flat()
: undefined : undefined
} }
......
import { ImageResponse } from 'next/og'
import { getAllSlugs } from '../../data'
export default function og() {
return new ImageResponse(
(
<div
style={{
width: '100%',
height: '100%',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
fontSize: 88,
background: 'lavender',
}}
>
Posts: {getAllSlugs().join(', ')}
</div>
)
)
}
import { getAllSlugs } from '../../data'
export function generateStaticParams() {
return getAllSlugs().map((slug) => ({ slug }))
}
export default async function Page({
params,
}: {
params: Promise<{ slug: string }>
}) {
const { slug } = await params
return <p>Post: {slug}</p>
}
// Async module: top-level await makes this an async module,
// which causes any transitive importer to also become async.
const data = await Promise.resolve({
slugs: ['hello-world', 'another-post'],
})
export function getAllSlugs(): string[] {
return data.slugs
}
export default function Layout({ children }) {
return (
<html>
<head></head>
<body>{children}</body>
</html>
)
}
import { nextTestSetup } from 'e2e-utils'
describe('app dir - metadata dynamic routes with async deps', () => {
const { next } = nextTestSetup({
files: __dirname,
dependencies: {
'@vercel/og': 'latest',
},
})
it('should render page with og:image meta tag when opengraph-image has async dependencies', async () => {
const $ = await next.render$('/blog/hello-world')
const ogImageUrl = $('meta[property="og:image"]').attr('content')
expect(ogImageUrl).toContain('/blog/hello-world/opengraph-image')
})
it('should serve the opengraph-image route as a valid image', async () => {
const res = await next.fetch('/blog/hello-world/opengraph-image')
expect(res.status).toBe(200)
expect(res.headers.get('content-type')).toBe('image/png')
})
})
/** @type {import('next').NextConfig} */
module.exports = {}
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