@tanstack/start-server-core 1.169.3 → 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/constants.js.map +1 -1
- package/dist/esm/createServerRpc.js.map +1 -1
- package/dist/esm/createSsrRpc.js.map +1 -1
- package/dist/esm/createStartHandler.js.map +1 -1
- package/dist/esm/early-hints.js.map +1 -1
- package/dist/esm/empty-plugin-adapters.d.ts +3 -0
- package/dist/esm/empty-plugin-adapters.js +7 -0
- package/dist/esm/empty-plugin-adapters.js.map +1 -0
- package/dist/esm/fake-start-server-fn-resolver.js.map +1 -1
- 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/frame-protocol.js.map +1 -1
- package/dist/esm/inlineCss.js.map +1 -1
- package/dist/esm/request-response.js.map +1 -1
- package/dist/esm/router-manifest.d.ts +2 -6
- package/dist/esm/router-manifest.js +3 -19
- package/dist/esm/router-manifest.js.map +1 -1
- package/dist/esm/serializer/ServerFunctionSerializationAdapter.js.map +1 -1
- package/dist/esm/server-functions-handler.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/dist/esm/virtual-modules.d.ts +0 -1
- package/dist/esm/virtual-modules.js +0 -1
- package/dist/esm/virtual-modules.js.map +1 -1
- package/package.json +5 -2
- package/src/empty-plugin-adapters.ts +4 -0
- package/src/finalManifest.ts +10 -15
- package/src/router-manifest.ts +7 -28
- package/src/tanstack-start.d.ts +1 -5
- package/src/transformAssetUrls.ts +10 -88
- package/src/virtual-modules.ts +0 -1
|
@@ -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
|
*/
|
|
@@ -35,16 +32,6 @@ async function getStartManifest(matchedRoutes) {
|
|
|
35
32
|
}]
|
|
36
33
|
});
|
|
37
34
|
}
|
|
38
|
-
if (process.env.TSS_DEV_SERVER === "true") {
|
|
39
|
-
const mod = await import("tanstack-start-injected-head-scripts:v");
|
|
40
|
-
if (mod.injectedHeadScripts) updateRootRoute({
|
|
41
|
-
...rootRoute,
|
|
42
|
-
scripts: [...rootRoute?.scripts ?? [], {
|
|
43
|
-
attrs: { type: "module" },
|
|
44
|
-
children: mod.injectedHeadScripts
|
|
45
|
-
}]
|
|
46
|
-
});
|
|
47
|
-
}
|
|
48
35
|
const manifestRoutes = {};
|
|
49
36
|
for (const k in routes) {
|
|
50
37
|
const v = routes[k];
|
|
@@ -55,12 +42,9 @@ async function getStartManifest(matchedRoutes) {
|
|
|
55
42
|
if (result.preloads || result.scripts || result.css) manifestRoutes[k] = result;
|
|
56
43
|
}
|
|
57
44
|
return {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
routes: manifestRoutes
|
|
62
|
-
},
|
|
63
|
-
clientEntry: startManifest.clientEntry
|
|
45
|
+
...startManifest.scriptFormat ? { scriptFormat: startManifest.scriptFormat } : {},
|
|
46
|
+
...startManifest.inlineCss ? { inlineCss: startManifest.inlineCss } : {},
|
|
47
|
+
routes: manifestRoutes
|
|
64
48
|
};
|
|
65
49
|
}
|
|
66
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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerFunctionSerializationAdapter.js","names":[],"sources":["../../../src/serializer/ServerFunctionSerializationAdapter.ts"],"sourcesContent":["import { createSerializationAdapter } from '@tanstack/router-core'\nimport { TSS_SERVER_FUNCTION } from '@tanstack/start-client-core'\nimport { getServerFnById } from '../getServerFnById'\n\nexport const ServerFunctionSerializationAdapter = createSerializationAdapter({\n key: '$TSS/serverfn',\n test: (v): v is { serverFnMeta: { id: string } } => {\n if (typeof v !== 'function') return false\n\n if (!(TSS_SERVER_FUNCTION in v)) return false\n\n return !!v[TSS_SERVER_FUNCTION]\n },\n toSerializable: ({ serverFnMeta }) => ({ functionId: serverFnMeta.id }),\n fromSerializable: ({ functionId }) => {\n const fn = async (opts: any, signal: any): Promise<any> => {\n // When a function ID is received through serialization (e.g., as a parameter\n // to another server function), it originates from the client and must be\n // validated the same way as direct HTTP calls to server functions.\n const serverFn = await getServerFnById(functionId, { origin: 'client' })\n const result = await serverFn(opts ?? {}, signal)\n return result.result\n }\n return fn as never\n },\n})\n"],"mappings":";;;;AAIA,IAAa,qCAAqC,2BAA2B;CAC3E,KAAK;CACL,OAAO,MAA6C;
|
|
1
|
+
{"version":3,"file":"ServerFunctionSerializationAdapter.js","names":[],"sources":["../../../src/serializer/ServerFunctionSerializationAdapter.ts"],"sourcesContent":["import { createSerializationAdapter } from '@tanstack/router-core'\nimport { TSS_SERVER_FUNCTION } from '@tanstack/start-client-core'\nimport { getServerFnById } from '../getServerFnById'\n\nexport const ServerFunctionSerializationAdapter = createSerializationAdapter({\n key: '$TSS/serverfn',\n test: (v): v is { serverFnMeta: { id: string } } => {\n if (typeof v !== 'function') return false\n\n if (!(TSS_SERVER_FUNCTION in v)) return false\n\n return !!v[TSS_SERVER_FUNCTION]\n },\n toSerializable: ({ serverFnMeta }) => ({ functionId: serverFnMeta.id }),\n fromSerializable: ({ functionId }) => {\n const fn = async (opts: any, signal: any): Promise<any> => {\n // When a function ID is received through serialization (e.g., as a parameter\n // to another server function), it originates from the client and must be\n // validated the same way as direct HTTP calls to server functions.\n const serverFn = await getServerFnById(functionId, { origin: 'client' })\n const result = await serverFn(opts ?? {}, signal)\n return result.result\n }\n return fn as never\n },\n})\n"],"mappings":";;;;AAIA,IAAa,qCAAqC,2BAA2B;CAC3E,KAAK;CACL,OAAO,MAA6C;EAClD,IAAI,OAAO,MAAM,YAAY,OAAO;EAEpC,IAAI,EAAE,uBAAuB,IAAI,OAAO;EAExC,OAAO,CAAC,CAAC,EAAE;CACb;CACA,iBAAiB,EAAE,oBAAoB,EAAE,YAAY,aAAa,GAAG;CACrE,mBAAmB,EAAE,iBAAiB;EACpC,MAAM,KAAK,OAAO,MAAW,WAA8B;GAMzD,QAAO,OADc,MADE,gBAAgB,YAAY,EAAE,QAAQ,SAAS,CAAC,GACzC,QAAQ,CAAC,GAAG,MAAM,GAClC;EAChB;EACA,OAAO;CACT;AACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-functions-handler.js","names":[],"sources":["../../src/server-functions-handler.ts"],"sourcesContent":["import {\n createRawStreamRPCPlugin,\n invariant,\n isNotFound,\n isRedirect,\n} from '@tanstack/router-core'\nimport {\n TSS_FORMDATA_CONTEXT,\n X_TSS_RAW_RESPONSE,\n X_TSS_SERIALIZED,\n getDefaultSerovalPlugins,\n safeObjectMerge,\n} from '@tanstack/start-client-core'\nimport { fromJSON, toCrossJSONAsync, toCrossJSONStream } from 'seroval'\nimport { getResponse } from './request-response'\nimport { getServerFnById } from './getServerFnById'\nimport {\n TSS_CONTENT_TYPE_FRAMED_VERSIONED,\n createMultiplexedStream,\n} from './frame-protocol'\nimport type { LateStreamRegistration } from './frame-protocol'\nimport type { Plugin as SerovalPlugin } from 'seroval'\n\n// Cache serovalPlugins at module level to avoid repeated calls\nlet serovalPlugins: Array<SerovalPlugin<any, any>> | undefined = undefined\n\n// Known FormData 'Content-Type' header values - module-level constant\nconst FORM_DATA_CONTENT_TYPES = [\n 'multipart/form-data',\n 'application/x-www-form-urlencoded',\n]\n\n// Maximum payload size for GET requests (1MB)\nconst MAX_PAYLOAD_SIZE = 1_000_000\n\nexport const handleServerAction = async ({\n request,\n context,\n serverFnId,\n}: {\n request: Request\n context: any\n serverFnId: string\n}) => {\n const method = request.method\n const methodUpper = method.toUpperCase()\n const url = new URL(request.url)\n\n const action = await getServerFnById(serverFnId, { origin: 'client' })\n\n // Early method check: reject mismatched HTTP methods before parsing\n // the request payload (FormData, JSON, query string, etc.)\n if (action.method && methodUpper !== action.method) {\n return new Response(\n `expected ${action.method} method. Got ${methodUpper}`,\n {\n status: 405,\n headers: {\n Allow: action.method,\n },\n },\n )\n }\n\n const isServerFn = request.headers.get('x-tsr-serverFn') === 'true'\n\n // Initialize serovalPlugins lazily (cached at module level)\n if (!serovalPlugins) {\n serovalPlugins = getDefaultSerovalPlugins()\n }\n\n const contentType = request.headers.get('Content-Type')\n\n function parsePayload(payload: any) {\n const parsedPayload = fromJSON(payload, { plugins: serovalPlugins })\n return parsedPayload as any\n }\n\n const response = await (async () => {\n try {\n let res = await (async () => {\n // FormData\n if (\n FORM_DATA_CONTENT_TYPES.some(\n (type) => contentType && contentType.includes(type),\n )\n ) {\n // We don't support GET requests with FormData payloads... that seems impossible\n if (methodUpper === 'GET') {\n if (process.env.NODE_ENV !== 'production') {\n throw new Error(\n 'Invariant failed: GET requests with FormData payloads are not supported',\n )\n }\n\n invariant()\n }\n const formData = await request.formData()\n const serializedContext = formData.get(TSS_FORMDATA_CONTEXT)\n formData.delete(TSS_FORMDATA_CONTEXT)\n\n const params = {\n context,\n data: formData,\n method: methodUpper,\n }\n if (typeof serializedContext === 'string') {\n try {\n const parsedContext = JSON.parse(serializedContext)\n const deserializedContext = fromJSON(parsedContext, {\n plugins: serovalPlugins,\n })\n if (\n typeof deserializedContext === 'object' &&\n deserializedContext\n ) {\n params.context = safeObjectMerge(\n deserializedContext as Record<string, unknown>,\n context,\n )\n }\n } catch (e) {\n // Log warning for debugging but don't expose to client\n if (process.env.NODE_ENV === 'development') {\n console.warn('Failed to parse FormData context:', e)\n }\n }\n }\n\n return await action(params)\n }\n\n // Get requests use the query string\n if (methodUpper === 'GET') {\n // Get payload directly from searchParams\n const payloadParam = url.searchParams.get('payload')\n // Reject oversized payloads to prevent DoS\n if (payloadParam && payloadParam.length > MAX_PAYLOAD_SIZE) {\n throw new Error('Payload too large')\n }\n // If there's a payload, we should try to parse it\n const payload: any = payloadParam\n ? parsePayload(JSON.parse(payloadParam))\n : {}\n payload.context = safeObjectMerge(payload.context, context)\n payload.method = methodUpper\n // Send it through!\n return await action(payload)\n }\n\n let jsonPayload\n if (contentType?.includes('application/json')) {\n jsonPayload = await request.json()\n }\n\n const payload = jsonPayload ? parsePayload(jsonPayload) : {}\n payload.context = safeObjectMerge(payload.context, context)\n payload.method = methodUpper\n return await action(payload)\n })()\n\n const unwrapped = res.result || res.error\n\n if (isNotFound(res)) {\n res = isNotFoundResponse(res)\n }\n\n if (!isServerFn) {\n return unwrapped\n }\n\n if (unwrapped instanceof Response) {\n if (isRedirect(unwrapped)) {\n return unwrapped\n }\n unwrapped.headers.set(X_TSS_RAW_RESPONSE, 'true')\n return unwrapped\n }\n\n return serializeResult(res)\n\n function serializeResult(res: unknown): Response {\n let nonStreamingBody: any = undefined\n\n const alsResponse = getResponse()\n if (res !== undefined) {\n // Collect raw streams encountered during initial synchronous serialization\n const rawStreams = new Map<number, ReadableStream<Uint8Array>>()\n\n // Track whether we're still in the initial synchronous phase\n // After initial phase, new RawStreams go to lateStreamWriter\n let initialPhase = true\n\n // Late stream registration for RawStreams discovered after initial pass\n // (e.g., from resolved Promises)\n let lateStreamWriter:\n | WritableStreamDefaultWriter<LateStreamRegistration>\n | undefined\n let lateStreamReadable:\n | ReadableStream<LateStreamRegistration>\n | undefined = undefined\n const pendingLateStreams: Array<LateStreamRegistration> = []\n\n const rawStreamPlugin = createRawStreamRPCPlugin(\n (id: number, stream: ReadableStream<Uint8Array>) => {\n if (initialPhase) {\n rawStreams.set(id, stream)\n return\n }\n\n if (lateStreamWriter) {\n // Late stream - write to the late stream channel\n lateStreamWriter.write({ id, stream }).catch(() => {\n // Ignore write errors - stream may be closed\n })\n return\n }\n\n // Discovered after initial phase but before writer exists.\n pendingLateStreams.push({ id, stream })\n },\n )\n\n // Build plugins with RawStreamRPCPlugin first (before default SSR plugin)\n const plugins = [rawStreamPlugin, ...(serovalPlugins || [])]\n\n // first run without the stream in case `result` does not need streaming\n let done = false as boolean\n const callbacks: {\n onParse: (value: any) => void\n onDone: () => void\n onError: (error: any) => void\n } = {\n onParse: (value) => {\n nonStreamingBody = value\n },\n onDone: () => {\n done = true\n },\n onError: (error) => {\n throw error\n },\n }\n toCrossJSONStream(res, {\n refs: new Map(),\n plugins,\n onParse(value) {\n callbacks.onParse(value)\n },\n onDone() {\n callbacks.onDone()\n },\n onError: (error) => {\n callbacks.onError(error)\n },\n })\n\n // End of initial synchronous phase - any new RawStreams are \"late\"\n initialPhase = false\n\n // If any RawStreams are discovered after this point but before the\n // late-stream writer exists, we buffer them and flush once the writer\n // is ready. This avoids an occasional missed-stream race.\n\n // If no raw streams and done synchronously, return simple JSON\n if (done && rawStreams.size === 0) {\n return new Response(\n nonStreamingBody ? JSON.stringify(nonStreamingBody) : undefined,\n {\n status: alsResponse.status,\n statusText: alsResponse.statusText,\n headers: {\n 'Content-Type': 'application/json',\n [X_TSS_SERIALIZED]: 'true',\n },\n },\n )\n }\n\n // Not done synchronously or has raw streams - use framed protocol\n // This supports late RawStreams from resolved Promises\n const { readable, writable } =\n new TransformStream<LateStreamRegistration>()\n lateStreamReadable = readable\n lateStreamWriter = writable.getWriter()\n\n // Flush any late streams that were discovered in the small window\n // between end of initial serialization and writer setup.\n for (const registration of pendingLateStreams) {\n lateStreamWriter.write(registration).catch(() => {\n // Ignore write errors - stream may be closed\n })\n }\n pendingLateStreams.length = 0\n\n // Create a stream of JSON chunks\n const jsonStream = new ReadableStream<string>({\n start(controller) {\n callbacks.onParse = (value) => {\n controller.enqueue(JSON.stringify(value) + '\\n')\n }\n callbacks.onDone = () => {\n try {\n controller.close()\n } catch {\n // Already closed\n }\n // Close late stream writer when JSON serialization is done\n // Any RawStreams not yet discovered won't be sent\n lateStreamWriter\n ?.close()\n .catch(() => {\n // Ignore close errors\n })\n .finally(() => {\n lateStreamWriter = undefined\n })\n }\n\n callbacks.onError = (error) => {\n controller.error(error)\n lateStreamWriter\n ?.abort(error)\n .catch(() => {\n // Ignore abort errors\n })\n .finally(() => {\n lateStreamWriter = undefined\n })\n }\n\n // Emit initial body if we have one\n if (nonStreamingBody !== undefined) {\n callbacks.onParse(nonStreamingBody)\n }\n // If serialization already completed synchronously, close now\n // This handles the case where onDone was called during toCrossJSONStream\n // before we overwrote callbacks.onDone\n if (done) {\n callbacks.onDone()\n }\n },\n cancel() {\n lateStreamWriter?.abort().catch(() => {})\n lateStreamWriter = undefined\n },\n })\n\n // Create multiplexed stream with JSON, initial raw streams, and late streams\n const multiplexedStream = createMultiplexedStream(\n jsonStream,\n rawStreams,\n lateStreamReadable,\n )\n\n return new Response(multiplexedStream, {\n status: alsResponse.status,\n statusText: alsResponse.statusText,\n headers: {\n 'Content-Type': TSS_CONTENT_TYPE_FRAMED_VERSIONED,\n [X_TSS_SERIALIZED]: 'true',\n },\n })\n }\n\n return new Response(undefined, {\n status: alsResponse.status,\n statusText: alsResponse.statusText,\n })\n }\n } catch (error: any) {\n if (error instanceof Response) {\n return error\n }\n // else if (\n // isPlainObject(error) &&\n // 'result' in error &&\n // error.result instanceof Response\n // ) {\n // return error.result\n // }\n\n // Currently this server-side context has no idea how to\n // build final URLs, so we need to defer that to the client.\n // The client will check for __redirect and __notFound keys,\n // and if they exist, it will handle them appropriately.\n\n if (isNotFound(error)) {\n return isNotFoundResponse(error)\n }\n\n console.info()\n console.info('Server Fn Error!')\n console.info()\n console.error(error)\n console.info()\n\n const serializedError = JSON.stringify(\n await Promise.resolve(\n toCrossJSONAsync(error, {\n refs: new Map(),\n plugins: serovalPlugins,\n }),\n ),\n )\n const response = getResponse()\n return new Response(serializedError, {\n status: response.status ?? 500,\n statusText: response.statusText,\n headers: {\n 'Content-Type': 'application/json',\n [X_TSS_SERIALIZED]: 'true',\n },\n })\n }\n })()\n\n return response\n}\n\nfunction isNotFoundResponse(error: any) {\n const { headers, ...rest } = error\n\n return new Response(JSON.stringify(rest), {\n status: 404,\n headers: {\n 'Content-Type': 'application/json',\n ...(headers || {}),\n },\n })\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server-functions-handler.js","names":[],"sources":["../../src/server-functions-handler.ts"],"sourcesContent":["import {\n createRawStreamRPCPlugin,\n invariant,\n isNotFound,\n isRedirect,\n} from '@tanstack/router-core'\nimport {\n TSS_FORMDATA_CONTEXT,\n X_TSS_RAW_RESPONSE,\n X_TSS_SERIALIZED,\n getDefaultSerovalPlugins,\n safeObjectMerge,\n} from '@tanstack/start-client-core'\nimport { fromJSON, toCrossJSONAsync, toCrossJSONStream } from 'seroval'\nimport { getResponse } from './request-response'\nimport { getServerFnById } from './getServerFnById'\nimport {\n TSS_CONTENT_TYPE_FRAMED_VERSIONED,\n createMultiplexedStream,\n} from './frame-protocol'\nimport type { LateStreamRegistration } from './frame-protocol'\nimport type { Plugin as SerovalPlugin } from 'seroval'\n\n// Cache serovalPlugins at module level to avoid repeated calls\nlet serovalPlugins: Array<SerovalPlugin<any, any>> | undefined = undefined\n\n// Known FormData 'Content-Type' header values - module-level constant\nconst FORM_DATA_CONTENT_TYPES = [\n 'multipart/form-data',\n 'application/x-www-form-urlencoded',\n]\n\n// Maximum payload size for GET requests (1MB)\nconst MAX_PAYLOAD_SIZE = 1_000_000\n\nexport const handleServerAction = async ({\n request,\n context,\n serverFnId,\n}: {\n request: Request\n context: any\n serverFnId: string\n}) => {\n const method = request.method\n const methodUpper = method.toUpperCase()\n const url = new URL(request.url)\n\n const action = await getServerFnById(serverFnId, { origin: 'client' })\n\n // Early method check: reject mismatched HTTP methods before parsing\n // the request payload (FormData, JSON, query string, etc.)\n if (action.method && methodUpper !== action.method) {\n return new Response(\n `expected ${action.method} method. Got ${methodUpper}`,\n {\n status: 405,\n headers: {\n Allow: action.method,\n },\n },\n )\n }\n\n const isServerFn = request.headers.get('x-tsr-serverFn') === 'true'\n\n // Initialize serovalPlugins lazily (cached at module level)\n if (!serovalPlugins) {\n serovalPlugins = getDefaultSerovalPlugins()\n }\n\n const contentType = request.headers.get('Content-Type')\n\n function parsePayload(payload: any) {\n const parsedPayload = fromJSON(payload, { plugins: serovalPlugins })\n return parsedPayload as any\n }\n\n const response = await (async () => {\n try {\n let res = await (async () => {\n // FormData\n if (\n FORM_DATA_CONTENT_TYPES.some(\n (type) => contentType && contentType.includes(type),\n )\n ) {\n // We don't support GET requests with FormData payloads... that seems impossible\n if (methodUpper === 'GET') {\n if (process.env.NODE_ENV !== 'production') {\n throw new Error(\n 'Invariant failed: GET requests with FormData payloads are not supported',\n )\n }\n\n invariant()\n }\n const formData = await request.formData()\n const serializedContext = formData.get(TSS_FORMDATA_CONTEXT)\n formData.delete(TSS_FORMDATA_CONTEXT)\n\n const params = {\n context,\n data: formData,\n method: methodUpper,\n }\n if (typeof serializedContext === 'string') {\n try {\n const parsedContext = JSON.parse(serializedContext)\n const deserializedContext = fromJSON(parsedContext, {\n plugins: serovalPlugins,\n })\n if (\n typeof deserializedContext === 'object' &&\n deserializedContext\n ) {\n params.context = safeObjectMerge(\n deserializedContext as Record<string, unknown>,\n context,\n )\n }\n } catch (e) {\n // Log warning for debugging but don't expose to client\n if (process.env.NODE_ENV === 'development') {\n console.warn('Failed to parse FormData context:', e)\n }\n }\n }\n\n return await action(params)\n }\n\n // Get requests use the query string\n if (methodUpper === 'GET') {\n // Get payload directly from searchParams\n const payloadParam = url.searchParams.get('payload')\n // Reject oversized payloads to prevent DoS\n if (payloadParam && payloadParam.length > MAX_PAYLOAD_SIZE) {\n throw new Error('Payload too large')\n }\n // If there's a payload, we should try to parse it\n const payload: any = payloadParam\n ? parsePayload(JSON.parse(payloadParam))\n : {}\n payload.context = safeObjectMerge(payload.context, context)\n payload.method = methodUpper\n // Send it through!\n return await action(payload)\n }\n\n let jsonPayload\n if (contentType?.includes('application/json')) {\n jsonPayload = await request.json()\n }\n\n const payload = jsonPayload ? parsePayload(jsonPayload) : {}\n payload.context = safeObjectMerge(payload.context, context)\n payload.method = methodUpper\n return await action(payload)\n })()\n\n const unwrapped = res.result || res.error\n\n if (isNotFound(res)) {\n res = isNotFoundResponse(res)\n }\n\n if (!isServerFn) {\n return unwrapped\n }\n\n if (unwrapped instanceof Response) {\n if (isRedirect(unwrapped)) {\n return unwrapped\n }\n unwrapped.headers.set(X_TSS_RAW_RESPONSE, 'true')\n return unwrapped\n }\n\n return serializeResult(res)\n\n function serializeResult(res: unknown): Response {\n let nonStreamingBody: any = undefined\n\n const alsResponse = getResponse()\n if (res !== undefined) {\n // Collect raw streams encountered during initial synchronous serialization\n const rawStreams = new Map<number, ReadableStream<Uint8Array>>()\n\n // Track whether we're still in the initial synchronous phase\n // After initial phase, new RawStreams go to lateStreamWriter\n let initialPhase = true\n\n // Late stream registration for RawStreams discovered after initial pass\n // (e.g., from resolved Promises)\n let lateStreamWriter:\n | WritableStreamDefaultWriter<LateStreamRegistration>\n | undefined\n let lateStreamReadable:\n | ReadableStream<LateStreamRegistration>\n | undefined = undefined\n const pendingLateStreams: Array<LateStreamRegistration> = []\n\n const rawStreamPlugin = createRawStreamRPCPlugin(\n (id: number, stream: ReadableStream<Uint8Array>) => {\n if (initialPhase) {\n rawStreams.set(id, stream)\n return\n }\n\n if (lateStreamWriter) {\n // Late stream - write to the late stream channel\n lateStreamWriter.write({ id, stream }).catch(() => {\n // Ignore write errors - stream may be closed\n })\n return\n }\n\n // Discovered after initial phase but before writer exists.\n pendingLateStreams.push({ id, stream })\n },\n )\n\n // Build plugins with RawStreamRPCPlugin first (before default SSR plugin)\n const plugins = [rawStreamPlugin, ...(serovalPlugins || [])]\n\n // first run without the stream in case `result` does not need streaming\n let done = false as boolean\n const callbacks: {\n onParse: (value: any) => void\n onDone: () => void\n onError: (error: any) => void\n } = {\n onParse: (value) => {\n nonStreamingBody = value\n },\n onDone: () => {\n done = true\n },\n onError: (error) => {\n throw error\n },\n }\n toCrossJSONStream(res, {\n refs: new Map(),\n plugins,\n onParse(value) {\n callbacks.onParse(value)\n },\n onDone() {\n callbacks.onDone()\n },\n onError: (error) => {\n callbacks.onError(error)\n },\n })\n\n // End of initial synchronous phase - any new RawStreams are \"late\"\n initialPhase = false\n\n // If any RawStreams are discovered after this point but before the\n // late-stream writer exists, we buffer them and flush once the writer\n // is ready. This avoids an occasional missed-stream race.\n\n // If no raw streams and done synchronously, return simple JSON\n if (done && rawStreams.size === 0) {\n return new Response(\n nonStreamingBody ? JSON.stringify(nonStreamingBody) : undefined,\n {\n status: alsResponse.status,\n statusText: alsResponse.statusText,\n headers: {\n 'Content-Type': 'application/json',\n [X_TSS_SERIALIZED]: 'true',\n },\n },\n )\n }\n\n // Not done synchronously or has raw streams - use framed protocol\n // This supports late RawStreams from resolved Promises\n const { readable, writable } =\n new TransformStream<LateStreamRegistration>()\n lateStreamReadable = readable\n lateStreamWriter = writable.getWriter()\n\n // Flush any late streams that were discovered in the small window\n // between end of initial serialization and writer setup.\n for (const registration of pendingLateStreams) {\n lateStreamWriter.write(registration).catch(() => {\n // Ignore write errors - stream may be closed\n })\n }\n pendingLateStreams.length = 0\n\n // Create a stream of JSON chunks\n const jsonStream = new ReadableStream<string>({\n start(controller) {\n callbacks.onParse = (value) => {\n controller.enqueue(JSON.stringify(value) + '\\n')\n }\n callbacks.onDone = () => {\n try {\n controller.close()\n } catch {\n // Already closed\n }\n // Close late stream writer when JSON serialization is done\n // Any RawStreams not yet discovered won't be sent\n lateStreamWriter\n ?.close()\n .catch(() => {\n // Ignore close errors\n })\n .finally(() => {\n lateStreamWriter = undefined\n })\n }\n\n callbacks.onError = (error) => {\n controller.error(error)\n lateStreamWriter\n ?.abort(error)\n .catch(() => {\n // Ignore abort errors\n })\n .finally(() => {\n lateStreamWriter = undefined\n })\n }\n\n // Emit initial body if we have one\n if (nonStreamingBody !== undefined) {\n callbacks.onParse(nonStreamingBody)\n }\n // If serialization already completed synchronously, close now\n // This handles the case where onDone was called during toCrossJSONStream\n // before we overwrote callbacks.onDone\n if (done) {\n callbacks.onDone()\n }\n },\n cancel() {\n lateStreamWriter?.abort().catch(() => {})\n lateStreamWriter = undefined\n },\n })\n\n // Create multiplexed stream with JSON, initial raw streams, and late streams\n const multiplexedStream = createMultiplexedStream(\n jsonStream,\n rawStreams,\n lateStreamReadable,\n )\n\n return new Response(multiplexedStream, {\n status: alsResponse.status,\n statusText: alsResponse.statusText,\n headers: {\n 'Content-Type': TSS_CONTENT_TYPE_FRAMED_VERSIONED,\n [X_TSS_SERIALIZED]: 'true',\n },\n })\n }\n\n return new Response(undefined, {\n status: alsResponse.status,\n statusText: alsResponse.statusText,\n })\n }\n } catch (error: any) {\n if (error instanceof Response) {\n return error\n }\n // else if (\n // isPlainObject(error) &&\n // 'result' in error &&\n // error.result instanceof Response\n // ) {\n // return error.result\n // }\n\n // Currently this server-side context has no idea how to\n // build final URLs, so we need to defer that to the client.\n // The client will check for __redirect and __notFound keys,\n // and if they exist, it will handle them appropriately.\n\n if (isNotFound(error)) {\n return isNotFoundResponse(error)\n }\n\n console.info()\n console.info('Server Fn Error!')\n console.info()\n console.error(error)\n console.info()\n\n const serializedError = JSON.stringify(\n await Promise.resolve(\n toCrossJSONAsync(error, {\n refs: new Map(),\n plugins: serovalPlugins,\n }),\n ),\n )\n const response = getResponse()\n return new Response(serializedError, {\n status: response.status ?? 500,\n statusText: response.statusText,\n headers: {\n 'Content-Type': 'application/json',\n [X_TSS_SERIALIZED]: 'true',\n },\n })\n }\n })()\n\n return response\n}\n\nfunction isNotFoundResponse(error: any) {\n const { headers, ...rest } = error\n\n return new Response(JSON.stringify(rest), {\n status: 404,\n headers: {\n 'Content-Type': 'application/json',\n ...(headers || {}),\n },\n })\n}\n"],"mappings":"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"}
|
|
@@ -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":"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"}
|
|
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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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
export declare const VIRTUAL_MODULES: {
|
|
2
2
|
readonly startManifest: "tanstack-start-manifest:v";
|
|
3
|
-
readonly injectedHeadScripts: "tanstack-start-injected-head-scripts:v";
|
|
4
3
|
readonly serverFnResolver: "#tanstack-start-server-fn-resolver";
|
|
5
4
|
readonly pluginAdapters: "#tanstack-start-plugin-adapters";
|
|
6
5
|
};
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
//#region src/virtual-modules.ts
|
|
2
2
|
var VIRTUAL_MODULES = {
|
|
3
3
|
startManifest: "tanstack-start-manifest:v",
|
|
4
|
-
injectedHeadScripts: "tanstack-start-injected-head-scripts:v",
|
|
5
4
|
serverFnResolver: "#tanstack-start-server-fn-resolver",
|
|
6
5
|
pluginAdapters: "#tanstack-start-plugin-adapters"
|
|
7
6
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"virtual-modules.js","names":[],"sources":["../../src/virtual-modules.ts"],"sourcesContent":["export const VIRTUAL_MODULES = {\n startManifest: 'tanstack-start-manifest:v',\n
|
|
1
|
+
{"version":3,"file":"virtual-modules.js","names":[],"sources":["../../src/virtual-modules.ts"],"sourcesContent":["export const VIRTUAL_MODULES = {\n startManifest: 'tanstack-start-manifest:v',\n serverFnResolver: '#tanstack-start-server-fn-resolver',\n pluginAdapters: '#tanstack-start-plugin-adapters',\n} as const\n"],"mappings":";AAAA,IAAa,kBAAkB;CAC7B,eAAe;CACf,kBAAkB;CAClB,gBAAgB;AAClB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tanstack/start-server-core",
|
|
3
|
-
"version": "1.169.
|
|
3
|
+
"version": "1.169.5",
|
|
4
4
|
"description": "Modern and scalable routing for React applications",
|
|
5
5
|
"author": "Tanner Linsley",
|
|
6
6
|
"license": "MIT",
|
|
@@ -49,6 +49,9 @@
|
|
|
49
49
|
"imports": {
|
|
50
50
|
"#tanstack-start-server-fn-resolver": {
|
|
51
51
|
"default": "./dist/esm/fake-start-server-fn-resolver.js"
|
|
52
|
+
},
|
|
53
|
+
"#tanstack-start-plugin-adapters": {
|
|
54
|
+
"default": "./dist/esm/empty-plugin-adapters.js"
|
|
52
55
|
}
|
|
53
56
|
},
|
|
54
57
|
"sideEffects": false,
|
|
@@ -68,7 +71,7 @@
|
|
|
68
71
|
"seroval": "^1.5.4",
|
|
69
72
|
"@tanstack/history": "1.162.0",
|
|
70
73
|
"@tanstack/router-core": "1.171.6",
|
|
71
|
-
"@tanstack/start-client-core": "1.170.
|
|
74
|
+
"@tanstack/start-client-core": "1.170.4",
|
|
72
75
|
"@tanstack/start-storage-context": "1.167.8"
|
|
73
76
|
},
|
|
74
77
|
"devDependencies": {
|
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
|
|
@@ -57,24 +57,6 @@ export async function getStartManifest(
|
|
|
57
57
|
})
|
|
58
58
|
}
|
|
59
59
|
|
|
60
|
-
if (process.env.TSS_DEV_SERVER === 'true') {
|
|
61
|
-
const mod = await import('tanstack-start-injected-head-scripts:v')
|
|
62
|
-
if (mod.injectedHeadScripts) {
|
|
63
|
-
updateRootRoute({
|
|
64
|
-
...rootRoute,
|
|
65
|
-
scripts: [
|
|
66
|
-
...(rootRoute?.scripts ?? []),
|
|
67
|
-
{
|
|
68
|
-
attrs: {
|
|
69
|
-
type: 'module',
|
|
70
|
-
},
|
|
71
|
-
children: mod.injectedHeadScripts,
|
|
72
|
-
},
|
|
73
|
-
],
|
|
74
|
-
})
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
|
|
78
60
|
const manifestRoutes: Record<string, ServerManifestRoute> = {}
|
|
79
61
|
|
|
80
62
|
for (const k in routes) {
|
|
@@ -103,8 +85,5 @@ export async function getStartManifest(
|
|
|
103
85
|
routes: manifestRoutes,
|
|
104
86
|
}
|
|
105
87
|
|
|
106
|
-
return
|
|
107
|
-
manifest: manifest as StartManifestWithClientEntry['manifest'],
|
|
108
|
-
clientEntry: startManifest.clientEntry,
|
|
109
|
-
}
|
|
88
|
+
return manifest
|
|
110
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' {
|
|
@@ -21,7 +21,3 @@ declare module '#tanstack-start-server-fn-resolver' {
|
|
|
21
21
|
access: ServerFnLookupAccess,
|
|
22
22
|
): Promise<ServerFn>
|
|
23
23
|
}
|
|
24
|
-
|
|
25
|
-
declare module 'tanstack-start-injected-head-scripts:v' {
|
|
26
|
-
export const injectedHeadScripts: string | undefined
|
|
27
|
-
}
|