Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
40 changes: 22 additions & 18 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,28 @@
- 'packages/react-router/**/*'
'package: react-router-with-query':
- 'packages/react-router-with-query/**/*'
'package: react-start':
- 'packages/react-start/**/*'
'package: react-start-api-routes':
- 'packages/react-start-api-routes/**/*'
'package: react-start-client':
- 'packages/react-start-client/**/*'
'package: react-start-config':
- 'packages/react-start-config/**/*'
'package: react-start-plugin':
- 'packages/react-start-plugin/**/*'
'package: react-start-router-manifest':
- 'packages/react-start-router-manifest/**/*'
'package: react-start-server':
- 'packages/react-start-server/**/*'
'package: react-start-server-functions-client':
- 'packages/react-start-server-functions-client/**/*'
'package: react-start-server-functions-fetcher':
- 'packages/react-start-server-functions-fetcher/**/*'
'package: react-start-server-functions-handler':
- 'packages/react-start-server-functions-handler/**/*'
'package: react-start-server-functions-ssr':
- 'packages/react-start-server-functions-ssr/**/*'
'package: router-cli':
- 'packages/router-cli/**/*'
'package: router-core':
Expand All @@ -34,28 +56,10 @@
- 'packages/solid-router/**/*'
'package: start':
- 'packages/start/**/*'
'package: start-api-routes':
- 'packages/start-api-routes/**/*'
'package: start-client':
- 'packages/start-client/**/*'
'package: start-config':
- 'packages/start-config/**/*'
'package: start-plugin':
- 'packages/start-plugin/**/*'
'package: start-router-manifest':
- 'packages/start-router-manifest/**/*'
'package: start-server':
- 'packages/start-server/**/*'
'package: start-server-functions-client':
- 'packages/start-server-functions-client/**/*'
'package: start-server-functions-fetcher':
- 'packages/start-server-functions-fetcher/**/*'
'package: start-server-functions-handler':
- 'packages/start-server-functions-handler/**/*'
'package: start-server-functions-server':
- 'packages/start-server-functions-server/**/*'
'package: start-server-functions-ssr':
- 'packages/start-server-functions-ssr/**/*'
'package: valibot-adapter':
- 'packages/valibot-adapter/**/*'
'package: virtual-file-routes':
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-auth/app.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defineConfig } from '@tanstack/start/config'
import { defineConfig } from '@tanstack/react-start/config'
import tsConfigPaths from 'vite-tsconfig-paths'

export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-auth/app/client.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// <reference types="vinxi/types/client" />
import { hydrateRoot } from 'react-dom/client'
import { StartClient } from '@tanstack/start'
import { StartClient } from '@tanstack/react-start'
import { createRouter } from './router'

const router = createRouter()
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-auth/app/components/Login.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useRouter } from '@tanstack/react-router'
import { useServerFn } from '@tanstack/start'
import { useServerFn } from '@tanstack/react-start'
import { useMutation } from '../hooks/useMutation'
import { loginFn } from '../routes/_authed'
import { Auth } from './Auth'
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-auth/app/routes/__root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
createRootRoute,
} from '@tanstack/react-router'
import { TanStackRouterDevtools } from '@tanstack/router-devtools'
import { createServerFn } from '@tanstack/start'
import { createServerFn } from '@tanstack/react-start'
import * as React from 'react'

import { DefaultCatchBoundary } from '~/components/DefaultCatchBoundary.js'
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-auth/app/routes/_authed.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createFileRoute } from '@tanstack/react-router'
import { createServerFn } from '@tanstack/start'
import { createServerFn } from '@tanstack/react-start'

import { hashPassword, prismaClient } from '~/utils/prisma'
import { Login } from '~/components/Login'
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-auth/app/routes/logout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createFileRoute, redirect } from '@tanstack/react-router'
import { createServerFn } from '@tanstack/start'
import { createServerFn } from '@tanstack/react-start'

import { useAppSession } from '~/utils/session'

Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-auth/app/routes/signup.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createFileRoute, redirect } from '@tanstack/react-router'
import { createServerFn, useServerFn } from '@tanstack/start'
import { createServerFn, useServerFn } from '@tanstack/react-start'

import { hashPassword, prismaClient } from '~/utils/prisma'
import { useMutation } from '~/hooks/useMutation'
Expand Down
4 changes: 2 additions & 2 deletions e2e/start/basic-auth/app/ssr.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {
createStartHandler,
defaultStreamHandler,
} from '@tanstack/start/server'
import { getRouterManifest } from '@tanstack/start/router-manifest'
} from '@tanstack/react-start/server'
import { getRouterManifest } from '@tanstack/react-start/router-manifest'

import { createRouter } from './router'

Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-auth/app/utils/posts.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { notFound } from '@tanstack/react-router'
import { createServerFn } from '@tanstack/start'
import { createServerFn } from '@tanstack/react-start'
import axios from 'redaxios'

