@shopgate/engage 7.31.4-beta.1 → 7.32.0-beta.2

package/core/constants/merchantSettings.d.ts

@@ -1,12 +1,2 @@
-export const RECEIVE_MERCHANT_SETTINGS: "RECEIVE_MERCHANT_SETTINGS";
-export const MERCHANT_SETTINGS_LOCATION_BASED_SHOPPING_ENABLED: "locationBasedShoppingEnabled";
-export const MERCHANT_SETTINGS_SUBSTITUTION_PREFERENCES_ENABLED: "enableSubstitutionPreferences";
-export const MERCHANT_SETTINGS_CUSTOMER_ATTRIBUTES: "customerAttributes";
-export const MERCHANT_SETTINGS_FULFILLMENT_SCHEDULED_ENABLED: "enableFulfillmentScheduling";
-export const MERCHANT_SETTINGS_RESTRICT_MULTI_LOCATION_ORDERS: "restrictMultiLocationOrders";
-export const MERCHANT_SETTINGS_DEFAULT_CURRENCY: "defaultCurrency";
-export const MERCHANT_SETTINGS_ENABLE_WEB_INDEXING: "enableWebIndexing";
-export const MERCHANT_SETTINGS_PRODUCT_SHOW_ALTERNATIVE_LOCATION: "productShowAlternativeLocation";
-export const MERCHANT_SETTINGS_PRODUCTLIST_SHOW_INVENTORY: "productListShowInventory";
-export const MERCHANT_SETTINGS_ENABLED_CMS_VERSION: "enabledCmsVersion";
+export * from "../../settings/constants/merchantSettings";
 //# sourceMappingURL=merchantSettings.d.ts.map

package/core/constants/merchantSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merchantSettings.d.ts","sourceRoot":"","sources":["../../../core/constants/merchantSettings.js"],"names":[],"mappings":"AAAA,wCAAyC,2BAA2B,CAAC;AACrE,gEAAiE,8BAA8B,CAAC;AAChG,iEAAkE,+BAA+B,CAAC;AAClG,oDAAqD,oBAAoB,CAAC;AAC1E,8DAA+D,6BAA6B,CAAC;AAC7F,+DAAgE,6BAA6B,CAAC;AAC9F,iDAAkD,iBAAiB,CAAC;AACpE,oDAAqD,mBAAmB,CAAC;AACzE,kEAAmE,gCAAgC,CAAC;AACpG,2DAA4D,0BAA0B,CAAC;AACvF,oDAAqD,mBAAmB,CAAC"}
+{"version":3,"file":"merchantSettings.d.ts","sourceRoot":"","sources":["../../../core/constants/merchantSettings.js"],"names":[],"mappings":""}

package/core/constants/merchantSettings.js

@@ -1,11 +1,3 @@
-export const RECEIVE_MERCHANT_SETTINGS = 'RECEIVE_MERCHANT_SETTINGS';
-export const MERCHANT_SETTINGS_LOCATION_BASED_SHOPPING_ENABLED = 'locationBasedShoppingEnabled';
-export const MERCHANT_SETTINGS_SUBSTITUTION_PREFERENCES_ENABLED = 'enableSubstitutionPreferences';
-export const MERCHANT_SETTINGS_CUSTOMER_ATTRIBUTES = 'customerAttributes';
-export const MERCHANT_SETTINGS_FULFILLMENT_SCHEDULED_ENABLED = 'enableFulfillmentScheduling';
-export const MERCHANT_SETTINGS_RESTRICT_MULTI_LOCATION_ORDERS = 'restrictMultiLocationOrders';
-export const MERCHANT_SETTINGS_DEFAULT_CURRENCY = 'defaultCurrency';
-export const MERCHANT_SETTINGS_ENABLE_WEB_INDEXING = 'enableWebIndexing';
-export const MERCHANT_SETTINGS_PRODUCT_SHOW_ALTERNATIVE_LOCATION = 'productShowAlternativeLocation';
-export const MERCHANT_SETTINGS_PRODUCTLIST_SHOW_INVENTORY = 'productListShowInventory';
-export const MERCHANT_SETTINGS_ENABLED_CMS_VERSION = 'enabledCmsVersion';
+// Backwards-compatible shim. The merchant settings constants now live in the
+// dedicated `settings` package: @shopgate/engage/settings/constants/merchantSettings
+export * from "../../settings/constants/merchantSettings";

package/core/constants/shopSettings.d.ts

