@decocms/blocks-cli 7.5.0 → 7.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/blocks-cli",
-  "version": "7.5.0",
+  "version": "7.5.2",
   "type": "module",
   "description": "Deco codegen (generate-blocks, generate-schema, generate-invoke) and Fresh-to-TanStack migration tooling",
   "repository": {
@@ -34,9 +34,9 @@
     "lint:unused": "knip"
   },
   "dependencies": {
-    "@decocms/blocks": "7.5.0",
+    "@decocms/blocks": "7.5.2",
     "ts-morph": "^27.0.0",
-    "tsx": "^4.19.0"
+    "tsx": "^4.22.5"
   },
   "devDependencies": {
     "knip": "^5.86.0",

package/scripts/generate-invoke.ts

@@ -21,6 +21,16 @@
  * compiled and shipped as part of the site's application code, so it lives
  * in `src/` alongside the code it's compiled with, not in `.deco/`.
  *
+ * This is empirically load-bearing, not taste (tested 2026-07-08 on a real
+ * site): with the file moved to `.deco/invoke.gen.ts`, the CLIENT half of
+ * the Start compiler works fine (stubs generated, IDs re-derived from the
+ * new path), but the SERVER half cannot resolve the split module back to an
+ * executable handler — every `/_serverFn/...` call returns an unhandled 500
+ * with no logged stack, i.e. every cart/session/MasterData action dies.
+ * Same site, file back under `src/`: identical RPC probe returns 200 with a
+ * real VTEX orderForm. Do not move this default without re-running that
+ * round-trip test end to end.
+ *
  * Usage (from site root):
  *   npx tsx node_modules/@decocms/blocks-cli/scripts/generate-invoke.ts
  *

package/scripts/generate-schema.test.ts

@@ -97,7 +97,7 @@ describe("typeToJsonSchema with an unresolvable widget alias import", () => {
       type: "string",
       format: "color",
     });
-  });
+  }, 30_000);
 });
 
 // ---------------------------------------------------------------------------
@@ -160,7 +160,7 @@ describe("generate-schema default output path (.deco/)", () => {
     expect(fs.existsSync(newDefault)).toBe(true);
     const meta = JSON.parse(fs.readFileSync(newDefault, "utf-8"));
     expect(meta.manifest.blocks.sections).toHaveProperty("site/sections/Hero.tsx");
-  });
+  }, 30_000);
 
   it("warns once to stderr naming both paths when the OLD default file exists and no --out is passed, but still writes the NEW default", () => {
     const oldDefaultDir = path.join(tmpDir, "src", "server", "admin");
@@ -176,7 +176,7 @@ describe("generate-schema default output path (.deco/)", () => {
 
     const newDefault = path.join(tmpDir, ".deco", "meta.gen.json");
     expect(fs.existsSync(newDefault)).toBe(true);
-  });
+  }, 30_000);
 
   it("does not warn when an explicit --out is passed, even if the OLD default file exists", () => {
     const oldDefaultDir = path.join(tmpDir, "src", "server", "admin");
@@ -189,5 +189,5 @@ describe("generate-schema default output path (.deco/)", () => {
 
     expect(stderr).not.toContain("Generator default output moved");
     expect(fs.existsSync(explicitOut)).toBe(true);
-  });
+  }, 30_000);
 });

package/scripts/generate-sections.test.ts

