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

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/src/start-server-routes-plugin/plugin.ts

@@ -244,7 +244,9 @@ async function generator(config: Config, root: string) {
       removeUnderscores(removeLayoutSegments(node.path)) ?? '',
     )
 
-    const routeCode = fs.readFileSync(node.fullPath, 'utf-8')
+    const routeCode = node.fullPath
+      ? fs.readFileSync(node.fullPath, 'utf-8')
+      : ''
 
     // Ensure the boilerplate for the route exists, which can be skipped for virtual parent routes and virtual routes
     if (!node.isVirtualParentRoute && !node.isVirtual) {
@@ -682,7 +684,13 @@ function buildStartDeclarationFile({
 }: {
   serverRoutesRelativePath: string
 }) {
-  return [`import '${serverRoutesRelativePath}'`].join('\n') + '\n'
+  const serverRoutesPath = replaceBackslash(serverRoutesRelativePath)
+  return (
+    [
+      '/// <reference types="vite/client" />',
+      `import '${serverRoutesPath}'`,
+    ].join('\n') + '\n'
+  )
 }
 
 function removeGroups(s: string) {