@tanstack/start-server-core 1.169.4 → 1.169.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/finalManifest.d.ts +5 -5
- package/dist/esm/finalManifest.js +2 -2
- package/dist/esm/finalManifest.js.map +1 -1
- package/dist/esm/router-manifest.d.ts +2 -6
- package/dist/esm/router-manifest.js +3 -9
- package/dist/esm/router-manifest.js.map +1 -1
- package/dist/esm/transformAssetUrls.d.ts +5 -14
- package/dist/esm/transformAssetUrls.js +10 -45
- package/dist/esm/transformAssetUrls.js.map +1 -1
- package/package.json +1 -1
- package/src/finalManifest.ts +10 -15
- package/src/router-manifest.ts +7 -10
- package/src/tanstack-start.d.ts +1 -1
- package/src/transformAssetUrls.ts +10 -88
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ServerManifest } from '@tanstack/router-core';
|
|
2
2
|
import { HandlerInlineCssOption } from './inlineCss.js';
|
|
3
|
-
import {
|
|
4
|
-
export type { HandlerInlineCssOption,
|
|
3
|
+
import { TransformAssets } from './transformAssetUrls.js';
|
|
4
|
+
export type { HandlerInlineCssOption, TransformAssets };
|
|
5
5
|
export interface FinalManifestOptions {
|
|
6
6
|
/**
|
|
7
7
|
* Controls whether Start inlines build-collected CSS by default at runtime.
|
|
@@ -17,13 +17,13 @@ export interface FinalManifestOptions {
|
|
|
17
17
|
* Transform manifest-managed asset URLs and attributes at runtime, e.g. to
|
|
18
18
|
* prepend a CDN prefix.
|
|
19
19
|
*
|
|
20
|
-
* This covers JS preloads,
|
|
21
|
-
*
|
|
20
|
+
* This covers JS preloads, manifest script tags, CSS links, and URLs inside
|
|
21
|
+
* build-collected inline CSS. Asset imports used directly in
|
|
22
22
|
* components should be handled by the bundler instead.
|
|
23
23
|
*/
|
|
24
24
|
transformAssets?: TransformAssets;
|
|
25
25
|
}
|
|
26
|
-
export type GetBaseManifest = () => Promise<
|
|
26
|
+
export type GetBaseManifest = () => Promise<ServerManifest>;
|
|
27
27
|
export interface FinalManifestRequestOptions {
|
|
28
28
|
request: Request;
|
|
29
29
|
requestInlineCss: boolean | undefined;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { buildManifest, resolveTransformAssetsConfig, transformManifestAssets } from "./transformAssetUrls.js";
|
|
2
2
|
import { getStaticHandlerInlineCssDefault, resolveInlineCssForRequest } from "./inlineCss.js";
|
|
3
3
|
//#region src/finalManifest.ts
|
|
4
4
|
function createCachedBaseManifestLoader(loadBaseManifest) {
|
|
@@ -93,7 +93,7 @@ function getOrCreateCachedFinalManifestPromise(cachedFinalManifestPromises, cach
|
|
|
93
93
|
return cacheFinalManifestPromise(cachedFinalManifestPromises, cacheKey, Promise.resolve().then(computeFinalManifest));
|
|
94
94
|
}
|
|
95
95
|
async function buildFinalManifest(opts) {
|
|
96
|
-
return opts.transformFn ? await transformManifestAssets(opts.base, opts.transformFn, { inlineCss: opts.inlineCss }) :
|
|
96
|
+
return opts.transformFn ? await transformManifestAssets(opts.base, opts.transformFn, { inlineCss: opts.inlineCss }) : buildManifest(opts.base, { inlineCss: opts.inlineCss });
|
|
97
97
|
}
|
|
98
98
|
async function resolveFinalManifest(opts) {
|
|
99
99
|
const computeFinalManifest = async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"finalManifest.js","names":[],"sources":["../../src/finalManifest.ts"],"sourcesContent":["import {\n buildManifestWithClientEntry,\n resolveTransformAssetsConfig,\n transformManifestAssets,\n} from './transformAssetUrls'\nimport {\n getStaticHandlerInlineCssDefault,\n resolveInlineCssForRequest,\n} from './inlineCss'\nimport type { ServerManifest } from '@tanstack/router-core'\nimport type { HandlerInlineCssOption } from './inlineCss'\nimport type {\n CreateTransformAssetsContext,\n StartManifestWithClientEntry,\n TransformAssets,\n TransformAssetsFn,\n} from './transformAssetUrls'\n\nexport type {\n HandlerInlineCssOption,\n StartManifestWithClientEntry,\n TransformAssets,\n}\n\nexport interface FinalManifestOptions {\n /**\n * Controls whether Start inlines build-collected CSS by default at runtime.\n *\n * This only has an effect when the build was created with\n * `server.build.inlineCss` enabled. Pass a callback to decide per request.\n * `handler(request, { inlineCss })` overrides this value for that request.\n *\n * @default true\n */\n inlineCss?: HandlerInlineCssOption\n /**\n * Transform manifest-managed asset URLs and attributes at runtime, e.g. to\n * prepend a CDN prefix.\n *\n * This covers JS preloads, CSS links, the client entry script, and URLs\n * inside build-collected inline CSS. Asset imports used directly in\n * components should be handled by the bundler instead.\n */\n transformAssets?: TransformAssets\n}\n\ntype FinalManifestCacheKey = 'inline-css' | 'linked-css'\ntype FinalManifestCache = Map<FinalManifestCacheKey, Promise<ServerManifest>>\nexport type GetBaseManifest = () => Promise<StartManifestWithClientEntry>\n\nexport interface FinalManifestRequestOptions {\n request: Request\n requestInlineCss: boolean | undefined\n getBaseManifest: GetBaseManifest\n}\n\ninterface FinalManifestTransformResolver {\n cache: boolean\n warmup: boolean\n getTransformFn: (\n ctx: CreateTransformAssetsContext,\n ) => Promise<TransformAssetsFn | undefined>\n clearCachedCreateTransform: () => void\n}\n\nexport interface FinalManifestResolver {\n warmup: (opts: {\n getBaseManifest: GetBaseManifest\n }) => Promise<ServerManifest> | undefined\n resolveCached: (opts: FinalManifestRequestOptions) => Promise<ServerManifest>\n resolveUncached: (\n opts: FinalManifestRequestOptions,\n ) => Promise<ServerManifest>\n}\n\nexport function createCachedBaseManifestLoader(\n loadBaseManifest: GetBaseManifest,\n): GetBaseManifest {\n let baseManifestPromise: Promise<StartManifestWithClientEntry> | undefined\n\n return () => {\n if (!baseManifestPromise) {\n baseManifestPromise = loadBaseManifest().catch((error) => {\n baseManifestPromise = undefined\n throw error\n })\n }\n\n return baseManifestPromise\n }\n}\n\nfunction createFinalManifestTransformResolver(\n transformAssets: TransformAssets | undefined,\n opts: { cacheCreateTransform: boolean },\n): FinalManifestTransformResolver {\n const transformConfig =\n transformAssets !== undefined\n ? resolveTransformAssetsConfig(transformAssets)\n : undefined\n const cache = transformConfig ? transformConfig.cache : true\n const warmup =\n !!transformAssets &&\n typeof transformAssets === 'object' &&\n 'warmup' in transformAssets &&\n transformAssets.warmup === true\n\n let cachedCreateTransformPromise: Promise<TransformAssetsFn> | undefined\n\n const clearCachedCreateTransform = () => {\n cachedCreateTransformPromise = undefined\n }\n\n return {\n cache,\n warmup,\n clearCachedCreateTransform,\n getTransformFn: async (ctx) => {\n if (!transformConfig) return undefined\n\n if (transformConfig.type !== 'createTransform') {\n return transformConfig.transformFn\n }\n\n if (!cache || !opts.cacheCreateTransform) {\n return transformConfig.createTransform(ctx)\n }\n\n if (!cachedCreateTransformPromise) {\n cachedCreateTransformPromise = Promise.resolve(\n transformConfig.createTransform(ctx),\n ).catch((error) => {\n clearCachedCreateTransform()\n throw error\n })\n }\n\n return cachedCreateTransformPromise\n },\n }\n}\n\nexport function createFinalManifestResolver(\n opts: FinalManifestOptions & { cacheCreateTransform: boolean },\n): FinalManifestResolver {\n const finalManifestCache: FinalManifestCache = new Map()\n const transformResolver = createFinalManifestTransformResolver(\n opts.transformAssets,\n { cacheCreateTransform: opts.cacheCreateTransform },\n )\n const handlerDefaultInlineCss = getStaticHandlerInlineCssDefault(\n opts.inlineCss,\n )\n\n const getRequestManifestOptions = async (\n requestOpts: FinalManifestRequestOptions,\n ) => {\n const transformFn = await transformResolver.getTransformFn({\n warmup: false,\n request: requestOpts.request,\n })\n const inlineCss = await resolveInlineCssForRequest({\n request: requestOpts.request,\n handlerInlineCss: opts.inlineCss,\n requestInlineCss: requestOpts.requestInlineCss,\n })\n\n return {\n getBaseManifest: requestOpts.getBaseManifest,\n transformFn,\n cache: transformResolver.cache,\n inlineCss,\n }\n }\n\n const resolveRequest = async (\n requestOpts: FinalManifestRequestOptions,\n cache: FinalManifestCache | undefined,\n ) => {\n return resolveFinalManifest({\n ...(await getRequestManifestOptions(requestOpts)),\n finalManifestCache: cache,\n })\n }\n\n return {\n warmup: ({ getBaseManifest }) =>\n warmupFinalManifest({\n enabled: transformResolver.warmup,\n handlerDefaultInlineCss,\n cache: transformResolver.cache,\n finalManifestCache,\n getBaseManifest,\n getTransformFn: () =>\n transformResolver.getTransformFn({ warmup: true }),\n onError: transformResolver.clearCachedCreateTransform,\n }),\n resolveCached: (requestOpts) =>\n resolveRequest(requestOpts, finalManifestCache),\n resolveUncached: (requestOpts) => resolveRequest(requestOpts, undefined),\n }\n}\n\nfunction getFinalManifestCacheKey(inlineCss: boolean): FinalManifestCacheKey {\n return inlineCss ? 'inline-css' : 'linked-css'\n}\n\nfunction cacheFinalManifestPromise(\n cachedFinalManifestPromises: FinalManifestCache,\n cacheKey: FinalManifestCacheKey,\n promise: Promise<ServerManifest>,\n): Promise<ServerManifest> {\n const cachedFinalManifestPromise = promise.catch((error) => {\n if (\n cachedFinalManifestPromises.get(cacheKey) === cachedFinalManifestPromise\n ) {\n cachedFinalManifestPromises.delete(cacheKey)\n }\n throw error\n })\n\n cachedFinalManifestPromises.set(cacheKey, cachedFinalManifestPromise)\n return cachedFinalManifestPromise\n}\n\nfunction getOrCreateCachedFinalManifestPromise(\n cachedFinalManifestPromises: FinalManifestCache,\n cacheKey: FinalManifestCacheKey,\n computeFinalManifest: () => Promise<ServerManifest>,\n): Promise<ServerManifest> {\n const cachedFinalManifestPromise = cachedFinalManifestPromises.get(cacheKey)\n if (cachedFinalManifestPromise) {\n return cachedFinalManifestPromise\n }\n\n return cacheFinalManifestPromise(\n cachedFinalManifestPromises,\n cacheKey,\n Promise.resolve().then(computeFinalManifest),\n )\n}\n\nasync function buildFinalManifest(opts: {\n base: StartManifestWithClientEntry\n transformFn: TransformAssetsFn | undefined\n inlineCss: boolean\n}): Promise<ServerManifest> {\n return opts.transformFn\n ? await transformManifestAssets(opts.base, opts.transformFn, {\n inlineCss: opts.inlineCss,\n })\n : buildManifestWithClientEntry(opts.base, { inlineCss: opts.inlineCss })\n}\n\nasync function resolveFinalManifest(opts: {\n getBaseManifest: () => Promise<StartManifestWithClientEntry>\n transformFn: TransformAssetsFn | undefined\n cache: boolean\n inlineCss: boolean\n finalManifestCache?: FinalManifestCache\n}): Promise<ServerManifest> {\n const computeFinalManifest = async () => {\n return buildFinalManifest({\n base: await opts.getBaseManifest(),\n transformFn: opts.transformFn,\n inlineCss: opts.inlineCss,\n })\n }\n\n if (opts.finalManifestCache && (!opts.transformFn || opts.cache)) {\n return getOrCreateCachedFinalManifestPromise(\n opts.finalManifestCache,\n getFinalManifestCacheKey(opts.inlineCss),\n computeFinalManifest,\n )\n }\n\n return computeFinalManifest()\n}\n\nfunction warmupFinalManifest(opts: {\n enabled: boolean\n handlerDefaultInlineCss: boolean | undefined\n cache: boolean\n finalManifestCache: FinalManifestCache\n getBaseManifest: () => Promise<StartManifestWithClientEntry>\n getTransformFn: () => Promise<TransformAssetsFn | undefined>\n onError?: () => void\n}): Promise<ServerManifest> | undefined {\n if (\n !opts.enabled ||\n opts.handlerDefaultInlineCss === undefined ||\n !opts.cache\n ) {\n return undefined\n }\n\n const inlineCss = opts.handlerDefaultInlineCss\n const warmupPromise = getOrCreateCachedFinalManifestPromise(\n opts.finalManifestCache,\n getFinalManifestCacheKey(inlineCss),\n async () => {\n const [base, transformFn] = await Promise.all([\n opts.getBaseManifest(),\n opts.getTransformFn(),\n ])\n\n return buildFinalManifest({\n base,\n transformFn,\n inlineCss,\n })\n },\n )\n\n if (opts.onError) {\n void warmupPromise.catch(opts.onError)\n }\n\n return warmupPromise\n}\n"],"mappings":";;;AA2EA,SAAgB,+BACd,kBACiB;CACjB,IAAI;CAEJ,aAAa;EACX,IAAI,CAAC,qBACH,sBAAsB,iBAAiB,EAAE,OAAO,UAAU;GACxD,sBAAsB,KAAA;GACtB,MAAM;EACR,CAAC;EAGH,OAAO;CACT;AACF;AAEA,SAAS,qCACP,iBACA,MACgC;CAChC,MAAM,kBACJ,oBAAoB,KAAA,IAChB,6BAA6B,eAAe,IAC5C,KAAA;CACN,MAAM,QAAQ,kBAAkB,gBAAgB,QAAQ;CACxD,MAAM,SACJ,CAAC,CAAC,mBACF,OAAO,oBAAoB,YAC3B,YAAY,mBACZ,gBAAgB,WAAW;CAE7B,IAAI;CAEJ,MAAM,mCAAmC;EACvC,+BAA+B,KAAA;CACjC;CAEA,OAAO;EACL;EACA;EACA;EACA,gBAAgB,OAAO,QAAQ;GAC7B,IAAI,CAAC,iBAAiB,OAAO,KAAA;GAE7B,IAAI,gBAAgB,SAAS,mBAC3B,OAAO,gBAAgB;GAGzB,IAAI,CAAC,SAAS,CAAC,KAAK,sBAClB,OAAO,gBAAgB,gBAAgB,GAAG;GAG5C,IAAI,CAAC,8BACH,+BAA+B,QAAQ,QACrC,gBAAgB,gBAAgB,GAAG,CACrC,EAAE,OAAO,UAAU;IACjB,2BAA2B;IAC3B,MAAM;GACR,CAAC;GAGH,OAAO;EACT;CACF;AACF;AAEA,SAAgB,4BACd,MACuB;CACvB,MAAM,qCAAyC,IAAI,IAAI;CACvD,MAAM,oBAAoB,qCACxB,KAAK,iBACL,EAAE,sBAAsB,KAAK,qBAAqB,CACpD;CACA,MAAM,0BAA0B,iCAC9B,KAAK,SACP;CAEA,MAAM,4BAA4B,OAChC,gBACG;EACH,MAAM,cAAc,MAAM,kBAAkB,eAAe;GACzD,QAAQ;GACR,SAAS,YAAY;EACvB,CAAC;EACD,MAAM,YAAY,MAAM,2BAA2B;GACjD,SAAS,YAAY;GACrB,kBAAkB,KAAK;GACvB,kBAAkB,YAAY;EAChC,CAAC;EAED,OAAO;GACL,iBAAiB,YAAY;GAC7B;GACA,OAAO,kBAAkB;GACzB;EACF;CACF;CAEA,MAAM,iBAAiB,OACrB,aACA,UACG;EACH,OAAO,qBAAqB;GAC1B,GAAI,MAAM,0BAA0B,WAAW;GAC/C,oBAAoB;EACtB,CAAC;CACH;CAEA,OAAO;EACL,SAAS,EAAE,sBACT,oBAAoB;GAClB,SAAS,kBAAkB;GAC3B;GACA,OAAO,kBAAkB;GACzB;GACA;GACA,sBACE,kBAAkB,eAAe,EAAE,QAAQ,KAAK,CAAC;GACnD,SAAS,kBAAkB;EAC7B,CAAC;EACH,gBAAgB,gBACd,eAAe,aAAa,kBAAkB;EAChD,kBAAkB,gBAAgB,eAAe,aAAa,KAAA,CAAS;CACzE;AACF;AAEA,SAAS,yBAAyB,WAA2C;CAC3E,OAAO,YAAY,eAAe;AACpC;AAEA,SAAS,0BACP,6BACA,UACA,SACyB;CACzB,MAAM,6BAA6B,QAAQ,OAAO,UAAU;EAC1D,IACE,4BAA4B,IAAI,QAAQ,MAAM,4BAE9C,4BAA4B,OAAO,QAAQ;EAE7C,MAAM;CACR,CAAC;CAED,4BAA4B,IAAI,UAAU,0BAA0B;CACpE,OAAO;AACT;AAEA,SAAS,sCACP,6BACA,UACA,sBACyB;CACzB,MAAM,6BAA6B,4BAA4B,IAAI,QAAQ;CAC3E,IAAI,4BACF,OAAO;CAGT,OAAO,0BACL,6BACA,UACA,QAAQ,QAAQ,EAAE,KAAK,oBAAoB,CAC7C;AACF;AAEA,eAAe,mBAAmB,MAIN;CAC1B,OAAO,KAAK,cACR,MAAM,wBAAwB,KAAK,MAAM,KAAK,aAAa,EACzD,WAAW,KAAK,UAClB,CAAC,IACD,6BAA6B,KAAK,MAAM,EAAE,WAAW,KAAK,UAAU,CAAC;AAC3E;AAEA,eAAe,qBAAqB,MAMR;CAC1B,MAAM,uBAAuB,YAAY;EACvC,OAAO,mBAAmB;GACxB,MAAM,MAAM,KAAK,gBAAgB;GACjC,aAAa,KAAK;GAClB,WAAW,KAAK;EAClB,CAAC;CACH;CAEA,IAAI,KAAK,uBAAuB,CAAC,KAAK,eAAe,KAAK,QACxD,OAAO,sCACL,KAAK,oBACL,yBAAyB,KAAK,SAAS,GACvC,oBACF;CAGF,OAAO,qBAAqB;AAC9B;AAEA,SAAS,oBAAoB,MAQW;CACtC,IACE,CAAC,KAAK,WACN,KAAK,4BAA4B,KAAA,KACjC,CAAC,KAAK,OAEN;CAGF,MAAM,YAAY,KAAK;CACvB,MAAM,gBAAgB,sCACpB,KAAK,oBACL,yBAAyB,SAAS,GAClC,YAAY;EACV,MAAM,CAAC,MAAM,eAAe,MAAM,QAAQ,IAAI,CAC5C,KAAK,gBAAgB,GACrB,KAAK,eAAe,CACtB,CAAC;EAED,OAAO,mBAAmB;GACxB;GACA;GACA;EACF,CAAC;CACH,CACF;CAEA,IAAI,KAAK,SACP,cAAmB,MAAM,KAAK,OAAO;CAGvC,OAAO;AACT"}
|
|
1
|
+
{"version":3,"file":"finalManifest.js","names":[],"sources":["../../src/finalManifest.ts"],"sourcesContent":["import {\n buildManifest,\n resolveTransformAssetsConfig,\n transformManifestAssets,\n} from './transformAssetUrls'\nimport {\n getStaticHandlerInlineCssDefault,\n resolveInlineCssForRequest,\n} from './inlineCss'\nimport type { ServerManifest } from '@tanstack/router-core'\nimport type { HandlerInlineCssOption } from './inlineCss'\nimport type {\n CreateTransformAssetsContext,\n TransformAssets,\n TransformAssetsFn,\n} from './transformAssetUrls'\n\nexport type { HandlerInlineCssOption, TransformAssets }\n\nexport interface FinalManifestOptions {\n /**\n * Controls whether Start inlines build-collected CSS by default at runtime.\n *\n * This only has an effect when the build was created with\n * `server.build.inlineCss` enabled. Pass a callback to decide per request.\n * `handler(request, { inlineCss })` overrides this value for that request.\n *\n * @default true\n */\n inlineCss?: HandlerInlineCssOption\n /**\n * Transform manifest-managed asset URLs and attributes at runtime, e.g. to\n * prepend a CDN prefix.\n *\n * This covers JS preloads, manifest script tags, CSS links, and URLs inside\n * build-collected inline CSS. Asset imports used directly in\n * components should be handled by the bundler instead.\n */\n transformAssets?: TransformAssets\n}\n\ntype FinalManifestCacheKey = 'inline-css' | 'linked-css'\ntype FinalManifestCache = Map<FinalManifestCacheKey, Promise<ServerManifest>>\nexport type GetBaseManifest = () => Promise<ServerManifest>\n\nexport interface FinalManifestRequestOptions {\n request: Request\n requestInlineCss: boolean | undefined\n getBaseManifest: GetBaseManifest\n}\n\ninterface FinalManifestTransformResolver {\n cache: boolean\n warmup: boolean\n getTransformFn: (\n ctx: CreateTransformAssetsContext,\n ) => Promise<TransformAssetsFn | undefined>\n clearCachedCreateTransform: () => void\n}\n\nexport interface FinalManifestResolver {\n warmup: (opts: {\n getBaseManifest: GetBaseManifest\n }) => Promise<ServerManifest> | undefined\n resolveCached: (opts: FinalManifestRequestOptions) => Promise<ServerManifest>\n resolveUncached: (\n opts: FinalManifestRequestOptions,\n ) => Promise<ServerManifest>\n}\n\nexport function createCachedBaseManifestLoader(\n loadBaseManifest: GetBaseManifest,\n): GetBaseManifest {\n let baseManifestPromise: Promise<ServerManifest> | undefined\n\n return () => {\n if (!baseManifestPromise) {\n baseManifestPromise = loadBaseManifest().catch((error) => {\n baseManifestPromise = undefined\n throw error\n })\n }\n\n return baseManifestPromise\n }\n}\n\nfunction createFinalManifestTransformResolver(\n transformAssets: TransformAssets | undefined,\n opts: { cacheCreateTransform: boolean },\n): FinalManifestTransformResolver {\n const transformConfig =\n transformAssets !== undefined\n ? resolveTransformAssetsConfig(transformAssets)\n : undefined\n const cache = transformConfig ? transformConfig.cache : true\n const warmup =\n !!transformAssets &&\n typeof transformAssets === 'object' &&\n 'warmup' in transformAssets &&\n transformAssets.warmup === true\n\n let cachedCreateTransformPromise: Promise<TransformAssetsFn> | undefined\n\n const clearCachedCreateTransform = () => {\n cachedCreateTransformPromise = undefined\n }\n\n return {\n cache,\n warmup,\n clearCachedCreateTransform,\n getTransformFn: async (ctx) => {\n if (!transformConfig) return undefined\n\n if (transformConfig.type !== 'createTransform') {\n return transformConfig.transformFn\n }\n\n if (!cache || !opts.cacheCreateTransform) {\n return transformConfig.createTransform(ctx)\n }\n\n if (!cachedCreateTransformPromise) {\n cachedCreateTransformPromise = Promise.resolve(\n transformConfig.createTransform(ctx),\n ).catch((error) => {\n clearCachedCreateTransform()\n throw error\n })\n }\n\n return cachedCreateTransformPromise\n },\n }\n}\n\nexport function createFinalManifestResolver(\n opts: FinalManifestOptions & { cacheCreateTransform: boolean },\n): FinalManifestResolver {\n const finalManifestCache: FinalManifestCache = new Map()\n const transformResolver = createFinalManifestTransformResolver(\n opts.transformAssets,\n { cacheCreateTransform: opts.cacheCreateTransform },\n )\n const handlerDefaultInlineCss = getStaticHandlerInlineCssDefault(\n opts.inlineCss,\n )\n\n const getRequestManifestOptions = async (\n requestOpts: FinalManifestRequestOptions,\n ) => {\n const transformFn = await transformResolver.getTransformFn({\n warmup: false,\n request: requestOpts.request,\n })\n const inlineCss = await resolveInlineCssForRequest({\n request: requestOpts.request,\n handlerInlineCss: opts.inlineCss,\n requestInlineCss: requestOpts.requestInlineCss,\n })\n\n return {\n getBaseManifest: requestOpts.getBaseManifest,\n transformFn,\n cache: transformResolver.cache,\n inlineCss,\n }\n }\n\n const resolveRequest = async (\n requestOpts: FinalManifestRequestOptions,\n cache: FinalManifestCache | undefined,\n ) => {\n return resolveFinalManifest({\n ...(await getRequestManifestOptions(requestOpts)),\n finalManifestCache: cache,\n })\n }\n\n return {\n warmup: ({ getBaseManifest }) =>\n warmupFinalManifest({\n enabled: transformResolver.warmup,\n handlerDefaultInlineCss,\n cache: transformResolver.cache,\n finalManifestCache,\n getBaseManifest,\n getTransformFn: () =>\n transformResolver.getTransformFn({ warmup: true }),\n onError: transformResolver.clearCachedCreateTransform,\n }),\n resolveCached: (requestOpts) =>\n resolveRequest(requestOpts, finalManifestCache),\n resolveUncached: (requestOpts) => resolveRequest(requestOpts, undefined),\n }\n}\n\nfunction getFinalManifestCacheKey(inlineCss: boolean): FinalManifestCacheKey {\n return inlineCss ? 'inline-css' : 'linked-css'\n}\n\nfunction cacheFinalManifestPromise(\n cachedFinalManifestPromises: FinalManifestCache,\n cacheKey: FinalManifestCacheKey,\n promise: Promise<ServerManifest>,\n): Promise<ServerManifest> {\n const cachedFinalManifestPromise = promise.catch((error) => {\n if (\n cachedFinalManifestPromises.get(cacheKey) === cachedFinalManifestPromise\n ) {\n cachedFinalManifestPromises.delete(cacheKey)\n }\n throw error\n })\n\n cachedFinalManifestPromises.set(cacheKey, cachedFinalManifestPromise)\n return cachedFinalManifestPromise\n}\n\nfunction getOrCreateCachedFinalManifestPromise(\n cachedFinalManifestPromises: FinalManifestCache,\n cacheKey: FinalManifestCacheKey,\n computeFinalManifest: () => Promise<ServerManifest>,\n): Promise<ServerManifest> {\n const cachedFinalManifestPromise = cachedFinalManifestPromises.get(cacheKey)\n if (cachedFinalManifestPromise) {\n return cachedFinalManifestPromise\n }\n\n return cacheFinalManifestPromise(\n cachedFinalManifestPromises,\n cacheKey,\n Promise.resolve().then(computeFinalManifest),\n )\n}\n\nasync function buildFinalManifest(opts: {\n base: ServerManifest\n transformFn: TransformAssetsFn | undefined\n inlineCss: boolean\n}): Promise<ServerManifest> {\n return opts.transformFn\n ? await transformManifestAssets(opts.base, opts.transformFn, {\n inlineCss: opts.inlineCss,\n })\n : buildManifest(opts.base, { inlineCss: opts.inlineCss })\n}\n\nasync function resolveFinalManifest(opts: {\n getBaseManifest: () => Promise<ServerManifest>\n transformFn: TransformAssetsFn | undefined\n cache: boolean\n inlineCss: boolean\n finalManifestCache?: FinalManifestCache\n}): Promise<ServerManifest> {\n const computeFinalManifest = async () => {\n return buildFinalManifest({\n base: await opts.getBaseManifest(),\n transformFn: opts.transformFn,\n inlineCss: opts.inlineCss,\n })\n }\n\n if (opts.finalManifestCache && (!opts.transformFn || opts.cache)) {\n return getOrCreateCachedFinalManifestPromise(\n opts.finalManifestCache,\n getFinalManifestCacheKey(opts.inlineCss),\n computeFinalManifest,\n )\n }\n\n return computeFinalManifest()\n}\n\nfunction warmupFinalManifest(opts: {\n enabled: boolean\n handlerDefaultInlineCss: boolean | undefined\n cache: boolean\n finalManifestCache: FinalManifestCache\n getBaseManifest: () => Promise<ServerManifest>\n getTransformFn: () => Promise<TransformAssetsFn | undefined>\n onError?: () => void\n}): Promise<ServerManifest> | undefined {\n if (\n !opts.enabled ||\n opts.handlerDefaultInlineCss === undefined ||\n !opts.cache\n ) {\n return undefined\n }\n\n const inlineCss = opts.handlerDefaultInlineCss\n const warmupPromise = getOrCreateCachedFinalManifestPromise(\n opts.finalManifestCache,\n getFinalManifestCacheKey(inlineCss),\n async () => {\n const [base, transformFn] = await Promise.all([\n opts.getBaseManifest(),\n opts.getTransformFn(),\n ])\n\n return buildFinalManifest({\n base,\n transformFn,\n inlineCss,\n })\n },\n )\n\n if (opts.onError) {\n void warmupPromise.catch(opts.onError)\n }\n\n return warmupPromise\n}\n"],"mappings":"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"}
|
|
@@ -1,15 +1,11 @@
|
|
|
1
|
-
import { AnyRoute } from '@tanstack/router-core';
|
|
2
|
-
import { StartManifestWithClientEntry } from './transformAssetUrls.js';
|
|
1
|
+
import { AnyRoute, ServerManifest } from '@tanstack/router-core';
|
|
3
2
|
/**
|
|
4
3
|
* @description Returns the router manifest data that should be sent to the client.
|
|
5
4
|
* This includes only the assets and preloads for the current route and any
|
|
6
5
|
* special assets that are needed for the client. It does not include relationships
|
|
7
6
|
* between routes or any other data that is not needed for the client.
|
|
8
7
|
*
|
|
9
|
-
* The client entry URL is returned separately so that it can be transformed
|
|
10
|
-
* (e.g. for CDN rewriting) before being embedded into the `<script>` tag.
|
|
11
|
-
*
|
|
12
8
|
* @param matchedRoutes - In dev mode, the matched routes are used to build
|
|
13
9
|
* the dev styles URL for route-scoped CSS collection.
|
|
14
10
|
*/
|
|
15
|
-
export declare function getStartManifest(matchedRoutes?: ReadonlyArray<AnyRoute>): Promise<
|
|
11
|
+
export declare function getStartManifest(matchedRoutes?: ReadonlyArray<AnyRoute>): Promise<ServerManifest>;
|
|
@@ -7,9 +7,6 @@ var DEV_SSR_STYLES_BASEPATH = process.env.TSS_DEV_SSR_STYLES_BASEPATH || "/";
|
|
|
7
7
|
* special assets that are needed for the client. It does not include relationships
|
|
8
8
|
* between routes or any other data that is not needed for the client.
|
|
9
9
|
*
|
|
10
|
-
* The client entry URL is returned separately so that it can be transformed
|
|
11
|
-
* (e.g. for CDN rewriting) before being embedded into the `<script>` tag.
|
|
12
|
-
*
|
|
13
10
|
* @param matchedRoutes - In dev mode, the matched routes are used to build
|
|
14
11
|
* the dev styles URL for route-scoped CSS collection.
|
|
15
12
|
*/
|
|
@@ -45,12 +42,9 @@ async function getStartManifest(matchedRoutes) {
|
|
|
45
42
|
if (result.preloads || result.scripts || result.css) manifestRoutes[k] = result;
|
|
46
43
|
}
|
|
47
44
|
return {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
routes: manifestRoutes
|
|
52
|
-
},
|
|
53
|
-
clientEntry: startManifest.clientEntry
|
|
45
|
+
...startManifest.scriptFormat ? { scriptFormat: startManifest.scriptFormat } : {},
|
|
46
|
+
...startManifest.inlineCss ? { inlineCss: startManifest.inlineCss } : {},
|
|
47
|
+
routes: manifestRoutes
|
|
54
48
|
};
|
|
55
49
|
}
|
|
56
50
|
//#endregion
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-manifest.js","names":[],"sources":["../../src/router-manifest.ts"],"sourcesContent":["import {\n DEV_STYLES_ATTR,\n buildDevStylesUrl,\n rootRouteId,\n} from '@tanstack/router-core'\nimport type {
|
|
1
|
+
{"version":3,"file":"router-manifest.js","names":[],"sources":["../../src/router-manifest.ts"],"sourcesContent":["import {\n DEV_STYLES_ATTR,\n buildDevStylesUrl,\n rootRouteId,\n} from '@tanstack/router-core'\nimport type {\n AnyRoute,\n ServerManifest,\n ServerManifestRoute,\n} from '@tanstack/router-core'\n\n// Pre-computed constant for dev styles URL basepath.\n// Defaults to vite `base` (set via TSS_DEV_SSR_STYLES_BASEPATH in the plugin),\n// aligning dev styles with how other CSS/JS assets are served.\nconst DEV_SSR_STYLES_BASEPATH = process.env.TSS_DEV_SSR_STYLES_BASEPATH || '/'\n/**\n * @description Returns the router manifest data that should be sent to the client.\n * This includes only the assets and preloads for the current route and any\n * special assets that are needed for the client. It does not include relationships\n * between routes or any other data that is not needed for the client.\n *\n * @param matchedRoutes - In dev mode, the matched routes are used to build\n * the dev styles URL for route-scoped CSS collection.\n */\nexport async function getStartManifest(\n matchedRoutes?: ReadonlyArray<AnyRoute>,\n): Promise<ServerManifest> {\n const { tsrStartManifest } = await import('tanstack-start-manifest:v')\n const startManifest = tsrStartManifest()\n let routes = startManifest.routes\n let rootRoute = routes[rootRouteId]\n\n const updateRootRoute = (nextRootRoute: ServerManifestRoute) => {\n rootRoute = nextRootRoute\n routes = {\n ...routes,\n [rootRouteId]: rootRoute,\n }\n }\n\n // Inject dev styles link in dev mode (when SSR styles are enabled)\n if (\n process.env.TSS_DEV_SERVER === 'true' &&\n process.env.TSS_DEV_SSR_STYLES_ENABLED !== 'false' &&\n matchedRoutes\n ) {\n const matchedRouteIds = matchedRoutes.map((route) => route.id)\n updateRootRoute({\n ...rootRoute,\n css: [\n ...(rootRoute?.css ?? []),\n {\n href: buildDevStylesUrl(DEV_SSR_STYLES_BASEPATH, matchedRouteIds),\n [DEV_STYLES_ATTR]: true,\n },\n ],\n })\n }\n\n const manifestRoutes: Record<string, ServerManifestRoute> = {}\n\n for (const k in routes) {\n const v = routes[k]!\n const result = {} as ServerManifestRoute\n\n if (v.preloads && v.preloads.length > 0) {\n result.preloads = v.preloads\n }\n if (v.scripts && v.scripts.length > 0) {\n result.scripts = v.scripts\n }\n if (v.css?.length) {\n result.css = v.css\n }\n if (result.preloads || result.scripts || result.css) {\n manifestRoutes[k] = result\n }\n }\n\n const manifest = {\n ...(startManifest.scriptFormat\n ? { scriptFormat: startManifest.scriptFormat }\n : {}),\n ...(startManifest.inlineCss ? { inlineCss: startManifest.inlineCss } : {}),\n routes: manifestRoutes,\n }\n\n return manifest\n}\n"],"mappings":";;AAcA,IAAM,0BAA0B,QAAQ,IAAI,+BAA+B;;;;;;;;;;AAU3E,eAAsB,iBACpB,eACyB;CACzB,MAAM,EAAE,qBAAqB,MAAM,OAAO;CAC1C,MAAM,gBAAgB,iBAAiB;CACvC,IAAI,SAAS,cAAc;CAC3B,IAAI,YAAY,OAAO;CAEvB,MAAM,mBAAmB,kBAAuC;EAC9D,YAAY;EACZ,SAAS;GACP,GAAG;IACF,cAAc;EACjB;CACF;CAGA,IACE,QAAQ,IAAI,mBAAmB,UAC/B,QAAQ,IAAI,+BAA+B,WAC3C,eACA;EACA,MAAM,kBAAkB,cAAc,KAAK,UAAU,MAAM,EAAE;EAC7D,gBAAgB;GACd,GAAG;GACH,KAAK,CACH,GAAI,WAAW,OAAO,CAAC,GACvB;IACE,MAAM,kBAAkB,yBAAyB,eAAe;KAC/D,kBAAkB;GACrB,CACF;EACF,CAAC;CACH;CAEA,MAAM,iBAAsD,CAAC;CAE7D,KAAK,MAAM,KAAK,QAAQ;EACtB,MAAM,IAAI,OAAO;EACjB,MAAM,SAAS,CAAC;EAEhB,IAAI,EAAE,YAAY,EAAE,SAAS,SAAS,GACpC,OAAO,WAAW,EAAE;EAEtB,IAAI,EAAE,WAAW,EAAE,QAAQ,SAAS,GAClC,OAAO,UAAU,EAAE;EAErB,IAAI,EAAE,KAAK,QACT,OAAO,MAAM,EAAE;EAEjB,IAAI,OAAO,YAAY,OAAO,WAAW,OAAO,KAC9C,eAAe,KAAK;CAExB;CAUA,OAAO;EAPL,GAAI,cAAc,eACd,EAAE,cAAc,cAAc,aAAa,IAC3C,CAAC;EACL,GAAI,cAAc,YAAY,EAAE,WAAW,cAAc,UAAU,IAAI,CAAC;EACxE,QAAQ;CAGH;AACT"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AssetCrossOrigin, Awaitable,
|
|
1
|
+
import { AssetCrossOrigin, Awaitable, ServerManifest } from '@tanstack/router-core';
|
|
2
2
|
export type { AssetCrossOrigin };
|
|
3
3
|
export type TransformAssetsContext = {
|
|
4
4
|
url: string;
|
|
@@ -110,25 +110,16 @@ export type ResolvedTransformAssetsConfig = {
|
|
|
110
110
|
cache: boolean;
|
|
111
111
|
};
|
|
112
112
|
export declare function resolveTransformAssetsConfig(transform: TransformAssets): ResolvedTransformAssetsConfig;
|
|
113
|
-
export
|
|
114
|
-
manifest: ServerManifest;
|
|
115
|
-
clientEntry: string;
|
|
116
|
-
}
|
|
117
|
-
/**
|
|
118
|
-
* Builds the client entry `<script>` tag from a (possibly transformed) client
|
|
119
|
-
* entry URL.
|
|
120
|
-
*/
|
|
121
|
-
export declare function buildClientEntryScriptTag(clientEntry: string, scriptFormat?: ScriptFormat, crossOrigin?: AssetCrossOrigin): ManifestScript;
|
|
122
|
-
export declare function transformManifestAssets(source: StartManifestWithClientEntry, transformFn: TransformAssetsFn, _opts?: {
|
|
113
|
+
export declare function transformManifestAssets(source: ServerManifest, transformFn: TransformAssetsFn, _opts?: {
|
|
123
114
|
clone?: boolean;
|
|
124
115
|
inlineCss?: boolean;
|
|
125
116
|
}): Promise<ServerManifest>;
|
|
126
117
|
/**
|
|
127
|
-
* Builds a final ServerManifest
|
|
128
|
-
*
|
|
118
|
+
* Builds a final ServerManifest without URL transforms. Used when no
|
|
119
|
+
* transformAssets option is provided.
|
|
129
120
|
*
|
|
130
121
|
* Returns a new manifest object so the cached base manifest is never mutated.
|
|
131
122
|
*/
|
|
132
|
-
export declare function
|
|
123
|
+
export declare function buildManifest(source: ServerManifest, opts?: {
|
|
133
124
|
inlineCss?: boolean;
|
|
134
125
|
}): ServerManifest;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { resolveManifestAssetLink, resolveManifestCssLink } from "@tanstack/router-core";
|
|
2
2
|
//#region src/transformAssetUrls.ts
|
|
3
3
|
function normalizeTransformAssetResult(result) {
|
|
4
4
|
if (typeof result === "string") return { href: result };
|
|
@@ -86,18 +86,6 @@ function resolveTransformAssetsConfig(transform) {
|
|
|
86
86
|
cache: transform.cache !== false
|
|
87
87
|
};
|
|
88
88
|
}
|
|
89
|
-
/**
|
|
90
|
-
* Builds the client entry `<script>` tag from a (possibly transformed) client
|
|
91
|
-
* entry URL.
|
|
92
|
-
*/
|
|
93
|
-
function buildClientEntryScriptTag(clientEntry, scriptFormat = "module", crossOrigin) {
|
|
94
|
-
return { attrs: {
|
|
95
|
-
...scriptFormat === "module" ? { type: "module" } : {},
|
|
96
|
-
async: true,
|
|
97
|
-
src: clientEntry,
|
|
98
|
-
...crossOrigin ? { crossOrigin } : {}
|
|
99
|
-
} };
|
|
100
|
-
}
|
|
101
89
|
function assignManifestLink(link, next) {
|
|
102
90
|
if (typeof link === "string") return next.crossOrigin ? next : next.href;
|
|
103
91
|
const nextLink = {
|
|
@@ -108,28 +96,8 @@ function assignManifestLink(link, next) {
|
|
|
108
96
|
else delete nextLink.crossOrigin;
|
|
109
97
|
return nextLink;
|
|
110
98
|
}
|
|
111
|
-
function appendUniqueManifestAssetLink(target, link) {
|
|
112
|
-
const href = typeof link === "string" ? link : link.href;
|
|
113
|
-
if (target) {
|
|
114
|
-
for (const item of target) if ((typeof item === "string" ? item : item.href) === href) return target;
|
|
115
|
-
}
|
|
116
|
-
return [...target ?? [], link];
|
|
117
|
-
}
|
|
118
|
-
function addClientEntryToManifest(manifest, clientEntry) {
|
|
119
|
-
const rootRoute = manifest.routes.__root__ ?? {};
|
|
120
|
-
const rootScripts = rootRoute.scripts ?? [];
|
|
121
|
-
const scripts = rootScripts.some((script) => script.attrs?.src === clientEntry) ? rootScripts : [...rootScripts, buildClientEntryScriptTag(clientEntry, getManifestScriptFormat(manifest))];
|
|
122
|
-
manifest.routes = {
|
|
123
|
-
...manifest.routes,
|
|
124
|
-
__root__: {
|
|
125
|
-
...rootRoute,
|
|
126
|
-
preloads: appendUniqueManifestAssetLink(rootRoute.preloads, clientEntry),
|
|
127
|
-
scripts
|
|
128
|
-
}
|
|
129
|
-
};
|
|
130
|
-
}
|
|
131
99
|
async function transformManifestAssets(source, transformFn, _opts) {
|
|
132
|
-
const manifest = structuredClone(source
|
|
100
|
+
const manifest = structuredClone(source);
|
|
133
101
|
const inlineCssEnabled = _opts?.inlineCss !== false;
|
|
134
102
|
const scriptTransforms = /* @__PURE__ */ new Map();
|
|
135
103
|
const transformScript = (url) => {
|
|
@@ -144,7 +112,6 @@ async function transformManifestAssets(source, transformFn, _opts) {
|
|
|
144
112
|
};
|
|
145
113
|
if (!inlineCssEnabled) delete manifest.inlineCss;
|
|
146
114
|
else if (manifest.inlineCss) manifest.inlineCss = await transformInlineCssStyles(manifest.inlineCss, transformFn);
|
|
147
|
-
addClientEntryToManifest(manifest, source.clientEntry);
|
|
148
115
|
for (const route of Object.values(manifest.routes)) {
|
|
149
116
|
if (route.preloads?.length) route.preloads = await Promise.all(route.preloads.map(async (link) => {
|
|
150
117
|
const result = await transformScript(resolveManifestAssetLink(link).href);
|
|
@@ -178,21 +145,19 @@ async function transformManifestAssets(source, transformFn, _opts) {
|
|
|
178
145
|
return manifest;
|
|
179
146
|
}
|
|
180
147
|
/**
|
|
181
|
-
* Builds a final ServerManifest
|
|
182
|
-
*
|
|
148
|
+
* Builds a final ServerManifest without URL transforms. Used when no
|
|
149
|
+
* transformAssets option is provided.
|
|
183
150
|
*
|
|
184
151
|
* Returns a new manifest object so the cached base manifest is never mutated.
|
|
185
152
|
*/
|
|
186
|
-
function
|
|
187
|
-
|
|
188
|
-
...source.
|
|
189
|
-
...opts?.inlineCss !== false && source.
|
|
190
|
-
routes: { ...source.
|
|
153
|
+
function buildManifest(source, opts) {
|
|
154
|
+
return {
|
|
155
|
+
...source.scriptFormat ? { scriptFormat: source.scriptFormat } : {},
|
|
156
|
+
...opts?.inlineCss !== false && source.inlineCss ? { inlineCss: structuredClone(source.inlineCss) } : {},
|
|
157
|
+
routes: { ...source.routes }
|
|
191
158
|
};
|
|
192
|
-
addClientEntryToManifest(manifest, source.clientEntry);
|
|
193
|
-
return manifest;
|
|
194
159
|
}
|
|
195
160
|
//#endregion
|
|
196
|
-
export {
|
|
161
|
+
export { buildManifest, resolveTransformAssetsConfig, transformManifestAssets };
|
|
197
162
|
|
|
198
163
|
//# sourceMappingURL=transformAssetUrls.js.map
|
|
@@ -1 +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":";;AAqKA,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;;;;;AAWA,SAAgB,0BACd,aACA,eAA6B,UAC7B,aACgB;CAChB,OAAO,EACL,OAAO;EACL,GAAI,iBAAiB,WAAW,EAAE,MAAM,SAAS,IAAI,CAAC;EACtD,OAAO;EACP,KAAK;EACL,GAAI,cAAc,EAAE,YAAY,IAAI,CAAC;CACvC,EACF;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,SAAS,8BACP,QACA,MACA;CACA,MAAM,OAAO,OAAO,SAAS,WAAW,OAAO,KAAK;CAEpD,IAAI;OACG,MAAM,QAAQ,QACjB,KAAK,OAAO,SAAS,WAAW,OAAO,KAAK,UAAU,MACpD,OAAO;CAAA;CAKb,OAAO,CAAC,GAAI,UAAU,CAAC,GAAI,IAAI;AACjC;AAEA,SAAS,yBACP,UACA,aACA;CACA,MAAM,YAAY,SAAS,OAAO,YAAY,CAAC;CAC/C,MAAM,cAAc,UAAU,WAAW,CAAC;CAC1C,MAAM,UAAU,YAAY,MACzB,WAAW,OAAO,OAAO,QAAQ,WACpC,IACI,cACA,CACE,GAAG,aACH,0BACE,aACA,wBAAwB,QAAQ,CAClC,CACF;CAEJ,SAAS,SAAS;EAChB,GAAG,SAAS;EACZ,UAAU;GACR,GAAG;GACH,UAAU,8BAA8B,UAAU,UAAU,WAAW;GACvE;EACF;CACF;AACF;AAEA,eAAsB,wBACpB,QACA,aACA,OAIyB;CACzB,MAAM,WAAW,gBAAgB,OAAO,QAAQ;CAChD,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,yBAAyB,UAAU,OAAO,WAAW;CAErD,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,6BACd,QACA,MACgB;CAChB,MAAM,WAA2B;EAC/B,GAAI,OAAO,SAAS,eAChB,EAAE,cAAc,OAAO,SAAS,aAAa,IAC7C,CAAC;EACL,GAAI,MAAM,cAAc,SAAS,OAAO,SAAS,YAC7C,EAAE,WAAW,gBAAgB,OAAO,SAAS,SAAS,EAAE,IACxD,CAAC;EACL,QAAQ,EACN,GAAG,OAAO,SAAS,OACrB;CACF;CAEA,yBAAyB,UAAU,OAAO,WAAW;CAErD,OAAO;AACT"}
|
|
1
|
+
{"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":"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"}
|
package/package.json
CHANGED
package/src/finalManifest.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
|
-
|
|
2
|
+
buildManifest,
|
|
3
3
|
resolveTransformAssetsConfig,
|
|
4
4
|
transformManifestAssets,
|
|
5
5
|
} from './transformAssetUrls'
|
|
@@ -11,16 +11,11 @@ import type { ServerManifest } from '@tanstack/router-core'
|
|
|
11
11
|
import type { HandlerInlineCssOption } from './inlineCss'
|
|
12
12
|
import type {
|
|
13
13
|
CreateTransformAssetsContext,
|
|
14
|
-
StartManifestWithClientEntry,
|
|
15
14
|
TransformAssets,
|
|
16
15
|
TransformAssetsFn,
|
|
17
16
|
} from './transformAssetUrls'
|
|
18
17
|
|
|
19
|
-
export type {
|
|
20
|
-
HandlerInlineCssOption,
|
|
21
|
-
StartManifestWithClientEntry,
|
|
22
|
-
TransformAssets,
|
|
23
|
-
}
|
|
18
|
+
export type { HandlerInlineCssOption, TransformAssets }
|
|
24
19
|
|
|
25
20
|
export interface FinalManifestOptions {
|
|
26
21
|
/**
|
|
@@ -37,8 +32,8 @@ export interface FinalManifestOptions {
|
|
|
37
32
|
* Transform manifest-managed asset URLs and attributes at runtime, e.g. to
|
|
38
33
|
* prepend a CDN prefix.
|
|
39
34
|
*
|
|
40
|
-
* This covers JS preloads,
|
|
41
|
-
*
|
|
35
|
+
* This covers JS preloads, manifest script tags, CSS links, and URLs inside
|
|
36
|
+
* build-collected inline CSS. Asset imports used directly in
|
|
42
37
|
* components should be handled by the bundler instead.
|
|
43
38
|
*/
|
|
44
39
|
transformAssets?: TransformAssets
|
|
@@ -46,7 +41,7 @@ export interface FinalManifestOptions {
|
|
|
46
41
|
|
|
47
42
|
type FinalManifestCacheKey = 'inline-css' | 'linked-css'
|
|
48
43
|
type FinalManifestCache = Map<FinalManifestCacheKey, Promise<ServerManifest>>
|
|
49
|
-
export type GetBaseManifest = () => Promise<
|
|
44
|
+
export type GetBaseManifest = () => Promise<ServerManifest>
|
|
50
45
|
|
|
51
46
|
export interface FinalManifestRequestOptions {
|
|
52
47
|
request: Request
|
|
@@ -76,7 +71,7 @@ export interface FinalManifestResolver {
|
|
|
76
71
|
export function createCachedBaseManifestLoader(
|
|
77
72
|
loadBaseManifest: GetBaseManifest,
|
|
78
73
|
): GetBaseManifest {
|
|
79
|
-
let baseManifestPromise: Promise<
|
|
74
|
+
let baseManifestPromise: Promise<ServerManifest> | undefined
|
|
80
75
|
|
|
81
76
|
return () => {
|
|
82
77
|
if (!baseManifestPromise) {
|
|
@@ -241,7 +236,7 @@ function getOrCreateCachedFinalManifestPromise(
|
|
|
241
236
|
}
|
|
242
237
|
|
|
243
238
|
async function buildFinalManifest(opts: {
|
|
244
|
-
base:
|
|
239
|
+
base: ServerManifest
|
|
245
240
|
transformFn: TransformAssetsFn | undefined
|
|
246
241
|
inlineCss: boolean
|
|
247
242
|
}): Promise<ServerManifest> {
|
|
@@ -249,11 +244,11 @@ async function buildFinalManifest(opts: {
|
|
|
249
244
|
? await transformManifestAssets(opts.base, opts.transformFn, {
|
|
250
245
|
inlineCss: opts.inlineCss,
|
|
251
246
|
})
|
|
252
|
-
:
|
|
247
|
+
: buildManifest(opts.base, { inlineCss: opts.inlineCss })
|
|
253
248
|
}
|
|
254
249
|
|
|
255
250
|
async function resolveFinalManifest(opts: {
|
|
256
|
-
getBaseManifest: () => Promise<
|
|
251
|
+
getBaseManifest: () => Promise<ServerManifest>
|
|
257
252
|
transformFn: TransformAssetsFn | undefined
|
|
258
253
|
cache: boolean
|
|
259
254
|
inlineCss: boolean
|
|
@@ -283,7 +278,7 @@ function warmupFinalManifest(opts: {
|
|
|
283
278
|
handlerDefaultInlineCss: boolean | undefined
|
|
284
279
|
cache: boolean
|
|
285
280
|
finalManifestCache: FinalManifestCache
|
|
286
|
-
getBaseManifest: () => Promise<
|
|
281
|
+
getBaseManifest: () => Promise<ServerManifest>
|
|
287
282
|
getTransformFn: () => Promise<TransformAssetsFn | undefined>
|
|
288
283
|
onError?: () => void
|
|
289
284
|
}): Promise<ServerManifest> | undefined {
|
package/src/router-manifest.ts
CHANGED
|
@@ -3,8 +3,11 @@ import {
|
|
|
3
3
|
buildDevStylesUrl,
|
|
4
4
|
rootRouteId,
|
|
5
5
|
} from '@tanstack/router-core'
|
|
6
|
-
import type {
|
|
7
|
-
|
|
6
|
+
import type {
|
|
7
|
+
AnyRoute,
|
|
8
|
+
ServerManifest,
|
|
9
|
+
ServerManifestRoute,
|
|
10
|
+
} from '@tanstack/router-core'
|
|
8
11
|
|
|
9
12
|
// Pre-computed constant for dev styles URL basepath.
|
|
10
13
|
// Defaults to vite `base` (set via TSS_DEV_SSR_STYLES_BASEPATH in the plugin),
|
|
@@ -16,15 +19,12 @@ const DEV_SSR_STYLES_BASEPATH = process.env.TSS_DEV_SSR_STYLES_BASEPATH || '/'
|
|
|
16
19
|
* special assets that are needed for the client. It does not include relationships
|
|
17
20
|
* between routes or any other data that is not needed for the client.
|
|
18
21
|
*
|
|
19
|
-
* The client entry URL is returned separately so that it can be transformed
|
|
20
|
-
* (e.g. for CDN rewriting) before being embedded into the `<script>` tag.
|
|
21
|
-
*
|
|
22
22
|
* @param matchedRoutes - In dev mode, the matched routes are used to build
|
|
23
23
|
* the dev styles URL for route-scoped CSS collection.
|
|
24
24
|
*/
|
|
25
25
|
export async function getStartManifest(
|
|
26
26
|
matchedRoutes?: ReadonlyArray<AnyRoute>,
|
|
27
|
-
): Promise<
|
|
27
|
+
): Promise<ServerManifest> {
|
|
28
28
|
const { tsrStartManifest } = await import('tanstack-start-manifest:v')
|
|
29
29
|
const startManifest = tsrStartManifest()
|
|
30
30
|
let routes = startManifest.routes
|
|
@@ -85,8 +85,5 @@ export async function getStartManifest(
|
|
|
85
85
|
routes: manifestRoutes,
|
|
86
86
|
}
|
|
87
87
|
|
|
88
|
-
return
|
|
89
|
-
manifest: manifest as StartManifestWithClientEntry['manifest'],
|
|
90
|
-
clientEntry: startManifest.clientEntry,
|
|
91
|
-
}
|
|
88
|
+
return manifest
|
|
92
89
|
}
|
package/src/tanstack-start.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
declare module 'tanstack-start-manifest:v' {
|
|
2
2
|
import type { ServerManifest } from '@tanstack/router-core'
|
|
3
3
|
|
|
4
|
-
export const tsrStartManifest: () => ServerManifest
|
|
4
|
+
export const tsrStartManifest: () => ServerManifest
|
|
5
5
|
}
|
|
6
6
|
|
|
7
7
|
declare module 'tanstack-start-route-tree:v' {
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import {
|
|
2
|
-
getManifestScriptFormat,
|
|
3
2
|
resolveManifestAssetLink,
|
|
4
3
|
resolveManifestCssLink,
|
|
5
4
|
} from '@tanstack/router-core'
|
|
@@ -9,8 +8,6 @@ import type {
|
|
|
9
8
|
Awaitable,
|
|
10
9
|
ManifestAssetLink,
|
|
11
10
|
ManifestCssLink,
|
|
12
|
-
ManifestScript,
|
|
13
|
-
ScriptFormat,
|
|
14
11
|
ServerManifest,
|
|
15
12
|
} from '@tanstack/router-core'
|
|
16
13
|
|
|
@@ -322,30 +319,6 @@ export function resolveTransformAssetsConfig(
|
|
|
322
319
|
}
|
|
323
320
|
}
|
|
324
321
|
|
|
325
|
-
export interface StartManifestWithClientEntry {
|
|
326
|
-
manifest: ServerManifest
|
|
327
|
-
clientEntry: string
|
|
328
|
-
}
|
|
329
|
-
|
|
330
|
-
/**
|
|
331
|
-
* Builds the client entry `<script>` tag from a (possibly transformed) client
|
|
332
|
-
* entry URL.
|
|
333
|
-
*/
|
|
334
|
-
export function buildClientEntryScriptTag(
|
|
335
|
-
clientEntry: string,
|
|
336
|
-
scriptFormat: ScriptFormat = 'module',
|
|
337
|
-
crossOrigin?: AssetCrossOrigin,
|
|
338
|
-
): ManifestScript {
|
|
339
|
-
return {
|
|
340
|
-
attrs: {
|
|
341
|
-
...(scriptFormat === 'module' ? { type: 'module' } : {}),
|
|
342
|
-
async: true,
|
|
343
|
-
src: clientEntry,
|
|
344
|
-
...(crossOrigin ? { crossOrigin } : {}),
|
|
345
|
-
},
|
|
346
|
-
}
|
|
347
|
-
}
|
|
348
|
-
|
|
349
322
|
type AssignableManifestLink = ManifestAssetLink | ManifestCssLink
|
|
350
323
|
|
|
351
324
|
function assignManifestLink(
|
|
@@ -378,60 +351,15 @@ function assignManifestLink(
|
|
|
378
351
|
return nextLink
|
|
379
352
|
}
|
|
380
353
|
|
|
381
|
-
function appendUniqueManifestAssetLink(
|
|
382
|
-
target: Array<ManifestAssetLink> | undefined,
|
|
383
|
-
link: ManifestAssetLink,
|
|
384
|
-
) {
|
|
385
|
-
const href = typeof link === 'string' ? link : link.href
|
|
386
|
-
|
|
387
|
-
if (target) {
|
|
388
|
-
for (const item of target) {
|
|
389
|
-
if ((typeof item === 'string' ? item : item.href) === href) {
|
|
390
|
-
return target
|
|
391
|
-
}
|
|
392
|
-
}
|
|
393
|
-
}
|
|
394
|
-
|
|
395
|
-
return [...(target ?? []), link]
|
|
396
|
-
}
|
|
397
|
-
|
|
398
|
-
function addClientEntryToManifest(
|
|
399
|
-
manifest: ServerManifest,
|
|
400
|
-
clientEntry: string,
|
|
401
|
-
) {
|
|
402
|
-
const rootRoute = manifest.routes.__root__ ?? {}
|
|
403
|
-
const rootScripts = rootRoute.scripts ?? []
|
|
404
|
-
const scripts = rootScripts.some(
|
|
405
|
-
(script) => script.attrs?.src === clientEntry,
|
|
406
|
-
)
|
|
407
|
-
? rootScripts
|
|
408
|
-
: [
|
|
409
|
-
...rootScripts,
|
|
410
|
-
buildClientEntryScriptTag(
|
|
411
|
-
clientEntry,
|
|
412
|
-
getManifestScriptFormat(manifest),
|
|
413
|
-
),
|
|
414
|
-
]
|
|
415
|
-
|
|
416
|
-
manifest.routes = {
|
|
417
|
-
...manifest.routes,
|
|
418
|
-
__root__: {
|
|
419
|
-
...rootRoute,
|
|
420
|
-
preloads: appendUniqueManifestAssetLink(rootRoute.preloads, clientEntry),
|
|
421
|
-
scripts,
|
|
422
|
-
},
|
|
423
|
-
}
|
|
424
|
-
}
|
|
425
|
-
|
|
426
354
|
export async function transformManifestAssets(
|
|
427
|
-
source:
|
|
355
|
+
source: ServerManifest,
|
|
428
356
|
transformFn: TransformAssetsFn,
|
|
429
357
|
_opts?: {
|
|
430
358
|
clone?: boolean
|
|
431
359
|
inlineCss?: boolean
|
|
432
360
|
},
|
|
433
361
|
): Promise<ServerManifest> {
|
|
434
|
-
const manifest = structuredClone(source
|
|
362
|
+
const manifest = structuredClone(source)
|
|
435
363
|
const inlineCssEnabled = _opts?.inlineCss !== false
|
|
436
364
|
const scriptTransforms = new Map<
|
|
437
365
|
string,
|
|
@@ -462,8 +390,6 @@ export async function transformManifestAssets(
|
|
|
462
390
|
)
|
|
463
391
|
}
|
|
464
392
|
|
|
465
|
-
addClientEntryToManifest(manifest, source.clientEntry)
|
|
466
|
-
|
|
467
393
|
for (const route of Object.values(manifest.routes)) {
|
|
468
394
|
if (route.preloads?.length) {
|
|
469
395
|
route.preloads = await Promise.all(
|
|
@@ -524,28 +450,24 @@ export async function transformManifestAssets(
|
|
|
524
450
|
}
|
|
525
451
|
|
|
526
452
|
/**
|
|
527
|
-
* Builds a final ServerManifest
|
|
528
|
-
*
|
|
453
|
+
* Builds a final ServerManifest without URL transforms. Used when no
|
|
454
|
+
* transformAssets option is provided.
|
|
529
455
|
*
|
|
530
456
|
* Returns a new manifest object so the cached base manifest is never mutated.
|
|
531
457
|
*/
|
|
532
|
-
export function
|
|
533
|
-
source:
|
|
458
|
+
export function buildManifest(
|
|
459
|
+
source: ServerManifest,
|
|
534
460
|
opts?: { inlineCss?: boolean },
|
|
535
461
|
): ServerManifest {
|
|
536
462
|
const manifest: ServerManifest = {
|
|
537
|
-
...(source.
|
|
538
|
-
|
|
539
|
-
:
|
|
540
|
-
...(opts?.inlineCss !== false && source.manifest.inlineCss
|
|
541
|
-
? { inlineCss: structuredClone(source.manifest.inlineCss) }
|
|
463
|
+
...(source.scriptFormat ? { scriptFormat: source.scriptFormat } : {}),
|
|
464
|
+
...(opts?.inlineCss !== false && source.inlineCss
|
|
465
|
+
? { inlineCss: structuredClone(source.inlineCss) }
|
|
542
466
|
: {}),
|
|
543
467
|
routes: {
|
|
544
|
-
...source.
|
|
468
|
+
...source.routes,
|
|
545
469
|
},
|
|
546
470
|
}
|
|
547
471
|
|
|
548
|
-
addClientEntryToManifest(manifest, source.clientEntry)
|
|
549
|
-
|
|
550
472
|
return manifest
|
|
551
473
|
}
|