@timber-js/app 0.1.10 → 0.1.11

package/src/server/request-context.ts

@@ -53,7 +53,6 @@ export const requestContextAls = new AsyncLocalStorage<RequestContextStore>();
 // the ALS context persists for the entire request lifecycle including
 // async stream consumption by React's renderToReadableStream.
 
-
 // ─── Cookie Signing Secrets ──────────────────────────────────────────────
 
 /**

package/src/server/route-matcher.ts

@@ -10,10 +10,7 @@
 
 import type { RouteMatch } from './pipeline.js';
 import type { MiddlewareFn } from './middleware-runner.js';
-import {
-  METADATA_ROUTE_CONVENTIONS,
-  type MetadataRouteType,
-} from './metadata-routes.js';
+import { METADATA_ROUTE_CONVENTIONS, type MetadataRouteType } from './metadata-routes.js';
 
 // ─── Manifest Types ───────────────────────────────────────────────────────
 // The virtual module manifest has a slightly different shape than SegmentNode:

package/src/server/rsc-entry/index.ts

@@ -24,49 +24,49 @@ import buildManifest from 'virtual:timber-build-manifest';
 
 import { renderToReadableStream } from '@vitejs/plugin-rsc/rsc';
 
-import React, { createElement } from 'react';
-import { createPipeline } from '#/server/pipeline.js';
-import { initDevTracing } from '#/server/tracing.js';
-import type { PipelineConfig, RouteMatch, InterceptionContext } from '#/server/pipeline.js';
-import { logRenderError } from '#/server/logger.js';
-import { resolveLogMode } from '#/server/dev-logger.js';
-import { createRouteMatcher, createMetadataRouteMatcher } from '#/server/route-matcher.js';
-import type { ManifestSegmentNode } from '#/server/route-matcher.js';
-import { DenySignal, RedirectSignal, RenderError, SsrStreamError } from '#/server/primitives.js';
-import { buildClientScripts } from '#/server/html-injectors.js';
-import type { ClientBootstrapConfig } from '#/server/html-injectors.js';
-import { renderDenyPage, renderDenyPageAsRsc } from '#/server/deny-renderer.js';
-import type { LayoutEntry } from '#/server/deny-renderer.js';
+import type { FormRerender } from '#/server/action-handler.js';
+import { handleActionRequest, isActionRequest } from '#/server/action-handler.js';
+import type { BodyLimitsConfig } from '#/server/body-limits.js';
+import type { BuildManifest } from '#/server/build-manifest.js';
 import {
-  collectRouteCss,
-  collectRouteFonts,
-  collectRouteModulepreloads,
   buildCssLinkTags,
   buildFontPreloadTags,
   buildModulepreloadTags,
+  collectRouteCss,
+  collectRouteFonts,
+  collectRouteModulepreloads,
 } from '#/server/build-manifest.js';
-import type { BuildManifest } from '#/server/build-manifest.js';
-import { collectEarlyHintHeaders } from '#/server/early-hints.js';
+import type { LayoutEntry } from '#/server/deny-renderer.js';
+import { renderDenyPage, renderDenyPageAsRsc } from '#/server/deny-renderer.js';
+import { resolveLogMode } from '#/server/dev-logger.js';
 import { sendEarlyHints103 } from '#/server/early-hints-sender.js';
-import type { NavContext } from '#/server/ssr-entry.js';
-import { buildRouteElement, RouteSignalWithContext } from '#/server/route-element-builder.js';
-import { isActionRequest, handleActionRequest } from '#/server/action-handler.js';
-import type { FormRerender } from '#/server/action-handler.js';
-import type { BodyLimitsConfig } from '#/server/body-limits.js';
+import { collectEarlyHintHeaders } from '#/server/early-hints.js';
 import { runWithFormFlash } from '#/server/form-flash.js';
+import type { ClientBootstrapConfig } from '#/server/html-injectors.js';
+import { buildClientScripts } from '#/server/html-injectors.js';
+import { logRenderError } from '#/server/logger.js';
+import type { InterceptionContext, PipelineConfig, RouteMatch } from '#/server/pipeline.js';
+import { createPipeline } from '#/server/pipeline.js';
+import { DenySignal, RedirectSignal, RenderError, SsrStreamError } from '#/server/primitives.js';
+import { buildRouteElement, RouteSignalWithContext } from '#/server/route-element-builder.js';
+import type { ManifestSegmentNode } from '#/server/route-matcher.js';
+import { createMetadataRouteMatcher, createRouteMatcher } from '#/server/route-matcher.js';
+import type { NavContext } from '#/server/ssr-entry.js';
+import { initDevTracing } from '#/server/tracing.js';
 
+import { renderFallbackError as renderFallback } from '#/server/fallback-error.js';
+import { handleApiRoute } from './api-handler.js';
+import { renderErrorPage, renderNoMatchPage } from './error-renderer.js';
 import {
-  createDebugChannelSink,
-  buildSegmentInfo,
-  isRscPayloadRequest,
   buildRedirectResponse,
+  buildSegmentInfo,
+  createDebugChannelSink,
   escapeHtml,
   isAbortError,
+  isRscPayloadRequest,
   parseCookiesFromHeader,
   RSC_CONTENT_TYPE,
 } from './helpers.js';
-import { handleApiRoute } from './api-handler.js';
-import { renderErrorPage, renderNoMatchPage } from './error-renderer.js';
 import { callSsr } from './ssr-bridge.js';
 
 // Dev-only pipeline error handler, set by the dev server after import.
@@ -183,6 +183,8 @@ async function createRequestHandler(manifest: typeof routeManifest, runtimeConfi
           if (_devPipelineErrorHandler) _devPipelineErrorHandler(error, phase);
         }
       : undefined,
+    renderFallbackError: (error, req, responseHeaders) =>
+      renderFallback(error, req, responseHeaders, isDev, manifest.root, clientBootstrap),
   };
 
   const pipeline = createPipeline(pipelineConfig);
@@ -409,6 +411,30 @@ async function renderRoute(
               status: error.status,
             });
           }
+          // Dev diagnostic: detect "Invalid hook call" errors which indicate
+          // a 'use client' component is being executed during RSC rendering
+          // instead of being serialized as a client reference. This happens when
+          // the RSC plugin's transform doesn't detect the directive — e.g., the
+          // directive isn't at the very top of the file, or the component is
+          // re-exported through a barrel file without 'use client'.
+          // See LOCAL-297.
+          if (
+            process.env.NODE_ENV !== 'production' &&
+            error instanceof Error &&
+            error.message.includes('Invalid hook call')
+          ) {
+            console.error(
+              '[timber] A React hook was called during RSC rendering. This usually means a ' +
+                "'use client' component is being executed as a server component instead of " +
+                'being serialized as a client reference.\n\n' +
+                'Common causes:\n' +
+                "  1. The 'use client' directive is not the FIRST statement in the file (before any imports)\n" +
+                "  2. The component is re-exported through a barrel file (index.ts) that lacks 'use client'\n" +
+                '  3. @vitejs/plugin-rsc is not loaded or is misconfigured\n\n' +
+                `Request: ${_req.method} ${new URL(_req.url).pathname}`
+            );
+          }
+
           // Track unhandled errors for pre-flush handling (500 status)
           if (!renderError) {
             renderError = { error, status: 500 };
@@ -640,15 +666,28 @@ async function renderRoute(
     if (sig) return buildRedirectResponse(_req, sig, responseHeaders);
     if (denySignal) {
       return renderDenyPage(
-        denySignal, segments, layoutComponents as LayoutEntry[],
-        _req, match, responseHeaders, clientBootstrap, createDebugChannelSink, callSsr
+        denySignal,
+        segments,
+        layoutComponents as LayoutEntry[],
+        _req,
+        match,
+        responseHeaders,
+        clientBootstrap,
+        createDebugChannelSink,
+        callSsr
       );
     }
     const err = renderError as { error: unknown; status: number } | null;
     if (err) {
       return renderErrorPage(
-        err.error, err.status, segments, layoutComponents as LayoutEntry[],
-        _req, match, responseHeaders, clientBootstrap
+        err.error,
+        err.status,
+        segments,
+        layoutComponents as LayoutEntry[],
+        _req,
+        match,
+        responseHeaders,
+        clientBootstrap
       );
     }
     return null;
@@ -688,15 +727,28 @@ async function renderRoute(
       if (denySignal) {
         // Render deny page without layouts — pass empty layout list
         return renderDenyPage(
-          denySignal, segments, [] as LayoutEntry[],
-          _req, match, responseHeaders, clientBootstrap, createDebugChannelSink, callSsr
+          denySignal,
+          segments,
+          [] as LayoutEntry[],
+          _req,
+          match,
+          responseHeaders,
+          clientBootstrap,
+          createDebugChannelSink,
+          callSsr
         );
       }
       const err = renderError as { error: unknown; status: number } | null;
       if (err) {
         return renderErrorPage(
-          err.error, err.status, segments, [] as LayoutEntry[],
-          _req, match, responseHeaders, clientBootstrap
+          err.error,
+          err.status,
+          segments,
+          [] as LayoutEntry[],
+          _req,
+          match,
+          responseHeaders,
+          clientBootstrap
         );
       }
       // No captured signal — return bare 500

package/src/server/slot-resolver.ts

@@ -16,12 +16,13 @@
  * See design/02-rendering-pipeline.md §"Parallel Slots"
  */
 
