chore(react-start,solid-start): update imports to use router-core (#3703)

Update start package imports after much router code has been moved to
the agnostic router-core package.

Author: birkskyum

packages/react-start-client/src/StartClient.tsx

@@ -1,6 +1,6 @@
 import { Await, RouterProvider } from '@tanstack/react-router'
 import { hydrate } from './ssr-client'
-import type { AnyRouter } from '@tanstack/react-router'
+import type { AnyRouter } from '@tanstack/router-core'
 
 let hydrationPromise: Promise<void | Array<Array<void>>> | undefined
 

packages/react-start-client/src/ssr-client.tsx

@@ -6,11 +6,8 @@ import { startSerializer } from './serializer'
 import type {
   AnyRouter,
   ControllablePromise,
-  MakeRouteMatch,
-} from '@tanstack/react-router'
-
-import type {
   DeferredPromiseState,
+  MakeRouteMatch,
   Manifest,
   RouteContextOptions,
 } from '@tanstack/router-core'

packages/react-start-config/package.json

@@ -52,6 +52,7 @@
   },
   "dependencies": {
     "@tanstack/react-router": "workspace:^",
+    "@tanstack/router-core": "workspace:^",
     "@tanstack/router-generator": "workspace:^",
     "@tanstack/router-plugin": "workspace:^",
     "@tanstack/server-functions-plugin": "workspace:^",

packages/react-start-config/src/index.ts

@@ -28,7 +28,7 @@ import type {
   TanStackStartOutputConfig,
 } from './schema.js'
 import type { App as VinxiApp } from 'vinxi'
-import type { Manifest } from '@tanstack/react-router'
+import type { Manifest } from '@tanstack/router-core'
 import type * as vite from 'vite'
 
 export type {

packages/react-start-server/src/StartServer.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { RouterProvider } from '@tanstack/react-router'
-import type { AnyRouter } from '@tanstack/react-router'
+import type { AnyRouter } from '@tanstack/router-core'
 
 export function StartServer<TRouter extends AnyRouter>(props: {
   router: TRouter

packages/react-start-server/src/createRequestHandler.ts

@@ -2,7 +2,7 @@ import { createMemoryHistory } from '@tanstack/history'
 import { mergeHeaders } from '@tanstack/react-start-client'
 import { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'
 import type { HandlerCallback } from './handlerCallback'
-import type { AnyRouter, Manifest } from '@tanstack/react-router'
+import type { AnyRouter, Manifest } from '@tanstack/router-core'
 
 export type RequestHandler<TRouter extends AnyRouter> = (
   cb: HandlerCallback<TRouter>,

packages/react-start-server/src/createStartHandler.ts

@@ -4,7 +4,7 @@ import { eventHandler, getResponseHeaders, toWebRequest } from 'h3'
 import { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'
 import type { HandlerCallback } from './handlerCallback'
 import type { EventHandlerResponse, H3Event } from 'h3'
-import type { AnyRouter, Manifest } from '@tanstack/react-router'
+import type { AnyRouter, Manifest } from '@tanstack/router-core'
 
 export type CustomizeStartHandler<
   TRouter extends AnyRouter,

packages/react-start-server/src/handlerCallback.ts

@@ -1,5 +1,5 @@
 import type { EventHandlerResponse } from 'h3'
-import type { AnyRouter } from '@tanstack/react-router'
+import type { AnyRouter } from '@tanstack/router-core'
 
 export interface HandlerCallback<
   TRouter extends AnyRouter,

packages/react-start-server/src/ssr-server.ts

@@ -15,8 +15,12 @@ import type {
   ResolvePromiseState,
   SsrMatch,
 } from '@tanstack/react-start-client'
-import type { AnyRouteMatch, AnyRouter } from '@tanstack/react-router'
-import type { DeferredPromise, Manifest } from '@tanstack/router-core'
+import type {
+  AnyRouteMatch,
+  AnyRouter,
+  DeferredPromise,
+  Manifest,
+} from '@tanstack/router-core'
 
 export type ServerExtractedEntry =
   | ServerExtractedStream

packages/react-start-server/src/transformStreamWithRouter.ts

@@ -1,7 +1,7 @@
 import { ReadableStream } from 'node:stream/web'
 import { Readable } from 'node:stream'
-import { createControlledPromise } from '@tanstack/react-router'
-import type { AnyRouter } from '@tanstack/react-router'
+import { createControlledPromise } from '@tanstack/router-core'
+import type { AnyRouter } from '@tanstack/router-core'
 
 export function transformReadableStreamWithRouter(
   router: AnyRouter,

packages/react-start-server/src/tsrScript.ts

@@ -1,4 +1,4 @@
-import type { ControllablePromise } from '@tanstack/react-router'
+import type { ControllablePromise } from '@tanstack/router-core'
 import type { StartSsrGlobal } from '@tanstack/react-start-client'
 
 const __TSR_SSR__: StartSsrGlobal = {

packages/solid-start-client/src/StartClient.tsx

@@ -1,6 +1,6 @@
 import { Await, HeadContent, RouterProvider } from '@tanstack/solid-router'
 import { hydrate } from './ssr-client'
-import type { AnyRouter } from '@tanstack/solid-router'
+import type { AnyRouter } from '@tanstack/router-core'
 import type { JSXElement } from 'solid-js'
 
 let hydrationPromise: Promise<void | Array<Array<void>>> | undefined

packages/solid-start-client/src/ssr-client.tsx

@@ -6,11 +6,8 @@ import { startSerializer } from './serializer'
 import type {
   AnyRouter,
   ControllablePromise,
-  MakeRouteMatch,
-} from '@tanstack/solid-router'
-
-import type {
   DeferredPromiseState,
+  MakeRouteMatch,
   Manifest,
   RouteContextOptions,
 } from '@tanstack/router-core'

packages/solid-start-config/package.json

@@ -52,6 +52,7 @@
   },
   "dependencies": {
     "@tanstack/solid-router": "workspace:^",
+    "@tanstack/router-core": "workspace:^",
     "@tanstack/router-generator": "workspace:^",
     "@tanstack/router-plugin": "workspace:^",
     "@tanstack/server-functions-plugin": "workspace:^",

packages/solid-start-config/src/index.ts

@@ -28,7 +28,7 @@ import type {
   TanStackStartOutputConfig,
 } from './schema.js'
 import type { App as VinxiApp } from 'vinxi'
-import type { Manifest } from '@tanstack/solid-router'
+import type { Manifest } from '@tanstack/router-core'
 import type * as vite from 'vite'
 
 export type {

packages/solid-start-server/src/StartServer.tsx

@@ -7,7 +7,7 @@ import {
   useAssets,
 } from 'solid-js/web'
 import { MetaProvider } from '@solidjs/meta'
-import type { AnyRouter } from '@tanstack/solid-router'
+import type { AnyRouter } from '@tanstack/router-core'
 
 export function ServerHeadContent() {
   const tags = useTags()

packages/solid-start-server/src/createRequestHandler.ts

@@ -2,8 +2,7 @@ import { createMemoryHistory } from '@tanstack/history'
 import { mergeHeaders } from '@tanstack/solid-start-client'
 import { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'
 import type { HandlerCallback } from './handlerCallback'
-import type { AnyRouter } from '@tanstack/solid-router'
-import type { Manifest } from '@tanstack/router-core'
+import type { AnyRouter, Manifest } from '@tanstack/router-core'
 
 export type RequestHandler<TRouter extends AnyRouter> = (
   cb: HandlerCallback<TRouter>,

packages/solid-start-server/src/createStartHandler.ts

@@ -4,8 +4,7 @@ import { eventHandler, getResponseHeaders, toWebRequest } from 'h3'
 import { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'
 import type { HandlerCallback } from './handlerCallback'
 import type { EventHandlerResponse, H3Event } from 'h3'
-import type { AnyRouter } from '@tanstack/solid-router'
-import type { Manifest } from '@tanstack/router-core'
+import type { AnyRouter, Manifest } from '@tanstack/router-core'
 
 export type CustomizeStartHandler<
   TRouter extends AnyRouter,

packages/solid-start-server/src/handlerCallback.ts

@@ -1,5 +1,5 @@
 import type { EventHandlerResponse } from 'h3'
-import type { AnyRouter } from '@tanstack/solid-router'
+import type { AnyRouter } from '@tanstack/router-core'
 
 export interface HandlerCallback<
   TRouter extends AnyRouter,

packages/solid-start-server/src/ssr-server.ts

@@ -15,8 +15,12 @@ import type {
   ResolvePromiseState,
   SsrMatch,
 } from '@tanstack/solid-start-client'
-import type { AnyRouteMatch, AnyRouter } from '@tanstack/solid-router'
-import type { DeferredPromise, Manifest } from '@tanstack/router-core'
+import type {
+  AnyRouteMatch,
+  AnyRouter,
+  DeferredPromise,
+  Manifest,
+} from '@tanstack/router-core'
 
 export type ServerExtractedEntry =
   | ServerExtractedStream

packages/solid-start-server/src/transformStreamWithRouter.ts

@@ -1,6 +1,6 @@
 import { ReadableStream } from 'node:stream/web'
-import { createControlledPromise } from '@tanstack/solid-router'
-import type { AnyRouter } from '@tanstack/solid-router'
+import { createControlledPromise } from '@tanstack/router-core'
+import type { AnyRouter } from '@tanstack/router-core'
 
 export function transformReadableStreamWithRouter(
   router: AnyRouter,

packages/solid-start-server/src/tsrScript.ts

@@ -1,4 +1,4 @@
-import type { ControllablePromise } from '@tanstack/solid-router'
+import type { ControllablePromise } from '@tanstack/router-core'
 import type { StartSsrGlobal } from '@tanstack/solid-start-client'
 
 const __TSR_SSR__: StartSsrGlobal = {