@modern-js/plugin-garfish 2.15.0 → 2.16.0

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

@@ -1,4 +1,4 @@
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState, useEffect, useCallback } from "react";
 import { logger } from "../util";
 const DEFAULT_LOADABLE = {
@@ -6,11 +6,11 @@ const DEFAULT_LOADABLE = {
   timeout: 1e4,
   loading: null
 };
-function Loadable(WrapComponent) {
+export 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] = useState(() => {
@@ -26,18 +26,22 @@ 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;
+      const LoadingComponent = (_props_loadable = props.loadable) === null || _props_loadable === void 0 ? void 0 : _props_loadable.loading;
       useEffect(() => {
         logger("Loadable render state", {
           state,
@@ -67,29 +71,31 @@ function Loadable(WrapComponent) {
           isLoading: true,
           timedOut: false
         });
-      }, [state]);
-      const setStateWithMountCheck = useCallback(
-        (newState) => {
-          setState((state2) => ({ ...state2, ...newState }));
-        },
-        [state]
-      );
+      }, [
+        state
+      ]);
+      const setStateWithMountCheck = useCallback((newState) => {
+        setState((state2) => ({
+          ...state2,
+          ...newState
+        }));
+      }, [
+        state
+      ]);
       const showLoading = (state.isLoading || state.error) && LoadingComponent;
-      return /* @__PURE__ */ jsxs(Fragment, { children: [
-        showLoading && /* @__PURE__ */ jsx(
-          LoadingComponent,
-          {
+      return /* @__PURE__ */ _jsxs(_Fragment, {
+        children: [
+          showLoading && /* @__PURE__ */ _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__ */ jsx(
-          WrapComponent,
-          {
-            style: { display: showLoading ? "none" : "block" },
+          }),
+          /* @__PURE__ */ _jsx(WrapComponent, {
+            style: {
+              display: showLoading ? "none" : "block"
+            },
             setLoadingState: (props2) => {
               if (props2.error && !LoadingComponent) {
                 throw props2.error;
@@ -97,12 +103,9 @@ function Loadable(WrapComponent) {
               setStateWithMountCheck(props2);
             },
             ...otherProps
-          }
-        )
-      ] });
+          })
+        ]
+      });
     };
   };
 }
-export {
-  Loadable
-};

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

@@ -1,4 +1,17 @@
-import { jsx } from "react/jsx-runtime";
+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;
+}
+import { jsx as _jsx } from "react/jsx-runtime";
 import GarfishInstance from "garfish";
 import React from "react";
 import hoistNonReactStatics from "hoist-non-react-statics";
@@ -8,23 +21,24 @@ import setExternal from "./utils/setExternal";
 import { generateMApp } from "./utils/MApp";
 import { generateApps } from "./utils/apps";
 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;
     }
     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;
     }
     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;
+  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;
     logger("modern_manifest", apps);
   }
   return {
@@ -32,7 +46,7 @@ async function initOptions(manifest = {}, options) {
     apps
   };
 }
