@modern-js/plugin-garfish 1.3.1 → 1.4.2

package/CHANGELOG.md

@@ -1,5 +1,43 @@
 # @modern-js/plugin-garfish
 
+## 1.4.2
+
+### Patch Changes
+
+- 2520ea86: fix: garfish schema
+- Updated dependencies [cc5e8001]
+- Updated dependencies [2520ea86]
+- Updated dependencies [6a2fd32e]
+- Updated dependencies [db43dce6]
+- Updated dependencies [e81fd9b7]
+- Updated dependencies [1c411e71]
+  - @modern-js/core@1.4.6
+  - @modern-js/plugin-router@1.2.5
+  - @modern-js/utils@1.3.4
+
+## 1.4.0
+
+### Minor Changes
+
+- 4c792f68: feat(plugin-garfish): Sub-applications automatically increment basename
+  feat(plugin-garfish): export common generate code function
+  fix(plugin-garfish): modify plugin-garfish schema config
+
+### Patch Changes
+
+- 55e18278: chore: remove unused dependencies and devDependencies
+- Updated dependencies [969f172f]
+- Updated dependencies [4c792f68]
+- Updated dependencies [4b5d4bf4]
+- Updated dependencies [62f5b8c8]
+- Updated dependencies [55e18278]
+- Updated dependencies [4499a674]
+- Updated dependencies [403f5169]
+- Updated dependencies [a7f42f48]
+  - @modern-js/core@1.4.4
+  - @modern-js/utils@1.3.3
+  - @modern-js/runtime-core@1.2.4
+
 ## 1.3.1
 
 ### Patch Changes

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

@@ -5,70 +5,56 @@ 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; }
 
 import path from 'path';
-import { createRuntimeExportsUtils, getEntryOptions, PLUGIN_SCHEMAS } from '@modern-js/utils';
+import { createRuntimeExportsUtils, PLUGIN_SCHEMAS } from '@modern-js/utils';
 import { createPlugin, useAppContext, useResolvedConfigContext } from '@modern-js/core';
 import { logger } from "../util";
-import { makeProvider, makeRenderFunction } from "./utils";
-
-function getRuntimeConfig(config) {
-  var _config$runtime;
-
-  if (config !== null && config !== void 0 && (_config$runtime = config.runtime) !== null && _config$runtime !== void 0 && _config$runtime.feature) {
-    var _config$runtime2;
-
-    return config === null || config === void 0 ? void 0 : (_config$runtime2 = config.runtime) === null || _config$runtime2 === void 0 ? void 0 : _config$runtime2.feature;
-  }
-
-  return config === null || config === void 0 ? void 0 : config.runtime;
-}
-
-function setRuntimeConfig(config, key, value) {
-  var _config$runtime3, _config$runtime4;
+import { getRuntimeConfig, makeProvider, makeRenderFunction, setRuntimeConfig } from "./utils";
+export const externals = {
+  'react-dom': 'react-dom',
+  react: 'react'
+};
+export const resolvedConfig = async config => {
+  const {
+    resolved
+  } = config;
+  const {
+    masterApp,
+    router
+  } = getRuntimeConfig(resolved);
+  const nConfig = {
+    resolved: _objectSpread({}, resolved)
+  };
 
-  if (config !== null && config !== void 0 && config.runtime && config !== null && config !== void 0 && config.runtime[key]) {
-    config.runtime[key] = value;
-  }
+  if (masterApp) {
+    var _router$historyOption;
 
-  if (config !== null && config !== void 0 && (_config$runtime3 = config.runtime) !== null && _config$runtime3 !== void 0 && _config$runtime3.feature && config !== null && config !== void 0 && (_config$runtime4 = config.runtime) !== null && _config$runtime4 !== void 0 && _config$runtime4.feature[key]) {
-    config.runtime.feature[key] = value;
+    // 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$historyOption = router.historyOptions) === null || _router$historyOption === void 0 ? void 0 : _router$historyOption.basename) || '/'
+    }));
   }
-}
 
