@swell/apps-sdk 1.0.175 → 1.0.177

package/dist/index.js

@@ -4644,8 +4644,8 @@
     { value: "popularity", name: "Popularity", query: "popularity desc" },
     { value: "price_asc", name: "Price, low to high", query: "price asc" },
     { value: "price_desc", name: "Price, high to low", query: "price desc" },
-    { value: "date_asc", name: "Date, old to new", query: "date asc" },
-    { value: "date_desc", name: "Date, new to old", query: "date desc" },
+    { value: "date_asc", name: "Date, old to new", query: "date_created asc" },
+    { value: "date_desc", name: "Date, new to old", query: "date_created desc" },
     { value: "name_asc", name: "Product name, A-Z", query: "name asc" },
     { value: "name_desc", name: "Product name, Z-A", query: "name desc" }
   ]);
@@ -5438,23 +5438,58 @@ ${formattedMessage}`;
   // src/easyblocks/config.ts
   var import_json53 = __toESM(__require("json5"), 1);
   var import_lodash_es4 = __require("lodash-es");
+
+  // src/compatibility/drops/template.ts
+  var import_liquidjs3 = __require("liquidjs");
+  var TemplateDrop = class extends import_liquidjs3.Drop {
+    constructor(name, directory, suffix) {
+      super();
+      this.name = name;
+      this.directory = directory;
+      this.suffix = suffix;
+    }
+    valueOf() {
+      return this.name;
+    }
+  };
+
+  // src/compatibility/shopify-objects/template.ts
+  function ShopifyTemplate(instance, template) {
+    return new TemplateDrop(
+      instance.getPageType(template.name),
+      template.path,
+      template.alt_name
+    );
+  }
+
+  // src/easyblocks/config.ts
   var NO_INLINE = true;
   async function getEasyblocksPageTemplate(theme, pageId, altTemplate) {
     let templateConfig = null;
+    let templateData = {
+      name: pageId
+    };
+    if (theme.shopifyCompatibility) {
+      templateData = ShopifyTemplate(theme.shopifyCompatibility, templateData);
+    }
+    const { name } = templateData;
     templateConfig = await theme.getThemeTemplateConfigByType(
       "templates",
-      pageId,
+      name,
       altTemplate
     );
     if (templateConfig) {
-      if (templateConfig.file_path.endsWith(".liquid")) {
-        return templateConfig.file_data;
+      let result = templateConfig.file_data;
+      if (!templateConfig.file_path.endsWith(".liquid")) {
+        try {
+          result = import_json53.default.parse(templateConfig.file_data);
+        } catch {
+        }
       }
-      try {
-        return import_json53.default.parse(templateConfig.file_data);
-      } catch {
-        return templateConfig.file_data;
+      if (result && typeof result === "object") {
+        result.id = name;
       }
+      return result;
     }
   }
   function getAcceptedLayoutSections(allSections, groupType) {
@@ -11396,11 +11431,11 @@ ${formattedMessage}`;
   });
 
   // src/compatibility/drops/image.ts
-  var import_liquidjs4 = __require("liquidjs");
+  var import_liquidjs5 = __require("liquidjs");
 
   // src/compatibility/drops/image-src.ts
