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

package/LICENSE

@@ -0,0 +1,8 @@
+DONTFUCKINGUSE LICENSE
+
+Copyright (c) 2025 Daniel Saewitz
+
+This software may not be used, copied, modified, merged, published,
+distributed, sublicensed, or sold by anyone other than the copyright holder.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND.

package/dist/fonts/bundle.d.ts

@@ -37,12 +37,12 @@ export declare function groupCachedFontsByFamily(cachedFonts: readonly CachedFon
 export declare function emitFontAssets(pipeline: FontPipeline, emitFile: EmitFile, warn: EmitWarning): void;
 /**
  * Populate `buildManifest.fonts` with `ManifestFontEntry[]` keyed by the
- * importer module path (relative to the project root, matching how Vite's
- * `manifest.json` keys css/js).
+ * absolute importer path. This matches the runtime route manifest's
+ * `filePath` values (which are absolute) and is consistent with how
+ * `buildManifest.css` keys work after TIM-1014.
  *
- * Google fonts use the content-hashed filenames produced during
- * `buildStart`. Local fonts use the source basename.
+ * All font binaries use content-hashed filenames for immutable caching.
  */
-export declare function writeFontManifest(pipeline: FontPipeline, buildManifest: BuildManifest, rootDir: string): void;
+export declare function writeFontManifest(pipeline: FontPipeline, buildManifest: BuildManifest): void;
 export {};
 //# sourceMappingURL=bundle.d.ts.map

package/dist/fonts/bundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/fonts/bundle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAqB,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAEpF;;;;GAIG;AACH,UAAU,YAAY;IACpB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC;CAC7B;AACD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,KAAK,QAAQ,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,MAAM,CAAC;AAChD,KAAK,WAAW,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;AAEzC,kEAAkE;AAClE,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,SAAS,UAAU,EAAE,GACjC,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAS3B;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,YAAY,EACtB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,WAAW,GAChB,IAAI,CA4BN;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,YAAY,EACtB,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,MAAM,GACd,IAAI,CAwCN"}
+{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/fonts/bundle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAqB,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAGpF;;;;GAIG;AACH,UAAU,YAAY;IACpB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC;CAC7B;AACD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,KAAK,QAAQ,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,MAAM,CAAC;AAChD,KAAK,WAAW,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;AAEzC,kEAAkE;AAClE,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,SAAS,UAAU,EAAE,GACjC,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAS3B;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,YAAY,EACtB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,WAAW,GAChB,IAAI,CA4BN;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,GAAG,IAAI,CAgC5F"}

package/dist/fonts/pipeline.d.ts

@@ -49,6 +49,11 @@ export declare class FontPipeline {
      * the map contents are mutable through the methods below.
      */
     private readonly _entries;
+    /** When true, local font sources are content-hashed at registration time. */
+    private readonly _hashOnRegister;
+    constructor(opts?: {
+        hashOnRegister?: boolean;
+    });
     /**
      * Per-importer virtual CSS module id registry. Populated by the
      * transform hook when it inlines a font function call, read by the

package/dist/fonts/pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../src/fonts/pipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC/E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAI9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE3D;;;;;;;;;GASG;AACH,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAEtD,qBAAa,YAAY;IACvB;;;;;;;OAOG;IACH,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgC;IAEzD;;;;;;;;;OASG;IACH,QAAQ,CAAC,QAAQ,sBAA6B;IAI9C,kCAAkC;IAClC,IAAI,IAAI,MAAM;IAId,2EAA2E;IAC3E,OAAO,IAAI,gBAAgB,CAAC,SAAS,CAAC;IAItC,uEAAuE;IACvE,KAAK,IAAI,gBAAgB,CAAC,aAAa,CAAC;IAIxC,2CAA2C;IAC1C,WAAW,IAAI,gBAAgB,CAAC,SAAS,CAAC;IAM3C,kCAAkC;IAClC,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAI3C;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAKjC;;;;;OAKG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAOvC;;;;;;;;OAQG;IACH,QAAQ,CAAC,SAAS,EAAE,aAAa,GAAG,IAAI;IAOxC,oEAAoE;IACpE,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,EAAE,GAAG,IAAI;IAW9D,8DAA8D;IAC9D,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI;IAW5D;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAShD,mEAAmE;IACnE,KAAK,IAAI,IAAI;IAOb;;;;;OAKG;IACF,iBAAiB,IAAI,gBAAgB,CAAC,UAAU,CAAC;IAYlD;;;;;;;OAOG;IACH,MAAM,IAAI,MAAM;IAQhB;;;;;;;;;;;;;;;OAeG;IACH,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;CAQ3C;AAoCD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,YAAY,EACtB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,IAAI,CAON"}
+{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../src/fonts/pipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAIH,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC/E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAK9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE3D;;;;;;;;;GASG;AACH,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAEtD,qBAAa,YAAY;IACvB;;;;;;;OAOG;IACH,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgC;IAEzD,6EAA6E;IAC7E,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;gBAE9B,IAAI,CAAC,EAAE;QAAE,cAAc,CAAC,EAAE,OAAO,CAAA;KAAE;IAI/C;;;;;;;;;OASG;IACH,QAAQ,CAAC,QAAQ,sBAA6B;IAI9C,kCAAkC;IAClC,IAAI,IAAI,MAAM;IAId,2EAA2E;IAC3E,OAAO,IAAI,gBAAgB,CAAC,SAAS,CAAC;IAItC,uEAAuE;IACvE,KAAK,IAAI,gBAAgB,CAAC,aAAa,CAAC;IAIxC,2CAA2C;IAC1C,WAAW,IAAI,gBAAgB,CAAC,SAAS,CAAC;IAM3C,kCAAkC;IAClC,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAI3C;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAKjC;;;;;OAKG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAOvC;;;;;;;;OAQG;IACH,QAAQ,CAAC,SAAS,EAAE,aAAa,GAAG,IAAI;IAoBxC,oEAAoE;IACpE,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,EAAE,GAAG,IAAI;IAW9D,8DAA8D;IAC9D,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI;IAW5D;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAShD,mEAAmE;IACnE,KAAK,IAAI,IAAI;IAOb;;;;;OAKG;IACF,iBAAiB,IAAI,gBAAgB,CAAC,UAAU,CAAC;IAYlD;;;;;;;OAOG;IACH,MAAM,IAAI,MAAM;IAQhB;;;;;;;;;;;;;;;OAeG;IACH,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;CAQ3C;AAoCD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,YAAY,EACtB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,IAAI,CAON"}

package/dist/fonts/types.d.ts

@@ -21,6 +21,8 @@ export interface LocalFontSrc {
     path: string;
     weight?: string;
     style?: string;
+    /** Content-hashed basename for production builds (e.g. `MyFont-Bold-a1b2c3d4.woff2`). */
+    hashedBasename?: string;
 }
 /** Configuration passed to `localFont()`. */
 export interface LocalFontConfig {

package/dist/fonts/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/fonts/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,8EAA8E;AAC9E,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,CAAC;IAC9D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,uDAAuD;AACvD,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,6CAA6C;AAC7C,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,GAAG,YAAY,EAAE,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,CAAC;IAC9D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mEAAmE;IACnE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB,4EAA4E;IAC5E,SAAS,EAAE,MAAM,CAAC;IAClB,iEAAiE;IACjE,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9B,kFAAkF;IAClF,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,aAAa;IAC5B,gFAAgF;IAChF,EAAE,EAAE,MAAM,CAAC;IACX,2CAA2C;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,qCAAqC;IACrC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC7B,+CAA+C;IAC/C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,oDAAoD;IACpD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,6DAA6D;IAC7D,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,0BAA0B;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yCAAyC;IACzC,YAAY,CAAC,EAAE,YAAY,EAAE,CAAC;IAC9B,oEAAoE;IACpE,QAAQ,EAAE,MAAM,CAAC;IACjB,mCAAmC;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,0CAA0C;IAC1C,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,SAAU,SAAQ,aAAa;IAC9C;;;;;OAKG;IACH,KAAK,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAE7B;;;;;;;;OAQG;IACH,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;CAC5B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/fonts/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,8EAA8E;AAC9E,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,CAAC;IAC9D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,uDAAuD;AACvD,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,yFAAyF;IACzF,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,6CAA6C;AAC7C,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,GAAG,YAAY,EAAE,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,CAAC;IAC9D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mEAAmE;IACnE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACzB,4EAA4E;IAC5E,SAAS,EAAE,MAAM,CAAC;IAClB,iEAAiE;IACjE,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9B,kFAAkF;IAClF,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,aAAa;IAC5B,gFAAgF;IAChF,EAAE,EAAE,MAAM,CAAC;IACX,2CAA2C;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,qCAAqC;IACrC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC7B,+CAA+C;IAC/C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,oDAAoD;IACpD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,6DAA6D;IAC7D,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,0BAA0B;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,8CAA8C;IAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yCAAyC;IACzC,YAAY,CAAC,EAAE,YAAY,EAAE,CAAC;IAC9B,oEAAoE;IACpE,QAAQ,EAAE,MAAM,CAAC;IACjB,mCAAmC;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,0CAA0C;IAC1C,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,SAAU,SAAQ,aAAa;IAC9C;;;;;OAKG;IACH,KAAK,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAE7B;;;;;;;;OAQG;IACH,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;CAC5B"}

package/dist/index.js

@@ -3927,7 +3927,7 @@ function generateLocalFontFaces(family, sources, display, urlPrefix = "/_timber/
 		const format = inferFontFormat(entry.path);
 		return {
 			family,
-			src: `url('${urlPrefix}/${entry.path.split("/").pop() ?? entry.path}') format('${format}')`,
+			src: `url('${urlPrefix}/${entry.hashedBasename ?? entry.path.split("/").pop() ?? entry.path}') format('${format}')`,
 			weight: entry.weight,
 			style: entry.style,
 			display
@@ -4095,6 +4095,33 @@ function generateLocalVirtualModule() {
 }
 //#endregion
 //#region src/fonts/pipeline.ts
+/**
+* FontPipeline — owns all per-font state for the timber-fonts plugin.
+*
+* Before TIM-829, font state was spread across three parallel mutable maps:
+*
+*   - `registry: Map<string, ExtractedFont>`
+*   - `googleFontFacesMap: Map<string, FontFaceDescriptor[]>`
+*   - `cachedFonts: CachedFont[]`
+*
+* Every plugin hook had to remember which map(s) it owned and which it
+* read. The TIM-824 bug existed because `transform` could write to
+* `registry` multiple times for the same `(importer, family)` pair without
+* a corresponding cleanup of the entries that `buildStart` / `load` would
+* later use. The fix in TIM-824 added prune calls in `transform` for the
+* registry, but the parallel maps still had the same hazard latent in
+* them: any future code path that ran `buildStart`-equivalent logic on
+* HMR could re-introduce a stale-entry leak in a different map.
+*
+* TIM-829 collapses the three maps into a single `Map<string, FontEntry>`
+* keyed by font ID. Mutation goes through a small set of methods that
+* maintain the core invariant: **every piece of state belonging to a font
+* lives on its `FontEntry`, and `pruneFor` removes the entry along with
+* everything attached to it in one call.** No code path inside the plugin
+* touches the underlying map directly.
+*
+* Design doc: 24-fonts.md
+*/
 var FontPipeline = class {
 	/**
 	* The single per-font store. Keyed by `FontEntry.id` (which is itself
@@ -4105,6 +4132,11 @@ var FontPipeline = class {
 	* the map contents are mutable through the methods below.
 	*/
 	_entries = /* @__PURE__ */ new Map();
+	/** When true, local font sources are content-hashed at registration time. */
+	_hashOnRegister;
+	constructor(opts) {
+		this._hashOnRegister = opts?.hashOnRegister ?? false;
+	}
 	/**
 	* Per-importer virtual CSS module id registry. Populated by the
 	* transform hook when it inlines a font function call, read by the
@@ -4170,7 +4202,16 @@ var FontPipeline = class {
 	* dropped (TIM-824).
 	*/
 	register(extracted) {
-		this._entries.set(extracted.id, { ...extracted });
+		const entry = { ...extracted };
+		if (this._hashOnRegister && entry.provider === "local" && entry.localSources) for (const src of entry.localSources) {
+			const absolutePath = normalize(resolve(src.path));
+			if (!existsSync(absolutePath)) continue;
+			const hash = contentHash(readFileSync(absolutePath));
+			const basename = src.path.split("/").pop() ?? src.path;
+			const ext = extname(basename);
+			src.hashedBasename = `${ext ? basename.slice(0, -ext.length) : basename}-${hash}${ext}`;
+		}
+		this._entries.set(entry.id, entry);
 	}
 	/** Attach pre-resolved `@font-face` descriptors to a font entry. */
 	attachFaces(fontId, faces) {
@@ -5547,11 +5588,11 @@ function emitFontAssets(pipeline, emitFile, warn) {
 				warn(`Local font file not found: ${absolutePath}`);
 				continue;
 			}
-			const basename = src.path.split("/").pop() ?? src.path;
+			const filename = src.hashedBasename ?? src.path.split("/").pop() ?? src.path;
 			const data = readFileSync(absolutePath);
 			emitFile({
 				type: "asset",
-				fileName: `_timber/fonts/${basename}`,
+				fileName: `_timber/fonts/${filename}`,
 				source: data
 			});
 		}
@@ -5559,18 +5600,18 @@ function emitFontAssets(pipeline, emitFile, warn) {
 }
 /**
 * Populate `buildManifest.fonts` with `ManifestFontEntry[]` keyed by the
-* importer module path (relative to the project root, matching how Vite's
-* `manifest.json` keys css/js).
+* absolute importer path. This matches the runtime route manifest's
+* `filePath` values (which are absolute) and is consistent with how
+* `buildManifest.css` keys work after TIM-1014.
 *
-* Google fonts use the content-hashed filenames produced during
-* `buildStart`. Local fonts use the source basename.
+* All font binaries use content-hashed filenames for immutable caching.
 */
-function writeFontManifest(pipeline, buildManifest, rootDir) {
+function writeFontManifest(pipeline, buildManifest) {
 	const fontsByImporter = /* @__PURE__ */ new Map();
 	for (const entry of pipeline.entries()) {
 		const manifestEntries = fontsByImporter.get(entry.importer) ?? [];
 		if (entry.provider === "local" && entry.localSources) for (const src of entry.localSources) {
-			const filename = src.path.split("/").pop() ?? src.path;
+			const filename = src.hashedBasename ?? src.path.split("/").pop() ?? src.path;
 			const format = inferFontFormat(src.path);
 			manifestEntries.push({
 				href: `/_timber/fonts/${filename}`,
@@ -5585,10 +5626,7 @@ function writeFontManifest(pipeline, buildManifest, rootDir) {
 		});
 		fontsByImporter.set(entry.importer, manifestEntries);
 	}
-	for (const [importer, entries] of fontsByImporter) {
-		const relativePath = importer.startsWith(rootDir) ? importer.slice(rootDir.length + 1) : importer;
-		buildManifest.fonts[relativePath] = entries;
-	}
+	for (const [importer, entries] of fontsByImporter) buildManifest.fonts[importer] = entries;
 }
 //#endregion
 //#region src/plugins/fonts.ts
@@ -5596,7 +5634,7 @@ function writeFontManifest(pipeline, buildManifest, rootDir) {
 * Create the timber-fonts Vite plugin.
 */
 function timberFonts(ctx) {
-	const pipeline = new FontPipeline();
+	const pipeline = new FontPipeline({ hashOnRegister: !ctx.dev });
 	return {
 		name: "timber-fonts",
 		/**
@@ -5690,8 +5728,10 @@ function timberFonts(ctx) {
 		*
 		* In dev mode this is a no-op — fonts point to the Google CDN and are
 		* resolved lazily inside `load()` when the side-effect module runs.
-		* The registry is populated by the transform hook which runs before
-		* `buildStart` in the build pipeline, so all fonts are known here.
+		*
+		* Local font hashing is handled at registration time by the pipeline
+		* (when `hashOnRegister` is set) so hashed filenames are available
+		* before the virtual CSS `load()` hook runs.
 		*/
 		async buildStart() {
 			if (ctx.dev) return;
@@ -5716,15 +5756,14 @@ function timberFonts(ctx) {
 		/**
 		* Emit font binaries and build-manifest entries.
 		*
-		* Google fonts use the content-hashed filenames produced during
-		* `buildStart`. Local fonts are emitted by basename. Font CSS is
-		* handled by Vite's CSS pipeline via virtual modules — we only emit
-		* binaries here.
+		* All font binaries (Google and local) use content-hashed filenames
+		* for immutable caching. Font CSS is handled by Vite's CSS pipeline
+		* via virtual modules — we only emit binaries here.
 		*/
 		generateBundle() {
 			emitFontAssets(pipeline, (asset) => this.emitFile(asset), (msg) => this.warn(msg));
 			if (!ctx.buildManifest) return;
-			writeFontManifest(pipeline, ctx.buildManifest, ctx.root);
+			writeFontManifest(pipeline, ctx.buildManifest);
 		}
 	};
 }
@@ -6445,6 +6484,36 @@ function timberChunks() {
 * See design/27-chunking-strategy.md, TIM-440, TIM-499.
 */
 /**
+* Check whether a root-relative path lives under the app directory,
+* and if so return the first non-group route segment.
+*
+* `appPrefix` is the root-relative app directory with a trailing slash
+* (e.g. "app/" or "src/app/"), computed once from the resolved appDir
+* and root. Matching uses `startsWith` — no ambiguity.
+*
+* Returns:
+*   { inApp: false }                       — path is not under app/
+*   { inApp: true, segment: null }         — root of app/ (e.g. app/layout.tsx)
+*   { inApp: true, segment: "dashboard" }  — nested route boundary
+*/
+function findAppBoundary(path, appPrefix) {
+	const relPath = path.replace(/\\/g, "/");
+	if (!relPath.startsWith(appPrefix)) return { inApp: false };
+	const segments = relPath.slice(appPrefix.length).split("/");
+	for (const seg of segments) {
+		if (seg.includes(".")) break;
+		if (seg.startsWith("(") && seg.endsWith(")")) continue;
+		return {
+			inApp: true,
+			segment: seg
+		};
+	}
+	return {
+		inApp: true,
+		segment: null
+	};
+}
+/**
 * Derive a chunk group name for a client reference module.
 *
 * Groups by the first non-group route segment under appDir so that all
@@ -6455,22 +6524,31 @@ function timberChunks() {
 *   - `facade:app/layout.tsx` (root layout) → `"client-shared"`
 *   - `shared:...` (shared across chunks) → `"client-shared"`
 *
+* When a 'use client' module lives outside the app directory (e.g. in
+* src/posts/ or src/components/), the function falls back to deriving
+* the layout boundary from the serverChunk's facade path. This prevents
+* lazily-loaded client dependencies (e.g. via import.meta.glob) from
+* being hoisted into the shared chunk when they're only used by a
+* specific route.
+*
 * This balances route-scoped code splitting with HTTP request count:
 * fewer chunks than per-serverChunk, but still avoids downloading every
 * client component on every page.
 */
-function clientChunkGroup(meta, appDir) {
+function clientChunkGroup(meta, appDir, root) {
 	const { normalizedId, serverChunk } = meta;
 	if (serverChunk.startsWith("shared:")) return "client-shared";
-	const relPath = normalizedId.replace(/\\/g, "/");
-	const appDirName = appDir.replace(/\\/g, "/").split("/").pop() || "app";
-	const appIdx = relPath.indexOf(appDirName + "/");
-	if (appIdx === -1) return "client-shared";
-	const segments = relPath.slice(appIdx + appDirName.length + 1).split("/");
-	for (const seg of segments) {
-		if (seg.includes(".")) break;
-		if (seg.startsWith("(") && seg.endsWith(")")) continue;
-		return `client-${seg}`;
+	const appPrefix = relative(root, appDir).replace(/\\/g, "/") + "/";
+	const result = findAppBoundary(normalizedId, appPrefix);
+	if (result.inApp && result.segment) return `client-${result.segment}`;
+	if (result.inApp) return "client-shared";
+	if (serverChunk.startsWith("facade:")) {
+		const facadePath = serverChunk.slice(7).replace(/\\/g, "/");
+		const facadeResult = findAppBoundary(facadePath, appPrefix);
+		if (facadeResult.inApp && facadeResult.segment) return `client-${facadeResult.segment}`;
+		if (facadeResult.inApp) return "client-shared";
+		const facadeName = facadePath.replace(/\.[^.]+$/, "").replace(/\//g, "-");
+		if (facadeName) return `client-${facadeName}`;
 	}
 	return "client-shared";
 }
@@ -7454,7 +7532,7 @@ function createRscOptions(ctx, encryptionKeyExpr) {
 			ssr: "virtual:timber-ssr-entry",
 			client: "virtual:timber-browser-entry"
 		},
-		clientChunks: (meta) => clientChunkGroup(meta, ctx.appDir)
+		clientChunks: (meta) => clientChunkGroup(meta, ctx.appDir, ctx.root)
 	};
 	Object.defineProperty(options, "enableActionEncryption", {
 		get() {