@tanstack/react-router 1.15.14 → 1.15.16

package/src/link.tsx

@@ -448,25 +448,24 @@ export function useLinkProps<
     }
   }
 
-  // The click handler
-  const handleFocus = (e: MouseEvent) => {
-    if (preload) {
+  const doPreload = () => {
+    React.startTransition(() => {
       router.preloadRoute(dest as any).catch((err) => {
         console.warn(err)
         console.warn(preloadWarning)
       })
-    }
+    })
   }
 
-  const handleTouchStart = (e: TouchEvent) => {
+  // The click handler
+  const handleFocus = (e: MouseEvent) => {
     if (preload) {
-      router.preloadRoute(dest as any).catch((err) => {
-        console.warn(err)
-        console.warn(preloadWarning)
-      })
+      doPreload()
     }
   }
 
+  const handleTouchStart = handleFocus
+
   const handleEnter = (e: MouseEvent) => {
     const target = (e.target || {}) as LinkCurrentTargetElement
 
@@ -477,10 +476,7 @@ export function useLinkProps<
 
       target.preloadTimeout = setTimeout(() => {
         target.preloadTimeout = null
-        router.preloadRoute(dest as any).catch((err) => {
-          console.warn(err)
-          console.warn(preloadWarning)
-        })
+        doPreload()
       }, preloadDelay)
     }
   }

package/src/route.ts

@@ -220,6 +220,9 @@ export type UpdatableRouteOptions<
     | Promise<JSX.IntrinsicElements['meta'][]>
   links?: () => JSX.IntrinsicElements['link'][]
   scripts?: () => JSX.IntrinsicElements['script'][]
+  headers?: (ctx: {
+    loaderData: TLoaderData
+  }) => Promise<Record<string, string>> | Record<string, string>
 } & UpdatableStaticRouteOption
 
 export type UpdatableStaticRouteOption =

package/src/router.ts

@@ -67,6 +67,14 @@ import { isRedirect } from './redirects'
 import { NotFoundError, isNotFound } from './not-found'
 import { ResolveRelativePath, ToOptions } from './link'
 import { NoInfer } from '@tanstack/react-store'
+import warning from 'tiny-warning'
+import {
+  DeferredPromise,
+  DeferredPromiseState,
+  defaultDeserializeError,
+  isDehydratedDeferred,
+  isServerSideError,
+} from '.'
 // import warning from 'tiny-warning'
 
 //
@@ -304,6 +312,10 @@ export class Router<
       parseSearch: options?.parseSearch ?? defaultParseSearch,
       transformer: options?.transformer ?? JSON,
     })
+
+    if (typeof document !== 'undefined') {
+      ;(window as any).__TSR__ROUTER__ = this
+    }
   }
 
   // These are default implementations that can optionally be overridden
@@ -719,6 +731,7 @@ export class Router<
         path: route.fullPath,
         params: routeParams,
       })
+
       const matchId =
         interpolatePath({
           path: route.id,
@@ -743,7 +756,7 @@ export class Router<
               isGlobalNotFound && route.id === rootRouteId
                 ? { global: true }
                 : undefined,
-            params: replaceEqualDeep(existingMatch.params, routeParams),
+            params: routeParams,
           }
         : {
             id: matchId,
@@ -1357,9 +1370,14 @@ export class Router<
 
               if ((latestPromise = checkLatest())) return await latestPromise
 
-              const meta = await route.options.meta?.({
-                loaderData,
-              })
+              const [meta, headers] = await Promise.all([
+                route.options.meta?.({
+                  loaderData,
+                }),
+                route.options.headers?.({
+                  loaderData,
+                }),
+              ])
 
               matches[index] = match = {
                 ...match,
@@ -1370,6 +1388,7 @@ export class Router<
                 loaderData,
                 loadPromise: undefined,
                 meta,
+                headers,
               }
             } catch (error) {
               if ((latestPromise = checkLatest())) return await latestPromise
@@ -1707,7 +1726,30 @@ export class Router<
     this.injectedHtml.push(html)
   }
 
+  // We use a token -> weak map to keep track of deferred promises
+  // that are registered on the server and need to be resolved
+  registeredDeferredsIds = new Map<string, {}>()
+  registeredDeferreds = new WeakMap<{}, DeferredPromiseState<any>>()
+
+  getDeferred = (uid: string) => {
+    const token = this.registeredDeferredsIds.get(uid)
+
+    if (!token) {
+      return undefined
+    }
+
+    return this.registeredDeferreds.get(token)
+  }
+
+  /**
+   * @deprecated Please inject your own html using the `injectHtml` method
+   */
   dehydrateData = <T>(key: any, getData: T | (() => Promise<T> | T)) => {
+    warning(
+      false,
+      `The dehydrateData method is deprecated. Please use the injectHtml method to inject your own data.`,
+    )
+
     if (typeof document === 'undefined') {
       const strKey = typeof key === 'string' ? key : JSON.stringify(key)
 
@@ -1728,7 +1770,15 @@ export class Router<
     return () => undefined
   }
 
+  /**
+   * @deprecated Please extract your own data from scripts injected using the `injectHtml` method
+   */
   hydrateData = <T extends any = unknown>(key: any) => {
+    warning(
+      false,
+      `The hydrateData method is deprecated. Please use the extractHtml method to extract your own data.`,
+    )
+
     if (typeof document !== 'undefined') {
       const strKey = typeof key === 'string' ? key : JSON.stringify(key)