fix: no remounting with ssr:false (#5964)

Author: schiller-manuel

e2e/react-start/selective-ssr/src/routes/__root.tsx

@@ -42,13 +42,6 @@ export const Route = createRootRoute({
     }
   },
   beforeLoad: ({ search }) => {
-    if (typeof window !== 'undefined') {
-      if (Route.options.ssr !== undefined) {
-        const error = `ssr() for ${Route.id} should have been deleted from the Route options on the client`
-        console.error(error)
-        throw new Error(error)
-      }
-    }
     console.log(
       `beforeLoad for ${Route.id} called on the ${typeof window !== 'undefined' ? 'client' : 'server'}`,
     )

e2e/react-start/selective-ssr/src/routes/posts.$postId.tsx

@@ -15,13 +15,6 @@ export const Route = createFileRoute('/posts/$postId')({
     }
   },
   beforeLoad: ({ search }) => {
-    if (typeof window !== 'undefined') {
-      if (Route.options.ssr !== undefined) {
-        const error = `ssr() for ${Route.id} should have been deleted from the Route options on the client`
-        console.error(error)
-        throw new Error(error)
-      }
-    }
     console.log(
       `beforeLoad for ${Route.id} called on the ${typeof window !== 'undefined' ? 'client' : 'server'}`,
     )

e2e/react-start/selective-ssr/src/routes/posts.tsx

@@ -15,13 +15,6 @@ export const Route = createFileRoute('/posts')({
     }
   },
   beforeLoad: ({ search }) => {
-    if (typeof window !== 'undefined') {
-      if (Route.options.ssr !== undefined) {
-        const error = `ssr() for ${Route.id} should have been deleted from the Route options on the client`
-        console.error(error)
-        throw new Error(error)
-      }
-    }
     console.log(
       `beforeLoad for ${Route.id} called on the ${typeof window !== 'undefined' ? 'client' : 'server'}`,
     )

e2e/solid-start/selective-ssr/src/routes/__root.tsx

@@ -42,13 +42,6 @@ export const Route = createRootRoute({
     }
   },
   beforeLoad: ({ search }) => {
-    if (typeof window !== 'undefined') {
-      if (Route.options.ssr !== undefined) {
-        const error = `ssr() for ${Route.id} should have been deleted from the Route options on the client`
-        console.error(error)
-        throw new Error(error)
-      }
-    }
     console.log(
       `beforeLoad for ${Route.id} called on the ${typeof window !== 'undefined' ? 'client' : 'server'}`,
     )

e2e/solid-start/selective-ssr/src/routes/posts.$postId.tsx

@@ -15,13 +15,6 @@ export const Route = createFileRoute('/posts/$postId')({
     }
   },
   beforeLoad: ({ search }) => {
-    if (typeof window !== 'undefined') {
-      if (Route.options.ssr !== undefined) {
-        const error = `ssr() for ${Route.id} should have been deleted from the Route options on the client`
-        console.error(error)
-        throw new Error(error)
-      }
-    }
     console.log(
       `beforeLoad for ${Route.id} called on the ${typeof window !== 'undefined' ? 'client' : 'server'}`,
     )

e2e/solid-start/selective-ssr/src/routes/posts.tsx

@@ -15,13 +15,6 @@ export const Route = createFileRoute('/posts')({
     }
   },
   beforeLoad: ({ search }) => {
-    if (typeof window !== 'undefined') {
-      if (Route.options.ssr !== undefined) {
-        const error = `ssr() for ${Route.id} should have been deleted from the Route options on the client`
-        console.error(error)
-        throw new Error(error)
-      }
-    }
     console.log(
       `beforeLoad for ${Route.id} called on the ${typeof window !== 'undefined' ? 'client' : 'server'}`,
     )

packages/router-core/src/router.ts

@@ -1446,6 +1446,7 @@ export class RouterCore<
 
         match = {
           id: matchId,
+          ssr: this.isServer ? undefined : route.options.ssr,
           index,
           routeId: route.id,
           params: previousMatch

packages/router-core/src/ssr/ssr-client.ts

@@ -136,6 +136,12 @@ export async function hydrate(router: AnyRouter): Promise<any> {
     }
   }
 
+  function setRouteSsr(match: AnyRouteMatch) {
+    const route = router.looseRoutesById[match.routeId]
+    if (route) {
+      route.options.ssr = match.ssr
+    }
+  }
   // Right after hydration and before the first render, we need to rehydrate each match
   // First step is to reyhdrate loaderData and __beforeLoadContext
   let firstNonSsrMatchIndex: number | undefined = undefined
@@ -146,10 +152,12 @@ export async function hydrate(router: AnyRouter): Promise<any> {
     if (!dehydratedMatch) {
       match._nonReactive.dehydrated = false
       match.ssr = false
+      setRouteSsr(match)
       return
     }
 
     hydrateMatch(match, dehydratedMatch)
+    setRouteSsr(match)
 
     match._nonReactive.dehydrated = match.ssr !== false