@tanstack/react-router 1.112.11 → 1.112.13

package/src/routerContext.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import type { AnyRouter, Router } from './router'
+import type { AnyRouter, Router } from '@tanstack/router-core'
 
 declare global {
   interface Window {

package/src/scroll-restoration.tsx

@@ -1,8 +1,11 @@
 import { functionalUpdate } from '@tanstack/router-core'
 import { useRouter } from './useRouter'
 import { ScriptOnce } from './ScriptOnce'
-import type { AnyRouter } from './router'
-import type { NonNullableUpdater, ParsedLocation } from '@tanstack/router-core'
+import type {
+  AnyRouter,
+  NonNullableUpdater,
+  ParsedLocation,
+} from '@tanstack/router-core'
 
 export type ScrollRestorationEntry = { scrollX: number; scrollY: number }
 

package/src/structuralSharing.ts

@@ -1,9 +1,9 @@
 import type {
+  AnyRouter,
   Constrain,
   OptionalStructuralSharing,
   ValidateJSON,
 } from '@tanstack/router-core'
-import type { AnyRouter } from './router'
 
 export type DefaultStructuralSharingEnabled<TRouter extends AnyRouter> =
   boolean extends TRouter['options']['defaultStructuralSharing']

package/src/typePrimitives.ts

@@ -1,10 +1,12 @@
 import type {
+  AnyRouter,
   Constrain,
   ConstrainLiteral,
   FromPathOption,
   NavigateOptions,
   PathParamOptions,
   Redirect,
+  RegisteredRouter,
   RouteIds,
   SearchParamOptions,
   ToPathOption,
@@ -12,8 +14,6 @@ import type {
   UseSearchResult,
 } from '@tanstack/router-core'
 import type { LinkComponentProps } from './link'
-import type { AnyRouter, RegisteredRouter } from './router'
-
 import type { UseParamsOptions } from './useParams'
 import type { UseSearchOptions } from './useSearch'
 

package/src/useBlocker.tsx

@@ -5,9 +5,12 @@ import type {
   HistoryAction,
   HistoryLocation,
 } from '@tanstack/history'
-import type { AnyRoute } from './route'
-import type { ParseRoute } from '@tanstack/router-core'
-import type { AnyRouter, RegisteredRouter } from './router'
+import type {
+  AnyRoute,
+  AnyRouter,
+  ParseRoute,
+  RegisteredRouter,
+} from '@tanstack/router-core'
 
 interface ShouldBlockFnLocation<
   out TRouteId,

package/src/useLoaderData.tsx

@@ -3,8 +3,9 @@ import type {
   StructuralSharingOption,
   ValidateSelected,
 } from './structuralSharing'
-import type { AnyRouter, RegisteredRouter } from './router'
 import type {
+  AnyRouter,
+  RegisteredRouter,
   ResolveUseLoaderData,
   StrictOrFrom,
   UseLoaderDataResult,

package/src/useLoaderDeps.tsx

@@ -3,8 +3,9 @@ import type {
   StructuralSharingOption,
   ValidateSelected,
 } from './structuralSharing'
-import type { AnyRouter, RegisteredRouter } from './router'
 import type {
+  AnyRouter,
+  RegisteredRouter,
   ResolveUseLoaderDeps,
   StrictOrFrom,
   UseLoaderDepsResult,

package/src/useLocation.tsx

@@ -3,7 +3,11 @@ import type {
   StructuralSharingOption,
   ValidateSelected,
 } from './structuralSharing'
-import type { AnyRouter, RegisteredRouter, RouterState } from './router'
+import type {
+  AnyRouter,
+  RegisteredRouter,
+  RouterState,
+} from '@tanstack/router-core'
 
 export interface UseLocationBaseOptions<
   TRouter extends AnyRouter,

package/src/useMatch.tsx

@@ -6,10 +6,11 @@ import type {
   StructuralSharingOption,
   ValidateSelected,
 } from './structuralSharing'
-import type { AnyRouter, RegisteredRouter } from './router'
 import type {
+  AnyRouter,
   MakeRouteMatch,
   MakeRouteMatchUnion,
+  RegisteredRouter,
   StrictOrFrom,
   ThrowOrOptional,
 } from '@tanstack/router-core'

package/src/useNavigate.tsx

@@ -1,11 +1,12 @@
 import * as React from 'react'
 import { useRouter } from './useRouter'
 import type {
+  AnyRouter,
   FromPathOption,
   NavigateOptions,
+  RegisteredRouter,
   UseNavigateResult,
 } from '@tanstack/router-core'
-import type { AnyRouter, RegisteredRouter } from './router'
 
 export function useNavigate<
   TRouter extends AnyRouter = RegisteredRouter,

package/src/useParams.tsx

@@ -4,8 +4,9 @@ import type {
   StructuralSharingOption,
   ValidateSelected,
 } from './structuralSharing'
-import type { AnyRouter, RegisteredRouter } from './router'
 import type {
+  AnyRouter,
+  RegisteredRouter,
   ResolveUseParams,
   StrictOrFrom,
   ThrowOrOptional,

package/src/useRouteContext.ts

@@ -1,6 +1,7 @@
 import { useMatch } from './useMatch'
-import type { AnyRouter, RegisteredRouter } from './router'
 import type {
+  AnyRouter,
+  RegisteredRouter,
   UseRouteContextBaseOptions,
   UseRouteContextOptions,
   UseRouteContextResult,

package/src/useRouter.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react'
 import warning from 'tiny-warning'
 import { getRouterContext } from './routerContext'
-import type { AnyRouter, RegisteredRouter } from './router'
+import type { AnyRouter, RegisteredRouter } from '@tanstack/router-core'
 
 export function useRouter<TRouter extends AnyRouter = RegisteredRouter>(opts?: {
   warn?: boolean

package/src/useRouterState.tsx

@@ -2,11 +2,15 @@ import { useStore } from '@tanstack/react-store'
 import { useRef } from 'react'
 import { replaceEqualDeep } from '@tanstack/router-core'
 import { useRouter } from './useRouter'
+import type {
+  AnyRouter,
+  RegisteredRouter,
+  RouterState,
+} from '@tanstack/router-core'
 import type {
   StructuralSharingOption,
   ValidateSelected,
 } from './structuralSharing'
-import type { AnyRouter, RegisteredRouter, RouterState } from './router'
 
 export type UseRouterStateOptions<
   TRouter extends AnyRouter,

package/src/useSearch.tsx

@@ -4,8 +4,9 @@ import type {
   StructuralSharingOption,
   ValidateSelected,
 } from './structuralSharing'
-import type { AnyRouter, RegisteredRouter } from './router'
 import type {
+  AnyRouter,
+  RegisteredRouter,
   ResolveUseSearch,
   StrictOrFrom,
   ThrowOrOptional,