Skip to content

Commit 589f4a9

Browse files
committedMay 9, 2024
fix: migrate to @tanstack/start, upgrade deps
1 parent bba8316 commit 589f4a9

14 files changed

+126
-146
lines changed
 

‎app.config.mjs

+7-9
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import { fileURLToPath } from 'url'
1313
const customVite = () =>
1414
config('dev', (router, app, env) => ({
1515
// ssr: {
16-
// noExternal: [/react-router-server\/dist\/esm\/server-runtime/],
16+
// noExternal: [/start\/dist\/esm\/server-runtime/],
1717
// external: ['react', 'react-dom'],
1818
// },
1919
// optimizeDeps: {
2020
// include: [
21-
// 'node_modules@tanstack/react-router-server/**/*.js',
21+
// 'node_modules@tanstack/start/**/*.js',
2222
// 'react-icons',
2323
// 'shiki',
2424
// ],
@@ -32,7 +32,7 @@ const customVite = () =>
3232
'@tanstack/store',
3333
'@tanstack/react-store',
3434
'@tanstack/react-router',
35-
'@tanstack/react-router-server',
35+
'@tanstack/start',
3636
'@tanstack/react-cross-context',
3737
'@tanstack/history',
3838
'use-sync-external-store',
@@ -79,7 +79,7 @@ export default createApp({
7979
}),
8080
tsconfigPaths(),
8181
serverTransform({
82-
runtime: `@tanstack/react-router-server/server-runtime`,
82+
runtime: `@tanstack/start/server-runtime`,
8383
}),
8484
],
8585
link: {
@@ -101,18 +101,16 @@ export default createApp({
101101
customVite(),
102102
tsconfigPaths(),
103103
serverFunctions.client({
104-
runtime: `@tanstack/react-router-server/client-runtime`,
104+
runtime: `@tanstack/start/client-runtime`,
105105
}),
106106
reactRefresh(),
107107
],
108108
},
109109
serverFunctions.router({
110110
name: 'server',
111111
plugins: () => [customVite(), tsconfigPaths()],
112-
handler: resolveToRelative(
113-
'@tanstack/react-router-server/server-handler'
114-
),
115-
runtime: `@tanstack/react-router-server/server-runtime`,
112+
handler: resolveToRelative('@tanstack/start/server-handler'),
113+
runtime: `@tanstack/start/server-runtime`,
116114
}),
117115
],
118116
})

‎app/client.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { hydrateRoot } from 'react-dom/client'
44
import 'vinxi/client'
55

66
import { createRouter } from './router'
7-
import { StartClient } from '@tanstack/react-router-server'
7+
import { StartClient } from '@tanstack/start'
88

99
const router = createRouter()
1010

‎app/routes/__root.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import appCss from '~/styles/app.css?url'
1313
import carbonStyles from '~/styles/carbon.css?url'
1414
import { seo } from '~/utils/seo'
1515
import ogImage from '~/images/og.png'
16-
import { Meta, RouterManagedTag, Scripts } from '@tanstack/react-router-server'
16+
import { Meta, RouterManagedTag, Scripts } from '@tanstack/start'
1717
import { TanStackRouterDevtools } from '@tanstack/router-devtools'
1818
import { NotFound } from '~/components/NotFound'
1919
import { CgSpinner } from 'react-icons/cg'

‎app/routes/blog.$.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import removeMarkdown from 'remove-markdown'
44
import { seo } from '~/utils/seo'
55
import { Doc } from '~/components/Doc'
66
import { PostNotFound } from './blog'
7-
import { createServerFn } from '@tanstack/react-router-server'
7+
import { createServerFn } from '@tanstack/start'
88

