@modern-js/plugin-garfish 2.15.0 → 2.17.0

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

@@ -1,42 +1,69 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
   for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var apps_exports = {};
-__export(apps_exports, {
-  generateApps: () => generateApps,
-  pathJoin: () => pathJoin
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  pathJoin: () => pathJoin,
+  generateApps: () => generateApps
 });
-module.exports = __toCommonJS(apps_exports);
-var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = require("react");
-var import_runtime = require("@modern-js/runtime");
-var import_garfish = __toESM(require("garfish"));
-var import_util = require("../../util");
-var import_loadable = require("../loadable");
+const _jsxruntime = require("react/jsx-runtime");
+const _react = /* @__PURE__ */ _interop_require_wildcard(require("react"));
+const _runtime = require("@modern-js/runtime");
+const _garfish = /* @__PURE__ */ _interop_require_default(require("garfish"));
+const _util = require("../../util");
+const _loadable = require("../loadable");
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+function _getRequireWildcardCache(nodeInterop) {
+  if (typeof WeakMap !== "function")
+    return null;
+  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
+  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
+  return (_getRequireWildcardCache = function(nodeInterop2) {
+    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
+  })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+  if (!nodeInterop && obj && obj.__esModule) {
+    return obj;
+  }
+  if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+    return {
+      default: obj
+    };
+  }
+  var cache = _getRequireWildcardCache(nodeInterop);
+  if (cache && cache.has(obj)) {
+    return cache.get(obj);
+  }
+  var newObj = {};
+  var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+  for (var key in obj) {
+    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+      var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+      if (desc && (desc.get || desc.set)) {
+        Object.defineProperty(newObj, key, desc);
+      } else {
+        newObj[key] = obj[key];
+      }
+    }
+  }
+  newObj.default = obj;
+  if (cache) {
+    cache.set(obj, newObj);
+  }
+  return newObj;
+}
 function pathJoin(...args) {
   const res = args.reduce((res2, path) => {
     let nPath = path;
@@ -57,39 +84,38 @@ function pathJoin(...args) {
 function getAppInstance(options, appInfo, manifest) {
   let locationHref = "";
   function MicroApp(props) {
-    var _a, _b, _c, _d, _e, _f;
-    const appRef = (0, import_react.useRef)(null);
-    const domId = (0, import_util.generateSubAppContainerKey)(appInfo);
-    const [SubModuleComponent, setSubModuleComponent] = (0, import_react.useState)();
-    const context = (0, import_react.useContext)(import_runtime.RuntimeReactContext);
-    const match = (_b = (_a = context == null ? void 0 : context.router) == null ? void 0 : _a.useRouteMatch) == null ? void 0 : _b.call(_a);
-    const matchs = (_d = (_c = context == null ? void 0 : context.router) == null ? void 0 : _c.useMatches) == null ? void 0 : _d.call(_c);
-    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) || "/";
+    var _context_router, _context_router_useRouteMatch, _context_router1, _context_router_useMatches, _context_router2, _context_router_useLocation;
+    const appRef = (0, _react.useRef)(null);
+    const domId = (0, _util.generateSubAppContainerKey)(appInfo);
+    const [SubModuleComponent, setSubModuleComponent] = (0, _react.useState)();
+    const context = (0, _react.useContext)(_runtime.RuntimeReactContext);
+    const match = context === null || context === void 0 ? void 0 : (_context_router = context.router) === null || _context_router === void 0 ? void 0 : (_context_router_useRouteMatch = _context_router.useRouteMatch) === null || _context_router_useRouteMatch === void 0 ? void 0 : _context_router_useRouteMatch.call(_context_router);
+    const matchs = context === null || context === void 0 ? void 0 : (_context_router1 = context.router) === null || _context_router1 === void 0 ? void 0 : (_context_router_useMatches = _context_router1.useMatches) === null || _context_router_useMatches === void 0 ? void 0 : _context_router_useMatches.call(_context_router1);
+    const location = context === null || context === void 0 ? void 0 : (_context_router2 = context.router) === null || _context_router2 === void 0 ? void 0 : (_context_router_useLocation = _context_router2.useLocation) === null || _context_router_useLocation === void 0 ? void 0 : _context_router_useLocation.call(_context_router2);
+    let basename = (options === null || options === void 0 ? void 0 : options.basename) || "/";
     if (matchs && matchs.length > 0) {
       const matchItem = {
         ...matchs[matchs.length - 1]
       };
       for (const key in matchItem.params) {
-        matchItem.pathname = matchItem.pathname.replace(
-          new RegExp(`/${matchItem.params[key]}$`),
-          ""
-        );
+        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) || "/");
+      basename = pathJoin(basename, (match === null || match === void 0 ? void 0 : match.path) || "/");
     }
-    (0, import_react.useEffect)(() => {
-      if (location && locationHref !== location.pathname && !import_garfish.default.running) {
+    (0, _react.useEffect)(() => {
+      if (location && locationHref !== location.pathname && !_garfish.default.running) {
         locationHref = location.pathname;
         const popStateEvent = new PopStateEvent("popstate");
         popStateEvent.garfish = true;
         dispatchEvent(popStateEvent);
-        (0, import_util.logger)(`MicroApp Garfish.loadApp popstate`);
+        (0, _util.logger)(`MicroApp Garfish.loadApp popstate`);
       }
-    }, [location]);
-    (0, import_react.useEffect)(() => {
+    }, [
+      location
+    ]);
+    (0, _react.useEffect)(() => {
       const { setLoadingState, ...userProps } = props;
       const loadAppOptions = {
         ...appInfo,
@@ -105,29 +131,24 @@ function getAppInstance(options, appInfo, manifest) {
           ...userProps
         },
         customLoader: (provider) => {
-          const {
-            render,
-            destroy,
-            SubModuleComponent: SubModuleComponent2,
-            jupiter_submodule_app_key
-          } = provider;
-          const componetRenderMode = (manifest == null ? void 0 : manifest.componentRender) && (SubModuleComponent2 || jupiter_submodule_app_key);
+          const { render, destroy, SubModuleComponent: SubModuleComponent2, jupiter_submodule_app_key } = provider;
+          const componetRenderMode = (manifest === null || manifest === void 0 ? void 0 : manifest.componentRender) && (SubModuleComponent2 || jupiter_submodule_app_key);
           return {
             mount: (...props2) => {
               if (componetRenderMode) {
                 setSubModuleComponent(SubModuleComponent2);
                 return void 0;
               } else {
-                (0, import_util.logger)("MicroApp customer render", props2);
-                return render == null ? void 0 : render.apply(provider, props2);
+                (0, _util.logger)("MicroApp customer render", props2);
+                return render === null || render === void 0 ? void 0 : render.apply(provider, props2);
               }
             },
             unmount(...props2) {
               if (componetRenderMode) {
                 return void 0;
               }
-              (0, import_util.logger)("MicroApp customer destroy", props2);
-              return destroy == null ? void 0 : destroy.apply(provider, props2);
+              (0, _util.logger)("MicroApp customer destroy", props2);
+              return destroy === null || destroy === void 0 ? void 0 : destroy.apply(provider, props2);
             }
           };
         }
@@ -136,36 +157,31 @@ function getAppInstance(options, appInfo, manifest) {
         isLoading: true,
         error: null
       });
-      (0, import_util.logger)(`MicroApp Garfish.loadApp "${appInfo.name}"`, {
+      (0, _util.logger)(`MicroApp Garfish.loadApp "${appInfo.name}"`, {
         loadAppOptions
       });
       async function renderApp() {
         try {
-          const appInstance = await import_garfish.default.loadApp(
-            appInfo.name,
-            loadAppOptions
-          );
+          const appInstance = await _garfish.default.loadApp(appInfo.name, loadAppOptions);
           if (!appInstance) {
-            throw new Error(
-              `MicroApp Garfish.loadApp "${appInfo.name}" result is null`
-            );
+            throw new Error(`MicroApp Garfish.loadApp "${appInfo.name}" result is null`);
           }
           appRef.current = appInstance;
           setLoadingState({
             isLoading: false
           });
           if (appInstance.mounted && appInstance.appInfo.cache) {
-            (0, import_util.logger)(`MicroApp Garfish.loadApp "${appInfo.name}" show`, {
+            (0, _util.logger)(`MicroApp Garfish.loadApp "${appInfo.name}" show`, {
               appInfo: appInstance.appInfo,
               appInstance
             });
-            await (appInstance == null ? void 0 : appInstance.show());
+            await (appInstance === null || appInstance === void 0 ? void 0 : appInstance.show());
           } else {
-            (0, import_util.logger)(`MicroApp Garfish.loadApp "${appInfo.name}" mount`, {
+            (0, _util.logger)(`MicroApp Garfish.loadApp "${appInfo.name}" mount`, {
               appInfo: appInstance.appInfo,
               appInstance
             });
-            await (appInstance == null ? void 0 : appInstance.mount());
+            await (appInstance === null || appInstance === void 0 ? void 0 : appInstance.mount());
           }
         } catch (error) {
           setLoadingState({
@@ -176,35 +192,39 @@ function getAppInstance(options, appInfo, manifest) {
       }
       renderApp();
       return () => {
-        var _a2, _b2;
         if (appRef.current) {
           const { appInfo: appInfo2 } = appRef.current;
           if (appInfo2.cache) {
-            (0, import_util.logger)(`MicroApp Garfish.loadApp "${appInfo2.name}" hide`);
-            (_a2 = appRef.current) == null ? void 0 : _a2.hide();
+            var _appRef_current;
+            (0, _util.logger)(`MicroApp Garfish.loadApp "${appInfo2.name}" hide`);
+            (_appRef_current = appRef.current) === null || _appRef_current === void 0 ? void 0 : _appRef_current.hide();
           } else {
-            (0, import_util.logger)(`MicroApp Garfish.loadApp "${appInfo2.name}" unmount`);
-            (_b2 = appRef.current) == null ? void 0 : _b2.unmount();
+            var _appRef_current1;
+            (0, _util.logger)(`MicroApp Garfish.loadApp "${appInfo2.name}" unmount`);
+            (_appRef_current1 = appRef.current) === null || _appRef_current1 === void 0 ? void 0 : _appRef_current1.unmount();
           }
         }
       };
     }, []);
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { id: domId, children: SubModuleComponent && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SubModuleComponent, {}) }) });
+    return /* @__PURE__ */ (0, _jsxruntime.jsx)(_jsxruntime.Fragment, {
+      children: /* @__PURE__ */ (0, _jsxruntime.jsx)("div", {
+        id: domId,
+        children: SubModuleComponent && /* @__PURE__ */ (0, _jsxruntime.jsx)(SubModuleComponent, {})
+      })
+    });
   }
-  return (0, import_loadable.Loadable)(MicroApp)(manifest == null ? void 0 : manifest.loadable);
+  return (0, _loadable.Loadable)(MicroApp)(manifest === null || manifest === void 0 ? void 0 : manifest.loadable);
 }
 function generateApps(options, manifest) {
-  var _a;
+  var _options_apps;
   const apps = {};
-  (_a = options.apps) == null ? void 0 : _a.forEach((appInfo) => {
+  (_options_apps = options.apps) === null || _options_apps === void 0 ? void 0 : _options_apps.forEach((appInfo) => {
     const Component = getAppInstance(options, appInfo, manifest);
     appInfo.Component = Component;
     apps[appInfo.name] = Component;
   });
-  return { apps, appInfoList: options.apps || [] };
+  return {
+    apps,
+    appInfoList: options.apps || []
+  };
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  generateApps,
-  pathJoin
-});

package/dist/cjs/runtime/utils/setExternal.js

@@ -1,43 +1,25 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var setExternal_exports = {};
-__export(setExternal_exports, {
-  default: () => setExternal_default
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: () => _default
 });
-module.exports = __toCommonJS(setExternal_exports);
-var import_react = __toESM(require("react"));
-var import_react_dom = __toESM(require("react-dom"));
-var import_garfish = __toESM(require("garfish"));
-var import_util = require("../../util");
-var setExternal_default = () => {
-  (0, import_util.logger)("setExternal ", { react: import_react.default, "react-dom": import_react_dom.default });
-  import_garfish.default.setExternal("react", import_react.default);
-  import_garfish.default.setExternal("react-dom", import_react_dom.default);
+const _react = /* @__PURE__ */ _interop_require_default(require("react"));
+const _reactdom = /* @__PURE__ */ _interop_require_default(require("react-dom"));
+const _garfish = /* @__PURE__ */ _interop_require_default(require("garfish"));
+const _util = require("../../util");
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+const _default = () => {
+  (0, _util.logger)("setExternal ", {
+    react: _react.default,
+    "react-dom": _reactdom.default
+  });
+  _garfish.default.setExternal("react", _react.default);
+  _garfish.default.setExternal("react-dom", _reactdom.default);
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/cjs/util.js

@@ -1,46 +1,27 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
   for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var util_exports = {};
-__export(util_exports, {
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  logger: () => logger,
   SUBMODULE_APP_COMPONENT_KEY: () => SUBMODULE_APP_COMPONENT_KEY,
-  generateSubAppContainerKey: () => generateSubAppContainerKey,
-  logger: () => logger
+  generateSubAppContainerKey: () => generateSubAppContainerKey
 });
-module.exports = __toCommonJS(util_exports);
-var import_debug = __toESM(require("debug"));
-const logger = (0, import_debug.default)("modern-js:plugin-garfish");
+const _debug = /* @__PURE__ */ _interop_require_default(require("debug"));
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+const logger = (0, _debug.default)("modern-js:plugin-garfish");
 const SUBMODULE_APP_COMPONENT_KEY = "SubModuleComponent";
 function generateSubAppContainerKey(moduleInfo) {
-  return moduleInfo ? `modern_sub_app_container_${decodeURIComponent(moduleInfo == null ? void 0 : moduleInfo.name)}` : "modern_sub_app_container";
+  return moduleInfo ? `modern_sub_app_container_${decodeURIComponent(moduleInfo === null || moduleInfo === void 0 ? void 0 : moduleInfo.name)}` : "modern_sub_app_container";
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  SUBMODULE_APP_COMPONENT_KEY,
-  generateSubAppContainerKey,
-  logger
-});