try fix edge

vercel · Nov 6, 2024 · 82d0136 · 82d0136
1 parent 9ba7cf7
commit 82d0136
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/packages/next/src/build/webpack/plugins/eval-source-map-dev-tool-plugin.ts b/packages/next/src/build/webpack/plugins/eval-source-map-dev-tool-plugin.ts
@@ -173,7 +173,7 @@ export default class EvalSourceMapDevToolPlugin {
                 {
                   requestShortener: runtimeTemplate.requestShortener,
                   chunkGraph,
-                  hashFunction: compilation.outputOptions.hashFunction,
+                  hashFunction: compilation.outputOptions.hashFunction!,
                 }
               )
             )

diff --git a/turbopack/crates/turbopack-ecmascript-runtime/js/src/shared-node/base-externals-utils.ts b/turbopack/crates/turbopack-ecmascript-runtime/js/src/shared-node/base-externals-utils.ts
@@ -7,51 +7,52 @@
 /// If a fn requires node.js specific behavior, it should be placed in `node-external-utils` instead.
 
 async function externalImport(id: ModuleId) {
-  let raw;
+  let raw
   try {
-    raw = await import(id);
+    raw = await import(id)
   } catch (err) {
     // TODO(alexkirsz) This can happen when a client-side module tries to load
     // an external module we don't provide a shim for (e.g. querystring, url).
     // For now, we fail semi-silently, but in the future this should be a
     // compilation error.
-    throw new Error(`Failed to load external module ${id}: ${err}`);
+    throw new Error(`Failed to load external module ${id}: ${err}`)
   }
 
-  if (raw && raw.__esModule && raw.default && "default" in raw.default) {
-    return interopEsm(raw.default, createNS(raw), true);
+  if (raw && raw.__esModule && raw.default && 'default' in raw.default) {
+    return interopEsm(raw.default, createNS(raw), true)
   }
 
-  return raw;
+  return raw
 }
 
 function externalRequire(
   id: ModuleId,
+  thunk: () => any,
   esm: boolean = false
 ): Exports | EsmNamespaceObject {
-  let raw;
+  let raw
   try {
-    raw = require(id);
+    raw = thunk()
   } catch (err) {
     // TODO(alexkirsz) This can happen when a client-side module tries to load
     // an external module we don't provide a shim for (e.g. querystring, url).
     // For now, we fail semi-silently, but in the future this should be a
     // compilation error.
-    throw new Error(`Failed to load external module ${id}: ${err}`);
+    throw new Error(`Failed to load external module ${id}: ${err}`)
   }
 
   if (!esm || raw.__esModule) {
-    return raw;
+    return raw
   }
 
-  return interopEsm(raw, createNS(raw), true);
+  return interopEsm(raw, createNS(raw), true)
 }
 
 externalRequire.resolve = (
   id: string,
   options?: {
-    paths?: string[];
+    paths?: string[]
   }
 ) => {
-  return require.resolve(id, options);
-};
+  return require.resolve(id, options)
+}
diff --git a/turbopack/crates/turbopack-ecmascript/src/references/pattern_mapping.rs b/turbopack/crates/turbopack-ecmascript/src/references/pattern_mapping.rs
@@ -121,10 +121,16 @@ impl SinglePatternMapping {
             }),
             Self::External(request, ExternalType::CommonJs) => Expr::Call(CallExpr {
                 callee: Callee::Expr(quote_expr!("__turbopack_external_require__")),
-                args: vec![ExprOrSpread {
-                    spread: None,
-                    expr: request.as_str().into(),
-                }],
+                args: vec![
+                    ExprOrSpread {
+                        spread: None,
+                        expr: request.as_str().into(),
+                    },
+                    ExprOrSpread {
+                        spread: None,
+                        expr: quote_expr!("() => require($arg)"),
+                    },
+                ],
                 span: DUMMY_SP,
                 ..Default::default()
             }),
@@ -170,7 +176,7 @@ impl SinglePatternMapping {
                         args: vec![ExprOrSpread {
                             spread: None,
                             expr: quote_expr!(
-                                "() => __turbopack_external_require__($arg, true)",
+                                "() => __turbopack_external_require__($arg, () => require($arg), true)",
                                 arg: Expr = key_expr.into_owned()
                             ),
                         }],
@@ -184,7 +190,7 @@ impl SinglePatternMapping {
                 args: vec![ExprOrSpread {
                     spread: None,
                     expr: quote_expr!(
-                        "() => __turbopack_external_require__($arg, true)",
+                        "() => __turbopack_external_require__($arg, () => require($arg), true)",
                         arg: Expr = key_expr.into_owned()
                     ),
                 }],