@decocms/blocks-cli 7.11.2 → 7.12.1

package/scripts/migrate/templates/package-json.test.ts

@@ -0,0 +1,43 @@
+import { describe, expect, it } from "vitest";
+import type { MigrationContext } from "../types";
+import { generatePackageJson } from "./package-json";
+
+const ctx = {
+  siteName: "acme-store",
+  platform: "vtex",
+  importMap: {},
+  discoveredNpmDeps: {},
+} as unknown as MigrationContext;
+
+describe("generatePackageJson — generate scripts", () => {
+  // generatePackageJson does one `npm view` lookup for the framework version
+  // (falls back silently when offline), hence the generous timeout.
+  it("emits ONE unified generate command instead of the 5-script chain", () => {
+    const pkg = JSON.parse(generatePackageJson(ctx));
+
+    expect(pkg.scripts.generate).toBe(
+      "tsx node_modules/@decocms/blocks-cli/scripts/generate.ts --site acme-store " +
+        "--exclude vtex/loaders,vtex/actions,loaders/vtex-auth-loader," +
+        "loaders/reviews/productReviews,loaders/product/buyTogether," +
+        "loaders/search/productListPageCollection,loaders/search/intelligenseSearch," +
+        "loaders/Layouts/ProductCard",
+    );
+
+    // The old hand-chained per-generator scripts must be gone — the
+    // orchestrator owns selection/ordering now. (The individual scripts are
+    // still shipped and runnable by path; sites just don't scaffold them.)
+    for (const legacy of [
+      "generate:blocks",
+      "generate:schema",
+      "generate:invoke",
+      "generate:sections",
+      "generate:loaders",
+    ]) {
+      expect(pkg.scripts[legacy], `${legacy} should not be scaffolded`).toBeUndefined();
+    }
+
+    // tsr is TanStack's generator, not ours — it stays a separate script.
+    expect(pkg.scripts["generate:routes"]).toBe("tsr generate");
+    expect(pkg.scripts.build).toBe("npm run generate && tsr generate && vite build");
+  }, 30_000);
+});

package/scripts/migrate/templates/package-json.ts

@@ -124,17 +124,16 @@ export function generatePackageJson(ctx: MigrationContext): string {
       dev: "vite dev",
       "dev:clean":
         "rm -rf node_modules/.vite .wrangler/state .tanstack && vite dev",
-      "generate:blocks":
-        "tsx node_modules/@decocms/blocks-cli/scripts/generate-blocks.ts",
+      // ONE incremental orchestrator instead of the old 5-script chain
+      // (generate-blocks/sections/loaders/schema/invoke). It runs the same
+      // generators — concurrently, skipping the ones whose inputs didn't
+      // change — and the individual scripts stay available under
+      // node_modules/@decocms/blocks-cli/scripts/ for one-off runs. Sites
+      // chain their own extra tools (tsr, graphql-codegen, tailwind) around
+      // this command themselves.
+      generate: `tsx node_modules/@decocms/blocks-cli/scripts/generate.ts --site ${ctx.siteName} --exclude vtex/loaders,vtex/actions,loaders/vtex-auth-loader,loaders/reviews/productReviews,loaders/product/buyTogether,loaders/search/productListPageCollection,loaders/search/intelligenseSearch,loaders/Layouts/ProductCard`,
       "generate:routes": "tsr generate",
-      "generate:schema": `tsx node_modules/@decocms/blocks-cli/scripts/generate-schema.ts --site ${ctx.siteName}`,
-      "generate:invoke":
-        "tsx node_modules/@decocms/blocks-cli/scripts/generate-invoke.ts",
-      "generate:sections":
-        "tsx node_modules/@decocms/blocks-cli/scripts/generate-sections.ts",
-      "generate:loaders": `tsx node_modules/@decocms/blocks-cli/scripts/generate-loaders.ts --exclude vtex/loaders,vtex/actions,loaders/vtex-auth-loader,loaders/reviews/productReviews,loaders/product/buyTogether,loaders/search/productListPageCollection,loaders/search/intelligenseSearch,loaders/Layouts/ProductCard`,
-      build:
-        "npm run generate:blocks && npm run generate:sections && npm run generate:loaders && npm run generate:schema && npm run generate:invoke && tsr generate && vite build",
+      build: "npm run generate && tsr generate && vite build",
       preview: "vite preview",
       // Deploy is owned by Cloudflare Workers Builds (D6.3); the
       // repo<->worker connection is configured per-worker in the CF