@tanstack/react-router 1.33.6 → 1.33.8

package/src/router.ts

@@ -27,6 +27,7 @@ import {
 } from './path'
 import { isRedirect, isResolvedRedirect } from './redirects'
 import { isNotFound } from './not-found'
+import type { Manifest } from './manifest'
 import type * as React from 'react'
 import type {
   HistoryLocation,
@@ -393,6 +394,7 @@ export type DehydratedRouteMatch = Pick<
 
 export interface DehydratedRouter {
   state: DehydratedRouterState
+  manifest?: Manifest
 }
 
 export type RouterConstructorOptions<
@@ -484,6 +486,7 @@ export class Router<
   injectedHtml: Array<InjectedHtmlEntry> = []
   dehydratedData?: TDehydrated
   viewTransitionPromise?: ControlledPromise<true>
+  manifest?: Manifest
 
   // Must build in constructor
   __store!: Store<RouterState<TRouteTree>>
@@ -1717,13 +1720,13 @@ export class Router<
                   handleRedirectAndNotFound(match, err)
                 }
 
-                matches[index] = match = {
+                matches[index] = match = updateMatch(match.id, () => ({
                   ...match,
                   error: err,
                   status: 'error',
                   updatedAt: Date.now(),
                   abortController: new AbortController(),
-                }
+                }))
               }
 
               if (match.paramsError) {
@@ -1739,8 +1742,8 @@ export class Router<
                   parentMatch?.context ?? this.options.context ?? {}
 
                 // Make sure the match has parent context set before going further
-                matches[index] = match = updateMatch(match.id, (prev) => ({
-                  ...prev,
+                matches[index] = match = updateMatch(match.id, () => ({
+                  ...match,
                   routeContext: replaceEqualDeep(
                     match.routeContext,
                     parentContext,
@@ -2314,6 +2317,7 @@ export class Router<
             : undefined,
         })),
       },
+      manifest: this.manifest,
     }
   }
 
@@ -2376,6 +2380,8 @@ export class Router<
         matches: matches as any,
       }
     })
+
+    this.manifest = ctx.router.manifest
   }
 
   handleNotFound = (matches: Array<AnyRouteMatch>, err: NotFoundError) => {