export type PostType = {
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-auth/app/utils/session.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// app/services/session.server.ts
import { useSession } from '@tanstack/start/server'
import { useSession } from '@tanstack/react-start/server'
import type { User } from '@prisma/client'

type SessionUser = {
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@prisma/client": "5.22.0",
"@tanstack/react-router": "workspace:^",
"@tanstack/router-devtools": "workspace:^",
"@tanstack/start": "workspace:^",
"@tanstack/react-start": "workspace:^",
"prisma": "^5.22.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-react-query/app.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defineConfig } from '@tanstack/start/config'
import { defineConfig } from '@tanstack/react-start/config'
import tsConfigPaths from 'vite-tsconfig-paths'

export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-react-query/app/api.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
createStartAPIHandler,
defaultAPIFileRouteHandler,
} from '@tanstack/start/api'
} from '@tanstack/react-start/api'

export default createStartAPIHandler(defaultAPIFileRouteHandler)
2 changes: 1 addition & 1 deletion e2e/start/basic-react-query/app/client.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// <reference types="vinxi/types/client" />
import { hydrateRoot } from 'react-dom/client'
import { StartClient } from '@tanstack/start'
import { StartClient } from '@tanstack/react-start'
import { createRouter } from './router'

const router = createRouter()
Expand Down
4 changes: 2 additions & 2 deletions e2e/start/basic-react-query/app/routes/api.users.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { json } from '@tanstack/start'
import { createAPIFileRoute } from '@tanstack/start/api'
import { json } from '@tanstack/react-start'
import { createAPIFileRoute } from '@tanstack/react-start/api'
import axios from 'redaxios'
import type { User } from '../utils/users'

Expand Down
4 changes: 2 additions & 2 deletions e2e/start/basic-react-query/app/routes/api/users.$id.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { json } from '@tanstack/start'
import { createAPIFileRoute } from '@tanstack/start/api'
import { json } from '@tanstack/react-start'
import { createAPIFileRoute } from '@tanstack/react-start/api'
import axios from 'redaxios'
import type { User } from '../../utils/users'

Expand Down
4 changes: 2 additions & 2 deletions e2e/start/basic-react-query/app/ssr.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {
createStartHandler,
defaultStreamHandler,
} from '@tanstack/start/server'
import { getRouterManifest } from '@tanstack/start/router-manifest'
} from '@tanstack/react-start/server'
import { getRouterManifest } from '@tanstack/react-start/router-manifest'

import { createRouter } from './router'

Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-react-query/app/utils/posts.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { queryOptions } from '@tanstack/react-query'
import { notFound } from '@tanstack/react-router'
import { createServerFn } from '@tanstack/start'
import { createServerFn } from '@tanstack/react-start'
import axios from 'redaxios'

export type PostType = {
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-react-query/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@tanstack/react-router": "workspace:^",
"@tanstack/react-router-with-query": "workspace:^",
"@tanstack/router-devtools": "workspace:^",
"@tanstack/start": "workspace:^",
"@tanstack/react-start": "workspace:^",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-rsc/app.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defineConfig } from '@tanstack/start/config'
import { defineConfig } from '@tanstack/react-start/config'
import tsConfigPaths from 'vite-tsconfig-paths'

export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-rsc/app/client.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// <reference types="vinxi/types/client" />
import { hydrateRoot } from 'react-dom/client'
import { StartClient } from '@tanstack/start'
import { StartClient } from '@tanstack/react-start'
import { createRouter } from './router'

const router = createRouter()
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-rsc/app/routes/posts.$postId.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ErrorComponent, Link, createFileRoute } from '@tanstack/react-router'
import { createServerFn } from '@tanstack/start'
import { createServerFn } from '@tanstack/react-start'
import type { ErrorComponentProps } from '@tanstack/react-router'

import { fetchPost } from '~/utils/posts'
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-rsc/app/routes/posts.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createFileRoute } from '@tanstack/react-router'
import { createServerFn, renderRsc } from '@tanstack/start'
import { createServerFn, renderRsc } from '@tanstack/react-start'
import { renderPosts } from '~/utils/renderPosts'

export const serverRenderPosts = createServerFn({ method: 'GET' }).handler(
Expand Down
4 changes: 2 additions & 2 deletions e2e/start/basic-rsc/app/ssr.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {
createStartHandler,
defaultStreamHandler,
} from '@tanstack/start/server'
import { getRouterManifest } from '@tanstack/start/router-manifest'
} from '@tanstack/react-start/server'
import { getRouterManifest } from '@tanstack/react-start/router-manifest'

import { createRouter } from './router'

Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-rsc/app/utils/posts.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// import { notFound } from '@tanstack/react-router'
// import { createServerFn } from '@tanstack/start'
// import { createServerFn } from '@tanstack/react-start'
import axios from 'redaxios'

