@modern-js/plugin-garfish 2.4.0 → 2.5.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @modern-js/plugin-garfish
 
+## 2.5.0
+
+### Patch Changes
+
+- 89ca6cc: refactor: merge build-config into scripts/build
+
+  refactor: 把 build-config 合并进 scripts/build
+
+- 30614fa: chore: modify package.json entry fields and build config
+  chore: 更改 package.json entry 字段以及构建配置
+- 97cc2d0: feat: pass origin bootstrap function to custom render
+  feat: 自定义渲染中传入原始 bootstrap 函数
+- b139eab: fix: avoid do not get provider when in micro-frontend mode
+  避免微前端模式下 provider 获取不到
+- Updated dependencies [89ca6cc]
+- Updated dependencies [7cb8bb4]
+- Updated dependencies [30614fa]
+- Updated dependencies [7a25271]
+- Updated dependencies [8871bb8]
+- Updated dependencies [1b0ce87]
+- Updated dependencies [0d75c27]
+- Updated dependencies [11c053b]
+- Updated dependencies [a0f2ab1]
+  - @modern-js/runtime@2.5.0
+  - @modern-js/utils@2.5.0
+
 ## 2.4.0
 
 ### Patch Changes

package/dist/{js/node → cjs}/cli/index.js

@@ -1,21 +1,7 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -29,26 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var cli_exports = {};
 __export(cli_exports, {
   default: () => cli_default,
@@ -68,10 +34,11 @@ function getDefaultMicroFrontedConfig(microFrontend) {
       moduleApp: ""
     };
   }
-  return __spreadValues({
+  return {
     enableHtmlEntry: true,
-    externalBasicLibrary: false
-  }, microFrontend);
+    externalBasicLibrary: false,
+    ...microFrontend
+  };
 }
 var cli_default = ({
   pluginName = "@modern-js/plugin-garfish",
@@ -84,12 +51,14 @@ var cli_default = ({
       validateSchema() {
         return import_utils.PLUGIN_SCHEMAS["@modern-js/plugin-garfish"];
       },
-      resolvedConfig: (config) => __async(void 0, null, function* () {
+      resolvedConfig: async (config) => {
         var _a, _b;
         const { resolved } = config;
         const { masterApp, router } = (0, import_utils2.getRuntimeConfig)(resolved);
         const nConfig = {
-          resolved: __spreadValues({}, resolved)
+          resolved: {
+            ...resolved
+          }
         };
         if (masterApp) {
           const useConfig = useConfigContext();
@@ -103,7 +72,7 @@ var cli_default = ({
             nConfig.resolved,
             "masterApp",
             Object.assign(
-              typeof masterApp === "object" ? __spreadValues({}, masterApp) : {},
+              typeof masterApp === "object" ? { ...masterApp } : {},
               {
                 basename: baseUrl || ((_b = router == null ? void 0 : router.historyOptions) == null ? void 0 : _b.basename) || (router == null ? void 0 : router.basename) || "/"
               }
@@ -117,7 +86,7 @@ var cli_default = ({
           server: nConfig.resolved.server
         });
         return nConfig;
-      }),
+      },
       config() {
         var _a, _b, _c;
         const useConfig = useConfigContext();

package/dist/{js/node → cjs}/cli/utils.js

@@ -115,8 +115,8 @@ const makeRenderFunction = (code) => {
     `bootstrap(AppWrapper, mountNode, root`,
     "bootstrap(AppWrapper, mountNode, root = IS_REACT18 ? ReactDOM.createRoot(mountNode) : null"
   ).replace(
-    `customBootstrap(AppWrapper)`,
-    "customBootstrap(AppWrapper, mountNode)"
+    `customBootstrap(AppWrapper`,
+    "customBootstrap(AppWrapper, mountNode"
   );
 };
 function getRuntimeConfig(config) {
@@ -149,6 +149,9 @@ const generateAsyncEntry = (code) => {
         return exports.provider.apply(null, args);
       };
       ${transformCode}
+      if (typeof __GARFISH_EXPORTS__ !== 'undefined') {
+        __GARFISH_EXPORTS__.provider = provider;
+      }
     `;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/{js/node → cjs}/runtime/loadable.js

@@ -1,36 +1,7 @@
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -60,8 +31,8 @@ const DEFAULT_LOADABLE = {
 function Loadable(WrapComponent) {
   return function(defaultLoadable) {
     return function Lodable(props) {
-      var _b;
-      const _a = props, { loadable = defaultLoadable != null ? defaultLoadable : DEFAULT_LOADABLE } = _a, otherProps = __objRest(_a, ["loadable"]);
+      var _a;
+      const { loadable = defaultLoadable != null ? defaultLoadable : DEFAULT_LOADABLE, ...otherProps } = props;
       let delayTimer = null;
       let timeoutTimer = null;
       const [state, setState] = (0, import_react.useState)(() => {
@@ -88,7 +59,7 @@ function Loadable(WrapComponent) {
         }
         return initState;
       });
-      const LoadingComponent = (_b = props.loadable) == null ? void 0 : _b.loading;
+      const LoadingComponent = (_a = props.loadable) == null ? void 0 : _a.loading;
       (0, import_react.useEffect)(() => {
         (0, import_util.logger)("Loadable render state", {
           state,
@@ -112,15 +83,16 @@ function Loadable(WrapComponent) {
         };
       }, []);
       const retry = (0, import_react.useCallback)(() => {
-        setState(__spreadProps(__spreadValues({}, state), {
+        setState({
+          ...state,
           error: null,
           isLoading: true,
           timedOut: false
-        }));
+        });
       }, [state]);
       const setStateWithMountCheck = (0, import_react.useCallback)(
         (newState) => {
-          setState((state2) => __spreadValues(__spreadValues({}, state2), newState));
+          setState((state2) => ({ ...state2, ...newState }));
         },
         [state]
       );
@@ -134,15 +106,16 @@ function Loadable(WrapComponent) {
             error: state == null ? void 0 : state.error,
             retry
           }),
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(WrapComponent, __spreadValues({
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(WrapComponent, {
             style: { display: showLoading ? "none" : "block" },
             setLoadingState: (props2) => {
               if (props2.error && !LoadingComponent) {
                 throw props2.error;
               }
               setStateWithMountCheck(props2);
-            }
-          }, otherProps))
+            },
+            ...otherProps
+          })
         ]
       });
     };

package/dist/{js/node → cjs}/runtime/plugin.js

@@ -1,38 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -50,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var plugin_exports = {};
 __export(plugin_exports, {
   default: () => plugin_default
@@ -84,37 +35,36 @@ 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");
-function initOptions() {
-  return __async(this, arguments, function* (manifest = {}, options) {
-    var _a, _b, _c;
-    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;
-      }
-      (0, import_util.logger)("manifest modules", apps);
-    }
-    if (manifest == null ? void 0 : manifest.getAppList) {
-      const getAppList = yield manifest == null ? void 0 : manifest.getAppList(manifest);
-      if (getAppList.length > 0) {
-        apps = getAppList;
-      }
-      (0, import_util.logger)("getAppList modules", apps);
+async function initOptions(manifest = {}, options) {
+  var _a, _b, _c;
+  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 (((_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);
+    (0, import_util.logger)("manifest modules", apps);
+  }
+  if (manifest == null ? void 0 : manifest.getAppList) {
+    const getAppList = await (manifest == null ? void 0 : manifest.getAppList(manifest));
+    if (getAppList.length > 0) {
+      apps = getAppList;
     }
-    return __spreadProps(__spreadValues({}, options), {
-      apps
-    });
-  });
+    (0, import_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);
+  }
+  return {
+    ...options,
+    apps
+  };
 }
 var plugin_default = (config) => ({
   name: "@modern-js/garfish-plugin",
   setup: () => {
     (0, import_setExternal.default)();
-    const _a = config, { manifest } = _a, options = __objRest(_a, ["manifest"]);
+    const { manifest, ...options } = config;
     (0, import_util.logger)("createPlugin", config);
     const promise = initOptions(manifest, options);
     return {
@@ -137,15 +87,16 @@ var plugin_default = (config) => ({
               ),
               appInfoList: []
             };
-            const load = () => __async(this, null, function* () {
-              import_garfish.default.setOptions(__spreadProps(__spreadValues({}, options), {
+            const load = async () => {
+              import_garfish.default.setOptions({
+                ...options,
                 insulationVariable: [
                   ...options.insulationVariable || [],
                   "_SERVER_DATA"
                 ],
                 apps: []
-              }));
-              const GarfishConfig = yield promise;
+              });
+              const GarfishConfig = await promise;
               const { appInfoList, apps } = (0, import_apps.generateApps)(
                 GarfishConfig,
                 manifest
@@ -159,14 +110,16 @@ var plugin_default = (config) => ({
                 apps,
                 appInfoList
               });
-            });
+            };
             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, __spreadValues({}, this.props))
+              children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {
+                ...this.props
+              })
             });
           }
         }

package/dist/{js/node → cjs}/runtime/useModuleApps.js

@@ -2,22 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -46,15 +32,17 @@ var import_util = require("../util");
 var import_Context = require("./utils/Context");
 function useModuleApps() {
   const { apps, MApp, appInfoList } = (0, import_react.useContext)(import_Context.GarfishContext);
-  (0, import_util.logger)("call useModuleApps", __spreadValues({
+  (0, import_util.logger)("call useModuleApps", {
     MApp,
-    apps: appInfoList
-  }, apps));
+    apps: appInfoList,
+    ...apps
+  });
   const Info = new Proxy(
-    __spreadValues({
+    {
       MApp,
-      apps: appInfoList
-    }, apps),
+      apps: appInfoList,
+      ...apps
+    },
     {
       get(target, p, receiver) {
         if (typeof p === "string" && p in target) {

package/dist/{js/node → cjs}/runtime/utils/MApp.js

@@ -2,34 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -135,7 +109,7 @@ function generateMApp(options, manifest) {
           return {
             mount: (appInfo) => {
               const transferProps = this.filterTransferProps();
-              appInfo.props = __spreadValues(__spreadValues({}, appInfo.props), transferProps);
+              appInfo.props = { ...appInfo.props, ...transferProps };
               if (componetRenderMode) {
                 this.setState({
                   SubModuleComponent: SubModuleComponent != null ? SubModuleComponent : jupiter_submodule_app_key
@@ -148,7 +122,7 @@ function generateMApp(options, manifest) {
             },
             unmount: (appInfo) => {
               const transferProps = this.filterTransferProps();
-              appInfo.props = __spreadValues(__spreadValues({}, appInfo.props), transferProps);
+              appInfo.props = { ...appInfo.props, ...transferProps };
               if (componetRenderMode) {
                 return void 0;
               }
@@ -171,14 +145,14 @@ function generateMApp(options, manifest) {
       (0, import_util.logger)("MApp componentWillUnmount");
     }
     filterTransferProps() {
-      const _a = this.props, { style, setLoadingState } = _a, others = __objRest(_a, ["style", "setLoadingState"]);
+      const { style, setLoadingState, ...others } = this.props;
       return others;
     }
     render() {
       const { style } = this.props;
       const { SubModuleComponent } = this.state;
       return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
-        style: __spreadValues({}, style),
+        style: { ...style },
         id: (0, import_util.generateSubAppContainerKey)(),
         children: SubModuleComponent && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SubModuleComponent, {})
       });