@timber-js/app 0.2.0-alpha.76 → 0.2.0-alpha.78

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

@@ -1 +1 @@
-{"version":3,"file":"shims.d.ts","sourceRoot":"","sources":["../../src/plugins/shims.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAGnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAsE1D;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CA+OvD"}
+{"version":3,"file":"shims.d.ts","sourceRoot":"","sources":["../../src/plugins/shims.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAGnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAsE1D;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CA0OvD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timber-js/app",
-  "version": "0.2.0-alpha.76",
+  "version": "0.2.0-alpha.78",
   "description": "Vite-native React framework built for Servers and Serverless Platforms — correct HTTP semantics, real status codes, pages that work without JavaScript",
   "keywords": [
     "cloudflare-workers",

package/src/plugins/shims.ts

@@ -178,17 +178,10 @@ export function timberShims(_ctx: PluginContext): Plugin {
       }
 
       if (cleanId === '#client-internal') {
-        const envName = (this as unknown as { environment?: { name?: string } }).environment?.name;
-        if (envName === 'client') {
-          // In the client (browser) env, resolve to dist/ so the dep
-          // optimizer (dev) and rolldown (build) can both find it.
-          // Resolving to src/ bypasses the optimizer and creates split
-          // module instances — globalRouter set in one copy reads as
-          // null from the other. dist/ is the published entrypoint and
-          // works in both dev (optimizer deduplicates) and prod build.
-          return resolve(PKG_ROOT, 'dist', 'client', 'internal.js');
-        }
-        // RSC/SSR: resolve to src/ for Vite transform correctness.
+        // Always resolve to src/ — all environments (RSC, SSR, client)
+        // use src/ for framework internals. In the client env, this
+        // ensures browser-entry and @timber-js/app/client share the
+        // same module graph (both resolve to src/).
         return resolve(PKG_ROOT, 'src', 'client', 'internal.ts');
       }
 
@@ -211,11 +204,7 @@ export function timberShims(_ctx: PluginContext): Plugin {
       }
 
       if (cleanId === '@timber-js/app/client/internal') {
-        const envName = (this as unknown as { environment?: { name?: string } }).environment?.name;
-        if (envName === 'client') {
-          // Same as #client-internal above — resolve to dist/.
-          return resolve(PKG_ROOT, 'dist', 'client', 'internal.js');
-        }
+        // Same as #client-internal above — always resolve to src/.
         return resolve(PKG_ROOT, 'src', 'client', 'internal.ts');
       }
 
@@ -230,8 +219,14 @@ export function timberShims(_ctx: PluginContext): Plugin {
 
       if (cleanId === '@timber-js/app/client') {
         const envName = (this as unknown as { environment?: { name?: string } }).environment?.name;
-        // SSR only — RSC needs dist/ for 'use client' boundary detection
-        if (envName === 'ssr') {
+        // RSC: return null — needs dist/ for 'use client' boundary detection.
+        // SSR + Client: resolve to src/ so that browser-entry (which uses
+        // relative imports from src/) and user code (which uses the bare
+        // specifier @timber-js/app/client) share the same module instances.
+        // Without this, state.ts is loaded twice (src/ and dist/) and
+        // setGlobalRouter() writes to one copy while getRouterOrNull()
+        // reads from the other (always null).
+        if (envName === 'ssr' || envName === 'client') {
           return resolve(PKG_ROOT, 'src', 'client', 'index.ts');
         }
         return null;