@modern-js/plugin-garfish 2.15.0 → 2.16.0

package/dist/cjs/deps/index.js

@@ -1,37 +1,14 @@
-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 deps_exports = {};
-__export(deps_exports, {
-  hoistNonReactStatics: () => import_hoist_non_react_statics.default
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(deps_exports);
-var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  hoistNonReactStatics
+Object.defineProperty(exports, "hoistNonReactStatics", {
+  enumerable: true,
+  get: () => _hoistnonreactstatics.default
 });
+const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}

package/dist/cjs/index.js

@@ -1,37 +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) => {
-  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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-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 src_exports = {};
-__export(src_exports, {
-  default: () => import_runtime.default
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(src_exports);
-var import_runtime = __toESM(require("./runtime"));
-__reExport(src_exports, require("./runtime"), module.exports);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: () => _runtime.default
+});
+const _runtime = /* @__PURE__ */ _interop_require_default(_export_star(require("./runtime"), exports));
+function _export_star(from, to) {
+  Object.keys(from).forEach(function(k) {
+    if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {
+      Object.defineProperty(to, k, {
+        enumerable: true,
+        get: function() {
+          return from[k];
+        }
+      });
+    }
+  });
+  return from;
+}
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}

package/dist/cjs/runtime/index.js

@@ -1,46 +1,26 @@
-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 runtime_exports = {};
-__export(runtime_exports, {
-  Garfish: () => import_garfish.default,
-  default: () => import_plugin.default,
-  garfish: () => import_garfish.default,
-  useModuleApp: () => import_useModuleApps.useModuleApp,
-  useModuleApps: () => import_useModuleApps.useModuleApps
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(runtime_exports);
-var import_plugin = __toESM(require("./plugin"));
-var import_useModuleApps = require("./useModuleApps");
-var import_garfish = __toESM(require("garfish"));
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  Garfish,
-  garfish,
-  useModuleApp,
-  useModuleApps
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  default: () => _plugin.default,
+  useModuleApps: () => _useModuleApps.useModuleApps,
+  useModuleApp: () => _useModuleApps.useModuleApp,
+  Garfish: () => _garfish.default,
+  garfish: () => _garfish.default
 });
+const _plugin = /* @__PURE__ */ _interop_require_default(require("./plugin"));
+const _useModuleApps = require("./useModuleApps");
+const _garfish = /* @__PURE__ */ _interop_require_default(require("garfish"));
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}

package/dist/cjs/runtime/loadable.js

