@tanstack/router-core 1.160.0 → 1.161.3

package/dist/cjs/router.d.cts

@@ -457,7 +457,7 @@ export type RouterContextOptions<TRouteTree extends AnyRoute> = AnyContext exten
     context: InferRouterContext<TRouteTree>;
 };
 export type RouterConstructorOptions<TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption, TDefaultStructuralSharingOption extends boolean, TRouterHistory extends RouterHistory, TDehydrated extends Record<string, any>> = Omit<RouterOptions<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, TDehydrated>, 'context' | 'serializationAdapters' | 'defaultSsr'> & RouterContextOptions<TRouteTree>;
-export type PreloadRouteFn<TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption, TDefaultStructuralSharingOption extends boolean, TRouterHistory extends RouterHistory> = <TFrom extends RoutePaths<TRouteTree> | string = string, TTo extends string | undefined = undefined, TMaskFrom extends RoutePaths<TRouteTree> | string = TFrom, TMaskTo extends string = ''>(opts: NavigateOptions<RouterCore<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory>, TFrom, TTo, TMaskFrom, TMaskTo>) => Promise<Array<AnyRouteMatch> | undefined>;
+export type PreloadRouteFn<TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption, TDefaultStructuralSharingOption extends boolean, TRouterHistory extends RouterHistory> = <TFrom extends RoutePaths<TRouteTree> | string = string, TTo extends string | undefined = undefined, TMaskFrom extends RoutePaths<TRouteTree> | string = TFrom, TMaskTo extends string = ''>(opts: NavigateOptions<RouterCore<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory>, TFrom, TTo, TMaskFrom, TMaskTo> & {}) => Promise<Array<AnyRouteMatch> | undefined>;
 export type MatchRouteFn<TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption, TDefaultStructuralSharingOption extends boolean, TRouterHistory extends RouterHistory> = <TFrom extends RoutePaths<TRouteTree> = '/', TTo extends string | undefined = undefined, TResolved = ResolveRelativePath<TFrom, NoInfer<TTo>>>(location: ToOptions<RouterCore<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory>, TFrom, TTo>, opts?: MatchRouteOptions) => false | RouteById<TRouteTree, TResolved>['types']['allParams'];
 export type UpdateFn<TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption, TDefaultStructuralSharingOption extends boolean, TRouterHistory extends RouterHistory, TDehydrated extends Record<string, any>> = (newOptions: RouterConstructorOptions<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, TDehydrated>) => void;
 export type InvalidateFn<TRouter extends AnyRouter> = (opts?: {

package/dist/esm/router.d.ts

@@ -457,7 +457,7 @@ export type RouterContextOptions<TRouteTree extends AnyRoute> = AnyContext exten
     context: InferRouterContext<TRouteTree>;
 };
 export type RouterConstructorOptions<TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption, TDefaultStructuralSharingOption extends boolean, TRouterHistory extends RouterHistory, TDehydrated extends Record<string, any>> = Omit<RouterOptions<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, TDehydrated>, 'context' | 'serializationAdapters' | 'defaultSsr'> & RouterContextOptions<TRouteTree>;
-export type PreloadRouteFn<TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption, TDefaultStructuralSharingOption extends boolean, TRouterHistory extends RouterHistory> = <TFrom extends RoutePaths<TRouteTree> | string = string, TTo extends string | undefined = undefined, TMaskFrom extends RoutePaths<TRouteTree> | string = TFrom, TMaskTo extends string = ''>(opts: NavigateOptions<RouterCore<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory>, TFrom, TTo, TMaskFrom, TMaskTo>) => Promise<Array<AnyRouteMatch> | undefined>;
+export type PreloadRouteFn<TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption, TDefaultStructuralSharingOption extends boolean, TRouterHistory extends RouterHistory> = <TFrom extends RoutePaths<TRouteTree> | string = string, TTo extends string | undefined = undefined, TMaskFrom extends RoutePaths<TRouteTree> | string = TFrom, TMaskTo extends string = ''>(opts: NavigateOptions<RouterCore<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory>, TFrom, TTo, TMaskFrom, TMaskTo> & {}) => Promise<Array<AnyRouteMatch> | undefined>;
 export type MatchRouteFn<TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption, TDefaultStructuralSharingOption extends boolean, TRouterHistory extends RouterHistory> = <TFrom extends RoutePaths<TRouteTree> = '/', TTo extends string | undefined = undefined, TResolved = ResolveRelativePath<TFrom, NoInfer<TTo>>>(location: ToOptions<RouterCore<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory>, TFrom, TTo>, opts?: MatchRouteOptions) => false | RouteById<TRouteTree, TResolved>['types']['allParams'];
 export type UpdateFn<TRouteTree extends AnyRoute, TTrailingSlashOption extends TrailingSlashOption, TDefaultStructuralSharingOption extends boolean, TRouterHistory extends RouterHistory, TDehydrated extends Record<string, any>> = (newOptions: RouterConstructorOptions<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, TDehydrated>) => void;
 export type InvalidateFn<TRouter extends AnyRouter> = (opts?: {

package/dist/esm/router.js

@@ -41,6 +41,10 @@ function getLocationChangeInfo(routerState) {
   const hashChanged = fromLocation?.hash !== toLocation.hash;
   return { fromLocation, toLocation, pathChanged, hrefChanged, hashChanged };
 }
+function filterRedirectedCachedMatches(matches) {
+  const filtered = matches.filter((d) => d.status !== "redirected");
+  return filtered.length === matches.length ? matches : filtered;
+}
 function createServerStore(initialState) {
   const store = {
     state: initialState,
@@ -131,16 +135,7 @@ class RouterCore {
             getInitialRouterState(this.latestLocation)
           );
         } else {
-          this.__store = new Store(getInitialRouterState(this.latestLocation), {
-            onUpdate: () => {
-              this.__store.state = {
-                ...this.state,
-                cachedMatches: this.state.cachedMatches.filter(
-                  (d) => !["redirected"].includes(d.status)
-                )
-              };
-            }
-          });
+          this.__store = new Store(getInitialRouterState(this.latestLocation));
           setupScrollRestoration(this);
         }
       }
@@ -170,10 +165,10 @@ class RouterCore {
         needsLocationUpdate = true;
       }
       if (needsLocationUpdate && this.__store) {
-        this.__store.state = {
-          ...this.state,
+        this.__store.setState((s) => ({
+          ...s,
           location: this.latestLocation
-        };
+        }));
       }
       if (typeof window !== "undefined" && "CSS" in window && typeof window.CSS?.supports === "function") {
         this.isViewTransitionTypesSupported = window.CSS.supports(
@@ -767,7 +762,7 @@ class RouterCore {
                           cachedMatches: [
                             ...s.cachedMatches,
                             ...exitingMatches.filter(
-                              (d) => d.status !== "error" && d.status !== "notFound"
+                              (d) => d.status !== "error" && d.status !== "notFound" && d.status !== "redirected"
                             )
                           ]
                         };
@@ -868,12 +863,21 @@ class RouterCore {
       this.startTransition(() => {
         const matchesKey = this.state.pendingMatches?.some((d) => d.id === id) ? "pendingMatches" : this.state.matches.some((d) => d.id === id) ? "matches" : this.state.cachedMatches.some((d) => d.id === id) ? "cachedMatches" : "";
         if (matchesKey) {
-          this.__store.setState((s) => ({
-            ...s,
-            [matchesKey]: s[matchesKey]?.map(
-              (d) => d.id === id ? updater(d) : d
-            )
-          }));
+          if (matchesKey === "cachedMatches") {
+            this.__store.setState((s) => ({
+              ...s,
+              cachedMatches: filterRedirectedCachedMatches(
+                s.cachedMatches.map((d) => d.id === id ? updater(d) : d)
+              )
+            }));
+          } else {
+            this.__store.setState((s) => ({
+              ...s,
+              [matchesKey]: s[matchesKey]?.map(
+                (d) => d.id === id ? updater(d) : d
+              )
+            }));
+          }
         }
       });
     };
@@ -969,7 +973,7 @@ class RouterCore {
     };
     this.loadRouteChunk = loadRouteChunk;
     this.preloadRoute = async (opts) => {
-      const next = this.buildLocation(opts);
+      const next = opts._builtLocation ?? this.buildLocation(opts);
       let matches = this.matchRoutes(next, {
         throwOnError: true,
         preload: true,