@@ -1,28 +1,2 @@
-export const RECEIVE_SHOP_SETTINGS: "RECEIVE_SHOP_SETTINGS";
-export const ERROR_SHOP_SETTINGS: "ERROR_SHOP_SETTINGS";
-export const CACHE_LEASE_SHOP_SETTINGS: number;
-export const SHOP_SETTING_GOOGLE_SITE_VERIFICATION_CODE: "googleSiteVerificationCode";
-export const SHOP_SETTING_CART_SUPPLEMENTAL_CONTENT: "cartSupplementalContent";
-export const SHOP_SETTING_ORDER_SUPPLEMENTAL_CONTENT: "orderSupplementalContent";
-export const SHOP_SETTING_SHOW_SHOP_LOGO_IN_APP: "showShopLogoInApp";
-export const SHOP_SETTING_SHOW_SHOP_LOGO_IN_WEB: "showShopLogoInWeb";
-export const SHOP_SETTING_PRODUCTS_SORT_ORDER: "productsSortOrder";
-export const SHOP_SETTING_WISHLIST_MODE: "wishlistMode";
-export const SHOP_SETTING_COOKIE_CONSENT_MODE: "cookieConsentMode";
-export const SHOP_SETTING_DISPLAY_PRICE_PER_MEASURE_UNIT: "displayPricePerMeasureUnit";
-export const SHOP_SETTING_IMAGES: "images";
-export const SHOP_SETTING_IMAGES_PRODUCT_PLACEHOLDER: "productPlaceholder";
-export const SHOP_SETTING_IMAGES_CATEGORY_PLACEHOLDER: "categoryPlaceholder";
-export const SHOP_SETTING_IMAGES_FAVICON: "favicon";
-export const SHOP_SETTING_NUMBER_OF_ADDRESS_LINES: "numberOfAddressLines";
-export const SHOP_SETTINGS_SHOW_CATEGORY_IMAGES: "showCategoryImages";
-export const SHOP_SETTING_REGISTRATION_MODE: "registrationMode";
-export const SHOP_SETTING_REGISTRATION_MODE_SIMPLE: "simple";
-export const SHOP_SETTING_REGISTRATION_MODE_EXTENDED: "extended";
-export const SHOP_SETTING_WISHLIST_ITEM_QUANTITY_ENABLED: "wishlistItemQuantityEnabled";
-export const SHOP_SETTING_WISHLIST_ITEM_NOTES_ENABLED: "wishlistItemNotesEnabled";
-export const SHOP_SETTING_LOAD_WISHLIST_ON_APP_START_ENABLED: "loadWishlistOnAppStartEnabled";
-export const SHOP_SETTING_SHOW_WISHLIST_ITEMS_COUNT_BADGE: "showWishlistItemsCountBadge";
-export const SHOP_SETTING_ENABLE_CMS_2_FOR_ALL_SHOPPERS: "enableCms2ForAllShoppers";
-export const WISHLIST_MODE_PERSIST_ON_ADD: "persistOnAdd";
+export * from "../../settings/constants/shopSettings";
 //# sourceMappingURL=shopSettings.d.ts.map

package/core/constants/shopSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shopSettings.d.ts","sourceRoot":"","sources":["../../../core/constants/shopSettings.js"],"names":[],"mappings":"AAAA,oCAAqC,uBAAuB,CAAC;AAC7D,kCAAmC,qBAAqB,CAAC;AACzD,+CAAwD;AACxD,yDAA0D,4BAA4B,CAAC;AACvF,qDAAsD,yBAAyB,CAAC;AAChF,sDAAuD,0BAA0B,CAAC;AAClF,iDAAkD,mBAAmB,CAAC;AACtE,iDAAkD,mBAAmB,CAAC;AACtE,+CAAgD,mBAAmB,CAAC;AACpE,yCAA0C,cAAc,CAAC;AACzD,+CAAgD,mBAAmB,CAAC;AACpE,0DAA2D,4BAA4B,CAAC;AACxF,kCAAmC,QAAQ,CAAC;AAC5C,sDAAuD,oBAAoB,CAAC;AAC5E,uDAAwD,qBAAqB,CAAC;AAC9E,0CAA2C,SAAS,CAAC;AACrD,mDAAoD,sBAAsB,CAAC;AAC3E,iDAAkD,oBAAoB,CAAC;AACvE,6CAA8C,kBAAkB,CAAC;AACjE,oDAAqD,QAAQ,CAAC;AAC9D,sDAAuD,UAAU,CAAC;AAClE,0DAA2D,6BAA6B,CAAC;AACzF,uDAAwD,0BAA0B,CAAC;AACnF,8DAA+D,+BAA+B,CAAC;AAC/F,2DAA4D,6BAA6B,CAAC;AAC1F,yDAA0D,0BAA0B,CAAC;AAErF,2CAA4C,cAAc,CAAC"}
+{"version":3,"file":"shopSettings.d.ts","sourceRoot":"","sources":["../../../core/constants/shopSettings.js"],"names":[],"mappings":""}

package/core/constants/shopSettings.js

