Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,28 @@
"lint": "eslint . --report-unused-disable-directives --max-warnings 0"
},
"dependencies": {
"@clerk/tanstack-react-start": "^0.23.0",
"@tanstack/react-router": "^1.131.28",
"@tanstack/react-router-devtools": "^1.131.28",
"@tanstack/react-start": "^1.131.28",
"@clerk/tanstack-react-start": "^0.26.0-canary.v20251014160127",
"@tanstack/react-router": "^1.132.47",
"@tanstack/react-router-devtools": "^1.133.1",
"@tanstack/react-start": "^1.132.56",
"react": "^19.1.0",
"react-dom": "^19.1.0"
"react-dom": "^19.1.0",
"srvx": "^0.8.15"
},
"devDependencies": {
"@eslint/compat": "^1.3.1",
"@eslint/js": "^9.31.0",
"@typescript-eslint/parser": "^8.37.0",
"@types/node": "^24.0.14",
"@types/react": "^19.1.8",
"@types/react-dom": "^19.1.6",
"@typescript-eslint/eslint-plugin": "^8.37.0",
"@typescript-eslint/parser": "^8.37.0",
"@vitejs/plugin-react": "^4.3.4",
"autoprefixer": "^10.4.21",
"eslint": "^9.31.0",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^5.2.0",
"eslint-plugin-react-refresh": "^0.4.20",
"@types/node": "^24.0.14",
"@types/react": "^19.1.8",
"@types/react-dom": "^19.1.6",
"autoprefixer": "^10.4.21",
"prettier": "^3.6.2",
"typescript": "^5.8.3",
"typescript-eslint": "^8.37.0",
Expand Down
10 changes: 10 additions & 0 deletions src/routeTree.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,13 @@ const rootRouteChildren: RootRouteChildren = {
export const routeTree = rootRouteImport
._addFileChildren(rootRouteChildren)
._addFileTypes<FileRouteTypes>()

import type { getRouter } from './router.tsx'
import type { startInstance } from './start.ts'
declare module '@tanstack/react-start' {
interface Register {
ssr: true
router: Awaited<ReturnType<typeof getRouter>>
config: Awaited<ReturnType<typeof startInstance.getOptions>>
}
}
8 changes: 4 additions & 4 deletions src/router.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { createRouter as createTanStackRouter } from '@tanstack/react-router'
import { createRouter } from '@tanstack/react-router'
import { routeTree } from './routeTree.gen'

export function createRouter() {
const router = createTanStackRouter({
export function getRouter() {
const router = createRouter({
routeTree,
defaultPreload: 'intent',
defaultErrorComponent: (err) => <p>{err.error.stack}</p>,
Expand All @@ -15,6 +15,6 @@ export function createRouter() {

declare module '@tanstack/react-router' {
interface Register {
router: ReturnType<typeof createRouter>
router: ReturnType<typeof getRouter>
}
Comment on lines 16 to 19

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if it matters, but this isn't present when creating a new Tanstack app.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the updated one

}
2 changes: 1 addition & 1 deletion src/routes/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function Home() {
</SignedIn>
<SignedOut>
<p>You are signed out</p>
<SignInButton />
<SignInButton mode="modal" />

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't in the quickstart changes from this PR: clerk/clerk-docs#2690

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated, ty!

</SignedOut>
</div>
)
Expand Down
14 changes: 0 additions & 14 deletions src/server.ts

This file was deleted.

8 changes: 8 additions & 0 deletions src/start.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { clerkMiddleware } from '@clerk/tanstack-react-start/server';
import { createStart } from '@tanstack/react-start';

export const startInstance = createStart(() => {
return {
requestMiddleware: [clerkMiddleware()],
};
});
2 changes: 2 additions & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { tanstackStart } from '@tanstack/react-start/plugin/vite'
import { defineConfig } from 'vite'
import tsConfigPaths from 'vite-tsconfig-paths'
import viteReact from '@vitejs/plugin-react'

export default defineConfig({
server: {
Expand All @@ -11,5 +12,6 @@ export default defineConfig({
projects: ['./tsconfig.json'],
}),
tanstackStart(),
viteReact(),
],
})