Skip to content

Commit 541e7b4

Browse files
mmastracmmastrac
committed
Return to dev chunking when None
1 parent 9fed6a4 commit 541e7b4

File tree

292 files changed

+1080
-1274
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

292 files changed

+1080
-1274
lines changed

‎turbopack/crates/turbopack-browser/src/chunking_context.rs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -689,16 +689,20 @@ impl ChunkingContext for BrowserChunkingContext {
689689

690690
#[turbo_tasks::function]
691691
async fn chunking_configs(&self) -> Result<Vc<ChunkingConfigs>> {
692-
let mut configs = self.chunking_configs.clone();
692+
let mut configs: Vec<(ResolvedVc<Box<dyn ChunkType>>, Option<ChunkingConfig>)> = self
693+
.chunking_configs
694+
.iter()
695+
.map(|(ty, config)| (*ty, Some(config.clone())))
696+
.collect();
693697
let ecma_type: ResolvedVc<Box<dyn ChunkType>> =
694698
ResolvedVc::upcast(Vc::<EcmascriptChunkType>::default().to_resolved().await?);
695699
if !configs.iter().any(|(ty, _)| *ty == ecma_type) {
696-
configs.push((ecma_type, ChunkingConfig::default()));
700+
configs.push((ecma_type, None));
697701
}
698702
let css_type: ResolvedVc<Box<dyn ChunkType>> =
699703
ResolvedVc::upcast(Vc::<CssChunkType>::default().to_resolved().await?);
700704
if !configs.iter().any(|(ty, _)| *ty == css_type) {
701-
configs.push((css_type, ChunkingConfig::default()));
705+
configs.push((css_type, None));
702706
}
703707
Ok(ChunkingConfigs(configs.into_iter().collect()).cell())
704708
}

‎turbopack/crates/turbopack-core/src/chunk/chunking/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ pub async fn make_chunks(
329329
chunks: &mut chunks,
330330
};
331331

332-
if let Some(chunking_config) = chunking_configs.get(&ty) {
332+
if let Some(chunking_config) = chunking_configs.get(&ty).and_then(|c| c.as_ref()) {
333333
// Production chunking
334334
if *ty.is_style().await? {
335335
make_style_production_chunks(

‎turbopack/crates/turbopack-core/src/chunk/chunking_context.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,10 @@ pub struct ChunkingConfig {
282282

283283
#[derive(Default)]
284284
#[turbo_tasks::value(shared)]
285-
pub struct ChunkingConfigs(pub FxHashMap<ResolvedVc<Box<dyn ChunkType>>, ChunkingConfig>);
285+
pub struct ChunkingConfigs(pub FxHashMap<ResolvedVc<Box<dyn ChunkType>>, Option<ChunkingConfig>>);
286286

287287
impl Deref for ChunkingConfigs {
288-
type Target = FxHashMap<ResolvedVc<Box<dyn ChunkType>>, ChunkingConfig>;
288+
type Target = FxHashMap<ResolvedVc<Box<dyn ChunkType>>, Option<ChunkingConfig>>;
289289
fn deref(&self) -> &Self::Target {
290290
&self.0
291291
}

‎turbopack/crates/turbopack-nodejs/src/chunking_context.rs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -450,16 +450,20 @@ impl ChunkingContext for NodeJsChunkingContext {
450450

451451
#[turbo_tasks::function]
452452
async fn chunking_configs(&self) -> Result<Vc<ChunkingConfigs>> {
453-
let mut configs = self.chunking_configs.clone();
453+
let mut configs: Vec<(ResolvedVc<Box<dyn ChunkType>>, Option<ChunkingConfig>)> = self
454+
.chunking_configs
455+
.iter()
456+
.map(|(ty, config)| (*ty, Some(config.clone())))
457+
.collect();
454458
let ecma_type: ResolvedVc<Box<dyn ChunkType>> =
455459
ResolvedVc::upcast(Vc::<EcmascriptChunkType>::default().to_resolved().await?);
456460
if !configs.iter().any(|(ty, _)| *ty == ecma_type) {
457-
configs.push((ecma_type, ChunkingConfig::default()));
461+
configs.push((ecma_type, None));
458462
}
459463
let css_type: ResolvedVc<Box<dyn ChunkType>> =
460464
ResolvedVc::upcast(Vc::<CssChunkType>::default().to_resolved().await?);
461465
if !configs.iter().any(|(ty, _)| *ty == css_type) {
462-
configs.push((css_type, ChunkingConfig::default()));
466+
configs.push((css_type, None));
463467
}
464468
Ok(ChunkingConfigs(configs.into_iter().collect()).cell())
465469
}

turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/dynamic-import/output/ad3e4_tests_snapshot_basic-tree-shake_dynamic-import_input_index_d8d543b1.js renamed to turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/dynamic-import/output/ad3e4_tests_snapshot_basic-tree-shake_dynamic-import_input_index_7dac1ace.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push([
2-
"output/ad3e4_tests_snapshot_basic-tree-shake_dynamic-import_input_index_d8d543b1.js",
3-
{"otherChunks":["output/bf321_tests_snapshot_basic-tree-shake_dynamic-import_input_index_9775ceed.js","output/bf321_tests_snapshot_basic-tree-shake_dynamic-import_input_lib_ee638b2a.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/dynamic-import/input/index.js [test] (ecmascript)"]}
2+
"output/ad3e4_tests_snapshot_basic-tree-shake_dynamic-import_input_index_7dac1ace.js",
3+
{"otherChunks":["output/bf321_tests_snapshot_basic-tree-shake_dynamic-import_input_lib_ee638b2a.js","output/bf321_tests_snapshot_basic-tree-shake_dynamic-import_input_index_9775ceed.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/dynamic-import/input/index.js [test] (ecmascript)"]}
44
]);
55
// Dummy runtime

turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/dynamic-import/output/bf321_tests_snapshot_basic-tree-shake_dynamic-import_input_index_d8d543b1.js.map renamed to turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/dynamic-import/output/bf321_tests_snapshot_basic-tree-shake_dynamic-import_input_index_7dac1ace.js.map

File renamed without changes.

‎turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/aaf3a_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_c0ebb290.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
__turbopack_context__.v((parentImport) => {
55
return Promise.all([
6-
"output/turbopack_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_0b8573ac._.js"
6+
"output/turbopack_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_c52390c2._.js"
77
].map((chunk) => __turbopack_context__.l(chunk))).then(() => {
88
return parentImport("[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js [test] (ecmascript)");
99
});

turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/aaf3a_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_7b89cd79.js.map renamed to turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/aaf3a_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_da1eef81.js.map

File renamed without changes.

‎turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/aaf3a_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_ea8e1245.js.map‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk/output/ba425_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_7b89cd79.js‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)