provide chunk path to WebWorkers, which doesn't support document.currentScript

Author: sokra

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

@@ -39,6 +39,9 @@ pub enum CurrentChunkMethod {
     DocumentCurrentScript,
 }
 
+pub const CURRENT_CHUNK_METHOD_DOCUMENT_CURRENT_SCRIPT_EXPR: &str =
+    "typeof document === \"object\" ? document.currentScript : undefined";
+
 pub struct BrowserChunkingContextBuilder {
     chunking_context: BrowserChunkingContext,
 }

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

@@ -20,7 +20,10 @@ use super::{
     chunk::EcmascriptBrowserChunk, content_entry::EcmascriptBrowserChunkContentEntries,
     merged::merger::EcmascriptBrowserChunkContentMerger, version::EcmascriptBrowserChunkVersion,
 };
-use crate::{chunking_context::CurrentChunkMethod, BrowserChunkingContext};
+use crate::{
+    chunking_context::{CurrentChunkMethod, CURRENT_CHUNK_METHOD_DOCUMENT_CURRENT_SCRIPT_EXPR},
+    BrowserChunkingContext,
+};
 
 #[turbo_tasks::value(serialization = "none")]
 pub struct EcmascriptBrowserChunkContent {
@@ -90,7 +93,9 @@ impl EcmascriptBrowserChunkContent {
                 };
                 Either::Left(StringifyJs(chunk_server_path))
             }
-            CurrentChunkMethod::DocumentCurrentScript => Either::Right("document.currentScript"),
+            CurrentChunkMethod::DocumentCurrentScript => {
+                Either::Right(CURRENT_CHUNK_METHOD_DOCUMENT_CURRENT_SCRIPT_EXPR)
+            }
         };
         let mut code = CodeBuilder::new(source_maps);
 

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

@@ -27,7 +27,10 @@ use turbopack_ecmascript::{
 };
 use turbopack_ecmascript_runtime::RuntimeType;
 
-use crate::{chunking_context::CurrentChunkMethod, BrowserChunkingContext};
+use crate::{
+    chunking_context::{CurrentChunkMethod, CURRENT_CHUNK_METHOD_DOCUMENT_CURRENT_SCRIPT_EXPR},
+    BrowserChunkingContext,
+};
 
 /// An Ecmascript chunk that:
 /// * Contains the Turbopack browser runtime code; and
@@ -98,7 +101,9 @@ impl EcmascriptBrowserEvaluateChunk {
                 };
                 Either::Left(StringifyJs(chunk_server_path))
             }
-            CurrentChunkMethod::DocumentCurrentScript => Either::Right("document.currentScript"),
+            CurrentChunkMethod::DocumentCurrentScript => {
+                Either::Right(CURRENT_CHUNK_METHOD_DOCUMENT_CURRENT_SCRIPT_EXPR)
+            }
         };
 
         let other_chunks_data = self.chunks_data().await?;

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

@@ -25,7 +25,9 @@ use super::{
     update::update_chunk_list,
     version::EcmascriptDevChunkListVersion,
 };
