@timber-js/app 0.2.0-alpha.8 → 0.2.0-alpha.80

package/src/plugins/fonts.ts

@@ -17,27 +17,47 @@
 import type { Plugin, ViteDevServer } from 'vite';
 import { readFileSync, existsSync } from 'node:fs';
 import { resolve, normalize } from 'node:path';
-import type { PluginContext } from '#/index.js';
-import type { ExtractedFont, GoogleFontConfig } from '#/fonts/types.js';
-import type { ManifestFontEntry } from '#/server/build-manifest.js';
-import { generateVariableClass, generateFontFamilyClass, generateFontFaces } from '#/fonts/css.js';
-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 type { PluginContext } from '../plugin-context.js';
+import type { ExtractedFont, GoogleFontConfig } from '../fonts/types.js';
+import type { ManifestFontEntry } from '../server/build-manifest.js';
+import { generateVariableClass, generateFontFamilyClass, generateFontFaces } from '../fonts/css.js';
+import { generateFallbackCss, buildFontStack } from '../fonts/fallbacks.js';
+import { processLocalFont, generateLocalFontFaces } from '../fonts/local.js';
+import { inferFontFormat } from '../fonts/local.js';
+import {
+  downloadAndCacheFonts,
+  generateProductionFontFaces,
+  resolveDevFontFaces,
+  type CachedFont,
+} from '../fonts/google.js';
+import type { FontFaceDescriptor } from '../fonts/types.js';
 import {
   extractFontConfigAst,
   extractLocalFontConfigAst,
   detectDynamicFontCallAst,
-} from '#/fonts/ast.js';
+} from '../fonts/ast.js';
 
 const VIRTUAL_GOOGLE = '@timber/fonts/google';
 const VIRTUAL_LOCAL = '@timber/fonts/local';
 const RESOLVED_GOOGLE = '\0@timber/fonts/google';
 const RESOLVED_LOCAL = '\0@timber/fonts/local';
 
-/** URL path where font CSS is served (dev middleware and prod asset). */
-const FONT_CSS_PATH = '/_timber/fonts/fonts.css';
+/**
+ * Virtual side-effect module that registers font CSS on globalThis.
+ *
+ * When a file calls localFont() or a Google font function, the transform
+ * hook injects `import 'virtual:timber-font-css-register'` into that file.
+ * This virtual module sets `globalThis.__timber_font_css` with the combined
+ * @font-face CSS. The RSC entry reads it at render time to inline a <style> tag.
+ *
+ * This approach avoids timing issues because:
+ * 1. The font file is in the RSC module graph (imported by layout.tsx)
+ * 2. The side-effect import is added to the font file during transform
+ * 3. When layout.tsx is loaded, fonts.ts runs → side-effect module runs → globalThis is set
+ * 4. RSC entry renders → reads globalThis → inlines <style>
+ */
+const VIRTUAL_FONT_CSS_REGISTER = 'virtual:timber-font-css-register';
+const RESOLVED_FONT_CSS_REGISTER = '\0virtual:timber-font-css-register';
 
 /**
  * Registry of fonts extracted during transform.
@@ -120,7 +140,7 @@ export function detectDynamicFontCall(source: string, importedNames: string[]):
  * but the source code still contains the original import specifier.
  */
 const GOOGLE_FONT_IMPORT_RE =
