@modern-js/plugin-garfish 2.3.0 → 2.4.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @modern-js/plugin-garfish
 
+## 2.4.0
+
+### Patch Changes
+
+- b55f8c6: fix(garfish): load microApp can not match it's route
+  fix(garfish): server.baseUrl is in preference to router.basename
+
+  修复微前端模式下约定式路由和自控式路由子应用无法正确加载问题
+  修复 basename 优先级问题 server.baseUrl 高于 router.basename
+
+- 8c2db5f: feat(core): improve support for exporting a function in config file
+
+  feat(core): 完善对配置文件中导出函数的支持
+
+- Updated dependencies [98a2733]
+- Updated dependencies [9e907ec]
+- Updated dependencies [8c2db5f]
+  - @modern-js/utils@2.4.0
+  - @modern-js/runtime@2.4.0
+
 ## 2.3.0
 
 ### Patch Changes

package/README.md

@@ -1,30 +1,26 @@
-
 <p align="center">
   <a href="https://modernjs.dev" target="blank"><img src="https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png" width="300" alt="Modern.js Logo" /></a>
 </p>
+
+<h1 align="center">Modern.js</h1>
+
 <p align="center">
-现代 Web 工程体系
-  <br/>
-  <a href="https://modernjs.dev" target="blank">
-    modernjs.dev
-  </a>
-</p>
-<p align="center">
-  The meta-framework suite designed from scratch for frontend-focused modern web development
+  A Progressive React Framework for modern web development.
 </p>
 
-# Introduction
-
-> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.
+## Getting Started
 
-- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)
+Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-start) to get started with Modern.js.
 
-## Getting Started
+## Documentation
 
