@timber-js/app 0.2.0-alpha.138 → 0.2.0-alpha.139

package/dist/index.js

@@ -1,10 +1,10 @@
-import { n as setViteServer } from "./_chunks/warnings-CAzunaGo.js";
-import { a as isDynamicMetadataExtension, o as isMetadataRouteServePath } from "./_chunks/metadata-routes-DESG8uk5.js";
-import { h as swallow } from "./_chunks/logger-CMd9P1xQ.js";
-import { c as loadTimberConfigFile, d as resolveBuildDir, f as resolveClientJavascript, l as mergeFileConfig, m as scanRoutes, o as DEFAULT_BUILD_DIR, p as createNoopTimer, s as createPluginContext, u as resolveAppDir } from "./_chunks/cli-schema-sync-q-Ce6-iG.js";
-import { a as generateRouteMap, i as collectInterceptionRewrites, r as validateSchemaAgainstRoutes, t as collectLeafRoutes } from "./_chunks/walkers-BbEu2_Pp.js";
-import { t as fnv1aHash } from "./_chunks/fast-hash-DXZ7S2D5.js";
-import { t as formatSize } from "./_chunks/format-CR6v1pWE.js";
+import { n as setViteServer } from "./_chunks/warnings-CNPXaypM.js";
+import { a as isDynamicMetadataExtension, o as isMetadataRouteServePath } from "./_chunks/metadata-routes-BjepjefT.js";
+import { h as swallow } from "./_chunks/logger-Dt-jQaBO.js";
+import { c as loadTimberConfigFile, d as resolveBuildDir, f as resolveClientJavascript, l as mergeFileConfig, m as scanRoutes, o as DEFAULT_BUILD_DIR, p as createNoopTimer, s as createPluginContext, u as resolveAppDir } from "./_chunks/cli-schema-sync-D2IpXicg.js";
+import { a as generateRouteMap, i as collectInterceptionRewrites, r as validateSchemaAgainstRoutes, t as collectLeafRoutes } from "./_chunks/walkers-7FBPM-hX.js";
+import { t as fnv1aHash } from "./_chunks/fast-hash-D6hIVt1Y.js";
+import { t as formatSize } from "./_chunks/format-CfwjgPz9.js";
 import { basename, dirname, extname, join, normalize, relative, resolve } from "node:path";
 import { createRequire } from "node:module";
 import react, { reactCompilerPreset } from "@vitejs/plugin-react";
@@ -3981,7 +3981,6 @@ var RESOLVED_LOCAL = "\0@timber/fonts/local";
 */
 var VIRTUAL_FONT_CSS_PREFIX = "virtual:timber-font-css/";
 var VIRTUAL_FONT_CSS_SUFFIX = ".css";
