@xfe-repo/web-router 1.2.2 → 1.2.5

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { History } from 'history';
 import { LoadableComponent, loadableReady } from '@loadable/component';
-import { ParsedQuery } from 'query-string';
+import { ParsedQuery } from '@xfe-repo/web-utils/tools';
 import React, { ReactElement, PropsWithChildren, ComponentType } from 'react';
 import { RegisterComponentStatic } from '@xfe-repo/web-register';
 import { LinkProps as LinkProps$1 } from 'react-router-dom';
@@ -32,17 +32,11 @@ declare const Router: React.MemoExoticComponent<(props: RouterProps) => react_js
 
 type LinkProps = Omit<LinkProps$1, 'to'> & {
     to: string;
-    reLaunch?: boolean;
     preload?: boolean;
 };
 declare const Link: React.MemoExoticComponent<(props: LinkProps) => react_jsx_runtime.JSX.Element>;
 
-type NavigatorStack = {
-    pathname: string;
-};
 interface NavigatorType extends History {
-    stack: NavigatorStack[];
-    reLaunch: (path: string, state?: any) => void;
     preload: (path: string, isReplace?: boolean, query?: ParsedQuery<string | number | boolean>) => Promise<void>;
     leave: (path: string) => void;
 }
@@ -56,4 +50,4 @@ declare function createNavigator(options: CreateNavigatorOptions): NavigatorType
 declare const getClientNavigator: () => NavigatorType;
 declare const routerReady: typeof loadableReady;
 
-export { type CreateNavigatorOptions, type GetRoutesConfig, Link, type NavigatorStack, type NavigatorType, type PageComponent, type RouteConfig, Router, createNavigator, getClientNavigator, getRoutes, routerDynamicRegx, routerIndexRegx, routerReady };
+export { type CreateNavigatorOptions, type GetRoutesConfig, Link, type NavigatorType, type PageComponent, type RouteConfig, Router, createNavigator, getClientNavigator, getRoutes, routerDynamicRegx, routerIndexRegx, routerReady };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { History } from 'history';
 import { LoadableComponent, loadableReady } from '@loadable/component';
-import { ParsedQuery } from 'query-string';
+import { ParsedQuery } from '@xfe-repo/web-utils/tools';
 import React, { ReactElement, PropsWithChildren, ComponentType } from 'react';
 import { RegisterComponentStatic } from '@xfe-repo/web-register';
 import { LinkProps as LinkProps$1 } from 'react-router-dom';
@@ -32,17 +32,11 @@ declare const Router: React.MemoExoticComponent<(props: RouterProps) => react_js
 
 type LinkProps = Omit<LinkProps$1, 'to'> & {
     to: string;
-    reLaunch?: boolean;
     preload?: boolean;
 };
 declare const Link: React.MemoExoticComponent<(props: LinkProps) => react_jsx_runtime.JSX.Element>;
 
-type NavigatorStack = {
-    pathname: string;
-};
 interface NavigatorType extends History {
-    stack: NavigatorStack[];
-    reLaunch: (path: string, state?: any) => void;
     preload: (path: string, isReplace?: boolean, query?: ParsedQuery<string | number | boolean>) => Promise<void>;
     leave: (path: string) => void;
 }
@@ -56,4 +50,4 @@ declare function createNavigator(options: CreateNavigatorOptions): NavigatorType
 declare const getClientNavigator: () => NavigatorType;
 declare const routerReady: typeof loadableReady;
 
-export { type CreateNavigatorOptions, type GetRoutesConfig, Link, type NavigatorStack, type NavigatorType, type PageComponent, type RouteConfig, Router, createNavigator, getClientNavigator, getRoutes, routerDynamicRegx, routerIndexRegx, routerReady };
+export { type CreateNavigatorOptions, type GetRoutesConfig, Link, type NavigatorType, type PageComponent, type RouteConfig, Router, createNavigator, getClientNavigator, getRoutes, routerDynamicRegx, routerIndexRegx, routerReady };

package/dist/index.js

@@ -290,8 +290,7 @@ module.exports = __toCommonJS(src_exports);
 var import_history = require("history");
 var import_component2 = require("@loadable/component");
 var import_react_router_dom3 = require("react-router-dom");
-var import_query_string = __toESM(require("query-string"));
-var import_env = require("@xfe-repo/web-utils/env");
+var import_tools = require("@xfe-repo/web-utils/tools");
 __reExport(src_exports, require("react-router-dom"), module.exports);
 // src/routes.ts
 var import_component = __toESM(require("@loadable/component"));
