@tanstack/start-plugin-core 1.120.4-alpha.9 → 1.121.0-alpha.2

package/dist/esm/schema.js

@@ -1,7 +1,7 @@
 import path from "node:path";
 import { existsSync } from "node:fs";
 import { z } from "zod";
-import { getConfig, configSchema } from "@tanstack/router-generator";
+import { configSchema, getConfig } from "@tanstack/router-generator";
 const tsrConfig = configSchema.partial().extend({
   srcDirectory: z.string().optional().default("src")
 });
@@ -30,6 +30,12 @@ function createTanStackConfig(frameworkPlugin) {
         if (existsSync(path.join(srcDirectory, "server.tsx"))) {
           return path.join(srcDirectory, "server.tsx");
         }
+        if (existsSync(path.join(srcDirectory, "server.ts"))) {
+          return path.join(srcDirectory, "server.ts");
+        }
+        if (existsSync(path.join(srcDirectory, "server.js"))) {
+          return path.join(srcDirectory, "server.js");
+        }
         return "/~start/default-server-entry";
       })();
       return {
@@ -62,7 +68,7 @@ function createTanStackStartOptionsSchema(frameworkPlugin = {}) {
       entry: z.string().optional()
     }).optional().default({}),
     serverFns: z.object({
-      base: z.string().optional().default("/_server")
+      base: z.string().optional().default("/_serverFn")
     }).optional().default({}),
     public: z.object({
       dir: z.string().optional().default("public"),
@@ -77,7 +83,8 @@ function createTanStackStartOptionsSchema(frameworkPlugin = {}) {
       concurrency: z.number().optional(),
       filter: z.function().args(pageSchema).returns(z.any()).optional(),
       failOnError: z.boolean().optional()
-    }).and(pagePrerenderOptionsSchema.optional()).optional()
+    }).and(pagePrerenderOptionsSchema.optional()).optional(),
+    spa: spaSchema.optional()
   }).optional().default({});
 }
 const pageSitemapOptionsSchema = z.object({
@@ -114,6 +121,7 @@ const pageBaseSchema = z.object({
 });
 const pagePrerenderOptionsSchema = z.object({
   enabled: z.boolean().optional(),
+  outputPath: z.string().optional(),
   autoSubfolderIndex: z.boolean().optional(),
   crawlLinks: z.boolean().optional(),
   retryCount: z.number().optional(),
@@ -125,6 +133,17 @@ const pagePrerenderOptionsSchema = z.object({
     })
   ).returns(z.any()).optional()
 });
+const spaSchema = z.object({
+  enabled: z.boolean().optional().default(true),
+  maskPath: z.string().optional().default("/"),
+  prerender: pagePrerenderOptionsSchema.optional().default({}).transform((opts) => ({
+    outputPath: opts.outputPath ?? "/_shell",
+    crawlLinks: false,
+    retryCount: 0,
+    ...opts,
+    enabled: true
+  }))
+});
 const pageSchema = pageBaseSchema.extend({
   prerender: pagePrerenderOptionsSchema.optional()
 });

package/dist/esm/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sources":["../../src/schema.ts"],"sourcesContent":["import path from 'node:path'\nimport { existsSync } from 'node:fs'\nimport { z } from 'zod'\nimport { configSchema, getConfig } from '@tanstack/router-generator'\nimport type { NitroConfig } from 'nitropack'\n\nconst tsrConfig = configSchema.partial().extend({\n  srcDirectory: z.string().optional().default('src'),\n})\n\nexport function createTanStackConfig<\n  TFrameworkPlugin extends Record<string, unknown>,\n>(frameworkPlugin?: TFrameworkPlugin) {\n  const schema = createTanStackStartOptionsSchema(frameworkPlugin)\n\n  return {\n    schema,\n    parse: (opts?: z.input<typeof schema>) => {\n      const options = schema.parse(opts)\n\n      const srcDirectory = options.tsr.srcDirectory\n\n      const routesDirectory =\n        options.tsr.routesDirectory ?? path.join(srcDirectory, 'routes')\n\n      const generatedRouteTree =\n        options.tsr.generatedRouteTree ??\n        path.join(srcDirectory, 'routeTree.gen.ts')\n\n      const clientEntryPath = (() => {\n        if (options.client.entry) {\n          return path.join(srcDirectory, options.client.entry)\n        }\n\n        if (existsSync(path.join(srcDirectory, 'client.tsx'))) {\n          return path.join(srcDirectory, 'client.tsx')\n        }\n\n        return '/~start/default-client-entry'\n      })()\n\n      const serverEntryPath = (() => {\n        if (options.server.entry) {\n          return path.join(srcDirectory, options.server.entry)\n        }\n\n        if (existsSync(path.join(srcDirectory, 'server.tsx'))) {\n          return path.join(srcDirectory, 'server.tsx')\n        }\n\n        return '/~start/default-server-entry'\n      })()\n\n      return {\n        ...options,\n        tsr: {\n          ...options.tsr,\n          ...getConfig({\n            ...options.tsr,\n            routesDirectory,\n            generatedRouteTree,\n          }),\n        },\n        clientEntryPath,\n        serverEntryPath,\n      }\n    },\n  }\n}\n\nexport function createTanStackStartOptionsSchema(\n  frameworkPlugin: Record<string, unknown> = {},\n) {\n  return z\n    .object({\n      root: z.string().optional().default(process.cwd()),\n      target: z.custom<NitroConfig['preset']>().optional(),\n      ...frameworkPlugin,\n      tsr: tsrConfig.optional().default({}),\n      client: z\n        .object({\n          entry: z.string().optional(),\n          base: z.string().optional().default('/_build'),\n        })\n        .optional()\n        .default({}),\n      server: z\n        .object({\n          entry: z.string().optional(),\n        })\n        .optional()\n        .default({}),\n      serverFns: z\n        .object({\n          base: z.string().optional().default('/_server'),\n        })\n        .optional()\n        .default({}),\n      public: z\n        .object({\n          dir: z.string().optional().default('public'),\n          base: z.string().optional().default('/'),\n        })\n        .optional()\n        .default({}),\n      pages: z\n        .array(z.union([z.string(), pageSchema]))\n        .optional()\n        .default([]),\n      sitemap: pagePrerenderOptionsSchema\n        .extend({\n          host: z.string().optional(),\n        })\n        .optional(),\n      prerender: z\n        .object({\n          enabled: z.boolean().optional(),\n          concurrency: z.number().optional(),\n          filter: z.function().args(pageSchema).returns(z.any()).optional(),\n          failOnError: z.boolean().optional(),\n        })\n        .and(pagePrerenderOptionsSchema.optional())\n        .optional(),\n    })\n    .optional()\n    .default({})\n}\n\nconst pageSitemapOptionsSchema = z.object({\n  exclude: z.boolean().optional(),\n  priority: z.number().min(0).max(1).optional(),\n  changefreq: z\n    .enum(['always', 'hourly', 'daily', 'weekly', 'monthly', 'yearly', 'never'])\n    .optional(),\n  lastmod: z.union([z.string(), z.date()]).optional(),\n  alternateRefs: z\n    .array(\n      z.object({\n        href: z.string(),\n        hreflang: z.string(),\n      }),\n    )\n    .optional(),\n  images: z\n    .array(\n      z.object({\n        loc: z.string(),\n        caption: z.string().optional(),\n        title: z.string().optional(),\n      }),\n    )\n    .optional(),\n  news: z\n    .object({\n      publication: z.object({\n        name: z.string(),\n        language: z.string(),\n      }),\n      publicationDate: z.union([z.string(), z.date()]),\n      title: z.string(),\n    })\n    .optional(),\n})\n\nconst pageBaseSchema = z.object({\n  path: z.string(),\n  sitemap: pageSitemapOptionsSchema.optional(),\n  fromCrawl: z.boolean().optional(),\n})\n\nconst pagePrerenderOptionsSchema = z.object({\n  enabled: z.boolean().optional(),\n  autoSubfolderIndex: z.boolean().optional(),\n  crawlLinks: z.boolean().optional(),\n  retryCount: z.number().optional(),\n  retryDelay: z.number().optional(),\n  onSuccess: z\n    .function()\n    .args(\n      z.object({\n        page: pageBaseSchema,\n        html: z.string(),\n      }),\n    )\n    .returns(z.any())\n    .optional(),\n})\n\nexport const pageSchema = pageBaseSchema.extend({\n  prerender: pagePrerenderOptionsSchema.optional(),\n})\n\nexport type Page = z.infer<typeof pageSchema>\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.js","sources":["../../src/schema.ts"],"sourcesContent":["import path from 'node:path'\nimport { existsSync } from 'node:fs'\nimport { z } from 'zod'\nimport { configSchema, getConfig } from '@tanstack/router-generator'\nimport type { NitroConfig } from 'nitropack'\n\nconst tsrConfig = configSchema.partial().extend({\n  srcDirectory: z.string().optional().default('src'),\n})\n\nexport function createTanStackConfig<\n  TFrameworkPlugin extends Record<string, unknown>,\n>(frameworkPlugin?: TFrameworkPlugin) {\n  const schema = createTanStackStartOptionsSchema(frameworkPlugin)\n\n  return {\n    schema,\n    parse: (opts?: z.input<typeof schema>) => {\n      const options = schema.parse(opts)\n\n      const srcDirectory = options.tsr.srcDirectory\n\n      const routesDirectory =\n        options.tsr.routesDirectory ?? path.join(srcDirectory, 'routes')\n\n      const generatedRouteTree =\n        options.tsr.generatedRouteTree ??\n        path.join(srcDirectory, 'routeTree.gen.ts')\n\n      const clientEntryPath = (() => {\n        if (options.client.entry) {\n          return path.join(srcDirectory, options.client.entry)\n        }\n\n        if (existsSync(path.join(srcDirectory, 'client.tsx'))) {\n          return path.join(srcDirectory, 'client.tsx')\n        }\n\n        return '/~start/default-client-entry'\n      })()\n\n      const serverEntryPath = (() => {\n        if (options.server.entry) {\n          return path.join(srcDirectory, options.server.entry)\n        }\n\n        if (existsSync(path.join(srcDirectory, 'server.tsx'))) {\n          return path.join(srcDirectory, 'server.tsx')\n        }\n\n        if (existsSync(path.join(srcDirectory, 'server.ts'))) {\n          return path.join(srcDirectory, 'server.ts')\n        }\n\n        if (existsSync(path.join(srcDirectory, 'server.js'))) {\n          return path.join(srcDirectory, 'server.js')\n        }\n\n        return '/~start/default-server-entry'\n      })()\n\n      return {\n        ...options,\n        tsr: {\n          ...options.tsr,\n          ...getConfig({\n            ...options.tsr,\n            routesDirectory,\n            generatedRouteTree,\n          }),\n        },\n        clientEntryPath,\n        serverEntryPath,\n      }\n    },\n  }\n}\n\nexport function createTanStackStartOptionsSchema(\n  frameworkPlugin: Record<string, unknown> = {},\n) {\n  return z\n    .object({\n      root: z.string().optional().default(process.cwd()),\n      target: z.custom<NitroConfig['preset']>().optional(),\n      ...frameworkPlugin,\n      tsr: tsrConfig.optional().default({}),\n      client: z\n        .object({\n          entry: z.string().optional(),\n          base: z.string().optional().default('/_build'),\n        })\n        .optional()\n        .default({}),\n      server: z\n        .object({\n          entry: z.string().optional(),\n        })\n        .optional()\n        .default({}),\n      serverFns: z\n        .object({\n          base: z.string().optional().default('/_serverFn'),\n        })\n        .optional()\n        .default({}),\n      public: z\n        .object({\n          dir: z.string().optional().default('public'),\n          base: z.string().optional().default('/'),\n        })\n        .optional()\n        .default({}),\n      pages: z\n        .array(z.union([z.string(), pageSchema]))\n        .optional()\n        .default([]),\n      sitemap: pagePrerenderOptionsSchema\n        .extend({\n          host: z.string().optional(),\n        })\n        .optional(),\n      prerender: z\n        .object({\n          enabled: z.boolean().optional(),\n          concurrency: z.number().optional(),\n          filter: z.function().args(pageSchema).returns(z.any()).optional(),\n          failOnError: z.boolean().optional(),\n        })\n        .and(pagePrerenderOptionsSchema.optional())\n        .optional(),\n      spa: spaSchema.optional(),\n    })\n    .optional()\n    .default({})\n}\n\nconst pageSitemapOptionsSchema = z.object({\n  exclude: z.boolean().optional(),\n  priority: z.number().min(0).max(1).optional(),\n  changefreq: z\n    .enum(['always', 'hourly', 'daily', 'weekly', 'monthly', 'yearly', 'never'])\n    .optional(),\n  lastmod: z.union([z.string(), z.date()]).optional(),\n  alternateRefs: z\n    .array(\n      z.object({\n        href: z.string(),\n        hreflang: z.string(),\n      }),\n    )\n    .optional(),\n  images: z\n    .array(\n      z.object({\n        loc: z.string(),\n        caption: z.string().optional(),\n        title: z.string().optional(),\n      }),\n    )\n    .optional(),\n  news: z\n    .object({\n      publication: z.object({\n        name: z.string(),\n        language: z.string(),\n      }),\n      publicationDate: z.union([z.string(), z.date()]),\n      title: z.string(),\n    })\n    .optional(),\n})\n\nconst pageBaseSchema = z.object({\n  path: z.string(),\n  sitemap: pageSitemapOptionsSchema.optional(),\n  fromCrawl: z.boolean().optional(),\n})\n\nconst pagePrerenderOptionsSchema = z.object({\n  enabled: z.boolean().optional(),\n  outputPath: z.string().optional(),\n  autoSubfolderIndex: z.boolean().optional(),\n  crawlLinks: z.boolean().optional(),\n  retryCount: z.number().optional(),\n  retryDelay: z.number().optional(),\n  onSuccess: z\n    .function()\n    .args(\n      z.object({\n        page: pageBaseSchema,\n        html: z.string(),\n      }),\n    )\n    .returns(z.any())\n    .optional(),\n})\n\nconst spaSchema = z.object({\n  enabled: z.boolean().optional().default(true),\n  maskPath: z.string().optional().default('/'),\n  prerender: pagePrerenderOptionsSchema\n    .optional()\n    .default({})\n    .transform((opts) => ({\n      outputPath: opts.outputPath ?? '/_shell',\n      crawlLinks: false,\n      retryCount: 0,\n      ...opts,\n      enabled: true,\n    })),\n})\n\nexport const pageSchema = pageBaseSchema.extend({\n  prerender: pagePrerenderOptionsSchema.optional(),\n})\n\nexport type Page = z.infer<typeof pageSchema>\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-plugin-core",
-  "version": "1.120.4-alpha.9",
+  "version": "1.121.0-alpha.2",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -63,9 +63,11 @@
     "ufo": "^1.5.4",
     "xmlbuilder2": "^3.1.1",
     "zod": "^3.24.2",
-    "@tanstack/router-core": "^1.120.4-alpha.1",
-    "@tanstack/router-utils": "^1.120.4-alpha.1",
-    "@tanstack/router-generator": "^1.120.4-alpha.4"
+    "@tanstack/router-core": "^1.121.0-alpha.1",
+    "@tanstack/router-generator": "^1.121.0-alpha.1",
+    "@tanstack/router-plugin": "^1.121.0-alpha.2",
+    "@tanstack/router-utils": "^1.121.0-alpha.2",
+    "@tanstack/server-functions-plugin": "^1.121.0-alpha.2"
   },
   "devDependencies": {
     "vite": "^6.0.0"

package/src/constants.ts

@@ -0,0 +1,6 @@
+export const VITE_ENVIRONMENT_NAMES = {
+  // 'ssr' is chosen as the name for the server environment to ensure backwards compatibility
+  // with vite plugins that are not compatible with the new vite environment API (e.g. tailwindcss)
+  server: 'ssr',
+  client: 'client',
+} as const

package/src/index.ts

@@ -1,10 +1,3 @@
-export type { CompileOptions, IdentifierConfig } from './compilers'
-
-export { compileStartOutputFactory } from './compilers'
-
-export type { PagesJson } from './nitro/build-sitemap'
-export { buildSitemap } from './nitro/build-sitemap'
-
 export {
   createTanStackConfig,
   createTanStackStartOptionsSchema,
@@ -12,4 +5,3 @@ export {
 } from './schema'
 
 export { TanStackStartVitePluginCore } from './plugin'
-export { TanStackStartServerRoutesVite } from './start-server-routes-plugin/plugin'

package/src/nitro/dev-server-plugin.ts

@@ -1,7 +1,8 @@
 import { createEvent, getHeader, sendWebResponse } from 'h3'
 import { isRunnableDevEnvironment } from 'vite'
 import { extractHtmlScripts } from '../extractHtmlScripts'
-import type { Connect, Plugin, ViteDevServer } from 'vite'
+import { VITE_ENVIRONMENT_NAMES } from '../constants'
+import type { Connect, DevEnvironment, Plugin, ViteDevServer } from 'vite'
 
 declare global {
   // eslint-disable-next-line no-var
@@ -30,11 +31,20 @@ export function devServerPlugin(): Plugin {
         let cachedScripts: string | undefined
         viteDevServer.middlewares.use(async (req, res) => {
           const event = createEvent(req, res)
-          const serverEnv = viteDevServer.environments['server']
+          const serverEnv = viteDevServer.environments[
+            VITE_ENVIRONMENT_NAMES.server
+          ] as DevEnvironment | undefined
 
           try {
-            if (!serverEnv || !isRunnableDevEnvironment(serverEnv)) {
-              throw new Error('Server environment not found')
+            if (!serverEnv) {
+              throw new Error(
+                `Server environment ${VITE_ENVIRONMENT_NAMES.server} not found`,
+              )
+            }
+            if (!isRunnableDevEnvironment(serverEnv)) {
+              throw new Error(
+                `Expected server environment ${VITE_ENVIRONMENT_NAMES.server} to be a RunnableDevEnvironment. This can be caused by multiple vite versions being installed in the project.`,
+              )
             }
             if (cachedScripts === undefined) {
               const templateHtml = `<html><head></head><body></body></html>`

package/src/nitro/nitro-plugin.ts

@@ -4,6 +4,7 @@ import { build, createNitro } from 'nitropack'
 import { dirname, resolve } from 'pathe'
 import { clientDistDir, ssrEntryFile } from '../plugin'
 import { prerender } from '../prerender'
+import { VITE_ENVIRONMENT_NAMES } from '../constants'
 import { devServerPlugin } from './dev-server-plugin'
 import { buildNitroEnvironment } from './build-nitro'
 import type { EnvironmentOptions, PluginOption, Rollup } from 'vite'
@@ -22,7 +23,7 @@ export function nitroPlugin(
     {
       name: 'tanstack-vite-plugin-nitro',
       configEnvironment(name) {
-        if (name === 'server') {
+        if (name === VITE_ENVIRONMENT_NAMES.server) {
           return {
             build: {
               commonjsOptions: {
@@ -44,8 +45,10 @@ export function nitroPlugin(
           builder: {
             sharedPlugins: true,
             async buildApp(builder) {
-              const clientEnv = builder.environments['client']
-              const serverEnv = builder.environments['server']
+              const clientEnv =
+                builder.environments[VITE_ENVIRONMENT_NAMES.client]
+              const serverEnv =
+                builder.environments[VITE_ENVIRONMENT_NAMES.server]
 
               if (!clientEnv) {
                 throw new Error('Client environment not found')
@@ -86,7 +89,42 @@ export function nitroPlugin(
 
               await buildNitroEnvironment(nitro, () => build(nitro))
 
-              if (options.prerender?.enabled) {
+              // If the user has not set a prerender option, we need to set it to true
+              // if the pages array is not empty and has sub options requiring for prerendering
+              if (options.prerender?.enabled !== false) {
+                options.prerender = {
+                  ...options.prerender,
+                  enabled: options.pages.some((d) =>
+                    typeof d === 'string' ? false : !!d.prerender?.enabled,
+                  ),
+                }
+              }
+
+              // Setup the options for prerendering the SPA shell (i.e `src/routes/__root.tsx`)
+              if (options.spa?.enabled) {
+                options.prerender = {
+                  ...options.prerender,
+                  enabled: true,
+                }
+
+                const maskUrl = new URL(
+                  options.spa.maskPath,
+                  'http://localhost',
+                )
+
+                maskUrl.searchParams.set('__TSS_SHELL', 'true')
+
+                options.pages.push({
+                  path: maskUrl.toString().replace('http://localhost', ''),
+                  prerender: options.spa.prerender,
+                  sitemap: {
+                    exclude: true,
+                  },
+                })
+              }
+
+              // Start prerendering!!!
+              if (options.prerender.enabled) {
                 await prerender({
                   options,
                   nitro,

package/src/plugin.ts

@@ -1,5 +1,8 @@
 import path from 'node:path'
 import { createNitro } from 'nitropack'
+import { tanstackRouter } from '@tanstack/router-plugin/vite'
+import { TanStackServerFnPluginEnv } from '@tanstack/server-functions-plugin'
+import * as vite from 'vite'
 import {
   createTanStackConfig,
   createTanStackStartOptionsSchema,
@@ -7,6 +10,8 @@ import {
 import { nitroPlugin } from './nitro/nitro-plugin'
 import { startManifestPlugin } from './routesManifestPlugin'
 import { TanStackStartCompilerPlugin } from './start-compiler-plugin'
+import { VITE_ENVIRONMENT_NAMES } from './constants'
+import { TanStackStartServerRoutesVite } from './start-server-routes-plugin/plugin'
 import type { PluginOption, Rollup } from 'vite'
 import type { z } from 'zod'
 import type { CompileStartFrameworkOptions } from './compilers'
@@ -28,21 +33,31 @@ export type TanStackStartOutputConfig = ReturnType<
 export const clientDistDir = '.tanstack-start/build/client-dist'
 export const ssrEntryFile = 'ssr.mjs'
 
+export interface TanStackStartVitePluginCoreOptions {
+  framework: CompileStartFrameworkOptions
+}
 // this needs to live outside of the TanStackStartVitePluginCore since it will be invoked multiple times by vite
 let ssrBundle: Rollup.OutputBundle
 
 export function TanStackStartVitePluginCore(
-  framework: CompileStartFrameworkOptions,
-  opts: TanStackStartOutputConfig,
+  opts: TanStackStartVitePluginCoreOptions,
+  startConfig: TanStackStartOutputConfig,
 ): Array<PluginOption> {
   return [
+    tanstackRouter({
+      verboseFileRoutes: false,
+      ...startConfig.tsr,
+      target: opts.framework,
+      enableRouteGeneration: true,
+      autoCodeSplitting: true,
+    }),
     {
       name: 'tanstack-start-core:config-client',
       async config() {
         const nitroOutputPublicDir = await (async () => {
           // Create a dummy nitro app to get the resolved public output path
           const dummyNitroApp = await createNitro({
-            preset: opts.target,
+            preset: startConfig.target,
             compatibilityDate: '2024-12-01',
           })
 
@@ -52,25 +67,41 @@ export function TanStackStartVitePluginCore(
           return nitroOutputPublicDir
         })()
 
+        const getClientEntryPath = (startConfig: TanStackStartOutputConfig) => {
+          // when the user specifies a custom client entry path, we need to resolve it
+          // relative to the root of the project, keeping in mind that if not specified
+          // it will be /~start/default-client-entry which is a virtual path
+          // that is resolved by vite to the actual client entry path
+          const entry = startConfig.clientEntryPath.startsWith(
+            '/~start/default-client-entry',
+          )
+            ? startConfig.clientEntryPath
+            : vite.normalizePath(
+                path.resolve(startConfig.root, startConfig.clientEntryPath),
+              )
+
+          return entry
+        }
+
         return {
           environments: {
-            client: {
+            [VITE_ENVIRONMENT_NAMES.client]: {
               consumer: 'client',
               build: {
                 manifest: true,
                 rollupOptions: {
                   input: {
-                    main: opts.clientEntryPath,
+                    main: getClientEntryPath(startConfig),
                   },
                   output: {
-                    dir: path.resolve(opts.root, clientDistDir),
+                    dir: path.resolve(startConfig.root, clientDistDir),
                   },
                   // TODO this should be removed
                   external: ['node:fs', 'node:path', 'node:os', 'node:crypto'],
                 },
               },
             },
-            server: {
+            [VITE_ENVIRONMENT_NAMES.server]: {
               consumer: 'server',
               build: {
                 ssr: true,
@@ -115,22 +146,57 @@ export function TanStackStartVitePluginCore(
               'nitropack',
               '@tanstack/**',
             ],
-            external: ['undici'],
           },
           /* prettier-ignore */
           define: {
-            ...injectDefineEnv('TSS_PUBLIC_BASE', opts.public.base),
-            ...injectDefineEnv('TSS_CLIENT_BASE', opts.client.base),
-            ...injectDefineEnv('TSS_CLIENT_ENTRY', opts.clientEntryPath),
-            ...injectDefineEnv('TSS_SERVER_FN_BASE', opts.serverFns.base),
+            ...injectDefineEnv('TSS_PUBLIC_BASE', startConfig.public.base),
+            ...injectDefineEnv('TSS_CLIENT_BASE', startConfig.client.base),
+            ...injectDefineEnv('TSS_CLIENT_ENTRY', getClientEntryPath(startConfig)), // This is consumed by the router-manifest, where the entry point is imported after the dev refresh runtime is resolved
+            ...injectDefineEnv('TSS_SERVER_FN_BASE', startConfig.serverFns.base),
             ...injectDefineEnv('TSS_OUTPUT_PUBLIC_DIR', nitroOutputPublicDir),
           },
         }
       },
     },
-    TanStackStartCompilerPlugin(framework),
-    startManifestPlugin(opts),
-    nitroPlugin(opts, () => ssrBundle),
+    // N.B. TanStackStartCompilerPlugin must be before the TanStackServerFnPluginEnv
+    TanStackStartCompilerPlugin(opts.framework, {
+      client: { envName: VITE_ENVIRONMENT_NAMES.client },
+      server: { envName: VITE_ENVIRONMENT_NAMES.server },
+    }),
+    TanStackServerFnPluginEnv({
+      // This is the ID that will be available to look up and import
+      // our server function manifest and resolve its module
+      manifestVirtualImportId: 'tanstack:server-fn-manifest',
+      client: {
+        getRuntimeCode: () =>
+          `import { createClientRpc } from '@tanstack/${opts.framework}-start/server-functions-client'`,
+        replacer: (d) =>
+          `createClientRpc('${d.functionId}', '${startConfig.serverFns.base}')`,
+        envName: VITE_ENVIRONMENT_NAMES.client,
+      },
+      server: {
+        getRuntimeCode: () =>
+          `import { createServerRpc } from '@tanstack/${opts.framework}-start/server-functions-server'`,
+        replacer: (d) =>
+          `createServerRpc('${d.functionId}', '${startConfig.serverFns.base}', ${d.fn})`,
+        envName: VITE_ENVIRONMENT_NAMES.server,
+      },
+      importer: (fn) => {
+        const serverEnv = (globalThis as any).viteDevServer.environments[
+          VITE_ENVIRONMENT_NAMES.server
+        ]
+        if (!serverEnv) {
+          throw new Error(`'ssr' vite dev environment not found`)
+        }
+        return serverEnv.runner.import(fn.extractedFilename)
+      },
+    }),
+    startManifestPlugin(startConfig),
+    nitroPlugin(startConfig, () => ssrBundle),
+    TanStackStartServerRoutesVite({
+      ...startConfig.tsr,
+      target: opts.framework,
+    }),
   ]
 }
 

package/src/prerender.ts

@@ -6,6 +6,7 @@ import { build as buildNitro, createNitro } from 'nitropack'
 import { joinURL, withBase, withoutBase } from 'ufo'
 import { Queue } from './queue'
 import { buildNitroEnvironment } from './nitro/build-nitro'
+import { VITE_ENVIRONMENT_NAMES } from './constants'
 import type { ViteBuilder } from 'vite'
 import type { $Fetch, Nitro } from 'nitropack'
 import type { TanStackStartOutputConfig } from './plugin'
@@ -20,7 +21,7 @@ export async function prerender({
   nitro: Nitro
   builder: ViteBuilder
 }) {
-  nitro.logger.info('Prendering pages...')
+  console.info('Prendering pages...')
 
   // If prerender is enabled but no pages are provided, default to prerendering the root page
   if (options.prerender?.enabled && !options.pages.length) {
@@ -31,10 +32,12 @@ export async function prerender({
     ]
   }
 
-  const serverEnv = builder.environments['server']
+  const serverEnv = builder.environments[VITE_ENVIRONMENT_NAMES.server]
 
   if (!serverEnv) {
-    throw new Error(`Vite's "server" environment not found`)
+    throw new Error(
+      `Vite's "${VITE_ENVIRONMENT_NAMES.server}" environment not found`,
+    )
   }
 
   const prerenderOutputDir = path.resolve(
@@ -90,14 +93,14 @@ export async function prerender({
     // Crawl all pages
     const pages = await prerenderPages()
 
-    nitro.logger.info(`Prerendered ${pages.length} pages:`)
+    console.info(`Prerendered ${pages.length} pages:`)
     pages.forEach((page) => {
-      nitro.logger.info(`- ${page}`)
+      console.info(`- ${page}`)
     })
 
     // TODO: Write the prerendered pages to the output directory
   } catch (error) {
-    nitro.logger.error(error)
+    console.error(error)
   } finally {
     // Ensure server is always closed
     // server.process.kill()
@@ -123,7 +126,7 @@ export async function prerender({
     const seen = new Set<string>()
     const retriesByPath = new Map<string, number>()
     const concurrency = options.prerender?.concurrency ?? os.cpus().length
-    nitro.logger.info(`Concurrency: ${concurrency}`)
+    console.info(`Concurrency: ${concurrency}`)
     const queue = new Queue({ concurrency })
 
     options.pages.forEach((_page) => {
@@ -165,7 +168,7 @@ export async function prerender({
 
       // Add the task
       queue.add(async () => {
-        nitro.logger.info(`Crawling: ${page.path}`)
+        console.info(`Crawling: ${page.path}`)
         const retries = retriesByPath.get(page.path) || 0
         try {
           // Fetch the route
@@ -179,23 +182,29 @@ export async function prerender({
           )
 
           if (!res.ok) {
-            throw new Error(`Failed to fetch ${page.path}: ${res.statusText}`)
+            throw new Error(`Failed to fetch ${page.path}: ${res.statusText}`, {
+              cause: res,
+            })
           }
 
+          const cleanPagePath = (
+            prerenderOptions.outputPath || page.path
+          ).split(/[?#]/)[0]!
+
           // Guess route type and populate fileName
           const contentType = res.headers.get('content-type') || ''
           const isImplicitHTML =
-            !page.path.endsWith('.html') && contentType.includes('html')
+            !cleanPagePath.endsWith('.html') && contentType.includes('html')
           // &&
           // !JsonSigRx.test(dataBuff.subarray(0, 32).toString('utf8'))
-          const routeWithIndex = page.path.endsWith('/')
-            ? page.path + 'index'
-            : page.path
+          const routeWithIndex = cleanPagePath.endsWith('/')
+            ? cleanPagePath + 'index'
+            : cleanPagePath
 
           const htmlPath =
-            page.path.endsWith('/') || prerenderOptions.autoSubfolderIndex
-              ? joinURL(page.path, 'index.html')
-              : page.path + '.html'
+            cleanPagePath.endsWith('/') || prerenderOptions.autoSubfolderIndex
+              ? joinURL(cleanPagePath, 'index.html')
+              : cleanPagePath + '.html'
 
           const filename = withoutBase(
             isImplicitHTML ? htmlPath : routeWithIndex,
@@ -227,9 +236,7 @@ export async function prerender({
           }
         } catch (error) {
           if (retries < (prerenderOptions.retryCount ?? 0)) {
-            nitro.logger.warn(
-              `Encountered error, retrying: ${page.path} in 500ms`,
-            )
+            console.warn(`Encountered error, retrying: ${page.path} in 500ms`)
             await new Promise((resolve) =>
               setTimeout(resolve, prerenderOptions.retryDelay),
             )

package/src/schema.ts

@@ -48,6 +48,14 @@ export function createTanStackConfig<
           return path.join(srcDirectory, 'server.tsx')
         }
 
+        if (existsSync(path.join(srcDirectory, 'server.ts'))) {
+          return path.join(srcDirectory, 'server.ts')
+        }
+
+        if (existsSync(path.join(srcDirectory, 'server.js'))) {
+          return path.join(srcDirectory, 'server.js')
+        }
+
         return '/~start/default-server-entry'
       })()
 
@@ -92,7 +100,7 @@ export function createTanStackStartOptionsSchema(
         .default({}),
       serverFns: z
         .object({
-          base: z.string().optional().default('/_server'),
+          base: z.string().optional().default('/_serverFn'),
         })
         .optional()
         .default({}),
@@ -121,6 +129,7 @@ export function createTanStackStartOptionsSchema(
         })
         .and(pagePrerenderOptionsSchema.optional())
         .optional(),
+      spa: spaSchema.optional(),
     })
     .optional()
     .default({})
@@ -170,6 +179,7 @@ const pageBaseSchema = z.object({
 
 const pagePrerenderOptionsSchema = z.object({
   enabled: z.boolean().optional(),
+  outputPath: z.string().optional(),
   autoSubfolderIndex: z.boolean().optional(),
   crawlLinks: z.boolean().optional(),
   retryCount: z.number().optional(),
@@ -186,6 +196,21 @@ const pagePrerenderOptionsSchema = z.object({
     .optional(),
 })
 
+const spaSchema = z.object({
+  enabled: z.boolean().optional().default(true),
+  maskPath: z.string().optional().default('/'),
+  prerender: pagePrerenderOptionsSchema
+    .optional()
+    .default({})
+    .transform((opts) => ({
+      outputPath: opts.outputPath ?? '/_shell',
+      crawlLinks: false,
+      retryCount: 0,
+      ...opts,
+      enabled: true,
+    })),
+})
+
 export const pageSchema = pageBaseSchema.extend({
   prerender: pagePrerenderOptionsSchema.optional(),
 })

package/dist/cjs/nitro/build-sitemap.cjs

@@ -1,54 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const fs = require("node:fs");
-const path = require("node:path");
-const xmlbuilder2 = require("xmlbuilder2");
-async function buildSitemap({
-  host,
-  routes,
-  outputDir
-}) {
-  const routeList = await optionHasRoutes(routes);
-  if (routeList.length) {
-    const slash = checkSlash(host);
-    const sitemapData = routeList.map((page) => ({
-      page: `${host}${slash}${page.replace(/^\/+/g, "")}`,
-      lastMod: (/* @__PURE__ */ new Date()).toISOString().split("T")[0]
-    }));
-    const sitemap = createXml("urlset");
-    for (const item of sitemapData) {
-      const page = sitemap.ele("url");
-      page.ele("loc").txt(item.page);
-      page.ele("lastmod").txt(item.lastMod);
-    }
-    const mapPath = `${path.resolve(outputDir)}/sitemap.xml`;
-    try {
-      console.log(`Writing sitemap at ${mapPath}`);
-      fs.writeFileSync(mapPath, sitemap.end({ prettyPrint: true }));
-    } catch (e) {
-      console.error(`Unable to write file at ${mapPath}`, e);
-    }
-  }
-}
-function createXml(elementName) {
-  return xmlbuilder2.create({ version: "1.0", encoding: "UTF-8" }).ele(elementName, {
-    xmlns: "https://www.sitemaps.org/schemas/sitemap/0.9"
-  }).com(`This file was automatically generated by Analog.`);
-}
-function checkSlash(host) {
-  const finalChar = host.slice(-1);
-  return finalChar === "/" ? "" : "/";
-}
-async function optionHasRoutes(routes) {
-  let routeList;
-  if (typeof routes === "function") {
-    routeList = await routes();
-  } else if (Array.isArray(routes)) {
-    routeList = routes;
-  } else {
-    routeList = [];
-  }
-  return routeList.filter(Boolean);
-}
-exports.buildSitemap = buildSitemap;
-//# sourceMappingURL=build-sitemap.cjs.map