@teamscala/service-boot 0.23.538 → 0.23.539

package/package.json

@@ -303,5 +303,5 @@
 	"repository": "https://github.com/teamgbg/service-boot",
 	"sideEffects": false,
 	"type": "module",
-	"version": "0.23.538"
+	"version": "0.23.539"
 }

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

@@ -11,24 +11,27 @@ export const MANIFEST_FILE = "asset-manifest.json";
 export interface AssetManifest {
 	stylesPath?: string;
 	hydratePath?: string;
-	buildFailed?: boolean;
-	buildFailedReason?: string;
-	buildFailedAt?: string;
 	sourceMaps?: SourceMapUploadResult;
 }
 
+export interface FailedBuildManifest {
+	buildFailed: true;
+	buildFailedReason: string;
+	buildFailedAt: string;
+}
+
+export type ManifestFile = AssetManifest | FailedBuildManifest;
+
 export async function readManifest(outDir: string): Promise<AssetManifest | null> {
 	const path = join(outDir, MANIFEST_FILE);
 	if (!(await Bun.file(path).exists())) return null;
 	try {
-		const parsed = await Bun.file(path).json() as Partial<AssetManifest>;
+		const parsed = (await Bun.file(path).json()) as ManifestFile;
+		if ("buildFailed" in parsed) return null;
 		if (parsed.stylesPath && parsed.hydratePath) {
 			return {
 				stylesPath: parsed.stylesPath,
 				hydratePath: parsed.hydratePath,
-				buildFailed: parsed.buildFailed,
-				buildFailedReason: parsed.buildFailedReason,
-				buildFailedAt: parsed.buildFailedAt,
 				sourceMaps: parsed.sourceMaps,
 			};
 		}
@@ -40,7 +43,7 @@ export async function readManifest(outDir: string): Promise<AssetManifest | null
 
 export async function writeManifest(
 	outDir: string,
-	manifest: AssetManifest,
+	manifest: ManifestFile,
 ): Promise<void> {
 	await Bun.write(
 		join(outDir, MANIFEST_FILE),

package/src/read-html-template.ts

@@ -5,9 +5,10 @@
 
 import { createCache } from "@teamscala/cache/create-cache";
 import { themeFontsLink } from "./theme-fonts-link.ts";
+import { MANIFEST_FILE, readManifest } from "./build-client-assets/manifest.ts";
 import { join } from "node:path";
 
-interface AssetManifest {
+interface TemplateManifest {
 	stylesPath: string;
 	hydratePath: string;
 }
@@ -41,7 +42,7 @@ const htmlCache = createCache<CachedHtml>("service-boot:html-template", {
 });
 
 function manifestPath(): string {
-	return join(process.cwd(), "dist", "client", "asset-manifest.json");
+	return join(process.cwd(), "dist", "client", MANIFEST_FILE);
 }
 
 async function manifestMtimeMs(): Promise<number> {
@@ -52,18 +53,10 @@ async function manifestMtimeMs(): Promise<number> {
 	}
 }
 
-async function loadManifest(): Promise<AssetManifest | null> {
-	const path = manifestPath();
-	if (!(await Bun.file(path).exists())) return null;
-	try {
-		const parsed = (await Bun.file(path).json()) as Partial<AssetManifest>;
-		if (parsed.stylesPath && parsed.hydratePath) {
-			return { stylesPath: parsed.stylesPath, hydratePath: parsed.hydratePath };
-		}
-	} catch {
-		return null;
-	}
-	return null;
+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 };
 }
 
 function manifestCacheKey(): string {