@modern-js/plugin-garfish 2.0.0-beta.6 → 2.0.0-beta.7

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

@@ -3,15 +3,12 @@ function _arrayLikeToArray(arr, len) {
     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 _assertThisInitialized(self) {
-    if (self === void 0) {
-        throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-    }
-    return self;
-}
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
         var info = gen[key](arg);
@@ -41,25 +38,6 @@ function _asyncToGenerator(fn) {
         });
     };
 }
-function _classCallCheck(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
-}
-function _defineProperties(target, props) {
-    for(var i = 0; i < props.length; i++){
-        var descriptor = props[i];
-        descriptor.enumerable = descriptor.enumerable || false;
-        descriptor.configurable = true;
-        if ("value" in descriptor) descriptor.writable = true;
-        Object.defineProperty(target, descriptor.key, descriptor);
-    }
-}
-function _createClass(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    return Constructor;
-}
 function _defineProperty(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -73,27 +51,35 @@ function _defineProperty(obj, key, value) {
     }
     return obj;
 }
-function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
-        return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _getPrototypeOf(o);
+function _iterableToArray(iter) {
+    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
-function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-        throw new TypeError("Super expression must either be null or a function");
-    }
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-        constructor: {
-            value: subClass,
-            writable: true,
-            configurable: true
+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;
         }
-    });
-    if (superClass) _setPrototypeOf(subClass, superClass);
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
+        }
+    }
+    return _arr;
 }
-function _iterableToArray(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+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.");
@@ -164,26 +150,12 @@ function _objectWithoutPropertiesLoose(source, excluded) {
     }
     return target;
 }
-function _possibleConstructorReturn(self, call) {
-    if (call && (_typeof(call) === "object" || typeof call === "function")) {
-        return call;
-    }
-    return _assertThisInitialized(self);
-}
-function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
-        o.__proto__ = p;
-        return o;
-    };
-    return _setPrototypeOf(o, p);
+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();
 }
-var _typeof = function(obj) {
-    "@swc/helpers - typeof";
-    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-};
 function _unsupportedIterableToArray(o, minLen) {
     if (!o) return;
     if (typeof o === "string") return _arrayLikeToArray(o, minLen);
@@ -192,30 +164,6 @@ function _unsupportedIterableToArray(o, minLen) {
     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);
 }
-function _isNativeReflectConstruct() {
-    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-    if (Reflect.construct.sham) return false;
-    if (typeof Proxy === "function") return true;
-    try {
-        Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
-        return true;
-    } catch (e) {
-        return false;
-    }
-}
-function _createSuper(Derived) {
-    var hasNativeReflectConstruct = _isNativeReflectConstruct();
-    return function _createSuperInternal() {
-        var Super = _getPrototypeOf(Derived), result;
-        if (hasNativeReflectConstruct) {
-            var NewTarget = _getPrototypeOf(this).constructor;
-            result = Reflect.construct(Super, arguments, NewTarget);
-        } else {
-            result = Super.apply(this, arguments);
-        }
-        return _possibleConstructorReturn(this, result);
-    };
-}
 var __generator = this && this.__generator || function(thisArg, body) {
     var f, y, t, g, _ = {
         label: 0,
@@ -312,219 +260,213 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import { Fragment, jsx } from "react/jsx-runtime";
-import path from "path";
-import React from "react";
+import { useContext, useState, useEffect, useRef } from "react";
+import { RuntimeReactContext } from "@modern-js/runtime";
 import Garfish from "garfish";
-import { withRouter } from "@modern-js/plugin-router-v5/runtime";
 import { logger, generateSubAppContainerKey } from "../../util";
 import { Loadable } from "../loadable";
+function pathJoin() {
+    for(var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
+        args[_key] = arguments[_key];
+    }
+    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 = nPath.length - 1;
+        if (nPath[lastIndex] === "/") {
+            nPath = nPath.substring(0, lastIndex);
+        }
+        return res2 + nPath;
+    }, "");
+    return res || "/";
+}
 function getAppInstance(options, appInfo, manifest) {
-    var locationHref = "";
-    var MicroApp = /*#__PURE__*/ function(_Component) {
-        "use strict";
-        _inherits(MicroApp, _Component);
-        var _super = _createSuper(MicroApp);
-        function MicroApp() {
-            _classCallCheck(this, MicroApp);
-            var _this;
-            _this = _super.apply(this, arguments);
-            _defineProperty(_assertThisInitialized(_this), "state", {
-                appInstance: null,
-                domId: generateSubAppContainerKey(appInfo),
-                SubModuleComponent: void 0
-            });
-            _defineProperty(_assertThisInitialized(_this), "unregisterHistoryListener", function() {});
-            return _this;
+    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) || "/");
         }