-  var import_liquidjs3 = __require("liquidjs");
-  var ImageSrcDrop = class extends import_liquidjs3.Drop {
+  var import_liquidjs4 = __require("liquidjs");
+  var ImageSrcDrop = class extends import_liquidjs4.Drop {
     constructor(url, width, height) {
       super();
       this.url = url;
@@ -11423,7 +11458,7 @@ ${formattedMessage}`;
   };
 
   // src/compatibility/drops/image.ts
-  var ImageDrop = class extends import_liquidjs4.Drop {
+  var ImageDrop = class extends import_liquidjs5.Drop {
     id;
     alt;
     src;
@@ -11634,7 +11669,9 @@ ${formattedMessage}`;
       ),
       barcode: void 0,
       compare_at_price: defer(
-        () => instance.toShopifyPrice(variant.orig_price)
+        () => instance.toShopifyPrice(
+          getPriceField(product, variant, "orig_price")
+        )
       ),
       featured_image: deferWith(
         [product, variant],
@@ -11681,13 +11718,14 @@ ${formattedMessage}`;
       // Deprecated by Shopify
       option3: getOptionByIndex(product, variant, 2),
       // Deprecated by Shopify
-      price: deferWith([product, variant], (product2, variant2) => {
-        let price = product2.price;
-        if (variant2.price !== null && variant2.price !== void 0) {
-          price = variant2.price;
+      price: deferWith(
+        [product, variant],
+        (product2, variant2) => {
+          return instance.toShopifyPrice(
+            getPriceField(product2, variant2, "price")
+          );
         }
-        return instance.toShopifyPrice(price);
-      }),
+      ),
       product: deferWith(product, (product2) => {
         return ShopifyProduct(
           instance,
@@ -11726,7 +11764,11 @@ ${formattedMessage}`;
       store_availabilities: [],
       taxable: true,
       title: defer(() => variant.name),
-      unit_price: defer(() => instance.toShopifyPrice(variant.price)),
+      unit_price: defer(
+        () => instance.toShopifyPrice(
+          getPriceField(product, variant, "price")
+        )
+      ),
       unit_price_measurement: void 0,
       url: defer(() => product.url),
       weight: defer(() => variant.weight),
@@ -11750,6 +11792,9 @@ ${formattedMessage}`;
       return variant2.option_value_ids.map((id) => optionValuesById[id]).filter(Boolean);
     });
   }
+  function getPriceField(product, variant, field) {
+    return variant[field] ?? product[field];
+  }
   function getOptionByIndex(product, variant, index) {
     return deferWith(
       [product, variant],
@@ -12177,7 +12222,12 @@ ${formattedMessage}`;
           return instance.toShopifyPrice(product2.price);
         }
         const max = product2.variants.results.reduce(
-          (max2, variant) => Math.max(max2, variant.price),
+          (max2, variant) => {
+            if (variant.price === void 0 || variant.price === null) {
+              return max2;
+            }
+            return Math.max(max2, variant.price);
+          },
           0
         );
         return instance.toShopifyPrice(max);
@@ -12187,7 +12237,12 @@ ${formattedMessage}`;
           return instance.toShopifyPrice(product2.price);
         }
         const min = product2.variants.results.reduce(
-          (min2, variant) => Math.min(min2, variant.price),
+          (min2, variant) => {
+            if (variant.price === void 0 || variant.price === null) {
+              return min2;
+            }
+            return Math.min(min2, variant.price);
+          },
           Infinity
         );
         return instance.toShopifyPrice(min);
@@ -12197,7 +12252,7 @@ ${formattedMessage}`;
           return false;
         }
         return product2.variants.results.some(
-          (variant) => variant.price !== product2.price
+          (variant) => variant.price !== void 0 && variant.price !== null && variant.price !== product2.price
         );
       }),
       published_at: deferWith(
@@ -12936,8 +12991,8 @@ ${formattedMessage}`;
   }
 
   // src/compatibility/drops/money.ts
-  var import_liquidjs5 = __require("liquidjs");
-  var MoneyDrop = class extends import_liquidjs5.Drop {
+  var import_liquidjs6 = __require("liquidjs");
+  var MoneyDrop = class extends import_liquidjs6.Drop {
     constructor(value, decimals, currency) {
       super();
       this.value = value;
@@ -13321,10 +13376,13 @@ ${formattedMessage}`;
     if (search instanceof ShopifyResource) {
       return search.clone();
     }
+    if (search instanceof StorefrontResource) {
+      search = cloneStorefrontResource(search);
+    }
     return new ShopifyResource({
-      performed: defer(() => search.performed),
+      performed: deferWith(search, (search2) => search2.performed),
       resources: ShopifyPredictiveSearchResources(instance, search),
-      terms: defer(() => search.query),
+      terms: deferWith(search, (search2) => search2.query),
       types: ["product"]
     });
   }
@@ -13395,6 +13453,9 @@ ${formattedMessage}`;
     if (search instanceof ShopifyResource) {
       return search.clone();
     }
+    if (search instanceof StorefrontResource) {
+      search = cloneStorefrontResource(search);
+    }
     const resolveProducts = makeProductsCollectionResolve(
       instance,
       search,
@@ -13530,8 +13591,8 @@ ${formattedMessage}`;
   }
 
   // src/compatibility/drops/all_products.ts