@@ -366,40 +365,37 @@ var import_react2 = require("react");
 var import_react_router_dom2 = require("react-router-dom");
 var import_jsx_runtime2 = require("react/jsx-runtime");
 var Link = (0, import_react2.memo)(function(props) {
-    var to = props.to, children = props.children, reLaunch = props.reLaunch, preload = props.preload, replace = props.replace, className = props.className;
+    var to = props.to, children = props.children, preload = props.preload, replace = props.replace, className = props.className, target = props.target;
     var _navigator2 = (0, import_react2.useMemo)(function() {
         return getClientNavigator();
     }, []);
     if (/http(s)?:\/{2}/.test(to)) {
         var handleLink = function(e) {
+            if (e.ctrlKey || e.metaKey) return;
             e.preventDefault();
-            window.location.href = to;
+            if (target === "_blank") {
+                window.open(to);
+            } else {
+                window.location.href = to;
+            }
         };
         return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("a", {
             href: to,
             onClick: handleLink,
             className: className,
-            children: children
-        });
-    }
-    if (reLaunch) {
-        var handleLink1 = function(e) {
-            e.preventDefault();
-            _navigator2.reLaunch(to);
-        };
-        return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("a", {
-            href: to,
-            onClick: handleLink1,
-            className: className,
+            target: target,
             children: children
         });
     }
     if (preload) {
-        var handleLink2 = function() {
+        var handleLink1 = function() {
             var _ref = _async_to_generator(function(e) {
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
+                            if (e.ctrlKey || e.metaKey) return [
+                                2
+                            ];
                             e.preventDefault();
                             return [
                                 4,
@@ -413,13 +409,13 @@ var Link = (0, import_react2.memo)(function(props) {
                     }
                 });
             });
-            return function handleLink2(e) {
+            return function handleLink1(e) {
                 return _ref.apply(this, arguments);
             };
         }();
         return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("a", {
             href: to,
-            onClick: handleLink2,
+            onClick: handleLink1,
             className: className,
             children: children
         });
@@ -443,38 +439,6 @@ function createNavigator(options) {
         originHistory = (0, import_history.createHashHistory)();
     }
     _navigator = originHistory;
-    var initialStack = [
-        {
-            pathname: _navigator.location.pathname
-        }
-    ];
-    var stack = _navigator.stack = initialStack;
-    _navigator.listen(function(param) {
-        var location = param.location, action = param.action;
-        var pathname = location.pathname;
-        if (action === "PUSH") {
-            stack.push({
-                pathname: pathname
-            });
-        } else if (action === "REPLACE") {
-            stack.pop();
-            stack.push({
-                pathname: pathname
-            });
-        } else if (action === "POP") {
-            stack.pop();
-        }
-        if (!import_env.isProduction) console.log("router", action, pathname, stack);
-    });
-    _navigator.reLaunch = function(path, state) {
-        var _stack_;
-        var shouldBlack = -stack.length + 1;
-        if (shouldBlack < 0) _navigator.go(shouldBlack);
-        if (((_stack_ = stack[0]) === null || _stack_ === void 0 ? void 0 : _stack_.pathname) === path) return;
-        setTimeout(function() {
-            _navigator.replace(path, state);
-        }, 1);
-    };
     _navigator.preload = function() {
         var _ref = _async_to_generator(function(path, isReplace, query) {
             var _, _this, _path_split, tmp, originPath, tmp1, search, matchPath, currentRoute, _pageModule_default_emitOnLoad, _pageModule_default, pageModule, _currentRoute_Component_emitOnLoad, _currentRoute_Component;
@@ -484,7 +448,7 @@ function createNavigator(options) {
                         _path_split = _sliced_to_array(path.split("?"), 2), tmp = _path_split[0], originPath = tmp === void 0 ? "" : tmp, tmp1 = _path_split[1], search = tmp1 === void 0 ? "" : tmp1;
                         matchPath = originPath.toLowerCase();
                         currentRoute = (_this = (0, import_react_router_dom3.matchRoutes)(routes, matchPath)) === null || _this === void 0 ? void 0 : (_ = _this[0]) === null || _ === void 0 ? void 0 : _.route;
-                        query = query || import_query_string.default.parse(search, {
+                        query = query || import_tools.queryString.parse(search, {
                             parseBooleans: true,
                             parseNumbers: true
                         });

package/dist/index.mjs

@@ -200,8 +200,7 @@ function _ts_generator(thisArg, body) {
 import { createHashHistory, createBrowserHistory, createMemoryHistory } from "history";
 import { loadableReady } from "@loadable/component";
 import { matchRoutes } from "react-router-dom";
-import queryString from "query-string";
-import { isProduction } from "@xfe-repo/web-utils/env";
+import { queryString } from "@xfe-repo/web-utils/tools";
 export * from "react-router-dom";
 // src/routes.ts
 import loadable from "@loadable/component";
@@ -276,40 +275,37 @@ import { memo as memo2, useMemo } from "react";
 import { Link as OriginalLink } from "react-router-dom";
 import { jsx as jsx2 } from "react/jsx-runtime";
 var Link = memo2(function(props) {
-    var to = props.to, children = props.children, reLaunch = props.reLaunch, preload = props.preload, replace = props.replace, className = props.className;
+    var to = props.to, children = props.children, preload = props.preload, replace = props.replace, className = props.className, target = props.target;
     var _navigator2 = useMemo(function() {
         return getClientNavigator();
     }, []);
     if (/http(s)?:\/{2}/.test(to)) {
         var handleLink = function(e) {
+            if (e.ctrlKey || e.metaKey) return;
             e.preventDefault();
-            window.location.href = to;
+            if (target === "_blank") {
+                window.open(to);
+            } else {
+                window.location.href = to;
+            }
         };
         return /* @__PURE__ */ jsx2("a", {
             href: to,
             onClick: handleLink,
             className: className,
-            children: children
-        });
-    }
-    if (reLaunch) {
-        var handleLink1 = function(e) {
-            e.preventDefault();
-            _navigator2.reLaunch(to);
-        };
-        return /* @__PURE__ */ jsx2("a", {
-            href: to,
-            onClick: handleLink1,
-            className: className,
+            target: target,
             children: children
         });
     }
     if (preload) {
-        var handleLink2 = function() {
+        var handleLink1 = function() {
             var _ref = _async_to_generator(function(e) {
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
+                            if (e.ctrlKey || e.metaKey) return [
+                                2
+                            ];
                             e.preventDefault();
                             return [
                                 4,
@@ -323,13 +319,13 @@ var Link = memo2(function(props) {
                     }
                 });
             });
-            return function handleLink2(e) {
+            return function handleLink1(e) {
                 return _ref.apply(this, arguments);
             };
         }();
         return /* @__PURE__ */ jsx2("a", {
             href: to,
-            onClick: handleLink2,
+            onClick: handleLink1,
             className: className,
             children: children
         });
@@ -353,38 +349,6 @@ function createNavigator(options) {
         originHistory = createHashHistory();
     }
     _navigator = originHistory;
-    var initialStack = [
-        {
-            pathname: _navigator.location.pathname
-        }
-    ];
-    var stack = _navigator.stack = initialStack;
-    _navigator.listen(function(param) {
-        var location = param.location, action = param.action;
-        var pathname = location.pathname;
-        if (action === "PUSH") {
-            stack.push({
-                pathname: pathname
-            });
-        } else if (action === "REPLACE") {
-            stack.pop();
-            stack.push({
-                pathname: pathname
-            });
-        } else if (action === "POP") {
-            stack.pop();
-        }
-        if (!isProduction) console.log("router", action, pathname, stack);
-    });
-    _navigator.reLaunch = function(path, state) {
-        var _stack_;
-        var shouldBlack = -stack.length + 1;
-        if (shouldBlack < 0) _navigator.go(shouldBlack);
-        if (((_stack_ = stack[0]) === null || _stack_ === void 0 ? void 0 : _stack_.pathname) === path) return;
-        setTimeout(function() {
-            _navigator.replace(path, state);
-        }, 1);
-    };
     _navigator.preload = function() {
         var _ref = _async_to_generator(function(path, isReplace, query) {
             var _matchRoutes_, _matchRoutes, _path_split, tmp, originPath, tmp1, search, matchPath, currentRoute, _pageModule_default_emitOnLoad, _pageModule_default, pageModule, _currentRoute_Component_emitOnLoad, _currentRoute_Component;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/web-router",
-  "version": "1.2.2",
+  "version": "1.2.5",
   "sideEffects": false,
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,17 +22,18 @@
   "dependencies": {
     "@loadable/component": "^5.16.4",
     "history": "^5.3.0",
-    "query-string": "^7.1.3",
-    "react-router-dom": "6.28.0",
-    "@xfe-repo/web-utils": "1.3.5"
+    "react-router-dom": "6.28.0"
   },
   "devDependencies": {
     "@types/loadable__component": "^5.13.9",
     "@types/node": "^20.16.5",
     "@types/react": "^18",
     "@xfe-repo/eslint-config": "0.0.5",
-    "@xfe-repo/typescript-config": "0.0.6",
-    "@xfe-repo/web-register": "1.3.4"
+    "@xfe-repo/web-register": "1.3.5",
+    "@xfe-repo/typescript-config": "0.0.6"
+  },
+  "peerDependencies": {
+    "@xfe-repo/web-utils": "1.3.7"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"