@tanstack/start-server-core 1.169.4 → 1.169.6

package/dist/esm/transformAssetUrls.js

@@ -1,4 +1,4 @@
-import { getManifestScriptFormat, resolveManifestAssetLink, resolveManifestCssLink } from "@tanstack/router-core";
+import { resolveManifestAssetLink, resolveManifestCssLink } from "@tanstack/router-core";
 //#region src/transformAssetUrls.ts
 function normalizeTransformAssetResult(result) {
 	if (typeof result === "string") return { href: result };
@@ -86,18 +86,6 @@ function resolveTransformAssetsConfig(transform) {
 		cache: transform.cache !== false
 	};
 }
-/**
-* Builds the client entry `<script>` tag from a (possibly transformed) client
-* entry URL.
-*/
-function buildClientEntryScriptTag(clientEntry, scriptFormat = "module", crossOrigin) {
-	return { attrs: {
-		...scriptFormat === "module" ? { type: "module" } : {},
-		async: true,
-		src: clientEntry,
-		...crossOrigin ? { crossOrigin } : {}
-	} };
-}
 function assignManifestLink(link, next) {
 	if (typeof link === "string") return next.crossOrigin ? next : next.href;
 	const nextLink = {
@@ -108,28 +96,8 @@ function assignManifestLink(link, next) {
 	else delete nextLink.crossOrigin;
 	return nextLink;
 }
-function appendUniqueManifestAssetLink(target, link) {
-	const href = typeof link === "string" ? link : link.href;
-	if (target) {
-		for (const item of target) if ((typeof item === "string" ? item : item.href) === href) return target;
-	}
-	return [...target ?? [], link];
-}
-function addClientEntryToManifest(manifest, clientEntry) {
-	const rootRoute = manifest.routes.__root__ ?? {};
-	const rootScripts = rootRoute.scripts ?? [];
-	const scripts = rootScripts.some((script) => script.attrs?.src === clientEntry) ? rootScripts : [...rootScripts, buildClientEntryScriptTag(clientEntry, getManifestScriptFormat(manifest))];
-	manifest.routes = {
-		...manifest.routes,
-		__root__: {
-			...rootRoute,
-			preloads: appendUniqueManifestAssetLink(rootRoute.preloads, clientEntry),
-			scripts
-		}
-	};
-}
 async function transformManifestAssets(source, transformFn, _opts) {
-	const manifest = structuredClone(source.manifest);
+	const manifest = structuredClone(source);
 	const inlineCssEnabled = _opts?.inlineCss !== false;
 	const scriptTransforms = /* @__PURE__ */ new Map();
 	const transformScript = (url) => {
@@ -144,7 +112,6 @@ async function transformManifestAssets(source, transformFn, _opts) {
 	};
 	if (!inlineCssEnabled) delete manifest.inlineCss;
 	else if (manifest.inlineCss) manifest.inlineCss = await transformInlineCssStyles(manifest.inlineCss, transformFn);
-	addClientEntryToManifest(manifest, source.clientEntry);
 	for (const route of Object.values(manifest.routes)) {
 		if (route.preloads?.length) route.preloads = await Promise.all(route.preloads.map(async (link) => {
 			const result = await transformScript(resolveManifestAssetLink(link).href);
@@ -178,21 +145,19 @@ async function transformManifestAssets(source, transformFn, _opts) {
 	return manifest;
 }
 /**
-* Builds a final ServerManifest from a StartManifestWithClientEntry without any
-* URL transforms. Used when no transformAssets option is provided.
+* Builds a final ServerManifest without URL transforms. Used when no
+* transformAssets option is provided.
 *
 * Returns a new manifest object so the cached base manifest is never mutated.
 */
-function buildManifestWithClientEntry(source, opts) {
-	const manifest = {
-		...source.manifest.scriptFormat ? { scriptFormat: source.manifest.scriptFormat } : {},
-		...opts?.inlineCss !== false && source.manifest.inlineCss ? { inlineCss: structuredClone(source.manifest.inlineCss) } : {},
-		routes: { ...source.manifest.routes }
+function buildManifest(source, opts) {
+	return {
+		...source.scriptFormat ? { scriptFormat: source.scriptFormat } : {},
+		...opts?.inlineCss !== false && source.inlineCss ? { inlineCss: structuredClone(source.inlineCss) } : {},
+		routes: { ...source.routes }
 	};
-	addClientEntryToManifest(manifest, source.clientEntry);
-	return manifest;
 }
 //#endregion
-export { buildManifestWithClientEntry, resolveTransformAssetsConfig, transformManifestAssets };
+export { buildManifest, resolveTransformAssetsConfig, transformManifestAssets };
 
 //# sourceMappingURL=transformAssetUrls.js.map

package/dist/esm/transformAssetUrls.js.map

@@ -1 +1 @@
-{"version":3,"file":"transformAssetUrls.js","names":[],"sources":["../../src/transformAssetUrls.ts"],"sourcesContent":["import {\n  getManifestScriptFormat,\n  resolveManifestAssetLink,\n  resolveManifestCssLink,\n} from '@tanstack/router-core'\n\nimport type {\n  AssetCrossOrigin,\n  Awaitable,\n  ManifestAssetLink,\n  ManifestCssLink,\n  ManifestScript,\n  ScriptFormat,\n  ServerManifest,\n} from '@tanstack/router-core'\n\nexport type { AssetCrossOrigin }\n\nexport type TransformAssetsContext =\n  | {\n      url: string\n      kind: 'script'\n    }\n  | {\n      url: string\n      kind: 'stylesheet'\n    }\n  | {\n      url: string\n      kind: 'css-url'\n      stylesheetHref: string\n    }\n\nexport type TransformAssetKind = TransformAssetsContext['kind']\n\ntype TransformAssetsShorthandCrossOriginKind = Exclude<\n  TransformAssetKind,\n  'css-url'\n>\n\nexport type TransformAssetResult =\n  | string\n  | {\n      href: string\n      crossOrigin?: AssetCrossOrigin\n    }\n\nexport type TransformAssetsFn = (\n  context: TransformAssetsContext,\n) => Awaitable<TransformAssetResult>\n\nexport type CreateTransformAssetsContext =\n  | {\n      /** True when the server is computing the cached manifest during startup warmup. */\n      warmup: true\n    }\n  | {\n      /**\n       * The current Request.\n       *\n       * Only available during request handling (i.e. when `warmup: false`).\n       */\n      request: Request\n      /** False when transforming URLs as part of request handling. */\n      warmup: false\n    }\n\nexport type CreateTransformAssetsFn = (\n  ctx: CreateTransformAssetsContext,\n) => Awaitable<TransformAssetsFn>\n\ntype TransformAssetsOptionsBase = {\n  /**\n   * Whether to cache the transformed manifest after the first request.\n   *\n   * When `true` (default), the transform runs once on the first request and\n   * the resulting manifest is reused for all subsequent requests in production.\n   *\n   * Set to `false` for per-request transforms (e.g. geo-routing to different\n   * CDNs based on request headers).\n   *\n   * @default true\n   */\n  cache?: boolean\n\n  /**\n   * When `true`, warms up the cached transformed manifest in the background when\n   * the server starts (production only).\n   *\n   * This can reduce latency for the first request when `cache` is `true`.\n   * Has no effect when `cache: false` (per-request transforms) or in dev mode.\n   *\n   * @default false\n   */\n  warmup?: boolean\n}\n\nexport type TransformAssetsOptions =\n  | (TransformAssetsOptionsBase & {\n      transform: string | TransformAssetsFn\n      createTransform?: never\n    })\n  | (TransformAssetsOptionsBase & {\n      createTransform: CreateTransformAssetsFn\n      transform?: never\n    })\n\n/**\n * Per-kind crossOrigin configuration for the object shorthand.\n *\n * Accepts either a single value applied to all asset kinds, or a per-kind\n * record (matching `HeadContent`'s `assetCrossOrigin` shape):\n *\n * ```ts\n * // All assets get the same value\n * crossOrigin: 'anonymous'\n *\n * // Different values per kind\n * crossOrigin: { script: 'anonymous', stylesheet: 'use-credentials' }\n * ```\n */\nexport type TransformAssetsCrossOriginConfig =\n  | AssetCrossOrigin\n  | Partial<Record<TransformAssetsShorthandCrossOriginKind, AssetCrossOrigin>>\n\n/**\n * Object shorthand for `transformAssets`. Combines a URL prefix with optional\n * per-asset `crossOrigin` without needing a callback:\n *\n * ```ts\n * transformAssets: {\n *   prefix: 'https://cdn.example.com',\n *   crossOrigin: 'anonymous',\n * }\n * ```\n */\nexport interface TransformAssetsObjectShorthand {\n  /** URL prefix prepended to every asset URL. */\n  prefix: string\n  /**\n   * Optional crossOrigin attribute applied to transformed script and stylesheet assets.\n   *\n   * Accepts a single value or a per-kind record.\n   */\n  crossOrigin?: TransformAssetsCrossOriginConfig\n}\n\nexport type TransformAssets =\n  | string\n  | TransformAssetsFn\n  | TransformAssetsObjectShorthand\n  | TransformAssetsOptions\n\nexport type ResolvedTransformAssetsConfig =\n  | {\n      type: 'transform'\n      transformFn: TransformAssetsFn\n      cache: boolean\n    }\n  | {\n      type: 'createTransform'\n      createTransform: CreateTransformAssetsFn\n      cache: boolean\n    }\n\nfunction normalizeTransformAssetResult(\n  result: TransformAssetResult,\n): Exclude<TransformAssetResult, string> {\n  if (typeof result === 'string') {\n    return { href: result }\n  }\n\n  return result\n}\n\nfunction escapeCssString(value: string) {\n  return value\n    .replace(/\\\\/g, '\\\\\\\\')\n    .replace(/\"/g, '\\\\\"')\n    .replace(/\\n/g, '\\\\a ')\n    .replace(/\\r/g, '\\\\d ')\n    .replace(/\\f/g, '\\\\c ')\n}\n\nasync function transformInlineCssTemplate(options: {\n  stylesheetHref: string\n  template: { strings: Array<string>; urls: Array<string> }\n  transformFn: TransformAssetsFn\n}) {\n  const { strings, urls } = options.template\n\n  if (strings.length !== urls.length + 1) {\n    throw new Error(\n      `TanStack Start inlineCss template for ${options.stylesheetHref} is invalid`,\n    )\n  }\n\n  let css = strings[0]!\n\n  for (let index = 0; index < urls.length; index++) {\n    const transformed = normalizeTransformAssetResult(\n      await options.transformFn({\n        kind: 'css-url',\n        url: urls[index]!,\n        stylesheetHref: options.stylesheetHref,\n      }),\n    )\n\n    css += escapeCssString(transformed.href) + strings[index + 1]!\n  }\n\n  return css\n}\n\nasync function transformInlineCssStyles(\n  inlineCss: NonNullable<ServerManifest['inlineCss']>,\n  transformFn: TransformAssetsFn,\n) {\n  const transformedStyles: Record<string, string> = {}\n\n  const transformedEntries = await Promise.all(\n    Object.entries(inlineCss.styles).map(async ([stylesheetHref, css]) => {\n      const template = inlineCss.templates?.[stylesheetHref]\n      return [\n        stylesheetHref,\n        template\n          ? await transformInlineCssTemplate({\n              stylesheetHref,\n              template,\n              transformFn,\n            })\n          : css,\n      ] as const\n    }),\n  )\n\n  for (const [stylesheetHref, css] of transformedEntries) {\n    transformedStyles[stylesheetHref] = css\n  }\n\n  return {\n    styles: transformedStyles,\n    ...(inlineCss.templates ? { templates: inlineCss.templates } : {}),\n  }\n}\n\nfunction resolveTransformAssetsCrossOrigin(\n  config: TransformAssetsCrossOriginConfig | undefined,\n  kind: TransformAssetsShorthandCrossOriginKind,\n): AssetCrossOrigin | undefined {\n  if (!config) return undefined\n  if (typeof config === 'string') return config\n\n  return config[kind]\n}\n\nfunction isObjectShorthand(\n  transform: TransformAssetsObjectShorthand | TransformAssetsOptions,\n): transform is TransformAssetsObjectShorthand {\n  return 'prefix' in transform\n}\n\nexport function resolveTransformAssetsConfig(\n  transform: TransformAssets,\n): ResolvedTransformAssetsConfig {\n  if (typeof transform === 'string') {\n    const prefix = transform\n    return {\n      type: 'transform',\n      transformFn: ({ url }) => ({ href: `${prefix}${url}` }),\n      cache: true,\n    }\n  }\n\n  if (typeof transform === 'function') {\n    return {\n      type: 'transform',\n      transformFn: transform,\n      cache: true,\n    }\n  }\n\n  // Object shorthand: { prefix, crossOrigin? }\n  if (isObjectShorthand(transform)) {\n    const { prefix, crossOrigin } = transform\n\n    return {\n      type: 'transform',\n      transformFn: ({ url, kind }) => {\n        const href = `${prefix}${url}`\n\n        if (kind === 'css-url') {\n          return { href }\n        }\n\n        const co = resolveTransformAssetsCrossOrigin(crossOrigin, kind)\n        return co ? { href, crossOrigin: co } : { href }\n      },\n      cache: true,\n    }\n  }\n\n  if ('createTransform' in transform && transform.createTransform) {\n    return {\n      type: 'createTransform',\n      createTransform: transform.createTransform,\n      cache: transform.cache !== false,\n    }\n  }\n\n  const transformFn =\n    typeof transform.transform === 'string'\n      ? ((({ url }: TransformAssetsContext) => ({\n          href: `${transform.transform}${url}`,\n        })) as TransformAssetsFn)\n      : transform.transform\n\n  return {\n    type: 'transform',\n    transformFn,\n    cache: transform.cache !== false,\n  }\n}\n\nexport interface StartManifestWithClientEntry {\n  manifest: ServerManifest\n  clientEntry: string\n}\n\n/**\n * Builds the client entry `<script>` tag from a (possibly transformed) client\n * entry URL.\n */\nexport function buildClientEntryScriptTag(\n  clientEntry: string,\n  scriptFormat: ScriptFormat = 'module',\n  crossOrigin?: AssetCrossOrigin,\n): ManifestScript {\n  return {\n    attrs: {\n      ...(scriptFormat === 'module' ? { type: 'module' } : {}),\n      async: true,\n      src: clientEntry,\n      ...(crossOrigin ? { crossOrigin } : {}),\n    },\n  }\n}\n\ntype AssignableManifestLink = ManifestAssetLink | ManifestCssLink\n\nfunction assignManifestLink(\n  link: ManifestAssetLink,\n  next: { href: string; crossOrigin?: AssetCrossOrigin },\n): ManifestAssetLink\nfunction assignManifestLink(\n  link: ManifestCssLink,\n  next: { href: string; crossOrigin?: AssetCrossOrigin },\n): ManifestCssLink\nfunction assignManifestLink(\n  link: AssignableManifestLink,\n  next: { href: string; crossOrigin?: AssetCrossOrigin },\n): AssignableManifestLink {\n  if (typeof link === 'string') {\n    return next.crossOrigin ? next : next.href\n  }\n\n  const nextLink: Exclude<ManifestCssLink, string> = {\n    ...link,\n    href: next.href,\n  }\n\n  if (next.crossOrigin) {\n    nextLink.crossOrigin = next.crossOrigin\n  } else {\n    delete nextLink.crossOrigin\n  }\n\n  return nextLink\n}\n\nfunction appendUniqueManifestAssetLink(\n  target: Array<ManifestAssetLink> | undefined,\n  link: ManifestAssetLink,\n) {\n  const href = typeof link === 'string' ? link : link.href\n\n  if (target) {\n    for (const item of target) {\n      if ((typeof item === 'string' ? item : item.href) === href) {\n        return target\n      }\n    }\n  }\n\n  return [...(target ?? []), link]\n}\n\nfunction addClientEntryToManifest(\n  manifest: ServerManifest,\n  clientEntry: string,\n) {\n  const rootRoute = manifest.routes.__root__ ?? {}\n  const rootScripts = rootRoute.scripts ?? []\n  const scripts = rootScripts.some(\n    (script) => script.attrs?.src === clientEntry,\n  )\n    ? rootScripts\n    : [\n        ...rootScripts,\n        buildClientEntryScriptTag(\n          clientEntry,\n          getManifestScriptFormat(manifest),\n        ),\n      ]\n\n  manifest.routes = {\n    ...manifest.routes,\n    __root__: {\n      ...rootRoute,\n      preloads: appendUniqueManifestAssetLink(rootRoute.preloads, clientEntry),\n      scripts,\n    },\n  }\n}\n\nexport async function transformManifestAssets(\n  source: StartManifestWithClientEntry,\n  transformFn: TransformAssetsFn,\n  _opts?: {\n    clone?: boolean\n    inlineCss?: boolean\n  },\n): Promise<ServerManifest> {\n  const manifest = structuredClone(source.manifest)\n  const inlineCssEnabled = _opts?.inlineCss !== false\n  const scriptTransforms = new Map<\n    string,\n    Promise<Exclude<TransformAssetResult, string>>\n  >()\n  const transformScript = (url: string) => {\n    const cached = scriptTransforms.get(url)\n    if (cached) {\n      return cached\n    }\n\n    const transformed = Promise.resolve(\n      transformFn({\n        url,\n        kind: 'script',\n      }),\n    ).then(normalizeTransformAssetResult)\n    scriptTransforms.set(url, transformed)\n    return transformed\n  }\n\n  if (!inlineCssEnabled) {\n    delete manifest.inlineCss\n  } else if (manifest.inlineCss) {\n    manifest.inlineCss = await transformInlineCssStyles(\n      manifest.inlineCss,\n      transformFn,\n    )\n  }\n\n  addClientEntryToManifest(manifest, source.clientEntry)\n\n  for (const route of Object.values(manifest.routes)) {\n    if (route.preloads?.length) {\n      route.preloads = await Promise.all(\n        route.preloads.map(async (link) => {\n          const resolved = resolveManifestAssetLink(link)\n          const result = await transformScript(resolved.href)\n\n          return assignManifestLink(link, {\n            href: result.href,\n            crossOrigin: result.crossOrigin,\n          })\n        }),\n      )\n    }\n\n    if (route.css?.length && !manifest.inlineCss) {\n      route.css = await Promise.all(\n        route.css.map(async (link) => {\n          const resolved = resolveManifestCssLink(link)\n          const result = normalizeTransformAssetResult(\n            await transformFn({\n              url: resolved.href,\n              kind: 'stylesheet',\n            }),\n          )\n\n          return assignManifestLink(link, {\n            href: result.href,\n            crossOrigin: result.crossOrigin,\n          })\n        }),\n      )\n    }\n\n    if (route.scripts?.length) {\n      for (const script of route.scripts) {\n        const src = script.attrs?.src\n        if (typeof src !== 'string') {\n          continue\n        }\n\n        const result = await transformScript(src)\n\n        script.attrs = {\n          ...script.attrs,\n          src: result.href,\n        }\n        if (result.crossOrigin) {\n          script.attrs.crossOrigin = result.crossOrigin\n        } else {\n          delete script.attrs.crossOrigin\n        }\n      }\n    }\n  }\n\n  return manifest\n}\n\n/**\n * Builds a final ServerManifest from a StartManifestWithClientEntry without any\n * URL transforms. Used when no transformAssets option is provided.\n *\n * Returns a new manifest object so the cached base manifest is never mutated.\n */\nexport function buildManifestWithClientEntry(\n  source: StartManifestWithClientEntry,\n  opts?: { inlineCss?: boolean },\n): ServerManifest {\n  const manifest: ServerManifest = {\n    ...(source.manifest.scriptFormat\n      ? { scriptFormat: source.manifest.scriptFormat }\n      : {}),\n    ...(opts?.inlineCss !== false && source.manifest.inlineCss\n      ? { inlineCss: structuredClone(source.manifest.inlineCss) }\n      : {}),\n    routes: {\n      ...source.manifest.routes,\n    },\n  }\n\n  addClientEntryToManifest(manifest, source.clientEntry)\n\n  return manifest\n}\n"],"mappings":"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"}
+{"version":3,"file":"transformAssetUrls.js","names":[],"sources":["../../src/transformAssetUrls.ts"],"sourcesContent":["import {\n  resolveManifestAssetLink,\n  resolveManifestCssLink,\n} from '@tanstack/router-core'\n\nimport type {\n  AssetCrossOrigin,\n  Awaitable,\n  ManifestAssetLink,\n  ManifestCssLink,\n  ServerManifest,\n} from '@tanstack/router-core'\n\nexport type { AssetCrossOrigin }\n\nexport type TransformAssetsContext =\n  | {\n      url: string\n      kind: 'script'\n    }\n  | {\n      url: string\n      kind: 'stylesheet'\n    }\n  | {\n      url: string\n      kind: 'css-url'\n      stylesheetHref: string\n    }\n\nexport type TransformAssetKind = TransformAssetsContext['kind']\n\ntype TransformAssetsShorthandCrossOriginKind = Exclude<\n  TransformAssetKind,\n  'css-url'\n>\n\nexport type TransformAssetResult =\n  | string\n  | {\n      href: string\n      crossOrigin?: AssetCrossOrigin\n    }\n\nexport type TransformAssetsFn = (\n  context: TransformAssetsContext,\n) => Awaitable<TransformAssetResult>\n\nexport type CreateTransformAssetsContext =\n  | {\n      /** True when the server is computing the cached manifest during startup warmup. */\n      warmup: true\n    }\n  | {\n      /**\n       * The current Request.\n       *\n       * Only available during request handling (i.e. when `warmup: false`).\n       */\n      request: Request\n      /** False when transforming URLs as part of request handling. */\n      warmup: false\n    }\n\nexport type CreateTransformAssetsFn = (\n  ctx: CreateTransformAssetsContext,\n) => Awaitable<TransformAssetsFn>\n\ntype TransformAssetsOptionsBase = {\n  /**\n   * Whether to cache the transformed manifest after the first request.\n   *\n   * When `true` (default), the transform runs once on the first request and\n   * the resulting manifest is reused for all subsequent requests in production.\n   *\n   * Set to `false` for per-request transforms (e.g. geo-routing to different\n   * CDNs based on request headers).\n   *\n   * @default true\n   */\n  cache?: boolean\n\n  /**\n   * When `true`, warms up the cached transformed manifest in the background when\n   * the server starts (production only).\n   *\n   * This can reduce latency for the first request when `cache` is `true`.\n   * Has no effect when `cache: false` (per-request transforms) or in dev mode.\n   *\n   * @default false\n   */\n  warmup?: boolean\n}\n\nexport type TransformAssetsOptions =\n  | (TransformAssetsOptionsBase & {\n      transform: string | TransformAssetsFn\n      createTransform?: never\n    })\n  | (TransformAssetsOptionsBase & {\n      createTransform: CreateTransformAssetsFn\n      transform?: never\n    })\n\n/**\n * Per-kind crossOrigin configuration for the object shorthand.\n *\n * Accepts either a single value applied to all asset kinds, or a per-kind\n * record (matching `HeadContent`'s `assetCrossOrigin` shape):\n *\n * ```ts\n * // All assets get the same value\n * crossOrigin: 'anonymous'\n *\n * // Different values per kind\n * crossOrigin: { script: 'anonymous', stylesheet: 'use-credentials' }\n * ```\n */\nexport type TransformAssetsCrossOriginConfig =\n  | AssetCrossOrigin\n  | Partial<Record<TransformAssetsShorthandCrossOriginKind, AssetCrossOrigin>>\n\n/**\n * Object shorthand for `transformAssets`. Combines a URL prefix with optional\n * per-asset `crossOrigin` without needing a callback:\n *\n * ```ts\n * transformAssets: {\n *   prefix: 'https://cdn.example.com',\n *   crossOrigin: 'anonymous',\n * }\n * ```\n */\nexport interface TransformAssetsObjectShorthand {\n  /** URL prefix prepended to every asset URL. */\n  prefix: string\n  /**\n   * Optional crossOrigin attribute applied to transformed script and stylesheet assets.\n   *\n   * Accepts a single value or a per-kind record.\n   */\n  crossOrigin?: TransformAssetsCrossOriginConfig\n}\n\nexport type TransformAssets =\n  | string\n  | TransformAssetsFn\n  | TransformAssetsObjectShorthand\n  | TransformAssetsOptions\n\nexport type ResolvedTransformAssetsConfig =\n  | {\n      type: 'transform'\n      transformFn: TransformAssetsFn\n      cache: boolean\n    }\n  | {\n      type: 'createTransform'\n      createTransform: CreateTransformAssetsFn\n      cache: boolean\n    }\n\nfunction normalizeTransformAssetResult(\n  result: TransformAssetResult,\n): Exclude<TransformAssetResult, string> {\n  if (typeof result === 'string') {\n    return { href: result }\n  }\n\n  return result\n}\n\nfunction escapeCssString(value: string) {\n  return value\n    .replace(/\\\\/g, '\\\\\\\\')\n    .replace(/\"/g, '\\\\\"')\n    .replace(/\\n/g, '\\\\a ')\n    .replace(/\\r/g, '\\\\d ')\n    .replace(/\\f/g, '\\\\c ')\n}\n\nasync function transformInlineCssTemplate(options: {\n  stylesheetHref: string\n  template: { strings: Array<string>; urls: Array<string> }\n  transformFn: TransformAssetsFn\n}) {\n  const { strings, urls } = options.template\n\n  if (strings.length !== urls.length + 1) {\n    throw new Error(\n      `TanStack Start inlineCss template for ${options.stylesheetHref} is invalid`,\n    )\n  }\n\n  let css = strings[0]!\n\n  for (let index = 0; index < urls.length; index++) {\n    const transformed = normalizeTransformAssetResult(\n      await options.transformFn({\n        kind: 'css-url',\n        url: urls[index]!,\n        stylesheetHref: options.stylesheetHref,\n      }),\n    )\n\n    css += escapeCssString(transformed.href) + strings[index + 1]!\n  }\n\n  return css\n}\n\nasync function transformInlineCssStyles(\n  inlineCss: NonNullable<ServerManifest['inlineCss']>,\n  transformFn: TransformAssetsFn,\n) {\n  const transformedStyles: Record<string, string> = {}\n\n  const transformedEntries = await Promise.all(\n    Object.entries(inlineCss.styles).map(async ([stylesheetHref, css]) => {\n      const template = inlineCss.templates?.[stylesheetHref]\n      return [\n        stylesheetHref,\n        template\n          ? await transformInlineCssTemplate({\n              stylesheetHref,\n              template,\n              transformFn,\n            })\n          : css,\n      ] as const\n    }),\n  )\n\n  for (const [stylesheetHref, css] of transformedEntries) {\n    transformedStyles[stylesheetHref] = css\n  }\n\n  return {\n    styles: transformedStyles,\n    ...(inlineCss.templates ? { templates: inlineCss.templates } : {}),\n  }\n}\n\nfunction resolveTransformAssetsCrossOrigin(\n  config: TransformAssetsCrossOriginConfig | undefined,\n  kind: TransformAssetsShorthandCrossOriginKind,\n): AssetCrossOrigin | undefined {\n  if (!config) return undefined\n  if (typeof config === 'string') return config\n\n  return config[kind]\n}\n\nfunction isObjectShorthand(\n  transform: TransformAssetsObjectShorthand | TransformAssetsOptions,\n): transform is TransformAssetsObjectShorthand {\n  return 'prefix' in transform\n}\n\nexport function resolveTransformAssetsConfig(\n  transform: TransformAssets,\n): ResolvedTransformAssetsConfig {\n  if (typeof transform === 'string') {\n    const prefix = transform\n    return {\n      type: 'transform',\n      transformFn: ({ url }) => ({ href: `${prefix}${url}` }),\n      cache: true,\n    }\n  }\n\n  if (typeof transform === 'function') {\n    return {\n      type: 'transform',\n      transformFn: transform,\n      cache: true,\n    }\n  }\n\n  // Object shorthand: { prefix, crossOrigin? }\n  if (isObjectShorthand(transform)) {\n    const { prefix, crossOrigin } = transform\n\n    return {\n      type: 'transform',\n      transformFn: ({ url, kind }) => {\n        const href = `${prefix}${url}`\n\n        if (kind === 'css-url') {\n          return { href }\n        }\n\n        const co = resolveTransformAssetsCrossOrigin(crossOrigin, kind)\n        return co ? { href, crossOrigin: co } : { href }\n      },\n      cache: true,\n    }\n  }\n\n  if ('createTransform' in transform && transform.createTransform) {\n    return {\n      type: 'createTransform',\n      createTransform: transform.createTransform,\n      cache: transform.cache !== false,\n    }\n  }\n\n  const transformFn =\n    typeof transform.transform === 'string'\n      ? ((({ url }: TransformAssetsContext) => ({\n          href: `${transform.transform}${url}`,\n        })) as TransformAssetsFn)\n      : transform.transform\n\n  return {\n    type: 'transform',\n    transformFn,\n    cache: transform.cache !== false,\n  }\n}\n\ntype AssignableManifestLink = ManifestAssetLink | ManifestCssLink\n\nfunction assignManifestLink(\n  link: ManifestAssetLink,\n  next: { href: string; crossOrigin?: AssetCrossOrigin },\n): ManifestAssetLink\nfunction assignManifestLink(\n  link: ManifestCssLink,\n  next: { href: string; crossOrigin?: AssetCrossOrigin },\n): ManifestCssLink\nfunction assignManifestLink(\n  link: AssignableManifestLink,\n  next: { href: string; crossOrigin?: AssetCrossOrigin },\n): AssignableManifestLink {\n  if (typeof link === 'string') {\n    return next.crossOrigin ? next : next.href\n  }\n\n  const nextLink: Exclude<ManifestCssLink, string> = {\n    ...link,\n    href: next.href,\n  }\n\n  if (next.crossOrigin) {\n    nextLink.crossOrigin = next.crossOrigin\n  } else {\n    delete nextLink.crossOrigin\n  }\n\n  return nextLink\n}\n\nexport async function transformManifestAssets(\n  source: ServerManifest,\n  transformFn: TransformAssetsFn,\n  _opts?: {\n    clone?: boolean\n    inlineCss?: boolean\n  },\n): Promise<ServerManifest> {\n  const manifest = structuredClone(source)\n  const inlineCssEnabled = _opts?.inlineCss !== false\n  const scriptTransforms = new Map<\n    string,\n    Promise<Exclude<TransformAssetResult, string>>\n  >()\n  const transformScript = (url: string) => {\n    const cached = scriptTransforms.get(url)\n    if (cached) {\n      return cached\n    }\n\n    const transformed = Promise.resolve(\n      transformFn({\n        url,\n        kind: 'script',\n      }),\n    ).then(normalizeTransformAssetResult)\n    scriptTransforms.set(url, transformed)\n    return transformed\n  }\n\n  if (!inlineCssEnabled) {\n    delete manifest.inlineCss\n  } else if (manifest.inlineCss) {\n    manifest.inlineCss = await transformInlineCssStyles(\n      manifest.inlineCss,\n      transformFn,\n    )\n  }\n\n  for (const route of Object.values(manifest.routes)) {\n    if (route.preloads?.length) {\n      route.preloads = await Promise.all(\n        route.preloads.map(async (link) => {\n          const resolved = resolveManifestAssetLink(link)\n          const result = await transformScript(resolved.href)\n\n          return assignManifestLink(link, {\n            href: result.href,\n            crossOrigin: result.crossOrigin,\n          })\n        }),\n      )\n    }\n\n    if (route.css?.length && !manifest.inlineCss) {\n      route.css = await Promise.all(\n        route.css.map(async (link) => {\n          const resolved = resolveManifestCssLink(link)\n          const result = normalizeTransformAssetResult(\n            await transformFn({\n              url: resolved.href,\n              kind: 'stylesheet',\n            }),\n          )\n\n          return assignManifestLink(link, {\n            href: result.href,\n            crossOrigin: result.crossOrigin,\n          })\n        }),\n      )\n    }\n\n    if (route.scripts?.length) {\n      for (const script of route.scripts) {\n        const src = script.attrs?.src\n        if (typeof src !== 'string') {\n          continue\n        }\n\n        const result = await transformScript(src)\n\n        script.attrs = {\n          ...script.attrs,\n          src: result.href,\n        }\n        if (result.crossOrigin) {\n          script.attrs.crossOrigin = result.crossOrigin\n        } else {\n          delete script.attrs.crossOrigin\n        }\n      }\n    }\n  }\n\n  return manifest\n}\n\n/**\n * Builds a final ServerManifest without URL transforms. Used when no\n * transformAssets option is provided.\n *\n * Returns a new manifest object so the cached base manifest is never mutated.\n */\nexport function buildManifest(\n  source: ServerManifest,\n  opts?: { inlineCss?: boolean },\n): ServerManifest {\n  const manifest: ServerManifest = {\n    ...(source.scriptFormat ? { scriptFormat: source.scriptFormat } : {}),\n    ...(opts?.inlineCss !== false && source.inlineCss\n      ? { inlineCss: structuredClone(source.inlineCss) }\n      : {}),\n    routes: {\n      ...source.routes,\n    },\n  }\n\n  return manifest\n}\n"],"mappings":";;AAkKA,SAAS,8BACP,QACuC;CACvC,IAAI,OAAO,WAAW,UACpB,OAAO,EAAE,MAAM,OAAO;CAGxB,OAAO;AACT;AAEA,SAAS,gBAAgB,OAAe;CACtC,OAAO,MACJ,QAAQ,OAAO,MAAM,EACrB,QAAQ,MAAM,MAAK,EACnB,QAAQ,OAAO,MAAM,EACrB,QAAQ,OAAO,MAAM,EACrB,QAAQ,OAAO,MAAM;AAC1B;AAEA,eAAe,2BAA2B,SAIvC;CACD,MAAM,EAAE,SAAS,SAAS,QAAQ;CAElC,IAAI,QAAQ,WAAW,KAAK,SAAS,GACnC,MAAM,IAAI,MACR,yCAAyC,QAAQ,eAAe,YAClE;CAGF,IAAI,MAAM,QAAQ;CAElB,KAAK,IAAI,QAAQ,GAAG,QAAQ,KAAK,QAAQ,SAAS;EAChD,MAAM,cAAc,8BAClB,MAAM,QAAQ,YAAY;GACxB,MAAM;GACN,KAAK,KAAK;GACV,gBAAgB,QAAQ;EAC1B,CAAC,CACH;EAEA,OAAO,gBAAgB,YAAY,IAAI,IAAI,QAAQ,QAAQ;CAC7D;CAEA,OAAO;AACT;AAEA,eAAe,yBACb,WACA,aACA;CACA,MAAM,oBAA4C,CAAC;CAEnD,MAAM,qBAAqB,MAAM,QAAQ,IACvC,OAAO,QAAQ,UAAU,MAAM,EAAE,IAAI,OAAO,CAAC,gBAAgB,SAAS;EACpE,MAAM,WAAW,UAAU,YAAY;EACvC,OAAO,CACL,gBACA,WACI,MAAM,2BAA2B;GAC/B;GACA;GACA;EACF,CAAC,IACD,GACN;CACF,CAAC,CACH;CAEA,KAAK,MAAM,CAAC,gBAAgB,QAAQ,oBAClC,kBAAkB,kBAAkB;CAGtC,OAAO;EACL,QAAQ;EACR,GAAI,UAAU,YAAY,EAAE,WAAW,UAAU,UAAU,IAAI,CAAC;CAClE;AACF;AAEA,SAAS,kCACP,QACA,MAC8B;CAC9B,IAAI,CAAC,QAAQ,OAAO,KAAA;CACpB,IAAI,OAAO,WAAW,UAAU,OAAO;CAEvC,OAAO,OAAO;AAChB;AAEA,SAAS,kBACP,WAC6C;CAC7C,OAAO,YAAY;AACrB;AAEA,SAAgB,6BACd,WAC+B;CAC/B,IAAI,OAAO,cAAc,UAAU;EACjC,MAAM,SAAS;EACf,OAAO;GACL,MAAM;GACN,cAAc,EAAE,WAAW,EAAE,MAAM,GAAG,SAAS,MAAM;GACrD,OAAO;EACT;CACF;CAEA,IAAI,OAAO,cAAc,YACvB,OAAO;EACL,MAAM;EACN,aAAa;EACb,OAAO;CACT;CAIF,IAAI,kBAAkB,SAAS,GAAG;EAChC,MAAM,EAAE,QAAQ,gBAAgB;EAEhC,OAAO;GACL,MAAM;GACN,cAAc,EAAE,KAAK,WAAW;IAC9B,MAAM,OAAO,GAAG,SAAS;IAEzB,IAAI,SAAS,WACX,OAAO,EAAE,KAAK;IAGhB,MAAM,KAAK,kCAAkC,aAAa,IAAI;IAC9D,OAAO,KAAK;KAAE;KAAM,aAAa;IAAG,IAAI,EAAE,KAAK;GACjD;GACA,OAAO;EACT;CACF;CAEA,IAAI,qBAAqB,aAAa,UAAU,iBAC9C,OAAO;EACL,MAAM;EACN,iBAAiB,UAAU;EAC3B,OAAO,UAAU,UAAU;CAC7B;CAUF,OAAO;EACL,MAAM;EACN,aARA,OAAO,UAAU,cAAc,aACxB,EAAE,WAAmC,EACtC,MAAM,GAAG,UAAU,YAAY,MACjC,MACA,UAAU;EAKd,OAAO,UAAU,UAAU;CAC7B;AACF;AAYA,SAAS,mBACP,MACA,MACwB;CACxB,IAAI,OAAO,SAAS,UAClB,OAAO,KAAK,cAAc,OAAO,KAAK;CAGxC,MAAM,WAA6C;EACjD,GAAG;EACH,MAAM,KAAK;CACb;CAEA,IAAI,KAAK,aACP,SAAS,cAAc,KAAK;MAE5B,OAAO,SAAS;CAGlB,OAAO;AACT;AAEA,eAAsB,wBACpB,QACA,aACA,OAIyB;CACzB,MAAM,WAAW,gBAAgB,MAAM;CACvC,MAAM,mBAAmB,OAAO,cAAc;CAC9C,MAAM,mCAAmB,IAAI,IAG3B;CACF,MAAM,mBAAmB,QAAgB;EACvC,MAAM,SAAS,iBAAiB,IAAI,GAAG;EACvC,IAAI,QACF,OAAO;EAGT,MAAM,cAAc,QAAQ,QAC1B,YAAY;GACV;GACA,MAAM;EACR,CAAC,CACH,EAAE,KAAK,6BAA6B;EACpC,iBAAiB,IAAI,KAAK,WAAW;EACrC,OAAO;CACT;CAEA,IAAI,CAAC,kBACH,OAAO,SAAS;MACX,IAAI,SAAS,WAClB,SAAS,YAAY,MAAM,yBACzB,SAAS,WACT,WACF;CAGF,KAAK,MAAM,SAAS,OAAO,OAAO,SAAS,MAAM,GAAG;EAClD,IAAI,MAAM,UAAU,QAClB,MAAM,WAAW,MAAM,QAAQ,IAC7B,MAAM,SAAS,IAAI,OAAO,SAAS;GAEjC,MAAM,SAAS,MAAM,gBADJ,yBAAyB,IACL,EAAS,IAAI;GAElD,OAAO,mBAAmB,MAAM;IAC9B,MAAM,OAAO;IACb,aAAa,OAAO;GACtB,CAAC;EACH,CAAC,CACH;EAGF,IAAI,MAAM,KAAK,UAAU,CAAC,SAAS,WACjC,MAAM,MAAM,MAAM,QAAQ,IACxB,MAAM,IAAI,IAAI,OAAO,SAAS;GAE5B,MAAM,SAAS,8BACb,MAAM,YAAY;IAChB,KAHa,uBAAuB,IAG/B,EAAS;IACd,MAAM;GACR,CAAC,CACH;GAEA,OAAO,mBAAmB,MAAM;IAC9B,MAAM,OAAO;IACb,aAAa,OAAO;GACtB,CAAC;EACH,CAAC,CACH;EAGF,IAAI,MAAM,SAAS,QACjB,KAAK,MAAM,UAAU,MAAM,SAAS;GAClC,MAAM,MAAM,OAAO,OAAO;GAC1B,IAAI,OAAO,QAAQ,UACjB;GAGF,MAAM,SAAS,MAAM,gBAAgB,GAAG;GAExC,OAAO,QAAQ;IACb,GAAG,OAAO;IACV,KAAK,OAAO;GACd;GACA,IAAI,OAAO,aACT,OAAO,MAAM,cAAc,OAAO;QAElC,OAAO,OAAO,MAAM;EAExB;CAEJ;CAEA,OAAO;AACT;;;;;;;AAQA,SAAgB,cACd,QACA,MACgB;CAWhB,OAAO;EATL,GAAI,OAAO,eAAe,EAAE,cAAc,OAAO,aAAa,IAAI,CAAC;EACnE,GAAI,MAAM,cAAc,SAAS,OAAO,YACpC,EAAE,WAAW,gBAAgB,OAAO,SAAS,EAAE,IAC/C,CAAC;EACL,QAAQ,EACN,GAAG,OAAO,OACZ;CAGK;AACT"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-server-core",
-  "version": "1.169.4",
+  "version": "1.169.6",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -70,9 +70,9 @@
     "h3-v2": "npm:h3@2.0.1-rc.20",
     "seroval": "^1.5.4",
     "@tanstack/history": "1.162.0",
-    "@tanstack/router-core": "1.171.6",
-    "@tanstack/start-client-core": "1.170.4",
-    "@tanstack/start-storage-context": "1.167.8"
+    "@tanstack/start-storage-context": "1.167.9",
+    "@tanstack/router-core": "1.171.7",
+    "@tanstack/start-client-core": "1.170.5"
   },
   "devDependencies": {
     "@standard-schema/spec": "^1.0.0",

package/src/createStartHandler.ts

@@ -16,6 +16,10 @@ import {
   attachRouterServerSsrUtils,
   getNormalizedURL,
   getOrigin,
+  isSsrResponse,
+  normalizeSsrResponse,
+  replaceSsrResponse,
+  stripSsrResponseBody,
 } from '@tanstack/router-core/ssr/server'
 import {
   getStartContext,
@@ -48,7 +52,11 @@ import type {
   AnySerializationAdapter,
   Register,
 } from '@tanstack/router-core'
-import type { HandlerCallback } from '@tanstack/router-core/ssr/server'
+import type {
+  HandlerCallback,
+  HandlerCallbackResult,
+  SsrResponse,
+} from '@tanstack/router-core/ssr/server'
 import type { FinalManifestOptions } from './finalManifest'
 
 type TODO = any
@@ -194,7 +202,7 @@ function isSpecialResponse(value: unknown): value is Response {
  * Normalize middleware result to context shape
  */
 function handleCtxResult(result: TODO) {
-  if (isSpecialResponse(result)) {
+  if (isSsrResponse(result) || isSpecialResponse(result)) {
     return { response: result }
   }
   return result
@@ -203,8 +211,70 @@ function handleCtxResult(result: TODO) {
 /**
  * Execute a middleware chain
  */
-function executeMiddleware(middlewares: Array<TODO>, ctx: TODO): Promise<TODO> {
+async function executeMiddleware(
+  middlewares: Array<TODO>,
+  ctx: TODO,
+): Promise<{ ctx: TODO; response: HandlerCallbackResult }> {
   let index = -1
+  let streamResponse:
+    | Extract<SsrResponse, { serverSsrCleanup: 'stream' }>
+    | undefined
+
+  const setResponse = (response: TODO) => {
+    if (isSsrResponse(response)) {
+      if (response.serverSsrCleanup === 'stream') {
+        streamResponse = response
+      }
+      ctx.response = response.response
+      return
+    }
+
+    ctx.response = response
+  }
+
+  const disposeStreamResponse = async (reason: string) => {
+    const response = streamResponse
+    if (!response) {
+      return
+    }
+
+    streamResponse = undefined
+    const currentResponse = ctx.response
+    if (
+      currentResponse === response.response ||
+      (currentResponse instanceof Response &&
+        response.response.body !== null &&
+        currentResponse.body === response.response.body)
+    ) {
+      ctx.response = undefined
+    }
+    await response.dispose(reason)
+  }
+
+  const getFinalResponse = async (): Promise<HandlerCallbackResult> => {
+    const response = ctx.response
+    if (!response) {
+      throwRouteHandlerError()
+    }
+
+    if (!streamResponse) {
+      return response
+    }
+
+    if (response === streamResponse.response) {
+      return streamResponse
+    }
+
+    if (
+      streamResponse.response.body !== null &&
+      response.body === streamResponse.response.body
+    ) {
+      return { ...streamResponse, response }
+    }
+
+    await disposeStreamResponse('middleware response replaced')
+    return response
+  }
 
   const next = async (nextCtx?: TODO): Promise<TODO> => {
     // Merge context if provided using safeObjectMerge for prototype pollution prevention
@@ -214,7 +284,9 @@ function executeMiddleware(middlewares: Array<TODO>, ctx: TODO): Promise<TODO> {
       }
       // Copy own properties except context (Object.keys returns only own enumerable properties)
       for (const key of Object.keys(nextCtx)) {
-        if (key !== 'context') {
+        if (key === 'response') {
+          setResponse(nextCtx.response)
+        } else if (key !== 'context') {
           ctx[key] = nextCtx[key]
         }
       }
@@ -229,16 +301,17 @@ function executeMiddleware(middlewares: Array<TODO>, ctx: TODO): Promise<TODO> {
       result = await middleware({ ...ctx, next })
     } catch (err) {
       if (isSpecialResponse(err)) {
-        ctx.response = err
+        setResponse(err)
         return ctx
       }
+      await disposeStreamResponse('middleware error')
       throw err
     }
 
     const normalized = handleCtxResult(result)
     if (normalized) {
       if (normalized.response !== undefined) {
-        ctx.response = normalized.response
+        setResponse(normalized.response)
       }
       if (normalized.context) {
         ctx.context = safeObjectMerge(ctx.context, normalized.context)
@@ -248,7 +321,8 @@ function executeMiddleware(middlewares: Array<TODO>, ctx: TODO): Promise<TODO> {
     return ctx
   }
 
-  return next()
+  await next()
+  return { ctx, response: await getFinalResponse() }
 }
 
 /**
@@ -327,7 +401,7 @@ export function createStartHandler<TRegister = Register>(
     requestOpts,
   ) => {
     let router: AnyRouter | null = null as AnyRouter | null
-    let cbWillCleanup = false as boolean
+    let responseOwnsCleanup = false as boolean
 
     try {
       // normalizing and sanitizing the pathname here for server, so we always deal with the same format during SSR.
@@ -447,21 +521,30 @@ export function createStartHandler<TRegister = Register>(
         const middlewares = flattenedRequestMiddlewares.map(
           (d) => d.options.server,
         )
-        const ctx = await executeMiddleware([...middlewares, serverFnHandler], {
-          request,
-          pathname: url.pathname,
-          handlerType: 'serverFn',
-          context: createNullProtoObject(requestOpts?.context),
-        })
+        const { response: middlewareResponse } = await executeMiddleware(
+          [...middlewares, serverFnHandler],
+          {
+            request,
+            pathname: url.pathname,
+            handlerType: 'serverFn',
+            context: createNullProtoObject(requestOpts?.context),
+          },
+        )
 
-        return handleRedirectResponse(ctx.response, request, getRouter)
+        const result = await handleRedirectResponse(
+          middlewareResponse,
+          request,
+          getRouter,
+        )
+        responseOwnsCleanup = result.serverSsrCleanup === 'stream'
+        return result.response
       }
 
       // Router execution function
       const executeRouter = async (
         serverContext: TODO,
         matchedRoutes?: ReadonlyArray<AnyRoute>,
-      ): Promise<Response> => {
+      ): Promise<SsrResponse> => {
         const acceptHeader = request.headers.get('Accept') || '*/*'
         const acceptParts = acceptHeader.split(',')
         const supportedMimeTypes = ['*/*', 'text/html']
@@ -471,9 +554,11 @@ export function createStartHandler<TRegister = Register>(
         )
 
         if (!isSupported) {
-          return Response.json(
-            { error: 'Only HTML requests are supported here' },
-            { status: 500 },
+          return normalizeSsrResponse(
+            Response.json(
+              { error: 'Only HTML requests are supported here' },
+              { status: 500 },
+            ),
           )
         }
 
@@ -503,7 +588,7 @@ export function createStartHandler<TRegister = Register>(
         await routerInstance.load()
 
         if (routerInstance.state.redirect) {
-          return routerInstance.state.redirect
+          return normalizeSsrResponse(routerInstance.state.redirect)
         }
 
         earlyHints?.collectDynamic(routerInstance.stores.matches.get())
@@ -518,13 +603,12 @@ export function createStartHandler<TRegister = Register>(
           router: routerInstance,
         })
         earlyHints?.appendResponseHeaders(responseHeaders)
-        cbWillCleanup = true
-
-        return cb({
+        const response = await cb({
           request,
           router: routerInstance,
           responseHeaders,
         })
+        return normalizeSsrResponse(response)
       }
 
       // Main request handler
@@ -561,7 +645,7 @@ export function createStartHandler<TRegister = Register>(
       const middlewares = flattenedRequestMiddlewares.map(
         (d) => d.options.server,
       )
-      const ctx = await executeMiddleware(
+      const { response: middlewareResponse } = await executeMiddleware(
         [...middlewares, requestHandlerMiddleware],
         {
           request,
@@ -571,14 +655,19 @@ export function createStartHandler<TRegister = Register>(
         },
       )
 
-      return handleRedirectResponse(ctx.response, request, getRouter)
+      const response = await handleRedirectResponse(
+        middlewareResponse,
+        request,
+        getRouter,
+      )
+      responseOwnsCleanup = response.serverSsrCleanup === 'stream'
+      return response.response
     } finally {
-      if (router && !cbWillCleanup) {
+      if (router?.serverSsr && !responseOwnsCleanup) {
         // Clean up router SSR state if it was set up but won't be cleaned up by the callback
         // (e.g., in redirect cases or early returns before the callback is invoked).
-        // When the callback runs, it handles cleanup (either via transformStreamWithRouter
-        // for streaming, or directly in renderRouterToString for non-streaming).
-        router.serverSsr?.cleanup()
+        // Transformed streaming response bodies clean up when consumed/cancelled.
+        router.serverSsr.cleanup()
       }
       router = null
     }
@@ -588,25 +677,30 @@ export function createStartHandler<TRegister = Register>(
 }
 
 async function handleRedirectResponse(
-  response: Response,
+  response: HandlerCallbackResult,
   request: Request,
   getRouter: () => Promise<AnyRouter>,
-): Promise<Response> {
-  if (!isRedirect(response)) {
-    return response
+): Promise<SsrResponse> {
+  const ssrResponse = normalizeSsrResponse(response)
+  if (!isRedirect(ssrResponse.response)) {
+    return ssrResponse
   }
 
-  if (isResolvedRedirect(response)) {
+  if (isResolvedRedirect(ssrResponse.response)) {
     if (request.headers.get('x-tsr-serverFn') === 'true') {
-      return Response.json(
-        { ...response.options, isSerializedRedirect: true },
-        { headers: response.headers },
+      return replaceSsrResponse(
+        ssrResponse,
+        Response.json(
+          { ...ssrResponse.response.options, isSerializedRedirect: true },
+          { headers: ssrResponse.response.headers },
+        ),
+        'redirect response replaced',
       )
     }
-    return response
+    return ssrResponse
   }
 
-  const opts = response.options
+  const opts = ssrResponse.response.options
   if (opts.to && typeof opts.to === 'string' && !opts.to.startsWith('/')) {
     throw new Error(
       `Server side redirects must use absolute paths via the 'href' or 'to' options. The redirect() method's "to" property accepts an internal path only. Use the "href" property to provide an external URL. Received: ${JSON.stringify(opts)}`,
@@ -629,16 +723,20 @@ async function handleRedirectResponse(
   }
 
   const router = await getRouter()
-  const redirect = router.resolveRedirect(response)
+  const redirect = router.resolveRedirect(ssrResponse.response)
 
   if (request.headers.get('x-tsr-serverFn') === 'true') {
-    return Response.json(
-      { ...response.options, isSerializedRedirect: true },
-      { headers: response.headers },
+    return replaceSsrResponse(
+      ssrResponse,
+      Response.json(
+        { ...ssrResponse.response.options, isSerializedRedirect: true },
+        { headers: ssrResponse.response.headers },
+      ),
+      'redirect response replaced',
     )
   }
 
-  return redirect
+  return replaceSsrResponse(ssrResponse, redirect, 'redirect response replaced')
 }
 
 async function handleServerRoutes({
@@ -655,10 +753,10 @@ async function handleServerRoutes({
   executeRouter: (
     serverContext: any,
     matchedRoutes?: ReadonlyArray<AnyRoute>,
-  ) => Promise<Response>
+  ) => Promise<SsrResponse>
   context: any
   executedRequestMiddlewares: Set<AnyRequestMiddleware>
-}): Promise<Response> {
+}): Promise<SsrResponse> {
   const router = await getRouter()
   const rewrittenUrl = executeRewriteInput(router.rewrite, url)
   const pathname = rewrittenUrl.pathname
@@ -728,11 +826,10 @@ async function handleServerRoutes({
   }
 
   // Final middleware: execute router with matched routes for dev styles
-  routeMiddlewares.push((ctx: TODO) =>
-    executeRouter(ctx.context, matchedRoutes),
-  )
+  routeMiddlewares.push(((ctx: TODO) =>
+    executeRouter(ctx.context, matchedRoutes)) as TODO)
 
-  const ctx = await executeMiddleware(routeMiddlewares, {
+  const { ctx, response } = await executeMiddleware(routeMiddlewares, {
     request,
     context,
     params: routeParams,
@@ -747,13 +844,9 @@ async function handleServerRoutes({
       throwRouteHandlerError()
     }
 
-    const resolved = await handleRedirectResponse(
-      ctx.response,
-      request,
-      getRouter,
-    )
-    return new Response(null, resolved)
+    const resolved = await handleRedirectResponse(response, request, getRouter)
+    return stripSsrResponseBody(resolved, 'HEAD body stripped')
   }
 
-  return ctx.response
+  return normalizeSsrResponse(response)
 }

package/src/finalManifest.ts

@@ -1,5 +1,5 @@
 import {
-  buildManifestWithClientEntry,
+  buildManifest,
   resolveTransformAssetsConfig,
   transformManifestAssets,
 } from './transformAssetUrls'
@@ -11,16 +11,11 @@ import type { ServerManifest } from '@tanstack/router-core'
 import type { HandlerInlineCssOption } from './inlineCss'
 import type {
   CreateTransformAssetsContext,
-  StartManifestWithClientEntry,
   TransformAssets,
   TransformAssetsFn,
 } from './transformAssetUrls'
 
-export type {
-  HandlerInlineCssOption,
-  StartManifestWithClientEntry,
-  TransformAssets,
-}
+export type { HandlerInlineCssOption, TransformAssets }
 
 export interface FinalManifestOptions {
   /**
@@ -37,8 +32,8 @@ export interface FinalManifestOptions {
    * Transform manifest-managed asset URLs and attributes at runtime, e.g. to
    * prepend a CDN prefix.
    *
-   * This covers JS preloads, CSS links, the client entry script, and URLs
-   * inside build-collected inline CSS. Asset imports used directly in
+   * This covers JS preloads, manifest script tags, CSS links, and URLs inside
+   * build-collected inline CSS. Asset imports used directly in
    * components should be handled by the bundler instead.
    */
   transformAssets?: TransformAssets
@@ -46,7 +41,7 @@ export interface FinalManifestOptions {
 
 type FinalManifestCacheKey = 'inline-css' | 'linked-css'
 type FinalManifestCache = Map<FinalManifestCacheKey, Promise<ServerManifest>>
-export type GetBaseManifest = () => Promise<StartManifestWithClientEntry>
+export type GetBaseManifest = () => Promise<ServerManifest>
 
 export interface FinalManifestRequestOptions {
   request: Request
@@ -76,7 +71,7 @@ export interface FinalManifestResolver {
 export function createCachedBaseManifestLoader(
   loadBaseManifest: GetBaseManifest,
 ): GetBaseManifest {
-  let baseManifestPromise: Promise<StartManifestWithClientEntry> | undefined
+  let baseManifestPromise: Promise<ServerManifest> | undefined
 
   return () => {
     if (!baseManifestPromise) {
@@ -241,7 +236,7 @@ function getOrCreateCachedFinalManifestPromise(
 }
 
 async function buildFinalManifest(opts: {
-  base: StartManifestWithClientEntry
+  base: ServerManifest
   transformFn: TransformAssetsFn | undefined
   inlineCss: boolean
 }): Promise<ServerManifest> {
@@ -249,11 +244,11 @@ async function buildFinalManifest(opts: {
     ? await transformManifestAssets(opts.base, opts.transformFn, {
         inlineCss: opts.inlineCss,
       })
-    : buildManifestWithClientEntry(opts.base, { inlineCss: opts.inlineCss })
+    : buildManifest(opts.base, { inlineCss: opts.inlineCss })
 }
 
 async function resolveFinalManifest(opts: {
-  getBaseManifest: () => Promise<StartManifestWithClientEntry>
+  getBaseManifest: () => Promise<ServerManifest>
   transformFn: TransformAssetsFn | undefined
   cache: boolean
   inlineCss: boolean
@@ -283,7 +278,7 @@ function warmupFinalManifest(opts: {
   handlerDefaultInlineCss: boolean | undefined
   cache: boolean
   finalManifestCache: FinalManifestCache
-  getBaseManifest: () => Promise<StartManifestWithClientEntry>
+  getBaseManifest: () => Promise<ServerManifest>
   getTransformFn: () => Promise<TransformAssetsFn | undefined>
   onError?: () => void
 }): Promise<ServerManifest> | undefined {