@modern-js/plugin-garfish 1.4.2 → 1.4.3

package/dist/js/node/cli/index.js

@@ -3,14 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.resolvedConfig = exports.initializer = exports.externals = exports.default = void 0;
+exports.externals = exports.default = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _core = require("@modern-js/core");
-
 var _util = require("../util");
 
 var _utils2 = require("./utils");
@@ -29,259 +27,245 @@ const externals = {
 };
 exports.externals = externals;
 
-const resolvedConfig = async config => {
-  const {
-    resolved
-  } = config;
-  const {
-    masterApp,
-    router
-  } = (0, _utils2.getRuntimeConfig)(resolved);
-  const nConfig = {
-    resolved: _objectSpread({}, resolved)
-  };
-
-  if (masterApp) {
-    var _router$historyOption;
-
-    // basename does not exist use router's basename
-    (0, _utils2.setRuntimeConfig)(nConfig.resolved, 'masterApp', Object.assign(typeof masterApp === 'object' ? _objectSpread({}, masterApp) : {}, {
-      basename: (router === null || router === void 0 ? void 0 : (_router$historyOption = router.historyOptions) === null || _router$historyOption === void 0 ? void 0 : _router$historyOption.basename) || '/'
-    }));
-  }
+var _default = ({
+  runtimePluginName: _runtimePluginName = '@modern-js/runtime/plugins'
+} = {}) => ({
+  name: '@modern-js/plugin-garfish',
+  setup: ({
+    useAppContext,
+    useResolvedConfigContext
+  }) => {
+    let pluginsExportsUtils;
+    let runtimeExportsUtils;
+    return {
+      validateSchema() {
+        return _utils.PLUGIN_SCHEMAS['@modern-js/plugin-garfish'];
+      },
+
+      resolvedConfig: async config => {
+        const {
+          resolved
+        } = config;
+        const {
+          masterApp,
+          router
+        } = (0, _utils2.getRuntimeConfig)(resolved);
+        const nConfig = {
+          resolved: _objectSpread({}, resolved)
+        };
 
-  (0, _util.logger)(`resolvedConfig`, {
-    runtime: nConfig.resolved.runtime,
-    deploy: nConfig.resolved.deploy,
-    server: nConfig.resolved.server
-  });
-  return nConfig;
-};
+        if (masterApp) {
+          var _router$historyOption;
 
-exports.resolvedConfig = resolvedConfig;
-
-const initializer = ( // eslint-disable-next-line @typescript-eslint/no-shadow
-{
-  resolvedConfig,
-  validateSchema
-}, {
-  runtimePluginName: _runtimePluginName = '@modern-js/runtime/plugins',
-  defaultEnableHtmlEntry: _defaultEnableHtmlEntry = true,
-  defaultExternalBasicLibrary: _defaultExternalBasicLibrary = false
-}) => () => {
-  let pluginsExportsUtils;
-  let runtimeExportsUtils;
-  return {
-    validateSchema,
-    resolvedConfig,
-
-    config() {
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      const config = (0, _core.useAppContext)();
-      pluginsExportsUtils = (0, _utils.createRuntimeExportsUtils)(config.internalDirectory, 'plugins');
-      runtimeExportsUtils = (0, _utils.createRuntimeExportsUtils)(config.internalDirectory, 'index');
-      return {
-        source: {
-          alias: {
-            '@modern-js/runtime/plugins': pluginsExportsUtils.getPath()
-          }
-        },
-        tools: {
-          webpack: (webpackConfig, {
-            chain,
-            webpack,
-            env: _env = process.env.NODE_ENV || 'development'
-          }) => {
-            var _resolveOptions$deplo, _resolveWebpackConfig;
+          // basename does not exist use router's basename
+          (0, _utils2.setRuntimeConfig)(nConfig.resolved, 'masterApp', Object.assign(typeof masterApp === 'object' ? _objectSpread({}, masterApp) : {}, {
+            basename: (router === null || router === void 0 ? void 0 : (_router$historyOption = router.historyOptions) === null || _router$historyOption === void 0 ? void 0 : _router$historyOption.basename) || (router === null || router === void 0 ? void 0 : router.basename) || '/'
+          }));
+        }
 
-            // eslint-disable-next-line react-hooks/rules-of-hooks
-            const resolveOptions = (0, _core.useResolvedConfigContext)();
+        (0, _util.logger)(`resolvedConfig`, {
+          runtime: nConfig.resolved.runtime,
+          deploy: nConfig.resolved.deploy,
+          server: nConfig.resolved.server
+        });
+        return nConfig;
+      },
 
-            if (resolveOptions !== null && resolveOptions !== void 0 && (_resolveOptions$deplo = resolveOptions.deploy) !== null && _resolveOptions$deplo !== void 0 && _resolveOptions$deplo.microFrontend) {
-              var _resolveOptions$serve, _resolveOptions$deplo2, _resolveOptions$deplo3;
+      config() {
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        const config = useAppContext(); // eslint-disable-next-line react-hooks/rules-of-hooks
 
-              chain.output.libraryTarget('umd');
+        const resolveOptions = useResolvedConfigContext();
+        pluginsExportsUtils = (0, _utils.createRuntimeExportsUtils)(config.internalDirectory, 'plugins');
+        runtimeExportsUtils = (0, _utils.createRuntimeExportsUtils)(config.internalDirectory, 'index');
+        return {
+          source: {
+            alias: {
+              '@modern-js/runtime/plugins': pluginsExportsUtils.getPath()
+            }
+          },
+          tools: {
+            webpack: (webpackConfig, {
+              chain,
+              webpack,
+              env: _env = process.env.NODE_ENV || 'development'
+            }) => {
+              var _resolveOptions$deplo, _resolveWebpackConfig;
+
+              if (resolveOptions !== null && resolveOptions !== void 0 && (_resolveOptions$deplo = resolveOptions.deploy) !== null && _resolveOptions$deplo !== void 0 && _resolveOptions$deplo.microFrontend) {
+                var _resolveOptions$serve, _resolveOptions$deplo2, _resolveOptions$deplo3;
+
+                chain.output.libraryTarget('umd');
+                chain.devServer.headers({
+                  'Access-Control-Allow-Origin': '*'
+                });
 
-              if (resolveOptions !== null && resolveOptions !== void 0 && (_resolveOptions$serve = resolveOptions.server) !== null && _resolveOptions$serve !== void 0 && _resolveOptions$serve.port) {
-                chain.output.publicPath(_env === 'development' ? `//localhost:${resolveOptions.server.port}/` : webpackConfig.output.publicPath);
-              } // add comments avoid sourcemap abnormal
+                if (resolveOptions !== null && resolveOptions !== void 0 && (_resolveOptions$serve = resolveOptions.server) !== null && _resolveOptions$serve !== void 0 && _resolveOptions$serve.port) {
+                  chain.output.publicPath(_env === 'development' ? `//localhost:${resolveOptions.server.port}/` : webpackConfig.output.publicPath);
+                } // add comments avoid sourcemap abnormal
 
 
-              if (webpack.BannerPlugin) {
-                chain.plugin('banner').use(webpack.BannerPlugin, [{
-                  banner: 'Micro front-end'
-                }]);
-              }
+                if (webpack.BannerPlugin) {
+                  chain.plugin('banner').use(webpack.BannerPlugin, [{
+                    banner: 'Micro front-end'
+                  }]);
+                }
 
-              const {
-                enableHtmlEntry = _defaultEnableHtmlEntry,
-                externalBasicLibrary = _defaultExternalBasicLibrary
-              } = typeof (resolveOptions === null || resolveOptions === void 0 ? void 0 : (_resolveOptions$deplo2 = resolveOptions.deploy) === null || _resolveOptions$deplo2 === void 0 ? void 0 : _resolveOptions$deplo2.microFrontend) === 'object' ? resolveOptions === null || resolveOptions === void 0 ? void 0 : (_resolveOptions$deplo3 = resolveOptions.deploy) === null || _resolveOptions$deplo3 === void 0 ? void 0 : _resolveOptions$deplo3.microFrontend : {}; // external
+                const {
+                  enableHtmlEntry = true,
+                  externalBasicLibrary = false
+                } = typeof (resolveOptions === null || resolveOptions === void 0 ? void 0 : (_resolveOptions$deplo2 = resolveOptions.deploy) === null || _resolveOptions$deplo2 === void 0 ? void 0 : _resolveOptions$deplo2.microFrontend) === 'object' ? resolveOptions === null || resolveOptions === void 0 ? void 0 : (_resolveOptions$deplo3 = resolveOptions.deploy) === null || _resolveOptions$deplo3 === void 0 ? void 0 : _resolveOptions$deplo3.microFrontend : {}; // external
 
-              if (externalBasicLibrary) {
-                chain.externals(externals);
-              } // use html mode
+                if (externalBasicLibrary) {
+                  chain.externals(externals);
+                } // use html mode
 
 
-              if (!enableHtmlEntry) {
-                chain.output.filename('index.js');
-                chain.plugins.delete('html-main');
-                chain.optimization.runtimeChunk(false);
-                chain.optimization.splitChunks({
-                  chunks: 'async'
-                });
+                if (!enableHtmlEntry) {
+                  chain.output.filename('index.js');
+                  chain.plugins.delete('html-main');
+                  chain.optimization.runtimeChunk(false);
+                  chain.optimization.splitChunks({
+                    chunks: 'async'
+                  });
+                }
               }
-            }
 
-            const resolveWebpackConfig = chain.toConfig();
-            (0, _util.logger)('webpackConfig', {
-              output: resolveWebpackConfig.output,
-              externals: resolveWebpackConfig.externals,
-              env: _env,
-              alias: (_resolveWebpackConfig = resolveWebpackConfig.resolve) === null || _resolveWebpackConfig === void 0 ? void 0 : _resolveWebpackConfig.alias
-            });
+              const resolveWebpackConfig = chain.toConfig();
+              (0, _util.logger)('webpackConfig', {
+                output: resolveWebpackConfig.output,
+                externals: resolveWebpackConfig.externals,
+                env: _env,
+                alias: (_resolveWebpackConfig = resolveWebpackConfig.resolve) === null || _resolveWebpackConfig === void 0 ? void 0 : _resolveWebpackConfig.alias
+              });
+            }
           }
+        };
+      },
+
+      addRuntimeExports() {
+        const mfPackage = _path.default.resolve(__dirname, '../../../../');
+
+        const addExportStatement = `export { default as garfish, default as masterApp } from '${mfPackage}'`;
+        (0, _util.logger)('exportStatement', addExportStatement);
+        pluginsExportsUtils.addExport(addExportStatement);
+        runtimeExportsUtils.addExport(`export * from '${mfPackage}'`);
+      },
+
+      modifyEntryImports({
+        entrypoint,
+        imports
+      }) {
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        const config = useResolvedConfigContext();
+        const {
+          masterApp
+        } = (0, _utils2.getRuntimeConfig)(config);
+
+        if (masterApp) {
+          imports.push({
+            value: _runtimePluginName,
+            specifiers: [{
+              imported: 'garfish'
+            }]
+          });
+          imports.push({
+            value: _runtimePluginName,
+            specifiers: [{
+              imported: 'masterApp'
+            }]
+          });
         }
-      };
-    },
-
-    addRuntimeExports() {
-      const mfPackage = _path.default.resolve(__dirname, '../../../../');
-
-      const addExportStatement = `export { default as garfish, default as masterApp } from '${mfPackage}'`;
-      (0, _util.logger)('exportStatement', addExportStatement);
-      pluginsExportsUtils.addExport(addExportStatement);
-      runtimeExportsUtils.addExport(`export * from '${mfPackage}'`);
-    },
-
-    modifyEntryImports({
-      entrypoint,
-      imports
-    }) {
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      const config = (0, _core.useResolvedConfigContext)();
-      const {
-        masterApp
-      } = (0, _utils2.getRuntimeConfig)(config);
-
-      if (masterApp) {
-        imports.push({
-          value: _runtimePluginName,
-          specifiers: [{
-            imported: 'garfish'
-          }]
-        });
+
         imports.push({
-          value: _runtimePluginName,
+          value: 'react-dom',
           specifiers: [{
-            imported: 'masterApp'
+            imported: 'unmountComponentAtNode'
+          }, {
+            imported: 'createPortal'
           }]
         });
-      }
-
-      imports.push({
-        value: 'react-dom',
-        specifiers: [{
-          imported: 'unmountComponentAtNode'
-        }, {
-          imported: 'createPortal'
-        }]
-      });
-      return {
-        imports,
-        entrypoint
-      };
-    },
-
-    modifyEntryRuntimePlugins({
-      entrypoint,
-      plugins
-    }) {
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      const config = (0, _core.useResolvedConfigContext)();
-      const {
-        masterApp
-      } = (0, _utils2.getRuntimeConfig)(config);
-
-      if (masterApp) {
-        (0, _util.logger)('garfishPlugin options', masterApp);
-        plugins.push({
-          name: 'garfish',
-          args: 'masterApp',
-          options: masterApp === true ? JSON.stringify({}) : JSON.stringify(masterApp)
-        });
-      }
+        return {
+          imports,
+          entrypoint
+        };
+      },
 
-      return {
+      modifyEntryRuntimePlugins({
         entrypoint,
         plugins
-      };
-    },
-
-    modifyEntryRenderFunction({
-      entrypoint,
-      code
-    }) {
-      var _config$deploy;
-
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      const config = (0, _core.useResolvedConfigContext)();
+      }) {
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        const config = useResolvedConfigContext();
+        const {
+          masterApp
+        } = (0, _utils2.getRuntimeConfig)(config);
+
+        if (masterApp) {
+          (0, _util.logger)('garfishPlugin options', masterApp);
+          plugins.push({
+            name: 'garfish',
+            args: 'masterApp',
+            options: masterApp === true ? JSON.stringify({}) : JSON.stringify(masterApp)
+          });
+        }
 
-      if (!(config !== null && config !== void 0 && (_config$deploy = config.deploy) !== null && _config$deploy !== void 0 && _config$deploy.microFrontend)) {
         return {
           entrypoint,
-          code
+          plugins
         };
-      }
+      },
 
-      const nCode = (0, _utils2.makeRenderFunction)(code);
-      (0, _util.logger)('makeRenderFunction', nCode);
-      return {
+      modifyEntryRenderFunction({
         entrypoint,
-        code: nCode
-      };
-    },
-
-    modifyEntryExport({
-      entrypoint,
-      exportStatement
-    }) {
-      var _config$deploy2;
-
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      const config = (0, _core.useResolvedConfigContext)();
-
-      if (config !== null && config !== void 0 && (_config$deploy2 = config.deploy) !== null && _config$deploy2 !== void 0 && _config$deploy2.microFrontend) {
-        const exportStatementCode = (0, _utils2.makeProvider)();
-        (0, _util.logger)('exportStatement', exportStatementCode);
+        code
+      }) {
+        var _config$deploy;
+
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        const config = useResolvedConfigContext();
+
+        if (!(config !== null && config !== void 0 && (_config$deploy = config.deploy) !== null && _config$deploy !== void 0 && _config$deploy.microFrontend)) {
+          return {
+            entrypoint,
+            code
+          };
+        }
+
+        const nCode = (0, _utils2.makeRenderFunction)(code);
+        (0, _util.logger)('makeRenderFunction', nCode);
         return {
           entrypoint,
-          exportStatement: exportStatementCode
+          code: nCode
         };
-      }
+      },
 
-      return {
+      modifyEntryExport({
         entrypoint,
         exportStatement
-      };
-    }
-
-  };
-};
-
-exports.initializer = initializer;
+      }) {
+        var _config$deploy2;
+
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        const config = useResolvedConfigContext();
+
+        if (config !== null && config !== void 0 && (_config$deploy2 = config.deploy) !== null && _config$deploy2 !== void 0 && _config$deploy2.microFrontend) {
+          const exportStatementCode = (0, _utils2.makeProvider)();
+          (0, _util.logger)('exportStatement', exportStatementCode);
+          return {
+            entrypoint,
+            exportStatement: exportStatementCode
+          };
+        }
 
-var _default = (0, _core.createPlugin)(initializer({
-  resolvedConfig,
+        return {
+          entrypoint,
+          exportStatement
+        };
+      }
 
-  validateSchema() {
-    return _utils.PLUGIN_SCHEMAS['@modern-js/plugin-garfish'];
+    };
   }
-
-}, {
-  runtimePluginName: '@modern-js/runtime/plugins'
-}), {
-  name: '@modern-js/plugin-garfish'
 });
 
 exports.default = _default;

package/dist/js/node/cli/utils.js

@@ -8,13 +8,15 @@ exports.makeRenderFunction = exports.makeProvider = void 0;
 exports.setRuntimeConfig = setRuntimeConfig;
 
 const makeProvider = () => `
-export const provider = function ({basename, dom, ...props}) {
+export const provider = function ({basename, dom}) {
   return {
-    render({basename, dom}) {
-      console.log('App.config', App.config);
-      const SubApp = render({props, basename});
+    render({basename, dom, props}) {
+      const SubApp = render({ props, basename });
       const node = dom.querySelector('#' + MOUNT_ID) || dom;
-      bootstrap(SubApp, node);
+      const App = function () {
+        return React.createElement(SubApp, props)
+      };
+      bootstrap(App, node);
     },
     destroy({ dom }) {
       const node = dom.querySelector('#' + MOUNT_ID) || dom;

package/dist/js/node/runtime/index.js

@@ -15,12 +15,6 @@ Object.defineProperty(exports, "default", {
     return _plugin.default;
   }
 });
-Object.defineProperty(exports, "useMicroApps", {
-  enumerable: true,
-  get: function () {
-    return _useModuleApps.useMicroApps;
-  }
-});
 Object.defineProperty(exports, "useModuleApp", {
   enumerable: true,
   get: function () {

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

@@ -99,8 +99,7 @@ const GarfishPlugin = config => {
               return /*#__PURE__*/_react.default.createElement('div');
             },
             apps: new Proxy({}, {
-              get(_target, _p) {
-                (0, _util.logger)('apps init Component Render', _p);
+              get() {
                 return () => /*#__PURE__*/_react.default.createElement('div');
               }
 

package/dist/js/node/runtime/useModuleApps.js

@@ -3,22 +3,49 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useMicroApps = useMicroApps;
 exports.useModuleApp = useModuleApp;
 exports.useModuleApps = useModuleApps;
 
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
 
 var _util = require("../util");
 
 var _Context = require("./utils/Context");
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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; }
+
 function useModuleApps() {
   const {
-    apps
+    apps,
+    MApp,
+    appInfoList
   } = (0, _react.useContext)(_Context.GarfishContext);
-  (0, _util.logger)('call useModuleApps', apps);
-  return apps;
+  (0, _util.logger)('call useModuleApps', _objectSpread({
+    MApp,
+    apps: appInfoList
+  }, apps));
+  const Info = new Proxy(_objectSpread({
+    MApp,
+    apps: appInfoList
+  }, apps), {
+    get(target, p, receiver) {
+      if (typeof p === 'string' && p in target) {
+        return Reflect.get(target, p, receiver);
+      }
+
+      return () => /*#__PURE__*/_react.default.createElement('div');
+    }
+
+  });
+  return Info;
 }
 
 function useModuleApp() {
@@ -27,22 +54,4 @@ function useModuleApp() {
   } = (0, _react.useContext)(_Context.GarfishContext);
   (0, _util.logger)('call useModuleApps', MApp);
   return MApp;
-}
-
-function useMicroApps() {
-  const {
-    MApp,
-    appInfoList,
-    apps
-  } = (0, _react.useContext)(_Context.GarfishContext);
-  (0, _util.logger)('call useMicroApps', {
-    MApp,
-    apps: appInfoList,
-    Components: apps
-  });
-  return {
-    MApp,
-    apps: appInfoList,
-    Components: apps
-  };
 }