@decocms/tanstack 7.4.0 → 7.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/tanstack",
-  "version": "7.4.0",
+  "version": "7.5.1",
   "type": "module",
   "description": "Deco framework binding for TanStack Start + Cloudflare Workers",
   "repository": {
@@ -22,9 +22,9 @@
     "lint:unused": "knip"
   },
   "dependencies": {
-    "@decocms/blocks": "7.4.0",
-    "@decocms/blocks-admin": "7.4.0",
-    "@decocms/blocks-cli": "7.4.0",
+    "@decocms/blocks": "7.5.1",
+    "@decocms/blocks-admin": "7.5.1",
+    "@decocms/blocks-cli": "7.5.1",
     "@deco-cx/warp-node": "^0.3.16",
     "fast-json-patch": "^3.1.0",
     "ws": "^8.18.0"

package/src/vite/plugin.js

@@ -14,7 +14,7 @@
  *   — V8's JSON parser is 2-10x faster than the JS parser for large data.
  *
  * meta.gen handling:
- *   The admin schema bundle (`server/admin/meta.gen.json`) is server-only;
+ *   The admin schema bundle (`.deco/meta.gen.json`) is server-only;
  *   the client receives pre-resolved blocks via the SSR payload. Stubbing
  *   it on the client cuts a typically-large module out of the browser bundle.
  *   Match is done by substring on the import id, so any path style works.
@@ -209,7 +209,7 @@ export function decoVitePlugin() {
       // below) so we don't depend on the consumer's TS loader.
       const cwd = process.cwd();
       const blocksDir = path.resolve(cwd, ".deco/blocks");
-      const outFile = path.resolve(cwd, "src/server/cms/blocks.gen.ts");
+      const outFile = path.resolve(cwd, ".deco/blocks.gen.ts");
       const jsonFile = outFile.replace(/\.ts$/, ".json");
 
       // Lazily load the block generator module (generateBlocks for the cold-start
@@ -224,6 +224,22 @@ export function decoVitePlugin() {
             tsImport("@decocms/blocks-cli/generate-blocks", import.meta.url),
           )
           .then((mod) => {
+            if (typeof mod.generateBlocks !== "function") {
+              // tsx 4.22.0–4.22.4 has a loader-hook state bug (fixed upstream
+              // in 4.22.5, "isolate hook state per async module.register()
+              // registration"): inside a Vite dev-server process, tsImport
+              // resolves correctly but returns an EMPTY module namespace —
+              // no rejection, no missing-module error. blocks-cli floors its
+              // tsx dependency at ^4.22.5, but a site's own lockfile can pin
+              // a broken copy that hoists above it. Fail with an actionable
+              // message instead of the bare "generateBlocks is not a
+              // function" this used to surface as.
+              throw new Error(
+                "tsImport(@decocms/blocks-cli/generate-blocks) returned an empty module namespace. " +
+                  "This is the tsx 4.22.0–4.22.4 loader-hook bug — check `node -e \"console.log(require('tsx/package.json').version)\"` " +
+                  "and upgrade tsx to >=4.22.5 (e.g. `bun update tsx` or pin a newer tsx in devDependencies).",
+              );
+            }
             genModule = mod;
             return mod;
           });
@@ -376,8 +392,10 @@ export function decoVitePlugin() {
       // --- meta.gen.json auto-regeneration ---
       // When section/loader/app source files change (types, JSDoc, Props),
       // re-run generate-schema.ts so meta.gen.json stays in sync during dev.
+      // No --out is passed to the generator below, so it writes to its own
+      // default (.deco/meta.gen.json) — this constant must track that default.
       const schemaWatchDirs = ["src"];
-      const schemaOutFile = path.resolve(cwd, "src/server/admin/meta.gen.json");
+      const schemaOutFile = path.resolve(cwd, ".deco/meta.gen.json");
 
       // Resolve the site name once from vite define or env.
       const definedSite = server.config.define?.["process.env.DECO_SITE_NAME"];