@faststore/core 3.80.0 → 3.82.0

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @faststore/core@3.79.1 prebuild /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.81.0 prebuild /home/runner/work/faststore/faststore/packages/core
 > na run partytown && na run generate
 
 
-> @faststore/core@3.79.1 partytown /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.81.0 partytown /home/runner/work/faststore/faststore/packages/core
 > partytown copylib ./public/~partytown
 
 Partytown lib copied to: /home/runner/work/faststore/faststore/packages/core/public/~partytown
 
-> @faststore/core@3.79.1 generate /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.81.0 generate /home/runner/work/faststore/faststore/packages/core
 > na run generate:schema && na run generate:codegen && na run format:generated
 
 
-> @faststore/core@3.79.1 generate:schema /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.81.0 generate:schema /home/runner/work/faststore/faststore/packages/core
 > tsx src/server/generator/generateGraphQLSchemaFile.ts
 
 Schema GraphQL file generated successfully
 
-> @faststore/core@3.79.1 generate:codegen /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.81.0 generate:codegen /home/runner/work/faststore/faststore/packages/core
 > graphql-codegen
 
 [STARTED] Parse Configuration
@@ -37,11 +37,11 @@ Running lifecycle hook "afterStart" scripts...
 [CLI] Loading Documents
 [CLI] Generating output
 
-> @faststore/core@3.79.1 format:generated /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.81.0 format:generated /home/runner/work/faststore/faststore/packages/core
 > prettier --write "@generated/**/*.{ts,js,tsx,jsx,json}" --loglevel error
 
 
-> @faststore/core@3.79.1 build /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.81.0 build /home/runner/work/faststore/faststore/packages/core
 > next build
 
 ⚠ No build cache found. Please configure build caching for faster rebuilds. Read more: https://nextjs.org/docs/messages/no-cache
@@ -83,8 +83,8 @@ Route (pages)                              Size     First Load JS
 ├   └ css/6d92375b6ee8276a.css             16.1 kB
 ├ ○ /404                                   1.55 kB         138 kB
 ├ ● /500                                   1.55 kB         138 kB
-├ λ /account                               240 B           106 kB
-├ ● /account/[...unknown]                  281 B           106 kB
+├ λ /account                               240 B           107 kB
+├ ● /account/[...unknown]                  281 B           107 kB
 ├ λ /account/403                           2.44 kB         139 kB
 ├   └ css/b7bba8fce075688b.css             4.2 kB
 ├ λ /account/404                           2.13 kB         139 kB
@@ -93,24 +93,24 @@ Route (pages)                              Size     First Load JS
 ├   └ css/38e3a4a55b13b062.css             12.7 kB
 ├ λ /account/orders/[id]                   12.1 kB         149 kB
 ├   └ css/297be4be3be36ff0.css             12.6 kB
-├ λ /account/profile                       1.79 kB         138 kB
+├ λ /account/profile                       1.79 kB         139 kB
 ├   └ css/831a1f72fe4b2d80.css             3.97 kB
-├ λ /account/security                      3.76 kB         140 kB
+├ λ /account/security                      3.76 kB         141 kB
 ├   └ css/ec7fdad03808422d.css             5.22 kB
-├ λ /account/user-details                  1.74 kB         138 kB
+├ λ /account/user-details                  1.74 kB         139 kB
 ├   └ css/e46393a76c5d93a9.css             4.17 kB
 ├ λ /api/graphql                           0 B             106 kB
 ├ λ /api/health/live                       0 B             106 kB
 ├ λ /api/health/ready                      0 B             106 kB
 ├ λ /api/preview                           0 B             106 kB
-├ ● /checkout                              737 B           137 kB
+├ ● /checkout                              737 B           138 kB
 ├ ● /login                                 1.68 kB         138 kB
 └ ● /s                                     3.3 kB          155 kB
 + First Load JS shared by all              110 kB
   ├ chunks/framework-807b0f81cbc129f0.js   45.4 kB
   ├ chunks/main-f658704b53a96ab1.js        33.1 kB
