@modern-js/plugin-garfish 2.54.3 → 2.54.4

package/dist/cjs/cli/utils.js

@@ -80,7 +80,7 @@ function canContinueRender ({ dom, appName }) {
 
 function generateRouterPlugin (basename,routerConfig) {
   if (basename) {
-    routerConfig.originalBaseUrl = basename;
+    routerConfig.originalBaseUrl = basename.replace(/^\\/*/, "/");
     // for compatibility with react router v5
     routerConfig.basename = basename;
     if (routerConfig.supportHtml5History !== false) {

package/dist/esm/cli/utils.js

@@ -1,5 +1,84 @@
 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.originalBaseUrl = basename;\n    // for compatibility with react router v5\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, props, basename }) {\n  const mountNode = dom ? (dom.querySelector('#' + MOUNT_ID) || dom) : document.getElementById(MOUNT_ID);\n  const mergedProps = {\n    ...props,\n    basename,\n  }\n  return { mountNode, props: mergedProps }\n}\n";
+  return `
+export const provider = function ({basename, dom}) {
+  return {
+    render({basename, dom, props, appName}) {
+      render({ props, basename, dom, appName });
+    },
+    destroy({ dom }) {
+      const node = dom.querySelector('#' + MOUNT_ID) || dom;
+
+      if (node) {
+        if (IS_REACT18) {
+          root.unmount();
+        } else {
+          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;
+}
+
+function canContinueRender ({ dom, appName }) {
+  var renderByGarfish =
+    typeof __GARFISH_EXPORTS__ !== 'undefined'
+    || typeof window !== 'undefined' && window.Garfish && window.Garfish.activeApps && window.Garfish.activeApps.some((app)=>app.appInfo.name === appName);
+  let renderByProvider = dom || appName;
+  if (renderByGarfish) {
+    // Runs in the Garfish environment and is rendered by the provider
+    if (renderByProvider) {
+      return true;
+    } else {
+      // Runs in the Garfish environment and is not rendered by the provider
+      return false;
+    }
+  } else {
+    // Running in a non-Garfish environment
+    return true;
+  }
+}
+
+function generateRouterPlugin (basename,routerConfig) {
+  if (basename) {
+    routerConfig.originalBaseUrl = basename.replace(/^\\/*/, "/");
+    // for compatibility with react router v5
+    routerConfig.basename = basename;
+    if (routerConfig.supportHtml5History !== false) {
+      if (!routerConfig.historyOptions) {
+        routerConfig.historyOptions = {
+          basename: basename
+        };
+      } else {
+        routerConfig.historyOptions.basename = basename;
+      }
+    }
+  }
+  return router(routerConfig);
+}
+
+function generateRootDom ({ dom, props, basename }) {
+  const mountNode = dom ? (dom.querySelector('#' + MOUNT_ID) || dom) : document.getElementById(MOUNT_ID);
+  const mergedProps = {
+    ...props,
+    basename,
+  }
+  return { mountNode, props: mergedProps }
+}
+`;
 };
 var makeRenderFunction = function(code) {
   var inGarfishToRender = "\n  let { basename, props, dom, appName } = typeof arguments[0] === 'object' && arguments[0] || {};\n  if (!canContinueRender({ dom, appName })) return null;\n  const rootDomInfo = generateRootDom({dom, props, basename});\n  let mountNode = rootDomInfo.mountNode;\n  props = rootDomInfo.props;\n  ";

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

@@ -53,7 +53,7 @@ function canContinueRender ({ dom, appName }) {
 
 function generateRouterPlugin (basename,routerConfig) {
   if (basename) {
-    routerConfig.originalBaseUrl = basename;
+    routerConfig.originalBaseUrl = basename.replace(/^\\/*/, "/");
     // for compatibility with react router v5
     routerConfig.basename = basename;
     if (routerConfig.supportHtml5History !== false) {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.54.3",
+  "version": "2.54.4",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "typesVersions": {
@@ -70,15 +70,15 @@
     "hoist-non-react-statics": "^3.3.2",
     "react-loadable": "^5.5.0",
     "@swc/helpers": "0.5.3",
-    "@modern-js/utils": "2.54.3"
+    "@modern-js/utils": "2.54.4"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^2.54.3",
+    "@modern-js/runtime": "^2.54.4",
     "react": ">=17",
     "react-dom": ">=17"
   },
   "devDependencies": {
-    "@rsbuild/shared": "0.7.9",
+    "@rsbuild/shared": "0.7.10",
     "@testing-library/dom": "^8.14.0",
     "@testing-library/jest-dom": "^5.16.1",
     "@testing-library/react": "^13.4.0",
@@ -93,13 +93,13 @@
     "react-dom": "^18",
     "react-router-dom": "6.22.0",
     "typescript": "^5",
-    "@modern-js/plugin-router-v5": "2.54.3",
-    "@modern-js/app-tools": "2.54.3",
-    "@modern-js/core": "2.54.3",
-    "@modern-js/runtime": "2.54.3",
-    "@modern-js/types": "2.54.3",
-    "@scripts/build": "2.54.3",
-    "@scripts/jest-config": "2.54.3"
+    "@modern-js/app-tools": "2.54.4",
+    "@modern-js/core": "2.54.4",
+    "@modern-js/plugin-router-v5": "2.54.4",
+    "@modern-js/types": "2.54.4",
+    "@scripts/build": "2.54.4",
+    "@modern-js/runtime": "2.54.4",
+    "@scripts/jest-config": "2.54.4"
   },
   "sideEffects": false,
   "publishConfig": {