@tanstack/react-router 1.19.8 → 1.19.10

package/src/Matches.tsx

@@ -224,9 +224,19 @@ function MatchInner({
     ErrorComponent
 
   if (match.status === 'notFound') {
-    invariant(isNotFound(match.error), 'Expected a notFound error')
+    let error: unknown
+    if (isServerSideError(match.error)) {
+      const deserializeError =
+        router.options.errorSerializer?.deserialize ?? defaultDeserializeError
+
+      error = deserializeError(match.error.data)
+    } else {
+      error = match.error
+    }
+
+    invariant(isNotFound(error), 'Expected a notFound error')
 
-    return renderRouteNotFound(router, route, match.error.data)
+    return renderRouteNotFound(router, route, error)
   }
 
   if (match.status === 'redirected') {

package/src/router.ts

@@ -1602,6 +1602,10 @@ export class Router<
         } catch (err) {
           if (isRedirect(err)) {
             redirect = this.resolveRedirect(err)
+
+            if (!isServer) {
+              this.navigate({ ...(redirect as any), replace: true })
+            }
           } else if (isNotFound(err)) {
             notFound = err
             this.handleNotFound(pendingMatches, err)