@@ -1,27 +1,3 @@
-export const RECEIVE_SHOP_SETTINGS = 'RECEIVE_SHOP_SETTINGS';
-export const ERROR_SHOP_SETTINGS = 'ERROR_SHOP_SETTINGS';
-export const CACHE_LEASE_SHOP_SETTINGS = 10 * 60 * 1000; // 10 minutes in milliseconds
-export const SHOP_SETTING_GOOGLE_SITE_VERIFICATION_CODE = 'googleSiteVerificationCode';
-export const SHOP_SETTING_CART_SUPPLEMENTAL_CONTENT = 'cartSupplementalContent';
-export const SHOP_SETTING_ORDER_SUPPLEMENTAL_CONTENT = 'orderSupplementalContent';
-export const SHOP_SETTING_SHOW_SHOP_LOGO_IN_APP = 'showShopLogoInApp';
-export const SHOP_SETTING_SHOW_SHOP_LOGO_IN_WEB = 'showShopLogoInWeb';
-export const SHOP_SETTING_PRODUCTS_SORT_ORDER = 'productsSortOrder';
-export const SHOP_SETTING_WISHLIST_MODE = 'wishlistMode';
-export const SHOP_SETTING_COOKIE_CONSENT_MODE = 'cookieConsentMode';
-export const SHOP_SETTING_DISPLAY_PRICE_PER_MEASURE_UNIT = 'displayPricePerMeasureUnit';
-export const SHOP_SETTING_IMAGES = 'images';
-export const SHOP_SETTING_IMAGES_PRODUCT_PLACEHOLDER = 'productPlaceholder';
-export const SHOP_SETTING_IMAGES_CATEGORY_PLACEHOLDER = 'categoryPlaceholder';
-export const SHOP_SETTING_IMAGES_FAVICON = 'favicon';
-export const SHOP_SETTING_NUMBER_OF_ADDRESS_LINES = 'numberOfAddressLines';
-export const SHOP_SETTINGS_SHOW_CATEGORY_IMAGES = 'showCategoryImages';
-export const SHOP_SETTING_REGISTRATION_MODE = 'registrationMode';
-export const SHOP_SETTING_REGISTRATION_MODE_SIMPLE = 'simple';
-export const SHOP_SETTING_REGISTRATION_MODE_EXTENDED = 'extended';
-export const SHOP_SETTING_WISHLIST_ITEM_QUANTITY_ENABLED = 'wishlistItemQuantityEnabled';
-export const SHOP_SETTING_WISHLIST_ITEM_NOTES_ENABLED = 'wishlistItemNotesEnabled';
-export const SHOP_SETTING_LOAD_WISHLIST_ON_APP_START_ENABLED = 'loadWishlistOnAppStartEnabled';
-export const SHOP_SETTING_SHOW_WISHLIST_ITEMS_COUNT_BADGE = 'showWishlistItemsCountBadge';
-export const SHOP_SETTING_ENABLE_CMS_2_FOR_ALL_SHOPPERS = 'enableCms2ForAllShoppers';
-export const WISHLIST_MODE_PERSIST_ON_ADD = 'persistOnAdd';
+// Backwards-compatible shim. The shop settings constants now live in the
+// dedicated `settings` package: @shopgate/engage/settings/constants/shopSettings
+export * from "../../settings/constants/shopSettings";

package/core/helpers/scrollContainer.js

@@ -1,11 +1,11 @@
-import { IS_PAGE_PREVIEW_ACTIVE } from '@shopgate/engage/page/constants';
+import { isAdminPreviewActive } from '@shopgate/engage/admin-preview/helpers';
 import { hasWebBridge } from "./bridge";
 
 /**
  * Checks whether the app shall use a scroll container
  * @returns {boolean}
  */
-export const applyScrollContainer = () => IS_PAGE_PREVIEW_ACTIVE || !hasWebBridge();
+export const applyScrollContainer = () => isAdminPreviewActive() || !hasWebBridge();
 
 /**
  * exports the old function name for backwards compatibility

package/core/initialization/index.js

@@ -8,7 +8,8 @@ import appConfig from '@shopgate/pwa-common/helpers/config';
 import { appInitialization, configuration } from '@shopgate/engage/core/collections';
 import { CONFIGURATION_COLLECTION_KEY_BASE_URL } from '@shopgate/engage/core/constants';
 import { loadCustomStyles } from '@shopgate/engage/styles';
-import { receiveShopSettings, receiveMerchantSettings, errorShopSettings } from "../action-creators";
+import { receiveShopSettings, errorShopSettings } from '@shopgate/engage/settings/action-creators/shopSettings';
+import { receiveMerchantSettings } from '@shopgate/engage/settings/action-creators/merchantSettings';
 const {
   locales: {
     currency: currencyLocale = null

package/core/selectors/merchantSettings.d.ts

@@ -1,21 +1,2 @@
-export const getIsLocationBasedShopping: Function;
-export const getSubstitutionPreferencesEnabled: Function;
-export const getMerchantCustomerAttributes: Function;
-export const getFulfillmentSchedulingEnabled: Function;
-export const getRestrictMultiLocationOrders: Function;
-export const getDefaultCurrency: Function;
-export const getEnableWebIndexing: Function;
-export const getProductShowAlternativeLocation: Function;
-export const getProductListShowInventory: Function;
-/**
- * Selector that retrieves the enabled CMS version.
- * @type {(state: RootState) => "v1" | "v2" | "both"}
- */
-export const getEnabledCMSVersion: (state: RootState) => "v1" | "v2" | "both";
-/**
- * Retrieves the merchantSettings state from the store.
- * @param {Object} state The current application state.
- * @return {Object} The locations state.
- */
-export function getState(state: Object): Object;
+export * from "../../settings/selectors/merchantSettings";
 //# sourceMappingURL=merchantSettings.d.ts.map