-import type { ManifestSegmentNode } from './route-matcher.js';
-import type { RouteMatch, InterceptionContext } from './pipeline.js';
-import { SlotAccessGate } from './access-gate.js';
-import { wrapSegmentWithErrorBoundaries } from './error-boundary-wrapper.js';
 import { TimberErrorBoundary } from '#/client/error-boundary.js';
 import SlotErrorFallback from '#/client/slot-error-fallback.js';
+import { SlotAccessGate } from './access-gate.js';
+import { wrapSegmentWithErrorBoundaries } from './error-boundary-wrapper.js';
+import type { InterceptionContext, RouteMatch } from './pipeline.js';
+import { DenySignal } from './primitives.js';
+import type { ManifestSegmentNode } from './route-matcher.js';
 
 type CreateElementFn = (...args: unknown[]) => React.ReactElement;
 
@@ -56,7 +57,39 @@ export async function resolveSlotElement(
     const mod = (await slotMatch.page.load()) as Record<string, unknown>;
     if (mod.default) {
       const SlotPage = mod.default as (...args: unknown[]) => unknown;
-      let element: React.ReactElement = h(SlotPage, {
+
+      // Load default.tsx fallback for notFound() handling in the slot page.
+      // When a slot page calls notFound() or deny(), it should gracefully
+      // degrade to default.tsx or null — not crash the page. This matches
+      // Next.js behavior. See design/02-rendering-pipeline.md
+      // §"Slot Access Failure = Graceful Degradation"
+      let denyFallback: React.ReactElement | null = null;
+      if (slotNode.default) {
+        const defaultMod = (await slotNode.default.load()) as Record<string, unknown>;
+        const DefaultComp = defaultMod.default as ((...args: unknown[]) => unknown) | undefined;
+        if (DefaultComp) {
+          denyFallback = h(DefaultComp, { params: paramsPromise, searchParams: {} });
+        }
+      }
+
+      // Wrap the slot page to catch DenySignal (from notFound() or deny())
+      // at the component level. This prevents the signal from reaching the
+      // RSC onError callback and being tracked as a page-level denial, which
+      // would cause the pipeline to replace the entire successful SSR response
+      // with a deny page. Instead, the slot gracefully degrades.
+      const denyFallbackCapture = denyFallback;
+      const SafeSlotPage = async (props: Record<string, unknown>) => {
+        try {
+          return await (SlotPage as (props: Record<string, unknown>) => unknown)(props);
+        } catch (error) {
+          if (error instanceof DenySignal) {
+            return denyFallbackCapture;
+          }
+          throw error;
+        }
+      };
+
+      let element: React.ReactElement = h(SafeSlotPage, {
         params: paramsPromise,
         searchParams: {},
       });

package/src/server/ssr-entry.ts

@@ -156,7 +156,10 @@ export async function handleSsr(
         // Wrap in SsrStreamError so the RSC entry can handle it without
         // re-executing server components via renderDenyPage.
         // See LOCAL-293.
-        console.error('[timber] SSR shell failed from RSC stream error:', formatSsrError(renderError));
+        console.error(
+          '[timber] SSR shell failed from RSC stream error:',
+          formatSsrError(renderError)
+        );
         throw new SsrStreamError(
           'SSR renderToReadableStream failed due to RSC stream error',
           renderError

package/src/server/tree-builder.ts

@@ -79,7 +79,10 @@ export interface AccessGateProps {
    * - 'pass': render children
    * - DenySignal/RedirectSignal: throw synchronously
    */
-  verdict?: 'pass' | import('./primitives.js').DenySignal | import('./primitives.js').RedirectSignal;
+  verdict?:
+    | 'pass'
+    | import('./primitives.js').DenySignal
+    | import('./primitives.js').RedirectSignal;
   children: ReactElement;
 }
 

package/src/shims/server-only-noop.js

@@ -1,3 +1,4 @@
+// oxlint-disable
 // No-op shim for server-only/client-only packages.
 // In dev mode, Vite externalizes node_modules and loads them via Node's
 // require(). Deps like `bright` that import `server-only` would hit the

package/dist/_chunks/registry-BfPM41ri.js

@@ -1,20 +0,0 @@
-//#region src/search-params/registry.ts
-var registry = /* @__PURE__ */ new Map();
-/**
-* Register a route's search params definition.
-* Called by the generated route manifest loader when a route's modules load.
-*/
-function registerSearchParams(route, definition) {
-	registry.set(route, definition);
-}
-/**
-* Look up a route's search params definition.
-* Returns undefined if the route hasn't been loaded yet.
-*/
-function getSearchParams(route) {
-	return registry.get(route);
-}
-//#endregion
-export { registerSearchParams as n, getSearchParams as t };
-
-//# sourceMappingURL=registry-BfPM41ri.js.map

package/dist/_chunks/registry-BfPM41ri.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"registry-BfPM41ri.js","names":[],"sources":["../../src/search-params/registry.ts"],"sourcesContent":["/**\n * Runtime registry for route-scoped search params definitions.\n *\n * When a route's modules load, the framework registers its search-params\n * definition here. useQueryStates('/route') resolves codecs from this map.\n *\n * Design doc: design/23-search-params.md §\"Runtime: Registration at Route Load\"\n */\n\nimport type { SearchParamsDefinition } from './create.js';\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst registry = new Map<string, SearchParamsDefinition<any>>();\n\n/**\n * Register a route's search params definition.\n * Called by the generated route manifest loader when a route's modules load.\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport function registerSearchParams(route: string, definition: SearchParamsDefinition<any>): void {\n  registry.set(route, definition);\n}\n\n/**\n * Look up a route's search params definition.\n * Returns undefined if the route hasn't been loaded yet.\n */\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport function getSearchParams(route: string): SearchParamsDefinition<any> | undefined {\n  return registry.get(route);\n}\n"],"mappings":";AAYA,IAAM,2BAAW,IAAI,KAA0C;;;;;AAO/D,SAAgB,qBAAqB,OAAe,YAA+C;AACjG,UAAS,IAAI,OAAO,WAAW;;;;;;AAQjC,SAAgB,gBAAgB,OAAwD;AACtF,QAAO,SAAS,IAAI,MAAM"}