refactor(router-core): moving internals of Router to router core (#3800)

Author: birkskyum

Diff for: packages/react-router/src/index.tsx

@@ -285,15 +285,15 @@ export type {
   NotFoundRouteComponent,
 } from './route'
 
+export { createRouter, Router } from './router'
+
 export {
   componentTypes,
-  createRouter,
-  Router,
   lazyFn,
   SearchParamError,
   PathParamError,
   getInitialRouterState,
-} from './router'
+} from '@tanstack/router-core'
 
 export { RouterProvider, RouterContextProvider } from './RouterProvider'
 export type { RouterProps } from './RouterProvider'

Diff for: packages/react-router/src/route.ts

@@ -30,7 +30,7 @@ import type {
   RouteMask,
   RouteOptions,
   RouteTypesById,
-  Router,
+  RouterCore,
   ToMaskOptions,
   UseNavigateResult,
 } from '@tanstack/router-core'
@@ -469,7 +469,7 @@ export function createRouteMask<
 >(
   opts: {
     routeTree: TRouteTree
-  } & ToMaskOptions<Router<TRouteTree, 'never', boolean>, TFrom, TTo>,
+  } & ToMaskOptions<RouterCore<TRouteTree, 'never', boolean>, TFrom, TTo>,
 ): RouteMask<TRouteTree> {
   return opts as any
 }

Diff for: packages/react-router/src/router.ts

@@ -1,13 +1,13 @@
 import * as React from 'react'
-import type { AnyRouter, Router } from '@tanstack/router-core'
+import type { AnyRouter } from '@tanstack/router-core'
 
 declare global {
   interface Window {
     __TSR_ROUTER_CONTEXT__?: React.Context<AnyRouter>
   }
 }
 
-const routerContext = React.createContext<Router<any, any, any>>(null!)
+const routerContext = React.createContext<AnyRouter>(null!)
 
 export function getRouterContext() {
   if (typeof document === 'undefined') {

Diff for: packages/react-router/src/routerContext.tsx

@@ -60,6 +60,7 @@
   },
   "dependencies": {
     "@tanstack/history": "workspace:*",
-    "@tanstack/store": "^0.7.0"
+    "@tanstack/store": "^0.7.0",
+    "tiny-invariant": "^1.3.3"
   }
 }

Diff for: packages/router-core/package.json

@@ -0,0 +1,9 @@
+import type { HistoryLocation } from '@tanstack/history'
+
+declare module '@tanstack/history' {
+  interface HistoryState {
+    __tempLocation?: HistoryLocation
+    __tempKey?: string
+    __hashScrollIntoViewOptions?: boolean | ScrollIntoViewOptions
+  }
+}

Diff for: packages/router-core/src/history.ts

@@ -199,7 +199,16 @@ export type {
   RouteAddFileTypesFn,
 } from './route'
 
-export { defaultSerializeError, getLocationChangeInfo } from './router'
+export {
+  defaultSerializeError,
+  getLocationChangeInfo,
+  RouterCore,
+  componentTypes,
+  lazyFn,
+  SearchParamError,
+  PathParamError,
+  getInitialRouterState,
+} from './router'
 export type {
   ViewTransitionOptions,
   ExtractedBaseEntry,
@@ -220,7 +229,6 @@ export type {
   RouterEvents,
   MatchRoutesOpts,
   RouterOptionsExtensions,
-  Router,
   DefaultRemountDepsFn,
   PreloadRouteFn,
   MatchRouteFn,
@@ -246,6 +254,7 @@ export type {
   LoadRouteChunkFn,
   ServerSrr,
   ClearCacheFn,
+  CreateRouterFn,
 } from './router'
 
 export type {

Diff for: packages/router-core/src/index.ts

@@ -293,15 +293,15 @@ export type {
   NotFoundRouteComponent,
 } from './route'
 
+export { createRouter, Router } from './router'
+
 export {
   componentTypes,
-  createRouter,
-  Router,
   lazyFn,
   SearchParamError,
   PathParamError,
   getInitialRouterState,
-} from './router'
+} from '@tanstack/router-core'
 
 export { RouterProvider, RouterContextProvider } from './RouterProvider'
 export type { RouterProps } from './RouterProvider'

Diff for: packages/router-core/src/router.ts

@@ -30,7 +30,7 @@ import type {
   RouteMask,
   RouteOptions,
   RouteTypesById,
-  Router,
+  RouterCore,
   ToMaskOptions,
   UseNavigateResult,
 } from '@tanstack/router-core'
@@ -420,7 +420,7 @@ export function createRouteMask<
 >(
   opts: {
     routeTree: TRouteTree
-  } & ToMaskOptions<Router<TRouteTree, 'never', false>, TFrom, TTo>,
+  } & ToMaskOptions<RouterCore<TRouteTree, 'never', false>, TFrom, TTo>,
 ): RouteMask<TRouteTree> {
   return opts as any
 }