refactor(start-client, start-server, start-server-functions-fetcher): work towards making agnostic

packages/start-client/package.json

@@ -64,9 +64,11 @@
   },
   "dependencies": {
     "@tanstack/react-router": "workspace:^",
+    "@tanstack/router-core": "workspace:^",
     "cookie-es": "^1.2.2",
     "jsesc": "^3.1.0",
     "tiny-invariant": "^1.3.3",
+    "tiny-warning": "^1.0.3",
     "vinxi": "^0.5.3"
   },
   "devDependencies": {

packages/start-client/src/createMiddleware.ts

@@ -11,7 +11,7 @@ import type {
   ResolveValidatorInput,
   ResolveValidatorOutput,
   SerializerStringify,
-} from '@tanstack/react-router'
+} from '@tanstack/router-core'
 
 export type AssignAllMiddleware<
   TMiddlewares,

packages/start-client/src/createServerFn.ts

@@ -1,9 +1,6 @@
-import {
-  invariant,
-  isNotFound,
-  isRedirect,
-  warning,
-} from '@tanstack/react-router'
+import { default as invariant } from 'tiny-invariant'
+import { default as warning } from 'tiny-warning'
+import { isNotFound, isRedirect } from '@tanstack/react-router'
 import { mergeHeaders } from './headers'
 import { globalMiddleware } from './registerGlobalMiddleware'
 import { startSerializer } from './serializer'