-  ├ chunks/pages/_app-57478e0d1d2ddf62.js  23.8 kB
-  ├ chunks/webpack-d29ca7e9684f9a33.js     3.85 kB
+  ├ chunks/pages/_app-cdb132efa1562b88.js  24.1 kB
+  ├ chunks/webpack-70daccedc5bafd4f.js     3.85 kB
   └ css/4b8252ed2f23ac67.css               3.51 kB
 
 λ  (Server)  server-side renders at runtime (uses getInitialProps or getServerSideProps)

package/.turbo/turbo-test.log

@@ -1,14 +1,14 @@
 
-> @faststore/core@3.79.1 test /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.81.0 test /home/runner/work/faststore/faststore/packages/core
 > jest
 
-PASS test/server/cms/global.test.ts (26.231 s)
-PASS test/utils/multipleTemplates.test.ts (26.775 s)
+PASS test/utils/multipleTemplates.test.ts (26.552 s)
+PASS test/server/cms/global.test.ts (27.109 s)
 PASS test/server/cms/index.test.ts
-PASS test/server/index.test.ts (30.564 s)
+PASS test/server/index.test.ts (30.406 s)
 
 Test Suites: 4 passed, 4 total
 Tests:       22 passed, 22 total
 Snapshots:   0 total
-Time:        31.888 s
+Time:        31.589 s
 Ran all test suites.

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.82.0](https://github.com/vtex/faststore/compare/v3.81.0...v3.82.0) (2025-09-05)
+
+### Features
+
+- Delivery Promise 2.1 - filters by Delivery Option ([#2926](https://github.com/vtex/faststore/issues/2926)) ([d365a5e](https://github.com/vtex/faststore/commit/d365a5ea0da451a58c87fd6bcfd7f49df2c96158)), closes [#2928](https://github.com/vtex/faststore/issues/2928) [#2930](https://github.com/vtex/faststore/issues/2930) [#2937](https://github.com/vtex/faststore/issues/2937)
+
+# 3.81.0 (2025-09-05)
+
+### Features
+
+- Allow users to select which CMS builder to use ([#2997](https://github.com/vtex/faststore/issues/2997)) ([3862832](https://github.com/vtex/faststore/commit/3862832aaf366453b8a26844e2c452647a534b4d))
+
 # 3.80.0 (2025-09-04)
 
 ### Bug Fixes

package/cms/faststore/content-types.json

@@ -234,6 +234,27 @@
                       }
                     }
                   }
+                },
+                "deliveryOptions": {
+                  "title": "PLP/Search Filter: Delivery Options",
+                  "type": "object",
+                  "properties": {
+                    "enabled": {
+                      "title": "Should enable Delivery Options?",
+                      "type": "boolean",
+                      "default": true
+                    },
+                    "title": {
+                      "title": "Delivery Options title",
+                      "type": "string",
+                      "default": "Delivery Option"
+                    },
+                    "allDeliveryOptions": {
+                      "title": "All delivery options label",
+                      "type": "string",
+                      "default": "All delivery options"
+                    }
+                  }
                 }
               }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "3.80.0",
+  "version": "3.82.0",
   "license": "MIT",
   "repository": "vtex/faststore",
   "browserslist": "supports es6-module and not dead",
@@ -44,11 +44,11 @@
     "@envelop/graphql-jit": "^8.0.3",
     "@envelop/parser-cache": "^6.0.2",
     "@envelop/validation-cache": "^6.0.2",