package/core/selectors/merchantSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merchantSettings.d.ts","sourceRoot":"","sources":["../../../core/selectors/merchantSettings.js"],"names":[],"mappings":"AAgCA,kDAGE;AAEF,yDAGE;AAEF,qDAGE;AAEF,uDAGE;AAEF,sDAGE;AAEF,0CAEE;AAEF,4CAGE;AAEF,yDAGE;AAEF,mDAGE;AAEF;;;GAGG;AACH,mCAFU,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,GAAG,IAAI,GAAG,MAAM,CAKlD;AArEF;;;;GAIG;AACH,gCAHW,MAAM,GACL,MAAM,CAE+C"}
+{"version":3,"file":"merchantSettings.d.ts","sourceRoot":"","sources":["../../../core/selectors/merchantSettings.js"],"names":[],"mappings":""}

package/core/selectors/merchantSettings.js

@@ -1,33 +1,3 @@
-import { createSelector } from 'reselect';
-import { MERCHANT_SETTINGS_LOCATION_BASED_SHOPPING_ENABLED, MERCHANT_SETTINGS_SUBSTITUTION_PREFERENCES_ENABLED, MERCHANT_SETTINGS_CUSTOMER_ATTRIBUTES, MERCHANT_SETTINGS_FULFILLMENT_SCHEDULED_ENABLED, MERCHANT_SETTINGS_RESTRICT_MULTI_LOCATION_ORDERS, MERCHANT_SETTINGS_DEFAULT_CURRENCY, MERCHANT_SETTINGS_ENABLE_WEB_INDEXING, MERCHANT_SETTINGS_PRODUCT_SHOW_ALTERNATIVE_LOCATION, MERCHANT_SETTINGS_PRODUCTLIST_SHOW_INVENTORY, MERCHANT_SETTINGS_ENABLED_CMS_VERSION } from "../constants";
-
-/**
- * Retrieves the merchantSettings state from the store.
- * @param {Object} state The current application state.
- * @return {Object} The locations state.
- */
-const getState = state => state?.settings?.merchantSettings || {};
-
-/**
- * Creates a selector to retrieve a single merchant setting.
- * @param {string} key The key of the merchant setting
- * @param {*} [fallback=null] The fallback value when no value can be determined.
- * @returns {Function}
- */
-const makeGetMerchantSettingByKey = (key, fallback = null) => createSelector(getState, state => typeof state?.[key] !== 'undefined' ? state?.[key] : fallback);
-export const getIsLocationBasedShopping = makeGetMerchantSettingByKey(MERCHANT_SETTINGS_LOCATION_BASED_SHOPPING_ENABLED, false);
-export const getSubstitutionPreferencesEnabled = makeGetMerchantSettingByKey(MERCHANT_SETTINGS_SUBSTITUTION_PREFERENCES_ENABLED, false);
-export const getMerchantCustomerAttributes = makeGetMerchantSettingByKey(MERCHANT_SETTINGS_CUSTOMER_ATTRIBUTES, []);
-export const getFulfillmentSchedulingEnabled = makeGetMerchantSettingByKey(MERCHANT_SETTINGS_FULFILLMENT_SCHEDULED_ENABLED, false);
-export const getRestrictMultiLocationOrders = makeGetMerchantSettingByKey(MERCHANT_SETTINGS_RESTRICT_MULTI_LOCATION_ORDERS, false);
-export const getDefaultCurrency = makeGetMerchantSettingByKey(MERCHANT_SETTINGS_DEFAULT_CURRENCY);
-export const getEnableWebIndexing = makeGetMerchantSettingByKey(MERCHANT_SETTINGS_ENABLE_WEB_INDEXING, false);
-export const getProductShowAlternativeLocation = makeGetMerchantSettingByKey(MERCHANT_SETTINGS_PRODUCT_SHOW_ALTERNATIVE_LOCATION, false);
-export const getProductListShowInventory = makeGetMerchantSettingByKey(MERCHANT_SETTINGS_PRODUCTLIST_SHOW_INVENTORY, false);
-
-/**
- * Selector that retrieves the enabled CMS version.
- * @type {(state: RootState) => "v1" | "v2" | "both"}
- */
-export const getEnabledCMSVersion = makeGetMerchantSettingByKey(MERCHANT_SETTINGS_ENABLED_CMS_VERSION, 'v1');
-export { getState };
+// Backwards-compatible shim. The merchant settings selectors now live in the
+// dedicated `settings` package: @shopgate/engage/settings/selectors/merchantSettings
+export * from "../../settings/selectors/merchantSettings";

