ESM external should give a namespace object

vercel · Nov 21, 2023 · 3b02956 · 3b02956
1 parent 45bbec6
commit 3b02956
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
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
@@ -13,7 +13,10 @@ interface RequireContextEntry {
   external: boolean;
 }
 
-type ExternalRequire = (id: ModuleId) => Exports | EsmNamespaceObject;
+type ExternalRequire = (
+  id: ModuleId,
+  esm?: boolean
+) => Exports | EsmNamespaceObject;
 type ExternalImport = (id: ModuleId) => Promise<Exports | EsmNamespaceObject>;
 
 interface TurbopackDevContext extends TurbopackDevBaseContext {

diff --git a/crates/turbopack-ecmascript/src/references/esm/base.rs b/crates/turbopack-ecmascript/src/references/esm/base.rs
@@ -274,7 +274,7 @@ impl CodeGenerateable for EsmAssetReference {
                                 )
                             } else {
                                 quote!(
-                                    "var $name = __turbopack_external_require__($id);" as Stmt,
+                                    "var $name = __turbopack_external_require__($id, true);" as Stmt,
                                     name = Ident::new(ident.clone().into(), DUMMY_SP),
                                     id: Expr = Expr::Lit(request.clone().into())
                                 )

diff --git a/crates/turbopack-ecmascript/src/references/esm/dynamic.rs b/crates/turbopack-ecmascript/src/references/esm/dynamic.rs
@@ -181,7 +181,7 @@ impl CodeGenerateable for EsmAsyncAssetReference {
                         call_expr.callee = Callee::Expr(quote_expr!("Promise.resolve().then"));
                         call_expr.args = vec![
                             ExprOrSpread { spread: None, expr: quote_expr!(
-                                "() => __turbopack_external_require__($arg)",
+                                "() => __turbopack_external_require__($arg, true)",
                                 arg: Expr = expr
                             ) },
                         ];