@teamscala/service-boot 0.23.556 → 0.23.559

package/package.json

@@ -27,7 +27,7 @@
   "repository": "https://github.com/teamgbg/service-boot",
   "sideEffects": false,
   "type": "module",
-  "version": "0.23.556",
+  "version": "0.23.559",
   "dependencies": {
     "@orpc/openapi": "*",
     "@orpc/server": "*",

package/src/build-client-assets/hydrate-bundle.ts

@@ -18,6 +18,8 @@ const HYDRATE_BASE = "hydrate";
 export interface HydrateBundleResult {
 	/** Served entry path (`/assets/hydrate-<hash>.js`), or null when no entry exists. */
 	hydratePath: string | null;
+	/** Chunk URLs the entry itself can load, for modulepreload emission. */
+	preloads: string[];
 	/** The VERIFIED source-map upload outcome for this build's release. */
 	sourceMaps: SourceMapUploadResult;
 }
@@ -195,8 +197,30 @@ export async function buildHydrateBundle(
 			.filter((o) => o.kind === "chunk")
 			.map((o) => o.path.split("/").pop() as string),
 	);
+	const entryText = await Bun.file(hashedPath).text();
+	const preloads = [
+		...new Set(
+			[...entryText.matchAll(/["'](\/assets\/[A-Za-z0-9-]+\.js)["']/g)].map(
+				(m) => m[1],
+			),
+		),
+	].sort();
+	const unknownPreloads = preloads.filter(
+		(url) =>
+			url !== `${ASSET_PUBLIC_PREFIX}${hashedName}` &&
+			!currentChunks.has(url.replace(/^\/assets\//, "")),
+	);
+	if (unknownPreloads.length > 0) {
+		throw new Error(
+			`[build-client-assets] entry references chunk URL(s) Bun did not emit: ${unknownPreloads.join(", ")} — refusing a manifest whose preloads name unbuilt assets`,
+		);
+	}
 	const sourceMaps = await uploadSourceMaps(cwd, outDir, hash, log, currentOutputs);
-	return { hydratePath: `${ASSET_PUBLIC_PREFIX}${hashedName}`, sourceMaps };
+	return {
+		hydratePath: `${ASSET_PUBLIC_PREFIX}${hashedName}`,
+		preloads,
+		sourceMaps,
+	};
 }
 
 async function removeStaleChunks(

package/src/build-client-assets/manifest.ts

@@ -12,6 +12,7 @@ export const MANIFEST_FILE = "asset-manifest.json";
 export interface AssetManifest {
 	stylesPath?: string;
 	hydratePath?: string;
+	preloads?: string[];
 	sourceMaps?: SourceMapUploadResult;
 }
 
@@ -47,6 +48,7 @@ export async function readManifestState(outDir: string): Promise<ManifestState>
 			manifest: {
 				stylesPath: parsed.stylesPath,
 				hydratePath: parsed.hydratePath,
+				preloads: parsed.preloads,
 				sourceMaps: parsed.sourceMaps,
 			},
 		};
@@ -96,10 +98,12 @@ export async function verifyClientBuildAssets(
 	const verdict = verifyManifestState(await readManifestState(outDir), outDir);
 	if (!verdict.ok) return verdict;
 	const manifest = verdict.manifest;
-	for (const [label, url] of [
+	const named: Array<readonly [string, string]> = [
 		["stylesheet", manifest.stylesPath],
 		["hydrate bundle", manifest.hydratePath],
-	] as const) {
+	];
+	for (const url of manifest.preloads ?? []) named.push(["preload chunk", url]);
+	for (const [label, url] of named) {
 		const file = join(outDir, url.replace(/^\/assets\//, ""));
 		if (!(await Bun.file(file).exists())) {
 			return {

package/src/build-client-assets.ts

@@ -109,6 +109,7 @@ async function performBuild(
 	await writeManifest(outDir, {
 		stylesPath,
 		hydratePath: hydrate.hydratePath,
+		preloads: hydrate.preloads,
 		sourceMaps: hydrate.sourceMaps,
 	});
 

package/src/proposal-authorized-emails.ts

@@ -20,12 +20,12 @@ export async function resolveProposalAuthorizedEmails(
 			UNION
 			SELECT lower(cd.primary_email) AS email
 			  FROM client_database cd
-			 WHERE cd.id = (SELECT contact_id FROM proposals WHERE id = ${proposalId})
+			 WHERE cd.id = (SELECT contact_id::text FROM proposals WHERE id = ${proposalId})
 			   AND cd.primary_email IS NOT NULL
 			UNION
 			SELECT lower(cd.primary_email) AS email
 			  FROM client_database cd
-			 WHERE cd.company_id = (SELECT partner_id FROM proposals WHERE id = ${proposalId})::uuid
+			 WHERE cd.company_id::text = (SELECT partner_id FROM proposals WHERE id = ${proposalId})
 			   AND cd.primary_email IS NOT NULL
 		` as { email: string }[];
 		return new Set(

package/src/read-html-template.ts

@@ -11,6 +11,7 @@ import { join } from "node:path";
 interface TemplateManifest {
 	stylesPath: string;
 	hydratePath: string;
+	preloads: string[];
 }
 
 const PAGE_DOCUMENT = `<!doctype html>
@@ -22,6 +23,7 @@ const PAGE_DOCUMENT = `<!doctype html>
 		<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
 		<!--theme-fonts-->
 		<link rel="stylesheet" href="{{stylesPath}}" />
+		<!--module-preloads-->
 		<!--head-outlet-->
 	</head>
 	<body>
@@ -56,7 +58,11 @@ async function manifestMtimeMs(): Promise<number> {
 async function loadManifest(): Promise<TemplateManifest | null> {
 	const manifest = await readManifest(join(process.cwd(), "dist", "client"));
 	if (!manifest?.stylesPath || !manifest.hydratePath) return null;
-	return { stylesPath: manifest.stylesPath, hydratePath: manifest.hydratePath };
+	return {
+		stylesPath: manifest.stylesPath,
+		hydratePath: manifest.hydratePath,
+		preloads: manifest.preloads ?? [],
+	};
 }
 
 function manifestCacheKey(): string {
@@ -78,6 +84,16 @@ export async function readHtmlTemplate(): Promise<string> {
 	let html = PAGE_DOCUMENT
 		.replace(/\{\{stylesPath\}\}/g, manifest.stylesPath)
 		.replace(/\{\{hydratePath\}\}/g, manifest.hydratePath)
+		.replace(
+			"<!--module-preloads-->",
+			() =>
+				manifest.preloads
+					.map(
+						(url) =>
+							`<link rel="modulepreload" href="${url}" />`,
+					)
+					.join("\n\t\t"),
+		)
 		.replace("<!--theme-fonts-->", () => themeFontsLink());
 	htmlCache.set(manifestCacheKey(), { html, manifestMtime });
 	return html;