@timber-js/app 0.1.26 → 0.1.28

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;AAqGhD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CA2FxD"}
+{"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;AAqGhD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CA+DxD"}

package/dist/plugins/server-bundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-bundle.d.ts","sourceRoot":"","sources":["../../src/plugins/server-bundle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC,wBAAgB,kBAAkB,IAAI,MAAM,EAAE,CA0G7C"}
+{"version":3,"file":"server-bundle.d.ts","sourceRoot":"","sources":["../../src/plugins/server-bundle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC,wBAAgB,kBAAkB,IAAI,MAAM,EAAE,CAyH7C"}

package/package.json

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

package/src/plugins/entries.ts

@@ -177,39 +177,11 @@ export function timberEntries(ctx: PluginContext): Plugin {
      * in the client output. This is confusing since those chunks contain client
      * components, not server code. Renaming clarifies their purpose.
      */
-    generateBundle(_options, bundle) {
-      if ((this as any).environment?.name !== 'client') return;
-
-      for (const [fileName, chunk] of Object.entries(bundle)) {
-        if (chunk.type !== 'chunk') continue;
-        if (!chunk.name?.startsWith('rsc-entry')) continue;
-
-        const newFileName = fileName.replace('rsc-entry', 'rsc-client-entry');
-        // Extract just the basename for matching code references like "./rsc-entry-XYZ.js"
-        const oldBase = fileName.split('/').pop()!;
-        const newBase = newFileName.split('/').pop()!;
-
-        chunk.fileName = newFileName;
-        chunk.name = chunk.name.replace('rsc-entry', 'rsc-client-entry');
-        bundle[newFileName] = chunk;
-        delete bundle[fileName];
-
-        // Update import references in other chunks
-        for (const other of Object.values(bundle)) {
-          if (other.type !== 'chunk') continue;
-          if (other.code.includes(oldBase)) {
-            other.code = other.code.replaceAll(oldBase, newBase);
-          }
-          if (other.imports) {
-            other.imports = other.imports.map((i) => (i === fileName ? newFileName : i));
-          }
-          if (other.dynamicImports) {
-            other.dynamicImports = other.dynamicImports.map((i) =>
-              i === fileName ? newFileName : i
-            );
-          }
-        }
-      }
-    },
+    // Note: chunk renaming (rsc-entry → rsc-client-entry) was previously done
+    // in generateBundle by mutating the bundle object. Rolldown does not support
+    // bundle mutation in generateBundle — assignments are silently ignored, which
+    // causes the renamed file to never be emitted while code references are
+    // updated, breaking client hydration. The rename is purely cosmetic and has
+    // been removed. The chunks keep their original "rsc-entry" names.
   };
 }

package/src/plugins/server-bundle.ts

@@ -95,10 +95,20 @@ export function timberServerBundle(): Plugin[] {
   // the variable assignment of the init function — so the module's React
   // imports, context creation, etc. never execute.
   //
-  // The fix: patch the `__esmMin` runtime definition to eagerly execute
-  // the init callback while still returning the lazy wrapper. This makes
-  // all ESM module inits run at load time (standard ESM behavior) instead
-  // of lazily, which is functionally correct and avoids the dropped-init bug.
+  // The fix: patch `__esmMin` to eagerly *attempt* each init, but fall
+  // back to lazy retry on failure. This handles two failure modes:
+  //
+  // 1. Forward references (e.g. Zod v4): `init_iso` calls `init_schemas`
+  //    which hasn't been defined yet. Eager execution fails, but when the
+  //    function is called lazily later, all dependencies are available.
+  //
+  // 2. Optional peer dep shims (e.g. @emotion/is-prop-valid for
+  //    framer-motion): Vite generates shims that throw for missing
+  //    optional deps. The throw is deferred to lazy execution where
+  //    the consuming package's try/catch handles it.
+  //
+  // The key: on failure, `fn` is NOT cleared, so the next call retries.
+  // On success, `fn` is set to 0 so subsequent calls are no-ops.
   const esmInitFixPlugin: Plugin = {
     name: 'timber-esm-init-fix',
     applyToEnvironment(environment) {
@@ -108,11 +118,16 @@ export function timberServerBundle(): Plugin[] {
       const lazy = 'var __esmMin = (fn, res) => () => (fn && (res = fn(fn = 0)), res);';
       if (!code.includes(lazy)) return null;
 
-      // Replace with eager-then-lazy: execute init immediately, then
-      // return the lazy wrapper for any subsequent calls (which are
-      // idempotent since fn is set to 0 after first execution).
-      const eager =
-        'var __esmMin = (fn, res) => { var l = () => (fn && (res = fn(fn = 0)), res); l(); return l; };';
+      // Eager-with-retry: attempt init immediately. On success, mark done
+      // (fn = 0). On failure, leave fn intact so the lazy wrapper retries
+      // on next call — by then forward dependencies are initialized.
+      const eager = [
+        'var __esmMin = (fn, res) => {',
+        '  var l = () => { if (fn) { var f = fn; try { res = f(); fn = 0; } catch(e) {} } return res; };',
+        '  l();',
+        '  return l;',
+        '};',
+      ].join(' ');
 
       return { code: code.replace(lazy, eager), map: null };
     },