fix WebWorkers

Author: sokra

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

@@ -13,13 +13,15 @@
 
 // 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 chunk suffix
+declare var TURBOPACK_CHUNK_SUFFIX: 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
+declare var CHUNK_SUFFIX: string
 
 interface TurbopackBrowserBaseContext<M> extends TurbopackBaseContext<M> {
   R: ResolvePathFromModule
@@ -322,8 +324,9 @@ function getWorkerBlobURL(chunks: ChunkPath[]): string {
   // It is important to reverse the array so when bootstrapping we can infer what chunk is being
   // evaluated by poping urls off of this array.  See `getPathFromScript`
   let bootstrap = `self.TURBOPACK_WORKER_LOCATION = ${JSON.stringify(location.origin)};
+self.TURBOPACK_CHUNK_SUFFIX = ${JSON.stringify(CHUNK_SUFFIX)};
 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());`
+importScripts(...self.TURBOPACK_NEXT_CHUNK_URLS.map(c => self.TURBOPACK_WORKER_LOCATION + c + self.TURBOPACK_CHUNK_SUFFIX).reverse());`
   let blob = new Blob([bootstrap], { type: 'text/javascript' })
   return URL.createObjectURL(blob)
 }
@@ -345,7 +348,7 @@ function getChunkRelativeUrl(chunkPath: ChunkPath | ChunkListPath): ChunkUrl {
   return `${CHUNK_BASE_PATH}${chunkPath
     .split('/')
     .map((p) => encodeURIComponent(p))
-    .join('/')}${CHUNK_SUFFIX_PATH}` as ChunkUrl
+    .join('/')}${CHUNK_SUFFIX}` as ChunkUrl
 }
 
 /**

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

@@ -111,7 +111,7 @@ let DEV_BACKEND: DevRuntimeBackend
 
 function _eval({ code, url, map }: EcmascriptModuleEntry): ModuleFactory {
   code += `\n\n//# sourceURL=${encodeURI(
-    location.origin + CHUNK_BASE_PATH + url + CHUNK_SUFFIX_PATH
+    location.origin + CHUNK_BASE_PATH + url + CHUNK_SUFFIX
   )}`
   if (map) {
     code += `\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,${btoa(

turbopack/crates/turbopack-ecmascript-runtime/src/browser_runtime.rs

@@ -106,15 +106,15 @@ pub async fn get_browser_runtime_code(
             writedoc!(
                 code,
                 r#"
-                    const CHUNK_SUFFIX_PATH = "";
+                    const CHUNK_SUFFIX = "";
                 "#
             )?;
         }
         ChunkSuffix::Constant(suffix) => {
             writedoc!(
                 code,
                 r#"
-                    const CHUNK_SUFFIX_PATH = {};
+                    const CHUNK_SUFFIX = {};
                 "#,
                 StringifyJs(suffix.as_str())
             )?;
@@ -123,7 +123,7 @@ pub async fn get_browser_runtime_code(
             writedoc!(
                 code,
                 r#"
-                    const CHUNK_SUFFIX_PATH = document?.currentScript?.getAttribute?.('src')?.replace(/^(.*(?=\?)|^.*$)/, "") || "";
+                    const CHUNK_SUFFIX = (self.TURBOPACK_CHUNK_SUFFIX ?? document?.currentScript?.getAttribute?.('src')?.replace(/^(.*(?=\?)|^.*$)/, "")) || "";
                 "#
             )?;
         }