@timber-js/app 0.2.0-alpha.57 → 0.2.0-alpha.59

package/src/plugins/entries.ts

@@ -15,7 +15,7 @@ import type { Plugin } from 'vite';
 import { resolve, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { existsSync } from 'node:fs';
-import type { PluginContext } from '#/index.js';
+import type { PluginContext } from '../index.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 

package/src/plugins/fonts.ts

@@ -17,19 +17,19 @@
 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 '../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 {
   extractFontConfigAst,
   extractLocalFontConfigAst,
   detectDynamicFontCallAst,
-} from '#/fonts/ast.js';
+} from '../fonts/ast.js';
 
 const VIRTUAL_GOOGLE = '@timber/fonts/google';
 const VIRTUAL_LOCAL = '@timber/fonts/local';

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 '../index.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 '../index.js';
 
 const VIRTUAL_MODULE_ID = 'virtual:timber-route-manifest';
 const RESOLVED_VIRTUAL_ID = `\0${VIRTUAL_MODULE_ID}`;

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/shims.ts

@@ -5,10 +5,13 @@
  * shim implementations. This enables Next.js-compatible libraries
  * (nuqs, next-intl, etc.) to work unmodified.
  *
- * NOTE: This plugin does NOT resolve @timber-js/app/* subpath imports.
- * Those are handled by Vite's native package.json `exports` resolution,
- * which maps them to dist/ files. This ensures a single module instance
- * for shared modules like request-context (ALS singleton).
+ * NOTE: This plugin does NOT remap @timber-js/app/* subpath imports to
+ * src/. All subpath imports resolve to dist/ via Vite's native
+ * package.json `exports` resolution, ensuring a single module instance
+ * for shared code. The only exception is @timber-js/app/server in the
+ * client environment, which returns a virtual stub to prevent server
+ * code in browser bundles. See TIM-568 for why src/ remapping was
+ * removed.
  *
  * Design doc: 18-build-system.md §"Shim Map"
  */
