@tanstack/react-router 1.121.0-alpha.3 → 1.121.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-router",
-  "version": "1.121.0-alpha.3",
+  "version": "1.121.0",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -38,7 +38,13 @@
         "default": "./dist/cjs/index.cjs"
       }
     },
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./llms": {
+      "import": {
+        "types": "./dist/llms/index.d.ts",
+        "default": "./dist/llms/index.js"
+      }
+    }
   },
   "sideEffects": false,
   "files": [
@@ -53,8 +59,8 @@
     "jsesc": "^3.1.0",
     "tiny-invariant": "^1.3.3",
     "tiny-warning": "^1.0.3",
-    "@tanstack/history": "1.121.0-alpha.1",
-    "@tanstack/router-core": "1.121.0-alpha.3"
+    "@tanstack/history": "1.120.17",
+    "@tanstack/router-core": "1.121.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.6.3",
@@ -64,6 +70,7 @@
     "combinate": "^1.1.11",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
+    "vibe-rules": "^0.2.57",
     "zod": "^3.24.2"
   },
   "peerDependencies": {

package/src/ClientOnly.tsx

@@ -2,7 +2,7 @@ import React from 'react'
 
 export interface ClientOnlyProps {
   /**
-   * The children to render if the JS is loaded.
+   * The children to render when the JS is loaded.
    */
   children: React.ReactNode
   /**

package/src/link.tsx

@@ -17,7 +17,6 @@ import {
 } from './utils'
 
 import { useMatch } from './useMatch'
-import { useMatches } from './Matches'
 import type {
   AnyRouter,
   Constrain,
@@ -106,39 +105,28 @@ export function useLinkProps<
     structuralSharing: true as any,
   })
 
-  const isRelativeFromPath = options.relative === 'path'
-
-  // when `from` is not supplied, use the nearest parent match's full path as the `from` location
-  // so relative routing works as expected. Try to stay out of rerenders as much as possible.
   const nearestFrom = useMatch({
     strict: false,
-    select: (match) => (isRelativeFromPath ? undefined : match.fullPath),
-  })
-
-  // When no from and relative is path, use the leaf match as the from location
-  // Avoid rerenders as much as possible.
-  const leafFrom = useMatches({
-    select: (matches) =>
-      isRelativeFromPath ? matches[matches.length - 1]!.fullPath : undefined,
+    select: (match) => match.fullPath,
   })
 
-  const from = options.from ?? (isRelativeFromPath ? leafFrom : nearestFrom)
+  const from = options.from ?? nearestFrom
 
   // Use it as the default `from` location
-  const _options = React.useMemo(() => ({ ...options, from }), [options, from])
+  options = { ...options, from }
 
   const next = React.useMemo(
-    () => router.buildLocation(_options as any),
+    () => router.buildLocation(options as any),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [router, _options, currentSearch],
+    [router, options, currentSearch],
   )
 
   const preload = React.useMemo(() => {
-    if (_options.reloadDocument) {
+    if (options.reloadDocument) {
       return false
     }
     return userPreload ?? router.options.defaultPreload
-  }, [router.options.defaultPreload, userPreload, _options.reloadDocument])
+  }, [router.options.defaultPreload, userPreload, options.reloadDocument])
   const preloadDelay =
     userPreloadDelay ?? router.options.defaultPreloadDelay ?? 0
 
@@ -189,11 +177,11 @@ export function useLinkProps<
   })
 
   const doPreload = React.useCallback(() => {
-    router.preloadRoute(_options as any).catch((err) => {
+    router.preloadRoute(options as any).catch((err) => {
       console.warn(err)
       console.warn(preloadWarning)
     })
-  }, [_options, router])
+  }, [options, router])
 
   const preloadViewportIoCallback = React.useCallback(
     (entry: IntersectionObserverEntry | undefined) => {
@@ -263,14 +251,14 @@ export function useLinkProps<
       // All is well? Navigate!
       // N.B. we don't call `router.commitLocation(next) here because we want to run `validateSearch` before committing
       return router.navigate({
-        ..._options,
+        ...options,
         replace,
         resetScroll,
         hashScrollIntoView,
         startTransition,
         viewTransition,
         ignoreBlocker,
-      } as any)
+      })
     }
   }
 
@@ -293,10 +281,14 @@ export function useLinkProps<
         return
       }
 
-      eventTarget.preloadTimeout = setTimeout(() => {
-        eventTarget.preloadTimeout = null
+      if (!preloadDelay) {
         doPreload()
-      }, preloadDelay)
+      } else {
+        eventTarget.preloadTimeout = setTimeout(() => {
+          eventTarget.preloadTimeout = null
+          doPreload()
+        }, preloadDelay)
+      }
     }
   }
 
@@ -378,8 +370,8 @@ type UseLinkReactProps<TComp> = TComp extends keyof React.JSX.IntrinsicElements
     > &
       React.RefAttributes<
         TComp extends
-          | React.FC<{ ref: infer TRef }>
-          | React.Component<{ ref: infer TRef }>
+          | React.FC<{ ref: React.Ref<infer TRef> }>
+          | React.Component<{ ref: React.Ref<infer TRef> }>
           ? TRef
           : never
       >

package/src/route.tsx

@@ -25,9 +25,11 @@ import type {
   ResolveFullPath,
   ResolveId,
   ResolveParams,
+  RootRoute as RootRouteCore,
   RootRouteId,
   RootRouteOptions,
   RouteConstraints,
+  Route as RouteCore,
   RouteIds,
   RouteMask,
   RouteOptions,
@@ -148,43 +150,62 @@ export class RouteApi<
 }
 
 export class Route<
-  in out TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute,
-  in out TPath extends RouteConstraints['TPath'] = '/',
-  in out TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath<
-    TParentRoute,
-    TPath
-  >,
-  in out TCustomId extends RouteConstraints['TCustomId'] = string,
-  in out TId extends RouteConstraints['TId'] = ResolveId<
+    in out TParentRoute extends RouteConstraints['TParentRoute'] = AnyRoute,
+    in out TPath extends RouteConstraints['TPath'] = '/',
+    in out TFullPath extends RouteConstraints['TFullPath'] = ResolveFullPath<
+      TParentRoute,
+      TPath
+    >,
+    in out TCustomId extends RouteConstraints['TCustomId'] = string,
+    in out TId extends RouteConstraints['TId'] = ResolveId<
+      TParentRoute,
+      TCustomId,
+      TPath
+    >,
+    in out TSearchValidator = undefined,
+    in out TParams = ResolveParams<TPath>,
+    in out TRouterContext = AnyContext,
+    in out TRouteContextFn = AnyContext,
+    in out TBeforeLoadFn = AnyContext,
+    in out TLoaderDeps extends Record<string, any> = {},
+    in out TLoaderFn = undefined,
+    in out TChildren = unknown,
+    in out TFileRouteTypes = unknown,
+  >
+  extends BaseRoute<
     TParentRoute,
+    TPath,
+    TFullPath,
     TCustomId,
-    TPath
-  >,
-  in out TSearchValidator = undefined,
-  in out TParams = ResolveParams<TPath>,
-  in out TRouterContext = AnyContext,
-  in out TRouteContextFn = AnyContext,
-  in out TBeforeLoadFn = AnyContext,
-  in out TLoaderDeps extends Record<string, any> = {},
-  in out TLoaderFn = undefined,
-  in out TChildren = unknown,
-  in out TFileRouteTypes = unknown,
-> extends BaseRoute<
-  TParentRoute,
-  TPath,
-  TFullPath,
-  TCustomId,
-  TId,
-  TSearchValidator,
-  TParams,
-  TRouterContext,
-  TRouteContextFn,
-  TBeforeLoadFn,
-  TLoaderDeps,
-  TLoaderFn,
-  TChildren,
-  TFileRouteTypes
-> {
+    TId,
+    TSearchValidator,
+    TParams,
+    TRouterContext,
+    TRouteContextFn,
+    TBeforeLoadFn,
+    TLoaderDeps,
+    TLoaderFn,
+    TChildren,
+    TFileRouteTypes
+  >
+  implements
+    RouteCore<
+      TParentRoute,
+      TPath,
+      TFullPath,
+      TCustomId,
+      TId,
+      TSearchValidator,
+      TParams,
+      TRouterContext,
+      TRouteContextFn,
+      TBeforeLoadFn,
+      TLoaderDeps,
+      TLoaderFn,
+      TChildren,
+      TFileRouteTypes
+    >
+{
   /**
    * @deprecated Use the `createRoute` function instead.
    */
@@ -364,24 +385,37 @@ export function createRootRouteWithContext<TRouterContext extends {}>() {
 export const rootRouteWithContext = createRootRouteWithContext
 
 export class RootRoute<
-  in out TSearchValidator = undefined,
-  in out TRouterContext = {},
-  in out TRouteContextFn = AnyContext,
-  in out TBeforeLoadFn = AnyContext,
-  in out TLoaderDeps extends Record<string, any> = {},
-  in out TLoaderFn = undefined,
-  in out TChildren = unknown,
-  in out TFileRouteTypes = unknown,
-> extends BaseRootRoute<
-  TSearchValidator,
-  TRouterContext,
-  TRouteContextFn,
-  TBeforeLoadFn,
-  TLoaderDeps,
-  TLoaderFn,
-  TChildren,
-  TFileRouteTypes
-> {
+    in out TSearchValidator = undefined,
+    in out TRouterContext = {},
+    in out TRouteContextFn = AnyContext,
+    in out TBeforeLoadFn = AnyContext,
+    in out TLoaderDeps extends Record<string, any> = {},
+    in out TLoaderFn = undefined,
+    in out TChildren = unknown,
+    in out TFileRouteTypes = unknown,
+  >
+  extends BaseRootRoute<
+    TSearchValidator,
+    TRouterContext,
+    TRouteContextFn,
+    TBeforeLoadFn,
+    TLoaderDeps,
+    TLoaderFn,
+    TChildren,
+    TFileRouteTypes
+  >
+  implements
+    RootRouteCore<
+      TSearchValidator,
+      TRouterContext,
+      TRouteContextFn,
+      TBeforeLoadFn,
+      TLoaderDeps,
+      TLoaderFn,
+      TChildren,
+      TFileRouteTypes
+    >
+{
   /**
    * @deprecated `RootRoute` is now an internal implementation detail. Use `createRootRoute()` instead.
    */

package/src/useNavigate.tsx

@@ -26,18 +26,14 @@ export function useNavigate<
 
   return React.useCallback(
     (options: NavigateOptions) => {
-      const isRelativeFromPath = options.relative === 'path'
-
       const from =
         options.from ??
         _defaultOpts?.from ??
-        (isRelativeFromPath
-          ? state.matches[state.matches.length - 1]!.fullPath
-          : state.matches[matchIndex]!.fullPath)
+        state.matches[matchIndex]!.fullPath
 
       return navigate({
         ...options,
-        from: from,
+        from,
       })
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps