@tanstack/react-router 1.58.17 → 1.59.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-router",
-  "version": "1.58.17",
+  "version": "1.59.0",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",

package/src/lazyRouteComponent.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react'
+import { Outlet } from './Match'
 import type { AsyncRouteComponent } from './route'
 
 // If the load fails due to module not found, it may mean a new version of
@@ -13,12 +14,32 @@ function isModuleNotFoundError(error: any): boolean {
   )
 }
 
+export function ClientOnly({
+  children,
+  fallback = null,
+}: React.PropsWithChildren<{ fallback?: React.ReactNode }>) {
+  return useHydrated() ? <>{children}</> : <>{fallback}</>
+}
+
+function subscribe() {
+  return () => {}
+}
+
+export function useHydrated() {
+  return React.useSyncExternalStore(
+    subscribe,
+    () => true,
+    () => false,
+  )
+}
+
 export function lazyRouteComponent<
   T extends Record<string, any>,
   TKey extends keyof T = 'default',
 >(
   importer: () => Promise<T>,
   exportName?: TKey,
+  ssr?: () => boolean,
 ): T[TKey] extends (props: infer TProps) => any
   ? AsyncRouteComponent<TProps>
   : never {
@@ -27,6 +48,10 @@ export function lazyRouteComponent<
   let error: any
 
   const load = () => {
+    if (typeof document === 'undefined' && ssr?.() === false) {
+      comp = (() => null) as any
+      return Promise.resolve()
+    }
     if (!loadPromise) {
       loadPromise = importer()
         .then((res) => {
@@ -81,6 +106,13 @@ export function lazyRouteComponent<
       throw load()
     }
 
+    if (ssr?.() === false) {
+      return (
+        <ClientOnly fallback={<Outlet />}>
+          {React.createElement(comp, props)}
+        </ClientOnly>
+      )
+    }
     return React.createElement(comp, props)
   }
 

package/src/route.ts

@@ -321,7 +321,6 @@ export interface UpdatableRouteOptions<
   in out TRouteContextFn,
   in out TBeforeLoadFn,
 > extends UpdatableStaticRouteOption {
-  // test?: (args: TAllContext) => void
   // If true, this route will be matched as case-sensitive
   caseSensitive?: boolean
   // If true, this route will be forcefully wrapped in a suspense boundary
@@ -439,6 +438,7 @@ export interface UpdatableRouteOptions<
   headers?: (ctx: {
     loaderData: ResolveLoaderData<TLoaderFn>
   }) => Record<string, string>
+  ssr?: boolean
 }
 
 interface RequiredStaticDataRouteOption {

package/src/router.ts

@@ -581,12 +581,14 @@ export function createRouter<
   TDehydrated extends Record<string, any> = Record<string, any>,
   TSerializedError extends Record<string, any> = Record<string, any>,
 >(
-  options: RouterConstructorOptions<
-    TRouteTree,
-    TTrailingSlashOption,
-    TDehydrated,
-    TSerializedError
-  >,
+  options: undefined extends number
+    ? 'strictNullChecks must be enabled in tsconfig.json'
+    : RouterConstructorOptions<
+        TRouteTree,
+        TTrailingSlashOption,
+        TDehydrated,
+        TSerializedError
+      >,
 ) {
   return new Router<
     TRouteTree,