@modern-js/plugin-garfish 1.3.0 → 1.3.1

package/.eslintrc.js

@@ -3,5 +3,5 @@ module.exports = {
   parserOptions: {
     project: require.resolve('./tsconfig.json'),
   },
-  ignorePatterns: ['type.d.ts'],
+  ignorePatterns: ['type.d.ts', 'tests/**/*.tsx'],
 };

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @modern-js/plugin-garfish
 
+## 1.3.1
+
+### Patch Changes
+
+- 53aca274: modify garfish-plugin config type
+- Updated dependencies [53aca274]
+- Updated dependencies [78279953]
+- Updated dependencies [e116ace5]
+- Updated dependencies [4d72edea]
+  - @modern-js/core@1.4.1
+  - @modern-js/utils@1.3.1
+
 ## 1.3.0
 
 ### Minor Changes

package/dist/js/modern/cli/index.js

@@ -1,15 +1,9 @@
-const _excluded = ["validateSchema", "externals", "componentKey"];
-
 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 _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; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 import path from 'path';
 import { createRuntimeExportsUtils, getEntryOptions, PLUGIN_SCHEMAS } from '@modern-js/utils';
 import { createPlugin, useAppContext, useResolvedConfigContext } from '@modern-js/core';
@@ -40,244 +34,231 @@ function setRuntimeConfig(config, key, value) {
   }
 }
 