-var plugin_default = (config) => ({
+export default (config) => ({
   name: "@modern-js/garfish-plugin",
   setup: () => {
     setExternal();
@@ -42,23 +56,29 @@ var plugin_default = (config) => ({
     return {
       hoc({ App }, next) {
         class GetMicroFrontendApp extends React.Component {
+          render() {
+            logger("GarfishProvider state", this.state);
+            return /* @__PURE__ */ _jsx(GarfishProvider, {
+              value: this.state,
+              children: /* @__PURE__ */ _jsx(App, {
+                ...this.props
+              })
+            });
+          }
           constructor(props) {
             super(props);
-            this.state = {
+            _define_property(this, "state", {
               MApp: () => {
                 logger("MApp init Component Render");
-                return React.createElement("div");
+                return /* @__PURE__ */ React.createElement("div");
               },
-              apps: new Proxy(
-                {},
-                {
-                  get() {
-                    return () => React.createElement("div");
-                  }
+              apps: new Proxy({}, {
+                get() {
+                  return () => /* @__PURE__ */ React.createElement("div");
                 }
-              ),
+              }),
               appInfoList: []
-            };
+            });
             const load = async () => {
               GarfishInstance.setOptions({
                 ...options,
@@ -69,14 +89,18 @@ var plugin_default = (config) => ({
                 apps: []
               });
               const GarfishConfig = await promise;
-              const { appInfoList, apps } = generateApps(
-                GarfishConfig,
-                manifest
-              );
+              const { appInfoList, apps } = generateApps(GarfishConfig, manifest);
               GarfishInstance.registerApp(appInfoList);
               const MApp = generateMApp(GarfishConfig, manifest);
-              logger("initOptions result", { manifest, GarfishConfig });
-              logger("generateApps", { MApp, apps, appInfoList });
+              logger("initOptions result", {
+                manifest,
+                GarfishConfig
+              });
+              logger("generateApps", {
+                MApp,
+                apps,
+                appInfoList
+              });
               this.setState({
                 MApp,
                 apps,
@@ -85,10 +109,6 @@ var plugin_default = (config) => ({
             };
             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)
@@ -97,6 +117,3 @@ var plugin_default = (config) => ({
     };
   }
 });
-export {
-  plugin_default as default
-};

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

@@ -1,36 +1,29 @@
 import React, { useContext } from "react";
 import { logger } from "../util";
 import { GarfishContext } from "./utils/Context";
-function useModuleApps() {
+export 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");
+  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() {
+export function useModuleApp() {
   const { MApp } = useContext(GarfishContext);
   logger("call useModuleApps", MApp);
   return MApp;
 }
-export {
-  useModuleApp,
-  useModuleApps
-};

package/dist/esm-node/runtime/utils/Context.js

@@ -1,7 +1,4 @@
 import React from "react";
-const GarfishContext = React.createContext(null);
+const GarfishContext = /* @__PURE__ */ React.createContext(null);
 const GarfishProvider = GarfishContext.Provider;
-export {
-  GarfishContext,
-  GarfishProvider
-};
+export { GarfishContext, GarfishProvider };

package/dist/esm-node/runtime/utils/MApp.js

@@ -1,38 +1,43 @@
-import { jsx } from "react/jsx-runtime";
+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;
+}
+import { jsx as _jsx } from "react/jsx-runtime";
 import React from "react";
 import Garfish from "garfish";
 import { logger, generateSubAppContainerKey } from "../../util";
 import { Loadable } from "../loadable";
-function generateMApp(options, manifest) {
+export function generateMApp(options, manifest) {
   class MApp extends React.Component {
-    constructor() {
-      super(...arguments);
-      this.state = {
-        domId: generateSubAppContainerKey()
-      };
-    }
     componentDidMount() {
       const { domId } = this.state;
       const { setLoadingState } = this.props;
-      const {
-        beforeLoad,
-        beforeMount,
-        errorLoadApp,
-        errorMountApp,
-        errorUnmountApp
-      } = options;
-      Garfish.router.setRouterConfig({ listening: true });
+      const { beforeLoad, beforeMount, errorLoadApp, errorMountApp, errorUnmountApp } = options;
+      Garfish.router.setRouterConfig({
+        listening: true
+      });
       const garfishOptions = {
         domGetter: `#${domId}`,
         beforeLoad(appInfo, ...args) {
-          logger("MApp beforeLoad", [appInfo]);
+          logger("MApp beforeLoad", [
+            appInfo
+          ]);
           if (appInfo.activeWhen) {
             setLoadingState({
               isLoading: true,
               error: null
             });
           }
-          return beforeLoad == null ? void 0 : beforeLoad(appInfo, ...args);
+          return beforeLoad === null || beforeLoad === void 0 ? void 0 : beforeLoad(appInfo, ...args);
         },
         beforeMount(appInfo, ...args) {
           logger("MApp beforeMount", args);
@@ -41,7 +46,7 @@ function generateMApp(options, manifest) {
               isLoading: false
             });
           }
-          return beforeMount == null ? void 0 : beforeMount(appInfo, ...args);
+          return beforeMount === null || beforeMount === void 0 ? void 0 : beforeMount(appInfo, ...args);
         },
         errorLoadApp(error, appInfo, ...args) {
           logger("MApp errorLoadApp", error, args);
@@ -50,7 +55,7 @@ function generateMApp(options, manifest) {
               error
             });
           }
-          return errorLoadApp == null ? void 0 : errorLoadApp(error, appInfo, ...args);
+          return errorLoadApp === null || errorLoadApp === void 0 ? void 0 : errorLoadApp(error, appInfo, ...args);
         },
         errorMountApp(error, appInfo, ...args) {
           logger("MApp errorMountApp", error, args);
@@ -59,7 +64,7 @@ function generateMApp(options, manifest) {
               error
             });
           }
-          return errorMountApp == null ? void 0 : errorMountApp(error, appInfo, ...args);
+          return errorMountApp === null || errorMountApp === void 0 ? void 0 : errorMountApp(error, appInfo, ...args);
         },
         errorUnmountApp(error, appInfo, ...args) {
           logger("MApp errorUnmountApp", error, args);
@@ -68,38 +73,43 @@ function generateMApp(options, manifest) {
               error
             });
           }
-          return errorUnmountApp == null ? void 0 : errorUnmountApp(error, appInfo, ...args);
+          return errorUnmountApp === null || errorUnmountApp === void 0 ? void 0 : errorUnmountApp(error, appInfo, ...args);
         },
         customLoader: (provider) => {
-          const {
-            render,
-            destroy,
-            SubModuleComponent,
-            jupiter_submodule_app_key
-          } = provider;
-          const componetRenderMode = (manifest == null ? void 0 : manifest.componentRender) && (SubModuleComponent || jupiter_submodule_app_key);
+          const { render, destroy, SubModuleComponent, jupiter_submodule_app_key } = provider;
+          const componetRenderMode = (manifest === null || manifest === void 0 ? void 0 : manifest.componentRender) && (SubModuleComponent || jupiter_submodule_app_key);
           return {
             mount: (appInfo) => {
               const transferProps = this.filterTransferProps();
-              appInfo.props = { ...appInfo.props, ...transferProps };
+              appInfo.props = {
+                ...appInfo.props,
+                ...transferProps
+              };
               if (componetRenderMode) {
                 this.setState({
-                  SubModuleComponent: SubModuleComponent != null ? SubModuleComponent : jupiter_submodule_app_key
+                  SubModuleComponent: SubModuleComponent !== null && SubModuleComponent !== void 0 ? SubModuleComponent : jupiter_submodule_app_key
                 });
                 return void 0;
               } else {
                 logger("MicroApp customer render", appInfo);
-                return render == null ? void 0 : render.apply(provider, [appInfo]);
+                return render === null || render === void 0 ? void 0 : render.apply(provider, [
+                  appInfo
+                ]);
               }
             },
             unmount: (appInfo) => {
               const transferProps = this.filterTransferProps();
-              appInfo.props = { ...appInfo.props, ...transferProps };
+              appInfo.props = {
+                ...appInfo.props,
+                ...transferProps
+              };
               if (componetRenderMode) {
                 return void 0;
               }
               logger("MicroApp customer destroy", appInfo);
-              return destroy == null ? void 0 : destroy.apply(provider, [appInfo]);
+              return destroy === null || destroy === void 0 ? void 0 : destroy.apply(provider, [
+                appInfo
+              ]);
             }
           };
         }
@@ -113,7 +123,9 @@ function generateMApp(options, manifest) {
       }
     }
     componentWillUnmount() {
-      Garfish.router.setRouterConfig({ listening: false });
+      Garfish.router.setRouterConfig({
+        listening: false
+      });
       logger("MApp componentWillUnmount");
     }
     filterTransferProps() {
@@ -123,11 +135,20 @@ function generateMApp(options, manifest) {
     render() {
       const { style } = this.props;
       const { SubModuleComponent } = this.state;
-      return /* @__PURE__ */ jsx("div", { style: { ...style }, id: generateSubAppContainerKey(), children: SubModuleComponent && /* @__PURE__ */ jsx(SubModuleComponent, {}) });
+      return /* @__PURE__ */ _jsx("div", {
+        style: {
+          ...style
+        },
+        id: generateSubAppContainerKey(),
+        children: SubModuleComponent && /* @__PURE__ */ _jsx(SubModuleComponent, {})
+      });
+    }
+    constructor(...args) {
+      super(...args);
+      _define_property(this, "state", {
+        domId: generateSubAppContainerKey()
+      });
     }
   }
-  return Loadable(MApp)(manifest == null ? void 0 : manifest.loadable);
+  return Loadable(MApp)(manifest === null || manifest === void 0 ? void 0 : manifest.loadable);
 }
-export {
-  generateMApp
-};

package/dist/esm-node/runtime/utils/apps.js

@@ -1,10 +1,10 @@
-import { Fragment, jsx } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { useContext, useState, useEffect, useRef } from "react";
 import { RuntimeReactContext } from "@modern-js/runtime";
 import Garfish from "garfish";
 import { logger, generateSubAppContainerKey } from "../../util";
 import { Loadable } from "../loadable";
-function pathJoin(...args) {
+export function pathJoin(...args) {
   const res = args.reduce((res2, path) => {
     let nPath = path;
     if (!nPath || typeof nPath !== "string") {
@@ -24,28 +24,25 @@ function pathJoin(...args) {
 function getAppInstance(options, appInfo, manifest) {
   let locationHref = "";
   function MicroApp(props) {
-    var _a, _b, _c, _d, _e, _f;
+    var _context_router, _context_router_useRouteMatch, _context_router1, _context_router_useMatches, _context_router2, _context_router_useLocation;
     const appRef = useRef(null);
     const domId = generateSubAppContainerKey(appInfo);
     const [SubModuleComponent, setSubModuleComponent] = useState();
     const context = useContext(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) || "/";
+    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) || "/");
     }
     useEffect(() => {
       if (location && locationHref !== location.pathname && !Garfish.running) {
@@ -55,7 +52,9 @@ function getAppInstance(options, appInfo, manifest) {
         dispatchEvent(popStateEvent);
         logger(`MicroApp Garfish.loadApp popstate`);
       }
-    }, [location]);
+    }, [
+      location
+    ]);
     useEffect(() => {
       const { setLoadingState, ...userProps } = props;
       const loadAppOptions = {
@@ -72,13 +71,8 @@ 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) {
@@ -86,7 +80,7 @@ function getAppInstance(options, appInfo, manifest) {
                 return void 0;
               } else {
                 logger("MicroApp customer render", props2);
-                return render == null ? void 0 : render.apply(provider, props2);
+                return render === null || render === void 0 ? void 0 : render.apply(provider, props2);
               }
             },
             unmount(...props2) {
@@ -94,7 +88,7 @@ function getAppInstance(options, appInfo, manifest) {
                 return void 0;
               }
               logger("MicroApp customer destroy", props2);
-              return destroy == null ? void 0 : destroy.apply(provider, props2);
+              return destroy === null || destroy === void 0 ? void 0 : destroy.apply(provider, props2);
             }
           };
         }
@@ -108,14 +102,9 @@ function getAppInstance(options, appInfo, manifest) {
       });
       async function renderApp() {
         try {
-          const appInstance = await Garfish.loadApp(
-            appInfo.name,
-            loadAppOptions
-          );
+          const appInstance = await Garfish.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({
@@ -126,13 +115,13 @@ function getAppInstance(options, appInfo, manifest) {
               appInfo: appInstance.appInfo,
               appInstance
             });
-            await (appInstance == null ? void 0 : appInstance.show());
+            await (appInstance === null || appInstance === void 0 ? void 0 : appInstance.show());
           } else {
             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({
@@ -143,34 +132,39 @@ function getAppInstance(options, appInfo, manifest) {
       }
       renderApp();
       return () => {
-        var _a2, _b2;
         if (appRef.current) {
           const { appInfo: appInfo2 } = appRef.current;
           if (appInfo2.cache) {
+            var _appRef_current;
             logger(`MicroApp Garfish.loadApp "${appInfo2.name}" hide`);
-            (_a2 = appRef.current) == null ? void 0 : _a2.hide();
+            (_appRef_current = appRef.current) === null || _appRef_current === void 0 ? void 0 : _appRef_current.hide();
           } else {
+            var _appRef_current1;
             logger(`MicroApp Garfish.loadApp "${appInfo2.name}" unmount`);
-            (_b2 = appRef.current) == null ? void 0 : _b2.unmount();
+            (_appRef_current1 = appRef.current) === null || _appRef_current1 === void 0 ? void 0 : _appRef_current1.unmount();
           }
         }
       };
     }, []);
-    return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx("div", { id: domId, children: SubModuleComponent && /* @__PURE__ */ jsx(SubModuleComponent, {}) }) });
+    return /* @__PURE__ */ _jsx(_Fragment, {
+      children: /* @__PURE__ */ _jsx("div", {
+        id: domId,
+        children: SubModuleComponent && /* @__PURE__ */ _jsx(SubModuleComponent, {})
+      })
+    });
   }
-  return Loadable(MicroApp)(manifest == null ? void 0 : manifest.loadable);
+  return Loadable(MicroApp)(manifest === null || manifest === void 0 ? void 0 : manifest.loadable);
 }
-function generateApps(options, manifest) {
-  var _a;
+export function generateApps(options, manifest) {
+  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 || []
+  };
 }
-export {
-  generateApps,
-  pathJoin
-};