fix(turbopack): adapat runtime CHUNK_BASE_PATH to original (#62)

Author: fireairforce

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

@@ -21,22 +21,6 @@ declare var TURBOPACK_NEXT_CHUNK_URLS: ChunkUrl[] | undefined
 declare var CHUNK_BASE_PATH: string
 declare var CHUNK_SUFFIX_PATH: string
 
-function normalizeChunkPath(path: string) {
-  if (path.startsWith('/')) {
-    path = path.substring(1)
-  } else if (path.startsWith('./')) {
-    path = path.substring(2)
-  }
-
-  if (!path.endsWith('/')) {
-    path += '/'
-  }
-
-  return path
-}
-
-const NORMALIZED_CHUNK_BASE_PATH = normalizeChunkPath(CHUNK_BASE_PATH)
-
 interface TurbopackBrowserBaseContext<M> extends TurbopackBaseContext<M> {
   R: ResolvePathFromModule
 }
@@ -340,8 +324,8 @@ 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_NEXT_CHUNK_URLS = ${JSON.stringify(chunks.reverse(), null, 2)};
-importScripts(...self.TURBOPACK_NEXT_CHUNK_URLS.map(c => self.TURBOPACK_WORKER_LOCATION + "/" + c).reverse());`
+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)
 }
@@ -360,7 +344,7 @@ function instantiateRuntimeModule(
  * Returns the URL relative to the origin where a chunk can be fetched from.
  */
 function getChunkRelativeUrl(chunkPath: ChunkPath | ChunkListPath): ChunkUrl {
-  return `${NORMALIZED_CHUNK_BASE_PATH}${chunkPath
+  return `${CHUNK_BASE_PATH}${chunkPath
     .split('/')
     .map((p) => encodeURIComponent(p))
     .join('/')}${CHUNK_SUFFIX_PATH}` as ChunkUrl
@@ -379,18 +363,13 @@ function getPathFromScript(
   if (typeof chunkScript === 'string') {
     return chunkScript as ChunkPath | ChunkListPath
   }
-  let chunkUrl =
+  const chunkUrl =
     typeof TURBOPACK_NEXT_CHUNK_URLS !== 'undefined'
       ? TURBOPACK_NEXT_CHUNK_URLS.pop()!
       : chunkScript.getAttribute('src')!
-  if (chunkUrl.startsWith('/')) {
-    chunkUrl = chunkUrl.substring(1)
-  } else if (chunkUrl.startsWith('./')) {
-    chunkUrl = chunkUrl.substring(2)
-  }
   const src = decodeURIComponent(chunkUrl.replace(/[?#].*$/, ''))
-  const path = src.startsWith(NORMALIZED_CHUNK_BASE_PATH)
-    ? src.slice(NORMALIZED_CHUNK_BASE_PATH.length)
+  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/dev-backend-dom.ts

@@ -51,19 +51,15 @@ let DEV_BACKEND: DevRuntimeBackend
           return
         }
 
-        const withoutNormalizedChunkUrl = chunkUrl.replace(
-          NORMALIZED_CHUNK_BASE_PATH,
-          '/'
-        )
-        const decodedChunkUrl = decodeURI(withoutNormalizedChunkUrl)
+        const decodedChunkUrl = decodeURI(chunkUrl)
         const previousLinks = document.querySelectorAll(
-          `link[rel=stylesheet][href="${decodedChunkUrl}"],link[rel=stylesheet][href^="${decodedChunkUrl}?"],link[rel=stylesheet][href="${withoutNormalizedChunkUrl}"],link[rel=stylesheet][href^="${withoutNormalizedChunkUrl}?"]`
+          `link[rel=stylesheet][href="${chunkUrl}"],link[rel=stylesheet][href^="${chunkUrl}?"],link[rel=stylesheet][href="${decodedChunkUrl}"],link[rel=stylesheet][href^="${decodedChunkUrl}?"]`
         )
 
         if (previousLinks.length === 0) {
           reject(
             new Error(
-              `No link element found for chunk ${withoutNormalizedChunkUrl}`
+              `No link element found for chunk ${chunkUrl}`
             )
           )
           return
@@ -80,9 +76,9 @@ let DEV_BACKEND: DevRuntimeBackend
           //
           // Safari has a similar issue, but only if you have a `<link rel=preload ... />` tag
           // pointing to the same URL as the stylesheet: https://bugs.webkit.org/show_bug.cgi?id=187726
-          link.href = `${withoutNormalizedChunkUrl}?ts=${Date.now()}`
+          link.href = `${chunkUrl}?ts=${Date.now()}`
         } else {
-          link.href = withoutNormalizedChunkUrl
+          link.href = chunkUrl
         }
 
         link.onerror = () => {
@@ -119,10 +115,7 @@ let DEV_BACKEND: DevRuntimeBackend
 
 function _eval({ code, url, map }: EcmascriptModuleEntry): ModuleFactory {
   code += `\n\n//# sourceURL=${encodeURI(
-    location.origin +
-      NORMALIZED_CHUNK_BASE_PATH +
-      normalizeChunkPath(url) +
-      CHUNK_SUFFIX_PATH
+    location.origin + CHUNK_BASE_PATH + url + CHUNK_SUFFIX_PATH
   )}`
   if (map) {
     code += `\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,${btoa(