@xfe-repo/web-router 1.2.8 → 1.5.1

package/dist/index.js

@@ -94,6 +94,10 @@ function _object_spread(target) {
 function _sliced_to_array(arr, i) {
     return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
 }
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 function _unsupported_iterable_to_array(o, minLen) {
     if (!o) return;
     if (typeof o === "string") return _array_like_to_array(o, minLen);
@@ -103,7 +107,7 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 function _ts_generator(thisArg, body) {
-    var f, y, t, g, _ = {
+    var f, y, t, _ = {
         label: 0,
         sent: function() {
             if (t[0] & 1) throw t[1];
@@ -111,13 +115,17 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    };
-    return g = {
-        next: verb(0),
-        "throw": verb(1),
-        "return": verb(2)
-    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-        return this;
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), d = Object.defineProperty;
+    return d(g, "next", {
+        value: verb(0)
+    }), d(g, "throw", {
+        value: verb(1)
+    }), d(g, "return", {
+        value: verb(2)
+    }), typeof Symbol === "function" && d(g, Symbol.iterator, {
+        value: function() {
+            return this;
+        }
     }), g;
     function verb(n) {
         return function(v) {
@@ -129,7 +137,7 @@ function _ts_generator(thisArg, body) {
     }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while(_)try {
+        while(g && (g = 0, op[0] && (_ = 0)), _)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,
@@ -203,20 +211,20 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = function(target, all) {
+var __export = function __export(target, all) {
     for(var name in all)__defProp(target, name, {
         get: all[name],
         enumerable: true
     });
 };
-var __copyProps = function(to, from, except, desc) {
-    if (from && typeof from === "object" || typeof from === "function") {
+var __copyProps = function __copyProps(to, from, except, desc) {
+    if (from && (typeof from === "undefined" ? "undefined" : _type_of(from)) === "object" || typeof from === "function") {
         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
         try {
             var _loop = function() {
                 var key = _step.value;
                 if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-                    get: function() {
+                    get: function get() {
                         return from[key];
                     },
                     enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
@@ -240,10 +248,10 @@ var __copyProps = function(to, from, except, desc) {
     }
     return to;
 };
-var __reExport = function(target, mod, secondTarget) {
+var __reExport = function __reExport(target, mod, secondTarget) {
     return __copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default");
 };
-var __toESM = function(mod, isNodeMode, target) {
+var __toESM = function __toESM(mod, isNodeMode, target) {
     return target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(// If the importer is in node compatibility mode or this is not an ESM
     // file that has been converted to a CommonJS file using a Babel-
     // compatible transform (i.e. "__esModule" has not been set), then set
@@ -253,52 +261,52 @@ var __toESM = function(mod, isNodeMode, target) {
         enumerable: true
     }) : target, mod);
 };
-var __toCommonJS = function(mod) {
+var __toCommonJS = function __toCommonJS(mod) {
     return __copyProps(__defProp({}, "__esModule", {
         value: true
     }), mod);
 };
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
-    HISTORY_CHANGE_EVENT: function() {
+var index_exports = {};
+__export(index_exports, {
+    HISTORY_CHANGE_EVENT: function HISTORY_CHANGE_EVENT1() {
         return HISTORY_CHANGE_EVENT;
     },
-    Link: function() {
+    Link: function Link1() {
         return Link;
     },
-    Router: function() {
+    Router: function Router1() {
         return Router;
     },
-    createNavigator: function() {
+    createNavigator: function createNavigator1() {
         return createNavigator;
     },
-    getClientNavigator: function() {
+    getClientNavigator: function getClientNavigator1() {
         return getClientNavigator;
     },
-    getRoutes: function() {
+    getRoutes: function getRoutes1() {
         return getRoutes;
     },
-    initHistoryInterceptor: function() {
+    initHistoryInterceptor: function initHistoryInterceptor1() {
         return initHistoryInterceptor;
     },
-    isHistoryIntercepted: function() {
+    isHistoryIntercepted: function isHistoryIntercepted1() {
         return isHistoryIntercepted;
     },
-    onHistoryChange: function() {
+    onHistoryChange: function onHistoryChange1() {
         return onHistoryChange;
     },
-    routerDynamicRegx: function() {
+    routerDynamicRegx: function routerDynamicRegx1() {
         return routerDynamicRegx;
     },
-    routerIndexRegx: function() {
+    routerIndexRegx: function routerIndexRegx1() {
         return routerIndexRegx;
     },
-    routerReady: function() {
+    routerReady: function routerReady1() {
         return routerReady;
     }
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 var import_component2 = require("@loadable/component");
 var import_history = require("history");
 var import_react_router_dom3 = require("react-router-dom");
@@ -341,7 +349,7 @@ function initHistoryInterceptor() {
         originalReplaceState.call(this, state, unused, url);
         dispatchHistoryChangeEvent(createEventDetail("replaceState", state));
     };
-    var handlePopState = function() {
+    var handlePopState = function handlePopState() {
         dispatchHistoryChangeEvent(createEventDetail("popstate", history.state));
     };
     window.addEventListener("popstate", handlePopState);
@@ -363,7 +371,7 @@ function isHistoryIntercepted() {
     return isIntercepted;
 }
 function onHistoryChange(callback) {
-    var handler = function(event) {
+    var handler = function handler(event) {
         var customEvent = event;
         callback(customEvent.detail);
     };
@@ -373,7 +381,7 @@ function onHistoryChange(callback) {
     };
 }
 // src/index.ts
-__reExport(src_exports, require("react-router-dom"), module.exports);
+__reExport(index_exports, require("react-router-dom"), module.exports);
 // src/Link.tsx
 var import_react = require("react");
 var import_react_router_dom = require("react-router-dom");
@@ -385,7 +393,7 @@ var Link = (0, import_react.memo)(function(props) {
         return getClientNavigator();
     }, []);
     if (/http(s)?:\/{2}/.test(to)) {
-        var handleLink = function(e) {
+        var handleLink = function handleLink(e) {
             if (e.ctrlKey || e.metaKey) return;
             e.preventDefault();
             if (target === "_blank") {
@@ -403,8 +411,8 @@ var Link = (0, import_react.memo)(function(props) {
         });
     }
     if (preload) {
-        var handleLink1 = function() {
-            var _ref = _async_to_generator(function(e) {
+        var handleLink1 = function handleLink(e) {
+            return _async_to_generator(function() {
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
@@ -423,11 +431,8 @@ var Link = (0, import_react.memo)(function(props) {
                             ];
                     }
                 });
-            });
-            return function handleLink1(e) {
-                return _ref.apply(this, arguments);
-            };
-        }();
+            })();
+        };
         return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("a", {
             href: to,
             onClick: handleLink1,
@@ -482,7 +487,7 @@ var Router = (0, import_react2.memo)(function(props) {
 var import_component = __toESM(require("@loadable/component"));
 var routerIndexRegx = /^(?!.*component)(.*)?\/index(\[[^.]+])?\.(ts|js)x?$/;
 var routerDynamicRegx = /\[([^.]+)]/;
-var getRoutes = function(config) {
+var getRoutes = function getRoutes(config) {
     var pagesIndexPath = config.pagesIndexPath, getRoutePath = config.getRoutePath, getPageComponents = config.getPageComponents, fallback = config.fallback;
     var routes = [];
     pagesIndexPath.forEach(function(pageIndexPath) {
@@ -522,8 +527,8 @@ function createNavigator(options) {
         originHistory = (0, import_history.createHashHistory)();
     }
     _navigator = originHistory;
-    _navigator.preload = function() {
-        var _ref = _async_to_generator(function(path, isReplace, query) {
+    _navigator.preload = function(path, isReplace, query) {
+        return _async_to_generator(function() {
             var _, _this, _path_split, tmp, originPath, tmp1, search, matchPath, currentRoute, _pageModule_default_emitOnLoad, _pageModule_default, pageModule, _currentRoute_Component_emitOnLoad, _currentRoute_Component;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
@@ -580,14 +585,11 @@ function createNavigator(options) {
                         ];
                 }
             });
-        });
-        return function(path, isReplace, query) {
-            return _ref.apply(this, arguments);
-        };
-    }();
+        })();
+    };
     return _navigator;
 }
-var getClientNavigator = function() {
+var getClientNavigator = function getClientNavigator() {
     return _navigator;
 };
 var routerReady = import_component2.loadableReady;

package/dist/index.mjs

@@ -1,4 +1,3 @@
-// src/index.ts
 function _array_like_to_array(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];
@@ -103,7 +102,7 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 function _ts_generator(thisArg, body) {
-    var f, y, t, g, _ = {
+    var f, y, t, _ = {
         label: 0,
         sent: function() {
             if (t[0] & 1) throw t[1];
@@ -111,13 +110,17 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    };
-    return g = {
-        next: verb(0),
-        "throw": verb(1),
-        "return": verb(2)
-    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-        return this;
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), d = Object.defineProperty;
+    return d(g, "next", {
+        value: verb(0)
+    }), d(g, "throw", {
+        value: verb(1)
+    }), d(g, "return", {
+        value: verb(2)
+    }), typeof Symbol === "function" && d(g, Symbol.iterator, {
+        value: function() {
+            return this;
+        }
     }), g;
     function verb(n) {
         return function(v) {
@@ -129,7 +132,7 @@ function _ts_generator(thisArg, body) {
     }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while(_)try {
+        while(g && (g = 0, op[0] && (_ = 0)), _)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,
@@ -197,6 +200,7 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
+// src/index.ts
 import { loadableReady } from "@loadable/component";
 import { createBrowserHistory, createHashHistory, createMemoryHistory } from "history";
 import { matchRoutes } from "react-router-dom";
@@ -239,7 +243,7 @@ function initHistoryInterceptor() {
         originalReplaceState.call(this, state, unused, url);
         dispatchHistoryChangeEvent(createEventDetail("replaceState", state));
     };
-    var handlePopState = function() {
+    var handlePopState = function handlePopState() {
         dispatchHistoryChangeEvent(createEventDetail("popstate", history.state));
     };
     window.addEventListener("popstate", handlePopState);
@@ -261,7 +265,7 @@ function isHistoryIntercepted() {
     return isIntercepted;
 }
 function onHistoryChange(callback) {
-    var handler = function(event) {
+    var handler = function handler(event) {
         var customEvent = event;
         callback(customEvent.detail);
     };
@@ -283,7 +287,7 @@ var Link = memo(function(props) {
         return getClientNavigator();
     }, []);
     if (/http(s)?:\/{2}/.test(to)) {
-        var handleLink = function(e) {
+        var handleLink = function handleLink(e) {
             if (e.ctrlKey || e.metaKey) return;
             e.preventDefault();
             if (target === "_blank") {
@@ -301,8 +305,8 @@ var Link = memo(function(props) {
         });
     }
     if (preload) {
-        var handleLink1 = function() {
-            var _ref = _async_to_generator(function(e) {
+        var handleLink1 = function handleLink(e) {
+            return _async_to_generator(function() {
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
@@ -321,11 +325,8 @@ var Link = memo(function(props) {
                             ];
                     }
                 });
-            });
-            return function handleLink1(e) {
-                return _ref.apply(this, arguments);
-            };
-        }();
+            })();
+        };
         return /* @__PURE__ */ jsx("a", {
             href: to,
             onClick: handleLink1,
@@ -380,7 +381,7 @@ var Router = memo2(function(props) {
 import loadable from "@loadable/component";
 var routerIndexRegx = /^(?!.*component)(.*)?\/index(\[[^.]+])?\.(ts|js)x?$/;
 var routerDynamicRegx = /\[([^.]+)]/;
-var getRoutes = function(config) {
+var getRoutes = function getRoutes(config) {
     var pagesIndexPath = config.pagesIndexPath, getRoutePath = config.getRoutePath, getPageComponents = config.getPageComponents, fallback = config.fallback;
     var routes = [];
     pagesIndexPath.forEach(function(pageIndexPath) {
@@ -420,8 +421,8 @@ function createNavigator(options) {
         originHistory = createHashHistory();
     }
     _navigator = originHistory;
-    _navigator.preload = function() {
-        var _ref = _async_to_generator(function(path, isReplace, query) {
+    _navigator.preload = function(path, isReplace, query) {
+        return _async_to_generator(function() {
             var _matchRoutes_, _matchRoutes, _path_split, tmp, originPath, tmp1, search, matchPath, currentRoute, _pageModule_default_emitOnLoad, _pageModule_default, pageModule, _currentRoute_Component_emitOnLoad, _currentRoute_Component;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
@@ -478,14 +479,11 @@ function createNavigator(options) {
                         ];
                 }
             });
-        });
-        return function(path, isReplace, query) {
-            return _ref.apply(this, arguments);
-        };
-    }();
+        })();
+    };
     return _navigator;
 }
-var getClientNavigator = function() {
+var getClientNavigator = function getClientNavigator() {
     return _navigator;
 };
 var routerReady = loadableReady;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/web-router",
-  "version": "1.2.8",
+  "version": "1.5.1",
   "sideEffects": false,
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,14 +26,15 @@
   },
   "devDependencies": {
     "@types/loadable__component": "^5.13.9",
-    "@types/node": "^20.16.5",
+    "@types/node": "^20.17.0",
     "@types/react": "^18",
-    "@xfe-repo/web-register": "1.3.5",
-    "@xfe-repo/typescript-config": "0.0.6",
-    "@xfe-repo/eslint-config": "0.0.5"
+    "eslint": "8.57.1",
+    "@xfe-repo/typescript-config": "1.5.1",
+    "@xfe-repo/web-register": "1.5.1",
+    "@xfe-repo/eslint-config": "1.5.1"
   },
   "peerDependencies": {
-    "@xfe-repo/web-utils": "1.3.11"
+    "@xfe-repo/web-utils": "1.5.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -41,7 +42,7 @@
   "scripts": {
     "build": "tsup",
     "dev": "tsup --watch",
-    "lint": "eslint \"src/**/*.ts*\"",
+    "lint": "eslint \"src/**/*.ts*\" --fix",
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
   }
 }