@@ -16,7 +19,7 @@
 import type { Plugin } from 'vite';
 import { resolve, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import type { PluginContext } from '#/index.js';
+import type { PluginContext } from '../index.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 // Detect whether we're running from source (src/plugins/) or dist (dist/).
@@ -88,14 +91,14 @@ export function timberShims(_ctx: PluginContext): Plugin {
      * 3. Check next/* shim map
      * 4. Return null (pass through) for everything else
      *
-     * @timber-js/app/server is resolved to src/ so it shares the same module
-     * instance as framework internals (which import via #/). This ensures
-     * a single requestContextAls and _getRscFallback variable.
+     * All @timber-js/app/* subpath imports resolve to dist/ via package.json
+     * exports in all environments. This ensures a single module instance
+     * for each module — the dist/ chunks share code via rollup's code
+     * splitting. No src/ remapping is needed (see TIM-568).
      *
-     * @timber-js/app/client is resolved to src/ in the SSR environment so
-     * client hooks share the same module instance as ssr-entry.ts internals.
-     * In RSC it resolves to dist/ (via package.json exports) where 'use client'
-     * is preserved on the entry for client boundary detection.
+     * The only exception is @timber-js/app/server in the client (browser)
+     * environment, which returns a virtual stub — server code must never
+     * be bundled into the browser.
      */
     resolveId(id: string) {
       // Poison pill packages — resolve to virtual modules handled by load()
@@ -117,38 +120,15 @@ export function timberShims(_ctx: PluginContext): Plugin {
         return SHIM_MAP[cleanId];
       }
 
-      // @timber-js/app/server → src/ in server environments so user code
-      // shares the same module instance as framework internals (single ALS).
-      // In the client environment, return a virtual empty module — server
-      // code must never be bundled into the browser.
+      // @timber-js/app/server in the client environment → virtual stub.
+      // Server code must never be bundled into the browser.
+      // In server environments (RSC, SSR), let Vite resolve to dist/ via
+      // package.json exports — no src/ remap needed.
       if (cleanId === '@timber-js/app/server') {
         const envName = (this as unknown as { environment?: { name?: string } }).environment?.name;
         if (envName === 'client') {
           return '\0timber:server-empty';
         }
-        return resolve(PKG_ROOT, 'src', 'server', 'index.ts');
-      }
-
-      // @timber-js/app/client → src/ in the SSR environment so client hooks
-      // (useParams, usePathname, etc.) share the same module instance as
-      // ssr-entry.ts's internal imports (via #/client/...).
-      //
-      // Without this remap, @timber-js/app/client resolves to dist/ (via
-      // package.json exports), creating a module instance split: ssr-entry.ts
-      // registers the ALS-backed SSR data provider on the src/ instance of
-      // ssr-data.ts, but client component hooks read getSsrData() from the
-      // dist/ instance — which has no provider. Result: hooks like useSegmentParams()
-      // return empty defaults during SSR.
-      //
-      // This remap is SSR-only. The RSC environment still resolves to dist/
-      // where 'use client' is preserved on the entry (needed for client
-      // boundary detection). The client (browser) environment uses dist/
-      // for bundling.
-      if (cleanId === '@timber-js/app/client') {
-        const envName = (this as unknown as { environment?: { name?: string } }).environment?.name;
-        if (envName === 'ssr') {
-          return resolve(PKG_ROOT, 'src', 'client', 'index.ts');
-        }
       }
 
       return null;

package/src/plugins/static-build.ts

@@ -10,8 +10,8 @@
  */
 
 import type { Plugin } from 'vite';
-import type { PluginContext } from '#/index.js';
-import { detectFileDirective } from '#/utils/directive-parser.js';
+import type { PluginContext } from '../index.js';
+import { detectFileDirective } from '../utils/directive-parser.js';
 
 // ---------------------------------------------------------------------------
 // Types

package/src/routing/scanner.ts

@@ -19,7 +19,7 @@ import type {
   InterceptionMarker,
 } from './types.js';
 import { DEFAULT_PAGE_EXTENSIONS, INTERCEPTION_MARKERS } from './types.js';
-import { classifyMetadataRoute, isDynamicMetadataExtension } from '#/server/metadata-routes.js';
+import { classifyMetadataRoute, isDynamicMetadataExtension } from '../server/metadata-routes.js';
 
 /**
  * Pattern matching encoded path delimiters that must be rejected during route discovery.

package/src/routing/status-file-lint.ts

@@ -15,7 +15,7 @@
 
 import { readFileSync } from 'node:fs';
 import type { RouteTree, SegmentNode } from './types.js';
-import { detectFileDirective } from '#/utils/directive-parser.js';
+import { detectFileDirective } from '../utils/directive-parser.js';
 
 /** Extensions that require 'use client' (component files, not MDX/JSON). */
 const CLIENT_REQUIRED_EXTENSIONS = new Set(['tsx', 'jsx', 'ts', 'js']);

package/src/search-params/define.ts

@@ -10,9 +10,9 @@
  * Design doc: design/23-search-params.md §"defineSearchParams — The Factory"
  */
 
-import { useQueryStates as clientUseQueryStates } from '#/client/use-query-states.js';
+import { useQueryStates as clientUseQueryStates } from '../client/use-query-states.js';
 import { fromSchema } from './codecs.js';
-import type { Codec } from '#/codec.js';
+import type { Codec } from '../codec.js';
 
 // Server-only reference for .load() — avoids pulling server ALS into client bundles.
 // In client environments, .load() throws before reaching this code path.

package/src/search-params/index.ts

@@ -1,7 +1,7 @@
 // @timber-js/app/search-params — Typed search params
 
 // Shared codec protocol
-export type { Codec } from '#/codec.js';
+export type { Codec } from '../codec.js';
 
 // Core types and factory
 export type {

package/src/server/action-client.ts

@@ -183,7 +183,7 @@ async function runActionMiddleware<TCtx>(
 
 // Re-export parseFormData for use throughout the framework
 import { parseFormData } from './form-data.js';
-import { formatSize } from '#/utils/format.js';
+import { formatSize } from '../utils/format.js';
 import { isDebug, isDevMode } from './debug.js';
 
 /**

package/src/server/action-handler.ts

@@ -18,7 +18,7 @@ import {
   decodeReply,
   decodeAction,
   renderToReadableStream,
-} from '#/rsc-runtime/rsc.js';
+} from '../rsc-runtime/rsc.js';
 
 import { validateCsrf, type CsrfConfig } from './csrf.js';
 import { executeAction, type RevalidateRenderer } from './actions.js';

package/src/server/actions.ts

@@ -14,7 +14,7 @@
  * See design/08-forms-and-actions.md
  */
 
-import type { CacheHandler } from '#/cache/index';
+import type { CacheHandler } from '../cache/index';
 import { RedirectSignal } from './primitives';
 import { withSpan } from './tracing';
 import { revalidationAls, type RevalidationState } from './als-registry.js';

package/src/server/als-registry.ts

@@ -21,6 +21,7 @@
  */
 
 import { AsyncLocalStorage } from 'node:async_hooks';
+import type { DebugComponentEntry } from './rsc-entry/helpers.js';
 
 // ─── Request Context ──────────────────────────────────────────────────────
 // Used by: request-context.ts (headers(), cookies(), searchParams())
@@ -64,6 +65,12 @@ export interface RequestContextStore {
   flushed: boolean;
   /** Whether the current context allows cookie mutation. */
   mutableContext: boolean;
+  /**
+   * Dev-only: getter for the current request's RSC debug components.
+   * Set by renderRoute() so onPipelineError can include component tree
+   * context for render-phase errors without module-level shared state.
+   */
+  debugComponentsGetter?: () => DebugComponentEntry[];
 }
 
 /** A single outgoing cookie entry in the cookie jar. */

package/src/server/deny-renderer.ts

@@ -16,7 +16,7 @@
  */
 
 import { createElement } from 'react';
-import { renderToReadableStream } from '#/rsc-runtime/rsc.js';
+import { renderToReadableStream } from '../rsc-runtime/rsc.js';
 
 import { DenySignal } from './primitives.js';
 import { logRenderError } from './logger.js';
@@ -29,6 +29,7 @@ import type { NavContext } from './ssr-entry.js';
 import { flightInitScript } from './flight-scripts.js';
 import type { ClientBootstrapConfig } from './html-injectors.js';
 import type { Metadata } from './types.js';
+import { teeWithErrorPropagation } from './stream-utils.js';
 
 /** RSC content type for client navigation payload requests. */
 const RSC_CONTENT_TYPE = 'text/x-component';
@@ -171,7 +172,7 @@ export async function renderDenyPage(
     debugChannel: createDebugChannelSink(),
   });
 
-  const [ssrStream, inlineStream] = rscStream.tee();
+  const [ssrStream, inlineStream] = teeWithErrorPropagation(rscStream);
 
   const navContext: NavContext = {
     pathname: new URL(req.url).pathname,

package/src/server/error-boundary-wrapper.ts

@@ -5,7 +5,7 @@
  * See design/10-error-handling.md.
  */
 
-import { TimberErrorBoundary } from '#/client/error-boundary.js';
+import { TimberErrorBoundary } from '../client/error-boundary.js';
 import type { ManifestSegmentNode } from './route-matcher.js';
 
 /** MDX/markdown extensions — server components that cannot be passed as function props. */

package/src/server/fallback-error.ts

@@ -10,11 +10,11 @@
  * exposed to the client (design/13-security.md principle 4).
  */
 
-import type { RouteMatch } from '#/server/pipeline.js';
-import type { ManifestSegmentNode } from '#/server/route-matcher.js';
-import type { ClientBootstrapConfig } from '#/server/html-injectors.js';
-import type { LayoutEntry } from '#/server/deny-renderer.js';
-import type { GlobalErrorFile } from '#/server/rsc-entry/error-renderer.js';
+import type { RouteMatch } from './pipeline.js';
+import type { ManifestSegmentNode } from './route-matcher.js';
+import type { ClientBootstrapConfig } from './html-injectors.js';
+import type { LayoutEntry } from './deny-renderer.js';
+import type { GlobalErrorFile } from './rsc-entry/error-renderer.js';
 
 /**
  * Render a fallback error page when the render pipeline throws.
@@ -35,7 +35,7 @@ export async function renderFallbackError(
     return renderDevErrorPage(error);
   }
   // Lazy import to avoid loading error-renderer in the pipeline module
-  const { renderErrorPage } = await import('#/server/rsc-entry/error-renderer.js');
+  const { renderErrorPage } = await import('./rsc-entry/error-renderer.js');
   const segments = [rootSegment];
   const layoutComponents: LayoutEntry[] = [];
   if (rootSegment.layout) {

package/src/server/pipeline-interception.ts

@@ -26,7 +26,7 @@ export interface InterceptionMatchResult {
 export function findInterceptionMatch(
   targetPathname: string,
   sourceUrl: string,
-  rewrites: import('#/routing/interception.js').InterceptionRewrite[]
+  rewrites: import('../routing/interception.js').InterceptionRewrite[]
 ): InterceptionMatchResult | null {
   for (const rewrite of rewrites) {
     // Check if the source URL starts with the intercepting prefix

package/src/server/pipeline.ts

@@ -48,7 +48,7 @@ import { checkVersionSkew, applyReloadHeaders } from './version-skew.js';
 import { serveStaticMetadataFile, serializeSitemap } from './pipeline-metadata.js';
 import { findInterceptionMatch } from './pipeline-interception.js';
 import type { MiddlewareContext } from './types.js';
-import type { SegmentNode } from '#/routing/types.js';
+import type { SegmentNode } from '../routing/types.js';
 
 // ─── Route Match Result ────────────────────────────────────────────────────
 
@@ -118,7 +118,7 @@ export interface PipelineConfig {
    * Generated at build time from intercepting route directories.
    * See design/07-routing.md §"Intercepting Routes"
    */
-  interceptionRewrites?: import('#/routing/interception.js').InterceptionRewrite[];
+  interceptionRewrites?: import('../routing/interception.js').InterceptionRewrite[];
   /**
    * Control Server-Timing header output.
    *

package/src/server/primitives.ts

@@ -7,7 +7,7 @@ import type { JsonSerializable } from './types.js';
 import { getWaitUntil as _getWaitUntil } from './waituntil-bridge.js';
 import { isDebug } from './debug.js';
 import { getRequestSearchString } from './request-context.js';
-import { mergePreservedSearchParams } from '#/shared/merge-search-params.js';
+import { mergePreservedSearchParams } from '../shared/merge-search-params.js';
 
 // ─── Dev-mode validation ────────────────────────────────────────────────────
 

package/src/server/request-context.ts

@@ -12,7 +12,8 @@
 
 import { requestContextAls, type RequestContextStore, type CookieEntry } from './als-registry.js';
 import { isDebug } from './debug.js';
-import { _setRawSearchParamsFn } from '#/search-params/define.js';
+import { _setRawSearchParamsFn } from '../search-params/define.js';
+import { _setRawSegmentParamsFn } from '../params/define.js';
 
 // Re-export the ALS for framework-internal consumers that need direct access.
 export { requestContextAls };
@@ -185,6 +186,11 @@ export function rawSearchParams(): Promise<URLSearchParams> {
 // breaking rawSearchParams() in parallel slot pages. See TIM-523.
 _setRawSearchParamsFn(rawSearchParams);
 
+// Eagerly register rawSegmentParams with the params module so
+// segmentParams.load() can call it synchronously without a dynamic import.
+// Same pattern as search params — dynamic imports lose ALS context. See TIM-523.
+_setRawSegmentParamsFn(rawSegmentParams);
+
 /**
  * Returns a Promise resolving to the current request's coerced segment params.
  *

package/src/server/route-element-builder.ts

@@ -27,7 +27,7 @@ import { METADATA_ROUTE_CONVENTIONS, getMetadataRouteAutoLink } from './metadata
 import { DenySignal, RedirectSignal } from './primitives.js';
 import { AccessGate } from './access-gate.js';
 import { resolveSlotElement } from './slot-resolver.js';
-import { SegmentProvider } from '#/client/segment-context.js';
+import { SegmentProvider } from '../client/segment-context.js';
 
 import { wrapSegmentWithErrorBoundaries } from './error-boundary-wrapper.js';
 import type { InterceptionContext } from './pipeline.js';

package/src/server/rsc-entry/api-handler.ts

@@ -6,13 +6,13 @@
  * See design/04-authorization.md §"Auth in API Routes".
  */
 
-import { withSpan, setSpanAttribute } from '#/server/tracing.js';
-import type { ManifestSegmentNode } from '#/server/route-matcher.js';
-import type { RouteMatch } from '#/server/pipeline.js';
-import { DenySignal, RedirectSignal } from '#/server/primitives.js';
-import { handleRouteRequest } from '#/server/route-handler.js';
-import type { RouteModule } from '#/server/route-handler.js';
-import type { RouteContext } from '#/server/types.js';
+import { withSpan, setSpanAttribute } from '../tracing.js';
+import type { ManifestSegmentNode } from '../route-matcher.js';
+import type { RouteMatch } from '../pipeline.js';
+import { DenySignal, RedirectSignal } from '../primitives.js';
+import { handleRouteRequest } from '../route-handler.js';
+import type { RouteModule } from '../route-handler.js';
+import type { RouteContext } from '../types.js';
 
 export async function handleApiRoute(
   req: Request,
@@ -90,7 +90,7 @@ async function renderApiDeny(
   segments: ManifestSegmentNode[],
   responseHeaders: Headers
 ): Promise<Response> {
-  const { resolveManifestStatusFile } = await import('#/server/manifest-status-resolver.js');
+  const { resolveManifestStatusFile } = await import('../manifest-status-resolver.js');
 
   const resolution = resolveManifestStatusFile(deny.status, segments, 'json');
   if (resolution) {