-export const initializer = _ref => {
-  let {
-    validateSchema,
-    externals,
-    componentKey
-  } = _ref,
-      otherLifeCycle = _objectWithoutProperties(_ref, _excluded);
-
-  return () => {
-    const configMap = new Map();
-    let pluginsExportsUtils;
-    let runtimeExportsUtils;
-    return _objectSpread({
-      resolvedConfig(config) {
-        const {
-          resolved
-        } = config;
-        const {
-          masterApp,
-          router
-        } = getRuntimeConfig(resolved);
-        const nConfig = {
-          resolved: _objectSpread({}, resolved)
-        };
-
-        if (masterApp) {
-          // basename does not exist use router's basename
-          setRuntimeConfig(nConfig.resolved, 'masterApp', Object.assign(typeof masterApp === 'object' ? _objectSpread({}, masterApp) : {}, {
-            basename: (router === null || router === void 0 ? void 0 : router.basename) || '/'
-          }));
-        }
+const externals = {
+  'react-dom': 'react-dom',
+  react: 'react'
+};
+export default createPlugin(() => {
+  const configMap = new Map();
+  let pluginsExportsUtils;
+  let runtimeExportsUtils;
+  return {
+    resolvedConfig(config) {
+      const {
+        resolved
+      } = config;
+      const {
+        masterApp,
+        router
+      } = getRuntimeConfig(resolved);
+      const nConfig = {
+        resolved: _objectSpread({}, resolved)
+      };
+
+      if (masterApp) {
+        // basename does not exist use router's basename
+        setRuntimeConfig(nConfig.resolved, 'masterApp', Object.assign(typeof masterApp === 'object' ? _objectSpread({}, masterApp) : {}, {
+          basename: (router === null || router === void 0 ? void 0 : router.basename) || '/'
+        }));
+      }
 
-        logger(`resolvedConfig`, {
-          runtime: nConfig.resolved.runtime,
-          deploy: nConfig.resolved.deploy,
-          server: nConfig.resolved.server
-        });
-        return nConfig;
-      },
-
-      config() {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        const config = useAppContext();
-        pluginsExportsUtils = createRuntimeExportsUtils(config.internalDirectory, 'plugins');
-        runtimeExportsUtils = createRuntimeExportsUtils(config.internalDirectory, 'index');
-        return {
-          source: {
-            alias: {
-              '@modern-js/runtime/plugins': pluginsExportsUtils.getPath()
-            }
-          },
-          tools: {
-            webpack: (webpackConfig, {
-              chain,
-              webpack
-            }) => {
-              var _resolvedConfig$deplo;
+      logger(`resolvedConfig`, {
+        runtime: nConfig.resolved.runtime,
+        deploy: nConfig.resolved.deploy,
+        server: nConfig.resolved.server
+      });
+      return nConfig;
+    },
+
+    config() {
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      const config = useAppContext();
+      pluginsExportsUtils = createRuntimeExportsUtils(config.internalDirectory, 'plugins');
+      runtimeExportsUtils = createRuntimeExportsUtils(config.internalDirectory, 'index');
+      return {
+        source: {
+          alias: {
+            '@modern-js/runtime/plugins': pluginsExportsUtils.getPath()
+          }
+        },
+        tools: {
+          webpack: (webpackConfig, {
+            chain,
+            webpack
+          }) => {
+            var _resolvedConfig$deplo, _resolveWebpackConfig;
 
-              const env = process.env.NODE_ENV; // eslint-disable-next-line react-hooks/rules-of-hooks
+            const env = process.env.NODE_ENV; // eslint-disable-next-line react-hooks/rules-of-hooks
 
-              const resolvedConfig = useResolvedConfigContext();
+            const resolvedConfig = useResolvedConfigContext();
 
-              if (resolvedConfig !== null && resolvedConfig !== void 0 && (_resolvedConfig$deplo = resolvedConfig.deploy) !== null && _resolvedConfig$deplo !== void 0 && _resolvedConfig$deplo.microFrontend) {
-                var _resolvedConfig$deplo2, _resolvedConfig$deplo3;
+            if (resolvedConfig !== null && resolvedConfig !== void 0 && (_resolvedConfig$deplo = resolvedConfig.deploy) !== null && _resolvedConfig$deplo !== void 0 && _resolvedConfig$deplo.microFrontend) {
+              var _resolvedConfig$deplo2, _resolvedConfig$deplo3;
 
-                chain.output.libraryTarget('umd');
+              chain.output.libraryTarget('umd');
 
-                if (resolvedConfig.server.port) {
-                  chain.output.publicPath(env === 'development' ? `//localhost:${resolvedConfig.server.port}/` : webpackConfig.output.publicPath);
-                } // add comments avoid sourcemap abnormal
+              if (resolvedConfig.server.port) {
+                chain.output.publicPath(env === 'development' ? `//localhost:${resolvedConfig.server.port}/` : webpackConfig.output.publicPath);
+              } // add comments avoid sourcemap abnormal
 
 
-                chain.plugin('banner').use(webpack.BannerPlugin, [{
-                  banner: 'Micro front-end'
-                }]);
-                const {
-                  enableHtmlEntry = true,
-                  externalBasicLibrary = true
-                } = typeof (resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig$deplo2 = resolvedConfig.deploy) === null || _resolvedConfig$deplo2 === void 0 ? void 0 : _resolvedConfig$deplo2.microFrontend) === 'object' ? resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig$deplo3 = resolvedConfig.deploy) === null || _resolvedConfig$deplo3 === void 0 ? void 0 : _resolvedConfig$deplo3.microFrontend : {}; // external
+              chain.plugin('banner').use(webpack.BannerPlugin, [{
+                banner: 'Micro front-end'
+              }]);
+              const {
+                enableHtmlEntry = true,
+                externalBasicLibrary = true
+              } = typeof (resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig$deplo2 = resolvedConfig.deploy) === null || _resolvedConfig$deplo2 === void 0 ? void 0 : _resolvedConfig$deplo2.microFrontend) === 'object' ? resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig$deplo3 = resolvedConfig.deploy) === null || _resolvedConfig$deplo3 === void 0 ? void 0 : _resolvedConfig$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();
-              logger('webpackConfig', {
-                output: resolveWebpackConfig.output,
-                externals: resolveWebpackConfig.externals,
-                env
-              });
             }
-          }
-        };
-      },
 
-      addRuntimeExports() {
-        const mfPackage = path.resolve(__dirname, '../../../../');
-        const addExportStatement = `export { default as garfish } from '${mfPackage}'`;
-        logger('exportStatement', addExportStatement);
-        pluginsExportsUtils.addExport(addExportStatement);
-        runtimeExportsUtils.addExport(`export * from '${mfPackage}'`);
-      },
-
-      validateSchema,
-
-      modifyEntryImports({
-        entrypoint,
-        imports
-      }) {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        const resolvedConfig = useResolvedConfigContext(); // support legacy config
-
-        const {
-          masterApp
-        } = getRuntimeConfig(resolvedConfig); // eslint-disable-next-line react-hooks/rules-of-hooks
-
-        const {
-          packageName
-        } = useAppContext();
-        const masterAppConfig = getEntryOptions(entrypoint.entryName, masterApp, resolvedConfig.runtimeByEntries, packageName);
-        configMap.set(entrypoint.entryName, masterAppConfig);
-
-        if (masterAppConfig) {
-          imports.push({
-            value: '@modern-js/runtime/plugins',
-            specifiers: [{
-              imported: 'garfish'
-            }]
-          });
+            const resolveWebpackConfig = chain.toConfig();
+            logger('webpackConfig', {
+              output: resolveWebpackConfig.output,
+              externals: resolveWebpackConfig.externals,
+              env,
+              alias: (_resolveWebpackConfig = resolveWebpackConfig.resolve) === null || _resolveWebpackConfig === void 0 ? void 0 : _resolveWebpackConfig.alias
+            });
+          }
         }
-
+      };
+    },
+
+    addRuntimeExports() {
+      const mfPackage = path.resolve(__dirname, '../../../../');
+      const addExportStatement = `export { default as garfish } from '${mfPackage}'`;
+      logger('exportStatement', addExportStatement);
+      pluginsExportsUtils.addExport(addExportStatement);
+      runtimeExportsUtils.addExport(`export * from '${mfPackage}'`);
+    },
+
+    validateSchema() {
+      return PLUGIN_SCHEMAS['@modern-js/plugin-garfish'];
+    },
+
+    modifyEntryImports({
+      entrypoint,
+      imports
+    }) {
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      const resolvedConfig = useResolvedConfigContext(); // support legacy config
+
+      const {
+        masterApp
+      } = getRuntimeConfig(resolvedConfig); // eslint-disable-next-line react-hooks/rules-of-hooks
+
+      const {
+        packageName
+      } = useAppContext();
+      const masterAppConfig = getEntryOptions(entrypoint.entryName, masterApp, resolvedConfig.runtimeByEntries, packageName);
+      configMap.set(entrypoint.entryName, masterAppConfig);
+
+      if (masterAppConfig) {
         imports.push({
-          value: 'react-dom',
+          value: '@modern-js/runtime/plugins',
           specifiers: [{
-            imported: 'unmountComponentAtNode'
-          }, {
-            imported: 'createPortal'
+            imported: 'garfish'
           }]
         });
-        return {
-          imports,
-          entrypoint
-        };
-      },
+      }
+
+      imports.push({
+        value: 'react-dom',
+        specifiers: [{
+          imported: 'unmountComponentAtNode'
+        }, {
+          imported: 'createPortal'
+        }]
+      });
+      return {
+        imports,
+        entrypoint
+      };
+    },
+
+    modifyEntryRuntimePlugins({
+      entrypoint,
+      plugins
+    }) {
+      const masterAppConfig = configMap.get(entrypoint.entryName);
+
+      if (masterAppConfig) {
+        logger('garfishPlugin options', masterAppConfig);
+        plugins.push({
+          name: 'garfish',
+          args: 'masterApp',
+          options: JSON.stringify(masterAppConfig)
+        });
+      }
 
-      modifyEntryRuntimePlugins({
+      return {
         entrypoint,
         plugins
-      }) {
-        const masterAppConfig = configMap.get(entrypoint.entryName);
-
-        if (masterAppConfig) {
-          logger('garfishPlugin options', masterAppConfig);
-          plugins.push({
-            name: 'garfish',
-            args: 'masterApp',
-            options: JSON.stringify(masterAppConfig)
-          });
-        }
+      };
+    },
 
-        return {
-          entrypoint,
-          plugins
-        };
-      },
+    modifyEntryRenderFunction({
+      entrypoint,
+      code
+    }) {
+      var _config$deploy;
 
-      modifyEntryRenderFunction({
-        entrypoint,
-        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
-          };
-        }
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      const config = useResolvedConfigContext();
 
-        const nCode = makeRenderFunction(code);
-        logger('makeRenderFunction', nCode);
+      if (!(config !== null && config !== void 0 && (_config$deploy = config.deploy) !== null && _config$deploy !== void 0 && _config$deploy.microFrontend)) {
         return {
           entrypoint,
-          code: nCode
+          code
         };
-      },
+      }
 
-      modifyEntryExport({
+      const nCode = makeRenderFunction(code);
+      logger('makeRenderFunction', nCode);
+      return {
         entrypoint,
-        exportStatement
-      }) {
-        var _resolvedConfig$deplo4;
-
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        const resolvedConfig = useResolvedConfigContext();
-
-        if (resolvedConfig !== null && resolvedConfig !== void 0 && (_resolvedConfig$deplo4 = resolvedConfig.deploy) !== null && _resolvedConfig$deplo4 !== void 0 && _resolvedConfig$deplo4.microFrontend) {
-          const exportStatementCode = makeProvider(componentKey);
-          logger('exportStatement', exportStatementCode);
-          return {
-            entrypoint,
-            exportStatement: exportStatementCode
-          };
-        }
-
+        code: nCode
+      };
+    },
+
+    modifyEntryExport({
+      entrypoint,
+      exportStatement
+    }) {
+      var _resolvedConfig$deplo4;
+
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      const resolvedConfig = useResolvedConfigContext();
+
+      if (resolvedConfig !== null && resolvedConfig !== void 0 && (_resolvedConfig$deplo4 = resolvedConfig.deploy) !== null && _resolvedConfig$deplo4 !== void 0 && _resolvedConfig$deplo4.microFrontend) {
+        const exportStatementCode = makeProvider();
+        logger('exportStatement', exportStatementCode);
         return {
           entrypoint,
-          exportStatement
+          exportStatement: exportStatementCode
         };
       }
 
-    }, otherLifeCycle);
+      return {
+        entrypoint,
+        exportStatement
+      };
+    }
+
   };
-};
-export default createPlugin(initializer({
-  validateSchema() {
-    return PLUGIN_SCHEMAS['@modern-js/plugin-garfish'];
-  },
-
-  externals: {
-    'react-dom': 'react-dom',
-    react: 'react'
-  },
-  componentKey: 'dynamicComponent'
-}), {
+}, {
   name: '@modern-js/plugin-garfish'
 });

package/dist/js/modern/cli/utils.js

@@ -1,4 +1,4 @@
-export const makeProvider = componentKey => `
+export const makeProvider = () => `
   export const provider = function ({basename, dom, ...props}) {
     return {
       render({basename, dom}) {
@@ -17,11 +17,6 @@ export const makeProvider = componentKey => `
       SubModuleComponent: (props) => {
         const SubApp = render(props, basename);
 
-        return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);
-      },
-      ${componentKey}: () => {
-        const SubApp = render(props, basename);
-
         return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);
       }
     }

package/dist/js/modern/index.js

@@ -1 +1,2 @@
-export { default } from "./cli";
+export { default } from "./runtime";
+export * from "./runtime";

package/dist/js/modern/runtime/index.js

@@ -1,2 +1,3 @@
 export { default } from "./plugin";
-export * from "./useModuleApps";
+export { useModuleApps, useMicroApps, useModuleApp } from "./useModuleApps";
+export { default as Garfish } from 'garfish';

package/dist/js/modern/runtime/loadable.js

@@ -1,9 +1,15 @@
+const _excluded = ["loadable"];
+
 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 _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; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 // logical reference to https://github.com/jamiebuilds/react-loadable/blob/6201c5837b212d6244c57f3748f2b1375096beeb/src/index.js
 import React from 'react';
 import { logger } from "../util";
@@ -11,14 +17,11 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export function Loadable(WrapComponent) {
-  return function (defaultLoadingComponent) {
+  return function (defaultLoadable) {
     return class LoadableComponent extends React.Component {
       constructor(...args) {
         super(...args);
         this.state = {
-          LoadingComponent: defaultLoadingComponent,
-          timeout: 10000,
-          delay: 200,
           error: null,
           pastDelay: false,
           timedOut: false,
@@ -42,19 +45,16 @@ export function Loadable(WrapComponent) {
       UNSAFE_componentWillMount() {
         this.mounted = true;
         const {
-          loadingConfig
+          loadable = defaultLoadable || {
+            delay: 200,
+            timeout: 10000,
+            loading: null
+          }
         } = this.props;
-
-        if (loadingConfig !== null && loadingConfig !== void 0 && loadingConfig.LoadingComponent) {
-          this.setStateWithMountCheck({
-            LoadingComponent: loadingConfig.LoadingComponent
-          });
-        }
-
         const {
           delay,
           timeout
-        } = this.state;
+        } = loadable;
 
         if (typeof delay === 'number') {
           if (delay === 0) {
@@ -93,7 +93,6 @@ export function Loadable(WrapComponent) {
           return;
         }
 
-        logger('Loadable state', this.state);
         this.setState(newState);
       }
 
@@ -103,17 +102,35 @@ export function Loadable(WrapComponent) {
       }
 
       render() {
-        // eslint-disable-next-line @typescript-eslint/no-shadow
         const {
           isLoading,
           error,
           pastDelay,
-          timedOut,
-          LoadingComponent
+          timedOut
         } = this.state;
+
+        const _this$props = this.props,
+              {
+          loadable = defaultLoadable || {
+            delay: 200,
+            timeout: 10000,
+            loading: null
+          }
+        } = _this$props,
+              otherProps = _objectWithoutProperties(_this$props, _excluded);
+
+        const {
+          loading: LoadingComponent
+        } = loadable;
+        logger('Loadable render state', {
+          state: this.state,
+          props: otherProps,
+          loadable,
+          defaultLoadable
+        });
         const showLoading = (isLoading || error) && LoadingComponent;
         return /*#__PURE__*/_jsxs(_Fragment, {
-          children: [showLoading && LoadingComponent && /*#__PURE__*/_jsx(LoadingComponent, {
+          children: [showLoading && /*#__PURE__*/_jsx(LoadingComponent, {
             isLoading: isLoading,
             pastDelay: pastDelay,
             timedOut: timedOut,
@@ -124,7 +141,7 @@ export function Loadable(WrapComponent) {
               display: showLoading ? 'none' : 'block'
             },
             setLoadingState: props => this.setStateWithMountCheck(props)
-          }, this.props))]
+          }, otherProps))]
         });
       }