99
const fetchBlogPost = createServerFn(
1010
'GET',

‎app/routes/blog.index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { format } from 'date-fns'
77
import { Footer } from '~/components/Footer'
88
import { extractFrontMatter, fetchRepoFile } from '~/utils/documents.server'
99
import { PostNotFound } from './blog'
10-
import { createServerFn } from '@tanstack/react-router-server'
10+
import { createServerFn } from '@tanstack/start'
1111

1212
const fetchFrontMatters = createServerFn('GET', async () => {
1313
'use server'

‎app/routes/dashboard.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { createFileRoute } from '@tanstack/react-router'
2-
import { createServerFn } from '@tanstack/react-router-server'
2+
import { createServerFn } from '@tanstack/start'
33
import { redirectWithClearedCookie, requireAuthCookie } from '~/auth/auth'
44
import { useMutation } from '~/hooks/useMutation'
55

‎app/routes/login.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { createFileRoute, redirect } from '@tanstack/react-router'
2-
import { createServerFn, json } from '@tanstack/react-router-server'
2+
import { createServerFn, json } from '@tanstack/start'
33
import { setAuthOnResponse } from '~/auth/auth'
44
import { useMutation } from '~/hooks/useMutation'
55

‎app/server.tsx

+2-5
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,15 @@ import type { PipeableStream } from 'react-dom/server'
33
import { renderToPipeableStream } from 'react-dom/server'
44
import { eventHandler, getResponseHeaders, toWebRequest } from 'vinxi/server'
55
import { getManifest } from 'vinxi/manifest'
6-
import {
7-
StartServer,
8-
transformStreamWithRouter,
9-
} from '@tanstack/react-router-server/server'
6+
import { StartServer, transformStreamWithRouter } from '@tanstack/start/server'
107
// import { Transform, PassThrough } from 'node:stream'
118

129
import { createRouter } from './router'
1310
import { createMemoryHistory } from '@tanstack/react-router'
1411
import {
1512
serverFnPayloadTypeHeader,
1613
serverFnReturnTypeHeader,
17-
} from '@tanstack/react-router-server'
14+
} from '@tanstack/start'
1815
import isbot from 'isbot'
1916

2017
export default eventHandler(async (event) => {

‎app/server/sponsors.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
getTierById,
77
updateTiersMeta,
88
} from '~/server/tiers'
9-
import { createServerFn, json } from '@tanstack/react-router-server'
9+
import { createServerFn, json } from '@tanstack/start'
1010

1111
export type Sponsor = {
1212
login: string

‎app/utils/config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { z } from 'zod'
22
import { fetchRepoFile } from './documents.server'
3-
import { createServerFn } from '@tanstack/react-router-server'
3+
import { createServerFn } from '@tanstack/start'
44

55
export type MenuItem = {
66
label: string | React.ReactNode

‎app/utils/docs.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { extractFrontMatter, fetchRepoFile } from '~/utils/documents.server'
22
import removeMarkdown from 'remove-markdown'
33
import { notFound } from '@tanstack/react-router'
4-
import { createServerFn, json } from '@tanstack/react-router-server'
4+
import { createServerFn, json } from '@tanstack/start'
55

66
export const loadDocs = async ({
77
repo,

‎package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
"@oramacloud/client": "^1.1.5",
2525
"@remix-run/node": "^2.8.1",
2626
"@tailwindcss/typography": "^0.5.13",
27-
"@tanstack/react-router": "1.31.24",
28-
"@tanstack/react-router-server": "1.31.24",
29-
"@tanstack/router-devtools": "1.31.24",
27+
"@tanstack/react-router": "1.31.25",
28+
"@tanstack/router-devtools": "1.31.25",
3029
"@tanstack/router-vite-plugin": "1.31.18",
30+
"@tanstack/start": "1.31.25",
3131
"@typescript-eslint/parser": "^7.2.0",
3232
"@vercel/analytics": "^1.2.2",
3333
"@vercel/speed-insights": "^1.0.10",
@@ -84,7 +84,7 @@
8484
"overrides": {
8585
"@tanstack/react-router": "file:../router/packages/react-router",
8686
"@tanstack/router-devtools": "file:../router/packages/router-devtools",
87-
"@tanstack/react-router-server": "file:../router/packages/react-router-server",
87+
"@tanstack/start": "file:../router/packages/start",
8888
"@tanstack/react-cross-context": "file:../router/packages/react-cross-context",
8989
"@tanstack/history": "file:../router/packages/history",
9090
"@tanstack/react-store": "file:../router/packages/react-router/node_modules/@tanstack/react-store",

‎pnpm-lock.yaml

+103-118
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/link.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import path from 'path'
44
const packages = {
55
// '@tanstack/react-router': 'router/packages/react-router',
66
// '@tanstack/router-devtools': 'router/packages/router-devtools',
7-
'@tanstack/react-router-server': 'router/packages/react-router-server',
7+
'@tanstack/start': 'router/packages/start',
88
// '@tanstack/react-cross-context': 'router/packages/react-cross-context',
99
// '@tanstack/history': 'router/packages/history',
1010
// '@tanstack/react-store':

0 commit comments

Comments
 (0)
Please sign in to comment.