@xfe-repo/web-router 1.2.6 → 1.2.8

package/dist/index.d.mts

@@ -99,6 +99,7 @@ type CreateNavigatorOptions = {
     mode: 'static' | 'browser' | 'hash';
     routes: RouteConfig[];
     initPathname?: string;
+    basename?: string;
     redirect?: (path: string) => void;
 };
 declare function createNavigator(options: CreateNavigatorOptions): NavigatorType;

package/dist/index.d.ts

@@ -99,6 +99,7 @@ type CreateNavigatorOptions = {
     mode: 'static' | 'browser' | 'hash';
     routes: RouteConfig[];
     initPathname?: string;
+    basename?: string;
     redirect?: (path: string) => void;
 };
 declare function createNavigator(options: CreateNavigatorOptions): NavigatorType;

package/dist/index.js

@@ -379,7 +379,8 @@ var import_react = require("react");
 var import_react_router_dom = require("react-router-dom");
 var import_jsx_runtime = require("react/jsx-runtime");
 var Link = (0, import_react.memo)(function(props) {
-    var to = props.to, children = props.children, preload = props.preload, replace = props.replace, className = props.className, target = props.target;
+    var originTo = props.to, children = props.children, preload = props.preload, replace = props.replace, className = props.className, target = props.target;
+    var to = (0, import_react_router_dom.useHref)(originTo);
     var _navigator2 = (0, import_react.useMemo)(function() {
         return getClientNavigator();
     }, []);
@@ -507,7 +508,7 @@ var getRoutes = function(config) {
 // src/index.ts
 var _navigator;
 function createNavigator(options) {
-    var mode = options.mode, _options_initPathname = options.initPathname, initPathname = _options_initPathname === void 0 ? "/" : _options_initPathname, routes = options.routes;
+    var mode = options.mode, _options_initPathname = options.initPathname, initPathname = _options_initPathname === void 0 ? "/" : _options_initPathname, routes = options.routes, basename = options.basename;
     var originHistory;
     if (mode === "static") {
         originHistory = (0, import_history.createMemoryHistory)({
@@ -529,7 +530,7 @@ function createNavigator(options) {
                     case 0:
                         _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;
+                        currentRoute = (_this = (0, import_react_router_dom3.matchRoutes)(routes, matchPath, basename)) === null || _this === void 0 ? void 0 : (_ = _this[0]) === null || _ === void 0 ? void 0 : _.route;
                         query = query || import_tools.queryString.parse(search, {
                             parseBooleans: true,
                             parseNumbers: true

package/dist/index.mjs

@@ -274,10 +274,11 @@ function onHistoryChange(callback) {
 export * from "react-router-dom";
 // src/Link.tsx
 import { memo, useMemo } from "react";
-import { Link as OriginalLink } from "react-router-dom";
+import { Link as OriginalLink, useHref } from "react-router-dom";
 import { jsx } from "react/jsx-runtime";
 var Link = memo(function(props) {
-    var to = props.to, children = props.children, preload = props.preload, replace = props.replace, className = props.className, target = props.target;
+    var originTo = props.to, children = props.children, preload = props.preload, replace = props.replace, className = props.className, target = props.target;
+    var to = useHref(originTo);
     var _navigator2 = useMemo(function() {
         return getClientNavigator();
     }, []);
@@ -405,7 +406,7 @@ var getRoutes = function(config) {
 // src/index.ts
 var _navigator;
 function createNavigator(options) {
-    var mode = options.mode, _options_initPathname = options.initPathname, initPathname = _options_initPathname === void 0 ? "/" : _options_initPathname, routes = options.routes;
+    var mode = options.mode, _options_initPathname = options.initPathname, initPathname = _options_initPathname === void 0 ? "/" : _options_initPathname, routes = options.routes, basename = options.basename;
     var originHistory;
     if (mode === "static") {
         originHistory = createMemoryHistory({
@@ -427,7 +428,7 @@ function createNavigator(options) {
                     case 0:
                         _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 = (_matchRoutes = matchRoutes(routes, matchPath)) === null || _matchRoutes === void 0 ? void 0 : (_matchRoutes_ = _matchRoutes[0]) === null || _matchRoutes_ === void 0 ? void 0 : _matchRoutes_.route;
+                        currentRoute = (_matchRoutes = matchRoutes(routes, matchPath, basename)) === null || _matchRoutes === void 0 ? void 0 : (_matchRoutes_ = _matchRoutes[0]) === null || _matchRoutes_ === void 0 ? void 0 : _matchRoutes_.route;
                         query = query || queryString.parse(search, {
                             parseBooleans: true,
                             parseNumbers: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/web-router",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "sideEffects": false,
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,12 +28,12 @@
     "@types/loadable__component": "^5.13.9",
     "@types/node": "^20.16.5",
     "@types/react": "^18",
+    "@xfe-repo/web-register": "1.3.5",
     "@xfe-repo/typescript-config": "0.0.6",
-    "@xfe-repo/eslint-config": "0.0.5",
-    "@xfe-repo/web-register": "1.3.5"
+    "@xfe-repo/eslint-config": "0.0.5"
   },
   "peerDependencies": {
-    "@xfe-repo/web-utils": "1.3.8"
+    "@xfe-repo/web-utils": "1.3.11"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"