@tanstack/react-router 1.97.20 → 1.97.23

package/src/router.ts

@@ -5,30 +5,28 @@ import {
 } from '@tanstack/history'
 import { Store, batch } from '@tanstack/react-store'
 import invariant from 'tiny-invariant'
-import { rootRouteId } from './root'
-import { defaultParseSearch, defaultStringifySearch } from './searchParams'
 import {
+  cleanPath,
   createControlledPromise,
   deepEqual,
+  defaultParseSearch,
+  defaultStringifySearch,
   functionalUpdate,
-  last,
-  pick,
-  replaceEqualDeep,
-} from './utils'
-import {
-  cleanPath,
   interpolatePath,
   joinPaths,
+  last,
   matchPathname,
   parsePathname,
+  pick,
+  replaceEqualDeep,
   resolvePath,
+  rootRouteId,
   trimPath,
   trimPathLeft,
   trimPathRight,
-} from './path'
+} from '@tanstack/router-core'
 import { isRedirect, isResolvedRedirect } from './redirects'
 import { isNotFound } from './not-found'
-import type { StartSerializer } from './serializer'
 import type * as React from 'react'
 import type {
   HistoryLocation,
@@ -37,9 +35,27 @@ import type {
   RouterHistory,
 } from '@tanstack/history'
 import type { NoInfer } from '@tanstack/react-store'
-import type { Manifest } from './manifest'
+
 import type {
   AnyContext,
+  AnySchema,
+  AnyValidator,
+  CommitLocationOptions,
+  ControlledPromise,
+  Manifest,
+  NonNullableUpdater,
+  ParsedLocation,
+  PickAsRequired,
+  ResolveRelativePath,
+  SearchMiddleware,
+  SearchParser,
+  SearchSerializer,
+  StartSerializer,
+  TrailingSlashOption,
+  Updater,
+  ViewTransitionOptions,
+} from '@tanstack/router-core'
+import type {
   AnyRoute,
   AnyRouteWithContext,
   BeforeLoadContextOptions,
@@ -50,8 +66,8 @@ import type {
   RouteComponent,
   RouteContextOptions,
   RouteMask,
-  SearchMiddleware,
 } from './route'
+
 import type {
   FullSearchSchema,
   RouteById,
@@ -59,29 +75,18 @@ import type {
   RoutesById,
   RoutesByPath,
 } from './routeInfo'
-import type {
-  ControlledPromise,
-  NonNullableUpdater,
-  PickAsRequired,
-  Updater,
-} from './utils'
 import type {
   AnyRouteMatch,
   MakeRouteMatch,
   MakeRouteMatchUnion,
   MatchRouteOptions,
 } from './Matches'
-import type { ParsedLocation } from './location'
-import type { SearchParser, SearchSerializer } from './searchParams'
-import type {
-  BuildLocationFn,
-  CommitLocationOptions,
-  NavigateFn,
-} from './RouterProvider'
+
+import type { BuildLocationFn, NavigateFn } from './RouterProvider'
+
 import type { AnyRedirect, ResolvedRedirect } from './redirects'
 import type { NotFoundError } from './not-found'
-import type { NavigateOptions, ResolveRelativePath, ToOptions } from './link'
-import type { AnySchema, AnyValidator } from './validators'
+import type { NavigateOptions, ToOptions } from './link'
 
 declare global {
   interface Window {
@@ -137,8 +142,6 @@ export type RouterContextOptions<TRouteTree extends AnyRoute> =
         context: InferRouterContext<TRouteTree>
       }
 
-export type TrailingSlashOption = 'always' | 'never' | 'preserve'
-
 export type InjectedHtmlEntry = Promise<string>
 
 export interface RouterOptions<
@@ -498,10 +501,6 @@ export interface MatchedRoutesResult {
   routeParams: Record<string, string>
 }
 
-export interface ViewTransitionOptions {
-  types: Array<string>
-}
-
 export type RouterConstructorOptions<
   TRouteTree extends AnyRoute,
   TTrailingSlashOption extends TrailingSlashOption,
@@ -733,7 +732,7 @@ export class Router<
   ) => {
     if (newOptions.notFoundRoute) {
       console.warn(
-        'The notFoundRoute API is deprecated and will be removed in the next major version. See https://tanstack.com/router/v1/docs/guide/not-found-errors#migrating-from-notfoundroute for more info.',
+        'The notFoundRoute API is deprecated and will be removed in the next major version. See https://tanstack.com/router/v1/docs/framework/react/guide/not-found-errors#migrating-from-notfoundroute for more info.',
       )
     }
 
@@ -3029,22 +3028,3 @@ export function getInitialRouterState(
     statusCode: 200,
   }
 }
-
-export function defaultSerializeError(err: unknown) {
-  if (err instanceof Error) {
-    const obj = {
-      name: err.name,
-      message: err.message,
-    }
-
-    if (process.env.NODE_ENV === 'development') {
-      ;(obj as any).stack = err.stack
-    }
-
-    return obj
-  }
-
-  return {
-    data: err,
-  }
-}

package/src/scroll-restoration.tsx

@@ -1,8 +1,7 @@
 import * as React from 'react'
+import { functionalUpdate } from '@tanstack/router-core'
 import { useRouter } from './useRouter'
-import { functionalUpdate } from './utils'
-import type { ParsedLocation } from './location'
-import type { NonNullableUpdater } from './utils'
+import type { NonNullableUpdater, ParsedLocation } from '@tanstack/router-core'
 
 const useLayoutEffect =
   typeof window !== 'undefined' ? React.useLayoutEffect : React.useEffect

package/src/structuralSharing.ts

@@ -1,4 +1,8 @@
-import type { Constrain, ValidateJSON } from './utils'
+import type {
+  Constrain,
+  OptionalStructuralSharing,
+  ValidateJSON,
+} from '@tanstack/router-core'
 import type { AnyRouter } from './router'
 
 export type DefaultStructuralSharingEnabled<TRouter extends AnyRouter> =
@@ -8,12 +12,6 @@ export type DefaultStructuralSharingEnabled<TRouter extends AnyRouter> =
       false
     : NonNullable<TRouter['options']['defaultStructuralSharing']>
 
-export interface OptionalStructuralSharing<TStructuralSharing, TConstraint> {
-  readonly structuralSharing?:
-    | Constrain<TStructuralSharing, TConstraint>
-    | undefined
-}
-
 export interface RequiredStructuralSharing<TStructuralSharing, TConstraint> {
   readonly structuralSharing: Constrain<TStructuralSharing, TConstraint>
 }

package/src/typePrimitives.ts

@@ -10,7 +10,7 @@ import type { RouteIds } from './routeInfo'
 import type { AnyRouter, RegisteredRouter } from './router'
 import type { UseParamsOptions, UseParamsResult } from './useParams'
 import type { UseSearchOptions, UseSearchResult } from './useSearch'
-import type { Constrain, ConstrainLiteral } from './utils'
+import type { Constrain, ConstrainLiteral } from '@tanstack/router-core'
 
 export type ValidateFromPath<
   TFrom,

package/src/useLoaderData.tsx

@@ -5,7 +5,8 @@ import type {
 } from './structuralSharing'
 import type { AnyRouter, RegisteredRouter } from './router'
 import type { AllLoaderData, RouteById } from './routeInfo'
-import type { Expand, StrictOrFrom } from './utils'
+import type { StrictOrFrom } from './utils'
+import type { Expand } from '@tanstack/router-core'
 
 export interface UseLoaderDataBaseOptions<
   TRouter extends AnyRouter,

package/src/useLoaderDeps.tsx

@@ -5,7 +5,8 @@ import type {
 } from './structuralSharing'
 import type { AnyRouter, RegisteredRouter } from './router'
 import type { RouteById } from './routeInfo'
-import type { Expand, StrictOrFrom } from './utils'
+import type { StrictOrFrom } from './utils'
+import type { Expand } from '@tanstack/router-core'
 
 export interface UseLoaderDepsBaseOptions<
   TRouter extends AnyRouter,

package/src/useMatch.tsx

@@ -8,7 +8,8 @@ import type {
 } from './structuralSharing'
 import type { AnyRouter, RegisteredRouter } from './router'
 import type { MakeRouteMatch, MakeRouteMatchUnion } from './Matches'
-import type { StrictOrFrom, ThrowOrOptional } from './utils'
+import type { StrictOrFrom } from './utils'
+import type { ThrowOrOptional } from '@tanstack/router-core'
 
 export interface UseMatchBaseOptions<
   TRouter extends AnyRouter,

package/src/useParams.tsx

@@ -5,7 +5,8 @@ import type {
 } from './structuralSharing'
 import type { AllParams, RouteById } from './routeInfo'
 import type { AnyRouter, RegisteredRouter } from './router'
-import type { Expand, StrictOrFrom } from './utils'
+import type { StrictOrFrom } from './utils'
+import type { Expand } from '@tanstack/router-core'
 
 export interface UseParamsBaseOptions<
   TRouter extends AnyRouter,

package/src/useRouteContext.ts

@@ -1,7 +1,8 @@
 import { useMatch } from './useMatch'
 import type { AllContext, RouteById } from './routeInfo'
 import type { AnyRouter, RegisteredRouter } from './router'
-import type { Expand, StrictOrFrom } from './utils'
+import type { StrictOrFrom } from './utils'
+import type { Expand } from '@tanstack/router-core'
 
 export interface UseRouteContextBaseOptions<
   TRouter extends AnyRouter,

package/src/useRouterState.tsx

@@ -1,7 +1,7 @@
 import { useStore } from '@tanstack/react-store'
 import { useRef } from 'react'
+import { replaceEqualDeep } from '@tanstack/router-core'
 import { useRouter } from './useRouter'
-import { replaceEqualDeep } from './utils'
 import type {
   StructuralSharingOption,
   ValidateSelected,

package/src/useSearch.tsx

@@ -5,7 +5,8 @@ import type {
 } from './structuralSharing'
 import type { FullSearchSchema, RouteById } from './routeInfo'
 import type { AnyRouter, RegisteredRouter } from './router'
-import type { Expand, StrictOrFrom } from './utils'
+import type { StrictOrFrom } from './utils'
+import type { Expand } from '@tanstack/router-core'
 
 export interface UseSearchBaseOptions<
   TRouter extends AnyRouter,