@tanstack/router-core 1.125.3 → 1.126.2

package/dist/cjs/RouterProvider.d.cts

@@ -23,4 +23,5 @@ export type NavigateFn = <TRouter extends RegisteredRouter, TTo extends string |
 export type BuildLocationFn = <TRouter extends RegisteredRouter, TTo extends string | undefined, TFrom extends RoutePaths<TRouter['routeTree']> | string = string, TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom, TMaskTo extends string = ''>(opts: ToOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> & {
     leaveParams?: boolean;
     _includeValidateSearch?: boolean;
+    _isNavigate?: boolean;
 }) => ParsedLocation;

package/dist/cjs/router.cjs

@@ -231,21 +231,31 @@ class RouterCore {
       const build = (dest = {}) => {
         var _a;
         const currentLocation = dest._fromLocation || this.latestLocation;
-        const allFromMatches = this.matchRoutes(currentLocation, {
+        const allCurrentLocationMatches = this.matchRoutes(currentLocation, {
           _buildLocation: true
         });
-        const lastMatch = utils.last(allFromMatches);
+        const lastMatch = utils.last(allCurrentLocationMatches);
         let fromPath = lastMatch.fullPath;
-        const routeIsChanging = !!dest.to && dest.to !== fromPath && this.resolvePathWithBase(fromPath, `${dest.to}`) !== fromPath;
+        const toPath = dest.to ? this.resolvePathWithBase(fromPath, `${dest.to}`) : this.resolvePathWithBase(fromPath, ".");
+        const routeIsChanging = !!dest.to && !this.comparePaths(dest.to.toString(), fromPath) && !this.comparePaths(toPath, fromPath);
         if (dest.unsafeRelative === "path") {
           fromPath = currentLocation.pathname;
         } else if (routeIsChanging && dest.from) {
           fromPath = dest.from;
-          const existingFrom = [...allFromMatches].reverse().find((d) => {
-            return d.fullPath === fromPath || d.fullPath === path.joinPaths([fromPath, "/"]);
-          });
-          if (!existingFrom) {
-            console.warn(`Could not find match for from: ${dest.from}`);
+          if (process.env.NODE_ENV !== "production" && dest._isNavigate) {
+            const allFromMatches = this.getMatchedRoutes(
+              dest.from,
+              void 0
+            ).matchedRoutes;
+            const matchedFrom = [...allCurrentLocationMatches].reverse().find((d) => {
+              return this.comparePaths(d.fullPath, fromPath);
+            });
+            const matchedCurrent = [...allFromMatches].reverse().find((d) => {
+              return this.comparePaths(d.fullPath, currentLocation.pathname);
+            });
+            if (!matchedFrom && !matchedCurrent) {
+              console.warn(`Could not find match for from: ${fromPath}`);
+            }
           }
         }
         const fromSearch = lastMatch.search;
@@ -483,7 +493,8 @@ class RouterCore {
       return this.buildAndCommitLocation({
         ...rest,
         href,
-        to
+        to,
+        _isNavigate: true
       });
     };
     this.beforeLoad = () => {
@@ -1670,6 +1681,9 @@ class RouterCore {
     });
     return matches;
   }
+  comparePaths(path1, path2) {
+    return path1.replace(/(.+)\/$/, "$1") === path2.replace(/(.+)\/$/, "$1");
+  }
 }
 class SearchParamError extends Error {
 }