@timber-js/app 0.2.0-alpha.65 → 0.2.0-alpha.67

package/dist/plugins/fonts.d.ts

@@ -16,6 +16,7 @@
 import type { Plugin } from 'vite';
 import type { PluginContext } from '../index.js';
 import type { ExtractedFont, GoogleFontConfig } from '../fonts/types.js';
+import type { FontFaceDescriptor } from '../fonts/types.js';
 /**
  * Registry of fonts extracted during transform.
  * Keyed by a unique font ID derived from family + config.
@@ -59,17 +60,23 @@ export declare function parseGoogleFontFamilies(source: string): Map<string, str
 /**
  * Generate CSS for a single extracted font.
  *
- * Includes @font-face rules (for local fonts), fallback @font-face,
+ * Includes @font-face rules (for local and Google fonts), fallback @font-face,
  * and the scoped class rule.
+ *
+ * For Google fonts, pass the resolved FontFaceDescriptor[] from either
+ * `generateProductionFontFaces()` (production) or `resolveDevFontFaces()` (dev).
  */
-export declare function generateFontCss(font: ExtractedFont): string;
+export declare function generateFontCss(font: ExtractedFont, googleFaces?: FontFaceDescriptor[]): string;
 /**
  * Generate the CSS output for all extracted fonts.
  *
- * Includes @font-face rules for local fonts, fallback @font-face rules,
- * and scoped classes.
+ * Includes @font-face rules for local and Google fonts, fallback @font-face
+ * rules, and scoped classes.
+ *
+ * `googleFontFacesMap` provides pre-resolved FontFaceDescriptor[] for each
+ * Google font ID (keyed by ExtractedFont.id).
  */
-export declare function generateAllFontCss(registry: FontRegistry): string;
+export declare function generateAllFontCss(registry: FontRegistry, googleFontFacesMap?: Map<string, FontFaceDescriptor[]>): string;
 /**
  * Parse the local name used for the default import of `@timber/fonts/local`.
  *

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

@@ -1 +1 @@
-{"version":3,"file":"fonts.d.ts","sourceRoot":"","sources":["../../src/plugins/fonts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,MAAM,CAAC;AAGlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAmCzE;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AA4CtD;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAE7E;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,IAAI,CAE5F;AAUD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAkB/D;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAqB3E;AAwED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAmB3D;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM,CAMjE;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKtE;AAqED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CA4VtD"}
+{"version":3,"file":"fonts.d.ts","sourceRoot":"","sources":["../../src/plugins/fonts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,MAAM,CAAC;AAGlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAYzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AA6B5D;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AA4CtD;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAE7E;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,IAAI,CAE5F;AAUD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAkB/D;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAqB3E;AAwED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAwB/F;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,kBAAkB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,GACrD,MAAM,CAOR;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKtE;AAqED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAqYtD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timber-js/app",
-  "version": "0.2.0-alpha.65",
+  "version": "0.2.0-alpha.67",
   "description": "Vite-native React framework built for Servers and Serverless Platforms — correct HTTP semantics, real status codes, pages that work without JavaScript",
   "keywords": [
     "cloudflare-workers",
@@ -88,6 +88,11 @@
   "publishConfig": {
     "access": "public"
   },
+  "scripts": {
+    "build": "vite build --config vite.lib.config.ts && tsc --emitDeclarationOnly --project tsconfig.json --outDir dist",
+    "typecheck": "tsgo --noEmit",
+    "prepublishOnly": "pnpm run build"
+  },
   "dependencies": {
     "@opentelemetry/api": "^1.9.1",
     "@opentelemetry/context-async-hooks": "^2.6.1",
@@ -126,9 +131,5 @@
   },
   "engines": {
     "node": ">=22.12.0"
-  },
-  "scripts": {
-    "build": "vite build --config vite.lib.config.ts && tsc --emitDeclarationOnly --project tsconfig.json --outDir dist",
-    "typecheck": "tsgo --noEmit"
   }
-}
+}

package/src/plugins/fonts.ts

@@ -24,7 +24,13 @@ import { generateVariableClass, generateFontFamilyClass, generateFontFaces } fro
 import { generateFallbackCss, buildFontStack } from '../fonts/fallbacks.js';
 import { processLocalFont, generateLocalFontFaces } from '../fonts/local.js';
 import { inferFontFormat } from '../fonts/local.js';
-import { downloadAndCacheFonts, type CachedFont } from '../fonts/google.js';
+import {
+  downloadAndCacheFonts,
+  generateProductionFontFaces,
+  resolveDevFontFaces,
+  type CachedFont,
+} from '../fonts/google.js';
+import type { FontFaceDescriptor } from '../fonts/types.js';
 import {
   extractFontConfigAst,
   extractLocalFontConfigAst,
@@ -264,10 +270,13 @@ function generateLocalVirtualModule(): string {
 /**
  * Generate CSS for a single extracted font.
  *
- * Includes @font-face rules (for local fonts), fallback @font-face,
+ * Includes @font-face rules (for local and Google fonts), fallback @font-face,
  * and the scoped class rule.
+ *
+ * For Google fonts, pass the resolved FontFaceDescriptor[] from either
+ * `generateProductionFontFaces()` (production) or `resolveDevFontFaces()` (dev).
  */