-        _createClass(MicroApp, [
-            {
-                key: "componentDidMount",
-                value: function componentDidMount() {
-                    var _this = this;
-                    return _asyncToGenerator(function() {
-                        var _props, match, history, setLoadingState, userProps, domId, loadAppOptions, appInstance, error;
-                        return __generator(this, function(_state) {
-                            switch(_state.label){
-                                case 0:
-                                    _props = _this.props, match = _props.match, history = _props.history, setLoadingState = _props.setLoadingState, userProps = _objectWithoutProperties(_props, [
-                                        "match",
-                                        "history",
-                                        "setLoadingState"
-                                    ]);
-                                    domId = _this.state.domId;
-                                    loadAppOptions = _objectSpreadProps(_objectSpread({}, appInfo), {
-                                        insulationVariable: _toConsumableArray(appInfo.insulationVariable || []).concat([
-                                            "_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({}, appInfo.props, userProps),
-                                        customLoader: function(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() {
-                                                    for(var _len = arguments.length, props = new Array(_len), _key = 0; _key < _len; _key++){
-                                                        props[_key] = arguments[_key];
-                                                    }
-                                                    if (componetRenderMode) {
-                                                        _this.setState({
-                                                            SubModuleComponent: SubModuleComponent !== null && SubModuleComponent !== void 0 ? SubModuleComponent : jupiter_submodule_app_key
-                                                        });
-                                                        return void 0;
-                                                    } else {
-                                                        logger("MicroApp customer render", props);
-                                                        return render === null || render === void 0 ? void 0 : render.apply(provider, props);
-                                                    }
-                                                },
-                                                unmount: function unmount() {
-                                                    for(var _len = arguments.length, props = new Array(_len), _key = 0; _key < _len; _key++){
-                                                        props[_key] = arguments[_key];
-                                                    }
-                                                    if (componetRenderMode) {
-                                                        return void 0;
-                                                    }
-                                                    logger("MicroApp customer destroy", props);
-                                                    return destroy === null || destroy === void 0 ? void 0 : destroy.apply(provider, props);
-                                                }
-                                            };
-                                        }
-                                    });
-                                    setLoadingState({
-                                        isLoading: true,
-                                        error: null
-                                    });
-                                    logger('MicroApp Garfish.loadApp "'.concat(appInfo.name, '"'), {
-                                        loadAppOptions: loadAppOptions
-                                    });
-                                    _state.label = 1;
-                                case 1:
-                                    _state.trys.push([
-                                        1,
-                                        7,
-                                        ,
-                                        8
-                                    ]);
-                                    return [
-                                        4,
-                                        Garfish.loadApp(appInfo.name, loadAppOptions)
-                                    ];
-                                case 2:
-                                    appInstance = _state.sent();
-                                    if (!appInstance) {
-                                        throw new Error('MicroApp Garfish.loadApp "'.concat(appInfo.name, '" result is null'));
-                                    }
-                                    _this.setState({
-                                        appInstance: appInstance
-                                    });
-                                    setLoadingState({
-                                        isLoading: false
-                                    });
-                                    if (!(appInstance.mounted && appInstance.appInfo.cache)) return [
-                                        3,
-                                        4
-                                    ];
-                                    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 3:
-                                    _state.sent();
-                                    return [
-                                        3,
-                                        6
-                                    ];
-                                case 4:
-                                    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 5:
-                                    _state.sent();
-                                    _state.label = 6;
-                                case 6:
-                                    _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");
-                                        }
-                                    });
-                                    return [
-                                        3,
-                                        8
-                                    ];
-                                case 7:
-                                    error = _state.sent();
-                                    setLoadingState({
-                                        isLoading: true,
-                                        error: error
-                                    });
-                                    return [
-                                        3,
-                                        8
-                                    ];
-                                case 8:
-                                    return [
-                                        2
-                                    ];
+        useEffect(function() {
+            if (location && locationHref !== location.pathname && !Garfish.running) {
+                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];
                             }
-                        });
-                    })();
-                }
-            },
-            {
-                key: "componentWillUnmount",
-                value: function componentWillUnmount() {
-                    var _this = this;
-                    return _asyncToGenerator(function() {
-                        var _obj, ref, appInstance, appInfo2;
-                        return __generator(this, function(_state) {
-                            appInstance = _this.state.appInstance;
-                            (ref = (_obj = _this).unregisterHistoryListener) === null || ref === void 0 ? void 0 : ref.call(_obj);
-                            if (appInstance) {
-                                appInfo2 = appInstance.appInfo;
-                                if (appInfo2.cache) {
-                                    logger('MicroApp Garfish.loadApp "'.concat(appInfo2.name, '" hide'));
-                                    appInstance === null || appInstance === void 0 ? void 0 : appInstance.hide();
-                                } else {
-                                    logger('MicroApp Garfish.loadApp "'.concat(appInfo2.name, '" unmount'));
-                                    appInstance === null || appInstance === void 0 ? void 0 : appInstance.unmount();
-                                }
+                            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);
+                            }
+                        },
+                        unmount: function unmount() {
+                            for(var _len = arguments.length, props2 = new Array(_len), _key = 0; _key < _len; _key++){
+                                props2[_key] = arguments[_key];
                             }
-                            return [
-                                2
-                            ];
-                        });
-                    })();
+                            if (componetRenderMode) {
+                                return void 0;
+                            }
+                            logger("MicroApp customer destroy", props2);
+                            return destroy === null || destroy === void 0 ? void 0 : destroy.apply(provider, props2);
+                        }
+                    };
                 }