-"" + VIRTUAL_FONT_CSS_PREFIX;
 /**
 * In-memory map from the short hash used in virtual module ids back to
 * the absolute importer path. Populated by `virtualFontCssIdFor()` when
@@ -5864,9 +5863,6 @@ function buildManifestFromBundle(bundle, base, root) {
 		const deps = collectTransitiveBundleDeps(chunk, chunksByFileName, base);
 		if (deps.length > 0) modulepreload[inputPath] = deps;
 	}
-	const allCss = [];
-	for (const item of Object.values(bundle)) if (item.type === "asset" && item.fileName.endsWith(".css")) allCss.push(base + item.fileName);
-	if (allCss.length > 0) css["_global"] = allCss;
 	return {
 		css,
 		js,
@@ -5914,10 +5910,52 @@ function computeMetadataRouteHashes(node) {
 	for (const slot of Object.values(node.slots)) Object.assign(hashes, computeMetadataRouteHashes(slot));
 	return hashes;
 }
+var CLIENT_REF_KEY_RE = /registerClientReference\([^,]+,\s*"([0-9a-f]{12})"/g;
+/**
+* Collect all route file paths (layout, page) from the route tree.
+*/
+function collectRouteFilePaths(node) {
+	const paths = [];
+	if (node.layout) paths.push(node.layout.filePath);
+	if (node.page) paths.push(node.page.filePath);
+	for (const child of node.children) paths.push(...collectRouteFilePaths(child));
+	for (const slot of Object.values(node.slots)) paths.push(...collectRouteFilePaths(slot));
+	return paths;
+}
+/**
+* Scan RSC bundle chunks to find which modules contain registerClientReference
+* calls, and extract the reference hash keys from each.
+*/
+function buildClientRefIndex(bundle) {
+	const index = /* @__PURE__ */ new Map();
+	for (const item of Object.values(bundle)) {
+		if (item.type !== "chunk" || !item.modules) continue;
+		for (const [moduleId, mod] of Object.entries(item.modules)) {
+			if (!mod.code) continue;
+			const keys = [];
+			for (const match of mod.code.matchAll(CLIENT_REF_KEY_RE)) keys.push(match[1]);
+			if (keys.length > 0) index.set(moduleId, keys);
+		}
+	}
+	return index;
+}
+/**
+* Walk a module's transitive imports to collect all client reference
+* keys reachable from it.
+*/
+function walkModuleImports(moduleId, clientRefIndex, visited, result, getModuleInfo) {
+	if (visited.has(moduleId)) return;
+	visited.add(moduleId);
+	const refKeys = clientRefIndex.get(moduleId);
+	if (refKeys) for (const key of refKeys) result.add(key);
+	const info = getModuleInfo(moduleId);
+	if (!info) return;
+	for (const importedId of info.importedIds) walkModuleImports(importedId, clientRefIndex, visited, result, getModuleInfo);
+}
 /**
 * Create the timber-build-manifest Vite plugin.
 *
-* Hooks: configResolved, resolveId, load, generateBundle (client env only)
+* Hooks: configResolved, resolveId, load, generateBundle (client and RSC envs)
 */
 function timberBuildManifest(ctx) {
 	let resolvedBase = "/";
@@ -5956,7 +5994,22 @@ function timberBuildManifest(ctx) {
 		},
 		generateBundle(_options, bundle) {
 			if (isDev) return;
-			if (this.environment?.name === "client") {
+			const envName = this.environment?.name;
+			if (envName === "rsc" && ctx.routeTree) {
+				const clientRefIndex = buildClientRefIndex(bundle);
+				if (clientRefIndex.size > 0) {
+					const routeFiles = collectRouteFilePaths(ctx.routeTree.root);
+					const routeClientRefKeys = /* @__PURE__ */ new Map();
+					const getInfo = (id) => this.getModuleInfo?.(id) ?? null;
+					for (const filePath of routeFiles) {
+						const refKeys = /* @__PURE__ */ new Set();
+						walkModuleImports(filePath, clientRefIndex, /* @__PURE__ */ new Set(), refKeys, getInfo);
+						if (refKeys.size > 0) routeClientRefKeys.set(filePath, refKeys);
+					}
+					if (routeClientRefKeys.size > 0) ctx.routeClientRefKeys = routeClientRefKeys;
+				}
+			}
+			if (envName === "client") {
 				ctx.buildManifest = buildManifestFromBundle(bundle, resolvedBase, ctx.root);
 				if (ctx.routeTree) ctx.buildManifest.metadataRouteHashes = computeMetadataRouteHashes(ctx.routeTree.root);
 				if (ctx.clientJavascript.disabled) {
@@ -6682,6 +6735,7 @@ function timberAdapterBuild(ctx) {
 				const adapter = ctx.config.adapter;
 				if (!adapter || typeof adapter.buildOutput !== "function") return;
 				const buildDir = ctx.buildDir;
+				if (ctx.buildManifest) await mergeRscAssetsManifest(buildDir, ctx.root, ctx.buildManifest, ctx.routeClientRefKeys);
 				let manifestInit;
 				if (ctx.buildManifest) {
 					const manifest = ctx.clientJavascript.disabled ? {
@@ -6711,6 +6765,49 @@ function timberAdapterBuild(ctx) {
 * intercept them. This rewrites the files on disk after all builds
 * complete but before the adapter copies them to the output directory.
 */
+/**
+* Read the RSC plugin's assets manifest and merge per-route CSS and
+* per-route JS modulepreloads into the build manifest.
+*
+* CSS: `serverResources` maps server component paths to CSS URLs.
+* JS: `clientReferenceDeps` maps reference hashes to JS dep URLs.
+*     Combined with `routeClientRefKeys` (from the RSC generateBundle
+*     module graph walk) to produce per-route modulepreload entries.
+*/
+async function mergeRscAssetsManifest(buildDir, root, buildManifest, routeClientRefKeys) {
+	const manifestPath = join(buildDir, "rsc", "__vite_rsc_assets_manifest.js");
+	let content;
+	try {
+		content = await readFile(manifestPath, "utf-8");
+	} catch {
+		return;
+	}
+	const jsonStr = content.replace(/^export default\s*/, "").replace(/;?\s*$/, "");
+	let manifest;
+	try {
+		manifest = JSON.parse(jsonStr);
+	} catch {
+		return;
+	}
+	const serverResources = manifest.serverResources;
+	if (serverResources) {
+		for (const [relativePath, deps] of Object.entries(serverResources)) if (deps.css && deps.css.length > 0) {
+			const absolutePath = join(root, relativePath);
+			buildManifest.css[absolutePath] = deps.css;
+		}
+	}
+	if (routeClientRefKeys && routeClientRefKeys.size > 0) {
+		const clientReferenceDeps = manifest.clientReferenceDeps;
+		if (clientReferenceDeps) for (const [filePath, refKeys] of routeClientRefKeys) {
+			const jsUrls = /* @__PURE__ */ new Set();
+			for (const key of refKeys) {
+				const deps = clientReferenceDeps[key];
+				if (deps?.js) for (const url of deps.js) jsUrls.add(url);
+			}
+			if (jsUrls.size > 0) buildManifest.modulepreload[filePath] = Array.from(jsUrls);
+		}
+	}
+}
 async function stripJsFromRscAssetsManifests(buildDir) {
 	const manifestName = "__vite_rsc_assets_manifest.js";
 	const paths = [join(buildDir, "rsc", manifestName), join(buildDir, "ssr", manifestName)];