package/core/selectors/shopSettings.d.ts

@@ -1,54 +1,2 @@
-export function getState(state: Object): Object;
-export function makeGetShopSettingByKey(key: string, fallback?: any): Function;
-export function makeGetShopSettings(keys?: any[]): Function;
-/** Selects the current wishlist mode */
-export const getWishlistMode: Function;
-/**
- * Selects the placeholder image for products
- */
-export const getProductImagePlaceholder: ((state: any, ...params: any[]) => any) & import("reselect").OutputSelectorFields<(...args: readonly unknown[]) => any, {
-    clearCache: () => void;
-}> & {
-    clearCache: () => void;
-};
-/**
- * Selects the placeholder image for products
- */
-export const getCategoryImagePlaceholder: ((state: any, ...params: any[]) => any) & import("reselect").OutputSelectorFields<(...args: readonly unknown[]) => any, {
-    clearCache: () => void;
-}> & {
-    clearCache: () => void;
-};
-/**
- * Selects the placeholder image for products
- */
-export const getFavicon: ((state: any, ...params: any[]) => any) & import("reselect").OutputSelectorFields<(...args: readonly unknown[]) => any, {
-    clearCache: () => void;
-}> & {
-    clearCache: () => void;
-};
-/**
- * Selects the number of address lines for registration / address forms
- */
-export const getNumberOfAddressLines: Function;
-export const getGoogleSiteVerificationCode: Function;
-export const getShowCategoryImages: Function;
-/**
- * Creates a selector to retrieve the current active registration mode.
- * When the selector returns "simple" the form will not contain any address related fields.
- */
-export const getRegistrationMode: Function;
-export const getWishlistItemQuantityEnabled: Function;
-export const getWishlistItemNotesEnabled: Function;
-export const getLoadWishlistOnAppStartEnabled: Function;
-export const getShowWishlistItemsCountBadge: ((state: any, ...params: any[]) => any) & import("reselect").OutputSelectorFields<(...args: readonly unknown[]) => any, {
-    clearCache: () => void;
-}> & {
-    clearCache: () => void;
-};
-/**
- * Selector that determines if CMS 2 is enabled for all shoppers.
- * @type {(state: RootState) => boolean}
- */
-export const getEnableCms2ForAllShoppers: (state: RootState) => boolean;
+export * from "../../settings/selectors/shopSettings";
 //# sourceMappingURL=shopSettings.d.ts.map

package/core/selectors/shopSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shopSettings.d.ts","sourceRoot":"","sources":["../../../core/selectors/shopSettings.js"],"names":[],"mappings":"AAyBO,gCAHI,MAAM,GACL,MAAM,CAEkD;AAQ7D,6CAJI,MAAM,aACN,GAAC,YAMX;AAOM,4DAmBN;AAED,wCAAwC;AACxC,uCAGE;AAIF;;GAEG;AACH;;;;EAGE;AAEF;;GAEG;AACH;;;;EAGE;AACF;;GAEG;AACH;;;;EAGE;AAEF;;GAEG;AACH,+CAGE;AAEF,qDAGE;AAEF,6CAGE;AAEF;;;GAGG;AACH,2CAGE;AAEF,sDAGE;AAEF,mDAGE;AAEF,wDAGE;AAEF;;;;EAQE;AAEF;;;GAGG;AACH,0CAFU,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAKrC"}
+{"version":3,"file":"shopSettings.d.ts","sourceRoot":"","sources":["../../../core/selectors/shopSettings.js"],"names":[],"mappings":""}

package/core/selectors/shopSettings.js