-const externals = {
-  'react-dom': 'react-dom',
-  react: 'react'
+  logger(`resolvedConfig`, {
+    runtime: nConfig.resolved.runtime,
+    deploy: nConfig.resolved.deploy,
+    server: nConfig.resolved.server
+  });
+  return nConfig;
 };
-export default createPlugin(() => {
-  const configMap = new Map();
+export 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 {
-    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;
-    },
+    validateSchema,
+    resolvedConfig,
 
     config() {
       // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -84,31 +70,34 @@ export default createPlugin(() => {
         tools: {
           webpack: (webpackConfig, {
             chain,
-            webpack
+            webpack,
+            env: _env = process.env.NODE_ENV || 'development'
           }) => {
-            var _resolvedConfig$deplo, _resolveWebpackConfig;
-
-            const env = process.env.NODE_ENV; // eslint-disable-next-line react-hooks/rules-of-hooks
+            var _resolveOptions$deplo, _resolveWebpackConfig;
 
-            const resolvedConfig = useResolvedConfigContext();
+            // eslint-disable-next-line react-hooks/rules-of-hooks
+            const resolveOptions = 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 (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');
 
-              if (resolvedConfig.server.port) {
-                chain.output.publicPath(env === 'development' ? `//localhost:${resolvedConfig.server.port}/` : webpackConfig.output.publicPath);
+              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
 
 
-              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 = 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
+                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
 
               if (externalBasicLibrary) {
                 chain.externals(externals);
@@ -129,7 +118,7 @@ export default createPlugin(() => {
             logger('webpackConfig', {
               output: resolveWebpackConfig.output,
               externals: resolveWebpackConfig.externals,
-              env,
+              env: _env,
               alias: (_resolveWebpackConfig = resolveWebpackConfig.resolve) === null || _resolveWebpackConfig === void 0 ? void 0 : _resolveWebpackConfig.alias
             });
           }
@@ -139,40 +128,35 @@ export default createPlugin(() => {
 
     addRuntimeExports() {
       const mfPackage = path.resolve(__dirname, '../../../../');
-      const addExportStatement = `export { default as garfish } from '${mfPackage}'`;
+      const addExportStatement = `export { default as garfish, default as masterApp } 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 config = useResolvedConfigContext();
       const {
         masterApp
-      } = getRuntimeConfig(resolvedConfig); // eslint-disable-next-line react-hooks/rules-of-hooks
+      } = getRuntimeConfig(config);
 
-      const {
-        packageName
-      } = useAppContext();
-      const masterAppConfig = getEntryOptions(entrypoint.entryName, masterApp, resolvedConfig.runtimeByEntries, packageName);
-      configMap.set(entrypoint.entryName, masterAppConfig);
-
-      if (masterAppConfig) {
+      if (masterApp) {
         imports.push({
-          value: '@modern-js/runtime/plugins',
+          value: _runtimePluginName,
           specifiers: [{
             imported: 'garfish'
           }]
         });
+        imports.push({
+          value: _runtimePluginName,
+          specifiers: [{
+            imported: 'masterApp'
+          }]
+        });
       }
 
       imports.push({
@@ -193,14 +177,18 @@ export default createPlugin(() => {
       entrypoint,
       plugins
     }) {
-      const masterAppConfig = configMap.get(entrypoint.entryName);
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      const config = useResolvedConfigContext();
+      const {
+        masterApp
+      } = getRuntimeConfig(config);
 
-      if (masterAppConfig) {
-        logger('garfishPlugin options', masterAppConfig);
+      if (masterApp) {
+        logger('garfishPlugin options', masterApp);
         plugins.push({
           name: 'garfish',
           args: 'masterApp',
-          options: JSON.stringify(masterAppConfig)
+          options: masterApp === true ? JSON.stringify({}) : JSON.stringify(masterApp)
         });
       }
 
@@ -238,12 +226,12 @@ export default createPlugin(() => {
       entrypoint,
       exportStatement
     }) {
-      var _resolvedConfig$deplo4;
+      var _config$deploy2;
 
       // eslint-disable-next-line react-hooks/rules-of-hooks
-      const resolvedConfig = useResolvedConfigContext();
+      const config = useResolvedConfigContext();
 
-      if (resolvedConfig !== null && resolvedConfig !== void 0 && (_resolvedConfig$deplo4 = resolvedConfig.deploy) !== null && _resolvedConfig$deplo4 !== void 0 && _resolvedConfig$deplo4.microFrontend) {
+      if (config !== null && config !== void 0 && (_config$deploy2 = config.deploy) !== null && _config$deploy2 !== void 0 && _config$deploy2.microFrontend) {
         const exportStatementCode = makeProvider();
         logger('exportStatement', exportStatementCode);
         return {
@@ -259,6 +247,16 @@ export default createPlugin(() => {
     }
 
   };
+};
+export default createPlugin(initializer({
+  resolvedConfig,
+
+  validateSchema() {
+    return PLUGIN_SCHEMAS['@modern-js/plugin-garfish'];
+  }
+
 }, {
+  runtimePluginName: '@modern-js/runtime/plugins'
+}), {
   name: '@modern-js/plugin-garfish'
 });

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

@@ -1,31 +1,90 @@
 export const makeProvider = () => `
-  export const provider = function ({basename, dom, ...props}) {
-    return {
-      render({basename, dom}) {
-        const SubApp = render(props, basename);
-        const node = dom.querySelector('#' + MOUNT_ID) || dom;
-
-        bootstrap(SubApp, node);
-      },
-      destroy({ dom }) {
-        const node = dom.querySelector('#' + MOUNT_ID) || dom;
-
-        if (node) {
-          unmountComponentAtNode(node);
-        }
-      },
-      SubModuleComponent: (props) => {
-        const SubApp = render(props, basename);
+export const provider = function ({basename, dom, ...props}) {
+  return {
+    render({basename, dom}) {
+      console.log('App.config', App.config);
+      const SubApp = render({props, basename});
+      const node = dom.querySelector('#' + MOUNT_ID) || dom;
+      bootstrap(SubApp, node);
+    },
+    destroy({ dom }) {
+      const node = dom.querySelector('#' + MOUNT_ID) || dom;
 
-        return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);
+      if (node) {
+        unmountComponentAtNode(node);
       }
+    },
+    SubModuleComponent: (props) => {
+      const SubApp = render({props, basename});
+
+      return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);
+    },
+    jupiter_submodule_app_key: (props) => {
+      const SubApp = render({props, basename});
+
+      return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);
     }
-  };
-  if (typeof __GARFISH_EXPORTS__ !== 'undefined') {
-    __GARFISH_EXPORTS__.provider = provider;
   }
+};
+
+if (typeof __GARFISH_EXPORTS__ !== 'undefined') {
+  __GARFISH_EXPORTS__.provider = provider;
+}
 `;
-export const makeRenderFunction = code => code.replace('IS_BROWSER', `
-        IS_BROWSER &&
-        typeof __GARFISH_EXPORTS__ === 'undefined'
-      `).replace('(App)', '(() => <App {...(arguments[0] || {})} />)').replace('"basename":"/"', '"basename":arguments[1] || "/"');
+export const makeRenderFunction = code => {
+  const inGarfishToRender = `
+  const { basename, props } = arguments[0] || {};
+  let renderByGarfish = false;
+  const renderByProvider = !!basename;
+
+  if (IS_BROWSER && window.Garfish && window.Garfish.activeApps && window.Garfish.activeApps.length !== 0) renderByGarfish = true;
+  if (IS_BROWSER && window.Garfish && window.Garfish.apps && Object.keys(window.Garfish.apps).length !== 0) renderByGarfish = true;
+  if (typeof __GARFISH_EXPORTS__ !== 'undefined') renderByGarfish = true;
+  if (renderByGarfish && !renderByProvider) return null;
+
+  function RouterPlugin (routerConfig) {
+    if (basename) {
+      routerConfig.basename = basename;
+      if (routerConfig.supportHtml5History !== false) {
+        if (!routerConfig.historyOptions) {
+          routerConfig.historyOptions = {
+            basename: basename
+          };
+        } else {
+          routerConfig.historyOptions.basename = basename;
+        }
+      }
+    }
+    return router(routerConfig);
+  }
+  `;
+  return inGarfishToRender + code.replace(`router(`, `RouterPlugin(`).replace('IS_BROWSER', `IS_BROWSER && !renderByGarfish`);
+}; // support legacy config
+
+export function getRuntimeConfig(config) {
+  var _config$runtime;
+
+  if (config !== null && config !== void 0 && (_config$runtime = config.runtime) !== null && _config$runtime !== void 0 && _config$runtime.features) {
+    var _config$runtime2;
+
+    return config === null || config === void 0 ? void 0 : (_config$runtime2 = config.runtime) === null || _config$runtime2 === void 0 ? void 0 : _config$runtime2.features;
+  }
+
+  return config === null || config === void 0 ? void 0 : config.runtime;
+} // support legacy config
+
+export function setRuntimeConfig(config, key, value) {
+  var _config$runtime3, _config$runtime4;
+
+  if (config !== null && config !== void 0 && (_config$runtime3 = config.runtime) !== null && _config$runtime3 !== void 0 && _config$runtime3.features && config !== null && config !== void 0 && (_config$runtime4 = config.runtime) !== null && _config$runtime4 !== void 0 && _config$runtime4.features[key]) {
+    config.runtime.features[key] = value;
+    return undefined;
+  }
+
+  if (config !== null && config !== void 0 && config.runtime && config !== null && config !== void 0 && config.runtime[key]) {
+    config.runtime[key] = value;
+    return undefined;
+  }
+
+  return undefined;
+}

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

@@ -27,13 +27,21 @@ async function initOptions(manifest = {}, options) {
   let apps = options.apps || []; // use manifest modules
 
   if (manifest !== null && manifest !== void 0 && manifest.modules) {
-    apps = manifest === null || manifest === void 0 ? void 0 : manifest.modules;
+    if ((manifest === null || manifest === void 0 ? void 0 : manifest.modules.length) > 0) {
+      apps = manifest === null || manifest === void 0 ? void 0 : manifest.modules;
+    }
+
     logger('manifest modules', apps);
   } // get module list
 
 
   if (manifest !== null && manifest !== void 0 && manifest.getAppList) {
-    apps = await (manifest === null || manifest === void 0 ? void 0 : manifest.getAppList());
+    const getAppList = await (manifest === null || manifest === void 0 ? void 0 : manifest.getAppList());
+
+    if (getAppList.length > 0) {
+      apps = getAppList;
+    }
+
     logger('getAppList modules', apps);
   } // get inject modules list
 

package/dist/js/modern/runtime/utils/MApp.js

@@ -68,7 +68,7 @@ export function generateMApp(options, manifest) {
         },
 
         errorLoadApp(error, ...args) {
-          logger('MApp errorLoadApp', args);
+          logger('MApp errorLoadApp', error, args);
           setLoadingState({
             error
           });
@@ -76,7 +76,7 @@ export function generateMApp(options, manifest) {
         },
 
         errorMountApp(error, ...args) {
-          logger('MApp errorMountApp', args);
+          logger('MApp errorMountApp', error, args);
           setLoadingState({
             error
           });
@@ -84,7 +84,7 @@ export function generateMApp(options, manifest) {
         },
 
         errorUnmountApp(error, ...args) {
-          logger('MApp errorUnmountApp', args);
+          logger('MApp errorUnmountApp', error, args);
           setLoadingState({
             error
           });

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

@@ -27,7 +27,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) {
   let locationHref = '';
 
   class MicroApp extends React.Component {
@@ -52,9 +52,6 @@ function getAppInstance(appInfo, manifest) {
       const {
         domId
       } = this.state;
-      const {
-        options
-      } = Garfish;
 
       const loadAppOptions = _objectSpread(_objectSpread({}, appInfo), {}, {
         domGetter: `#${domId}`,
@@ -175,7 +172,7 @@ export function generateApps(options, manifest) {
 
   const apps = {};
   (_options$apps = options.apps) === null || _options$apps === void 0 ? void 0 : _options$apps.forEach(appInfo => {
-    const Component = getAppInstance(appInfo, manifest);
+    const Component = getAppInstance(options, appInfo, manifest);
     appInfo.Component = Component;
     apps[appInfo.name] = Component;
   });