-export function generateFontCss(font: ExtractedFont): string {
+export function generateFontCss(font: ExtractedFont, googleFaces?: FontFaceDescriptor[]): string {
   const cssParts: string[] = [];
 
   if (font.provider === 'local' && font.localSources) {
@@ -276,6 +285,11 @@ export function generateFontCss(font: ExtractedFont): string {
     if (faceCss) cssParts.push(faceCss);
   }
 
+  if (font.provider === 'google' && googleFaces && googleFaces.length > 0) {
+    const faceCss = generateFontFaces(googleFaces);
+    if (faceCss) cssParts.push(faceCss);
+  }
+
   const fallbackCss = generateFallbackCss(font.family);
   if (fallbackCss) cssParts.push(fallbackCss);
 
@@ -291,13 +305,20 @@ export function generateFontCss(font: ExtractedFont): string {
 /**
  * Generate the CSS output for all extracted fonts.
  *
- * Includes @font-face rules for local fonts, fallback @font-face rules,
- * and scoped classes.
+ * Includes @font-face rules for local and Google fonts, fallback @font-face
+ * rules, and scoped classes.
+ *
+ * `googleFontFacesMap` provides pre-resolved FontFaceDescriptor[] for each
+ * Google font ID (keyed by ExtractedFont.id).
  */
-export function generateAllFontCss(registry: FontRegistry): string {
+export function generateAllFontCss(
+  registry: FontRegistry,
+  googleFontFacesMap?: Map<string, FontFaceDescriptor[]>
+): string {
   const cssParts: string[] = [];
   for (const font of registry.values()) {
-    cssParts.push(generateFontCss(font));
+    const googleFaces = googleFontFacesMap?.get(font.id);
+    cssParts.push(generateFontCss(font, googleFaces));
   }
   return cssParts.join('\n\n');
 }
@@ -390,6 +411,11 @@ export function timberFonts(ctx: PluginContext): Plugin {
   const registry: FontRegistry = new Map();
   /** Fonts downloaded during buildStart (production only). */
   let cachedFonts: CachedFont[] = [];
+  /**
+   * Pre-resolved @font-face descriptors for Google fonts, keyed by font ID.
+   * Populated in buildStart (production) or lazily in load (dev).
+   */
+  const googleFontFacesMap = new Map<string, FontFaceDescriptor[]>();
 
   return {
     name: 'timber-fonts',
@@ -429,12 +455,32 @@ export function timberFonts(ctx: PluginContext): Plugin {
      * Because this is loaded lazily (on first request), the font
      * registry is always populated by the time it's needed.
      */
-    load(id: string) {
+    async load(id: string) {
       if (id === RESOLVED_GOOGLE) return generateGoogleVirtualModule(registry);
       if (id === RESOLVED_LOCAL) return generateLocalVirtualModule();
 
       if (id === RESOLVED_FONT_CSS_REGISTER) {
-        const css = generateAllFontCss(registry);
+        // In dev mode, resolve Google font faces from CDN on demand.
+        if (ctx.dev) {
+          const googleFonts = [...registry.values()].filter((f) => f.provider === 'google');
+          for (const font of googleFonts) {
+            if (!googleFontFacesMap.has(font.id)) {
+              try {
+                const faces = await resolveDevFontFaces(font);
+                googleFontFacesMap.set(font.id, faces);
+              } catch (e) {
+                // In dev mode, fail gracefully — fonts fall back to system fonts.
+                const msg = e instanceof Error ? e.message : String(e);
+                console.warn(
+                  `[timber-fonts] Failed to resolve Google font "${font.family}": ${msg}`
+                );
+                googleFontFacesMap.set(font.id, []);
+              }
+            }
+          }
+        }
+
+        const css = generateAllFontCss(registry, googleFontFacesMap);
         // Side-effect module: sets font CSS on globalThis for the RSC entry to read.
         return `globalThis.__timber_font_css = ${JSON.stringify(css)};`;
       }
@@ -515,6 +561,22 @@ export function timberFonts(ctx: PluginContext): Plugin {
       if (googleFonts.length === 0) return;
 
       cachedFonts = await downloadAndCacheFonts(googleFonts, ctx.root);
+
+      // Build a family→CachedFont[] lookup, then generate production @font-face
+      // descriptors for each registered Google font.
+      const cachedByFamily = new Map<string, CachedFont[]>();
+      for (const cf of cachedFonts) {
+        const key = cf.face.family.toLowerCase();
+        const arr = cachedByFamily.get(key) ?? [];
+        arr.push(cf);
+        cachedByFamily.set(key, arr);
+      }
+
+      for (const font of googleFonts) {
+        const familyCached = cachedByFamily.get(font.family.toLowerCase()) ?? [];
+        const faces = generateProductionFontFaces(familyCached, font.display);
+        googleFontFacesMap.set(font.id, faces);
+      }
     },
 
     /**

package/LICENSE

@@ -1,8 +0,0 @@
-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.