use document.currentScript instead of chunk path literal

Author: sokra

turbopack/crates/turbopack-browser/src/ecmascript/content.rs

@@ -1,6 +1,6 @@
 use std::io::Write;
 
-use anyhow::{bail, Result};
+use anyhow::Result;
 use indoc::writedoc;
 use turbo_rcstr::RcStr;
 use turbo_tasks::{ResolvedVc, Vc};
@@ -67,22 +67,10 @@ impl EcmascriptBrowserChunkContent {
     #[turbo_tasks::function]
     async fn code(self: Vc<Self>) -> Result<Vc<Code>> {
         let this = self.await?;
-        let output_root = this.chunking_context.output_root().await?;
         let source_maps = *this
             .chunking_context
             .reference_chunk_source_maps(*ResolvedVc::upcast(this.chunk))
             .await?;
-        let chunk_path_vc = this.chunk.path();
-        let chunk_path = chunk_path_vc.await?;
-        let chunk_server_path = if let Some(path) = output_root.get_path_to(&chunk_path) {
-            path
-        } else {
-            bail!(
-                "chunk path {} is not in output root {}",
-                chunk_path.to_string(),
-                output_root.to_string()
-            );
-        };
         let mut code = CodeBuilder::new(source_maps);
 
         // When a chunk is executed, it will either register itself with the current
@@ -95,9 +83,8 @@ impl EcmascriptBrowserChunkContent {
         writedoc!(
             code,
             r#"
-                (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([{chunk_path}, {{
+                (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([document.currentScript, {{
             "#,
-            chunk_path = StringifyJs(chunk_server_path)
         )?;
 
         let content = this.content.await?;

turbopack/crates/turbopack-browser/src/ecmascript/evaluate/chunk.rs

@@ -1,6 +1,6 @@
 use std::io::Write;
 
-use anyhow::{bail, Result};
+use anyhow::Result;
 use indoc::writedoc;
 use serde::Serialize;
 use turbo_rcstr::RcStr;
@@ -74,23 +74,11 @@ impl EcmascriptBrowserEvaluateChunk {
         let chunking_context = this.chunking_context.await?;
         let environment = this.chunking_context.environment();
 
-        let output_root = this.chunking_context.output_root().await?;
         let output_root_to_root_path = this.chunking_context.output_root_to_root_path();
         let source_maps = *this
             .chunking_context
             .reference_chunk_source_maps(Vc::upcast(self))
             .await?;
-        let chunk_path_vc = self.path();
-        let chunk_path = chunk_path_vc.await?;
-        let chunk_public_path = if let Some(path) = output_root.get_path_to(&chunk_path) {
-            path
-        } else {
-            bail!(
-                "chunk path {} is not in output root {}",
-                chunk_path.to_string(),
-                output_root.to_string()
-            );
-        };
 
         let other_chunks_data = self.chunks_data().await?;
         let other_chunks_data = other_chunks_data.iter().try_join().await?;
@@ -139,12 +127,11 @@ impl EcmascriptBrowserEvaluateChunk {
             code,
             r#"
                 (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
-                    {},
+                    document.currentScript,
                     {{}},
                     {}
                 ]);
             "#,
-            StringifyJs(&chunk_public_path),
             StringifyJs(&params),
         )?;
 

turbopack/crates/turbopack-browser/src/ecmascript/list/content.rs

@@ -1,8 +1,7 @@
 use std::io::Write;
 
-use anyhow::{Context, Result};
+use anyhow::Result;
 use indoc::writedoc;
-use serde::Serialize;
 use turbo_tasks::{FxIndexMap, IntoTraitRef, ResolvedVc, TryJoinIterExt, Vc};
 use turbo_tasks_fs::File;
 use turbopack_core::{
@@ -25,7 +24,6 @@ use super::{
 /// Contents of an [`EcmascriptDevChunkList`].
 #[turbo_tasks::value]
 pub(super) struct EcmascriptDevChunkListContent {
-    chunk_list_path: String,
     pub(super) chunks_contents: FxIndexMap<String, ResolvedVc<Box<dyn VersionedContent>>>,
     source: EcmascriptDevChunkListSource,
 }
@@ -38,10 +36,6 @@ impl EcmascriptDevChunkListContent {
         let chunk_list_ref = chunk_list.await?;
         let output_root = chunk_list_ref.chunking_context.output_root().await?;
         Ok(EcmascriptDevChunkListContent {
-            chunk_list_path: output_root
-                .get_path_to(&*chunk_list.path().await?)
-                .context("chunk list path not in output root")?
-                .to_string(),
             chunks_contents: chunk_list_ref
                 .chunks
                 .await?
@@ -111,11 +105,11 @@ impl EcmascriptDevChunkListContent {
     pub(super) async fn code(self: Vc<Self>) -> Result<Vc<Code>> {
         let this = self.await?;
 
-        let params = EcmascriptDevChunkListParams {
-            path: &this.chunk_list_path,
-            chunks: this.chunks_contents.keys().map(|s| s.as_str()).collect(),
-            source: this.source,
-        };
+        let chunks = this
+            .chunks_contents
+            .keys()
+            .map(|s| s.as_str())
+            .collect::<Vec<_>>();
 
         let mut code = CodeBuilder::default();
 
@@ -126,13 +120,17 @@ impl EcmascriptDevChunkListContent {
             code,
             r#"
                 (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
-                    {},
+                    document.currentScript,
                     {{}},
                 ]);
-                (globalThis.TURBOPACK_CHUNK_LISTS = globalThis.TURBOPACK_CHUNK_LISTS || []).push({:#});
+                (globalThis.TURBOPACK_CHUNK_LISTS = globalThis.TURBOPACK_CHUNK_LISTS || []).push({{
+                    script: document.currentScript,
+                    chunks: {:#},
+                    source: {:#}
+                }});
             "#,
-            StringifyJs(&this.chunk_list_path),
-            StringifyJs(&params),
+            StringifyJs(&chunks),
+            StringifyJs(&this.source),
         )?;
 
         Ok(Code::cell(code.build()))
@@ -159,14 +157,3 @@ impl VersionedContent for EcmascriptDevChunkListContent {
         update_chunk_list(self, from_version)
     }
 }
-
-#[derive(Debug, Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-struct EcmascriptDevChunkListParams<'a> {
-    /// Path to the chunk list to register.
-    path: &'a str,
-    /// All chunks that belong to the chunk list.
-    chunks: Vec<&'a str>,
-    /// Where this chunk list is from.
-    source: EcmascriptDevChunkListSource,
-}

turbopack/crates/turbopack-ecmascript-runtime/js/src/browser/runtime/base/dev-base.ts

@@ -1083,7 +1083,8 @@ function registerChunkList(
   chunkUpdateProvider: ChunkUpdateProvider,
   chunkList: ChunkList
 ) {
-  const chunkListPath = chunkList.path;
+  const chunkListScript = chunkList.script;
+  const chunkListPath = getPathFromScript(chunkListScript);
   chunkUpdateProvider.push([
     chunkListPath,
     handleApply.bind(null, chunkListPath),

turbopack/crates/turbopack-ecmascript-runtime/js/src/browser/runtime/base/runtime-base.ts

@@ -22,13 +22,13 @@ type RuntimeParams = {
 };
 
 type ChunkRegistration = [
-  chunkPath: ChunkPath,
+  chunkPath: ChunkScript,
   chunkModules: ModuleFactories,
   params: RuntimeParams | undefined
 ];
 
 type ChunkList = {
-  path: ChunkListPath;
+  script: ChunkListScript;
   chunks: ChunkData[];
   source: "entry" | "dynamic";
 };
@@ -304,6 +304,17 @@ function getChunkRelativeUrl(chunkPath: ChunkPath | ChunkListPath): ChunkUrl {
     .join("/")}${CHUNK_SUFFIX_PATH}` as ChunkUrl;
 }
 
+/**
+ * Return the ChunkPath from a ChunkScript.
+ */
+function getPathFromScript(chunkScript: ChunkScript): ChunkPath;
+function getPathFromScript(chunkScript: ChunkListScript): ChunkListPath;
+function getPathFromScript(chunkScript: ChunkScript | ChunkListScript): ChunkPath | ChunkListPath {
+  const src = decodeURIComponent(chunkScript.getAttribute("src")!);
+  const path = src.startsWith(CHUNK_BASE_PATH) ? src.slice(CHUNK_BASE_PATH.length) : src;
+  return path as ChunkPath | ChunkListPath;
+}
+
 /**
  * Marks a chunk list as a runtime chunk list. There can be more than one
  * runtime chunk list. For instance, integration tests can have multiple chunk
@@ -314,10 +325,11 @@ function markChunkListAsRuntime(chunkListPath: ChunkListPath) {
 }
 
 function registerChunk([
-  chunkPath,
+  chunkScript,
   chunkModules,
   runtimeParams,
 ]: ChunkRegistration) {
+  const chunkPath = getPathFromScript(chunkScript);
   for (const [moduleId, moduleFactory] of Object.entries(chunkModules)) {
     if (!moduleFactories[moduleId]) {
       moduleFactories[moduleId] = moduleFactory;

turbopack/crates/turbopack-ecmascript-runtime/js/src/shared/runtime-types.d.ts

@@ -7,8 +7,11 @@
  * specific to the runtime context.
  */
 
+type CurrentScript = { getAttribute: (name: string) => string | null };
 type ChunkListPath = string & { readonly brand: unique symbol };
+type ChunkListScript = CurrentScript & { readonly brand: unique symbol };
 type ChunkPath = string & { readonly brand: unique symbol };
+type ChunkScript = CurrentScript & { readonly brand: unique symbol };
 type ChunkUrl = string & { readonly brand: unique symbol };
 type ModuleId = string;
 

turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/dynamic-import/output/4c35f_tests_snapshot_basic-tree-shake_dynamic-import_input_index_6151e286.js

@@ -1,5 +1,5 @@
 (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
-    "output/4c35f_tests_snapshot_basic-tree-shake_dynamic-import_input_index_6151e286.js",
+    document.currentScript,
     {},
     {"otherChunks":["output/4c35f_tests_snapshot_basic-tree-shake_dynamic-import_input_lib_44a9b7f1.js","output/4c35f_tests_snapshot_basic-tree-shake_dynamic-import_input_index_92a5f455.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/dynamic-import/input/index.js [test] (ecmascript)"]}
 ]);

turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/dynamic-import/output/4c35f_tests_snapshot_basic-tree-shake_dynamic-import_input_index_92a5f455.js

@@ -1,4 +1,4 @@
-(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push(["output/4c35f_tests_snapshot_basic-tree-shake_dynamic-import_input_lib_44a9b7f1.js", {
+(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([document.currentScript, {
 
 "[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/dynamic-import/input/lib.js [test] (ecmascript, async loader)": ((__turbopack_context__) => {
 

turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/dynamic-import/output/4c35f_tests_snapshot_basic-tree-shake_dynamic-import_input_lib_44a9b7f1.js

@@ -1,5 +1,5 @@
 (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
-    "output/4c35f_tests_snapshot_basic-tree-shake_export-named_input_index_343390a0.js",
+    document.currentScript,
     {},
     {"otherChunks":["output/b1abf_turbopack-tests_tests_snapshot_basic-tree-shake_export-named_input_86188939._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/export-named/input/index.js [test] (ecmascript)"]}
 ]);

turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/dynamic-import/output/4c35f_tests_snapshot_basic-tree-shake_dynamic-import_input_lib_b2d8c81e.js

@@ -1,5 +1,5 @@
 (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
-    "output/4c35f_tests_snapshot_basic-tree-shake_export-namespace_input_index_3c992eb1.js",
+    document.currentScript,
     {},
     {"otherChunks":["output/b1abf_turbopack-tests_tests_snapshot_basic-tree-shake_export-namespace_input_e9b22068._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/export-namespace/input/index.js [test] (ecmascript)"]}
 ]);

turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/export-named/output/4c35f_tests_snapshot_basic-tree-shake_export-named_input_index_343390a0.js

@@ -1,5 +1,5 @@
 (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
-    "output/4c35f_tests_snapshot_basic-tree-shake_import-named-all_input_index_94ec6396.js",
+    document.currentScript,
     {},
     {"otherChunks":["output/b1abf_turbopack-tests_tests_snapshot_basic-tree-shake_import-named-all_input_00b867a0._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/import-named-all/input/index.js [test] (ecmascript)"]}
 ]);

turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/export-named/output/b1abf_turbopack-tests_tests_snapshot_basic-tree-shake_export-named_input_86188939._.js

@@ -1,5 +1,5 @@
 (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
-    "output/4c35f_tests_snapshot_basic-tree-shake_import-named_input_index_d7a07524.js",
+    document.currentScript,
     {},
     {"otherChunks":["output/b1abf_turbopack-tests_tests_snapshot_basic-tree-shake_import-named_input_f64e7412._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/import-named/input/index.js [test] (ecmascript)"]}
 ]);

turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/export-namespace/output/4c35f_tests_snapshot_basic-tree-shake_export-namespace_input_index_3c992eb1.js

@@ -1,5 +1,5 @@
 (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
-    "output/4c35f_tests_snapshot_basic-tree-shake_import-namespace_input_index_c9bf16f7.js",
+    document.currentScript,
     {},
     {"otherChunks":["output/b1abf_turbopack-tests_tests_snapshot_basic-tree-shake_import-namespace_input_25e69485._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/import-namespace/input/index.js [test] (ecmascript)"]}
 ]);

turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/export-namespace/output/b1abf_turbopack-tests_tests_snapshot_basic-tree-shake_export-namespace_input_e9b22068._.js

@@ -1,5 +1,5 @@
 (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
-    "output/4c35f_tests_snapshot_basic-tree-shake_import-side-effect_input_index_480319bf.js",
+    document.currentScript,
     {},
     {"otherChunks":["output/4c35f_tests_snapshot_basic-tree-shake_import-side-effect_input_e082b9f6._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/import-side-effect/input/index.js [test] (ecmascript)"]}
 ]);

turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/import-named-all/output/4c35f_tests_snapshot_basic-tree-shake_import-named-all_input_index_94ec6396.js

@@ -1,5 +1,5 @@
 (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
-    "output/4c35f_tests_snapshot_basic-tree-shake_require-side-effect_input_index_f088c8ee.js",
+    document.currentScript,
     {},
     {"otherChunks":["output/4c35f_tests_snapshot_basic-tree-shake_require-side-effect_input_f83a22d6._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/require-side-effect/input/index.js [test] (ecmascript)"]}
 ]);

turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/import-named-all/output/b1abf_turbopack-tests_tests_snapshot_basic-tree-shake_import-named-all_input_00b867a0._.js

@@ -1,5 +1,5 @@
 (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
-    "output/4c35f_tests_snapshot_basic-tree-shake_tree-shake-test-1_input_index_acd812ea.js",
+    document.currentScript,
     {},
     {"otherChunks":["output/4c35f_tests_snapshot_basic-tree-shake_tree-shake-test-1_input_index_09a16221.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/tree-shake-test-1/input/index.js [test] (ecmascript)"]}
 ]);

turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/import-named/output/4c35f_tests_snapshot_basic-tree-shake_import-named_input_index_d7a07524.js

@@ -1,4 +1,4 @@
-(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push(["output/4e721_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_46e42b9f.js", {
+(globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([document.currentScript, {
 
 "[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/import.js [test] (ecmascript, async loader)": ((__turbopack_context__) => {
 

turbopack/crates/turbopack-tests/tests/snapshot/basic-tree-shake/import-named/output/b1abf_turbopack-tests_tests_snapshot_basic-tree-shake_import-named_input_f64e7412._.js

@@ -1,5 +1,5 @@
 (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
-    "output/4e721_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_index_5fd91ee7.js",
+    document.currentScript,
     {},
     {"otherChunks":["output/4e721_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_import_46e42b9f.js","output/turbopack_crates_turbopack-tests_tests_snapshot_basic_async_chunk_input_46366300._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/basic/async_chunk/input/index.js [test] (ecmascript)"]}
 ]);