@@ -1,80 +1,3 @@
-import "core-js/modules/es.array.includes.js";
-import "core-js/modules/es.array.reduce.js";
-import { createSelector } from 'reselect';
-import { WISHLIST_MODE_PERSIST_ON_ADD, SHOP_SETTING_WISHLIST_MODE, SHOP_SETTING_IMAGES, SHOP_SETTING_IMAGES_PRODUCT_PLACEHOLDER, SHOP_SETTING_IMAGES_CATEGORY_PLACEHOLDER, SHOP_SETTING_IMAGES_FAVICON, SHOP_SETTING_NUMBER_OF_ADDRESS_LINES, SHOP_SETTING_GOOGLE_SITE_VERIFICATION_CODE, SHOP_SETTINGS_SHOW_CATEGORY_IMAGES, SHOP_SETTING_REGISTRATION_MODE, SHOP_SETTING_REGISTRATION_MODE_EXTENDED, SHOP_SETTING_LOAD_WISHLIST_ON_APP_START_ENABLED, SHOP_SETTING_WISHLIST_ITEM_QUANTITY_ENABLED, SHOP_SETTING_WISHLIST_ITEM_NOTES_ENABLED, SHOP_SETTING_SHOW_WISHLIST_ITEMS_COUNT_BADGE, SHOP_SETTING_ENABLE_CMS_2_FOR_ALL_SHOPPERS } from "../constants/shopSettings";
-
-/**
- * Retrieves the shopSettings state from the store.
- * @param {Object} state The current application state.
- * @return {Object} The locations state.
- */
-export const getState = state => state?.settings?.shopSettings || {};
-
-/**
- * Creates a selector to retrieve a single shop setting.
- * @param {string} key The key of the shop setting
- * @param {*} [fallback=null] The fallback value when no value can be determined.
- * @returns {Function}
- */
-export const makeGetShopSettingByKey = (key, fallback = null) => createSelector(getState, state => typeof state?.[key] !== 'undefined' ? state?.[key] : fallback);
-
-/**
- * Creates a selector to retrieve multiple shop setting.
- * @param {Array} [keys=[]] Optional keys to filter.
- * @returns {Function}
- */
-export const makeGetShopSettings = (keys = []) => createSelector(getState, state => {
-  const result = Object.keys(state).filter(key => {
-    if (Array.isArray(keys) && keys.length > 0) {
-      return keys.includes(key);
-    }
-    return true;
-  }).reduce((acc, key) => {
-    if (state?.[key]) {
-      acc[key] = state[key];
-    }
-    return acc;
-  }, {});
-  return result;
-});
-
-/** Selects the current wishlist mode */
-export const getWishlistMode = makeGetShopSettingByKey(SHOP_SETTING_WISHLIST_MODE, WISHLIST_MODE_PERSIST_ON_ADD);
-const getShopSettingImages = makeGetShopSettingByKey(SHOP_SETTING_IMAGES, {});
-
-/**
- * Selects the placeholder image for products
- */
-export const getProductImagePlaceholder = createSelector(getShopSettingImages, images => images?.[SHOP_SETTING_IMAGES_PRODUCT_PLACEHOLDER] || null);
-
-/**
- * Selects the placeholder image for products
- */
-export const getCategoryImagePlaceholder = createSelector(getShopSettingImages, images => images?.[SHOP_SETTING_IMAGES_CATEGORY_PLACEHOLDER] || null);
-/**
- * Selects the placeholder image for products
- */
-export const getFavicon = createSelector(getShopSettingImages, images => images?.[SHOP_SETTING_IMAGES_FAVICON] || null);
-
-/**
- * Selects the number of address lines for registration / address forms
- */
-export const getNumberOfAddressLines = makeGetShopSettingByKey(SHOP_SETTING_NUMBER_OF_ADDRESS_LINES, 2);
-export const getGoogleSiteVerificationCode = makeGetShopSettingByKey(SHOP_SETTING_GOOGLE_SITE_VERIFICATION_CODE, '');
-export const getShowCategoryImages = makeGetShopSettingByKey(SHOP_SETTINGS_SHOW_CATEGORY_IMAGES, true);
-
-/**
- * Creates a selector to retrieve the current active registration mode.
- * When the selector returns "simple" the form will not contain any address related fields.
- */
-export const getRegistrationMode = makeGetShopSettingByKey(SHOP_SETTING_REGISTRATION_MODE, SHOP_SETTING_REGISTRATION_MODE_EXTENDED);
-export const getWishlistItemQuantityEnabled = makeGetShopSettingByKey(SHOP_SETTING_WISHLIST_ITEM_QUANTITY_ENABLED, false);
-export const getWishlistItemNotesEnabled = makeGetShopSettingByKey(SHOP_SETTING_WISHLIST_ITEM_NOTES_ENABLED, false);
-export const getLoadWishlistOnAppStartEnabled = makeGetShopSettingByKey(SHOP_SETTING_LOAD_WISHLIST_ON_APP_START_ENABLED, true);
-export const getShowWishlistItemsCountBadge = createSelector(getLoadWishlistOnAppStartEnabled, makeGetShopSettingByKey(SHOP_SETTING_SHOW_WISHLIST_ITEMS_COUNT_BADGE, true), (loadWishlistOnAppStartEnabled, showWishlistItemsCountBadge) => loadWishlistOnAppStartEnabled ? showWishlistItemsCountBadge : false);
-
-/**
- * Selector that determines if CMS 2 is enabled for all shoppers.
- * @type {(state: RootState) => boolean}
- */
-export const getEnableCms2ForAllShoppers = makeGetShopSettingByKey(SHOP_SETTING_ENABLE_CMS_2_FOR_ALL_SHOPPERS, false);
+// Backwards-compatible shim. The shop settings selectors now live in the
+// dedicated `settings` package: @shopgate/engage/settings/selectors/shopSettings
+export * from "../../settings/selectors/shopSettings";

