@modern-js/plugin-garfish 2.4.1-beta.0 → 2.5.0

package/dist/{js/node → cjs}/runtime/utils/apps.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 apps_exports = {};
 __export(apps_exports, {
   generateApps: () => generateApps,
@@ -112,7 +63,9 @@ function getAppInstance(options, appInfo, manifest) {
     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) || "/";
     if (matchs && matchs.length > 0) {
-      const matchItem = __spreadValues({}, matchs[matchs.length - 1]);
+      const matchItem = {
+        ...matchs[matchs.length - 1]
+      };
       for (const key in matchItem.params) {
         matchItem.pathname = matchItem.pathname.replace(
           new RegExp(`/${matchItem.params[key]}$`),
@@ -133,8 +86,9 @@ function getAppInstance(options, appInfo, manifest) {
       }
     }, [location]);
     (0, import_react.useEffect)(() => {
-      const _a2 = props, { setLoadingState } = _a2, userProps = __objRest(_a2, ["setLoadingState"]);
-      const loadAppOptions = __spreadProps(__spreadValues({}, appInfo), {
+      const { setLoadingState, ...userProps } = props;
+      const loadAppOptions = {
+        ...appInfo,
         insulationVariable: [
           ...appInfo.insulationVariable || [],
           "_SERVER_DATA"
@@ -142,7 +96,10 @@ function getAppInstance(options, appInfo, manifest) {
         domGetter: `#${domId}`,
         basename,
         cache: true,
-        props: __spreadValues(__spreadValues({}, appInfo.props), userProps),
+        props: {
+          ...appInfo.props,
+          ...userProps
+        },
         customLoader: (provider) => {
           const {
             render,
@@ -170,7 +127,7 @@ function getAppInstance(options, appInfo, manifest) {
             }
           };
         }
-      });
+      };
       setLoadingState({
         isLoading: true,
         error: null
@@ -178,51 +135,49 @@ function getAppInstance(options, appInfo, manifest) {
       (0, import_util.logger)(`MicroApp Garfish.loadApp "${appInfo.name}"`, {
         loadAppOptions
       });
-      function renderApp() {
-        return __async(this, null, function* () {
-          try {
-            const appInstance = yield import_garfish.default.loadApp(
-              appInfo.name,
-              loadAppOptions
+      async function renderApp() {
+        try {
+          const appInstance = await import_garfish.default.loadApp(
+            appInfo.name,
+            loadAppOptions
+          );
+          if (!appInstance) {
+            throw new Error(
+              `MicroApp Garfish.loadApp "${appInfo.name}" result is null`
             );
-            if (!appInstance) {
-              throw new Error(
-                `MicroApp Garfish.loadApp "${appInfo.name}" result is null`
-              );
-            }
-            appRef.current = appInstance;
-            setLoadingState({
-              isLoading: false
+          }
+          appRef.current = appInstance;
+          setLoadingState({
+            isLoading: false
+          });
+          if (appInstance.mounted && appInstance.appInfo.cache) {
+            (0, import_util.logger)(`MicroApp Garfish.loadApp "${appInfo.name}" show`, {
+              appInfo: appInstance.appInfo,
+              appInstance
             });
-            if (appInstance.mounted && appInstance.appInfo.cache) {
-              (0, import_util.logger)(`MicroApp Garfish.loadApp "${appInfo.name}" show`, {
-                appInfo: appInstance.appInfo,
-                appInstance
-              });
-              yield appInstance == null ? void 0 : appInstance.show();
-            } else {
-              (0, import_util.logger)(`MicroApp Garfish.loadApp "${appInfo.name}" mount`, {
-                appInfo: appInstance.appInfo,
-                appInstance
-              });
-              yield appInstance == null ? void 0 : appInstance.mount();
-            }
-          } catch (error) {
-            setLoadingState({
-              isLoading: true,
-              error
+            await (appInstance == null ? void 0 : appInstance.show());
+          } else {
+            (0, import_util.logger)(`MicroApp Garfish.loadApp "${appInfo.name}" mount`, {
+              appInfo: appInstance.appInfo,
+              appInstance
             });
+            await (appInstance == null ? void 0 : appInstance.mount());
           }
-        });
+        } catch (error) {
+          setLoadingState({
+            isLoading: true,
+            error
+          });
+        }
       }
       renderApp();
       return () => {
-        var _a3, _b2;
+        var _a2, _b2;
         if (appRef.current) {
           const { appInfo: appInfo2 } = appRef.current;
           if (appInfo2.cache) {
             (0, import_util.logger)(`MicroApp Garfish.loadApp "${appInfo2.name}" hide`);
-            (_a3 = appRef.current) == null ? void 0 : _a3.hide();
+            (_a2 = appRef.current) == null ? void 0 : _a2.hide();
           } else {
             (0, import_util.logger)(`MicroApp Garfish.loadApp "${appInfo2.name}" unmount`);
             (_b2 = appRef.current) == null ? void 0 : _b2.unmount();

package/dist/{js/treeshaking → esm}/cli/utils.js

@@ -3,7 +3,7 @@ var makeProvider = function() {
 };
 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 { AppWrapper, mountNode } = generateAppWrapperAndRootDom({App, props: {...props, basename}, dom});\n  ";
-    return inGarfishToRender + 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("(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");
 };
 function getRuntimeConfig(config) {
     var _config_runtime;
@@ -27,6 +27,6 @@ function setRuntimeConfig(config, key, value) {
 }
 var generateAsyncEntry = function(code) {
     var transformCode = code.replace("import('./bootstrap.js');", "if (!window.__GARFISH__) { import('./bootstrap.js'); }");
-    return "\n      export const provider = async (...args) => {\n        const exports = await import('./bootstrap');\n        return exports.provider.apply(null, args);\n      };\n      ".concat(transformCode, "\n    ");
+    return "\n      export const provider = async (...args) => {\n        const exports = await import('./bootstrap');\n        return exports.provider.apply(null, args);\n      };\n      ".concat(transformCode, "\n      if (typeof __GARFISH_EXPORTS__ !== 'undefined') {\n        __GARFISH_EXPORTS__.provider = provider;\n      }\n    ");
 };
 export { generateAsyncEntry, getRuntimeConfig, makeProvider, makeRenderFunction, setRuntimeConfig };

package/dist/{js/modern → esm-node}/cli/index.js

@@ -1,39 +1,3 @@
-var __defProp = Object.defineProperty;
-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 __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());
-  });
-};
 import { createRuntimeExportsUtils, PLUGIN_SCHEMAS } from "@modern-js/utils";
 import { logger } from "../util";
 import {
@@ -52,10 +16,11 @@ function getDefaultMicroFrontedConfig(microFrontend) {
       moduleApp: ""
     };
   }
-  return __spreadValues({
+  return {
     enableHtmlEntry: true,
-    externalBasicLibrary: false
-  }, microFrontend);
+    externalBasicLibrary: false,
+    ...microFrontend
+  };
 }
 var cli_default = ({
   pluginName = "@modern-js/plugin-garfish",
@@ -68,12 +33,14 @@ var cli_default = ({
       validateSchema() {
         return 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 } = getRuntimeConfig(resolved);
         const nConfig = {
-          resolved: __spreadValues({}, resolved)
+          resolved: {
+            ...resolved
+          }
         };
         if (masterApp) {
           const useConfig = useConfigContext();
@@ -87,7 +54,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) || "/"
               }
@@ -101,7 +68,7 @@ var cli_default = ({
           server: nConfig.resolved.server
         });
         return nConfig;
-      }),
+      },
       config() {
         var _a, _b, _c;
         const useConfig = useConfigContext();

package/dist/{js/modern → esm-node}/cli/utils.js

@@ -89,8 +89,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) {
@@ -123,6 +123,9 @@ const generateAsyncEntry = (code) => {
         return exports.provider.apply(null, args);
       };
       ${transformCode}
+      if (typeof __GARFISH_EXPORTS__ !== 'undefined') {
+        __GARFISH_EXPORTS__.provider = provider;
+      }
     `;
 };
 export {

package/dist/{js/modern → esm-node}/runtime/loadable.js

@@ -1,34 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-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;
-};
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { useState, useEffect, useCallback } from "react";
 import { logger } from "../util";
@@ -40,8 +9,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] = useState(() => {
@@ -68,7 +37,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;
       useEffect(() => {
         logger("Loadable render state", {
           state,
@@ -92,15 +61,16 @@ function Loadable(WrapComponent) {
         };
       }, []);
       const retry = useCallback(() => {
-        setState(__spreadProps(__spreadValues({}, state), {
+        setState({
+          ...state,
           error: null,
           isLoading: true,
           timedOut: false
-        }));
+        });
       }, [state]);
       const setStateWithMountCheck = useCallback(
         (newState) => {
-          setState((state2) => __spreadValues(__spreadValues({}, state2), newState));
+          setState((state2) => ({ ...state2, ...newState }));
         },
         [state]
       );
@@ -114,15 +84,16 @@ function Loadable(WrapComponent) {
             error: state == null ? void 0 : state.error,
             retry
           }),
-          /* @__PURE__ */ jsx(WrapComponent, __spreadValues({
+          /* @__PURE__ */ jsx(WrapComponent, {
             style: { display: showLoading ? "none" : "block" },
             setLoadingState: (props2) => {
               if (props2.error && !LoadingComponent) {
                 throw props2.error;
               }
               setStateWithMountCheck(props2);
-            }
-          }, otherProps))
+            },
+            ...otherProps
+          })
         ]
       });
     };

package/dist/esm-node/runtime/plugin.js

@@ -0,0 +1,107 @@
+import { jsx } from "react/jsx-runtime";
+import GarfishInstance from "garfish";
+import React from "react";
+import hoistNonReactStatics from "hoist-non-react-statics";
+import { logger } from "../util";
+import { GarfishProvider } from "./utils/Context";
+import setExternal from "./utils/setExternal";
+import { generateMApp } from "./utils/MApp";
+import { generateApps } from "./utils/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;
+    }
+    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;
+    }
+    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;
+    logger("modern_manifest", apps);
+  }
+  return {
+    ...options,
+    apps
+  };
+}
+var plugin_default = (config) => ({
+  name: "@modern-js/garfish-plugin",
+  setup: () => {
+    setExternal();
+    const { manifest, ...options } = config;
+    logger("createPlugin", config);
+    const promise = initOptions(manifest, options);
+    return {
+      hoc({ App }, next) {
+        class GetMicroFrontendApp extends React.Component {
+          constructor(props) {
+            super(props);
+            this.state = {
+              MApp: () => {
+                logger("MApp init Component Render");
+                return React.createElement("div");
+              },
+              apps: new Proxy(
+                {},
+                {
+                  get() {
+                    return () => React.createElement("div");
+                  }
+                }
+              ),
+              appInfoList: []
+            };
+            const load = async () => {
+              GarfishInstance.setOptions({
+                ...options,
+                insulationVariable: [
+                  ...options.insulationVariable || [],
+                  "_SERVER_DATA"
+                ],
+                apps: []
+              });
+              const GarfishConfig = await promise;
+              const { appInfoList, apps } = generateApps(
+                GarfishConfig,
+                manifest
+              );
+              GarfishInstance.registerApp(appInfoList);
+              const MApp = generateMApp(GarfishConfig, manifest);
+              logger("initOptions result", { manifest, GarfishConfig });
+              logger("generateApps", { MApp, apps, appInfoList });
+              this.setState({
+                MApp,
+                apps,
+                appInfoList
+              });
+            };
+            load();
+          }
+          render() {
+            logger("GarfishProvider state", this.state);
+            return /* @__PURE__ */ jsx(GarfishProvider, {
+              value: this.state,
+              children: /* @__PURE__ */ jsx(App, {
+                ...this.props
+              })
+            });
+          }
+        }
+        return next({
+          App: hoistNonReactStatics(GetMicroFrontendApp, App)
+        });
+      }
+    };
+  }
+});
+export {
+  plugin_default as default
+};

package/dist/esm-node/runtime/useModuleApps.js

@@ -0,0 +1,36 @@
+import React, { useContext } from "react";
+import { logger } from "../util";
+import { GarfishContext } from "./utils/Context";
+function useModuleApps() {
+  const { apps, MApp, appInfoList } = useContext(GarfishContext);
+  logger("call useModuleApps", {
+    MApp,
+    apps: appInfoList,
+    ...apps
+  });
+  const Info = new Proxy(
+    {
+      MApp,
+      apps: appInfoList,
+      ...apps
+    },
+    {
+      get(target, p, receiver) {
+        if (typeof p === "string" && p in target) {
+          return Reflect.get(target, p, receiver);
+        }
+        return () => React.createElement("div");
+      }
+    }
+  );
+  return Info;
+}
+function useModuleApp() {
+  const { MApp } = useContext(GarfishContext);
+  logger("call useModuleApps", MApp);
+  return MApp;
+}
+export {
+  useModuleApp,
+  useModuleApps
+};

package/dist/{js/modern → esm-node}/runtime/utils/MApp.js

@@ -1,31 +1,3 @@
-var __defProp = Object.defineProperty;
-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 __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;
-};
 import { jsx } from "react/jsx-runtime";
 import React from "react";
 import Garfish from "garfish";
@@ -109,7 +81,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
@@ -122,7 +94,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;
               }
@@ -145,14 +117,14 @@ function generateMApp(options, manifest) {
       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__ */ jsx("div", {
-        style: __spreadValues({}, style),
+        style: { ...style },
         id: generateSubAppContainerKey(),
         children: SubModuleComponent && /* @__PURE__ */ jsx(SubModuleComponent, {})
       });