-            },
-            {
-                key: "render",
-                value: function render() {
-                    var _state = this.state, domId = _state.domId, SubModuleComponent = _state.SubModuleComponent;
-                    return /* @__PURE__ */ jsx(Fragment, {
-                        children: /* @__PURE__ */ jsx("div", {
-                            id: domId,
-                            children: SubModuleComponent && /* @__PURE__ */ jsx(SubModuleComponent, {})
-                        })
+            });
+            setLoadingState({
+                isLoading: true,
+                error: null
+            });
+            logger('MicroApp Garfish.loadApp "'.concat(appInfo.name, '"'), {
+                loadAppOptions: loadAppOptions
+            });
+            function renderApp() {
+                return _renderApp.apply(this, arguments);
+            }
+            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);
             }
-        ]);
-        return MicroApp;
-    }(React.Component);
-    return Loadable(withRouter(MicroApp))(manifest === null || manifest === void 0 ? void 0 : manifest.loadable);
+            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 {
+                        var ref1;
+                        logger('MicroApp Garfish.loadApp "'.concat(appInfo2.name, '" unmount'));
+                        (ref1 = appRef.current) === null || ref1 === void 0 ? void 0 : ref1.unmount();
+                    }
+                }
+            };
+        }, []);
+        return /* @__PURE__ */ jsx(Fragment, {
+            children: /* @__PURE__ */ jsx("div", {
+                id: domId,
+                children: SubModuleComponent && /* @__PURE__ */ jsx(SubModuleComponent, {})
+            })
+        });
+    };
+    var locationHref = "";
+    return Loadable(MicroApp)(manifest === null || manifest === void 0 ? void 0 : manifest.loadable);
 }
 function generateApps(options, manifest) {
     var ref;
@@ -539,4 +481,4 @@ function generateApps(options, manifest) {
         appInfoList: options.apps || []
     };
 }
-export { generateApps };
+export { generateApps, pathJoin };

package/dist/types/cli/index.d.ts

@@ -1,6 +1,5 @@
 import type { CliHookCallbacks, useConfigContext } from '@modern-js/core';
 import type { CliPlugin, AppTools } from '@modern-js/app-tools';
-import './types';
 export declare type UseConfig = ReturnType<typeof useConfigContext>;
 export declare const externals: {
   'react-dom': string;
@@ -12,12 +11,10 @@ export declare function getDefaultMicroFrontedConfig(microFrontend: NonInValidAb
 
 declare const _default: ({
   pluginName,
-  runtimePluginName,
-  mfPackagePath
+  runtimePluginName
 }?: {
   pluginName?: string | undefined;
   runtimePluginName?: string | undefined;
-  mfPackagePath?: string | undefined;
 }) => CliPlugin<AppTools>;
 
 export default _default;

package/dist/types/runtime/loadable.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="react" />
-import { RouteComponentProps } from '@modern-js/plugin-router-v5/runtime';
 import { LoadableConfig, MicroComponentProps } from './useModuleApps';
-export interface MicroProps extends RouteComponentProps {
+export interface MicroProps {
   setLoadingState: (state: {
     isLoading?: boolean;
     error?: unknown;

package/dist/types/runtime/utils/apps.d.ts

@@ -8,6 +8,7 @@ export interface Provider extends interfaces.Provider {
 export interface AppMap {
   [key: string]: React.FC<MicroComponentProps>;
 }
+export declare function pathJoin(...args: string[]): string;
 export declare function generateApps(options: typeof Garfish.options, manifest?: Manifest): {
   apps: AppMap;
   appInfoList: ModulesInfo;