@decocms/start 5.3.0-rc.2 → 5.4.0

package/src/sdk/workerEntry.ts

@@ -49,6 +49,7 @@ import { RequestContext } from "./requestContext";
 import { cleanPathForCacheKey } from "./urlUtils";
 import { type Device, isMobileUA } from "./useDevice";
 import { getAppMiddleware } from "./setupApps";
+import { isDevMode } from "./env";
 
 /**
  * Build-time identifier injected by `decoVitePlugin()` (see
@@ -802,8 +803,9 @@ export function createDecoWorkerEntry(
 
     const geoVariants = body.countries ?? [];
 
-    const cache =
-      typeof caches !== "undefined"
+    const cache = isDevMode()
+      ? null
+      : typeof caches !== "undefined"
         ? ((caches as unknown as { default?: Cache }).default ?? null)
         : null;
 
@@ -1200,8 +1202,9 @@ export function createDecoWorkerEntry(
       request.method === "POST" &&
       (url.pathname.startsWith("/_serverFn/") || url.pathname.startsWith("/_server/"))
     ) {
-      const serverFnCache =
-        typeof caches !== "undefined"
+      const serverFnCache = isDevMode()
+        ? null
+        : typeof caches !== "undefined"
           ? ((caches as unknown as { default?: Cache }).default ?? null)
           : null;
 
@@ -1422,9 +1425,10 @@ export function createDecoWorkerEntry(
       return resp;
     }
 
-    // Check Cache API (may not be available in local dev / miniflare)
-    const cache =
-      typeof caches !== "undefined"
+    // Check Cache API — disabled in local dev to avoid stale responses
+    const cache = isDevMode()
+      ? null
+      : typeof caches !== "undefined"
         ? ((caches as unknown as { default?: Cache }).default ?? null)
         : null;
 

package/src/vite/plugin.js

@@ -32,7 +32,8 @@
  * ```
  */
 import { execFileSync } from "node:child_process";
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
+import path from "node:path";
 
 /**
  * Resolve a per-build identifier for cache-key versioning.
@@ -197,17 +198,135 @@ export function decoVitePlugin() {
     },
 
     configureServer(server) {
-      // When blocks.gen.json changes on disk, invalidate the .ts module
-      // so Vite re-runs our load() hook with the fresh data.
-      server.watcher.on("change", (file) => {
-        if (file.endsWith("blocks.gen.json")) {
-          const tsId = file.replace(/\.json$/, ".ts");
-          const mod = server.environments?.ssr?.moduleGraph?.getModuleById(tsId);
-          if (mod) {
-            server.environments.ssr.moduleGraph.invalidateModule(mod);
+      // Watch `.deco/blocks/**/*.json` and regenerate `blocks.gen.json` when
+      // CMS content changes (manual edit, sync-decofile, daemon PATCH).
+      // After regen, we POST the new blocks to the dev server's own
+      // /.decofile endpoint — this calls setBlocks() inside the workerd SSR
+      // runtime without any module invalidation (which breaks TanStack
+      // Start/Router state).
+      //
+      // Generator is loaded lazily via tsImport (same pattern as the daemon
+      // 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 jsonFile = outFile.replace(/\.ts$/, ".json");
+
+      let generateBlocksFn;
+      const loadGenerator = () => {
+        if (generateBlocksFn) return Promise.resolve(generateBlocksFn);
+        // Same tsImport pattern as the daemon loader below — keeps `tsx`
+        // scoped to this single import instead of registering a global hook.
+        return import("tsx/esm/api")
+          .then(({ tsImport }) =>
+            tsImport("../../scripts/generate-blocks.ts", import.meta.url),
+          )
+          .then((mod) => {
+            generateBlocksFn = mod.generateBlocks;
+            return generateBlocksFn;
+          });
+      };
+
+      let regenTimer = null;
+      let regenInFlight = false;
+      let regenQueued = false;
+      const runRegen = async () => {
+        if (regenInFlight) {
+          regenQueued = true;
+          return;
+        }
+        regenInFlight = true;
+        try {
+          const fn = await loadGenerator();
+          const start = Date.now();
+          const result = await fn({ blocksDir, outFile, silent: true });
+          const ms = Date.now() - start;
+          if (result.empty) {
+            console.warn(`[deco] .deco/blocks not found — emitted empty blocks.gen.json`);
+          } else {
+            console.log(`[deco] regenerated ${result.count} blocks in ${ms}ms`);
+            // POST blocks to the dev server's /.decofile endpoint so
+            // setBlocks() runs inside the workerd SSR runtime. No module
+            // invalidation — that would cascade through the route tree and
+            // break TanStack Start server functions.
+            try {
+              const addr = server.httpServer?.address();
+              const port = typeof addr === "object" && addr ? addr.port : 5173;
+              const blocksJson = readFileSync(jsonFile, "utf-8");
+              const res = await fetch(`http://localhost:${port}/.decofile`, {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                body: blocksJson,
+              });
+              if (res.ok) {
+                server.hot?.send({ type: "full-reload", path: "*" });
+              } else {
+                console.warn(`[deco] blocks reload failed: ${res.status}`);
+              }
+            } catch (reloadErr) {
+              console.warn("[deco] blocks reload request failed:", reloadErr?.message);
+            }
+          }
+        } catch (err) {
+          console.warn("[deco] failed to regenerate blocks:", err?.message ?? err);
+        } finally {
+          regenInFlight = false;
+          if (regenQueued) {
+            regenQueued = false;
+            scheduleRegen();
+          }
+        }
+      };
+      const scheduleRegen = () => {
+        if (regenTimer) clearTimeout(regenTimer);
+        regenTimer = setTimeout(() => {
+          regenTimer = null;
+          runRegen();
+        }, 150);
+      };
+
+      // chokidar (Vite's watcher) needs the directory added explicitly because
+      // `.deco/` lives outside the module graph it walks by default.
+      if (existsSync(blocksDir)) {
+        server.watcher.add(blocksDir);
+      }
+      const handleBlocksDirEvent = (file) => {
+        if (!file.endsWith(".json")) return;
+        if (!file.startsWith(blocksDir + path.sep) && file !== blocksDir) return;
+        scheduleRegen();
+      };
+      server.watcher.on("add", handleBlocksDirEvent);
+      server.watcher.on("change", handleBlocksDirEvent);
+      server.watcher.on("unlink", handleBlocksDirEvent);
+
+      // Cold-start bootstrap: regenerate once if the artifact is missing or
+      // older than the newest source file. Skips work on a clean build where
+      // `npm run build` already produced a current artifact.
+      try {
+        const needsBootstrap = (() => {
+          if (!existsSync(jsonFile)) return existsSync(blocksDir);
+          if (!existsSync(blocksDir)) return false;
+          const artifactMtime = statSync(jsonFile).mtimeMs;
+          for (const entry of readdirSync(blocksDir)) {
+            if (!entry.endsWith(".json")) continue;
+            try {
+              if (statSync(path.join(blocksDir, entry)).mtimeMs > artifactMtime) {
+                return true;
+              }
+            } catch {
+              // skip unreadable entries
+            }
           }
+          return false;
+        })();
+        if (needsBootstrap) {
+          // Fire and forget — the next request that touches blocks.gen.ts
+          // will see the fresh artifact thanks to the change listener above.
+          runRegen();
         }
-      });
+      } catch (err) {
+        console.warn("[deco] blocks bootstrap check failed:", err?.message ?? err);
+      }
 
       // Tunnel + daemon: connect local dev to admin.deco.cx
       // Activated only when both DECO_SITE_NAME and DECO_ENV_NAME are set.