@modern-js/plugin-garfish 2.11.0 → 2.13.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @modern-js/plugin-garfish
 
+## 2.13.0
+
+### Patch Changes
+
+- 4220c0e: feat: support global props in createApp and pass garfish props in
+  feat: createApp 支持全局属性，garfish 通过这个方式透传 garfish props
+- Updated dependencies [cad9676]
+- Updated dependencies [e9b1656]
+- Updated dependencies [4d413c4]
+- Updated dependencies [4220c0e]
+  - @modern-js/runtime@2.13.0
+  - @modern-js/utils@2.13.0
+
+## 2.12.0
+
+### Patch Changes
+
+- Updated dependencies [c2ca6c8]
+- Updated dependencies [0b05ec3]
+- Updated dependencies [6d86e34]
+- Updated dependencies [1aa0cb7]
+  - @modern-js/utils@2.12.0
+  - @modern-js/runtime@2.12.0
+
 ## 2.11.0
 
 ### Patch Changes

package/dist/cjs/cli/index.js

@@ -234,11 +234,7 @@ var cli_default = ({
         if (!((_a = config == null ? void 0 : config.deploy) == null ? void 0 : _a.microFrontend)) {
           return { entrypoint, code };
         }
-        const { nestedRoutesEntry, pageRoutesEntry } = entrypoint;
-        const nCode = (0, import_utils2.makeRenderFunction)(
-          code,
-          Boolean(nestedRoutesEntry || pageRoutesEntry)
-        );
+        const nCode = (0, import_utils2.makeRenderFunction)(code);
         (0, import_util.logger)("makeRenderFunction", nCode);
         return {
           entrypoint,

package/dist/cjs/cli/utils.js

@@ -93,42 +93,24 @@ function generateRouterPlugin (basename,routerConfig) {
   return router(routerConfig);
 }
 
-function generateAppWrapperAndRootDom ({ App, props: garfishProps, dom }) {
-  let AppWrapper = App;
-  if (garfishProps) {
-    AppWrapper = function (props) {
-      return React.createElement(App, { ...garfishProps, ...props });
-    };
-    AppWrapper = hoistNonReactStatics(AppWrapper, App);
-  }
+function generateRootDom ({ dom }) {
   const mountNode = dom ? (dom.querySelector('#' + MOUNT_ID) || dom) : document.getElementById(MOUNT_ID);
-  return { AppWrapper, mountNode }
+  return { mountNode }
 }
 `;
-const makeRenderFunction = (code, isNested) => {
+const makeRenderFunction = (code) => {
   const inGarfishToRender = `
   const { basename, props, dom, appName } = typeof arguments[0] === 'object' && arguments[0] || {};
   if (!canContinueRender({ dom, appName })) return null;
+  let { mountNode } = generateRootDom({dom});
   `;
-  const appWrapperCode = `let { AppWrapper, mountNode } = generateAppWrapperAndRootDom({App: ${isNested ? "AppWrapper" : "App"}, props: {...props, basename}, dom});`;
-  if (isNested) {
-    const codeString = inGarfishToRender + code.replace(`router(`, `generateRouterPlugin(basename,`).replace("(App)", `(AppWrapper)`).replace(/MOUNT_ID/g, "mountNode").replace(`if(!AppWrapper.init`, `${appWrapperCode}if(!AppWrapper.init`).replace(
-      `bootstrap(AppWrapper, mountNode, root`,
-      "bootstrap(AppWrapper, mountNode, root = IS_REACT18 ? ReactDOM.createRoot(mountNode) : null"
-    ).replace(
-      `customBootstrap(AppWrapper`,
-      "customBootstrap(AppWrapper, mountNode"
-    );
-    return codeString;
-  } else {
-    return inGarfishToRender + appWrapperCode + 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"
-    );
-  }
+  return inGarfishToRender + code.replace(`router(`, `generateRouterPlugin(basename,`).replace(/MOUNT_ID/g, "mountNode").replace(`createApp({`, "createApp({ props,").replace(
+    `bootstrap(AppWrapper, mountNode, root`,
+    "bootstrap(AppWrapper, mountNode, root = IS_REACT18 ? ReactDOM.createRoot(mountNode) : null"
+  ).replace(
+    `customBootstrap(AppWrapper`,
+    "customBootstrap(AppWrapper, mountNode"
+  );
 };
 function getRuntimeConfig(config) {
   var _a, _b;

package/dist/esm/cli/index.js

@@ -374,8 +374,7 @@ var cli_default = function() {
                             code: code
                         };
                     }
-                    var nestedRoutesEntry = entrypoint.nestedRoutesEntry, pageRoutesEntry = entrypoint.pageRoutesEntry;
-                    var nCode = makeRenderFunction(code, Boolean(nestedRoutesEntry || pageRoutesEntry));
+                    var nCode = makeRenderFunction(code);
                     logger("makeRenderFunction", nCode);
                     return {
                         entrypoint: entrypoint,

package/dist/esm/cli/utils.js

@@ -1,15 +1,9 @@
 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";
+    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 generateRootDom ({ dom }) {\n  const mountNode = dom ? (dom.querySelector('#' + MOUNT_ID) || dom) : document.getElementById(MOUNT_ID);\n  return { mountNode }\n}\n";
 };
-var makeRenderFunction = function(code, isNested) {
-    var inGarfishToRender = "\n  const { basename, props, dom, appName } = typeof arguments[0] === 'object' && arguments[0] || {};\n  if (!canContinueRender({ dom, appName })) return null;\n  ";
-    var appWrapperCode = "let { AppWrapper, mountNode } = generateAppWrapperAndRootDom({App: ".concat(isNested ? "AppWrapper" : "App", ", props: {...props, basename}, dom});");
-    if (isNested) {
-        var codeString = inGarfishToRender + code.replace("router(", "generateRouterPlugin(basename,").replace("(App)", "(AppWrapper)").replace(/MOUNT_ID/g, "mountNode").replace("if(!AppWrapper.init", "".concat(appWrapperCode, "if(!AppWrapper.init")).replace("bootstrap(AppWrapper, mountNode, root", "bootstrap(AppWrapper, mountNode, root = IS_REACT18 ? ReactDOM.createRoot(mountNode) : null").replace("customBootstrap(AppWrapper", "customBootstrap(AppWrapper, mountNode");
-        return codeString;
-    } else {
-        return inGarfishToRender + appWrapperCode + 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");
-    }
+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 { mountNode } = generateRootDom({dom});\n  ";
+    return inGarfishToRender + code.replace("router(", "generateRouterPlugin(basename,").replace(/MOUNT_ID/g, "mountNode").replace("createApp({", "createApp({ props,").replace("bootstrap(AppWrapper, mountNode, root", "bootstrap(AppWrapper, mountNode, root = IS_REACT18 ? ReactDOM.createRoot(mountNode) : null").replace("customBootstrap(AppWrapper", "customBootstrap(AppWrapper, mountNode");
 };
 function getRuntimeConfig(config) {
     var _config_runtime;

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

@@ -216,11 +216,7 @@ var cli_default = ({
         if (!((_a = config == null ? void 0 : config.deploy) == null ? void 0 : _a.microFrontend)) {
           return { entrypoint, code };
         }
-        const { nestedRoutesEntry, pageRoutesEntry } = entrypoint;
-        const nCode = makeRenderFunction(
-          code,
-          Boolean(nestedRoutesEntry || pageRoutesEntry)
-        );
+        const nCode = makeRenderFunction(code);
         logger("makeRenderFunction", nCode);
         return {
           entrypoint,

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

@@ -67,42 +67,24 @@ function generateRouterPlugin (basename,routerConfig) {
   return router(routerConfig);
 }
 
-function generateAppWrapperAndRootDom ({ App, props: garfishProps, dom }) {
-  let AppWrapper = App;
-  if (garfishProps) {
-    AppWrapper = function (props) {
-      return React.createElement(App, { ...garfishProps, ...props });
-    };
-    AppWrapper = hoistNonReactStatics(AppWrapper, App);
-  }
+function generateRootDom ({ dom }) {
   const mountNode = dom ? (dom.querySelector('#' + MOUNT_ID) || dom) : document.getElementById(MOUNT_ID);
-  return { AppWrapper, mountNode }
+  return { mountNode }
 }
 `;
-const makeRenderFunction = (code, isNested) => {
+const makeRenderFunction = (code) => {
   const inGarfishToRender = `
   const { basename, props, dom, appName } = typeof arguments[0] === 'object' && arguments[0] || {};
   if (!canContinueRender({ dom, appName })) return null;
+  let { mountNode } = generateRootDom({dom});
   `;
-  const appWrapperCode = `let { AppWrapper, mountNode } = generateAppWrapperAndRootDom({App: ${isNested ? "AppWrapper" : "App"}, props: {...props, basename}, dom});`;
-  if (isNested) {
-    const codeString = inGarfishToRender + code.replace(`router(`, `generateRouterPlugin(basename,`).replace("(App)", `(AppWrapper)`).replace(/MOUNT_ID/g, "mountNode").replace(`if(!AppWrapper.init`, `${appWrapperCode}if(!AppWrapper.init`).replace(
-      `bootstrap(AppWrapper, mountNode, root`,
-      "bootstrap(AppWrapper, mountNode, root = IS_REACT18 ? ReactDOM.createRoot(mountNode) : null"
-    ).replace(
-      `customBootstrap(AppWrapper`,
-      "customBootstrap(AppWrapper, mountNode"
-    );
-    return codeString;
-  } else {
-    return inGarfishToRender + appWrapperCode + 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"
-    );
-  }
+  return inGarfishToRender + code.replace(`router(`, `generateRouterPlugin(basename,`).replace(/MOUNT_ID/g, "mountNode").replace(`createApp({`, "createApp({ props,").replace(
+    `bootstrap(AppWrapper, mountNode, root`,
+    "bootstrap(AppWrapper, mountNode, root = IS_REACT18 ? ReactDOM.createRoot(mountNode) : null"
+  ).replace(
+    `customBootstrap(AppWrapper`,
+    "customBootstrap(AppWrapper, mountNode"
+  );
 };
 function getRuntimeConfig(config) {
   var _a, _b;

package/dist/types/cli/utils.d.ts

@@ -1,6 +1,6 @@
 import type { AppNormalizedConfig } from '@modern-js/app-tools';
 export declare const makeProvider: () => string;
-export declare const makeRenderFunction: (code: string, isNested: boolean) => string;
+export declare const makeRenderFunction: (code: string) => string;
 export declare function getRuntimeConfig(config: Partial<AppNormalizedConfig>): any;
 export declare function setRuntimeConfig(config: Partial<AppNormalizedConfig>, key: string, value: any): undefined;
 export declare const generateAsyncEntry: (code: string) => string;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.11.0",
+  "version": "2.13.0",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "typesVersions": {
@@ -66,10 +66,10 @@
     "garfish": "^1.8.1",
     "hoist-non-react-statics": "^3.3.2",
     "react-loadable": "^5.5.0",
-    "@modern-js/utils": "2.11.0"
+    "@modern-js/utils": "2.13.0"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^2.11.0"
+    "@modern-js/runtime": "^2.13.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.16.1",
@@ -86,13 +86,13 @@
     "react-router-dom": "^6.8.1",
     "typescript": "^4",
     "webpack-chain": "^6.5.1",
-    "@modern-js/app-tools": "2.11.0",
-    "@modern-js/core": "2.11.0",
-    "@modern-js/plugin-router-v5": "2.11.0",
-    "@modern-js/runtime": "2.11.0",
-    "@modern-js/types": "2.11.0",
-    "@scripts/build": "2.11.0",
-    "@scripts/jest-config": "2.11.0"
+    "@modern-js/app-tools": "2.13.0",
+    "@modern-js/core": "2.13.0",
+    "@modern-js/plugin-router-v5": "2.13.0",
+    "@modern-js/runtime": "2.13.0",
+    "@modern-js/types": "2.13.0",
+    "@scripts/build": "2.13.0",
+    "@scripts/jest-config": "2.13.0"
   },
   "sideEffects": false,
   "modernConfig": {},