@tanstack/router-core 1.163.3 → 1.166.4

package/src/ssr/ssr-client.ts

@@ -28,6 +28,14 @@ function hydrateMatch(
   match.ssr = deyhydratedMatch.ssr
   match.updatedAt = deyhydratedMatch.u
   match.error = deyhydratedMatch.e
+  // Only hydrate global-not-found when a defined value is present in the
+  // dehydrated payload. If omitted, preserve the value computed from the
+  // current client location (important for SPA fallback HTML served at unknown
+  // URLs, where dehydrated matches may come from `/` but client matching marks
+  // root as globalNotFound).
+  if (deyhydratedMatch.g !== undefined) {
+    match.globalNotFound = deyhydratedMatch.g
+  }
 }
 
 export async function hydrate(router: AnyRouter): Promise<any> {
@@ -82,10 +90,9 @@ export async function hydrate(router: AnyRouter): Promise<any> {
 
   // kick off loading the route chunks
   const routeChunkPromise = Promise.all(
-    matches.map((match) => {
-      const route = router.looseRoutesById[match.routeId]!
-      return router.loadRouteChunk(route)
-    }),
+    matches.map((match) =>
+      router.loadRouteChunk(router.looseRoutesById[match.routeId]!),
+    ),
   )
 
   function setMatchForcePending(match: AnyRouteMatch) {
@@ -146,12 +153,10 @@ export async function hydrate(router: AnyRouter): Promise<any> {
     }
   })
 
-  router.__store.setState((s) => {
-    return {
-      ...s,
-      matches,
-    }
-  })
+  router.__store.setState((s) => ({
+    ...s,
+    matches,
+  }))
 
   // Allow the user to handle custom hydration data
   await router.options.hydrate?.(dehydratedData)
@@ -277,13 +282,11 @@ export async function hydrate(router: AnyRouter): Promise<any> {
           }))
         }
         // hide the pending component once the load is finished
-        router.updateMatch(match.id, (prev) => {
-          return {
-            ...prev,
-            _displayPending: undefined,
-            displayPendingPromise: undefined,
-          }
-        })
+        router.updateMatch(match.id, (prev) => ({
+          ...prev,
+          _displayPending: undefined,
+          displayPendingPromise: undefined,
+        }))
       })
     })
   }

package/src/ssr/ssr-server.ts

@@ -54,6 +54,9 @@ export function dehydrateMatch(match: AnyRouteMatch): DehydratedMatch {
       dehydratedMatch[shorthand] = match[key]
     }
   }
+  if (match.globalNotFound) {
+    dehydratedMatch.g = true
+  }
   return dehydratedMatch
 }
 

package/src/ssr/types.ts

@@ -9,6 +9,7 @@ export interface DehydratedMatch {
   u: MakeRouteMatch['updatedAt']
   s: MakeRouteMatch['status']
   ssr?: MakeRouteMatch['ssr']
+  g?: true
 }
 
 export interface DehydratedRouter {