@timber-js/app 0.1.17 → 0.1.19

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

@@ -1 +1 @@
-{"version":3,"file":"shims.d.ts","sourceRoot":"","sources":["../../src/plugins/shims.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAGnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AA6DhD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAkIvD"}
+{"version":3,"file":"shims.d.ts","sourceRoot":"","sources":["../../src/plugins/shims.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAGnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAiDhD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAoIvD"}

package/dist/shims/link.d.ts

@@ -3,7 +3,10 @@
  *
  * Re-exports timber's Link component so libraries that import next/link
  * get the timber equivalent without modification.
+ *
+ * Imports from @timber-js/app/client (not #/) so the component resolves
+ * to the same module instance as user code in Vite dev.
  */
-export { Link as default, Link } from '#/client/link.js';
-export type { LinkProps } from '#/client/link.js';
+export { Link as default, Link } from '@timber-js/app/client';
+export type { LinkProps } from '@timber-js/app/client';
 //# sourceMappingURL=link.d.ts.map

package/dist/shims/link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../src/shims/link.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AAEH,OAAO,EAAE,IAAI,IAAI,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACzD,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../src/shims/link.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AAEH,OAAO,EAAE,IAAI,IAAI,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC9D,YAAY,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/shims/navigation-client.d.ts

@@ -1,20 +1,21 @@
 /**
  * Shim: next/navigation (client environment only)
  *
- * Re-exports only the client-side hooks from timber's navigation shims.
+ * Re-exports only the client-side hooks from timber's client API.
  * Server-only functions (redirect, notFound, etc.) are excluded to prevent
  * server/primitives.ts from being pulled into the browser bundle.
  *
  * The full shim (navigation.ts) is still used in the RSC and SSR environments
  * where both client hooks and server functions are needed.
  *
+ * Imports use @timber-js/app/client (not #/ subpath imports) so they resolve
+ * to the same module instances as user code in Vite dev — preventing module
+ * duplication where setGlobalRouter() writes to one instance and useRouter()
+ * reads from another.
+ *
  * See design/14-ecosystem.md §"next/navigation" for the full shim audit.
  */
-export { useParams } from '#/client/use-params.js';
-export { usePathname } from '#/client/use-pathname.js';
-export { useSearchParams } from '#/client/use-search-params.js';
-export { useRouter } from '#/client/use-router.js';
-export { useSelectedLayoutSegment, useSelectedLayoutSegments, } from '#/client/use-selected-layout-segment.js';
+export { useParams, usePathname, useSearchParams, useRouter, useSelectedLayoutSegment, useSelectedLayoutSegments, } from '@timber-js/app/client';
 export declare const RedirectType: {
     readonly push: "push";
     readonly replace: "replace";

package/dist/shims/navigation-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"navigation-client.d.ts","sourceRoot":"","sources":["../../src/shims/navigation-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EACL,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,yCAAyC,CAAC;AAIjD,eAAO,MAAM,YAAY;;;CAGf,CAAC;AAKX,wBAAgB,QAAQ,IAAI,KAAK,CAKhC;AAED,wBAAgB,iBAAiB,IAAI,KAAK,CAKzC;AAED,wBAAgB,QAAQ,IAAI,KAAK,CAIhC"}
+{"version":3,"file":"navigation-client.d.ts","sourceRoot":"","sources":["../../src/shims/navigation-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,EACL,SAAS,EACT,WAAW,EACX,eAAe,EACf,SAAS,EACT,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,uBAAuB,CAAC;AAI/B,eAAO,MAAM,YAAY;;;CAGf,CAAC;AAKX,wBAAgB,QAAQ,IAAI,KAAK,CAKhC;AAED,wBAAgB,iBAAiB,IAAI,KAAK,CAKzC;AAED,wBAAgB,QAAQ,IAAI,KAAK,CAIhC"}

package/dist/shims/navigation.d.ts

@@ -1,15 +1,10 @@
 /**
  * Shim: next/navigation → timber navigation primitives
  *
- * Client hooks use #/ source imports (individual files with 'use client' directives
- * that the RSC plugin detects).
- * Server functions use @timber-js/app/server (resolved to dist/ via native exports)
- * for ALS singleton consistency.
+ * Client hooks import from @timber-js/app/client (the public barrel) so they
+ * resolve to the same module instances as user code in Vite dev. Server
+ * functions import from @timber-js/app/server for ALS singleton consistency.
  */
-export { useParams } from '#/client/use-params.js';
-export { usePathname } from '#/client/use-pathname.js';
-export { useSearchParams } from '#/client/use-search-params.js';
-export { useRouter } from '#/client/use-router.js';
-export { useSelectedLayoutSegment, useSelectedLayoutSegments, } from '#/client/use-selected-layout-segment.js';
+export { useParams, usePathname, useSearchParams, useRouter, useSelectedLayoutSegment, useSelectedLayoutSegments, } from '@timber-js/app/client';
 export { redirect, permanentRedirect, notFound, RedirectType } from '@timber-js/app/server';
 //# sourceMappingURL=navigation.d.ts.map

package/dist/shims/navigation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../../src/shims/navigation.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EACL,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,yCAAyC,CAAC;AAGjD,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../../src/shims/navigation.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EACL,SAAS,EACT,WAAW,EACX,eAAe,EACf,SAAS,EACT,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC"}

package/package.json

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

package/src/client/browser-entry.ts

@@ -30,13 +30,25 @@ import {
   setServerCallback,
   encodeReply,
 } from '@vitejs/plugin-rsc/browser';
-import { createRouter } from './router.js';
-import type { RouterDeps, RouterInstance } from './router.js';
+// Shared-state modules MUST be imported from @timber-js/app/client (the public
+// barrel) so they resolve to the same module instances as user code. In Vite dev,
+// user code imports @timber-js/app/client from dist/ via package.json exports.
+// If we used relative imports (./router-ref.js), Vite would load separate src/
+// copies with separate module-level state — e.g., globalRouter set here but
+// read as null from the dist/ copy used by useRouter().
+import {
+  createRouter,
+  setGlobalRouter,
+  getRouter,
+  setCurrentParams,
+} from '@timber-js/app/client';
+import type { RouterDeps, RouterInstance } from '@timber-js/app/client';
+
+// Internal-only modules (no shared mutable state with user code) use relative
+// imports — they don't need singleton behavior across module graphs.
 import { applyHeadElements } from './head.js';
-import { setGlobalRouter, getRouter } from './router-ref.js';
 import { TimberNuqsAdapter } from './nuqs-adapter.js';
 import { isPageUnloading } from './unload-guard.js';
-import { setCurrentParams } from './use-params.js';
 import { ON_NAVIGATE_KEY } from './link-navigate-interceptor.js';
 
 // ─── Server Action Dispatch ──────────────────────────────────────

package/src/client/index.ts

@@ -18,7 +18,7 @@ export type {
 export { useNavigationPending } from './use-navigation-pending';
 export { useLinkStatus, LinkStatusContext } from './use-link-status';
 export type { LinkStatus } from './use-link-status';
-export { getRouter } from './router-ref';
+export { getRouter, setGlobalRouter } from './router-ref';
 export { useRouter } from './use-router';
 export type { AppRouterInstance } from './use-router';
 export { usePathname } from './use-pathname';

package/src/client/router-ref.ts

@@ -1,9 +1,18 @@
 // Global router reference — shared between browser-entry and client hooks.
 // This module has no dependencies on virtual modules, so it can be safely
 // imported by client hooks without pulling in browser-entry's virtual imports.
+//
+// The router is stored as a module-level variable. browser-entry.ts and all
+// shim files import from @timber-js/app/client (the public barrel) rather
+// than relative paths or #/ subpath imports. This ensures all import chains
+// resolve to the same module instance via Vite's dep optimizer, preventing
+// the duplication that previously required a window.__timber_router workaround.
+//
+// See design/18-build-system.md §"Module Singleton Strategy"
 
 import type { RouterInstance } from './router.js';
 
+/** Module-level singleton — set once during bootstrap. */
 let globalRouter: RouterInstance | null = null;
 
 /**
@@ -32,3 +41,12 @@ export function getRouter(): RouterInstance {
 export function getRouterOrNull(): RouterInstance | null {
   return globalRouter;
 }
+
+/**
+ * Reset the global router to null. Used only in tests to isolate
+ * module-level state between test cases.
+ * @internal
+ */
+export function resetGlobalRouter(): void {
+  globalRouter = null;
+}

package/src/client/use-router.ts

@@ -27,16 +27,6 @@ export interface AppRouterInstance {
   prefetch(href: string): void;
 }
 
-/** No-op router returned during SSR or before bootstrap. All methods are safe no-ops. */
-const SSR_NOOP_ROUTER: AppRouterInstance = {
-  push() {},
-  replace() {},
-  refresh() {},
-  back() {},
-  forward() {},
-  prefetch() {},
-};
-
 /**
  * Get a router instance for programmatic navigation.
  *
@@ -47,7 +37,7 @@ const SSR_NOOP_ROUTER: AppRouterInstance = {
  * because during hydration, React synchronously executes component render
  * functions *before* the router is bootstrapped in browser-entry.ts.
  * If we eagerly captured the router during render, components would get
- * the SSR_NOOP_ROUTER and be stuck with silent no-ops forever.
+ * a null reference and be stuck with silent no-ops forever.
  *
  * Returns safe no-ops during SSR or before bootstrap. The `typeof window`
  * check is insufficient because Vite's client SSR environment defines

package/src/plugins/shims.ts

@@ -55,18 +55,6 @@ const SHIM_MAP: Record<string, string> = {
   'next/font/local': '\0@timber/fonts/local',
 };
 
-/**
- * Client-only shim overrides for the browser environment.
- *
- * next/navigation in the client environment resolves to navigation-client.ts
- * which only re-exports client hooks — not server functions like redirect()
- * and deny(). This prevents server/primitives.ts from being pulled into the
- * browser bundle via tree-shaking-resistant imports.
- */
-const CLIENT_SHIM_OVERRIDES: Record<string, string> = {
-  'next/navigation': resolve(SHIMS_DIR, 'navigation-client.ts'),
-};
-
 /**
  * Strip .js extension from an import specifier.
  *
@@ -115,12 +103,14 @@ export function timberShims(_ctx: PluginContext): Plugin {
       const cleanId = stripJsExtension(id);
 
       // Check next/* shim map.
-      // In the client (browser) environment, use client-only shim overrides
-      // to avoid pulling server code (primitives.ts) into the browser bundle.
+      // In the client (browser) environment, next/navigation resolves to
+      // navigation-client.ts which only re-exports client hooks — not server
+      // functions like redirect() and deny(). This prevents server/primitives.ts
+      // from being pulled into the browser bundle.
       if (cleanId in SHIM_MAP) {
         const envName = (this as unknown as { environment?: { name?: string } }).environment?.name;
-        if (envName === 'client' && cleanId in CLIENT_SHIM_OVERRIDES) {
-          return CLIENT_SHIM_OVERRIDES[cleanId];
+        if (envName === 'client' && cleanId === 'next/navigation') {
+          return resolve(SHIMS_DIR, 'navigation-client.ts');
         }
         return SHIM_MAP[cleanId];
       }

package/src/shims/link.ts

@@ -5,7 +5,10 @@
  *
  * Re-exports timber's Link component so libraries that import next/link
  * get the timber equivalent without modification.
+ *
+ * Imports from @timber-js/app/client (not #/) so the component resolves
+ * to the same module instance as user code in Vite dev.
  */
 
-export { Link as default, Link } from '#/client/link.js';
-export type { LinkProps } from '#/client/link.js';
+export { Link as default, Link } from '@timber-js/app/client';
+export type { LinkProps } from '@timber-js/app/client';

package/src/shims/navigation-client.ts

@@ -1,25 +1,30 @@
 /**
  * Shim: next/navigation (client environment only)
  *
- * Re-exports only the client-side hooks from timber's navigation shims.
+ * Re-exports only the client-side hooks from timber's client API.
  * Server-only functions (redirect, notFound, etc.) are excluded to prevent
  * server/primitives.ts from being pulled into the browser bundle.
  *
  * The full shim (navigation.ts) is still used in the RSC and SSR environments
  * where both client hooks and server functions are needed.
  *
+ * Imports use @timber-js/app/client (not #/ subpath imports) so they resolve
+ * to the same module instances as user code in Vite dev — preventing module
+ * duplication where setGlobalRouter() writes to one instance and useRouter()
+ * reads from another.
+ *
  * See design/14-ecosystem.md §"next/navigation" for the full shim audit.
  */
 
-// Hooks (client-side only)
-export { useParams } from '#/client/use-params.js';
-export { usePathname } from '#/client/use-pathname.js';
-export { useSearchParams } from '#/client/use-search-params.js';
-export { useRouter } from '#/client/use-router.js';
+// Hooks — imported from the public barrel for module singleton consistency.
 export {
+  useParams,
+  usePathname,
+  useSearchParams,
+  useRouter,
   useSelectedLayoutSegment,
   useSelectedLayoutSegments,
-} from '#/client/use-selected-layout-segment.js';
+} from '@timber-js/app/client';
 
 // RedirectType enum is safe (no server code dependency) and used by some
 // client-side libraries for type checking.

package/src/shims/navigation.ts

@@ -1,21 +1,20 @@
 /**
  * Shim: next/navigation → timber navigation primitives
  *
- * Client hooks use #/ source imports (individual files with 'use client' directives
- * that the RSC plugin detects).
- * Server functions use @timber-js/app/server (resolved to dist/ via native exports)
- * for ALS singleton consistency.
+ * Client hooks import from @timber-js/app/client (the public barrel) so they
+ * resolve to the same module instances as user code in Vite dev. Server
+ * functions import from @timber-js/app/server for ALS singleton consistency.
  */
 
-// Hooks (client-side — must use source imports for RSC 'use client' detection)
-export { useParams } from '#/client/use-params.js';
-export { usePathname } from '#/client/use-pathname.js';
-export { useSearchParams } from '#/client/use-search-params.js';
-export { useRouter } from '#/client/use-router.js';
+// Hooks (client-side — imported from public barrel for module singleton)
 export {
+  useParams,
+  usePathname,
+  useSearchParams,
+  useRouter,
   useSelectedLayoutSegment,
   useSelectedLayoutSegments,
-} from '#/client/use-selected-layout-segment.js';
+} from '@timber-js/app/client';
 
-// Functions (server-side — resolved to dist/ for ALS singleton consistency)
+// Functions (server-side)
 export { redirect, permanentRedirect, notFound, RedirectType } from '@timber-js/app/server';