@timber-js/app 0.1.54 → 0.1.56

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

@@ -1 +1 @@
-{"version":3,"file":"entries.d.ts","sourceRoot":"","sources":["../../src/plugins/entries.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAInC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAyHhD;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAAC,mBAAmB,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAwBxF;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAwExD"}
+{"version":3,"file":"entries.d.ts","sourceRoot":"","sources":["../../src/plugins/entries.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAInC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AA0HhD;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAAC,mBAAmB,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAwBxF;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAwExD"}

package/dist/server/state-tree-diff.d.ts

@@ -39,5 +39,5 @@ export declare function parseClientStateTree(req: Request): Set<string> | null;
  * @param isLeaf - Whether this is the leaf segment (page segment)
  * @param clientSegments - Set of paths from X-Timber-State-Tree, or null
  */
-export declare function shouldSkipSegment(urlPath: string, layoutComponent: ((...args: unknown[]) => unknown) | undefined, isLeaf: boolean, clientSegments: Set<string> | null): boolean;
+export declare function shouldSkipSegment(_urlPath: string, _layoutComponent: ((...args: unknown[]) => unknown) | undefined, _isLeaf: boolean, _clientSegments: Set<string> | null): boolean;
 //# sourceMappingURL=state-tree-diff.d.ts.map

package/dist/server/state-tree-diff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state-tree-diff.d.ts","sourceRoot":"","sources":["../../src/server/state-tree-diff.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAarE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,GAAG,SAAS,EAC9D,MAAM,EAAE,OAAO,EACf,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,GACjC,OAAO,CAeT"}
+{"version":3,"file":"state-tree-diff.d.ts","sourceRoot":"","sources":["../../src/server/state-tree-diff.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAarE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,GAAG,SAAS,EAC/D,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,GAClC,OAAO,CAeT"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timber-js/app",
-  "version": "0.1.54",
+  "version": "0.1.56",
   "description": "Vite-native React framework for Cloudflare Workers — correct HTTP semantics, real status codes, pages that work without JavaScript",
   "keywords": [
     "cloudflare-workers",

package/src/adapters/nitro.ts

@@ -341,20 +341,24 @@ export function generateNitroEntry(
   return `// Generated by @timber-js/app/adapters/nitro
 // Do not edit — this file is regenerated on each build.
 
-${manifestImport}import { defineEventHandler } from 'nitro/h3'
-import handler, { runWithEarlyHintsSender${waitUntilImport} } from '${serverEntryRelative}'
+${manifestImport}import handler, { runWithEarlyHintsSender${waitUntilImport} } from '${serverEntryRelative}'
 import { compressResponse } from './_compress.mjs'
 
 // Set TIMBER_RUNTIME for instrumentation.ts conditional SDK initialization.
 // See design/25-production-deployments.md §"TIMBER_RUNTIME".
 process.env.TIMBER_RUNTIME = '${runtimeName}'
 
-export default defineEventHandler(async (event) => {
+// Nitro's index.mjs wraps this import with defineLazyEventHandler, which
+// already handles the event handler protocol. We export a plain async
+// function — no defineEventHandler wrapper needed.
+// Nitro bundles h3 into its internal _libs/ directory but doesn't make
+// it available as a bare specifier in the output's node_modules.
+export default async function timberHandler(event) {
   // h3 v2: event.req is the Web Request
   const webRequest = event.req
 ${handlerCall}
   return compressResponse(webRequest, webResponse)
-})
+}
 `;
 }
 

package/src/client/browser-entry.ts

@@ -381,7 +381,7 @@ function bootstrap(runtimeConfig: typeof config): void {
       element as React.ReactNode
     );
     const wrapped = createElement(TimberNuqsAdapter, null, withNav);
-    const rootElement = createElement(TransitionRoot, { initial: wrapped });
+    const rootElement = createElement(TransitionRoot, { initial: wrapped, topLoaderConfig: _config.topLoader });
     _reactRoot = hydrateRoot(document, rootElement, {
       // Suppress recoverable hydration errors from deny/error signals
       // inside Suspense boundaries. The server already handled these

package/src/client/top-loader.tsx

@@ -0,0 +1,213 @@
+/**
+ * TopLoader — Built-in progress bar for client navigations.
+ *
+ * Shows an animated progress bar at the top of the viewport while an RSC
+ * navigation is in flight. Injected automatically by the framework into
+ * TransitionRoot — users never render this component directly.
+ *
+ * Configuration is via timber.config.ts `topLoader` key. Enabled by default.
+ * Users who want a fully custom progress indicator disable the built-in one
+ * (`topLoader: { enabled: false }`) and use `useNavigationPending()` directly.
+ *
+ * Animation approach: pure CSS @keyframes. The bar crawls from 0% to ~90%
+ * width over ~30s using ease-out timing. When navigation completes, the bar
+ * snaps to 100% and fades out over 200ms. No JS animation loops (RAF, setInterval).
+ *
+ * The bar respects a configurable delay (default 150ms) — if navigation
+ * resolves faster than the delay, the bar never appears.
+ *
+ * See design/19-client-navigation.md §"useNavigationPending()"
+ * See LOCAL-336 for design decisions.
+ */
+
+'use client';
+
+import { useState, useEffect, useRef, createElement } from 'react';
+import { usePendingNavigationUrl } from './navigation-context.js';
+
+// ─── Types ───────────────────────────────────────────────────────
+
+export interface TopLoaderConfig {
+  /** Whether the top-loader is enabled. Default: true. */
+  enabled?: boolean;
+  /** Bar color. Default: '#2299DD'. */
+  color?: string;
+  /** Bar height in pixels. Default: 3. */
+  height?: number;
+  /** Show subtle glow/shadow effect. Default: true. */
+  shadow?: boolean;
+  /** Delay in ms before showing the bar. Default: 150. */
+  delay?: number;
+  /** CSS z-index. Default: 1600. */
+  zIndex?: number;
+}
+
+// ─── Defaults ────────────────────────────────────────────────────
+
+const DEFAULT_COLOR = '#2299DD';
+const DEFAULT_HEIGHT = 3;
+const DEFAULT_SHADOW = true;
+const DEFAULT_DELAY = 150;
+const DEFAULT_Z_INDEX = 1600;
+
+// ─── Keyframes ID ────────────────────────────────────────────────
+
+// Unique keyframes name to avoid collisions with user styles.
+const KEYFRAMES_NAME = '__timber_top_loader_crawl';
+
+// Track whether the @keyframes rule has been injected into the document.
+let keyframesInjected = false;
+
+/**
+ * Inject the @keyframes rule into the document head once.
+ * Uses a <style> tag so the animation is available for inline-styled elements.
+ */
+function ensureKeyframes(): void {
+  if (keyframesInjected) return;
+  if (typeof document === 'undefined') return;
+
+  const style = document.createElement('style');
+  style.textContent = `
+@keyframes ${KEYFRAMES_NAME} {
+  0% { width: 0%; }
+  100% { width: 90%; }
+}
+`;
+  document.head.appendChild(style);
+  keyframesInjected = true;
+}
+
+// ─── Component ───────────────────────────────────────────────────
+
+/**
+ * Internal top-loader component. Injected by TransitionRoot.
+ *
+ * Reads pending navigation state from PendingNavigationContext.
+ * Shows nothing when no navigation is pending or when the navigation
+ * resolves before the delay threshold.
+ */
+export function TopLoader({ config }: { config?: TopLoaderConfig }): React.ReactElement | null {
+  const pendingUrl = usePendingNavigationUrl();
+  const isPending = pendingUrl !== null;
+
+  const color = config?.color ?? DEFAULT_COLOR;
+  const height = config?.height ?? DEFAULT_HEIGHT;
+  const shadow = config?.shadow ?? DEFAULT_SHADOW;
+  const delay = config?.delay ?? DEFAULT_DELAY;
+  const zIndex = config?.zIndex ?? DEFAULT_Z_INDEX;
+
+  // Track visibility states:
+  // - 'hidden': no bar shown
+  // - 'crawling': bar is animating from 0% to 90%
+  // - 'finishing': bar is snapping to 100% and fading out
+  const [phase, setPhase] = useState<'hidden' | 'crawling' | 'finishing'>('hidden');
+  const delayTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const finishTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+  // Inject keyframes on mount
+  useEffect(() => {
+    ensureKeyframes();
+  }, []);
+
+  // Handle pending state changes
+  useEffect(() => {
+    if (isPending) {
+      // Navigation started — wait for delay before showing the bar
+      // Clear any finish timer from a previous navigation
+      if (finishTimerRef.current !== null) {
+        clearTimeout(finishTimerRef.current);
+        finishTimerRef.current = null;
+      }
+
+      if (delay > 0) {
+        delayTimerRef.current = setTimeout(() => {
+          delayTimerRef.current = null;
+          setPhase('crawling');
+        }, delay);
+      } else {
+        setPhase('crawling');
+      }
+    } else {
+      // Navigation ended (or was never pending)
+      // Clear the delay timer — if it hasn't fired, the bar never shows
+      if (delayTimerRef.current !== null) {
+        clearTimeout(delayTimerRef.current);
+        delayTimerRef.current = null;
+        // Bar was never shown — stay hidden
+        if (phase === 'hidden') return;
+      }
+
+      if (phase === 'crawling') {
+        // Bar was visible — snap to 100% and fade out
+        setPhase('finishing');
+        finishTimerRef.current = setTimeout(() => {
+          finishTimerRef.current = null;
+          setPhase('hidden');
+        }, 200);
+      }
+      // If already 'finishing' or 'hidden', do nothing
+    }
+
+    return () => {
+      if (delayTimerRef.current !== null) {
+        clearTimeout(delayTimerRef.current);
+        delayTimerRef.current = null;
+      }
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- phase is read but intentionally not a dependency
+  }, [isPending, delay]);
+
+  // Cleanup finish timer on unmount
+  useEffect(() => {
+    return () => {
+      if (finishTimerRef.current !== null) {
+        clearTimeout(finishTimerRef.current);
+      }
+    };
+  }, []);
+
+  if (phase === 'hidden') return null;
+
+  // ─── Styles ──────────────────────────────────────────────────
+
+  const containerStyle: React.CSSProperties = {
+    position: 'fixed',
+    top: 0,
+    left: 0,
+    width: '100%',
+    height: `${height}px`,
+    zIndex,
+    pointerEvents: 'none',
+  };
+
+  const barStyle: React.CSSProperties = {
+    height: '100%',
+    backgroundColor: color,
+    ...(phase === 'crawling'
+      ? {
+          // Crawling: animate from 0% to 90% over 30s
+          animation: `${KEYFRAMES_NAME} 30s ease-out forwards`,
+        }
+      : {
+          // Finishing: snap to 100% and fade out
+          width: '100%',
+          opacity: 0,
+          transition: 'width 200ms ease, opacity 200ms ease',
+        }),
+    ...(shadow
+      ? {
+          boxShadow: `0 0 10px ${color}, 0 0 5px ${color}`,
+        }
+      : {}),
+  };
+
+  return createElement(
+    'div',
+    {
+      style: containerStyle,
+      'aria-hidden': 'true',
+      'data-timber-top-loader': '',
+    },
+    createElement('div', { style: barStyle })
+  );
+}

package/src/client/transition-root.tsx

@@ -22,8 +22,9 @@
  * See design/19-client-navigation.md §"NavigationContext"
  */
 
-import { useState, useTransition, createElement, type ReactNode } from 'react';
+import { useState, useTransition, createElement, Fragment, type ReactNode } from 'react';
 import { PendingNavigationProvider } from './navigation-context.js';
+import { TopLoader, type TopLoaderConfig } from './top-loader.js';
 
 // ─── Module-level functions ──────────────────────────────────────
 
@@ -61,7 +62,7 @@ let _navigateTransition:
  * Non-navigation renders:
  *   transitionRender(newWrappedElement);
  */
-export function TransitionRoot({ initial }: { initial: ReactNode }): ReactNode {
+export function TransitionRoot({ initial, topLoaderConfig }: { initial: ReactNode; topLoaderConfig?: TopLoaderConfig }): ReactNode {
   const [element, setElement] = useState<ReactNode>(initial);
   const [pendingUrl, setPendingUrl] = useState<string | null>(null);
   const [, startTransition] = useTransition();
@@ -101,7 +102,14 @@ export function TransitionRoot({ initial }: { initial: ReactNode }): ReactNode {
     });
   };
 
-  return createElement(PendingNavigationProvider, { value: pendingUrl }, element);
+  // Inject TopLoader alongside the element tree inside PendingNavigationProvider.
+  // The TopLoader reads pendingUrl from context to show/hide the progress bar.
+  // It is rendered only when not explicitly disabled via config.
+  const showTopLoader = topLoaderConfig?.enabled !== false;
+  const children = showTopLoader
+    ? createElement(Fragment, null, createElement(TopLoader, { config: topLoaderConfig }), element)
+    : element;
+  return createElement(PendingNavigationProvider, { value: pendingUrl }, children);
 }
 
 // ─── Public API ──────────────────────────────────────────────────

package/src/index.ts

@@ -110,6 +110,30 @@ export interface TimberUserConfig {
     recmaPlugins?: unknown[];
     remarkRehypeOptions?: Record<string, unknown>;
   };
+  /**
+   * Built-in top-loader progress bar for client navigations.
+   * Shows an animated bar at the top of the viewport during RSC navigations.
+   * Enabled by default — set `enabled: false` to opt out.
+   *
+   * Users who want a fully custom progress indicator should disable this
+   * and use `useNavigationPending()` directly.
+   *
+   * See LOCAL-336 for design decisions.
+   */
+  topLoader?: {
+    /** Whether the top-loader is enabled. Default: true. */
+    enabled?: boolean;
+    /** Bar color. Default: '#2299DD'. */
+    color?: string;
+    /** Bar height in pixels. Default: 3. */
+    height?: number;
+    /** Show subtle glow/shadow effect. Default: true. */
+    shadow?: boolean;
+    /** Delay in ms before showing the bar (avoids flash on fast navs). Default: 150. */
+    delay?: number;
+    /** CSS z-index. Default: 1600. */
+    zIndex?: number;
+  };
 }
 
 /**

package/src/plugins/entries.ts

@@ -109,6 +109,7 @@ function generateConfigModule(ctx: PluginContext): string {
     slowPhaseMs: ctx.config.dev?.slowPhaseMs ?? 200,
     slowRequestMs: ctx.config.slowRequestMs ?? 3000,
     cookieSecrets,
+    topLoader: ctx.config.topLoader,
   };
 
   return [

package/src/server/state-tree-diff.ts

@@ -55,23 +55,23 @@ export function parseClientStateTree(req: Request): Set<string> | null {
  * @param clientSegments - Set of paths from X-Timber-State-Tree, or null
  */
 export function shouldSkipSegment(
-  urlPath: string,
-  layoutComponent: ((...args: unknown[]) => unknown) | undefined,
-  isLeaf: boolean,
-  clientSegments: Set<string> | null
+  _urlPath: string,
+  _layoutComponent: ((...args: unknown[]) => unknown) | undefined,
+  _isLeaf: boolean,
+  _clientSegments: Set<string> | null
 ): boolean {
-  // No state tree → full render (initial load, refresh, etc.)
-  if (!clientSegments) return false;
-
-  // Leaf segments (pages) are never skipped
-  if (isLeaf) return false;
-
-  // No layout → nothing to skip
-  if (!layoutComponent) return false;
-
-  // Async layouts always re-render (they may depend on request context)
-  if (layoutComponent.constructor?.name === 'AsyncFunction') return false;
-
-  // Skip if the client already has this segment cached
-  return clientSegments.has(urlPath);
+  // DISABLED: Client-side segment merging via React element tree walking
+  // is too fragile for production. The merger's replaceInnerSegment relies
+  // on walking RSC-decoded element trees to find SegmentProvider boundaries,
+  // but production trees contain structures the walker can't handle:
+  // Suspense wrappers, error boundaries, AccessGate components, React lazy
+  // refs, and client component module references.
+  //
+  // The merger infrastructure (segment-merger.ts, element cache, state tree
+  // filtering) is in place and tested. Re-enable when the merger can handle
+  // real RSC element trees — likely requires a SegmentOutlet client component
+  // approach instead of post-hoc element tree walking.
+  //
+  // See design/19-client-navigation.md §"X-Timber-State-Tree Header"
+  return false;
 }