package/development/components/ClientInformation/ClientInformation.js

@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 import { useSelector } from 'react-redux';
 import { makeStyles } from '@shopgate/engage/styles';
+import { Typography } from '@shopgate/engage/components';
 import { useLongPress } from '@shopgate/engage/core/hooks';
 import { getClientInformation } from '@shopgate/engage/core/selectors';
 import { pckVersion } from '@shopgate/pwa-common/helpers/config';
@@ -10,8 +11,7 @@ const useStyles = makeStyles()(theme => ({
   root: {
     position: 'relative',
     textAlign: 'center',
-    color: theme.palette.grey[500],
-    fontSize: 12,
+    color: theme.palette.text.secondary,
     paddingBottom: 20
   },
   unselectable: {
@@ -57,7 +57,9 @@ const ClientInformation = () => {
   if (!codebaseVersion) {
     return null;
   }
-  return /*#__PURE__*/_jsxs("div", {
+  return /*#__PURE__*/_jsxs(Typography, {
+    variant: "caption",
+    component: "div",
     className: cx('ui-shared__client-information', classes.root),
     ...longPressAttrs,
     "aria-hidden": true,

package/development/components/DevelopmentSettings/DevelopmentSettings.js

@@ -3,7 +3,8 @@ import PropTypes from 'prop-types';
 import { useSelector, useDispatch } from 'react-redux';
 import { SheetDrawer, RippleButton } from '@shopgate/engage/components';
 import { makeStyles } from '@shopgate/engage/styles';
-import { getEnabledCMSVersion, getEnableCms2ForAllShoppers } from '@shopgate/engage/core/selectors';
+import { getEnabledCMSVersion } from '@shopgate/engage/settings/selectors/merchantSettings';
+import { getEnableCms2ForAllShoppers } from '@shopgate/engage/settings/selectors/shopSettings';
 import { getIsCMS2PreviewEnabled } from "../../selectors";
 import { toggleCms2Preview } from "../../action-creators";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -14,7 +15,7 @@ const useStyles = makeStyles()(theme => ({
     justifyContent: 'center'
   },
   button: {
-    fontWeight: 'normal'
+    fontWeight: theme.typography.fontWeightRegular
   }
 }));
 

package/development/components/SimulatedInsets/SimulatedInsetBottom.js

@@ -2,14 +2,14 @@ import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { makeStyles } from '@shopgate/engage/styles';
 import { jsx as _jsx } from "react/jsx-runtime";
-const useStyles = makeStyles()({
+const useStyles = makeStyles()(theme => ({
   container: {
     position: 'fixed',
     bottom: 0,
     display: 'flex',
     justifyContent: 'center',
     alignItems: 'center',
-    height: 'var(--safe-area-inset-bottom)',
+    height: theme.layout.safeArea.bottom,
     width: '100%',
     zIndex: 10000000,
     pointerEvents: 'auto',
@@ -26,7 +26,7 @@ const useStyles = makeStyles()({
     border: '1px solid rgba(255, 255, 255, 0.5)',
     boxSizing: 'content-box'
   }
-});
+}));
 
 /**
  * Renders a simulated iOS bottom inset in development.

package/development/components/SimulatedInsets/SimulatedInsetTop.js

@@ -4,19 +4,19 @@ import { useSelector } from 'react-redux';
 import { makeStyles } from '@shopgate/engage/styles';
 import { getStatusBarStyleStorage } from '@shopgate/engage/development/selectors';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const useStyles = makeStyles()({
+const useStyles = makeStyles()(theme => ({
   container: {
     position: 'fixed',
     top: 0,
     display: 'flex',
     justifyContent: 'space-between',
     alignItems: 'center',
-    height: 'var(--safe-area-inset-top)',
+    height: theme.layout.safeArea.top,
     width: '100%',
     zIndex: 10000000,
     pointerEvents: 'auto',
     transition: 'background 0.2s ease',
-    fontSize: '16px'
+    fontSize: theme.typography.body1.fontSize
   },
   containerHighlight: {
     background: 'rgba(255, 0, 0, 0.7)'
@@ -33,17 +33,17 @@ const useStyles = makeStyles()({
   info: {
     flex: 1,
     textAlign: 'center',
-    fontWeight: 500
+    fontWeight: theme.typography.fontWeightMedium
   },
   notch: {
     flex: 1,
     background: 'black',
-    height: 'calc(var(--safe-area-inset-top) - 16px)',
+    height: `calc(${theme.layout.safeArea.top} - 16px)`,
     maxWidth: 150,
     borderRadius: 16,
     border: '1px solid rgba(255, 255, 255, 0.5)'
   }
-});
+}));
 
 /**
  * Creates a human readable time string to mimic the iOS clock.

package/favorites/components/CommentDialog/CommentDialog.js

@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
 import { makeStyles } from '@shopgate/engage/styles';
 import { getCommentDialogSettings } from '@shopgate/pwa-common-commerce/favorites/selectors';
 import { i18n, usePrevious } from '@shopgate/engage/core';
-import { Dialog, TextField, I18n } from '@shopgate/engage/components';
+import { Dialog, TextField, I18n, Typography } from '@shopgate/engage/components';
 import { broadcastLiveMessage } from '@shopgate/engage/a11y';
 import { closeFavoritesCommentDialog } from '@shopgate/pwa-common-commerce/favorites/action-creators';
 import { themeName } from '@shopgate/pwa-common/helpers/config';
@@ -31,22 +31,19 @@ const mapDispatchToProps = dispatch => ({
     dispatch(updateFavorite(productId, listId, quantity, notes));
   }
 });
-const useStyles = makeStyles()({
+const useStyles = makeStyles()(theme => ({
   root: {
     display: 'flex',
     flexDirection: 'column'
   },
   input: {
     textAlign: 'left',
-    fontSize: '1rem'
+    fontSize: theme.typography.body1.fontSize
   },
   characterCount: {
-    textAlign: 'right',
-    marginTop: -16,
-    fontSize: '0.875rem',
-    color: 'var(--color-text-medium-emphasis)'
+    marginTop: -16
   }
-});
+}));
 const MAX_CHARACTER_COUNT = 250;
 
 /**
@@ -138,14 +135,19 @@ const CommentDialog = ({
         attributes: attributes,
         multiLine: true,
         tabIndex: 0
-      }), /*#__PURE__*/_jsx(I18n.Text, {
+      }), /*#__PURE__*/_jsx(Typography, {
+        variant: "body2",
+        color: "textSecondary",
+        align: "right",
         className: classes.characterCount,
-        string: "favorites.comment_modal.characterCount",
-        "aria-hidden": true,
-        params: {
-          maxCount: MAX_CHARACTER_COUNT,
-          count: value?.length || 0
-        }
+        children: /*#__PURE__*/_jsx(I18n.Text, {
+          string: "favorites.comment_modal.characterCount",
+          "aria-hidden": true,
+          params: {
+            maxCount: MAX_CHARACTER_COUNT,
+            count: value?.length || 0
+          }
+        })
       })]
     })
   });

package/favorites/components/FavoriteButtonWide/FavoriteButtonWide.js

@@ -6,7 +6,7 @@ import { makeStyles } from '@shopgate/engage/styles';
 import { i18n } from '@shopgate/engage/core/helpers';
 import { toggleFavoriteWithListChooser } from '@shopgate/pwa-common-commerce/favorites/actions/toggleFavorites';
 import { makeIsProductOnFavoriteList, hasMultipleFavoritesList } from '@shopgate/pwa-common-commerce/favorites/selectors';
-import { getWishlistItemQuantityEnabled } from '@shopgate/engage/core/selectors/shopSettings';
+import { getWishlistItemQuantityEnabled } from '@shopgate/engage/settings/selectors/shopSettings';
 import appConfig from '@shopgate/pwa-common/helpers/config';
 
 /**
@@ -29,15 +29,14 @@ const makeMapStateToProps = () => {
 const mapDispatchToProps = dispatch => ({
   toggle: productId => dispatch(toggleFavoriteWithListChooser(productId))
 });
-const useStyles = makeStyles()({
+const useStyles = makeStyles()(theme => ({
   root: {
     '&&': {
       margin: '0 0px 16px 16px',
-      backgroundColor: '#fff',
-      border: '1px solid var(--color-primary)',
-      color: 'var(--color-high-emphasis)',
+      backgroundColor: theme.palette.background.surface,
+      border: `1px solid ${theme.palette.primary.main}`,
       borderRadius: 5,
-      fontSize: 14,
+      fontSize: theme.typography.body2.fontSize,
       textTransform: 'none',
       padding: 0
     }
@@ -45,7 +44,7 @@ const useStyles = makeStyles()({
   ripple: {
     padding: '8px 16px'
   }
-});
+}));
 
 /** @returns {JSX} */
 const FavoriteButtonWide = ({

package/favorites/components/Item/Item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Item.d.ts","sourceRoot":"","sources":["../../../../favorites/components/Item/Item.jsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;QAiLY,GAAG,CAAC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAzKD,YAAY"}
+{"version":3,"file":"Item.d.ts","sourceRoot":"","sources":["../../../../favorites/components/Item/Item.jsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;QA2KY,GAAG,CAAC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAnKD,YAAY"}