@decocms/tanstack 7.20.2 → 7.20.4

package/package.json

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

package/src/vite/plugin.js

@@ -376,27 +376,52 @@ export function decoVitePlugin() {
       server.watcher.on("change", (file) => handleBlocksDirEvent(file, false));
       server.watcher.on("unlink", (file) => handleBlocksDirEvent(file, true));
 
-      // Cold-start bootstrap: always regenerate `blocks.gen.json` from source
-      // on dev startup. We deliberately do NOT gate this on mtime. A fresh git
-      // checkout/clone (e.g. Studio's preview sandbox) rewrites every file's
-      // mtime to the checkout time, so the committed artifact can be CONTENT-
-      // stale yet mtime-"fresh" — the old `source.mtime > artifact.mtime` gate
-      // then skipped regen and served the stale snapshot (the double-render
-      // bug in branch previews). Regen is cheap (tens of ms for a typical
-      // decofile) and fire-and-forget, so it never blocks startup. No POST
-      // /.decofile here — the SSR runtime isn't listening yet, and `setup.ts`
-      // reads the freshly-written .json via the load() hook on the first
-      // request (the watch-driven path above handles live edits, with reload).
+      // Cold-start bootstrap of `blocks.gen.json`, in two modes:
+      //
+      // MISSING (fresh clone): blocks.gen.json is gitignored, so a first
+      //   checkout has no file on disk. The async refresh below is
+      //   fire-and-forget and races the first request — `setup.ts` reads the
+      //   .json sibling via the blocks.gen.ts load() hook, and a miss falls
+      //   back to the empty stub, rendering a blank page until regen lands and
+      //   triggers a reload. So when the snapshot is ABSENT we generate it
+      //   SYNCHRONOUSLY, blocking startup until the very first request can see
+      //   real content. This only fires on a fresh clone, never steady-state.
+      //
+      // PRESENT (steady state): refresh asynchronously and DELIBERATELY NOT
+      //   gated on mtime. A fresh git checkout rewrites every file's mtime to
+      //   the checkout time, so a committed artifact could be CONTENT-stale yet
+      //   mtime-"fresh" — the old `source.mtime > artifact.mtime` gate then
+      //   served the stale snapshot (the double-render bug in branch previews).
+      //   Regen is cheap (tens of ms) and fire-and-forget, so it never blocks
+      //   startup. No POST /.decofile here — the SSR runtime isn't listening
+      //   yet; `setup.ts` reads the freshly-written .json on the first request
+      //   (the watch-driven path above handles live edits, with reload).
       if (existsSync(blocksDir)) {
-        ensureMerged()
-          .then(({ result }) => {
-            if (result && !result.empty) {
-              console.log(`[deco] bootstrapped ${result.count} blocks from .deco/blocks`);
-            }
-          })
-          .catch((err) => {
-            console.warn("[deco] blocks bootstrap failed:", err?.message ?? err);
-          });
+        if (!existsSync(jsonFile)) {
+          console.log("[deco] blocks.gen.json missing — generating on cold start…");
+          try {
+            const scriptPath = path.resolve(
+              cwd,
+              "node_modules/@decocms/blocks-cli/scripts/generate-blocks.ts",
+            );
+            execFileSync("npx", ["tsx", scriptPath], { cwd, stdio: "inherit" });
+          } catch (err) {
+            console.warn(
+              "[deco] blocks.gen.json cold-start generation failed:",
+              err?.message ?? err,
+            );
+          }
+        } else {
+          ensureMerged()
+            .then(({ result }) => {
+              if (result && !result.empty) {
+                console.log(`[deco] bootstrapped ${result.count} blocks from .deco/blocks`);
+              }
+            })
+            .catch((err) => {
+              console.warn("[deco] blocks bootstrap failed:", err?.message ?? err);
+            });
+        }
       }
 
       // --- meta.gen.json auto-regeneration ---
@@ -456,6 +481,38 @@ export function decoVitePlugin() {
         }, 500);
       };
 
+      // Cold-start bootstrap: generate meta.gen.json if it's absent. Unlike the
+      // decofile, meta.gen.json is normally COMMITTED (it merges cleanly), so
+      // this is a safety net — it fires only when the file is genuinely missing
+      // (a site that opts to gitignore it, a partial checkout, a manual delete).
+      // It matters because setup.ts imports meta.gen.json EAGERLY via
+      // createAdminSetup, so a missing file would reject the import on the first
+      // request.
+      //
+      // Unlike the blocks bootstrap above, this is (a) gated on absence and
+      // (b) SYNCHRONOUS: a full ts-morph schema pass takes seconds, so we only
+      // pay it when the file is genuinely missing, and we must finish before the
+      // server accepts a request. Once the file exists on disk (any subsequent
+      // start), this is skipped and the watch-driven regen below keeps it fresh.
+      if (!existsSync(schemaOutFile)) {
+        console.log("[deco] meta.gen.json missing — generating on cold start…");
+        try {
+          const scriptPath = path.resolve(
+            cwd,
+            "node_modules/@decocms/blocks-cli/scripts/generate-schema.ts",
+          );
+          execFileSync("npx", ["tsx", scriptPath, "--site", schemaSiteName], {
+            cwd,
+            stdio: "inherit",
+          });
+        } catch (err) {
+          console.warn(
+            "[deco] meta.gen.json cold-start generation failed:",
+            err?.message ?? err,
+          );
+        }
+      }
+
       const isSchemaSource = (file) => {
         const rel = path.relative(cwd, file);
         return (