fix: change plugin config (#5012)

Author: schiller-manuel

docs/start/framework/react/migrate-from-next-js.md

@@ -100,7 +100,7 @@ export default defineConfig({
     // Enables Vite to resolve imports using path aliases.
     tsconfigPaths(),
     tanstackStart({
-      tsr: {
+      router: {
         // Specifies the directory TanStack Router uses for your routes.
         routesDirectory: 'src/app', // Defaults to "src/routes"
       },

e2e/react-start/basic-tsr-config/vite.config.ts

@@ -7,9 +7,7 @@ export default defineConfig({
   },
   plugins: [
     tanstackStart({
-      tsr: {
-        srcDirectory: './src/app',
-      },
+      srcDirectory: './src/app',
     }),
   ],
 })

e2e/react-start/basic/vite.config.ts

@@ -11,7 +11,7 @@ export default defineConfig({
     tsConfigPaths({
       projects: ['./tsconfig.json'],
     }),
-    tanstackStart({ tsr: { verboseFileRoutes: false } }),
+    tanstackStart({ router: { verboseFileRoutes: false } }),
     viteReact(),
   ],
 })

e2e/react-start/virtual-routes/vite.config.ts

@@ -11,7 +11,7 @@ export default defineConfig({
       projects: ['./tsconfig.json'],
     }),
     tanstackStart({
-      tsr: {
+      router: {
         virtualRouteConfig: './routes.ts',
       },
     }),

e2e/solid-start/basic-tsr-config/vite.config.ts

@@ -12,9 +12,7 @@ export default defineConfig({
       projects: ['./tsconfig.json'],
     }),
     tanstackStart({
-      tsr: {
-        srcDirectory: './src/app',
-      },
+      srcDirectory: './src/app',
     }),
     viteSolid({ ssr: true }),
   ],

packages/start-plugin-core/src/plugin.ts

@@ -56,7 +56,7 @@ export function TanStackStartVitePluginCore(
 
   return [
     tanStackStartRouter({
-      ...startConfig.tsr,
+      ...startConfig.router,
       target: corePluginOpts.framework,
       autoCodeSplitting: true,
     }),
@@ -67,7 +67,7 @@ export function TanStackStartVitePluginCore(
         globalThis.TSS_APP_BASE = viteAppBase
 
         const root = viteConfig.root || process.cwd()
-        const resolvedSrcDirectory = join(root, startConfig.tsr.srcDirectory)
+        const resolvedSrcDirectory = join(root, startConfig.srcDirectory)
 
         const routerFilePath = resolveEntry({
           type: 'router entry',

packages/start-plugin-core/src/schema.ts

@@ -2,35 +2,28 @@ import path from 'node:path'
 import { z } from 'zod'
 import { configSchema, getConfig } from '@tanstack/router-generator'
 
-const tsrConfig = configSchema
-  .omit({ autoCodeSplitting: true })
-  .partial()
-  .extend({
-    // this is relative to vite root
-    // TODO why is this nested under tsr?
-    srcDirectory: z.string().optional().default('src'),
-  })
+const tsrConfig = configSchema.omit({ autoCodeSplitting: true }).partial()
 
 export function parseStartConfig(
   opts?: z.input<typeof tanstackStartOptionsSchema>,
 ) {
   const options = tanstackStartOptionsSchema.parse(opts)
 
-  const srcDirectory = options.tsr.srcDirectory
+  const srcDirectory = options.srcDirectory
 
   const routesDirectory =
-    options.tsr.routesDirectory ?? path.join(srcDirectory, 'routes')
+    options.router.routesDirectory ?? path.join(srcDirectory, 'routes')
 
   const generatedRouteTree =
-    options.tsr.generatedRouteTree ??
+    options.router.generatedRouteTree ??
     path.join(srcDirectory, 'routeTree.gen.ts')
 
   return {
     ...options,
-    tsr: {
-      ...options.tsr,
+    router: {
+      ...options.router,
       ...getConfig({
-        ...options.tsr,
+        ...options.router,
         routesDirectory,
         generatedRouteTree,
       }),
@@ -121,12 +114,13 @@ const pageSchema = pageBaseSchema.extend({
 
 const tanstackStartOptionsSchema = z
   .object({
-    tsr: tsrConfig.optional().default({}),
+    srcDirectory: z.string().optional().default('src'),
     router: z
       .object({
-        // TODO naming?
+        // TODO this will move to 'start' once we have `createStart`
         entry: z.string().optional(),
       })
+      .and(tsrConfig.optional().default({}))
       .optional()
       .default({}),
     client: z