@@ -1,28 +1,14 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var loadable_exports = {};
-__export(loadable_exports, {
-  Loadable: () => Loadable
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(loadable_exports);
-var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = require("react");
-var import_util = require("../util");
+Object.defineProperty(exports, "Loadable", {
+  enumerable: true,
+  get: () => Loadable
+});
+const _jsxruntime = require("react/jsx-runtime");
+const _react = require("react");
+const _util = require("../util");
 const DEFAULT_LOADABLE = {
   delay: 200,
   timeout: 1e4,
@@ -31,11 +17,11 @@ const DEFAULT_LOADABLE = {
 function Loadable(WrapComponent) {
   return function(defaultLoadable) {
     return function Lodable(props) {
-      var _a;
-      const { loadable = defaultLoadable != null ? defaultLoadable : DEFAULT_LOADABLE, ...otherProps } = props;
+      var _props_loadable;
+      const { loadable = defaultLoadable !== null && defaultLoadable !== void 0 ? defaultLoadable : DEFAULT_LOADABLE, ...otherProps } = props;
       let delayTimer = null;
       let timeoutTimer = null;
-      const [state, setState] = (0, import_react.useState)(() => {
+      const [state, setState] = (0, _react.useState)(() => {
         const { delay, timeout } = loadable;
         const initState = {
           error: null,
@@ -48,20 +34,24 @@ function Loadable(WrapComponent) {
             initState.pastDelay = true;
           } else {
             delayTimer = setTimeout(() => {
-              setStateWithMountCheck({ pastDelay: true });
+              setStateWithMountCheck({
+                pastDelay: true
+              });
             }, delay);
           }
         }
         if (typeof timeout === "number") {
           timeoutTimer = setTimeout(() => {
-            setStateWithMountCheck({ timedOut: true });
+            setStateWithMountCheck({
+              timedOut: true
+            });
           }, timeout);
         }
         return initState;
       });
-      const LoadingComponent = (_a = props.loadable) == null ? void 0 : _a.loading;
-      (0, import_react.useEffect)(() => {
-        (0, import_util.logger)("Loadable render state", {
+      const LoadingComponent = (_props_loadable = props.loadable) === null || _props_loadable === void 0 ? void 0 : _props_loadable.loading;
+      (0, _react.useEffect)(() => {
+        (0, _util.logger)("Loadable render state", {
           state,
           props: otherProps,
           loadable,
@@ -82,36 +72,38 @@ function Loadable(WrapComponent) {
           }
         };
       }, []);
-      const retry = (0, import_react.useCallback)(() => {
+      const retry = (0, _react.useCallback)(() => {
         setState({
           ...state,
           error: null,
           isLoading: true,
           timedOut: false
         });
-      }, [state]);
-      const setStateWithMountCheck = (0, import_react.useCallback)(
-        (newState) => {
-          setState((state2) => ({ ...state2, ...newState }));
-        },
-        [state]
-      );
+      }, [
+        state
+      ]);
+      const setStateWithMountCheck = (0, _react.useCallback)((newState) => {
+        setState((state2) => ({
+          ...state2,
+          ...newState
+        }));
+      }, [
+        state
+      ]);
       const showLoading = (state.isLoading || state.error) && LoadingComponent;
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
-        showLoading && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-          LoadingComponent,
-          {
+      return /* @__PURE__ */ (0, _jsxruntime.jsxs)(_jsxruntime.Fragment, {
+        children: [
+          showLoading && /* @__PURE__ */ (0, _jsxruntime.jsx)(LoadingComponent, {
             isLoading: state.isLoading,
             pastDelay: state.pastDelay,
             timedOut: state.timedOut,
-            error: state == null ? void 0 : state.error,
+            error: state === null || state === void 0 ? void 0 : state.error,
             retry
-          }
-        ),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-          WrapComponent,
-          {
-            style: { display: showLoading ? "none" : "block" },
+          }),
+          /* @__PURE__ */ (0, _jsxruntime.jsx)(WrapComponent, {
+            style: {
+              display: showLoading ? "none" : "block"
+            },
             setLoadingState: (props2) => {
               if (props2.error && !LoadingComponent) {
                 throw props2.error;
@@ -119,13 +111,9 @@ function Loadable(WrapComponent) {
               setStateWithMountCheck(props2);
             },
             ...otherProps
-          }
-        )
-      ] });
+          })
+        ]
+      });
     };
   };
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  Loadable
-});

package/dist/cjs/runtime/plugin.js

@@ -1,98 +1,104 @@
-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 plugin_exports = {};
-__export(plugin_exports, {
-  default: () => plugin_default
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(plugin_exports);
-var import_jsx_runtime = require("react/jsx-runtime");
-var import_garfish = __toESM(require("garfish"));
-var import_react = __toESM(require("react"));
-var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
-var import_util = require("../util");
-var import_Context = require("./utils/Context");
-var import_setExternal = __toESM(require("./utils/setExternal"));
-var import_MApp = require("./utils/MApp");
-var import_apps = require("./utils/apps");
+Object.defineProperty(
+  exports,
+  // export default garfishPlugin;
+  "default",
+  {
+    enumerable: true,
+    get: () => _default
+  }
+);
+const _jsxruntime = require("react/jsx-runtime");
+const _garfish = /* @__PURE__ */ _interop_require_default(require("garfish"));
+const _react = /* @__PURE__ */ _interop_require_default(require("react"));
+const _hoistnonreactstatics = /* @__PURE__ */ _interop_require_default(require("hoist-non-react-statics"));
+const _util = require("../util");
+const _Context = require("./utils/Context");
+const _setExternal = /* @__PURE__ */ _interop_require_default(require("./utils/setExternal"));
+const _MApp = require("./utils/MApp");
+const _apps = require("./utils/apps");
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+function _interop_require_default(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
 async function initOptions(manifest = {}, options) {
-  var _a, _b, _c;
+  var _window_modern_manifest, _window_modern_manifest1;
   let apps = options.apps || [];
-  if (manifest == null ? void 0 : manifest.modules) {
-    if ((manifest == null ? void 0 : manifest.modules.length) > 0) {
-      apps = manifest == null ? void 0 : manifest.modules;
+  if (manifest === null || manifest === void 0 ? void 0 : manifest.modules) {
+    if ((manifest === null || manifest === void 0 ? void 0 : manifest.modules.length) > 0) {
+      apps = manifest === null || manifest === void 0 ? void 0 : manifest.modules;
     }
-    (0, import_util.logger)("manifest modules", apps);
+    (0, _util.logger)("manifest modules", apps);
   }
-  if (manifest == null ? void 0 : manifest.getAppList) {
-    const getAppList = await (manifest == null ? void 0 : manifest.getAppList(manifest));
+  if (manifest === null || manifest === void 0 ? void 0 : manifest.getAppList) {
+    const getAppList = await (manifest === null || manifest === void 0 ? void 0 : manifest.getAppList(manifest));
     if (getAppList.length > 0) {
       apps = getAppList;
     }
-    (0, import_util.logger)("getAppList modules", apps);
+    (0, _util.logger)("getAppList modules", apps);
   }
-  if (((_a = window == null ? void 0 : window.modern_manifest) == null ? void 0 : _a.modules) && ((_b = window == null ? void 0 : window.modern_manifest) == null ? void 0 : _b.modules.length) > 0) {
-    apps = (_c = window == null ? void 0 : window.modern_manifest) == null ? void 0 : _c.modules;
-    (0, import_util.logger)("modern_manifest", apps);
+  if ((window === null || window === void 0 ? void 0 : (_window_modern_manifest = window.modern_manifest) === null || _window_modern_manifest === void 0 ? void 0 : _window_modern_manifest.modules) && (window === null || window === void 0 ? void 0 : (_window_modern_manifest1 = window.modern_manifest) === null || _window_modern_manifest1 === void 0 ? void 0 : _window_modern_manifest1.modules.length) > 0) {
+    var _window_modern_manifest2;
+    apps = window === null || window === void 0 ? void 0 : (_window_modern_manifest2 = window.modern_manifest) === null || _window_modern_manifest2 === void 0 ? void 0 : _window_modern_manifest2.modules;
+    (0, _util.logger)("modern_manifest", apps);
   }
   return {
     ...options,
     apps
   };
 }
-var plugin_default = (config) => ({
+const _default = (config) => ({
   name: "@modern-js/garfish-plugin",
   setup: () => {
-    (0, import_setExternal.default)();
+    (0, _setExternal.default)();
     const { manifest, ...options } = config;
-    (0, import_util.logger)("createPlugin", config);
+    (0, _util.logger)("createPlugin", config);
     const promise = initOptions(manifest, options);
     return {
       hoc({ App }, next) {
-        class GetMicroFrontendApp extends import_react.default.Component {
+        class GetMicroFrontendApp extends _react.default.Component {
+          render() {
+            (0, _util.logger)("GarfishProvider state", this.state);
+            return /* @__PURE__ */ (0, _jsxruntime.jsx)(_Context.GarfishProvider, {
+              value: this.state,
+              children: /* @__PURE__ */ (0, _jsxruntime.jsx)(App, {
+                ...this.props
+              })
+            });
+          }
           constructor(props) {
             super(props);
-            this.state = {
+            _define_property(this, "state", {
               MApp: () => {
-                (0, import_util.logger)("MApp init Component Render");
-                return import_react.default.createElement("div");
+                (0, _util.logger)("MApp init Component Render");
+                return /* @__PURE__ */ _react.default.createElement("div");
               },
-              apps: new Proxy(
-                {},
-                {
-                  get() {
-                    return () => import_react.default.createElement("div");
-                  }
+              apps: new Proxy({}, {
+                get() {
+                  return () => /* @__PURE__ */ _react.default.createElement("div");
                 }
-              ),
+              }),
               appInfoList: []
-            };
+            });
             const load = async () => {
-              import_garfish.default.setOptions({
+              _garfish.default.setOptions({
                 ...options,
                 insulationVariable: [
                   ...options.insulationVariable || [],
@@ -101,14 +107,18 @@ var plugin_default = (config) => ({
                 apps: []
               });
               const GarfishConfig = await promise;
-              const { appInfoList, apps } = (0, import_apps.generateApps)(
-                GarfishConfig,
-                manifest
-              );
-              import_garfish.default.registerApp(appInfoList);
-              const MApp = (0, import_MApp.generateMApp)(GarfishConfig, manifest);
-              (0, import_util.logger)("initOptions result", { manifest, GarfishConfig });
-              (0, import_util.logger)("generateApps", { MApp, apps, appInfoList });
+              const { appInfoList, apps } = (0, _apps.generateApps)(GarfishConfig, manifest);
+              _garfish.default.registerApp(appInfoList);
+              const MApp = (0, _MApp.generateMApp)(GarfishConfig, manifest);
+              (0, _util.logger)("initOptions result", {
+                manifest,
+                GarfishConfig
+              });
+              (0, _util.logger)("generateApps", {
+                MApp,
+                apps,
+                appInfoList
+              });
               this.setState({
                 MApp,
                 apps,
@@ -117,17 +127,11 @@ var plugin_default = (config) => ({
             };
             load();
           }
-          render() {
-            (0, import_util.logger)("GarfishProvider state", this.state);
-            return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Context.GarfishProvider, { value: this.state, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, { ...this.props }) });
-          }
         }
         return next({
-          App: (0, import_hoist_non_react_statics.default)(GetMicroFrontendApp, App)
+          App: (0, _hoistnonreactstatics.default)(GetMicroFrontendApp, App)
         });
       }
     };
   }
 });
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});