@tanstack/start-server-core 1.169.2 → 1.169.3

package/dist/esm/transformAssetUrls.d.ts

@@ -1,21 +1,18 @@
-import { AssetCrossOrigin, Awaitable, Manifest, RouterManagedTag } from '@tanstack/router-core';
+import { AssetCrossOrigin, Awaitable, ManifestScript, ScriptFormat, ServerManifest } from '@tanstack/router-core';
 export type { AssetCrossOrigin };
 export type TransformAssetsContext = {
     url: string;
-    kind: 'modulepreload';
+    kind: 'script';
 } | {
     url: string;
     kind: 'stylesheet';
-} | {
-    url: string;
-    kind: 'clientEntry';
 } | {
     url: string;
     kind: 'css-url';
     stylesheetHref: string;
 };
 export type TransformAssetKind = TransformAssetsContext['kind'];
-type TransformAssetsShorthandCrossOriginKind = Exclude<TransformAssetKind, 'clientEntry' | 'css-url'>;
+type TransformAssetsShorthandCrossOriginKind = Exclude<TransformAssetKind, 'css-url'>;
 export type TransformAssetResult = string | {
     href: string;
     crossOrigin?: AssetCrossOrigin;
@@ -77,7 +74,7 @@ export type TransformAssetsOptions = (TransformAssetsOptionsBase & {
  * crossOrigin: 'anonymous'
  *
  * // Different values per kind
- * crossOrigin: { modulepreload: 'anonymous', stylesheet: 'use-credentials' }
+ * crossOrigin: { script: 'anonymous', stylesheet: 'use-credentials' }
  * ```
  */
 export type TransformAssetsCrossOriginConfig = AssetCrossOrigin | Partial<Record<TransformAssetsShorthandCrossOriginKind, AssetCrossOrigin>>;
@@ -96,7 +93,7 @@ export interface TransformAssetsObjectShorthand {
     /** URL prefix prepended to every asset URL. */
     prefix: string;
     /**
-     * Optional crossOrigin attribute applied to manifest-managed `<link>` assets.
+     * Optional crossOrigin attribute applied to transformed script and stylesheet assets.
      *
      * Accepts a single value or a per-kind record.
      */
@@ -114,26 +111,24 @@ export type ResolvedTransformAssetsConfig = {
 };
 export declare function resolveTransformAssetsConfig(transform: TransformAssets): ResolvedTransformAssetsConfig;
 export interface StartManifestWithClientEntry {
-    manifest: Manifest;
+    manifest: ServerManifest;
     clientEntry: string;
-    /** Script content prepended before the client entry import (dev only) */
-    injectedHeadScripts?: string;
 }
 /**
  * Builds the client entry `<script>` tag from a (possibly transformed) client
- * entry URL and optional injected head scripts.
+ * entry URL.
  */
-export declare function buildClientEntryScriptTag(clientEntry: string, injectedHeadScripts?: string): RouterManagedTag;
+export declare function buildClientEntryScriptTag(clientEntry: string, scriptFormat?: ScriptFormat, crossOrigin?: AssetCrossOrigin): ManifestScript;
 export declare function transformManifestAssets(source: StartManifestWithClientEntry, transformFn: TransformAssetsFn, _opts?: {
     clone?: boolean;
     inlineCss?: boolean;
-}): Promise<Manifest>;
+}): Promise<ServerManifest>;
 /**
- * Builds a final Manifest from a StartManifestWithClientEntry without any
+ * Builds a final ServerManifest from a StartManifestWithClientEntry without any
  * URL transforms. Used when no transformAssets option is provided.
  *
  * Returns a new manifest object so the cached base manifest is never mutated.
  */
 export declare function buildManifestWithClientEntry(source: StartManifestWithClientEntry, opts?: {
     inlineCss?: boolean;
-}): Manifest;
+}): ServerManifest;

package/dist/esm/transformAssetUrls.js

@@ -1,4 +1,4 @@
-import { resolveManifestAssetLink, rootRouteId } from "@tanstack/router-core";
+import { getManifestScriptFormat, resolveManifestAssetLink, resolveManifestCssLink } from "@tanstack/router-core";
 //#region src/transformAssetUrls.ts
 function normalizeTransformAssetResult(result) {
 	if (typeof result === "string") return { href: result };
@@ -65,7 +65,7 @@ function resolveTransformAssetsConfig(transform) {
 			type: "transform",
 			transformFn: ({ url, kind }) => {
 				const href = `${prefix}${url}`;
-				if (kind === "clientEntry" || kind === "css-url") return { href };
+				if (kind === "css-url") return { href };
 				const co = resolveTransformAssetsCrossOrigin(crossOrigin, kind);
 				return co ? {
 					href,
@@ -88,82 +88,109 @@ function resolveTransformAssetsConfig(transform) {
 }
 /**
 * Builds the client entry `<script>` tag from a (possibly transformed) client
-* entry URL and optional injected head scripts.
+* entry URL.
 */
-function buildClientEntryScriptTag(clientEntry, injectedHeadScripts) {
-	let script = `import(${JSON.stringify(clientEntry)})`;
-	if (injectedHeadScripts) script = `${injectedHeadScripts};${script}`;
-	return {
-		tag: "script",
-		attrs: {
-			type: "module",
-			async: true
-		},
-		children: script
-	};
+function buildClientEntryScriptTag(clientEntry, scriptFormat = "module", crossOrigin) {
+	return { attrs: {
+		...scriptFormat === "module" ? { type: "module" } : {},
+		async: true,
+		src: clientEntry,
+		...crossOrigin ? { crossOrigin } : {}
+	} };
 }
-function assignManifestAssetLink(link, next) {
+function assignManifestLink(link, next) {
 	if (typeof link === "string") return next.crossOrigin ? next : next.href;
-	return next.crossOrigin ? next : { href: next.href };
+	const nextLink = {
+		...link,
+		href: next.href
+	};
+	if (next.crossOrigin) nextLink.crossOrigin = next.crossOrigin;
+	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);
-	if (!(_opts?.inlineCss !== false)) delete manifest.inlineCss;
+	const inlineCssEnabled = _opts?.inlineCss !== false;
+	const scriptTransforms = /* @__PURE__ */ new Map();
+	const transformScript = (url) => {
+		const cached = scriptTransforms.get(url);
+		if (cached) return cached;
+		const transformed = Promise.resolve(transformFn({
+			url,
+			kind: "script"
+		})).then(normalizeTransformAssetResult);
+		scriptTransforms.set(url, transformed);
+		return transformed;
+	};
+	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) route.preloads = await Promise.all(route.preloads.map(async (link) => {
+		if (route.preloads?.length) route.preloads = await Promise.all(route.preloads.map(async (link) => {
+			const result = await transformScript(resolveManifestAssetLink(link).href);
+			return assignManifestLink(link, {
+				href: result.href,
+				crossOrigin: result.crossOrigin
+			});
+		}));
+		if (route.css?.length && !manifest.inlineCss) route.css = await Promise.all(route.css.map(async (link) => {
 			const result = normalizeTransformAssetResult(await transformFn({
-				url: resolveManifestAssetLink(link).href,
-				kind: "modulepreload"
+				url: resolveManifestCssLink(link).href,
+				kind: "stylesheet"
 			}));
-			return assignManifestAssetLink(link, {
+			return assignManifestLink(link, {
 				href: result.href,
 				crossOrigin: result.crossOrigin
 			});
 		}));
-		if (route.assets && !manifest.inlineCss) {
-			for (const asset of route.assets) if (asset.tag === "link" && asset.attrs?.href) {
-				const rel = asset.attrs.rel;
-				if (!(typeof rel === "string" ? rel.split(/\s+/) : []).includes("stylesheet")) continue;
-				const result = normalizeTransformAssetResult(await transformFn({
-					url: asset.attrs.href,
-					kind: "stylesheet"
-				}));
-				asset.attrs.href = result.href;
-				if (result.crossOrigin) asset.attrs.crossOrigin = result.crossOrigin;
-				else delete asset.attrs.crossOrigin;
-			}
+		if (route.scripts?.length) for (const script of route.scripts) {
+			const src = script.attrs?.src;
+			if (typeof src !== "string") continue;
+			const result = await transformScript(src);
+			script.attrs = {
+				...script.attrs,
+				src: result.href
+			};
+			if (result.crossOrigin) script.attrs.crossOrigin = result.crossOrigin;
+			else delete script.attrs.crossOrigin;
 		}
 	}
-	const transformedClientEntry = normalizeTransformAssetResult(await transformFn({
-		url: source.clientEntry,
-		kind: "clientEntry"
-	}));
-	const rootRoute = manifest.routes[rootRouteId] = manifest.routes[rootRouteId] || {};
-	rootRoute.assets = rootRoute.assets || [];
-	rootRoute.assets.push(buildClientEntryScriptTag(transformedClientEntry.href, source.injectedHeadScripts));
 	return manifest;
 }
 /**
-* Builds a final Manifest from a StartManifestWithClientEntry without any
+* Builds a final ServerManifest from a StartManifestWithClientEntry without any
 * 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 scriptTag = buildClientEntryScriptTag(source.clientEntry, source.injectedHeadScripts);
-	const baseRootRoute = source.manifest.routes[rootRouteId];
-	const routes = {
-		...source.manifest.routes,
-		[rootRouteId]: {
-			...baseRootRoute,
-			assets: [...baseRootRoute?.assets || [], scriptTag]
-		}
-	};
-	return {
-		...opts?.inlineCss === false ? {} : { inlineCss: structuredClone(source.manifest.inlineCss) },
-		routes
+	const manifest = {
+		...source.manifest.scriptFormat ? { scriptFormat: source.manifest.scriptFormat } : {},
+		...opts?.inlineCss !== false && source.manifest.inlineCss ? { inlineCss: structuredClone(source.manifest.inlineCss) } : {},
+		routes: { ...source.manifest.routes }
 	};
+	addClientEntryToManifest(manifest, source.clientEntry);
+	return manifest;
 }
 //#endregion
 export { buildManifestWithClientEntry, resolveTransformAssetsConfig, transformManifestAssets };

package/dist/esm/transformAssetUrls.js.map

@@ -1 +1 @@
-{"version":3,"file":"transformAssetUrls.js","names":[],"sources":["../../src/transformAssetUrls.ts"],"sourcesContent":["import { resolveManifestAssetLink, rootRouteId } from '@tanstack/router-core'\n\nimport type {\n  AssetCrossOrigin,\n  Awaitable,\n  Manifest,\n  ManifestAssetLink,\n  RouterManagedTag,\n} from '@tanstack/router-core'\n\nexport type { AssetCrossOrigin }\n\nexport type TransformAssetsContext =\n  | {\n      url: string\n      kind: 'modulepreload'\n    }\n  | {\n      url: string\n      kind: 'stylesheet'\n    }\n  | {\n      url: string\n      kind: 'clientEntry'\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  'clientEntry' | '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: { modulepreload: '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 manifest-managed `<link>` 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<Manifest['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 === 'clientEntry' || 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: Manifest\n  clientEntry: string\n  /** Script content prepended before the client entry import (dev only) */\n  injectedHeadScripts?: string\n}\n\n/**\n * Builds the client entry `<script>` tag from a (possibly transformed) client\n * entry URL and optional injected head scripts.\n */\nexport function buildClientEntryScriptTag(\n  clientEntry: string,\n  injectedHeadScripts?: string,\n): RouterManagedTag {\n  const clientEntryLiteral = JSON.stringify(clientEntry)\n  let script = `import(${clientEntryLiteral})`\n  if (injectedHeadScripts) {\n    script = `${injectedHeadScripts};${script}`\n  }\n  return {\n    tag: 'script',\n    attrs: {\n      type: 'module',\n      async: true,\n    },\n    children: script,\n  }\n}\n\nfunction assignManifestAssetLink(\n  link: ManifestAssetLink,\n  next: { href: string; crossOrigin?: AssetCrossOrigin },\n): ManifestAssetLink {\n  if (typeof link === 'string') {\n    return next.crossOrigin ? next : next.href\n  }\n\n  return next.crossOrigin ? next : { href: next.href }\n}\n\nexport async function transformManifestAssets(\n  source: StartManifestWithClientEntry,\n  transformFn: TransformAssetsFn,\n  _opts?: {\n    clone?: boolean\n    inlineCss?: boolean\n  },\n): Promise<Manifest> {\n  const manifest = structuredClone(source.manifest)\n  const inlineCssEnabled = _opts?.inlineCss !== false\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) {\n      route.preloads = await Promise.all(\n        route.preloads.map(async (link) => {\n          const resolved = resolveManifestAssetLink(link)\n          const result = normalizeTransformAssetResult(\n            await transformFn({\n              url: resolved.href,\n              kind: 'modulepreload',\n            }),\n          )\n\n          return assignManifestAssetLink(link, {\n            href: result.href,\n            crossOrigin: result.crossOrigin,\n          })\n        }),\n      )\n    }\n\n    if (route.assets && !manifest.inlineCss) {\n      for (const asset of route.assets) {\n        if (asset.tag === 'link' && asset.attrs?.href) {\n          const rel = asset.attrs.rel\n          const relTokens = typeof rel === 'string' ? rel.split(/\\s+/) : []\n\n          if (!relTokens.includes('stylesheet')) {\n            continue\n          }\n\n          const result = normalizeTransformAssetResult(\n            await transformFn({\n              url: asset.attrs.href,\n              kind: 'stylesheet',\n            }),\n          )\n\n          asset.attrs.href = result.href\n          if (result.crossOrigin) {\n            asset.attrs.crossOrigin = result.crossOrigin\n          } else {\n            delete asset.attrs.crossOrigin\n          }\n        }\n      }\n    }\n  }\n\n  const transformedClientEntry = normalizeTransformAssetResult(\n    await transformFn({\n      url: source.clientEntry,\n      kind: 'clientEntry',\n    }),\n  )\n\n  const rootRoute = (manifest.routes[rootRouteId] =\n    manifest.routes[rootRouteId] || {})\n  rootRoute.assets = rootRoute.assets || []\n  rootRoute.assets.push(\n    buildClientEntryScriptTag(\n      transformedClientEntry.href,\n      source.injectedHeadScripts,\n    ),\n  )\n\n  return manifest\n}\n\n/**\n * Builds a final Manifest 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): Manifest {\n  const scriptTag = buildClientEntryScriptTag(\n    source.clientEntry,\n    source.injectedHeadScripts,\n  )\n\n  const baseRootRoute = source.manifest.routes[rootRouteId]\n  const routes = {\n    ...source.manifest.routes,\n    [rootRouteId]: {\n      ...baseRootRoute,\n      assets: [...(baseRootRoute?.assets || []), scriptTag],\n    },\n  }\n\n  return {\n    ...(opts?.inlineCss === false\n      ? {}\n      : { inlineCss: structuredClone(source.manifest.inlineCss) }),\n    routes,\n  }\n}\n"],"mappings":"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"}
+{"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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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/start-server-core",
-  "version": "1.169.2",
+  "version": "1.169.3",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -67,9 +67,9 @@
     "h3-v2": "npm:h3@2.0.1-rc.20",
     "seroval": "^1.5.4",
     "@tanstack/history": "1.162.0",
-    "@tanstack/router-core": "1.171.5",
-    "@tanstack/start-client-core": "1.170.2",
-    "@tanstack/start-storage-context": "1.167.7"
+    "@tanstack/router-core": "1.171.6",
+    "@tanstack/start-client-core": "1.170.3",
+    "@tanstack/start-storage-context": "1.167.8"
   },
   "devDependencies": {
     "@standard-schema/spec": "^1.0.0",

package/src/createStartHandler.ts

@@ -497,7 +497,6 @@ export function createStartHandler<TRegister = Register>(
           manifest,
           getRequestAssets: () =>
             getStartContext({ throwIfNotFound: false })?.requestAssets,
-          includeUnmatchedRouteAssets: false,
         })
 
         routerInstance.update({ additionalContext: { serverContext } })

package/src/early-hints.ts

@@ -1,13 +1,14 @@
 import {
+  getScriptPreloadAttrs,
   getStylesheetHref,
-  resolveManifestAssetLink,
+  resolveManifestCssLink,
 } from '@tanstack/router-core'
 import type {
   AnyRoute,
   AnyRouteMatch,
   AssetCrossOrigin,
-  Manifest,
   RouterManagedTag,
+  ServerManifest,
 } from '@tanstack/router-core'
 
 export type EarlyHint = {
@@ -49,7 +50,7 @@ export type ResponseLinkHeaderOptions = {
 
 export interface EarlyHintsCollector {
   collectStatic: (opts: {
-    manifest: Manifest
+    manifest: ServerManifest
     matchedRoutes?: ReadonlyArray<AnyRoute>
   }) => void
   collectDynamic: (matches: ReadonlyArray<AnyRouteMatch>) => void
@@ -174,7 +175,7 @@ function linkAttrsToEarlyHint(
 }
 
 export function collectStaticHintsFromManifest(
-  manifest: Manifest,
+  manifest: ServerManifest,
   matchedRoutes: ReadonlyArray<AnyRoute>,
 ): Array<EarlyHint> {
   const hints: Array<EarlyHint> = []
@@ -184,33 +185,32 @@ export function collectStaticHintsFromManifest(
     if (!routeManifest) continue
 
     for (const link of routeManifest.preloads ?? []) {
-      const { href, crossOrigin } = resolveManifestAssetLink(link)
-      const hint: EarlyHint = { href, rel: 'modulepreload', as: 'script' }
-      if (crossOrigin !== undefined) hint.crossOrigin = crossOrigin
+      const attrs = getScriptPreloadAttrs(manifest, link)
+      const hint: EarlyHint = {
+        href: attrs.href,
+        rel: attrs.rel,
+        as: 'script',
+      }
+      if (attrs.crossOrigin !== undefined) hint.crossOrigin = attrs.crossOrigin
       hints.push(hint)
     }
 
-    for (const asset of routeManifest.assets ?? []) {
-      if (asset.tag !== 'link') continue
-
-      const stylesheetHref = getStylesheetHref(asset)
-      if (stylesheetHref) {
-        if (manifest.inlineCss?.styles[stylesheetHref] !== undefined) continue
-
-        const hint: EarlyHint = {
-          href: stylesheetHref,
-          rel: 'preload',
-          as: 'style',
-        }
-        addEarlyHintFetchAttrs(hint, asset.attrs)
-        hints.push(hint)
+    for (const link of routeManifest.css ?? []) {
+      const stylesheetHref = getStylesheetHref(link)
+      if (manifest.inlineCss?.styles[stylesheetHref] !== undefined) {
         continue
       }
+      const resolvedLink = resolveManifestCssLink(link)
 
-      const hint = linkAttrsToEarlyHint(asset.attrs)
-      if (hint) {
-        hints.push(hint)
+      const hint: EarlyHint = {
+        href: stylesheetHref,
+        rel: 'preload',
+        as: 'style',
       }
+      if (resolvedLink.crossOrigin !== undefined) {
+        hint.crossOrigin = resolvedLink.crossOrigin
+      }
+      hints.push(hint)
     }
   }
 

package/src/finalManifest.ts

@@ -7,7 +7,7 @@ import {
   getStaticHandlerInlineCssDefault,
   resolveInlineCssForRequest,
 } from './inlineCss'
-import type { Manifest } from '@tanstack/router-core'
+import type { ServerManifest } from '@tanstack/router-core'
 import type { HandlerInlineCssOption } from './inlineCss'
 import type {
   CreateTransformAssetsContext,
@@ -45,7 +45,7 @@ export interface FinalManifestOptions {
 }
 
 type FinalManifestCacheKey = 'inline-css' | 'linked-css'
-type FinalManifestCache = Map<FinalManifestCacheKey, Promise<Manifest>>
+type FinalManifestCache = Map<FinalManifestCacheKey, Promise<ServerManifest>>
 export type GetBaseManifest = () => Promise<StartManifestWithClientEntry>
 
 export interface FinalManifestRequestOptions {
@@ -66,9 +66,11 @@ interface FinalManifestTransformResolver {
 export interface FinalManifestResolver {
   warmup: (opts: {
     getBaseManifest: GetBaseManifest
-  }) => Promise<Manifest> | undefined
-  resolveCached: (opts: FinalManifestRequestOptions) => Promise<Manifest>
-  resolveUncached: (opts: FinalManifestRequestOptions) => Promise<Manifest>
+  }) => Promise<ServerManifest> | undefined
+  resolveCached: (opts: FinalManifestRequestOptions) => Promise<ServerManifest>
+  resolveUncached: (
+    opts: FinalManifestRequestOptions,
+  ) => Promise<ServerManifest>
 }
 
 export function createCachedBaseManifestLoader(
@@ -206,8 +208,8 @@ function getFinalManifestCacheKey(inlineCss: boolean): FinalManifestCacheKey {
 function cacheFinalManifestPromise(
   cachedFinalManifestPromises: FinalManifestCache,
   cacheKey: FinalManifestCacheKey,
-  promise: Promise<Manifest>,
-): Promise<Manifest> {
+  promise: Promise<ServerManifest>,
+): Promise<ServerManifest> {
   const cachedFinalManifestPromise = promise.catch((error) => {
     if (
       cachedFinalManifestPromises.get(cacheKey) === cachedFinalManifestPromise
@@ -224,8 +226,8 @@ function cacheFinalManifestPromise(
 function getOrCreateCachedFinalManifestPromise(
   cachedFinalManifestPromises: FinalManifestCache,
   cacheKey: FinalManifestCacheKey,
-  computeFinalManifest: () => Promise<Manifest>,
-): Promise<Manifest> {
+  computeFinalManifest: () => Promise<ServerManifest>,
+): Promise<ServerManifest> {
   const cachedFinalManifestPromise = cachedFinalManifestPromises.get(cacheKey)
   if (cachedFinalManifestPromise) {
     return cachedFinalManifestPromise
@@ -242,7 +244,7 @@ async function buildFinalManifest(opts: {
   base: StartManifestWithClientEntry
   transformFn: TransformAssetsFn | undefined
   inlineCss: boolean
-}): Promise<Manifest> {
+}): Promise<ServerManifest> {
   return opts.transformFn
     ? await transformManifestAssets(opts.base, opts.transformFn, {
         inlineCss: opts.inlineCss,
@@ -256,7 +258,7 @@ async function resolveFinalManifest(opts: {
   cache: boolean
   inlineCss: boolean
   finalManifestCache?: FinalManifestCache
-}): Promise<Manifest> {
+}): Promise<ServerManifest> {
   const computeFinalManifest = async () => {
     return buildFinalManifest({
       base: await opts.getBaseManifest(),
@@ -284,7 +286,7 @@ function warmupFinalManifest(opts: {
   getBaseManifest: () => Promise<StartManifestWithClientEntry>
   getTransformFn: () => Promise<TransformAssetsFn | undefined>
   onError?: () => void
-}): Promise<Manifest> | undefined {
+}): Promise<ServerManifest> | undefined {
   if (
     !opts.enabled ||
     opts.handlerDefaultInlineCss === undefined ||

package/src/request-handler.ts

@@ -9,7 +9,8 @@ type EarlyHintsOptions = {
    * Fire-and-forget callback for HTTP 103 Early Hints.
    * Only invoked in production (when TSS_DEV_SERVER !== 'true').
    *
-   * The `static` phase contains transformed manifest assets for matched routes.
+   * The `static` phase contains transformed manifest preloads and stylesheets
+   * for matched routes.
    * The `dynamic` phase runs after route load, is skipped for redirects, and
    * can contain route `head().links` or empty `hints` and `links` arrays.
    * `hints` and `links` contain only values not emitted in earlier phases.