Skip to content

Commit

Permalink
refactor: use start-server-core package in server-functions packages (#…
Browse files Browse the repository at this point in the history
…3724)

instead of
- solid-start-server
- react-start-server

Use in the *-start-server-functions-* packages the agnostic
- start-server-core
  • Loading branch information
birkskyum authored Mar 10, 2025
1 parent bea9e4d commit 391b026
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 23 deletions.
1 change: 0 additions & 1 deletion packages/react-router/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,6 @@ export type { NotFoundError } from '@tanstack/router-core'
export * from './typePrimitives'

export { ScriptOnce } from './ScriptOnce'

export { Asset } from './Asset'
export { HeadContent } from './HeadContent'
export { Scripts } from './Scripts'
2 changes: 1 addition & 1 deletion packages/react-start-server-functions-handler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"dependencies": {
"@tanstack/react-router": "workspace:^",
"@tanstack/start-client-core": "workspace:^",
"@tanstack/react-start-server": "workspace:^",
"@tanstack/start-server-core": "workspace:^",
"tiny-invariant": "^1.3.3"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/react-start-server-functions-handler/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import {
getEvent,
getResponseStatus,
toWebRequest,
} from '@tanstack/react-start-server'
} from '@tanstack/start-server-core'
import { startSerializer } from '@tanstack/start-client-core'
// @ts-expect-error
import _serverFnManifest from 'tsr:server-fn-manifest'
import type { H3Event } from '@tanstack/react-start-server'
import type { H3Event } from '@tanstack/start-server-core'

// NOTE: This is a dummy export to silence warnings about
// only having a default export.
Expand Down
2 changes: 1 addition & 1 deletion packages/react-start-server-functions-ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
},
"dependencies": {
"@tanstack/server-functions-plugin": "workspace:^",
"@tanstack/react-start-server": "workspace:^",
"@tanstack/react-start-server-functions-fetcher": "workspace:^",
"@tanstack/start-client-core": "workspace:^",
"@tanstack/start-server-core": "workspace:^",
"tiny-invariant": "^1.3.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-start-server-functions-ssr/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// <reference types="node" />
import { serverFnFetcher } from '@tanstack/react-start-server-functions-fetcher'
import { mergeHeaders } from '@tanstack/start-client-core'
import { getEvent, getHeaders } from '@tanstack/react-start-server'
import { getEvent, getHeaders } from '@tanstack/start-server-core'
import type { CreateRpcFn } from '@tanstack/server-functions-plugin'

function sanitizeBase(base: string) {
Expand Down
2 changes: 1 addition & 1 deletion packages/solid-start-server-functions-handler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"dependencies": {
"@tanstack/solid-router": "workspace:^",
"@tanstack/start-client-core": "workspace:^",
"@tanstack/solid-start-server": "workspace:^",
"@tanstack/start-server-core": "workspace:^",
"tiny-invariant": "^1.3.3"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/solid-start-server-functions-handler/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import {
getEvent,
getResponseStatus,
toWebRequest,
} from '@tanstack/solid-start-server'
} from '@tanstack/start-server-core'
import { startSerializer } from '@tanstack/start-client-core'
// @ts-expect-error
import _serverFnManifest from 'tsr:server-fn-manifest'
import type { H3Event } from '@tanstack/solid-start-server'
import type { H3Event } from '@tanstack/start-server-core'

// NOTE: This is a dummy export to silence warnings about
// only having a default export.
Expand Down
2 changes: 1 addition & 1 deletion packages/solid-start-server-functions-ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
},
"dependencies": {
"@tanstack/server-functions-plugin": "workspace:^",
"@tanstack/solid-start-server": "workspace:^",
"@tanstack/solid-start-server-functions-fetcher": "workspace:^",
"@tanstack/start-client-core": "workspace:^",
"@tanstack/start-server-core": "workspace:^",
"tiny-invariant": "^1.3.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/solid-start-server-functions-ssr/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// <reference types="node" />
import { serverFnFetcher } from '@tanstack/solid-start-server-functions-fetcher'
import { mergeHeaders } from '@tanstack/start-client-core'
import { getEvent, getHeaders } from '@tanstack/solid-start-server'
import { getEvent, getHeaders } from '@tanstack/start-server-core'
import type { CreateRpcFn } from '@tanstack/server-functions-plugin'

function sanitizeBase(base: string) {
Expand Down
24 changes: 12 additions & 12 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 391b026

Please sign in to comment.