@modern-js/plugin-garfish 1.22.6 → 1.22.7

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @modern-js/plugin-garfish
 
+## 1.22.7
+
+### Patch Changes
+
+- 7e959f9: fix(garfish): pass basename as props to root component
+  传递 basename 给子应用根组件
+- efae5b5: fix: avoid do not get provider when in micro-frontend mode
+  避免微前端模式下 provider 获取不到
+  - @modern-js/runtime@1.22.7
+  - @modern-js/utils@1.22.7
+
 ## 1.22.6
 
 ### Patch Changes

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

@@ -83,7 +83,7 @@ export 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`, 'bootstrap(AppWrapper, mountNode, root = IS_REACT18 ? ReactDOM.createRoot(mountNode) : null');
 }; // support legacy config
@@ -123,5 +123,8 @@ export const generateAsyncEntry = code => {
         return exports.provider.apply(null, args);
       };
       ${transformCode}
+      if (typeof __GARFISH_EXPORTS__ !== 'undefined') {
+        __GARFISH_EXPORTS__.provider = provider;
+      }
     `;
 };

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

@@ -96,7 +96,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`, 'bootstrap(AppWrapper, mountNode, root = IS_REACT18 ? ReactDOM.createRoot(mountNode) : null');
 }; // support legacy config
@@ -141,6 +141,9 @@ const generateAsyncEntry = code => {
         return exports.provider.apply(null, args);
       };
       ${transformCode}
+      if (typeof __GARFISH_EXPORTS__ !== 'undefined') {
+        __GARFISH_EXPORTS__.provider = provider;
+      }
     `;
 };
 

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

@@ -2,7 +2,7 @@ export var makeProvider = function makeProvider() {
   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, dom }) {\n  let AppWrapper = App;\n  if (props) {\n    AppWrapper = function () {\n      return React.createElement(App, 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";
 };
 export var makeRenderFunction = function makeRenderFunction(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');
 }; // support legacy config
 
@@ -35,5 +35,5 @@ export function setRuntimeConfig(config, key, value) {
 }
 export var generateAsyncEntry = function generateAsyncEntry(code) {
   var transformCode = code.replace("import('./bootstrap.js');", "if (!window.__GARFISH__) { import('./bootstrap.js'); }");
-  return "\n      export const provider = async (...args) => {\n        const exports = await import('./bootstrap');\n        return exports.provider.apply(null, args);\n      };\n      ".concat(transformCode, "\n    ");
+  return "\n      export const provider = async (...args) => {\n        const exports = await import('./bootstrap');\n        return exports.provider.apply(null, args);\n      };\n      ".concat(transformCode, "\n      if (typeof __GARFISH_EXPORTS__ !== 'undefined') {\n        __GARFISH_EXPORTS__.provider = provider;\n      }\n    ");
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.22.6",
+  "version": "1.22.7",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/runtime/index.d.ts",
   "typesVersions": {
@@ -56,10 +56,10 @@
     "garfish": "^1.8.1",
     "hoist-non-react-statics": "^3.3.2",
     "react-loadable": "^5.5.0",
-    "@modern-js/utils": "1.22.6"
+    "@modern-js/utils": "1.22.7"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^1.22.6"
+    "@modern-js/runtime": "^1.22.7"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -82,11 +82,11 @@
     "react-router-dom": "^6.2.1",
     "typescript": "^4",
     "webpack-chain": "^6.5.1",
-    "@modern-js/core": "1.22.6",
-    "@modern-js/runtime": "1.22.6",
-    "@modern-js/types": "1.22.6",
-    "@scripts/build": "1.22.6",
-    "@scripts/jest-config": "1.22.6"
+    "@modern-js/core": "1.22.7",
+    "@modern-js/runtime": "1.22.7",
+    "@modern-js/types": "1.22.7",
+    "@scripts/build": "1.22.7",
+    "@scripts/jest-config": "1.22.7"
   },
   "sideEffects": false,
   "modernConfig": {},