@xfe-repo/web-micro 1.2.3 → 1.2.5

package/dist/index.d.mts

@@ -13,6 +13,7 @@ type MicroAppProps = {
     data?: Record<string, any>;
     loadingFallback?: React.ReactNode;
     errorFallback?: React.ReactNode;
+    aHrefResolver?: (hrefValue: string) => string;
 };
 declare const MicroAppRoute: React.MemoExoticComponent<(props: MicroAppProps) => react_jsx_runtime.JSX.Element>;
 
@@ -21,6 +22,11 @@ type MicroAppLinkProps = LinkProps & {
     microApp?: string;
 };
 declare const MicroAppLink: React.MemoExoticComponent<(props: MicroAppLinkProps) => react_jsx_runtime.JSX.Element>;
+type NavigateToWithMicroAppOptions = {
+    replace?: boolean;
+    state?: any;
+};
+declare const navigateToWithMicroApp: (to: string, options?: NavigateToWithMicroAppOptions) => void;
 
 declare enum MicroAppEventEnum {
     DISPATCH_ACTION = "dispatchAction"
@@ -55,7 +61,9 @@ declare class MicroAppEventCenter {
     addDispatchListener(type: string, listener: MicroAppDispatchListener): void;
     removeDispatchListener(type: string, listener?: MicroAppDispatchListener): boolean | undefined;
 }
+type AHrefResolverType = (hrefValue: string) => string;
+declare const aHrefResolverCollector: Record<string, AHrefResolverType>;
 
 declare const microApp: _micro_zoe_micro_app.MicroApp;
 
-export { type MicroAppActionMetaType, type MicroAppActionType, type MicroAppDispatchListener, MicroAppEventCenter, type MicroAppEventCenterConfig, MicroAppEventEnum, type MicroAppGlobalDataType, MicroAppLink, type MicroAppProps, MicroAppRoute, microApp };
+export { type MicroAppActionMetaType, type MicroAppActionType, type MicroAppDispatchListener, MicroAppEventCenter, type MicroAppEventCenterConfig, MicroAppEventEnum, type MicroAppGlobalDataType, MicroAppLink, type MicroAppProps, MicroAppRoute, type NavigateToWithMicroAppOptions, aHrefResolverCollector, microApp, navigateToWithMicroApp };

package/dist/index.d.ts

@@ -13,6 +13,7 @@ type MicroAppProps = {
     data?: Record<string, any>;
     loadingFallback?: React.ReactNode;
     errorFallback?: React.ReactNode;
+    aHrefResolver?: (hrefValue: string) => string;
 };
 declare const MicroAppRoute: React.MemoExoticComponent<(props: MicroAppProps) => react_jsx_runtime.JSX.Element>;
 
@@ -21,6 +22,11 @@ type MicroAppLinkProps = LinkProps & {
     microApp?: string;
 };
 declare const MicroAppLink: React.MemoExoticComponent<(props: MicroAppLinkProps) => react_jsx_runtime.JSX.Element>;
+type NavigateToWithMicroAppOptions = {
+    replace?: boolean;
+    state?: any;
+};
+declare const navigateToWithMicroApp: (to: string, options?: NavigateToWithMicroAppOptions) => void;
 
 declare enum MicroAppEventEnum {
     DISPATCH_ACTION = "dispatchAction"
@@ -55,7 +61,9 @@ declare class MicroAppEventCenter {
     addDispatchListener(type: string, listener: MicroAppDispatchListener): void;
     removeDispatchListener(type: string, listener?: MicroAppDispatchListener): boolean | undefined;
 }
+type AHrefResolverType = (hrefValue: string) => string;
+declare const aHrefResolverCollector: Record<string, AHrefResolverType>;
 
 declare const microApp: _micro_zoe_micro_app.MicroApp;
 
-export { type MicroAppActionMetaType, type MicroAppActionType, type MicroAppDispatchListener, MicroAppEventCenter, type MicroAppEventCenterConfig, MicroAppEventEnum, type MicroAppGlobalDataType, MicroAppLink, type MicroAppProps, MicroAppRoute, microApp };
+export { type MicroAppActionMetaType, type MicroAppActionType, type MicroAppDispatchListener, MicroAppEventCenter, type MicroAppEventCenterConfig, MicroAppEventEnum, type MicroAppGlobalDataType, MicroAppLink, type MicroAppProps, MicroAppRoute, type NavigateToWithMicroAppOptions, aHrefResolverCollector, microApp, navigateToWithMicroApp };

package/dist/index.js

@@ -292,38 +292,38 @@ __export(src_exports, {
     MicroAppRoute: function() {
         return MicroAppRoute;
     },
+    aHrefResolverCollector: function() {
+        return aHrefResolverCollector;
+    },
     microApp: function() {
-        return microApp2;
+        return microApp;
+    },
+    navigateToWithMicroApp: function() {
+        return navigateToWithMicroApp;
     }
 });
 module.exports = __toCommonJS(src_exports);
-var import_micro_app2 = __toESM(require("@micro-zoe/micro-app"));
 var import_env = require("@xfe-repo/web-utils/env");
 var import_tools = require("@xfe-repo/web-utils/tools");
+var import_micro_app = __toESM(require("@micro-zoe/micro-app"));
 __reExport(src_exports, require("@micro-zoe/micro-app"), module.exports);
 // src/MicroAppRoute.tsx
 var import_react = require("react");
 var import_web_router = require("@xfe-repo/web-router");
-var import_micro_app = __toESM(require("@micro-zoe/micro-app"));
 var import_jsx_custom_event = __toESM(require("@micro-zoe/micro-app/polyfill/jsx-custom-event.js"));
 var MicroAppRoute = (0, import_react.memo)(function(props) {
-    var name = props.name, baseRoute = props.baseRoute, url = props.url, keepAlive = props.keepAlive, className = props.className, data = props.data, loadingFallback = props.loadingFallback, errorFallback = props.errorFallback;
-    var navigate = (0, import_web_router.useNavigate)();
-    var location = (0, import_web_router.useLocation)();
+    var name = props.name, baseRoute = props.baseRoute, url = props.url, keepAlive = props.keepAlive, className = props.className, data = props.data, loadingFallback = props.loadingFallback, errorFallback = props.errorFallback, aHrefResolver = props.aHrefResolver;
+    if (aHrefResolver) aHrefResolverCollector[name] = aHrefResolver;
     var _ref = _sliced_to_array((0, import_react.useState)(false), 2), microAppIsShow = _ref[0], setMicroAppIsShow = _ref[1];
     var _ref1 = _sliced_to_array((0, import_react.useState)(false), 2), microAppIsError = _ref1[0], setMicroAppIsError = _ref1[1];
     var handleMicroAppMounted = (0, import_react.useCallback)(function() {
-        var path = location.pathname + location.search;
-        navigate(path, {
-            replace: true
-        });
+        var navigator = (0, import_web_router.getClientNavigator)();
+        navigator.replace(location.pathname + location.search, history.state);
         setMicroAppIsShow(true);
-    }, [
-        location
-    ]);
+    }, []);
     var handleMicroAppAfterShow = (0, import_react.useCallback)(function() {
         var path = location.pathname + location.search;
-        import_micro_app.default.router.push({
+        microApp.router.push({
             name: "dashboard",
             path: path,
             replace: true
@@ -331,9 +331,7 @@ var MicroAppRoute = (0, import_react.memo)(function(props) {
             return console.error(e);
         });
         setMicroAppIsShow(true);
-    }, [
-        location
-    ]);
+    }, []);
     var handleMicroAppError = (0, import_react.useCallback)(function() {
         setMicroAppIsError(true);
     }, []);
@@ -361,27 +359,13 @@ var import_react2 = require("react");
 var import_web_router2 = require("@xfe-repo/web-router");
 var import_jsx_runtime = require("react/jsx-runtime");
 var MicroAppLink = (0, import_react2.memo)(function(props) {
-    var microAppBaseName = props.microApp, to = props.to, children = props.children, replace = props.replace, className = props.className;
-    var navigate = (0, import_web_router2.useNavigate)();
+    var to = props.to, children = props.children, replace = props.replace, className = props.className;
     var handleLink = (0, import_react2.useCallback)(function(e) {
         e.preventDefault();
-        navigate(to, {
-            replace: replace
-        });
-        if (!microAppBaseName) return;
-        var activeApps = microApp2.getActiveApps({
-            excludeHiddenApp: true
-        });
-        if (activeApps.includes(microAppBaseName)) microApp2.router.push({
-            name: microAppBaseName,
-            path: to,
+        navigateToWithMicroApp(to, {
             replace: replace
-        }).catch(function(e2) {
-            return e2;
         });
     }, [
-        navigate,
-        microAppBaseName,
         to,
         replace
     ]);
@@ -392,6 +376,24 @@ var MicroAppLink = (0, import_react2.memo)(function(props) {
         children: children
     });
 });
+var navigateToWithMicroApp = function(to, options) {
+    var _ref = options || {}, replace = _ref.replace, state = _ref.state;
+    var navigator = (0, import_web_router2.getClientNavigator)();
+    replace ? navigator.replace(to, state) : navigator.push(to, state);
+    var microAppBaseName = to.split("/")[1];
+    if (!microAppBaseName) return;
+    var activeApps = microApp.getActiveApps({
+        excludeHiddenApp: true
+    });
+    if (activeApps.includes(microAppBaseName)) microApp.router.push({
+        name: microAppBaseName,
+        path: to,
+        replace: replace,
+        state: state
+    }).catch(function(e) {
+        return e;
+    });
+};
 // src/index.ts
 var MicroAppEventEnum = /* @__PURE__ */ function(MicroAppEventEnum2) {
     MicroAppEventEnum2["DISPATCH_ACTION"] = "dispatchAction";
@@ -403,7 +405,7 @@ var MicroAppEventCenter = /*#__PURE__*/ function() {
         _class_call_check(this, MicroAppEventCenter);
         this.dispatchListeners = {};
         this.config = config;
-        if (config.isMain) window.microGlobalEventCenter = new import_micro_app2.EventCenterForMicroApp("global");
+        if (config.isMain) window.microGlobalEventCenter = new import_micro_app.EventCenterForMicroApp("global");
         if (!window.microGlobalEventCenter) throw new Error("microGlobalEventCenter is not defined, please check if the main app is loaded first");
         window.microGlobalEventCenter.addGlobalDataListener(function(globalData) {
             return _this.listener(globalData);
@@ -570,12 +572,19 @@ var MicroAppEventCenter = /*#__PURE__*/ function() {
     ]);
     return MicroAppEventCenter;
 }();
-var microApp2 = import_micro_app2.default;
+var aHrefResolverCollector = {};
+import_micro_app.default.options.aHrefResolver = function(hrefValue, appName) {
+    var _aHrefResolverCollector_appName;
+    return ((_aHrefResolverCollector_appName = aHrefResolverCollector[appName]) === null || _aHrefResolverCollector_appName === void 0 ? void 0 : _aHrefResolverCollector_appName.call(aHrefResolverCollector, hrefValue)) || hrefValue;
+};
+var microApp = import_micro_app.default;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = _object_spread({
     MicroAppEventCenter: MicroAppEventCenter,
     MicroAppEventEnum: MicroAppEventEnum,
     MicroAppLink: MicroAppLink,
     MicroAppRoute: MicroAppRoute,
-    microApp: microApp
+    aHrefResolverCollector: aHrefResolverCollector,
+    microApp: microApp,
+    navigateToWithMicroApp: navigateToWithMicroApp
 }, require("@micro-zoe/micro-app")));

package/dist/index.mjs

@@ -216,30 +216,24 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
-import originMicroApp, { EventCenterForMicroApp } from "@micro-zoe/micro-app";
 import { isProduction } from "@xfe-repo/web-utils/env";
 import { uuid } from "@xfe-repo/web-utils/tools";
+import originMicroApp, { EventCenterForMicroApp } from "@micro-zoe/micro-app";
 export * from "@micro-zoe/micro-app";
 // src/MicroAppRoute.tsx
 import { memo, useCallback, useState } from "react";
-import { useNavigate, useLocation } from "@xfe-repo/web-router";
-import microApp from "@micro-zoe/micro-app";
+import { getClientNavigator } from "@xfe-repo/web-router";
 import jsxCustomEvent from "@micro-zoe/micro-app/polyfill/jsx-custom-event.js";
 var MicroAppRoute = memo(function(props) {
-    var name = props.name, baseRoute = props.baseRoute, url = props.url, keepAlive = props.keepAlive, className = props.className, data = props.data, loadingFallback = props.loadingFallback, errorFallback = props.errorFallback;
-    var navigate = useNavigate();
-    var location = useLocation();
+    var name = props.name, baseRoute = props.baseRoute, url = props.url, keepAlive = props.keepAlive, className = props.className, data = props.data, loadingFallback = props.loadingFallback, errorFallback = props.errorFallback, aHrefResolver = props.aHrefResolver;
+    if (aHrefResolver) aHrefResolverCollector[name] = aHrefResolver;
     var _useState = _sliced_to_array(useState(false), 2), microAppIsShow = _useState[0], setMicroAppIsShow = _useState[1];
     var _useState1 = _sliced_to_array(useState(false), 2), microAppIsError = _useState1[0], setMicroAppIsError = _useState1[1];
     var handleMicroAppMounted = useCallback(function() {
-        var path = location.pathname + location.search;
-        navigate(path, {
-            replace: true
-        });
+        var navigator = getClientNavigator();
+        navigator.replace(location.pathname + location.search, history.state);
         setMicroAppIsShow(true);
-    }, [
-        location
-    ]);
+    }, []);
     var handleMicroAppAfterShow = useCallback(function() {
         var path = location.pathname + location.search;
         microApp.router.push({
@@ -250,9 +244,7 @@ var MicroAppRoute = memo(function(props) {
             return console.error(e);
         });
         setMicroAppIsShow(true);
-    }, [
-        location
-    ]);
+    }, []);
     var handleMicroAppError = useCallback(function() {
         setMicroAppIsError(true);
     }, []);
@@ -277,30 +269,16 @@ var MicroAppRoute = memo(function(props) {
 });
 // src/MicroAppLink.tsx
 import { memo as memo2, useCallback as useCallback2 } from "react";
-import { useNavigate as useNavigate2 } from "@xfe-repo/web-router";
+import { getClientNavigator as getClientNavigator2 } from "@xfe-repo/web-router";
 import { jsx } from "react/jsx-runtime";
 var MicroAppLink = memo2(function(props) {
-    var microAppBaseName = props.microApp, to = props.to, children = props.children, replace = props.replace, className = props.className;
-    var navigate = useNavigate2();
+    var to = props.to, children = props.children, replace = props.replace, className = props.className;
     var handleLink = useCallback2(function(e) {
         e.preventDefault();
-        navigate(to, {
-            replace: replace
-        });
-        if (!microAppBaseName) return;
-        var activeApps = microApp2.getActiveApps({
-            excludeHiddenApp: true
-        });
-        if (activeApps.includes(microAppBaseName)) microApp2.router.push({
-            name: microAppBaseName,
-            path: to,
+        navigateToWithMicroApp(to, {
             replace: replace
-        }).catch(function(e2) {
-            return e2;
         });
     }, [
-        navigate,
-        microAppBaseName,
         to,
         replace
     ]);
@@ -311,6 +289,24 @@ var MicroAppLink = memo2(function(props) {
         children: children
     });
 });
+var navigateToWithMicroApp = function(to, options) {
+    var _ref = options || {}, replace = _ref.replace, state = _ref.state;
+    var navigator = getClientNavigator2();
+    replace ? navigator.replace(to, state) : navigator.push(to, state);
+    var microAppBaseName = to.split("/")[1];
+    if (!microAppBaseName) return;
+    var activeApps = microApp.getActiveApps({
+        excludeHiddenApp: true
+    });
+    if (activeApps.includes(microAppBaseName)) microApp.router.push({
+        name: microAppBaseName,
+        path: to,
+        replace: replace,
+        state: state
+    }).catch(function(e) {
+        return e;
+    });
+};
 // src/index.ts
 var MicroAppEventEnum = /* @__PURE__ */ function(MicroAppEventEnum2) {
     MicroAppEventEnum2["DISPATCH_ACTION"] = "dispatchAction";
@@ -490,5 +486,10 @@ var MicroAppEventCenter = /*#__PURE__*/ function() {
     ]);
     return MicroAppEventCenter;
 }();
-var microApp2 = originMicroApp;
-export { MicroAppEventCenter, MicroAppEventEnum, MicroAppLink, MicroAppRoute, microApp2 as microApp };
+var aHrefResolverCollector = {};
+originMicroApp.options.aHrefResolver = function(hrefValue, appName) {
+    var _aHrefResolverCollector_appName;
+    return ((_aHrefResolverCollector_appName = aHrefResolverCollector[appName]) === null || _aHrefResolverCollector_appName === void 0 ? void 0 : _aHrefResolverCollector_appName.call(aHrefResolverCollector, hrefValue)) || hrefValue;
+};
+var microApp = originMicroApp;
+export { MicroAppEventCenter, MicroAppEventEnum, MicroAppLink, MicroAppRoute, aHrefResolverCollector, microApp, navigateToWithMicroApp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/web-micro",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "sideEffects": false,
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,15 +20,17 @@
     "dist"
   ],
   "dependencies": {
-    "@micro-zoe/micro-app": "1.0.0-rc.20",
-    "@xfe-repo/web-router": "1.2.2",
-    "@xfe-repo/web-utils": "1.3.6"
+    "@micro-zoe/micro-app": "1.0.0-rc.24",
+    "@xfe-repo/web-utils": "1.3.7"
   },
   "devDependencies": {
     "@types/node": "^20.16.5",
     "@types/react": "^18",
-    "@xfe-repo/eslint-config": "0.0.5",
-    "@xfe-repo/typescript-config": "0.0.6"
+    "@xfe-repo/typescript-config": "0.0.6",
+    "@xfe-repo/eslint-config": "0.0.5"
+  },
+  "peerDependencies": {
+    "@xfe-repo/web-router": "1.2.3"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"