From a507775d68fcc025a97f4d1ddfd15fb84356835d Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Mon, 20 Feb 2023 22:57:48 +0100 Subject: [PATCH 01/21] add infrastructure for keeping track of available assets --- .../in_chunking_context_asset.rs | 20 ++++- .../src/next_client_chunks/with_chunks.rs | 24 ++++-- .../with_chunking_context_scope_asset.rs | 20 ++++- .../with_client_chunks.rs | 17 ++-- crates/next-core/src/web_entry_source.rs | 8 +- crates/turbo-tasks/src/primitives.rs | 8 ++ crates/turbopack-cli-utils/src/lib.rs | 1 - .../src/chunk/available_assets.rs | 78 +++++++++++++++++ crates/turbopack-core/src/chunk/mod.rs | 86 ++++++++++++++++--- crates/turbopack-css/src/asset.rs | 20 ++++- crates/turbopack-css/src/chunk/mod.rs | 76 ++++++++++++++-- crates/turbopack-css/src/chunk/optimize.rs | 2 + crates/turbopack-css/src/module_asset.rs | 36 ++++++-- .../turbopack-ecmascript/src/chunk/content.rs | 64 ++++++++++++-- crates/turbopack-ecmascript/src/chunk/item.rs | 17 +++- .../src/chunk/manifest/chunk_asset.rs | 65 ++++++++++++-- .../src/chunk/manifest/loader_item.rs | 42 +++++---- crates/turbopack-ecmascript/src/chunk/mod.rs | 77 +++++++++++++++-- .../src/chunk/optimize.rs | 7 +- .../src/chunk_group_files_asset.rs | 24 ++++-- crates/turbopack-ecmascript/src/lib.rs | 20 ++++- .../src/references/pattern_mapping.rs | 5 +- crates/turbopack-env/src/asset.rs | 20 ++++- crates/turbopack-json/src/lib.rs | 20 ++++- crates/turbopack-mdx/src/lib.rs | 20 ++++- crates/turbopack-static/src/lib.rs | 19 +++- crates/turbopack-tests/tests/snapshot.rs | 2 +- .../basic/async_chunk/input/import.js | 3 + .../snapshot/basic/async_chunk/input/index.js | 5 ++ .../input/node_modules/bar/index.js | 3 + .../input/node_modules/bar/package.json | 3 + .../basic/async_chunk/input/shared.js | 1 + .../output/20803_bar_index_309a59.js | 16 ++++ .../output/20803_bar_index_309a59.js.map | 6 ++ .../output/20803_bar_index_b2b240.js | 16 ++++ .../output/20803_bar_index_b2b240.js.map | 6 ++ ...foo_index.js => 20803_foo_index_b32b98.js} | 4 +- ...x.js.map => 20803_foo_index_b32b98.js.map} | 0 ...snapshot_basic_async_chunk_input_import.js | 14 --- ...shot_basic_async_chunk_input_import.js.map | 6 -- ...t_basic_async_chunk_input_import_0d49f0.js | 23 +++++ ...sic_async_chunk_input_import_0d49f0.js.map | 8 ++ ..._basic_async_chunk_input_import_bc0725.js} | 7 +- ...ic_async_chunk_input_import_bc0725.js.map} | 0 ...asic_async_chunk_input_index_580957.js.map | 6 -- ...t_basic_async_chunk_input_index_5b8d24.js} | 24 ++++-- ...asic_async_chunk_input_index_5b8d24.js.map | 8 ++ ...asic_async_chunk_input_index_da3760.js.map | 6 -- ...t_basic_async_chunk_input_index_e242f7.js} | 24 ++++-- ...asic_async_chunk_input_index_e242f7.js.map | 8 ++ ...foo_index.js => 39e84_foo_index_a20770.js} | 4 +- ...x.js.map => 39e84_foo_index_a20770.js.map} | 0 ...pshot_basic_chunked_input_index_162014.js} | 8 +- ...t_basic_chunked_input_index_162014.js.map} | 0 ...pshot_basic_chunked_input_index_b468e5.js} | 8 +- ...t_basic_chunked_input_index_b468e5.js.map} | 0 ...pshot_basic_shebang_input_index_22a205.js} | 8 +- ...t_basic_shebang_input_index_22a205.js.map} | 0 ...pshot_basic_shebang_input_index_f5dad6.js} | 8 +- ...t_basic_shebang_input_index_f5dad6.js.map} | 0 ...foo_index.js => d1787_foo_index_ea748e.js} | 4 +- ...x.js.map => d1787_foo_index_ea748e.js.map} | 0 ...=> 8697f_foo_style.module.css_8b24e0._.js} | 4 +- ...697f_foo_style.module.css_8b24e0._.js.map} | 0 ...ts_snapshot_css_css_input_index_9a2d4f.js} | 8 +- ...napshot_css_css_input_index_9a2d4f.js.map} | 0 ...ts_snapshot_css_css_input_index_ee32cf.js} | 8 +- ...napshot_css_css_input_index_ee32cf.js.map} | 0 ...s => 63a02_@emotion_react_index_19c07f.js} | 4 +- ... 63a02_@emotion_react_index_19c07f.js.map} | 0 ..._@emotion_react_jsx-dev-runtime_5103e7.js} | 4 +- ...otion_react_jsx-dev-runtime_5103e7.js.map} | 0 ... => 63a02_@emotion_styled_index_f6fc75.js} | 4 +- ...63a02_@emotion_styled_index_f6fc75.js.map} | 0 ...hot_emotion_emotion_input_index_3ce2d4.js} | 8 +- ...emotion_emotion_input_index_3ce2d4.js.map} | 0 ...hot_emotion_emotion_input_index_ec2274.js} | 8 +- ...emotion_emotion_input_index_ec2274.js.map} | 0 ...shot_imports_dynamic_input_index_56419a.js | 2 +- ...shot_imports_dynamic_input_index_6f9eb3.js | 2 +- ...orts_dynamic_input_vercel.mjs_4b587e._.js} | 4 +- ..._dynamic_input_vercel.mjs_4b587e._.js.map} | 0 ...orts_dynamic_input_vercel.mjs_e25ebc._.js} | 4 +- ..._dynamic_input_vercel.mjs_e25ebc._.js.map} | 0 ...s_static-and-dynamic_input_index_507785.js | 2 +- ...s_static-and-dynamic_input_index_899ad5.js | 2 +- ...-and-dynamic_input_vercel.mjs_5aa78c._.js} | 4 +- ...-dynamic_input_vercel.mjs_5aa78c._.js.map} | 0 ...-and-dynamic_input_vercel.mjs_f4c89b._.js} | 4 +- ...-dynamic_input_vercel.mjs_f4c89b._.js.map} | 0 ...> 63a02_styled-components_index_7ff1d5.js} | 4 +- ...a02_styled-components_index_7ff1d5.js.map} | 0 ...s_styled_components_input_index_8fa5f1.js} | 8 +- ...yled_components_input_index_8fa5f1.js.map} | 0 ...s_styled_components_input_index_9e5528.js} | 8 +- ...yled_components_input_index_9e5528.js.map} | 0 ... => 63a02_react_jsx-dev-runtime_a01403.js} | 4 +- ...63a02_react_jsx-dev-runtime_a01403.js.map} | 0 ...7bf_third_party_component_index_c2ffe3.js} | 4 +- ...third_party_component_index_c2ffe3.js.map} | 0 ..._input_packages_component_index_13a243.js} | 4 +- ...ut_packages_component_index_13a243.js.map} | 0 ...sforms_input_packages_app_index_b3cd87.js} | 8 +- ...ms_input_packages_app_index_b3cd87.js.map} | 0 ...sforms_input_packages_app_index_bf4cf5.js} | 8 +- ...ms_input_packages_app_index_bf4cf5.js.map} | 0 ...ers_src__class_call_check.mjs_926eaa._.js} | 4 +- ...src__class_call_check.mjs_926eaa._.js.map} | 0 ...ansforms_preset_env_input_index_93c2b3.js} | 8 +- ...orms_preset_env_input_index_93c2b3.js.map} | 0 ...ansforms_preset_env_input_index_e3510a.js} | 8 +- ...orms_preset_env_input_index_e3510a.js.map} | 0 112 files changed, 911 insertions(+), 264 deletions(-) create mode 100644 crates/turbopack-core/src/chunk/available_assets.rs create mode 100644 crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/bar/index.js create mode 100644 crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/bar/package.json create mode 100644 crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/shared.js create mode 100644 crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_309a59.js create mode 100644 crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_309a59.js.map create mode 100644 crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_b2b240.js create mode 100644 crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_b2b240.js.map rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{20803_foo_index.js => 20803_foo_index_b32b98.js} (89%) rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{20803_foo_index.js.map => 20803_foo_index_b32b98.js.map} (100%) delete mode 100644 crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js delete mode 100644 crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js.map create mode 100644 crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js create mode 100644 crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js.map rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_93c5e8.js => crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_bc0725.js} (77%) rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_93c5e8.js.map => crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_bc0725.js.map} (100%) delete mode 100644 crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js.map rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_da3760.js => crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js} (95%) create mode 100644 crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js.map delete mode 100644 crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_da3760.js.map rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js => crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js} (95%) create mode 100644 crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js.map rename crates/turbopack-tests/tests/snapshot/basic/chunked/output/{39e84_foo_index.js => 39e84_foo_index_a20770.js} (89%) rename crates/turbopack-tests/tests/snapshot/basic/chunked/output/{39e84_foo_index.js.map => 39e84_foo_index_a20770.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/basic/chunked/output/{crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_e8535e.js => crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js} (99%) rename crates/turbopack-tests/tests/snapshot/basic/chunked/output/{crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_1d9ecb.js.map => crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/basic/chunked/output/{crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_1d9ecb.js => crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js} (99%) rename crates/turbopack-tests/tests/snapshot/basic/chunked/output/{crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_e8535e.js.map => crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/basic/shebang/output/{crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_a8bbcc.js => crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js} (99%) rename crates/turbopack-tests/tests/snapshot/basic/shebang/output/{crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_718090.js.map => crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/basic/shebang/output/{crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_718090.js => crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js} (99%) rename crates/turbopack-tests/tests/snapshot/basic/shebang/output/{crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_a8bbcc.js.map => crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/basic/shebang/output/{d1787_foo_index.js => d1787_foo_index_ea748e.js} (89%) rename crates/turbopack-tests/tests/snapshot/basic/shebang/output/{d1787_foo_index.js.map => d1787_foo_index_ea748e.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/css/css/output/{8697f_foo_style.module.css_354da7._.js => 8697f_foo_style.module.css_8b24e0._.js} (85%) rename crates/turbopack-tests/tests/snapshot/css/css/output/{8697f_foo_style.module.css_354da7._.js.map => 8697f_foo_style.module.css_8b24e0._.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/css/css/output/{crates_turbopack-tests_tests_snapshot_css_css_input_index_c93332.js => crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js} (99%) rename crates/turbopack-tests/tests/snapshot/css/css/output/{crates_turbopack-tests_tests_snapshot_css_css_input_index_47659c.js.map => crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/css/css/output/{crates_turbopack-tests_tests_snapshot_css_css_input_index_47659c.js => crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js} (99%) rename crates/turbopack-tests/tests/snapshot/css/css/output/{crates_turbopack-tests_tests_snapshot_css_css_input_index_c93332.js.map => crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/emotion/emotion/output/{63a02_@emotion_react_index.js => 63a02_@emotion_react_index_19c07f.js} (86%) rename crates/turbopack-tests/tests/snapshot/emotion/emotion/output/{63a02_@emotion_react_index.js.map => 63a02_@emotion_react_index_19c07f.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/emotion/emotion/output/{63a02_@emotion_react_jsx-dev-runtime.js => 63a02_@emotion_react_jsx-dev-runtime_5103e7.js} (84%) rename crates/turbopack-tests/tests/snapshot/emotion/emotion/output/{63a02_@emotion_react_jsx-dev-runtime.js.map => 63a02_@emotion_react_jsx-dev-runtime_5103e7.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/emotion/emotion/output/{63a02_@emotion_styled_index.js => 63a02_@emotion_styled_index_f6fc75.js} (85%) rename crates/turbopack-tests/tests/snapshot/emotion/emotion/output/{63a02_@emotion_styled_index.js.map => 63a02_@emotion_styled_index_f6fc75.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/emotion/emotion/output/{crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_549658.js => crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js} (99%) rename crates/turbopack-tests/tests/snapshot/emotion/emotion/output/{crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_549658.js.map => crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/emotion/emotion/output/{crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_d9fc1b.js => crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js} (98%) rename crates/turbopack-tests/tests/snapshot/emotion/emotion/output/{crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_d9fc1b.js.map => crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/dynamic/output/{crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_93c5e8._.js => crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_4b587e._.js} (84%) rename crates/turbopack-tests/tests/snapshot/imports/dynamic/output/{crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_93c5e8._.js.map => crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_4b587e._.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/dynamic/output/{crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs._.js => crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js} (84%) rename crates/turbopack-tests/tests/snapshot/imports/dynamic/output/{crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs._.js.map => crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/{a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_93c5e8._.js => a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_5aa78c._.js} (77%) rename crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/{a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_93c5e8._.js.map => a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_5aa78c._.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/{79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs._.js => a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js} (68%) rename crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/{79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs._.js.map => a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/{63a02_styled-components_index.js => 63a02_styled-components_index_7ff1d5.js} (85%) rename crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/{63a02_styled-components_index.js.map => 63a02_styled-components_index_7ff1d5.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/{a587c_tests_snapshot_styled_components_styled_components_input_index_0496ed.js => a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js} (99%) rename crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/{a587c_tests_snapshot_styled_components_styled_components_input_index_01a621.js.map => a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/{a587c_tests_snapshot_styled_components_styled_components_input_index_01a621.js => a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js} (99%) rename crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/{a587c_tests_snapshot_styled_components_styled_components_input_index_0496ed.js.map => a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/{63a02_react_jsx-dev-runtime.js => 63a02_react_jsx-dev-runtime_a01403.js} (85%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/{63a02_react_jsx-dev-runtime.js.map => 63a02_react_jsx-dev-runtime_a01403.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/{7b7bf_third_party_component_index.js => 7b7bf_third_party_component_index_c2ffe3.js} (86%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/{7b7bf_third_party_component_index.js.map => 7b7bf_third_party_component_index_c2ffe3.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/{a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_component_index.js => 8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js} (83%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/{a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_component_index.js.map => 8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/{a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_38ad57.js => a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js} (98%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/{a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_2a30e9.js.map => a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/{a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_2a30e9.js => a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js} (98%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/{a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_38ad57.js.map => a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/{63a02_@swc_helpers_src__class_call_check.mjs._.js => 63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js} (90%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/{63a02_@swc_helpers_src__class_call_check.mjs._.js.map => 63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/{79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_62f043.js => 79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js} (99%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/{79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_097653.js.map => 79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/{79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_097653.js => 79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js} (99%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/{79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_62f043.js.map => 79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js.map} (100%) diff --git a/crates/next-core/src/next_client_chunks/in_chunking_context_asset.rs b/crates/next-core/src/next_client_chunks/in_chunking_context_asset.rs index b2dae4ba07533..d6629badabe36 100644 --- a/crates/next-core/src/next_client_chunks/in_chunking_context_asset.rs +++ b/crates/next-core/src/next_client_chunks/in_chunking_context_asset.rs @@ -6,7 +6,10 @@ use turbopack::ecmascript::chunk::{ }; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, - chunk::{ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc}, + chunk::{ + available_assets::AvailableAssetsVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, + ChunkingContextVc, + }, ident::AssetIdentVc, reference::AssetReferencesVc, }; @@ -43,8 +46,19 @@ impl Asset for InChunkingContextAsset { #[turbo_tasks::value_impl] impl ChunkableAsset for InChunkingContextAsset { #[turbo_tasks::function] - fn as_chunk(&self, _context: ChunkingContextVc) -> ChunkVc { - EcmascriptChunkVc::new(self.chunking_context, self.asset).into() + fn as_chunk( + &self, + _context: ChunkingContextVc, + available_assets: Option, + current_availability_root: Option, + ) -> ChunkVc { + EcmascriptChunkVc::new( + self.chunking_context, + self.asset, + available_assets, + current_availability_root, + ) + .into() } } diff --git a/crates/next-core/src/next_client_chunks/with_chunks.rs b/crates/next-core/src/next_client_chunks/with_chunks.rs index 9fb7d9f049b2b..51019840ecebd 100644 --- a/crates/next-core/src/next_client_chunks/with_chunks.rs +++ b/crates/next-core/src/next_client_chunks/with_chunks.rs @@ -14,9 +14,10 @@ use turbopack::ecmascript::{ use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc, ChunkListReferenceVc, ChunkVc, ChunkableAsset, - ChunkableAssetReference, ChunkableAssetReferenceVc, ChunkableAssetVc, ChunkingContext, - ChunkingContextVc, ChunkingType, ChunkingTypeOptionVc, + available_assets::AvailableAssetsVc, Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc, + ChunkListReferenceVc, ChunkVc, ChunkableAsset, ChunkableAssetReference, + ChunkableAssetReferenceVc, ChunkableAssetVc, ChunkingContext, ChunkingContextVc, + ChunkingType, ChunkingTypeOptionVc, }, ident::AssetIdentVc, reference::{AssetReference, AssetReferenceVc, AssetReferencesVc}, @@ -59,8 +60,19 @@ impl Asset for WithChunksAsset { #[turbo_tasks::value_impl] impl ChunkableAsset for WithChunksAsset { #[turbo_tasks::function] - fn as_chunk(self_vc: WithChunksAssetVc, context: ChunkingContextVc) -> ChunkVc { - EcmascriptChunkVc::new(context, self_vc.as_ecmascript_chunk_placeable()).into() + fn as_chunk( + self_vc: WithChunksAssetVc, + context: ChunkingContextVc, + available_assets: Option, + current_availability_root: Option, + ) -> ChunkVc { + EcmascriptChunkVc::new( + context, + self_vc.as_ecmascript_chunk_placeable(), + available_assets, + current_availability_root, + ) + .into() } } @@ -110,6 +122,8 @@ impl WithChunksChunkItemVc { Ok(ChunkGroupVc::from_asset( inner.asset.into(), this.inner_context, + None, + Some(inner.asset.into()), )) } } diff --git a/crates/next-core/src/next_client_component/with_chunking_context_scope_asset.rs b/crates/next-core/src/next_client_component/with_chunking_context_scope_asset.rs index 1ef70f884c74e..30dbcb9318219 100644 --- a/crates/next-core/src/next_client_component/with_chunking_context_scope_asset.rs +++ b/crates/next-core/src/next_client_component/with_chunking_context_scope_asset.rs @@ -6,7 +6,10 @@ use turbopack::ecmascript::chunk::{ }; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, - chunk::{ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContext, ChunkingContextVc}, + chunk::{ + available_assets::AvailableAssetsVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, + ChunkingContext, ChunkingContextVc, + }, ident::AssetIdentVc, reference::AssetReferencesVc, }; @@ -43,8 +46,19 @@ impl Asset for WithChunkingContextScopeAsset { #[turbo_tasks::value_impl] impl ChunkableAsset for WithChunkingContextScopeAsset { #[turbo_tasks::function] - fn as_chunk(&self, context: ChunkingContextVc) -> ChunkVc { - EcmascriptChunkVc::new(context.with_layer(&self.layer), self.asset).into() + fn as_chunk( + &self, + context: ChunkingContextVc, + available_assets: Option, + current_availability_root: Option, + ) -> ChunkVc { + EcmascriptChunkVc::new( + context.with_layer(&self.layer), + self.asset, + available_assets, + current_availability_root, + ) + .into() } } diff --git a/crates/next-core/src/next_client_component/with_client_chunks.rs b/crates/next-core/src/next_client_component/with_client_chunks.rs index 037059c9d609a..699d3a4298e26 100644 --- a/crates/next-core/src/next_client_component/with_client_chunks.rs +++ b/crates/next-core/src/next_client_component/with_client_chunks.rs @@ -13,9 +13,9 @@ use turbopack::ecmascript::{ use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, - ChunkableAssetReference, ChunkableAssetReferenceVc, ChunkableAssetVc, ChunkingContext, - ChunkingContextVc, ChunkingType, ChunkingTypeOptionVc, + available_assets::AvailableAssetsVc, Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc, ChunkVc, + ChunkableAsset, ChunkableAssetReference, ChunkableAssetReferenceVc, ChunkableAssetVc, + ChunkingContext, ChunkingContextVc, ChunkingType, ChunkingTypeOptionVc, }, ident::AssetIdentVc, reference::{AssetReference, AssetReferenceVc, AssetReferencesVc}, @@ -57,10 +57,17 @@ impl Asset for WithClientChunksAsset { #[turbo_tasks::value_impl] impl ChunkableAsset for WithClientChunksAsset { #[turbo_tasks::function] - fn as_chunk(self_vc: WithClientChunksAssetVc, context: ChunkingContextVc) -> ChunkVc { + fn as_chunk( + self_vc: WithClientChunksAssetVc, + context: ChunkingContextVc, + available_assets: Option, + current_availability_root: Option, + ) -> ChunkVc { EcmascriptChunkVc::new( context.with_layer("rsc"), self_vc.as_ecmascript_chunk_placeable(), + available_assets, + current_availability_root, ) .into() } @@ -104,7 +111,7 @@ impl EcmascriptChunkItem for WithClientChunksChunkItem { #[turbo_tasks::function] async fn content(&self) -> Result { let inner = self.inner.await?; - let group = ChunkGroupVc::from_asset(inner.asset.into(), self.context); + let group = ChunkGroupVc::from_asset(inner.asset.into(), self.context, None, None); let chunks = group.chunks().await?; let server_root = inner.server_root.await?; diff --git a/crates/next-core/src/web_entry_source.rs b/crates/next-core/src/web_entry_source.rs index 51fc056303446..3c02c3c272566 100644 --- a/crates/next-core/src/web_entry_source.rs +++ b/crates/next-core/src/web_entry_source.rs @@ -80,9 +80,11 @@ pub async fn create_web_entry_source( } else if let Some(chunkable) = ChunkableAssetVc::resolve_from(module).await? { // TODO this is missing runtime code, so it's probably broken and we should also // add an ecmascript chunk with the runtime code - Ok(ChunkGroupVc::from_chunk( - chunkable.as_chunk(chunking_context), - )) + Ok(ChunkGroupVc::from_chunk(chunkable.as_chunk( + chunking_context, + None, + Some(module), + ))) } else { // TODO convert into a serve-able asset Err(anyhow!( diff --git a/crates/turbo-tasks/src/primitives.rs b/crates/turbo-tasks/src/primitives.rs index 125dc54376586..55e9de8f4a186 100644 --- a/crates/turbo-tasks/src/primitives.rs +++ b/crates/turbo-tasks/src/primitives.rs @@ -25,6 +25,14 @@ pub struct U32(u32); #[turbo_tasks::value(transparent)] pub struct U64(u64); +#[turbo_tasks::value_impl] +impl ValueToString for U64 { + #[turbo_tasks::function] + fn to_string(&self) -> StringVc { + StringVc::cell(self.0.to_string()) + } +} + #[turbo_tasks::value(transparent)] pub struct OptionString(Option); diff --git a/crates/turbopack-cli-utils/src/lib.rs b/crates/turbopack-cli-utils/src/lib.rs index b185c55cb1a7a..ddddfe14531db 100644 --- a/crates/turbopack-cli-utils/src/lib.rs +++ b/crates/turbopack-cli-utils/src/lib.rs @@ -1,7 +1,6 @@ #![feature(async_closure)] #![feature(min_specialization)] #![feature(round_char_boundary)] -#![feature(main_separator_str)] pub mod issue; diff --git a/crates/turbopack-core/src/chunk/available_assets.rs b/crates/turbopack-core/src/chunk/available_assets.rs new file mode 100644 index 0000000000000..0ca15fc9dffe0 --- /dev/null +++ b/crates/turbopack-core/src/chunk/available_assets.rs @@ -0,0 +1,78 @@ +use anyhow::Result; +use turbo_tasks::{ + primitives::{BoolVc, U64Vc}, + TryJoinIterExt, ValueToString, +}; +use turbo_tasks_hash::Xxh3Hash64Hasher; + +use crate::asset::{Asset, AssetVc}; + +#[turbo_tasks::value] +pub struct AvailableAssets { + parent: Option, + roots: Vec, +} + +#[turbo_tasks::value_impl] +impl AvailableAssetsVc { + #[turbo_tasks::function] + fn new_normalized(parent: Option, roots: Vec) -> Self { + AvailableAssets { parent, roots }.cell() + } + + #[turbo_tasks::function] + pub fn new(roots: Vec) -> Self { + Self::new_normalized(None, roots) + } + + #[turbo_tasks::function] + pub async fn with_roots(self, roots: Vec) -> Result { + let roots = roots + .into_iter() + .map(|root| async move { Ok((self.includes(root).await?, root)) }) + .try_join() + .await? + .into_iter() + .filter_map(|(included, root)| (!*included).then_some(root)) + .collect(); + Ok(Self::new_normalized(Some(self), roots)) + } + + #[turbo_tasks::function] + pub async fn hash(self) -> Result { + let this = self.await?; + let mut hasher = Xxh3Hash64Hasher::new(); + if let Some(parent) = this.parent { + hasher.write_value(parent.hash().await?); + } + for root in &this.roots { + hasher.write_value(root.ident().to_string().await?); + } + Ok(U64Vc::cell(hasher.finish())) + } + + #[turbo_tasks::function] + pub async fn includes(self, asset: AssetVc) -> Result { + let this = self.await?; + if let Some(parent) = this.parent { + if *parent.includes(asset).await? { + return Ok(BoolVc::cell(true)); + } + } + // TODO implement + Ok(BoolVc::cell(false)) + } +} + +impl AvailableAssetsVc { + pub fn from(parent: Option, root: Option) -> Option { + let Some(root) = root else { + return parent; + }; + if let Some(parent) = parent { + Some(parent.with_roots(vec![root])) + } else { + Some(Self::new(vec![root])) + } + } +} diff --git a/crates/turbopack-core/src/chunk/mod.rs b/crates/turbopack-core/src/chunk/mod.rs index e5594310357b0..86d45962ecad4 100644 --- a/crates/turbopack-core/src/chunk/mod.rs +++ b/crates/turbopack-core/src/chunk/mod.rs @@ -1,3 +1,4 @@ +pub mod available_assets; pub mod chunk_in_group; pub mod dev; pub(crate) mod list; @@ -26,7 +27,9 @@ use turbo_tasks_fs::FileSystemPathVc; use turbo_tasks_hash::DeterministicHash; pub use self::list::reference::{ChunkListReference, ChunkListReferenceVc}; -use self::{chunk_in_group::ChunkInGroupVc, optimize::optimize}; +use self::{ + available_assets::AvailableAssetsVc, chunk_in_group::ChunkInGroupVc, optimize::optimize, +}; use crate::{ asset::{Asset, AssetVc, AssetsVc}, environment::EnvironmentVc, @@ -107,7 +110,12 @@ pub trait ChunkingContext { /// An [Asset] that can be converted into a [Chunk]. #[turbo_tasks::value_trait] pub trait ChunkableAsset: Asset { - fn as_chunk(&self, context: ChunkingContextVc) -> ChunkVc; + fn as_chunk( + &self, + context: ChunkingContextVc, + available_assets: Option, + current_availability_root: Option, + ) -> ChunkVc; } #[turbo_tasks::value] @@ -122,8 +130,13 @@ pub struct Chunks(Vec); impl ChunkGroupVc { /// Creates a chunk group from an asset as entrypoint #[turbo_tasks::function] - pub fn from_asset(asset: ChunkableAssetVc, context: ChunkingContextVc) -> Self { - Self::from_chunk(asset.as_chunk(context)) + pub fn from_asset( + asset: ChunkableAssetVc, + context: ChunkingContextVc, + available_asset: Option, + current_availability_root: Option, + ) -> Self { + Self::from_chunk(asset.as_chunk(context, available_asset, current_availability_root)) } /// Creates a chunk group from an chunk as entrypoint @@ -153,7 +166,7 @@ impl ChunkGroupVc { chunks .await? .iter() - .map(|&chunk| ChunkInGroupVc::new(chunk).as_chunk()) + .map(|&chunk| chunk.in_group(self)) .collect(), ); @@ -226,6 +239,11 @@ pub trait Chunk: Asset { fn path(&self) -> FileSystemPathVc { self.ident().path() } + /// Returns a variant of the chunk which is placed in a certain chunk group. + /// Should return the same chunk type. + fn in_group(&self, _chunk_group: ChunkGroupVc) -> ChunkVc { + ChunkInGroupVc::new(*self).into() + } } /// see [Chunk] for explanation @@ -380,6 +398,8 @@ pub trait FromChunkableAsset: ChunkItem + Sized + Debug { async fn from_async_asset( context: ChunkingContextVc, asset: ChunkableAssetVc, + available_assets: Option, + current_availability_root: Option, ) -> Result>; } @@ -387,24 +407,43 @@ pub async fn chunk_content_split( context: ChunkingContextVc, entry: AssetVc, additional_entries: Option, + available_assets: Option, + current_availability_root: Option, ) -> Result> where I: FromChunkableAsset + Eq + std::hash::Hash + Clone, { - chunk_content_internal_parallel(context, entry, additional_entries, true) - .await - .map(|o| o.unwrap()) + chunk_content_internal_parallel( + context, + entry, + additional_entries, + available_assets, + current_availability_root, + true, + ) + .await + .map(|o| o.unwrap()) } pub async fn chunk_content( context: ChunkingContextVc, entry: AssetVc, additional_entries: Option, + available_assets: Option, + current_availability_root: Option, ) -> Result>> where I: FromChunkableAsset + Eq + std::hash::Hash + Clone, { - chunk_content_internal_parallel(context, entry, additional_entries, false).await + chunk_content_internal_parallel( + context, + entry, + additional_entries, + available_assets, + current_availability_root, + false, + ) + .await } #[derive(Eq, PartialEq, Clone, Hash)] @@ -423,6 +462,8 @@ enum ChunkContentGraphNode { struct ChunkContentContext { chunking_context: ChunkingContextVc, entry: AssetVc, + available_assets: Option, + current_availability_root: Option, split: bool, } @@ -481,7 +522,11 @@ where } } ChunkingType::Parallel => { - let chunk = chunkable_asset.as_chunk(context.chunking_context); + let chunk = chunkable_asset.as_chunk( + context.chunking_context, + context.available_assets, + context.current_availability_root, + ); graph_nodes.push(( Some((asset, chunking_type)), ChunkContentGraphNode::Chunk(chunk), @@ -506,7 +551,11 @@ where } } - let chunk = chunkable_asset.as_chunk(context.chunking_context); + let chunk = chunkable_asset.as_chunk( + context.chunking_context, + context.available_assets, + context.current_availability_root, + ); graph_nodes.push(( Some((asset, chunking_type)), ChunkContentGraphNode::Chunk(chunk), @@ -518,12 +567,19 @@ where ChunkContentGraphNode::AsyncChunkGroup(ChunkGroupVc::from_asset( chunkable_asset, context.chunking_context, + context.available_assets, + context.current_availability_root, )), )); } ChunkingType::SeparateAsync => { - if let Some(manifest_loader_item) = - I::from_async_asset(context.chunking_context, chunkable_asset).await? + if let Some(manifest_loader_item) = I::from_async_asset( + context.chunking_context, + chunkable_asset, + context.available_assets, + context.current_availability_root, + ) + .await? { graph_nodes.push(( Some((asset, chunking_type)), @@ -625,6 +681,8 @@ async fn chunk_content_internal_parallel( chunking_context: ChunkingContextVc, entry: AssetVc, additional_entries: Option, + available_assets: Option, + current_availability_root: Option, split: bool, ) -> Result>> where @@ -654,6 +712,8 @@ where chunking_context, entry, split, + available_assets, + current_availability_root, }; let visit = ChunkContentVisit { diff --git a/crates/turbopack-css/src/asset.rs b/crates/turbopack-css/src/asset.rs index 23e759da2006f..a0a3d78c53cf0 100644 --- a/crates/turbopack-css/src/asset.rs +++ b/crates/turbopack-css/src/asset.rs @@ -11,7 +11,10 @@ use turbo_tasks::{primitives::StringVc, TryJoinIterExt, Value, ValueToString}; use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, - chunk::{ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc}, + chunk::{ + available_assets::AvailableAssetsVc, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + ChunkableAssetVc, ChunkingContextVc, + }, context::AssetContextVc, ident::AssetIdentVc, reference::{AssetReference, AssetReferencesVc}, @@ -115,8 +118,19 @@ impl Asset for CssModuleAsset { #[turbo_tasks::value_impl] impl ChunkableAsset for CssModuleAsset { #[turbo_tasks::function] - fn as_chunk(self_vc: CssModuleAssetVc, context: ChunkingContextVc) -> ChunkVc { - CssChunkVc::new(context, self_vc.into()).into() + fn as_chunk( + self_vc: CssModuleAssetVc, + context: ChunkingContextVc, + available_assets: Option, + current_availability_root: Option, + ) -> ChunkVc { + CssChunkVc::new( + context, + self_vc.into(), + available_assets, + current_availability_root, + ) + .into() } } diff --git a/crates/turbopack-css/src/chunk/mod.rs b/crates/turbopack-css/src/chunk/mod.rs index aa327bccf60bb..284cac6fd2516 100644 --- a/crates/turbopack-css/src/chunk/mod.rs +++ b/crates/turbopack-css/src/chunk/mod.rs @@ -11,6 +11,7 @@ use turbo_tasks_fs::{rope::Rope, File, FileSystemPathOptionVc, FileSystemPathVc} use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ + available_assets::AvailableAssetsVc, chunk_content, chunk_content_split, optimize::{ChunkOptimizerVc, OptimizableChunk, OptimizableChunkVc}, Chunk, ChunkContentResult, ChunkGroupReferenceVc, ChunkGroupVc, ChunkItem, ChunkItemVc, @@ -41,22 +42,41 @@ use crate::{ pub struct CssChunk { context: ChunkingContextVc, main_entries: CssChunkPlaceablesVc, + available_assets: Option, + current_availability_root: Option, } #[turbo_tasks::value_impl] impl CssChunkVc { #[turbo_tasks::function] - pub fn new_normalized(context: ChunkingContextVc, main_entries: CssChunkPlaceablesVc) -> Self { + pub fn new_normalized( + context: ChunkingContextVc, + main_entries: CssChunkPlaceablesVc, + available_assets: Option, + current_availability_root: Option, + ) -> Self { CssChunk { context, main_entries, + available_assets, + current_availability_root, } .cell() } #[turbo_tasks::function] - pub fn new(context: ChunkingContextVc, entry: CssChunkPlaceableVc) -> Self { - Self::new_normalized(context, CssChunkPlaceablesVc::cell(vec![entry])) + pub fn new( + context: ChunkingContextVc, + entry: CssChunkPlaceableVc, + available_assets: Option, + current_availability_root: Option, + ) -> Self { + Self::new_normalized( + context, + CssChunkPlaceablesVc::cell(vec![entry]), + available_assets, + current_availability_root, + ) } /// Return the most specific directory which contains all elements of the @@ -197,12 +217,21 @@ impl From> for CssChunkContentResult { async fn css_chunk_content( context: ChunkingContextVc, entries: CssChunkPlaceablesVc, + available_assets: Option, + current_availability_root: Option, ) -> Result { let entries = entries.await?; let entries = entries.iter().copied(); let contents = entries - .map(|entry| css_chunk_content_single_entry(context, entry)) + .map(|entry| { + css_chunk_content_single_entry( + context, + entry, + available_assets, + current_availability_root, + ) + }) .collect::>(); if contents.len() == 1 { @@ -240,12 +269,29 @@ async fn css_chunk_content( async fn css_chunk_content_single_entry( context: ChunkingContextVc, entry: CssChunkPlaceableVc, + available_assets: Option, + current_availability_root: Option, ) -> Result { let asset = entry.as_asset(); - let res = if let Some(res) = chunk_content::(context, asset, None).await? { + let res = if let Some(res) = chunk_content::( + context, + asset, + None, + available_assets, + current_availability_root, + ) + .await? + { res } else { - chunk_content_split::(context, asset, None).await? + chunk_content_split::( + context, + asset, + None, + available_assets, + current_availability_root, + ) + .await? }; Ok(CssChunkContentResultVc::cell(res.into())) @@ -301,7 +347,13 @@ impl Asset for CssChunk { #[turbo_tasks::function] async fn references(self_vc: CssChunkVc) -> Result { let this = self_vc.await?; - let content = css_chunk_content(this.context, this.main_entries).await?; + let content = css_chunk_content( + this.context, + this.main_entries, + this.available_assets, + this.current_availability_root, + ) + .await?; let mut references = Vec::new(); for r in content.external_asset_references.iter() { references.push(*r); @@ -400,6 +452,8 @@ impl FromChunkableAsset for CssChunkItemVc { async fn from_async_asset( _context: ChunkingContextVc, _asset: ChunkableAssetVc, + _available_assets: Option, + _current_availability_root: Option, ) -> Result> { Ok(None) } @@ -432,7 +486,13 @@ impl Introspectable for CssChunk { let content = content_to_details(self_vc.content()); let mut details = String::new(); let this = self_vc.await?; - let chunk_content = css_chunk_content(this.context, this.main_entries).await?; + let chunk_content = css_chunk_content( + this.context, + this.main_entries, + this.available_assets, + this.current_availability_root, + ) + .await?; details += "Chunk items:\n\n"; for item in chunk_content.chunk_items.iter() { writeln!(details, "- {}", item.asset_ident().to_string().await?)?; diff --git a/crates/turbopack-css/src/chunk/optimize.rs b/crates/turbopack-css/src/chunk/optimize.rs index fac6a583100c3..73018534b5cdf 100644 --- a/crates/turbopack-css/src/chunk/optimize.rs +++ b/crates/turbopack-css/src/chunk/optimize.rs @@ -63,6 +63,8 @@ async fn merge_chunks( Ok(CssChunkVc::new_normalized( first.await?.context, CssChunkPlaceablesVc::cell(main_entries.into_iter().collect()), + first.await?.available_assets, + first.await?.current_availability_root, )) } diff --git a/crates/turbopack-css/src/module_asset.rs b/crates/turbopack-css/src/module_asset.rs index 00dfce1918177..9810d28504b5e 100644 --- a/crates/turbopack-css/src/module_asset.rs +++ b/crates/turbopack-css/src/module_asset.rs @@ -12,9 +12,9 @@ use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetReference, - ChunkableAssetReferenceVc, ChunkableAssetVc, ChunkingContextVc, ChunkingType, - ChunkingTypeOptionVc, + available_assets::AvailableAssetsVc, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + ChunkableAssetReference, ChunkableAssetReferenceVc, ChunkableAssetVc, ChunkingContextVc, + ChunkingType, ChunkingTypeOptionVc, }, context::AssetContextVc, ident::AssetIdentVc, @@ -199,8 +199,19 @@ impl ModuleCssModuleAssetVc { #[turbo_tasks::value_impl] impl ChunkableAsset for ModuleCssModuleAsset { #[turbo_tasks::function] - fn as_chunk(self_vc: ModuleCssModuleAssetVc, context: ChunkingContextVc) -> ChunkVc { - EcmascriptChunkVc::new(context, self_vc.into()).into() + fn as_chunk( + self_vc: ModuleCssModuleAssetVc, + context: ChunkingContextVc, + available_assets: Option, + current_availability_root: Option, + ) -> ChunkVc { + EcmascriptChunkVc::new( + context, + self_vc.into(), + available_assets, + current_availability_root, + ) + .into() } } @@ -442,8 +453,19 @@ impl Asset for CssProxyModuleAsset { #[turbo_tasks::value_impl] impl ChunkableAsset for CssProxyModuleAsset { #[turbo_tasks::function] - fn as_chunk(self_vc: CssProxyModuleAssetVc, context: ChunkingContextVc) -> ChunkVc { - CssChunkVc::new(context, self_vc.into()).into() + fn as_chunk( + self_vc: CssProxyModuleAssetVc, + context: ChunkingContextVc, + available_assets: Option, + current_availability_root: Option, + ) -> ChunkVc { + CssChunkVc::new( + context, + self_vc.into(), + available_assets, + current_availability_root, + ) + .into() } } diff --git a/crates/turbopack-ecmascript/src/chunk/content.rs b/crates/turbopack-ecmascript/src/chunk/content.rs index b094fede660b9..9e9def194c1d8 100644 --- a/crates/turbopack-ecmascript/src/chunk/content.rs +++ b/crates/turbopack-ecmascript/src/chunk/content.rs @@ -6,10 +6,10 @@ use indoc::{indoc, writedoc}; use turbo_tasks::TryJoinIterExt; use turbo_tasks_fs::{embed_file, File, FileContent, FileSystemPathReadRef, FileSystemPathVc}; use turbopack_core::{ - asset::AssetContentVc, + asset::{AssetContentVc, AssetVc}, chunk::{ - chunk_content, chunk_content_split, ChunkContentResult, ChunkGroupVc, ChunkVc, - ChunkingContext, ChunkingContextVc, ModuleId, + available_assets::AvailableAssetsVc, chunk_content, chunk_content_split, + ChunkContentResult, ChunkGroupVc, ChunkVc, ChunkingContext, ChunkingContextVc, ModuleId, }, code_builder::{CodeBuilder, CodeVc}, environment::{ChunkLoading, EnvironmentVc}, @@ -64,10 +64,22 @@ pub(crate) fn ecmascript_chunk_content( context: ChunkingContextVc, main_entries: EcmascriptChunkPlaceablesVc, omit_entries: Option, + available_assets: Option, + current_availability_root: Option, ) -> EcmascriptChunkContentResultVc { - let mut chunk_content = ecmascript_chunk_content_internal(context, main_entries); + let mut chunk_content = ecmascript_chunk_content_internal( + context, + main_entries, + available_assets, + current_availability_root, + ); if let Some(omit_entries) = omit_entries { - let omit_chunk_content = ecmascript_chunk_content_internal(context, omit_entries); + let omit_chunk_content = ecmascript_chunk_content_internal( + context, + omit_entries, + available_assets, + current_availability_root, + ); chunk_content = chunk_content.filter(omit_chunk_content); } chunk_content @@ -77,12 +89,21 @@ pub(crate) fn ecmascript_chunk_content( async fn ecmascript_chunk_content_internal( context: ChunkingContextVc, entries: EcmascriptChunkPlaceablesVc, + available_assets: Option, + current_availability_root: Option, ) -> Result { let entries = entries.await?; let entries = entries.iter().copied(); let contents = entries - .map(|entry| ecmascript_chunk_content_single_entry(context, entry)) + .map(|entry| { + ecmascript_chunk_content_single_entry( + context, + entry, + available_assets, + current_availability_root, + ) + }) .collect::>(); if contents.len() == 1 { @@ -124,14 +145,31 @@ async fn ecmascript_chunk_content_internal( async fn ecmascript_chunk_content_single_entry( context: ChunkingContextVc, entry: EcmascriptChunkPlaceableVc, + available_assets: Option, + current_availability_root: Option, ) -> Result { let asset = entry.as_asset(); Ok(EcmascriptChunkContentResultVc::cell( - if let Some(res) = chunk_content::(context, asset, None).await? { + if let Some(res) = chunk_content::( + context, + asset, + None, + available_assets, + current_availability_root, + ) + .await? + { res } else { - chunk_content_split::(context, asset, None).await? + chunk_content_split::( + context, + asset, + None, + available_assets, + current_availability_root, + ) + .await? } .into(), )) @@ -155,10 +193,18 @@ impl EcmascriptChunkContentVc { omit_entries: Option, chunk_path: FileSystemPathVc, evaluate: Option, + available_assets: Option, + current_availability_root: Option, ) -> Result { // TODO(alexkirsz) All of this should be done in a transition, otherwise we run // the risks of values not being strongly consistent with each other. - let chunk_content = ecmascript_chunk_content(context, main_entries, omit_entries); + let chunk_content = ecmascript_chunk_content( + context, + main_entries, + omit_entries, + available_assets, + current_availability_root, + ); let chunk_content = chunk_content.await?; let chunk_path = chunk_path.await?; let module_factories = chunk_content.chunk_items.to_entry_snapshot().await?; diff --git a/crates/turbopack-ecmascript/src/chunk/item.rs b/crates/turbopack-ecmascript/src/chunk/item.rs index 58a17c2f4c14b..182971245393d 100644 --- a/crates/turbopack-ecmascript/src/chunk/item.rs +++ b/crates/turbopack-ecmascript/src/chunk/item.rs @@ -6,7 +6,8 @@ use turbo_tasks_fs::rope::Rope; use turbopack_core::{ asset::AssetVc, chunk::{ - ChunkItem, ChunkItemVc, ChunkableAssetVc, ChunkingContextVc, FromChunkableAsset, ModuleIdVc, + available_assets::AvailableAssetsVc, ChunkItem, ChunkItemVc, ChunkableAssetVc, + ChunkingContextVc, FromChunkableAsset, ModuleIdVc, }, }; @@ -60,9 +61,19 @@ impl FromChunkableAsset for EcmascriptChunkItemVc { async fn from_async_asset( context: ChunkingContextVc, asset: ChunkableAssetVc, + available_assets: Option, + current_availability_root: Option, ) -> Result> { - let chunk = ManifestChunkAssetVc::new(asset, context); - Ok(Some(ManifestLoaderItemVc::new(context, chunk).into())) + let next_available_assets = if let Some(next_available_assets) = + AvailableAssetsVc::from(available_assets, current_availability_root) + { + Some(next_available_assets.resolve().await?) + } else { + None + }; + let manifest_asset = ManifestChunkAssetVc::new(asset, context, next_available_assets); + let manifest_loader = ManifestLoaderItemVc::new(manifest_asset); + Ok(Some(manifest_loader.into())) } } diff --git a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs index 7a6e1553bd06d..fbb10d794d4af 100644 --- a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs +++ b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs @@ -1,10 +1,12 @@ use anyhow::Result; use turbo_tasks::{primitives::StringVc, ValueToString, ValueToStringVc}; +use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - ChunkGroupVc, ChunkVc, ChunkableAsset, ChunkableAssetReference, ChunkableAssetReferenceVc, - ChunkableAssetVc, ChunkingContextVc, ChunkingType, ChunkingTypeOptionVc, + available_assets::AvailableAssetsVc, ChunkGroupVc, ChunkVc, ChunkableAsset, + ChunkableAssetReference, ChunkableAssetReferenceVc, ChunkableAssetVc, ChunkingContext, + ChunkingContextVc, ChunkingType, ChunkingTypeOptionVc, }, ident::AssetIdentVc, reference::{AssetReference, AssetReferenceVc, AssetReferencesVc}, @@ -26,6 +28,11 @@ fn modifier() -> StringVc { StringVc::cell("manifest chunk".to_string()) } +#[turbo_tasks::function] +fn chunk_list_modifier() -> StringVc { + StringVc::cell("chunks list".to_string()) +} + /// The manifest chunk is deferred until requested by the manifest loader /// item when the dynamic `import()` expression is reached. Its responsibility /// is to generate a Promise that will resolve only after all the necessary @@ -40,22 +47,57 @@ fn modifier() -> StringVc { pub struct ManifestChunkAsset { pub asset: ChunkableAssetVc, pub chunking_context: ChunkingContextVc, + pub available_assets: Option, } #[turbo_tasks::value_impl] impl ManifestChunkAssetVc { #[turbo_tasks::function] - pub fn new(asset: ChunkableAssetVc, chunking_context: ChunkingContextVc) -> Self { + pub fn new( + asset: ChunkableAssetVc, + chunking_context: ChunkingContextVc, + available_assets: Option, + ) -> Self { Self::cell(ManifestChunkAsset { asset, chunking_context, + available_assets, }) } #[turbo_tasks::function] pub(super) async fn chunk_group(self) -> Result { let this = self.await?; - Ok(ChunkGroupVc::from_asset(this.asset, this.chunking_context)) + Ok(ChunkGroupVc::from_asset( + this.asset, + this.chunking_context, + this.available_assets, + Some(this.asset.as_asset()), + )) + } + + #[turbo_tasks::function] + pub(super) async fn chunk_list_path(self) -> Result { + let this = &*self.await?; + Ok(this.chunking_context.chunk_list_path(self.ident())) + } + + #[turbo_tasks::function] + pub async fn manifest_chunk(self) -> Result { + let this = self.await?; + Ok(self.as_chunk( + this.chunking_context, + this.available_assets, + Some(self.as_asset()), + )) + } + + #[turbo_tasks::function] + async fn chunks_list_path(self) -> Result { + Ok(self + .await? + .chunking_context + .chunk_path(self.ident().with_modifier(chunk_list_modifier()), ".json")) } } @@ -80,8 +122,19 @@ impl Asset for ManifestChunkAsset { #[turbo_tasks::value_impl] impl ChunkableAsset for ManifestChunkAsset { #[turbo_tasks::function] - fn as_chunk(self_vc: ManifestChunkAssetVc, context: ChunkingContextVc) -> ChunkVc { - EcmascriptChunkVc::new(context, self_vc.into()).into() + fn as_chunk( + self_vc: ManifestChunkAssetVc, + context: ChunkingContextVc, + available_assets: Option, + current_availability_root: Option, + ) -> ChunkVc { + EcmascriptChunkVc::new( + context, + self_vc.into(), + available_assets, + current_availability_root, + ) + .into() } } diff --git a/crates/turbopack-ecmascript/src/chunk/manifest/loader_item.rs b/crates/turbopack-ecmascript/src/chunk/manifest/loader_item.rs index b4d4f3ded8ce0..b2f1ccaa558c8 100644 --- a/crates/turbopack-ecmascript/src/chunk/manifest/loader_item.rs +++ b/crates/turbopack-ecmascript/src/chunk/manifest/loader_item.rs @@ -3,12 +3,10 @@ use std::io::Write as _; use anyhow::{anyhow, bail, Result}; use indoc::writedoc; use turbo_tasks::{primitives::StringVc, ValueToString}; -use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::Asset, chunk::{ - Chunk, ChunkItem, ChunkItemVc, ChunkListReferenceVc, ChunkableAsset, ChunkingContext, - ChunkingContextVc, + Chunk, ChunkItem, ChunkItemVc, ChunkListReferenceVc, ChunkingContext, ChunkingContextVc, }, ident::AssetIdentVc, reference::AssetReferencesVc, @@ -45,21 +43,14 @@ fn modifier() -> StringVc { /// import appears in. #[turbo_tasks::value] pub struct ManifestLoaderItem { - context: ChunkingContextVc, manifest: ManifestChunkAssetVc, } #[turbo_tasks::value_impl] impl ManifestLoaderItemVc { #[turbo_tasks::function] - pub fn new(context: ChunkingContextVc, manifest: ManifestChunkAssetVc) -> Self { - Self::cell(ManifestLoaderItem { context, manifest }) - } - - #[turbo_tasks::function] - async fn chunk_list_path(self) -> Result { - let this = &*self.await?; - Ok(this.context.chunk_list_path(this.manifest.ident())) + pub fn new(manifest: ManifestChunkAssetVc) -> Self { + Self::cell(ManifestLoaderItem { manifest }) } } @@ -81,9 +72,9 @@ impl ChunkItem for ManifestLoaderItem { .into(), // This creates the chunk list corresponding to the manifest chunk's chunk group. ChunkListReferenceVc::new( - this.context.output_root(), + this.manifest.await?.chunking_context.output_root(), this.manifest.chunk_group(), - self_vc.chunk_list_path(), + this.manifest.chunk_list_path(), ) .into(), ])) @@ -93,8 +84,8 @@ impl ChunkItem for ManifestLoaderItem { #[turbo_tasks::value_impl] impl EcmascriptChunkItem for ManifestLoaderItem { #[turbo_tasks::function] - fn chunking_context(&self) -> ChunkingContextVc { - self.context + async fn chunking_context(&self) -> Result { + Ok(self.manifest.await?.chunking_context) } #[turbo_tasks::function] @@ -104,10 +95,10 @@ impl EcmascriptChunkItem for ManifestLoaderItem { let manifest = this.manifest.await?; let asset = manifest.asset.as_asset(); - let chunk = this.manifest.as_chunk(this.context); + let chunk = this.manifest.manifest_chunk(); let chunk_path = &*chunk.path().await?; - let output_root = this.context.output_root().await?; + let output_root = manifest.chunking_context.output_root().await?; // We need several items in order for a dynamic import to fully load. First, we // need the chunk path of the manifest chunk, relative from the output root. The @@ -119,20 +110,27 @@ impl EcmascriptChunkItem for ManifestLoaderItem { bail!( "chunk path {} is not in output root {}", chunk.path().to_string().await?, - this.context.output_root().to_string().await? + manifest.chunking_context.output_root().to_string().await? ); }; // We also need the manifest chunk item's id, which points to a CJS module that // exports a promise for all of the necessary chunk loads. - let item_id = &*this.manifest.as_chunk_item(this.context).id().await?; + let item_id = &*this + .manifest + .as_chunk_item(manifest.chunking_context) + .id() + .await?; // Finally, we need the id of the module that we're actually trying to // dynamically import. let placeable = EcmascriptChunkPlaceableVc::resolve_from(asset) .await? .ok_or_else(|| anyhow!("asset is not placeable in ecmascript chunk"))?; - let dynamic_id = &*placeable.as_chunk_item(this.context).id().await?; + let dynamic_id = &*placeable + .as_chunk_item(manifest.chunking_context) + .id() + .await?; // This is the code that will be executed when the dynamic import is reached. // It will load the manifest chunk, which will load all the chunks needed by @@ -159,7 +157,7 @@ impl EcmascriptChunkItem for ManifestLoaderItem { dynamic_id = stringify_js(dynamic_id), chunk_list_path = stringify_js( output_root - .get_path_to(&*self_vc.chunk_list_path().await?) + .get_path_to(&*this.manifest.chunk_list_path().await?) .ok_or(anyhow!("chunk list path is not in output root"))? ) )?; diff --git a/crates/turbopack-ecmascript/src/chunk/mod.rs b/crates/turbopack-ecmascript/src/chunk/mod.rs index 76a7f742a810e..4c7f9e9b70b12 100644 --- a/crates/turbopack-ecmascript/src/chunk/mod.rs +++ b/crates/turbopack-ecmascript/src/chunk/mod.rs @@ -24,6 +24,7 @@ use turbo_tasks_fs::FileSystemPathOptionVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ + available_assets::AvailableAssetsVc, optimize::{ChunkOptimizerVc, OptimizableChunk, OptimizableChunkVc}, Chunk, ChunkGroupReferenceVc, ChunkGroupVc, ChunkItem, ChunkListReferenceVc, ChunkReferenceVc, ChunkVc, ChunkingContext, ChunkingContextVc, @@ -62,6 +63,8 @@ pub struct EcmascriptChunk { main_entries: EcmascriptChunkPlaceablesVc, omit_entries: Option, evaluate: Option, + available_assets: Option, + current_availability_root: Option, } #[turbo_tasks::value_impl] @@ -72,23 +75,34 @@ impl EcmascriptChunkVc { main_entries: EcmascriptChunkPlaceablesVc, omit_entries: Option, evaluate: Option, + available_assets: Option, + current_availability_root: Option, ) -> Self { EcmascriptChunk { context, main_entries, omit_entries, evaluate, + available_assets, + current_availability_root, } .cell() } #[turbo_tasks::function] - pub fn new(context: ChunkingContextVc, main_entry: EcmascriptChunkPlaceableVc) -> Self { + pub fn new( + context: ChunkingContextVc, + main_entry: EcmascriptChunkPlaceableVc, + available_assets: Option, + current_availability_root: Option, + ) -> Self { Self::new_normalized( context, EcmascriptChunkPlaceablesVc::cell(vec![main_entry]), None, None, + available_assets, + current_availability_root, ) } @@ -116,6 +130,8 @@ impl EcmascriptChunkVc { } .cell(), ), + None, + Some(main_entry.as_asset()), )) } @@ -154,8 +170,20 @@ impl EcmascriptChunkVc { let a = left.await?; let b = right.await?; - let a = ecmascript_chunk_content(a.context, a.main_entries, a.omit_entries); - let b = ecmascript_chunk_content(b.context, b.main_entries, b.omit_entries); + let a = ecmascript_chunk_content( + a.context, + a.main_entries, + a.omit_entries, + a.available_assets, + a.current_availability_root, + ); + let b = ecmascript_chunk_content( + b.context, + b.main_entries, + b.omit_entries, + b.available_assets, + b.current_availability_root, + ); let a = a.await?.chunk_items.to_set(); let b = b.await?.chunk_items.to_set(); @@ -263,6 +291,8 @@ impl EcmascriptChunkVc { this.context, this.main_entries, this.omit_entries, + this.available_assets, + this.current_availability_root, )) } @@ -295,6 +325,8 @@ impl EcmascriptChunkVc { this.omit_entries, chunk_path, evaluate, + this.available_assets, + this.current_availability_root, ); Ok(content) } @@ -336,6 +368,20 @@ impl Asset for EcmascriptChunk { } } + // Current availability root is included + if let Some(current_availability_root) = this.current_availability_root { + let ident = current_availability_root.ident(); + let need_root = if let [(_, main_entry)] = &assets[..] { + main_entry.resolve().await? != ident.resolve().await? + } else { + false + }; + if need_root { + let availability_root_key = StringVc::cell("current_availability_root".to_string()); + assets.push((availability_root_key, ident)); + } + } + // Evaluate info is included let mut modifiers = Vec::new(); if let Some(evaluate) = this.evaluate { @@ -357,6 +403,11 @@ impl Asset for EcmascriptChunk { modifiers.extend(evaluate.entry_modules_ids.iter().map(|id| id.to_string())); } + // Available assets are include + if let Some(available_assets) = this.available_assets { + modifiers.push(available_assets.hash().to_string()); + } + // Simplify when it's only a single main entry without extra info let ident = if assets.len() == 1 && modifiers.is_empty() { assets[0].1 @@ -383,8 +434,14 @@ impl Asset for EcmascriptChunk { #[turbo_tasks::function] async fn references(self_vc: EcmascriptChunkVc) -> Result { let this = self_vc.await?; - let content = - ecmascript_chunk_content(this.context, this.main_entries, this.omit_entries).await?; + let content = ecmascript_chunk_content( + this.context, + this.main_entries, + this.omit_entries, + this.available_assets, + this.current_availability_root, + ) + .await?; let mut references = Vec::new(); for r in content.external_asset_references.iter() { references.push(*r); @@ -452,8 +509,14 @@ impl Introspectable for EcmascriptChunk { let content = content_to_details(self_vc.content()); let mut details = String::new(); let this = self_vc.await?; - let chunk_content = - ecmascript_chunk_content(this.context, this.main_entries, this.omit_entries).await?; + let chunk_content = ecmascript_chunk_content( + this.context, + this.main_entries, + this.omit_entries, + this.available_assets, + this.current_availability_root, + ) + .await?; let chunk_items = chunk_content.chunk_items.await?; details += "Chunk items:\n\n"; for chunk in chunk_items.iter() { diff --git a/crates/turbopack-ecmascript/src/chunk/optimize.rs b/crates/turbopack-ecmascript/src/chunk/optimize.rs index 19725d67878f2..3ec3648322e27 100644 --- a/crates/turbopack-ecmascript/src/chunk/optimize.rs +++ b/crates/turbopack-ecmascript/src/chunk/optimize.rs @@ -63,11 +63,14 @@ async fn merge_chunks( .flat_map(|e| e.iter().copied()) .collect::>(); let evaluate = chunks.iter().find_map(|e| e.evaluate); + let first = first.await?; Ok(EcmascriptChunkVc::new_normalized( - first.await?.context, + first.context, EcmascriptChunkPlaceablesVc::cell(main_entries.into_iter().collect()), None, evaluate, + first.available_assets, + first.current_availability_root, )) } @@ -403,6 +406,8 @@ async fn optimize_ecmascript( } .cell(), ), + content.available_assets, + content.current_availability_root, ) } } diff --git a/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs b/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs index 6fd59285a043e..1bec365164d02 100644 --- a/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs +++ b/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs @@ -4,8 +4,9 @@ use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc, ChunkReferenceVc, ChunkVc, ChunkableAsset, - ChunkableAssetVc, ChunkingContext, ChunkingContextVc, + available_assets::AvailableAssetsVc, Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc, + ChunkReferenceVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContext, + ChunkingContextVc, }, ident::AssetIdentVc, reference::AssetReferencesVc, @@ -48,7 +49,7 @@ impl ChunkGroupFilesAssetVc { ecma.as_evaluated_chunk(this.chunking_context, this.runtime_entries), ) } else { - ChunkGroupVc::from_asset(this.asset, this.chunking_context) + ChunkGroupVc::from_asset(this.asset, this.chunking_context, None, None) }; Ok(chunk_group) } @@ -81,8 +82,19 @@ impl Asset for ChunkGroupFilesAsset { #[turbo_tasks::value_impl] impl ChunkableAsset for ChunkGroupFilesAsset { #[turbo_tasks::function] - fn as_chunk(self_vc: ChunkGroupFilesAssetVc, context: ChunkingContextVc) -> ChunkVc { - EcmascriptChunkVc::new(context, self_vc.as_ecmascript_chunk_placeable()).into() + fn as_chunk( + self_vc: ChunkGroupFilesAssetVc, + context: ChunkingContextVc, + available_assets: Option, + current_availability_root: Option, + ) -> ChunkVc { + EcmascriptChunkVc::new( + context, + self_vc.as_ecmascript_chunk_placeable(), + available_assets, + current_availability_root, + ) + .into() } } @@ -97,7 +109,7 @@ impl EcmascriptChunkPlaceable for ChunkGroupFilesAsset { Ok(ChunkGroupFilesChunkItem { context, inner: self_vc, - chunk: this.asset.as_chunk(context), + chunk: this.asset.as_chunk(context, None, Some(this.asset.into())), } .cell() .into()) diff --git a/crates/turbopack-ecmascript/src/lib.rs b/crates/turbopack-ecmascript/src/lib.rs index c59d04771fa4c..81cc1952bbe9e 100644 --- a/crates/turbopack-ecmascript/src/lib.rs +++ b/crates/turbopack-ecmascript/src/lib.rs @@ -46,7 +46,10 @@ use turbo_tasks::{primitives::StringVc, TryJoinIterExt, Value, ValueToString}; use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetOptionVc, AssetVc}, - chunk::{ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc}, + chunk::{ + available_assets::AvailableAssetsVc, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + ChunkableAssetVc, ChunkingContextVc, + }, compile_time_info::CompileTimeInfoVc, context::AssetContextVc, ident::AssetIdentVc, @@ -205,8 +208,19 @@ impl Asset for EcmascriptModuleAsset { #[turbo_tasks::value_impl] impl ChunkableAsset for EcmascriptModuleAsset { #[turbo_tasks::function] - fn as_chunk(self_vc: EcmascriptModuleAssetVc, context: ChunkingContextVc) -> ChunkVc { - EcmascriptChunkVc::new(context, self_vc.as_ecmascript_chunk_placeable()).into() + fn as_chunk( + self_vc: EcmascriptModuleAssetVc, + context: ChunkingContextVc, + available_assets: Option, + current_availability_root: Option, + ) -> ChunkVc { + EcmascriptChunkVc::new( + context, + self_vc.as_ecmascript_chunk_placeable(), + available_assets, + current_availability_root, + ) + .into() } } diff --git a/crates/turbopack-ecmascript/src/references/pattern_mapping.rs b/crates/turbopack-ecmascript/src/references/pattern_mapping.rs index 0ee25bd0edc63..bc58fc2a5aadc 100644 --- a/crates/turbopack-ecmascript/src/references/pattern_mapping.rs +++ b/crates/turbopack-ecmascript/src/references/pattern_mapping.rs @@ -157,8 +157,11 @@ impl PatternMappingVc { if let Some(chunkable) = ChunkableAssetVc::resolve_from(asset).await? { if *resolve_type == ResolveType::EsmAsync { + // Passing no available_assets and no current_availability_root works here + // because the manifest loader has an id that is independent of them. So luckily + // we don't need chunk dependenent code generation. if let Some(loader) = - EcmascriptChunkItemVc::from_async_asset(context, chunkable).await? + EcmascriptChunkItemVc::from_async_asset(context, chunkable, None, None).await? { return Ok(PatternMappingVc::cell(PatternMapping::Single( loader.id().await?.clone_value(), diff --git a/crates/turbopack-env/src/asset.rs b/crates/turbopack-env/src/asset.rs index 56cc3f299f005..dc924af7837b2 100644 --- a/crates/turbopack-env/src/asset.rs +++ b/crates/turbopack-env/src/asset.rs @@ -5,7 +5,10 @@ use turbo_tasks_env::{ProcessEnv, ProcessEnvVc}; use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, - chunk::{ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc}, + chunk::{ + available_assets::AvailableAssetsVc, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + ChunkableAssetVc, ChunkingContextVc, + }, ident::AssetIdentVc, reference::AssetReferencesVc, }; @@ -58,8 +61,19 @@ impl Asset for ProcessEnvAsset { #[turbo_tasks::value_impl] impl ChunkableAsset for ProcessEnvAsset { #[turbo_tasks::function] - fn as_chunk(self_vc: ProcessEnvAssetVc, context: ChunkingContextVc) -> ChunkVc { - EcmascriptChunkVc::new(context, self_vc.into()).into() + fn as_chunk( + self_vc: ProcessEnvAssetVc, + context: ChunkingContextVc, + available_assets: Option, + current_availability_root: Option, + ) -> ChunkVc { + EcmascriptChunkVc::new( + context, + self_vc.into(), + available_assets, + current_availability_root, + ) + .into() } } diff --git a/crates/turbopack-json/src/lib.rs b/crates/turbopack-json/src/lib.rs index e4d7fc68aa3dc..3436cff6f23db 100644 --- a/crates/turbopack-json/src/lib.rs +++ b/crates/turbopack-json/src/lib.rs @@ -14,7 +14,10 @@ use turbo_tasks::{primitives::StringVc, ValueToString}; use turbo_tasks_fs::{FileContent, FileJsonContent}; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, - chunk::{ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc}, + chunk::{ + available_assets::AvailableAssetsVc, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + ChunkableAssetVc, ChunkingContextVc, + }, ident::AssetIdentVc, reference::AssetReferencesVc, }; @@ -58,8 +61,19 @@ impl Asset for JsonModuleAsset { #[turbo_tasks::value_impl] impl ChunkableAsset for JsonModuleAsset { #[turbo_tasks::function] - fn as_chunk(self_vc: JsonModuleAssetVc, context: ChunkingContextVc) -> ChunkVc { - EcmascriptChunkVc::new(context, self_vc.as_ecmascript_chunk_placeable()).into() + fn as_chunk( + self_vc: JsonModuleAssetVc, + context: ChunkingContextVc, + available_assets: Option, + current_availability_root: Option, + ) -> ChunkVc { + EcmascriptChunkVc::new( + context, + self_vc.as_ecmascript_chunk_placeable(), + available_assets, + current_availability_root, + ) + .into() } } diff --git a/crates/turbopack-mdx/src/lib.rs b/crates/turbopack-mdx/src/lib.rs index ce1508d44a0fa..a04ad99cacde9 100644 --- a/crates/turbopack-mdx/src/lib.rs +++ b/crates/turbopack-mdx/src/lib.rs @@ -6,7 +6,10 @@ use turbo_tasks::{primitives::StringVc, Value}; use turbo_tasks_fs::{rope::Rope, File, FileContent, FileSystemPathVc}; use turbopack_core::{ asset::{Asset, AssetContent, AssetContentVc, AssetVc}, - chunk::{ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc}, + chunk::{ + available_assets::AvailableAssetsVc, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + ChunkableAssetVc, ChunkingContextVc, + }, context::{AssetContext, AssetContextVc}, ident::AssetIdentVc, reference::AssetReferencesVc, @@ -114,8 +117,19 @@ impl Asset for MdxModuleAsset { #[turbo_tasks::value_impl] impl ChunkableAsset for MdxModuleAsset { #[turbo_tasks::function] - fn as_chunk(self_vc: MdxModuleAssetVc, context: ChunkingContextVc) -> ChunkVc { - EcmascriptChunkVc::new(context, self_vc.as_ecmascript_chunk_placeable()).into() + fn as_chunk( + self_vc: MdxModuleAssetVc, + context: ChunkingContextVc, + available_assets: Option, + current_availability_root: Option, + ) -> ChunkVc { + EcmascriptChunkVc::new( + context, + self_vc.as_ecmascript_chunk_placeable(), + available_assets, + current_availability_root, + ) + .into() } } diff --git a/crates/turbopack-static/src/lib.rs b/crates/turbopack-static/src/lib.rs index cc91cd006a99b..bbc334c676e0f 100644 --- a/crates/turbopack-static/src/lib.rs +++ b/crates/turbopack-static/src/lib.rs @@ -16,8 +16,8 @@ use turbo_tasks_fs::FileContent; use turbopack_core::{ asset::{Asset, AssetContent, AssetContentVc, AssetVc}, chunk::{ - ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContext, - ChunkingContextVc, + available_assets::AvailableAssetsVc, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + ChunkableAssetVc, ChunkingContext, ChunkingContextVc, }, context::AssetContextVc, ident::AssetIdentVc, @@ -80,8 +80,19 @@ impl Asset for StaticModuleAsset { #[turbo_tasks::value_impl] impl ChunkableAsset for StaticModuleAsset { #[turbo_tasks::function] - fn as_chunk(self_vc: StaticModuleAssetVc, context: ChunkingContextVc) -> ChunkVc { - EcmascriptChunkVc::new(context, self_vc.as_ecmascript_chunk_placeable()).into() + fn as_chunk( + self_vc: StaticModuleAssetVc, + context: ChunkingContextVc, + available_assets: Option, + current_availability_root: Option, + ) -> ChunkVc { + EcmascriptChunkVc::new( + context, + self_vc.as_ecmascript_chunk_placeable(), + available_assets, + current_availability_root, + ) + .into() } } diff --git a/crates/turbopack-tests/tests/snapshot.rs b/crates/turbopack-tests/tests/snapshot.rs index c84fd5594c3e2..80119ec5d2b5f 100644 --- a/crates/turbopack-tests/tests/snapshot.rs +++ b/crates/turbopack-tests/tests/snapshot.rs @@ -248,7 +248,7 @@ async fn run_test(resource: String) -> Result { // TODO: Load runtime entries from snapshots Ok(ecmascript.as_evaluated_chunk(chunking_context, runtime_entries)) } else if let Some(chunkable) = ChunkableAssetVc::resolve_from(module).await? { - Ok(chunkable.as_chunk(chunking_context)) + Ok(chunkable.as_chunk(chunking_context, None, Some(chunkable.into()))) } else { // TODO convert into a serve-able asset Err(anyhow!( diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js index 9820516162f14..1c2b150c634ca 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js @@ -1,3 +1,6 @@ import { foo } from "foo"; +import { bar } from "bar"; +import "./shared"; foo(true); +bar(true); diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js index 54e8e7cb28cc2..282fdbc134dd3 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js @@ -1,3 +1,8 @@ +import { bar } from "bar"; +import "./shared"; + +bar(true); + import("./import").then(({ foo }) => { foo(true); }); diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/bar/index.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/bar/index.js new file mode 100644 index 0000000000000..6e9a13a68ba32 --- /dev/null +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/bar/index.js @@ -0,0 +1,3 @@ +export function bar(value) { + console.assert(value); +} diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/bar/package.json b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/bar/package.json new file mode 100644 index 0000000000000..14ab704d8f639 --- /dev/null +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/bar/package.json @@ -0,0 +1,3 @@ +{ + "main": "index.js" +} diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/shared.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/shared.js new file mode 100644 index 0000000000000..645a24a4851fa --- /dev/null +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/shared.js @@ -0,0 +1 @@ +// shared package diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_309a59.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_309a59.js new file mode 100644 index 0000000000000..b3586ffe6e0da --- /dev/null +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_309a59.js @@ -0,0 +1,16 @@ +(self.TURBOPACK = self.TURBOPACK || []).push(["output/20803_bar_index_309a59.js", { + +"[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/bar/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { + +__turbopack_esm__({ + "bar": ()=>bar +}); +function bar(value) { + console.assert(value); +} + +})()), +}]); + + +//# sourceMappingURL=20803_bar_index_309a59.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_309a59.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_309a59.js.map new file mode 100644 index 0000000000000..3de783a7ae6c8 --- /dev/null +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_309a59.js.map @@ -0,0 +1,6 @@ +{ + "version": 3, + "sections": [ + {"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":["/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/bar/index.js"],"sourcesContent":["export function bar(value) {\n console.assert(value);\n}\n"],"names":[],"mappings":";;;AAAO,SAAS,IAAI,KAAK,EAAE;IACzB,QAAQ,MAAM,CAAC;AACjB"}}, + {"offset": {"line": 10, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}] +} \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_b2b240.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_b2b240.js new file mode 100644 index 0000000000000..7398492e65b4f --- /dev/null +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_b2b240.js @@ -0,0 +1,16 @@ +(self.TURBOPACK = self.TURBOPACK || []).push(["output/20803_bar_index_b2b240.js", { + +"[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/bar/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { + +__turbopack_esm__({ + "bar": ()=>bar +}); +function bar(value) { + console.assert(value); +} + +})()), +}]); + + +//# sourceMappingURL=20803_bar_index_b2b240.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_b2b240.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_b2b240.js.map new file mode 100644 index 0000000000000..3de783a7ae6c8 --- /dev/null +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_b2b240.js.map @@ -0,0 +1,6 @@ +{ + "version": 3, + "sections": [ + {"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":["/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/bar/index.js"],"sourcesContent":["export function bar(value) {\n console.assert(value);\n}\n"],"names":[],"mappings":";;;AAAO,SAAS,IAAI,KAAK,EAAE;IACzB,QAAQ,MAAM,CAAC;AACjB"}}, + {"offset": {"line": 10, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}] +} \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index_b32b98.js similarity index 89% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index.js rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index_b32b98.js index 5c8cf0cff709d..89557ccddb622 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index_b32b98.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/20803_foo_index.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/20803_foo_index_b32b98.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/foo/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -13,4 +13,4 @@ function foo(value) { }]); -//# sourceMappingURL=20803_foo_index.js.map \ No newline at end of file +//# sourceMappingURL=20803_foo_index_b32b98.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index_b32b98.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index.js.map rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index_b32b98.js.map diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js deleted file mode 100644 index 4b84efd15d5e0..0000000000000 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js +++ /dev/null @@ -1,14 +0,0 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js", { - -"[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { - -var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$basic$2f$async_chunk$2f$input$2f$node_modules$2f$foo$2f$index$2e$js__$28$ecmascript$29__ = __turbopack_import__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/foo/index.js (ecmascript)"); -"__TURBOPACK__ecmascript__hoisting__location__"; -; -__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$basic$2f$async_chunk$2f$input$2f$node_modules$2f$foo$2f$index$2e$js__$28$ecmascript$29__["foo"](true); - -})()), -}]); - - -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js.map deleted file mode 100644 index 00720e1f4f737..0000000000000 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js.map +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": 3, - "sections": [ - {"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":["/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js"],"sourcesContent":["import { foo } from \"foo\";\n\nfoo(true);\n"],"names":[],"mappings":";;;AAEA,qMAAI,IAAI"}}, - {"offset": {"line": 8, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}] -} \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js new file mode 100644 index 0000000000000..00eb4b60ff1ca --- /dev/null +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js @@ -0,0 +1,23 @@ +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js", { + +"[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/shared.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { + + +}.call(this) }), +"[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { + +var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$basic$2f$async_chunk$2f$input$2f$node_modules$2f$foo$2f$index$2e$js__$28$ecmascript$29__ = __turbopack_import__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/foo/index.js (ecmascript)"); +var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$basic$2f$async_chunk$2f$input$2f$node_modules$2f$bar$2f$index$2e$js__$28$ecmascript$29__ = __turbopack_import__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/bar/index.js (ecmascript)"); +var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$basic$2f$async_chunk$2f$input$2f$shared$2e$js__$28$ecmascript$29__ = __turbopack_import__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/shared.js (ecmascript)"); +"__TURBOPACK__ecmascript__hoisting__location__"; +; +; +; +__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$basic$2f$async_chunk$2f$input$2f$node_modules$2f$foo$2f$index$2e$js__$28$ecmascript$29__["foo"](true); +__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$basic$2f$async_chunk$2f$input$2f$node_modules$2f$bar$2f$index$2e$js__$28$ecmascript$29__["bar"](true); + +})()), +}]); + + +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js.map new file mode 100644 index 0000000000000..8356a671133e3 --- /dev/null +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js.map @@ -0,0 +1,8 @@ +{ + "version": 3, + "sections": [ + {"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":""}}, + {"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}, + {"offset": {"line": 8, "column": 0}, "map": {"version":3,"sources":["/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js"],"sourcesContent":["import { foo } from \"foo\";\nimport { bar } from \"bar\";\nimport \"./shared\";\n\nfoo(true);\nbar(true);\n"],"names":[],"mappings":";;;;;;;AAIA,qMAAI,IAAI;AACR,qMAAI,IAAI"}}, + {"offset": {"line": 17, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}] +} \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_93c5e8.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_bc0725.js similarity index 77% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_93c5e8.js rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_bc0725.js index e38e1d37d0fba..5eb7c77960514 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_93c5e8.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_bc0725.js @@ -1,10 +1,11 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_93c5e8.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_bc0725.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__([ - "output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js", - "output/20803_foo_index.js" + "output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js", + "output/20803_foo_index_b32b98.js", + "output/20803_bar_index_b2b240.js" ]); })()), diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_93c5e8.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_bc0725.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_93c5e8.js.map rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_bc0725.js.map diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js.map deleted file mode 100644 index f8106d6faf06c..0000000000000 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js.map +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": 3, - "sections": [ - {"offset": {"line": 18, "column": 0}, "map": {"version":3,"sources":["/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js"],"sourcesContent":["import(\"./import\").then(({ foo }) => {\n foo(true);\n});\n"],"names":[],"mappings":"AAAA,sKAAmB,IAAI,CAAC,CAAC,EAAE,IAAG,EAAE,GAAK;IACnC,IAAI,IAAI;AACV"}}, - {"offset": {"line": 21, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}] -} \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_da3760.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js similarity index 95% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_da3760.js rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js index 9fdda376a123b..2acd99b5e38a8 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_da3760.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js @@ -1,9 +1,9 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_da3760.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_93c5e8.js").then(() => { + return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js_d744dd._.json", chunks_paths); @@ -14,16 +14,26 @@ __turbopack_export_value__((__turbopack_import__) => { }); })()), -"[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { +"[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/shared.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { + +}.call(this) }), +"[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { + +var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$basic$2f$async_chunk$2f$input$2f$node_modules$2f$bar$2f$index$2e$js__$28$ecmascript$29__ = __turbopack_import__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/bar/index.js (ecmascript)"); +var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$basic$2f$async_chunk$2f$input$2f$shared$2e$js__$28$ecmascript$29__ = __turbopack_import__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/shared.js (ecmascript)"); +"__TURBOPACK__ecmascript__hoisting__location__"; +; +; +__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$basic$2f$async_chunk$2f$input$2f$node_modules$2f$bar$2f$index$2e$js__$28$ecmascript$29__["bar"](true); __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk, loader)")(__turbopack_import__).then(({ foo })=>{ foo(true); }); -}.call(this) }), +})()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js"]); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js") && loadedChunks.has("output/20803_bar_index_309a59.js"))) return true; + registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js","output/20803_bar_index_309a59.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js (ecmascript)"); } ]); @@ -1466,4 +1476,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_da3760.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js.map new file mode 100644 index 0000000000000..7e72211757161 --- /dev/null +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js.map @@ -0,0 +1,8 @@ +{ + "version": 3, + "sections": [ + {"offset": {"line": 18, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":""}}, + {"offset": {"line": 18, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}, + {"offset": {"line": 22, "column": 0}, "map": {"version":3,"sources":["/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js"],"sourcesContent":["import { bar } from \"bar\";\nimport \"./shared\";\n\nbar(true);\n\nimport(\"./import\").then(({ foo }) => {\n foo(true);\n});\n"],"names":[],"mappings":";;;;;AAGA,qMAAI,IAAI;AAER,sKAAmB,IAAI,CAAC,CAAC,EAAE,IAAG,EAAE,GAAK;IACnC,IAAI,IAAI;AACV"}}, + {"offset": {"line": 31, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}] +} \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_da3760.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_da3760.js.map deleted file mode 100644 index f8106d6faf06c..0000000000000 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_da3760.js.map +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": 3, - "sections": [ - {"offset": {"line": 18, "column": 0}, "map": {"version":3,"sources":["/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js"],"sourcesContent":["import(\"./import\").then(({ foo }) => {\n foo(true);\n});\n"],"names":[],"mappings":"AAAA,sKAAmB,IAAI,CAAC,CAAC,EAAE,IAAG,EAAE,GAAK;IACnC,IAAI,IAAI;AACV"}}, - {"offset": {"line": 21, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}] -} \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js similarity index 95% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js index e0b0b4edce2c7..c8b7a7c803272 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js @@ -1,9 +1,9 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_93c5e8.js").then(() => { + return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js_d744dd._.json", chunks_paths); @@ -14,16 +14,26 @@ __turbopack_export_value__((__turbopack_import__) => { }); })()), -"[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { +"[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/shared.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { + +}.call(this) }), +"[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { + +var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$basic$2f$async_chunk$2f$input$2f$node_modules$2f$bar$2f$index$2e$js__$28$ecmascript$29__ = __turbopack_import__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/bar/index.js (ecmascript)"); +var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$basic$2f$async_chunk$2f$input$2f$shared$2e$js__$28$ecmascript$29__ = __turbopack_import__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/shared.js (ecmascript)"); +"__TURBOPACK__ecmascript__hoisting__location__"; +; +; +__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$basic$2f$async_chunk$2f$input$2f$node_modules$2f$bar$2f$index$2e$js__$28$ecmascript$29__["bar"](true); __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk, loader)")(__turbopack_import__).then(({ foo })=>{ foo(true); }); -}.call(this) }), +})()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/20803_bar_index_309a59.js"))) return true; + registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index.js_f5704b._.json", ["output/20803_bar_index_309a59.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js (ecmascript)"); } ]); @@ -1466,4 +1476,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js.map new file mode 100644 index 0000000000000..7e72211757161 --- /dev/null +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js.map @@ -0,0 +1,8 @@ +{ + "version": 3, + "sections": [ + {"offset": {"line": 18, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":""}}, + {"offset": {"line": 18, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}, + {"offset": {"line": 22, "column": 0}, "map": {"version":3,"sources":["/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js"],"sourcesContent":["import { bar } from \"bar\";\nimport \"./shared\";\n\nbar(true);\n\nimport(\"./import\").then(({ foo }) => {\n foo(true);\n});\n"],"names":[],"mappings":";;;;;AAGA,qMAAI,IAAI;AAER,sKAAmB,IAAI,CAAC,CAAC,EAAE,IAAG,EAAE,GAAK;IACnC,IAAI,IAAI;AACV"}}, + {"offset": {"line": 31, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}] +} \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/39e84_foo_index.js b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/39e84_foo_index_a20770.js similarity index 89% rename from crates/turbopack-tests/tests/snapshot/basic/chunked/output/39e84_foo_index.js rename to crates/turbopack-tests/tests/snapshot/basic/chunked/output/39e84_foo_index_a20770.js index f548771395b8c..80678f7cebb5d 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/39e84_foo_index.js +++ b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/39e84_foo_index_a20770.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/39e84_foo_index.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/39e84_foo_index_a20770.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/chunked/input/node_modules/foo/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -13,4 +13,4 @@ function foo(value) { }]); -//# sourceMappingURL=39e84_foo_index.js.map \ No newline at end of file +//# sourceMappingURL=39e84_foo_index_a20770.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/39e84_foo_index.js.map b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/39e84_foo_index_a20770.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/chunked/output/39e84_foo_index.js.map rename to crates/turbopack-tests/tests/snapshot/basic/chunked/output/39e84_foo_index_a20770.js.map diff --git a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_e8535e.js b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_e8535e.js rename to crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js index 5c8ce976d6d6e..0b05bf6d9630c 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_e8535e.js +++ b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_e8535e.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/chunked/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -9,8 +9,8 @@ __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_1d9ecb.js") && loadedChunks.has("output/39e84_foo_index.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_1d9ecb.js","output/39e84_foo_index.js"]); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js") && loadedChunks.has("output/39e84_foo_index_a20770.js"))) return true; + registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js","output/39e84_foo_index_a20770.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/chunked/input/index.js (ecmascript)"); } ]); @@ -1453,4 +1453,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_e8535e.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_1d9ecb.js.map b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_1d9ecb.js.map rename to crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js.map diff --git a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_1d9ecb.js b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_1d9ecb.js rename to crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js index 87538d9dfddf4..eb180e5c3fd21 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_1d9ecb.js +++ b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_1d9ecb.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/chunked/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -9,8 +9,8 @@ __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/39e84_foo_index.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index.js_f5704b._.json", ["output/39e84_foo_index.js"]); + if (!(true && loadedChunks.has("output/39e84_foo_index_a20770.js"))) return true; + registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index.js_f5704b._.json", ["output/39e84_foo_index_a20770.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/chunked/input/index.js (ecmascript)"); } ]); @@ -1453,4 +1453,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_1d9ecb.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_e8535e.js.map b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_e8535e.js.map rename to crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js.map diff --git a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_a8bbcc.js b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_a8bbcc.js rename to crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js index 859359be317e8..46ebc30479eb4 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_a8bbcc.js +++ b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_a8bbcc.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/shebang/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -9,8 +9,8 @@ __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_718090.js") && loadedChunks.has("output/d1787_foo_index.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_718090.js","output/d1787_foo_index.js"]); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js") && loadedChunks.has("output/d1787_foo_index_ea748e.js"))) return true; + registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js","output/d1787_foo_index_ea748e.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/shebang/input/index.js (ecmascript)"); } ]); @@ -1453,4 +1453,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_a8bbcc.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_718090.js.map b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_718090.js.map rename to crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js.map diff --git a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_718090.js b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_718090.js rename to crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js index 2f0b46a068428..d47abbeac5db2 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_718090.js +++ b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_718090.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/shebang/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -9,8 +9,8 @@ __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/d1787_foo_index.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index.js_f5704b._.json", ["output/d1787_foo_index.js"]); + if (!(true && loadedChunks.has("output/d1787_foo_index_ea748e.js"))) return true; + registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index.js_f5704b._.json", ["output/d1787_foo_index_ea748e.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/shebang/input/index.js (ecmascript)"); } ]); @@ -1453,4 +1453,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_718090.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_a8bbcc.js.map b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_a8bbcc.js.map rename to crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js.map diff --git a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/d1787_foo_index.js b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/d1787_foo_index_ea748e.js similarity index 89% rename from crates/turbopack-tests/tests/snapshot/basic/shebang/output/d1787_foo_index.js rename to crates/turbopack-tests/tests/snapshot/basic/shebang/output/d1787_foo_index_ea748e.js index b8a18c6ca079f..03bc3d1c7944a 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/d1787_foo_index.js +++ b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/d1787_foo_index_ea748e.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/d1787_foo_index.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/d1787_foo_index_ea748e.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/shebang/input/node_modules/foo/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -13,4 +13,4 @@ function foo(value) { }]); -//# sourceMappingURL=d1787_foo_index.js.map \ No newline at end of file +//# sourceMappingURL=d1787_foo_index_ea748e.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/d1787_foo_index.js.map b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/d1787_foo_index_ea748e.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/shebang/output/d1787_foo_index.js.map rename to crates/turbopack-tests/tests/snapshot/basic/shebang/output/d1787_foo_index_ea748e.js.map diff --git a/crates/turbopack-tests/tests/snapshot/css/css/output/8697f_foo_style.module.css_354da7._.js b/crates/turbopack-tests/tests/snapshot/css/css/output/8697f_foo_style.module.css_8b24e0._.js similarity index 85% rename from crates/turbopack-tests/tests/snapshot/css/css/output/8697f_foo_style.module.css_354da7._.js rename to crates/turbopack-tests/tests/snapshot/css/css/output/8697f_foo_style.module.css_8b24e0._.js index 3ff660ac11b99..a393696c51816 100644 --- a/crates/turbopack-tests/tests/snapshot/css/css/output/8697f_foo_style.module.css_354da7._.js +++ b/crates/turbopack-tests/tests/snapshot/css/css/output/8697f_foo_style.module.css_8b24e0._.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/8697f_foo_style.module.css_354da7._.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/8697f_foo_style.module.css_8b24e0._.js", { "[project]/crates/turbopack-tests/tests/snapshot/css/css/input/node_modules/foo/style.module.css (css, css module)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -10,4 +10,4 @@ __turbopack_export_value__({ }]); -//# sourceMappingURL=8697f_foo_style.module.css_354da7._.js.map \ No newline at end of file +//# sourceMappingURL=8697f_foo_style.module.css_8b24e0._.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/css/css/output/8697f_foo_style.module.css_354da7._.js.map b/crates/turbopack-tests/tests/snapshot/css/css/output/8697f_foo_style.module.css_8b24e0._.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/css/css/output/8697f_foo_style.module.css_354da7._.js.map rename to crates/turbopack-tests/tests/snapshot/css/css/output/8697f_foo_style.module.css_8b24e0._.js.map diff --git a/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_c93332.js b/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_c93332.js rename to crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js index fc083bccefb2a..b3d9c4b20e91d 100644 --- a/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_c93332.js +++ b/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_css_css_input_index_c93332.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js", { "[project]/crates/turbopack-tests/tests/snapshot/css/css/input/style.module.css (css, css module)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -24,8 +24,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/8697f_foo_style.module.css_354da7._.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_css_css_input_index.js_f5704b._.json", ["output/8697f_foo_style.module.css_354da7._.js","output/8697f_foo_style.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.css","output/8697f_foo_style.module_b5a149.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.module_b5a149.css"]); + if (!(true && loadedChunks.has("output/8697f_foo_style.module.css_8b24e0._.js"))) return true; + registerChunkList("output/crates_turbopack-tests_tests_snapshot_css_css_input_index.js_f5704b._.json", ["output/8697f_foo_style.module.css_8b24e0._.js","output/8697f_foo_style.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.css","output/8697f_foo_style.module_b5a149.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.module_b5a149.css"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/css/css/input/index.js (ecmascript)"); } ]); @@ -1468,4 +1468,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_css_input_index_c93332.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_47659c.js.map b/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_47659c.js.map rename to crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js.map diff --git a/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_47659c.js b/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_47659c.js rename to crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js index 921e31bf882d5..a91f9f2c78751 100644 --- a/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_47659c.js +++ b/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_css_css_input_index_47659c.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js", { "[project]/crates/turbopack-tests/tests/snapshot/css/css/input/style.module.css (css, css module)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -24,8 +24,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_css_css_input_index_c93332.js") && loadedChunks.has("output/8697f_foo_style.module.css_354da7._.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_css_css_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_css_css_input_index_c93332.js","output/8697f_foo_style.module.css_354da7._.js","output/8697f_foo_style.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.css","output/8697f_foo_style.module_b5a149.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.module_b5a149.css"]); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js") && loadedChunks.has("output/8697f_foo_style.module.css_8b24e0._.js"))) return true; + registerChunkList("output/crates_turbopack-tests_tests_snapshot_css_css_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js","output/8697f_foo_style.module.css_8b24e0._.js","output/8697f_foo_style.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.css","output/8697f_foo_style.module_b5a149.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.module_b5a149.css"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/css/css/input/index.js (ecmascript)"); } ]); @@ -1468,4 +1468,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_css_input_index_47659c.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_c93332.js.map b/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_c93332.js.map rename to crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js.map diff --git a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_index.js b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_index_19c07f.js similarity index 86% rename from crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_index.js rename to crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_index_19c07f.js index 8cdc40a1e8274..606db4ce517e6 100644 --- a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_index.js +++ b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_index_19c07f.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/63a02_@emotion_react_index.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/63a02_@emotion_react_index_19c07f.js", { "[project]/crates/turbopack-tests/tests/node_modules/@emotion/react/index.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -9,4 +9,4 @@ }]); -//# sourceMappingURL=63a02_@emotion_react_index.js.map \ No newline at end of file +//# sourceMappingURL=63a02_@emotion_react_index_19c07f.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_index.js.map b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_index_19c07f.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_index.js.map rename to crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_index_19c07f.js.map diff --git a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_jsx-dev-runtime.js b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js similarity index 84% rename from crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_jsx-dev-runtime.js rename to crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js index 89fd0a2915b77..a4b3839b2722c 100644 --- a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_jsx-dev-runtime.js +++ b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/63a02_@emotion_react_jsx-dev-runtime.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js", { "[project]/crates/turbopack-tests/tests/node_modules/@emotion/react/jsx-dev-runtime.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -9,4 +9,4 @@ }]); -//# sourceMappingURL=63a02_@emotion_react_jsx-dev-runtime.js.map \ No newline at end of file +//# sourceMappingURL=63a02_@emotion_react_jsx-dev-runtime_5103e7.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_jsx-dev-runtime.js.map b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_jsx-dev-runtime.js.map rename to crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js.map diff --git a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_styled_index.js b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_styled_index_f6fc75.js similarity index 85% rename from crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_styled_index.js rename to crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_styled_index_f6fc75.js index f3cef3d4abc40..502b540f4ff9a 100644 --- a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_styled_index.js +++ b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_styled_index_f6fc75.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/63a02_@emotion_styled_index.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/63a02_@emotion_styled_index_f6fc75.js", { "[project]/crates/turbopack-tests/tests/node_modules/@emotion/styled/index.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -9,4 +9,4 @@ }]); -//# sourceMappingURL=63a02_@emotion_styled_index.js.map \ No newline at end of file +//# sourceMappingURL=63a02_@emotion_styled_index_f6fc75.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_styled_index.js.map b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_styled_index_f6fc75.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_styled_index.js.map rename to crates/turbopack-tests/tests/snapshot/emotion/emotion/output/63a02_@emotion_styled_index_f6fc75.js.map diff --git a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_549658.js b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_549658.js rename to crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js index de4295390dbd8..67f4d4ff55190 100644 --- a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_549658.js +++ b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_549658.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js", { "[project]/crates/turbopack-tests/tests/snapshot/emotion/emotion/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -29,8 +29,8 @@ console.log(StyledButton, ClassNameButton); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/63a02_@emotion_react_jsx-dev-runtime.js") && loadedChunks.has("output/63a02_@emotion_react_index.js") && loadedChunks.has("output/63a02_@emotion_styled_index.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index.js_f5704b._.json", ["output/63a02_@emotion_react_jsx-dev-runtime.js","output/63a02_@emotion_react_index.js","output/63a02_@emotion_styled_index.js"]); + if (!(true && loadedChunks.has("output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js") && loadedChunks.has("output/63a02_@emotion_react_index_19c07f.js") && loadedChunks.has("output/63a02_@emotion_styled_index_f6fc75.js"))) return true; + registerChunkList("output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index.js_f5704b._.json", ["output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js","output/63a02_@emotion_react_index_19c07f.js","output/63a02_@emotion_styled_index_f6fc75.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/emotion/emotion/input/index.js (ecmascript)"); } ]); @@ -1473,4 +1473,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_549658.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_549658.js.map b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_549658.js.map rename to crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js.map diff --git a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_d9fc1b.js b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js similarity index 98% rename from crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_d9fc1b.js rename to crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js index e14fe60721bea..9e819ff35c7b7 100644 --- a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_d9fc1b.js +++ b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_d9fc1b.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js", { "[project]/crates/turbopack-tests/tests/snapshot/emotion/emotion/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -29,8 +29,8 @@ console.log(StyledButton, ClassNameButton); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/63a02_@emotion_react_jsx-dev-runtime.js") && loadedChunks.has("output/63a02_@emotion_react_index.js") && loadedChunks.has("output/63a02_@emotion_styled_index.js") && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_549658.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index.js_f5704b._.json", ["output/63a02_@emotion_react_jsx-dev-runtime.js","output/63a02_@emotion_react_index.js","output/63a02_@emotion_styled_index.js","output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_549658.js"]); + if (!(true && loadedChunks.has("output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js") && loadedChunks.has("output/63a02_@emotion_react_index_19c07f.js") && loadedChunks.has("output/63a02_@emotion_styled_index_f6fc75.js") && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js"))) return true; + registerChunkList("output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index.js_f5704b._.json", ["output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js","output/63a02_@emotion_react_index_19c07f.js","output/63a02_@emotion_styled_index_f6fc75.js","output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/emotion/emotion/input/index.js (ecmascript)"); } ]); @@ -1473,4 +1473,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_d9fc1b.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_d9fc1b.js.map b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_d9fc1b.js.map rename to crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js.map diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js index 64bd0e4b685ea..03207bf6e1958 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js @@ -3,7 +3,7 @@ "[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_93c5e8._.js").then(() => { + return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d744dd._.json", chunks_paths); diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js index 6780519082913..17ea52e6dcab1 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js @@ -3,7 +3,7 @@ "[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_93c5e8._.js").then(() => { + return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d744dd._.json", chunks_paths); diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_93c5e8._.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_4b587e._.js similarity index 84% rename from crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_93c5e8._.js rename to crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_4b587e._.js index 3d07e709d38cc..1f874abcc5afe 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_93c5e8._.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_4b587e._.js @@ -1,9 +1,9 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_93c5e8._.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_4b587e._.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__([ - "output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs._.js" + "output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js" ]); })()), diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_93c5e8._.js.map b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_4b587e._.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_93c5e8._.js.map rename to crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_4b587e._.js.map diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs._.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js similarity index 84% rename from crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs._.js rename to crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js index 50ffebf121736..22ea3fbd4a9bc 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs._.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs._.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -11,4 +11,4 @@ const __TURBOPACK__default__export__ = "turbopack"; }]); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs._.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs._.js.map b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs._.js.map rename to crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js.map diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js index 50974ed6615cc..39f24c4ca809a 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js @@ -3,7 +3,7 @@ "[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_93c5e8._.js").then(() => { + return __turbopack_load__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_d744dd._.json", chunks_paths); diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js index d535883079762..017a425cd667e 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js @@ -3,7 +3,7 @@ "[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_93c5e8._.js").then(() => { + return __turbopack_load__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_d744dd._.json", chunks_paths); diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_93c5e8._.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_5aa78c._.js similarity index 77% rename from crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_93c5e8._.js rename to crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_5aa78c._.js index b78eb7686bf45..f52113d5c3fcd 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_93c5e8._.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_5aa78c._.js @@ -1,9 +1,9 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_93c5e8._.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_5aa78c._.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__([ - "output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs._.js" + "output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js" ]); })()), diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_93c5e8._.js.map b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_5aa78c._.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_93c5e8._.js.map rename to crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_5aa78c._.js.map diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs._.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js similarity index 68% rename from crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs._.js rename to crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js index 7fff51cea0f28..fbb0ee82d7e69 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs._.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs._.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -11,4 +11,4 @@ const __TURBOPACK__default__export__ = "turbopack"; }]); -//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs._.js.map \ No newline at end of file +//# sourceMappingURL=a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs._.js.map b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs._.js.map rename to crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js.map diff --git a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/63a02_styled-components_index.js b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/63a02_styled-components_index_7ff1d5.js similarity index 85% rename from crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/63a02_styled-components_index.js rename to crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/63a02_styled-components_index_7ff1d5.js index 8dccf61e5f92e..dc1eaa3d37d74 100644 --- a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/63a02_styled-components_index.js +++ b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/63a02_styled-components_index_7ff1d5.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/63a02_styled-components_index.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/63a02_styled-components_index_7ff1d5.js", { "[project]/crates/turbopack-tests/tests/node_modules/styled-components/index.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -9,4 +9,4 @@ }]); -//# sourceMappingURL=63a02_styled-components_index.js.map \ No newline at end of file +//# sourceMappingURL=63a02_styled-components_index_7ff1d5.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/63a02_styled-components_index.js.map b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/63a02_styled-components_index_7ff1d5.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/63a02_styled-components_index.js.map rename to crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/63a02_styled-components_index_7ff1d5.js.map diff --git a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_0496ed.js b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_0496ed.js rename to crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js index 5885493148e28..efba640247ac2 100644 --- a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_0496ed.js +++ b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_styled_components_styled_components_input_index_0496ed.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js", { "[project]/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -15,8 +15,8 @@ console.log(MyButton); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/63a02_styled-components_index.js") && loadedChunks.has("output/a587c_tests_snapshot_styled_components_styled_components_input_index_01a621.js"))) return true; - registerChunkList("output/a587c_tests_snapshot_styled_components_styled_components_input_index.js_f5704b._.json", ["output/63a02_styled-components_index.js","output/a587c_tests_snapshot_styled_components_styled_components_input_index_01a621.js"]); + if (!(true && loadedChunks.has("output/63a02_styled-components_index_7ff1d5.js") && loadedChunks.has("output/a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js"))) return true; + registerChunkList("output/a587c_tests_snapshot_styled_components_styled_components_input_index.js_f5704b._.json", ["output/63a02_styled-components_index_7ff1d5.js","output/a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/input/index.js (ecmascript)"); } ]); @@ -1459,4 +1459,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=a587c_tests_snapshot_styled_components_styled_components_input_index_0496ed.js.map \ No newline at end of file +//# sourceMappingURL=a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_01a621.js.map b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_01a621.js.map rename to crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js.map diff --git a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_01a621.js b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_01a621.js rename to crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js index 21dac7303a59e..be98e74f7878e 100644 --- a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_01a621.js +++ b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_styled_components_styled_components_input_index_01a621.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js", { "[project]/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -15,8 +15,8 @@ console.log(MyButton); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/63a02_styled-components_index.js"))) return true; - registerChunkList("output/a587c_tests_snapshot_styled_components_styled_components_input_index.js_f5704b._.json", ["output/63a02_styled-components_index.js"]); + if (!(true && loadedChunks.has("output/63a02_styled-components_index_7ff1d5.js"))) return true; + registerChunkList("output/a587c_tests_snapshot_styled_components_styled_components_input_index.js_f5704b._.json", ["output/63a02_styled-components_index_7ff1d5.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/input/index.js (ecmascript)"); } ]); @@ -1459,4 +1459,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=a587c_tests_snapshot_styled_components_styled_components_input_index_01a621.js.map \ No newline at end of file +//# sourceMappingURL=a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_0496ed.js.map b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_0496ed.js.map rename to crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js.map diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/63a02_react_jsx-dev-runtime.js b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/63a02_react_jsx-dev-runtime_a01403.js similarity index 85% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/63a02_react_jsx-dev-runtime.js rename to crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/63a02_react_jsx-dev-runtime_a01403.js index a213570a77fd4..98f68b4aa3fe0 100644 --- a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/63a02_react_jsx-dev-runtime.js +++ b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/63a02_react_jsx-dev-runtime_a01403.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/63a02_react_jsx-dev-runtime.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/63a02_react_jsx-dev-runtime_a01403.js", { "[project]/crates/turbopack-tests/tests/node_modules/react/jsx-dev-runtime.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -9,4 +9,4 @@ }]); -//# sourceMappingURL=63a02_react_jsx-dev-runtime.js.map \ No newline at end of file +//# sourceMappingURL=63a02_react_jsx-dev-runtime_a01403.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/63a02_react_jsx-dev-runtime.js.map b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/63a02_react_jsx-dev-runtime_a01403.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/63a02_react_jsx-dev-runtime.js.map rename to crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/63a02_react_jsx-dev-runtime_a01403.js.map diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/7b7bf_third_party_component_index.js b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/7b7bf_third_party_component_index_c2ffe3.js similarity index 86% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/7b7bf_third_party_component_index.js rename to crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/7b7bf_third_party_component_index_c2ffe3.js index 3d00664f6ee27..c6718749696dd 100644 --- a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/7b7bf_third_party_component_index.js +++ b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/7b7bf_third_party_component_index_c2ffe3.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/7b7bf_third_party_component_index.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/7b7bf_third_party_component_index_c2ffe3.js", { "[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/input/node_modules/third_party_component/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -13,4 +13,4 @@ function ThirdPartyComponent() { }]); -//# sourceMappingURL=7b7bf_third_party_component_index.js.map \ No newline at end of file +//# sourceMappingURL=7b7bf_third_party_component_index_c2ffe3.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/7b7bf_third_party_component_index.js.map b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/7b7bf_third_party_component_index_c2ffe3.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/7b7bf_third_party_component_index.js.map rename to crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/7b7bf_third_party_component_index_c2ffe3.js.map diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_component_index.js b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js similarity index 83% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_component_index.js rename to crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js index 38d322db6db67..82cd8424e70cc 100644 --- a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_component_index.js +++ b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_component_index.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js", { "[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/input/packages/component/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -22,4 +22,4 @@ function MyApp() { }]); -//# sourceMappingURL=a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_component_index.js.map \ No newline at end of file +//# sourceMappingURL=8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_component_index.js.map b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_component_index.js.map rename to crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js.map diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_38ad57.js b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js similarity index 98% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_38ad57.js rename to crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js index 814ac88c0b810..997a37b898795 100644 --- a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_38ad57.js +++ b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_38ad57.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js", { "[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/input/packages/app/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -11,8 +11,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/63a02_react_jsx-dev-runtime.js") && loadedChunks.has("output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_component_index.js") && loadedChunks.has("output/7b7bf_third_party_component_index.js"))) return true; - registerChunkList("output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_app_index.js_f5704b._.json", ["output/63a02_react_jsx-dev-runtime.js","output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_component_index.js","output/7b7bf_third_party_component_index.js"]); + if (!(true && loadedChunks.has("output/63a02_react_jsx-dev-runtime_a01403.js") && loadedChunks.has("output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js") && loadedChunks.has("output/7b7bf_third_party_component_index_c2ffe3.js"))) return true; + registerChunkList("output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_app_index.js_f5704b._.json", ["output/63a02_react_jsx-dev-runtime_a01403.js","output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js","output/7b7bf_third_party_component_index_c2ffe3.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/input/packages/app/index.js (ecmascript)"); } ]); @@ -1455,4 +1455,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_38ad57.js.map \ No newline at end of file +//# sourceMappingURL=a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_2a30e9.js.map b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_2a30e9.js.map rename to crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js.map diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_2a30e9.js b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js similarity index 98% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_2a30e9.js rename to crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js index 7a6da67f32bab..8722b0147c9ad 100644 --- a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_2a30e9.js +++ b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_2a30e9.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js", { "[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/input/packages/app/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -11,8 +11,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/63a02_react_jsx-dev-runtime.js") && loadedChunks.has("output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_component_index.js") && loadedChunks.has("output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_38ad57.js") && loadedChunks.has("output/7b7bf_third_party_component_index.js"))) return true; - registerChunkList("output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_app_index.js_f5704b._.json", ["output/63a02_react_jsx-dev-runtime.js","output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_component_index.js","output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_38ad57.js","output/7b7bf_third_party_component_index.js"]); + if (!(true && loadedChunks.has("output/63a02_react_jsx-dev-runtime_a01403.js") && loadedChunks.has("output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js") && loadedChunks.has("output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js") && loadedChunks.has("output/7b7bf_third_party_component_index_c2ffe3.js"))) return true; + registerChunkList("output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_app_index.js_f5704b._.json", ["output/63a02_react_jsx-dev-runtime_a01403.js","output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js","output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js","output/7b7bf_third_party_component_index_c2ffe3.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/input/packages/app/index.js (ecmascript)"); } ]); @@ -1455,4 +1455,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_2a30e9.js.map \ No newline at end of file +//# sourceMappingURL=a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_38ad57.js.map b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_38ad57.js.map rename to crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js.map diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/63a02_@swc_helpers_src__class_call_check.mjs._.js b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js similarity index 90% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/63a02_@swc_helpers_src__class_call_check.mjs._.js rename to crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js index fcaab5e5dae5a..e4e1d14703cc3 100644 --- a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/63a02_@swc_helpers_src__class_call_check.mjs._.js +++ b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/63a02_@swc_helpers_src__class_call_check.mjs._.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js", { "[project]/crates/turbopack-tests/tests/node_modules/@swc/helpers/src/_class_call_check.mjs (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -9,4 +9,4 @@ }]); -//# sourceMappingURL=63a02_@swc_helpers_src__class_call_check.mjs._.js.map \ No newline at end of file +//# sourceMappingURL=63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/63a02_@swc_helpers_src__class_call_check.mjs._.js.map b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/63a02_@swc_helpers_src__class_call_check.mjs._.js.map rename to crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js.map diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_62f043.js b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_62f043.js rename to crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js index 6a3d444ee3e44..5bdfc3e67c9d1 100644 --- a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_62f043.js +++ b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_62f043.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js", { "[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -14,8 +14,8 @@ console.log(Foo, [].includes("foo")); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/63a02_@swc_helpers_src__class_call_check.mjs._.js"))) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index.js_f5704b._.json", ["output/63a02_@swc_helpers_src__class_call_check.mjs._.js"]); + if (!(true && loadedChunks.has("output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js"))) return true; + registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index.js_f5704b._.json", ["output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/input/index.js (ecmascript)"); } ]); @@ -1458,4 +1458,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_62f043.js.map \ No newline at end of file +//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_097653.js.map b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_097653.js.map rename to crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js.map diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_097653.js b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_097653.js rename to crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js index f115ae0243411..5172985f35df6 100644 --- a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_097653.js +++ b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_097653.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js", { "[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -14,8 +14,8 @@ console.log(Foo, [].includes("foo")); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/63a02_@swc_helpers_src__class_call_check.mjs._.js") && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_62f043.js"))) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index.js_f5704b._.json", ["output/63a02_@swc_helpers_src__class_call_check.mjs._.js","output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_62f043.js"]); + if (!(true && loadedChunks.has("output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js") && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js"))) return true; + registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index.js_f5704b._.json", ["output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js","output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/input/index.js (ecmascript)"); } ]); @@ -1458,4 +1458,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_097653.js.map \ No newline at end of file +//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_62f043.js.map b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_62f043.js.map rename to crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js.map From 6102075ee9e86f7bfff792247cfd26edfc91556b Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Mon, 20 Feb 2023 23:57:32 +0100 Subject: [PATCH 02/21] compute available assets --- .../src/next_client_chunks/with_chunks.rs | 2 +- .../with_client_chunks.rs | 2 +- crates/turbopack-core/src/asset.rs | 6 +-- .../src/chunk/available_assets.rs | 50 ++++++++++++++++++- .../src/chunk/list/reference.rs | 2 +- crates/turbopack-core/src/chunk/mod.rs | 4 +- crates/turbopack-css/src/module_asset.rs | 2 +- .../src/chunk/manifest/chunk_asset.rs | 2 +- .../src/references/esm/base.rs | 4 +- .../src/references/esm/dynamic.rs | 2 +- .../src/references/esm/module_id.rs | 4 +- .../src/references/esm/url.rs | 2 +- 12 files changed, 64 insertions(+), 18 deletions(-) diff --git a/crates/next-core/src/next_client_chunks/with_chunks.rs b/crates/next-core/src/next_client_chunks/with_chunks.rs index 51019840ecebd..0e2587a6cb8f3 100644 --- a/crates/next-core/src/next_client_chunks/with_chunks.rs +++ b/crates/next-core/src/next_client_chunks/with_chunks.rs @@ -236,7 +236,7 @@ impl AssetReference for WithChunksAssetReference { #[turbo_tasks::value_impl] impl ChunkableAssetReference for WithChunksAssetReference { #[turbo_tasks::function] - fn chunking_type(&self, _context: ChunkingContextVc) -> ChunkingTypeOptionVc { + fn chunking_type(&self) -> ChunkingTypeOptionVc { ChunkingTypeOptionVc::cell(Some(ChunkingType::Separate)) } } diff --git a/crates/next-core/src/next_client_component/with_client_chunks.rs b/crates/next-core/src/next_client_component/with_client_chunks.rs index 699d3a4298e26..650e10f6ee8fe 100644 --- a/crates/next-core/src/next_client_component/with_client_chunks.rs +++ b/crates/next-core/src/next_client_component/with_client_chunks.rs @@ -209,7 +209,7 @@ impl AssetReference for WithClientChunksAssetReference { #[turbo_tasks::value_impl] impl ChunkableAssetReference for WithClientChunksAssetReference { #[turbo_tasks::function] - fn chunking_type(&self, _context: ChunkingContextVc) -> ChunkingTypeOptionVc { + fn chunking_type(&self) -> ChunkingTypeOptionVc { ChunkingTypeOptionVc::cell(Some(ChunkingType::PlacedOrParallel)) } } diff --git a/crates/turbopack-core/src/asset.rs b/crates/turbopack-core/src/asset.rs index d8158770055f0..3abc6b63d54c9 100644 --- a/crates/turbopack-core/src/asset.rs +++ b/crates/turbopack-core/src/asset.rs @@ -13,12 +13,12 @@ use crate::{ }; /// A list of [Asset]s -#[turbo_tasks::value(shared, transparent)] +#[turbo_tasks::value(transparent)] #[derive(Hash)] pub struct Assets(Vec); /// A set of [Asset]s -#[turbo_tasks::value(shared, transparent)] +#[turbo_tasks::value(transparent)] pub struct AssetsSet(IndexSet); #[turbo_tasks::value_impl] @@ -26,7 +26,7 @@ impl AssetsVc { /// Creates an empty list of [Asset]s #[turbo_tasks::function] pub fn empty() -> Self { - Assets(Vec::new()).into() + AssetsVc::cell(Vec::new()) } } diff --git a/crates/turbopack-core/src/chunk/available_assets.rs b/crates/turbopack-core/src/chunk/available_assets.rs index 0ca15fc9dffe0..bbc5de74a5e5c 100644 --- a/crates/turbopack-core/src/chunk/available_assets.rs +++ b/crates/turbopack-core/src/chunk/available_assets.rs @@ -1,11 +1,18 @@ +use std::iter::once; + use anyhow::Result; use turbo_tasks::{ + graph::{GraphTraversal, ReverseTopological}, primitives::{BoolVc, U64Vc}, TryJoinIterExt, ValueToString, }; use turbo_tasks_hash::Xxh3Hash64Hasher; -use crate::asset::{Asset, AssetVc}; +use super::{ChunkableAssetReference, ChunkableAssetReferenceVc, ChunkingType}; +use crate::{ + asset::{Asset, AssetVc, AssetsSetVc}, + reference::AssetReference, +}; #[turbo_tasks::value] pub struct AvailableAssets { @@ -59,7 +66,11 @@ impl AvailableAssetsVc { return Ok(BoolVc::cell(true)); } } - // TODO implement + for root in this.roots.iter() { + if chunkable_assets_set(*root).await?.contains(&asset) { + return Ok(BoolVc::cell(true)); + } + } Ok(BoolVc::cell(false)) } } @@ -76,3 +87,38 @@ impl AvailableAssetsVc { } } } + +#[turbo_tasks::function] +async fn chunkable_assets_set(root: AssetVc) -> Result { + let assets = GraphTraversal::>::visit( + once(root), + |&asset: &AssetVc| async move { + let mut results = Vec::new(); + for reference in asset.references().await?.iter() { + if let Some(chunkable) = ChunkableAssetReferenceVc::resolve_from(reference).await? { + if matches!( + &*chunkable.chunking_type().await?, + Some( + ChunkingType::Parallel + | ChunkingType::PlacedOrParallel + | ChunkingType::Placed + ) + ) { + results.extend( + chunkable + .resolve_reference() + .primary_assets() + .await? + .iter() + .copied(), + ); + } + } + } + Ok(results) + }, + ) + .await + .completed()?; + Ok(AssetsSetVc::cell(assets.into_iter().collect())) +} diff --git a/crates/turbopack-core/src/chunk/list/reference.rs b/crates/turbopack-core/src/chunk/list/reference.rs index cf9a811ac0bfc..d01bdf27f4aad 100644 --- a/crates/turbopack-core/src/chunk/list/reference.rs +++ b/crates/turbopack-core/src/chunk/list/reference.rs @@ -68,7 +68,7 @@ impl AssetReference for ChunkListReference { #[turbo_tasks::value_impl] impl ChunkableAssetReference for ChunkListReference { #[turbo_tasks::function] - fn chunking_type(&self, _context: ChunkingContextVc) -> ChunkingTypeOptionVc { + fn chunking_type(&self) -> ChunkingTypeOptionVc { ChunkingTypeOptionVc::cell(Some(ChunkingType::Separate)) } } diff --git a/crates/turbopack-core/src/chunk/mod.rs b/crates/turbopack-core/src/chunk/mod.rs index 86d45962ecad4..1f945b814ce16 100644 --- a/crates/turbopack-core/src/chunk/mod.rs +++ b/crates/turbopack-core/src/chunk/mod.rs @@ -287,7 +287,7 @@ pub struct ChunkingTypeOption(Option); /// specific interface is implemented. #[turbo_tasks::value_trait] pub trait ChunkableAssetReference: AssetReference + ValueToString { - fn chunking_type(&self, _context: ChunkingContextVc) -> ChunkingTypeOptionVc { + fn chunking_type(&self) -> ChunkingTypeOptionVc { ChunkingTypeOptionVc::cell(Some(ChunkingType::default())) } } @@ -478,7 +478,7 @@ where return Ok(vec![(None, ChunkContentGraphNode::ExternalAssetReference(reference))]); }; - let Some(chunking_type) = *chunkable_asset_reference.chunking_type(context.chunking_context).await? else { + let Some(chunking_type) = *chunkable_asset_reference.chunking_type().await? else { return Ok(vec![(None, ChunkContentGraphNode::ExternalAssetReference(reference))]); }; diff --git a/crates/turbopack-css/src/module_asset.rs b/crates/turbopack-css/src/module_asset.rs index 9810d28504b5e..7e72255594f2d 100644 --- a/crates/turbopack-css/src/module_asset.rs +++ b/crates/turbopack-css/src/module_asset.rs @@ -409,7 +409,7 @@ impl AssetReference for CssProxyToCssAssetReference { #[turbo_tasks::value_impl] impl ChunkableAssetReference for CssProxyToCssAssetReference { #[turbo_tasks::function] - fn chunking_type(&self, _context: ChunkingContextVc) -> ChunkingTypeOptionVc { + fn chunking_type(&self) -> ChunkingTypeOptionVc { ChunkingTypeOptionVc::cell(Some(ChunkingType::Parallel)) } } diff --git a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs index fbb10d794d4af..d277e9f8d9959 100644 --- a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs +++ b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs @@ -186,7 +186,7 @@ impl AssetReference for ManifestChunkAssetReference { #[turbo_tasks::value_impl] impl ChunkableAssetReference for ManifestChunkAssetReference { #[turbo_tasks::function] - fn chunking_type(&self, _context: ChunkingContextVc) -> ChunkingTypeOptionVc { + fn chunking_type(&self) -> ChunkingTypeOptionVc { ChunkingTypeOptionVc::cell(Some(ChunkingType::Separate)) } } diff --git a/crates/turbopack-ecmascript/src/references/esm/base.rs b/crates/turbopack-ecmascript/src/references/esm/base.rs index b1231c717936c..a536f0a4881be 100644 --- a/crates/turbopack-ecmascript/src/references/esm/base.rs +++ b/crates/turbopack-ecmascript/src/references/esm/base.rs @@ -155,7 +155,7 @@ impl ValueToString for EsmAssetReference { #[turbo_tasks::value_impl] impl ChunkableAssetReference for EsmAssetReference { #[turbo_tasks::function] - fn chunking_type(&self, _context: ChunkingContextVc) -> Result { + fn chunking_type(&self) -> Result { Ok(ChunkingTypeOptionVc::cell( if let Some(chunking_type) = self.annotations.chunking_type() { match chunking_type { @@ -180,7 +180,7 @@ impl CodeGenerateable for EsmAssetReference { ) -> Result { let mut visitors = Vec::new(); - let chunking_type = self_vc.chunking_type(context).await?; + let chunking_type = self_vc.chunking_type().await?; let resolved = self_vc.resolve_reference().await?; // Insert code that throws immediately at time of import if a request is diff --git a/crates/turbopack-ecmascript/src/references/esm/dynamic.rs b/crates/turbopack-ecmascript/src/references/esm/dynamic.rs index cdb6e0db3543f..3a8d5aee32e91 100644 --- a/crates/turbopack-ecmascript/src/references/esm/dynamic.rs +++ b/crates/turbopack-ecmascript/src/references/esm/dynamic.rs @@ -63,7 +63,7 @@ impl ValueToString for EsmAsyncAssetReference { #[turbo_tasks::value_impl] impl ChunkableAssetReference for EsmAsyncAssetReference { #[turbo_tasks::function] - fn chunking_type(&self, _context: ChunkingContextVc) -> ChunkingTypeOptionVc { + fn chunking_type(&self) -> ChunkingTypeOptionVc { ChunkingTypeOptionVc::cell(Some(ChunkingType::SeparateAsync)) } } diff --git a/crates/turbopack-ecmascript/src/references/esm/module_id.rs b/crates/turbopack-ecmascript/src/references/esm/module_id.rs index debb8af20f4a0..02b3ed6d3282b 100644 --- a/crates/turbopack-ecmascript/src/references/esm/module_id.rs +++ b/crates/turbopack-ecmascript/src/references/esm/module_id.rs @@ -55,8 +55,8 @@ impl ValueToString for EsmModuleIdAssetReference { #[turbo_tasks::value_impl] impl ChunkableAssetReference for EsmModuleIdAssetReference { #[turbo_tasks::function] - fn chunking_type(&self, context: ChunkingContextVc) -> ChunkingTypeOptionVc { - self.inner.chunking_type(context) + fn chunking_type(&self) -> ChunkingTypeOptionVc { + self.inner.chunking_type() } } diff --git a/crates/turbopack-ecmascript/src/references/esm/url.rs b/crates/turbopack-ecmascript/src/references/esm/url.rs index 6141e99b27fd5..b2780bb2cb068 100644 --- a/crates/turbopack-ecmascript/src/references/esm/url.rs +++ b/crates/turbopack-ecmascript/src/references/esm/url.rs @@ -101,7 +101,7 @@ impl ValueToString for UrlAssetReference { #[turbo_tasks::value_impl] impl ChunkableAssetReference for UrlAssetReference { #[turbo_tasks::function] - fn chunking_type(&self, _context: ChunkingContextVc) -> ChunkingTypeOptionVc { + fn chunking_type(&self) -> ChunkingTypeOptionVc { ChunkingTypeOptionVc::cell(Some(ChunkingType::PlacedOrParallel)) } } From 5746856b8393e9ee2b2f6d4b6b3392b62ffbf803 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Tue, 21 Feb 2023 12:26:34 +0100 Subject: [PATCH 03/21] set references for assets as they are needed to availability checks --- .../src/next_client_chunks/with_chunks.rs | 74 +++++++++---------- .../src/chunk/list/reference.rs | 4 +- .../src/chunk/manifest/chunk_asset.rs | 20 +++-- .../src/chunk/manifest/chunk_item.rs | 16 +--- .../src/chunk_group_files_asset.rs | 29 ++++---- 5 files changed, 70 insertions(+), 73 deletions(-) diff --git a/crates/next-core/src/next_client_chunks/with_chunks.rs b/crates/next-core/src/next_client_chunks/with_chunks.rs index 0e2587a6cb8f3..5ee717c853a3e 100644 --- a/crates/next-core/src/next_client_chunks/with_chunks.rs +++ b/crates/next-core/src/next_client_chunks/with_chunks.rs @@ -52,8 +52,26 @@ impl Asset for WithChunksAsset { } #[turbo_tasks::function] - fn references(&self) -> AssetReferencesVc { - unimplemented!() + async fn references(self_vc: WithChunksAssetVc) -> Result { + let this = self_vc.await?; + Ok(AssetReferencesVc::cell(vec![ + WithChunksAssetReference { + asset: InChunkingContextAsset { + asset: this.asset, + chunking_context: this.chunking_context, + } + .cell() + .into(), + } + .cell() + .into(), + ChunkListReferenceVc::new( + this.server_root, + self_vc.chunk_group(), + self_vc.chunk_list_path(), + ) + .into(), + ])) } } @@ -100,34 +118,33 @@ impl EcmascriptChunkPlaceable for WithChunksAsset { } } -#[turbo_tasks::value] -struct WithChunksChunkItem { - context: ChunkingContextVc, - inner_context: ChunkingContextVc, - inner: WithChunksAssetVc, -} - #[turbo_tasks::value_impl] -impl WithChunksChunkItemVc { +impl WithChunksAssetVc { #[turbo_tasks::function] async fn chunk_list_path(self) -> Result { let this = self.await?; - Ok(this.inner_context.chunk_list_path(this.inner.ident())) + Ok(this.chunking_context.chunk_list_path(self.ident())) } #[turbo_tasks::function] async fn chunk_group(self) -> Result { let this = self.await?; - let inner = this.inner.await?; Ok(ChunkGroupVc::from_asset( - inner.asset.into(), - this.inner_context, + this.asset.into(), + this.chunking_context, None, - Some(inner.asset.into()), + Some(this.asset.into()), )) } } +#[turbo_tasks::value] +struct WithChunksChunkItem { + context: ChunkingContextVc, + inner_context: ChunkingContextVc, + inner: WithChunksAssetVc, +} + #[turbo_tasks::value_impl] impl EcmascriptChunkItem for WithChunksChunkItem { #[turbo_tasks::function] @@ -139,12 +156,12 @@ impl EcmascriptChunkItem for WithChunksChunkItem { async fn content(self_vc: WithChunksChunkItemVc) -> Result { let this = self_vc.await?; let inner = this.inner.await?; - let group = self_vc.chunk_group(); + let group = this.inner.chunk_group(); let chunks = group.chunks().await?; let server_root = inner.server_root.await?; let mut client_chunks = Vec::new(); - let chunk_list_path = self_vc.chunk_list_path().await?; + let chunk_list_path = this.inner.chunk_list_path().await?; let chunk_list_path = if let Some(path) = server_root.get_path_to(&chunk_list_path) { path } else { @@ -185,27 +202,8 @@ impl ChunkItem for WithChunksChunkItem { } #[turbo_tasks::function] - async fn references(self_vc: WithChunksChunkItemVc) -> Result { - let this = self_vc.await?; - let inner = this.inner.await?; - Ok(AssetReferencesVc::cell(vec![ - WithChunksAssetReference { - asset: InChunkingContextAsset { - asset: inner.asset, - chunking_context: this.inner_context, - } - .cell() - .into(), - } - .cell() - .into(), - ChunkListReferenceVc::new( - inner.server_root, - self_vc.chunk_group(), - self_vc.chunk_list_path(), - ) - .into(), - ])) + fn references(&self) -> AssetReferencesVc { + self.inner.references() } } diff --git a/crates/turbopack-core/src/chunk/list/reference.rs b/crates/turbopack-core/src/chunk/list/reference.rs index d01bdf27f4aad..2e54db54d7f41 100644 --- a/crates/turbopack-core/src/chunk/list/reference.rs +++ b/crates/turbopack-core/src/chunk/list/reference.rs @@ -5,8 +5,8 @@ use turbo_tasks_fs::FileSystemPathVc; use super::asset::ChunkListAssetVc; use crate::{ chunk::{ - ChunkGroupVc, ChunkableAssetReference, ChunkableAssetReferenceVc, ChunkingContextVc, - ChunkingType, ChunkingTypeOptionVc, + ChunkGroupVc, ChunkableAssetReference, ChunkableAssetReferenceVc, ChunkingType, + ChunkingTypeOptionVc, }, reference::{AssetReference, AssetReferenceVc}, resolve::{ResolveResult, ResolveResultVc}, diff --git a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs index d277e9f8d9959..cc40cdd911371 100644 --- a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs +++ b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs @@ -4,9 +4,9 @@ use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - available_assets::AvailableAssetsVc, ChunkGroupVc, ChunkVc, ChunkableAsset, - ChunkableAssetReference, ChunkableAssetReferenceVc, ChunkableAssetVc, ChunkingContext, - ChunkingContextVc, ChunkingType, ChunkingTypeOptionVc, + available_assets::AvailableAssetsVc, ChunkGroupVc, ChunkReferenceVc, ChunkVc, + ChunkableAsset, ChunkableAssetReference, ChunkableAssetReferenceVc, ChunkableAssetVc, + ChunkingContext, ChunkingContextVc, ChunkingType, ChunkingTypeOptionVc, }, ident::AssetIdentVc, reference::{AssetReference, AssetReferenceVc, AssetReferencesVc}, @@ -114,8 +114,18 @@ impl Asset for ManifestChunkAsset { } #[turbo_tasks::function] - fn references(&self) -> AssetReferencesVc { - todo!() + async fn references(self_vc: ManifestChunkAssetVc) -> Result { + let chunks = self_vc.chunk_group().chunks(); + + Ok(AssetReferencesVc::cell( + chunks + .await? + .iter() + .copied() + .map(ChunkReferenceVc::new) + .map(Into::into) + .collect(), + )) } } diff --git a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_item.rs b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_item.rs index ff002ddff84eb..6e7821c382b02 100644 --- a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_item.rs +++ b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_item.rs @@ -4,7 +4,7 @@ use indoc::formatdoc; use turbo_tasks::ValueToString; use turbopack_core::{ asset::Asset, - chunk::{Chunk, ChunkItem, ChunkItemVc, ChunkReferenceVc, ChunkingContext, ChunkingContextVc}, + chunk::{Chunk, ChunkItem, ChunkItemVc, ChunkingContext, ChunkingContextVc}, ident::AssetIdentVc, reference::AssetReferencesVc, }; @@ -81,17 +81,7 @@ impl ChunkItem for ManifestChunkItem { } #[turbo_tasks::function] - async fn references(&self) -> Result { - let chunks = self.manifest.chunk_group().chunks(); - - Ok(AssetReferencesVc::cell( - chunks - .await? - .iter() - .copied() - .map(ChunkReferenceVc::new) - .map(Into::into) - .collect(), - )) + fn references(&self) -> AssetReferencesVc { + self.manifest.references() } } diff --git a/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs b/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs index 1bec365164d02..88403a5356221 100644 --- a/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs +++ b/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs @@ -74,8 +74,18 @@ impl Asset for ChunkGroupFilesAsset { } #[turbo_tasks::function] - fn references(&self) -> AssetReferencesVc { - unimplemented!() + async fn references(self_vc: ChunkGroupFilesAssetVc) -> Result { + let chunks = self_vc.chunk_group().chunks(); + + Ok(AssetReferencesVc::cell( + chunks + .await? + .iter() + .copied() + .map(ChunkReferenceVc::new) + .map(Into::into) + .collect(), + )) } } @@ -169,18 +179,7 @@ impl ChunkItem for ChunkGroupFilesChunkItem { } #[turbo_tasks::function] - async fn references(&self) -> Result { - let chunk_group = self.inner.chunk_group(); - let chunks = chunk_group.chunks(); - - let references: Vec<_> = chunks - .await? - .iter() - .copied() - .map(ChunkReferenceVc::new) - .map(Into::into) - .collect(); - - Ok(AssetReferencesVc::cell(references)) + fn references(&self) -> AssetReferencesVc { + self.inner.references() } } From f3182f36e70857628c9c7e3e698c342c88bd7227 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Tue, 21 Feb 2023 14:24:09 +0100 Subject: [PATCH 04/21] skip cycles in chunkable_assets_set --- crates/turbopack-core/src/chunk/available_assets.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/turbopack-core/src/chunk/available_assets.rs b/crates/turbopack-core/src/chunk/available_assets.rs index bbc5de74a5e5c..7dc3dbe0058a0 100644 --- a/crates/turbopack-core/src/chunk/available_assets.rs +++ b/crates/turbopack-core/src/chunk/available_assets.rs @@ -2,7 +2,7 @@ use std::iter::once; use anyhow::Result; use turbo_tasks::{ - graph::{GraphTraversal, ReverseTopological}, + graph::{GraphTraversal, ReverseTopological, SkipDuplicates}, primitives::{BoolVc, U64Vc}, TryJoinIterExt, ValueToString, }; @@ -90,7 +90,7 @@ impl AvailableAssetsVc { #[turbo_tasks::function] async fn chunkable_assets_set(root: AssetVc) -> Result { - let assets = GraphTraversal::>::visit( + let assets = GraphTraversal::, _>>::visit( once(root), |&asset: &AssetVc| async move { let mut results = Vec::new(); @@ -120,5 +120,5 @@ async fn chunkable_assets_set(root: AssetVc) -> Result { ) .await .completed()?; - Ok(AssetsSetVc::cell(assets.into_iter().collect())) + Ok(AssetsSetVc::cell(assets.into_inner().into_iter().collect())) } From b073342aaf3691b7371d92a8502aad047b714a0a Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Wed, 22 Feb 2023 15:29:48 +0100 Subject: [PATCH 05/21] fix chunk references from manifest chunk --- .../src/chunk/manifest/chunk_asset.rs | 40 ++----------------- .../src/chunk/manifest/loader_item.rs | 20 ++++------ ..._basic_async_chunk_input_import_3aa117.js} | 2 +- ...ic_async_chunk_input_import_3aa117.js.map} | 0 ...orts_dynamic_input_vercel.mjs_a392ef._.js} | 2 +- ..._dynamic_input_vercel.mjs_a392ef._.js.map} | 0 ...-and-dynamic_input_vercel.mjs_072e69._.js} | 2 +- ...-dynamic_input_vercel.mjs_072e69._.js.map} | 0 8 files changed, 14 insertions(+), 52 deletions(-) rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_bc0725.js => crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js} (90%) rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_bc0725.js.map => crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/dynamic/output/{crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_4b587e._.js => crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js} (88%) rename crates/turbopack-tests/tests/snapshot/imports/dynamic/output/{crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_4b587e._.js.map => crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/{a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_5aa78c._.js => a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js} (90%) rename crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/{a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_5aa78c._.js.map => a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js.map} (100%) diff --git a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs index cc40cdd911371..197d78cf00648 100644 --- a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs +++ b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs @@ -1,16 +1,14 @@ use anyhow::Result; -use turbo_tasks::{primitives::StringVc, ValueToString, ValueToStringVc}; +use turbo_tasks::primitives::StringVc; use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ available_assets::AvailableAssetsVc, ChunkGroupVc, ChunkReferenceVc, ChunkVc, - ChunkableAsset, ChunkableAssetReference, ChunkableAssetReferenceVc, ChunkableAssetVc, - ChunkingContext, ChunkingContextVc, ChunkingType, ChunkingTypeOptionVc, + ChunkableAsset, ChunkableAssetVc, ChunkingContext, ChunkingContextVc, }, ident::AssetIdentVc, - reference::{AssetReference, AssetReferenceVc, AssetReferencesVc}, - resolve::{ResolveResult, ResolveResultVc}, + reference::AssetReferencesVc, }; use super::chunk_item::ManifestChunkItem; @@ -168,35 +166,3 @@ impl EcmascriptChunkPlaceable for ManifestChunkAsset { EcmascriptExports::Value.cell() } } - -#[turbo_tasks::value(shared)] -pub(super) struct ManifestChunkAssetReference { - pub manifest: ManifestChunkAssetVc, -} - -#[turbo_tasks::value_impl] -impl ValueToString for ManifestChunkAssetReference { - #[turbo_tasks::function] - async fn to_string(&self) -> Result { - Ok(StringVc::cell(format!( - "referenced manifest {}", - self.manifest.ident().to_string().await? - ))) - } -} - -#[turbo_tasks::value_impl] -impl AssetReference for ManifestChunkAssetReference { - #[turbo_tasks::function] - fn resolve_reference(&self) -> ResolveResultVc { - ResolveResult::asset(self.manifest.into()).cell() - } -} - -#[turbo_tasks::value_impl] -impl ChunkableAssetReference for ManifestChunkAssetReference { - #[turbo_tasks::function] - fn chunking_type(&self) -> ChunkingTypeOptionVc { - ChunkingTypeOptionVc::cell(Some(ChunkingType::Separate)) - } -} diff --git a/crates/turbopack-ecmascript/src/chunk/manifest/loader_item.rs b/crates/turbopack-ecmascript/src/chunk/manifest/loader_item.rs index b2f1ccaa558c8..0e28156f34ffd 100644 --- a/crates/turbopack-ecmascript/src/chunk/manifest/loader_item.rs +++ b/crates/turbopack-ecmascript/src/chunk/manifest/loader_item.rs @@ -6,13 +6,14 @@ use turbo_tasks::{primitives::StringVc, ValueToString}; use turbopack_core::{ asset::Asset, chunk::{ - Chunk, ChunkItem, ChunkItemVc, ChunkListReferenceVc, ChunkingContext, ChunkingContextVc, + Chunk, ChunkItem, ChunkItemVc, ChunkListReferenceVc, ChunkReferenceVc, ChunkingContext, + ChunkingContextVc, }, ident::AssetIdentVc, reference::AssetReferencesVc, }; -use super::chunk_asset::{ManifestChunkAssetReference, ManifestChunkAssetVc}; +use super::chunk_asset::ManifestChunkAssetVc; use crate::{ chunk::{ item::{ @@ -62,19 +63,14 @@ impl ChunkItem for ManifestLoaderItem { } #[turbo_tasks::function] - async fn references(self_vc: ManifestLoaderItemVc) -> Result { - let this = &*self_vc.await?; + async fn references(&self) -> Result { Ok(AssetReferencesVc::cell(vec![ - ManifestChunkAssetReference { - manifest: this.manifest, - } - .cell() - .into(), + ChunkReferenceVc::new(self.manifest.manifest_chunk()).into(), // This creates the chunk list corresponding to the manifest chunk's chunk group. ChunkListReferenceVc::new( - this.manifest.await?.chunking_context.output_root(), - this.manifest.chunk_group(), - this.manifest.chunk_list_path(), + self.manifest.await?.chunking_context.output_root(), + self.manifest.chunk_group(), + self.manifest.chunk_list_path(), ) .into(), ])) diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_bc0725.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js similarity index 90% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_bc0725.js rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js index 5eb7c77960514..be1af88f7f61f 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_bc0725.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_bc0725.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_bc0725.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_bc0725.js.map rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js.map diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_4b587e._.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js similarity index 88% rename from crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_4b587e._.js rename to crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js index 1f874abcc5afe..ce117acb3a11a 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_4b587e._.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_4b587e._.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_4b587e._.js.map b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_4b587e._.js.map rename to crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js.map diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_5aa78c._.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js similarity index 90% rename from crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_5aa78c._.js rename to crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js index f52113d5c3fcd..41192448baccb 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_5aa78c._.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_5aa78c._.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_5aa78c._.js.map b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_5aa78c._.js.map rename to crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js.map From f5a120105ef046f8a292ecdb37e630bfdfa0d255 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Thu, 2 Mar 2023 14:03:29 +0100 Subject: [PATCH 06/21] actually omit assets when they are already available --- crates/turbopack-core/src/chunk/mod.rs | 13 +++++++++++++ .../async_chunk/output/20803_bar_index_b2b240.js | 16 ---------------- .../output/20803_bar_index_b2b240.js.map | 6 ------ ...shot_basic_async_chunk_input_import_0d49f0.js | 4 ---- ..._basic_async_chunk_input_import_0d49f0.js.map | 6 ++---- ...shot_basic_async_chunk_input_import_3aa117.js | 3 +-- 6 files changed, 16 insertions(+), 32 deletions(-) delete mode 100644 crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_b2b240.js delete mode 100644 crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_b2b240.js.map diff --git a/crates/turbopack-core/src/chunk/mod.rs b/crates/turbopack-core/src/chunk/mod.rs index 1f945b814ce16..e6e5c03b05f74 100644 --- a/crates/turbopack-core/src/chunk/mod.rs +++ b/crates/turbopack-core/src/chunk/mod.rs @@ -450,6 +450,8 @@ where enum ChunkContentGraphNode { // Chunk items that are placed into the current chunk ChunkItem(I), + // Asset that is already available and doesn't need to be included + AvailableAsset(AssetVc), // Chunks that are loaded in parallel to the current chunk Chunk(ChunkVc), // Chunk groups that are referenced from the current chunk, but @@ -496,6 +498,16 @@ where let mut graph_nodes = vec![]; for asset in assets { + if let Some(available_assets) = context.available_assets { + if *available_assets.includes(asset).await? { + graph_nodes.push(( + Some((asset, chunking_type)), + ChunkContentGraphNode::AvailableAsset(asset), + )); + continue; + } + } + let chunkable_asset = match ChunkableAssetVc::resolve_from(asset).await? { Some(chunkable_asset) => chunkable_asset, _ => { @@ -737,6 +749,7 @@ where for graph_node in graph_nodes { match graph_node { + ChunkContentGraphNode::AvailableAsset(_asset) => {} ChunkContentGraphNode::ChunkItem(chunk_item) => { chunk_items.push(chunk_item); } diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_b2b240.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_b2b240.js deleted file mode 100644 index 7398492e65b4f..0000000000000 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_b2b240.js +++ /dev/null @@ -1,16 +0,0 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/20803_bar_index_b2b240.js", { - -"[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/bar/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { - -__turbopack_esm__({ - "bar": ()=>bar -}); -function bar(value) { - console.assert(value); -} - -})()), -}]); - - -//# sourceMappingURL=20803_bar_index_b2b240.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_b2b240.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_b2b240.js.map deleted file mode 100644 index 3de783a7ae6c8..0000000000000 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_bar_index_b2b240.js.map +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": 3, - "sections": [ - {"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":["/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/bar/index.js"],"sourcesContent":["export function bar(value) {\n console.assert(value);\n}\n"],"names":[],"mappings":";;;AAAO,SAAS,IAAI,KAAK,EAAE;IACzB,QAAQ,MAAM,CAAC;AACjB"}}, - {"offset": {"line": 10, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}] -} \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js index 00eb4b60ff1ca..62e50704150cb 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js @@ -1,9 +1,5 @@ (self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js", { -"[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/shared.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { - - -}.call(this) }), "[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$basic$2f$async_chunk$2f$input$2f$node_modules$2f$foo$2f$index$2e$js__$28$ecmascript$29__ = __turbopack_import__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/foo/index.js (ecmascript)"); diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js.map index 8356a671133e3..066c7d131e614 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js.map +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js.map @@ -1,8 +1,6 @@ { "version": 3, "sections": [ - {"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":""}}, - {"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}, - {"offset": {"line": 8, "column": 0}, "map": {"version":3,"sources":["/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js"],"sourcesContent":["import { foo } from \"foo\";\nimport { bar } from \"bar\";\nimport \"./shared\";\n\nfoo(true);\nbar(true);\n"],"names":[],"mappings":";;;;;;;AAIA,qMAAI,IAAI;AACR,qMAAI,IAAI"}}, - {"offset": {"line": 17, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}] + {"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":["/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js"],"sourcesContent":["import { foo } from \"foo\";\nimport { bar } from \"bar\";\nimport \"./shared\";\n\nfoo(true);\nbar(true);\n"],"names":[],"mappings":";;;;;;;AAIA,qMAAI,IAAI;AACR,qMAAI,IAAI"}}, + {"offset": {"line": 13, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}] } \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js index be1af88f7f61f..e7887128c5626 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js @@ -4,8 +4,7 @@ __turbopack_export_value__([ "output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js", - "output/20803_foo_index_b32b98.js", - "output/20803_bar_index_b2b240.js" + "output/20803_foo_index_b32b98.js" ]); })()), From cca8bf1e8e5ea859b146f19f008cb07026a71d4a Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Mon, 6 Mar 2023 11:45:41 +0100 Subject: [PATCH 07/21] fix client chunks --- .../with_client_chunks.rs | 34 ++++++++----------- crates/turbopack-core/src/chunk/mod.rs | 15 ++++++++ 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/crates/next-core/src/next_client_component/with_client_chunks.rs b/crates/next-core/src/next_client_component/with_client_chunks.rs index 650e10f6ee8fe..4c87964532ab7 100644 --- a/crates/next-core/src/next_client_component/with_client_chunks.rs +++ b/crates/next-core/src/next_client_component/with_client_chunks.rs @@ -23,8 +23,6 @@ use turbopack_core::{ }; use turbopack_ecmascript::utils::stringify_js_pretty; -use crate::next_client_chunks::in_chunking_context_asset::InChunkingContextAsset; - #[turbo_tasks::function] fn modifier() -> StringVc { StringVc::cell("client chunks".to_string()) @@ -50,7 +48,11 @@ impl Asset for WithClientChunksAsset { #[turbo_tasks::function] fn references(&self) -> AssetReferencesVc { - unimplemented!() + AssetReferencesVc::cell(vec![WithClientChunksAssetReference { + asset: self.asset.into(), + } + .cell() + .into()]) } } @@ -111,7 +113,12 @@ impl EcmascriptChunkItem for WithClientChunksChunkItem { #[turbo_tasks::function] async fn content(&self) -> Result { let inner = self.inner.await?; - let group = ChunkGroupVc::from_asset(inner.asset.into(), self.context, None, None); + let group = ChunkGroupVc::from_asset( + inner.asset.into(), + self.context, + None, + Some(inner.asset.into()), + ); let chunks = group.chunks().await?; let server_root = inner.server_root.await?; @@ -164,21 +171,8 @@ impl ChunkItem for WithClientChunksChunkItem { } #[turbo_tasks::function] - async fn references(self_vc: WithClientChunksChunkItemVc) -> Result { - let this = self_vc.await?; - let inner = this.inner.await?; - Ok(AssetReferencesVc::cell(vec![ - WithClientChunksAssetReference { - asset: InChunkingContextAsset { - asset: inner.asset, - chunking_context: this.context, - } - .cell() - .into(), - } - .cell() - .into(), - ])) + fn references(&self) -> AssetReferencesVc { + self.inner.references() } } @@ -210,6 +204,6 @@ impl AssetReference for WithClientChunksAssetReference { impl ChunkableAssetReference for WithClientChunksAssetReference { #[turbo_tasks::function] fn chunking_type(&self) -> ChunkingTypeOptionVc { - ChunkingTypeOptionVc::cell(Some(ChunkingType::PlacedOrParallel)) + ChunkingTypeOptionVc::cell(Some(ChunkingType::IsolatedParallel)) } } diff --git a/crates/turbopack-core/src/chunk/mod.rs b/crates/turbopack-core/src/chunk/mod.rs index e6e5c03b05f74..d1bc353d6c39b 100644 --- a/crates/turbopack-core/src/chunk/mod.rs +++ b/crates/turbopack-core/src/chunk/mod.rs @@ -266,6 +266,10 @@ pub enum ChunkingType { PlacedOrParallel, /// Asset is always placed in a separate chunk that is loaded in parallel. Parallel, + /// Asset is always placed in a separate chunk that is loaded in parallel. + /// Referenced asset will not inherit the available modules, but form a + /// new availablility root. + IsolatedParallel, /// Asset is placed in a separate chunk group that is referenced from the /// referencing chunk group, but not loaded. /// Note: Separate chunks need to be loaded by something external to current @@ -544,6 +548,17 @@ where ChunkContentGraphNode::Chunk(chunk), )); } + ChunkingType::IsolatedParallel => { + let chunk = chunkable_asset.as_chunk( + context.chunking_context, + None, + Some(chunkable_asset.into()), + ); + graph_nodes.push(( + Some((asset, chunking_type)), + ChunkContentGraphNode::Chunk(chunk), + )); + } ChunkingType::PlacedOrParallel => { // heuristic for being in the same chunk if !context.split From 4a32d025954e9702c0b968e3c0aa4a56c7d6747f Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Mon, 6 Mar 2023 11:46:18 +0100 Subject: [PATCH 08/21] improve error handling for introspection --- .../src/introspect/mod.rs | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/crates/turbopack-dev-server/src/introspect/mod.rs b/crates/turbopack-dev-server/src/introspect/mod.rs index 986972e57be16..e9f52ee25d089 100644 --- a/crates/turbopack-dev-server/src/introspect/mod.rs +++ b/crates/turbopack-dev-server/src/introspect/mod.rs @@ -1,7 +1,10 @@ -use std::{collections::HashSet, fmt::Display}; +use std::{borrow::Cow, collections::HashSet, fmt::Display}; use anyhow::Result; -use turbo_tasks::{primitives::StringVc, registry, CellId, RawVc, TryJoinIterExt}; +use turbo_tasks::{ + primitives::{StringReadRef, StringVc}, + registry, CellId, RawVc, TryJoinIterExt, +}; use turbo_tasks_fs::{json::parse_json_with_source_context, File, FileContent}; use turbopack_core::{ asset::AssetContent, @@ -98,17 +101,29 @@ impl ContentSource for IntrospectionSource { } else { unreachable!() }; - let ty = introspectable.ty().await?; - let title = introspectable.title().await?; - let details = introspectable.details().await?; + fn str_or_err(s: &Result) -> Cow<'_, str> { + s.as_ref().map_or_else( + |e| Cow::<'_, str>::Owned(format!("ERROR: {:?}", e)), + |d| Cow::Borrowed(&**d), + ) + } + let ty = introspectable.ty().await; + let ty = str_or_err(&ty); + let title = introspectable.title().await; + let title = str_or_err(&title); + let details = introspectable.details().await; + let details = str_or_err(&details); let children = introspectable.children().await?; let has_children = !children.is_empty(); let children = children .iter() .map(|&(name, child)| async move { - let name = name.await?; - let ty = child.ty().await?; - let title = child.title().await?; + let name = name.await; + let name = str_or_err(&name); + let ty = child.ty().await; + let ty = str_or_err(&ty); + let title = child.title().await; + let title = str_or_err(&title); let path = serde_json::to_string(&child)?; Ok(format!( "
  • {name} [{ty}] {title}
    • ", From bc9768faf2fce2b88ea0d2621ad36b6d979bff5e Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Mon, 6 Mar 2023 15:46:56 +0100 Subject: [PATCH 09/21] fix with chunks transition --- .../js/src/entry/app/server-to-client-ssr.tsx | 2 +- crates/next-core/src/app_source.rs | 2 +- .../src/next_client_chunks/with_chunks.rs | 77 ++++--------------- .../src/references/esm/base.rs | 1 + 4 files changed, 20 insertions(+), 62 deletions(-) diff --git a/crates/next-core/js/src/entry/app/server-to-client-ssr.tsx b/crates/next-core/js/src/entry/app/server-to-client-ssr.tsx index 41e0ab50cf1c1..2f57e412afb32 100644 --- a/crates/next-core/js/src/entry/app/server-to-client-ssr.tsx +++ b/crates/next-core/js/src/entry/app/server-to-client-ssr.tsx @@ -1,6 +1,6 @@ import { createProxy } from "next/dist/build/webpack/loaders/next-flight-loader/module-proxy"; -("TURBOPACK { chunking-type: parallel }"); +("TURBOPACK { chunking-type: isolatedParallel }"); // @ts-expect-error CLIENT_MODULE is provided by rust import { __turbopack_module_id__ as id } from "CLIENT_MODULE"; diff --git a/crates/next-core/src/app_source.rs b/crates/next-core/src/app_source.rs index 33cae92b70365..c7e0e0c48e7ef 100644 --- a/crates/next-core/src/app_source.rs +++ b/crates/next-core/src/app_source.rs @@ -593,7 +593,7 @@ impl AppRendererVc { for (_, imports) in segments.iter() { for (p, identifier, chunks_identifier) in imports.values() { - result += r#"("TURBOPACK { transition: next-layout-entry; chunking-type: parallel }"); + result += r#"("TURBOPACK { transition: next-layout-entry; chunking-type: isolatedParallel }"); "#; writeln!( result, diff --git a/crates/next-core/src/next_client_chunks/with_chunks.rs b/crates/next-core/src/next_client_chunks/with_chunks.rs index 5ee717c853a3e..2cda52a6327ff 100644 --- a/crates/next-core/src/next_client_chunks/with_chunks.rs +++ b/crates/next-core/src/next_client_chunks/with_chunks.rs @@ -1,7 +1,7 @@ use anyhow::{bail, Result}; use indoc::formatdoc; use serde_json::Value; -use turbo_tasks::{primitives::StringVc, TryJoinIterExt, ValueToString, ValueToStringVc}; +use turbo_tasks::{primitives::StringVc, TryJoinIterExt}; use turbo_tasks_fs::FileSystemPathVc; use turbopack::ecmascript::{ chunk::{ @@ -14,19 +14,15 @@ use turbopack::ecmascript::{ use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - available_assets::AvailableAssetsVc, Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc, - ChunkListReferenceVc, ChunkVc, ChunkableAsset, ChunkableAssetReference, - ChunkableAssetReferenceVc, ChunkableAssetVc, ChunkingContext, ChunkingContextVc, - ChunkingType, ChunkingTypeOptionVc, + available_assets::AvailableAssetsVc, Chunk, ChunkGroupReferenceVc, ChunkGroupVc, ChunkItem, + ChunkItemVc, ChunkListReferenceVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, + ChunkingContext, ChunkingContextVc, }, ident::AssetIdentVc, - reference::{AssetReference, AssetReferenceVc, AssetReferencesVc}, - resolve::{ResolveResult, ResolveResultVc}, + reference::AssetReferencesVc, }; use turbopack_ecmascript::utils::stringify_js_pretty; -use super::in_chunking_context_asset::InChunkingContextAsset; - #[turbo_tasks::function] fn modifier() -> StringVc { StringVc::cell("chunks".to_string()) @@ -55,16 +51,7 @@ impl Asset for WithChunksAsset { async fn references(self_vc: WithChunksAssetVc) -> Result { let this = self_vc.await?; Ok(AssetReferencesVc::cell(vec![ - WithChunksAssetReference { - asset: InChunkingContextAsset { - asset: this.asset, - chunking_context: this.chunking_context, - } - .cell() - .into(), - } - .cell() - .into(), + ChunkGroupReferenceVc::new(self_vc.chunk_group()).into(), ChunkListReferenceVc::new( this.server_root, self_vc.chunk_group(), @@ -101,10 +88,8 @@ impl EcmascriptChunkPlaceable for WithChunksAsset { self_vc: WithChunksAssetVc, context: ChunkingContextVc, ) -> Result { - let this = self_vc.await?; Ok(WithChunksChunkItem { context, - inner_context: this.chunking_context, inner: self_vc, } .cell() @@ -141,7 +126,6 @@ impl WithChunksAssetVc { #[turbo_tasks::value] struct WithChunksChunkItem { context: ChunkingContextVc, - inner_context: ChunkingContextVc, inner: WithChunksAssetVc, } @@ -153,15 +137,14 @@ impl EcmascriptChunkItem for WithChunksChunkItem { } #[turbo_tasks::function] - async fn content(self_vc: WithChunksChunkItemVc) -> Result { - let this = self_vc.await?; - let inner = this.inner.await?; - let group = this.inner.chunk_group(); + async fn content(&self) -> Result { + let inner = self.inner.await?; + let group = self.inner.chunk_group(); let chunks = group.chunks().await?; let server_root = inner.server_root.await?; let mut client_chunks = Vec::new(); - let chunk_list_path = this.inner.chunk_list_path().await?; + let chunk_list_path = self.inner.chunk_list_path().await?; let chunk_list_path = if let Some(path) = server_root.get_path_to(&chunk_list_path) { path } else { @@ -173,7 +156,13 @@ impl EcmascriptChunkItem for WithChunksChunkItem { client_chunks.push(Value::String(path.to_string())); } } - let module_id = stringify_js(&*inner.asset.as_chunk_item(this.inner_context).id().await?); + let module_id = stringify_js( + &*inner + .asset + .as_chunk_item(inner.chunking_context) + .id() + .await?, + ); Ok(EcmascriptChunkItemContent { inner_code: formatdoc! { r#" @@ -206,35 +195,3 @@ impl ChunkItem for WithChunksChunkItem { self.inner.references() } } - -#[turbo_tasks::value] -struct WithChunksAssetReference { - asset: AssetVc, -} - -#[turbo_tasks::value_impl] -impl ValueToString for WithChunksAssetReference { - #[turbo_tasks::function] - async fn to_string(&self) -> Result { - Ok(StringVc::cell(format!( - "referenced asset {}", - self.asset.ident().to_string().await? - ))) - } -} - -#[turbo_tasks::value_impl] -impl AssetReference for WithChunksAssetReference { - #[turbo_tasks::function] - fn resolve_reference(&self) -> ResolveResultVc { - ResolveResult::asset(self.asset).cell() - } -} - -#[turbo_tasks::value_impl] -impl ChunkableAssetReference for WithChunksAssetReference { - #[turbo_tasks::function] - fn chunking_type(&self) -> ChunkingTypeOptionVc { - ChunkingTypeOptionVc::cell(Some(ChunkingType::Separate)) - } -} diff --git a/crates/turbopack-ecmascript/src/references/esm/base.rs b/crates/turbopack-ecmascript/src/references/esm/base.rs index a536f0a4881be..4453c89363a09 100644 --- a/crates/turbopack-ecmascript/src/references/esm/base.rs +++ b/crates/turbopack-ecmascript/src/references/esm/base.rs @@ -161,6 +161,7 @@ impl ChunkableAssetReference for EsmAssetReference { match chunking_type { "separate" => Some(ChunkingType::Separate), "parallel" => Some(ChunkingType::Parallel), + "isolatedParallel" => Some(ChunkingType::IsolatedParallel), "none" => None, _ => return Err(anyhow!("unknown chunking_type: {}", chunking_type)), } From 4021fc440843627ff0f18484cb053d2cc73a5972 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Tue, 7 Mar 2023 19:41:30 +0100 Subject: [PATCH 10/21] fixup snapshots --- .../Issue while running loader-0adf3e.txt | 21 +++++++++++++++++++ .../Issue while running loader-61350a.txt | 21 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-0adf3e.txt create mode 100644 crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-61350a.txt diff --git a/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-0adf3e.txt b/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-0adf3e.txt new file mode 100644 index 0000000000000..f39ab506318b3 --- /dev/null +++ b/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-0adf3e.txt @@ -0,0 +1,21 @@ +PlainIssue { + severity: Warning, + context: "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/hello.emit", + category: "loaders", + title: "Issue while running loader", + description: "Error: Warning!\n at Object.module.exports (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/node_modules/emit-loader/index.js:2:20)\n at LOADER_EXECUTION (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4134)\n at runSyncOrAsync (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4145)\n at iterateNormalLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5782)\n at (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5426)\n at readResource (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:55:17)\n at (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:6160)\n at processResource (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5308)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4667)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4764)\n at (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4896)\n at handleResult (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:1424)\n at loadLoader (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:963)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4794)\n at runLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:8590)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:35:9)\n at \n at Module.transform (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:28:12)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]__a17b9f._.js:13:212)\n at Module.run (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_ipc_evaluate.ts_f5e151._.js:172:45)\n at processTicksAndRejections (node:internal/process/task_queues:96:5)\n", + detail: "", + documentation_link: "", + source: None, + sub_issues: [], + processing_path: Some( + [ + PlainIssueProcessingPathItem { + context: Some( + "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/index.js", + ), + description: "Next.js pages directory", + }, + ], + ), +} \ No newline at end of file diff --git a/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-61350a.txt b/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-61350a.txt new file mode 100644 index 0000000000000..376a5b4bf4d78 --- /dev/null +++ b/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-61350a.txt @@ -0,0 +1,21 @@ +PlainIssue { + severity: Error, + context: "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/hello.emit", + category: "loaders", + title: "Issue while running loader", + description: "Error: Error!\n at Object.module.exports (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/node_modules/emit-loader/index.js:4:18)\n at LOADER_EXECUTION (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4134)\n at runSyncOrAsync (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4145)\n at iterateNormalLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5782)\n at (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5426)\n at readResource (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:55:17)\n at (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:6160)\n at processResource (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5308)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4667)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4764)\n at (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4896)\n at handleResult (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:1424)\n at loadLoader (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:963)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4794)\n at runLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:8590)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:35:9)\n at \n at Module.transform (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:28:12)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]__a17b9f._.js:13:212)\n at Module.run (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_ipc_evaluate.ts_f5e151._.js:172:45)\n at processTicksAndRejections (node:internal/process/task_queues:96:5)\n", + detail: "", + documentation_link: "", + source: None, + sub_issues: [], + processing_path: Some( + [ + PlainIssueProcessingPathItem { + context: Some( + "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/index.js", + ), + description: "Next.js pages directory", + }, + ], + ), +} \ No newline at end of file From 66539f1078849b41b90c5b79b9435525d31e23a7 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Thu, 9 Mar 2023 16:45:40 +0100 Subject: [PATCH 11/21] review --- crates/turbopack-core/src/chunk/available_assets.rs | 3 +++ crates/turbopack-core/src/chunk/mod.rs | 2 +- crates/turbopack-ecmascript/src/chunk/mod.rs | 2 +- crates/turbopack-ecmascript/src/references/pattern_mapping.rs | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/crates/turbopack-core/src/chunk/available_assets.rs b/crates/turbopack-core/src/chunk/available_assets.rs index 7dc3dbe0058a0..f00d820c52101 100644 --- a/crates/turbopack-core/src/chunk/available_assets.rs +++ b/crates/turbopack-core/src/chunk/available_assets.rs @@ -14,6 +14,9 @@ use crate::{ reference::AssetReference, }; +/// Allows to gather information about which assets are already available. +/// Adding more roots will form a linked list like structure to allow caching +/// `include` queries. #[turbo_tasks::value] pub struct AvailableAssets { parent: Option, diff --git a/crates/turbopack-core/src/chunk/mod.rs b/crates/turbopack-core/src/chunk/mod.rs index d1bc353d6c39b..c9ea751277bb3 100644 --- a/crates/turbopack-core/src/chunk/mod.rs +++ b/crates/turbopack-core/src/chunk/mod.rs @@ -266,7 +266,7 @@ pub enum ChunkingType { PlacedOrParallel, /// Asset is always placed in a separate chunk that is loaded in parallel. Parallel, - /// Asset is always placed in a separate chunk that is loaded in parallel. + /// Asset is always placed in a separate chunk that is loaded in parallel. /// Referenced asset will not inherit the available modules, but form a /// new availablility root. IsolatedParallel, diff --git a/crates/turbopack-ecmascript/src/chunk/mod.rs b/crates/turbopack-ecmascript/src/chunk/mod.rs index 4c7f9e9b70b12..81b103c921f24 100644 --- a/crates/turbopack-ecmascript/src/chunk/mod.rs +++ b/crates/turbopack-ecmascript/src/chunk/mod.rs @@ -403,7 +403,7 @@ impl Asset for EcmascriptChunk { modifiers.extend(evaluate.entry_modules_ids.iter().map(|id| id.to_string())); } - // Available assets are include + // Available assets are included if let Some(available_assets) = this.available_assets { modifiers.push(available_assets.hash().to_string()); } diff --git a/crates/turbopack-ecmascript/src/references/pattern_mapping.rs b/crates/turbopack-ecmascript/src/references/pattern_mapping.rs index bc58fc2a5aadc..16a3e09c813dd 100644 --- a/crates/turbopack-ecmascript/src/references/pattern_mapping.rs +++ b/crates/turbopack-ecmascript/src/references/pattern_mapping.rs @@ -159,7 +159,7 @@ impl PatternMappingVc { if *resolve_type == ResolveType::EsmAsync { // Passing no available_assets and no current_availability_root works here // because the manifest loader has an id that is independent of them. So luckily - // we don't need chunk dependenent code generation. + // we don't need chunk dependent code generation. if let Some(loader) = EcmascriptChunkItemVc::from_async_asset(context, chunkable, None, None).await? { From 1593cc00d9930077fac2049697a14f28268baf3d Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Thu, 9 Mar 2023 17:32:20 +0100 Subject: [PATCH 12/21] refactor to use AvailablilityInfo --- .../in_chunking_context_asset.rs | 15 +--- .../src/next_client_chunks/with_chunks.rs | 20 +++-- .../with_chunking_context_scope_asset.rs | 10 +-- .../with_client_chunks.rs | 19 +++-- crates/next-core/src/web_entry_source.rs | 9 ++- .../src/chunk/available_assets.rs | 13 ---- .../src/chunk/availablility_info.rs | 40 ++++++++++ crates/turbopack-core/src/chunk/mod.rs | 74 +++++++------------ crates/turbopack-css/src/asset.rs | 13 +--- crates/turbopack-css/src/chunk/mod.rs | 60 ++++----------- crates/turbopack-css/src/chunk/optimize.rs | 5 +- crates/turbopack-css/src/module_asset.rs | 24 ++---- .../turbopack-ecmascript/src/chunk/content.rs | 72 +++++------------- crates/turbopack-ecmascript/src/chunk/item.rs | 33 ++++++--- .../src/chunk/manifest/chunk_asset.rs | 30 +++----- crates/turbopack-ecmascript/src/chunk/mod.rs | 45 +++++------ .../src/chunk/optimize.rs | 8 +- .../src/chunk_group_files_asset.rs | 25 +++++-- crates/turbopack-ecmascript/src/lib.rs | 8 +- .../src/references/pattern_mapping.rs | 19 +++-- crates/turbopack-env/src/asset.rs | 14 +--- crates/turbopack-json/src/lib.rs | 10 +-- crates/turbopack-mdx/src/lib.rs | 8 +- crates/turbopack-static/src/lib.rs | 10 +-- crates/turbopack-tests/tests/snapshot.rs | 12 ++- 25 files changed, 250 insertions(+), 346 deletions(-) create mode 100644 crates/turbopack-core/src/chunk/availablility_info.rs diff --git a/crates/next-core/src/next_client_chunks/in_chunking_context_asset.rs b/crates/next-core/src/next_client_chunks/in_chunking_context_asset.rs index d6629badabe36..6b2567544cc12 100644 --- a/crates/next-core/src/next_client_chunks/in_chunking_context_asset.rs +++ b/crates/next-core/src/next_client_chunks/in_chunking_context_asset.rs @@ -1,5 +1,5 @@ use anyhow::Result; -use turbo_tasks::primitives::StringVc; +use turbo_tasks::{primitives::StringVc, Value}; use turbopack::ecmascript::chunk::{ EcmascriptChunkItemVc, EcmascriptChunkPlaceable, EcmascriptChunkPlaceableVc, EcmascriptChunkVc, EcmascriptExportsVc, @@ -7,7 +7,7 @@ use turbopack::ecmascript::chunk::{ use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - available_assets::AvailableAssetsVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, + availablility_info::AvailablilityInfo, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc, }, ident::AssetIdentVc, @@ -49,16 +49,9 @@ impl ChunkableAsset for InChunkingContextAsset { fn as_chunk( &self, _context: ChunkingContextVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> ChunkVc { - EcmascriptChunkVc::new( - self.chunking_context, - self.asset, - available_assets, - current_availability_root, - ) - .into() + EcmascriptChunkVc::new(self.chunking_context, self.asset, availablility_info).into() } } diff --git a/crates/next-core/src/next_client_chunks/with_chunks.rs b/crates/next-core/src/next_client_chunks/with_chunks.rs index 2cda52a6327ff..af3eff4b7d1e4 100644 --- a/crates/next-core/src/next_client_chunks/with_chunks.rs +++ b/crates/next-core/src/next_client_chunks/with_chunks.rs @@ -1,7 +1,6 @@ use anyhow::{bail, Result}; use indoc::formatdoc; -use serde_json::Value; -use turbo_tasks::{primitives::StringVc, TryJoinIterExt}; +use turbo_tasks::{primitives::StringVc, TryJoinIterExt, Value}; use turbo_tasks_fs::FileSystemPathVc; use turbopack::ecmascript::{ chunk::{ @@ -14,8 +13,8 @@ use turbopack::ecmascript::{ use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - available_assets::AvailableAssetsVc, Chunk, ChunkGroupReferenceVc, ChunkGroupVc, ChunkItem, - ChunkItemVc, ChunkListReferenceVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, + availablility_info::AvailablilityInfo, Chunk, ChunkGroupReferenceVc, ChunkGroupVc, + ChunkItem, ChunkItemVc, ChunkListReferenceVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContext, ChunkingContextVc, }, ident::AssetIdentVc, @@ -68,14 +67,12 @@ impl ChunkableAsset for WithChunksAsset { fn as_chunk( self_vc: WithChunksAssetVc, context: ChunkingContextVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> ChunkVc { EcmascriptChunkVc::new( context, self_vc.as_ecmascript_chunk_placeable(), - available_assets, - current_availability_root, + availablility_info, ) .into() } @@ -117,8 +114,9 @@ impl WithChunksAssetVc { Ok(ChunkGroupVc::from_asset( this.asset.into(), this.chunking_context, - None, - Some(this.asset.into()), + Value::new(AvailablilityInfo::Root { + current_availability_root: this.asset.into(), + }), )) } } @@ -153,7 +151,7 @@ impl EcmascriptChunkItem for WithChunksChunkItem { for chunk_path in chunks.iter().map(|c| c.path()).try_join().await? { if let Some(path) = server_root.get_path_to(&chunk_path) { - client_chunks.push(Value::String(path.to_string())); + client_chunks.push(serde_json::Value::String(path.to_string())); } } let module_id = stringify_js( diff --git a/crates/next-core/src/next_client_component/with_chunking_context_scope_asset.rs b/crates/next-core/src/next_client_component/with_chunking_context_scope_asset.rs index 30dbcb9318219..5f32c16c423db 100644 --- a/crates/next-core/src/next_client_component/with_chunking_context_scope_asset.rs +++ b/crates/next-core/src/next_client_component/with_chunking_context_scope_asset.rs @@ -1,5 +1,5 @@ use anyhow::Result; -use turbo_tasks::primitives::StringVc; +use turbo_tasks::{primitives::StringVc, Value}; use turbopack::ecmascript::chunk::{ EcmascriptChunkItemVc, EcmascriptChunkPlaceable, EcmascriptChunkPlaceableVc, EcmascriptChunkVc, EcmascriptExportsVc, @@ -7,7 +7,7 @@ use turbopack::ecmascript::chunk::{ use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - available_assets::AvailableAssetsVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, + availablility_info::AvailablilityInfo, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContext, ChunkingContextVc, }, ident::AssetIdentVc, @@ -49,14 +49,12 @@ impl ChunkableAsset for WithChunkingContextScopeAsset { fn as_chunk( &self, context: ChunkingContextVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> ChunkVc { EcmascriptChunkVc::new( context.with_layer(&self.layer), self.asset, - available_assets, - current_availability_root, + availablility_info, ) .into() } diff --git a/crates/next-core/src/next_client_component/with_client_chunks.rs b/crates/next-core/src/next_client_component/with_client_chunks.rs index 4c87964532ab7..a0255c96b90af 100644 --- a/crates/next-core/src/next_client_component/with_client_chunks.rs +++ b/crates/next-core/src/next_client_component/with_client_chunks.rs @@ -1,6 +1,6 @@ use anyhow::Result; use indoc::formatdoc; -use turbo_tasks::{primitives::StringVc, ValueToString, ValueToStringVc}; +use turbo_tasks::{primitives::StringVc, Value, ValueToString, ValueToStringVc}; use turbo_tasks_fs::FileSystemPathVc; use turbopack::ecmascript::{ chunk::{ @@ -13,9 +13,9 @@ use turbopack::ecmascript::{ use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - available_assets::AvailableAssetsVc, Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc, ChunkVc, - ChunkableAsset, ChunkableAssetReference, ChunkableAssetReferenceVc, ChunkableAssetVc, - ChunkingContext, ChunkingContextVc, ChunkingType, ChunkingTypeOptionVc, + availablility_info::AvailablilityInfo, Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc, + ChunkVc, ChunkableAsset, ChunkableAssetReference, ChunkableAssetReferenceVc, + ChunkableAssetVc, ChunkingContext, ChunkingContextVc, ChunkingType, ChunkingTypeOptionVc, }, ident::AssetIdentVc, reference::{AssetReference, AssetReferenceVc, AssetReferencesVc}, @@ -62,14 +62,12 @@ impl ChunkableAsset for WithClientChunksAsset { fn as_chunk( self_vc: WithClientChunksAssetVc, context: ChunkingContextVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> ChunkVc { EcmascriptChunkVc::new( context.with_layer("rsc"), self_vc.as_ecmascript_chunk_placeable(), - available_assets, - current_availability_root, + availablility_info, ) .into() } @@ -116,8 +114,9 @@ impl EcmascriptChunkItem for WithClientChunksChunkItem { let group = ChunkGroupVc::from_asset( inner.asset.into(), self.context, - None, - Some(inner.asset.into()), + Value::new(AvailablilityInfo::Root { + current_availability_root: inner.asset.into(), + }), ); let chunks = group.chunks().await?; let server_root = inner.server_root.await?; diff --git a/crates/next-core/src/web_entry_source.rs b/crates/next-core/src/web_entry_source.rs index 3c02c3c272566..6bde0502bee9e 100644 --- a/crates/next-core/src/web_entry_source.rs +++ b/crates/next-core/src/web_entry_source.rs @@ -4,7 +4,9 @@ use turbo_tasks_env::ProcessEnvVc; use turbo_tasks_fs::FileSystemPathVc; use turbopack::ecmascript::EcmascriptModuleAssetVc; use turbopack_core::{ - chunk::{ChunkGroupVc, ChunkableAsset, ChunkableAssetVc}, + chunk::{ + availablility_info::AvailablilityInfo, ChunkGroupVc, ChunkableAsset, ChunkableAssetVc, + }, reference_type::{EntryReferenceSubType, ReferenceType}, resolve::{origin::PlainResolveOriginVc, parse::RequestVc}, }; @@ -82,8 +84,9 @@ pub async fn create_web_entry_source( // add an ecmascript chunk with the runtime code Ok(ChunkGroupVc::from_chunk(chunkable.as_chunk( chunking_context, - None, - Some(module), + Value::new(AvailablilityInfo::Root { + current_availability_root: module, + }), ))) } else { // TODO convert into a serve-able asset diff --git a/crates/turbopack-core/src/chunk/available_assets.rs b/crates/turbopack-core/src/chunk/available_assets.rs index f00d820c52101..c44bd9ff45db2 100644 --- a/crates/turbopack-core/src/chunk/available_assets.rs +++ b/crates/turbopack-core/src/chunk/available_assets.rs @@ -78,19 +78,6 @@ impl AvailableAssetsVc { } } -impl AvailableAssetsVc { - pub fn from(parent: Option, root: Option) -> Option { - let Some(root) = root else { - return parent; - }; - if let Some(parent) = parent { - Some(parent.with_roots(vec![root])) - } else { - Some(Self::new(vec![root])) - } - } -} - #[turbo_tasks::function] async fn chunkable_assets_set(root: AssetVc) -> Result { let assets = GraphTraversal::, _>>::visit( diff --git a/crates/turbopack-core/src/chunk/availablility_info.rs b/crates/turbopack-core/src/chunk/availablility_info.rs new file mode 100644 index 0000000000000..29c8f5d2f25cd --- /dev/null +++ b/crates/turbopack-core/src/chunk/availablility_info.rs @@ -0,0 +1,40 @@ +use super::available_assets::AvailableAssetsVc; +use crate::asset::AssetVc; + +#[turbo_tasks::value(serialization = "auto_for_input")] +#[derive(PartialOrd, Ord, Hash, Clone, Copy, Debug)] +pub enum AvailablilityInfo { + Untracked, + Root { + current_availability_root: AssetVc, + }, + Inner { + available_assets: AvailableAssetsVc, + current_availability_root: AssetVc, + }, +} + +impl AvailablilityInfo { + pub fn current_availability_root(&self) -> Option { + match self { + Self::Untracked => None, + Self::Root { + current_availability_root, + } => Some(*current_availability_root), + Self::Inner { + current_availability_root, + .. + } => Some(*current_availability_root), + } + } + + pub fn available_assets(&self) -> Option { + match self { + Self::Untracked => None, + Self::Root { .. } => None, + Self::Inner { + available_assets, .. + } => Some(*available_assets), + } + } +} diff --git a/crates/turbopack-core/src/chunk/mod.rs b/crates/turbopack-core/src/chunk/mod.rs index c9ea751277bb3..3fc7e5a169354 100644 --- a/crates/turbopack-core/src/chunk/mod.rs +++ b/crates/turbopack-core/src/chunk/mod.rs @@ -1,4 +1,5 @@ pub mod available_assets; +pub mod availablility_info; pub mod chunk_in_group; pub mod dev; pub(crate) mod list; @@ -21,14 +22,14 @@ use turbo_tasks::{ }, primitives::{BoolVc, StringVc}, trace::TraceRawVcs, - TryJoinIterExt, ValueToString, ValueToStringVc, + TryJoinIterExt, Value, ValueToString, ValueToStringVc, }; use turbo_tasks_fs::FileSystemPathVc; use turbo_tasks_hash::DeterministicHash; pub use self::list::reference::{ChunkListReference, ChunkListReferenceVc}; use self::{ - available_assets::AvailableAssetsVc, chunk_in_group::ChunkInGroupVc, optimize::optimize, + availablility_info::AvailablilityInfo, chunk_in_group::ChunkInGroupVc, optimize::optimize, }; use crate::{ asset::{Asset, AssetVc, AssetsVc}, @@ -113,8 +114,7 @@ pub trait ChunkableAsset: Asset { fn as_chunk( &self, context: ChunkingContextVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> ChunkVc; } @@ -133,10 +133,9 @@ impl ChunkGroupVc { pub fn from_asset( asset: ChunkableAssetVc, context: ChunkingContextVc, - available_asset: Option, - current_availability_root: Option, + availablility_info: Value, ) -> Self { - Self::from_chunk(asset.as_chunk(context, available_asset, current_availability_root)) + Self::from_chunk(asset.as_chunk(context, availablility_info)) } /// Creates a chunk group from an chunk as entrypoint @@ -402,8 +401,7 @@ pub trait FromChunkableAsset: ChunkItem + Sized + Debug { async fn from_async_asset( context: ChunkingContextVc, asset: ChunkableAssetVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> Result>; } @@ -411,30 +409,21 @@ pub async fn chunk_content_split( context: ChunkingContextVc, entry: AssetVc, additional_entries: Option, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> Result> where I: FromChunkableAsset + Eq + std::hash::Hash + Clone, { - chunk_content_internal_parallel( - context, - entry, - additional_entries, - available_assets, - current_availability_root, - true, - ) - .await - .map(|o| o.unwrap()) + chunk_content_internal_parallel(context, entry, additional_entries, availablility_info, true) + .await + .map(|o| o.unwrap()) } pub async fn chunk_content( context: ChunkingContextVc, entry: AssetVc, additional_entries: Option, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> Result>> where I: FromChunkableAsset + Eq + std::hash::Hash + Clone, @@ -443,8 +432,7 @@ where context, entry, additional_entries, - available_assets, - current_availability_root, + availablility_info, false, ) .await @@ -468,8 +456,7 @@ enum ChunkContentGraphNode { struct ChunkContentContext { chunking_context: ChunkingContextVc, entry: AssetVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, split: bool, } @@ -502,7 +489,7 @@ where let mut graph_nodes = vec![]; for asset in assets { - if let Some(available_assets) = context.available_assets { + if let Some(available_assets) = context.availablility_info.available_assets() { if *available_assets.includes(asset).await? { graph_nodes.push(( Some((asset, chunking_type)), @@ -538,11 +525,8 @@ where } } ChunkingType::Parallel => { - let chunk = chunkable_asset.as_chunk( - context.chunking_context, - context.available_assets, - context.current_availability_root, - ); + let chunk = + chunkable_asset.as_chunk(context.chunking_context, context.availablility_info); graph_nodes.push(( Some((asset, chunking_type)), ChunkContentGraphNode::Chunk(chunk), @@ -551,8 +535,9 @@ where ChunkingType::IsolatedParallel => { let chunk = chunkable_asset.as_chunk( context.chunking_context, - None, - Some(chunkable_asset.into()), + Value::new(AvailablilityInfo::Root { + current_availability_root: chunkable_asset.into(), + }), ); graph_nodes.push(( Some((asset, chunking_type)), @@ -578,11 +563,8 @@ where } } - let chunk = chunkable_asset.as_chunk( - context.chunking_context, - context.available_assets, - context.current_availability_root, - ); + let chunk = + chunkable_asset.as_chunk(context.chunking_context, context.availablility_info); graph_nodes.push(( Some((asset, chunking_type)), ChunkContentGraphNode::Chunk(chunk), @@ -594,8 +576,7 @@ where ChunkContentGraphNode::AsyncChunkGroup(ChunkGroupVc::from_asset( chunkable_asset, context.chunking_context, - context.available_assets, - context.current_availability_root, + context.availablility_info, )), )); } @@ -603,8 +584,7 @@ where if let Some(manifest_loader_item) = I::from_async_asset( context.chunking_context, chunkable_asset, - context.available_assets, - context.current_availability_root, + context.availablility_info, ) .await? { @@ -708,8 +688,7 @@ async fn chunk_content_internal_parallel( chunking_context: ChunkingContextVc, entry: AssetVc, additional_entries: Option, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, split: bool, ) -> Result>> where @@ -739,8 +718,7 @@ where chunking_context, entry, split, - available_assets, - current_availability_root, + availablility_info, }; let visit = ChunkContentVisit { diff --git a/crates/turbopack-css/src/asset.rs b/crates/turbopack-css/src/asset.rs index a0a3d78c53cf0..e8fd1410d6003 100644 --- a/crates/turbopack-css/src/asset.rs +++ b/crates/turbopack-css/src/asset.rs @@ -12,7 +12,7 @@ use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - available_assets::AvailableAssetsVc, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + availablility_info::AvailablilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc, }, context::AssetContextVc, @@ -121,16 +121,9 @@ impl ChunkableAsset for CssModuleAsset { fn as_chunk( self_vc: CssModuleAssetVc, context: ChunkingContextVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> ChunkVc { - CssChunkVc::new( - context, - self_vc.into(), - available_assets, - current_availability_root, - ) - .into() + CssChunkVc::new(context, self_vc.into(), availablility_info).into() } } diff --git a/crates/turbopack-css/src/chunk/mod.rs b/crates/turbopack-css/src/chunk/mod.rs index 284cac6fd2516..08c4ef1b70493 100644 --- a/crates/turbopack-css/src/chunk/mod.rs +++ b/crates/turbopack-css/src/chunk/mod.rs @@ -11,7 +11,7 @@ use turbo_tasks_fs::{rope::Rope, File, FileSystemPathOptionVc, FileSystemPathVc} use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - available_assets::AvailableAssetsVc, + availablility_info::AvailablilityInfo, chunk_content, chunk_content_split, optimize::{ChunkOptimizerVc, OptimizableChunk, OptimizableChunkVc}, Chunk, ChunkContentResult, ChunkGroupReferenceVc, ChunkGroupVc, ChunkItem, ChunkItemVc, @@ -42,8 +42,7 @@ use crate::{ pub struct CssChunk { context: ChunkingContextVc, main_entries: CssChunkPlaceablesVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: AvailablilityInfo, } #[turbo_tasks::value_impl] @@ -52,14 +51,12 @@ impl CssChunkVc { pub fn new_normalized( context: ChunkingContextVc, main_entries: CssChunkPlaceablesVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> Self { CssChunk { context, main_entries, - available_assets, - current_availability_root, + availablility_info: availablility_info.into_value(), } .cell() } @@ -68,14 +65,12 @@ impl CssChunkVc { pub fn new( context: ChunkingContextVc, entry: CssChunkPlaceableVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> Self { Self::new_normalized( context, CssChunkPlaceablesVc::cell(vec![entry]), - available_assets, - current_availability_root, + availablility_info, ) } @@ -217,21 +212,13 @@ impl From> for CssChunkContentResult { async fn css_chunk_content( context: ChunkingContextVc, entries: CssChunkPlaceablesVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> Result { let entries = entries.await?; let entries = entries.iter().copied(); let contents = entries - .map(|entry| { - css_chunk_content_single_entry( - context, - entry, - available_assets, - current_availability_root, - ) - }) + .map(|entry| css_chunk_content_single_entry(context, entry, availablility_info)) .collect::>(); if contents.len() == 1 { @@ -269,29 +256,15 @@ async fn css_chunk_content( async fn css_chunk_content_single_entry( context: ChunkingContextVc, entry: CssChunkPlaceableVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> Result { let asset = entry.as_asset(); - let res = if let Some(res) = chunk_content::( - context, - asset, - None, - available_assets, - current_availability_root, - ) - .await? + let res = if let Some(res) = + chunk_content::(context, asset, None, availablility_info).await? { res } else { - chunk_content_split::( - context, - asset, - None, - available_assets, - current_availability_root, - ) - .await? + chunk_content_split::(context, asset, None, availablility_info).await? }; Ok(CssChunkContentResultVc::cell(res.into())) @@ -350,8 +323,7 @@ impl Asset for CssChunk { let content = css_chunk_content( this.context, this.main_entries, - this.available_assets, - this.current_availability_root, + Value::new(this.availablility_info), ) .await?; let mut references = Vec::new(); @@ -452,8 +424,7 @@ impl FromChunkableAsset for CssChunkItemVc { async fn from_async_asset( _context: ChunkingContextVc, _asset: ChunkableAssetVc, - _available_assets: Option, - _current_availability_root: Option, + _availablility_info: Value, ) -> Result> { Ok(None) } @@ -489,8 +460,7 @@ impl Introspectable for CssChunk { let chunk_content = css_chunk_content( this.context, this.main_entries, - this.available_assets, - this.current_availability_root, + Value::new(this.availablility_info), ) .await?; details += "Chunk items:\n\n"; diff --git a/crates/turbopack-css/src/chunk/optimize.rs b/crates/turbopack-css/src/chunk/optimize.rs index 73018534b5cdf..79e1ee682c692 100644 --- a/crates/turbopack-css/src/chunk/optimize.rs +++ b/crates/turbopack-css/src/chunk/optimize.rs @@ -1,6 +1,6 @@ use anyhow::{bail, Result}; use indexmap::IndexSet; -use turbo_tasks::TryJoinIterExt; +use turbo_tasks::{TryJoinIterExt, Value}; use turbopack_core::chunk::{ optimize::{ChunkOptimizer, ChunkOptimizerVc}, ChunkGroupVc, ChunkVc, ChunkingContextVc, ChunksVc, @@ -63,8 +63,7 @@ async fn merge_chunks( Ok(CssChunkVc::new_normalized( first.await?.context, CssChunkPlaceablesVc::cell(main_entries.into_iter().collect()), - first.await?.available_assets, - first.await?.current_availability_root, + Value::new(first.await?.availablility_info), )) } diff --git a/crates/turbopack-css/src/module_asset.rs b/crates/turbopack-css/src/module_asset.rs index 7e72255594f2d..d80c4ee5af798 100644 --- a/crates/turbopack-css/src/module_asset.rs +++ b/crates/turbopack-css/src/module_asset.rs @@ -12,7 +12,7 @@ use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - available_assets::AvailableAssetsVc, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + availablility_info::AvailablilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetReference, ChunkableAssetReferenceVc, ChunkableAssetVc, ChunkingContextVc, ChunkingType, ChunkingTypeOptionVc, }, @@ -202,16 +202,9 @@ impl ChunkableAsset for ModuleCssModuleAsset { fn as_chunk( self_vc: ModuleCssModuleAssetVc, context: ChunkingContextVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> ChunkVc { - EcmascriptChunkVc::new( - context, - self_vc.into(), - available_assets, - current_availability_root, - ) - .into() + EcmascriptChunkVc::new(context, self_vc.into(), availablility_info).into() } } @@ -456,16 +449,9 @@ impl ChunkableAsset for CssProxyModuleAsset { fn as_chunk( self_vc: CssProxyModuleAssetVc, context: ChunkingContextVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> ChunkVc { - CssChunkVc::new( - context, - self_vc.into(), - available_assets, - current_availability_root, - ) - .into() + CssChunkVc::new(context, self_vc.into(), availablility_info).into() } } diff --git a/crates/turbopack-ecmascript/src/chunk/content.rs b/crates/turbopack-ecmascript/src/chunk/content.rs index 9e9def194c1d8..669c57894a47f 100644 --- a/crates/turbopack-ecmascript/src/chunk/content.rs +++ b/crates/turbopack-ecmascript/src/chunk/content.rs @@ -3,12 +3,12 @@ use std::io::Write as _; use anyhow::{anyhow, bail, Result}; use indexmap::IndexSet; use indoc::{indoc, writedoc}; -use turbo_tasks::TryJoinIterExt; +use turbo_tasks::{TryJoinIterExt, Value}; use turbo_tasks_fs::{embed_file, File, FileContent, FileSystemPathReadRef, FileSystemPathVc}; use turbopack_core::{ - asset::{AssetContentVc, AssetVc}, + asset::AssetContentVc, chunk::{ - available_assets::AvailableAssetsVc, chunk_content, chunk_content_split, + availablility_info::AvailablilityInfo, chunk_content, chunk_content_split, ChunkContentResult, ChunkGroupVc, ChunkVc, ChunkingContext, ChunkingContextVc, ModuleId, }, code_builder::{CodeBuilder, CodeVc}, @@ -64,22 +64,13 @@ pub(crate) fn ecmascript_chunk_content( context: ChunkingContextVc, main_entries: EcmascriptChunkPlaceablesVc, omit_entries: Option, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> EcmascriptChunkContentResultVc { - let mut chunk_content = ecmascript_chunk_content_internal( - context, - main_entries, - available_assets, - current_availability_root, - ); + let mut chunk_content = + ecmascript_chunk_content_internal(context, main_entries, availablility_info); if let Some(omit_entries) = omit_entries { - let omit_chunk_content = ecmascript_chunk_content_internal( - context, - omit_entries, - available_assets, - current_availability_root, - ); + let omit_chunk_content = + ecmascript_chunk_content_internal(context, omit_entries, availablility_info); chunk_content = chunk_content.filter(omit_chunk_content); } chunk_content @@ -89,21 +80,13 @@ pub(crate) fn ecmascript_chunk_content( async fn ecmascript_chunk_content_internal( context: ChunkingContextVc, entries: EcmascriptChunkPlaceablesVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> Result { let entries = entries.await?; let entries = entries.iter().copied(); let contents = entries - .map(|entry| { - ecmascript_chunk_content_single_entry( - context, - entry, - available_assets, - current_availability_root, - ) - }) + .map(|entry| ecmascript_chunk_content_single_entry(context, entry, availablility_info)) .collect::>(); if contents.len() == 1 { @@ -145,31 +128,18 @@ async fn ecmascript_chunk_content_internal( async fn ecmascript_chunk_content_single_entry( context: ChunkingContextVc, entry: EcmascriptChunkPlaceableVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> Result { let asset = entry.as_asset(); Ok(EcmascriptChunkContentResultVc::cell( - if let Some(res) = chunk_content::( - context, - asset, - None, - available_assets, - current_availability_root, - ) - .await? + if let Some(res) = + chunk_content::(context, asset, None, availablility_info).await? { res } else { - chunk_content_split::( - context, - asset, - None, - available_assets, - current_availability_root, - ) - .await? + chunk_content_split::(context, asset, None, availablility_info) + .await? } .into(), )) @@ -193,18 +163,12 @@ impl EcmascriptChunkContentVc { omit_entries: Option, chunk_path: FileSystemPathVc, evaluate: Option, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> Result { // TODO(alexkirsz) All of this should be done in a transition, otherwise we run // the risks of values not being strongly consistent with each other. - let chunk_content = ecmascript_chunk_content( - context, - main_entries, - omit_entries, - available_assets, - current_availability_root, - ); + let chunk_content = + ecmascript_chunk_content(context, main_entries, omit_entries, availablility_info); let chunk_content = chunk_content.await?; let chunk_path = chunk_path.await?; let module_factories = chunk_content.chunk_items.to_entry_snapshot().await?; diff --git a/crates/turbopack-ecmascript/src/chunk/item.rs b/crates/turbopack-ecmascript/src/chunk/item.rs index 182971245393d..678e905f5e958 100644 --- a/crates/turbopack-ecmascript/src/chunk/item.rs +++ b/crates/turbopack-ecmascript/src/chunk/item.rs @@ -1,13 +1,13 @@ use anyhow::Result; use indexmap::IndexSet; use serde::{Deserialize, Serialize}; -use turbo_tasks::{trace::TraceRawVcs, TryJoinIterExt}; +use turbo_tasks::{trace::TraceRawVcs, TryJoinIterExt, Value}; use turbo_tasks_fs::rope::Rope; use turbopack_core::{ asset::AssetVc, chunk::{ - available_assets::AvailableAssetsVc, ChunkItem, ChunkItemVc, ChunkableAssetVc, - ChunkingContextVc, FromChunkableAsset, ModuleIdVc, + available_assets::AvailableAssetsVc, availablility_info::AvailablilityInfo, ChunkItem, + ChunkItemVc, ChunkableAssetVc, ChunkingContextVc, FromChunkableAsset, ModuleIdVc, }, }; @@ -61,17 +61,26 @@ impl FromChunkableAsset for EcmascriptChunkItemVc { async fn from_async_asset( context: ChunkingContextVc, asset: ChunkableAssetVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> Result> { - let next_available_assets = if let Some(next_available_assets) = - AvailableAssetsVc::from(available_assets, current_availability_root) - { - Some(next_available_assets.resolve().await?) - } else { - None + let next_availablility_info = match availablility_info.into_value() { + AvailablilityInfo::Untracked => AvailablilityInfo::Untracked, + AvailablilityInfo::Root { + current_availability_root, + } => AvailablilityInfo::Inner { + available_assets: AvailableAssetsVc::new(vec![current_availability_root]), + current_availability_root: asset.as_asset(), + }, + AvailablilityInfo::Inner { + available_assets, + current_availability_root, + } => AvailablilityInfo::Inner { + available_assets: available_assets.with_roots(vec![current_availability_root]), + current_availability_root: asset.as_asset(), + }, }; - let manifest_asset = ManifestChunkAssetVc::new(asset, context, next_available_assets); + let manifest_asset = + ManifestChunkAssetVc::new(asset, context, Value::new(next_availablility_info)); let manifest_loader = ManifestLoaderItemVc::new(manifest_asset); Ok(Some(manifest_loader.into())) } diff --git a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs index 197d78cf00648..995e6a51e9f86 100644 --- a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs +++ b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs @@ -1,10 +1,10 @@ use anyhow::Result; -use turbo_tasks::primitives::StringVc; +use turbo_tasks::{primitives::StringVc, Value}; use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - available_assets::AvailableAssetsVc, ChunkGroupVc, ChunkReferenceVc, ChunkVc, + availablility_info::AvailablilityInfo, ChunkGroupVc, ChunkReferenceVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContext, ChunkingContextVc, }, ident::AssetIdentVc, @@ -45,7 +45,7 @@ fn chunk_list_modifier() -> StringVc { pub struct ManifestChunkAsset { pub asset: ChunkableAssetVc, pub chunking_context: ChunkingContextVc, - pub available_assets: Option, + pub availablility_info: AvailablilityInfo, } #[turbo_tasks::value_impl] @@ -54,12 +54,12 @@ impl ManifestChunkAssetVc { pub fn new( asset: ChunkableAssetVc, chunking_context: ChunkingContextVc, - available_assets: Option, + availablility_info: Value, ) -> Self { Self::cell(ManifestChunkAsset { asset, chunking_context, - available_assets, + availablility_info: availablility_info.into_value(), }) } @@ -69,8 +69,7 @@ impl ManifestChunkAssetVc { Ok(ChunkGroupVc::from_asset( this.asset, this.chunking_context, - this.available_assets, - Some(this.asset.as_asset()), + Value::new(this.availablility_info), )) } @@ -83,11 +82,7 @@ impl ManifestChunkAssetVc { #[turbo_tasks::function] pub async fn manifest_chunk(self) -> Result { let this = self.await?; - Ok(self.as_chunk( - this.chunking_context, - this.available_assets, - Some(self.as_asset()), - )) + Ok(self.as_chunk(this.chunking_context, Value::new(this.availablility_info))) } #[turbo_tasks::function] @@ -133,16 +128,9 @@ impl ChunkableAsset for ManifestChunkAsset { fn as_chunk( self_vc: ManifestChunkAssetVc, context: ChunkingContextVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> ChunkVc { - EcmascriptChunkVc::new( - context, - self_vc.into(), - available_assets, - current_availability_root, - ) - .into() + EcmascriptChunkVc::new(context, self_vc.into(), availablility_info).into() } } diff --git a/crates/turbopack-ecmascript/src/chunk/mod.rs b/crates/turbopack-ecmascript/src/chunk/mod.rs index 81b103c921f24..2b37d693e836e 100644 --- a/crates/turbopack-ecmascript/src/chunk/mod.rs +++ b/crates/turbopack-ecmascript/src/chunk/mod.rs @@ -24,7 +24,7 @@ use turbo_tasks_fs::FileSystemPathOptionVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - available_assets::AvailableAssetsVc, + availablility_info::AvailablilityInfo, optimize::{ChunkOptimizerVc, OptimizableChunk, OptimizableChunkVc}, Chunk, ChunkGroupReferenceVc, ChunkGroupVc, ChunkItem, ChunkListReferenceVc, ChunkReferenceVc, ChunkVc, ChunkingContext, ChunkingContextVc, @@ -63,8 +63,7 @@ pub struct EcmascriptChunk { main_entries: EcmascriptChunkPlaceablesVc, omit_entries: Option, evaluate: Option, - available_assets: Option, - current_availability_root: Option, + availablility_info: AvailablilityInfo, } #[turbo_tasks::value_impl] @@ -75,16 +74,14 @@ impl EcmascriptChunkVc { main_entries: EcmascriptChunkPlaceablesVc, omit_entries: Option, evaluate: Option, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> Self { EcmascriptChunk { context, main_entries, omit_entries, evaluate, - available_assets, - current_availability_root, + availablility_info: availablility_info.into_value(), } .cell() } @@ -93,16 +90,14 @@ impl EcmascriptChunkVc { pub fn new( context: ChunkingContextVc, main_entry: EcmascriptChunkPlaceableVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> Self { Self::new_normalized( context, EcmascriptChunkPlaceablesVc::cell(vec![main_entry]), None, None, - available_assets, - current_availability_root, + availablility_info, ) } @@ -130,8 +125,9 @@ impl EcmascriptChunkVc { } .cell(), ), - None, - Some(main_entry.as_asset()), + Value::new(AvailablilityInfo::Root { + current_availability_root: main_entry.as_asset(), + }), )) } @@ -174,15 +170,13 @@ impl EcmascriptChunkVc { a.context, a.main_entries, a.omit_entries, - a.available_assets, - a.current_availability_root, + Value::new(a.availablility_info), ); let b = ecmascript_chunk_content( b.context, b.main_entries, b.omit_entries, - b.available_assets, - b.current_availability_root, + Value::new(b.availablility_info), ); let a = a.await?.chunk_items.to_set(); @@ -291,8 +285,7 @@ impl EcmascriptChunkVc { this.context, this.main_entries, this.omit_entries, - this.available_assets, - this.current_availability_root, + Value::new(this.availablility_info), )) } @@ -325,8 +318,7 @@ impl EcmascriptChunkVc { this.omit_entries, chunk_path, evaluate, - this.available_assets, - this.current_availability_root, + Value::new(this.availablility_info), ); Ok(content) } @@ -369,7 +361,8 @@ impl Asset for EcmascriptChunk { } // Current availability root is included - if let Some(current_availability_root) = this.current_availability_root { + if let Some(current_availability_root) = this.availablility_info.current_availability_root() + { let ident = current_availability_root.ident(); let need_root = if let [(_, main_entry)] = &assets[..] { main_entry.resolve().await? != ident.resolve().await? @@ -404,7 +397,7 @@ impl Asset for EcmascriptChunk { } // Available assets are included - if let Some(available_assets) = this.available_assets { + if let Some(available_assets) = this.availablility_info.available_assets() { modifiers.push(available_assets.hash().to_string()); } @@ -438,8 +431,7 @@ impl Asset for EcmascriptChunk { this.context, this.main_entries, this.omit_entries, - this.available_assets, - this.current_availability_root, + Value::new(this.availablility_info), ) .await?; let mut references = Vec::new(); @@ -513,8 +505,7 @@ impl Introspectable for EcmascriptChunk { this.context, this.main_entries, this.omit_entries, - this.available_assets, - this.current_availability_root, + Value::new(this.availablility_info), ) .await?; let chunk_items = chunk_content.chunk_items.await?; diff --git a/crates/turbopack-ecmascript/src/chunk/optimize.rs b/crates/turbopack-ecmascript/src/chunk/optimize.rs index 3ec3648322e27..1e6a8cfc142ef 100644 --- a/crates/turbopack-ecmascript/src/chunk/optimize.rs +++ b/crates/turbopack-ecmascript/src/chunk/optimize.rs @@ -4,7 +4,7 @@ use std::{cmp::Ordering, collections::HashSet}; use anyhow::{bail, Result}; use indexmap::{IndexMap, IndexSet}; -use turbo_tasks::TryJoinIterExt; +use turbo_tasks::{TryJoinIterExt, Value}; use turbo_tasks_fs::FileSystemPathOptionVc; use turbopack_core::chunk::{ optimize::{optimize_by_common_parent, ChunkOptimizer, ChunkOptimizerVc}, @@ -69,8 +69,7 @@ async fn merge_chunks( EcmascriptChunkPlaceablesVc::cell(main_entries.into_iter().collect()), None, evaluate, - first.available_assets, - first.current_availability_root, + Value::new(first.availablility_info), )) } @@ -406,8 +405,7 @@ async fn optimize_ecmascript( } .cell(), ), - content.available_assets, - content.current_availability_root, + Value::new(content.availablility_info), ) } } diff --git a/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs b/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs index 88403a5356221..97f276dfed394 100644 --- a/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs +++ b/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs @@ -1,10 +1,10 @@ use anyhow::Result; -use turbo_tasks::{primitives::StringVc, TryJoinIterExt}; +use turbo_tasks::{primitives::StringVc, TryJoinIterExt, Value}; use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - available_assets::AvailableAssetsVc, Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc, + availablility_info::AvailablilityInfo, Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc, ChunkReferenceVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContext, ChunkingContextVc, }, @@ -49,7 +49,13 @@ impl ChunkGroupFilesAssetVc { ecma.as_evaluated_chunk(this.chunking_context, this.runtime_entries), ) } else { - ChunkGroupVc::from_asset(this.asset, this.chunking_context, None, None) + ChunkGroupVc::from_asset( + this.asset, + this.chunking_context, + Value::new(AvailablilityInfo::Root { + current_availability_root: this.asset.into(), + }), + ) }; Ok(chunk_group) } @@ -95,14 +101,12 @@ impl ChunkableAsset for ChunkGroupFilesAsset { fn as_chunk( self_vc: ChunkGroupFilesAssetVc, context: ChunkingContextVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> ChunkVc { EcmascriptChunkVc::new( context, self_vc.as_ecmascript_chunk_placeable(), - available_assets, - current_availability_root, + availablility_info, ) .into() } @@ -119,7 +123,12 @@ impl EcmascriptChunkPlaceable for ChunkGroupFilesAsset { Ok(ChunkGroupFilesChunkItem { context, inner: self_vc, - chunk: this.asset.as_chunk(context, None, Some(this.asset.into())), + chunk: this.asset.as_chunk( + context, + Value::new(AvailablilityInfo::Root { + current_availability_root: this.asset.into(), + }), + ), } .cell() .into()) diff --git a/crates/turbopack-ecmascript/src/lib.rs b/crates/turbopack-ecmascript/src/lib.rs index 81cc1952bbe9e..f4ab8e917b3c3 100644 --- a/crates/turbopack-ecmascript/src/lib.rs +++ b/crates/turbopack-ecmascript/src/lib.rs @@ -47,7 +47,7 @@ use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetOptionVc, AssetVc}, chunk::{ - available_assets::AvailableAssetsVc, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + availablility_info::AvailablilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc, }, compile_time_info::CompileTimeInfoVc, @@ -211,14 +211,12 @@ impl ChunkableAsset for EcmascriptModuleAsset { fn as_chunk( self_vc: EcmascriptModuleAssetVc, context: ChunkingContextVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> ChunkVc { EcmascriptChunkVc::new( context, self_vc.as_ecmascript_chunk_placeable(), - available_assets, - current_availability_root, + availablility_info, ) .into() } diff --git a/crates/turbopack-ecmascript/src/references/pattern_mapping.rs b/crates/turbopack-ecmascript/src/references/pattern_mapping.rs index 16a3e09c813dd..656a0f489731e 100644 --- a/crates/turbopack-ecmascript/src/references/pattern_mapping.rs +++ b/crates/turbopack-ecmascript/src/references/pattern_mapping.rs @@ -7,7 +7,10 @@ use swc_core::{ use turbo_tasks::{debug::ValueDebug, primitives::StringVc, Value, ValueToString}; use turbopack_core::{ asset::Asset, - chunk::{ChunkableAssetVc, ChunkingContextVc, FromChunkableAsset, ModuleId}, + chunk::{ + availablility_info::AvailablilityInfo, ChunkableAssetVc, ChunkingContextVc, + FromChunkableAsset, ModuleId, + }, issue::{code_gen::CodeGenerationIssue, IssueSeverity}, resolve::{ origin::{ResolveOrigin, ResolveOriginVc}, @@ -157,11 +160,15 @@ impl PatternMappingVc { if let Some(chunkable) = ChunkableAssetVc::resolve_from(asset).await? { if *resolve_type == ResolveType::EsmAsync { - // Passing no available_assets and no current_availability_root works here - // because the manifest loader has an id that is independent of them. So luckily - // we don't need chunk dependent code generation. - if let Some(loader) = - EcmascriptChunkItemVc::from_async_asset(context, chunkable, None, None).await? + // Passing [AvailablilityInfo::Untracked] works here because the manifest loader + // has an id that is independent of them. So luckily we don't need chunk + // dependent code generation. + if let Some(loader) = EcmascriptChunkItemVc::from_async_asset( + context, + chunkable, + Value::new(AvailablilityInfo::Untracked), + ) + .await? { return Ok(PatternMappingVc::cell(PatternMapping::Single( loader.id().await?.clone_value(), diff --git a/crates/turbopack-env/src/asset.rs b/crates/turbopack-env/src/asset.rs index dc924af7837b2..af25742613ebf 100644 --- a/crates/turbopack-env/src/asset.rs +++ b/crates/turbopack-env/src/asset.rs @@ -1,12 +1,13 @@ use std::fmt::Write as _; use anyhow::Result; +use turbo_tasks::Value; use turbo_tasks_env::{ProcessEnv, ProcessEnvVc}; use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - available_assets::AvailableAssetsVc, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + availablility_info::AvailablilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc, }, ident::AssetIdentVc, @@ -64,16 +65,9 @@ impl ChunkableAsset for ProcessEnvAsset { fn as_chunk( self_vc: ProcessEnvAssetVc, context: ChunkingContextVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> ChunkVc { - EcmascriptChunkVc::new( - context, - self_vc.into(), - available_assets, - current_availability_root, - ) - .into() + EcmascriptChunkVc::new(context, self_vc.into(), availablility_info).into() } } diff --git a/crates/turbopack-json/src/lib.rs b/crates/turbopack-json/src/lib.rs index 3436cff6f23db..0d9c3f99e2fc6 100644 --- a/crates/turbopack-json/src/lib.rs +++ b/crates/turbopack-json/src/lib.rs @@ -10,12 +10,12 @@ use std::fmt::Write; use anyhow::{bail, Error, Result}; -use turbo_tasks::{primitives::StringVc, ValueToString}; +use turbo_tasks::{primitives::StringVc, Value, ValueToString}; use turbo_tasks_fs::{FileContent, FileJsonContent}; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - available_assets::AvailableAssetsVc, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + availablility_info::AvailablilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc, }, ident::AssetIdentVc, @@ -64,14 +64,12 @@ impl ChunkableAsset for JsonModuleAsset { fn as_chunk( self_vc: JsonModuleAssetVc, context: ChunkingContextVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> ChunkVc { EcmascriptChunkVc::new( context, self_vc.as_ecmascript_chunk_placeable(), - available_assets, - current_availability_root, + availablility_info, ) .into() } diff --git a/crates/turbopack-mdx/src/lib.rs b/crates/turbopack-mdx/src/lib.rs index a04ad99cacde9..a479534f9ae31 100644 --- a/crates/turbopack-mdx/src/lib.rs +++ b/crates/turbopack-mdx/src/lib.rs @@ -7,7 +7,7 @@ use turbo_tasks_fs::{rope::Rope, File, FileContent, FileSystemPathVc}; use turbopack_core::{ asset::{Asset, AssetContent, AssetContentVc, AssetVc}, chunk::{ - available_assets::AvailableAssetsVc, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + availablility_info::AvailablilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc, }, context::{AssetContext, AssetContextVc}, @@ -120,14 +120,12 @@ impl ChunkableAsset for MdxModuleAsset { fn as_chunk( self_vc: MdxModuleAssetVc, context: ChunkingContextVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> ChunkVc { EcmascriptChunkVc::new( context, self_vc.as_ecmascript_chunk_placeable(), - available_assets, - current_availability_root, + availablility_info, ) .into() } diff --git a/crates/turbopack-static/src/lib.rs b/crates/turbopack-static/src/lib.rs index bbc334c676e0f..a7581138824c4 100644 --- a/crates/turbopack-static/src/lib.rs +++ b/crates/turbopack-static/src/lib.rs @@ -11,12 +11,12 @@ #![feature(min_specialization)] use anyhow::{anyhow, Result}; -use turbo_tasks::{primitives::StringVc, ValueToString}; +use turbo_tasks::{primitives::StringVc, Value, ValueToString}; use turbo_tasks_fs::FileContent; use turbopack_core::{ asset::{Asset, AssetContent, AssetContentVc, AssetVc}, chunk::{ - available_assets::AvailableAssetsVc, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + availablility_info::AvailablilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContext, ChunkingContextVc, }, context::AssetContextVc, @@ -83,14 +83,12 @@ impl ChunkableAsset for StaticModuleAsset { fn as_chunk( self_vc: StaticModuleAssetVc, context: ChunkingContextVc, - available_assets: Option, - current_availability_root: Option, + availablility_info: Value, ) -> ChunkVc { EcmascriptChunkVc::new( context, self_vc.as_ecmascript_chunk_placeable(), - available_assets, - current_availability_root, + availablility_info, ) .into() } diff --git a/crates/turbopack-tests/tests/snapshot.rs b/crates/turbopack-tests/tests/snapshot.rs index 80119ec5d2b5f..f805538fffe85 100644 --- a/crates/turbopack-tests/tests/snapshot.rs +++ b/crates/turbopack-tests/tests/snapshot.rs @@ -27,7 +27,10 @@ use turbopack::{ }; use turbopack_core::{ asset::{Asset, AssetVc}, - chunk::{dev::DevChunkingContextVc, ChunkableAsset, ChunkableAssetVc}, + chunk::{ + availablility_info::AvailablilityInfo, dev::DevChunkingContextVc, ChunkableAsset, + ChunkableAssetVc, + }, compile_time_defines, compile_time_info::CompileTimeInfo, context::{AssetContext, AssetContextVc}, @@ -248,7 +251,12 @@ async fn run_test(resource: String) -> Result { // TODO: Load runtime entries from snapshots Ok(ecmascript.as_evaluated_chunk(chunking_context, runtime_entries)) } else if let Some(chunkable) = ChunkableAssetVc::resolve_from(module).await? { - Ok(chunkable.as_chunk(chunking_context, None, Some(chunkable.into()))) + Ok(chunkable.as_chunk( + chunking_context, + Value::new(AvailablilityInfo::Root { + current_availability_root: chunkable.into(), + }), + )) } else { // TODO convert into a serve-able asset Err(anyhow!( From 0bb4a5d28a4186276966932c341b41e6c1af558d Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Thu, 9 Mar 2023 20:20:52 +0100 Subject: [PATCH 13/21] update snapshots --- .../Issue while running loader-042c71.txt | 21 +++++++++++++++++++ .../Issue while running loader-0adf3e.txt | 21 ------------------- .../Issue while running loader-179c1e.txt | 21 ------------------- .../Issue while running loader-403f9d.txt | 21 ------------------- .../Issue while running loader-61350a.txt | 21 ------------------- .../Issue while running loader-e90206.txt | 21 +++++++++++++++++++ ..._basic_async_chunk_input_import_95859b.js} | 2 +- ...ic_async_chunk_input_import_95859b.js.map} | 0 ...ot_basic_async_chunk_input_index_5b8d24.js | 2 +- ...ot_basic_async_chunk_input_index_e242f7.js | 2 +- ...shot_imports_dynamic_input_index_56419a.js | 2 +- ...shot_imports_dynamic_input_index_6f9eb3.js | 2 +- ...orts_dynamic_input_vercel.mjs_8d7d11._.js} | 2 +- ..._dynamic_input_vercel.mjs_8d7d11._.js.map} | 0 ...s_static-and-dynamic_input_index_507785.js | 2 +- ...s_static-and-dynamic_input_index_899ad5.js | 2 +- ...-and-dynamic_input_vercel.mjs_ee4015._.js} | 2 +- ...-dynamic_input_vercel.mjs_ee4015._.js.map} | 0 18 files changed, 51 insertions(+), 93 deletions(-) create mode 100644 crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-042c71.txt delete mode 100644 crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-0adf3e.txt delete mode 100644 crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-179c1e.txt delete mode 100644 crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-403f9d.txt delete mode 100644 crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-61350a.txt create mode 100644 crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-e90206.txt rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js => crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js} (89%) rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js.map => crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/dynamic/output/{crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js => crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js} (88%) rename crates/turbopack-tests/tests/snapshot/imports/dynamic/output/{crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js.map => crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/{a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js => a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js} (90%) rename crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/{a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js.map => a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js.map} (100%) diff --git a/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-042c71.txt b/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-042c71.txt new file mode 100644 index 0000000000000..984a4b3f7a5ee --- /dev/null +++ b/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-042c71.txt @@ -0,0 +1,21 @@ +PlainIssue { + severity: Warning, + context: "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/hello.emit", + category: "loaders", + title: "Issue while running loader", + description: "Error: Warning!\n at Object.module.exports (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/node_modules/emit-loader/index.js:2:20)\n at LOADER_EXECUTION (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4134)\n at runSyncOrAsync (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4145)\n at iterateNormalLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5782)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5426)\n at readResource (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:55:17)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:6160)\n at processResource (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5308)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4667)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4764)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4896)\n at handleResult (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:1424)\n at loadLoader (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:963)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4794)\n at runLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:8590)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:35:9)\n at \n at Module.transform (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:28:12)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]__a17b9f._.js:13:212)\n at Module.run (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_ipc_evaluate.ts_f5e151._.js:172:45)\n at processTicksAndRejections (node:internal/process/task_queues:96:5)\n", + detail: "", + documentation_link: "", + source: None, + sub_issues: [], + processing_path: Some( + [ + PlainIssueProcessingPathItem { + context: Some( + "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/index.js", + ), + description: "Next.js pages directory", + }, + ], + ), +} \ No newline at end of file diff --git a/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-0adf3e.txt b/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-0adf3e.txt deleted file mode 100644 index f39ab506318b3..0000000000000 --- a/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-0adf3e.txt +++ /dev/null @@ -1,21 +0,0 @@ -PlainIssue { - severity: Warning, - context: "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/hello.emit", - category: "loaders", - title: "Issue while running loader", - description: "Error: Warning!\n at Object.module.exports (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/node_modules/emit-loader/index.js:2:20)\n at LOADER_EXECUTION (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4134)\n at runSyncOrAsync (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4145)\n at iterateNormalLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5782)\n at (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5426)\n at readResource (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:55:17)\n at (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:6160)\n at processResource (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5308)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4667)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4764)\n at (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4896)\n at handleResult (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:1424)\n at loadLoader (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:963)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4794)\n at runLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:8590)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:35:9)\n at \n at Module.transform (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:28:12)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]__a17b9f._.js:13:212)\n at Module.run (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_ipc_evaluate.ts_f5e151._.js:172:45)\n at processTicksAndRejections (node:internal/process/task_queues:96:5)\n", - detail: "", - documentation_link: "", - source: None, - sub_issues: [], - processing_path: Some( - [ - PlainIssueProcessingPathItem { - context: Some( - "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/index.js", - ), - description: "Next.js pages directory", - }, - ], - ), -} \ No newline at end of file diff --git a/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-179c1e.txt b/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-179c1e.txt deleted file mode 100644 index 81009b2024a49..0000000000000 --- a/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-179c1e.txt +++ /dev/null @@ -1,21 +0,0 @@ -PlainIssue { - severity: Warning, - context: "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/hello.emit", - category: "loaders", - title: "Issue while running loader", - description: "Error: Warning!\n at Object.module.exports (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/node_modules/emit-loader/index.js:2:20)\n at LOADER_EXECUTION (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4134)\n at runSyncOrAsync (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4145)\n at iterateNormalLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5782)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5426)\n at readResource (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts._.js:55:17)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:6160)\n at processResource (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5308)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4667)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4764)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4896)\n at handleResult (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:1424)\n at loadLoader (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:963)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4794)\n at runLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:8590)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts._.js:35:9)\n at \n at Module.transform (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts._.js:28:12)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]__516bc8._.js:13:212)\n at Module.run (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_ipc_evaluate.ts._.js:172:45)\n at processTicksAndRejections (node:internal/process/task_queues:96:5)\n", - detail: "", - documentation_link: "", - source: None, - sub_issues: [], - processing_path: Some( - [ - PlainIssueProcessingPathItem { - context: Some( - "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/index.js", - ), - description: "Next.js pages directory", - }, - ], - ), -} \ No newline at end of file diff --git a/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-403f9d.txt b/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-403f9d.txt deleted file mode 100644 index 59b0cad08091c..0000000000000 --- a/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-403f9d.txt +++ /dev/null @@ -1,21 +0,0 @@ -PlainIssue { - severity: Error, - context: "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/hello.emit", - category: "loaders", - title: "Issue while running loader", - description: "Error: Error!\n at Object.module.exports (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/node_modules/emit-loader/index.js:4:18)\n at LOADER_EXECUTION (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4134)\n at runSyncOrAsync (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4145)\n at iterateNormalLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5782)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5426)\n at readResource (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts._.js:55:17)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:6160)\n at processResource (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5308)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4667)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4764)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4896)\n at handleResult (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:1424)\n at loadLoader (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:963)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4794)\n at runLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:8590)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts._.js:35:9)\n at \n at Module.transform (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts._.js:28:12)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]__516bc8._.js:13:212)\n at Module.run (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_ipc_evaluate.ts._.js:172:45)\n at processTicksAndRejections (node:internal/process/task_queues:96:5)\n", - detail: "", - documentation_link: "", - source: None, - sub_issues: [], - processing_path: Some( - [ - PlainIssueProcessingPathItem { - context: Some( - "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/index.js", - ), - description: "Next.js pages directory", - }, - ], - ), -} \ No newline at end of file diff --git a/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-61350a.txt b/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-61350a.txt deleted file mode 100644 index 376a5b4bf4d78..0000000000000 --- a/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-61350a.txt +++ /dev/null @@ -1,21 +0,0 @@ -PlainIssue { - severity: Error, - context: "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/hello.emit", - category: "loaders", - title: "Issue while running loader", - description: "Error: Error!\n at Object.module.exports (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/node_modules/emit-loader/index.js:4:18)\n at LOADER_EXECUTION (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4134)\n at runSyncOrAsync (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4145)\n at iterateNormalLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5782)\n at (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5426)\n at readResource (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:55:17)\n at (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:6160)\n at processResource (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5308)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4667)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4764)\n at (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4896)\n at handleResult (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:1424)\n at loadLoader (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:963)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4794)\n at runLoaders (node_modules/.pnpm/next@13.1.7-canary.28_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:8590)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:35:9)\n at \n at Module.transform (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:28:12)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]__a17b9f._.js:13:212)\n at Module.run (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_ipc_evaluate.ts_f5e151._.js:172:45)\n at processTicksAndRejections (node:internal/process/task_queues:96:5)\n", - detail: "", - documentation_link: "", - source: None, - sub_issues: [], - processing_path: Some( - [ - PlainIssueProcessingPathItem { - context: Some( - "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/index.js", - ), - description: "Next.js pages directory", - }, - ], - ), -} \ No newline at end of file diff --git a/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-e90206.txt b/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-e90206.txt new file mode 100644 index 0000000000000..717c7725c4eed --- /dev/null +++ b/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-e90206.txt @@ -0,0 +1,21 @@ +PlainIssue { + severity: Error, + context: "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/hello.emit", + category: "loaders", + title: "Issue while running loader", + description: "Error: Error!\n at Object.module.exports (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/node_modules/emit-loader/index.js:4:18)\n at LOADER_EXECUTION (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4134)\n at runSyncOrAsync (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4145)\n at iterateNormalLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5782)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5426)\n at readResource (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:55:17)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:6160)\n at processResource (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5308)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4667)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4764)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4896)\n at handleResult (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:1424)\n at loadLoader (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:963)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4794)\n at runLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:8590)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:35:9)\n at \n at Module.transform (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:28:12)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]__a17b9f._.js:13:212)\n at Module.run (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_ipc_evaluate.ts_f5e151._.js:172:45)\n at processTicksAndRejections (node:internal/process/task_queues:96:5)\n", + detail: "", + documentation_link: "", + source: None, + sub_issues: [], + processing_path: Some( + [ + PlainIssueProcessingPathItem { + context: Some( + "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/index.js", + ), + description: "Next.js pages directory", + }, + ], + ), +} \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js similarity index 89% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js index e7887128c5626..5a91e7d1d4897 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js.map rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js.map diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js index 2acd99b5e38a8..a2a7f912e3ff4 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js @@ -3,7 +3,7 @@ "[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js").then(() => { + return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js_d744dd._.json", chunks_paths); diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js index c8b7a7c803272..c7ba6ed3bfd85 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js @@ -3,7 +3,7 @@ "[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_3aa117.js").then(() => { + return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js_d744dd._.json", chunks_paths); diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js index 03207bf6e1958..d734a64307678 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js @@ -3,7 +3,7 @@ "[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js").then(() => { + return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d744dd._.json", chunks_paths); diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js index 17ea52e6dcab1..ee13f8f15ac83 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js @@ -3,7 +3,7 @@ "[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js").then(() => { + return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d744dd._.json", chunks_paths); diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js similarity index 88% rename from crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js rename to crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js index ce117acb3a11a..3e902227e4852 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js.map b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_a392ef._.js.map rename to crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js.map diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js index 39f24c4ca809a..047945dc33377 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js @@ -3,7 +3,7 @@ "[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js").then(() => { + return __turbopack_load__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_d744dd._.json", chunks_paths); diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js index 017a425cd667e..687c583175929 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js @@ -3,7 +3,7 @@ "[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js").then(() => { + return __turbopack_load__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_d744dd._.json", chunks_paths); diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js similarity index 90% rename from crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js rename to crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js index 41192448baccb..89a821cbfadea 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js.map b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_072e69._.js.map rename to crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js.map From 7e808646483442518090207f3de15e2670044727 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Fri, 10 Mar 2023 14:10:29 +0100 Subject: [PATCH 14/21] review --- crates/turbopack-cli/Cargo.toml | 55 +++++++++++++++++++ .../src/chunk/available_assets.rs | 2 + 2 files changed, 57 insertions(+) create mode 100644 crates/turbopack-cli/Cargo.toml diff --git a/crates/turbopack-cli/Cargo.toml b/crates/turbopack-cli/Cargo.toml new file mode 100644 index 0000000000000..71ee1b0e02e25 --- /dev/null +++ b/crates/turbopack-cli/Cargo.toml @@ -0,0 +1,55 @@ +[package] +name = "turbopack-cli" +version = "0.1.0" +description = "TBD" +license = "MPL-2.0" +edition = "2021" +autobenches = false + +[[bin]] +name = "turbopack-cli" +path = "src/main.rs" +bench = false + +[lib] +bench = false + +[features] +# By default, we enable native-tls for reqwest via downstream transitive features. +# This is for the convenience of running daily dev workflows, i.e running +# `cargo xxx` without explicitly specifying features, not that we want to +# promote this as default backend. Actual configuration is done when building next-swc, +# and also turbopack standalone when we have it. +default = ["custom_allocator", "native-tls"] +serializable = [] +tokio_console = [ + "dep:console-subscriber", + "tokio/tracing", + "turbo-tasks/tokio_tracing", +] +profile = [] +custom_allocator = ["turbo-malloc/custom_allocator"] +native-tls = ["next-core/native-tls"] +rustls-tls = ["next-core/rustls-tls"] + +[dependencies] +anyhow = { workspace = true, features = ["backtrace"] } +clap = { workspace = true, features = ["derive", "env"] } +console-subscriber = { workspace = true, optional = true } +dunce = { workspace = true } +futures = { workspace = true } +mime = { workspace = true } +owo-colors = { workspace = true } +serde = { workspace = true } +tokio = { workspace = true, features = ["full"] } +turbo-malloc = { workspace = true, default-features = false } +turbo-tasks = { workspace = true } +turbo-tasks-fs = { workspace = true } +turbo-tasks-memory = { workspace = true } +turbopack-cli-utils = { workspace = true } +turbopack-core = { workspace = true } +turbopack-dev-server = { workspace = true } +turbopack-node = { workspace = true } + +[build-dependencies] +turbo-tasks-build = { workspace = true } diff --git a/crates/turbopack-core/src/chunk/available_assets.rs b/crates/turbopack-core/src/chunk/available_assets.rs index c44bd9ff45db2..dc77db35f66d6 100644 --- a/crates/turbopack-core/src/chunk/available_assets.rs +++ b/crates/turbopack-core/src/chunk/available_assets.rs @@ -54,6 +54,8 @@ impl AvailableAssetsVc { let mut hasher = Xxh3Hash64Hasher::new(); if let Some(parent) = this.parent { hasher.write_value(parent.hash().await?); + } else { + hasher.write_value(0u64); } for root in &this.roots { hasher.write_value(root.ident().to_string().await?); From 3c6feea609812ae58c21fcef0c5d4dd7707ccd44 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Fri, 10 Mar 2023 14:15:45 +0100 Subject: [PATCH 15/21] update snapshot --- ...{20803_foo_index_b32b98.js => 20803_foo_index_f1c29b.js} | 4 ++-- ...oo_index_b32b98.js.map => 20803_foo_index_f1c29b.js.map} | 0 ...tests_snapshot_basic_async_chunk_input_import_52aed8.js} | 4 ++-- ...s_snapshot_basic_async_chunk_input_import_52aed8.js.map} | 0 ...tests_snapshot_basic_async_chunk_input_import_85740a.js} | 6 +++--- ...s_snapshot_basic_async_chunk_input_import_85740a.js.map} | 0 ...s_tests_snapshot_basic_async_chunk_input_index_5b8d24.js | 2 +- ...s_tests_snapshot_basic_async_chunk_input_index_e242f7.js | 2 +- ...sts_tests_snapshot_imports_dynamic_input_index_56419a.js | 2 +- ...sts_tests_snapshot_imports_dynamic_input_index_6f9eb3.js | 2 +- ...s_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js} | 4 ++-- ...apshot_imports_dynamic_input_vercel.mjs_c72a25._.js.map} | 0 ...s_snapshot_imports_dynamic_input_vercel.mjs_d12c37._.js} | 4 ++-- ...apshot_imports_dynamic_input_vercel.mjs_d12c37._.js.map} | 0 ...napshot_imports_static-and-dynamic_input_index_507785.js | 2 +- ...napshot_imports_static-and-dynamic_input_index_899ad5.js | 2 +- ...imports_static-and-dynamic_input_vercel.mjs_12d05a._.js} | 4 ++-- ...rts_static-and-dynamic_input_vercel.mjs_12d05a._.js.map} | 0 ...imports_static-and-dynamic_input_vercel.mjs_e3316a._.js} | 4 ++-- ...rts_static-and-dynamic_input_vercel.mjs_e3316a._.js.map} | 0 20 files changed, 21 insertions(+), 21 deletions(-) rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{20803_foo_index_b32b98.js => 20803_foo_index_f1c29b.js} (89%) rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{20803_foo_index_b32b98.js.map => 20803_foo_index_f1c29b.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js => crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_52aed8.js} (94%) rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js.map => crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_52aed8.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js => crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js} (81%) rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js.map => crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/dynamic/output/{crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js => crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js} (84%) rename crates/turbopack-tests/tests/snapshot/imports/dynamic/output/{crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js.map => crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/dynamic/output/{crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js => crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d12c37._.js} (84%) rename crates/turbopack-tests/tests/snapshot/imports/dynamic/output/{crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js.map => crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d12c37._.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/{a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js => a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js} (87%) rename crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/{a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js.map => a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/{a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js => a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_e3316a._.js} (87%) rename crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/{a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js.map => a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_e3316a._.js.map} (100%) diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index_b32b98.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index_f1c29b.js similarity index 89% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index_b32b98.js rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index_f1c29b.js index 89557ccddb622..810a5d37e19b6 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index_b32b98.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index_f1c29b.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/20803_foo_index_b32b98.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/20803_foo_index_f1c29b.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/node_modules/foo/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -13,4 +13,4 @@ function foo(value) { }]); -//# sourceMappingURL=20803_foo_index_b32b98.js.map \ No newline at end of file +//# sourceMappingURL=20803_foo_index_f1c29b.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index_b32b98.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index_f1c29b.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index_b32b98.js.map rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/20803_foo_index_f1c29b.js.map diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_52aed8.js similarity index 94% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_52aed8.js index 62e50704150cb..585941b854a50 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_52aed8.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_52aed8.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -16,4 +16,4 @@ __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$ }]); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_52aed8.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_52aed8.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js.map rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_52aed8.js.map diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js similarity index 81% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js index 5a91e7d1d4897..3939c5ccdec1b 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js @@ -1,10 +1,10 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__([ - "output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_0d49f0.js", - "output/20803_foo_index_b32b98.js" + "output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_52aed8.js", + "output/20803_foo_index_f1c29b.js" ]); })()), diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js.map rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js.map diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js index 98ab96cb67806..bef83307b7884 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js @@ -3,7 +3,7 @@ "[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js").then(() => { + return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js_d744dd._.json", chunks_paths); diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js index 1dcc820bb9d42..4c07918c08048 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js @@ -3,7 +3,7 @@ "[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_95859b.js").then(() => { + return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js_d744dd._.json", chunks_paths); diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js index c9513c911fefa..8855765101baa 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js @@ -3,7 +3,7 @@ "[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js").then(() => { + return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d744dd._.json", chunks_paths); diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js index 2d7fed5448e15..db77579a33a6f 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js @@ -3,7 +3,7 @@ "[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js").then(() => { + return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d744dd._.json", chunks_paths); diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js similarity index 84% rename from crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js rename to crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js index 3e902227e4852..f3b9291b00100 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js @@ -1,9 +1,9 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__([ - "output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js" + "output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d12c37._.js" ]); })()), diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js.map b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_8d7d11._.js.map rename to crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js.map diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d12c37._.js similarity index 84% rename from crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js rename to crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d12c37._.js index 22ea3fbd4a9bc..0374f23f7c4f4 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d12c37._.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d12c37._.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -11,4 +11,4 @@ const __TURBOPACK__default__export__ = "turbopack"; }]); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d12c37._.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js.map b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d12c37._.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_e25ebc._.js.map rename to crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d12c37._.js.map diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js index 62a98acf077c5..8539677f14e8c 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js @@ -3,7 +3,7 @@ "[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js").then(() => { + return __turbopack_load__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_d744dd._.json", chunks_paths); diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js index cdd6f19b849bb..75ca2051c874b 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js @@ -3,7 +3,7 @@ "[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { - return __turbopack_load__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js").then(() => { + return __turbopack_load__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk)"); }).then((chunks_paths) => { __turbopack_register_chunk_list__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_d744dd._.json", chunks_paths); diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js similarity index 87% rename from crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js rename to crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js index 89a821cbfadea..f5e76e8bfca17 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js @@ -1,9 +1,9 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__([ - "output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js" + "output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_e3316a._.js" ]); })()), diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js.map b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_ee4015._.js.map rename to crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js.map diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_e3316a._.js similarity index 87% rename from crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js rename to crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_e3316a._.js index fbb0ee82d7e69..af149f1392308 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_e3316a._.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_e3316a._.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -11,4 +11,4 @@ const __TURBOPACK__default__export__ = "turbopack"; }]); -//# sourceMappingURL=a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js.map \ No newline at end of file +//# sourceMappingURL=a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_e3316a._.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js.map b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_e3316a._.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_f4c89b._.js.map rename to crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_e3316a._.js.map From 1c0614d22a81ad17a84566e7c1b84d494548dab5 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Fri, 10 Mar 2023 14:24:44 +0100 Subject: [PATCH 16/21] typo --- .../in_chunking_context_asset.rs | 6 +-- .../src/next_client_chunks/with_chunks.rs | 10 ++-- .../with_chunking_context_scope_asset.rs | 6 +-- .../with_client_chunks.rs | 12 ++--- crates/next-core/src/web_entry_source.rs | 6 +-- ...lablility_info.rs => availability_info.rs} | 4 +- crates/turbopack-core/src/chunk/mod.rs | 48 ++++++++----------- crates/turbopack-css/src/asset.rs | 6 +-- crates/turbopack-css/src/chunk/mod.rs | 28 +++++------ crates/turbopack-css/src/chunk/optimize.rs | 2 +- crates/turbopack-css/src/module_asset.rs | 10 ++-- .../turbopack-ecmascript/src/chunk/content.rs | 22 ++++----- crates/turbopack-ecmascript/src/chunk/item.rs | 18 +++---- .../src/chunk/manifest/chunk_asset.rs | 16 +++---- crates/turbopack-ecmascript/src/chunk/mod.rs | 30 ++++++------ .../src/chunk/optimize.rs | 4 +- .../src/chunk_group_files_asset.rs | 10 ++-- crates/turbopack-ecmascript/src/lib.rs | 6 +-- .../src/references/pattern_mapping.rs | 6 +-- crates/turbopack-env/src/asset.rs | 6 +-- crates/turbopack-json/src/lib.rs | 6 +-- crates/turbopack-mdx/src/lib.rs | 6 +-- crates/turbopack-static/src/lib.rs | 6 +-- crates/turbopack-tests/tests/snapshot.rs | 4 +- 24 files changed, 135 insertions(+), 143 deletions(-) rename crates/turbopack-core/src/chunk/{availablility_info.rs => availability_info.rs} (95%) diff --git a/crates/next-core/src/next_client_chunks/in_chunking_context_asset.rs b/crates/next-core/src/next_client_chunks/in_chunking_context_asset.rs index 6b2567544cc12..6e62d29a88c62 100644 --- a/crates/next-core/src/next_client_chunks/in_chunking_context_asset.rs +++ b/crates/next-core/src/next_client_chunks/in_chunking_context_asset.rs @@ -7,7 +7,7 @@ use turbopack::ecmascript::chunk::{ use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - availablility_info::AvailablilityInfo, ChunkVc, ChunkableAsset, ChunkableAssetVc, + availability_info::AvailabilityInfo, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc, }, ident::AssetIdentVc, @@ -49,9 +49,9 @@ impl ChunkableAsset for InChunkingContextAsset { fn as_chunk( &self, _context: ChunkingContextVc, - availablility_info: Value, + availability_info: Value, ) -> ChunkVc { - EcmascriptChunkVc::new(self.chunking_context, self.asset, availablility_info).into() + EcmascriptChunkVc::new(self.chunking_context, self.asset, availability_info).into() } } diff --git a/crates/next-core/src/next_client_chunks/with_chunks.rs b/crates/next-core/src/next_client_chunks/with_chunks.rs index af3eff4b7d1e4..d7b19850bf6d4 100644 --- a/crates/next-core/src/next_client_chunks/with_chunks.rs +++ b/crates/next-core/src/next_client_chunks/with_chunks.rs @@ -13,8 +13,8 @@ use turbopack::ecmascript::{ use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - availablility_info::AvailablilityInfo, Chunk, ChunkGroupReferenceVc, ChunkGroupVc, - ChunkItem, ChunkItemVc, ChunkListReferenceVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, + availability_info::AvailabilityInfo, Chunk, ChunkGroupReferenceVc, ChunkGroupVc, ChunkItem, + ChunkItemVc, ChunkListReferenceVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContext, ChunkingContextVc, }, ident::AssetIdentVc, @@ -67,12 +67,12 @@ impl ChunkableAsset for WithChunksAsset { fn as_chunk( self_vc: WithChunksAssetVc, context: ChunkingContextVc, - availablility_info: Value, + availability_info: Value, ) -> ChunkVc { EcmascriptChunkVc::new( context, self_vc.as_ecmascript_chunk_placeable(), - availablility_info, + availability_info, ) .into() } @@ -114,7 +114,7 @@ impl WithChunksAssetVc { Ok(ChunkGroupVc::from_asset( this.asset.into(), this.chunking_context, - Value::new(AvailablilityInfo::Root { + Value::new(AvailabilityInfo::Root { current_availability_root: this.asset.into(), }), )) diff --git a/crates/next-core/src/next_client_component/with_chunking_context_scope_asset.rs b/crates/next-core/src/next_client_component/with_chunking_context_scope_asset.rs index 5f32c16c423db..563ef46207312 100644 --- a/crates/next-core/src/next_client_component/with_chunking_context_scope_asset.rs +++ b/crates/next-core/src/next_client_component/with_chunking_context_scope_asset.rs @@ -7,7 +7,7 @@ use turbopack::ecmascript::chunk::{ use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - availablility_info::AvailablilityInfo, ChunkVc, ChunkableAsset, ChunkableAssetVc, + availability_info::AvailabilityInfo, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContext, ChunkingContextVc, }, ident::AssetIdentVc, @@ -49,12 +49,12 @@ impl ChunkableAsset for WithChunkingContextScopeAsset { fn as_chunk( &self, context: ChunkingContextVc, - availablility_info: Value, + availability_info: Value, ) -> ChunkVc { EcmascriptChunkVc::new( context.with_layer(&self.layer), self.asset, - availablility_info, + availability_info, ) .into() } diff --git a/crates/next-core/src/next_client_component/with_client_chunks.rs b/crates/next-core/src/next_client_component/with_client_chunks.rs index a0255c96b90af..98252cf1fecc8 100644 --- a/crates/next-core/src/next_client_component/with_client_chunks.rs +++ b/crates/next-core/src/next_client_component/with_client_chunks.rs @@ -13,9 +13,9 @@ use turbopack::ecmascript::{ use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - availablility_info::AvailablilityInfo, Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc, - ChunkVc, ChunkableAsset, ChunkableAssetReference, ChunkableAssetReferenceVc, - ChunkableAssetVc, ChunkingContext, ChunkingContextVc, ChunkingType, ChunkingTypeOptionVc, + availability_info::AvailabilityInfo, Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc, ChunkVc, + ChunkableAsset, ChunkableAssetReference, ChunkableAssetReferenceVc, ChunkableAssetVc, + ChunkingContext, ChunkingContextVc, ChunkingType, ChunkingTypeOptionVc, }, ident::AssetIdentVc, reference::{AssetReference, AssetReferenceVc, AssetReferencesVc}, @@ -62,12 +62,12 @@ impl ChunkableAsset for WithClientChunksAsset { fn as_chunk( self_vc: WithClientChunksAssetVc, context: ChunkingContextVc, - availablility_info: Value, + availability_info: Value, ) -> ChunkVc { EcmascriptChunkVc::new( context.with_layer("rsc"), self_vc.as_ecmascript_chunk_placeable(), - availablility_info, + availability_info, ) .into() } @@ -114,7 +114,7 @@ impl EcmascriptChunkItem for WithClientChunksChunkItem { let group = ChunkGroupVc::from_asset( inner.asset.into(), self.context, - Value::new(AvailablilityInfo::Root { + Value::new(AvailabilityInfo::Root { current_availability_root: inner.asset.into(), }), ); diff --git a/crates/next-core/src/web_entry_source.rs b/crates/next-core/src/web_entry_source.rs index 6bde0502bee9e..fde8578adee81 100644 --- a/crates/next-core/src/web_entry_source.rs +++ b/crates/next-core/src/web_entry_source.rs @@ -4,9 +4,7 @@ use turbo_tasks_env::ProcessEnvVc; use turbo_tasks_fs::FileSystemPathVc; use turbopack::ecmascript::EcmascriptModuleAssetVc; use turbopack_core::{ - chunk::{ - availablility_info::AvailablilityInfo, ChunkGroupVc, ChunkableAsset, ChunkableAssetVc, - }, + chunk::{availability_info::AvailabilityInfo, ChunkGroupVc, ChunkableAsset, ChunkableAssetVc}, reference_type::{EntryReferenceSubType, ReferenceType}, resolve::{origin::PlainResolveOriginVc, parse::RequestVc}, }; @@ -84,7 +82,7 @@ pub async fn create_web_entry_source( // add an ecmascript chunk with the runtime code Ok(ChunkGroupVc::from_chunk(chunkable.as_chunk( chunking_context, - Value::new(AvailablilityInfo::Root { + Value::new(AvailabilityInfo::Root { current_availability_root: module, }), ))) diff --git a/crates/turbopack-core/src/chunk/availablility_info.rs b/crates/turbopack-core/src/chunk/availability_info.rs similarity index 95% rename from crates/turbopack-core/src/chunk/availablility_info.rs rename to crates/turbopack-core/src/chunk/availability_info.rs index 29c8f5d2f25cd..d0eed8999c3cf 100644 --- a/crates/turbopack-core/src/chunk/availablility_info.rs +++ b/crates/turbopack-core/src/chunk/availability_info.rs @@ -3,7 +3,7 @@ use crate::asset::AssetVc; #[turbo_tasks::value(serialization = "auto_for_input")] #[derive(PartialOrd, Ord, Hash, Clone, Copy, Debug)] -pub enum AvailablilityInfo { +pub enum AvailabilityInfo { Untracked, Root { current_availability_root: AssetVc, @@ -14,7 +14,7 @@ pub enum AvailablilityInfo { }, } -impl AvailablilityInfo { +impl AvailabilityInfo { pub fn current_availability_root(&self) -> Option { match self { Self::Untracked => None, diff --git a/crates/turbopack-core/src/chunk/mod.rs b/crates/turbopack-core/src/chunk/mod.rs index 3fc7e5a169354..823b4bd6d1f4c 100644 --- a/crates/turbopack-core/src/chunk/mod.rs +++ b/crates/turbopack-core/src/chunk/mod.rs @@ -1,5 +1,5 @@ +pub mod availability_info; pub mod available_assets; -pub mod availablility_info; pub mod chunk_in_group; pub mod dev; pub(crate) mod list; @@ -29,7 +29,7 @@ use turbo_tasks_hash::DeterministicHash; pub use self::list::reference::{ChunkListReference, ChunkListReferenceVc}; use self::{ - availablility_info::AvailablilityInfo, chunk_in_group::ChunkInGroupVc, optimize::optimize, + availability_info::AvailabilityInfo, chunk_in_group::ChunkInGroupVc, optimize::optimize, }; use crate::{ asset::{Asset, AssetVc, AssetsVc}, @@ -114,7 +114,7 @@ pub trait ChunkableAsset: Asset { fn as_chunk( &self, context: ChunkingContextVc, - availablility_info: Value, + availability_info: Value, ) -> ChunkVc; } @@ -133,9 +133,9 @@ impl ChunkGroupVc { pub fn from_asset( asset: ChunkableAssetVc, context: ChunkingContextVc, - availablility_info: Value, + availability_info: Value, ) -> Self { - Self::from_chunk(asset.as_chunk(context, availablility_info)) + Self::from_chunk(asset.as_chunk(context, availability_info)) } /// Creates a chunk group from an chunk as entrypoint @@ -267,7 +267,7 @@ pub enum ChunkingType { Parallel, /// Asset is always placed in a separate chunk that is loaded in parallel. /// Referenced asset will not inherit the available modules, but form a - /// new availablility root. + /// new availability root. IsolatedParallel, /// Asset is placed in a separate chunk group that is referenced from the /// referencing chunk group, but not loaded. @@ -401,7 +401,7 @@ pub trait FromChunkableAsset: ChunkItem + Sized + Debug { async fn from_async_asset( context: ChunkingContextVc, asset: ChunkableAssetVc, - availablility_info: Value, + availability_info: Value, ) -> Result>; } @@ -409,12 +409,12 @@ pub async fn chunk_content_split( context: ChunkingContextVc, entry: AssetVc, additional_entries: Option, - availablility_info: Value, + availability_info: Value, ) -> Result> where I: FromChunkableAsset + Eq + std::hash::Hash + Clone, { - chunk_content_internal_parallel(context, entry, additional_entries, availablility_info, true) + chunk_content_internal_parallel(context, entry, additional_entries, availability_info, true) .await .map(|o| o.unwrap()) } @@ -423,19 +423,13 @@ pub async fn chunk_content( context: ChunkingContextVc, entry: AssetVc, additional_entries: Option, - availablility_info: Value, + availability_info: Value, ) -> Result>> where I: FromChunkableAsset + Eq + std::hash::Hash + Clone, { - chunk_content_internal_parallel( - context, - entry, - additional_entries, - availablility_info, - false, - ) - .await + chunk_content_internal_parallel(context, entry, additional_entries, availability_info, false) + .await } #[derive(Eq, PartialEq, Clone, Hash)] @@ -456,7 +450,7 @@ enum ChunkContentGraphNode { struct ChunkContentContext { chunking_context: ChunkingContextVc, entry: AssetVc, - availablility_info: Value, + availability_info: Value, split: bool, } @@ -489,7 +483,7 @@ where let mut graph_nodes = vec![]; for asset in assets { - if let Some(available_assets) = context.availablility_info.available_assets() { + if let Some(available_assets) = context.availability_info.available_assets() { if *available_assets.includes(asset).await? { graph_nodes.push(( Some((asset, chunking_type)), @@ -526,7 +520,7 @@ where } ChunkingType::Parallel => { let chunk = - chunkable_asset.as_chunk(context.chunking_context, context.availablility_info); + chunkable_asset.as_chunk(context.chunking_context, context.availability_info); graph_nodes.push(( Some((asset, chunking_type)), ChunkContentGraphNode::Chunk(chunk), @@ -535,7 +529,7 @@ where ChunkingType::IsolatedParallel => { let chunk = chunkable_asset.as_chunk( context.chunking_context, - Value::new(AvailablilityInfo::Root { + Value::new(AvailabilityInfo::Root { current_availability_root: chunkable_asset.into(), }), ); @@ -564,7 +558,7 @@ where } let chunk = - chunkable_asset.as_chunk(context.chunking_context, context.availablility_info); + chunkable_asset.as_chunk(context.chunking_context, context.availability_info); graph_nodes.push(( Some((asset, chunking_type)), ChunkContentGraphNode::Chunk(chunk), @@ -576,7 +570,7 @@ where ChunkContentGraphNode::AsyncChunkGroup(ChunkGroupVc::from_asset( chunkable_asset, context.chunking_context, - context.availablility_info, + context.availability_info, )), )); } @@ -584,7 +578,7 @@ where if let Some(manifest_loader_item) = I::from_async_asset( context.chunking_context, chunkable_asset, - context.availablility_info, + context.availability_info, ) .await? { @@ -688,7 +682,7 @@ async fn chunk_content_internal_parallel( chunking_context: ChunkingContextVc, entry: AssetVc, additional_entries: Option, - availablility_info: Value, + availability_info: Value, split: bool, ) -> Result>> where @@ -718,7 +712,7 @@ where chunking_context, entry, split, - availablility_info, + availability_info, }; let visit = ChunkContentVisit { diff --git a/crates/turbopack-css/src/asset.rs b/crates/turbopack-css/src/asset.rs index e8fd1410d6003..3604c8165b39a 100644 --- a/crates/turbopack-css/src/asset.rs +++ b/crates/turbopack-css/src/asset.rs @@ -12,7 +12,7 @@ use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - availablility_info::AvailablilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + availability_info::AvailabilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc, }, context::AssetContextVc, @@ -121,9 +121,9 @@ impl ChunkableAsset for CssModuleAsset { fn as_chunk( self_vc: CssModuleAssetVc, context: ChunkingContextVc, - availablility_info: Value, + availability_info: Value, ) -> ChunkVc { - CssChunkVc::new(context, self_vc.into(), availablility_info).into() + CssChunkVc::new(context, self_vc.into(), availability_info).into() } } diff --git a/crates/turbopack-css/src/chunk/mod.rs b/crates/turbopack-css/src/chunk/mod.rs index 08c4ef1b70493..8759a26ea21ca 100644 --- a/crates/turbopack-css/src/chunk/mod.rs +++ b/crates/turbopack-css/src/chunk/mod.rs @@ -11,7 +11,7 @@ use turbo_tasks_fs::{rope::Rope, File, FileSystemPathOptionVc, FileSystemPathVc} use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - availablility_info::AvailablilityInfo, + availability_info::AvailabilityInfo, chunk_content, chunk_content_split, optimize::{ChunkOptimizerVc, OptimizableChunk, OptimizableChunkVc}, Chunk, ChunkContentResult, ChunkGroupReferenceVc, ChunkGroupVc, ChunkItem, ChunkItemVc, @@ -42,7 +42,7 @@ use crate::{ pub struct CssChunk { context: ChunkingContextVc, main_entries: CssChunkPlaceablesVc, - availablility_info: AvailablilityInfo, + availability_info: AvailabilityInfo, } #[turbo_tasks::value_impl] @@ -51,12 +51,12 @@ impl CssChunkVc { pub fn new_normalized( context: ChunkingContextVc, main_entries: CssChunkPlaceablesVc, - availablility_info: Value, + availability_info: Value, ) -> Self { CssChunk { context, main_entries, - availablility_info: availablility_info.into_value(), + availability_info: availability_info.into_value(), } .cell() } @@ -65,12 +65,12 @@ impl CssChunkVc { pub fn new( context: ChunkingContextVc, entry: CssChunkPlaceableVc, - availablility_info: Value, + availability_info: Value, ) -> Self { Self::new_normalized( context, CssChunkPlaceablesVc::cell(vec![entry]), - availablility_info, + availability_info, ) } @@ -212,13 +212,13 @@ impl From> for CssChunkContentResult { async fn css_chunk_content( context: ChunkingContextVc, entries: CssChunkPlaceablesVc, - availablility_info: Value, + availability_info: Value, ) -> Result { let entries = entries.await?; let entries = entries.iter().copied(); let contents = entries - .map(|entry| css_chunk_content_single_entry(context, entry, availablility_info)) + .map(|entry| css_chunk_content_single_entry(context, entry, availability_info)) .collect::>(); if contents.len() == 1 { @@ -256,15 +256,15 @@ async fn css_chunk_content( async fn css_chunk_content_single_entry( context: ChunkingContextVc, entry: CssChunkPlaceableVc, - availablility_info: Value, + availability_info: Value, ) -> Result { let asset = entry.as_asset(); let res = if let Some(res) = - chunk_content::(context, asset, None, availablility_info).await? + chunk_content::(context, asset, None, availability_info).await? { res } else { - chunk_content_split::(context, asset, None, availablility_info).await? + chunk_content_split::(context, asset, None, availability_info).await? }; Ok(CssChunkContentResultVc::cell(res.into())) @@ -323,7 +323,7 @@ impl Asset for CssChunk { let content = css_chunk_content( this.context, this.main_entries, - Value::new(this.availablility_info), + Value::new(this.availability_info), ) .await?; let mut references = Vec::new(); @@ -424,7 +424,7 @@ impl FromChunkableAsset for CssChunkItemVc { async fn from_async_asset( _context: ChunkingContextVc, _asset: ChunkableAssetVc, - _availablility_info: Value, + _availability_info: Value, ) -> Result> { Ok(None) } @@ -460,7 +460,7 @@ impl Introspectable for CssChunk { let chunk_content = css_chunk_content( this.context, this.main_entries, - Value::new(this.availablility_info), + Value::new(this.availability_info), ) .await?; details += "Chunk items:\n\n"; diff --git a/crates/turbopack-css/src/chunk/optimize.rs b/crates/turbopack-css/src/chunk/optimize.rs index 79e1ee682c692..123641d82041e 100644 --- a/crates/turbopack-css/src/chunk/optimize.rs +++ b/crates/turbopack-css/src/chunk/optimize.rs @@ -63,7 +63,7 @@ async fn merge_chunks( Ok(CssChunkVc::new_normalized( first.await?.context, CssChunkPlaceablesVc::cell(main_entries.into_iter().collect()), - Value::new(first.await?.availablility_info), + Value::new(first.await?.availability_info), )) } diff --git a/crates/turbopack-css/src/module_asset.rs b/crates/turbopack-css/src/module_asset.rs index d80c4ee5af798..ed4c90433e62d 100644 --- a/crates/turbopack-css/src/module_asset.rs +++ b/crates/turbopack-css/src/module_asset.rs @@ -12,7 +12,7 @@ use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - availablility_info::AvailablilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + availability_info::AvailabilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetReference, ChunkableAssetReferenceVc, ChunkableAssetVc, ChunkingContextVc, ChunkingType, ChunkingTypeOptionVc, }, @@ -202,9 +202,9 @@ impl ChunkableAsset for ModuleCssModuleAsset { fn as_chunk( self_vc: ModuleCssModuleAssetVc, context: ChunkingContextVc, - availablility_info: Value, + availability_info: Value, ) -> ChunkVc { - EcmascriptChunkVc::new(context, self_vc.into(), availablility_info).into() + EcmascriptChunkVc::new(context, self_vc.into(), availability_info).into() } } @@ -449,9 +449,9 @@ impl ChunkableAsset for CssProxyModuleAsset { fn as_chunk( self_vc: CssProxyModuleAssetVc, context: ChunkingContextVc, - availablility_info: Value, + availability_info: Value, ) -> ChunkVc { - CssChunkVc::new(context, self_vc.into(), availablility_info).into() + CssChunkVc::new(context, self_vc.into(), availability_info).into() } } diff --git a/crates/turbopack-ecmascript/src/chunk/content.rs b/crates/turbopack-ecmascript/src/chunk/content.rs index 669c57894a47f..3214a047147c4 100644 --- a/crates/turbopack-ecmascript/src/chunk/content.rs +++ b/crates/turbopack-ecmascript/src/chunk/content.rs @@ -8,7 +8,7 @@ use turbo_tasks_fs::{embed_file, File, FileContent, FileSystemPathReadRef, FileS use turbopack_core::{ asset::AssetContentVc, chunk::{ - availablility_info::AvailablilityInfo, chunk_content, chunk_content_split, + availability_info::AvailabilityInfo, chunk_content, chunk_content_split, ChunkContentResult, ChunkGroupVc, ChunkVc, ChunkingContext, ChunkingContextVc, ModuleId, }, code_builder::{CodeBuilder, CodeVc}, @@ -64,13 +64,13 @@ pub(crate) fn ecmascript_chunk_content( context: ChunkingContextVc, main_entries: EcmascriptChunkPlaceablesVc, omit_entries: Option, - availablility_info: Value, + availability_info: Value, ) -> EcmascriptChunkContentResultVc { let mut chunk_content = - ecmascript_chunk_content_internal(context, main_entries, availablility_info); + ecmascript_chunk_content_internal(context, main_entries, availability_info); if let Some(omit_entries) = omit_entries { let omit_chunk_content = - ecmascript_chunk_content_internal(context, omit_entries, availablility_info); + ecmascript_chunk_content_internal(context, omit_entries, availability_info); chunk_content = chunk_content.filter(omit_chunk_content); } chunk_content @@ -80,13 +80,13 @@ pub(crate) fn ecmascript_chunk_content( async fn ecmascript_chunk_content_internal( context: ChunkingContextVc, entries: EcmascriptChunkPlaceablesVc, - availablility_info: Value, + availability_info: Value, ) -> Result { let entries = entries.await?; let entries = entries.iter().copied(); let contents = entries - .map(|entry| ecmascript_chunk_content_single_entry(context, entry, availablility_info)) + .map(|entry| ecmascript_chunk_content_single_entry(context, entry, availability_info)) .collect::>(); if contents.len() == 1 { @@ -128,17 +128,17 @@ async fn ecmascript_chunk_content_internal( async fn ecmascript_chunk_content_single_entry( context: ChunkingContextVc, entry: EcmascriptChunkPlaceableVc, - availablility_info: Value, + availability_info: Value, ) -> Result { let asset = entry.as_asset(); Ok(EcmascriptChunkContentResultVc::cell( if let Some(res) = - chunk_content::(context, asset, None, availablility_info).await? + chunk_content::(context, asset, None, availability_info).await? { res } else { - chunk_content_split::(context, asset, None, availablility_info) + chunk_content_split::(context, asset, None, availability_info) .await? } .into(), @@ -163,12 +163,12 @@ impl EcmascriptChunkContentVc { omit_entries: Option, chunk_path: FileSystemPathVc, evaluate: Option, - availablility_info: Value, + availability_info: Value, ) -> Result { // TODO(alexkirsz) All of this should be done in a transition, otherwise we run // the risks of values not being strongly consistent with each other. let chunk_content = - ecmascript_chunk_content(context, main_entries, omit_entries, availablility_info); + ecmascript_chunk_content(context, main_entries, omit_entries, availability_info); let chunk_content = chunk_content.await?; let chunk_path = chunk_path.await?; let module_factories = chunk_content.chunk_items.to_entry_snapshot().await?; diff --git a/crates/turbopack-ecmascript/src/chunk/item.rs b/crates/turbopack-ecmascript/src/chunk/item.rs index 678e905f5e958..c6918fc995330 100644 --- a/crates/turbopack-ecmascript/src/chunk/item.rs +++ b/crates/turbopack-ecmascript/src/chunk/item.rs @@ -6,7 +6,7 @@ use turbo_tasks_fs::rope::Rope; use turbopack_core::{ asset::AssetVc, chunk::{ - available_assets::AvailableAssetsVc, availablility_info::AvailablilityInfo, ChunkItem, + availability_info::AvailabilityInfo, available_assets::AvailableAssetsVc, ChunkItem, ChunkItemVc, ChunkableAssetVc, ChunkingContextVc, FromChunkableAsset, ModuleIdVc, }, }; @@ -61,26 +61,26 @@ impl FromChunkableAsset for EcmascriptChunkItemVc { async fn from_async_asset( context: ChunkingContextVc, asset: ChunkableAssetVc, - availablility_info: Value, + availability_info: Value, ) -> Result> { - let next_availablility_info = match availablility_info.into_value() { - AvailablilityInfo::Untracked => AvailablilityInfo::Untracked, - AvailablilityInfo::Root { + let next_availability_info = match availability_info.into_value() { + AvailabilityInfo::Untracked => AvailabilityInfo::Untracked, + AvailabilityInfo::Root { current_availability_root, - } => AvailablilityInfo::Inner { + } => AvailabilityInfo::Inner { available_assets: AvailableAssetsVc::new(vec![current_availability_root]), current_availability_root: asset.as_asset(), }, - AvailablilityInfo::Inner { + AvailabilityInfo::Inner { available_assets, current_availability_root, - } => AvailablilityInfo::Inner { + } => AvailabilityInfo::Inner { available_assets: available_assets.with_roots(vec![current_availability_root]), current_availability_root: asset.as_asset(), }, }; let manifest_asset = - ManifestChunkAssetVc::new(asset, context, Value::new(next_availablility_info)); + ManifestChunkAssetVc::new(asset, context, Value::new(next_availability_info)); let manifest_loader = ManifestLoaderItemVc::new(manifest_asset); Ok(Some(manifest_loader.into())) } diff --git a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs index 995e6a51e9f86..a897e03622192 100644 --- a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs +++ b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs @@ -4,7 +4,7 @@ use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - availablility_info::AvailablilityInfo, ChunkGroupVc, ChunkReferenceVc, ChunkVc, + availability_info::AvailabilityInfo, ChunkGroupVc, ChunkReferenceVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContext, ChunkingContextVc, }, ident::AssetIdentVc, @@ -45,7 +45,7 @@ fn chunk_list_modifier() -> StringVc { pub struct ManifestChunkAsset { pub asset: ChunkableAssetVc, pub chunking_context: ChunkingContextVc, - pub availablility_info: AvailablilityInfo, + pub availability_info: AvailabilityInfo, } #[turbo_tasks::value_impl] @@ -54,12 +54,12 @@ impl ManifestChunkAssetVc { pub fn new( asset: ChunkableAssetVc, chunking_context: ChunkingContextVc, - availablility_info: Value, + availability_info: Value, ) -> Self { Self::cell(ManifestChunkAsset { asset, chunking_context, - availablility_info: availablility_info.into_value(), + availability_info: availability_info.into_value(), }) } @@ -69,7 +69,7 @@ impl ManifestChunkAssetVc { Ok(ChunkGroupVc::from_asset( this.asset, this.chunking_context, - Value::new(this.availablility_info), + Value::new(this.availability_info), )) } @@ -82,7 +82,7 @@ impl ManifestChunkAssetVc { #[turbo_tasks::function] pub async fn manifest_chunk(self) -> Result { let this = self.await?; - Ok(self.as_chunk(this.chunking_context, Value::new(this.availablility_info))) + Ok(self.as_chunk(this.chunking_context, Value::new(this.availability_info))) } #[turbo_tasks::function] @@ -128,9 +128,9 @@ impl ChunkableAsset for ManifestChunkAsset { fn as_chunk( self_vc: ManifestChunkAssetVc, context: ChunkingContextVc, - availablility_info: Value, + availability_info: Value, ) -> ChunkVc { - EcmascriptChunkVc::new(context, self_vc.into(), availablility_info).into() + EcmascriptChunkVc::new(context, self_vc.into(), availability_info).into() } } diff --git a/crates/turbopack-ecmascript/src/chunk/mod.rs b/crates/turbopack-ecmascript/src/chunk/mod.rs index 2b37d693e836e..f8b9a904c87ea 100644 --- a/crates/turbopack-ecmascript/src/chunk/mod.rs +++ b/crates/turbopack-ecmascript/src/chunk/mod.rs @@ -24,7 +24,7 @@ use turbo_tasks_fs::FileSystemPathOptionVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - availablility_info::AvailablilityInfo, + availability_info::AvailabilityInfo, optimize::{ChunkOptimizerVc, OptimizableChunk, OptimizableChunkVc}, Chunk, ChunkGroupReferenceVc, ChunkGroupVc, ChunkItem, ChunkListReferenceVc, ChunkReferenceVc, ChunkVc, ChunkingContext, ChunkingContextVc, @@ -63,7 +63,7 @@ pub struct EcmascriptChunk { main_entries: EcmascriptChunkPlaceablesVc, omit_entries: Option, evaluate: Option, - availablility_info: AvailablilityInfo, + availability_info: AvailabilityInfo, } #[turbo_tasks::value_impl] @@ -74,14 +74,14 @@ impl EcmascriptChunkVc { main_entries: EcmascriptChunkPlaceablesVc, omit_entries: Option, evaluate: Option, - availablility_info: Value, + availability_info: Value, ) -> Self { EcmascriptChunk { context, main_entries, omit_entries, evaluate, - availablility_info: availablility_info.into_value(), + availability_info: availability_info.into_value(), } .cell() } @@ -90,14 +90,14 @@ impl EcmascriptChunkVc { pub fn new( context: ChunkingContextVc, main_entry: EcmascriptChunkPlaceableVc, - availablility_info: Value, + availability_info: Value, ) -> Self { Self::new_normalized( context, EcmascriptChunkPlaceablesVc::cell(vec![main_entry]), None, None, - availablility_info, + availability_info, ) } @@ -125,7 +125,7 @@ impl EcmascriptChunkVc { } .cell(), ), - Value::new(AvailablilityInfo::Root { + Value::new(AvailabilityInfo::Root { current_availability_root: main_entry.as_asset(), }), )) @@ -170,13 +170,13 @@ impl EcmascriptChunkVc { a.context, a.main_entries, a.omit_entries, - Value::new(a.availablility_info), + Value::new(a.availability_info), ); let b = ecmascript_chunk_content( b.context, b.main_entries, b.omit_entries, - Value::new(b.availablility_info), + Value::new(b.availability_info), ); let a = a.await?.chunk_items.to_set(); @@ -285,7 +285,7 @@ impl EcmascriptChunkVc { this.context, this.main_entries, this.omit_entries, - Value::new(this.availablility_info), + Value::new(this.availability_info), )) } @@ -318,7 +318,7 @@ impl EcmascriptChunkVc { this.omit_entries, chunk_path, evaluate, - Value::new(this.availablility_info), + Value::new(this.availability_info), ); Ok(content) } @@ -361,7 +361,7 @@ impl Asset for EcmascriptChunk { } // Current availability root is included - if let Some(current_availability_root) = this.availablility_info.current_availability_root() + if let Some(current_availability_root) = this.availability_info.current_availability_root() { let ident = current_availability_root.ident(); let need_root = if let [(_, main_entry)] = &assets[..] { @@ -397,7 +397,7 @@ impl Asset for EcmascriptChunk { } // Available assets are included - if let Some(available_assets) = this.availablility_info.available_assets() { + if let Some(available_assets) = this.availability_info.available_assets() { modifiers.push(available_assets.hash().to_string()); } @@ -431,7 +431,7 @@ impl Asset for EcmascriptChunk { this.context, this.main_entries, this.omit_entries, - Value::new(this.availablility_info), + Value::new(this.availability_info), ) .await?; let mut references = Vec::new(); @@ -505,7 +505,7 @@ impl Introspectable for EcmascriptChunk { this.context, this.main_entries, this.omit_entries, - Value::new(this.availablility_info), + Value::new(this.availability_info), ) .await?; let chunk_items = chunk_content.chunk_items.await?; diff --git a/crates/turbopack-ecmascript/src/chunk/optimize.rs b/crates/turbopack-ecmascript/src/chunk/optimize.rs index 1e6a8cfc142ef..4940904a6f5c0 100644 --- a/crates/turbopack-ecmascript/src/chunk/optimize.rs +++ b/crates/turbopack-ecmascript/src/chunk/optimize.rs @@ -69,7 +69,7 @@ async fn merge_chunks( EcmascriptChunkPlaceablesVc::cell(main_entries.into_iter().collect()), None, evaluate, - Value::new(first.availablility_info), + Value::new(first.availability_info), )) } @@ -405,7 +405,7 @@ async fn optimize_ecmascript( } .cell(), ), - Value::new(content.availablility_info), + Value::new(content.availability_info), ) } } diff --git a/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs b/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs index f4515c7a1940f..07e00a852d887 100644 --- a/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs +++ b/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs @@ -5,7 +5,7 @@ use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - availablility_info::AvailablilityInfo, Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc, + availability_info::AvailabilityInfo, Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc, ChunkReferenceVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContext, ChunkingContextVc, }, @@ -57,7 +57,7 @@ impl ChunkGroupFilesAssetVc { ChunkGroupVc::from_asset( this.asset, this.chunking_context, - Value::new(AvailablilityInfo::Root { + Value::new(AvailabilityInfo::Root { current_availability_root: this.asset.into(), }), ) @@ -106,12 +106,12 @@ impl ChunkableAsset for ChunkGroupFilesAsset { fn as_chunk( self_vc: ChunkGroupFilesAssetVc, context: ChunkingContextVc, - availablility_info: Value, + availability_info: Value, ) -> ChunkVc { EcmascriptChunkVc::new( context, self_vc.as_ecmascript_chunk_placeable(), - availablility_info, + availability_info, ) .into() } @@ -130,7 +130,7 @@ impl EcmascriptChunkPlaceable for ChunkGroupFilesAsset { inner: self_vc, chunk: this.asset.as_chunk( context, - Value::new(AvailablilityInfo::Root { + Value::new(AvailabilityInfo::Root { current_availability_root: this.asset.into(), }), ), diff --git a/crates/turbopack-ecmascript/src/lib.rs b/crates/turbopack-ecmascript/src/lib.rs index f5a5f427636bb..07926df07641f 100644 --- a/crates/turbopack-ecmascript/src/lib.rs +++ b/crates/turbopack-ecmascript/src/lib.rs @@ -49,7 +49,7 @@ use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetOptionVc, AssetVc}, chunk::{ - availablility_info::AvailablilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + availability_info::AvailabilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc, }, compile_time_info::CompileTimeInfoVc, @@ -259,12 +259,12 @@ impl ChunkableAsset for EcmascriptModuleAsset { fn as_chunk( self_vc: EcmascriptModuleAssetVc, context: ChunkingContextVc, - availablility_info: Value, + availability_info: Value, ) -> ChunkVc { EcmascriptChunkVc::new( context, self_vc.as_ecmascript_chunk_placeable(), - availablility_info, + availability_info, ) .into() } diff --git a/crates/turbopack-ecmascript/src/references/pattern_mapping.rs b/crates/turbopack-ecmascript/src/references/pattern_mapping.rs index 656a0f489731e..7391686741453 100644 --- a/crates/turbopack-ecmascript/src/references/pattern_mapping.rs +++ b/crates/turbopack-ecmascript/src/references/pattern_mapping.rs @@ -8,7 +8,7 @@ use turbo_tasks::{debug::ValueDebug, primitives::StringVc, Value, ValueToString} use turbopack_core::{ asset::Asset, chunk::{ - availablility_info::AvailablilityInfo, ChunkableAssetVc, ChunkingContextVc, + availability_info::AvailabilityInfo, ChunkableAssetVc, ChunkingContextVc, FromChunkableAsset, ModuleId, }, issue::{code_gen::CodeGenerationIssue, IssueSeverity}, @@ -160,13 +160,13 @@ impl PatternMappingVc { if let Some(chunkable) = ChunkableAssetVc::resolve_from(asset).await? { if *resolve_type == ResolveType::EsmAsync { - // Passing [AvailablilityInfo::Untracked] works here because the manifest loader + // Passing [AvailabilityInfo::Untracked] works here because the manifest loader // has an id that is independent of them. So luckily we don't need chunk // dependent code generation. if let Some(loader) = EcmascriptChunkItemVc::from_async_asset( context, chunkable, - Value::new(AvailablilityInfo::Untracked), + Value::new(AvailabilityInfo::Untracked), ) .await? { diff --git a/crates/turbopack-env/src/asset.rs b/crates/turbopack-env/src/asset.rs index af25742613ebf..5145b48c2ebe8 100644 --- a/crates/turbopack-env/src/asset.rs +++ b/crates/turbopack-env/src/asset.rs @@ -7,7 +7,7 @@ use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - availablility_info::AvailablilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + availability_info::AvailabilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc, }, ident::AssetIdentVc, @@ -65,9 +65,9 @@ impl ChunkableAsset for ProcessEnvAsset { fn as_chunk( self_vc: ProcessEnvAssetVc, context: ChunkingContextVc, - availablility_info: Value, + availability_info: Value, ) -> ChunkVc { - EcmascriptChunkVc::new(context, self_vc.into(), availablility_info).into() + EcmascriptChunkVc::new(context, self_vc.into(), availability_info).into() } } diff --git a/crates/turbopack-json/src/lib.rs b/crates/turbopack-json/src/lib.rs index 0d9c3f99e2fc6..392e31cba3793 100644 --- a/crates/turbopack-json/src/lib.rs +++ b/crates/turbopack-json/src/lib.rs @@ -15,7 +15,7 @@ use turbo_tasks_fs::{FileContent, FileJsonContent}; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - availablility_info::AvailablilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + availability_info::AvailabilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc, }, ident::AssetIdentVc, @@ -64,12 +64,12 @@ impl ChunkableAsset for JsonModuleAsset { fn as_chunk( self_vc: JsonModuleAssetVc, context: ChunkingContextVc, - availablility_info: Value, + availability_info: Value, ) -> ChunkVc { EcmascriptChunkVc::new( context, self_vc.as_ecmascript_chunk_placeable(), - availablility_info, + availability_info, ) .into() } diff --git a/crates/turbopack-mdx/src/lib.rs b/crates/turbopack-mdx/src/lib.rs index 42183ed1c6b0c..655eaa0b686d6 100644 --- a/crates/turbopack-mdx/src/lib.rs +++ b/crates/turbopack-mdx/src/lib.rs @@ -7,7 +7,7 @@ use turbo_tasks_fs::{rope::Rope, File, FileContent, FileSystemPathVc}; use turbopack_core::{ asset::{Asset, AssetContent, AssetContentVc, AssetVc}, chunk::{ - availablility_info::AvailablilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + availability_info::AvailabilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc, }, context::{AssetContext, AssetContextVc}, @@ -122,12 +122,12 @@ impl ChunkableAsset for MdxModuleAsset { fn as_chunk( self_vc: MdxModuleAssetVc, context: ChunkingContextVc, - availablility_info: Value, + availability_info: Value, ) -> ChunkVc { EcmascriptChunkVc::new( context, self_vc.as_ecmascript_chunk_placeable(), - availablility_info, + availability_info, ) .into() } diff --git a/crates/turbopack-static/src/lib.rs b/crates/turbopack-static/src/lib.rs index a7581138824c4..299d2c664aa05 100644 --- a/crates/turbopack-static/src/lib.rs +++ b/crates/turbopack-static/src/lib.rs @@ -16,7 +16,7 @@ use turbo_tasks_fs::FileContent; use turbopack_core::{ asset::{Asset, AssetContent, AssetContentVc, AssetVc}, chunk::{ - availablility_info::AvailablilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, + availability_info::AvailabilityInfo, ChunkItem, ChunkItemVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContext, ChunkingContextVc, }, context::AssetContextVc, @@ -83,12 +83,12 @@ impl ChunkableAsset for StaticModuleAsset { fn as_chunk( self_vc: StaticModuleAssetVc, context: ChunkingContextVc, - availablility_info: Value, + availability_info: Value, ) -> ChunkVc { EcmascriptChunkVc::new( context, self_vc.as_ecmascript_chunk_placeable(), - availablility_info, + availability_info, ) .into() } diff --git a/crates/turbopack-tests/tests/snapshot.rs b/crates/turbopack-tests/tests/snapshot.rs index f805538fffe85..c4b4a417e8924 100644 --- a/crates/turbopack-tests/tests/snapshot.rs +++ b/crates/turbopack-tests/tests/snapshot.rs @@ -28,7 +28,7 @@ use turbopack::{ use turbopack_core::{ asset::{Asset, AssetVc}, chunk::{ - availablility_info::AvailablilityInfo, dev::DevChunkingContextVc, ChunkableAsset, + availability_info::AvailabilityInfo, dev::DevChunkingContextVc, ChunkableAsset, ChunkableAssetVc, }, compile_time_defines, @@ -253,7 +253,7 @@ async fn run_test(resource: String) -> Result { } else if let Some(chunkable) = ChunkableAssetVc::resolve_from(module).await? { Ok(chunkable.as_chunk( chunking_context, - Value::new(AvailablilityInfo::Root { + Value::new(AvailabilityInfo::Root { current_availability_root: chunkable.into(), }), )) From 815fff0abaae0e6205c6aadb45752dc83e08ad97 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Fri, 10 Mar 2023 17:44:18 +0100 Subject: [PATCH 17/21] move chunk_list_path to ChunkGroup use entry chunk for chunk list path instead of only module to include all info chunk path no longer depends on chunk group content for evaluated chunks --- .../src/next_client_chunks/with_chunks.rs | 20 ++----- .../src/chunk/chunk_in_group.rs | 9 ++- crates/turbopack-core/src/chunk/dev.rs | 10 +++- crates/turbopack-core/src/chunk/list/asset.rs | 10 +--- .../src/chunk/list/reference.rs | 16 ++---- crates/turbopack-core/src/chunk/mod.rs | 23 +++++++- crates/turbopack-css/src/chunk/mod.rs | 7 ++- .../src/chunk/evaluate.rs | 17 ++---- .../src/chunk/manifest/chunk_asset.rs | 33 +++++------ .../src/chunk/manifest/chunk_item.rs | 17 ++++-- .../src/chunk/manifest/loader_item.rs | 30 +++------- crates/turbopack-ecmascript/src/chunk/mod.rs | 57 +++++++++---------- .../src/chunk/optimize.rs | 1 - .../src/chunk_group_files_asset.rs | 9 +-- 14 files changed, 118 insertions(+), 141 deletions(-) diff --git a/crates/next-core/src/next_client_chunks/with_chunks.rs b/crates/next-core/src/next_client_chunks/with_chunks.rs index d7b19850bf6d4..502b96f5e9d62 100644 --- a/crates/next-core/src/next_client_chunks/with_chunks.rs +++ b/crates/next-core/src/next_client_chunks/with_chunks.rs @@ -15,7 +15,7 @@ use turbopack_core::{ chunk::{ availability_info::AvailabilityInfo, Chunk, ChunkGroupReferenceVc, ChunkGroupVc, ChunkItem, ChunkItemVc, ChunkListReferenceVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, - ChunkingContext, ChunkingContextVc, + ChunkingContextVc, }, ident::AssetIdentVc, reference::AssetReferencesVc, @@ -49,14 +49,10 @@ impl Asset for WithChunksAsset { #[turbo_tasks::function] async fn references(self_vc: WithChunksAssetVc) -> Result { let this = self_vc.await?; + let chunk_group = self_vc.chunk_group(); Ok(AssetReferencesVc::cell(vec![ - ChunkGroupReferenceVc::new(self_vc.chunk_group()).into(), - ChunkListReferenceVc::new( - this.server_root, - self_vc.chunk_group(), - self_vc.chunk_list_path(), - ) - .into(), + ChunkGroupReferenceVc::new(chunk_group).into(), + ChunkListReferenceVc::new(this.server_root, chunk_group).into(), ])) } } @@ -102,12 +98,6 @@ impl EcmascriptChunkPlaceable for WithChunksAsset { #[turbo_tasks::value_impl] impl WithChunksAssetVc { - #[turbo_tasks::function] - async fn chunk_list_path(self) -> Result { - let this = self.await?; - Ok(this.chunking_context.chunk_list_path(self.ident())) - } - #[turbo_tasks::function] async fn chunk_group(self) -> Result { let this = self.await?; @@ -142,7 +132,7 @@ impl EcmascriptChunkItem for WithChunksChunkItem { let server_root = inner.server_root.await?; let mut client_chunks = Vec::new(); - let chunk_list_path = self.inner.chunk_list_path().await?; + let chunk_list_path = group.chunk_list_path().await?; let chunk_list_path = if let Some(path) = server_root.get_path_to(&chunk_list_path) { path } else { diff --git a/crates/turbopack-core/src/chunk/chunk_in_group.rs b/crates/turbopack-core/src/chunk/chunk_in_group.rs index faa759ba22316..5d71b9825910c 100644 --- a/crates/turbopack-core/src/chunk/chunk_in_group.rs +++ b/crates/turbopack-core/src/chunk/chunk_in_group.rs @@ -4,7 +4,7 @@ use turbo_tasks::{primitives::StringVc, ValueToString}; use super::{Chunk, ChunkVc, ParallelChunkReferenceVc}; use crate::{ asset::{Asset, AssetContentVc, AssetVc}, - chunk::ParallelChunkReference, + chunk::{ChunkingContextVc, ParallelChunkReference}, ident::AssetIdentVc, introspect::{ asset::{children_from_asset_references, content_to_details, IntrospectableAssetVc}, @@ -37,7 +37,12 @@ impl ChunkInGroupVc { } #[turbo_tasks::value_impl] -impl Chunk for ChunkInGroup {} +impl Chunk for ChunkInGroup { + #[turbo_tasks::function] + fn chunking_context(&self) -> ChunkingContextVc { + self.inner.chunking_context() + } +} #[turbo_tasks::value_impl] impl Asset for ChunkInGroup { diff --git a/crates/turbopack-core/src/chunk/dev.rs b/crates/turbopack-core/src/chunk/dev.rs index 0e336823e1297..21f72515714cf 100644 --- a/crates/turbopack-core/src/chunk/dev.rs +++ b/crates/turbopack-core/src/chunk/dev.rs @@ -223,8 +223,14 @@ impl ChunkingContext for DevChunkingContext { } #[turbo_tasks::function] - fn chunk_list_path(self_vc: DevChunkingContextVc, ident: AssetIdentVc) -> FileSystemPathVc { - self_vc.chunk_path(ident.with_modifier(chunk_list_modifier()), ".json") + fn chunk_list_path( + self_vc: DevChunkingContextVc, + entry_chunk_path: FileSystemPathVc, + ) -> FileSystemPathVc { + self_vc.chunk_path( + AssetIdentVc::from_path(entry_chunk_path).with_modifier(chunk_list_modifier()), + ".json", + ) } #[turbo_tasks::function] diff --git a/crates/turbopack-core/src/chunk/list/asset.rs b/crates/turbopack-core/src/chunk/list/asset.rs index 439256dad380f..20344aa4c952f 100644 --- a/crates/turbopack-core/src/chunk/list/asset.rs +++ b/crates/turbopack-core/src/chunk/list/asset.rs @@ -22,22 +22,16 @@ use crate::{ pub(super) struct ChunkListAsset { server_root: FileSystemPathVc, chunk_group: ChunkGroupVc, - path: FileSystemPathVc, } #[turbo_tasks::value_impl] impl ChunkListAssetVc { /// Creates a new [`ChunkListAsset`]. #[turbo_tasks::function] - pub fn new( - server_root: FileSystemPathVc, - chunk_group: ChunkGroupVc, - path: FileSystemPathVc, - ) -> Self { + pub fn new(server_root: FileSystemPathVc, chunk_group: ChunkGroupVc) -> Self { ChunkListAsset { server_root, chunk_group, - path, } .cell() } @@ -61,7 +55,7 @@ impl ChunkListAssetVc { impl Asset for ChunkListAsset { #[turbo_tasks::function] fn ident(&self) -> AssetIdentVc { - AssetIdentVc::from_path(self.path) + AssetIdentVc::from_path(self.chunk_group.chunk_list_path()) } #[turbo_tasks::function] diff --git a/crates/turbopack-core/src/chunk/list/reference.rs b/crates/turbopack-core/src/chunk/list/reference.rs index 2e54db54d7f41..950c57baf2720 100644 --- a/crates/turbopack-core/src/chunk/list/reference.rs +++ b/crates/turbopack-core/src/chunk/list/reference.rs @@ -22,22 +22,16 @@ use crate::{ pub struct ChunkListReference { server_root: FileSystemPathVc, chunk_group: ChunkGroupVc, - path: FileSystemPathVc, } #[turbo_tasks::value_impl] impl ChunkListReferenceVc { /// Creates a new [`ChunkListReference`]. #[turbo_tasks::function] - pub fn new( - server_root: FileSystemPathVc, - chunk_group: ChunkGroupVc, - path: FileSystemPathVc, - ) -> Self { + pub fn new(server_root: FileSystemPathVc, chunk_group: ChunkGroupVc) -> Self { ChunkListReference { server_root, chunk_group, - path, } .cell() } @@ -49,7 +43,7 @@ impl ValueToString for ChunkListReference { async fn to_string(&self) -> Result { Ok(StringVc::cell(format!( "referenced chunk list {}", - self.path.to_string().await? + self.chunk_group.chunk_list_path().to_string().await? ))) } } @@ -58,10 +52,8 @@ impl ValueToString for ChunkListReference { impl AssetReference for ChunkListReference { #[turbo_tasks::function] fn resolve_reference(&self) -> ResolveResultVc { - ResolveResult::asset( - ChunkListAssetVc::new(self.server_root, self.chunk_group, self.path).into(), - ) - .cell() + ResolveResult::asset(ChunkListAssetVc::new(self.server_root, self.chunk_group).into()) + .cell() } } diff --git a/crates/turbopack-core/src/chunk/mod.rs b/crates/turbopack-core/src/chunk/mod.rs index 823b4bd6d1f4c..809e5029631af 100644 --- a/crates/turbopack-core/src/chunk/mod.rs +++ b/crates/turbopack-core/src/chunk/mod.rs @@ -89,9 +89,9 @@ pub trait ChunkingContext { fn chunk_path(&self, ident: AssetIdentVc, extension: &str) -> FileSystemPathVc; - /// Returns the path to the chunk list file for the given entry module - /// ident. - fn chunk_list_path(&self, ident: AssetIdentVc) -> FileSystemPathVc; + /// Returns the path to the chunk list file for the given unoptimized entry + /// chunk path. + fn chunk_list_path(&self, entry_chunk_path: FileSystemPathVc) -> FileSystemPathVc; fn can_be_in_same_chunk(&self, asset_a: AssetVc, asset_b: AssetVc) -> BoolVc; @@ -144,6 +144,22 @@ impl ChunkGroupVc { Self::cell(ChunkGroup { entry: chunk }) } + /// Returns the entry chunk of this chunk group. + #[turbo_tasks::function] + pub async fn entry(self) -> Result { + Ok(self.await?.entry) + } + + /// Returns the chunk list path for this chunk group. + #[turbo_tasks::function] + pub async fn chunk_list_path(self) -> Result { + let this = self.await?; + Ok(this + .entry + .chunking_context() + .chunk_list_path(this.entry.ident().path())) + } + /// Lists all chunks that are in this chunk group. /// These chunks need to be loaded to fulfill that chunk group. /// All chunks should be loaded in parallel. @@ -231,6 +247,7 @@ impl ValueToString for ChunkGroup { /// same chunk group. #[turbo_tasks::value_trait] pub trait Chunk: Asset { + fn chunking_context(&self) -> ChunkingContextVc; // TODO Once output assets have their own trait, this path() method will move // into that trait and ident() will be removed from that. Assets on the // output-level only have a path and no complex ident. diff --git a/crates/turbopack-css/src/chunk/mod.rs b/crates/turbopack-css/src/chunk/mod.rs index 8759a26ea21ca..9bf8447738f5e 100644 --- a/crates/turbopack-css/src/chunk/mod.rs +++ b/crates/turbopack-css/src/chunk/mod.rs @@ -271,7 +271,12 @@ async fn css_chunk_content_single_entry( } #[turbo_tasks::value_impl] -impl Chunk for CssChunk {} +impl Chunk for CssChunk { + #[turbo_tasks::function] + fn chunking_context(&self) -> ChunkingContextVc { + self.context + } +} #[turbo_tasks::value_impl] impl OptimizableChunk for CssChunk { diff --git a/crates/turbopack-ecmascript/src/chunk/evaluate.rs b/crates/turbopack-ecmascript/src/chunk/evaluate.rs index 2b266fee1f549..0b8c350179f4b 100644 --- a/crates/turbopack-ecmascript/src/chunk/evaluate.rs +++ b/crates/turbopack-ecmascript/src/chunk/evaluate.rs @@ -1,5 +1,4 @@ use anyhow::Result; -use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::chunk::{ chunk_in_group::ChunkInGroupVc, Chunk, ChunkGroupVc, ChunkingContext, ChunkingContextVc, ModuleIdVc, @@ -21,9 +20,6 @@ pub struct EcmascriptChunkEvaluate { /// All chunks of this chunk group need to be ready for execution to start. /// When None, it will use a chunk group created from the current chunk. pub chunk_group: Option, - /// The path to the chunk list asset. This will be used to register the - /// chunk list when this chunk is evaluated. - pub chunk_list_path: Option, } #[turbo_tasks::value_impl] @@ -37,7 +33,6 @@ impl EcmascriptChunkEvaluateVc { let &EcmascriptChunkEvaluate { evaluate_entries, chunk_group, - chunk_list_path, } = &*self.await?; let chunk_group = chunk_group.unwrap_or_else(|| ChunkGroupVc::from_chunk(origin_chunk.into())); @@ -68,14 +63,10 @@ impl EcmascriptChunkEvaluateVc { .iter() .map(|entry| entry.as_chunk_item(context).id()) .collect(); - let chunk_list_path = if let Some(chunk_list_path) = chunk_list_path { - let chunk_list_path = chunk_list_path.await?; - output_root - .get_path_to(&chunk_list_path) - .map(|path| path.to_string()) - } else { - None - }; + let chunk_list_path = chunk_group.chunk_list_path().await?; + let chunk_list_path = output_root + .get_path_to(&chunk_list_path) + .map(|path| path.to_string()); Ok(EcmascriptChunkContentEvaluate { ecma_chunks_server_paths, other_chunks_server_paths, diff --git a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs index a897e03622192..21371dba7a5d0 100644 --- a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs +++ b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_asset.rs @@ -1,11 +1,12 @@ +use std::iter::once; + use anyhow::Result; use turbo_tasks::{primitives::StringVc, Value}; -use turbo_tasks_fs::FileSystemPathVc; use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ - availability_info::AvailabilityInfo, ChunkGroupVc, ChunkReferenceVc, ChunkVc, - ChunkableAsset, ChunkableAssetVc, ChunkingContext, ChunkingContextVc, + availability_info::AvailabilityInfo, ChunkGroupVc, ChunkListReferenceVc, ChunkReferenceVc, + ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContext, ChunkingContextVc, }, ident::AssetIdentVc, reference::AssetReferencesVc, @@ -73,25 +74,11 @@ impl ManifestChunkAssetVc { )) } - #[turbo_tasks::function] - pub(super) async fn chunk_list_path(self) -> Result { - let this = &*self.await?; - Ok(this.chunking_context.chunk_list_path(self.ident())) - } - #[turbo_tasks::function] pub async fn manifest_chunk(self) -> Result { let this = self.await?; Ok(self.as_chunk(this.chunking_context, Value::new(this.availability_info))) } - - #[turbo_tasks::function] - async fn chunks_list_path(self) -> Result { - Ok(self - .await? - .chunking_context - .chunk_path(self.ident().with_modifier(chunk_list_modifier()), ".json")) - } } #[turbo_tasks::value_impl] @@ -108,7 +95,8 @@ impl Asset for ManifestChunkAsset { #[turbo_tasks::function] async fn references(self_vc: ManifestChunkAssetVc) -> Result { - let chunks = self_vc.chunk_group().chunks(); + let chunk_group = self_vc.chunk_group(); + let chunks = chunk_group.chunks(); Ok(AssetReferencesVc::cell( chunks @@ -117,6 +105,15 @@ impl Asset for ManifestChunkAsset { .copied() .map(ChunkReferenceVc::new) .map(Into::into) + .chain(once( + // This creates the chunk list corresponding to the manifest chunk's chunk + // group. + ChunkListReferenceVc::new( + self_vc.await?.chunking_context.output_root(), + chunk_group, + ) + .into(), + )) .collect(), )) } diff --git a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_item.rs b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_item.rs index 6e7821c382b02..af5825770b66f 100644 --- a/crates/turbopack-ecmascript/src/chunk/manifest/chunk_item.rs +++ b/crates/turbopack-ecmascript/src/chunk/manifest/chunk_item.rs @@ -1,4 +1,4 @@ -use anyhow::{bail, Result}; +use anyhow::{anyhow, bail, Result}; use indexmap::IndexSet; use indoc::formatdoc; use turbo_tasks::ValueToString; @@ -36,7 +36,9 @@ impl EcmascriptChunkItem for ManifestChunkItem { #[turbo_tasks::function] async fn content(&self) -> Result { - let chunks = self.manifest.chunk_group().chunks().await?; + let chunk_group = self.manifest.chunk_group(); + let chunks = chunk_group.chunks().await?; + let output_root = self.context.output_root().await?; let mut chunk_server_paths = IndexSet::new(); for chunk in chunks.iter() { @@ -45,7 +47,6 @@ impl EcmascriptChunkItem for ManifestChunkItem { // item is one of several that are contained in that chunk file. let chunk_path = &*chunk.path().await?; // The pathname is the file path necessary to load the chunk from the server. - let output_root = self.context.output_root().await?; let chunk_server_path = if let Some(path) = output_root.get_path_to(chunk_path) { path } else { @@ -58,11 +59,17 @@ impl EcmascriptChunkItem for ManifestChunkItem { chunk_server_paths.insert(chunk_server_path.to_string()); } + let chunk_list_path = chunk_group.chunk_list_path().await?; + let chunk_list_path = output_root + .get_path_to(&*chunk_list_path) + .ok_or(anyhow!("chunk list path is not in output root"))?; + let code = formatdoc! { r#" - __turbopack_export_value__({chunk_paths}); + __turbopack_export_value__({{ chunks: {chunk_paths}, list: {chunk_list_path} }}); "#, - chunk_paths = stringify_js_pretty(&chunk_server_paths) + chunk_paths = stringify_js_pretty(&chunk_server_paths), + chunk_list_path = stringify_js_pretty(&chunk_list_path), }; Ok(EcmascriptChunkItemContent { diff --git a/crates/turbopack-ecmascript/src/chunk/manifest/loader_item.rs b/crates/turbopack-ecmascript/src/chunk/manifest/loader_item.rs index 0e28156f34ffd..d69c5be957cac 100644 --- a/crates/turbopack-ecmascript/src/chunk/manifest/loader_item.rs +++ b/crates/turbopack-ecmascript/src/chunk/manifest/loader_item.rs @@ -5,10 +5,7 @@ use indoc::writedoc; use turbo_tasks::{primitives::StringVc, ValueToString}; use turbopack_core::{ asset::Asset, - chunk::{ - Chunk, ChunkItem, ChunkItemVc, ChunkListReferenceVc, ChunkReferenceVc, ChunkingContext, - ChunkingContextVc, - }, + chunk::{Chunk, ChunkItem, ChunkItemVc, ChunkReferenceVc, ChunkingContext, ChunkingContextVc}, ident::AssetIdentVc, reference::AssetReferencesVc, }; @@ -64,16 +61,10 @@ impl ChunkItem for ManifestLoaderItem { #[turbo_tasks::function] async fn references(&self) -> Result { - Ok(AssetReferencesVc::cell(vec![ - ChunkReferenceVc::new(self.manifest.manifest_chunk()).into(), - // This creates the chunk list corresponding to the manifest chunk's chunk group. - ChunkListReferenceVc::new( - self.manifest.await?.chunking_context.output_root(), - self.manifest.chunk_group(), - self.manifest.chunk_list_path(), - ) - .into(), - ])) + Ok(AssetReferencesVc::cell(vec![ChunkReferenceVc::new( + self.manifest.manifest_chunk(), + ) + .into()])) } } @@ -140,9 +131,9 @@ impl EcmascriptChunkItem for ManifestLoaderItem { __turbopack_export_value__((__turbopack_import__) => {{ return __turbopack_load__({chunk_server_path}).then(() => {{ return __turbopack_require__({item_id}); - }}).then((chunks_paths) => {{ - __turbopack_register_chunk_list__({chunk_list_path}, chunks_paths); - return Promise.all(chunks_paths.map((chunk_path) => __turbopack_load__(chunk_path))); + }}).then(({{ chunks, list }}) => {{ + __turbopack_register_chunk_list__(list, chunks); + return Promise.all(chunks.map((chunk_path) => __turbopack_load__(chunk_path))); }}).then(() => {{ return __turbopack_import__({dynamic_id}); }}); @@ -151,11 +142,6 @@ impl EcmascriptChunkItem for ManifestLoaderItem { chunk_server_path = stringify_js(chunk_server_path), item_id = stringify_js(item_id), dynamic_id = stringify_js(dynamic_id), - chunk_list_path = stringify_js( - output_root - .get_path_to(&*this.manifest.chunk_list_path().await?) - .ok_or(anyhow!("chunk list path is not in output root"))? - ) )?; Ok(EcmascriptChunkItemContent { diff --git a/crates/turbopack-ecmascript/src/chunk/mod.rs b/crates/turbopack-ecmascript/src/chunk/mod.rs index f8b9a904c87ea..757d9616b3e2b 100644 --- a/crates/turbopack-ecmascript/src/chunk/mod.rs +++ b/crates/turbopack-ecmascript/src/chunk/mod.rs @@ -121,7 +121,6 @@ impl EcmascriptChunkVc { EcmascriptChunkEvaluate { evaluate_entries: entries, chunk_group: None, - chunk_list_path: Some(context.chunk_list_path(main_entry.ident())), } .cell(), ), @@ -213,7 +212,12 @@ pub struct EcmascriptChunkComparison { } #[turbo_tasks::value_impl] -impl Chunk for EcmascriptChunk {} +impl Chunk for EcmascriptChunk { + #[turbo_tasks::function] + fn chunking_context(&self) -> ChunkingContextVc { + self.context + } +} #[turbo_tasks::value_impl] impl OptimizableChunk for EcmascriptChunk { @@ -378,22 +382,25 @@ impl Asset for EcmascriptChunk { // Evaluate info is included let mut modifiers = Vec::new(); if let Some(evaluate) = this.evaluate { - let evaluate = evaluate.content(this.context, self_vc).await?; + let evaluate = evaluate.await?; modifiers.extend( evaluate - .ecma_chunks_server_paths - .iter() - .cloned() - .map(StringVc::cell), - ); - modifiers.extend( - evaluate - .other_chunks_server_paths + .evaluate_entries + .await? .iter() - .cloned() - .map(StringVc::cell), + .map(|entry| entry.ident().to_string()), ); - modifiers.extend(evaluate.entry_modules_ids.iter().map(|id| id.to_string())); + // When the chunk group has changed, e.g. due to optimization, we want to + // include the information too. Since the optimization is + // deterministic, it's enough to include the entry chunk which is the only + // factor that influences the chunk group chunks. + // We want to avoid a cycle when this chunk is the entry chunk. + if let Some(chunk_group) = evaluate.chunk_group { + let entry = chunk_group.entry().resolve().await?; + if entry != self_vc.into() { + modifiers.push(entry.ident().to_string()); + } + } } // Available assets are included @@ -445,23 +452,11 @@ impl Asset for EcmascriptChunk { references.push(ChunkGroupReferenceVc::new(*chunk_group).into()); } if let Some(evaluate) = this.evaluate { - let EcmascriptChunkEvaluate { - chunk_list_path, - chunk_group, - .. - } = *evaluate.await?; - if let Some(chunk_list_path) = chunk_list_path { - let chunk_group = - chunk_group.unwrap_or_else(|| ChunkGroupVc::from_chunk(self_vc.into())); - references.push( - ChunkListReferenceVc::new( - this.context.output_root(), - chunk_group, - chunk_list_path, - ) - .into(), - ); - } + let EcmascriptChunkEvaluate { chunk_group, .. } = *evaluate.await?; + let chunk_group = + chunk_group.unwrap_or_else(|| ChunkGroupVc::from_chunk(self_vc.into())); + references + .push(ChunkListReferenceVc::new(this.context.output_root(), chunk_group).into()); } references.push(EcmascriptChunkSourceMapAssetReferenceVc::new(self_vc).into()); diff --git a/crates/turbopack-ecmascript/src/chunk/optimize.rs b/crates/turbopack-ecmascript/src/chunk/optimize.rs index 4940904a6f5c0..0414f8c2c25fd 100644 --- a/crates/turbopack-ecmascript/src/chunk/optimize.rs +++ b/crates/turbopack-ecmascript/src/chunk/optimize.rs @@ -401,7 +401,6 @@ async fn optimize_ecmascript( EcmascriptChunkEvaluate { evaluate_entries: evaluate.evaluate_entries, chunk_group: Some(chunk_group), - chunk_list_path: evaluate.chunk_list_path, } .cell(), ), diff --git a/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs b/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs index 07e00a852d887..b7766173a0aa5 100644 --- a/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs +++ b/crates/turbopack-ecmascript/src/chunk_group_files_asset.rs @@ -6,8 +6,7 @@ use turbopack_core::{ asset::{Asset, AssetContentVc, AssetVc}, chunk::{ availability_info::AvailabilityInfo, Chunk, ChunkGroupVc, ChunkItem, ChunkItemVc, - ChunkReferenceVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContext, - ChunkingContextVc, + ChunkReferenceVc, ChunkVc, ChunkableAsset, ChunkableAssetVc, ChunkingContextVc, }, ident::AssetIdentVc, introspect::{ @@ -64,12 +63,6 @@ impl ChunkGroupFilesAssetVc { }; Ok(chunk_group) } - - #[turbo_tasks::function] - async fn chunk_list_path(self) -> Result { - let this = &*self.await?; - Ok(this.chunking_context.chunk_list_path(this.asset.ident())) - } } #[turbo_tasks::value_impl] From 8966a321084b0adafdf8f1aba5fb9977fc587b7f Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Fri, 10 Mar 2023 17:52:07 +0100 Subject: [PATCH 18/21] update snapshots --- ...apshot_basic_async_chunk_input_import_85740a.js | 4 ++-- ...apshot_basic_async_chunk_input_index_450749.js} | 12 ++++++------ ...ot_basic_async_chunk_input_index_450749.js.map} | 0 ...apshot_basic_async_chunk_input_index_580957.js} | 14 +++++++------- ...ot_basic_async_chunk_input_index_580957.js.map} | 0 ...s_snapshot_basic_chunked_input_index_874f70.js} | 8 ++++---- ...apshot_basic_chunked_input_index_874f70.js.map} | 0 ...s_snapshot_basic_chunked_input_index_9e2ad0.js} | 6 +++--- ...apshot_basic_chunked_input_index_9e2ad0.js.map} | 0 ...s_snapshot_basic_shebang_input_index_6c9fe5.js} | 6 +++--- ...apshot_basic_shebang_input_index_6c9fe5.js.map} | 0 ...s_snapshot_basic_shebang_input_index_fdfba0.js} | 8 ++++---- ...apshot_basic_shebang_input_index_fdfba0.js.map} | 0 ..._snapshot_comptime_define_input_index_68d56d.js | 4 ++-- ...snapshot_comptime_define_input_index_ffcac3.js} | 8 ++++---- ...shot_comptime_define_input_index_ffcac3.js.map} | 0 ..._css_absolute-uri-import_input_index_e73f78.js} | 8 ++++---- ..._absolute-uri-import_input_index_e73f78.js.map} | 0 ..._css_absolute-uri-import_input_index_ec53e6.js} | 6 +++--- ..._absolute-uri-import_input_index_ec53e6.js.map} | 0 ...s_tests_snapshot_css_css_input_index_e01293.js} | 8 ++++---- ...sts_snapshot_css_css_input_index_e01293.js.map} | 0 ...s_tests_snapshot_css_css_input_index_e969fb.js} | 8 ++++---- ...sts_snapshot_css_css_input_index_e969fb.js.map} | 0 ...snapshot_emotion_emotion_input_index_71d1a4.js} | 8 ++++---- ...shot_emotion_emotion_input_index_71d1a4.js.map} | 0 ...snapshot_emotion_emotion_input_index_e4d6b5.js} | 6 +++--- ...shot_emotion_emotion_input_index_e4d6b5.js.map} | 0 ...tests_tests_snapshot_env_env_input_a480a5._.js} | 8 ++++---- ...s_tests_snapshot_env_env_input_a480a5._.js.map} | 0 ...-tests_tests_snapshot_env_env_input_bb8ee7._.js | 4 ++-- ...ated_entrry_runtime_entry_input_index_19edf2.js | 4 ++-- ...ted_entrry_runtime_entry_input_index_51926d.js} | 8 ++++---- ...entrry_runtime_entry_input_index_51926d.js.map} | 0 ..._snapshot_example_example_input_index_0a08ce.js | 4 ++-- ...snapshot_example_example_input_index_673f1c.js} | 8 ++++---- ...shot_example_example_input_index_673f1c.js.map} | 0 ...apshot_export-alls_cjs-2_input_index_82c83d.js} | 8 ++++---- ...ot_export-alls_cjs-2_input_index_82c83d.js.map} | 0 ...napshot_export-alls_cjs-2_input_index_d5f22a.js | 4 ++-- ...ot_export-alls_cjs-script_input_index_ed5b85.js | 4 ++-- ...t_export-alls_cjs-script_input_index_f76046.js} | 8 ++++---- ...port-alls_cjs-script_input_index_f76046.js.map} | 0 ...snapshot_import-meta_cjs_input_index_32cfb4.js} | 8 ++++---- ...shot_import-meta_cjs_input_index_32cfb4.js.map} | 0 ..._snapshot_import-meta_cjs_input_index_746b39.js | 4 ++-- ...import-meta_esm-multiple_input_index_02a7c3.js} | 8 ++++---- ...rt-meta_esm-multiple_input_index_02a7c3.js.map} | 0 ..._import-meta_esm-multiple_input_index_8687d1.js | 4 ++-- ...t_import-meta_esm-mutable_input_index_3487d2.js | 4 ++-- ..._import-meta_esm-mutable_input_index_67d1c2.js} | 8 ++++---- ...ort-meta_esm-mutable_input_index_67d1c2.js.map} | 0 ...ot_import-meta_esm-object_input_index_73c2df.js | 4 ++-- ...t_import-meta_esm-object_input_index_bfaad6.js} | 8 ++++---- ...port-meta_esm-object_input_index_bfaad6.js.map} | 0 ...snapshot_import-meta_esm_input_index_9d9531.js} | 8 ++++---- ...shot_import-meta_esm_input_index_9d9531.js.map} | 0 ..._snapshot_import-meta_esm_input_index_fe8e61.js | 4 ++-- ..._snapshot_import-meta_url_input_index_5f69bf.js | 4 ++-- ...snapshot_import-meta_url_input_index_c686f7.js} | 8 ++++---- ...shot_import-meta_url_input_index_c686f7.js.map} | 0 ..._snapshot_imports_dynamic_input_index_56419a.js | 10 +++++----- ...snapshot_imports_dynamic_input_index_9b621f.js} | 14 +++++++------- ...shot_imports_dynamic_input_index_9b621f.js.map} | 0 ...ot_imports_dynamic_input_vercel.mjs_c72a25._.js | 4 ++-- ...ts_snapshot_imports_json_input_index_8148ab.js} | 8 ++++---- ...napshot_imports_json_input_index_8148ab.js.map} | 0 ...sts_snapshot_imports_json_input_index_881b1b.js | 4 ++-- ...imports_resolve_error_cjs_input_index_707ee1.js | 4 ++-- ...mports_resolve_error_cjs_input_index_ae8d72.js} | 8 ++++---- ...ts_resolve_error_cjs_input_index_ae8d72.js.map} | 0 ...mports_resolve_error_esm_input_index_35e7a9.js} | 8 ++++---- ...ts_resolve_error_esm_input_index_35e7a9.js.map} | 0 ...imports_resolve_error_esm_input_index_af6491.js | 4 ++-- ...ports_static-and-dynamic_input_index_115b05.js} | 14 +++++++------- ...s_static-and-dynamic_input_index_115b05.js.map} | 0 ...mports_static-and-dynamic_input_index_507785.js | 10 +++++----- ...static-and-dynamic_input_vercel.mjs_12d05a._.js | 4 ++-- ..._snapshot_imports_static_input_index_5b1237.js} | 8 ++++---- ...pshot_imports_static_input_index_5b1237.js.map} | 0 ...s_snapshot_imports_static_input_index_9fc270.js | 4 ++-- ...e_node_protocol_external_input_index_46dd5f.js} | 8 ++++---- ...de_protocol_external_input_index_46dd5f.js.map} | 0 ...de_node_protocol_external_input_index_69be78.js | 4 ++-- ...onents_styled_components_input_index_56786e.js} | 6 +++--- ...ts_styled_components_input_index_56786e.js.map} | 0 ...onents_styled_components_input_index_d9d28a.js} | 8 ++++---- ...ts_styled_components_input_index_d9d28a.js.map} | 0 ..._transforms_input_packages_app_index_484c8d.js} | 6 +++--- ...nsforms_input_packages_app_index_484c8d.js.map} | 0 ..._transforms_input_packages_app_index_e02442.js} | 8 ++++---- ...nsforms_input_packages_app_index_e02442.js.map} | 0 ...wc_transforms_preset_env_input_index_83e217.js} | 8 ++++---- ...ransforms_preset_env_input_index_83e217.js.map} | 0 ...wc_transforms_preset_env_input_index_bc3760.js} | 6 +++--- ...ransforms_preset_env_input_index_bc3760.js.map} | 0 ...pescript_jsconfig-baseurl_input_index_18c34e.js | 4 ++-- ...escript_jsconfig-baseurl_input_index_b81b04.js} | 8 ++++---- ...ipt_jsconfig-baseurl_input_index_b81b04.js.map} | 0 ...ipt_tsconfig-baseurl_input_index.ts_540b0c._.js | 4 ++-- ...pt_tsconfig-baseurl_input_index.ts_58f3de._.js} | 8 ++++---- ...sconfig-baseurl_input_index.ts_58f3de._.js.map} | 0 102 files changed, 214 insertions(+), 214 deletions(-) rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js => crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js} (98%) rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js.map => crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js => crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js} (98%) rename crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/{crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js.map => crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/basic/chunked/output/{crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js => crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js} (99%) rename crates/turbopack-tests/tests/snapshot/basic/chunked/output/{crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js.map => crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/basic/chunked/output/{crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js => crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js} (99%) rename crates/turbopack-tests/tests/snapshot/basic/chunked/output/{crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js.map => crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/basic/shebang/output/{crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js => crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js} (99%) rename crates/turbopack-tests/tests/snapshot/basic/shebang/output/{crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js.map => crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/basic/shebang/output/{crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js => crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js} (99%) rename crates/turbopack-tests/tests/snapshot/basic/shebang/output/{crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js.map => crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/comptime/define/output/{crates_turbopack-tests_tests_snapshot_comptime_define_input_index_f522f3.js => crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js} (99%) rename crates/turbopack-tests/tests/snapshot/comptime/define/output/{crates_turbopack-tests_tests_snapshot_comptime_define_input_index_f522f3.js.map => crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/{crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_24fbf6.js => crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js} (99%) rename crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/{crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_24fbf6.js.map => crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/{crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_73a15e.js => crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js} (99%) rename crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/{crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_73a15e.js.map => crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/css/css/output/{crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js => crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js} (98%) rename crates/turbopack-tests/tests/snapshot/css/css/output/{crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js.map => crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/css/css/output/{crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js => crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js} (98%) rename crates/turbopack-tests/tests/snapshot/css/css/output/{crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js.map => crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/emotion/emotion/output/{crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js => crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js} (98%) rename crates/turbopack-tests/tests/snapshot/emotion/emotion/output/{crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js.map => crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/emotion/emotion/output/{crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js => crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js} (99%) rename crates/turbopack-tests/tests/snapshot/emotion/emotion/output/{crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js.map => crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/env/env/output/{crates_turbopack-tests_tests_snapshot_env_env_input_93aa94._.js => crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js} (99%) rename crates/turbopack-tests/tests/snapshot/env/env/output/{crates_turbopack-tests_tests_snapshot_env_env_input_93aa94._.js.map => crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/{a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_09dc6c.js => a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js} (99%) rename crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/{a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_09dc6c.js.map => a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/example/example/output/{crates_turbopack-tests_tests_snapshot_example_example_input_index_29e0b9.js => crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js} (98%) rename crates/turbopack-tests/tests/snapshot/example/example/output/{crates_turbopack-tests_tests_snapshot_example_example_input_index_29e0b9.js.map => crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/{crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d9c332.js => crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js} (99%) rename crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/{crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d9c332.js.map => crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/{crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_b23628.js => crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js} (98%) rename crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/{crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_b23628.js.map => crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/{crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_3e3da0.js => crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js} (99%) rename crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/{crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_3e3da0.js.map => crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/{79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_090618.js => 79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js} (99%) rename crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/{79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_090618.js.map => 79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/{crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_dc37f8.js => crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js} (99%) rename crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/{crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_dc37f8.js.map => crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/{crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_040a52.js => crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js} (98%) rename crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/{crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_040a52.js.map => crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/import-meta/esm/output/{crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_c633a8.js => crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js} (99%) rename crates/turbopack-tests/tests/snapshot/import-meta/esm/output/{crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_c633a8.js.map => crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/import-meta/url/output/{crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_f01bae.js => crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js} (99%) rename crates/turbopack-tests/tests/snapshot/import-meta/url/output/{crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_f01bae.js.map => crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/dynamic/output/{crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js => crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js} (98%) rename crates/turbopack-tests/tests/snapshot/imports/dynamic/output/{crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js.map => crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/json/output/{crates_turbopack-tests_tests_snapshot_imports_json_input_index_e460e9.js => crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js} (99%) rename crates/turbopack-tests/tests/snapshot/imports/json/output/{crates_turbopack-tests_tests_snapshot_imports_json_input_index_e460e9.js.map => crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/{79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_fb56eb.js => 79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js} (99%) rename crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/{79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_fb56eb.js.map => 79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/{79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_ee6078.js => 79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js} (99%) rename crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/{79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_ee6078.js.map => 79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/{79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js => 79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js} (98%) rename crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/{79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js.map => 79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/imports/static/output/{crates_turbopack-tests_tests_snapshot_imports_static_input_index_82c953.js => crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js} (99%) rename crates/turbopack-tests/tests/snapshot/imports/static/output/{crates_turbopack-tests_tests_snapshot_imports_static_input_index_82c953.js.map => crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/{79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_4e764f.js => 79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js} (99%) rename crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/{79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_4e764f.js.map => 79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/{a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js => a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js} (99%) rename crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/{a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js.map => a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/{a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js => a587c_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js} (99%) rename crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/{a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js.map => a587c_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/{a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js => a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js} (99%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/{a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js.map => a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/{a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js => a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_e02442.js} (98%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/{a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js.map => a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_e02442.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/{79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js => 79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js} (99%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/{79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js.map => 79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/{79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js => 79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js} (99%) rename crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/{79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js.map => 79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/{79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_3d21b6.js => 79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js} (99%) rename crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/{79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_3d21b6.js.map => 79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js.map} (100%) rename crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/{a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_814f4c._.js => a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js} (99%) rename crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/{a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_814f4c._.js.map => a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js.map} (100%) diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js index 3939c5ccdec1b..36c8d9bf98654 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js @@ -2,10 +2,10 @@ "[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { -__turbopack_export_value__([ +__turbopack_export_value__({ chunks: [ "output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_52aed8.js", "output/20803_foo_index_f1c29b.js" -]); +], list: "output/269ea_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_52aed8.js_e3a1b5._.json" }); })()), }]); \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js similarity index 98% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js index 4c07918c08048..7f5fe783d9089 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js @@ -1,13 +1,13 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk)"); - }).then((chunks_paths) => { - __turbopack_register_chunk_list__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js_d744dd._.json", chunks_paths); - return Promise.all(chunks_paths.map((chunk_path) => __turbopack_load__(chunk_path))); + }).then(({ chunks, list }) => { + __turbopack_register_chunk_list__(list, chunks); + return Promise.all(chunks.map((chunk_path) => __turbopack_load__(chunk_path))); }).then(() => { return __turbopack_import__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript)"); }); @@ -33,7 +33,7 @@ __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/basic/asy })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/20803_bar_index_309a59.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index.js_f5704b._.json", ["output/20803_bar_index_309a59.js"]); + registerChunkList("output/269ea_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js_e3a1b5._.json", ["output/20803_bar_index_309a59.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js (ecmascript)"); } ]); @@ -1510,4 +1510,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js.map rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js.map diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js similarity index 98% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js index bef83307b7884..fce44fae3df3b 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js @@ -1,13 +1,13 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript, manifest chunk)"); - }).then((chunks_paths) => { - __turbopack_register_chunk_list__("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import.js_d744dd._.json", chunks_paths); - return Promise.all(chunks_paths.map((chunk_path) => __turbopack_load__(chunk_path))); + }).then(({ chunks, list }) => { + __turbopack_register_chunk_list__(list, chunks); + return Promise.all(chunks.map((chunk_path) => __turbopack_load__(chunk_path))); }).then(() => { return __turbopack_import__("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js (ecmascript)"); }); @@ -32,8 +32,8 @@ __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/basic/asy })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js") && loadedChunks.has("output/20803_bar_index_309a59.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js","output/20803_bar_index_309a59.js"]); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js") && loadedChunks.has("output/20803_bar_index_309a59.js"))) return true; + registerChunkList("output/269ea_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js","output/20803_bar_index_309a59.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js (ecmascript)"); } ]); @@ -1510,4 +1510,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5b8d24.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js.map b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_e242f7.js.map rename to crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js.map diff --git a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js rename to crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js index 43534f56aa2a0..153faee954df1 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js +++ b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/chunked/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -9,8 +9,8 @@ __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js") && loadedChunks.has("output/39e84_foo_index_a20770.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js","output/39e84_foo_index_a20770.js"]); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js") && loadedChunks.has("output/39e84_foo_index_a20770.js"))) return true; + registerChunkList("output/946d2_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js","output/39e84_foo_index_a20770.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/chunked/input/index.js (ecmascript)"); } ]); @@ -1487,4 +1487,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js.map b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_162014.js.map rename to crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js.map diff --git a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js rename to crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js index 5d797c8975a70..48793ae5e596b 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js +++ b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/chunked/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -10,7 +10,7 @@ __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/39e84_foo_index_a20770.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index.js_f5704b._.json", ["output/39e84_foo_index_a20770.js"]); + registerChunkList("output/946d2_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js_e3a1b5._.json", ["output/39e84_foo_index_a20770.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/chunked/input/index.js (ecmascript)"); } ]); @@ -1487,4 +1487,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js.map b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_b468e5.js.map rename to crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js.map diff --git a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js rename to crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js index 47b82c3db7a88..5f420f48c8be6 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js +++ b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/shebang/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -10,7 +10,7 @@ __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/d1787_foo_index_ea748e.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index.js_f5704b._.json", ["output/d1787_foo_index_ea748e.js"]); + registerChunkList("output/89a5c_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js_e3a1b5._.json", ["output/d1787_foo_index_ea748e.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/shebang/input/index.js (ecmascript)"); } ]); @@ -1487,4 +1487,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js.map b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js.map rename to crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js.map diff --git a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js rename to crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js index 60f57b8adc148..dd2c04716a6a4 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js +++ b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js", { "[project]/crates/turbopack-tests/tests/snapshot/basic/shebang/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -9,8 +9,8 @@ __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js") && loadedChunks.has("output/d1787_foo_index_ea748e.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js","output/d1787_foo_index_ea748e.js"]); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js") && loadedChunks.has("output/d1787_foo_index_ea748e.js"))) return true; + registerChunkList("output/89a5c_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js","output/d1787_foo_index_ea748e.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/shebang/input/index.js (ecmascript)"); } ]); @@ -1487,4 +1487,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_22a205.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js.map b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_f5dad6.js.map rename to crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js.map diff --git a/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_68d56d.js b/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_68d56d.js index 1bc5be6598c9a..7c279bd002165 100644 --- a/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_68d56d.js +++ b/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_68d56d.js @@ -30,8 +30,8 @@ p.env.NODE_ENV == 'production' && console.log('production'); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js"))) return true; + registerChunkList("output/cba5c_turbopack-tests_tests_snapshot_comptime_define_input_index_68d56d.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/comptime/define/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_f522f3.js b/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_f522f3.js rename to crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js index e2b81c0c5701b..19c1a390fe062 100644 --- a/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_f522f3.js +++ b/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_f522f3.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js", { "[project]/crates/turbopack-tests/tests/snapshot/comptime/define/input/index.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -30,8 +30,8 @@ p.env.NODE_ENV == 'production' && console.log('production'); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_68d56d.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_68d56d.js"]); + if (!(true)) return true; + registerChunkList("output/cba5c_turbopack-tests_tests_snapshot_comptime_define_input_index_68d56d.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/comptime/define/input/index.js (ecmascript)"); } ]); @@ -1508,4 +1508,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_comptime_define_input_index_f522f3.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_f522f3.js.map b/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_f522f3.js.map rename to crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js.map diff --git a/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_24fbf6.js b/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_24fbf6.js rename to crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js index f27e19d3b2048..3b06674034e2a 100644 --- a/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_24fbf6.js +++ b/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_24fbf6.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js", { "[project]/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/input/index.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -6,8 +6,8 @@ }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_73a15e.js"))) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_73a15e.js","output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index.css"]); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js"))) return true; + registerChunkList("output/b4f97_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js","output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index.css"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/input/index.js (ecmascript)"); } ]); @@ -1484,4 +1484,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_24fbf6.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_24fbf6.js.map b/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_24fbf6.js.map rename to crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js.map diff --git a/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_73a15e.js b/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_73a15e.js rename to crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js index 513f63f61c203..01c96e28e1cac 100644 --- a/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_73a15e.js +++ b/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_73a15e.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js", { "[project]/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/input/index.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -7,7 +7,7 @@ }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index.css"]); + registerChunkList("output/b4f97_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index.css"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/input/index.js (ecmascript)"); } ]); @@ -1484,4 +1484,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_73a15e.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_73a15e.js.map b/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_73a15e.js.map rename to crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js.map diff --git a/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js b/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js similarity index 98% rename from crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js rename to crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js index a0d0ec9fa8446..09124243aedcc 100644 --- a/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js +++ b/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js", { "[project]/crates/turbopack-tests/tests/snapshot/css/css/input/style.module.css (css, css module)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -24,8 +24,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/8697f_foo_style.module.css_8b24e0._.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_css_css_input_index.js_f5704b._.json", ["output/8697f_foo_style.module.css_8b24e0._.js","output/8697f_foo_style.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.css","output/8697f_foo_style.module_b5a149.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.module_b5a149.css"]); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js") && loadedChunks.has("output/8697f_foo_style.module.css_8b24e0._.js"))) return true; + registerChunkList("output/38609_crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js","output/8697f_foo_style.module.css_8b24e0._.js","output/8697f_foo_style.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.css","output/8697f_foo_style.module_b5a149.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.module_b5a149.css"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/css/css/input/index.js (ecmascript)"); } ]); @@ -1502,4 +1502,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js.map b/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js.map rename to crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js.map diff --git a/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js b/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js similarity index 98% rename from crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js rename to crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js index 8c001e2650c40..6bc296788faee 100644 --- a/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js +++ b/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js", { "[project]/crates/turbopack-tests/tests/snapshot/css/css/input/style.module.css (css, css module)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -24,8 +24,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js") && loadedChunks.has("output/8697f_foo_style.module.css_8b24e0._.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_css_css_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_css_css_input_index_9a2d4f.js","output/8697f_foo_style.module.css_8b24e0._.js","output/8697f_foo_style.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.css","output/8697f_foo_style.module_b5a149.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.module_b5a149.css"]); + if (!(true && loadedChunks.has("output/8697f_foo_style.module.css_8b24e0._.js"))) return true; + registerChunkList("output/38609_crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js_e3a1b5._.json", ["output/8697f_foo_style.module.css_8b24e0._.js","output/8697f_foo_style.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.css","output/8697f_foo_style.module_b5a149.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.module_b5a149.css"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/css/css/input/index.js (ecmascript)"); } ]); @@ -1502,4 +1502,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js.map b/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_ee32cf.js.map rename to crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js.map diff --git a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js similarity index 98% rename from crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js rename to crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js index eb4995a41be27..b38696e63e198 100644 --- a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js +++ b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js", { "[project]/crates/turbopack-tests/tests/snapshot/emotion/emotion/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -29,8 +29,8 @@ console.log(StyledButton, ClassNameButton); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js") && loadedChunks.has("output/63a02_@emotion_react_index_19c07f.js") && loadedChunks.has("output/63a02_@emotion_styled_index_f6fc75.js") && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index.js_f5704b._.json", ["output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js","output/63a02_@emotion_react_index_19c07f.js","output/63a02_@emotion_styled_index_f6fc75.js","output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js"]); + if (!(true && loadedChunks.has("output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js") && loadedChunks.has("output/63a02_@emotion_react_index_19c07f.js") && loadedChunks.has("output/63a02_@emotion_styled_index_f6fc75.js") && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js"))) return true; + registerChunkList("output/c4aa1_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js_e3a1b5._.json", ["output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js","output/63a02_@emotion_react_index_19c07f.js","output/63a02_@emotion_styled_index_f6fc75.js","output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/emotion/emotion/input/index.js (ecmascript)"); } ]); @@ -1507,4 +1507,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js.map b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js.map rename to crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js.map diff --git a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js rename to crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js index 794839688978f..6ffb9f55d9b3b 100644 --- a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js +++ b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js", { "[project]/crates/turbopack-tests/tests/snapshot/emotion/emotion/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -30,7 +30,7 @@ console.log(StyledButton, ClassNameButton); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js") && loadedChunks.has("output/63a02_@emotion_react_index_19c07f.js") && loadedChunks.has("output/63a02_@emotion_styled_index_f6fc75.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index.js_f5704b._.json", ["output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js","output/63a02_@emotion_react_index_19c07f.js","output/63a02_@emotion_styled_index_f6fc75.js"]); + registerChunkList("output/c4aa1_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js_e3a1b5._.json", ["output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js","output/63a02_@emotion_react_index_19c07f.js","output/63a02_@emotion_styled_index_f6fc75.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/emotion/emotion/input/index.js (ecmascript)"); } ]); @@ -1507,4 +1507,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_3ce2d4.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js.map b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_ec2274.js.map rename to crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js.map diff --git a/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_93aa94._.js b/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_93aa94._.js rename to crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js index bf4c038d3f814..8009a8df076e2 100644 --- a/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_93aa94._.js +++ b/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_env_env_input_93aa94._.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js", { "[project]/crates/turbopack-tests/tests/snapshot/env/env/input/.env/.env.js": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -14,8 +14,8 @@ console.log(process.env.FOOBAR); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_env_env_input_bb8ee7._.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_env_env_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_env_env_input_bb8ee7._.js"]); + if (!(true)) return true; + registerChunkList("output/1bb2d_output_crates_turbopack-tests_tests_snapshot_env_env_input_bb8ee7._.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/env/env/input/.env/.env.js"); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/env/env/input/index.js (ecmascript)"); } @@ -1493,4 +1493,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_env_env_input_93aa94._.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_93aa94._.js.map b/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_93aa94._.js.map rename to crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js.map diff --git a/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_bb8ee7._.js b/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_bb8ee7._.js index 7eaa25d0432e6..b7a1cd816c453 100644 --- a/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_bb8ee7._.js +++ b/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_bb8ee7._.js @@ -14,8 +14,8 @@ console.log(process.env.FOOBAR); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_env_env_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js"))) return true; + registerChunkList("output/1bb2d_output_crates_turbopack-tests_tests_snapshot_env_env_input_bb8ee7._.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/env/env/input/.env/.env.js"); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/env/env/input/index.js (ecmascript)"); } diff --git a/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_19edf2.js b/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_19edf2.js index 5801496ed2db1..254516f3c57a0 100644 --- a/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_19edf2.js +++ b/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_19edf2.js @@ -6,8 +6,8 @@ console.log("hello world"); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js"))) return true; + registerChunkList("output/36ae9_tests_snapshot_evaluated_entrry_runtime_entry_input_index_19edf2.js_e3a1b5._.json", ["output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_09dc6c.js b/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_09dc6c.js rename to crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js index b0227fabf08c6..f6735b454aa3d 100644 --- a/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_09dc6c.js +++ b/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_09dc6c.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js", { "[project]/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/input/index.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -6,8 +6,8 @@ console.log("hello world"); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_19edf2.js"))) return true; - registerChunkList("output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index.js_f5704b._.json", ["output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_19edf2.js"]); + if (!(true)) return true; + registerChunkList("output/36ae9_tests_snapshot_evaluated_entrry_runtime_entry_input_index_19edf2.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/input/index.js (ecmascript)"); } ]); @@ -1484,4 +1484,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_09dc6c.js.map \ No newline at end of file +//# sourceMappingURL=a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_09dc6c.js.map b/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_09dc6c.js.map rename to crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js.map diff --git a/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_0a08ce.js b/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_0a08ce.js index 08c91dcb542dc..b030ee0b07669 100644 --- a/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_0a08ce.js +++ b/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_0a08ce.js @@ -6,8 +6,8 @@ console.log("hello world"); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_example_example_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js"))) return true; + registerChunkList("output/bee30_turbopack-tests_tests_snapshot_example_example_input_index_0a08ce.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/example/example/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_29e0b9.js b/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js similarity index 98% rename from crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_29e0b9.js rename to crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js index f448d3786ac4f..520cbde38691c 100644 --- a/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_29e0b9.js +++ b/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_example_example_input_index_29e0b9.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js", { "[project]/crates/turbopack-tests/tests/snapshot/example/example/input/index.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -6,8 +6,8 @@ console.log("hello world"); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_example_example_input_index_0a08ce.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_example_example_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_example_example_input_index_0a08ce.js"]); + if (!(true)) return true; + registerChunkList("output/bee30_turbopack-tests_tests_snapshot_example_example_input_index_0a08ce.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/example/example/input/index.js (ecmascript)"); } ]); @@ -1484,4 +1484,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_example_example_input_index_29e0b9.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_29e0b9.js.map b/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_29e0b9.js.map rename to crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js.map diff --git a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d9c332.js b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d9c332.js rename to crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js index cce93905ac6d3..f9ed1d025773e 100644 --- a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d9c332.js +++ b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d9c332.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js", { "[project]/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/input/commonjs.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -32,8 +32,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d5f22a.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d5f22a.js"]); + if (!(true)) return true; + registerChunkList("output/24bd4_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d5f22a.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/input/index.js (ecmascript)"); } ]); @@ -1510,4 +1510,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d9c332.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d9c332.js.map b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d9c332.js.map rename to crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js.map diff --git a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d5f22a.js b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d5f22a.js index 892a93d5b8971..aa115c581c220 100644 --- a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d5f22a.js +++ b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d5f22a.js @@ -32,8 +32,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js"))) return true; + registerChunkList("output/24bd4_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d5f22a.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_ed5b85.js b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_ed5b85.js index 91e8a7eef5a52..8d1aaa70debb2 100644 --- a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_ed5b85.js +++ b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_ed5b85.js @@ -27,8 +27,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js"))) return true; + registerChunkList("output/a4de8_tests_snapshot_export-alls_cjs-script_input_index_ed5b85.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_b23628.js b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js similarity index 98% rename from crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_b23628.js rename to crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js index 7e94da68980f8..3ad26c1caea99 100644 --- a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_b23628.js +++ b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_b23628.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js", { "[project]/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/input/exported.cjs (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -27,8 +27,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_ed5b85.js"))) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_ed5b85.js"]); + if (!(true)) return true; + registerChunkList("output/a4de8_tests_snapshot_export-alls_cjs-script_input_index_ed5b85.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/input/index.js (ecmascript)"); } ]); @@ -1505,4 +1505,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_b23628.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_b23628.js.map b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_b23628.js.map rename to crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js.map diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_3e3da0.js b/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_3e3da0.js rename to crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js index 27cd56b0072cc..0d9c76425e26e 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_3e3da0.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_3e3da0.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js", { "[project]/crates/turbopack-tests/tests/snapshot/import-meta/cjs/input/mod.cjs (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -17,8 +17,8 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_746b39.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_746b39.js"]); + if (!(true)) return true; + registerChunkList("output/5cf33_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_746b39.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/cjs/input/index.js (ecmascript)"); } ]); @@ -1495,4 +1495,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_3e3da0.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_3e3da0.js.map b/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_3e3da0.js.map rename to crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js.map diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_746b39.js b/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_746b39.js index db5154ab5d9b0..0e67da3b1c85f 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_746b39.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_746b39.js @@ -17,8 +17,8 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js"))) return true; + registerChunkList("output/5cf33_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_746b39.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/cjs/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_090618.js b/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_090618.js rename to crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js index bc978e207d4fb..94888df588d52 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_090618.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_090618.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js", { "[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/input/mod.mjs (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -24,8 +24,8 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_8687d1.js"))) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index.js_f5704b._.json", ["output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_8687d1.js"]); + if (!(true)) return true; + registerChunkList("output/b58a4_tests_snapshot_import-meta_esm-multiple_input_index_8687d1.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/input/index.js (ecmascript)"); } ]); @@ -1502,4 +1502,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_090618.js.map \ No newline at end of file +//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_090618.js.map b/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_090618.js.map rename to crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js.map diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_8687d1.js b/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_8687d1.js index 2f5d9ccac8b44..32aef5b5625a3 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_8687d1.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_8687d1.js @@ -24,8 +24,8 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js"))) return true; + registerChunkList("output/b58a4_tests_snapshot_import-meta_esm-multiple_input_index_8687d1.js_e3a1b5._.json", ["output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_3487d2.js b/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_3487d2.js index b3f1306e6e8b2..f7a55f8d1613f 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_3487d2.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_3487d2.js @@ -17,8 +17,8 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js"))) return true; + registerChunkList("output/6e9dd_tests_snapshot_import-meta_esm-mutable_input_index_3487d2.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_dc37f8.js b/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_dc37f8.js rename to crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js index 2fe93ce5d3b4d..4419b5c2b7b9c 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_dc37f8.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_dc37f8.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js", { "[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/input/mod.mjs (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -17,8 +17,8 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_3487d2.js"))) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_3487d2.js"]); + if (!(true)) return true; + registerChunkList("output/6e9dd_tests_snapshot_import-meta_esm-mutable_input_index_3487d2.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/input/index.js (ecmascript)"); } ]); @@ -1495,4 +1495,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_dc37f8.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_dc37f8.js.map b/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_dc37f8.js.map rename to crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js.map diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_73c2df.js b/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_73c2df.js index f52899b89e18e..a8807d18fe508 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_73c2df.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_73c2df.js @@ -17,8 +17,8 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js"))) return true; + registerChunkList("output/f01a7_tests_snapshot_import-meta_esm-object_input_index_73c2df.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_040a52.js b/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js similarity index 98% rename from crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_040a52.js rename to crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js index bf7611db855ec..51c73b10c8e43 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_040a52.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_040a52.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js", { "[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/input/mod.mjs (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -17,8 +17,8 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_73c2df.js"))) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_73c2df.js"]); + if (!(true)) return true; + registerChunkList("output/f01a7_tests_snapshot_import-meta_esm-object_input_index_73c2df.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/input/index.js (ecmascript)"); } ]); @@ -1495,4 +1495,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_040a52.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_040a52.js.map b/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_040a52.js.map rename to crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js.map diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_c633a8.js b/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_c633a8.js rename to crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js index f737649f4af71..b6cc1221f715a 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_c633a8.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_c633a8.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js", { "[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm/input/mod.mjs (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -17,8 +17,8 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_fe8e61.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_fe8e61.js"]); + if (!(true)) return true; + registerChunkList("output/8a55e_turbopack-tests_tests_snapshot_import-meta_esm_input_index_fe8e61.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm/input/index.js (ecmascript)"); } ]); @@ -1495,4 +1495,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_c633a8.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_c633a8.js.map b/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_c633a8.js.map rename to crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js.map diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_fe8e61.js b/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_fe8e61.js index 3179d8ad87a2f..8cfd22ca6ac0d 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_fe8e61.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_fe8e61.js @@ -17,8 +17,8 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js"))) return true; + registerChunkList("output/8a55e_turbopack-tests_tests_snapshot_import-meta_esm_input_index_fe8e61.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f69bf.js b/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f69bf.js index 7625acff714d2..7ab1bf1f2fd6c 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f69bf.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f69bf.js @@ -23,8 +23,8 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js"))) return true; + registerChunkList("output/de719_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f69bf.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/url/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_f01bae.js b/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_f01bae.js rename to crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js index 5385a8d5dbec9..bdce77ea0eec4 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_f01bae.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_f01bae.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js", { "[project]/crates/turbopack-tests/tests/snapshot/import-meta/url/input/asset.txt (static)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -23,8 +23,8 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f69bf.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f69bf.js"]); + if (!(true)) return true; + registerChunkList("output/de719_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f69bf.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/url/input/index.js (ecmascript)"); } ]); @@ -1501,4 +1501,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_f01bae.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_f01bae.js.map b/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_f01bae.js.map rename to crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js.map diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js index 8855765101baa..0bd6c1f1307b3 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js @@ -5,9 +5,9 @@ __turbopack_export_value__((__turbopack_import__) => { return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk)"); - }).then((chunks_paths) => { - __turbopack_register_chunk_list__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d744dd._.json", chunks_paths); - return Promise.all(chunks_paths.map((chunk_path) => __turbopack_load__(chunk_path))); + }).then(({ chunks, list }) => { + __turbopack_register_chunk_list__(list, chunks); + return Promise.all(chunks.map((chunk_path) => __turbopack_load__(chunk_path))); }).then(() => { return __turbopack_import__("[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript)"); }); @@ -20,8 +20,8 @@ __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/d }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js"))) return true; + registerChunkList("output/bb804_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js similarity index 98% rename from crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js rename to crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js index db77579a33a6f..55ec947735e14 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js @@ -1,13 +1,13 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { return __turbopack_load__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk)"); - }).then((chunks_paths) => { - __turbopack_register_chunk_list__("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d744dd._.json", chunks_paths); - return Promise.all(chunks_paths.map((chunk_path) => __turbopack_load__(chunk_path))); + }).then(({ chunks, list }) => { + __turbopack_register_chunk_list__(list, chunks); + return Promise.all(chunks.map((chunk_path) => __turbopack_load__(chunk_path))); }).then(() => { return __turbopack_import__("[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript)"); }); @@ -20,8 +20,8 @@ __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/d }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js"]); + if (!(true)) return true; + registerChunkList("output/bb804_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/index.js (ecmascript)"); } ]); @@ -1498,4 +1498,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js.map b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_6f9eb3.js.map rename to crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js.map diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js index f3b9291b00100..859115aa1a378 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js @@ -2,9 +2,9 @@ "[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/vercel.mjs (ecmascript, manifest chunk)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { -__turbopack_export_value__([ +__turbopack_export_value__({ chunks: [ "output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d12c37._.js" -]); +], list: "output/254ef_tests_snapshot_imports_dynamic_input_vercel.mjs_d12c37._.js_e3a1b5._.json" }); })()), }]); \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_e460e9.js b/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_e460e9.js rename to crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js index f5932a3fe3000..5e15a7393979d 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_e460e9.js +++ b/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_e460e9.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/json/input/invalid.json (json)": (() => {{ @@ -21,8 +21,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_881b1b.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_imports_json_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_881b1b.js"]); + if (!(true)) return true; + registerChunkList("output/1c2ec_crates_turbopack-tests_tests_snapshot_imports_json_input_index_881b1b.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/json/input/index.js (ecmascript)"); } ]); @@ -1499,4 +1499,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_imports_json_input_index_e460e9.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_e460e9.js.map b/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_e460e9.js.map rename to crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js.map diff --git a/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_881b1b.js b/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_881b1b.js index 67585a0037893..8ca6bf817f1af 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_881b1b.js +++ b/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_881b1b.js @@ -21,8 +21,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_imports_json_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js"))) return true; + registerChunkList("output/1c2ec_crates_turbopack-tests_tests_snapshot_imports_json_input_index_881b1b.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/json/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_707ee1.js b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_707ee1.js index f5cb42e6bda09..198353b658bb0 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_707ee1.js +++ b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_707ee1.js @@ -11,8 +11,8 @@ console.log(dne); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js"))) return true; + registerChunkList("output/bc5a3_tests_snapshot_imports_resolve_error_cjs_input_index_707ee1.js_e3a1b5._.json", ["output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_fb56eb.js b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_fb56eb.js rename to crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js index d04fc3d0911e6..b0d63f506a445 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_fb56eb.js +++ b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_fb56eb.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/input/index.js (ecmascript)": (function({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname, m: module, e: exports }) { !function() { @@ -11,8 +11,8 @@ console.log(dne); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_707ee1.js"))) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index.js_f5704b._.json", ["output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_707ee1.js"]); + if (!(true)) return true; + registerChunkList("output/bc5a3_tests_snapshot_imports_resolve_error_cjs_input_index_707ee1.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/input/index.js (ecmascript)"); } ]); @@ -1489,4 +1489,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_fb56eb.js.map \ No newline at end of file +//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_fb56eb.js.map b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_fb56eb.js.map rename to crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js.map diff --git a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_ee6078.js b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_ee6078.js rename to crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js index 1fc87264b3d28..db27c8ae064df 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_ee6078.js +++ b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_ee6078.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -14,8 +14,8 @@ console.log({}[dne]); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_af6491.js"))) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index.js_f5704b._.json", ["output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_af6491.js"]); + if (!(true)) return true; + registerChunkList("output/e04c9_tests_snapshot_imports_resolve_error_esm_input_index_af6491.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/input/index.js (ecmascript)"); } ]); @@ -1492,4 +1492,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_ee6078.js.map \ No newline at end of file +//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_ee6078.js.map b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_ee6078.js.map rename to crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js.map diff --git a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_af6491.js b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_af6491.js index eee1237246023..d40e73bf462d8 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_af6491.js +++ b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_af6491.js @@ -14,8 +14,8 @@ console.log({}[dne]); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js"))) return true; + registerChunkList("output/e04c9_tests_snapshot_imports_resolve_error_esm_input_index_af6491.js_e3a1b5._.json", ["output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js similarity index 98% rename from crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js rename to crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js index 75ca2051c874b..95e4378d89c3b 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js @@ -1,13 +1,13 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk, loader)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { __turbopack_export_value__((__turbopack_import__) => { return __turbopack_load__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk)"); - }).then((chunks_paths) => { - __turbopack_register_chunk_list__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_d744dd._.json", chunks_paths); - return Promise.all(chunks_paths.map((chunk_path) => __turbopack_load__(chunk_path))); + }).then(({ chunks, list }) => { + __turbopack_register_chunk_list__(list, chunks); + return Promise.all(chunks.map((chunk_path) => __turbopack_load__(chunk_path))); }).then(() => { return __turbopack_import__("[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript)"); }); @@ -32,8 +32,8 @@ __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/s })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js"))) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index.js_f5704b._.json", ["output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js"]); + if (!(true)) return true; + registerChunkList("output/d246c_tests_snapshot_imports_static-and-dynamic_input_index_507785.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/index.js (ecmascript)"); } ]); @@ -1510,4 +1510,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js.map \ No newline at end of file +//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js.map b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_899ad5.js.map rename to crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js.map diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js index 8539677f14e8c..9307bee1084fb 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js @@ -5,9 +5,9 @@ __turbopack_export_value__((__turbopack_import__) => { return __turbopack_load__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js").then(() => { return __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk)"); - }).then((chunks_paths) => { - __turbopack_register_chunk_list__("output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_d744dd._.json", chunks_paths); - return Promise.all(chunks_paths.map((chunk_path) => __turbopack_load__(chunk_path))); + }).then(({ chunks, list }) => { + __turbopack_register_chunk_list__(list, chunks); + return Promise.all(chunks.map((chunk_path) => __turbopack_load__(chunk_path))); }).then(() => { return __turbopack_import__("[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript)"); }); @@ -32,8 +32,8 @@ __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/s })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js"))) return true; + registerChunkList("output/d246c_tests_snapshot_imports_static-and-dynamic_input_index_507785.js_e3a1b5._.json", ["output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js index f5e76e8bfca17..d4d6be2cfe8db 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js @@ -2,9 +2,9 @@ "[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/vercel.mjs (ecmascript, manifest chunk)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { -__turbopack_export_value__([ +__turbopack_export_value__({ chunks: [ "output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_e3316a._.js" -]); +], list: "output/16c99_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_e3316a._.js_e3a1b5._.json" }); })()), }]); \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_82c953.js b/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_82c953.js rename to crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js index be57979d0f1d0..07a434ef8dbe2 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_82c953.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_82c953.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js", { "[project]/crates/turbopack-tests/tests/snapshot/imports/static/input/vercel.svg (static)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -13,8 +13,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_9fc270.js"))) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_imports_static_input_index.js_f5704b._.json", ["output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_9fc270.js"]); + if (!(true)) return true; + registerChunkList("output/504b2_turbopack-tests_tests_snapshot_imports_static_input_index_9fc270.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/static/input/index.js (ecmascript)"); } ]); @@ -1491,4 +1491,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_imports_static_input_index_82c953.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_82c953.js.map b/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_82c953.js.map rename to crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js.map diff --git a/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_9fc270.js b/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_9fc270.js index 64142b73c49b0..ce01ff0bbc470 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_9fc270.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_9fc270.js @@ -13,8 +13,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/crates_turbopack-tests_tests_snapshot_imports_static_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js"))) return true; + registerChunkList("output/504b2_turbopack-tests_tests_snapshot_imports_static_input_index_9fc270.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/static/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_4e764f.js b/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_4e764f.js rename to crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js index 5128df21b244e..737706c469c4a 100644 --- a/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_4e764f.js +++ b/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_4e764f.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js", { "[project]/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -8,8 +8,8 @@ var __TURBOPACK__external__node$3a$fs__ = __turbopack_external_require__("node:f })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_69be78.js"))) return true; - registerChunkList("output/a587c_tests_snapshot_node_node_protocol_external_input_index.js_f5704b._.json", ["output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_69be78.js"]); + if (!(true)) return true; + registerChunkList("output/f1985_tests_snapshot_node_node_protocol_external_input_index_69be78.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/input/index.js (ecmascript)"); } ]); @@ -1486,4 +1486,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_4e764f.js.map \ No newline at end of file +//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_4e764f.js.map b/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_4e764f.js.map rename to crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js.map diff --git a/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_69be78.js b/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_69be78.js index 114c81ae387f2..4643ef6f0d69c 100644 --- a/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_69be78.js +++ b/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_69be78.js @@ -8,8 +8,8 @@ var __TURBOPACK__external__node$3a$fs__ = __turbopack_external_require__("node:f })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/a587c_tests_snapshot_node_node_protocol_external_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js"))) return true; + registerChunkList("output/f1985_tests_snapshot_node_node_protocol_external_input_index_69be78.js_e3a1b5._.json", ["output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js rename to crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js index d138797909743..b5f8f229ee7cb 100644 --- a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js +++ b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js", { "[project]/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -16,7 +16,7 @@ console.log(MyButton); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/63a02_styled-components_index_7ff1d5.js"))) return true; - registerChunkList("output/a587c_tests_snapshot_styled_components_styled_components_input_index.js_f5704b._.json", ["output/63a02_styled-components_index_7ff1d5.js"]); + registerChunkList("output/90245_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js_e3a1b5._.json", ["output/63a02_styled-components_index_7ff1d5.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/input/index.js (ecmascript)"); } ]); @@ -1493,4 +1493,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js.map \ No newline at end of file +//# sourceMappingURL=a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js.map b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js.map rename to crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js.map diff --git a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js rename to crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js index eebe168bc6834..2591e48ffa109 100644 --- a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js +++ b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js", { "[project]/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -15,8 +15,8 @@ console.log(MyButton); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/63a02_styled-components_index_7ff1d5.js") && loadedChunks.has("output/a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js"))) return true; - registerChunkList("output/a587c_tests_snapshot_styled_components_styled_components_input_index.js_f5704b._.json", ["output/63a02_styled-components_index_7ff1d5.js","output/a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js"]); + if (!(true && loadedChunks.has("output/63a02_styled-components_index_7ff1d5.js") && loadedChunks.has("output/a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js"))) return true; + registerChunkList("output/90245_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js_e3a1b5._.json", ["output/63a02_styled-components_index_7ff1d5.js","output/a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/input/index.js (ecmascript)"); } ]); @@ -1493,4 +1493,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=a587c_tests_snapshot_styled_components_styled_components_input_index_8fa5f1.js.map \ No newline at end of file +//# sourceMappingURL=a587c_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js.map b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_9e5528.js.map rename to crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js.map diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js rename to crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js index 02cf9e35010f0..7bf63d7050d9f 100644 --- a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js +++ b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js", { "[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/input/packages/app/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -12,7 +12,7 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/63a02_react_jsx-dev-runtime_a01403.js") && loadedChunks.has("output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js") && loadedChunks.has("output/7b7bf_third_party_component_index_c2ffe3.js"))) return true; - registerChunkList("output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_app_index.js_f5704b._.json", ["output/63a02_react_jsx-dev-runtime_a01403.js","output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js","output/7b7bf_third_party_component_index_c2ffe3.js"]); + registerChunkList("output/eabb6_swc_transforms_mono_transforms_input_packages_app_index_e02442.js_e3a1b5._.json", ["output/63a02_react_jsx-dev-runtime_a01403.js","output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js","output/7b7bf_third_party_component_index_c2ffe3.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/input/packages/app/index.js (ecmascript)"); } ]); @@ -1489,4 +1489,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js.map \ No newline at end of file +//# sourceMappingURL=a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js.map b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js.map rename to crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js.map diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_e02442.js similarity index 98% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js rename to crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_e02442.js index 130443c8f83ac..5fff4a0bb9d8a 100644 --- a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js +++ b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_e02442.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_e02442.js", { "[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/input/packages/app/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -11,8 +11,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/63a02_react_jsx-dev-runtime_a01403.js") && loadedChunks.has("output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js") && loadedChunks.has("output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js") && loadedChunks.has("output/7b7bf_third_party_component_index_c2ffe3.js"))) return true; - registerChunkList("output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_app_index.js_f5704b._.json", ["output/63a02_react_jsx-dev-runtime_a01403.js","output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js","output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_b3cd87.js","output/7b7bf_third_party_component_index_c2ffe3.js"]); + if (!(true && loadedChunks.has("output/63a02_react_jsx-dev-runtime_a01403.js") && loadedChunks.has("output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js") && loadedChunks.has("output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js") && loadedChunks.has("output/7b7bf_third_party_component_index_c2ffe3.js"))) return true; + registerChunkList("output/eabb6_swc_transforms_mono_transforms_input_packages_app_index_e02442.js_e3a1b5._.json", ["output/63a02_react_jsx-dev-runtime_a01403.js","output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js","output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js","output/7b7bf_third_party_component_index_c2ffe3.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/input/packages/app/index.js (ecmascript)"); } ]); @@ -1489,4 +1489,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js.map \ No newline at end of file +//# sourceMappingURL=a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_e02442.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js.map b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_e02442.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_bf4cf5.js.map rename to crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_e02442.js.map diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js rename to crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js index df19e85f9a5fb..783b456c09914 100644 --- a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js +++ b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js", { "[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -14,8 +14,8 @@ console.log(Foo, [].includes("foo")); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js") && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js"))) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index.js_f5704b._.json", ["output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js","output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js"]); + if (!(true && loadedChunks.has("output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js") && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js"))) return true; + registerChunkList("output/822b1_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js_e3a1b5._.json", ["output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js","output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/input/index.js (ecmascript)"); } ]); @@ -1492,4 +1492,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js.map \ No newline at end of file +//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js.map b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js.map rename to crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js.map diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js rename to crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js index 74f1b437b6e6e..7bf9286bc14b3 100644 --- a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js +++ b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js", { "[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/input/index.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -15,7 +15,7 @@ console.log(Foo, [].includes("foo")); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js"))) return true; - registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index.js_f5704b._.json", ["output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js"]); + registerChunkList("output/822b1_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js_e3a1b5._.json", ["output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/input/index.js (ecmascript)"); } ]); @@ -1492,4 +1492,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_93c2b3.js.map \ No newline at end of file +//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js.map b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_e3510a.js.map rename to crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js.map diff --git a/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_18c34e.js b/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_18c34e.js index a2e62295a87d9..59ee8f882a61e 100644 --- a/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_18c34e.js +++ b/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_18c34e.js @@ -21,8 +21,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/a587c_tests_snapshot_typescript_jsconfig-baseurl_input_index.js_f5704b._.json", []); + if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js"))) return true; + registerChunkList("output/84aae_tests_snapshot_typescript_jsconfig-baseurl_input_index_18c34e.js_e3a1b5._.json", ["output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_3d21b6.js b/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_3d21b6.js rename to crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js index c1b8fc78caf79..22d2ea8b6c704 100644 --- a/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_3d21b6.js +++ b/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_3d21b6.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js", { "[project]/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/input/prop.js (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -21,8 +21,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_18c34e.js"))) return true; - registerChunkList("output/a587c_tests_snapshot_typescript_jsconfig-baseurl_input_index.js_f5704b._.json", ["output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_18c34e.js"]); + if (!(true)) return true; + registerChunkList("output/84aae_tests_snapshot_typescript_jsconfig-baseurl_input_index_18c34e.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/input/index.js (ecmascript)"); } ]); @@ -1499,4 +1499,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_3d21b6.js.map \ No newline at end of file +//# sourceMappingURL=79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_3d21b6.js.map b/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_3d21b6.js.map rename to crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js.map diff --git a/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_540b0c._.js b/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_540b0c._.js index b56c52fecaa14..33a4305867645 100644 --- a/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_540b0c._.js +++ b/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_540b0c._.js @@ -21,8 +21,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true)) return true; - registerChunkList("output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_f5704b._.json", []); + if (!(true && loadedChunks.has("output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js"))) return true; + registerChunkList("output/0e5ae_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_540b0c._.js_e3a1b5._.json", ["output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/input/index.ts (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_814f4c._.js b/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js similarity index 99% rename from crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_814f4c._.js rename to crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js index 051f33db6a849..40299d93c734e 100644 --- a/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_814f4c._.js +++ b/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js @@ -1,4 +1,4 @@ -(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_814f4c._.js", { +(self.TURBOPACK = self.TURBOPACK || []).push(["output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js", { "[project]/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/input/prop.ts (ecmascript)": (({ r: __turbopack_require__, x: __turbopack_external_require__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, c: __turbopack_cache__, l: __turbopack_load__, k: __turbopack_register_chunk_list__, j: __turbopack_cjs__, p: process, g: global, __dirname }) => (() => { @@ -21,8 +21,8 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { - if (!(true && loadedChunks.has("output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_540b0c._.js"))) return true; - registerChunkList("output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_f5704b._.json", ["output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_540b0c._.js"]); + if (!(true)) return true; + registerChunkList("output/0e5ae_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_540b0c._.js_e3a1b5._.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/input/index.ts (ecmascript)"); } ]); @@ -1499,4 +1499,4 @@ globalThis.TURBOPACK = { })(); -//# sourceMappingURL=a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_814f4c._.js.map \ No newline at end of file +//# sourceMappingURL=a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js.map \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_814f4c._.js.map b/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js.map similarity index 100% rename from crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_814f4c._.js.map rename to crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js.map From f3b88ef4899a4269b2a96c5c49307491adb4b73b Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Fri, 10 Mar 2023 19:53:51 +0100 Subject: [PATCH 19/21] fix chunk list path --- crates/turbopack-core/src/chunk/dev.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/turbopack-core/src/chunk/dev.rs b/crates/turbopack-core/src/chunk/dev.rs index 21f72515714cf..c832cc3df307c 100644 --- a/crates/turbopack-core/src/chunk/dev.rs +++ b/crates/turbopack-core/src/chunk/dev.rs @@ -223,14 +223,14 @@ impl ChunkingContext for DevChunkingContext { } #[turbo_tasks::function] - fn chunk_list_path( - self_vc: DevChunkingContextVc, + async fn chunk_list_path( + &self, entry_chunk_path: FileSystemPathVc, - ) -> FileSystemPathVc { - self_vc.chunk_path( - AssetIdentVc::from_path(entry_chunk_path).with_modifier(chunk_list_modifier()), - ".json", - ) + ) -> Result { + Ok(entry_chunk_path.parent().join(&format!( + "{}.chunk-list.json", + entry_chunk_path.await?.file_name() + ))) } #[turbo_tasks::function] From d8f2185cc207e2c0737c39deeeda329f8ab8051f Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Fri, 10 Mar 2023 19:56:40 +0100 Subject: [PATCH 20/21] update snapshots --- ...ests_tests_snapshot_basic_async_chunk_input_import_85740a.js | 2 +- ...tests_tests_snapshot_basic_async_chunk_input_index_450749.js | 2 +- ...tests_tests_snapshot_basic_async_chunk_input_index_580957.js | 2 +- ...ack-tests_tests_snapshot_basic_chunked_input_index_874f70.js | 2 +- ...ack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js | 2 +- ...ack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js | 2 +- ...ack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js | 2 +- ...k-tests_tests_snapshot_comptime_define_input_index_68d56d.js | 2 +- ...k-tests_tests_snapshot_comptime_define_input_index_ffcac3.js | 2 +- ...tests_snapshot_css_absolute-uri-import_input_index_e73f78.js | 2 +- ...tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js | 2 +- ...turbopack-tests_tests_snapshot_css_css_input_index_e01293.js | 2 +- ...turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js | 2 +- ...k-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js | 2 +- ...k-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js | 2 +- ...tes_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js | 2 +- ...tes_turbopack-tests_tests_snapshot_env_env_input_bb8ee7._.js | 2 +- ...napshot_evaluated_entrry_runtime_entry_input_index_19edf2.js | 2 +- ...napshot_evaluated_entrry_runtime_entry_input_index_51926d.js | 2 +- ...k-tests_tests_snapshot_example_example_input_index_0a08ce.js | 2 +- ...k-tests_tests_snapshot_example_example_input_index_673f1c.js | 2 +- ...tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js | 2 +- ...tests_tests_snapshot_export-alls_cjs-2_input_index_d5f22a.js | 2 +- ..._tests_snapshot_export-alls_cjs-script_input_index_ed5b85.js | 2 +- ..._tests_snapshot_export-alls_cjs-script_input_index_f76046.js | 2 +- ...k-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js | 2 +- ...k-tests_tests_snapshot_import-meta_cjs_input_index_746b39.js | 2 +- ...ests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js | 2 +- ...ests_snapshot_import-meta_esm-multiple_input_index_8687d1.js | 2 +- ...tests_snapshot_import-meta_esm-mutable_input_index_3487d2.js | 2 +- ...tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js | 2 +- ..._tests_snapshot_import-meta_esm-object_input_index_73c2df.js | 2 +- ..._tests_snapshot_import-meta_esm-object_input_index_bfaad6.js | 2 +- ...k-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js | 2 +- ...k-tests_tests_snapshot_import-meta_esm_input_index_fe8e61.js | 2 +- ...k-tests_tests_snapshot_import-meta_url_input_index_5f69bf.js | 2 +- ...k-tests_tests_snapshot_import-meta_url_input_index_c686f7.js | 2 +- ...k-tests_tests_snapshot_imports_dynamic_input_index_56419a.js | 2 +- ...k-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js | 2 +- ..._tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js | 2 +- ...pack-tests_tests_snapshot_imports_json_input_index_8148ab.js | 2 +- ...pack-tests_tests_snapshot_imports_json_input_index_881b1b.js | 2 +- ...sts_snapshot_imports_resolve_error_cjs_input_index_707ee1.js | 2 +- ...sts_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js | 2 +- ...sts_snapshot_imports_resolve_error_esm_input_index_35e7a9.js | 2 +- ...sts_snapshot_imports_resolve_error_esm_input_index_af6491.js | 2 +- ...ts_snapshot_imports_static-and-dynamic_input_index_115b05.js | 2 +- ...ts_snapshot_imports_static-and-dynamic_input_index_507785.js | 2 +- ...shot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js | 2 +- ...ck-tests_tests_snapshot_imports_static_input_index_5b1237.js | 2 +- ...ck-tests_tests_snapshot_imports_static_input_index_9fc270.js | 2 +- ...s_snapshot_node_node_protocol_external_input_index_46dd5f.js | 2 +- ...s_snapshot_node_node_protocol_external_input_index_69be78.js | 2 +- ...ot_styled_components_styled_components_input_index_56786e.js | 2 +- ...ot_styled_components_styled_components_input_index_d9d28a.js | 2 +- ...ransforms_mono_transforms_input_packages_app_index_484c8d.js | 2 +- ...ransforms_mono_transforms_input_packages_app_index_e02442.js | 2 +- ...sts_snapshot_swc_transforms_preset_env_input_index_83e217.js | 2 +- ...sts_snapshot_swc_transforms_preset_env_input_index_bc3760.js | 2 +- ...s_snapshot_typescript_jsconfig-baseurl_input_index_18c34e.js | 2 +- ...s_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js | 2 +- ...pshot_typescript_tsconfig-baseurl_input_index.ts_540b0c._.js | 2 +- ...pshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js | 2 +- 63 files changed, 63 insertions(+), 63 deletions(-) diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js index 36c8d9bf98654..d1b4a99bf0d7f 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_85740a.js @@ -5,7 +5,7 @@ __turbopack_export_value__({ chunks: [ "output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_52aed8.js", "output/20803_foo_index_f1c29b.js" -], list: "output/269ea_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_52aed8.js_e3a1b5._.json" }); +], list: "output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_52aed8.js.chunk-list.json" }); })()), }]); \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js index 7f5fe783d9089..74c1e7607d0ae 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js @@ -33,7 +33,7 @@ __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/basic/asy })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/20803_bar_index_309a59.js"))) return true; - registerChunkList("output/269ea_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js_e3a1b5._.json", ["output/20803_bar_index_309a59.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js.chunk-list.json", ["output/20803_bar_index_309a59.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js index fce44fae3df3b..bd06f7f7c1bb4 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js +++ b/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js @@ -33,7 +33,7 @@ __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/basic/asy })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js") && loadedChunks.has("output/20803_bar_index_309a59.js"))) return true; - registerChunkList("output/269ea_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js","output/20803_bar_index_309a59.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_580957.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_450749.js","output/20803_bar_index_309a59.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js index 153faee954df1..883c1d91ec118 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js +++ b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js @@ -10,7 +10,7 @@ __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js") && loadedChunks.has("output/39e84_foo_index_a20770.js"))) return true; - registerChunkList("output/946d2_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js","output/39e84_foo_index_a20770.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js","output/39e84_foo_index_a20770.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/chunked/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js index 48793ae5e596b..8d3c81a22ac5d 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js +++ b/crates/turbopack-tests/tests/snapshot/basic/chunked/output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_9e2ad0.js @@ -10,7 +10,7 @@ __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/39e84_foo_index_a20770.js"))) return true; - registerChunkList("output/946d2_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js_e3a1b5._.json", ["output/39e84_foo_index_a20770.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_chunked_input_index_874f70.js.chunk-list.json", ["output/39e84_foo_index_a20770.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/chunked/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js index 5f420f48c8be6..805e86e88dbe4 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js +++ b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js @@ -10,7 +10,7 @@ __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/d1787_foo_index_ea748e.js"))) return true; - registerChunkList("output/89a5c_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js_e3a1b5._.json", ["output/d1787_foo_index_ea748e.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js.chunk-list.json", ["output/d1787_foo_index_ea748e.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/shebang/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js index dd2c04716a6a4..d18e752ded4c4 100644 --- a/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js +++ b/crates/turbopack-tests/tests/snapshot/basic/shebang/output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js @@ -10,7 +10,7 @@ __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js") && loadedChunks.has("output/d1787_foo_index_ea748e.js"))) return true; - registerChunkList("output/89a5c_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js","output/d1787_foo_index_ea748e.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_fdfba0.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_basic_shebang_input_index_6c9fe5.js","output/d1787_foo_index_ea748e.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/basic/shebang/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_68d56d.js b/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_68d56d.js index 7c279bd002165..4539b562a7e6d 100644 --- a/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_68d56d.js +++ b/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_68d56d.js @@ -31,7 +31,7 @@ p.env.NODE_ENV == 'production' && console.log('production'); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js"))) return true; - registerChunkList("output/cba5c_turbopack-tests_tests_snapshot_comptime_define_input_index_68d56d.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_68d56d.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/comptime/define/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js b/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js index 19c1a390fe062..7801a3264d92e 100644 --- a/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js +++ b/crates/turbopack-tests/tests/snapshot/comptime/define/output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_ffcac3.js @@ -31,7 +31,7 @@ p.env.NODE_ENV == 'production' && console.log('production'); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/cba5c_turbopack-tests_tests_snapshot_comptime_define_input_index_68d56d.js_e3a1b5._.json", []); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_comptime_define_input_index_68d56d.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/comptime/define/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js b/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js index 3b06674034e2a..f61392560f9fa 100644 --- a/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js +++ b/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js @@ -7,7 +7,7 @@ }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js"))) return true; - registerChunkList("output/b4f97_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js","output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index.css"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js","output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index.css"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js b/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js index 01c96e28e1cac..e2f0def3e43be 100644 --- a/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js +++ b/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_ec53e6.js @@ -7,7 +7,7 @@ }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/b4f97_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index.css"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index_e73f78.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_css_absolute-uri-import_input_index.css"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/css/absolute-uri-import/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js b/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js index 09124243aedcc..b521107a5a893 100644 --- a/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js +++ b/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js @@ -25,7 +25,7 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js") && loadedChunks.has("output/8697f_foo_style.module.css_8b24e0._.js"))) return true; - registerChunkList("output/38609_crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js","output/8697f_foo_style.module.css_8b24e0._.js","output/8697f_foo_style.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.css","output/8697f_foo_style.module_b5a149.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.module_b5a149.css"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js","output/8697f_foo_style.module.css_8b24e0._.js","output/8697f_foo_style.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.css","output/8697f_foo_style.module_b5a149.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.module_b5a149.css"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/css/css/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js b/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js index 6bc296788faee..4fa770128221e 100644 --- a/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js +++ b/crates/turbopack-tests/tests/snapshot/css/css/output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e969fb.js @@ -25,7 +25,7 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/8697f_foo_style.module.css_8b24e0._.js"))) return true; - registerChunkList("output/38609_crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js_e3a1b5._.json", ["output/8697f_foo_style.module.css_8b24e0._.js","output/8697f_foo_style.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.css","output/8697f_foo_style.module_b5a149.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.module_b5a149.css"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_css_css_input_index_e01293.js.chunk-list.json", ["output/8697f_foo_style.module.css_8b24e0._.js","output/8697f_foo_style.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.css","output/8697f_foo_style.module_b5a149.css","output/crates_turbopack-tests_tests_snapshot_css_css_input_style.module_b5a149.css"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/css/css/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js index b38696e63e198..219711e870899 100644 --- a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js +++ b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js @@ -30,7 +30,7 @@ console.log(StyledButton, ClassNameButton); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js") && loadedChunks.has("output/63a02_@emotion_react_index_19c07f.js") && loadedChunks.has("output/63a02_@emotion_styled_index_f6fc75.js") && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js"))) return true; - registerChunkList("output/c4aa1_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js_e3a1b5._.json", ["output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js","output/63a02_@emotion_react_index_19c07f.js","output/63a02_@emotion_styled_index_f6fc75.js","output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js.chunk-list.json", ["output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js","output/63a02_@emotion_react_index_19c07f.js","output/63a02_@emotion_styled_index_f6fc75.js","output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/emotion/emotion/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js index 6ffb9f55d9b3b..5e9c6ef23cc16 100644 --- a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js +++ b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_e4d6b5.js @@ -30,7 +30,7 @@ console.log(StyledButton, ClassNameButton); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js") && loadedChunks.has("output/63a02_@emotion_react_index_19c07f.js") && loadedChunks.has("output/63a02_@emotion_styled_index_f6fc75.js"))) return true; - registerChunkList("output/c4aa1_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js_e3a1b5._.json", ["output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js","output/63a02_@emotion_react_index_19c07f.js","output/63a02_@emotion_styled_index_f6fc75.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_emotion_emotion_input_index_71d1a4.js.chunk-list.json", ["output/63a02_@emotion_react_jsx-dev-runtime_5103e7.js","output/63a02_@emotion_react_index_19c07f.js","output/63a02_@emotion_styled_index_f6fc75.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/emotion/emotion/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js b/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js index 8009a8df076e2..74fd19cdbbc90 100644 --- a/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js +++ b/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js @@ -15,7 +15,7 @@ console.log(process.env.FOOBAR); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/1bb2d_output_crates_turbopack-tests_tests_snapshot_env_env_input_bb8ee7._.js_e3a1b5._.json", []); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_env_env_input_bb8ee7._.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/env/env/input/.env/.env.js"); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/env/env/input/index.js (ecmascript)"); } diff --git a/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_bb8ee7._.js b/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_bb8ee7._.js index b7a1cd816c453..56159c1f7d754 100644 --- a/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_bb8ee7._.js +++ b/crates/turbopack-tests/tests/snapshot/env/env/output/crates_turbopack-tests_tests_snapshot_env_env_input_bb8ee7._.js @@ -15,7 +15,7 @@ console.log(process.env.FOOBAR); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js"))) return true; - registerChunkList("output/1bb2d_output_crates_turbopack-tests_tests_snapshot_env_env_input_bb8ee7._.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_env_env_input_bb8ee7._.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_env_env_input_a480a5._.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/env/env/input/.env/.env.js"); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/env/env/input/index.js (ecmascript)"); } diff --git a/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_19edf2.js b/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_19edf2.js index 254516f3c57a0..3ed81778f017c 100644 --- a/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_19edf2.js +++ b/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_19edf2.js @@ -7,7 +7,7 @@ console.log("hello world"); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js"))) return true; - registerChunkList("output/36ae9_tests_snapshot_evaluated_entrry_runtime_entry_input_index_19edf2.js_e3a1b5._.json", ["output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js"]); + registerChunkList("output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_19edf2.js.chunk-list.json", ["output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js b/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js index f6735b454aa3d..dd868aaf9d482 100644 --- a/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js +++ b/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_51926d.js @@ -7,7 +7,7 @@ console.log("hello world"); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/36ae9_tests_snapshot_evaluated_entrry_runtime_entry_input_index_19edf2.js_e3a1b5._.json", []); + registerChunkList("output/a587c_tests_snapshot_evaluated_entrry_runtime_entry_input_index_19edf2.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/evaluated_entrry/runtime_entry/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_0a08ce.js b/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_0a08ce.js index b030ee0b07669..f1469513a2cbc 100644 --- a/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_0a08ce.js +++ b/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_0a08ce.js @@ -7,7 +7,7 @@ console.log("hello world"); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js"))) return true; - registerChunkList("output/bee30_turbopack-tests_tests_snapshot_example_example_input_index_0a08ce.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_example_example_input_index_0a08ce.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/example/example/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js b/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js index 520cbde38691c..8357e5e4bc418 100644 --- a/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js +++ b/crates/turbopack-tests/tests/snapshot/example/example/output/crates_turbopack-tests_tests_snapshot_example_example_input_index_673f1c.js @@ -7,7 +7,7 @@ console.log("hello world"); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/bee30_turbopack-tests_tests_snapshot_example_example_input_index_0a08ce.js_e3a1b5._.json", []); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_example_example_input_index_0a08ce.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/example/example/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js index f9ed1d025773e..0aec54f451491 100644 --- a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js +++ b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js @@ -33,7 +33,7 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/24bd4_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d5f22a.js_e3a1b5._.json", []); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d5f22a.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d5f22a.js b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d5f22a.js index aa115c581c220..831ab8328b245 100644 --- a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d5f22a.js +++ b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d5f22a.js @@ -33,7 +33,7 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js"))) return true; - registerChunkList("output/24bd4_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d5f22a.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_d5f22a.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-2_input_index_82c83d.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/export-alls/cjs-2/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_ed5b85.js b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_ed5b85.js index 8d1aaa70debb2..148e903b10682 100644 --- a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_ed5b85.js +++ b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_ed5b85.js @@ -28,7 +28,7 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js"))) return true; - registerChunkList("output/a4de8_tests_snapshot_export-alls_cjs-script_input_index_ed5b85.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_ed5b85.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js index 3ad26c1caea99..8217046a6ceaa 100644 --- a/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js +++ b/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_f76046.js @@ -28,7 +28,7 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/a4de8_tests_snapshot_export-alls_cjs-script_input_index_ed5b85.js_e3a1b5._.json", []); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_export-alls_cjs-script_input_index_ed5b85.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/export-alls/cjs-script/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js b/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js index 0d9c76425e26e..8afa882c9f2bc 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js @@ -18,7 +18,7 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/5cf33_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_746b39.js_e3a1b5._.json", []); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_746b39.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/cjs/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_746b39.js b/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_746b39.js index 0e67da3b1c85f..7446d25270990 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_746b39.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/cjs/output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_746b39.js @@ -18,7 +18,7 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js"))) return true; - registerChunkList("output/5cf33_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_746b39.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_746b39.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_cjs_input_index_32cfb4.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/cjs/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js b/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js index 94888df588d52..9674d56eb77cf 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js @@ -25,7 +25,7 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/b58a4_tests_snapshot_import-meta_esm-multiple_input_index_8687d1.js_e3a1b5._.json", []); + registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_8687d1.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_8687d1.js b/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_8687d1.js index 32aef5b5625a3..4fc94d113598f 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_8687d1.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_8687d1.js @@ -25,7 +25,7 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js"))) return true; - registerChunkList("output/b58a4_tests_snapshot_import-meta_esm-multiple_input_index_8687d1.js_e3a1b5._.json", ["output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js"]); + registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_8687d1.js.chunk-list.json", ["output/79fb1_turbopack-tests_tests_snapshot_import-meta_esm-multiple_input_index_02a7c3.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm-multiple/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_3487d2.js b/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_3487d2.js index f7a55f8d1613f..6e83993274f75 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_3487d2.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_3487d2.js @@ -18,7 +18,7 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js"))) return true; - registerChunkList("output/6e9dd_tests_snapshot_import-meta_esm-mutable_input_index_3487d2.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_3487d2.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js b/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js index 4419b5c2b7b9c..45a06bcb15ac6 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_67d1c2.js @@ -18,7 +18,7 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/6e9dd_tests_snapshot_import-meta_esm-mutable_input_index_3487d2.js_e3a1b5._.json", []); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_import-meta_esm-mutable_input_index_3487d2.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm-mutable/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_73c2df.js b/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_73c2df.js index a8807d18fe508..1306793003517 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_73c2df.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_73c2df.js @@ -18,7 +18,7 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js"))) return true; - registerChunkList("output/f01a7_tests_snapshot_import-meta_esm-object_input_index_73c2df.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_73c2df.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js b/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js index 51c73b10c8e43..a53a4d2e21f77 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_bfaad6.js @@ -18,7 +18,7 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/f01a7_tests_snapshot_import-meta_esm-object_input_index_73c2df.js_e3a1b5._.json", []); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_import-meta_esm-object_input_index_73c2df.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm-object/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js b/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js index b6cc1221f715a..bd2bab01ae34c 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js @@ -18,7 +18,7 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/8a55e_turbopack-tests_tests_snapshot_import-meta_esm_input_index_fe8e61.js_e3a1b5._.json", []); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_fe8e61.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_fe8e61.js b/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_fe8e61.js index 8cfd22ca6ac0d..275d1168ccde7 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_fe8e61.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/esm/output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_fe8e61.js @@ -18,7 +18,7 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js"))) return true; - registerChunkList("output/8a55e_turbopack-tests_tests_snapshot_import-meta_esm_input_index_fe8e61.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_fe8e61.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_esm_input_index_9d9531.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/esm/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f69bf.js b/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f69bf.js index 7ab1bf1f2fd6c..ac85115be2034 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f69bf.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f69bf.js @@ -24,7 +24,7 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js"))) return true; - registerChunkList("output/de719_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f69bf.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f69bf.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/url/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js b/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js index bdce77ea0eec4..4e1b3bdabde20 100644 --- a/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js +++ b/crates/turbopack-tests/tests/snapshot/import-meta/url/output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_c686f7.js @@ -24,7 +24,7 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/de719_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f69bf.js_e3a1b5._.json", []); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_import-meta_url_input_index_5f69bf.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/import-meta/url/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js index 0bd6c1f1307b3..a20cea2e7498a 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js @@ -21,7 +21,7 @@ __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/d }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js"))) return true; - registerChunkList("output/bb804_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js index 55ec947735e14..c8a40c059ac94 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_9b621f.js @@ -21,7 +21,7 @@ __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/d }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/bb804_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js_e3a1b5._.json", []); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_index_56419a.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/dynamic/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js index 859115aa1a378..d8fe8f3d7bb4f 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js +++ b/crates/turbopack-tests/tests/snapshot/imports/dynamic/output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_c72a25._.js @@ -4,7 +4,7 @@ __turbopack_export_value__({ chunks: [ "output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d12c37._.js" -], list: "output/254ef_tests_snapshot_imports_dynamic_input_vercel.mjs_d12c37._.js_e3a1b5._.json" }); +], list: "output/crates_turbopack-tests_tests_snapshot_imports_dynamic_input_vercel.mjs_d12c37._.js.chunk-list.json" }); })()), }]); \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js b/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js index 5e15a7393979d..ace8e43c0e48c 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js +++ b/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js @@ -22,7 +22,7 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/1c2ec_crates_turbopack-tests_tests_snapshot_imports_json_input_index_881b1b.js_e3a1b5._.json", []); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_881b1b.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/json/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_881b1b.js b/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_881b1b.js index 8ca6bf817f1af..cfc46d58b360e 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_881b1b.js +++ b/crates/turbopack-tests/tests/snapshot/imports/json/output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_881b1b.js @@ -22,7 +22,7 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js"))) return true; - registerChunkList("output/1c2ec_crates_turbopack-tests_tests_snapshot_imports_json_input_index_881b1b.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_881b1b.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_imports_json_input_index_8148ab.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/json/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_707ee1.js b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_707ee1.js index 198353b658bb0..bb0ba80a85ac1 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_707ee1.js +++ b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_707ee1.js @@ -12,7 +12,7 @@ console.log(dne); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js"))) return true; - registerChunkList("output/bc5a3_tests_snapshot_imports_resolve_error_cjs_input_index_707ee1.js_e3a1b5._.json", ["output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js"]); + registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_707ee1.js.chunk-list.json", ["output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js index b0d63f506a445..50888a020ae95 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js +++ b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_ae8d72.js @@ -12,7 +12,7 @@ console.log(dne); }.call(this) }), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/bc5a3_tests_snapshot_imports_resolve_error_cjs_input_index_707ee1.js_e3a1b5._.json", []); + registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_cjs_input_index_707ee1.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/resolve_error_cjs/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js index db27c8ae064df..62030ab0c8c71 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js +++ b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js @@ -15,7 +15,7 @@ console.log({}[dne]); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/e04c9_tests_snapshot_imports_resolve_error_esm_input_index_af6491.js_e3a1b5._.json", []); + registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_af6491.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_af6491.js b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_af6491.js index d40e73bf462d8..da7d31ea28c61 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_af6491.js +++ b/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_af6491.js @@ -15,7 +15,7 @@ console.log({}[dne]); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js"))) return true; - registerChunkList("output/e04c9_tests_snapshot_imports_resolve_error_esm_input_index_af6491.js_e3a1b5._.json", ["output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js"]); + registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_af6491.js.chunk-list.json", ["output/79fb1_turbopack-tests_tests_snapshot_imports_resolve_error_esm_input_index_35e7a9.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/resolve_error_esm/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js index 95e4378d89c3b..8f40c41d8208b 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js @@ -33,7 +33,7 @@ __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/s })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/d246c_tests_snapshot_imports_static-and-dynamic_input_index_507785.js_e3a1b5._.json", []); + registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js index 9307bee1084fb..9c8a34ac0ecc0 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js @@ -33,7 +33,7 @@ __turbopack_require__("[project]/crates/turbopack-tests/tests/snapshot/imports/s })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js"))) return true; - registerChunkList("output/d246c_tests_snapshot_imports_static-and-dynamic_input_index_507785.js_e3a1b5._.json", ["output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js"]); + registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_507785.js.chunk-list.json", ["output/79fb1_turbopack-tests_tests_snapshot_imports_static-and-dynamic_input_index_115b05.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js index d4d6be2cfe8db..fda62330d20e4 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static-and-dynamic/output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_12d05a._.js @@ -4,7 +4,7 @@ __turbopack_export_value__({ chunks: [ "output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_e3316a._.js" -], list: "output/16c99_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_e3316a._.js_e3a1b5._.json" }); +], list: "output/a587c_tests_snapshot_imports_static-and-dynamic_input_vercel.mjs_e3316a._.js.chunk-list.json" }); })()), }]); \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js b/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js index 07a434ef8dbe2..f4d142460172d 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js @@ -14,7 +14,7 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/504b2_turbopack-tests_tests_snapshot_imports_static_input_index_9fc270.js_e3a1b5._.json", []); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_9fc270.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/static/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_9fc270.js b/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_9fc270.js index ce01ff0bbc470..43dde1ae8b389 100644 --- a/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_9fc270.js +++ b/crates/turbopack-tests/tests/snapshot/imports/static/output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_9fc270.js @@ -14,7 +14,7 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js"))) return true; - registerChunkList("output/504b2_turbopack-tests_tests_snapshot_imports_static_input_index_9fc270.js_e3a1b5._.json", ["output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js"]); + registerChunkList("output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_9fc270.js.chunk-list.json", ["output/crates_turbopack-tests_tests_snapshot_imports_static_input_index_5b1237.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/imports/static/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js b/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js index 737706c469c4a..8bfdd1c77f197 100644 --- a/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js +++ b/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js @@ -9,7 +9,7 @@ var __TURBOPACK__external__node$3a$fs__ = __turbopack_external_require__("node:f })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/f1985_tests_snapshot_node_node_protocol_external_input_index_69be78.js_e3a1b5._.json", []); + registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_69be78.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_69be78.js b/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_69be78.js index 4643ef6f0d69c..cd0dd8cd67e2d 100644 --- a/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_69be78.js +++ b/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_69be78.js @@ -9,7 +9,7 @@ var __TURBOPACK__external__node$3a$fs__ = __turbopack_external_require__("node:f })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js"))) return true; - registerChunkList("output/f1985_tests_snapshot_node_node_protocol_external_input_index_69be78.js_e3a1b5._.json", ["output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js"]); + registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_69be78.js.chunk-list.json", ["output/79fb1_turbopack-tests_tests_snapshot_node_node_protocol_external_input_index_46dd5f.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/node/node_protocol_external/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js index b5f8f229ee7cb..4c32e24a00927 100644 --- a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js +++ b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js @@ -16,7 +16,7 @@ console.log(MyButton); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/63a02_styled-components_index_7ff1d5.js"))) return true; - registerChunkList("output/90245_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js_e3a1b5._.json", ["output/63a02_styled-components_index_7ff1d5.js"]); + registerChunkList("output/a587c_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js.chunk-list.json", ["output/63a02_styled-components_index_7ff1d5.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js index 2591e48ffa109..7c6dcd23f3d4c 100644 --- a/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js +++ b/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/output/a587c_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js @@ -16,7 +16,7 @@ console.log(MyButton); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/63a02_styled-components_index_7ff1d5.js") && loadedChunks.has("output/a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js"))) return true; - registerChunkList("output/90245_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js_e3a1b5._.json", ["output/63a02_styled-components_index_7ff1d5.js","output/a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js"]); + registerChunkList("output/a587c_tests_snapshot_styled_components_styled_components_input_index_d9d28a.js.chunk-list.json", ["output/63a02_styled-components_index_7ff1d5.js","output/a587c_tests_snapshot_styled_components_styled_components_input_index_56786e.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/styled_components/styled_components/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js index 7bf63d7050d9f..67e2aac969f80 100644 --- a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js +++ b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js @@ -12,7 +12,7 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/63a02_react_jsx-dev-runtime_a01403.js") && loadedChunks.has("output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js") && loadedChunks.has("output/7b7bf_third_party_component_index_c2ffe3.js"))) return true; - registerChunkList("output/eabb6_swc_transforms_mono_transforms_input_packages_app_index_e02442.js_e3a1b5._.json", ["output/63a02_react_jsx-dev-runtime_a01403.js","output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js","output/7b7bf_third_party_component_index_c2ffe3.js"]); + registerChunkList("output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_e02442.js.chunk-list.json", ["output/63a02_react_jsx-dev-runtime_a01403.js","output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js","output/7b7bf_third_party_component_index_c2ffe3.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/input/packages/app/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_e02442.js b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_e02442.js index 5fff4a0bb9d8a..dfecb0810c99a 100644 --- a/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_e02442.js +++ b/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_e02442.js @@ -12,7 +12,7 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/63a02_react_jsx-dev-runtime_a01403.js") && loadedChunks.has("output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js") && loadedChunks.has("output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js") && loadedChunks.has("output/7b7bf_third_party_component_index_c2ffe3.js"))) return true; - registerChunkList("output/eabb6_swc_transforms_mono_transforms_input_packages_app_index_e02442.js_e3a1b5._.json", ["output/63a02_react_jsx-dev-runtime_a01403.js","output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js","output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js","output/7b7bf_third_party_component_index_c2ffe3.js"]); + registerChunkList("output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_e02442.js.chunk-list.json", ["output/63a02_react_jsx-dev-runtime_a01403.js","output/8562f_snapshot_swc_transforms_mono_transforms_input_packages_component_index_13a243.js","output/a587c_tests_snapshot_swc_transforms_mono_transforms_input_packages_app_index_484c8d.js","output/7b7bf_third_party_component_index_c2ffe3.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/mono_transforms/input/packages/app/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js index 783b456c09914..c0603f5162353 100644 --- a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js +++ b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js @@ -15,7 +15,7 @@ console.log(Foo, [].includes("foo")); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js") && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js"))) return true; - registerChunkList("output/822b1_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js_e3a1b5._.json", ["output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js","output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js"]); + registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js.chunk-list.json", ["output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js","output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js index 7bf9286bc14b3..b7430f1984650 100644 --- a/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js +++ b/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_bc3760.js @@ -15,7 +15,7 @@ console.log(Foo, [].includes("foo")); })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js"))) return true; - registerChunkList("output/822b1_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js_e3a1b5._.json", ["output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js"]); + registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_swc_transforms_preset_env_input_index_83e217.js.chunk-list.json", ["output/63a02_@swc_helpers_src__class_call_check.mjs_926eaa._.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/swc_transforms/preset_env/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_18c34e.js b/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_18c34e.js index 59ee8f882a61e..962560f900d32 100644 --- a/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_18c34e.js +++ b/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_18c34e.js @@ -22,7 +22,7 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js"))) return true; - registerChunkList("output/84aae_tests_snapshot_typescript_jsconfig-baseurl_input_index_18c34e.js_e3a1b5._.json", ["output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js"]); + registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_18c34e.js.chunk-list.json", ["output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js b/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js index 22d2ea8b6c704..4e15f5c53d6b2 100644 --- a/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js +++ b/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_b81b04.js @@ -22,7 +22,7 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/84aae_tests_snapshot_typescript_jsconfig-baseurl_input_index_18c34e.js_e3a1b5._.json", []); + registerChunkList("output/79fb1_turbopack-tests_tests_snapshot_typescript_jsconfig-baseurl_input_index_18c34e.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/typescript/jsconfig-baseurl/input/index.js (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_540b0c._.js b/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_540b0c._.js index 33a4305867645..3002aa3b08eee 100644 --- a/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_540b0c._.js +++ b/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_540b0c._.js @@ -22,7 +22,7 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true && loadedChunks.has("output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js"))) return true; - registerChunkList("output/0e5ae_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_540b0c._.js_e3a1b5._.json", ["output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js"]); + registerChunkList("output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_540b0c._.js.chunk-list.json", ["output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js"]); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/input/index.ts (ecmascript)"); } ]); diff --git a/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js b/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js index 40299d93c734e..7d2aebf3a65ce 100644 --- a/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js +++ b/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_58f3de._.js @@ -22,7 +22,7 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }, ({ loadedChunks, instantiateRuntimeModule, registerChunkList }) => { if (!(true)) return true; - registerChunkList("output/0e5ae_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_540b0c._.js_e3a1b5._.json", []); + registerChunkList("output/a587c_tests_snapshot_typescript_tsconfig-baseurl_input_index.ts_540b0c._.js.chunk-list.json", []); instantiateRuntimeModule("[project]/crates/turbopack-tests/tests/snapshot/typescript/tsconfig-baseurl/input/index.ts (ecmascript)"); } ]); From 7fdd49d9fc53f6c7ef3be95d937fee166d75e977 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Fri, 10 Mar 2023 20:23:05 +0100 Subject: [PATCH 21/21] update snapshot --- ... loader-042c71.txt => Issue while running loader-0f7218.txt} | 2 +- ... loader-e90206.txt => Issue while running loader-c76e5e.txt} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/{Issue while running loader-042c71.txt => Issue while running loader-0f7218.txt} (98%) rename crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/{Issue while running loader-e90206.txt => Issue while running loader-c76e5e.txt} (98%) diff --git a/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-042c71.txt b/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-0f7218.txt similarity index 98% rename from crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-042c71.txt rename to crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-0f7218.txt index 984a4b3f7a5ee..f9359dffee1ca 100644 --- a/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-042c71.txt +++ b/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-0f7218.txt @@ -3,7 +3,7 @@ PlainIssue { context: "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/hello.emit", category: "loaders", title: "Issue while running loader", - description: "Error: Warning!\n at Object.module.exports (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/node_modules/emit-loader/index.js:2:20)\n at LOADER_EXECUTION (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4134)\n at runSyncOrAsync (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4145)\n at iterateNormalLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5782)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5426)\n at readResource (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:55:17)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:6160)\n at processResource (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5308)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4667)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4764)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4896)\n at handleResult (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:1424)\n at loadLoader (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:963)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4794)\n at runLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:8590)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:35:9)\n at \n at Module.transform (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:28:12)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]__a17b9f._.js:13:212)\n at Module.run (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_ipc_evaluate.ts_f5e151._.js:172:45)\n at processTicksAndRejections (node:internal/process/task_queues:96:5)\n", + description: "Error: Warning!\n at Object.module.exports (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/node_modules/emit-loader/index.js:2:20)\n at LOADER_EXECUTION (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4134)\n at runSyncOrAsync (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4145)\n at iterateNormalLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5782)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5426)\n at readResource (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:55:17)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:6160)\n at processResource (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5308)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4667)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4764)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4896)\n at handleResult (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:1424)\n at loadLoader (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:963)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4794)\n at runLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:8590)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:35:9)\n at \n at Module.transform (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:28:12)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]__c3ef78._.js:13:212)\n at Module.run (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_ipc_evaluate.ts_f5e151._.js:172:45)\n at processTicksAndRejections (node:internal/process/task_queues:96:5)\n", detail: "", documentation_link: "", source: None, diff --git a/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-e90206.txt b/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-c76e5e.txt similarity index 98% rename from crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-e90206.txt rename to crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-c76e5e.txt index 717c7725c4eed..88a4dba9948d7 100644 --- a/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-e90206.txt +++ b/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/issues/Issue while running loader-c76e5e.txt @@ -3,7 +3,7 @@ PlainIssue { context: "[project]/crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/pages/hello.emit", category: "loaders", title: "Issue while running loader", - description: "Error: Error!\n at Object.module.exports (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/node_modules/emit-loader/index.js:4:18)\n at LOADER_EXECUTION (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4134)\n at runSyncOrAsync (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4145)\n at iterateNormalLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5782)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5426)\n at readResource (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:55:17)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:6160)\n at processResource (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5308)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4667)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4764)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4896)\n at handleResult (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:1424)\n at loadLoader (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:963)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4794)\n at runLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:8590)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:35:9)\n at \n at Module.transform (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:28:12)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]__a17b9f._.js:13:212)\n at Module.run (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_ipc_evaluate.ts_f5e151._.js:172:45)\n at processTicksAndRejections (node:internal/process/task_queues:96:5)\n", + description: "Error: Error!\n at Object.module.exports (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/node_modules/emit-loader/index.js:4:18)\n at LOADER_EXECUTION (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4134)\n at runSyncOrAsync (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4145)\n at iterateNormalLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5782)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5426)\n at readResource (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:55:17)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:6160)\n at processResource (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:5308)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4667)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4764)\n at (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4896)\n at handleResult (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:1424)\n at loadLoader (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:963)\n at iteratePitchingLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:4794)\n at runLoaders (node_modules/.pnpm/next@13.2.4-canary.7_pjwopsidmaokadturxaafygjp4/node_modules/next/dist/compiled/loader-runner/LoaderRunner.js:1:8590)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:35:9)\n at \n at Module.transform (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_transforms_webpack-loaders.ts_fa48d1._.js:28:12)\n at (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]__c3ef78._.js:13:212)\n at Module.run (crates/next-dev-tests/tests/integration/next/webpack-loaders/emitted-errors/input/.next/build/webpack_loaders/chunks/[turbopack-node]_ipc_evaluate.ts_f5e151._.js:172:45)\n at processTicksAndRejections (node:internal/process/task_queues:96:5)\n", detail: "", documentation_link: "", source: None,