@tanstack/start-plugin-core 1.133.36 → 1.134.2

package/dist/esm/prerender.js

@@ -143,7 +143,17 @@ async function prerender({
           const contentType = res.headers.get("content-type") || "";
           const isImplicitHTML = !cleanPagePath.endsWith(".html") && contentType.includes("html");
           const routeWithIndex = cleanPagePath.endsWith("/") ? cleanPagePath + "index" : cleanPagePath;
-          const htmlPath = cleanPagePath.endsWith("/") || (prerenderOptions.autoSubfolderIndex ?? true) ? joinURL(cleanPagePath, "index.html") : cleanPagePath + ".html";
+          const isSpaShell = startConfig.spa?.prerender.outputPath === cleanPagePath;
+          let htmlPath;
+          if (isSpaShell) {
+            htmlPath = cleanPagePath + ".html";
+          } else {
+            if (cleanPagePath.endsWith("/") || (prerenderOptions.autoSubfolderIndex ?? true)) {
+              htmlPath = joinURL(cleanPagePath, "index.html");
+            } else {
+              htmlPath = cleanPagePath + ".html";
+            }
+          }
           const filename = withoutBase(
             isImplicitHTML ? htmlPath : routeWithIndex,
             routerBasePath

package/dist/esm/prerender.js.map

@@ -1 +1 @@
-{"version":3,"file":"prerender.js","sources":["../../src/prerender.ts"],"sourcesContent":["import { existsSync, promises as fsp, rmSync } from 'node:fs'\nimport { pathToFileURL } from 'node:url'\nimport os from 'node:os'\nimport path from 'pathe'\nimport { joinURL, withBase, withoutBase } from 'ufo'\nimport { VITE_ENVIRONMENT_NAMES } from './constants'\nimport { createLogger } from './utils'\nimport { Queue } from './queue'\nimport type { Rollup, ViteBuilder } from 'vite'\nimport type { Page, TanStackStartOutputConfig } from './schema'\n\nexport async function prerender({\n  startConfig,\n  builder,\n  serverBundle,\n}: {\n  startConfig: TanStackStartOutputConfig\n  builder: ViteBuilder\n  serverBundle: Rollup.OutputBundle\n}) {\n  const logger = createLogger('prerender')\n  logger.info('Prerendering pages...')\n\n  // If prerender is enabled\n  if (startConfig.prerender?.enabled) {\n    // default to root page if no pages are defined\n    let pages = startConfig.pages.length ? startConfig.pages : [{ path: '/' }]\n\n    if (startConfig.prerender.autoStaticPathsDiscovery ?? true) {\n      // merge discovered static pages with user-defined pages\n      const pagesMap = new Map(pages.map((item) => [item.path, item]))\n      const discoveredPages = globalThis.TSS_PRERENDABLE_PATHS || []\n\n      for (const page of discoveredPages) {\n        if (!pagesMap.has(page.path)) {\n          pagesMap.set(page.path, page)\n        }\n      }\n\n      pages = Array.from(pagesMap.values())\n    }\n\n    startConfig.pages = pages\n  }\n\n  const serverEnv = builder.environments[VITE_ENVIRONMENT_NAMES.server]\n\n  if (!serverEnv) {\n    throw new Error(\n      `Vite's \"${VITE_ENVIRONMENT_NAMES.server}\" environment not found`,\n    )\n  }\n\n  const clientEnv = builder.environments[VITE_ENVIRONMENT_NAMES.client]\n  if (!clientEnv) {\n    throw new Error(\n      `Vite's \"${VITE_ENVIRONMENT_NAMES.client}\" environment not found`,\n    )\n  }\n\n  const outputDir = clientEnv.config.build.outDir\n\n  const entryFile = findEntryFileInBundle(serverBundle)\n  let fullEntryFilePath = path.join(serverEnv.config.build.outDir, entryFile)\n  process.env.TSS_PRERENDERING = 'true'\n\n  if (!existsSync(fullEntryFilePath)) {\n    // if the file does not exist, we need to write the bundle to a temporary directory\n    // this can happen e.g. with nitro that postprocesses the bundle and thus does not write SSR build to disk\n    const bundleOutputDir = path.resolve(\n      serverEnv.config.root,\n      '.tanstack',\n      'start',\n      'prerender',\n    )\n    rmSync(bundleOutputDir, { recursive: true, force: true })\n    await writeBundleToDisk({ bundle: serverBundle, outDir: bundleOutputDir })\n    fullEntryFilePath = path.join(bundleOutputDir, entryFile)\n  }\n\n  const { default: serverEntrypoint } = await import(\n    pathToFileURL(fullEntryFilePath).toString()\n  )\n\n  const isRedirectResponse = (res: Response) => {\n    return res.status >= 300 && res.status < 400 && res.headers.get('location')\n  }\n  async function localFetch(\n    path: string,\n    options?: RequestInit,\n    maxRedirects: number = 5,\n  ): Promise<Response> {\n    const url = new URL(`http://localhost${path}`)\n    const response = await serverEntrypoint.fetch(new Request(url, options))\n\n    if (isRedirectResponse(response) && maxRedirects > 0) {\n      const location = response.headers.get('location')!\n      if (location.startsWith('http://localhost') || location.startsWith('/')) {\n        const newUrl = location.replace('http://localhost', '')\n        return localFetch(newUrl, options, maxRedirects - 1)\n      } else {\n        logger.warn(`Skipping redirect to external location: ${location}`)\n      }\n    }\n\n    return response\n  }\n\n  try {\n    // Crawl all pages\n    const pages = await prerenderPages({ outputDir })\n\n    logger.info(`Prerendered ${pages.length} pages:`)\n    pages.forEach((page) => {\n      logger.info(`- ${page}`)\n    })\n  } catch (error) {\n    logger.error(error)\n  }\n\n  function extractLinks(html: string): Array<string> {\n    const linkRegex = /<a[^>]+href=[\"']([^\"']+)[\"'][^>]*>/g\n    const links: Array<string> = []\n    let match\n\n    while ((match = linkRegex.exec(html)) !== null) {\n      const href = match[1]\n      if (href && (href.startsWith('/') || href.startsWith('./'))) {\n        links.push(href)\n      }\n    }\n\n    return links\n  }\n\n  async function prerenderPages({ outputDir }: { outputDir: string }) {\n    const seen = new Set<string>()\n    const prerendered = new Set<string>()\n    const retriesByPath = new Map<string, number>()\n    const concurrency = startConfig.prerender?.concurrency ?? os.cpus().length\n    logger.info(`Concurrency: ${concurrency}`)\n    const queue = new Queue({ concurrency })\n    const routerBasePath = joinURL('/', startConfig.router.basepath ?? '')\n\n    startConfig.pages.forEach((page) => addCrawlPageTask(page))\n\n    await queue.start()\n\n    return Array.from(prerendered)\n\n    function addCrawlPageTask(page: Page) {\n      // Was the page already seen?\n      if (seen.has(page.path)) return\n\n      // Add the page to the seen set\n      seen.add(page.path)\n\n      if (page.fromCrawl) {\n        startConfig.pages.push(page)\n      }\n\n      // If not enabled, skip\n      if (!(page.prerender?.enabled ?? true)) return\n\n      // If there is a filter link, check if the page should be prerendered\n      if (startConfig.prerender?.filter && !startConfig.prerender.filter(page))\n        return\n\n      // Resolve the merged default and page-specific prerender options\n      const prerenderOptions = {\n        ...startConfig.prerender,\n        ...page.prerender,\n      }\n\n      // Add the task\n      queue.add(async () => {\n        logger.info(`Crawling: ${page.path}`)\n        const retries = retriesByPath.get(page.path) || 0\n        try {\n          // Fetch the route\n          const encodedRoute = encodeURI(page.path)\n\n          const res = await localFetch(\n            withBase(encodedRoute, routerBasePath),\n            {\n              headers: {\n                ...(prerenderOptions.headers ?? {}),\n              },\n            },\n            prerenderOptions.maxRedirects,\n          )\n\n          if (!res.ok) {\n            if (isRedirectResponse(res)) {\n              logger.warn(`Max redirects reached for ${page.path}`)\n            }\n            throw new Error(`Failed to fetch ${page.path}: ${res.statusText}`, {\n              cause: res,\n            })\n          }\n\n          const cleanPagePath = (\n            prerenderOptions.outputPath || page.path\n          ).split(/[?#]/)[0]!\n\n          // Guess route type and populate fileName\n          const contentType = res.headers.get('content-type') || ''\n          const isImplicitHTML =\n            !cleanPagePath.endsWith('.html') && contentType.includes('html')\n          // &&\n          // !JsonSigRx.test(dataBuff.subarray(0, 32).toString('utf8'))\n          const routeWithIndex = cleanPagePath.endsWith('/')\n            ? cleanPagePath + 'index'\n            : cleanPagePath\n\n          const htmlPath =\n            cleanPagePath.endsWith('/') ||\n            (prerenderOptions.autoSubfolderIndex ?? true)\n              ? joinURL(cleanPagePath, 'index.html')\n              : cleanPagePath + '.html'\n\n          const filename = withoutBase(\n            isImplicitHTML ? htmlPath : routeWithIndex,\n            routerBasePath,\n          )\n\n          const html = await res.text()\n\n          const filepath = path.join(outputDir, filename)\n\n          await fsp.mkdir(path.dirname(filepath), {\n            recursive: true,\n          })\n\n          await fsp.writeFile(filepath, html)\n\n          prerendered.add(page.path)\n\n          const newPage = await prerenderOptions.onSuccess?.({ page, html })\n\n          if (newPage) {\n            Object.assign(page, newPage)\n          }\n\n          // Find new links\n          if (prerenderOptions.crawlLinks ?? true) {\n            const links = extractLinks(html)\n            for (const link of links) {\n              addCrawlPageTask({ path: link, fromCrawl: true })\n            }\n          }\n        } catch (error) {\n          if (retries < (prerenderOptions.retryCount ?? 0)) {\n            logger.warn(`Encountered error, retrying: ${page.path} in 500ms`)\n            await new Promise((resolve) =>\n              setTimeout(resolve, prerenderOptions.retryDelay),\n            )\n            retriesByPath.set(page.path, retries + 1)\n            addCrawlPageTask(page)\n          } else {\n            if (prerenderOptions.failOnError ?? true) {\n              throw error\n            }\n          }\n        }\n      })\n    }\n  }\n}\n\nfunction findEntryFileInBundle(bundle: Rollup.OutputBundle): string {\n  let entryFile: string | undefined\n\n  for (const [_name, file] of Object.entries(bundle)) {\n    if (file.type === 'chunk') {\n      if (file.isEntry) {\n        if (entryFile !== undefined) {\n          throw new Error(\n            `Multiple entry points found. Only one entry point is allowed.`,\n          )\n        }\n        entryFile = file.fileName\n      }\n    }\n  }\n  if (entryFile === undefined) {\n    throw new Error(`No entry point found in the bundle.`)\n  }\n  return entryFile\n}\n\nexport async function writeBundleToDisk({\n  bundle,\n  outDir,\n}: {\n  bundle: Rollup.OutputBundle\n  outDir: string\n}) {\n  const createdDirs = new Set<string>()\n\n  for (const [fileName, asset] of Object.entries(bundle)) {\n    const fullPath = path.join(outDir, fileName)\n    const dir = path.dirname(fullPath)\n    const content = asset.type === 'asset' ? asset.source : asset.code\n\n    if (!createdDirs.has(dir)) {\n      await fsp.mkdir(dir, { recursive: true })\n      createdDirs.add(dir)\n    }\n\n    await fsp.writeFile(fullPath, content)\n  }\n}\n"],"names":["path","outputDir","fsp"],"mappings":"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"}
+{"version":3,"file":"prerender.js","sources":["../../src/prerender.ts"],"sourcesContent":["import { existsSync, promises as fsp, rmSync } from 'node:fs'\nimport { pathToFileURL } from 'node:url'\nimport os from 'node:os'\nimport path from 'pathe'\nimport { joinURL, withBase, withoutBase } from 'ufo'\nimport { VITE_ENVIRONMENT_NAMES } from './constants'\nimport { createLogger } from './utils'\nimport { Queue } from './queue'\nimport type { Rollup, ViteBuilder } from 'vite'\nimport type { Page, TanStackStartOutputConfig } from './schema'\n\nexport async function prerender({\n  startConfig,\n  builder,\n  serverBundle,\n}: {\n  startConfig: TanStackStartOutputConfig\n  builder: ViteBuilder\n  serverBundle: Rollup.OutputBundle\n}) {\n  const logger = createLogger('prerender')\n  logger.info('Prerendering pages...')\n\n  // If prerender is enabled\n  if (startConfig.prerender?.enabled) {\n    // default to root page if no pages are defined\n    let pages = startConfig.pages.length ? startConfig.pages : [{ path: '/' }]\n\n    if (startConfig.prerender.autoStaticPathsDiscovery ?? true) {\n      // merge discovered static pages with user-defined pages\n      const pagesMap = new Map(pages.map((item) => [item.path, item]))\n      const discoveredPages = globalThis.TSS_PRERENDABLE_PATHS || []\n\n      for (const page of discoveredPages) {\n        if (!pagesMap.has(page.path)) {\n          pagesMap.set(page.path, page)\n        }\n      }\n\n      pages = Array.from(pagesMap.values())\n    }\n\n    startConfig.pages = pages\n  }\n\n  const serverEnv = builder.environments[VITE_ENVIRONMENT_NAMES.server]\n\n  if (!serverEnv) {\n    throw new Error(\n      `Vite's \"${VITE_ENVIRONMENT_NAMES.server}\" environment not found`,\n    )\n  }\n\n  const clientEnv = builder.environments[VITE_ENVIRONMENT_NAMES.client]\n  if (!clientEnv) {\n    throw new Error(\n      `Vite's \"${VITE_ENVIRONMENT_NAMES.client}\" environment not found`,\n    )\n  }\n\n  const outputDir = clientEnv.config.build.outDir\n\n  const entryFile = findEntryFileInBundle(serverBundle)\n  let fullEntryFilePath = path.join(serverEnv.config.build.outDir, entryFile)\n  process.env.TSS_PRERENDERING = 'true'\n\n  if (!existsSync(fullEntryFilePath)) {\n    // if the file does not exist, we need to write the bundle to a temporary directory\n    // this can happen e.g. with nitro that postprocesses the bundle and thus does not write SSR build to disk\n    const bundleOutputDir = path.resolve(\n      serverEnv.config.root,\n      '.tanstack',\n      'start',\n      'prerender',\n    )\n    rmSync(bundleOutputDir, { recursive: true, force: true })\n    await writeBundleToDisk({ bundle: serverBundle, outDir: bundleOutputDir })\n    fullEntryFilePath = path.join(bundleOutputDir, entryFile)\n  }\n\n  const { default: serverEntrypoint } = await import(\n    pathToFileURL(fullEntryFilePath).toString()\n  )\n\n  const isRedirectResponse = (res: Response) => {\n    return res.status >= 300 && res.status < 400 && res.headers.get('location')\n  }\n  async function localFetch(\n    path: string,\n    options?: RequestInit,\n    maxRedirects: number = 5,\n  ): Promise<Response> {\n    const url = new URL(`http://localhost${path}`)\n    const response = await serverEntrypoint.fetch(new Request(url, options))\n\n    if (isRedirectResponse(response) && maxRedirects > 0) {\n      const location = response.headers.get('location')!\n      if (location.startsWith('http://localhost') || location.startsWith('/')) {\n        const newUrl = location.replace('http://localhost', '')\n        return localFetch(newUrl, options, maxRedirects - 1)\n      } else {\n        logger.warn(`Skipping redirect to external location: ${location}`)\n      }\n    }\n\n    return response\n  }\n\n  try {\n    // Crawl all pages\n    const pages = await prerenderPages({ outputDir })\n\n    logger.info(`Prerendered ${pages.length} pages:`)\n    pages.forEach((page) => {\n      logger.info(`- ${page}`)\n    })\n  } catch (error) {\n    logger.error(error)\n  }\n\n  function extractLinks(html: string): Array<string> {\n    const linkRegex = /<a[^>]+href=[\"']([^\"']+)[\"'][^>]*>/g\n    const links: Array<string> = []\n    let match\n\n    while ((match = linkRegex.exec(html)) !== null) {\n      const href = match[1]\n      if (href && (href.startsWith('/') || href.startsWith('./'))) {\n        links.push(href)\n      }\n    }\n\n    return links\n  }\n\n  async function prerenderPages({ outputDir }: { outputDir: string }) {\n    const seen = new Set<string>()\n    const prerendered = new Set<string>()\n    const retriesByPath = new Map<string, number>()\n    const concurrency = startConfig.prerender?.concurrency ?? os.cpus().length\n    logger.info(`Concurrency: ${concurrency}`)\n    const queue = new Queue({ concurrency })\n    const routerBasePath = joinURL('/', startConfig.router.basepath ?? '')\n\n    startConfig.pages.forEach((page) => addCrawlPageTask(page))\n\n    await queue.start()\n\n    return Array.from(prerendered)\n\n    function addCrawlPageTask(page: Page) {\n      // Was the page already seen?\n      if (seen.has(page.path)) return\n\n      // Add the page to the seen set\n      seen.add(page.path)\n\n      if (page.fromCrawl) {\n        startConfig.pages.push(page)\n      }\n\n      // If not enabled, skip\n      if (!(page.prerender?.enabled ?? true)) return\n\n      // If there is a filter link, check if the page should be prerendered\n      if (startConfig.prerender?.filter && !startConfig.prerender.filter(page))\n        return\n\n      // Resolve the merged default and page-specific prerender options\n      const prerenderOptions = {\n        ...startConfig.prerender,\n        ...page.prerender,\n      }\n\n      // Add the task\n      queue.add(async () => {\n        logger.info(`Crawling: ${page.path}`)\n        const retries = retriesByPath.get(page.path) || 0\n        try {\n          // Fetch the route\n          const encodedRoute = encodeURI(page.path)\n\n          const res = await localFetch(\n            withBase(encodedRoute, routerBasePath),\n            {\n              headers: {\n                ...(prerenderOptions.headers ?? {}),\n              },\n            },\n            prerenderOptions.maxRedirects,\n          )\n\n          if (!res.ok) {\n            if (isRedirectResponse(res)) {\n              logger.warn(`Max redirects reached for ${page.path}`)\n            }\n            throw new Error(`Failed to fetch ${page.path}: ${res.statusText}`, {\n              cause: res,\n            })\n          }\n\n          const cleanPagePath = (\n            prerenderOptions.outputPath || page.path\n          ).split(/[?#]/)[0]!\n\n          // Guess route type and populate fileName\n          const contentType = res.headers.get('content-type') || ''\n          const isImplicitHTML =\n            !cleanPagePath.endsWith('.html') && contentType.includes('html')\n\n          const routeWithIndex = cleanPagePath.endsWith('/')\n            ? cleanPagePath + 'index'\n            : cleanPagePath\n\n          const isSpaShell =\n            startConfig.spa?.prerender.outputPath === cleanPagePath\n\n          let htmlPath: string\n          if (isSpaShell) {\n            // For SPA shell, ignore autoSubfolderIndex option\n            htmlPath = cleanPagePath + '.html'\n          } else {\n            if (\n              cleanPagePath.endsWith('/') ||\n              (prerenderOptions.autoSubfolderIndex ?? true)\n            ) {\n              htmlPath = joinURL(cleanPagePath, 'index.html')\n            } else {\n              htmlPath = cleanPagePath + '.html'\n            }\n          }\n\n          const filename = withoutBase(\n            isImplicitHTML ? htmlPath : routeWithIndex,\n            routerBasePath,\n          )\n\n          const html = await res.text()\n\n          const filepath = path.join(outputDir, filename)\n\n          await fsp.mkdir(path.dirname(filepath), {\n            recursive: true,\n          })\n\n          await fsp.writeFile(filepath, html)\n\n          prerendered.add(page.path)\n\n          const newPage = await prerenderOptions.onSuccess?.({ page, html })\n\n          if (newPage) {\n            Object.assign(page, newPage)\n          }\n\n          // Find new links\n          if (prerenderOptions.crawlLinks ?? true) {\n            const links = extractLinks(html)\n            for (const link of links) {\n              addCrawlPageTask({ path: link, fromCrawl: true })\n            }\n          }\n        } catch (error) {\n          if (retries < (prerenderOptions.retryCount ?? 0)) {\n            logger.warn(`Encountered error, retrying: ${page.path} in 500ms`)\n            await new Promise((resolve) =>\n              setTimeout(resolve, prerenderOptions.retryDelay),\n            )\n            retriesByPath.set(page.path, retries + 1)\n            addCrawlPageTask(page)\n          } else {\n            if (prerenderOptions.failOnError ?? true) {\n              throw error\n            }\n          }\n        }\n      })\n    }\n  }\n}\n\nfunction findEntryFileInBundle(bundle: Rollup.OutputBundle): string {\n  let entryFile: string | undefined\n\n  for (const [_name, file] of Object.entries(bundle)) {\n    if (file.type === 'chunk') {\n      if (file.isEntry) {\n        if (entryFile !== undefined) {\n          throw new Error(\n            `Multiple entry points found. Only one entry point is allowed.`,\n          )\n        }\n        entryFile = file.fileName\n      }\n    }\n  }\n  if (entryFile === undefined) {\n    throw new Error(`No entry point found in the bundle.`)\n  }\n  return entryFile\n}\n\nexport async function writeBundleToDisk({\n  bundle,\n  outDir,\n}: {\n  bundle: Rollup.OutputBundle\n  outDir: string\n}) {\n  const createdDirs = new Set<string>()\n\n  for (const [fileName, asset] of Object.entries(bundle)) {\n    const fullPath = path.join(outDir, fileName)\n    const dir = path.dirname(fullPath)\n    const content = asset.type === 'asset' ? asset.source : asset.code\n\n    if (!createdDirs.has(dir)) {\n      await fsp.mkdir(dir, { recursive: true })\n      createdDirs.add(dir)\n    }\n\n    await fsp.writeFile(fullPath, content)\n  }\n}\n"],"names":["path","outputDir","fsp"],"mappings":"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"}

package/dist/esm/start-compiler-plugin/compilers.js

@@ -23,13 +23,15 @@ function compileStartOutputFactory(framework) {
         name: "createIsomorphicFn",
         handleCallExpression: handleCreateIsomorphicFnCallExpression,
         paths: []
-      },
-      createMiddleware: {
+      }
+    };
+    if (opts.env === "client") {
+      identifiers.createMiddleware = {
         name: "createMiddleware",
         handleCallExpression: handleCreateMiddleware,
         paths: []
-      }
-    };
+      };
+    }
     const ast = parseAst(opts);
     const doDce = opts.dce ?? true;
     const refIdents = doDce ? findReferencedIdentifiers(ast) : void 0;
