@modern-js/plugin-garfish 1.3.1 → 1.4.2

package/dist/js/treeshaking/runtime/utils/apps.js

@@ -54,7 +54,7 @@ import { Loadable } from "../loadable"; // type Provider = {
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 
-function getAppInstance(appInfo, manifest) {
+function getAppInstance(options, appInfo, manifest) {
   var locationHref = '';
 
   var MicroApp = /*#__PURE__*/function (_React$Component) {
@@ -84,7 +84,7 @@ function getAppInstance(appInfo, manifest) {
       value: // eslint-disable-next-line @typescript-eslint/naming-convention
       function () {
         var _UNSAFE_componentWillMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-          var _this$props, match, history, setLoadingState, userProps, domId, options, loadAppOptions, appInstance;
+          var _this$props, match, history, setLoadingState, userProps, domId, loadAppOptions, appInstance;
 
           return _regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
@@ -92,7 +92,6 @@ function getAppInstance(appInfo, manifest) {
                 case 0:
                   _this$props = this.props, match = _this$props.match, history = _this$props.history, setLoadingState = _this$props.setLoadingState, userProps = _objectWithoutProperties(_this$props, _excluded);
                   domId = this.state.domId;
-                  options = Garfish.options;
                   loadAppOptions = _objectSpread(_objectSpread({}, appInfo), {}, {
                     domGetter: "#".concat(domId),
                     basename: path.join((options === null || options === void 0 ? void 0 : options.basename) || '/', (match === null || match === void 0 ? void 0 : match.path) || '/'),
@@ -128,21 +127,21 @@ function getAppInstance(appInfo, manifest) {
                   logger("MicroApp Garfish.loadApp \"".concat(appInfo.name, "\""), {
                     loadAppOptions: loadAppOptions
                   });
-                  _context.prev = 6;
-                  _context.next = 9;
+                  _context.prev = 5;
+                  _context.next = 8;
                   return Garfish.loadApp(appInfo.name, loadAppOptions);
 
-                case 9:
+                case 8:
                   appInstance = _context.sent;
 
                   if (appInstance) {
-                    _context.next = 12;
+                    _context.next = 11;
                     break;
                   }
 
                   throw new Error("MicroApp Garfish.loadApp \"".concat(appInfo.name, "\" result is null"));
 
-                case 12:
+                case 11:
                   this.setState({
                     appInstance: appInstance
                   });
@@ -151,7 +150,7 @@ function getAppInstance(appInfo, manifest) {
                   });
 
                   if (!(appInstance.mounted && appInstance.appInfo.cache)) {
-                    _context.next = 20;
+                    _context.next = 19;
                     break;
                   }
 
@@ -159,22 +158,22 @@ function getAppInstance(appInfo, manifest) {
                     appInfo: appInstance.appInfo,
                     appInstance: appInstance
                   });
-                  _context.next = 18;
+                  _context.next = 17;
                   return appInstance === null || appInstance === void 0 ? void 0 : appInstance.show();
 
-                case 18:
-                  _context.next = 23;
+                case 17:
+                  _context.next = 22;
                   break;
 
-                case 20:
+                case 19:
                   logger("MicroApp Garfish.loadApp \"".concat(appInfo.name, "\" mount"), {
                     appInfo: appInstance.appInfo,
                     appInstance: appInstance
                   });
-                  _context.next = 23;
+                  _context.next = 22;
                   return appInstance === null || appInstance === void 0 ? void 0 : appInstance.mount();
 
-                case 23:
+                case 22:
                   history === null || history === void 0 ? void 0 : history.listen(function () {
                     if (locationHref !== history.location.pathname) {
                       locationHref = history.location.pathname;
@@ -183,23 +182,23 @@ function getAppInstance(appInfo, manifest) {
                       logger("MicroApp Garfish.loadApp popstate");
                     }
                   });
-                  _context.next = 29;
+                  _context.next = 28;
                   break;
 
-                case 26:
-                  _context.prev = 26;
-                  _context.t0 = _context["catch"](6);
+                case 25:
+                  _context.prev = 25;
+                  _context.t0 = _context["catch"](5);
                   setLoadingState({
                     isLoading: true,
                     error: _context.t0
                   });
 
-                case 29:
+                case 28:
                 case "end":
                   return _context.stop();
               }
             }
-          }, _callee, this, [[6, 26]]);
+          }, _callee, this, [[5, 25]]);
         }));
 
         function UNSAFE_componentWillMount() {
@@ -270,7 +269,7 @@ export function generateApps(options, manifest) {
 
   var apps = {};
   (_options$apps = options.apps) === null || _options$apps === void 0 ? void 0 : _options$apps.forEach(function (appInfo) {
-    var Component = getAppInstance(appInfo, manifest);
+    var Component = getAppInstance(options, appInfo, manifest);
     appInfo.Component = Component;
     apps[appInfo.name] = Component;
   });

package/dist/types/cli/index.d.ts

@@ -1,9 +1,25 @@
-import { NormalizedConfig } from '@modern-js/core';
+import { createPlugin } from '@modern-js/core';
+export declare const externals: {
+  'react-dom': string;
+  react: string;
+};
+declare type Initializer = Parameters<typeof createPlugin>[0];
+declare type NonVoidPromiseAble<T> = T extends void | Promise<any> ? never : T;
+export declare type LifeCycle = NonVoidPromiseAble<ReturnType<Initializer>>;
+export declare const resolvedConfig: NonNullable<LifeCycle['resolvedConfig']>;
+export declare const initializer: (hooks: {
+  resolvedConfig: LifeCycle['resolvedConfig'];
+  validateSchema: LifeCycle['validateSchema'];
+}, initializerConfig: {
+  runtimePluginName?: string;
+  defaultEnableHtmlEntry?: boolean;
+  defaultExternalBasicLibrary?: boolean;
+}) => Initializer;
 
 declare const _default: import("@modern-js/core").AsyncPlugin<Partial<import("@modern-js/core").Progresses2Threads<{
   config: import("@modern-js/core").ParallelWorkflow<void, unknown>;
   resolvedConfig: import("@modern-js/core").AsyncWaterfall<{
-    resolved: NormalizedConfig;
+    resolved: import("@modern-js/core").NormalizedConfig;
   }>;
   validateSchema: import("@modern-js/core").ParallelWorkflow<void, unknown>;
   prepare: import("@modern-js/core").AsyncWorkflow<void, void>;

package/dist/types/cli/utils.d.ts

@@ -1,2 +1,5 @@
+import { NormalizedConfig } from '@modern-js/core';
 export declare const makeProvider: () => string;
-export declare const makeRenderFunction: (code: string) => string;
+export declare const makeRenderFunction: (code: string) => string;
+export declare function getRuntimeConfig(config: Partial<NormalizedConfig>): any;
+export declare function setRuntimeConfig(config: Partial<NormalizedConfig>, key: string, value: any): undefined;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.3.1",
+  "version": "1.4.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/runtime/index.d.ts",
   "typesVersions": {
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.3.1",
+    "@modern-js/utils": "^1.3.4",
     "@types/debug": "^4.1.7",
     "@types/react-loadable": "^5.5.6",
     "debug": "^4.3.2",
@@ -55,10 +55,10 @@
     "react-loadable": "^5.5.0"
   },
   "devDependencies": {
-    "@modern-js/core": "^1.4.1",
-    "@modern-js/plugin-router": "^1.2.2",
-    "@modern-js/runtime-core": "^1.2.2",
-    "@modern-js/types": "^1.3.1",
+    "@modern-js/core": "^1.4.6",
+    "@modern-js/plugin-router": "^1.2.5",
+    "@modern-js/runtime-core": "^1.2.4",
+    "@modern-js/types": "^1.3.4",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
     "@testing-library/jest-dom": "^5.16.1",
@@ -70,7 +70,6 @@
     "@types/node": "^14",
     "@types/react": "^17",
     "@types/react-dom": "^17",
-    "html-webpack-externals-plugin": "^3.8.0",
     "jest": "^27",
     "jest-fetch-mock": "^3.0.3",
     "react": "^17.0.2",
@@ -80,9 +79,9 @@
     "webpack-chain": "^6.5.1"
   },
   "peerDependencies": {
-    "@modern-js/core": "^1.4.1",
-    "@modern-js/plugin-router": "^1.2.2",
-    "@modern-js/runtime-core": "^1.2.2"
+    "@modern-js/core": "^1.4.6",
+    "@modern-js/plugin-router": "^1.2.5",
+    "@modern-js/runtime-core": "^1.2.4"
   },
   "sideEffects": false,
   "modernConfig": {},

package/tests/cli.test.tsx

@@ -1,29 +1,221 @@
 import '@testing-library/jest-dom';
-import GarfishPlugin from '../src/cli';
-
-// jest.mock('@modern-js/core', () => {
-//   const originalModule = jest.requireActual('@modern-js/core');
-//   return {
-//     __esModule: true,
-//     ...originalModule,
-//     default: jest.fn(() => 'mocked baz'),
-//     useResolvedConfigContext: () => ({
-//       runtime: {
-//         masterApp: {
-//           manifest: {
-//             componentKey: 'test-dynamic-key',
-//           },
-//         },
-//       },
-//       deploy: {
-//         microFrontend: 'dynamicComponentKey',
-//       },
-//     }),
-//   };
-// });
+import { manager, useAppContext } from '@modern-js/core';
+import WebpackChain from 'webpack-chain';
+import GarfishPlugin, { externals, resolvedConfig } from '../src/cli';
+import { getRuntimeConfig, makeRenderFunction, setRuntimeConfig } from '../src/cli/utils';
+
+const mock_config_context = {
+  context: {},
+  get() {
+    return this.context;
+  },
+  set(newContext: any) {
+    Object.assign(this.context, newContext);
+  },
+  recover(newContext: any) {
+    this.context = newContext;
+  }
+};
+
+jest.mock('@modern-js/core', () => {
+  const originalModule = jest.requireActual('@modern-js/core');
+  return {
+    __esModule: true,
+    ...originalModule,
+    useResolvedConfigContext: ()=>{
+      return mock_config_context.get();
+    }
+  };
+});
+
 
 describe('plugin-garfish cli', () => {
-  test('cli garfish plugin', () => {
+  test('cli garfish basename', async () => {
     expect(GarfishPlugin.name).toBe('@modern-js/plugin-garfish');
+    const basename = '/test';
+    const resolveConfig = {
+      resolved: {
+        runtime: {
+          router: {
+            historyOptions: { basename }
+          },
+          masterApp: {}
+        },
+      }
+    };
+    const config = await resolvedConfig(resolveConfig as any);
+    expect(config.resolved.runtime.masterApp.basename).toBe(basename);
+  });
+
+  test('cli makeRender function', ()=>{
+    const code = `
+      const router = (config)=> config;
+      const App = {};
+      const routerConfig = router({...App?.config?.router, ...App?.config?.features?.router});
+      const resultConfig = {
+        routerConfig,
+        renderByProvider: true,
+      };
+    
+      if (IS_BROWSER) {
+        resultConfig.renderByProvider = false;
+      }
+      return resultConfig;
+    `;
+    const generateNewRenderFn = new Function('appInfo', 'IS_BROWSER', '__GARFISH_EXPORTS__', makeRenderFunction(code));
+    
+    // render byGarfish but don't provider appInfo
+    expect(generateNewRenderFn(undefined, true, false)).toBe(null);
+
+    // run alone
+    expect(generateNewRenderFn(undefined, true)).toMatchObject({
+      renderByProvider: false
+    });
+
+    // render ByGarfish and provider appInfo
+    expect(generateNewRenderFn({ basename: '/test' }, true, true)).toMatchObject({
+      renderByProvider: true,
+      routerConfig: {
+        basename: '/test',
+        historyOptions: {
+          basename: '/test'
+        }
+      }
+    });
+  });
+
+  test('cli get runtime config', ()=>{
+    const runtimeConfig = getRuntimeConfig({
+      runtime: {
+        masterApp: {
+          basename: '/test'
+        }
+      }
+    });
+    expect(runtimeConfig).toMatchObject({
+      masterApp: {
+        basename: '/test'
+      }
+    });
+  });
+
+  test('cli get runtime features config', ()=>{
+    const runtimeConfig = getRuntimeConfig({
+      runtime: {
+        masterApp: {
+          basename: '/test'
+        },
+        features: {
+          masterApp: {
+            basename: '/test2'
+          }
+        }
+      }
+    });
+
+    expect(runtimeConfig).toMatchObject({
+      masterApp: {
+        basename: '/test2'
+      }
+    });
+  });
+
+  test('cli set runtime config', ()=>{
+    const runtimeConfig = {
+      runtime: {
+        masterApp: {
+          basename: '/test'
+        }
+      }
+    };
+
+    setRuntimeConfig(runtimeConfig, 'masterApp', true);
+
+    expect(runtimeConfig.runtime.masterApp).toBe(true);
+  });
+
+  test('cli set runtime features config', ()=>{
+    const runtimeConfig = {
+      runtime: {
+        features: {
+          masterApp: {
+            basename: '/test'
+          }
+        }
+      }
+    };
+
+    setRuntimeConfig(runtimeConfig, 'masterApp', true);
+
+    expect(runtimeConfig.runtime.features.masterApp).toBe(true);
+  });
+
+  test('webpack config close external and use js entry', async ()=>{
+    const main = manager.clone().usePlugin(GarfishPlugin);
+    const runner = await main.init();
+    await runner.prepare();
+    const config: any = await runner.config();
+    const webpackConfig = new WebpackChain();
+    mock_config_context.recover({
+      deploy: {
+        microFrontend: {
+          externalBasicLibrary: true,
+          enableHtmlEntry: false,
+        },
+      },
+      server: {
+        port: '8080'
+      }
+    });
+
+    config[0].tools.webpack({}, {
+      chain: webpackConfig,
+      webpack: jest.fn(),
+      env: 'development'
+    });
+
+    const generateConfig = webpackConfig.toConfig();
+    expect(generateConfig).toMatchObject({
+      output: {
+        libraryTarget: 'umd',
+        publicPath: '//localhost:8080/',
+        filename: 'index.js'
+      },
+      externals,
+      optimization: { runtimeChunk: false, splitChunks: { chunks: 'async' } }
+    });
+  })
+
+  test('webpack config default micro config', async ()=>{
+    const main = manager.clone().usePlugin(GarfishPlugin);
+    const runner = await main.init();
+    await runner.prepare();
+    const config: any = await runner.config();
+    const webpackConfig = new WebpackChain();
+
+    mock_config_context.recover({
+      deploy: {
+        microFrontend: true,
+      },
+      server: {
+        port: '8080'
+      }
+    });
+
+    config[0].tools.webpack({}, {
+      chain: webpackConfig,
+      webpack: jest.fn(),
+      env: 'development'
+    });
+
+    const generateConfig = webpackConfig.toConfig();
+    expect(generateConfig).toMatchObject({
+      output: {
+        libraryTarget: 'umd',
+        publicPath: '//localhost:8080/'
+      }
+    });
+    expect(generateConfig.externals).toBeUndefined();
+    expect(generateConfig.output.filename).toBeUndefined();
   });
 });