@tanstack/start-plugin-core 1.167.33 → 1.167.35

package/dist/esm/vite/start-manifest-plugin/plugin.js

@@ -1,34 +1,68 @@
 import { ENTRY_POINTS, START_ENVIRONMENT_NAMES } from "../../constants.js";
 import { createVirtualModule } from "../createVirtualModule.js";
-import { buildStartManifest, serializeStartManifest } from "../../start-manifest-plugin/manifestBuilder.js";
+import { normalizeViteClientBuild } from "./normalized-client-build.js";
+import { buildStartManifest, createManifestAssetResolvers, serializeStartManifest } from "../../start-manifest-plugin/manifestBuilder.js";
+import { rootRouteId } from "@tanstack/router-core";
 import { VIRTUAL_MODULES } from "@tanstack/start-server-core";
 import { joinURL } from "ufo";
 //#region src/vite/start-manifest-plugin/plugin.ts
 function startManifestPlugin(opts) {
-	return createVirtualModule({
+	let clientBuild;
+	let cssCodeSplitDisabledFileName;
+	return [{
+		name: "tanstack-start:start-manifest-capture-client-build",
+		applyToEnvironment(environment) {
+			return environment.name === START_ENVIRONMENT_NAMES.client;
+		},
+		enforce: "post",
+		generateBundle(_options, bundle) {
+			if (this.environment.name !== START_ENVIRONMENT_NAMES.client) throw new Error(`Unexpected environment for client build capture: ${this.environment.name}`);
+			clientBuild = normalizeViteClientBuild(bundle);
+			cssCodeSplitDisabledFileName = getAssetFileNameByName(bundle, "style.css");
+		}
+	}, createVirtualModule({
 		name: "tanstack-start:start-manifest-plugin",
 		moduleId: VIRTUAL_MODULES.startManifest,
 		enforce: "pre",
 		load() {
 			const { resolvedStartConfig } = opts.getConfig();
-			if (this.environment.name !== START_ENVIRONMENT_NAMES.server) return "export default {}";
-			if (this.environment.config.command === "serve") return `export const tsrStartManifest = () => ({
-            routes: {},
-            clientEntry: '${joinURL(resolvedStartConfig.basePaths.publicBase, "@id", ENTRY_POINTS.client)}',
-          })`;
+			const clientEntry = joinURL(resolvedStartConfig.basePaths.publicBase, "@id", ENTRY_POINTS.client);
+			if (this.environment.name !== START_ENVIRONMENT_NAMES.server) return getEmptyStartManifestModule(clientEntry);
+			if (this.environment.config.command === "serve") return getEmptyStartManifestModule(clientEntry);
 			const routeTreeRoutes = globalThis.TSS_ROUTES_MANIFEST;
-			const clientBuild = opts.getClientBuild();
-			if (!clientBuild) return `export const tsrStartManifest = () => ({
-              routes: {},
-              clientEntry: '${joinURL(resolvedStartConfig.basePaths.publicBase, "@id", ENTRY_POINTS.client)}',
-              })`;
+			if (!clientBuild) return getEmptyStartManifestModule(clientEntry);
 			return `export const tsrStartManifest = () => (${serializeStartManifest(buildStartManifest({
 				clientBuild,
 				routeTreeRoutes,
-				basePath: resolvedStartConfig.basePaths.publicBase
+				basePath: resolvedStartConfig.basePaths.publicBase,
+				additionalRouteAssets: getViteAdditionalRouteAssets({
+					cssCodeSplitDisabledFileName,
+					basePath: resolvedStartConfig.basePaths.publicBase,
+					cssCodeSplit: this.environment.config.build.cssCodeSplit
+				})
 			}))})`;
 		}
-	});
+	})];
+}
+function getViteAdditionalRouteAssets(options) {
+	if (options.cssCodeSplit !== false) return;
+	if (!options.cssCodeSplitDisabledFileName) throw new Error("TanStack Start could not find Vite's generated `style.css` manifest entry while `build.cssCodeSplit` is disabled");
+	const { getStylesheetAsset } = createManifestAssetResolvers(options.basePath);
+	return { [rootRouteId]: [getStylesheetAsset(options.cssCodeSplitDisabledFileName)] };
+}
+function getAssetFileNameByName(bundle, assetName) {
+	for (const fileName in bundle) {
+		const bundleEntry = bundle[fileName];
+		if (bundleEntry.type !== "asset") continue;
+		if (bundleEntry.name === assetName) return fileName;
+		if ("names" in bundleEntry && bundleEntry.names.includes(assetName)) return fileName;
+	}
+}
+function getEmptyStartManifestModule(clientEntry) {
+	return `export const tsrStartManifest = () => ({
+      routes: {},
+      clientEntry: '${clientEntry}',
+    })`;
 }
 //#endregion
 export { startManifestPlugin };

