fix: fix cjs module problem

web-infra-dev · Jun 30, 2021 · 1b94018 · 1b94018
1 parent a732e45
commit 1b94018
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/packages/runtime/core/src/module/app.ts b/packages/runtime/core/src/module/app.ts
@@ -86,10 +86,11 @@ export class App {
     this.isHtmlMode = isHtmlMode;
     this.cjsModules = {
       exports: {},
-      module: this.cjsModules,
+      module: null,
       require: (key: string) => context.externals[key],
       [__GARFISH_EXPORTS__]: this.customExports,
     };
+    this.cjsModules.module = this.cjsModules;
     this.customLoader = customLoader;
 
     // Save all the resources to address

diff --git a/packages/runtime/micro-component/src/actuator.ts b/packages/runtime/micro-component/src/actuator.ts
@@ -13,10 +13,11 @@ export class Actuator {
     this.env = {
       ...env,
       exports: {},
-      module: this.env,
+      module: null,
       // Env has a higher priority
       require: (key) => this.env[key] || EXTERNALS[key],
     };
+    this.env.module = this.env;
   }
 
   execScript() {

diff --git a/packages/runtime/micro-component/src/apis.ts b/packages/runtime/micro-component/src/apis.ts
@@ -48,11 +48,11 @@ export function loadComponent(
       } else {
         const data = await loader.loadComponent(url);
         const actuator = new Actuator(data.resourceManager, env);
-        const exports = actuator.execScript().exports;
+        let exports = actuator.execScript().exports;
         if (typeof adapter === 'function') {
-          adapter(exports);
+          exports = adapter(exports);
         }
-        result = exports.default || exports;
+        result = exports;
         cacheComponents[urlWithVersion] = result;
       }
     } catch (err) {
@@ -98,11 +98,11 @@ export function loadComponentSync(
 
     try {
       const actuator = new Actuator(manager, env);
-      const exports = actuator.execScript().exports;
+      let exports = actuator.execScript().exports;
       if (typeof adapter === 'function') {
-        adapter(exports);
+        exports = adapter(exports);
       }
-      result = exports.default || exports;
+      result = exports;
       cacheComponents[urlWithVersion] = result;
     } catch (err) {
       if (typeof error === 'function') {