-- [Quick Start](https://modernjs.dev/docs/start)
-- [Guides](https://modernjs.dev/docs/guides)
-- [API References](https://modernjs.dev/docs/apis)
+- [English Documentation](https://modernjs.dev/en/)
+- [中文文档](https://modernjs.dev)
 
 ## Contributing
 
-- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)
+Please read the [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md).
+
+## License
+
+Modern.js is [MIT licensed](https://github.com/modern-js-dev/modern.js/blob/main/LICENSE).

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

@@ -69,20 +69,27 @@ var cli_default = ({
         return PLUGIN_SCHEMAS["@modern-js/plugin-garfish"];
       },
       resolvedConfig: (config) => __async(void 0, null, function* () {
-        var _a;
+        var _a, _b;
         const { resolved } = config;
         const { masterApp, router } = getRuntimeConfig(resolved);
         const nConfig = {
           resolved: __spreadValues({}, resolved)
         };
         if (masterApp) {
+          const useConfig = useConfigContext();
+          const baseUrl = (_a = useConfig == null ? void 0 : useConfig.server) == null ? void 0 : _a.baseUrl;
+          if (Array.isArray(baseUrl)) {
+            throw new Error(
+              "Now Micro-Front-End mode dose not support multiple baseUrl, you can set it as a string"
+            );
+          }
           setRuntimeConfig(
             nConfig.resolved,
             "masterApp",
             Object.assign(
               typeof masterApp === "object" ? __spreadValues({}, masterApp) : {},
               {
-                basename: ((_a = router == null ? void 0 : router.historyOptions) == null ? void 0 : _a.basename) || (router == null ? void 0 : router.basename) || "/"
+                basename: baseUrl || ((_b = router == null ? void 0 : router.historyOptions) == null ? void 0 : _b.basename) || (router == null ? void 0 : router.basename) || "/"
               }
             )
           );
@@ -129,11 +136,7 @@ var cli_default = ({
                 "Access-Control-Allow-Origin": "*"
               }
             },
-            webpackChain: (chain, {
-              webpack,
-              env = process.env.NODE_ENV || "development",
-              CHAIN_ID
-            }) => {
+            webpackChain: (chain, { webpack, env, CHAIN_ID }) => {
               var _a2, _b2, _c2, _d, _e;
               const resolveOptions = useResolvedConfigContext();
               if ((_a2 = resolveOptions == null ? void 0 : resolveOptions.deploy) == null ? void 0 : _a2.microFrontend) {

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

@@ -83,7 +83,7 @@ const makeRenderFunction = (code) => {
   const inGarfishToRender = `
   const { basename, props, dom, appName } = typeof arguments[0] === 'object' && arguments[0] || {};
   if (!canContinueRender({ dom, appName })) return null;
-  let { AppWrapper, mountNode } = generateAppWrapperAndRootDom({App, props, dom});
+  let { AppWrapper, mountNode } = generateAppWrapperAndRootDom({App, props: {...props, basename}, dom});
   `;
   return inGarfishToRender + code.replace(`router(`, `generateRouterPlugin(basename,`).replace("(App)", `(AppWrapper)`).replace(/MOUNT_ID/g, "mountNode").replace(
     `bootstrap(AppWrapper, mountNode, root`,

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

@@ -85,7 +85,14 @@ function getAppInstance(options, appInfo, manifest) {
     const location = (_f = (_e = context == null ? void 0 : context.router) == null ? void 0 : _e.useLocation) == null ? void 0 : _f.call(_e);
     let basename = (options == null ? void 0 : options.basename) || "/";
     if (matchs && matchs.length > 0) {
-      basename = pathJoin(basename, matchs[matchs.length - 1].pathname || "/");
+      const matchItem = __spreadValues({}, matchs[matchs.length - 1]);
+      for (const key in matchItem.params) {
+        matchItem.pathname = matchItem.pathname.replace(
+          new RegExp(`/${matchItem.params[key]}$`),
+          ""
+        );
+      }
+      basename = pathJoin(basename, matchItem.pathname || "/");
     } else if (match) {
       basename = pathJoin(basename, (match == null ? void 0 : match.path) || "/");
     }

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

@@ -85,20 +85,27 @@ var cli_default = ({
         return import_utils.PLUGIN_SCHEMAS["@modern-js/plugin-garfish"];
       },
       resolvedConfig: (config) => __async(void 0, null, function* () {
-        var _a;
+        var _a, _b;
         const { resolved } = config;
         const { masterApp, router } = (0, import_utils2.getRuntimeConfig)(resolved);
         const nConfig = {
           resolved: __spreadValues({}, resolved)
         };
         if (masterApp) {
+          const useConfig = useConfigContext();
+          const baseUrl = (_a = useConfig == null ? void 0 : useConfig.server) == null ? void 0 : _a.baseUrl;
+          if (Array.isArray(baseUrl)) {
+            throw new Error(
+              "Now Micro-Front-End mode dose not support multiple baseUrl, you can set it as a string"
+            );
+          }
           (0, import_utils2.setRuntimeConfig)(
             nConfig.resolved,
             "masterApp",
             Object.assign(
               typeof masterApp === "object" ? __spreadValues({}, masterApp) : {},
               {
-                basename: ((_a = router == null ? void 0 : router.historyOptions) == null ? void 0 : _a.basename) || (router == null ? void 0 : router.basename) || "/"
+                basename: baseUrl || ((_b = router == null ? void 0 : router.historyOptions) == null ? void 0 : _b.basename) || (router == null ? void 0 : router.basename) || "/"
               }
             )
           );
@@ -145,11 +152,7 @@ var cli_default = ({
                 "Access-Control-Allow-Origin": "*"
               }
             },
-            webpackChain: (chain, {
-              webpack,
-              env = process.env.NODE_ENV || "development",
-              CHAIN_ID
-            }) => {
+            webpackChain: (chain, { webpack, env, CHAIN_ID }) => {
               var _a2, _b2, _c2, _d, _e;
               const resolveOptions = useResolvedConfigContext();
               if ((_a2 = resolveOptions == null ? void 0 : resolveOptions.deploy) == null ? void 0 : _a2.microFrontend) {

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

@@ -109,7 +109,7 @@ const makeRenderFunction = (code) => {
   const inGarfishToRender = `
   const { basename, props, dom, appName } = typeof arguments[0] === 'object' && arguments[0] || {};
   if (!canContinueRender({ dom, appName })) return null;
-  let { AppWrapper, mountNode } = generateAppWrapperAndRootDom({App, props, dom});
+  let { AppWrapper, mountNode } = generateAppWrapperAndRootDom({App, props: {...props, basename}, dom});
   `;
   return inGarfishToRender + code.replace(`router(`, `generateRouterPlugin(basename,`).replace("(App)", `(AppWrapper)`).replace(/MOUNT_ID/g, "mountNode").replace(
     `bootstrap(AppWrapper, mountNode, root`,

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

@@ -112,7 +112,14 @@ function getAppInstance(options, appInfo, manifest) {
     const location = (_f = (_e = context == null ? void 0 : context.router) == null ? void 0 : _e.useLocation) == null ? void 0 : _f.call(_e);
     let basename = (options == null ? void 0 : options.basename) || "/";
     if (matchs && matchs.length > 0) {
-      basename = pathJoin(basename, matchs[matchs.length - 1].pathname || "/");
+      const matchItem = __spreadValues({}, matchs[matchs.length - 1]);
+      for (const key in matchItem.params) {
+        matchItem.pathname = matchItem.pathname.replace(
+          new RegExp(`/${matchItem.params[key]}$`),
+          ""
+        );
+      }
+      basename = pathJoin(basename, matchItem.pathname || "/");
     } else if (match) {
       basename = pathJoin(basename, (match == null ? void 0 : match.path) || "/");
     }

package/dist/js/treeshaking/cli/index.js

@@ -183,7 +183,7 @@ var cli_default = function() {
                 },
                 resolvedConfig: function() {
                     var _ref = _asyncToGenerator(function(config) {
-                        var resolved, ref, masterApp, router, nConfig, ref1;
+                        var resolved, ref, masterApp, router, nConfig, ref1, ref2, useConfig, baseUrl;
                         return __generator(this, function(_state) {
                             resolved = config.resolved;
                             ref = getRuntimeConfig(resolved), masterApp = ref.masterApp, router = ref.router;
@@ -192,8 +192,13 @@ var cli_default = function() {
                             };
                             if (masterApp) {
                                 ;
+                                useConfig = useConfigContext();
+                                baseUrl = useConfig === null || useConfig === void 0 ? void 0 : (ref1 = useConfig.server) === null || ref1 === void 0 ? void 0 : ref1.baseUrl;
+                                if (Array.isArray(baseUrl)) {
+                                    throw new Error("Now Micro-Front-End mode dose not support multiple baseUrl, you can set it as a string");
+                                }
                                 setRuntimeConfig(nConfig.resolved, "masterApp", Object.assign(typeof masterApp === "object" ? _objectSpread({}, masterApp) : {}, {
-                                    basename: (router === null || router === void 0 ? void 0 : (ref1 = router.historyOptions) === null || ref1 === void 0 ? void 0 : ref1.basename) || (router === null || router === void 0 ? void 0 : router.basename) || "/"
+                                    basename: baseUrl || (router === null || router === void 0 ? void 0 : (ref2 = router.historyOptions) === null || ref2 === void 0 ? void 0 : ref2.basename) || (router === null || router === void 0 ? void 0 : router.basename) || "/"
                                 }));
                             }
                             logger("resolvedConfig", {
@@ -243,7 +248,7 @@ var cli_default = function() {
                                 }
                             },
                             webpackChain: function(chain, param) {
-                                var webpack = param.webpack, _env = param.env, env = _env === void 0 ? process.env.NODE_ENV || "development" : _env, CHAIN_ID = param.CHAIN_ID;
+                                var webpack = param.webpack, env = param.env, CHAIN_ID = param.CHAIN_ID;
                                 var ref, ref1;
                                 var resolveOptions = useResolvedConfigContext();
                                 if (resolveOptions === null || resolveOptions === void 0 ? void 0 : (ref = resolveOptions.deploy) === null || ref === void 0 ? void 0 : ref.microFrontend) {

package/dist/js/treeshaking/cli/utils.js

@@ -2,7 +2,7 @@ var makeProvider = function() {
     return "\nexport const provider = function ({basename, dom}) {\n  return {\n    render({basename, dom, props, appName}) {\n      render({ props, basename, dom, appName });\n    },\n    destroy({ dom }) {\n      const node = dom.querySelector('#' + MOUNT_ID) || dom;\n\n      if (node) {\n        if (IS_REACT18) {\n          root.unmount();\n        } else {\n          unmountComponentAtNode(node);\n        }\n      }\n    },\n    SubModuleComponent: (props) => {\n      const SubApp = render({props, basename});\n\n      return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);\n    },\n    jupiter_submodule_app_key: (props) => {\n      const SubApp = render({props, basename});\n\n      return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);\n    }\n  }\n};\n\nif (typeof __GARFISH_EXPORTS__ !== 'undefined') {\n  __GARFISH_EXPORTS__.provider = provider;\n}\n\nfunction canContinueRender ({ dom, appName }) {\n  var renderByGarfish =\n    typeof __GARFISH_EXPORTS__ !== 'undefined'\n    || typeof window !== 'undefined' && window.Garfish && window.Garfish.activeApps && window.Garfish.activeApps.some((app)=>app.appInfo.name === appName);\n  let renderByProvider = dom || appName;\n  if (renderByGarfish) {\n    // Runs in the Garfish environment and is rendered by the provider\n    if (renderByProvider) {\n      return true;\n    } else {\n      // Runs in the Garfish environment and is not rendered by the provider\n      return false;\n    }\n  } else {\n    // Running in a non-Garfish environment\n    return true;\n  }\n}\n\nfunction generateRouterPlugin (basename,routerConfig) {\n  if (basename) {\n    routerConfig.basename = basename;\n    if (routerConfig.supportHtml5History !== false) {\n      if (!routerConfig.historyOptions) {\n        routerConfig.historyOptions = {\n          basename: basename\n        };\n      } else {\n        routerConfig.historyOptions.basename = basename;\n      }\n    }\n  }\n  return router(routerConfig);\n}\n\nfunction generateAppWrapperAndRootDom ({ App, props: garfishProps, dom }) {\n  let AppWrapper = App;\n  if (garfishProps) {\n    AppWrapper = function (props) {\n      return React.createElement(App, { ...garfishProps, ...props });\n    };\n    AppWrapper = hoistNonReactStatics(AppWrapper, App);\n  }\n  const mountNode = dom ? (dom.querySelector('#' + MOUNT_ID) || dom) : document.getElementById(MOUNT_ID);\n  return { AppWrapper, mountNode }\n}\n";
 };
 var makeRenderFunction = function(code) {
-    var inGarfishToRender = "\n  const { basename, props, dom, appName } = typeof arguments[0] === 'object' && arguments[0] || {};\n  if (!canContinueRender({ dom, appName })) return null;\n  let { AppWrapper, mountNode } = generateAppWrapperAndRootDom({App, props, dom});\n  ";
+    var inGarfishToRender = "\n  const { basename, props, dom, appName } = typeof arguments[0] === 'object' && arguments[0] || {};\n  if (!canContinueRender({ dom, appName })) return null;\n  let { AppWrapper, mountNode } = generateAppWrapperAndRootDom({App, props: {...props, basename}, dom});\n  ";
     return inGarfishToRender + code.replace("router(", "generateRouterPlugin(basename,").replace("(App)", "(AppWrapper)").replace(/MOUNT_ID/g, "mountNode").replace("bootstrap(AppWrapper, mountNode, root", "bootstrap(AppWrapper, mountNode, root = IS_REACT18 ? ReactDOM.createRoot(mountNode) : null").replace("customBootstrap(AppWrapper)", "customBootstrap(AppWrapper, mountNode)");
 };
 function getRuntimeConfig(config) {

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

@@ -297,7 +297,11 @@ function getAppInstance(options, appInfo, manifest) {
         var location = context === null || context === void 0 ? void 0 : (ref4 = context.router) === null || ref4 === void 0 ? void 0 : (ref5 = ref4.useLocation) === null || ref5 === void 0 ? void 0 : ref5.call(ref4);
         var basename = (options === null || options === void 0 ? void 0 : options.basename) || "/";
         if (matchs && matchs.length > 0) {
-            basename = pathJoin(basename, matchs[matchs.length - 1].pathname || "/");
+            var matchItem = _objectSpread({}, matchs[matchs.length - 1]);
+            for(var key in matchItem.params){
+                matchItem.pathname = matchItem.pathname.replace(new RegExp("/".concat(matchItem.params[key], "$")), "");
+            }
+            basename = pathJoin(basename, matchItem.pathname || "/");
         } else if (match) {
             basename = pathJoin(basename, (match === null || match === void 0 ? void 0 : match.path) || "/");
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/plugin-garfish",
-  "description": "The meta-framework suite designed from scratch for frontend-focused modern web development.",
+  "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
   "bugs": "https://github.com/modern-js-dev/modern.js/issues",
   "repository": "modern-js-dev/modern.js",
@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.3.0",
+  "version": "2.4.0",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "typesVersions": {
@@ -63,10 +63,10 @@
     "garfish": "^1.8.1",
     "hoist-non-react-statics": "^3.3.2",
     "react-loadable": "^5.5.0",
-    "@modern-js/utils": "2.3.0"
+    "@modern-js/utils": "2.4.0"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^2.3.0"
+    "@modern-js/runtime": "^2.4.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -88,13 +88,13 @@
     "react-router-dom": "^6.6.0",
     "typescript": "^4",
     "webpack-chain": "^6.5.1",
-    "@modern-js/app-tools": "2.3.0",
-    "@modern-js/core": "2.3.0",
-    "@modern-js/runtime": "2.3.0",
-    "@modern-js/plugin-router-v5": "2.3.0",
-    "@modern-js/types": "2.3.0",
-    "@scripts/build": "2.3.0",
-    "@scripts/jest-config": "2.3.0"
+    "@modern-js/app-tools": "2.4.0",
+    "@modern-js/core": "2.4.0",
+    "@modern-js/runtime": "2.4.0",
+    "@modern-js/plugin-router-v5": "2.4.0",
+    "@modern-js/types": "2.4.0",
+    "@scripts/build": "2.4.0",
+    "@scripts/jest-config": "2.4.0"
   },
   "sideEffects": false,
   "modernConfig": {},