package/dist/esm/vite/start-manifest-plugin/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","names":[],"sources":["../../../../src/vite/start-manifest-plugin/plugin.ts"],"sourcesContent":["import { joinURL } from 'ufo'\nimport { VIRTUAL_MODULES } from '@tanstack/start-server-core'\nimport { ENTRY_POINTS, START_ENVIRONMENT_NAMES } from '../../constants'\nimport {\n  buildStartManifest,\n  serializeStartManifest,\n} from '../../start-manifest-plugin/manifestBuilder'\nimport { createVirtualModule } from '../createVirtualModule'\nimport type { GetConfigFn, NormalizedClientBuild } from '../../types'\nimport type { PluginOption } from 'vite'\n\nexport function startManifestPlugin(opts: {\n  getClientBuild: () => NormalizedClientBuild | undefined\n  getConfig: GetConfigFn\n}): PluginOption {\n  return createVirtualModule({\n    name: 'tanstack-start:start-manifest-plugin',\n    moduleId: VIRTUAL_MODULES.startManifest,\n    enforce: 'pre',\n    load() {\n      const { resolvedStartConfig } = opts.getConfig()\n      if (this.environment.name !== START_ENVIRONMENT_NAMES.server) {\n        return 'export default {}'\n      }\n\n      if (this.environment.config.command === 'serve') {\n        return `export const tsrStartManifest = () => ({\n            routes: {},\n            clientEntry: '${joinURL(resolvedStartConfig.basePaths.publicBase, '@id', ENTRY_POINTS.client)}',\n          })`\n      }\n\n      const routeTreeRoutes = globalThis.TSS_ROUTES_MANIFEST\n      const clientBuild = opts.getClientBuild()\n      // TODO this needs further discussion with vite-rsc, this is a temporary workaround\n      // If the client bundle isn't available yet (e.g., during RSC scan builds),\n      // return a dummy manifest. The real manifest will be generated in the actual build.\n      if (!clientBuild) {\n        return `export const tsrStartManifest = () => ({\n              routes: {},\n              clientEntry: '${joinURL(resolvedStartConfig.basePaths.publicBase, '@id', ENTRY_POINTS.client)}',\n              })`\n      }\n      const startManifest = buildStartManifest({\n        clientBuild,\n        routeTreeRoutes,\n        basePath: resolvedStartConfig.basePaths.publicBase,\n      })\n\n      return `export const tsrStartManifest = () => (${serializeStartManifest(startManifest)})`\n    },\n  })\n}\n"],"mappings":";;;;;;AAWA,SAAgB,oBAAoB,MAGnB;AACf,QAAO,oBAAoB;EACzB,MAAM;EACN,UAAU,gBAAgB;EAC1B,SAAS;EACT,OAAO;GACL,MAAM,EAAE,wBAAwB,KAAK,WAAW;AAChD,OAAI,KAAK,YAAY,SAAS,wBAAwB,OACpD,QAAO;AAGT,OAAI,KAAK,YAAY,OAAO,YAAY,QACtC,QAAO;;4BAEa,QAAQ,oBAAoB,UAAU,YAAY,OAAO,aAAa,OAAO,CAAC;;GAIpG,MAAM,kBAAkB,WAAW;GACnC,MAAM,cAAc,KAAK,gBAAgB;AAIzC,OAAI,CAAC,YACH,QAAO;;8BAEe,QAAQ,oBAAoB,UAAU,YAAY,OAAO,aAAa,OAAO,CAAC;;AAStG,UAAO,0CAA0C,uBAN3B,mBAAmB;IACvC;IACA;IACA,UAAU,oBAAoB,UAAU;IACzC,CAAC,CAEoF,CAAC;;EAE1F,CAAC"}
+{"version":3,"file":"plugin.js","names":[],"sources":["../../../../src/vite/start-manifest-plugin/plugin.ts"],"sourcesContent":["import { joinURL } from 'ufo'\nimport { VIRTUAL_MODULES } from '@tanstack/start-server-core'\nimport { rootRouteId } from '@tanstack/router-core'\nimport { ENTRY_POINTS, START_ENVIRONMENT_NAMES } from '../../constants'\nimport {\n  buildStartManifest,\n  createManifestAssetResolvers,\n  normalizeViteClientBuild,\n  serializeStartManifest,\n} from '../../start-manifest-plugin/manifestBuilder'\nimport { createVirtualModule } from '../createVirtualModule'\nimport type { GetConfigFn, NormalizedClientBuild } from '../../types'\nimport type { PluginOption, Rollup } from 'vite'\n\nexport function startManifestPlugin(opts: {\n  getConfig: GetConfigFn\n}): PluginOption {\n  let clientBuild: NormalizedClientBuild | undefined\n  let cssCodeSplitDisabledFileName: string | undefined\n\n  return [\n    {\n      name: 'tanstack-start:start-manifest-capture-client-build',\n      applyToEnvironment(environment) {\n        return environment.name === START_ENVIRONMENT_NAMES.client\n      },\n      enforce: 'post',\n      generateBundle(_options, bundle) {\n        if (this.environment.name !== START_ENVIRONMENT_NAMES.client) {\n          throw new Error(\n            `Unexpected environment for client build capture: ${this.environment.name}`,\n          )\n        }\n\n        clientBuild = normalizeViteClientBuild(bundle)\n        cssCodeSplitDisabledFileName = getAssetFileNameByName(\n          bundle,\n          'style.css',\n        )\n      },\n    },\n    createVirtualModule({\n      name: 'tanstack-start:start-manifest-plugin',\n      moduleId: VIRTUAL_MODULES.startManifest,\n      enforce: 'pre',\n      load() {\n        const { resolvedStartConfig } = opts.getConfig()\n        const clientEntry = joinURL(\n          resolvedStartConfig.basePaths.publicBase,\n          '@id',\n          ENTRY_POINTS.client,\n        )\n\n        if (this.environment.name !== START_ENVIRONMENT_NAMES.server) {\n          return getEmptyStartManifestModule(clientEntry)\n        }\n\n        if (this.environment.config.command === 'serve') {\n          return getEmptyStartManifestModule(clientEntry)\n        }\n\n        const routeTreeRoutes = globalThis.TSS_ROUTES_MANIFEST\n        // TODO this needs further discussion with vite-rsc, this is a temporary workaround\n        // If the client bundle isn't available yet (e.g., during RSC scan builds),\n        // return a dummy manifest. The real manifest will be generated in the actual build.\n        if (!clientBuild) {\n          return getEmptyStartManifestModule(clientEntry)\n        }\n        const startManifest = buildStartManifest({\n          clientBuild,\n          routeTreeRoutes,\n          basePath: resolvedStartConfig.basePaths.publicBase,\n          additionalRouteAssets: getViteAdditionalRouteAssets({\n            cssCodeSplitDisabledFileName,\n            basePath: resolvedStartConfig.basePaths.publicBase,\n            cssCodeSplit: this.environment.config.build.cssCodeSplit,\n          }),\n        })\n\n        return `export const tsrStartManifest = () => (${serializeStartManifest(startManifest)})`\n      },\n    }),\n  ]\n}\n\nfunction getViteAdditionalRouteAssets(options: {\n  cssCodeSplitDisabledFileName: string | undefined\n  basePath: string\n  cssCodeSplit: boolean | undefined\n}) {\n  if (options.cssCodeSplit !== false) {\n    return undefined\n  }\n\n  if (!options.cssCodeSplitDisabledFileName) {\n    throw new Error(\n      \"TanStack Start could not find Vite's generated `style.css` manifest entry while `build.cssCodeSplit` is disabled\",\n    )\n  }\n\n  const { getStylesheetAsset } = createManifestAssetResolvers(options.basePath)\n\n  return {\n    [rootRouteId]: [getStylesheetAsset(options.cssCodeSplitDisabledFileName)],\n  }\n}\n\nfunction getAssetFileNameByName(\n  bundle: Rollup.OutputBundle,\n  assetName: string,\n) {\n  for (const fileName in bundle) {\n    const bundleEntry = bundle[fileName]!\n\n    if (bundleEntry.type !== 'asset') {\n      continue\n    }\n\n    if (bundleEntry.name === assetName) {\n      return fileName\n    }\n\n    if ('names' in bundleEntry && bundleEntry.names.includes(assetName)) {\n      return fileName\n    }\n  }\n\n  return undefined\n}\n\nfunction getEmptyStartManifestModule(clientEntry: string) {\n  return `export const tsrStartManifest = () => ({\n      routes: {},\n      clientEntry: '${clientEntry}',\n    })`\n}\n"],"mappings":";;;;;;;;AAcA,SAAgB,oBAAoB,MAEnB;CACf,IAAI;CACJ,IAAI;AAEJ,QAAO,CACL;EACE,MAAM;EACN,mBAAmB,aAAa;AAC9B,UAAO,YAAY,SAAS,wBAAwB;;EAEtD,SAAS;EACT,eAAe,UAAU,QAAQ;AAC/B,OAAI,KAAK,YAAY,SAAS,wBAAwB,OACpD,OAAM,IAAI,MACR,oDAAoD,KAAK,YAAY,OACtE;AAGH,iBAAc,yBAAyB,OAAO;AAC9C,kCAA+B,uBAC7B,QACA,YACD;;EAEJ,EACD,oBAAoB;EAClB,MAAM;EACN,UAAU,gBAAgB;EAC1B,SAAS;EACT,OAAO;GACL,MAAM,EAAE,wBAAwB,KAAK,WAAW;GAChD,MAAM,cAAc,QAClB,oBAAoB,UAAU,YAC9B,OACA,aAAa,OACd;AAED,OAAI,KAAK,YAAY,SAAS,wBAAwB,OACpD,QAAO,4BAA4B,YAAY;AAGjD,OAAI,KAAK,YAAY,OAAO,YAAY,QACtC,QAAO,4BAA4B,YAAY;GAGjD,MAAM,kBAAkB,WAAW;AAInC,OAAI,CAAC,YACH,QAAO,4BAA4B,YAAY;AAajD,UAAO,0CAA0C,uBAX3B,mBAAmB;IACvC;IACA;IACA,UAAU,oBAAoB,UAAU;IACxC,uBAAuB,6BAA6B;KAClD;KACA,UAAU,oBAAoB,UAAU;KACxC,cAAc,KAAK,YAAY,OAAO,MAAM;KAC7C,CAAC;IACH,CAAC,CAEoF,CAAC;;EAE1F,CAAC,CACH;;AAGH,SAAS,6BAA6B,SAInC;AACD,KAAI,QAAQ,iBAAiB,MAC3B;AAGF,KAAI,CAAC,QAAQ,6BACX,OAAM,IAAI,MACR,mHACD;CAGH,MAAM,EAAE,uBAAuB,6BAA6B,QAAQ,SAAS;AAE7E,QAAO,GACJ,cAAc,CAAC,mBAAmB,QAAQ,6BAA6B,CAAC,EAC1E;;AAGH,SAAS,uBACP,QACA,WACA;AACA,MAAK,MAAM,YAAY,QAAQ;EAC7B,MAAM,cAAc,OAAO;AAE3B,MAAI,YAAY,SAAS,QACvB;AAGF,MAAI,YAAY,SAAS,UACvB,QAAO;AAGT,MAAI,WAAW,eAAe,YAAY,MAAM,SAAS,UAAU,CACjE,QAAO;;;AAOb,SAAS,4BAA4B,aAAqB;AACxD,QAAO;;sBAEa,YAAY"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-plugin-core",
-  "version": "1.167.33",
+  "version": "1.167.35",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -67,12 +67,12 @@
     "vitefu": "^1.1.1",
     "xmlbuilder2": "^4.0.3",
     "zod": "^3.24.2",
-    "@tanstack/router-core": "1.168.14",
-    "@tanstack/router-generator": "1.166.31",
-    "@tanstack/router-plugin": "1.167.21",
+    "@tanstack/router-core": "1.168.15",
+    "@tanstack/router-generator": "1.166.32",
+    "@tanstack/router-plugin": "1.167.22",
     "@tanstack/router-utils": "1.161.6",
-    "@tanstack/start-client-core": "1.167.16",
-    "@tanstack/start-server-core": "1.167.18"
+    "@tanstack/start-client-core": "1.167.17",
+    "@tanstack/start-server-core": "1.167.19"
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.6",

package/src/start-manifest-plugin/manifestBuilder.ts

@@ -10,8 +10,6 @@ import {
 import type { ManifestAssetLink, RouterManagedTag } from '@tanstack/router-core'
 import type { NormalizedClientBuild, NormalizedClientChunk } from '../types'
 
-const ROUTER_MANAGED_MODE = 1
-const NON_ROUTE_DYNAMIC_MODE = 2
 const VISITING_CHUNK = 1
 
 type RouteTreeRoute = {
@@ -27,7 +25,6 @@ interface ScannedClientChunks {
   entryChunk: NormalizedClientChunk
   chunksByFileName: ReadonlyMap<string, NormalizedClientChunk>
   routeChunksByFilePath: ReadonlyMap<string, Array<NormalizedClientChunk>>
-  routeEntryChunks: ReadonlySet<NormalizedClientChunk>
 }
 
 interface ManifestAssetResolvers {
@@ -114,19 +111,25 @@ export function appendUniqueAssets(
 }
 
 function getAssetIdentity(asset: RouterManagedTag) {
-  if (asset.tag === 'link' || asset.tag === 'script') {
-    const attrs = asset.attrs ?? {}
-    return [
-      asset.tag,
-      'href' in attrs ? String(attrs.href) : '',
-      'src' in attrs ? String(attrs.src) : '',
-      'rel' in attrs ? String(attrs.rel) : '',
-      'type' in attrs ? String(attrs.type) : '',
-      asset.children ?? '',
-    ].join('|')
+  return JSON.stringify({
+    tag: asset.tag,
+    attrs: normalizeAssetAttrs(asset.attrs),
+    children: 'children' in asset ? (asset.children ?? null) : null,
+  })
+}
+
+function normalizeAssetAttrs(attrs: Record<string, any> | undefined) {
+  if (!attrs) {
+    return null
   }
 
-  return JSON.stringify(asset)
+  const entries = Object.entries(attrs)
+  if (entries.length === 0) {
+    return null
+  }
+
+  entries.sort(([left], [right]) => left.localeCompare(right))
+  return Object.fromEntries(entries)
 }
 
 function mergeRouteChunkData(options: {
@@ -149,17 +152,12 @@ export function buildStartManifest(options: {
   clientBuild: NormalizedClientBuild
   routeTreeRoutes: RouteTreeRoutes
   basePath: string
+  additionalRouteAssets?: Partial<
+    Record<string, ReadonlyArray<RouterManagedTag>>
+  >
 }): StartManifest {
   const scannedChunks = scanClientChunks(options.clientBuild)
-  const hashedCssFiles = collectDynamicImportCss(
-    scannedChunks.routeEntryChunks,
-    scannedChunks.chunksByFileName,
-    scannedChunks.entryChunk,
-  )
-  const assetResolvers = createManifestAssetResolvers({
-    basePath: options.basePath,
-    hashedCssFiles,
-  })
+  const assetResolvers = createManifestAssetResolvers(options.basePath)
 
   const routes = buildRouteManifestRoutes({
     routeTreeRoutes: options.routeTreeRoutes,
@@ -167,6 +165,7 @@ export function buildStartManifest(options: {
     chunksByFileName: scannedChunks.chunksByFileName,
     entryChunk: scannedChunks.entryChunk,
     assetResolvers,
+    additionalRouteAssets: options.additionalRouteAssets,
   })
 
   dedupeNestedRouteManifestEntries(rootRouteId, routes[rootRouteId]!, routes)
@@ -202,13 +201,10 @@ export function scanClientChunks(
     throw new Error(`Missing entry chunk: ${clientBuild.entryChunkFileName}`)
   }
 
-  const routeEntryChunks = new Set<NormalizedClientChunk>()
   const routeChunksByFilePath = new Map<string, Array<NormalizedClientChunk>>()
 
   for (const chunk of clientBuild.chunksByFileName.values()) {
     if (chunk.routeFilePaths.length > 0) {
-      routeEntryChunks.add(chunk)
-
       for (const routeFilePath of chunk.routeFilePaths) {
         let chunks = routeChunksByFilePath.get(routeFilePath)
         if (chunks === undefined) {
@@ -224,92 +220,12 @@ export function scanClientChunks(
     entryChunk,
     chunksByFileName: clientBuild.chunksByFileName,
     routeChunksByFilePath,
-    routeEntryChunks,
   }
 }
 
-export function collectDynamicImportCss(
-  routeEntryChunks: ReadonlySet<NormalizedClientChunk>,
-  chunksByFileName: ReadonlyMap<string, NormalizedClientChunk>,
-  entryChunk?: NormalizedClientChunk,
-) {
-  const routerManagedCssFiles = new Set<string>()
-  const nonRouteDynamicCssFiles = new Set<string>()
-  const hashedCssFiles = new Set<string>()
-  const visitedByChunk = new Map<NormalizedClientChunk, number>()
-  const chunkStack: Array<NormalizedClientChunk> = []
-  const modeStack: Array<number> = []
-
-  for (const routeEntryChunk of routeEntryChunks) {
-    chunkStack.push(routeEntryChunk)
-    modeStack.push(ROUTER_MANAGED_MODE)
-  }
-
-  if (entryChunk) {
-    chunkStack.push(entryChunk)
-    modeStack.push(ROUTER_MANAGED_MODE)
-  }
-
-  while (chunkStack.length > 0) {
-    const chunk = chunkStack.pop()!
-    const mode = modeStack.pop()!
-    const previousMode = visitedByChunk.get(chunk) ?? 0
-
-    if ((previousMode & mode) === mode) {
-      continue
-    }
-
-    visitedByChunk.set(chunk, previousMode | mode)
-
-    if ((mode & ROUTER_MANAGED_MODE) !== 0) {
-      for (const cssFile of chunk.css) {
-        routerManagedCssFiles.add(cssFile)
-      }
-    }
-
-    if ((mode & NON_ROUTE_DYNAMIC_MODE) !== 0) {
-      for (const cssFile of chunk.css) {
-        nonRouteDynamicCssFiles.add(cssFile)
-      }
-    }
-
-    for (let i = 0; i < chunk.imports.length; i++) {
-      const importedChunk = chunksByFileName.get(chunk.imports[i]!)
-      if (importedChunk) {
-        chunkStack.push(importedChunk)
-        modeStack.push(mode)
-      }
-    }
-
-    for (let i = 0; i < chunk.dynamicImports.length; i++) {
-      const dynamicImportedChunk = chunksByFileName.get(
-        chunk.dynamicImports[i]!,
-      )
-      if (dynamicImportedChunk) {
-        chunkStack.push(dynamicImportedChunk)
-        modeStack.push(
-          (mode & NON_ROUTE_DYNAMIC_MODE) !== 0 ||
-            !routeEntryChunks.has(dynamicImportedChunk)
-            ? NON_ROUTE_DYNAMIC_MODE
-            : ROUTER_MANAGED_MODE,
-        )
-      }
-    }
-  }
-
-  for (const cssFile of routerManagedCssFiles) {
-    if (nonRouteDynamicCssFiles.has(cssFile)) {
-      hashedCssFiles.add(cssFile)
-    }
-  }
-
-  return hashedCssFiles
-}
-
-export function createManifestAssetResolvers(options: {
-  basePath: string
-  hashedCssFiles?: Set<string>
-}): ManifestAssetResolvers {
+export function createManifestAssetResolvers(
+  basePath: string,
+): ManifestAssetResolvers {
   const assetPathByFileName = new Map<string, string>()
   const stylesheetAssetByFileName = new Map<string, RouterManagedTag>()
   const preloadsByChunk = new Map<NormalizedClientChunk, Array<string>>()
@@ -320,7 +236,7 @@ export function createManifestAssetResolvers(options: {
       return cachedPath
     }
 
-    const assetPath = joinURL(options.basePath, fileName)
+    const assetPath = joinURL(basePath, fileName)
     assetPathByFileName.set(fileName, assetPath)
     return assetPath
   }
@@ -336,7 +252,7 @@ export function createManifestAssetResolvers(options: {
       tag: 'link',
       attrs: {
         rel: 'stylesheet',
-        href: options.hashedCssFiles?.has(cssFile) ? `${href}#` : href,
+        href,
         type: 'text/css',
       },
     } satisfies RouterManagedTag
@@ -380,15 +296,14 @@ export function createChunkCssAssetCollector(options: {
 
   const appendAsset = (
     assets: Array<RouterManagedTag>,
-    seenAssets: Set<string>,
+    seenAssets: Set<RouterManagedTag>,
     asset: RouterManagedTag,
   ) => {
-    const identity = getAssetIdentity(asset)
-    if (seenAssets.has(identity)) {
+    if (seenAssets.has(asset)) {
       return
     }
 
-    seenAssets.add(identity)
+    seenAssets.add(asset)
     assets.push(asset)
   }
 
@@ -406,7 +321,7 @@ export function createChunkCssAssetCollector(options: {
     stateByChunk.set(chunk, VISITING_CHUNK)
 
     const assets: Array<RouterManagedTag> = []
-    const seenAssets = new Set<string>()
+    const seenAssets = new Set<RouterManagedTag>()
 
     for (const cssFile of chunk.css) {
       appendAsset(assets, seenAssets, options.getStylesheetAsset(cssFile))
@@ -441,6 +356,9 @@ export function buildRouteManifestRoutes(options: {
   chunksByFileName: ReadonlyMap<string, NormalizedClientChunk>
   entryChunk: NormalizedClientChunk
   assetResolvers: ManifestAssetResolvers
+  additionalRouteAssets?: Partial<
+    Record<string, ReadonlyArray<RouterManagedTag>>
+  >
 }) {
   const routes: Record<string, RouteTreeRoute> = {}
   const getChunkCssAssets = createChunkCssAssetCollector({
@@ -485,6 +403,25 @@ export function buildRouteManifestRoutes(options: {
     getChunkPreloads: options.assetResolvers.getChunkPreloads,
   })
 
+  if (options.additionalRouteAssets) {
+    for (const [routeId, assets] of Object.entries(
+      options.additionalRouteAssets,
+    )) {
+      if (!assets || assets.length === 0) {
+        continue
+      }
+
+      if (!(routeId in options.routeTreeRoutes)) {
+        throw new Error(
+          `expected additionalRouteAssets routeId to exist in routeTreeRoutes: ${routeId}`,
+        )
+      }
+
+      const route = (routes[routeId] = routes[routeId] || {})
+      route.assets = appendUniqueAssets(route.assets, [...assets])
+    }
+  }
+
   return routes
 }
 

package/src/vite/plugin.ts

@@ -22,7 +22,6 @@ import {
 import { devServerPlugin } from './dev-server-plugin/plugin'
 import { previewServerPlugin } from './preview-server-plugin/plugin'
 import {
-  createCaptureClientBuildPlugin,
   createDevBaseRewritePlugin,
   createPostBuildPlugin,
   createVirtualClientEntryPlugin,
@@ -36,12 +35,10 @@ import {
 } from './output-directory'
 import { postServerBuild } from './post-server-build'
 import { serializationAdaptersPlugin } from './serialization-adapters-plugin'
-import type { NormalizedClientBuild } from '../types'
 import type {
   TanStackStartVitePluginCoreOptions,
   ViteRscForwardSsrResolverStrategy,
 } from './types'
-import type { StartEnvironmentName } from '../constants'
 import type { TanStackStartViteInputConfig } from './schema'
 import type { PluginOption } from 'vite'
 
@@ -64,16 +61,6 @@ export function tanStackStartVite(
   // we install a URL rewrite middleware instead of erroring.
   let needsDevBaseRewrite = false
 
-  const capturedClientBuild: Partial<
-    Record<StartEnvironmentName, NormalizedClientBuild>
-  > = {}
-
-  function getClientBuild(
-    envName: StartEnvironmentName,
-  ): NormalizedClientBuild | undefined {
-    return capturedClientBuild[envName]
-  }
-
   const environments: Array<{
     name: string
     type: 'client' | 'server'
@@ -242,7 +229,6 @@ export function tanStackStartVite(
       getClientEntry: () => configContext.resolveEntries().entryPaths.client,
     }),
     startManifestPlugin({
-      getClientBuild: () => getClientBuild(START_ENVIRONMENT_NAMES.client),
       getConfig,
     }),
     // When the vite base and router basepath are misaligned (e.g. base: '/_ui/', basepath: '/'),
@@ -266,9 +252,6 @@ export function tanStackStartVite(
     serializationAdaptersPlugin({
       adapters: corePluginOpts.serializationAdapters,
     }),
-    createCaptureClientBuildPlugin({
-      capturedClientBuild,
-    }),
   ]
 }
 

package/src/vite/plugins.ts

@@ -1,13 +1,7 @@
 import { normalizePath } from 'vite'
-import { ENTRY_POINTS, START_ENVIRONMENT_NAMES } from '../constants'
+import { ENTRY_POINTS } from '../constants'
 import { createVirtualModule } from './createVirtualModule'
-import { normalizeViteClientBuild } from './start-manifest-plugin/normalized-client-build'
-import type {
-  GetConfigFn,
-  NormalizedClientBuild,
-  ResolvedStartConfig,
-} from '../types'
-import type { StartEnvironmentName } from '../constants'
+import type { GetConfigFn, ResolvedStartConfig } from '../types'
 import type { PluginOption, ViteBuilder } from 'vite'
 
 export function createVirtualClientEntryPlugin(opts: {
@@ -69,28 +63,3 @@ export function createDevBaseRewritePlugin(opts: {
     },
   }
 }
-
-export function createCaptureClientBuildPlugin(opts: {
-  capturedClientBuild: Partial<
-    Record<StartEnvironmentName, NormalizedClientBuild>
-  >
-}): PluginOption {
-  return {
-    name: 'tanstack-start:core:capture-bundle',
-    applyToEnvironment(environment) {
-      return environment.name === START_ENVIRONMENT_NAMES.client
-    },
-    enforce: 'post',
-    generateBundle(_options, bundle) {
-      const environment = this.environment.name as StartEnvironmentName
-
-      if (environment !== START_ENVIRONMENT_NAMES.client) {
-        throw new Error(
-          `Unexpected environment for client build capture: ${environment}`,
-        )
-      }
-
-      opts.capturedClientBuild[environment] = normalizeViteClientBuild(bundle)
-    },
-  }
-}

package/src/vite/start-manifest-plugin/normalized-client-build.ts

@@ -42,6 +42,8 @@ export function normalizeViteClientBuild(
   const cssFilesBySourcePath = new Map<string, Array<string>>()
 
   for (const chunk of chunksByFileName.values()) {
+    const bundleEntry = clientBundle[chunk.fileName] as Rollup.OutputChunk
+
     if (chunk.isEntry) {
       if (entryChunkFileName) {
         throw new Error(
@@ -60,22 +62,19 @@ export function normalizeViteClientBuild(
       chunkFileNames.push(chunk.fileName)
     }
 
-    const bundleEntry = clientBundle[chunk.fileName]
-    if (bundleEntry?.type === 'chunk') {
-      for (const moduleId of bundleEntry.moduleIds) {
-        const queryIndex = moduleId.indexOf('?')
-        const sourcePath =
-          queryIndex >= 0 ? moduleId.slice(0, queryIndex) : moduleId
-        if (!sourcePath) continue
-
-        const existing = cssFilesBySourcePath.get(sourcePath)
-        cssFilesBySourcePath.set(
-          sourcePath,
-          existing
-            ? Array.from(new Set([...existing, ...chunk.css]))
-            : chunk.css.slice(),
-        )
-      }
+    for (const moduleId of bundleEntry.moduleIds) {
+      const queryIndex = moduleId.indexOf('?')
+      const sourcePath =
+        queryIndex >= 0 ? moduleId.slice(0, queryIndex) : moduleId
+      if (!sourcePath) continue
+
+      const existing = cssFilesBySourcePath.get(sourcePath)
+      cssFilesBySourcePath.set(
+        sourcePath,
+        existing
+          ? Array.from(new Set([...existing, ...chunk.css]))
+          : chunk.css.slice(),
+      )
     }
   }