@decocms/blocks-cli 7.10.0 → 7.11.0

package/package.json

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

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

@@ -0,0 +1,59 @@
+import { describe, expect, it } from "vitest";
+import type { MigrationContext } from "../types";
+import { createContext } from "../types";
+import { generateRoutes } from "./routes";
+
+function makeCtx(platform: MigrationContext["platform"]): MigrationContext {
+  const ctx = createContext("/tmp/routes-template-fixture-site");
+  ctx.siteName = "acme-storefront";
+  ctx.platform = platform;
+  ctx.vtexAccount = platform === "vtex" ? "acme" : null;
+  return ctx;
+}
+
+/**
+ * Regression guard: the scaffolded deco admin route files must use the
+ * dev-HMR-safe `*RouteConfig()` factories — the only form @decocms/tanstack
+ * exports since 7.10.0 — never the removed pre-7.10.0 module-scope literals
+ * passed by reference. router-core's `update()` mutates the options object it
+ * receives (injects id/path); a shared literal got polluted on first
+ * execution, and any dev-HMR re-execution of the route file then threw
+ * "Route cannot have both an 'id' and a 'path' option", 500ing every route
+ * until the dev server restarted.
+ */
+describe("scaffolded deco admin routes use HMR-safe factories", () => {
+  const routeCases = [
+    { file: "src/routes/deco/meta.ts", factory: "decoMetaRouteConfig", literal: "decoMetaRoute" },
+    {
+      file: "src/routes/deco/render.ts",
+      factory: "decoRenderRouteConfig",
+      literal: "decoRenderRoute",
+    },
+    {
+      file: "src/routes/deco/invoke.$.ts",
+      factory: "decoInvokeRouteConfig",
+      literal: "decoInvokeRoute",
+    },
+  ] as const;
+
+  for (const platform of ["vtex", "custom"] as const) {
+    describe(`platform: ${platform}`, () => {
+      const files = generateRoutes(makeCtx(platform));
+
+      for (const { file, factory, literal } of routeCases) {
+        it(`${file} calls ${factory}() and never passes ${literal} by reference`, () => {
+          const content = files[file];
+          expect(content, `${file} must be emitted`).toBeTypeOf("string");
+
+          // Factory form: createFileRoute("...")(decoXRouteConfig())
+          expect(content).toContain(`${factory}()`);
+          expect(content).toContain(`import { ${factory} } from "@decocms/tanstack"`);
+
+          // Forbidden form: createFileRoute("...")(decoXRoute) — shared
+          // literal by reference. `(?!Config)` keeps the factory call legal.
+          expect(content).not.toMatch(new RegExp(`\\)\\(${literal}(?!Config)\\s*\\)`));
+        });
+      }
+    });
+  }
+});

package/scripts/migrate/templates/routes.ts

@@ -210,26 +210,34 @@ function NotFoundPage() {
 `;
 }
 
+// The deco admin routes use the `*RouteConfig()` factories — the only form
+// @decocms/tanstack exports since 7.10.0. The pre-7.10.0 module-scope
+// literals (decoMetaRoute/decoRenderRoute/decoInvokeRoute) were removed:
+// passed by reference, router-core's update() mutated the shared object
+// (injecting id/path), and any dev-HMR re-execution of the route file then
+// threw "Route cannot have both an 'id' and a 'path' option", 500ing every
+// route until dev restart.
+
 function generateDecoMeta(): string {
   return `import { createFileRoute } from "@tanstack/react-router";
-import { decoMetaRoute } from "@decocms/tanstack";
+import { decoMetaRouteConfig } from "@decocms/tanstack";
 
-export const Route = createFileRoute("/deco/meta")(decoMetaRoute);
+export const Route = createFileRoute("/deco/meta")(decoMetaRouteConfig());
 `;
 }
 
 function generateDecoInvoke(): string {
   return `import { createFileRoute } from "@tanstack/react-router";
-import { decoInvokeRoute } from "@decocms/tanstack";
+import { decoInvokeRouteConfig } from "@decocms/tanstack";
 
-export const Route = createFileRoute("/deco/invoke/$")(decoInvokeRoute);
+export const Route = createFileRoute("/deco/invoke/$")(decoInvokeRouteConfig());
 `;
 }
 
 function generateDecoRender(): string {
   return `import { createFileRoute } from "@tanstack/react-router";
-import { decoRenderRoute } from "@decocms/tanstack";
+import { decoRenderRouteConfig } from "@decocms/tanstack";
 
-export const Route = createFileRoute("/deco/render")(decoRenderRoute);
+export const Route = createFileRoute("/deco/render")(decoRenderRouteConfig());
 `;
 }