@@ -71,7 +71,7 @@ describe("generate-sections walkDir exclusions", () => {
     expect(generated).not.toContain("Hero.test.tsx");
     expect(generated).not.toContain("Hero.stories.tsx");
     expect(generated).not.toContain("sections.gen.ts");
-  });
+  }, 30_000);
 });
 
 describe("generate-sections default output path (.deco/)", () => {
@@ -101,7 +101,7 @@ describe("generate-sections default output path (.deco/)", () => {
     expect(fs.readFileSync(newDefault, "utf-8")).toContain("site/sections/Hero.tsx");
     // No legacy file present, so no warning is expected.
     expect(stderr).not.toContain("Generator default output moved");
-  });
+  }, 30_000);
 
   it("warns once to stderr naming both paths when the OLD default file exists and no --out-file is passed, but still writes the NEW default", () => {
     const oldDefaultDir = path.join(tmpDir, "src", "server", "cms");
@@ -118,7 +118,7 @@ describe("generate-sections default output path (.deco/)", () => {
     const newDefault = path.join(tmpDir, ".deco", "sections.gen.ts");
     expect(fs.existsSync(newDefault)).toBe(true);
     expect(fs.readFileSync(newDefault, "utf-8")).toContain("site/sections/Hero.tsx");
-  });
+  }, 30_000);
 
   it("does not warn when an explicit --out-file is passed, even if the OLD default file exists", () => {
     const oldDefaultDir = path.join(tmpDir, "src", "server", "cms");
@@ -131,7 +131,7 @@ describe("generate-sections default output path (.deco/)", () => {
 
     expect(stderr).not.toContain("Generator default output moved");
     expect(fs.existsSync(explicitOut)).toBe(true);
-  });
+  }, 30_000);
 });
 
 describe("generate-sections --registry", () => {
@@ -186,7 +186,7 @@ describe("generate-sections --registry", () => {
     expect(generated).toContain(
       `"./sections/Nested/Promo.tsx": () => import("${expectedImportPath(promoPath)}")`,
     );
-  });
+  }, 30_000);
 
   it("does not emit sectionImports without the --registry flag", () => {
     fs.writeFileSync(
@@ -203,7 +203,7 @@ describe("generate-sections --registry", () => {
 
     const generated = fs.readFileSync(outFile, "utf-8");
     expect(generated).not.toContain("sectionImports");
-  });
+  }, 30_000);
 
   it("emits a doc comment that does not self-terminate early, and the resulting file is importable (regression: a literal `**/` inside the emitted /** */ comment used to close it prematurely, leaving prose as bare statements and making every --registry output invalid TypeScript)", () => {
     const heroPath = path.join(sectionsDir, "Hero.tsx");

package/scripts/migrate/analyzers/loader-inventory.ts

@@ -3,7 +3,7 @@ import * as path from "node:path";
 import type { MigrationContext, LoaderInfo, Platform } from "../types";
 import { log } from "../types";
 
-/** Well-known loaders that map directly to @decocms/apps equivalents */
+/** Well-known loaders that map directly to @decocms/apps-* equivalents */
 const APPS_EQUIVALENTS: Record<string, string> = {
   "loaders/availableIcons.ts": "", // deleted
   "loaders/icons.ts": "", // deleted

package/scripts/migrate/phase-analyze.ts

@@ -255,7 +255,7 @@ function decideAction(
   if (SDK_DELETE.has(relPath)) {
     return {
       action: "delete",
-      notes: "Use framework equivalent from @decocms/start or @decocms/apps",
+      notes: "Use framework equivalent from @decocms/blocks or @decocms/apps-vtex",
     };
   }
 
@@ -263,13 +263,13 @@ function decideAction(
   if (COMPONENT_DELETE.has(relPath)) {
     return {
       action: "delete",
-      notes: "Scaffolded fresh from @decocms/apps re-exports",
+      notes: "Scaffolded fresh from @decocms/blocks re-exports",
     };
   }
 
   // cart/ directory → delete
   if (relPath.startsWith("sdk/cart/")) {
-    return { action: "delete", notes: "Use @decocms/apps cart hooks" };
+    return { action: "delete", notes: "Use @decocms/apps-vtex cart hooks" };
   }
 
   // Non-platform cleanup is done in analyze() post-processing (needs ctx.platform)

package/scripts/migrate/phase-cleanup.ts

@@ -971,12 +971,15 @@ function upgradeSectionRenderer(ctx: MigrationContext) {
     let changed = false;
 
     // 1. Replace `import { SectionRenderer } from "@decocms/start/hooks"`
-    //    with `import { RenderSection } from "@decocms/start/hooks"`
+    //    with `import { RenderSection } from "@decocms/blocks/hooks"`
+    //    (RenderSection is a distinct component from tanstack's
+    //    SectionRenderer — it lives in @decocms/blocks/hooks, not
+    //    @decocms/tanstack.)
     const sectionRendererImport =
       /import\s*\{([^}]*)\bSectionRenderer\b([^}]*)\}\s*from\s*["']@decocms\/start\/hooks["']/g;
     const newContent = result.replace(sectionRendererImport, (_m, before, after) => {
       changed = true;
-      return `import {${before}RenderSection${after}} from "@decocms/start/hooks"`;
+      return `import {${before}RenderSection${after}} from "@decocms/blocks/hooks"`;
     });
     if (newContent !== result) {
       result = newContent;
@@ -1000,7 +1003,7 @@ function upgradeSectionRenderer(ctx: MigrationContext) {
 
     // 4. Add RenderSection import if we introduced usages but no import exists
     if (changed && result.includes("<RenderSection") && !result.includes("RenderSection")) {
-      result = `import { RenderSection } from "@decocms/start/hooks";\n` + result;
+      result = `import { RenderSection } from "@decocms/blocks/hooks";\n` + result;
     }
 
     if (!changed) return null;
@@ -1013,16 +1016,18 @@ function upgradeSectionRenderer(ctx: MigrationContext) {
  *
  * Historical context:
  * Earlier versions of this script rewrote `@decocms/apps/vtex/utils/*` imports
- * to local `~/lib/vtex-*` shims because those modules did not exist yet in
- * `@decocms/apps`. They now do (apps-start exports `./vtex/utils/*` and
- * `./vtex/client` directly), so any further rewrite would actively REGRESS
- * working direct imports back into NO-OP shims and silently break runtime
- * behavior on every migrated site.
+ * (the pre-split Fresh/Deno site's original import shape) to local
+ * `~/lib/vtex-*` shims because those modules did not exist yet as
+ * directly-importable subpaths. They now do — the post-7.x split
+ * `@decocms/apps-vtex` package exports `./utils/*` and `./client`
+ * directly — so any further rewrite would actively REGRESS working direct
+ * imports back into NO-OP shims and silently break runtime behavior on
+ * every migrated site.
  *
  * Scope kept here:
  * - `@decocms/apps/vtex/loaders/intelligentSearch/*` → inline stubs
- *   (loaders moved under `inline-loaders/` in apps-start; this is still a
- *    real path-mismatch fixup)
+ *   (loaders moved under `inline-loaders/` in `@decocms/apps-vtex`; this
+ *    is still a real path-mismatch fixup)
  * - `LabelledFuzzy` type + `mapLabelledFuzzyToFuzzy` helper inlined when
  *   `intelligentSearch/productListingPage` is imported
  * - `createHttpClient<Type>(...)` → `createHttpClient(...)` (Proxy handles types)
@@ -1034,12 +1039,13 @@ function upgradeSectionRenderer(ctx: MigrationContext) {
  * What was removed:
  * The four `@decocms/apps/vtex/utils/* → ~/lib/vtex-*` rewrites that the
  * first-pass `transforms/imports.ts` (lines 50-52) already produces in the
- * correct, direct form. See discovery notes in MIGRATION_TOOLING_PLAN.md.
+ * correct, direct `@decocms/apps-vtex/utils/*` form. See discovery notes
+ * in MIGRATION_TOOLING_PLAN.md.
  */
 function rewriteVtexUtilImports(ctx: MigrationContext) {
   // Intentionally empty — see docstring. First-pass `transforms/imports.ts`
   // already maps `apps/vtex/utils/*` and `apps/vtex/client` directly to the
-  // `@decocms/apps` equivalents; rewriting them again here would dead-shim them.
+  // `@decocms/apps-vtex` equivalents; rewriting them again here would dead-shim them.
   const importRewrites: Array<{ pattern: RegExp; replacement: string; desc: string }> = [];
 
   rewriteFilesRecursive(ctx, path.join(ctx.sourceDir, "src"), (content, relPath) => {
@@ -1117,12 +1123,12 @@ function rewriteVtexUtilImports(ctx: MigrationContext) {
       log(ctx, `  Replaced inline getISCookiesFromBag stub → ~/lib/vtex-intelligent-search: src/${relPath}`);
     }
 
-    // Rewrite ~/utils/retry → @decocms/start/sdk/retry
+    // Rewrite ~/utils/retry → @decocms/blocks/sdk/retry
     const retryImport = /from\s+["']~\/utils\/retry["']/g;
     if (retryImport.test(result)) {
-      result = result.replace(retryImport, 'from "@decocms/start/sdk/retry"');
+      result = result.replace(retryImport, 'from "@decocms/blocks/sdk/retry"');
       changed = true;
-      log(ctx, `  Rewrote retry import → @decocms/start/sdk/retry: src/${relPath}`);
+      log(ctx, `  Rewrote retry import → @decocms/blocks/sdk/retry: src/${relPath}`);
     }
 
     // Rewrite type-only imports from productListingPage (Props type)
@@ -1301,7 +1307,7 @@ function moveRootConstantsToSrc(ctx: MigrationContext) {
  * with broken imports.
  *
  * New stack: the canonical Minicart contract + VTEX transform live in
- * `@decocms/apps/vtex/inline-loaders/minicart`. We replace the loader with a
+ * `@decocms/apps-vtex/inline-loaders/minicart`. We replace the loader with a
  * thin VTEX-only re-export. Sites on Shopify/VNDA/Wake/Linx/Nuvemshop are
  * not currently in production on the new stack — when one is, swap this for
  * a runtime dispatcher again or add a platform-flagged rewrite.
@@ -1325,19 +1331,19 @@ function rewriteMinicartLoader(ctx: MigrationContext) {
 //
 // The legacy site shipped per-platform loaders behind a \`usePlatform()\`
 // switch (vnda, wake, linx, shopify, nuvemshop). The canonical minicart
-// contract now lives in \`@decocms/apps\`. Until a non-VTEX customer comes
+// contract now lives in \`@decocms/apps-vtex\`. Until a non-VTEX customer comes
 // online on the new stack, we re-export the framework loader directly.
 // TODO: when adding another platform, replace this with a runtime
 // dispatcher and import the matching framework loader.
-export { default } from "@decocms/apps/vtex/inline-loaders/minicart";
-export type { MinicartProps } from "@decocms/apps/vtex/inline-loaders/minicart";
+export { default } from "@decocms/apps-vtex/inline-loaders/minicart";
+export type { MinicartProps } from "@decocms/apps-vtex/inline-loaders/minicart";
 `;
 
     if (ctx.dryRun) {
       log(ctx, `[DRY] Would rewrite: ${path.relative(ctx.sourceDir, filePath)} (VTEX-only re-export)`);
     } else {
       fs.writeFileSync(filePath, newContent);
-      log(ctx, `Rewrote: ${path.relative(ctx.sourceDir, filePath)} (VTEX-only re-export of @decocms/apps/vtex/inline-loaders/minicart)`);
+      log(ctx, `Rewrote: ${path.relative(ctx.sourceDir, filePath)} (VTEX-only re-export of @decocms/apps-vtex/inline-loaders/minicart)`);
     }
   }
 }
@@ -1422,7 +1428,7 @@ export function cleanup(ctx: MigrationContext): void {
 
   // 5. Override contexts/device.tsx with SSR-safe useSyncExternalStore version.
   // The transform phase copies and transforms the source file (createContext-based),
-  // but @decocms/start shell-renders sections without a Device.Provider, so we
+  // but @decocms/tanstack shell-renders sections without a Device.Provider, so we
   // must replace it with a standalone implementation.
   console.log("  Overriding contexts/device.tsx...");
   overrideDeviceContext(ctx);
@@ -1452,7 +1458,7 @@ export function cleanup(ctx: MigrationContext): void {
 
   // 11. Rewrite VTEX utility imports to use ~/lib/ wrappers
   //    The old stack imports from apps/vtex/utils/* which get rewritten to
-  //    @decocms/apps/vtex/utils/* — but the signatures are incompatible
+  //    @decocms/apps-vtex/utils/* — but the signatures are incompatible
   //    and some types (VTEXCommerceStable) don't exist. Replace with
   //    simplified ~/lib/ wrappers generated during scaffold.
   console.log("  Rewriting VTEX utility imports → ~/lib/ wrappers...");
@@ -1467,7 +1473,7 @@ export function cleanup(ctx: MigrationContext): void {
   // 11b. Rewrite legacy multi-platform minicart loader → VTEX-only re-export.
   //    `sdk/cart/` is deleted by DIRS_TO_DELETE, leaving loaders/minicart.ts
   //    with broken imports. Replace it with a thin re-export of the
-  //    framework's @decocms/apps/vtex/inline-loaders/minicart loader.
+  //    framework's @decocms/apps-vtex/inline-loaders/minicart loader.
   console.log("  Rewriting loaders/minicart.ts → VTEX-only re-export...");
   rewriteMinicartLoader(ctx);
 

package/scripts/migrate/phase-report.ts

@@ -5,11 +5,11 @@ import { logPhase } from "./types";
 
 const FRAMEWORK_FINDINGS = [
   "Session/analytics SDK is boilerplate duplicated across all sites — should be a single framework function",
-  "GTM event system (useGTMEvent, data-gtm-* listeners) is universal pattern — should be in @decocms/start",
+  "GTM event system (useGTMEvent, data-gtm-* listeners) is universal pattern — should be in @decocms/blocks",
   "Route files (__root.tsx, index.tsx, $.tsx, deco/*) are near-identical across sites — should be generated by framework",
   "server.ts, worker-entry.ts, router.tsx are pure boilerplate — should be a single createSite() call",
   "setup.ts section registration via import.meta.glob is 100% boilerplate — framework should handle this",
-  "runtime.ts invoke proxy is identical across sites — already in @decocms/start but sites still have local copies",
+  "runtime.ts invoke proxy is identical across sites — already in @decocms/blocks/sdk/invoke but sites still have local copies",
   "apps/site.ts is mostly empty after migration — platform config should be in a config file, not code",
 ];
 
@@ -124,7 +124,7 @@ export function report(ctx: MigrationContext): void {
     lines.push("## Loader Inventory");
     lines.push("");
     lines.push(`- **${ctx.loaderInventory.length}** loaders inventoried`);
-    lines.push(`- **${mapped}** mapped to \`@decocms/apps\` equivalents`);
+    lines.push(`- **${mapped}** mapped to \`@decocms/apps-*\` equivalents`);
     lines.push(`- **${custom}** custom (included in \`setup/commerce-loaders.ts\`)`);
     lines.push("");
   }
@@ -175,7 +175,7 @@ export function report(ctx: MigrationContext): void {
   lines.push("## Framework Findings");
   lines.push("");
   lines.push(
-    "> These are patterns found during migration that should eventually be handled by `@decocms/start` instead of being duplicated in every site.",
+    "> These are patterns found during migration that should eventually be handled by `@decocms/blocks` instead of being duplicated in every site.",
   );
   lines.push("");
   for (const finding of ctx.frameworkFindings) {
@@ -215,11 +215,11 @@ export function report(ctx: MigrationContext): void {
   lines.push("#");
   lines.push("#    Forwarding to a future ClickHouse-backed OTel collector is on the");
   lines.push("#    roadmap (placeholder lives at");
-  lines.push("#    @decocms/start/sdk/otelAdapters/clickhouseCollector); when it");
+  lines.push("#    @decocms/blocks/sdk/otelAdapters/clickhouseCollector); when it");
   lines.push("#    ships, the codemod gains a `--destination-logs` /");
   lines.push("#    `--destination-traces` flag to point at it.");
-  lines.push("npx -p @decocms/start deco-cf-observability         # dry-run");
-  lines.push("npx -p @decocms/start deco-cf-observability --write # apply");
+  lines.push("npx -p @decocms/blocks-cli deco-cf-observability         # dry-run");
+  lines.push("npx -p @decocms/blocks-cli deco-cf-observability --write # apply");
   lines.push("```");
   lines.push("");
 

package/scripts/migrate/phase-scaffold.ts

@@ -135,7 +135,7 @@ export function scaffold(ctx: MigrationContext): void {
   // some file actually imports. See `writeImportedLibShims` in phase-cleanup.
 
   // Replace Context-based useDevice with SSR-safe useSyncExternalStore version.
-  // @decocms/start shell-renders sections in a separate React root without
+  // @decocms/tanstack shell-renders sections in a separate React root without
   // Device.Provider, so the old createContext pattern throws during SSR.
   writeFile(ctx, "src/contexts/device.tsx", generateDeviceContext());
 
@@ -312,7 +312,7 @@ export default debounce;
 
 function generateSignalShim(): string {
   return `import { useState, useRef, useEffect, useMemo, useCallback } from "react";
-export { signal, type ReactiveSignal } from "@decocms/start/sdk/signal";
+export { signal, type ReactiveSignal } from "@decocms/blocks/sdk/signal";
 
 /** Run a function immediately. Kept for legacy module-level side effects. */
 export function effect(fn: () => void | (() => void)): () => void {
@@ -535,8 +535,8 @@ function generateLocationMatcher(): string {
  * rules server-side.
  */
 
-import { registerMatcher } from "@decocms/start/cms";
-import type { MatcherContext } from "@decocms/start/cms";
+import { registerMatcher } from "@decocms/blocks/cms";
+import type { MatcherContext } from "@decocms/blocks/cms";
 
 const COUNTRY_NAME_TO_CODE: Record<string, string> = {
   Brasil: "BR",

package/scripts/migrate/phase-transform.ts

@@ -155,7 +155,7 @@ export function transform(ctx: MigrationContext): void {
     // This file uses Deno-specific APIs (toFileUrl, import.meta.resolve)
     // and the HTMX-driven `useComponent(component, props)` pattern, which
     // do not run on Cloudflare Workers and have no equivalent in
-    // @decocms/start. The whole file must be deleted.
+    // @decocms/blocks. The whole file must be deleted.
     if (
       /sections\/Component\.tsx?$/.test(record.path) ||
       /sections\/Component\.tsx?$/.test(targetPath)

package/scripts/migrate/phase-verify.ts

@@ -35,7 +35,7 @@ const REQUIRED_FILES = [
   "src/hooks/useUser.ts",
   "src/hooks/useWishlist.ts",
   // src/types/widgets.ts intentionally omitted — provided by the
-  // framework at `@decocms/start/types/widgets`; sites no longer
+  // framework at `@decocms/blocks/types/widgets`; sites no longer
   // shadow the file locally.
   "src/types/deco.ts",
   "src/types/commerce-app.ts",
@@ -173,8 +173,9 @@ export const checks: Check[] = [
       const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
       const deps = { ...pkg.dependencies, ...pkg.devDependencies };
       const required = [
-        "@decocms/start",
-        "@decocms/apps",
+        "@decocms/blocks",
+        "@decocms/tanstack",
+        "@decocms/apps-commerce",
         "react",
         "react-dom",
         "@tanstack/react-start",
@@ -382,7 +383,7 @@ export const checks: Check[] = [
     },
   },
   {
-    name: "No apps/ imports in src/ (should be @decocms/apps or ~/)",
+    name: "No apps/ imports in src/ (should be @decocms/apps-* or ~/)",
     severity: "error",
     fn: (ctx) => {
       const srcDir = path.join(ctx.sourceDir, "src");
@@ -457,7 +458,7 @@ export const checks: Check[] = [
     severity: "warning",
     fn: (ctx) => {
       const typeFiles = [
-        // widgets.ts is provided by @decocms/start/types/widgets, not
+        // widgets.ts is provided by @decocms/blocks/types/widgets, not
         // scaffolded locally.
         "src/types/deco.ts",
         "src/types/commerce-app.ts",