-use crate::chunking_context::CurrentChunkMethod;
+use crate::chunking_context::{
+    CurrentChunkMethod, CURRENT_CHUNK_METHOD_DOCUMENT_CURRENT_SCRIPT_EXPR,
+};
 
 #[derive(Clone, Debug, Serialize, Deserialize, TraceRawVcs, PartialEq, Eq, NonLocalValue)]
 enum CurrentChunkMethodWithData {
@@ -141,7 +143,7 @@ impl EcmascriptDevChunkListContent {
         let script_or_path = match &this.current_chunk_method {
             CurrentChunkMethodWithData::StringLiteral(path) => Either::Left(StringifyJs(path)),
             CurrentChunkMethodWithData::DocumentCurrentScript => {
-                Either::Right("document.currentScript")
+                Either::Right(CURRENT_CHUNK_METHOD_DOCUMENT_CURRENT_SCRIPT_EXPR)
             }
         };
 
@@ -153,10 +155,6 @@ impl EcmascriptDevChunkListContent {
         writedoc!(
             code,
             r#"
-                (globalThis.TURBOPACK = globalThis.TURBOPACK || []).push([
-                    {script_or_path},
-                    {{}},
-                ]);
                 (globalThis.TURBOPACK_CHUNK_LISTS = globalThis.TURBOPACK_CHUNK_LISTS || []).push({{
                     script: {script_or_path},
                     chunks: {:#},

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

@@ -20,10 +20,6 @@ const devModuleCache: ModuleCache<HotModule> = Object.create(null);
 type RefreshRuntimeGlobals =
   import("@next/react-refresh-utils/dist/runtime").RefreshRuntimeGlobals;
 
-// Workers are loaded via blob object urls and aren't relative to the main context, this gets
-// prefixed to chunk urls in the worker.
-// declare var TURBOPACK_WORKER_LOCATION: string;
-// declare var CHUNK_BASE_PATH: string;
 declare var $RefreshHelpers$: RefreshRuntimeGlobals["$RefreshHelpers$"];
 declare var $RefreshReg$: RefreshRuntimeGlobals["$RefreshReg$"];
 declare var $RefreshSig$: RefreshRuntimeGlobals["$RefreshSig$"];
@@ -1085,6 +1081,8 @@ function registerChunkList(
 ) {
   const chunkListScript = chunkList.script;
   const chunkListPath = getPathFromScript(chunkListScript);
+  // The "chunk" is also registered to finish the loading in the backend
+  BACKEND.registerChunk(chunkListPath as string as ChunkPath);
   chunkUpdateProvider.push([
     chunkListPath,
     handleApply.bind(null, chunkListPath),

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

@@ -11,9 +11,17 @@
 /// <reference path="../base/globals.d.ts" />
 /// <reference path="../../../shared/runtime-utils.ts" />
 
+// Used in WebWorkers to tell the runtime about the chunk base path
 declare var TURBOPACK_WORKER_LOCATION: string;
+// Used in WebWorkers to tell the runtime about the current chunk url since it can't be detected via document.currentScript
+// Note it's stored in reversed order to use push and pop
+declare var TURBOPACK_NEXT_CHUNK_URLS: ChunkUrl[] | undefined;
+
+// Injected by rust code
 declare var CHUNK_BASE_PATH: string;
 declare var CHUNK_SUFFIX_PATH: string;
+
+// Provided by build or dev base
 declare function instantiateModule(id: ModuleId, source: SourceInfo): Module;
 
 type RuntimeParams = {
@@ -245,7 +253,9 @@ function resolveAbsolutePath(modulePath?: string): string {
 }
 
 function getWorkerBlobURL(chunks: ChunkPath[]): string {
-  let bootstrap = `self.TURBOPACK_WORKER_LOCATION = ${JSON.stringify(location.origin)};importScripts(${chunks.map(c => (`self.TURBOPACK_WORKER_LOCATION + ${JSON.stringify(getChunkRelativeUrl(c))}`)).join(", ")});`;
+  let bootstrap = `self.TURBOPACK_WORKER_LOCATION = ${JSON.stringify(location.origin)};
+self.TURBOPACK_NEXT_CHUNK_URLS = ${JSON.stringify(chunks.reverse().map(getChunkRelativeUrl), null, 2)};
+importScripts(...self.TURBOPACK_NEXT_CHUNK_URLS.map(c => self.TURBOPACK_WORKER_LOCATION + c).reverse());`;
   let blob = new Blob([bootstrap], { type: "text/javascript" });
   return URL.createObjectURL(blob);
 }
@@ -313,7 +323,10 @@ function getPathFromScript(chunkScript: ChunkPath | ChunkListPath | ChunkScript
   if (typeof chunkScript === "string") {
     return chunkScript as ChunkPath | ChunkListPath;
   }
-  const src = decodeURIComponent(chunkScript.getAttribute("src")!);
+  const chunkUrl = typeof TURBOPACK_NEXT_CHUNK_URLS !== "undefined"
+    ? TURBOPACK_NEXT_CHUNK_URLS.pop()!
+    : chunkScript.getAttribute("src")!;
+  const src = decodeURIComponent(chunkUrl);
   const path = src.startsWith(CHUNK_BASE_PATH) ? src.slice(CHUNK_BASE_PATH.length) : src;
   return path as ChunkPath | ChunkListPath;
 }

turbopack/crates/turbopack-ecmascript-runtime/js/src/browser/runtime/dom/runtime-backend-dom.ts

@@ -151,6 +151,7 @@ const chunkResolvers: Map<ChunkUrl, ChunkResolver> = new Map();
       if (isCss(chunkUrl)) {
         // ignore
       } else if (isJs(chunkUrl)) {
+        self.TURBOPACK_NEXT_CHUNK_URLS!.push(chunkUrl);
         importScripts(TURBOPACK_WORKER_LOCATION + chunkUrl);
       } else {
         throw new Error(`can't infer type of chunk from URL ${chunkUrl} in worker`);