-  var import_liquidjs6 = __require("liquidjs");
-  var AllProductsDrop = class extends import_liquidjs6.Drop {
+  var import_liquidjs7 = __require("liquidjs");
+  var AllProductsDrop = class extends import_liquidjs7.Drop {
     #instance;
     #map;
     constructor(instance) {
@@ -13573,8 +13634,8 @@ ${formattedMessage}`;
   };
 
   // src/compatibility/drops/articles.ts
-  var import_liquidjs7 = __require("liquidjs");
-  var ArticlesDrop = class extends import_liquidjs7.Drop {
+  var import_liquidjs8 = __require("liquidjs");
+  var ArticlesDrop = class extends import_liquidjs8.Drop {
     #instance;
     #map;
     constructor(instance) {
@@ -13616,8 +13677,8 @@ ${formattedMessage}`;
   };
 
   // src/compatibility/drops/blogs.ts
-  var import_liquidjs8 = __require("liquidjs");
-  var BlogsDrop = class extends import_liquidjs8.Drop {
+  var import_liquidjs9 = __require("liquidjs");
+  var BlogsDrop = class extends import_liquidjs9.Drop {
     #instance;
     #map;
     constructor(instance) {
@@ -13663,7 +13724,7 @@ ${formattedMessage}`;
   };
 
   // src/compatibility/drops/collections.ts
-  var import_liquidjs9 = __require("liquidjs");
+  var import_liquidjs10 = __require("liquidjs");
   var AllCategoryResource = class extends StorefrontResource {
     constructor(instance) {
       super(() => {
@@ -13677,7 +13738,7 @@ ${formattedMessage}`;
       });
     }
   };
-  var CollectionsDrop = class extends import_liquidjs9.Drop {
+  var CollectionsDrop = class extends import_liquidjs10.Drop {
     #instance;
     #map;
     constructor(instance) {
@@ -13794,8 +13855,8 @@ ${formattedMessage}`;
   };
 
   // src/compatibility/drops/images.ts
-  var import_liquidjs10 = __require("liquidjs");
-  var ImagesDrop = class extends import_liquidjs10.Drop {
+  var import_liquidjs11 = __require("liquidjs");
+  var ImagesDrop = class extends import_liquidjs11.Drop {
     #instance;
     #map;
     constructor(instance) {
@@ -13849,8 +13910,8 @@ ${formattedMessage}`;
   };
 
   // src/compatibility/drops/object-handles.ts
-  var import_liquidjs11 = __require("liquidjs");
-  var ObjectHandlesDrop = class extends import_liquidjs11.Drop {
+  var import_liquidjs12 = __require("liquidjs");
+  var ObjectHandlesDrop = class extends import_liquidjs12.Drop {
     #map;
     constructor(map) {
       super();
@@ -13890,8 +13951,8 @@ ${formattedMessage}`;
   };
 
   // src/compatibility/drops/pages.ts
-  var import_liquidjs12 = __require("liquidjs");
-  var PagesDrop = class extends import_liquidjs12.Drop {
+  var import_liquidjs13 = __require("liquidjs");
+  var PagesDrop = class extends import_liquidjs13.Drop {
     #instance;
     #map;
     constructor(instance) {
@@ -14590,29 +14651,6 @@ ${injects.join("\n")}<\/script>`;
     }
   };
 
-  // src/compatibility/drops/template.ts
-  var import_liquidjs13 = __require("liquidjs");
-  var TemplateDrop = class extends import_liquidjs13.Drop {
-    constructor(name, directory, suffix) {
-      super();
-      this.name = name;
-      this.directory = directory;
-      this.suffix = suffix;
-    }
-    valueOf() {
-      return this.name;
-    }
-  };
-
-  // src/compatibility/shopify-objects/template.ts
-  function ShopifyTemplate(instance, template) {
-    return new TemplateDrop(
-      instance.getPageType(template.name),
-      template.path,
-      template.alt_name
-    );
-  }
-
   // src/liquid/drops/render.ts
   var import_liquidjs14 = __require("liquidjs");
   var import_lodash_es8 = __require("lodash-es");
@@ -15271,12 +15309,12 @@ ${injects.join("\n")}<\/script>`;
           });
         });
         if (output && schema && settings) {
-          const { shopify_compatibility: shopifyCompatibility } = liquidSwell.theme.globals;
           const tag = schema.tag || "div";
-          const id = `${shopifyCompatibility ? "shopify" : "swell"}-section-${settings.id || this.fileName}`;
-          const className = shopifyCompatibility ? "shopify-section" : "swell-section";
+          const sectionClassName = liquidSwell.theme.getSectionClassName();
+          const sectionIdPrefix = liquidSwell.theme.getSectionIdPrefix();
+          const id = `${sectionIdPrefix}-${settings.id || this.fileName}`;
           emitter.write(
-            `<${tag} id="${id}" class="${className} ${schema.class || ""}">${output}</${tag}>`
+            `<${tag} id="${id}" class="${sectionClassName} ${schema.class || ""}">${output}</${tag}>`
           );
         }
       }
@@ -15308,12 +15346,13 @@ ${injects.join("\n")}<\/script>`;
           const sectionConfigs = yield liquidSwell.renderPageSections(
             sectionGroup
           );
-          const { shopify_compatibility: shopifyCompatibility } = liquidSwell.theme.globals;
+          const sectionClassName = liquidSwell.theme.getSectionClassName();
+          const sectionIdPrefix = liquidSwell.theme.getSectionIdPrefix();
           emitter.write(
             `<div id="swell-section-group__${this.fileName}">${sectionConfigs.map((section) => {
               const tag = section.tag || "div";
-              const id = `${shopifyCompatibility ? "shopify" : "swell"}-section-sections--${themeConfig.hash}__${section.id}`;
-              const className = shopifyCompatibility ? `shopify-section shopify-section-group-${this.fileName} section-${section.id}` : `swell-section swell-section-group-${this.fileName} section-${section.id}`;
+              const id = `${sectionIdPrefix}-sections--${themeConfig.hash}__${section.id}`;
+              const className = `${sectionClassName} ${sectionClassName}-group-${this.fileName} section-${section.id}`;
               return `<${tag} id="${id}" class="${className} ${section.class || ""}">${section.output}</${tag}>`;
             }).join("")}</div>`
           );
@@ -15498,7 +15537,7 @@ ${injects.join("\n")}<\/script>`;
   };
   function bindTags(liquidSwell) {
     Object.entries(tags).forEach(
-      ([tag, bind65]) => liquidSwell.registerTag(tag, bind65(liquidSwell))
+      ([tag, bind66]) => liquidSwell.registerTag(tag, bind66(liquidSwell))
     );
   }
 
@@ -16051,8 +16090,17 @@ ${injects.join("\n")}<\/script>`;
     };
   }
 
+  // src/liquid/filters/minus.ts
+  function bind47(_liquidSwell) {
+    return (first, second) => {
+      const firstValue = isNumber(first) ? first : 0;
+      const secondValue = isNumber(second) ? second : 0;
+      return firstValue - secondValue;
+    };
+  }
+
   // src/liquid/filters/money.ts
-  function bind47(liquidSwell) {
+  function bind48(liquidSwell) {
     return function filterMoney(value) {
       const amount = getMoneyAmount(liquidSwell, value);
       return liquidSwell.renderCurrency(amount);
@@ -16069,7 +16117,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/money_with_currency.ts
-  function bind48(liquidSwell) {
+  function bind49(liquidSwell) {
     return function filterMoneyWithCurrency(value) {
       const { currency } = liquidSwell.theme.swell.getStorefrontLocalization();
       const amount = getMoneyAmount(liquidSwell, value);
@@ -16078,7 +16126,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/money_without_currency.ts
-  function bind49(liquidSwell) {
+  function bind50(liquidSwell) {
     return function filterMoneyWithoutCurrency(value) {
       const amount = getMoneyAmount(liquidSwell, value);
       return liquidSwell.renderCurrency(amount).replace(/[^0-9.,]/g, "");
@@ -16086,7 +16134,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/money_without_trailing_zeros.ts
-  function bind50(liquidSwell) {
+  function bind51(liquidSwell) {
     return function filterMoneyWithoutTrailingZeros(value) {
       const amount = getMoneyAmount(liquidSwell, value);
       return liquidSwell.renderCurrency(amount).split(".")[0].split(",")[0];
@@ -16094,21 +16142,21 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/script_tag.ts
-  function bind51(_liquidSwell) {
+  function bind52(_liquidSwell) {
     return function filterScriptTag(assetUrl) {
       return `<script src="${assetUrl}" type="text/javascript"><\/script>`;
     };
   }
 
   // src/liquid/filters/stylesheet_tag.ts
-  function bind52(_liquidSwell) {
+  function bind53(_liquidSwell) {
     return function filterStyleSheetTag(assetUrl) {
       return `<link href="${assetUrl}" rel="stylesheet" type="text/css" media="all" />`;
     };
   }
 
   // src/liquid/filters/time_tag.ts
-  function bind53(_liquidSwell) {
+  function bind54(_liquidSwell) {
     const dateFilter = bind33(_liquidSwell);
     return (dateValue, ...params) => {
       const date = ensureDate(dateValue);
@@ -16119,7 +16167,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/translate.ts
-  function bind54(liquidSwell) {
+  function bind55(liquidSwell) {
     return async function filterTranslate(key, params) {
       const props = params && paramsToProps(params);
       const str = await liquidSwell.renderTranslation(key, props);
@@ -16128,7 +16176,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/where.ts
-  function bind55(_liquidSwell) {
+  function bind56(_liquidSwell) {
     return function* filterWhere(arr, property, expected) {
       const results = [];
       const list = yield resolveEnumerable(arr);
@@ -16182,7 +16230,7 @@ ${injects.join("\n")}<\/script>`;
       height: height ? Number(height) : void 0
     };
   }
-  function bind56(liquidSwell) {
+  function bind57(liquidSwell) {
     return async function filterAssetImgUrl(assetPath, size = "small") {
       const imageUrl = await liquidSwell.getAssetUrl(assetPath).then((url) => url || "");
       const sizes = getSizesFromParam(size);
@@ -16198,14 +16246,14 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/shopify/hex_to_rgba.ts
-  function bind57(_liquidSwell) {
+  function bind58(_liquidSwell) {
     return (color, alpha) => {
       return ThemeColor.get(color).rgba(alpha || 1);
     };
   }
 
   // src/liquid/filters/shopify/img_url.ts
-  function bind58(_liquidSwell) {
+  function bind59(_liquidSwell) {
     return function filterImgUrl(input, ...params) {
       if (!input) return "";
       let url;
@@ -16250,14 +16298,14 @@ ${injects.join("\n")}<\/script>`;
   };
 
   // src/liquid/filters/shopify/payment_button.ts
-  function bind59(_liquidSwell) {
+  function bind60(_liquidSwell) {
     return (form) => {
       return null;
     };
   }
 
   // src/liquid/filters/shopify/payment_terms.ts
-  function bind60(_liquidSwell) {
+  function bind61(_liquidSwell) {
     return (form) => {
       return null;
     };
@@ -16359,7 +16407,7 @@ ${injects.join("\n")}<\/script>`;
   var placeholder_svgs_default = svgs;
 
   // src/liquid/filters/shopify/placeholder_svg_tag.ts
-  function bind61(_liquidSwell) {
+  function bind62(_liquidSwell) {
     return function filterPlaceholderSvgTag(name, className) {
       const svg = placeholder_svgs_default[name];
       if (typeof svg === "object" && svg !== null) {
@@ -16370,7 +16418,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/shopify/shopify_asset_url.ts
-  function bind62(_liquidSwell) {
+  function bind63(_liquidSwell) {
     return function filterShopifyAssetUrl(input) {
       if (typeof input === "string") {
         switch (input) {
@@ -16395,7 +16443,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/shopify/structured_data.ts
-  function bind63(_liquidSwell) {
+  function bind64(_liquidSwell) {
     return async function filterStructuredData(input) {
       let value = input;
       if (value instanceof StorefrontResource) {
@@ -16473,7 +16521,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/filters/inline_editable.ts
-  function bind64(_liquidSwell) {
+  function bind65(_liquidSwell) {
     return (value, key) => {
       if (typeof value === "object" && "value" in value) {
         value = value.value;
@@ -16517,29 +16565,30 @@ ${injects.join("\n")}<\/script>`;
     json: bind44,
     json_pretty: bind45,
     locale_flag: bind46,
-    money: bind47,
-    money_with_currency: bind48,
-    money_without_currency: bind49,
-    money_without_trailing_zeros: bind50,
-    script_tag: bind51,
-    stylesheet_tag: bind52,
-    time_tag: bind53,
-    translate: bind54,
-    t: bind54,
+    minus: bind47,
+    money: bind48,
+    money_with_currency: bind49,
+    money_without_currency: bind50,
+    money_without_trailing_zeros: bind51,
+    script_tag: bind52,
+    stylesheet_tag: bind53,
+    time_tag: bind54,
+    translate: bind55,
+    t: bind55,
     // alias
-    where: bind55,
+    where: bind56,
     // Shopify compatibility only
-    asset_img_url: bind56,
-    hex_to_rgba: bind57,
-    img_url: bind58,
+    asset_img_url: bind57,
+    hex_to_rgba: bind58,
+    img_url: bind59,
     item_count_for_variant: item_count_for_variant_default,
-    payment_button: bind59,
-    payment_terms: bind60,
-    placeholder_svg_tag: bind61,
-    shopify_asset_url: bind62,
-    structured_data: bind63,
+    payment_button: bind60,
+    payment_terms: bind61,
+    placeholder_svg_tag: bind62,
+    shopify_asset_url: bind63,
+    structured_data: bind64,
     // Swell only
-    inline_editable: bind64
+    inline_editable: bind65
   };
   function bindFilters(liquidSwell) {
     for (const [tag, handler] of Object.entries(filters)) {
@@ -16553,8 +16602,8 @@ ${injects.join("\n")}<\/script>`;
       }
     }
   }
-  function bindWithResolvedProps(liquidSwell, bind65, resolve = []) {
-    const handler = bind65(liquidSwell);
+  function bindWithResolvedProps(liquidSwell, bind66, resolve = []) {
+    const handler = bind66(liquidSwell);
     if (!Array.isArray(resolve)) {
       return handler;
     }
@@ -16616,7 +16665,8 @@ ${injects.join("\n")}<\/script>`;
       if (isArray(l)) return l.some((i) => equal(i, r));
       if (isFunction(l?.indexOf)) return l.indexOf(toValue(r)) > -1;
       return false;
-    }
+    },
+    ",": (l, r) => `${l},${r}`
   };
   function equal(lhs, rhs) {
     if (isComparable(lhs)) return lhs.equals(rhs);
@@ -16771,7 +16821,7 @@ ${injects.join("\n")}<\/script>`;
   }
 
   // src/liquid/index.ts
-  var LiquidSwell30 = class extends import_liquidjs34.Liquid {
+  var LiquidSwell31 = class extends import_liquidjs34.Liquid {
     theme;
     getThemeConfig;
     getThemeTemplateConfigByType;
@@ -17445,7 +17495,7 @@ ${injects.join("\n")}<\/script>`;
       this.resources = resources;
       this.dynamicAssetUrl = dynamicAssetUrl;
       this.shopifyCompatibilityClass = shopifyCompatibilityClass || ShopifyCompatibility2;
-      this.liquidSwell = new LiquidSwell30({
+      this.liquidSwell = new LiquidSwell31({
         theme: this,
         getThemeConfig: this.getThemeConfig.bind(this),
         getAssetUrl: this.getAssetUrl.bind(this),
@@ -18363,6 +18413,12 @@ ${content.slice(pos)}`;
     isShopify1HomePage(pageId, pageContent) {
       return Boolean(pageId === "index" && typeof pageContent === "string");
     }
+    getSectionClassName() {
+      return this.shopifyCompatibility ? "shopify-section" : "swell-section";
+    }
+    getSectionIdPrefix() {
+      return this.shopifyCompatibility ? "shopify-section" : "swell-section";
+    }
     async renderAllSections(sectionsIds, pageData) {
       const sections = typeof sectionsIds === "string" ? sectionsIds.split(/\s*,\s*/) : sectionsIds;
       const sectionsRendered = await Promise.all(
@@ -18370,18 +18426,14 @@ ${content.slice(pos)}`;
           return this.renderSection(sectionId, pageData);
         })
       );
+      const sectionClassName = this.getSectionClassName();
+      const sectionIdPrefix = this.getSectionIdPrefix();
       return sectionsRendered.reduce(
         (acc, section, index) => {
           const sectionId = sections[index];
-          if (this.shopifyCompatibility) {
-            acc[sectionId] = `
-          <div id="shopify-section-${sectionId}" class="shopify-section">${String(section)}</div>
+          acc[sectionId] = `
+          <div id="${sectionIdPrefix}-${sectionId}" class="${sectionClassName}">${String(section)}</div>
         `.trim();
-          } else {
-            acc[sectionId] = `
-          <div id="swell-section-${sectionId}" class="swell-section">${String(section)}</div>
-        `.trim();
-          }
           return acc;
         },
         {}