@decocms/blocks 7.26.1 → 7.26.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/blocks",
-  "version": "7.26.1",
+  "version": "7.26.2",
   "type": "module",
   "engines": {
     "node": ">=24"

package/src/cms/schema.test.ts

@@ -271,19 +271,33 @@ describe("commerce SEO section schemas", () => {
     expect(props.jsonLD.hide).toBe(true);
   });
 
-  it("registers the sections so existing pages resolve, without polluting the picker", () => {
+  it("always registers the defs + manifest blocks so existing pages resolve", () => {
     const meta = composeMeta(emptySiteMeta());
     for (const key of [
       "commerce/sections/Seo/SeoPLPV2.tsx",
       "commerce/sections/Seo/SeoPDPV2.tsx",
     ]) {
-      // Registered as a manifest block + def → the SEO editor can resolve a
-      // schema for a page already on this type.
       expect(meta.manifest.blocks.sections).toHaveProperty(key);
       expect(meta.schema.definitions).toHaveProperty(b64(key));
-      // But deliberately NOT offered as a new pickable section everywhere
-      // (legacy commerce types have no component in start).
-      expect(meta.schema.root.sections.anyOf).not.toContainEqual(b64Ref(key));
+    }
+  });
+
+  it("offers them as page.seo options only on a commerce site", () => {
+    // "commerce site" = product-list loaders registered (the signal
+    // buildFrameworkSections gates the picker on). The key must match
+    // inferLoaderTags so it is tagged "product-list".
+    registerAppSchemas({
+      namespace: "vtex",
+      loaders: {
+        "vtex/loaders/test/ProductListForSeoPicker.ts": { type: "object", properties: {} },
+      },
+    });
+    const meta = composeMeta(emptySiteMeta());
+    for (const key of [
+      "commerce/sections/Seo/SeoPLPV2.tsx",
+      "commerce/sections/Seo/SeoPDPV2.tsx",
+    ]) {
+      expect(meta.schema.root.sections.anyOf).toContainEqual(b64Ref(key));
     }
   });
 });

package/src/cms/schema.ts

@@ -736,6 +736,12 @@ function buildFrameworkSections(sectionAnyOf: any[]) {
   const manifestBlocks: Record<string, any> = {};
   const extraAnyOf: any[] = [];
 
+  // A site is "commerce" when it registered product-list loaders (same signal
+  // wrapResolvableProperties uses). Gates whether the commerce SEO section types
+  // below are offered as pickable page.seo options — a blog site should not see
+  // "Product listing SEO" in the SEO type dropdown.
+  const hasCommerce = getProductListLoaderKeys().length > 0;
+
   // --- website/sections/Rendering/Lazy.tsx ---
   const LAZY_TYPE = "website/sections/Rendering/Lazy.tsx";
   const lazyKey = toBase64(LAZY_TYPE);
@@ -842,11 +848,10 @@ function buildFrameworkSections(sectionAnyOf: any[]) {
   // data-source block-ref set once when the page is created; it round-trips via
   // the form (kept `hide`) rather than being re-picked in the SEO panel.
   //
-  // NOT pushed to `extraAnyOf`: unlike the website Seo sections these are legacy
-  // deco-cx types with no component in start, so we only register the def +
-  // manifest block (enough for the SEO editor to resolve a schema for pages
-  // already on these types) without offering them as a new pickable section on
-  // every — including non-commerce — site.
+  // The def + manifest block are always registered so the SEO editor can resolve
+  // a schema for pages already on these types. They are added to `extraAnyOf`
+  // (offered as a selectable page.seo type) only on commerce sites, so a blog
+  // does not get "Product listing SEO" in its SEO type dropdown.
   const SEO_PLP_V2_TYPE = "commerce/sections/Seo/SeoPLPV2.tsx";
   const seoPlpV2Key = toBase64(SEO_PLP_V2_TYPE);
   definitions[seoPlpV2Key] = {
@@ -882,6 +887,7 @@ function buildFrameworkSections(sectionAnyOf: any[]) {
     $ref: `#/definitions/${seoPlpV2Key}`,
     namespace: "commerce",
   };
+  if (hasCommerce) extraAnyOf.push({ $ref: `#/definitions/${seoPlpV2Key}` });
 
   // --- commerce/sections/Seo/SeoPDPV2.tsx ---
   // Product-details SEO. Studio "pdp" mode counterpart of the PLP section above.
@@ -914,6 +920,7 @@ function buildFrameworkSections(sectionAnyOf: any[]) {
     $ref: `#/definitions/${seoPdpV2Key}`,
     namespace: "commerce",
   };
+  if (hasCommerce) extraAnyOf.push({ $ref: `#/definitions/${seoPdpV2Key}` });
 
   // --- website/flags/multivariate/section.ts ---
   const MV_SECTION_TYPE = "website/flags/multivariate/section.ts";