@modern-js/plugin-garfish 2.0.0-beta.3 → 2.0.0-beta.5

package/dist/js/modern/runtime/utils/MApp.js

@@ -1,30 +1,47 @@
-const _excluded = ["style", "setLoadingState"];
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-import React from 'react';
-// eslint-disable-next-line import/no-named-as-default
-import Garfish from 'garfish';
+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";
 import { logger, generateSubAppContainerKey } from "../../util";
 import { Loadable } from "../loadable";
-import { jsx as _jsx } from "react/jsx-runtime";
-export function generateMApp(options, manifest) {
+function generateMApp(options, manifest) {
   class MApp extends React.Component {
-    constructor(...args) {
-      super(...args);
-      _defineProperty(this, "state", {
+    constructor() {
+      super(...arguments);
+      this.state = {
         domId: generateSubAppContainerKey()
-      });
+      };
     }
     componentDidMount() {
-      const {
-        domId
-      } = this.state;
-      const {
-        setLoadingState
-      } = this.props;
+      const { domId } = this.state;
+      const { setLoadingState } = this.props;
       const {
         beforeLoad,
         beforeMount,
@@ -32,94 +49,90 @@ export function generateMApp(options, manifest) {
         errorMountApp,
         errorUnmountApp
       } = options;
-
-      // start auto render able
-      Garfish.router.setRouterConfig({
-        listening: true
-      });
+      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 || beforeLoad === void 0 ? void 0 : beforeLoad(appInfo, ...args);
+          return beforeLoad == null ? void 0 : beforeLoad(appInfo, ...args);
         },
         beforeMount(appInfo, ...args) {
-          logger('MApp beforeMount', args);
+          logger("MApp beforeMount", args);
           if (appInfo.activeWhen) {
             setLoadingState({
               isLoading: false
             });
           }
-          return beforeMount === null || beforeMount === void 0 ? void 0 : beforeMount(appInfo, ...args);
+          return beforeMount == null ? void 0 : beforeMount(appInfo, ...args);
         },
         errorLoadApp(error, appInfo, ...args) {
-          logger('MApp errorLoadApp', error, args);
+          logger("MApp errorLoadApp", error, args);
           if (appInfo.activeWhen) {
             setLoadingState({
               error
             });
           }
-          return errorLoadApp === null || errorLoadApp === void 0 ? void 0 : errorLoadApp(error, appInfo, ...args);
+          return errorLoadApp == null ? void 0 : errorLoadApp(error, appInfo, ...args);
         },
         errorMountApp(error, appInfo, ...args) {
-          logger('MApp errorMountApp', error, args);
+          logger("MApp errorMountApp", error, args);
           if (appInfo.activeWhen) {
             setLoadingState({
               error
             });
           }
-          return errorMountApp === null || errorMountApp === void 0 ? void 0 : errorMountApp(error, appInfo, ...args);
+          return errorMountApp == null ? void 0 : errorMountApp(error, appInfo, ...args);
         },
         errorUnmountApp(error, appInfo, ...args) {
-          logger('MApp errorUnmountApp', error, args);
+          logger("MApp errorUnmountApp", error, args);
           if (appInfo.activeWhen) {
             setLoadingState({
               error
             });
           }
-          return errorUnmountApp === null || errorUnmountApp === void 0 ? void 0 : errorUnmountApp(error, appInfo, ...args);
+          return errorUnmountApp == null ? void 0 : errorUnmountApp(error, appInfo, ...args);
         },
-        customLoader: provider => {
+        customLoader: (provider) => {
           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);
+          const componetRenderMode = (manifest == null ? void 0 : manifest.componentRender) && (SubModuleComponent || jupiter_submodule_app_key);
           return {
-            mount: appInfo => {
+            mount: (appInfo) => {
               const transferProps = this.filterTransferProps();
-              appInfo.props = _objectSpread(_objectSpread({}, appInfo.props), transferProps);
+              appInfo.props = __spreadValues(__spreadValues({}, appInfo.props), transferProps);
               if (componetRenderMode) {
                 this.setState({
-                  SubModuleComponent: SubModuleComponent !== null && SubModuleComponent !== void 0 ? SubModuleComponent : jupiter_submodule_app_key
+                  SubModuleComponent: SubModuleComponent != null ? SubModuleComponent : jupiter_submodule_app_key
                 });
-                return undefined;
+                return void 0;
               } else {
-                logger('MicroApp customer render', appInfo);
-                return render === null || render === void 0 ? void 0 : render.apply(provider, [appInfo]);
+                logger("MicroApp customer render", appInfo);
+                return render == null ? void 0 : render.apply(provider, [appInfo]);
               }
             },
-            unmount: appInfo => {
+            unmount: (appInfo) => {
               const transferProps = this.filterTransferProps();
-              appInfo.props = _objectSpread(_objectSpread({}, appInfo.props), transferProps);
+              appInfo.props = __spreadValues(__spreadValues({}, appInfo.props), transferProps);
               if (componetRenderMode) {
-                return undefined;
+                return void 0;
               }
-              logger('MicroApp customer destroy', appInfo);
-              return destroy === null || destroy === void 0 ? void 0 : destroy.apply(provider, [appInfo]);
+              logger("MicroApp customer destroy", appInfo);
+              return destroy == null ? void 0 : destroy.apply(provider, [appInfo]);
             }
           };
         }
       };
-      logger('MApp componentDidMount', {
+      logger("MApp componentDidMount", {
         garfishRunning: Garfish.running,
         garfishOptions
       });
@@ -128,34 +141,25 @@ export function generateMApp(options, manifest) {
       }
     }
     componentWillUnmount() {
-      // close auto render able
-      Garfish.router.setRouterConfig({
-        listening: false
-      });
-      logger('MApp componentWillUnmount');
+      Garfish.router.setRouterConfig({ listening: false });
+      logger("MApp componentWillUnmount");
     }
     filterTransferProps() {
-      const _this$props = this.props,
-        {
-          style,
-          setLoadingState
-        } = _this$props,
-        others = _objectWithoutProperties(_this$props, _excluded);
+      const _a = this.props, { style, setLoadingState } = _a, others = __objRest(_a, ["style", "setLoadingState"]);
       return others;
     }
     render() {
-      const {
-        style
-      } = this.props;
-      const {
-        SubModuleComponent
-      } = this.state;
-      return /*#__PURE__*/_jsx("div", {
-        style: _objectSpread({}, style),
+      const { style } = this.props;
+      const { SubModuleComponent } = this.state;
+      return /* @__PURE__ */ jsx("div", {
+        style: __spreadValues({}, style),
         id: generateSubAppContainerKey(),
-        children: SubModuleComponent && /*#__PURE__*/_jsx(SubModuleComponent, {})
+        children: SubModuleComponent && /* @__PURE__ */ jsx(SubModuleComponent, {})
       });
     }
   }
-  return Loadable(MApp)(manifest === null || manifest === void 0 ? void 0 : manifest.loadable);
-}
+  return Loadable(MApp)(manifest == null ? void 0 : manifest.loadable);
+}
+export {
+  generateMApp
+};

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

@@ -1,76 +1,138 @@
-const _excluded = ["match", "history", "setLoadingState"];
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-// The loading logic of the current component refers to react-loadable https://github.com/jamiebuilds/react-loadable
-import path from 'path';
-import React from 'react';
-// eslint-disable-next-line import/no-named-as-default
-import Garfish from 'garfish';
-import { withRouter } from '@modern-js/plugin-router-legacy';
-// import Loadable from 'react-loadable';
-
+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;
+};
+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 { Fragment, jsx } 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";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
+function pathJoin(...args) {
+  const res = args.reduce((res2, path) => {
+    let nPath = path;
+    if (!nPath || typeof nPath !== "string") {
+      return res2;
+    }
+    if (nPath[0] !== "/") {
+      nPath = `/${nPath}`;
+    }
+    const lastIndex = path.length - 1;
+    if (nPath[lastIndex] === "/") {
+      nPath = nPath.substring(0, lastIndex);
+    }
+    return res2 + nPath;
+  }, "");
+  return res || "/";
+}
 function getAppInstance(options, appInfo, manifest) {
-  let locationHref = '';
-  class MicroApp extends React.Component {
-    constructor(...args) {
-      super(...args);
-      _defineProperty(this, "state", {
-        appInstance: null,
-        domId: generateSubAppContainerKey(appInfo),
-        SubModuleComponent: undefined
-      });
-      _defineProperty(this, "unregisterHistoryListener", () => {});
+  let locationHref = "";
+  function MicroApp(props) {
+    var _a, _b, _c, _d, _e, _f;
+    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) || "/";
+    if (matchs && matchs.length > 0) {
+      basename = pathJoin(basename, matchs[matchs.length - 1].pathname || "/");
+    } else if (match) {
+      basename = pathJoin(basename, (match == null ? void 0 : match.path) || "/");
     }
-    async componentDidMount() {
-      const _this$props = this.props,
-        {
-          match,
-          history,
-          setLoadingState
-        } = _this$props,
-        userProps = _objectWithoutProperties(_this$props, _excluded);
-      const {
-        domId
-      } = this.state;
-      const loadAppOptions = _objectSpread(_objectSpread({}, appInfo), {}, {
-        insulationVariable: [...(appInfo.insulationVariable || []), '_SERVER_DATA'],
+    useEffect(() => {
+      if (location && locationHref !== location.pathname) {
+        locationHref = location.pathname;
+        const popStateEvent = new PopStateEvent("popstate");
+        popStateEvent.garfish = true;
+        dispatchEvent(popStateEvent);
+        logger(`MicroApp Garfish.loadApp popstate`);
+      }
+    }, [location]);
+    useEffect(() => {
+      const _a2 = props, { setLoadingState } = _a2, userProps = __objRest(_a2, ["setLoadingState"]);
+      const loadAppOptions = __spreadProps(__spreadValues({}, appInfo), {
+        insulationVariable: [
+          ...appInfo.insulationVariable || [],
+          "_SERVER_DATA"
+        ],
         domGetter: `#${domId}`,
-        basename: path.join((options === null || options === void 0 ? void 0 : options.basename) || '/', (match === null || match === void 0 ? void 0 : match.path) || '/'),
+        basename,
         cache: true,
-        props: _objectSpread(_objectSpread({}, appInfo.props), userProps),
-        customLoader: provider => {
+        props: __spreadValues(__spreadValues({}, appInfo.props), userProps),
+        customLoader: (provider) => {
           const {
             render,
             destroy,
-            SubModuleComponent,
+            SubModuleComponent: SubModuleComponent2,
             jupiter_submodule_app_key
           } = provider;
-          const componetRenderMode = (manifest === null || manifest === void 0 ? void 0 : manifest.componentRender) && (SubModuleComponent || jupiter_submodule_app_key);
+          const componetRenderMode = (manifest == null ? void 0 : manifest.componentRender) && (SubModuleComponent2 || jupiter_submodule_app_key);
           return {
-            mount: (...props) => {
+            mount: (...props2) => {
               if (componetRenderMode) {
-                this.setState({
-                  SubModuleComponent: SubModuleComponent !== null && SubModuleComponent !== void 0 ? SubModuleComponent : jupiter_submodule_app_key
-                });
-                return undefined;
+                setSubModuleComponent(SubModuleComponent2);
+                return void 0;
               } else {
-                logger('MicroApp customer render', props);
-                return render === null || render === void 0 ? void 0 : render.apply(provider, props);
+                logger("MicroApp customer render", props2);
+                return render == null ? void 0 : render.apply(provider, props2);
               }
             },
-            unmount(...props) {
+            unmount(...props2) {
               if (componetRenderMode) {
-                return undefined;
+                return void 0;
               }
-              logger('MicroApp customer destroy', props);
-              return destroy === null || destroy === void 0 ? void 0 : destroy.apply(provider, props);
+              logger("MicroApp customer destroy", props2);
+              return destroy == null ? void 0 : destroy.apply(provider, props2);
             }
           };
         }
@@ -82,91 +144,78 @@ function getAppInstance(options, appInfo, manifest) {
       logger(`MicroApp Garfish.loadApp "${appInfo.name}"`, {
         loadAppOptions
       });
-      try {
-        const appInstance = await Garfish.loadApp(appInfo.name, loadAppOptions);
-        if (!appInstance) {
-          throw new Error(`MicroApp Garfish.loadApp "${appInfo.name}" result is null`);
-        }
-
-        // eslint-disable-next-line react/no-did-mount-set-state
-        this.setState({
-          appInstance
-        });
-        setLoadingState({
-          isLoading: false
-        });
-        if (appInstance.mounted && appInstance.appInfo.cache) {
-          logger(`MicroApp Garfish.loadApp "${appInfo.name}" show`, {
-            appInfo: appInstance.appInfo,
-            appInstance
-          });
-          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 || appInstance === void 0 ? void 0 : appInstance.mount());
-        }
-        this.unregisterHistoryListener = history === null || history === void 0 ? void 0 : history.listen(() => {
-          if (locationHref !== history.location.pathname) {
-            locationHref = history.location.pathname;
-            const popStateEvent = new PopStateEvent('popstate');
-            dispatchEvent(popStateEvent);
-            logger(`MicroApp Garfish.loadApp popstate`);
+      function renderApp() {
+        return __async(this, null, function* () {
+          try {
+            const appInstance = yield Garfish.loadApp(
+              appInfo.name,
+              loadAppOptions
+            );
+            if (!appInstance) {
+              throw new Error(
+                `MicroApp Garfish.loadApp "${appInfo.name}" result is null`
+              );
+            }
+            appRef.current = appInstance;
+            setLoadingState({
+              isLoading: false
+            });
+            if (appInstance.mounted && appInstance.appInfo.cache) {
+              logger(`MicroApp Garfish.loadApp "${appInfo.name}" show`, {
+                appInfo: appInstance.appInfo,
+                appInstance
+              });
+              yield appInstance == null ? void 0 : appInstance.show();
+            } else {
+              logger(`MicroApp Garfish.loadApp "${appInfo.name}" mount`, {
+                appInfo: appInstance.appInfo,
+                appInstance
+              });
+              yield appInstance == null ? void 0 : appInstance.mount();
+            }
+          } catch (error) {
+            setLoadingState({
+              isLoading: true,
+              error
+            });
           }
         });
-      } catch (error) {
-        setLoadingState({
-          isLoading: true,
-          error
-        });
       }
-    }
-    async componentWillUnmount() {
-      var _this$unregisterHisto;
-      const {
-        appInstance
-      } = this.state;
-      (_this$unregisterHisto = this.unregisterHistoryListener) === null || _this$unregisterHisto === void 0 ? void 0 : _this$unregisterHisto.call(this);
-      if (appInstance) {
-        const {
-          appInfo
-        } = appInstance;
-        if (appInfo.cache) {
-          logger(`MicroApp Garfish.loadApp "${appInfo.name}" hide`);
-          appInstance === null || appInstance === void 0 ? void 0 : appInstance.hide();
-        } else {
-          logger(`MicroApp Garfish.loadApp "${appInfo.name}" unmount`);
-          appInstance === null || appInstance === void 0 ? void 0 : appInstance.unmount();
+      renderApp();
+      return () => {
+        var _a3, _b2;
+        if (appRef.current) {
+          const { appInfo: appInfo2 } = appRef.current;
+          if (appInfo2.cache) {
+            logger(`MicroApp Garfish.loadApp "${appInfo2.name}" hide`);
+            (_a3 = appRef.current) == null ? void 0 : _a3.hide();
+          } else {
+            logger(`MicroApp Garfish.loadApp "${appInfo2.name}" unmount`);
+            (_b2 = appRef.current) == null ? void 0 : _b2.unmount();
+          }
         }
-      }
-    }
-    render() {
-      const {
-        domId,
-        SubModuleComponent
-      } = this.state;
-      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(withRouter(MicroApp))(manifest === null || manifest === void 0 ? void 0 : manifest.loadable);
+  return Loadable(MicroApp)(manifest == null ? void 0 : manifest.loadable);
 }
-export function generateApps(options, manifest) {
-  var _options$apps;
+function generateApps(options, manifest) {
+  var _a;
   const apps = {};
-  (_options$apps = options.apps) === null || _options$apps === void 0 ? void 0 : _options$apps.forEach(appInfo => {
+  (_a = options.apps) == null ? void 0 : _a.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
+};

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

@@ -1,12 +1,12 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import garfish from 'garfish';
+import React from "react";
+import ReactDOM from "react-dom";
+import garfish from "garfish";
 import { logger } from "../../util";
-export default (() => {
-  logger('setExternal ', {
-    react: React,
-    'react-dom': ReactDOM
-  });
-  garfish.setExternal('react', React);
-  garfish.setExternal('react-dom', ReactDOM);
-});
+var setExternal_default = () => {
+  logger("setExternal ", { react: React, "react-dom": ReactDOM });
+  garfish.setExternal("react", React);
+  garfish.setExternal("react-dom", ReactDOM);
+};
+export {
+  setExternal_default as default
+};

package/dist/js/modern/util.js

@@ -1,9 +1,11 @@
-/**
- * Tips: this package will be bundled and running in the browser, do not import from `@modern-js/utils`.
- */
-import createDebug from 'debug';
-export const logger = createDebug('modern-js:plugin-garfish');
-export const SUBMODULE_APP_COMPONENT_KEY = 'SubModuleComponent';
-export function generateSubAppContainerKey(moduleInfo) {
-  return moduleInfo ? `modern_sub_app_container_${decodeURIComponent(moduleInfo === null || moduleInfo === void 0 ? void 0 : moduleInfo.name)}` : 'modern_sub_app_container';
-}
+import createDebug from "debug";
+const logger = createDebug("modern-js:plugin-garfish");
+const SUBMODULE_APP_COMPONENT_KEY = "SubModuleComponent";
+function generateSubAppContainerKey(moduleInfo) {
+  return moduleInfo ? `modern_sub_app_container_${decodeURIComponent(moduleInfo == null ? void 0 : moduleInfo.name)}` : "modern_sub_app_container";
+}
+export {
+  SUBMODULE_APP_COMPONENT_KEY,
+  generateSubAppContainerKey,
+  logger
+};