@decocms/blocks-cli 7.5.1 → 7.5.3

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,25 @@ 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).
+  //
+  // If this ever stops being true (e.g. a package starts shipping
+  // independent version bumps), every `${frameworkVersion}` usage below
+  // (in `dependencies` and `devDependencies`) needs to become its own
+  // `getLatestVersion("<package>", "<fallback>")` call instead of sharing
+  // this one lookup.
+  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 +125,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 +157,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 +174,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;

package/scripts/migrate/templates/server-entry.ts

@@ -43,7 +43,7 @@ function generateWorkerEntry(ctx: MigrationContext): string {
  * Cloudflare Worker entry point.
  *
  * Wraps TanStack Start with admin protocol handlers, edge caching, and
- * the @decocms/start observability stack (5.0+, Cloudflare-native):
+ * the @decocms/blocks observability stack (5.0+, Cloudflare-native):
  *   - logs:    console.* -> CF Workers Logs (captured by the platform
  *              when wrangler.jsonc has \`observability.enabled: true\`).
  *              View in the CF dashboard -> Workers & Pages -> <site> ->
@@ -57,27 +57,27 @@ function generateWorkerEntry(ctx: MigrationContext): string {
  *
  * No in-Worker OTLP exporter ships with 5.x — the CF dashboard is the
  * destination. A ClickHouse-collector adapter is scaffolded at
- * @decocms/start/sdk/otelAdapters/clickhouseCollector but throws if
+ * @decocms/blocks/sdk/otelAdapters/clickhouseCollector but throws if
  * called; it'll get a real implementation once the OTel collector
  * gateway lands.
  *
  * To wire wrangler.jsonc with the canonical observability block, run:
- *   npx -p @decocms/start deco-cf-observability --write
+ *   npx -p @decocms/blocks-cli deco-cf-observability --write
  */
 import "./setup";
 import handler, { createServerEntry } from "@tanstack/react-start/server-entry";
-import { createDecoWorkerEntry } from "@decocms/start/sdk/workerEntry";
-import { instrumentWorker } from "@decocms/start/sdk/observability";
+import { createDecoWorkerEntry } from "@decocms/tanstack";
+import { instrumentWorker } from "@decocms/blocks/sdk/observability";
 import {
   handleMeta,
   handleDecofileRead,
   handleDecofileReload,
   handleRender,
   corsHeaders,
-} from "@decocms/start/admin";
+} from "@decocms/blocks-admin";
 ${isCommerce ? `
 // TODO: Uncomment and wire proxy for ${platformLabel}
-// import { shouldProxyTo${capitalize(platformLabel!)}, proxyTo${capitalize(platformLabel!)} } from "@decocms/apps/${platformLabel}/utils/proxy";
+// import { shouldProxyTo${capitalize(platformLabel!)}, proxyTo${capitalize(platformLabel!)} } from "@decocms/apps-${platformLabel}/utils/proxy";
 ` : ""}
 const serverEntry = createServerEntry({ fetch: handler.fetch });
 
@@ -110,23 +110,23 @@ function generateVtexWorkerEntry(ctx: MigrationContext): string {
 
   return `import "./setup";
 import handler, { createServerEntry } from "@tanstack/react-start/server-entry";
-import { createDecoWorkerEntry } from "@decocms/start/sdk/workerEntry";
-import { instrumentWorker } from "@decocms/start/sdk/observability";
+import { createDecoWorkerEntry } from "@decocms/tanstack";
+import { instrumentWorker } from "@decocms/blocks/sdk/observability";
 import {
   handleMeta,
   handleDecofileRead,
   handleDecofileReload,
   handleRender,
   corsHeaders,
-} from "@decocms/start/admin";
-import { shouldProxyToVtex, createVtexCheckoutProxy } from "@decocms/apps/vtex/utils/proxy";
-import { extractVtexContext } from "@decocms/apps/vtex/middleware";
-import { loadRedirects, matchRedirect } from "@decocms/start/sdk/redirects";
-import { withABTesting } from "@decocms/start/sdk/abTesting";
-import { loadBlocks } from "@decocms/start/cms";
+} from "@decocms/blocks-admin";
+import { shouldProxyToVtex, createVtexCheckoutProxy } from "@decocms/apps-vtex/utils/proxy";
+import { extractVtexContext } from "@decocms/apps-vtex/middleware";
+import { loadRedirects, matchRedirect } from "@decocms/blocks/sdk/redirects";
+import { withABTesting } from "@decocms/blocks/sdk/abTesting";
+import { loadBlocks } from "@decocms/blocks/cms";
 
 // ---------------------------------------------------------------------------
-// VTEX checkout proxy — configured via @decocms/apps factory
+// VTEX checkout proxy — configured via @decocms/apps-vtex factory
 // ---------------------------------------------------------------------------
 
 const proxyCheckout = createVtexCheckoutProxy({
@@ -226,7 +226,7 @@ const abTestedWorker = withABTesting(decoWorker, {
 // ---------------------------------------------------------------------------
 // Observability wrap (outermost layer)
 //
-// @decocms/start 5.0+ converged on Cloudflare-native observability:
+// @decocms/blocks 5.0+ converged on Cloudflare-native observability:
 //   - logs:    console.* -> CF Workers Logs (dashboard captures, no
 //              app-side OTLP exporter)
 //   - traces:  @opentelemetry/api global tracer (bridged from
@@ -236,7 +236,7 @@ const abTestedWorker = withABTesting(decoWorker, {
 //              src/sdk/otelAdapters/clickhouseCollector.ts)
 //
 // Wire wrangler.jsonc with the canonical observability block via:
-//   npx -p @decocms/start deco-cf-observability --write
+//   npx -p @decocms/blocks-cli deco-cf-observability --write
 // ---------------------------------------------------------------------------
 export default instrumentWorker(abTestedWorker, {
   serviceName: "${ctx.siteName}",
@@ -246,7 +246,7 @@ export default instrumentWorker(abTestedWorker, {
 
 function generateRouter(): string {
   return `import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { createDecoRouter } from "@decocms/start/sdk/router";
+import { createDecoRouter } from "@decocms/tanstack";
 import { routeTree } from "./routeTree.gen";
 import "./setup";
 
@@ -274,16 +274,16 @@ declare module "@tanstack/react-router" {
 
 function generateRuntime(): string {
   return `/**
- * Runtime invoke proxy — re-exports the framework canonical from @decocms/start/sdk.
+ * Runtime invoke proxy — re-exports the framework canonical from @decocms/blocks/sdk/invoke.
  *
  * The implementation (typed RPC over /deco/invoke, dotted-path proxy, .ts
- * suffix fallback) lives in @decocms/start/sdk/invoke. This file exists so
+ * suffix fallback) lives in @decocms/blocks/sdk/invoke. This file exists so
  * existing site code can keep \`import { invoke } from "~/runtime"\` and
  * \`Runtime.invoke\` shapes without churn.
  *
- * Don't reimplement here — extend @decocms/start/sdk/invoke instead.
+ * Don't reimplement here — extend @decocms/blocks/sdk/invoke instead.
  */
-import { invoke } from "@decocms/start/sdk";
+import { invoke } from "@decocms/blocks/sdk/invoke";
 
 export { invoke };
 
@@ -328,14 +328,14 @@ export const invoke = {} as const;
  */
 import { createServerFn } from "@tanstack/react-start";
 import { getRequestHeader } from "@tanstack/react-start/server";
-import { forwardResponseCookies } from "@decocms/start/sdk/cookiePassthrough";
+import { forwardResponseCookies } from "@decocms/tanstack/sdk/cookiePassthrough";
 import { vtexActions } from "./invoke.gen";
 ${hasVtexAuthLoader ? `import vtexAuthLoader from "../loaders/vtex-auth-loader";\n` : ""}import {
   extractVtexCookiesFromHeader,
   stripCookieDomain,
   performVtexLogout,
   parseVtexAuthJwt,
-} from "@decocms/apps/vtex/utils/authHelpers";
+} from "@decocms/apps-vtex/utils/authHelpers";
 
 export type { OrderForm } from "./invoke.gen";
 
@@ -398,17 +398,17 @@ export const vtexActions = {} as const;
 // Each server function is a top-level const so TanStack Start's compiler
 // can transform createServerFn().handler() into RPC stubs on the client.
 import { createServerFn } from "@tanstack/react-start";
-import { getOrCreateCart, addItemsToCart, updateCartItems, addCouponToCart, simulateCart, getSellersByRegion, setShippingPostalCode, updateOrderFormAttachment } from "@decocms/apps/vtex/actions/checkout";
-import { createSession, editSession } from "@decocms/apps/vtex/actions/session";
-import { createDocument, getDocument, patchDocument, searchDocuments, uploadAttachment } from "@decocms/apps/vtex/actions/masterData";
-import { subscribe } from "@decocms/apps/vtex/actions/newsletter";
-import { notifyMe } from "@decocms/apps/vtex/actions/misc";
-import type { OrderForm } from "@decocms/apps/vtex/types";
-import type { SimulationItem, RegionResult } from "@decocms/apps/vtex/actions/checkout";
-import type { SessionData } from "@decocms/apps/vtex/actions/session";
-import type { CreateDocumentResult, UploadAttachmentOpts } from "@decocms/apps/vtex/actions/masterData";
-import type { SubscribeProps } from "@decocms/apps/vtex/actions/newsletter";
-import type { NotifyMeProps } from "@decocms/apps/vtex/actions/misc";
+import { getOrCreateCart, addItemsToCart, updateCartItems, addCouponToCart, simulateCart, getSellersByRegion, setShippingPostalCode, updateOrderFormAttachment } from "@decocms/apps-vtex/actions/checkout";
+import { createSession, editSession } from "@decocms/apps-vtex/actions/session";
+import { createDocument, getDocument, patchDocument, searchDocuments, uploadAttachment } from "@decocms/apps-vtex/actions/masterData";
+import { subscribe } from "@decocms/apps-vtex/actions/newsletter";
+import { notifyMe } from "@decocms/apps-vtex/actions/misc";
+import type { OrderForm } from "@decocms/apps-vtex/types";
+import type { SimulationItem, RegionResult } from "@decocms/apps-vtex/actions/checkout";
+import type { SessionData } from "@decocms/apps-vtex/actions/session";
+import type { CreateDocumentResult, UploadAttachmentOpts } from "@decocms/apps-vtex/actions/masterData";
+import type { SubscribeProps } from "@decocms/apps-vtex/actions/newsletter";
+import type { NotifyMeProps } from "@decocms/apps-vtex/actions/misc";
 
 function unwrapResult<T>(result: unknown): T {
   if (result && typeof result === "object" && "data" in result) {
@@ -549,7 +549,7 @@ export const vtexActions = {
   notifyMe: $notifyMe as unknown as (ctx: { data: NotifyMeProps }) => Promise<void>,
 } as const;
 
-export type { OrderForm } from "@decocms/apps/vtex/types";
+export type { OrderForm } from "@decocms/apps-vtex/types";
 
 export const invoke = {
   vtex: {

package/scripts/migrate/templates/setup.ts

@@ -93,15 +93,15 @@ import "./cache-config";
 import {
   registerCommerceLoaders,
   applySectionConventions,
-} from "@decocms/start/cms";
-import { createSiteSetup } from "@decocms/start/setup";
-import { setInvokeLoaders } from "@decocms/start/admin";${isVtex ? `
-import { createInstrumentedFetch } from "@decocms/start/sdk/instrumentedFetch";
-import { initVtexFromBlocks, setVtexFetch } from "@decocms/apps/vtex";` : ""}${hasLocationMatcher ? `
+} from "@decocms/blocks/cms";
+import { createSiteSetup } from "@decocms/blocks/setup";
+import { setInvokeLoaders } from "@decocms/blocks-admin";${isVtex ? `
+import { createInstrumentedFetch } from "@decocms/blocks/sdk/instrumentedFetch";
+import { initVtexFromBlocks, setVtexFetch } from "@decocms/apps-vtex";` : ""}${hasLocationMatcher ? `
 import { registerLocationMatcher } from "./matchers/location";` : ""}
 import { blocks as generatedBlocks } from "../.deco/blocks.gen";
 import { sectionMeta, syncComponents, loadingFallbacks } from "../.deco/sections.gen";
-import { PreviewProviders } from "@decocms/start/hooks";
+import { PreviewProviders } from "@decocms/tanstack";
 // @ts-ignore Vite ?url import
 import appCss from "./styles/app.css?url";
 

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

@@ -5,7 +5,7 @@ export function generateTypeFiles(ctx: MigrationContext): Record<string, string>
 
   // src/types/widgets.ts is no longer generated — the framework owns these
   // string aliases (`ImageWidget`, `HTMLWidget`, …) at
-  // `@decocms/start/types/widgets`, and `transforms/imports.ts` rewrites
+  // `@decocms/blocks/types/widgets`, and `transforms/imports.ts` rewrites
   // `apps/admin/widgets.ts` directly to that path. Schema generation
   // works the same way: the generator matches by type *text*, not module
   // identity (see scripts/generate-schema.ts:WIDGET_TYPE_FORMATS).
@@ -99,7 +99,7 @@ export type AppContext = {
 export type LegacyAppContext = AppContext;
 `;
 
-    files["src/types/vtex-loaders.ts"] = `import type { Product, ProductListingPage } from "@decocms/apps/commerce/types";
+    files["src/types/vtex-loaders.ts"] = `import type { Product, ProductListingPage } from "@decocms/apps-commerce/types";
 
 export interface ProductListProps {
   page: ProductListingPage | null;

package/scripts/migrate/templates/ui-components.ts

@@ -13,7 +13,7 @@ export function generateUiComponents(_ctx: MigrationContext): Record<string, str
   FACTORS,
   type ImageProps,
   type FitOptions,
-} from "@decocms/apps/commerce/components/Image";
+} from "@decocms/blocks/hooks";
 `;
 
   files["src/components/ui/Picture.tsx"] = `import type { ReactNode } from "react";
@@ -22,7 +22,7 @@ import {
   getSrcSet,
   type FitOptions,
   type ImageProps,
-} from "@decocms/apps/commerce/components/Image";
+} from "@decocms/blocks/hooks";
 
 export interface PictureSourceProps {
   src: string;

package/scripts/migrate/templates/vite-config.ts

@@ -1,7 +1,14 @@
 import type { MigrationContext } from "../types";
 
+const PLATFORM_PACKAGE: Partial<Record<MigrationContext["platform"], string>> = {
+  vtex: "@decocms/apps-vtex",
+  shopify: "@decocms/apps-shopify",
+  magento: "@decocms/apps-magento",
+};
+
 export function generateViteConfig(ctx: MigrationContext): string {
   const isVtex = ctx.platform === "vtex";
+  const platformDep = PLATFORM_PACKAGE[ctx.platform];
 
   const vtexAccount = ctx.vtexAccount || ctx.siteName.replace(/-migrated$/, "").replace(/-storefront$/, "");
 
@@ -29,7 +36,7 @@ const VTEX_ORIGIN = \`https://\${VTEX_ACCOUNT}.\${VTEX_ENVIRONMENT}.\${VTEX_DOMA
 
   return `import { cloudflare } from "@cloudflare/vite-plugin";
 import { tanstackStart } from "@tanstack/react-start/plugin/vite";
-import { decoVitePlugin } from "@decocms/start/vite";
+import { decoVitePlugin } from "@decocms/tanstack/vite";
 import react from "@vitejs/plugin-react";
 import tailwindcss from "@tailwindcss/vite";
 import { defineConfig } from "vite";
@@ -80,8 +87,10 @@ export default defineConfig({
   },
   resolve: {
     dedupe: [
-      "@decocms/start",
-      "@decocms/apps",
+      "@decocms/blocks",
+      "@decocms/blocks-admin",
+      "@decocms/tanstack",
+      "@decocms/apps-commerce",${platformDep ? `\n      "${platformDep}",` : ""}
       "@tanstack/react-start",
       "@tanstack/react-router",
       "@tanstack/react-start-server",

package/scripts/migrate/transforms/fresh-apis.ts

@@ -165,10 +165,10 @@ export function transformFreshApis(content: string): TransformResult {
   if (result.includes("scriptAsDataURI")) {
     // Ensure useScript is imported
     if (
-      !result.includes('"@decocms/start/sdk/useScript"') &&
-      !result.includes("'@decocms/start/sdk/useScript'")
+      !result.includes('"@decocms/blocks/sdk/useScript"') &&
+      !result.includes("'@decocms/blocks/sdk/useScript'")
     ) {
-      result = `import { useScript } from "@decocms/start/sdk/useScript";\n${result}`;
+      result = `import { useScript } from "@decocms/blocks/sdk/useScript";\n${result}`;
     }
 
     // Transform src={scriptAsDataURI(...)} into dangerouslySetInnerHTML={{ __html: useScript(...) }}
@@ -190,7 +190,7 @@ export function transformFreshApis(content: string): TransformResult {
     notes.push("Replaced scriptAsDataURI with useScript + dangerouslySetInnerHTML");
   }
 
-  // allowCorsFor — not available in @decocms/start, remove usage
+  // allowCorsFor — not available in @decocms/blocks, remove usage
   if (result.includes("allowCorsFor")) {
     result = result.replace(
       /^import\s+\{[^}]*\ballowCorsFor\b[^}]*\}\s+from\s+["'][^"']+["'];?\s*\n?/gm,
@@ -204,7 +204,7 @@ export function transformFreshApis(content: string): TransformResult {
 
   // ctx.response.headers → not available, flag
   if (result.includes("ctx.response")) {
-    notes.push("MANUAL: ctx.response usage found — FnContext in @decocms/start does not have response object");
+    notes.push("MANUAL: ctx.response usage found — FnContext in @decocms/blocks does not have response object");
   }
 
   // { crypto } from "@std/crypto" → use globalThis.crypto (Web Crypto API)