fix: adjust env to externals

web-infra-dev · Jul 6, 2021 · a6d8711 · a6d8711
1 parent b118287
commit a6d8711
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/dev/main/index.ts b/dev/main/index.ts
@@ -24,7 +24,7 @@ GarfishInstance.run({
   // disablePreloadApp: true,
   sandbox: {
     open: true,
-    snapshot: false,
+    snapshot: true,
     modules: [],
   },
 });

diff --git a/dev/react/src/index.js b/dev/react/src/index.js
@@ -5,7 +5,7 @@ import App from './App';
 import { setModuleConfig } from '@garfish/remote-module';
 
 setModuleConfig({
-  env: { React },
+  externals: { React },
 });
 // setModuleAlias({
 //   testModule: 'http://localhost:3000/remoteComponent.js',

diff --git a/packages/runtime/remote-module/README.md b/packages/runtime/remote-module/README.md
@@ -29,7 +29,7 @@ import {
 } from '@garfish/remote-module';
 
 setModuleConfig({
-  env: { React }, // Environment variables required by remoteModules
+  externals: { React }, // Environment variables required by remoteModules
   alias: { Component: 'https://xx.js' },
 });
 
@@ -59,7 +59,7 @@ Other usage
 // Or
 loadModule({
   cache: true, // This will cache the module instance
-  env: { React },
+  externals: { React },
   url: 'https://xx.js',
   error: (err, info, alias) => {
     console.error(err);

diff --git a/packages/runtime/remote-module/src/actuator.ts b/packages/runtime/remote-module/src/actuator.ts
@@ -6,12 +6,12 @@ export class Actuator {
   private manager: ModuleManager;
   public env: Record<string, any>;
 
-  constructor(manager: ModuleManager, env?: Record<string, any>) {
+  constructor(manager: ModuleManager, externals?: Record<string, any>) {
     this.manager = manager;
     this.env = {
       exports: {},
       module: null,
-      require: (key) => (env || {})[key] || moduleConfig.env[key],
+      require: (key) => (externals || {})[key] || moduleConfig.externals[key],
     };
     this.env.module = this.env;
   }

diff --git a/packages/runtime/remote-module/src/apis/loadModule.ts b/packages/runtime/remote-module/src/apis/loadModule.ts
@@ -14,7 +14,7 @@ export function loadModule(
   options: ModuleInfo | string,
 ): Promise<Record<string, any> | null> {
   const info = purifyOptions(options);
-  const { env, cache, version, url: originalUrl, error, adapter } = info;
+  const { cache, version, externals, url: originalUrl, error, adapter } = info;
   const [url, segments] = processAlias(originalUrl);
 
   assert(url, 'Missing url for loading remote module');
@@ -38,7 +38,7 @@ export function loadModule(
         result = getValueInObject(module, segments);
       } else {
         const data = await loader.loadModule(url);
-        const actuator = new Actuator(data.resourceManager, env);
+        const actuator = new Actuator(data.resourceManager, externals);
         let exports = actuator.execScript().exports;
         if (typeof adapter === 'function') {
           exports = adapter(exports);

diff --git a/packages/runtime/remote-module/src/apis/loadModuleSync.ts b/packages/runtime/remote-module/src/apis/loadModuleSync.ts
@@ -27,7 +27,7 @@ export function loadModuleSync(
   options: ModuleInfo | string,
 ): Record<string, any> {
   const info = purifyOptions(options);
-  const { env, cache, version, url: originalUrl, error, adapter } = info;
+  const { cache, version, externals, url: originalUrl, error, adapter } = info;
   const [url, segments] = processAlias(originalUrl);
 
   assert(url, 'Missing url for loading remote module');
@@ -51,7 +51,7 @@ export function loadModuleSync(
     );
 
     try {
-      const actuator = new Actuator(manager, env);
+      const actuator = new Actuator(manager, externals);
       let exports = actuator.execScript().exports;
       if (typeof adapter === 'function') {
         exports = adapter(exports);

diff --git a/packages/runtime/remote-module/src/common.ts b/packages/runtime/remote-module/src/common.ts
@@ -10,7 +10,7 @@ export interface ModuleInfo {
   url: string;
   cache?: boolean;
   version?: string;
-  env?: Record<string, any>;
+  externals?: Record<string, any>;
   error?: (err: Error, info: ModuleInfo, alias: string) => any;
   adapter?: (cjsModule: Record<string, any>) => Record<string, any>;
 }
@@ -24,7 +24,7 @@ export const moduleConfig: ModuleConfig = {
   cache: true, // Default use cache
   error: null,
   adapter: null,
-  env: {
+  externals: {
     loadModule, // Only `loadModule` is provided for use by remote modules
   },
 };
@@ -42,7 +42,7 @@ try {
       currentApp = app;
     }
     if (isObject(externals)) {
-      moduleConfig.env = { ...externals };
+      moduleConfig.externals = { ...externals };
     }
     if (Array.isArray(remoteModulesCode)) {
       resourcesStore = resourcesStore.concat(remoteModulesCode);

diff --git a/packages/runtime/remote-module/src/garfishPlugin.ts b/packages/runtime/remote-module/src/garfishPlugin.ts
@@ -42,7 +42,7 @@ export function GarfishRemoteModulePlugin() {
       version: __VERSION__,
       bootstrap() {
         setModuleConfig({
-          env: Garfish.externals,
+          externals: Garfish.externals,
         });
       },
     };