-    "@faststore/api": "^3.80.0",
-    "@faststore/graphql-utils": "^3.80.0",
-    "@faststore/lighthouse": "^3.80.0",
-    "@faststore/sdk": "^3.80.0",
-    "@faststore/ui": "^3.80.0",
+    "@faststore/api": "^3.82.0",
+    "@faststore/graphql-utils": "^3.81.0",
+    "@faststore/lighthouse": "^3.81.0",
+    "@faststore/sdk": "^3.81.0",
+    "@faststore/ui": "^3.81.0",
     "@graphql-codegen/cli": "5.0.2",
     "@graphql-codegen/client-preset": "4.2.6",
     "@graphql-codegen/typescript": "4.0.7",
@@ -108,5 +108,5 @@
     "ts-jest": "29.1.1",
     "typescript": "5.3.2"
   },
-  "gitHead": "1b4a2efd041bfbd78d6848e5da407d1fe0d3c66b"
+  "gitHead": "8037b2c4dccc4add6e048c8082942a6744187f54"
 }

package/src/components/search/Filter/FilterDeliveryMethodFacet.tsx

@@ -1,17 +1,11 @@
 import { regionSliderTypes, Button as UIButton, useUI } from '@faststore/ui'
+import type { StoreFacetValueBoolean } from '@generated/graphql'
 import { sessionStore } from 'src/sdk/session'
 import type { GlobalCmsData } from 'src/utils/globalSettings'
 import { textToTitleCase } from 'src/utils/utilities'
 
-interface FacetValue {
-  value: string
-  label: string
-  selected: boolean
-  quantity: number
-}
-
 interface FilterDeliveryMethodFacetProps {
-  item: FacetValue
+  item: StoreFacetValueBoolean
   deliveryMethods: GlobalCmsData['deliveryPromise']['deliveryMethods']
 }
 

package/src/components/search/Filter/FilterDesktop.tsx

@@ -18,8 +18,8 @@ import type { useFilter } from 'src/sdk/search/useFilter'
 import type { FilterSliderProps } from './FilterSlider'
 
 import {
-  useDeliveryPromise,
   PICKUP_ALL_FACET_VALUE,
+  useDeliveryPromise,
 } from 'src/sdk/deliveryPromise'
 import { getGlobalSettings } from 'src/utils/globalSettings'
 import FilterDeliveryMethodFacet from './FilterDeliveryMethodFacet'