@@ -44,6 +46,9 @@ function compileStartOutputFactory(framework) {
               path.node.specifiers.forEach((specifier) => {
                 transformFuncs.forEach((identifierKey) => {
                   const identifier = identifiers[identifierKey];
+                  if (!identifier) {
+                    return;
+                  }
                   if (specifier.type === "ImportSpecifier" && specifier.imported.type === "Identifier") {
                     if (specifier.imported.name === identifierKey) {
                       identifier.name = specifier.local.name;
@@ -57,11 +62,15 @@ function compileStartOutputFactory(framework) {
             },
             CallExpression: (path) => {
               transformFuncs.forEach((identifierKey) => {
-                if (t.isIdentifier(path.node.callee) && path.node.callee.name === identifiers[identifierKey].name) {
-                  if (path.scope.getBinding(identifiers[identifierKey].name)?.path.node.type === "FunctionDeclaration") {
+                const identifier = identifiers[identifierKey];
+                if (!identifier) {
+                  return;
+                }
+                if (t.isIdentifier(path.node.callee) && path.node.callee.name === identifier.name) {
+                  if (path.scope.getBinding(identifier.name)?.path.node.type === "FunctionDeclaration") {
                     return;
                   }
-                  return identifiers[identifierKey].paths.push(path);
+                  return identifier.paths.push(path);
                 }
                 if (t.isMemberExpression(path.node.callee)) {
                   if (t.isIdentifier(path.node.callee.object) && t.isIdentifier(path.node.callee.property)) {
@@ -69,8 +78,8 @@ function compileStartOutputFactory(framework) {
                       path.node.callee.object.name,
                       path.node.callee.property.name
                     ].join(".");
-                    if (callname === identifiers[identifierKey].name) {
-                      identifiers[identifierKey].paths.push(path);
+                    if (callname === identifier.name) {
+                      identifier.paths.push(path);
                     }
                   }
                 }
@@ -79,8 +88,12 @@ function compileStartOutputFactory(framework) {
             }
           });
           transformFuncs.forEach((identifierKey) => {
-            identifiers[identifierKey].paths.forEach((path) => {
-              identifiers[identifierKey].handleCallExpression(
+            const identifier = identifiers[identifierKey];
+            if (!identifier) {
+              return;
+            }
+            identifier.paths.forEach((path) => {
+              identifier.handleCallExpression(
                 path,
                 opts
               );

package/dist/esm/start-compiler-plugin/compilers.js.map

@@ -1 +1 @@
-{"version":3,"file":"compilers.js","sources":["../../../src/start-compiler-plugin/compilers.ts"],"sourcesContent":["import * as babel from '@babel/core'\nimport * as t from '@babel/types'\n\nimport {\n  deadCodeElimination,\n  findReferencedIdentifiers,\n} from 'babel-dead-code-elimination'\nimport { generateFromAst, parseAst } from '@tanstack/router-utils'\nimport { handleCreateMiddleware } from '../create-server-fn-plugin/handleCreateMiddleware'\nimport { transformFuncs } from './constants'\nimport { handleCreateIsomorphicFnCallExpression } from './isomorphicFn'\nimport {\n  handleCreateClientOnlyFnCallExpression,\n  handleCreateServerOnlyFnCallExpression,\n} from './envOnly'\nimport type { GeneratorResult, ParseAstOptions } from '@tanstack/router-utils'\n\nexport type CompileStartFrameworkOptions = 'react' | 'solid'\n\ntype Identifiers = { [K in (typeof transformFuncs)[number]]: IdentifierConfig }\n\nexport function compileStartOutputFactory(\n  framework: CompileStartFrameworkOptions,\n) {\n  return function compileStartOutput(opts: CompileOptions): GeneratorResult {\n    const identifiers: Identifiers = {\n      createServerOnlyFn: {\n        name: 'createServerOnlyFn',\n        handleCallExpression: handleCreateServerOnlyFnCallExpression,\n        paths: [],\n      },\n      createClientOnlyFn: {\n        name: 'createClientOnlyFn',\n        handleCallExpression: handleCreateClientOnlyFnCallExpression,\n        paths: [],\n      },\n      createIsomorphicFn: {\n        name: 'createIsomorphicFn',\n        handleCallExpression: handleCreateIsomorphicFnCallExpression,\n        paths: [],\n      },\n      createMiddleware: {\n        name: 'createMiddleware',\n        handleCallExpression: handleCreateMiddleware,\n        paths: [],\n      },\n    }\n\n    const ast = parseAst(opts)\n\n    const doDce = opts.dce ?? true\n    // find referenced identifiers *before* we transform anything\n    const refIdents = doDce ? findReferencedIdentifiers(ast) : undefined\n\n    babel.traverse(ast, {\n      Program: {\n        enter(programPath) {\n          programPath.traverse({\n            ImportDeclaration: (path) => {\n              if (path.node.source.value !== `@tanstack/${framework}-start`) {\n                return\n              }\n\n              // handle a destructured imports being renamed like \"import { createServerFn as myCreateServerFn } from '@tanstack/react-start';\"\n              path.node.specifiers.forEach((specifier) => {\n                transformFuncs.forEach((identifierKey) => {\n                  const identifier = identifiers[identifierKey]\n\n                  if (\n                    specifier.type === 'ImportSpecifier' &&\n                    specifier.imported.type === 'Identifier'\n                  ) {\n                    if (specifier.imported.name === identifierKey) {\n                      identifier.name = specifier.local.name\n                    }\n                  }\n\n                  // handle namespace imports like \"import * as TanStackStart from '@tanstack/react-start';\"\n                  if (specifier.type === 'ImportNamespaceSpecifier') {\n                    identifier.name = `${specifier.local.name}.${identifierKey}`\n                  }\n                })\n              })\n            },\n            CallExpression: (path) => {\n              transformFuncs.forEach((identifierKey) => {\n                // Check to see if the call expression is a call to the\n                // identifiers[identifierKey].name\n                if (\n                  t.isIdentifier(path.node.callee) &&\n                  path.node.callee.name === identifiers[identifierKey].name\n                ) {\n                  // The identifier could be a call to the original function\n                  // in the source code. If this is case, we need to ignore it.\n                  // Check the scope to see if the identifier is a function declaration.\n                  // if it is, then we can ignore it.\n\n                  if (\n                    path.scope.getBinding(identifiers[identifierKey].name)?.path\n                      .node.type === 'FunctionDeclaration'\n                  ) {\n                    return\n                  }\n\n                  return identifiers[identifierKey].paths.push(path)\n                }\n\n                // handle namespace imports like \"import * as TanStackStart from '@tanstack/react-start';\"\n                // which are then called like \"TanStackStart.createServerFn()\"\n                if (t.isMemberExpression(path.node.callee)) {\n                  if (\n                    t.isIdentifier(path.node.callee.object) &&\n                    t.isIdentifier(path.node.callee.property)\n                  ) {\n                    const callname = [\n                      path.node.callee.object.name,\n                      path.node.callee.property.name,\n                    ].join('.')\n\n                    if (callname === identifiers[identifierKey].name) {\n                      identifiers[identifierKey].paths.push(path)\n                    }\n                  }\n                }\n\n                return\n              })\n            },\n          })\n\n          transformFuncs.forEach((identifierKey) => {\n            identifiers[identifierKey].paths.forEach((path) => {\n              identifiers[identifierKey].handleCallExpression(\n                path as babel.NodePath<t.CallExpression>,\n                opts,\n              )\n            })\n          })\n        },\n      },\n    })\n\n    if (doDce) {\n      deadCodeElimination(ast, refIdents)\n    }\n\n    return generateFromAst(ast, {\n      sourceMaps: true,\n      sourceFileName: opts.filename,\n      filename: opts.filename,\n    })\n  }\n}\n\nexport type CompileOptions = ParseAstOptions & {\n  env: 'server' | 'client'\n  dce?: boolean\n  filename: string\n}\n\nexport type IdentifierConfig = {\n  name: string\n  handleCallExpression: (\n    path: babel.NodePath<t.CallExpression>,\n    opts: CompileOptions,\n  ) => void\n  paths: Array<babel.NodePath>\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"compilers.js","sources":["../../../src/start-compiler-plugin/compilers.ts"],"sourcesContent":["import * as babel from '@babel/core'\nimport * as t from '@babel/types'\n\nimport {\n  deadCodeElimination,\n  findReferencedIdentifiers,\n} from 'babel-dead-code-elimination'\nimport { generateFromAst, parseAst } from '@tanstack/router-utils'\nimport { handleCreateMiddleware } from '../create-server-fn-plugin/handleCreateMiddleware'\nimport { transformFuncs } from './constants'\nimport { handleCreateIsomorphicFnCallExpression } from './isomorphicFn'\nimport {\n  handleCreateClientOnlyFnCallExpression,\n  handleCreateServerOnlyFnCallExpression,\n} from './envOnly'\nimport type { GeneratorResult, ParseAstOptions } from '@tanstack/router-utils'\n\nexport type CompileStartFrameworkOptions = 'react' | 'solid'\n\ntype Identifiers = { [K in (typeof transformFuncs)[number]]: IdentifierConfig }\n\nexport function compileStartOutputFactory(\n  framework: CompileStartFrameworkOptions,\n) {\n  return function compileStartOutput(opts: CompileOptions): GeneratorResult {\n    const identifiers: Partial<Identifiers> = {\n      createServerOnlyFn: {\n        name: 'createServerOnlyFn',\n        handleCallExpression: handleCreateServerOnlyFnCallExpression,\n        paths: [],\n      },\n      createClientOnlyFn: {\n        name: 'createClientOnlyFn',\n        handleCallExpression: handleCreateClientOnlyFnCallExpression,\n        paths: [],\n      },\n      createIsomorphicFn: {\n        name: 'createIsomorphicFn',\n        handleCallExpression: handleCreateIsomorphicFnCallExpression,\n        paths: [],\n      },\n    }\n\n    // createMiddleware only performs modifications in the client environment\n    // so we can avoid executing this on the server\n    if (opts.env === 'client') {\n      identifiers.createMiddleware = {\n        name: 'createMiddleware',\n        handleCallExpression: handleCreateMiddleware,\n        paths: [],\n      }\n    }\n\n    const ast = parseAst(opts)\n\n    const doDce = opts.dce ?? true\n    // find referenced identifiers *before* we transform anything\n    const refIdents = doDce ? findReferencedIdentifiers(ast) : undefined\n\n    babel.traverse(ast, {\n      Program: {\n        enter(programPath) {\n          programPath.traverse({\n            ImportDeclaration: (path) => {\n              if (path.node.source.value !== `@tanstack/${framework}-start`) {\n                return\n              }\n\n              // handle a destructured imports being renamed like \"import { createServerFn as myCreateServerFn } from '@tanstack/react-start';\"\n              path.node.specifiers.forEach((specifier) => {\n                transformFuncs.forEach((identifierKey) => {\n                  const identifier = identifiers[identifierKey]\n                  if (!identifier) {\n                    return\n                  }\n                  if (\n                    specifier.type === 'ImportSpecifier' &&\n                    specifier.imported.type === 'Identifier'\n                  ) {\n                    if (specifier.imported.name === identifierKey) {\n                      identifier.name = specifier.local.name\n                    }\n                  }\n\n                  // handle namespace imports like \"import * as TanStackStart from '@tanstack/react-start';\"\n                  if (specifier.type === 'ImportNamespaceSpecifier') {\n                    identifier.name = `${specifier.local.name}.${identifierKey}`\n                  }\n                })\n              })\n            },\n            CallExpression: (path) => {\n              transformFuncs.forEach((identifierKey) => {\n                const identifier = identifiers[identifierKey]\n                if (!identifier) {\n                  return\n                }\n                // Check to see if the call expression is a call to the\n                // identifiers[identifierKey].name\n                if (\n                  t.isIdentifier(path.node.callee) &&\n                  path.node.callee.name === identifier.name\n                ) {\n                  // The identifier could be a call to the original function\n                  // in the source code. If this is case, we need to ignore it.\n                  // Check the scope to see if the identifier is a function declaration.\n                  // if it is, then we can ignore it.\n\n                  if (\n                    path.scope.getBinding(identifier.name)?.path.node.type ===\n                    'FunctionDeclaration'\n                  ) {\n                    return\n                  }\n\n                  return identifier.paths.push(path)\n                }\n\n                // handle namespace imports like \"import * as TanStackStart from '@tanstack/react-start';\"\n                // which are then called like \"TanStackStart.createServerFn()\"\n                if (t.isMemberExpression(path.node.callee)) {\n                  if (\n                    t.isIdentifier(path.node.callee.object) &&\n                    t.isIdentifier(path.node.callee.property)\n                  ) {\n                    const callname = [\n                      path.node.callee.object.name,\n                      path.node.callee.property.name,\n                    ].join('.')\n\n                    if (callname === identifier.name) {\n                      identifier.paths.push(path)\n                    }\n                  }\n                }\n\n                return\n              })\n            },\n          })\n\n          transformFuncs.forEach((identifierKey) => {\n            const identifier = identifiers[identifierKey]\n            if (!identifier) {\n              return\n            }\n            identifier.paths.forEach((path) => {\n              identifier.handleCallExpression(\n                path as babel.NodePath<t.CallExpression>,\n                opts,\n              )\n            })\n          })\n        },\n      },\n    })\n\n    if (doDce) {\n      deadCodeElimination(ast, refIdents)\n    }\n\n    return generateFromAst(ast, {\n      sourceMaps: true,\n      sourceFileName: opts.filename,\n      filename: opts.filename,\n    })\n  }\n}\n\nexport type CompileOptions = ParseAstOptions & {\n  env: 'server' | 'client'\n  dce?: boolean\n  filename: string\n}\n\nexport type IdentifierConfig = {\n  name: string\n  handleCallExpression: (\n    path: babel.NodePath<t.CallExpression>,\n    opts: CompileOptions,\n  ) => void\n  paths: Array<babel.NodePath>\n}\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-plugin-core",
-  "version": "1.133.36",
+  "version": "1.134.2",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -59,13 +59,13 @@
     "vitefu": "^1.1.1",
     "xmlbuilder2": "^3.1.1",
     "zod": "^3.24.2",
-    "@tanstack/router-generator": "1.133.36",
     "@tanstack/router-core": "1.133.36",
-    "@tanstack/router-utils": "1.133.19",
+    "@tanstack/router-generator": "1.133.36",
     "@tanstack/router-plugin": "1.133.36",
     "@tanstack/server-functions-plugin": "1.133.25",
-    "@tanstack/start-client-core": "1.133.36",
-    "@tanstack/start-server-core": "1.133.36"
+    "@tanstack/router-utils": "1.133.19",
+    "@tanstack/start-server-core": "1.133.36",
+    "@tanstack/start-client-core": "1.133.36"
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.6",

package/src/prerender.ts

@@ -207,17 +207,28 @@ export async function prerender({
           const contentType = res.headers.get('content-type') || ''
           const isImplicitHTML =
             !cleanPagePath.endsWith('.html') && contentType.includes('html')
-          // &&
-          // !JsonSigRx.test(dataBuff.subarray(0, 32).toString('utf8'))
+
           const routeWithIndex = cleanPagePath.endsWith('/')
             ? cleanPagePath + 'index'
             : cleanPagePath
 
-          const htmlPath =
-            cleanPagePath.endsWith('/') ||
-            (prerenderOptions.autoSubfolderIndex ?? true)
-              ? joinURL(cleanPagePath, 'index.html')
-              : cleanPagePath + '.html'
+          const isSpaShell =
+            startConfig.spa?.prerender.outputPath === cleanPagePath
+
+          let htmlPath: string
+          if (isSpaShell) {
+            // For SPA shell, ignore autoSubfolderIndex option
+            htmlPath = cleanPagePath + '.html'
+          } else {
+            if (
+              cleanPagePath.endsWith('/') ||
+              (prerenderOptions.autoSubfolderIndex ?? true)
+            ) {
+              htmlPath = joinURL(cleanPagePath, 'index.html')
+            } else {
+              htmlPath = cleanPagePath + '.html'
+            }
+          }
 
           const filename = withoutBase(
             isImplicitHTML ? htmlPath : routeWithIndex,

package/src/start-compiler-plugin/compilers.ts

@@ -23,7 +23,7 @@ export function compileStartOutputFactory(
   framework: CompileStartFrameworkOptions,
 ) {
   return function compileStartOutput(opts: CompileOptions): GeneratorResult {
-    const identifiers: Identifiers = {
+    const identifiers: Partial<Identifiers> = {
       createServerOnlyFn: {
         name: 'createServerOnlyFn',
         handleCallExpression: handleCreateServerOnlyFnCallExpression,
@@ -39,11 +39,16 @@ export function compileStartOutputFactory(
         handleCallExpression: handleCreateIsomorphicFnCallExpression,
         paths: [],
       },
-      createMiddleware: {
+    }
+
+    // createMiddleware only performs modifications in the client environment
+    // so we can avoid executing this on the server
+    if (opts.env === 'client') {
+      identifiers.createMiddleware = {
         name: 'createMiddleware',
         handleCallExpression: handleCreateMiddleware,
         paths: [],
-      },
+      }
     }
 
     const ast = parseAst(opts)
@@ -65,7 +70,9 @@ export function compileStartOutputFactory(
               path.node.specifiers.forEach((specifier) => {
                 transformFuncs.forEach((identifierKey) => {
                   const identifier = identifiers[identifierKey]
-
+                  if (!identifier) {
+                    return
+                  }
                   if (
                     specifier.type === 'ImportSpecifier' &&
                     specifier.imported.type === 'Identifier'
@@ -84,11 +91,15 @@ export function compileStartOutputFactory(
             },
             CallExpression: (path) => {
               transformFuncs.forEach((identifierKey) => {
+                const identifier = identifiers[identifierKey]
+                if (!identifier) {
+                  return
+                }
                 // Check to see if the call expression is a call to the
                 // identifiers[identifierKey].name
                 if (
                   t.isIdentifier(path.node.callee) &&
-                  path.node.callee.name === identifiers[identifierKey].name
+                  path.node.callee.name === identifier.name
                 ) {
                   // The identifier could be a call to the original function
                   // in the source code. If this is case, we need to ignore it.
@@ -96,13 +107,13 @@ export function compileStartOutputFactory(
                   // if it is, then we can ignore it.
 
                   if (
-                    path.scope.getBinding(identifiers[identifierKey].name)?.path
-                      .node.type === 'FunctionDeclaration'
+                    path.scope.getBinding(identifier.name)?.path.node.type ===
+                    'FunctionDeclaration'
                   ) {
                     return
                   }
 
-                  return identifiers[identifierKey].paths.push(path)
+                  return identifier.paths.push(path)
                 }
 
                 // handle namespace imports like "import * as TanStackStart from '@tanstack/react-start';"
@@ -117,8 +128,8 @@ export function compileStartOutputFactory(
                       path.node.callee.property.name,
                     ].join('.')
 
-                    if (callname === identifiers[identifierKey].name) {
-                      identifiers[identifierKey].paths.push(path)
+                    if (callname === identifier.name) {
+                      identifier.paths.push(path)
                     }
                   }
                 }
@@ -129,8 +140,12 @@ export function compileStartOutputFactory(
           })
 
           transformFuncs.forEach((identifierKey) => {
-            identifiers[identifierKey].paths.forEach((path) => {
-              identifiers[identifierKey].handleCallExpression(
+            const identifier = identifiers[identifierKey]
+            if (!identifier) {
+              return
+            }
+            identifier.paths.forEach((path) => {
+              identifier.handleCallExpression(
                 path as babel.NodePath<t.CallExpression>,
                 opts,
               )