fix: various fixes (#5215)

schiller-manuel · autofix-ci[bot] · web-flow · commit e4d5671ba945 · 2025-09-24T21:42:56.000+02:00
Co-authored-by: autofix-ci[bot] &lt;114827586+autofix-ci[bot]@users.noreply.github.com&gt;
diff --git a/docs/router/integrations/query.md b/docs/router/integrations/query.md
@@ -18,13 +18,13 @@ title: TanStack Query Integration
 The TanStack query integration is a separate package that you need to install:
 
 ```sh
-npm install -D @tanstack/react-router-ssr-query
+npm install @tanstack/react-router-ssr-query
 # or
-pnpm add -D @tanstack/react-router-ssr-query
+pnpm add @tanstack/react-router-ssr-query
 # or
-yarn add -D @tanstack/react-router-ssr-query
+yarn add @tanstack/react-router-ssr-query
 # or
-bun add -D @tanstack/react-router-ssr-query
+bun add @tanstack/react-router-ssr-query
 ```
 
 ## Setup
@@ -38,7 +38,7 @@ import { createRouter } from '@tanstack/react-router'
 import { setupRouterSsrQueryIntegration } from '@tanstack/react-router-ssr-query'
 import { routeTree } from './routeTree.gen'
 
-export function createAppRouter() {
+export function getRouter() {
   const queryClient = new QueryClient()
   const router = createRouter({
     routeTree,
diff --git a/docs/start/framework/react/authentication.md b/docs/start/framework/react/authentication.md
@@ -47,7 +47,7 @@ import { redirect } from '@tanstack/react-router'
 
 // Login server function
 export const loginFn = createServerFn({ method: 'POST' })
-  .validator((data: { email: string; password: string }) => data)
+  .inputValidator((data: { email: string; password: string }) => data)
   .handler(async ({ data }) => {
     // Verify credentials (replace with your auth logic)
     const user = await authenticateUser(data.email, data.password)
@@ -218,7 +218,9 @@ import { createServerFn } from '@tanstack/react-start'
 
 // User registration
 export const registerFn = createServerFn({ method: 'POST' })
-  .validator((data: { email: string; password: string; name: string }) => data)
+  .inputValidator(
+    (data: { email: string; password: string; name: string }) => data,
+  )
   .handler(async ({ data }) => {
     // Check if user exists
     const existingUser = await getUserByEmail(data.email)
@@ -300,7 +302,7 @@ export const authProviders = {
 }
 
 export const initiateOAuthFn = createServerFn({ method: 'POST' })
-  .validator((data: { provider: 'google' | 'github' }) => data)
+  .inputValidator((data: { provider: 'google' | 'github' }) => data)
   .handler(async ({ data }) => {
     const provider = authProviders[data.provider]
     const state = generateRandomState()
@@ -321,7 +323,7 @@ export const initiateOAuthFn = createServerFn({ method: 'POST' })
 ```tsx
 // Password reset request
 export const requestPasswordResetFn = createServerFn({ method: 'POST' })
-  .validator((data: { email: string }) => data)
+  .inputValidator((data: { email: string }) => data)
   .handler(async ({ data }) => {
     const user = await getUserByEmail(data.email)
     if (!user) {
@@ -340,7 +342,7 @@ export const requestPasswordResetFn = createServerFn({ method: 'POST' })
 
 // Password reset confirmation
 export const resetPasswordFn = createServerFn({ method: 'POST' })
-  .validator((data: { token: string; newPassword: string }) => data)
+  .inputValidator((data: { token: string; newPassword: string }) => data)
   .handler(async ({ data }) => {
     const resetToken = await getPasswordResetToken(data.token)
 
@@ -421,7 +423,7 @@ const loginSchema = z.object({
 })
 
 export const loginFn = createServerFn({ method: 'POST' })
-  .validator((data) => loginSchema.parse(data))
+  .inputValidator((data) => loginSchema.parse(data))
   .handler(async ({ data }) => {
     // data is now validated
   })
@@ -517,7 +519,7 @@ function LoginForm() {
 
 ```tsx
 export const loginFn = createServerFn({ method: 'POST' })
-  .validator(
+  .inputValidator(
     (data: { email: string; password: string; rememberMe?: boolean }) => data,
   )
   .handler(async ({ data }) => {
diff --git a/docs/start/framework/react/observability.md b/docs/start/framework/react/observability.md
@@ -61,7 +61,7 @@ Add logging to your server functions to track execution, performance, and errors
 import { createServerFn } from '@tanstack/react-start'
 
 const getUser = createServerFn({ method: 'GET' })
-  .validator((id: string) => id)
+  .inputValidator((id: string) => id)
   .handler(async ({ data: id }) => {
     const startTime = Date.now()
 
@@ -518,7 +518,7 @@ import { trace, SpanStatusCode } from '@opentelemetry/api'
 const tracer = trace.getTracer('tanstack-start')
 
 const getUserWithTracing = createServerFn({ method: 'GET' })
-  .validator((id: string) => id)
+  .inputValidator((id: string) => id)
   .handler(async ({ data: id }) => {
     return tracer.startActiveSpan('get-user', async (span) => {
       span.setAttributes({
diff --git a/packages/react-start/src/default-entry/server.ts b/packages/react-start/src/default-entry/server.ts
@@ -2,14 +2,13 @@ import {
   createStartHandler,
   defaultStreamHandler,
 } from '@tanstack/react-start/server'
-import type { Register } from '@tanstack/react-start'
+import type { Register } from '@tanstack/react-router'
 import type { RequestHandler } from '@tanstack/react-start/server'
 
 const fetch = createStartHandler(defaultStreamHandler)
 
 export default {
   // Providing `RequestHandler` from `@tanstack/react-start/server` is required so that the output types don't import it from `@tanstack/start-server-core`
-
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
   fetch: fetch as RequestHandler<Register>,
 }
diff --git a/packages/react-start/src/default-entry/start.ts b/packages/react-start/src/default-entry/start.ts
@@ -1 +1 @@
-export default {}
+export const startInstance = undefined
diff --git a/packages/react-start/vite.config.server-entry.ts b/packages/react-start/vite.config.server-entry.ts
@@ -4,7 +4,7 @@ export default tanstackViteConfig({
   srcDir: './src/default-entry',
   exclude: ['./src/default-entry/client.tsx'],
   entry: ['./src/default-entry/server.ts'],
-  externalDeps: ['@tanstack/react-start/server', '#tanstack-start-entry'],
+  externalDeps: ['@tanstack/react-start/server'],
   outDir: './dist/default-entry',
   cjs: false,
 })
diff --git a/packages/router-plugin/src/core/code-splitter/compilers.ts b/packages/router-plugin/src/core/code-splitter/compilers.ts
@@ -169,7 +169,7 @@ export function compileCodeSplitReferenceRoute(
                     (prop) => {
                       if (t.isObjectProperty(prop)) {
                         if (t.isIdentifier(prop.key)) {
-                          if (opts.deleteNodes?.has(prop.key.name as any)) {
+                          if (opts.deleteNodes!.has(prop.key.name as any)) {
                             return false
                           }
                         }
diff --git a/packages/router-plugin/src/core/router-code-splitter-plugin.ts b/packages/router-plugin/src/core/router-code-splitter-plugin.ts
@@ -131,7 +131,9 @@ export const unpluginRouterCodeSplitterFactory: UnpluginFactory<
       targetFramework: userConfig.target,
       filename: id,
       id,
-      deleteNodes: new Set(userConfig.codeSplittingOptions?.deleteNodes),
+      deleteNodes: userConfig.codeSplittingOptions?.deleteNodes
+        ? new Set(userConfig.codeSplittingOptions.deleteNodes)
+        : undefined,
       addHmr:
         (userConfig.codeSplittingOptions?.addHmr ?? true) && !isProduction,
     })
diff --git a/packages/solid-start/src/default-entry/server.ts b/packages/solid-start/src/default-entry/server.ts
@@ -9,6 +9,6 @@ const fetch = createStartHandler(defaultStreamHandler)
 
 export default {
   // Providing `RequestHandler` from `@tanstack/solid-start/server` is required so that the output types don't import it from `@tanstack/start-server-core`
-
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
   fetch: fetch as RequestHandler<Register>,
 }
diff --git a/packages/solid-start/src/default-entry/start.ts b/packages/solid-start/src/default-entry/start.ts
@@ -1 +1 @@
-export default {}
+export const startInstance = undefined
diff --git a/packages/solid-start/vite.config.server-entry.ts b/packages/solid-start/vite.config.server-entry.ts
@@ -4,7 +4,7 @@ export default tanstackViteConfig({
   srcDir: './src/default-entry',
   exclude: ['./src/default-entry/client.tsx'],
   entry: ['./src/default-entry/server.ts'],
-  externalDeps: ['@tanstack/solid-start/server', '#tanstack-start-entry'],
+  externalDeps: ['@tanstack/solid-start/server'],
   outDir: './dist/default-entry',
   cjs: false,
 })
diff --git a/packages/start-client-core/src/client/hydrateStart.ts b/packages/start-client-core/src/client/hydrateStart.ts
@@ -3,15 +3,15 @@ import { hydrate } from '@tanstack/router-core/ssr/client'
 import { ServerFunctionSerializationAdapter } from './ServerFunctionSerializationAdapter'
 import type { AnyStartInstanceOptions } from '../createStart'
 import type { AnyRouter, AnySerializationAdapter } from '@tanstack/router-core'
-import * as startEntry from '#tanstack-start-entry'
+import { startInstance } from '#tanstack-start-entry'
 import { getRouter } from '#tanstack-router-entry'
 
 export async function hydrateStart(): Promise<AnyRouter> {
   const router = await getRouter()
 
   let serializationAdapters: Array<AnySerializationAdapter>
-  if (startEntry.startInstance) {
-    const startOptions = await startEntry.startInstance.getOptions()
+  if (startInstance) {
+    const startOptions = await startInstance.getOptions()
     startOptions.serializationAdapters =
       startOptions.serializationAdapters ?? []
     window.__TSS_START_OPTIONS__ = startOptions as AnyStartInstanceOptions
diff --git a/packages/start-plugin-core/package.json b/packages/start-plugin-core/package.json
@@ -64,6 +64,7 @@
     "@babel/code-frame": "7.26.2",
     "@babel/core": "^7.26.8",
     "@babel/types": "^7.26.8",
+    "@rolldown/pluginutils": "1.0.0-beta.40",
     "@tanstack/router-core": "workspace:*",
     "@tanstack/router-generator": "workspace:*",
     "@tanstack/router-plugin": "workspace:*",
diff --git a/packages/start-plugin-core/src/start-compiler-plugin/plugin.ts b/packages/start-plugin-core/src/start-compiler-plugin/plugin.ts
@@ -5,6 +5,7 @@ import { logDiff } from '@tanstack/router-utils'
 import { VIRTUAL_MODULES } from '@tanstack/start-server-core'
 import { normalizePath } from 'vite'
 import path from 'pathe'
+import { makeIdFiltersToMatchWithQuery } from '@rolldown/pluginutils'
 import { VITE_ENVIRONMENT_NAMES } from '../constants'
 import { compileStartOutputFactory } from './compilers'
 import { transformFuncs } from './constants'
@@ -27,7 +28,6 @@ const require = createRequire(import.meta.url)
 function resolveRuntimeFiles(opts: { package: string; files: Array<string> }) {
   const pkgRoot = resolvePackage(opts.package)
   const basePath = path.join(pkgRoot, 'dist', 'esm')
-
   return opts.files.map((file) => normalizePath(path.join(basePath, file)))
 }
 
@@ -60,29 +60,25 @@ export function startCompilerPlugin(
             // we do not want to include them in the transformation
             // however, those packages (especially start-client-core ATM) also USE these functions
             // (namely `createIsomorphicFn` in `packages/start-client-core/src/getRouterInstance.ts`) and thus need to be transformed
-            ...resolveRuntimeFiles({
-              package: '@tanstack/start-client-core',
-              files: [
-                'index.js',
-                'createIsomorphicFn.js',
-                'envOnly.js',
-                'createServerFn.js',
-                'createMiddleware.js',
-                'serverFnFetcher.js',
-              ],
-            }),
-            ...resolveRuntimeFiles({
-              package: '@tanstack/start-server-core',
-              files: [
-                'index.js',
-                'server-functions-handler.js',
-                'serverRoute.js',
-              ],
-            }),
-            ...resolveRuntimeFiles({
-              package: `@tanstack/${framework}-start-client`,
-              files: ['index.js'],
-            }),
+            ...makeIdFiltersToMatchWithQuery([
+              ...resolveRuntimeFiles({
+                package: '@tanstack/start-client-core',
+                files: [
+                  'index.js',
+                  'createIsomorphicFn.js',
+                  'envOnly.js',
+                  'serverFnFetcher.js',
+                ],
+              }),
+              ...resolveRuntimeFiles({
+                package: '@tanstack/start-server-core',
+                files: ['index.js', 'server-functions-handler.js'],
+              }),
+              ...resolveRuntimeFiles({
+                package: `@tanstack/${framework}-start-client`,
+                files: ['index.js'],
+              }),
+            ]),
           ],
         },
       },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export default {}`
	`1`	`+export const startInstance = undefined`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ export function compileCodeSplitReferenceRoute(`
`169`	`169`	`(prop) => {`
`170`	`170`	`if (t.isObjectProperty(prop)) {`
`171`	`171`	`if (t.isIdentifier(prop.key)) {`
`172`		`- if (opts.deleteNodes?.has(prop.key.name as any)) {`
	`172`	`+ if (opts.deleteNodes!.has(prop.key.name as any)) {`
`173`	`173`	`return false`
`174`	`174`	`}`
`175`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ const fetch = createStartHandler(defaultStreamHandler)`
`9`	`9`
`10`	`10`	`export default {`
`11`	`11`	// Providing `RequestHandler` from `@tanstack/solid-start/server` is required so that the output types don't import it from `@tanstack/start-server-core`
`12`		`-`
	`12`	`+ // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion`
`13`	`13`	`fetch: fetch as RequestHandler<Register>,`
`14`	`14`	`}`