@modern-js/plugin-garfish 1.4.4-beta.2 → 1.4.4-beta.3

package/dist/js/modern/runtime/plugin.js

@@ -1,3 +1,4 @@
+import _merge from "lodash/merge";
 const _excluded = ["manifest"];
 
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -10,8 +11,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-// eslint-disable-next-line filenames/match-exported
-import { createPlugin } from '@modern-js/runtime-core';
 import React from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import { logger } from "../util";
@@ -56,83 +55,86 @@ async function initOptions(manifest = {}, options) {
   return _objectSpread(_objectSpread({}, options), {}, {
     apps
   });
-}
-
-const GarfishPlugin = config => {
-  setExternal();
-
-  const {
-    manifest
-  } = config,
-        options = _objectWithoutProperties(config, _excluded);
-
-  logger('createPlugin', {
-    config
-  });
-  const promise = initOptions(manifest, options);
-  return createPlugin(() => ({
-    hoc({
-      App
-    }, next) {
-      class GetMicroFrontendApp extends React.Component {
-        constructor(props) {
-          super(props);
-          this.state = {
-            MApp: () => {
-              logger('MApp init Component Render');
-              return /*#__PURE__*/React.createElement('div');
-            },
-            apps: new Proxy({}, {
-              get() {
-                return () => /*#__PURE__*/React.createElement('div');
-              }
-
-            }),
-            appInfoList: []
-          };
-
-          const load = async () => {
-            const GarfishConfig = await promise;
-            logger('initOptions result', {
-              manifest,
-              GarfishConfig
-            });
-            const MApp = generateMApp(GarfishConfig, manifest);
-            const {
-              appInfoList,
-              apps
-            } = generateApps(GarfishConfig, manifest);
-            logger('generateApps', {
-              MApp,
-              apps,
-              appInfoList
-            });
-            this.setState({
-              MApp,
-              apps,
-              appInfoList
+} // export default GarfishPlugin;
+
+
+export default (defaultConfig => ({
+  name: '@modern-js/garfish-plugin',
+  setup: config => {
+    setExternal();
+
+    const _merge2 = _merge(defaultConfig, config),
+          {
+      manifest
+    } = _merge2,
+          options = _objectWithoutProperties(_merge2, _excluded);
+
+    logger('createPlugin', {
+      config
+    });
+    const promise = initOptions(manifest, options);
+    return {
+      hoc({
+        App
+      }, next) {
+        class GetMicroFrontendApp extends React.Component {
+          constructor(props) {
+            super(props);
+            this.state = {
+              MApp: () => {
+                logger('MApp init Component Render');
+                return /*#__PURE__*/React.createElement('div');
+              },
+              apps: new Proxy({}, {
+                get() {
+                  return () => /*#__PURE__*/React.createElement('div');
+                }
+
+              }),
+              appInfoList: []
+            };
+
+            const load = async () => {
+              const GarfishConfig = await promise;
+              logger('initOptions result', {
+                manifest,
+                GarfishConfig
+              });
+              const MApp = generateMApp(GarfishConfig, manifest);
+              const {
+                appInfoList,
+                apps
+              } = generateApps(GarfishConfig, manifest);
+              logger('generateApps', {
+                MApp,
+                apps,
+                appInfoList
+              });
+              this.setState({
+                MApp,
+                apps,
+                appInfoList
+              });
+            };
+
+            load();
+          }
+
+          render() {
+            logger('GarfishProvider state', this.state);
+            return /*#__PURE__*/_jsx(GarfishProvider, {
+              value: this.state,
+              children: /*#__PURE__*/_jsx(App, _objectSpread(_objectSpread({}, this.props), this.state))
             });
-          };
+          }
 
-          load();
-        }
-
-        render() {
-          logger('GarfishProvider state', this.state);
-          return /*#__PURE__*/_jsx(GarfishProvider, {
-            value: this.state,
-            children: /*#__PURE__*/_jsx(App, _objectSpread(_objectSpread({}, this.props), this.state))
-          });
         }
 
+        return next({
+          App: hoistNonReactStatics(GetMicroFrontendApp, App)
+        });
       }
 
-      return next({
-        App: hoistNonReactStatics(GetMicroFrontendApp, App)
-      });
-    }
-
-  }));
-};
-
-export default GarfishPlugin;
+    };
+  }
+}));

package/dist/js/node/runtime/plugin.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _runtimeCore = require("@modern-js/runtime-core");
+var _merge3 = _interopRequireDefault(require("lodash/merge"));
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -72,84 +72,88 @@ async function initOptions(manifest = {}, options) {
   return _objectSpread(_objectSpread({}, options), {}, {
     apps
   });
-}
-
-const GarfishPlugin = config => {
-  (0, _setExternal.default)();
-
-  const {
-    manifest
-  } = config,
-        options = _objectWithoutProperties(config, _excluded);
-
-  (0, _util.logger)('createPlugin', {
-    config
-  });
-  const promise = initOptions(manifest, options);
-  return (0, _runtimeCore.createPlugin)(() => ({
-    hoc({
-      App
-    }, next) {
-      class GetMicroFrontendApp extends _react.default.Component {
-        constructor(props) {
-          super(props);
-          this.state = {
-            MApp: () => {
-              (0, _util.logger)('MApp init Component Render');
-              return /*#__PURE__*/_react.default.createElement('div');
-            },
-            apps: new Proxy({}, {
-              get() {
-                return () => /*#__PURE__*/_react.default.createElement('div');
-              }
-
-            }),
-            appInfoList: []
-          };
-
-          const load = async () => {
-            const GarfishConfig = await promise;
-            (0, _util.logger)('initOptions result', {
-              manifest,
-              GarfishConfig
-            });
-            const MApp = (0, _MApp.generateMApp)(GarfishConfig, manifest);
-            const {
-              appInfoList,
-              apps
-            } = (0, _apps.generateApps)(GarfishConfig, manifest);
-            (0, _util.logger)('generateApps', {
-              MApp,
-              apps,
-              appInfoList
-            });
-            this.setState({
-              MApp,
-              apps,
-              appInfoList
+} // export default GarfishPlugin;
+
+
+var _default = defaultConfig => ({
+  name: '@modern-js/garfish-plugin',
+  setup: config => {
+    (0, _setExternal.default)();
+
+    const _merge2 = (0, _merge3.default)(defaultConfig, config),
+          {
+      manifest
+    } = _merge2,
+          options = _objectWithoutProperties(_merge2, _excluded);
+
+    (0, _util.logger)('createPlugin', {
+      config
+    });
+    const promise = initOptions(manifest, options);
+    return {
+      hoc({
+        App
+      }, next) {
+        class GetMicroFrontendApp extends _react.default.Component {
+          constructor(props) {
+            super(props);
+            this.state = {
+              MApp: () => {
+                (0, _util.logger)('MApp init Component Render');
+                return /*#__PURE__*/_react.default.createElement('div');
+              },
+              apps: new Proxy({}, {
+                get() {
+                  return () => /*#__PURE__*/_react.default.createElement('div');
+                }
+
+              }),
+              appInfoList: []
+            };
+
+            const load = async () => {
+              const GarfishConfig = await promise;
+              (0, _util.logger)('initOptions result', {
+                manifest,
+                GarfishConfig
+              });
+              const MApp = (0, _MApp.generateMApp)(GarfishConfig, manifest);
+              const {
+                appInfoList,
+                apps
+              } = (0, _apps.generateApps)(GarfishConfig, manifest);
+              (0, _util.logger)('generateApps', {
+                MApp,
+                apps,
+                appInfoList
+              });
+              this.setState({
+                MApp,
+                apps,
+                appInfoList
+              });
+            };
+
+            load();
+          }
+
+          render() {
+            (0, _util.logger)('GarfishProvider state', this.state);
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Context.GarfishProvider, {
+              value: this.state,
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(App, _objectSpread(_objectSpread({}, this.props), this.state))
             });
-          };
+          }
 
-          load();
-        }
-
-        render() {
-          (0, _util.logger)('GarfishProvider state', this.state);
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Context.GarfishProvider, {
-            value: this.state,
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(App, _objectSpread(_objectSpread({}, this.props), this.state))
-          });
         }
 
+        return next({
+          App: (0, _hoistNonReactStatics.default)(GetMicroFrontendApp, App)
+        });
       }
 
-      return next({
-        App: (0, _hoistNonReactStatics.default)(GetMicroFrontendApp, App)
-      });
-    }
-
-  }));
-};
+    };
+  }
+});
 
-var _default = GarfishPlugin;
 exports.default = _default;

package/dist/js/treeshaking/runtime/plugin.js

@@ -1,5 +1,6 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
+import _merge from "lodash/merge";
 var _excluded = ["manifest"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -38,8 +39,6 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-// eslint-disable-next-line filenames/match-exported
-import { createPlugin } from '@modern-js/runtime-core';
 import React from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import { logger } from "../util";
@@ -51,7 +50,8 @@ import { jsx as _jsx } from "react/jsx-runtime";
 
 function initOptions() {
   return _initOptions.apply(this, arguments);
-}
+} // export default GarfishPlugin;
+
 
 function _initOptions() {
   _initOptions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
@@ -120,115 +120,117 @@ function _initOptions() {
   return _initOptions.apply(this, arguments);
 }
 
-var GarfishPlugin = function GarfishPlugin(config) {
-  setExternal();
-
-  var manifest = config.manifest,
-      options = _objectWithoutProperties(config, _excluded);
-
-  logger('createPlugin', {
-    config: config
-  });
-  var promise = initOptions(manifest, options);
-  return createPlugin(function () {
-    return {
-      hoc: function hoc(_ref, next) {
-        var App = _ref.App;
-
-        var GetMicroFrontendApp = /*#__PURE__*/function (_React$Component) {
-          _inherits(GetMicroFrontendApp, _React$Component);
-
-          var _super = _createSuper(GetMicroFrontendApp);
-
-          function GetMicroFrontendApp(props) {
-            var _this;
-
-            _classCallCheck(this, GetMicroFrontendApp);
-
-            _this = _super.call(this, props);
-            _this.state = {
-              MApp: function MApp() {
-                logger('MApp init Component Render');
-                return /*#__PURE__*/React.createElement('div');
-              },
-              apps: new Proxy({}, {
-                get: function get() {
-                  return function () {
-                    return /*#__PURE__*/React.createElement('div');
-                  };
-                }
-              }),
-              appInfoList: []
-            };
-
-            var load = /*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-                var GarfishConfig, MApp, _generateApps, appInfoList, apps;
-
-                return _regeneratorRuntime.wrap(function _callee$(_context) {
-                  while (1) {
-                    switch (_context.prev = _context.next) {
-                      case 0:
-                        _context.next = 2;
-                        return promise;
-
-                      case 2:
-                        GarfishConfig = _context.sent;
-                        logger('initOptions result', {
-                          manifest: manifest,
-                          GarfishConfig: GarfishConfig
-                        });
-                        MApp = generateMApp(GarfishConfig, manifest);
-                        _generateApps = generateApps(GarfishConfig, manifest), appInfoList = _generateApps.appInfoList, apps = _generateApps.apps;
-                        logger('generateApps', {
-                          MApp: MApp,
-                          apps: apps,
-                          appInfoList: appInfoList
-                        });
-
-                        _this.setState({
-                          MApp: MApp,
-                          apps: apps,
-                          appInfoList: appInfoList
-                        });
-
-                      case 8:
-                      case "end":
-                        return _context.stop();
-                    }
+export default (function (defaultConfig) {
+  return {
+    name: '@modern-js/garfish-plugin',
+    setup: function setup(config) {
+      setExternal();
+
+      var _merge2 = _merge(defaultConfig, config),
+          manifest = _merge2.manifest,
+          options = _objectWithoutProperties(_merge2, _excluded);
+
+      logger('createPlugin', {
+        config: config
+      });
+      var promise = initOptions(manifest, options);
+      return {
+        hoc: function hoc(_ref, next) {
+          var App = _ref.App;
+
+          var GetMicroFrontendApp = /*#__PURE__*/function (_React$Component) {
+            _inherits(GetMicroFrontendApp, _React$Component);
+
+            var _super = _createSuper(GetMicroFrontendApp);
+
+            function GetMicroFrontendApp(props) {
+              var _this;
+
+              _classCallCheck(this, GetMicroFrontendApp);
+
+              _this = _super.call(this, props);
+              _this.state = {
+                MApp: function MApp() {
+                  logger('MApp init Component Render');
+                  return /*#__PURE__*/React.createElement('div');
+                },
+                apps: new Proxy({}, {
+                  get: function get() {
+                    return function () {
+                      return /*#__PURE__*/React.createElement('div');
+                    };
                   }
-                }, _callee);
-              }));
-
-              return function load() {
-                return _ref2.apply(this, arguments);
+                }),
+                appInfoList: []
               };
-            }();
-
-            load();
-            return _this;
-          }
-
-          _createClass(GetMicroFrontendApp, [{
-            key: "render",
-            value: function render() {
-              logger('GarfishProvider state', this.state);
-              return /*#__PURE__*/_jsx(GarfishProvider, {
-                value: this.state,
-                children: /*#__PURE__*/_jsx(App, _objectSpread(_objectSpread({}, this.props), this.state))
-              });
+
+              var load = /*#__PURE__*/function () {
+                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+                  var GarfishConfig, MApp, _generateApps, appInfoList, apps;
+
+                  return _regeneratorRuntime.wrap(function _callee$(_context) {
+                    while (1) {
+                      switch (_context.prev = _context.next) {
+                        case 0:
+                          _context.next = 2;
+                          return promise;
+
+                        case 2:
+                          GarfishConfig = _context.sent;
+                          logger('initOptions result', {
+                            manifest: manifest,
+                            GarfishConfig: GarfishConfig
+                          });
+                          MApp = generateMApp(GarfishConfig, manifest);
+                          _generateApps = generateApps(GarfishConfig, manifest), appInfoList = _generateApps.appInfoList, apps = _generateApps.apps;
+                          logger('generateApps', {
+                            MApp: MApp,
+                            apps: apps,
+                            appInfoList: appInfoList
+                          });
+
+                          _this.setState({
+                            MApp: MApp,
+                            apps: apps,
+                            appInfoList: appInfoList
+                          });
+
+                        case 8:
+                        case "end":
+                          return _context.stop();
+                      }
+                    }
+                  }, _callee);
+                }));
+
+                return function load() {
+                  return _ref2.apply(this, arguments);
+                };
+              }();
+
+              load();
+              return _this;
             }
-          }]);
 
-          return GetMicroFrontendApp;
-        }(React.Component);
+            _createClass(GetMicroFrontendApp, [{
+              key: "render",
+              value: function render() {
+                logger('GarfishProvider state', this.state);
+                return /*#__PURE__*/_jsx(GarfishProvider, {
+                  value: this.state,
+                  children: /*#__PURE__*/_jsx(App, _objectSpread(_objectSpread({}, this.props), this.state))
+                });
+              }
+            }]);
 
-        return next({
-          App: hoistNonReactStatics(GetMicroFrontendApp, App)
-        });
-      }
-    };
-  });
-};
+            return GetMicroFrontendApp;
+          }(React.Component);
 
