fix(router-core,ssr-client): Catch errors thrown during hydrate

e2e/react-start/basic/src/routeTree.gen.ts

@@ -33,7 +33,9 @@ import { Route as SearchParamsLoaderThrowsRedirectRouteImport } from './routes/s
 import { Route as SearchParamsDefaultRouteImport } from './routes/search-params/default'
 import { Route as RedirectTargetRouteImport } from './routes/redirect/$target'
 import { Route as PostsPostIdRouteImport } from './routes/posts.$postId'
+import { Route as NotFoundViaLoaderWithContextRouteImport } from './routes/not-found/via-loader-with-context'
 import { Route as NotFoundViaLoaderRouteImport } from './routes/not-found/via-loader'
+import { Route as NotFoundViaHeadRouteImport } from './routes/not-found/via-head'
 import { Route as NotFoundViaBeforeLoadRouteImport } from './routes/not-found/via-beforeLoad'
 import { Route as ApiUsersRouteImport } from './routes/api.users'
 import { Route as LayoutLayout2RouteImport } from './routes/_layout/_layout-2'
@@ -164,11 +166,22 @@ const PostsPostIdRoute = PostsPostIdRouteImport.update({
   path: '/$postId',
   getParentRoute: () => PostsRoute,
 } as any)
+const NotFoundViaLoaderWithContextRoute =
+  NotFoundViaLoaderWithContextRouteImport.update({
+    id: '/via-loader-with-context',
+    path: '/via-loader-with-context',
+    getParentRoute: () => NotFoundRouteRoute,
+  } as any)
 const NotFoundViaLoaderRoute = NotFoundViaLoaderRouteImport.update({
   id: '/via-loader',
   path: '/via-loader',
   getParentRoute: () => NotFoundRouteRoute,
 } as any)
