@decocms/blocks-cli 7.20.2 → 7.20.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/blocks-cli",
-  "version": "7.20.2",
+  "version": "7.20.4",
   "type": "module",
   "description": "Deco codegen (generate-blocks, generate-schema, generate-invoke) and Fresh-to-TanStack migration tooling",
   "repository": {
@@ -30,7 +30,7 @@
     "lint:unused": "knip"
   },
   "dependencies": {
-    "@decocms/blocks": "7.20.2",
+    "@decocms/blocks": "7.20.4",
     "ts-morph": "^27.0.0",
     "tsx": "^4.22.5"
   },

package/scripts/migrate/phase-scaffold.ts

@@ -262,6 +262,13 @@ vite.config.timestamp_*
 
 # Deco CMS
 .deco/metadata/*
+# The decofile snapshot only. blocks.gen.json is a single 10MB+ line (merge of
+# .deco/blocks/*.json), so committing it makes every content PR conflict
+# irresolvably; it is regenerated by \`npm run generate\` (build) and on dev
+# cold-start. meta.gen.json (the schema) stays COMMITTED — it merges cleanly and
+# keeps admin/Studio working on a fresh clone without a regen. The small .gen.ts
+# stubs and generate.digests.json also stay committed.
+.deco/blocks.gen.json
 
 # IDE
 .vscode/

package/scripts/migrate/phase-verify.ts

@@ -349,7 +349,16 @@ export const checks: Check[] = [
         return false;
       }
       const content = fs.readFileSync(gitignorePath, "utf-8");
-      const required = [".wrangler/", "node_modules/", ".tanstack/", "src/routeTree.gen.ts"];
+      const required = [
+        ".wrangler/",
+        "node_modules/",
+        ".tanstack/",
+        "src/routeTree.gen.ts",
+        // The decofile snapshot must be ignored — its 10MB+ single line causes
+        // constant PR merge conflicts (see generateGitignore in phase-scaffold).
+        // meta.gen.json stays committed on purpose, so it is NOT required here.
+        ".deco/blocks.gen.json",
+      ];
       const missing = required.filter((r) => !content.includes(r));
       if (missing.length > 0) {
         console.log(`    .gitignore missing entries: ${missing.join(", ")}`);