-export default GarfishPlugin;
+          return next({
+            App: hoistNonReactStatics(GetMicroFrontendApp, App)
+          });
+        }
+      };
+    }
+  };
+});

package/dist/types/runtime/plugin.d.ts

@@ -1,29 +1,6 @@
-import React from 'react';
+import type { Plugin } from '@modern-js/runtime-core';
 import { Config } from './useModuleApps';
-declare const GarfishPlugin: (config: Config) => import("@modern-js/core").Plugin<{
-  hoc: import("@modern-js/runtime-core").Pipeline<{
-    App: React.ComponentType<any>;
-  }, React.ComponentType<any>>;
-  provide: import("@modern-js/runtime-core").Pipeline<{
-    element: JSX.Element;
-    readonly props: import("@modern-js/runtime-core/src/plugin").AppProps;
-    readonly context: import("@modern-js/runtime-core").RuntimeContext;
-  }, JSX.Element>;
-  client: import("@modern-js/runtime-core").AsyncPipeline<{
-    App: React.ComponentType<any>;
-    readonly context?: import("@modern-js/runtime-core").RuntimeContext | undefined;
-    rootElement: HTMLElement;
-  }, void>;
-  server: import("@modern-js/runtime-core").AsyncPipeline<{
-    App: React.ComponentType<any>;
-    readonly context?: import("@modern-js/runtime-core").RuntimeContext | undefined;
-  }, string>;
-  init: import("@modern-js/runtime-core").AsyncPipeline<{
-    context: import("@modern-js/runtime-core").RuntimeContext;
-  }, unknown>;
-  pickContext: import("@modern-js/runtime-core").Pipeline<{
-    context: import("@modern-js/runtime-core").RuntimeContext;
-    pickedContext: import("@modern-js/runtime-core").TRuntimeContext;
-  }, import("@modern-js/runtime-core").TRuntimeContext>;
-}, Record<string, never>>;
-export default GarfishPlugin;
+
+declare const _default: (defaultConfig: Partial<Config>) => Plugin;
+
+export default _default;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.4-beta.2",
+  "version": "1.4.4-beta.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/runtime/index.d.ts",
   "typesVersions": {
@@ -52,6 +52,7 @@
     "debug": "^4.3.2",
     "garfish": "^1.3.3",
     "hoist-non-react-statics": "^3.3.2",
+    "lodash": "^4.17.21",
     "react-loadable": "^5.5.0"
   },
   "devDependencies": {
@@ -67,6 +68,7 @@
     "@testing-library/user-event": "^13.5.0",
     "@types/hoist-non-react-statics": "^3.3.1",
     "@types/jest": "^26.0.24",
+    "@types/lodash": "^4.14.181",
     "@types/node": "^14",
     "@types/react": "^17",
     "@types/react-dom": "^17",

package/tests/__snapshots__/cli.test.tsx.snap

@@ -1,5 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`plugin-garfish cli cli addRuntimeExports 1`] = `
+Array [
+  "export { default as garfish, default as masterApp } from '@modern-js/test/plugin-garfish'",
+  "export * from '@modern-js/test/plugin-garfish'",
+]
+`;
+
 exports[`plugin-garfish cli cli get runtime config 1`] = `
 Object {
   "masterApp": Object {

package/tests/cli.test.tsx

@@ -1,9 +1,24 @@
 import '@testing-library/jest-dom';
-import { manager } from '@modern-js/core';
+import { Hooks, manager, ToRunners } from '@modern-js/core';
 import WebpackChain from 'webpack-chain';
 import GarfishPlugin, { externals } from '../src/cli';
 import { getRuntimeConfig, makeRenderFunction, setRuntimeConfig } from '../src/cli/utils';
 
+const addExportList = [];
+jest.mock('@modern-js/utils', () => {
+  const originalModule = jest.requireActual('@modern-js/utils');
+  return {
+    __esModule: true,
+    ...originalModule,
+    createRuntimeExportsUtils: ()=>({
+      addExport: (val: any)=> {
+        addExportList.push(val);
+      },
+      getPath: ()=> 'test',
+    }),
+  }
+});
+
 describe('plugin-garfish cli', () => {
   test('cli garfish basename', async () => {
     expect(GarfishPlugin().name).toBe('@modern-js/plugin-garfish');
@@ -21,7 +36,7 @@ describe('plugin-garfish cli', () => {
         },
       }
     } as any);
-    
+
     expect(configHistoryOptions.resolved.runtime.masterApp.basename).toBe('/test');
 
     const configHistory: any = await runner.resolvedConfig({
@@ -34,7 +49,7 @@ describe('plugin-garfish cli', () => {
         },
       }
     } as any);
-    
+
     expect(configHistory.resolved.runtime.masterApp.basename).toBe('/test2');
   });
 
@@ -202,4 +217,23 @@ describe('plugin-garfish cli', () => {
     expect(generateConfig.externals).toBeUndefined();
     expect(generateConfig.output.filename).toBeUndefined();
   });
+
+  test('cli addRuntimeExports', async ()=>{
+    const resolveConfig: any = {};
+    const mfPackagePath = '@modern-js/test/plugin-garfish';
+    const plugin = GarfishPlugin({
+      mfPackagePath,
+    });
+
+    const lifecycle = await plugin.setup({
+      useResolvedConfigContext: () => resolveConfig,
+      useAppContext: ()=>({
+        internalDirectory: 'test'
+      }),
+    } as any);
+    
+    lifecycle && lifecycle.config();
+    lifecycle && lifecycle.addRuntimeExports()
+    expect(addExportList).toMatchSnapshot();
+  });
 });