@tanstack/router-core 1.129.3 → 1.129.5

package/dist/cjs/RouterProvider.d.cts

@@ -19,7 +19,7 @@ export interface CommitLocationOptions {
     startTransition?: boolean;
     ignoreBlocker?: boolean;
 }
-export type NavigateFn = <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: NavigateOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>) => Promise<void> | void;
+export type NavigateFn = <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: NavigateOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>) => Promise<void>;
 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;

package/dist/cjs/router.cjs

@@ -233,7 +233,7 @@ class RouterCore {
         const lastMatch = utils.last(allCurrentLocationMatches);
         let fromPath = lastMatch.fullPath;
         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);
+        const routeIsChanging = !!dest.to && !comparePaths(dest.to.toString(), fromPath) && !comparePaths(toPath, fromPath);
         if (dest.unsafeRelative === "path") {
           fromPath = currentLocation.pathname;
         } else if (routeIsChanging && dest.from) {
@@ -244,10 +244,10 @@ class RouterCore {
               void 0
             ).matchedRoutes;
             const matchedFrom = [...allCurrentLocationMatches].reverse().find((d) => {
-              return this.comparePaths(d.fullPath, fromPath);
+              return comparePaths(d.fullPath, fromPath);
             });
             const matchedCurrent = [...allFromMatches].reverse().find((d) => {
-              return this.comparePaths(d.fullPath, currentLocation.pathname);
+              return comparePaths(d.fullPath, currentLocation.pathname);
             });
             if (!matchedFrom && !matchedCurrent) {
               console.warn(`Could not find match for from: ${fromPath}`);
@@ -490,7 +490,7 @@ class RouterCore {
         } else {
           window.location.href = href;
         }
-        return;
+        return Promise.resolve();
       }
       return this.buildAndCommitLocation({
         ...rest,
@@ -1646,14 +1646,15 @@ class RouterCore {
     });
     return matches;
   }
-  comparePaths(path1, path2) {
-    return path1.replace(/\/$/, "") === path2.replace(/\/$/, "");
-  }
 }
 class SearchParamError extends Error {
 }
 class PathParamError extends Error {
 }
+const normalize = (str) => str.endsWith("/") && str.length > 1 ? str.slice(0, -1) : str;
+function comparePaths(a, b) {
+  return normalize(a) === normalize(b);
+}
 function lazyFn(fn, key) {
   return async (...args) => {
     const imported = await fn();