@tanstack/router-core 1.125.3 → 1.125.4

package/dist/cjs/router.d.cts

@@ -537,6 +537,7 @@ export declare class RouterCore<in out TRouteTree extends AnyRoute, in out TTrai
     getMatchedRoutes: GetMatchRoutesFn;
     cancelMatch: (id: string) => void;
     cancelMatches: () => void;
+    private comparePaths;
     buildLocation: BuildLocationFn;
     commitLocationPromise: undefined | ControlledPromise<void>;
     commitLocation: CommitLocationFn;

package/dist/esm/router.d.ts

@@ -537,6 +537,7 @@ export declare class RouterCore<in out TRouteTree extends AnyRoute, in out TTrai
     getMatchedRoutes: GetMatchRoutesFn;
     cancelMatch: (id: string) => void;
     cancelMatches: () => void;
+    private comparePaths;
     buildLocation: BuildLocationFn;
     commitLocationPromise: undefined | ControlledPromise<void>;
     commitLocation: CommitLocationFn;

package/dist/esm/router.js

@@ -234,16 +234,17 @@ class RouterCore {
         });
         const lastMatch = last(allFromMatches);
         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 === joinPaths([fromPath, "/"]);
+            return this.comparePaths(d.fullPath, fromPath);
           });
           if (!existingFrom) {
-            console.warn(`Could not find match for from: ${dest.from}`);
+            console.warn(`Could not find match for from: ${fromPath}`);
           }
         }
         const fromSearch = lastMatch.search;
@@ -1668,6 +1669,9 @@ class RouterCore {
     });
     return matches;
   }
+  comparePaths(path1, path2) {
+    return path1.replace(/(.+)\/$/, "$1") === path2.replace(/(.+)\/$/, "$1");
+  }
 }
 class SearchParamError extends Error {
 }