address review comments

vercel · Aug 1, 2023 · 9b69862 · 9b69862
1 parent 454b883
commit 9b69862
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 25 deletions.
diff --git a/crates/turbopack-ecmascript-runtime/js/src/build/runtime.ts b/crates/turbopack-ecmascript-runtime/js/src/build/runtime.ts
@@ -75,8 +75,7 @@ function loadChunkAsync(source: SourceInfo, chunkPath: string): Promise<void> {
 }
 
 function loadWebAssembly(chunkPath: ChunkPath, imports: WebAssembly.Imports) {
-  const resolved = require.resolve(path.resolve(RUNTIME_ROOT, chunkPath));
-  delete require.cache[resolved];
+  const resolved = path.resolve(RUNTIME_ROOT, chunkPath);
 
   return loadWebAssemblyFromPath(resolved, imports)
 }

diff --git a/crates/turbopack-ecmascript-runtime/js/src/dev/runtime/base/runtime-base.ts b/crates/turbopack-ecmascript-runtime/js/src/dev/runtime/base/runtime-base.ts
@@ -316,6 +316,8 @@ function instantiateModule(id: ModuleId, source: SourceInfo): Module {
 
   // NOTE(alexkirsz) This can fail when the module encounters a runtime error.
   try {
+    const sourceInfo: SourceInfo = { type: SourceType.Parent, parentId: id };
+
     runModuleExecutionHooks(module, (refresh) => {
       moduleFactory.call(
         module.exports,
@@ -331,8 +333,8 @@ function instantiateModule(id: ModuleId, source: SourceInfo): Module {
           n: exportNamespace.bind(null, module),
           m: module,
           c: moduleCache,
-          l: loadChunk.bind(null, { type: SourceType.Parent, parentId: id }),
-          w: loadWebAssembly.bind(null, { type: SourceType.Parent, parentId: id }),
+          l: loadChunk.bind(null, sourceInfo),
+          w: loadWebAssembly.bind(null, sourceInfo),
           g: globalThis,
           k: refresh,
           __dirname: module.id.replace(/(^|\/)\/+$/, ""),

diff --git a/crates/turbopack-ecmascript-runtime/js/src/dev/runtime/nodejs/runtime-backend-nodejs.ts b/crates/turbopack-ecmascript-runtime/js/src/dev/runtime/nodejs/runtime-backend-nodejs.ts
@@ -41,12 +41,10 @@ function resolveChunkPath(chunkPath: ChunkPath, source: SourceInfo) {
       break;
   }
 
-  const path = require("path");
-  const resolved = require.resolve(
+  const path = require("node:path/posix");
+  return require.resolve(
     "./" + path.relative(path.dirname(fromChunkPath), chunkPath)
   );
-
-  return resolved;
 }
 
 function loadWebAssembly(

diff --git a/...urbopack-tests/tests/snapshot/runtime/default_build_runtime/output/[turbopack]_runtime.js b/...urbopack-tests/tests/snapshot/runtime/default_build_runtime/output/[turbopack]_runtime.js
diff --git a/...pack-tests/tests/snapshot/runtime/default_build_runtime/output/[turbopack]_runtime.js.map b/...pack-tests/tests/snapshot/runtime/default_build_runtime/output/[turbopack]_runtime.js.map
diff --git a/...ut/79fb1_turbopack-tests_tests_snapshot_runtime_default_dev_runtime_input_index_e60ecd.js b/...ut/79fb1_turbopack-tests_tests_snapshot_runtime_default_dev_runtime_input_index_e60ecd.js