@@ -48,6 +48,7 @@ function FilterDesktop({
   const {
     facets: filteredFacets,
     deliveryLabel,
+    deliveryOptionsLabel,
     isPickupAllEnabled,
     shouldDisplayDeliveryButton,
     onDeliveryFacetChange,
@@ -92,17 +93,24 @@ function FilterDesktop({
           const index = shouldDisplayDeliveryButton ? idx + 1 : idx
           const { __typename: type, label } = facet
           const isExpanded = expanded.has(index)
-          const isDeliveryFacet = facet.key === 'shipping'
+          const isDeliveryMethodFacet = facet.key === 'shipping'
+          const isDeliveryOptionFacet = facet.key === 'delivery-options'
+
+          const sectionLabel = isDeliveryMethodFacet
+            ? deliveryLabel
+            : isDeliveryOptionFacet
+              ? deliveryOptionsLabel
+              : label
 
           return (
             <UIFilterFacets
-              key={`${testId}-${label}-${index}`}
+              key={`${testId}-${sectionLabel}-${index}`}
               testId={testId}
               index={index}
               type={type}
-              label={isDeliveryFacet ? deliveryLabel : label}
+              label={sectionLabel}
               description={
-                isDeliveryFacet
+                isDeliveryMethodFacet
                   ? deliveryPromiseSettings?.deliveryMethods?.description
                   : undefined
               }
@@ -126,7 +134,7 @@ function FilterDesktop({
                           quantity={item.quantity}
                           facetKey={facet.key}
                           label={
-                            isDeliveryFacet ? (
+                            isDeliveryMethodFacet ? (
                               <FilterDeliveryMethodFacet
                                 item={item}
                                 deliveryMethods={
@@ -137,7 +145,11 @@ function FilterDesktop({
                               item.label
                             )
                           }
-                          type={isDeliveryFacet ? 'radio' : 'checkbox'}
+                          type={
+                            isDeliveryMethodFacet || isDeliveryOptionFacet
+                              ? 'radio'
+                              : 'checkbox'
+                          }
                         />
                       )
                   )}

package/src/components/search/Filter/FilterSlider.tsx

@@ -12,17 +12,16 @@ import {
   type FilterSliderProps as UIFilterSliderProps,
   type IconProps as UIIconProps,
 } from '@faststore/ui'
-
 import { useFormattedPrice } from 'src/sdk/product/useFormattedPrice'
 
 import type { Filter_FacetsFragment } from '@generated/graphql'
 import FilterDeliveryMethodFacet from './FilterDeliveryMethodFacet'
 
-import type { useFilter } from 'src/sdk/search/useFilter'
 import {
-  useDeliveryPromise,
   PICKUP_ALL_FACET_VALUE,
+  useDeliveryPromise,
 } from 'src/sdk/deliveryPromise'
+import type { useFilter } from 'src/sdk/search/useFilter'
 import { getGlobalSettings } from 'src/utils/globalSettings'
 
 import styles from './section.module.scss'
@@ -104,6 +103,7 @@ function FilterSlider({
   const {
     facets: filteredFacets,
     deliveryLabel,
+    deliveryOptionsLabel,
     isPickupAllEnabled,
     shouldDisplayDeliveryButton,
     onDeliveryFacetChange,
@@ -190,17 +190,24 @@ function FilterSlider({
             const index = shouldDisplayDeliveryButton ? idx + 1 : idx
             const { __typename: type, label } = facet
             const isExpanded = expanded.has(index)
-            const isDeliveryFacet = facet.key === 'shipping'
+            const isDeliveryMethodFacet = facet.key === 'shipping'
+            const isDeliveryOptionFacet = facet.key === 'delivery-options'
+
+            const sectionLabel = isDeliveryMethodFacet
+              ? deliveryLabel
+              : isDeliveryOptionFacet
+                ? deliveryOptionsLabel
+                : label
 
             return (
               <UIFilterFacets
-                key={`${testId}-${label}-${index}`}
+                key={`${testId}-${sectionLabel}-${index}`}
                 testId={`mobile-${testId}`}
                 index={index}
                 type={type}
-                label={isDeliveryFacet ? deliveryLabel : label}
+                label={sectionLabel}
                 description={
-                  isDeliveryFacet
+                  isDeliveryMethodFacet
                     ? deliveryPromiseSettings?.deliveryMethods?.description
                     : undefined
                 }
@@ -226,7 +233,7 @@ function FilterSlider({
                             quantity={item.quantity}
                             facetKey={facet.key}
                             label={
-                              isDeliveryFacet ? (
+                              isDeliveryMethodFacet ? (
                                 <FilterDeliveryMethodFacet
                                   item={item}
                                   deliveryMethods={
@@ -237,7 +244,11 @@ function FilterSlider({
                                 item.label
                               )
                             }
-                            type={isDeliveryFacet ? 'radio' : 'checkbox'}
+                            type={
+                              isDeliveryMethodFacet || isDeliveryOptionFacet
+                                ? 'radio'
+                                : 'checkbox'
+                            }
                           />
                         )
                     )}

package/src/components/templates/ProductListingPage/ProductListing.tsx

@@ -1,4 +1,4 @@
-import { formatSearchState, useSearch } from '@faststore/sdk'
+import { useSearch } from '@faststore/sdk'
 import type {
   ServerCollectionPageQueryQuery,
   ServerManyProductsQueryQuery,

package/src/components/ui/ProductGallery/ProductGallery.tsx

@@ -22,8 +22,8 @@ import { useDelayedPagination } from 'src/sdk/search/useDelayedPagination'
 import { useFilter } from 'src/sdk/search/useFilter'
 import useScreenResize from 'src/sdk/ui/useScreenResize'
 
-import styles from '../../sections/ProductGallery/section.module.scss'
 import { useFormattedPrice } from 'src/sdk/product/useFormattedPrice'
+import styles from '../../sections/ProductGallery/section.module.scss'
 
 const ProductGalleryPage = lazy(() => import('./ProductGalleryPage'))
 const FilterSkeleton = dynamic(

package/src/sdk/deliveryPromise/useDeliveryPromise.ts

@@ -26,6 +26,9 @@ export const SHIPPING_FACET_KEY = 'shipping' as const
 export const PICKUP_IN_POINT_FACET_VALUE = 'pickup-in-point' as const
 export const ALL_DELIVERY_METHODS_FACET_VALUE = 'all-delivery-methods' as const
 export const PICKUP_ALL_FACET_VALUE = 'pickup-all' as const
+export const ALL_DELIVERY_OPTIONS_FACET_VALUE = 'all-delivery-options' as const
+export const DELIVERY_OPTIONS_FACET_KEY = 'delivery-options' as const
+export const DYNAMIC_ESTIMATE_FACET_KEY = 'dynamic-estimate' as const
 
 type Facet = SearchState['selectedFacets'][number]
 
@@ -105,6 +108,8 @@ export function useDeliveryPromise({
   } = useDeliveryPromiseContext()
 
   const isDeliveryPromiseEnabled = deliveryPromiseConfig.enabled
+  const isDeliveryOptionsEnabled =
+    deliveryPromiseSettings?.deliveryOptions?.enabled ?? true
 
   const selectedFacets = useMemo(
     () => selectedFilterFacets ?? searchState.selectedFacets,
@@ -199,21 +204,39 @@ export function useDeliveryPromise({
     [defaultPickupPoint, selectedFacets]
   )
 
-  const allDeliveryMethodsFacet = useMemo(
-    () => ({
-      value: ALL_DELIVERY_METHODS_FACET_VALUE,
-      label:
-        deliveryPromiseSettings?.deliveryMethods?.allDeliveryMethods ??
-        'All delivery methods',
-      selected:
-        !selectedFacets.some((facet) => facet.key === SHIPPING_FACET_KEY) ||
-        selectedFacets?.some(
-          (facet) =>
-            facet.key === SHIPPING_FACET_KEY &&
-            facet.value === ALL_DELIVERY_METHODS_FACET_VALUE
-        ),
-      quantity: 0,
-    }),
+  const [allDeliveryMethodsFacet, allDeliveryOptionsFacet] = useMemo(
+    () => [
+      {
+        value: ALL_DELIVERY_METHODS_FACET_VALUE,
+        label:
+          deliveryPromiseSettings?.deliveryMethods?.allDeliveryMethods ??
+          'All delivery methods',
+        selected:
+          !selectedFacets.some(({ key }) => key === SHIPPING_FACET_KEY) ||
+          selectedFacets?.some(
+            ({ key, value }) =>
+              key === SHIPPING_FACET_KEY &&
+              value === ALL_DELIVERY_METHODS_FACET_VALUE
+          ),
+        quantity: 0,
+      },
+      {
+        value: ALL_DELIVERY_OPTIONS_FACET_VALUE,
+        label:
+          deliveryPromiseSettings?.deliveryOptions?.allDeliveryOptions ??
+          'All delivery options',
+        selected:
+          !selectedFacets.some(
+            ({ key }) => key === DELIVERY_OPTIONS_FACET_KEY
+          ) ||
+          selectedFacets?.some(
+            ({ key, value }) =>
+              key === DELIVERY_OPTIONS_FACET_KEY &&
+              value === ALL_DELIVERY_OPTIONS_FACET_VALUE
+          ),
+        quantity: 0,
+      },
+    ],
     [selectedFacets, deliveryPromiseSettings, pickupInPointFacet]
   )
 
@@ -272,61 +295,100 @@ export function useDeliveryPromise({
     if (!allFacets) return []
 
     return !isDeliveryPromiseEnabled || !postalCode
-      ? allFacets.filter(({ key }) => key !== SHIPPING_FACET_KEY)
-      : allFacets.map((facet) => {
-          if (
-            facet.key !== SHIPPING_FACET_KEY ||
-            facet.__typename !== 'StoreFacetBoolean'
-          )
-            return facet
+      ? allFacets.filter(
+          ({ key }) =>
+            key !== SHIPPING_FACET_KEY &&
+            key !== DELIVERY_OPTIONS_FACET_KEY &&
+            key !== DYNAMIC_ESTIMATE_FACET_KEY
+        )
+      : allFacets
+          .filter(({ key }) => key !== DYNAMIC_ESTIMATE_FACET_KEY) // TODO: remove this filter when dynamic estimate is implemented
+          .filter(({ key }) => {
+            if (
+              !isDeliveryOptionsEnabled &&
+              key === DELIVERY_OPTIONS_FACET_KEY
+            ) {
+              return false
+            }
+
+            return true
+          })
+          .map((facet) => {
+            if (facet.__typename !== 'StoreFacetBoolean') return facet
+
+            if (facet.key === DELIVERY_OPTIONS_FACET_KEY) {
+              facet.values = withUniqueFacet(
+                facet.values,
+                allDeliveryOptionsFacet
+              )
+
+              return facet
+            }
 
-          facet.values = withUniqueFacet(facet.values, allDeliveryMethodsFacet)
-          const pickupInPointFacetIndex = facet.values.findIndex(
-            (item) => item?.value === PICKUP_IN_POINT_FACET_VALUE
-          )
+            if (facet.key !== SHIPPING_FACET_KEY) return facet
 
-          // Remove old pickup `pickup in point` facet from list and search state
-          if (pickupInPointFacetIndex !== -1 && !defaultPickupPoint) {
-            const selectedShippingFacet = selectedFacets.find(
-              ({ key }) => key === SHIPPING_FACET_KEY
+            facet.values = withUniqueFacet(
+              facet.values,
+              allDeliveryMethodsFacet
+            )
+            const pickupInPointFacetIndex = facet.values.findIndex(
+              (item) => item?.value === PICKUP_IN_POINT_FACET_VALUE
             )
 
-            if (selectedShippingFacet) {
-              const selectedPickupInPointFacets = selectedFacets.filter(
-                ({ key, value }) =>
-                  value === PICKUP_IN_POINT_FACET_VALUE ||
-                  key === PICKUP_POINT_FACET_KEY
+            // Remove old pickup `pickup in point` facet from list and search state
+            if (pickupInPointFacetIndex !== -1 && !defaultPickupPoint) {
+              const selectedShippingFacet = selectedFacets.find(
+                ({ key }) => key === SHIPPING_FACET_KEY
               )
 
-              selectedPickupInPointFacets.length
-                ? onDeliveryFacetChange({ facets: selectedPickupInPointFacets })
-                : onDeliveryFacetChange({ facet: selectedShippingFacet })
+              if (selectedShippingFacet) {
+                const selectedPickupInPointFacets = selectedFacets.filter(
+                  ({ key, value }) =>
+                    value === PICKUP_IN_POINT_FACET_VALUE ||
+                    key === PICKUP_POINT_FACET_KEY
+                )
+
+                selectedPickupInPointFacets.length
+                  ? onDeliveryFacetChange({
+                      facets: selectedPickupInPointFacets,
+                    })
+                  : onDeliveryFacetChange({ facet: selectedShippingFacet })
+              }
+
+              // Removes pickupInPointIndex from array
+              facet.values = facet.values.filter(
+                (_, index) => index !== pickupInPointFacetIndex
+              )
+            }
+            // Prevent multiple `pickup in point` facet
+            else if (pickupInPointFacetIndex === -1 && defaultPickupPoint) {
+              facet.values.push(pickupInPointFacet)
+            }
+            // Replace current `pickup-in-point` facet with the updated one
+            else if (
+              facet.values[pickupInPointFacetIndex] &&
+              facet.values[pickupInPointFacetIndex]?.label !==
+                pickupInPointFacet.label
+            ) {
+              facet.values[pickupInPointFacetIndex] = pickupInPointFacet
             }
 
-            // Removes pickupInPointIndex from array
-            facet.values = facet.values.filter(
-              (_, index) => index !== pickupInPointFacetIndex
+            facet.values = facet.values.sort((a, b) =>
+              (a.value ?? '').localeCompare(b.value ?? '')
             )
-          }
-          // Prevent multiple `pickup in point` facet
-          else if (pickupInPointFacetIndex === -1 && defaultPickupPoint) {
-            facet.values.push(pickupInPointFacet)
-          }
-          // Replace current `pickup-in-point` facet with the updated one
-          else if (
-            facet.values[pickupInPointFacetIndex] &&
-            facet.values[pickupInPointFacetIndex]?.label !==
-              pickupInPointFacet.label
-          ) {
-            facet.values[pickupInPointFacetIndex] = pickupInPointFacet
-          }
-
-          facet.values = facet.values.sort((a, b) =>
-            (a.value ?? '').localeCompare(b.value ?? '')
-          )
-
-          return facet
-        })
+
+            return facet
+          })
+          .sort((a, b) => {
+            // Define priority order: shipping (0), delivery-options (1), others (2)
+            const getPriority = (key: string) => {
+              if (key === SHIPPING_FACET_KEY) return 0
+              if (key === DELIVERY_OPTIONS_FACET_KEY) return 1
+              return 2
+            }
+
+            return getPriority(a.key) - getPriority(b.key)
+          })
   }, [
     allDeliveryMethodsFacet,
     pickupInPointFacet,
@@ -395,6 +457,8 @@ export function useDeliveryPromise({
     onDeliveryFacetChange,
     deliveryLabel:
       deliveryPromiseSettings?.deliveryMethods?.title ?? 'Delivery',
+    deliveryOptionsLabel:
+      deliveryPromiseSettings?.deliveryOptions?.title ?? 'Delivery Option',
     isPickupAllEnabled:
       pickupPoints?.length > 0 &&
       (deliveryPromiseSettings?.deliveryMethods?.pickupAll?.enabled ?? false),
@@ -408,10 +472,10 @@ type BoleanFacet = Extract<
 >['values'][number]
 
 function withUniqueFacet(facets: Array<BoleanFacet>, facet: BoleanFacet) {
-  return facets.filter((item) => item.value !== facet.value).concat([facet])
+  return [facet, ...facets.filter((item) => item.value !== facet.value)]
 }
 
-const RADIO_FACETS = ['shipping', 'pickupPoint'] as const
+const RADIO_FACETS = ['shipping', 'pickupPoint', 'delivery-options'] as const
 function isRadioFacet(facet: unknown): facet is (typeof RADIO_FACETS)[number] {
   if (typeof facet !== 'string') return false
 

package/src/server/cms/index.ts

@@ -66,6 +66,8 @@ export const isLocator = (x: any): x is Locator =>
 export const clientCMS = new ClientCMS({
   workspace: config.api.workspace,
   tenant: config.api.storeId,
+  builder:
+    (config.contentSource as Record<string, string>)?.project ?? 'faststore',
   host: sanitizeHost(config.storeUrl),
 })
 

package/src/utils/globalSettings.ts

@@ -58,6 +58,11 @@ type DeliveryPromiseCmsData = {
       alt?: string
     }
   }
+  deliveryOptions?: {
+    enabled?: boolean
+    title?: string
+    allDeliveryOptions?: string
+  }
 }
 
 export function getGlobalSettings(