@@ -16,7 +13,7 @@ import type {
   SerializerStringify,
   SerializerStringifyBy,
   Validator,
-} from '@tanstack/react-router'
+} from '@tanstack/router-core'
 import type {
   AnyMiddleware,
   AssignAllClientSendContext,

packages/start-client/src/serializer.ts

@@ -1,5 +1,5 @@
-import { isPlainObject } from '@tanstack/react-router'
-import type { StartSerializer } from '@tanstack/react-router'
+import { isPlainObject } from '@tanstack/router-core'
+import type { StartSerializer } from '@tanstack/router-core'
 
 export const startSerializer: StartSerializer = {
   stringify: (value: any) =>

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

@@ -1,16 +1,16 @@
-import { isPlainObject } from '@tanstack/react-router'
+import { isPlainObject } from '@tanstack/router-core'
 
 import invariant from 'tiny-invariant'
 
 import { startSerializer } from './serializer'
 import type {
   AnyRouter,
   ControllablePromise,
-  DeferredPromiseState,
   MakeRouteMatch,
-  Manifest,
 } from '@tanstack/react-router'
 
+import type { DeferredPromiseState, Manifest } from '@tanstack/router-core'
+
 declare global {
   interface Window {
     __TSR_SSR__?: StartSsrGlobal

packages/start-client/src/tests/createServerFn.test-d.tsx

@@ -1,7 +1,7 @@
 import { expectTypeOf, test } from 'vitest'
 import { createServerFn } from '../createServerFn'
 import { createMiddleware } from '../createMiddleware'
-import type { Constrain, Validator } from '@tanstack/react-router'
+import type { Constrain, Validator } from '@tanstack/router-core'
 
 test('createServerFn method with autocomplete', () => {
   createServerFn().handler((options) => {

packages/start-client/src/tests/createServerMiddleware.test-d.ts

@@ -1,6 +1,6 @@
 import { expectTypeOf, test } from 'vitest'
 import { createMiddleware } from '../createMiddleware'
-import type { Constrain, Validator } from '@tanstack/react-router'
+import type { Constrain, Validator } from '@tanstack/router-core'
 
 test('createServeMiddleware removes middleware after middleware,', () => {
   const middleware = createMiddleware()

packages/start-server-functions-fetcher/package.json

@@ -63,6 +63,7 @@
   },
   "dependencies": {
     "@tanstack/react-router": "workspace:^",
+    "@tanstack/router-core": "workspace:^",
     "@tanstack/start-client": "workspace:^"
   },
   "devDependencies": {

packages/start-server-functions-fetcher/src/index.tsx → packages/start-server-functions-fetcher/src/index.ts

@@ -1,9 +1,5 @@
-import {
-  encode,
-  isNotFound,
-  isPlainObject,
-  isRedirect,
-} from '@tanstack/react-router'
+import { isNotFound, isRedirect } from '@tanstack/react-router'
+import { encode, isPlainObject } from '@tanstack/router-core'
 import { startSerializer } from '@tanstack/start-client'
 import type { MiddlewareClientFnOptions } from '@tanstack/start-client'
 

packages/start-server-functions-fetcher/tsconfig.json

@@ -1,7 +1,6 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "jsx": "react-jsx",
     "module": "esnext"
   },
   "include": ["src", "vite.config.ts"]

packages/start-server-functions-fetcher/vite.config.ts

@@ -16,7 +16,7 @@ const config = defineConfig({
 export default mergeConfig(
   config,
   tanstackViteConfig({
-    entry: './src/index.tsx',
+    entry: './src/index.ts',
     srcDir: './src',
   }),
 )

packages/start-server-functions-handler/tsconfig.json

@@ -1,7 +1,6 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "jsx": "react-jsx",
     "module": "esnext"
   },
   "include": ["src", "vite.config.ts"]

packages/start-server-functions-handler/vite.config.ts

@@ -16,7 +16,7 @@ const config = defineConfig({
 export default mergeConfig(
   config,
   tanstackViteConfig({
-    entry: './src/index.tsx',
+    entry: './src/index.ts',
     srcDir: './src',
     externalDeps: ['tsr:server-fn-manifest'],
   }),

packages/start-server/package.json

@@ -62,8 +62,11 @@
     "node": ">=12"
   },
   "dependencies": {
+    "@tanstack/history": "workspace:^",
     "@tanstack/react-router": "workspace:^",
+    "@tanstack/router-core": "workspace:^",
     "@tanstack/start-client": "workspace:^",
+    "tiny-warning": "^1.0.3",
     "h3": "1.13.0",
     "isbot": "^5.1.22",
     "jsesc": "^3.1.0",

packages/start-server/src/createRequestHandler.ts

@@ -1,4 +1,4 @@
-import { createMemoryHistory } from '@tanstack/react-router'
+import { createMemoryHistory } from '@tanstack/history'
 import { mergeHeaders } from '@tanstack/start-client'
 import { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'
 import type { HandlerCallback } from './handlerCallback'

packages/start-server/src/createStartHandler.ts

@@ -1,4 +1,4 @@
-import { createMemoryHistory } from '@tanstack/react-router'
+import { createMemoryHistory } from '@tanstack/history'
 import { mergeHeaders } from '@tanstack/start-client'
 import { eventHandler, getResponseHeaders, toWebRequest } from 'h3'
 import { attachRouterServerSsrUtils, dehydrateRouter } from './ssr-server'

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

@@ -1,11 +1,11 @@
+import { default as warning } from 'tiny-warning'
 import {
   TSR_DEFERRED_PROMISE,
   defer,
   isPlainArray,
   isPlainObject,
   pick,
-  warning,
-} from '@tanstack/react-router'
+} from '@tanstack/router-core'
 import jsesc from 'jsesc'
 import { startSerializer } from '@tanstack/start-client'
 import minifiedTsrBootStrapScript from './tsrScript?script-string'
@@ -15,12 +15,8 @@ import type {
   ResolvePromiseState,
   SsrMatch,
 } from '@tanstack/start-client'
-import type {
-  AnyRouteMatch,
-  AnyRouter,
-  DeferredPromise,
-  Manifest,
-} from '@tanstack/react-router'
+import type { AnyRouteMatch, AnyRouter } from '@tanstack/react-router'
+import type { DeferredPromise, Manifest } from '@tanstack/router-core'
 
 export type ServerExtractedEntry =
   | ServerExtractedStream