add evaluatables to chunk list ident (#5785)

### Description This fixes a write conflict as two chunk group lists might have the same filename but different content. This is caused by different chunk groups can be created with the same entry chunk but different evaluatables. Closes WEB-1426
vercel · Aug 24, 2023 · 838eaec · 838eaec
1 parent 2a746e2
commit 838eaec
Show file tree

Hide file tree

Showing 42 changed files with 92 additions and 81 deletions.
diff --git a/crates/turbopack-dev/src/chunking_context.rs b/crates/turbopack-dev/src/chunking_context.rs
@@ -167,12 +167,14 @@ impl DevChunkingContext {
     fn generate_chunk_list_register_chunk(
         self: Vc<Self>,
         entry_chunk: Vc<Box<dyn Chunk>>,
+        evaluatable_assets: Vc<EvaluatableAssets>,
         other_chunks: Vc<OutputAssets>,
         source: Value<EcmascriptDevChunkListSource>,
     ) -> Vc<Box<dyn OutputAsset>> {
         Vc::upcast(EcmascriptDevChunkList::new(
             self,
             entry_chunk,
+            evaluatable_assets,
             other_chunks,
             source,
         ))
@@ -324,6 +326,7 @@ impl ChunkingContext for DevChunkingContext {
 
         assets.push(self.generate_chunk_list_register_chunk(
             entry_chunk,
+            EvaluatableAssets::empty(),
             Vc::cell(assets.clone()),
             Value::new(EcmascriptDevChunkListSource::Dynamic),
         ));
@@ -370,6 +373,7 @@ impl ChunkingContext for DevChunkingContext {
 
         assets.push(self.generate_chunk_list_register_chunk(
             entry_chunk,
+            evaluatable_assets,
             other_assets,
             Value::new(EcmascriptDevChunkListSource::Entry),
         ));

diff --git a/crates/turbopack-dev/src/ecmascript/list/asset.rs b/crates/turbopack-dev/src/ecmascript/list/asset.rs
@@ -3,8 +3,9 @@ use serde::Serialize;
 use turbo_tasks::{Value, ValueToString, Vc};
 use turbopack_core::{
     asset::{Asset, AssetContent},
-    chunk::{Chunk, ChunkingContext},
+    chunk::{Chunk, ChunkingContext, EvaluatableAssets},
     ident::AssetIdent,
+    module::Module,
     output::{OutputAsset, OutputAssets},
     version::VersionedContent,
 };
@@ -27,6 +28,7 @@ use crate::DevChunkingContext;
 pub(crate) struct EcmascriptDevChunkList {
     pub(super) chunking_context: Vc<DevChunkingContext>,
     pub(super) entry_chunk: Vc<Box<dyn Chunk>>,
+    pub(super) evaluatable_assets: Vc<EvaluatableAssets>,
     pub(super) chunks: Vc<OutputAssets>,
     pub(super) source: EcmascriptDevChunkListSource,
 }
@@ -38,12 +40,14 @@ impl EcmascriptDevChunkList {
     pub fn new(
         chunking_context: Vc<DevChunkingContext>,
         entry_chunk: Vc<Box<dyn Chunk>>,
+        evaluatable_assets: Vc<EvaluatableAssets>,
         chunks: Vc<OutputAssets>,
         source: Value<EcmascriptDevChunkListSource>,
     ) -> Vc<Self> {
         EcmascriptDevChunkList {
             chunking_context,
             entry_chunk,
+            evaluatable_assets,
             chunks,
             source: source.into_value(),
         }
@@ -79,6 +83,9 @@ impl OutputAsset for EcmascriptDevChunkList {
     #[turbo_tasks::function]
     async fn ident(&self) -> Result<Vc<AssetIdent>> {
         let mut ident = self.entry_chunk.ident().await?.clone_value();
+        for evaluatable_asset in self.evaluatable_assets.await?.iter() {
+            ident.add_asset(Vc::<String>::empty(), evaluatable_asset.ident());
+        }
 
         ident.add_modifier(modifier());
 

diff --git a/...t_basic_async_chunk_input_index_5771e1.js → ...t_basic_async_chunk_input_index_be234a.js b/...t_basic_async_chunk_input_index_5771e1.js → ...t_basic_async_chunk_input_index_be234a.js
diff --git a/...pshot_basic_chunked_input_index_5771e1.js → ...pshot_basic_chunked_input_index_65dea0.js b/...pshot_basic_chunked_input_index_5771e1.js → ...pshot_basic_chunked_input_index_65dea0.js
diff --git a/...pshot_basic_shebang_input_index_5771e1.js → ...pshot_basic_shebang_input_index_98eac3.js b/...pshot_basic_shebang_input_index_5771e1.js → ...pshot_basic_shebang_input_index_98eac3.js
diff --git a/...sic_top-level-await_input_index_5771e1.js → ...sic_top-level-await_input_index_9e449e.js b/...sic_top-level-await_input_index_5771e1.js → ...sic_top-level-await_input_index_9e449e.js
diff --git a/...hot_comptime_define_input_index_5771e1.js → ...hot_comptime_define_input_index_fcd744.js b/...hot_comptime_define_input_index_5771e1.js → ...hot_comptime_define_input_index_fcd744.js
diff --git a/...absolute-uri-import_input_index_5771e1.js → ...absolute-uri-import_input_index_7aa5f3.js b/...absolute-uri-import_input_index_5771e1.js → ...absolute-uri-import_input_index_7aa5f3.js
diff --git a/...ts_snapshot_css_css_input_index_5771e1.js → ...ts_snapshot_css_css_input_index_daa48f.js b/...ts_snapshot_css_css_input_index_5771e1.js → ...ts_snapshot_css_css_input_index_daa48f.js
diff --git a/...hot_emotion_emotion_input_index_5771e1.js → ...hot_emotion_emotion_input_index_7b5f07.js b/...hot_emotion_emotion_input_index_5771e1.js → ...hot_emotion_emotion_input_index_7b5f07.js
diff --git a/...ts_snapshot_env_env_input_index_5771e1.js → ...ts_snapshot_env_env_input_index_b07cc9.js b/...ts_snapshot_env_env_input_index_5771e1.js → ...ts_snapshot_env_env_input_index_b07cc9.js
diff --git a/...ntrry_runtime_entry_input_index_5771e1.js → ...ntrry_runtime_entry_input_index_60171f.js b/...ntrry_runtime_entry_input_index_5771e1.js → ...ntrry_runtime_entry_input_index_60171f.js
diff --git a/...hot_example_example_input_index_5771e1.js → ...hot_example_example_input_index_f5c60a.js b/...hot_example_example_input_index_5771e1.js → ...hot_example_example_input_index_f5c60a.js
diff --git a/...t_export-alls_cjs-2_input_index_5771e1.js → ...t_export-alls_cjs-2_input_index_dd8fad.js b/...t_export-alls_cjs-2_input_index_5771e1.js → ...t_export-alls_cjs-2_input_index_dd8fad.js
diff --git a/...ort-alls_cjs-script_input_index_5771e1.js → ...ort-alls_cjs-script_input_index_e0d64d.js b/...ort-alls_cjs-script_input_index_5771e1.js → ...ort-alls_cjs-script_input_index_e0d64d.js
diff --git a/...hot_import-meta_cjs_input_index_5771e1.js → ...hot_import-meta_cjs_input_index_806b66.js b/...hot_import-meta_cjs_input_index_5771e1.js → ...hot_import-meta_cjs_input_index_806b66.js
diff --git a/...t-meta_esm-multiple_input_index_5771e1.js → ...t-meta_esm-multiple_input_index_5d38d3.js b/...t-meta_esm-multiple_input_index_5771e1.js → ...t-meta_esm-multiple_input_index_5d38d3.js
diff --git a/...rt-meta_esm-mutable_input_index_5771e1.js → ...rt-meta_esm-mutable_input_index_e8764c.js b/...rt-meta_esm-mutable_input_index_5771e1.js → ...rt-meta_esm-mutable_input_index_e8764c.js
diff --git a/...ort-meta_esm-object_input_index_5771e1.js → ...ort-meta_esm-object_input_index_3439cf.js b/...ort-meta_esm-object_input_index_5771e1.js → ...ort-meta_esm-object_input_index_3439cf.js
diff --git a/...hot_import-meta_esm_input_index_5771e1.js → ...hot_import-meta_esm_input_index_2799bf.js b/...hot_import-meta_esm_input_index_5771e1.js → ...hot_import-meta_esm_input_index_2799bf.js
diff --git a/...hot_import-meta_url_input_index_5771e1.js → ...hot_import-meta_url_input_index_1836ab.js b/...hot_import-meta_url_input_index_5771e1.js → ...hot_import-meta_url_input_index_1836ab.js
diff --git a/...hot_imports_dynamic_input_index_5771e1.js → ...hot_imports_dynamic_input_index_249e67.js b/...hot_imports_dynamic_input_index_5771e1.js → ...hot_imports_dynamic_input_index_249e67.js
diff --git a/...apshot_imports_json_input_index_5771e1.js → ...apshot_imports_json_input_index_a8331e.js b/...apshot_imports_json_input_index_5771e1.js → ...apshot_imports_json_input_index_a8331e.js
diff --git a/...pshot_imports_order_input_index_5771e1.js → ...pshot_imports_order_input_index_97e64f.js b/...pshot_imports_order_input_index_5771e1.js → ...pshot_imports_order_input_index_97e64f.js
diff --git a/...s_resolve_error_cjs_input_index_5771e1.js → ...s_resolve_error_cjs_input_index_1ef02c.js b/...s_resolve_error_cjs_input_index_5771e1.js → ...s_resolve_error_cjs_input_index_1ef02c.js
diff --git a/...s_resolve_error_esm_input_index_5771e1.js → ...s_resolve_error_esm_input_index_fc54c4.js b/...s_resolve_error_esm_input_index_5771e1.js → ...s_resolve_error_esm_input_index_fc54c4.js
diff --git a/..._static-and-dynamic_input_index_5771e1.js → ..._static-and-dynamic_input_index_22ae2e.js b/..._static-and-dynamic_input_index_5771e1.js → ..._static-and-dynamic_input_index_22ae2e.js