-  /import\s*\{([^}]+)\}\s*from\s*['"](?:@timber\/fonts\/google|next\/font\/google)['"]/g;
+  /import\s*\{([^}]+)\}\s*from\s*['"](?:@timber\/fonts\/google|@timber-js\/app\/fonts\/google|next\/font\/google)['"]/g;
 
 /**
  * Parse import specifiers from a source file that imports from
@@ -248,37 +268,61 @@ function generateLocalVirtualModule(): string {
 }
 
 /**
- * Generate the CSS output for all extracted fonts.
+ * Generate CSS for a single extracted font.
+ *
+ * Includes @font-face rules (for local and Google fonts), fallback @font-face,
+ * and the scoped class rule.
  *
- * Includes @font-face rules for local fonts, fallback @font-face rules,
- * and scoped classes.
+ * For Google fonts, pass the resolved FontFaceDescriptor[] from either
+ * `generateProductionFontFaces()` (production) or `resolveDevFontFaces()` (dev).
  */
-export function generateAllFontCss(registry: FontRegistry): string {
+export function generateFontCss(font: ExtractedFont, googleFaces?: FontFaceDescriptor[]): string {
   const cssParts: string[] = [];
 
-  for (const font of registry.values()) {
-    // Generate @font-face rules for local fonts
-    if (font.provider === 'local' && font.localSources) {
-      const faces = generateLocalFontFaces(font.family, font.localSources, font.display);
-      const faceCss = generateFontFaces(faces);
-      if (faceCss) cssParts.push(faceCss);
-    }
+  if (font.provider === 'local' && font.localSources) {
+    const faces = generateLocalFontFaces(font.family, font.localSources, font.display);
+    const faceCss = generateFontFaces(faces);
+    if (faceCss) cssParts.push(faceCss);
+  }
 
-    // Generate fallback @font-face if metrics are available
-    const fallbackCss = generateFallbackCss(font.family);
-    if (fallbackCss) cssParts.push(fallbackCss);
+  if (font.provider === 'google' && googleFaces && googleFaces.length > 0) {
+    const faceCss = generateFontFaces(googleFaces);
+    if (faceCss) cssParts.push(faceCss);
+  }
 
-    // Generate scoped class
-    if (font.variable) {
-      cssParts.push(generateVariableClass(font.className, font.variable, font.fontFamily));
-    } else {
-      cssParts.push(generateFontFamilyClass(font.className, font.fontFamily));
-    }
+  const fallbackCss = generateFallbackCss(font.family);
+  if (fallbackCss) cssParts.push(fallbackCss);
+
+  if (font.variable) {
+    cssParts.push(generateVariableClass(font.className, font.variable, font.fontFamily));
+  } else {
+    cssParts.push(generateFontFamilyClass(font.className, font.fontFamily));
   }
 
   return cssParts.join('\n\n');
 }
 
+/**
+ * Generate the CSS output for all extracted fonts.
+ *
+ * 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,
+  googleFontFacesMap?: Map<string, FontFaceDescriptor[]>
+): string {
+  const cssParts: string[] = [];
+  for (const font of registry.values()) {
+    const googleFaces = googleFontFacesMap?.get(font.id);
+    cssParts.push(generateFontCss(font, googleFaces));
+  }
+  return cssParts.join('\n\n');
+}
+
 /**
  * Parse the local name used for the default import of `@timber/fonts/local`.
  *
@@ -288,7 +332,7 @@ export function generateAllFontCss(registry: FontRegistry): string {
  */
 export function parseLocalFontImportName(source: string): string | null {
   const match = source.match(
-    /import\s+(\w+)\s+from\s*['"](?:@timber\/fonts\/local|next\/font\/local)['"]/
+    /import\s+(\w+)\s+from\s*['"](?:@timber\/fonts\/local|@timber-js\/app\/fonts\/local|next\/font\/local)['"]/
   );
   return match ? match[1] : null;
 }
@@ -353,7 +397,7 @@ function transformLocalFonts(
 
   // Remove the import statement
   transformedCode = transformedCode.replace(
-    /import\s+\w+\s+from\s*['"](?:@timber\/fonts\/local|next\/font\/local)['"];?\s*\n?/g,
+    /import\s+\w+\s+from\s*['"](?:@timber\/fonts\/local|@timber-js\/app\/fonts\/local|next\/font\/local)['"];?\s*\n?/g,
     ''
   );
 
@@ -367,25 +411,80 @@ 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',
 
     /**
-     * Resolve `@timber/fonts/google` and `@timber/fonts/local` to virtual modules.
+     * Resolve `@timber/fonts/google`, `@timber/fonts/local`,
+     * and `virtual:timber-font-css` virtual modules.
+     *
+     * Handles \0 prefix and root prefix stripping for RSC/SSR
+     * environments where the RSC plugin re-imports virtual modules
+     * with additional prefixes.
      */
     resolveId(id: string) {
-      if (id === VIRTUAL_GOOGLE) return RESOLVED_GOOGLE;
-      if (id === VIRTUAL_LOCAL) return RESOLVED_LOCAL;
+      // Strip \0 prefix (RSC plugin re-imports)
+      let cleanId = id.startsWith('\0') ? id.slice(1) : id;
+      // Strip root prefix (SSR build entries)
+      if (cleanId.startsWith(ctx.root)) {
+        const stripped = cleanId.slice(ctx.root.length);
+        if (stripped.startsWith('/') || stripped.startsWith('\\')) {
+          cleanId = stripped.slice(1);
+        } else {
+          cleanId = stripped;
+        }
+      }
+
+      if (cleanId === VIRTUAL_GOOGLE) return RESOLVED_GOOGLE;
+      if (cleanId === VIRTUAL_LOCAL) return RESOLVED_LOCAL;
+      if (cleanId === VIRTUAL_FONT_CSS_REGISTER) return RESOLVED_FONT_CSS_REGISTER;
       return null;
     },
 
     /**
      * Return generated source for font virtual modules.
+     *
+     * `virtual:timber-font-css` exports the combined @font-face CSS
+     * as a string. The RSC entry imports it and inlines a <style> tag.
+     * 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) {
+        // 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.
+                // Don't cache the failure so transient errors (network blips,
+                // rate limits) are retried on the next request. See TIM-636.
+                const msg = e instanceof Error ? e.message : String(e);
+                console.warn(
+                  `[timber-fonts] Failed to resolve Google font "${font.family}": ${msg}. Will retry on next request.`
+                );
+              }
+            }
+          }
+        }
+
+        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)};`;
+      }
       return null;
     },
 
@@ -412,14 +511,8 @@ export function timberFonts(ctx: PluginContext): Plugin {
           return;
         }
 
-        // Serve generated font CSS
-        if (requestedFilename === 'fonts.css') {
-          const css = generateAllFontCss(registry);
-          res.setHeader('Content-Type', 'text/css');
-          res.setHeader('Cache-Control', 'no-cache');
-          res.end(css);
-          return;
-        }
+        // Font CSS is now injected via Vite's CSS pipeline (virtual:timber-font-css modules).
+        // This middleware only serves font binary files (woff2, etc.).
 
         // Find the matching font file in the registry
         for (const font of registry.values()) {
@@ -469,6 +562,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);
+      }
     },
 
     /**
@@ -486,9 +595,13 @@ export function timberFonts(ctx: PluginContext): Plugin {
       if (id.startsWith('\0') || id.includes('node_modules')) return null;
 
       const hasGoogleImport =
-        code.includes('@timber/fonts/google') || code.includes('next/font/google');
+        code.includes('@timber/fonts/google') ||
+        code.includes('@timber-js/app/fonts/google') ||
+        code.includes('next/font/google');
       const hasLocalImport =
-        code.includes('@timber/fonts/local') || code.includes('next/font/local');
+        code.includes('@timber/fonts/local') ||
+        code.includes('@timber-js/app/fonts/local') ||
+        code.includes('next/font/local');
       if (!hasGoogleImport && !hasLocalImport) return null;
 
       let transformedCode = code;
@@ -560,7 +673,7 @@ export function timberFonts(ctx: PluginContext): Plugin {
           }
 
           transformedCode = transformedCode.replace(
-            /import\s*\{[^}]+\}\s*from\s*['"](?:@timber\/fonts\/google|next\/font\/google)['"];?\s*\n?/g,
+            /import\s*\{[^}]+\}\s*from\s*['"](?:@timber\/fonts\/google|@timber-js\/app\/fonts\/google|next\/font\/google)['"];?\s*\n?/g,
             ''
           );
         }
@@ -578,9 +691,10 @@ export function timberFonts(ctx: PluginContext): Plugin {
       }
 
       if (transformedCode !== code) {
-        // Mark that fonts are in use so the RSC entry injects a <link> tag.
-        if (registry.size > 0 && !ctx.fontCssUrl) {
-          ctx.fontCssUrl = FONT_CSS_PATH;
+        // Inject side-effect import that registers font CSS on globalThis.
+        // The RSC entry reads globalThis.__timber_font_css to inline a <style> tag.
+        if (registry.size > 0) {
+          transformedCode = `import '${VIRTUAL_FONT_CSS_REGISTER}';\n` + transformedCode;
         }
         return { code: transformedCode, map: null };
       }
@@ -627,15 +741,8 @@ export function timberFonts(ctx: PluginContext): Plugin {
         }
       }
 
-      // Emit the combined font CSS as an asset
-      const fontCss = generateAllFontCss(registry);
-      if (fontCss) {
-        this.emitFile({
-          type: 'asset',
-          fileName: '_timber/fonts/fonts.css',
-          source: fontCss,
-        });
-      }
+      // Font CSS is emitted by Vite's CSS pipeline via virtual:timber-font-css modules.
+      // We only need to emit font binary files and update the build manifest here.
 
       if (!ctx.buildManifest) return;
 

package/src/plugins/mdx.ts

@@ -11,7 +11,7 @@
 import type { Plugin } from 'vite';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
-import type { PluginContext } from '#/index.js';
+import type { PluginContext } from '../plugin-context.js';
 
 const MDX_EXTENSIONS = ['mdx', 'md'];
 

package/src/plugins/routing.ts

@@ -11,15 +11,15 @@
 import type { Plugin, ViteDevServer } from 'vite';
 import { writeFile, mkdir } from 'node:fs/promises';
 import { join } from 'node:path';
-import { scanRoutes } from '#/routing/scanner.js';
-import { generateRouteMap } from '#/routing/codegen.js';
-import { collectInterceptionRewrites } from '#/routing/interception.js';
+import { scanRoutes } from '../routing/scanner.js';
+import { generateRouteMap } from '../routing/codegen.js';
+import { collectInterceptionRewrites } from '../routing/interception.js';
 import {
   lintStatusFileDirectives,
   formatStatusFileLintWarnings,
-} from '#/routing/status-file-lint.js';
-import type { RouteTree, SegmentNode, RouteFile } from '#/routing/types.js';
-import type { PluginContext } from '#/index.js';
+} from '../routing/status-file-lint.js';
+import type { RouteTree, SegmentNode, RouteFile } from '../routing/types.js';
+import type { PluginContext } from '../plugin-context.js';
 
 const VIRTUAL_MODULE_ID = 'virtual:timber-route-manifest';
 const RESOLVED_VIRTUAL_ID = `\0${VIRTUAL_MODULE_ID}`;
@@ -28,7 +28,7 @@ const RESOLVED_VIRTUAL_ID = `\0${VIRTUAL_MODULE_ID}`;
  * File convention names we track for changes that require manifest regeneration.
  */
 const ROUTE_FILE_PATTERNS =
-  /\/(page|layout|middleware|access|route|error|default|denied|search-params|\d{3}|[45]xx|not-found|forbidden|unauthorized|sitemap|robots|manifest|favicon|icon|opengraph-image|twitter-image|apple-icon)\./;
+  /\/(page|layout|middleware|access|route|error|global-error|default|denied|params|\d{3}|[45]xx|not-found|forbidden|unauthorized|sitemap|robots|manifest|favicon|icon|opengraph-image|twitter-image|apple-icon)\./;
 
 /**
  * Create the timber-routing Vite plugin.
@@ -168,20 +168,49 @@ export function timberRouting(ctx: PluginContext): Plugin {
       // Watch the app directory
       devServer.watcher.add(ctx.appDir);
 
-      const handleFileChange = (filePath: string) => {
-        // Only react to route-significant files in the app directory
+      /** Snapshot of the last generated manifest, used to detect structural changes. */
+      let lastManifest = ctx.routeTree ? generateManifestModule(ctx.routeTree) : '';
+
+      /**
+       * Handle a route-significant file being added or removed.
+       * Always triggers a full-reload since the route tree structure changed.
+       */
+      const handleStructuralChange = (filePath: string) => {
         if (!filePath.startsWith(ctx.appDir)) return;
         if (!ROUTE_FILE_PATTERNS.test(filePath)) return;
 
-        // Rescan the route tree
         rescan();
-
-        // Invalidate the virtual module in all environments
+        lastManifest = ctx.routeTree ? generateManifestModule(ctx.routeTree) : '';
         invalidateManifest(devServer);
       };
 
-      devServer.watcher.on('add', handleFileChange);
-      devServer.watcher.on('unlink', handleFileChange);
+      /**
+       * Handle a route file's content changing.
+       *
+       * Most content edits (JSX changes, fixing typos) don't affect route
+       * metadata — Vite's React Fast Refresh handles those via normal HMR.
+       * Only rescan and full-reload when route metadata actually changed
+       * (e.g., searchParams export added/removed, metadata export changed).
+       */
+      const handleContentChange = (filePath: string) => {
+        if (!filePath.startsWith(ctx.appDir)) return;
+        if (!ROUTE_FILE_PATTERNS.test(filePath)) return;
+
+        rescan();
+        const newManifest = ctx.routeTree ? generateManifestModule(ctx.routeTree) : '';
+        if (newManifest !== lastManifest) {
+          lastManifest = newManifest;
+          invalidateManifest(devServer);
+        }
+        // Otherwise: content edit didn't change route metadata — let Vite HMR handle it
+      };
+
+      devServer.watcher.on('add', handleStructuralChange);
+      devServer.watcher.on('unlink', handleStructuralChange);
+      // Watch content changes to page files — searchParams detection depends
+      // on file contents (export const searchParams), not just file presence.
+      // But only full-reload when route metadata actually changes.
+      devServer.watcher.on('change', handleContentChange);
       // Also watch renames (which are add+unlink) — handled by the above
     },
   };
@@ -301,12 +330,15 @@ function generateManifestModule(tree: RouteTree): string {
         `${nextIndent}denied: { load: ${v}, filePath: ${JSON.stringify(node.denied.filePath)} },`
       );
     }
-    if (node.searchParams) {
-      const v = addImport(node.searchParams);
+    if (node.params) {
+      const v = addImport(node.params);
       parts.push(
-        `${nextIndent}searchParams: { load: ${v}, filePath: ${JSON.stringify(node.searchParams.filePath)} },`
+        `${nextIndent}params: { load: ${v}, filePath: ${JSON.stringify(node.params.filePath)} },`
       );
     }
+    // searchParams is now a named export from page.tsx, not a separate file.
+    // The page module's searchParams export is loaded via the page's lazy import.
+    // Runtime registration happens in the route loader using the page module.
 
     // Status-code files
     if (node.statusFiles && node.statusFiles.size > 0) {
@@ -391,6 +423,13 @@ function generateManifestModule(tree: RouteTree): string {
     proxyLine = `  proxy: { load: ${v}, filePath: ${JSON.stringify(tree.proxy.filePath)} },`;
   }
 
+  // Global error page (Tier 2)
+  let globalErrorLine = '';
+  if (tree.globalError) {
+    const v = addImport(tree.globalError);
+    globalErrorLine = `  globalError: { load: ${v}, filePath: ${JSON.stringify(tree.globalError.filePath)} },`;
+  }
+
   // Interception rewrites — computed at build time from the route tree.
   // Only interceptedPattern and interceptingPrefix are needed at runtime.
   const rewrites = collectInterceptionRewrites(tree.root);
@@ -407,6 +446,7 @@ function generateManifestModule(tree: RouteTree): string {
     '',
     'const manifest = {',
     proxyLine,
+    globalErrorLine,
     rewritesLine,
     `  root: ${rootSerialized},`,
     '};',

package/src/plugins/server-action-exports.ts

@@ -1,7 +1,7 @@
 import type { Plugin } from 'vite';
 import { Parser } from 'acorn';
 import acornJsx from 'acorn-jsx';
-import { detectFileDirective } from '#/utils/directive-parser.js';
+import { detectFileDirective } from '../utils/directive-parser.js';
 
 const jsxParser = Parser.extend(acornJsx());
 

package/src/plugins/server-bundle.ts

@@ -137,5 +137,36 @@ export function timberServerBundle(): Plugin[] {
     },
   };
 
-  return [bundlePlugin, esmInitFixPlugin];
+  // Fix Rolldown's `createRequire(import.meta.url)` CJS interop shim for
+  // Cloudflare Workers. Rolldown emits this for CJS dependencies (e.g.
+  // @opentelemetry/context-async-hooks) that use `require()`. On Workers,
+  // `import.meta.url` is `undefined` for non-entry modules, causing:
+  //   TypeError: The argument 'path' must be a file URL object, a file URL
+  //   string, or an absolute path string. Received 'undefined'
+  //
+  // The fix: provide a fallback URL when `import.meta.url` is undefined.
+  // The actual URL doesn't matter — `createRequire` only needs it for
+  // resolving relative paths, but the only `__require()` calls are for
+  // Node built-ins (events, async_hooks) which resolve from any base.
+  //
+  // The top-level `ssr: { target: 'webworker' }` was supposed to prevent
+  // this, but it doesn't propagate to custom environments (rsc) in Vite's
+  // Environment API. See LOCAL-405.
+  const createRequireFixPlugin: Plugin = {
+    name: 'timber-create-require-fix',
+    applyToEnvironment(environment) {
+      return environment.name === 'rsc' || environment.name === 'ssr';
+    },
+    renderChunk(code) {
+      const pattern = 'createRequire(import.meta.url)';
+      if (!code.includes(pattern)) return null;
+
+      return {
+        code: code.replace(pattern, 'createRequire(import.meta.url || "file:///app")'),
+        map: null,
+      };
+    },
+  };
+
+  return [bundlePlugin, esmInitFixPlugin, createRequireFixPlugin];
 }