@decocms/blocks-cli 7.5.1 → 7.5.2

package/scripts/migrate/templates/commerce-loaders.ts

@@ -37,15 +37,15 @@ export function generateCommerceLoaders(ctx: MigrationContext): string {
   lines.push(` */`);
 
   if (ctx.platform === "vtex") {
-    lines.push(`import { getVtexConfig } from "@decocms/apps/vtex";`);
-    lines.push(`import { createVtexCommerceLoaders, createCachedPDPLoader } from "@decocms/apps/vtex/commerceLoaders";`);
+    lines.push(`import { getVtexConfig } from "@decocms/apps-vtex";`);
+    lines.push(`import { createVtexCommerceLoaders, createCachedPDPLoader } from "@decocms/apps-vtex/commerceLoaders";`);
     if (hasAutocomplete) {
-      lines.push(`import { autocompleteSearch } from "@decocms/apps/vtex/loaders/autocomplete";`);
+      lines.push(`import { autocompleteSearch } from "@decocms/apps-vtex/loaders/autocomplete";`);
     }
-    lines.push(`import { getAddressByPostalCode } from "@decocms/apps/vtex/loaders/address";`);
-    lines.push(`import { createAddressFromRequest, updateAddressFromRequest, deleteAddressFromRequest } from "@decocms/apps/vtex/actions/address";`);
-    lines.push(`import { updateProfileFromRequest, newsletterProfileFromRequest, deletePaymentFromRequest, getPasswordLastUpdate } from "@decocms/apps/vtex/actions/profile";`);
-    lines.push(`import { createCachedLoader } from "@decocms/start/sdk/cachedLoader";`);
+    lines.push(`import { getAddressByPostalCode } from "@decocms/apps-vtex/loaders/address";`);
+    lines.push(`import { createAddressFromRequest, updateAddressFromRequest, deleteAddressFromRequest } from "@decocms/apps-vtex/actions/address";`);
+    lines.push(`import { updateProfileFromRequest, newsletterProfileFromRequest, deletePaymentFromRequest, getPasswordLastUpdate } from "@decocms/apps-vtex/actions/profile";`);
+    lines.push(`import { createCachedLoader } from "@decocms/blocks/sdk/cachedLoader";`);
 
     if (hasVtexAuth) {
       lines.push(`import vtexAuthLoader from "../loaders/vtex-auth-loader";`);
@@ -92,7 +92,7 @@ export function generateCommerceLoaders(ctx: MigrationContext): string {
 
     // Autocomplete aliases
     if (hasAutocomplete) {
-      lines.push(`  // Autocomplete search — from @decocms/apps`);
+      lines.push(`  // Autocomplete search — from @decocms/apps-vtex`);
       lines.push(`  "site/loaders/search/intelligenseSearch.ts": cachedAutocomplete,`);
       lines.push(`  "site/loaders/search/intelligenseSearch": cachedAutocomplete,`);
       lines.push(``);
@@ -109,7 +109,7 @@ export function generateCommerceLoaders(ctx: MigrationContext): string {
     }
 
     // VTEX address CRUD
-    lines.push(`  // VTEX address CRUD — request-aware wrappers from @decocms/apps`);
+    lines.push(`  // VTEX address CRUD — request-aware wrappers from @decocms/apps-vtex`);
     lines.push(`  "vtex/actions/address/createAddress": createAddressFromRequest as any,`);
     lines.push(`  "vtex/actions/address/updateAddress": updateAddressFromRequest as any,`);
     lines.push(`  "vtex/actions/address/deleteAddress": deleteAddressFromRequest as any,`);
@@ -215,7 +215,7 @@ export function generateCommerceLoaders(ctx: MigrationContext): string {
 
     lines.push(``);
     // Profile actions
-    lines.push(`  // Profile actions — request-aware wrappers from @decocms/apps`);
+    lines.push(`  // Profile actions — request-aware wrappers from @decocms/apps-vtex`);
     lines.push(`  "vtex/actions/profile/updateProfile": updateProfileFromRequest as any,`);
     lines.push(`  "vtex/actions/profile/updateProfile.ts": updateProfileFromRequest as any,`);
     lines.push(`  "vtex/actions/profile/newsletterProfile": newsletterProfileFromRequest as any,`);

package/scripts/migrate/templates/cursor-rules.test.ts

@@ -43,6 +43,12 @@ describe("generateMigrationPolicyPointerRule", () => {
 		expect(body.length).toBeLessThan(3000);
 	});
 
+	it("does not emit the pre-split @decocms/start or @decocms/apps package names", () => {
+		expect(body).not.toContain("@decocms/start");
+		expect(body).not.toContain("@decocms/apps\`");
+		expect(body).toContain("@decocms/blocks-cli");
+	});
+
 	it("is deterministic — same site name, same output", () => {
 		const a = generateMigrationPolicyPointerRule("foo");
 		const b = generateMigrationPolicyPointerRule("foo");

package/scripts/migrate/templates/cursor-rules.ts

@@ -26,10 +26,11 @@ alwaysApply: true
 
 # Migration Tooling Policy — Pointer
 
-> This site (\`${siteName}\`) was generated by the \`@decocms/start\`
-> migration script. The canonical policy that governs how the migration
-> tooling, framework (\`@decocms/start\`), and commerce layer
-> (\`@decocms/apps\`) evolve lives **upstream**, not in this repo.
+> This site (\`${siteName}\`) was generated by the \`@decocms/blocks-cli\`
+> migration script (\`deco-migrate\`). The canonical policy that governs how
+> the migration tooling, framework (\`@decocms/blocks\` + \`@decocms/tanstack\`),
+> and commerce layer (\`@decocms/apps-*\`) evolve lives **upstream**, not in
+> this repo.
 
 ## Where to read
 
@@ -38,24 +39,24 @@ alwaysApply: true
 - **Plan (living tracker, decisions + waves):**
   https://github.com/decocms/deco-start/blob/main/MIGRATION_TOOLING_PLAN.md
 - **Migration skill (phase playbook):**
-  \`@decocms/start/.agents/skills/deco-to-tanstack-migration\`
+  https://github.com/decocms/deco-start/blob/main/.agents/skills/deco-to-tanstack-migration/SKILL.md
 
 ## What you need to know in this site
 
 | ID | Decision | What it means here |
 |----|----------|--------------------|
-| **D1** | Force convergence — no fork runtime support | Site customisations live in \`src/apps/local/\` or open a PR to \`@decocms/apps\`. Don't wrap framework/commerce code in soft adapters. |
+| **D1** | Force convergence — no fork runtime support | Site customisations live in \`src/apps/local/\` or open a PR to \`@decocms/apps-*\`. Don't wrap framework/commerce code in soft adapters. |
 | **D2** | Rewrite HTMX on migration | If you find HTMX residue, rewrite to React. Don't bring back \`hx-*\` runtime. |
-| **D3** | Generated stubs throw at runtime | If a \`~/lib/vtex-*\` import comes from a stub that returns \`null\` / \`{}\` / identity-cast, replace it. \`npx -p @decocms/start deco-post-cleanup --fix\` does the safe swaps automatically. |
-| **D4** | Site-local apps by default, promote at 3+ sites | Don't try to upstream a pattern that has only shipped here. Build it twice in different sites first, then PR it to \`@decocms/apps\`. |
+| **D3** | Generated stubs throw at runtime | If a \`~/lib/vtex-*\` import comes from a stub that returns \`null\` / \`{}\` / identity-cast, replace it. \`npx -p @decocms/blocks-cli deco-post-cleanup --fix\` does the safe swaps automatically. |
+| **D4** | Site-local apps by default, promote at 3+ sites | Don't try to upstream a pattern that has only shipped here. Build it twice in different sites first, then PR it to \`@decocms/apps-*\`. |
 | **D5** | Failed migrations: \`rm -rf\` and re-run | No restart-mode magic. If the migration goes sideways, blow away the working tree and run again. |
 
 ## How to find issues this rule wants you to fix
 
 \`\`\`bash
-npx -p @decocms/start deco-post-cleanup           # audit only
-npx -p @decocms/start deco-post-cleanup --fix     # auto-fix the safe rules
-npx -p @decocms/start deco-post-cleanup --strict  # exit 1 on any finding (CI)
+npx -p @decocms/blocks-cli deco-post-cleanup           # audit only
+npx -p @decocms/blocks-cli deco-post-cleanup --fix     # auto-fix the safe rules
+npx -p @decocms/blocks-cli deco-post-cleanup --strict  # exit 1 on any finding (CI)
 \`\`\`
 
 ## Process

package/scripts/migrate/templates/hooks.test.ts

@@ -44,12 +44,12 @@ describe("generateHooks (vtex)", () => {
 		const code = files["src/hooks/useCart.ts"];
 		// Imports from the framework factory.
 		expect(code).toContain(
-			'import { createUseCart } from "@decocms/apps/vtex/hooks/createUseCart"',
+			'import { createUseCart } from "@decocms/apps-vtex/hooks/createUseCart"',
 		);
 		expect(code).toContain('import { invoke } from "~/server/invoke"');
-		// Re-exports types from @decocms/apps directly.
+		// Re-exports types from @decocms/apps-vtex directly.
 		expect(code).toContain(
-			'export type { OrderForm, OrderFormItem } from "@decocms/apps/vtex/types"',
+			'export type { OrderForm, OrderFormItem } from "@decocms/apps-vtex/types"',
 		);
 		// Calls the factory with invoke and destructures the public API.
 		expect(code).toContain(
@@ -70,11 +70,11 @@ describe("generateHooks (vtex)", () => {
 	it("useUser is the createUseUser factory shim (no signal-stub boilerplate)", () => {
 		const code = files["src/hooks/useUser.ts"];
 		expect(code).toContain(
-			'import { createUseUser } from "@decocms/apps/vtex/hooks/createUseUser"',
+			'import { createUseUser } from "@decocms/apps-vtex/hooks/createUseUser"',
 		);
 		expect(code).toContain('import { invoke } from "~/server/invoke"');
 		expect(code).toContain(
-			'export type { Person } from "@decocms/apps/vtex/loaders/user"',
+			'export type { Person } from "@decocms/apps-vtex/loaders/user"',
 		);
 		expect(code).toContain("export const { useUser, resetUser } = createUseUser");
 		// Must NOT scaffold the legacy signal stub.
@@ -85,11 +85,11 @@ describe("generateHooks (vtex)", () => {
 	it("useWishlist is the createUseWishlist factory shim", () => {
 		const code = files["src/hooks/useWishlist.ts"];
 		expect(code).toContain(
-			'import { createUseWishlist } from "@decocms/apps/vtex/hooks/createUseWishlist"',
+			'import { createUseWishlist } from "@decocms/apps-vtex/hooks/createUseWishlist"',
 		);
 		expect(code).toContain('import { invoke } from "~/server/invoke"');
 		expect(code).toContain(
-			'export type { WishlistItem } from "@decocms/apps/vtex/loaders/wishlist"',
+			'export type { WishlistItem } from "@decocms/apps-vtex/loaders/wishlist"',
 		);
 		expect(code).toContain(
 			"export const { useWishlist, resetWishlist } = createUseWishlist",

package/scripts/migrate/templates/hooks.ts

@@ -19,11 +19,11 @@ export function generateHooks(ctx: MigrationContext): Record<string, string> {
 function generateVtexUseCart(): string {
   // The legacy invoke-based useCart hook is now a 5-line factory call —
   // the heavy lifting (singleton state, listener pattern, async actions,
-  // analytics helpers) lives in @decocms/apps/vtex/hooks/createUseCart.
-  return `import { createUseCart } from "@decocms/apps/vtex/hooks/createUseCart";
+  // analytics helpers) lives in @decocms/apps-vtex/hooks/createUseCart.
+  return `import { createUseCart } from "@decocms/apps-vtex/hooks/createUseCart";
 import { invoke } from "~/server/invoke";
 
-export type { OrderForm, OrderFormItem } from "@decocms/apps/vtex/types";
+export type { OrderForm, OrderFormItem } from "@decocms/apps-vtex/types";
 
 export const { useCart, resetCart, itemToAnalyticsItem } = createUseCart({
   invoke,
@@ -70,22 +70,22 @@ export default useCart;
 // VTEX path — these are five-line factory shims. The heavy lifting
 // (singleton state, listener pattern, async actions, signal-shaped
 // accessors, legacy arg-swap conventions) lives in
-// @decocms/apps/vtex/hooks/createUseUser and createUseWishlist.
+// @decocms/apps-vtex/hooks/createUseUser and createUseWishlist.
 function generateVtexUseUser(): string {
-  return `import { createUseUser } from "@decocms/apps/vtex/hooks/createUseUser";
+  return `import { createUseUser } from "@decocms/apps-vtex/hooks/createUseUser";
 import { invoke } from "~/server/invoke";
 
-export type { Person } from "@decocms/apps/vtex/loaders/user";
+export type { Person } from "@decocms/apps-vtex/loaders/user";
 
 export const { useUser, resetUser } = createUseUser({ invoke });
 `;
 }
 
 function generateVtexUseWishlist(): string {
-  return `import { createUseWishlist } from "@decocms/apps/vtex/hooks/createUseWishlist";
+  return `import { createUseWishlist } from "@decocms/apps-vtex/hooks/createUseWishlist";
 import { invoke } from "~/server/invoke";
 
-export type { WishlistItem } from "@decocms/apps/vtex/loaders/wishlist";
+export type { WishlistItem } from "@decocms/apps-vtex/loaders/wishlist";
 
 export const { useWishlist, resetWishlist } = createUseWishlist({ invoke });
 `;
@@ -98,7 +98,7 @@ function generateGenericUseUser(): string {
   return `/**
  * User Hook — wire to invoke.site.loaders for your platform's user API.
  *
- * VTEX sites get a real factory from @decocms/apps/vtex/hooks/createUseUser;
+ * VTEX sites get a real factory from @decocms/apps-vtex/hooks/createUseUser;
  * see migration template hooks.ts for the canonical five-line shim.
  */
 import { signal } from "~/sdk/signal";
@@ -125,7 +125,7 @@ function generateGenericUseWishlist(): string {
   return `/**
  * Wishlist Hook — wire to invoke.site.loaders/actions for your platform.
  *
- * VTEX sites get a real factory from @decocms/apps/vtex/hooks/createUseWishlist;
+ * VTEX sites get a real factory from @decocms/apps-vtex/hooks/createUseWishlist;
  * see migration template hooks.ts for the canonical five-line shim.
  */
 import { signal } from "~/sdk/signal";

package/scripts/migrate/templates/lib-utils.test.ts

@@ -99,7 +99,7 @@ describe("D3 — generated stubs throw at runtime", () => {
   it("vtex-transform.toProduct throws and points at the canonical path", () => {
     const src = LIB_TEMPLATES["src/lib/vtex-transform.ts"];
     expect(src).toMatch(/throw new Error/);
-    expect(src).toMatch(/@decocms\/apps\/vtex\/utils\/transform/);
+    expect(src).toMatch(/@decocms\/apps-vtex\/utils\/transform/);
     expect(src).toMatch(/\[deco-migrate\]/);
   });
 
@@ -117,7 +117,7 @@ describe("D3 — generated stubs throw at runtime", () => {
     const src = LIB_TEMPLATES["src/lib/vtex-segment.ts"];
     expect(src).toMatch(/getSegmentFromBag[\s\S]*?throw new Error/);
     expect(src).toMatch(/withSegmentCookie[\s\S]*?throw new Error/);
-    expect(src).toMatch(/@decocms\/apps\/vtex\/utils\/segment/);
+    expect(src).toMatch(/@decocms\/apps-vtex\/utils\/segment/);
   });
 
   it("non-stub helpers stay implemented (negative check — no throw)", () => {

package/scripts/migrate/templates/lib-utils.ts

@@ -46,11 +46,11 @@ export function selectImportedLibTemplates(
 //
 // Each thrown message points at the canonical replacement so the fix
 // is mechanical. `deco-post-cleanup --fix` automates the swap.
-const LIB_VTEX_TRANSFORM = `import type { Product } from "@decocms/apps/commerce/types";
+const LIB_VTEX_TRANSFORM = `import type { Product } from "@decocms/apps-commerce/types";
 
 const STUB =
   "[deco-migrate] \`~/lib/vtex-transform.toProduct\` is a generated stub. " +
-  "Replace with: import { toProduct } from '@decocms/apps/vtex/utils/transform' " +
+  "Replace with: import { toProduct } from '@decocms/apps-vtex/utils/transform' " +
   "(canonical signature: \`toProduct(product, sku, level, options)\`). " +
   "Run \`deco-post-cleanup --fix\` or see the deco-to-tanstack-migration skill " +
   "(post-migration-cleanup § 5).";
@@ -119,13 +119,13 @@ const LIB_VTEX_SEGMENT = `// Per the migration tooling policy (D3): both these s
 const STUB_GET_SEGMENT_FROM_BAG =
   "[deco-migrate] \`~/lib/vtex-segment.getSegmentFromBag\` is a generated " +
   "stub. Refactor: read cookies via \`request.headers.get('cookie')\` then " +
-  "call \`buildSegmentFromCookies()\` from '@decocms/apps/vtex/utils/segment'. " +
+  "call \`buildSegmentFromCookies()\` from '@decocms/apps-vtex/utils/segment'. " +
   "The bag-based lookup mechanism does not exist on TanStack Start.";
 
 const STUB_WITH_SEGMENT_COOKIE =
   "[deco-migrate] \`~/lib/vtex-segment.withSegmentCookie\` is a generated " +
   "stub. Replace with: import { withSegmentCookie } from " +
-  "'@decocms/apps/vtex/utils/segment' (canonical signature: " +
+  "'@decocms/apps-vtex/utils/segment' (canonical signature: " +
   "\`withSegmentCookie(segment, headers?)\`). Run \`deco-post-cleanup --fix\` " +
   "or see the deco-to-tanstack-migration skill.";
 

package/scripts/migrate/templates/no-legacy-packages.test.ts

@@ -0,0 +1,147 @@
+import { describe, expect, it } from "vitest";
+import { createContext } from "../types";
+import type { MigrationContext } from "../types";
+import { generateRoutes } from "./routes";
+import { generateServerEntry } from "./server-entry";
+import { generateSetup } from "./setup";
+import { generateViteConfig } from "./vite-config";
+import { generateCommerceLoaders } from "./commerce-loaders";
+import { generateSectionLoaders } from "./section-loaders";
+import { generateHooks } from "./hooks";
+import { generateUiComponents } from "./ui-components";
+import { generateTypeFiles } from "./types-gen";
+import { generateCacheConfig } from "./cache-config";
+import { generateSdkFiles } from "./sdk-gen";
+import { generatePackageJson } from "./package-json";
+import { generateMigrationPolicyPointerRule } from "./cursor-rules";
+
+/**
+ * Fleet-wide regression guard: none of the scaffolder's templates may emit
+ * the pre-7.x-split `@decocms/start` package, or a bare `@decocms/apps/`
+ * monolith subpath import — neither exists for 7.x consumers, so any
+ * occurrence here means a freshly scaffolded site ships broken code.
+ *
+ * `@decocms/apps-<platform>` (the current split packages) are fine and
+ * intentionally NOT flagged by this check.
+ */
+function assertNoLegacyPackageNames(label: string, output: string) {
+  expect(output, `${label} must not emit "@decocms/start"`).not.toContain(
+    "@decocms/start",
+  );
+  expect(
+    output,
+    `${label} must not emit the "@decocms/apps/" monolith subpath`,
+  ).not.toMatch(/@decocms\/apps\//);
+}
+
+function makeCtx(platform: MigrationContext["platform"]): MigrationContext {
+  const ctx = createContext("/tmp/no-legacy-packages-fixture-site");
+  ctx.siteName = "acme-storefront";
+  ctx.platform = platform;
+  ctx.vtexAccount = platform === "vtex" ? "acme" : null;
+  return ctx;
+}
+
+describe("scaffolder templates never emit @decocms/start or @decocms/apps/*", () => {
+  for (const platform of ["vtex", "custom"] as const) {
+    describe(`platform: ${platform}`, () => {
+      const ctx = makeCtx(platform);
+
+      it("routes.ts", () => {
+        const files = generateRoutes(ctx);
+        for (const [path, content] of Object.entries(files)) {
+          assertNoLegacyPackageNames(`routes.ts (${path})`, content);
+        }
+      });
+
+      it("server-entry.ts", () => {
+        const files = generateServerEntry(ctx);
+        for (const [path, content] of Object.entries(files)) {
+          assertNoLegacyPackageNames(`server-entry.ts (${path})`, content);
+        }
+      });
+
+      it("setup.ts", () => {
+        assertNoLegacyPackageNames("setup.ts", generateSetup(ctx));
+      });
+
+      it("vite-config.ts", () => {
+        assertNoLegacyPackageNames("vite-config.ts", generateViteConfig(ctx));
+      });
+
+      it("commerce-loaders.ts", () => {
+        assertNoLegacyPackageNames(
+          "commerce-loaders.ts",
+          generateCommerceLoaders(ctx),
+        );
+      });
+
+      it("section-loaders.ts", () => {
+        assertNoLegacyPackageNames(
+          "section-loaders.ts",
+          generateSectionLoaders(ctx),
+        );
+      });
+
+      it("hooks.ts", () => {
+        const files = generateHooks(ctx);
+        for (const [path, content] of Object.entries(files)) {
+          assertNoLegacyPackageNames(`hooks.ts (${path})`, content);
+        }
+      });
+
+      it("types-gen.ts", () => {
+        const files = generateTypeFiles(ctx);
+        for (const [path, content] of Object.entries(files)) {
+          assertNoLegacyPackageNames(`types-gen.ts (${path})`, content);
+        }
+      });
+
+      it("cache-config.ts", () => {
+        assertNoLegacyPackageNames(
+          "cache-config.ts",
+          generateCacheConfig(ctx),
+        );
+      });
+
+      it("sdk-gen.ts", () => {
+        const files = generateSdkFiles(ctx);
+        for (const [path, content] of Object.entries(files)) {
+          assertNoLegacyPackageNames(`sdk-gen.ts (${path})`, content);
+        }
+      });
+    });
+  }
+
+  // Platform-agnostic templates
+  it("ui-components.ts", () => {
+    const ctx = makeCtx("custom");
+    const files = generateUiComponents(ctx);
+    for (const [path, content] of Object.entries(files)) {
+      assertNoLegacyPackageNames(`ui-components.ts (${path})`, content);
+    }
+  });
+
+  it("cursor-rules.ts", () => {
+    assertNoLegacyPackageNames(
+      "cursor-rules.ts",
+      generateMigrationPolicyPointerRule("acme-storefront"),
+    );
+  });
+
+  // package-json.ts shells out to `npm view` to resolve the latest published
+  // version, with a hardcoded fallback if that fails (offline/CI-sandboxed).
+  // Either way the emitted dependency *names* must never be the retired
+  // @decocms/start / @decocms/apps monolith.
+  it("package-json.ts", () => {
+    const ctx = makeCtx("vtex");
+    const pkg = generatePackageJson(ctx);
+    assertNoLegacyPackageNames("package-json.ts", pkg);
+    const parsed = JSON.parse(pkg);
+    expect(parsed.dependencies).not.toHaveProperty("@decocms/start");
+    expect(parsed.dependencies).not.toHaveProperty("@decocms/apps");
+    expect(parsed.dependencies).toHaveProperty("@decocms/blocks");
+    expect(parsed.dependencies).toHaveProperty("@decocms/tanstack");
+    expect(parsed.dependencies).toHaveProperty("@decocms/apps-vtex");
+  }, 20000);
+});

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

@@ -95,9 +95,19 @@ export function generatePackageJson(ctx: MigrationContext): string {
 
   const siteDeps = extractedDeps;
 
-  // Fetch latest versions from npm registry
-  const startVersion = getLatestVersion("@decocms/start", "0.34.0");
-  const appsVersion = getLatestVersion("@decocms/apps", "0.27.0");
+  // @decocms/blocks, @decocms/blocks-admin, @decocms/blocks-cli,
+  // @decocms/tanstack, and the @decocms/apps-* platform packages are
+  // published in lockstep from the same monorepo release, so a single
+  // version lookup covers all of them (mirrors how consumer sites bump
+  // "@decocms/blocks/blocks-admin/nextjs ranges" together).
+  const frameworkVersion = getLatestVersion("@decocms/blocks", "7.5.1");
+
+  const platformPackage: Partial<Record<typeof ctx.platform, string>> = {
+    vtex: "@decocms/apps-vtex",
+    shopify: "@decocms/apps-shopify",
+    magento: "@decocms/apps-magento",
+  };
+  const platformDep = platformPackage[ctx.platform];
 
   const pkg = {
     name: ctx.siteName,
@@ -109,14 +119,14 @@ export function generatePackageJson(ctx: MigrationContext): string {
       "dev:clean":
         "rm -rf node_modules/.vite .wrangler/state .tanstack && vite dev",
       "generate:blocks":
-        "tsx node_modules/@decocms/start/scripts/generate-blocks.ts",
+        "tsx node_modules/@decocms/blocks-cli/scripts/generate-blocks.ts",
       "generate:routes": "tsr generate",
-      "generate:schema": `tsx node_modules/@decocms/start/scripts/generate-schema.ts --site ${ctx.siteName}`,
+      "generate:schema": `tsx node_modules/@decocms/blocks-cli/scripts/generate-schema.ts --site ${ctx.siteName}`,
       "generate:invoke":
-        "tsx node_modules/@decocms/start/scripts/generate-invoke.ts",
+        "tsx node_modules/@decocms/blocks-cli/scripts/generate-invoke.ts",
       "generate:sections":
-        "tsx node_modules/@decocms/start/scripts/generate-sections.ts",
-      "generate:loaders": `tsx node_modules/@decocms/start/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`,
+        "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",
       preview: "vite preview",
@@ -141,8 +151,11 @@ export function generatePackageJson(ctx: MigrationContext): string {
     license: "MIT",
     packageManager: `bun@${CANONICAL_BUN_VERSION}`,
     dependencies: {
-      "@decocms/apps": `^${appsVersion}`,
-      "@decocms/start": `^${startVersion}`,
+      "@decocms/blocks": `^${frameworkVersion}`,
+      "@decocms/blocks-admin": `^${frameworkVersion}`,
+      "@decocms/tanstack": `^${frameworkVersion}`,
+      "@decocms/apps-commerce": `^${frameworkVersion}`,
+      ...(platformDep ? { [platformDep]: `^${frameworkVersion}` } : {}),
       "@tanstack/react-query": "5.90.21",
       "@tanstack/react-router": "1.166.7",
       "@tanstack/react-start": "1.166.8",
@@ -155,6 +168,7 @@ export function generatePackageJson(ctx: MigrationContext): string {
     },
     devDependencies: {
       "@cloudflare/vite-plugin": "^1.27.0",
+      "@decocms/blocks-cli": `^${frameworkVersion}`,
       "@tailwindcss/vite": "^4.2.1",
       "@tanstack/router-cli": "1.166.7",
       "@types/react": "^19.2.14",

package/scripts/migrate/templates/routes.ts

@@ -63,7 +63,7 @@ function generateRoot(ctx: MigrationContext, siteTitle: string, vtexAccount: str
   }
 
   return `import { createRootRoute } from "@tanstack/react-router";
-import { DecoRootLayout } from "@decocms/start/hooks";
+import { DecoRootLayout } from "@decocms/tanstack";
 // @ts-ignore Vite ?url import
 import appCss from "../styles/app.css?url";
 
@@ -107,8 +107,7 @@ function RootLayout() {
 
 function generateIndex(ctx: MigrationContext, siteTitle: string): string {
   return `import { createFileRoute } from "@tanstack/react-router";
-import { cmsHomeRouteConfig, deferredSectionLoader } from "@decocms/start/routes";
-import { DecoPageRenderer } from "@decocms/start/hooks";
+import { cmsHomeRouteConfig, DecoPageRenderer, loadDeferredSection } from "@decocms/tanstack";
 
 // MIGRATION TODO: customize defaultTitle / defaultDescription / fallback
 // copy below for ${siteTitle}. CMS \`Site.seo\` overrides these once block
@@ -144,7 +143,7 @@ function HomePage() {
       deferredPromises={data.deferredPromises}
       pagePath={data.pagePath}
       pageUrl={data.pageUrl}
-      loadDeferredSectionFn={deferredSectionLoader}
+      loadDeferredSectionFn={loadDeferredSection}
     />
   );
 }
@@ -153,8 +152,7 @@ function HomePage() {
 
 function generateCatchAll(ctx: MigrationContext, siteTitle: string): string {
   return `import { createFileRoute } from "@tanstack/react-router";
-import { cmsRouteConfig, deferredSectionLoader } from "@decocms/start/routes";
-import { DecoPageRenderer } from "@decocms/start/hooks";
+import { cmsRouteConfig, DecoPageRenderer, loadDeferredSection } from "@decocms/tanstack";
 
 // MIGRATION TODO: customize defaultTitle / defaultDescription for ${siteTitle}
 // (CMS \`Site.seo\` overrides these per-page once block resolution kicks in).
@@ -182,7 +180,7 @@ function CmsPage() {
       deferredPromises={data.deferredPromises}
       pagePath={data.pagePath}
       pageUrl={data.pageUrl}
-      loadDeferredSectionFn={deferredSectionLoader}
+      loadDeferredSectionFn={loadDeferredSection}
     />
   );
 }
@@ -214,7 +212,7 @@ function NotFoundPage() {
 
 function generateDecoMeta(): string {
   return `import { createFileRoute } from "@tanstack/react-router";
-import { decoMetaRoute } from "@decocms/start/routes";
+import { decoMetaRoute } from "@decocms/tanstack";
 
 export const Route = createFileRoute("/deco/meta")(decoMetaRoute);
 `;
@@ -222,7 +220,7 @@ export const Route = createFileRoute("/deco/meta")(decoMetaRoute);
 
 function generateDecoInvoke(): string {
   return `import { createFileRoute } from "@tanstack/react-router";
-import { decoInvokeRoute } from "@decocms/start/routes";
+import { decoInvokeRoute } from "@decocms/tanstack";
 
 export const Route = createFileRoute("/deco/invoke/$")(decoInvokeRoute);
 `;
@@ -230,7 +228,7 @@ export const Route = createFileRoute("/deco/invoke/$")(decoInvokeRoute);
 
 function generateDecoRender(): string {
   return `import { createFileRoute } from "@tanstack/react-router";
-import { decoRenderRoute } from "@decocms/start/routes";
+import { decoRenderRoute } from "@decocms/tanstack";
 
 export const Route = createFileRoute("/deco/render")(decoRenderRoute);
 `;

package/scripts/migrate/templates/sdk-gen.ts

@@ -12,7 +12,7 @@ export function generateSdkFiles(ctx: MigrationContext): Record<string, string>
 function generateDeviceServer(): string {
   return `import { createServerFn } from "@tanstack/react-start";
 import { getRequestHeader } from "@tanstack/react-start/server";
-import { detectDevice } from "@decocms/start/sdk/useDevice";
+import { detectDevice } from "@decocms/blocks/sdk/useDevice";
 
 export const getDeviceFromServer = createServerFn({ method: "GET" }).handler(
   async () => {

package/scripts/migrate/templates/section-loaders.ts

@@ -71,22 +71,22 @@ export function generateSectionLoaders(ctx: MigrationContext): string {
   lines.push(`  withSearchParam,`);
   lines.push(`  withSectionLoader,`);
   lines.push(`  compose,`);
-  lines.push(`} from "@decocms/start/cms";`);
+  lines.push(`} from "@decocms/blocks/cms";`);
 
   if (hasSearchResult) {
-    lines.push(`import { detectDevice } from "@decocms/start/sdk/useDevice";`);
+    lines.push(`import { detectDevice } from "@decocms/blocks/sdk/useDevice";`);
   }
 
   if (isVtex) {
-    lines.push(`import { getVtexConfig } from "@decocms/apps/vtex";`);
+    lines.push(`import { getVtexConfig } from "@decocms/apps-vtex";`);
     if (hasWishlistSection && hasWishlistLoaders) {
-      lines.push(`import { getUser } from "@decocms/apps/vtex/loaders/user";`);
-      lines.push(`import { getVtexCookies } from "@decocms/apps/vtex/utils/cookies";`);
+      lines.push(`import { getUser } from "@decocms/apps-vtex/loaders/user";`);
+      lines.push(`import { getVtexCookies } from "@decocms/apps-vtex/utils/cookies";`);
     }
   }
 
   if (hasAccountSections) {
-    lines.push(`import { vtexAccountLoaders } from "@decocms/apps/vtex/utils/accountLoaders";`);
+    lines.push(`import { vtexAccountLoaders } from "@decocms/apps-vtex/utils/accountLoaders";`);
   }
 
   if (hasProductReviewsLoader && (hasProductReviews || hasSearchResult)) {
@@ -338,7 +338,7 @@ export function generateSectionLoaders(ctx: MigrationContext): string {
   // ---------- Account sections ----------
   if (isVtex && hasAccountSections) {
     entries.push(``);
-    entries.push(`  // Account sections — via @decocms/apps factory`);
+    entries.push(`  // Account sections — via @decocms/apps-vtex factory`);
 
     for (const meta of ctx.sectionMetas) {
       if (!meta.isAccountSection) continue;