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

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

@@ -1,236 +1,484 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
-import _createSuper from "@babel/runtime/helpers/esm/createSuper";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _excluded = ["match", "history", "setLoadingState"];
-// 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';
-
+function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _arrayWithHoles(arr) {
+    if (Array.isArray(arr)) return arr;
+}
+function _arrayWithoutHoles(arr) {
+    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+}
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+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;
+}
+function _iterableToArray(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+}
+function _iterableToArrayLimit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
+    }
+    return _arr;
+}
+function _nonIterableRest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _nonIterableSpread() {
+    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _objectSpreadProps(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        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 _slicedToArray(arr, i) {
+    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+function _toConsumableArray(arr) {
+    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+}
+function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+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 getAppInstance(options, appInfo, manifest) {
-  var locationHref = '';
-  var MicroApp = /*#__PURE__*/function (_React$Component) {
-    _inherits(MicroApp, _React$Component);
-    var _super = _createSuper(MicroApp);
-    function MicroApp() {
-      var _this;
-      _classCallCheck(this, MicroApp);
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+function pathJoin() {
+    for(var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
         args[_key] = arguments[_key];
-      }
-      _this = _super.call.apply(_super, [this].concat(args));
-      _defineProperty(_assertThisInitialized(_this), "state", {
-        appInstance: null,
-        domId: generateSubAppContainerKey(appInfo),
-        SubModuleComponent: undefined
-      });
-      _defineProperty(_assertThisInitialized(_this), "unregisterHistoryListener", function () {});
-      return _this;
     }
-    _createClass(MicroApp, [{
-      key: "componentDidMount",
-      value: function () {
-        var _componentDidMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-          var _this2 = this;
-          var _this$props, match, history, setLoadingState, userProps, domId, loadAppOptions, appInstance;
-          return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                  _this$props = this.props, match = _this$props.match, history = _this$props.history, setLoadingState = _this$props.setLoadingState, userProps = _objectWithoutProperties(_this$props, _excluded);
-                  domId = this.state.domId;
-                  loadAppOptions = _objectSpread(_objectSpread({}, appInfo), {}, {
-                    insulationVariable: [].concat(_toConsumableArray(appInfo.insulationVariable || []), ['_SERVER_DATA']),
-                    domGetter: "#".concat(domId),
-                    basename: path.join((options === null || options === void 0 ? void 0 : options.basename) || '/', (match === null || match === void 0 ? void 0 : match.path) || '/'),
-                    cache: true,
-                    props: _objectSpread(_objectSpread({}, appInfo.props), userProps),
-                    customLoader: function customLoader(provider) {
-                      var render = provider.render,
-                        destroy = provider.destroy,
-                        SubModuleComponent = provider.SubModuleComponent,
-                        jupiter_submodule_app_key = provider.jupiter_submodule_app_key;
-                      var componetRenderMode = (manifest === null || manifest === void 0 ? void 0 : manifest.componentRender) && (SubModuleComponent || jupiter_submodule_app_key);
-                      return {
-                        mount: function mount() {
-                          if (componetRenderMode) {
-                            _this2.setState({
-                              SubModuleComponent: SubModuleComponent !== null && SubModuleComponent !== void 0 ? SubModuleComponent : jupiter_submodule_app_key
-                            });
-                            return undefined;
-                          } else {
-                            for (var _len2 = arguments.length, props = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-                              props[_key2] = arguments[_key2];
+    var res = args.reduce(function(res2, path) {
+        var nPath = path;
+        if (!nPath || typeof nPath !== "string") {
+            return res2;
+        }
+        if (nPath[0] !== "/") {
+            nPath = "/".concat(nPath);
+        }
+        var lastIndex = path.length - 1;
+        if (nPath[lastIndex] === "/") {
+            nPath = nPath.substring(0, lastIndex);
+        }
+        return res2 + nPath;
+    }, "");
+    return res || "/";
+}
+function getAppInstance(options, appInfo, manifest) {
+    var MicroApp = function MicroApp(props) {
+        var ref, ref1, ref2, ref3, ref4, ref5;
+        var appRef = useRef(null);
+        var domId = generateSubAppContainerKey(appInfo);
+        var ref6 = _slicedToArray(useState(), 2), SubModuleComponent = ref6[0], setSubModuleComponent = ref6[1];
+        var context = useContext(RuntimeReactContext);
+        var match = context === null || context === void 0 ? void 0 : (ref = context.router) === null || ref === void 0 ? void 0 : (ref1 = ref.useRouteMatch) === null || ref1 === void 0 ? void 0 : ref1.call(ref);
+        var matchs = context === null || context === void 0 ? void 0 : (ref2 = context.router) === null || ref2 === void 0 ? void 0 : (ref3 = ref2.useMatches) === null || ref3 === void 0 ? void 0 : ref3.call(ref2);
+        var location = context === null || context === void 0 ? void 0 : (ref4 = context.router) === null || ref4 === void 0 ? void 0 : (ref5 = ref4.useLocation) === null || ref5 === void 0 ? void 0 : ref5.call(ref4);
+        var basename = (options === null || options === void 0 ? 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 || match === void 0 ? void 0 : match.path) || "/");
+        }
+        useEffect(function() {
+            if (location && locationHref !== location.pathname) {
+                locationHref = location.pathname;
+                var popStateEvent = new PopStateEvent("popstate");
+                popStateEvent.garfish = true;
+                dispatchEvent(popStateEvent);
+                logger("MicroApp Garfish.loadApp popstate");
+            }
+        }, [
+            location
+        ]);
+        useEffect(function() {
+            var setLoadingState = props.setLoadingState, userProps = _objectWithoutProperties(props, [
+                "setLoadingState"
+            ]);
+            var loadAppOptions = _objectSpreadProps(_objectSpread({}, appInfo), {
+                insulationVariable: _toConsumableArray(appInfo.insulationVariable || []).concat([
+                    "_SERVER_DATA"
+                ]),
+                domGetter: "#".concat(domId),
+                basename: basename,
+                cache: true,
+                props: _objectSpread({}, appInfo.props, userProps),
+                customLoader: function(provider) {
+                    var render = provider.render, destroy = provider.destroy, SubModuleComponent2 = provider.SubModuleComponent, jupiter_submodule_app_key = provider.jupiter_submodule_app_key;
+                    var componetRenderMode = (manifest === null || manifest === void 0 ? void 0 : manifest.componentRender) && (SubModuleComponent2 || jupiter_submodule_app_key);
+                    return {
+                        mount: function() {
+                            for(var _len = arguments.length, props2 = new Array(_len), _key = 0; _key < _len; _key++){
+                                props2[_key] = arguments[_key];
+                            }
+                            if (componetRenderMode) {
+                                setSubModuleComponent(SubModuleComponent2);
+                                return void 0;
+                            } else {
+                                logger("MicroApp customer render", props2);
+                                return render === null || render === void 0 ? void 0 : render.apply(provider, props2);
                             }
-                            logger('MicroApp customer render', props);
-                            return render === null || render === void 0 ? void 0 : render.apply(provider, props);
-                          }
                         },
                         unmount: function unmount() {
-                          if (componetRenderMode) {
-                            return undefined;
-                          }
-                          for (var _len3 = arguments.length, props = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-                            props[_key3] = arguments[_key3];
-                          }
-                          logger('MicroApp customer destroy', props);
-                          return destroy === null || destroy === void 0 ? void 0 : destroy.apply(provider, props);
+                            for(var _len = arguments.length, props2 = new Array(_len), _key = 0; _key < _len; _key++){
+                                props2[_key] = arguments[_key];
+                            }
+                            if (componetRenderMode) {
+                                return void 0;
+                            }
+                            logger("MicroApp customer destroy", props2);
+                            return destroy === null || destroy === void 0 ? void 0 : destroy.apply(provider, props2);
                         }
-                      };
-                    }
-                  });
-                  setLoadingState({
-                    isLoading: true,
-                    error: null
-                  });
-                  logger("MicroApp Garfish.loadApp \"".concat(appInfo.name, "\""), {
-                    loadAppOptions: loadAppOptions
-                  });
-                  _context.prev = 5;
-                  _context.next = 8;
-                  return Garfish.loadApp(appInfo.name, loadAppOptions);
-                case 8:
-                  appInstance = _context.sent;
-                  if (appInstance) {
-                    _context.next = 11;
-                    break;
-                  }
-                  throw new Error("MicroApp Garfish.loadApp \"".concat(appInfo.name, "\" result is null"));
-                case 11:
-                  // eslint-disable-next-line react/no-did-mount-set-state
-                  this.setState({
-                    appInstance: appInstance
-                  });
-                  setLoadingState({
-                    isLoading: false
-                  });
-                  if (!(appInstance.mounted && appInstance.appInfo.cache)) {
-                    _context.next = 19;
-                    break;
-                  }
-                  logger("MicroApp Garfish.loadApp \"".concat(appInfo.name, "\" show"), {
-                    appInfo: appInstance.appInfo,
-                    appInstance: appInstance
-                  });
-                  _context.next = 17;
-                  return appInstance === null || appInstance === void 0 ? void 0 : appInstance.show();
-                case 17:
-                  _context.next = 22;
-                  break;
-                case 19:
-                  logger("MicroApp Garfish.loadApp \"".concat(appInfo.name, "\" mount"), {
-                    appInfo: appInstance.appInfo,
-                    appInstance: appInstance
-                  });
-                  _context.next = 22;
-                  return appInstance === null || appInstance === void 0 ? void 0 : appInstance.mount();
-                case 22:
-                  this.unregisterHistoryListener = history === null || history === void 0 ? void 0 : history.listen(function () {
-                    if (locationHref !== history.location.pathname) {
-                      locationHref = history.location.pathname;
-                      var popStateEvent = new PopStateEvent('popstate');
-                      dispatchEvent(popStateEvent);
-                      logger("MicroApp Garfish.loadApp popstate");
-                    }
-                  });
-                  _context.next = 28;
-                  break;
-                case 25:
-                  _context.prev = 25;
-                  _context.t0 = _context["catch"](5);
-                  setLoadingState({
-                    isLoading: true,
-                    error: _context.t0
-                  });
-                case 28:
-                case "end":
-                  return _context.stop();
-              }
+                    };
+                }
+            });
+            setLoadingState({
+                isLoading: true,
+                error: null
+            });
+            logger('MicroApp Garfish.loadApp "'.concat(appInfo.name, '"'), {
+                loadAppOptions: loadAppOptions
+            });
+            function renderApp() {
+                return _renderApp.apply(this, arguments);
             }
-          }, _callee, this, [[5, 25]]);
-        }));
-        function componentDidMount() {
-          return _componentDidMount.apply(this, arguments);
-        }
-        return componentDidMount;
-      }()
-    }, {
-      key: "componentWillUnmount",
-      value: function () {
-        var _componentWillUnmount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-          var _this$unregisterHisto;
-          var appInstance, _appInfo;
-          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-            while (1) {
-              switch (_context2.prev = _context2.next) {
-                case 0:
-                  appInstance = this.state.appInstance;
-                  (_this$unregisterHisto = this.unregisterHistoryListener) === null || _this$unregisterHisto === void 0 ? void 0 : _this$unregisterHisto.call(this);
-                  if (appInstance) {
-                    _appInfo = appInstance.appInfo;
-                    if (_appInfo.cache) {
-                      logger("MicroApp Garfish.loadApp \"".concat(_appInfo.name, "\" hide"));
-                      appInstance === null || appInstance === void 0 ? void 0 : appInstance.hide();
+            function _renderApp() {
+                _renderApp = _asyncToGenerator(function() {
+                    var appInstance, error;
+                    return __generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                _state.trys.push([
+                                    0,
+                                    6,
+                                    ,
+                                    7
+                                ]);
+                                return [
+                                    4,
+                                    Garfish.loadApp(appInfo.name, loadAppOptions)
+                                ];
+                            case 1:
+                                appInstance = _state.sent();
+                                if (!appInstance) {
+                                    throw new Error('MicroApp Garfish.loadApp "'.concat(appInfo.name, '" result is null'));
+                                }
+                                appRef.current = appInstance;
+                                setLoadingState({
+                                    isLoading: false
+                                });
+                                if (!(appInstance.mounted && appInstance.appInfo.cache)) return [
+                                    3,
+                                    3
+                                ];
+                                logger('MicroApp Garfish.loadApp "'.concat(appInfo.name, '" show'), {
+                                    appInfo: appInstance.appInfo,
+                                    appInstance: appInstance
+                                });
+                                return [
+                                    4,
+                                    appInstance === null || appInstance === void 0 ? void 0 : appInstance.show()
+                                ];
+                            case 2:
+                                _state.sent();
+                                return [
+                                    3,
+                                    5
+                                ];
+                            case 3:
+                                logger('MicroApp Garfish.loadApp "'.concat(appInfo.name, '" mount'), {
+                                    appInfo: appInstance.appInfo,
+                                    appInstance: appInstance
+                                });
+                                return [
+                                    4,
+                                    appInstance === null || appInstance === void 0 ? void 0 : appInstance.mount()
+                                ];
+                            case 4:
+                                _state.sent();
+                                _state.label = 5;
+                            case 5:
+                                return [
+                                    3,
+                                    7
+                                ];
+                            case 6:
+                                error = _state.sent();
+                                setLoadingState({
+                                    isLoading: true,
+                                    error: error
+                                });
+                                return [
+                                    3,
+                                    7
+                                ];
+                            case 7:
+                                return [
+                                    2
+                                ];
+                        }
+                    });
+                });
+                return _renderApp.apply(this, arguments);
+            }
+            renderApp();
+            return function() {
+                if (appRef.current) {
+                    var _current = appRef.current, appInfo2 = _current.appInfo;
+                    if (appInfo2.cache) {
+                        var ref;
+                        logger('MicroApp Garfish.loadApp "'.concat(appInfo2.name, '" hide'));
+                        (ref = appRef.current) === null || ref === void 0 ? void 0 : ref.hide();
                     } else {
-                      logger("MicroApp Garfish.loadApp \"".concat(_appInfo.name, "\" unmount"));
-                      appInstance === null || appInstance === void 0 ? void 0 : appInstance.unmount();
+                        var ref1;
+                        logger('MicroApp Garfish.loadApp "'.concat(appInfo2.name, '" unmount'));
+                        (ref1 = appRef.current) === null || ref1 === void 0 ? void 0 : ref1.unmount();
                     }
-                  }
-                case 3:
-                case "end":
-                  return _context2.stop();
-              }
-            }
-          }, _callee2, this);
-        }));
-        function componentWillUnmount() {
-          return _componentWillUnmount.apply(this, arguments);
-        }
-        return componentWillUnmount;
-      }()
-    }, {
-      key: "render",
-      value: function render() {
-        var _this$state = this.state,
-          domId = _this$state.domId,
-          SubModuleComponent = _this$state.SubModuleComponent;
-        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 MicroApp;
-  }(React.Component);
-  return Loadable(withRouter(MicroApp))(manifest === null || manifest === void 0 ? void 0 : manifest.loadable);
-}
-export function generateApps(options, manifest) {
-  var _options$apps;
-  var apps = {};
-  (_options$apps = options.apps) === null || _options$apps === void 0 ? void 0 : _options$apps.forEach(function (appInfo) {
-    var Component = getAppInstance(options, appInfo, manifest);
-    appInfo.Component = Component;
-    apps[appInfo.name] = Component;
-  });
-  return {
-    apps: apps,
-    appInfoList: options.apps || []
-  };
-}
+    };
+    var locationHref = "";
+    return Loadable(MicroApp)(manifest === null || manifest === void 0 ? void 0 : manifest.loadable);
+}
+function generateApps(options, manifest) {
+    var ref;
+    var apps = {};
+    (ref = options.apps) === null || ref === void 0 ? void 0 : ref.forEach(function(appInfo) {
+        var Component = getAppInstance(options, appInfo, manifest);
+        appInfo.Component = Component;
+        apps[appInfo.name] = Component;
+    });
+    return {
+        apps: apps,
+        appInfoList: options.apps || []
+    };
+}
+export { generateApps, pathJoin };