Unverified Commit 2c1f68eb authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

[Turbopack] include async loaders in chunking instead of separating it (#75052)

### What?

Chunk async loaders together with normal chunk items to avoid multiple chunkings and small chunks
parent 410250bf
...@@ -163,7 +163,6 @@ pub async fn make_chunk_group( ...@@ -163,7 +163,6 @@ pub async fn make_chunk_group(
}) })
.try_join() .try_join()
.await?; .await?;
let has_async_loaders = !async_loaders.is_empty();
let async_loader_chunk_items = let async_loader_chunk_items =
async_loaders async_loaders
.iter() .iter()
...@@ -180,14 +179,8 @@ pub async fn make_chunk_group( ...@@ -180,14 +179,8 @@ pub async fn make_chunk_group(
.map(|&loader| loader.references()) .map(|&loader| loader.references())
.try_join() .try_join()
.await?; .await?;
let async_loader_external_module_references = Vc::cell(
async_loader_references
.iter()
.flat_map(|references| references.iter().copied())
.collect(),
);
let traced_output_assets = traced_modules let mut referenced_output_assets = traced_modules
.into_iter() .into_iter()
.map(|module| async move { .map(|module| async move {
Ok(ResolvedVc::upcast( Ok(ResolvedVc::upcast(
...@@ -203,7 +196,7 @@ pub async fn make_chunk_group( ...@@ -203,7 +196,7 @@ pub async fn make_chunk_group(
.try_join() .try_join()
.await?; .await?;
let chunk_items = all_modules let mut chunk_items = all_modules
.iter() .iter()
.map(|(module, async_info)| { .map(|(module, async_info)| {
Either::Left(async move { Either::Left(async move {
...@@ -234,34 +227,21 @@ pub async fn make_chunk_group( ...@@ -234,34 +227,21 @@ pub async fn make_chunk_group(
.try_join() .try_join()
.await?; .await?;
chunk_items.extend(async_loader_chunk_items);
referenced_output_assets.reserve(async_loader_references.iter().map(|r| r.len()).sum());
referenced_output_assets.extend(async_loader_references.into_iter().flatten());
// Pass chunk items to chunking algorithm // Pass chunk items to chunking algorithm
let mut chunks = make_chunks( let chunks = make_chunks(
module_graph, module_graph,
*chunking_context, *chunking_context,
Vc::cell(chunk_items), Vc::cell(chunk_items),
"".into(), "".into(),
Vc::cell(traced_output_assets), Vc::cell(referenced_output_assets),
) )
.await? .await?
.clone_value(); .clone_value();
if has_async_loaders {
// Pass async chunk loaders to chunking algorithm
// We want them to be separate since they are specific to this chunk group due
// to available chunk items differing
let async_loader_chunks = make_chunks(
module_graph,
*chunking_context,
Vc::cell(async_loader_chunk_items.into_iter().collect()),
"async-loader-".into(),
async_loader_external_module_references,
)
.await?;
// concatenate chunks
chunks.extend(async_loader_chunks.iter().copied());
}
Ok(MakeChunkGroupResult { Ok(MakeChunkGroupResult {
chunks, chunks,
availability_info, availability_info,
......
...@@ -39,16 +39,29 @@ pub async fn app_vendors_split( ...@@ -39,16 +39,29 @@ pub async fn app_vendors_split(
mut name: String, mut name: String,
split_context: &mut SplitContext<'_>, split_context: &mut SplitContext<'_>,
) -> Result<()> { ) -> Result<()> {
let mut chunk_group_specific_chunk_items = Vec::new();
let mut app_chunk_items = Vec::new(); let mut app_chunk_items = Vec::new();
let mut vendors_chunk_items = Vec::new(); let mut vendors_chunk_items = Vec::new();
for item in chunk_items { for item in chunk_items {
let ChunkItemWithInfo { asset_ident, .. } = &item; let ChunkItemWithInfo {
if is_app_code(asset_ident) { asset_ident,
module,
..
} = &item;
if module.is_none() {
// This happens for async module loaders.
// We want them to be in a separate chunk.
chunk_group_specific_chunk_items.push(item);
} else if is_app_code(asset_ident) {
app_chunk_items.push(item); app_chunk_items.push(item);
} else { } else {
vendors_chunk_items.push(item); vendors_chunk_items.push(item);
} }
} }
if !chunk_group_specific_chunk_items.is_empty() {
let mut name = format!("{}-specific", name);
make_chunk(chunk_group_specific_chunk_items, &mut name, split_context).await?;
}
let mut remaining = Vec::new(); let mut remaining = Vec::new();
let mut key = format!("{}-app", name); let mut key = format!("{}-app", name);
if !handle_split_group( if !handle_split_group(
......
(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([ (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
"output/4c35f_tests_snapshot_basic-tree-shake_dynamic-import_input_index_d5474b.js", "output/4c35f_tests_snapshot_basic-tree-shake_dynamic-import_input_index_aba1a0.js",
{}, {},
{"otherChunks":["output/4c35f_tests_snapshot_basic-tree-shake_dynamic-import_input_index_92a5f4.js","output/b1abf_turbopack-tests_tests_snapshot_basic-tree-shake_dynamic-import_input_lib_44a9b7.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/dynamic-import/input/index.js [test] (ecmascript)"]} {"otherChunks":["output/b1abf_turbopack-tests_tests_snapshot_basic-tree-shake_dynamic-import_input_lib_44a9b7.js","output/4c35f_tests_snapshot_basic-tree-shake_dynamic-import_input_index_92a5f4.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/dynamic-import/input/index.js [test] (ecmascript)"]}
]); ]);
// Dummy runtime // Dummy runtime
\ No newline at end of file
(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([ (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
"output/4e721_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_3567a8.js", "output/4e721_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_c2e2cc.js",
{}, {},
{"otherChunks":["output/turbopack_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_463663._.js","output/4e721_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_46e42b.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js [test] (ecmascript)"]} {"otherChunks":["output/4e721_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_46e42b.js","output/turbopack_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_463663._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js [test] (ecmascript)"]}
]); ]);
// Dummy runtime // Dummy runtime
\ No newline at end of file
const CHUNK_PUBLIC_PATH = "output/index.entry.js"; const CHUNK_PUBLIC_PATH = "output/index.entry.js";
const runtime = require("./[turbopack]_runtime.js"); const runtime = require("./[turbopack]_runtime.js");
runtime.loadChunk("output/4e721_crates_turbopack-tests_tests_snapshot_basic_async_chunk_build_input_1e4137._.js");
runtime.loadChunk("output/b1abf_turbopack-tests_tests_snapshot_basic_async_chunk_build_input_import_6f110a.js"); runtime.loadChunk("output/b1abf_turbopack-tests_tests_snapshot_basic_async_chunk_build_input_import_6f110a.js");
runtime.loadChunk("output/4e721_crates_turbopack-tests_tests_snapshot_basic_async_chunk_build_input_1e4137._.js");
runtime.getOrInstantiateRuntimeModule("[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk_build/input/index.js [test] (ecmascript)", CHUNK_PUBLIC_PATH); runtime.getOrInstantiateRuntimeModule("[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk_build/input/index.js [test] (ecmascript)", CHUNK_PUBLIC_PATH);
module.exports = runtime.getOrInstantiateRuntimeModule("[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk_build/input/index.js [test] (ecmascript)", CHUNK_PUBLIC_PATH).exports; module.exports = runtime.getOrInstantiateRuntimeModule("[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk_build/input/index.js [test] (ecmascript)", CHUNK_PUBLIC_PATH).exports;
\ No newline at end of file
(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([ (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
"output/4e721_crates_turbopack-tests_tests_snapshot_basic_top-level-await_input_index_b01f59.js", "output/4e721_crates_turbopack-tests_tests_snapshot_basic_top-level-await_input_index_f3a578.js",
{}, {},
{"otherChunks":["output/4e721_crates_turbopack-tests_tests_snapshot_basic_top-level-await_input_9acd43._.js","output/b1abf_turbopack-tests_tests_snapshot_basic_top-level-await_input_UserAPI_ba56f9.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic/top-level-await/input/index.js [test] (ecmascript)"]} {"otherChunks":["output/b1abf_turbopack-tests_tests_snapshot_basic_top-level-await_input_UserAPI_ba56f9.js","output/4e721_crates_turbopack-tests_tests_snapshot_basic_top-level-await_input_9acd43._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic/top-level-await/input/index.js [test] (ecmascript)"]}
]); ]);
// Dummy runtime // Dummy runtime
\ No newline at end of file
(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([ (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
"output/4e721_crates_turbopack-tests_tests_snapshot_css_css-modules_input_index_ae0851.js", "output/4e721_crates_turbopack-tests_tests_snapshot_css_css-modules_input_index_b09cf6.js",
{}, {},
{"otherChunks":[{"path":"output/4e721_crates_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_76a252.css","included":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules/input/style.module.css [test] (css)"],"moduleChunks":["output/4e721_crates_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_7d7e1c.css"]},"output/turbopack_crates_turbopack-tests_tests_snapshot_css_css-modules_input_8f2e7f._.js","output/b1abf_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_css_adb3ea._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules/input/index.js [test] (ecmascript)"]} {"otherChunks":[{"path":"output/4e721_crates_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_76a252.css","included":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules/input/style.module.css [test] (css)"],"moduleChunks":["output/4e721_crates_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_7d7e1c.css"]},"output/b1abf_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_css_adb3ea._.js","output/turbopack_crates_turbopack-tests_tests_snapshot_css_css-modules_input_8f2e7f._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules/input/index.js [test] (ecmascript)"]}
]); ]);
// Dummy runtime // Dummy runtime
\ No newline at end of file
(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([ (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
"output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_index_ec14ee.js", "output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_index_7c78ad.js",
{}, {},
{"otherChunks":[{"path":"output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_8f45c3._.css","included":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css/input/node_modules/foo/style.css [test] (css)","[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css/input/imported.css [test] (css, )","[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css/input/imported.css [test] (css, layer(layer) print)","[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css/input/style.css [test] (css)","[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css/input/node_modules/foo/style.module.css [test] (css)","[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css/input/style.module.css [test] (css)"],"moduleChunks":["output/08d19_foo_style_7d7e1c.css","output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_imported_d96429.css","output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_imported_9f97d9.css","output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_style_7d7e1c.css","output/08d19_foo_style_module_7d7e1c.css","output/4e721_crates_turbopack-tests_tests_snapshot_css_css_input_style_module_7d7e1c.css","output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_imported_d96429.css","output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_imported_d96429.css","output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_imported_9f97d9.css"]},"output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_6dc4af._.js","output/08d19_foo_style_css_1f8924._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css/input/index.js [test] (ecmascript)"]} {"otherChunks":[{"path":"output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_8f45c3._.css","included":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css/input/node_modules/foo/style.css [test] (css)","[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css/input/imported.css [test] (css, )","[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css/input/imported.css [test] (css, layer(layer) print)","[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css/input/style.css [test] (css)","[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css/input/node_modules/foo/style.module.css [test] (css)","[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css/input/style.module.css [test] (css)"],"moduleChunks":["output/08d19_foo_style_7d7e1c.css","output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_imported_d96429.css","output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_imported_9f97d9.css","output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_style_7d7e1c.css","output/08d19_foo_style_module_7d7e1c.css","output/4e721_crates_turbopack-tests_tests_snapshot_css_css_input_style_module_7d7e1c.css","output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_imported_d96429.css","output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_imported_d96429.css","output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_imported_9f97d9.css"]},"output/08d19_foo_style_css_1f8924._.js","output/turbopack_crates_turbopack-tests_tests_snapshot_css_css_input_6dc4af._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css/input/index.js [test] (ecmascript)"]}
]); ]);
// Dummy runtime // Dummy runtime
\ No newline at end of file
(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([ (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
"output/4e721_crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_41b5f3.js", "output/4e721_crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_fb4a0c.js",
{}, {},
{"otherChunks":["output/4e721_crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_23ea6f.js","output/4e721_crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel_mjs_a2d40e._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/index.js [test] (ecmascript)"]} {"otherChunks":["output/4e721_crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel_mjs_a2d40e._.js","output/4e721_crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_23ea6f.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/index.js [test] (ecmascript)"]}
]); ]);
// Dummy runtime // Dummy runtime
\ No newline at end of file
(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([ (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
"output/b1abf_turbopack-tests_tests_snapshot_imports_ignore-comments_input_index_b5a38b.js", "output/b1abf_turbopack-tests_tests_snapshot_imports_ignore-comments_input_index_e44b7c.js",
{}, {},
{"otherChunks":["output/4e721_crates_turbopack-tests_tests_snapshot_imports_ignore-comments_input_26ea62._.js","output/b1abf_turbopack-tests_tests_snapshot_imports_ignore-comments_input_vercel_mjs_bc04b7._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/ignore-comments/input/index.js [test] (ecmascript)"]} {"otherChunks":["output/b1abf_turbopack-tests_tests_snapshot_imports_ignore-comments_input_vercel_mjs_bc04b7._.js","output/4e721_crates_turbopack-tests_tests_snapshot_imports_ignore-comments_input_26ea62._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/ignore-comments/input/index.js [test] (ecmascript)"]}
]); ]);
// Dummy runtime // Dummy runtime
\ No newline at end of file
(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([ (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
"output/b1abf_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_aeac15.js", "output/b1abf_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_8101ed.js",
{}, {},
{"otherChunks":["output/4e721_crates_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_ab9cac._.js","output/4c35f_tests_snapshot_imports_static-and-dynamic_input_vercel_mjs_cbd419._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/index.js [test] (ecmascript)"]} {"otherChunks":["output/4c35f_tests_snapshot_imports_static-and-dynamic_input_vercel_mjs_cbd419._.js","output/4e721_crates_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_ab9cac._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/index.js [test] (ecmascript)"]}
]); ]);
// Dummy runtime // Dummy runtime
\ No newline at end of file
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