export type PostType = {
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-rsc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@babel/plugin-syntax-typescript": "^7.25.9",
"@tanstack/react-router": "workspace:^",
"@tanstack/router-devtools": "workspace:^",
"@tanstack/start": "workspace:^",
"@tanstack/react-start": "workspace:^",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-tsr-config/app.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// app.config.ts
import { defineConfig } from '@tanstack/start/config'
import { defineConfig } from '@tanstack/react-start/config'

export default defineConfig({
tsr: {
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-tsr-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"@tanstack/react-router": "workspace:^",
"@tanstack/start": "workspace:^",
"@tanstack/react-start": "workspace:^",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"vinxi": "0.5.3"
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-tsr-config/src/app/client.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// <reference types="vinxi/types/client" />
import { hydrateRoot } from 'react-dom/client'
import { StartClient } from '@tanstack/start'
import { StartClient } from '@tanstack/react-start'
import { createRouter } from './router'

const router = createRouter()
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-tsr-config/src/app/routes/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createFileRoute, useRouter } from '@tanstack/react-router'
import { createServerFn } from '@tanstack/start'
import { createServerFn } from '@tanstack/react-start'

let count = 0

Expand Down
4 changes: 2 additions & 2 deletions e2e/start/basic-tsr-config/src/app/ssr.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import {
createStartHandler,
defaultStreamHandler,
} from '@tanstack/start/server'
import { getRouterManifest } from '@tanstack/start/router-manifest'
} from '@tanstack/react-start/server'
import { getRouterManifest } from '@tanstack/react-start/router-manifest'

import { createRouter } from './router'

Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic/app.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defineConfig } from '@tanstack/start/config'
import { defineConfig } from '@tanstack/react-start/config'
import tsConfigPaths from 'vite-tsconfig-paths'

export default defineConfig({
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic/app/api.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
createStartAPIHandler,
defaultAPIFileRouteHandler,
} from '@tanstack/start/api'
} from '@tanstack/react-start/api'

export default createStartAPIHandler(defaultAPIFileRouteHandler)
2 changes: 1 addition & 1 deletion e2e/start/basic/app/client.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// <reference types="vinxi/types/client" />
import { hydrateRoot } from 'react-dom/client'
import { StartClient } from '@tanstack/start'
import { StartClient } from '@tanstack/react-start'
import { createRouter } from './router'

const router = createRouter()
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic/app/components/RedirectOnClick.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useServerFn } from '@tanstack/start'
import { useServerFn } from '@tanstack/react-start'
import { throwRedirect } from './throwRedirect'

interface RedirectOnClickProps {
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic/app/components/throwRedirect.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { redirect } from '@tanstack/react-router'
import { createServerFn } from '@tanstack/start'
import { createServerFn } from '@tanstack/react-start'

export const throwRedirect = createServerFn()
.validator(
Expand Down
4 changes: 2 additions & 2 deletions e2e/start/basic/app/routes/api.users.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { json } from '@tanstack/start'
import { createAPIFileRoute } from '@tanstack/start/api'
import { json } from '@tanstack/react-start'
import { createAPIFileRoute } from '@tanstack/react-start/api'
import axios from 'redaxios'

import type { User } from '~/utils/users'
Expand Down
4 changes: 2 additions & 2 deletions e2e/start/basic/app/routes/api/users.$id.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { json } from '@tanstack/start'
import { createAPIFileRoute } from '@tanstack/start/api'
import { json } from '@tanstack/react-start'
import { createAPIFileRoute } from '@tanstack/react-start/api'
import axios from 'redaxios'

import type { User } from '~/utils/users'
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic/app/routes/deferred.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Await, createFileRoute } from '@tanstack/react-router'
import { createServerFn } from '@tanstack/start'
import { createServerFn } from '@tanstack/react-start'
import { Suspense, useState } from 'react'

const personServerFn = createServerFn({ method: 'GET' })
Expand Down
4 changes: 2 additions & 2 deletions e2e/start/basic/app/ssr.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {
createStartHandler,
defaultStreamHandler,
} from '@tanstack/start/server'
import { getRouterManifest } from '@tanstack/start/router-manifest'
} from '@tanstack/react-start/server'
import { getRouterManifest } from '@tanstack/react-start/router-manifest'

import { createRouter } from './router'

Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic/app/utils/posts.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { notFound } from '@tanstack/react-router'
import { createServerFn } from '@tanstack/start'
import { createServerFn } from '@tanstack/react-start'
import axios from 'redaxios'

export type PostType = {
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@tanstack/react-router": "workspace:^",
"@tanstack/router-devtools": "workspace:^",
"@tanstack/start": "workspace:^",
"@tanstack/react-start": "workspace:^",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"redaxios": "^0.5.1",
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/clerk-basic/app.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defineConfig } from '@tanstack/start/config'
import { defineConfig } from '@tanstack/react-start/config'
import tsConfigPaths from 'vite-tsconfig-paths'

export default defineConfig({
Expand Down
Loading
Loading