+const NotFoundViaHeadRoute = NotFoundViaHeadRouteImport.update({
+  id: '/via-head',
+  path: '/via-head',
+  getParentRoute: () => NotFoundRouteRoute,
+} as any)
 const NotFoundViaBeforeLoadRoute = NotFoundViaBeforeLoadRouteImport.update({
   id: '/via-beforeLoad',
   path: '/via-beforeLoad',
@@ -272,7 +285,9 @@ export interface FileRoutesByFullPath {
   '/대한민국': typeof Char45824Char54620Char48124Char44397Route
   '/api/users': typeof ApiUsersRouteWithChildren
   '/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
+  '/not-found/via-head': typeof NotFoundViaHeadRoute
   '/not-found/via-loader': typeof NotFoundViaLoaderRoute
+  '/not-found/via-loader-with-context': typeof NotFoundViaLoaderWithContextRoute
   '/posts/$postId': typeof PostsPostIdRoute
   '/redirect/$target': typeof RedirectTargetRouteWithChildren
   '/search-params/default': typeof SearchParamsDefaultRoute
@@ -307,7 +322,9 @@ export interface FileRoutesByTo {
   '/대한민국': typeof Char45824Char54620Char48124Char44397Route
   '/api/users': typeof ApiUsersRouteWithChildren
   '/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
+  '/not-found/via-head': typeof NotFoundViaHeadRoute
   '/not-found/via-loader': typeof NotFoundViaLoaderRoute
+  '/not-found/via-loader-with-context': typeof NotFoundViaLoaderWithContextRoute
   '/posts/$postId': typeof PostsPostIdRoute
   '/search-params/default': typeof SearchParamsDefaultRoute
   '/search-params/loader-throws-redirect': typeof SearchParamsLoaderThrowsRedirectRoute
@@ -347,7 +364,9 @@ export interface FileRoutesById {
   '/_layout/_layout-2': typeof LayoutLayout2RouteWithChildren
   '/api/users': typeof ApiUsersRouteWithChildren
   '/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
+  '/not-found/via-head': typeof NotFoundViaHeadRoute
   '/not-found/via-loader': typeof NotFoundViaLoaderRoute
+  '/not-found/via-loader-with-context': typeof NotFoundViaLoaderWithContextRoute
   '/posts/$postId': typeof PostsPostIdRoute
   '/redirect/$target': typeof RedirectTargetRouteWithChildren
   '/search-params/default': typeof SearchParamsDefaultRoute
@@ -389,7 +408,9 @@ export interface FileRouteTypes {
     | '/대한민국'
     | '/api/users'
     | '/not-found/via-beforeLoad'
+    | '/not-found/via-head'
     | '/not-found/via-loader'
+    | '/not-found/via-loader-with-context'
     | '/posts/$postId'
     | '/redirect/$target'
     | '/search-params/default'
@@ -424,7 +445,9 @@ export interface FileRouteTypes {
     | '/대한민국'
     | '/api/users'
     | '/not-found/via-beforeLoad'
+    | '/not-found/via-head'
     | '/not-found/via-loader'
+    | '/not-found/via-loader-with-context'
     | '/posts/$postId'
     | '/search-params/default'
     | '/search-params/loader-throws-redirect'
@@ -463,7 +486,9 @@ export interface FileRouteTypes {
     | '/_layout/_layout-2'
     | '/api/users'
     | '/not-found/via-beforeLoad'
+    | '/not-found/via-head'
     | '/not-found/via-loader'
+    | '/not-found/via-loader-with-context'
     | '/posts/$postId'
     | '/redirect/$target'
     | '/search-params/default'
@@ -666,13 +691,27 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof PostsPostIdRouteImport
       parentRoute: typeof PostsRoute
     }
+    '/not-found/via-loader-with-context': {
+      id: '/not-found/via-loader-with-context'
+      path: '/via-loader-with-context'
+      fullPath: '/not-found/via-loader-with-context'
+      preLoaderRoute: typeof NotFoundViaLoaderWithContextRouteImport
+      parentRoute: typeof NotFoundRouteRoute
+    }
     '/not-found/via-loader': {
       id: '/not-found/via-loader'
       path: '/via-loader'
       fullPath: '/not-found/via-loader'
       preLoaderRoute: typeof NotFoundViaLoaderRouteImport
       parentRoute: typeof NotFoundRouteRoute
     }
+    '/not-found/via-head': {
+      id: '/not-found/via-head'
+      path: '/via-head'
+      fullPath: '/not-found/via-head'
+      preLoaderRoute: typeof NotFoundViaHeadRouteImport
+      parentRoute: typeof NotFoundRouteRoute
+    }
     '/not-found/via-beforeLoad': {
       id: '/not-found/via-beforeLoad'
       path: '/via-beforeLoad'
@@ -797,13 +836,17 @@ declare module '@tanstack/react-router' {
 
 interface NotFoundRouteRouteChildren {
   NotFoundViaBeforeLoadRoute: typeof NotFoundViaBeforeLoadRoute
+  NotFoundViaHeadRoute: typeof NotFoundViaHeadRoute
   NotFoundViaLoaderRoute: typeof NotFoundViaLoaderRoute
+  NotFoundViaLoaderWithContextRoute: typeof NotFoundViaLoaderWithContextRoute
   NotFoundIndexRoute: typeof NotFoundIndexRoute
 }
 
 const NotFoundRouteRouteChildren: NotFoundRouteRouteChildren = {
   NotFoundViaBeforeLoadRoute: NotFoundViaBeforeLoadRoute,
+  NotFoundViaHeadRoute: NotFoundViaHeadRoute,
   NotFoundViaLoaderRoute: NotFoundViaLoaderRoute,
+  NotFoundViaLoaderWithContextRoute: NotFoundViaLoaderWithContextRoute,
   NotFoundIndexRoute: NotFoundIndexRoute,
 }
 

e2e/react-start/basic/src/routes/not-found/index.tsx

@@ -25,6 +25,26 @@ export const Route = createFileRoute('/not-found/')({
             via-loader
           </Link>
         </div>
+        <div className="mb-2">
+          <Link
+            from={Route.fullPath}
+            to="./via-head"
+            preload={preload}
+            data-testid="via-head"
+          >
+            via-head
+          </Link>
+        </div>
+        <div className="mb-2">
+          <Link
+            from={Route.fullPath}
+            to="./via-loader-with-context"
+            preload={preload}
+            data-testid="via-loader-with-context"
+          >
+            via-loader-with-context
+          </Link>
+        </div>
       </div>
     )
   },

e2e/react-start/basic/src/routes/not-found/via-head.tsx

@@ -0,0 +1,23 @@
+import { createFileRoute, notFound } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/not-found/via-head')({
+  head: () => {
+    throw notFound()
+  },
+  component: RouteComponent,
+  notFoundComponent: () => {
+    return (
+      <div data-testid="via-head-notFound-component">
+        Not Found "/not-found/via-head"!
+      </div>
+    )
+  },
+})
+
+function RouteComponent() {
+  return (
+    <div data-testid="via-head-route-component" data-server={typeof window}>
+      Hello "/not-found/via-head"!
+    </div>
+  )
+}

e2e/react-start/basic/src/routes/not-found/via-loader-with-context.tsx

@@ -0,0 +1,29 @@
+import { createFileRoute, notFound, useRouteContext } from '@tanstack/react-router'
+
+export const Route = createFileRoute('/not-found/via-loader-with-context')({
+  beforeLoad: () => {
+    return {
+        fool: 'of a Took'
+    }
+  },
+  loader: () => {
+    throw notFound()
+  },
+  component: RouteComponent,
+  notFoundComponent: () => {
+    const context = useRouteContext({ strict: false })
+    return (
+        <div data-testid="via-loader-with-context-notFound-component" data-server={typeof window}>
+        {`Hello you fool ${context.fool}`}
+        </div>
+    )
+  },
+})
+
+function RouteComponent() {
+  return (
+    <div data-testid="via-loader-with-context-route-component" data-server={typeof window}>
+      Hello "/not-found/via-loader-with-context"!
+    </div>
+  )
+}

e2e/react-start/basic/tests/not-found.spec.ts

@@ -9,6 +9,7 @@ const combinate = (combinateImport as any).default as typeof combinateImport
 test.use({
   whitelistErrors: [
     /Failed to load resource: the server responded with a status of 404/,
+    'Error during route context hydration: {isNotFound: true}',
   ],
 })
 test.describe('not-found', () => {
@@ -24,8 +25,7 @@ test.describe('not-found', () => {
 
   test.describe('throw notFound()', () => {
     const navigationTestMatrix = combinate({
-      // TODO beforeLoad!
-      thrower: [/* 'beforeLoad',*/ 'loader'] as const,
+      thrower: ['beforeLoad', 'head', 'loader', 'loader-with-context'] as const,
       preload: [false, true] as const,
     })
 
@@ -55,9 +55,7 @@ test.describe('not-found', () => {
       })
     })
     const directVisitTestMatrix = combinate({
-      // TODO beforeLoad!
-
-      thrower: [/* 'beforeLoad',*/ 'loader'] as const,
+      thrower: ['beforeLoad', 'head', 'loader', 'loader-with-context'] as const,
     })
 
     directVisitTestMatrix.forEach(({ thrower }) => {

e2e/react-start/basic/vite.config.ts

@@ -20,7 +20,9 @@ const prerenderConfiguration = {
       '/redirect',
       '/i-do-not-exist',
       '/not-found/via-beforeLoad',
+      '/not-found/via-head',
       '/not-found/via-loader',
+      '/not-found/via-loader-with-context',
     ].some((p) => page.path.includes(p)),
   maxRedirects: 100,
 }

e2e/solid-start/basic/src/routeTree.gen.ts

@@ -31,7 +31,9 @@ import { Route as SearchParamsLoaderThrowsRedirectRouteImport } from './routes/s
 import { Route as SearchParamsDefaultRouteImport } from './routes/search-params/default'
 import { Route as RedirectTargetRouteImport } from './routes/redirect/$target'
 import { Route as PostsPostIdRouteImport } from './routes/posts.$postId'
+import { Route as NotFoundViaLoaderWithContextRouteImport } from './routes/not-found/via-loader-with-context'
 import { Route as NotFoundViaLoaderRouteImport } from './routes/not-found/via-loader'
+import { Route as NotFoundViaHeadRouteImport } from './routes/not-found/via-head'
 import { Route as NotFoundViaBeforeLoadRouteImport } from './routes/not-found/via-beforeLoad'
 import { Route as ApiUsersRouteImport } from './routes/api/users'
 import { Route as LayoutLayout2RouteImport } from './routes/_layout/_layout-2'
@@ -158,11 +160,22 @@ const PostsPostIdRoute = PostsPostIdRouteImport.update({
   path: '/$postId',
   getParentRoute: () => PostsRoute,
 } as any)
+const NotFoundViaLoaderWithContextRoute =
+  NotFoundViaLoaderWithContextRouteImport.update({
+    id: '/via-loader-with-context',
+    path: '/via-loader-with-context',
+    getParentRoute: () => NotFoundRouteRoute,
+  } as any)
 const NotFoundViaLoaderRoute = NotFoundViaLoaderRouteImport.update({
   id: '/via-loader',
   path: '/via-loader',
   getParentRoute: () => NotFoundRouteRoute,
 } as any)
+const NotFoundViaHeadRoute = NotFoundViaHeadRouteImport.update({
+  id: '/via-head',
+  path: '/via-head',
+  getParentRoute: () => NotFoundRouteRoute,
+} as any)
 const NotFoundViaBeforeLoadRoute = NotFoundViaBeforeLoadRouteImport.update({
   id: '/via-beforeLoad',
   path: '/via-beforeLoad',
@@ -252,7 +265,9 @@ export interface FileRoutesByFullPath {
   '/대한민국': typeof Char45824Char54620Char48124Char44397Route
   '/api/users': typeof ApiUsersRouteWithChildren
   '/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
+  '/not-found/via-head': typeof NotFoundViaHeadRoute
   '/not-found/via-loader': typeof NotFoundViaLoaderRoute
+  '/not-found/via-loader-with-context': typeof NotFoundViaLoaderWithContextRoute
   '/posts/$postId': typeof PostsPostIdRoute
   '/redirect/$target': typeof RedirectTargetRouteWithChildren
   '/search-params/default': typeof SearchParamsDefaultRoute
@@ -285,7 +300,9 @@ export interface FileRoutesByTo {
   '/대한민국': typeof Char45824Char54620Char48124Char44397Route
   '/api/users': typeof ApiUsersRouteWithChildren
   '/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
+  '/not-found/via-head': typeof NotFoundViaHeadRoute
   '/not-found/via-loader': typeof NotFoundViaLoaderRoute
+  '/not-found/via-loader-with-context': typeof NotFoundViaLoaderWithContextRoute
   '/posts/$postId': typeof PostsPostIdRoute
   '/search-params/default': typeof SearchParamsDefaultRoute
   '/search-params/loader-throws-redirect': typeof SearchParamsLoaderThrowsRedirectRoute
@@ -324,7 +341,9 @@ export interface FileRoutesById {
   '/_layout/_layout-2': typeof LayoutLayout2RouteWithChildren
   '/api/users': typeof ApiUsersRouteWithChildren
   '/not-found/via-beforeLoad': typeof NotFoundViaBeforeLoadRoute
+  '/not-found/via-head': typeof NotFoundViaHeadRoute
   '/not-found/via-loader': typeof NotFoundViaLoaderRoute
+  '/not-found/via-loader-with-context': typeof NotFoundViaLoaderWithContextRoute
   '/posts/$postId': typeof PostsPostIdRoute
   '/redirect/$target': typeof RedirectTargetRouteWithChildren
   '/search-params/default': typeof SearchParamsDefaultRoute
@@ -363,7 +382,9 @@ export interface FileRouteTypes {
     | '/대한민국'
     | '/api/users'
     | '/not-found/via-beforeLoad'
+    | '/not-found/via-head'
     | '/not-found/via-loader'
+    | '/not-found/via-loader-with-context'
     | '/posts/$postId'
     | '/redirect/$target'
     | '/search-params/default'
@@ -396,7 +417,9 @@ export interface FileRouteTypes {
     | '/대한민국'
     | '/api/users'
     | '/not-found/via-beforeLoad'
+    | '/not-found/via-head'
     | '/not-found/via-loader'
+    | '/not-found/via-loader-with-context'
     | '/posts/$postId'
     | '/search-params/default'
     | '/search-params/loader-throws-redirect'
@@ -434,7 +457,9 @@ export interface FileRouteTypes {
     | '/_layout/_layout-2'
     | '/api/users'
     | '/not-found/via-beforeLoad'
+    | '/not-found/via-head'
     | '/not-found/via-loader'
+    | '/not-found/via-loader-with-context'
     | '/posts/$postId'
     | '/redirect/$target'
     | '/search-params/default'
@@ -633,13 +658,27 @@ declare module '@tanstack/solid-router' {
       preLoaderRoute: typeof PostsPostIdRouteImport
       parentRoute: typeof PostsRoute
     }
+    '/not-found/via-loader-with-context': {
+      id: '/not-found/via-loader-with-context'
+      path: '/via-loader-with-context'
+      fullPath: '/not-found/via-loader-with-context'
+      preLoaderRoute: typeof NotFoundViaLoaderWithContextRouteImport
+      parentRoute: typeof NotFoundRouteRoute
+    }
     '/not-found/via-loader': {
       id: '/not-found/via-loader'
       path: '/via-loader'
       fullPath: '/not-found/via-loader'
       preLoaderRoute: typeof NotFoundViaLoaderRouteImport
       parentRoute: typeof NotFoundRouteRoute
     }
+    '/not-found/via-head': {
+      id: '/not-found/via-head'
+      path: '/via-head'
+      fullPath: '/not-found/via-head'
+      preLoaderRoute: typeof NotFoundViaHeadRouteImport
+      parentRoute: typeof NotFoundRouteRoute
+    }
     '/not-found/via-beforeLoad': {
       id: '/not-found/via-beforeLoad'
       path: '/via-beforeLoad'
@@ -743,13 +782,17 @@ declare module '@tanstack/solid-router' {
 
 interface NotFoundRouteRouteChildren {
   NotFoundViaBeforeLoadRoute: typeof NotFoundViaBeforeLoadRoute
+  NotFoundViaHeadRoute: typeof NotFoundViaHeadRoute
   NotFoundViaLoaderRoute: typeof NotFoundViaLoaderRoute
+  NotFoundViaLoaderWithContextRoute: typeof NotFoundViaLoaderWithContextRoute
   NotFoundIndexRoute: typeof NotFoundIndexRoute
 }
 
 const NotFoundRouteRouteChildren: NotFoundRouteRouteChildren = {
   NotFoundViaBeforeLoadRoute: NotFoundViaBeforeLoadRoute,
+  NotFoundViaHeadRoute: NotFoundViaHeadRoute,
   NotFoundViaLoaderRoute: NotFoundViaLoaderRoute,
+  NotFoundViaLoaderWithContextRoute: NotFoundViaLoaderWithContextRoute,
   NotFoundIndexRoute: NotFoundIndexRoute,
 }