@sonic-equipment/ui 141.0.0 → 142.0.0

package/dist/pages/checkout/shipping-page/shipping-page.js

@@ -1,16 +1,18 @@
-import { jsx } from 'react/jsx-runtime';
+import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useRef, useEffect } from 'react';
+import { useCountries } from '../../../country-select/hooks/use-countries.js';
 import { useFetchSession } from '../../../shared/api/storefront/hooks/authentication/use-fetch-session.js';
 import { usePatchSession } from '../../../shared/api/storefront/hooks/authentication/use-patch-session.js';
 import { useFetchCurrentCart } from '../../../shared/api/storefront/hooks/cart/use-fetch-current-cart.js';
 import { useFetchFulfillmentMethodsForCurrentCart } from '../../../shared/api/storefront/hooks/customer/use-fetch-fulfillment-methods-for-current-cart.js';
-import { useFetchCountries } from '../../../shared/api/storefront/hooks/website/use-fetch-countries.js';
 import { useDataLayer } from '../../../shared/ga/use-data-layer.js';
+import { useDisclosure } from '../../../shared/hooks/use-disclosure.js';
 import { useNavigate } from '../../../shared/routing/use-navigate.js';
 import { hasNo } from '../../../shared/utils/types.js';
 import { ErrorPage } from '../../error-page/error-page.js';
 import { LoadingPage } from '../../loading-page/loading-page.js';
 import { PATHS } from '../../paths.js';
+import { CurrencyChangeDialog } from './components/currency-change-dialog.js';
 import { EditAddressesForm } from './components/edit-address-form.js';
 import { ReadOnlyAddresses } from './components/readonly-address.js';
 import { usePatchShippingDetails } from './hooks/use-patch-shipping-details.js';
@@ -21,9 +23,14 @@ function ShippingPage() {
     const gaEventPushed = useRef(false);
     const { data: cart, error: errorFetchCart, isLoading: isLoadingCart, refetch: refetchCart, } = useFetchCurrentCart();
     const { data: session } = useFetchSession();
-    const { data: countries, isLoading: isLoadingCountries } = useFetchCountries({
+    const { countries, currentCountry: selectedCountry, isFetching: isLoadingCountries, } = useCountries({
         enabled: hasNo(cart?.billTo?.address1) || Boolean(session?.isGuest),
     });
+    const currentCountry = countries && cart?.billTo?.country
+        ? countries.find(country => country.id === cart.billTo?.country?.id)
+        : selectedCountry;
+    const { close: closeCurrencyWarningDialog, isOpen: currencyWarningDialogIsOpen, open: openCurrencyWarningDialog, toggle: toggleCurrencyWarningDialog, } = useDisclosure();
+    const formData = useRef();
     const { data: fulfillmentMethods, isLoading: isLoadingFulfillmentMethods } = useFetchFulfillmentMethodsForCurrentCart();
     const { isLoading: isPatchingSession, mutate: patchSession } = usePatchSession();
     const { error: errorPatchBillingAddress, isError, isLoading: isPatching, isSuccess, mutate: patchShippingDetails, } = usePatchShippingDetails();
@@ -76,24 +83,63 @@ function ShippingPage() {
     if (!isAuthenticated ||
         hasNo(session) ||
         hasNo(cart) ||
+        hasNo(countries) ||
         hasNo(cart.cartLines) ||
         cart.cartLines.length === 0 ||
         hasNo(cart.billTo) ||
         (hasNo(cart.billTo.address1) && hasNo(countries)))
+        // TODO: Return error page, but first check all the conditions
         return null;
-    return (jsx(ShippingPageContent, { cart: cart, editAddress: jsx(EditAddressesForm, { billTo: cart.billTo, countries: countries || [], isLoading: isPatching, isPickup: isPickup, onSubmit: async ({ address, notes }) => {
-                if (!cart.billTo)
-                    return;
-                await patchShippingDetails({
-                    billTo: { ...cart.billTo, ...address },
-                    cart,
-                    notes,
-                });
-                dataLayer.push(createEcommerceEvent({
-                    cart,
-                    event: { event: 'add_shipping_info' },
-                }));
-            } }), errorPatchBillingAddress: errorPatchBillingAddress, fulfillmentMethods: fulfillmentMethods, isGuest: session.isGuest, isLoadingFulfillmentMethods: isLoadingFulfillmentMethods, isPatching: isPatching, isPatchingSession: isPatchingSession, onChangeFulfillmentMethod: async (value) => {
+    async function handleSubmit({ address, cart, notes, }) {
+        if (!cart.billTo)
+            throw new Error('No billTo address found');
+        await patchShippingDetails({
+            billTo: {
+                ...cart.billTo,
+                address1: address.address1,
+                address2: address.address2,
+                address3: address.address3,
+                attention: address.attention,
+                city: address.city,
+                companyName: address.companyName,
+                country: { id: address.country.id },
+                email: address.email,
+                firstName: address.firstName,
+                lastName: address.lastName,
+                phone: address.phone,
+                postalCode: address.postalCode,
+            },
+            cart,
+            notes,
+        });
+        dataLayer.push(createEcommerceEvent({
+            cart,
+            event: { event: 'add_shipping_info' },
+        }));
+    }
+    return (jsx(ShippingPageContent, { cart: cart, editAddress: jsxs(Fragment, { children: [jsx(EditAddressesForm, { billTo: cart.billTo, countries: countries, currentCountry: currentCountry, isLoading: isPatching, isPickup: isPickup, onSubmit: async ({ address, notes }) => {
+                        if (!cart.billTo)
+                            return;
+                        formData.current = { address, notes };
+                        /* When the currency changes, depending on the country,
+                         * we need to show a dialog to ask the customer if they
+                         * want to review their cart with the new currency */
+                        if (address.country.currencyCode === currentCountry?.currencyCode) {
+                            handleSubmit({ address, cart, notes });
+                        }
+                        else {
+                            openCurrencyWarningDialog();
+                        }
+                    } }), jsx(CurrencyChangeDialog, { isOpen: currencyWarningDialogIsOpen, onOpenChange: toggleCurrencyWarningDialog, onSubmit: () => {
+                        if (!formData.current)
+                            return;
+                        closeCurrencyWarningDialog();
+                        handleSubmit({
+                            address: formData.current.address,
+                            cart,
+                            notes: formData.current.notes,
+                        });
+                    } })] }), errorPatchBillingAddress: errorPatchBillingAddress, fulfillmentMethods: fulfillmentMethods, isGuest: session.isGuest, isLoadingFulfillmentMethods: isLoadingFulfillmentMethods, isPatching: isPatching, isPatchingSession: isPatchingSession, onChangeFulfillmentMethod: async (value) => {
             await patchSession({
                 session: {
                     ...session,
@@ -104,7 +150,12 @@ function ShippingPage() {
         }, readOnlyAddress: jsx(ReadOnlyAddresses, { billTo: cart.billTo, isLoading: isPatching, isPickup: isPickup, notes: cart.notes, onSubmit: async ({ notes }) => {
                 if (!cart.billTo)
                     return;
-                await patchShippingDetails({ cart, notes });
+                if (notes === undefined) {
+                    navigate(PATHS.REVIEW_AND_SUBMIT);
+                }
+                else {
+                    await patchShippingDetails({ cart, notes });
+                }
                 dataLayer.push(createEcommerceEvent({
                     cart,
                     event: { event: 'add_shipping_info' },

package/dist/pages/components/page-container/page-container.js

@@ -1,9 +1,10 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
 import clsx from 'clsx';
+import resetStyles from '../../../shared/reset.module.css.js';
 import styles from './page-container.module.css.js';
 
 function PageContainer({ breadcrumbSlot, children, className, fluid, fullHeight, titleSlot, }) {
-    return (jsx("div", { className: clsx(styles['page-container'], fullHeight && styles['full-height'], fluid && styles['fluid'], className), children: jsxs("main", { className: styles['page-main'], children: [breadcrumbSlot && (jsx("div", { className: styles.breadcrumb, children: breadcrumbSlot })), titleSlot && jsx("div", { className: styles.title, children: titleSlot }), jsx("div", { className: styles.content, children: children })] }) }));
+    return (jsx("div", { className: clsx(styles['page-container'], resetStyles.reset, fullHeight && styles['full-height'], fluid && styles['fluid'], className), children: jsxs("main", { className: styles['page-main'], children: [breadcrumbSlot && (jsx("div", { className: styles.breadcrumb, children: breadcrumbSlot })), titleSlot && jsx("div", { className: styles.title, children: titleSlot }), jsx("div", { className: styles.content, children: children })] }) }));
 }
 
 export { PageContainer };

package/dist/pages/error-page/error-page.js

@@ -9,10 +9,13 @@ import { PATHS } from '../paths.js';
 
 function ErrorPage({ error }) {
     useEffect(() => {
-        setTimeout(() => {
+        const timeoutId = setTimeout(() => {
             if (!isRequestError(error))
                 throw error;
         }, 0);
+        return () => {
+            clearTimeout(timeoutId);
+        };
     }, [error]);
     return (jsx(Page, { breadcrumb: [
             { href: PATHS.HOME, label: 'Home' },

package/dist/pages/product/product-details-page/components/product-details-panel/product-details-panel.js

@@ -23,7 +23,9 @@ function ProductDetailsPanel({ priceComponent, product, }) {
                                     sendAddToWishListFromProductDetailsPageEvent({
                                         objectId: product.productNumber,
                                     });
-                                }, productId: product.storefrontId }))] })] }), jsxs("div", { children: [jsx(Heading, { italic: true, className: styles['product-features-heading'], size: "xxs", children: jsx(FormattedMessage, { id: "Product Features" }) }), product.content.htmlContent && (jsx(ShowAll, { initialHeight: 216, children: jsx("div", { className: styles.description, dangerouslySetInnerHTML: {
+                                }, productId: product.storefrontId }))] })] }), jsxs("div", { children: [jsx(Heading, { italic: true, className: styles['product-features-heading'], size: "xxs", children: jsx(FormattedMessage, { id: "Product Features" }) }), product.content.htmlContent && (jsx(ShowAll, { initialHeight: 216, children: jsx("div", { className: styles.description, 
+                            // eslint-disable-next-line @eslint-react/dom/no-dangerously-set-innerhtml
+                            dangerouslySetInnerHTML: {
                                 __html: product.content.htmlContent,
                             } }) }))] }), jsx("div", { children: jsxs(Accordion, { indented: true, borderType: ['top', 'middle-accentuated'], children: [product.attributeTypes.length > 0 && (jsx(AccordionItem, { id: "specification", title: jsx(FormattedMessage, { id: "Specifications" }), children: jsx(FeatureList, { className: styles['feature-list'], features: product.attributeTypes.map(attribute => ({
                                     id: `${attribute.id}`,

package/dist/pages/product/product-listing-page/no-results/no-results.js

@@ -1,14 +1,14 @@
 "use client";
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { FormattedMessage } from '../../../../intl/formatted-message.js';
-import { useBreakpoint } from '../../../../shared/hooks/use-breakpoint.js';
+import { useIsBreakpoint } from '../../../../shared/hooks/use-is-breakpoint.js';
 import { RouteButton } from '../../../../shared/routing/route-button.js';
 import { Heading } from '../../../../typography/heading/heading.js';
 import styles from './no-results.module.css.js';
 
 function NoResults({ content, title }) {
-    const { lg } = useBreakpoint();
-    return (jsxs("div", { className: styles['no-results'], children: [jsx(Heading, { bold: false, className: styles.title, size: lg ? 's' : 'xs', tag: "h2", children: title }), jsx("p", { className: styles.body, children: content }), jsx("div", { className: styles.buttons, children: jsx(RouteButton, { withArrow: true, "data-test-selector": "buttonContinueShopping", href: "/", size: "md", children: jsx(FormattedMessage, { id: "Continue shopping" }) }) })] }));
+    const isLg = useIsBreakpoint('lg');
+    return (jsxs("div", { className: styles['no-results'], children: [jsx(Heading, { bold: false, className: styles.title, size: isLg ? 's' : 'xs', tag: "h2", children: title }), jsx("p", { className: styles.body, children: content }), jsx("div", { className: styles.buttons, children: jsx(RouteButton, { withArrow: true, "data-test-selector": "buttonContinueShopping", href: "/", size: "md", children: jsx(FormattedMessage, { id: "Continue shopping" }) }) })] }));
 }
 
 export { NoResults };

package/dist/pages/product/product-listing-page/product-listing-page-category-carousel/product-listing-page-category-carousel.js

@@ -16,7 +16,7 @@ function ProductListingPageCategoryCarousel({ currentCategoryPath, }) {
     return (jsx(CategoryCarousel, { categoryCards: categories.map((category, index) => (jsx(CategoryCard, { href: category.href, image: {
                 image: category.image,
                 title: category.name,
-            }, title: category.name }, index))) }));
+            }, title: category.name }, category.href || index))) }));
 }
 
 export { ProductListingPageCategoryCarousel };

package/dist/pages/product/product-listing-page/product-listing-page-provider/product-listing-page-provider.js

@@ -1,10 +1,11 @@
 "use client";
 import { jsx } from 'react/jsx-runtime';
-import { useContext } from 'react';
+import { useMemo, useContext } from 'react';
 import { ProductListingPageContext } from './product-listing-page-context.js';
 
 function ProductListingPageProvider({ children, data, error, isError, isLoading, }) {
-    return (jsx(ProductListingPageContext.Provider, { value: { data, error, isError, isLoading }, children: children }));
+    const value = useMemo(() => ({ data, error, isError, isLoading }), [data, error, isError, isLoading]);
+    return (jsx(ProductListingPageContext.Provider, { value: value, children: children }));
 }
 function useProductListingPageProvider() {
     return useContext(ProductListingPageContext);

package/dist/pages/product/search-result-page/search-results-page-category-carousel/search-results-page-category-carousel.js

@@ -16,7 +16,7 @@ function SearchResultsPageCategoryCarousel() {
     return (jsx(CategoryCarousel, { categoryCards: categories.map((category, index) => (jsx(CategoryCard, { href: category.href, image: {
                 image: category.image,
                 title: category.name,
-            }, title: category.name }, index))) }));
+            }, title: category.name }, category.href + category.name || index))) }));
 }
 
 export { SearchResultsPageCategoryCarousel };

package/dist/promos/promo-banners/promo-banners.d.ts

@@ -1,8 +1,9 @@
 import { ResponsiveImageType } from '../../shared/model/image';
+export interface PromoBannersData {
+    href: string;
+    image: ResponsiveImageType;
+}
 export interface PromoBannersProps {
-    promoBannersData?: Array<{
-        href: string;
-        image: ResponsiveImageType;
-    }>;
+    promoBannersData?: PromoBannersData[];
 }
-export declare function PromoBanners({ promoBannersData }: PromoBannersProps): import("react/jsx-runtime").JSX.Element | null;
+export declare function PromoBanners({ promoBannersData, }: PromoBannersProps): import("react/jsx-runtime").JSX.Element | null;

package/dist/promos/promo-banners/promo-banners.js

@@ -1,16 +1,17 @@
 "use client";
 import { jsx, Fragment } from 'react/jsx-runtime';
 import { Carousel } from '../../carousel/carousel.js';
-import { useBreakpoint } from '../../shared/hooks/use-breakpoint.js';
+import { useIsBreakpoint } from '../../shared/hooks/use-is-breakpoint.js';
 import { PromoBanner } from '../promo-banner/promo-banner.js';
 import styles from './promo-banners.module.css.js';
 
-function PromoBanners({ promoBannersData = [] }) {
-    const { lg } = useBreakpoint();
-    const promoBanners = promoBannersData.map((promoBanner, index) => (jsx(PromoBanner, { href: promoBanner.href, image: promoBanner.image, variant: index % 2 === 0 ? 'lg' : 'sm' }, `promo-banner-${index}`)));
+const defaultPromoBannersData = [];
+function PromoBanners({ promoBannersData = defaultPromoBannersData, }) {
+    const isLg = useIsBreakpoint('lg');
+    const promoBanners = promoBannersData.map((promoBanner, index) => (jsx(PromoBanner, { href: promoBanner.href, image: promoBanner.image, variant: index % 2 === 0 ? 'lg' : 'sm' }, `promo-banner-${promoBanner.href || index}`)));
     if (promoBannersData.length === 0)
         return null;
-    return (jsx("div", { className: styles.promos, children: lg ? (jsx(Fragment, { children: promoBanners })) : (jsx(Carousel, { hasNavigation: false, hasOverflow: false, slides: promoBanners, spaceBetween: 16 })) }));
+    return (jsx("div", { className: styles.promos, children: isLg ? (jsx(Fragment, { children: promoBanners })) : (jsx(Carousel, { hasNavigation: false, hasOverflow: false, slides: promoBanners, spaceBetween: 16 })) }));
 }
 
 export { PromoBanners };

package/dist/promos/promo-card/promo-card.d.ts

@@ -2,6 +2,6 @@ import { ImageType } from '../../shared/model/image';
 export interface PromoCardProps {
     href: string;
     image: ImageType;
-    onClick?: () => void;
+    onClick?: VoidFunction;
 }
 export declare function PromoCard({ href, image, onClick }: PromoCardProps): import("react/jsx-runtime").JSX.Element;

package/dist/shared/api/bff/model/bff.model.d.ts

@@ -159,4 +159,17 @@ export interface ProductListingPageDataResponse {
     page: PageModel;
     promoBanners: PromoBanners | null;
 }
+export interface Language {
+    cultureCode: string;
+    description: string;
+    id: string;
+    languageCode: string;
+}
+export interface Country {
+    abbreviation: string;
+    currencyCode: string;
+    id: string;
+    languages: Language[];
+    name: string;
+}
 export {};

package/dist/shared/api/storefront/hooks/cart/use-delete-cart-line-by-id.d.ts

@@ -1,6 +1,6 @@
 interface UseDeleteCartLineByIdArgs {
-    onError?: () => void;
-    onSuccess?: () => void;
+    onError?: VoidFunction;
+    onSuccess?: VoidFunction;
 }
 export declare function useDeleteCartLineById({ onError, onSuccess, }?: UseDeleteCartLineByIdArgs): import("@tanstack/react-query").UseMutationResult<void, Error, {
     cartLineId: string;

package/dist/shared/api/storefront/hooks/cart/use-delete-current-cart.d.ts

@@ -1,7 +1,7 @@
 import { CartModel } from '../../model/storefront.model';
 interface UseDeleteCurrentCartArgs {
-    onError?: () => void;
-    onSuccess?: () => void;
+    onError?: VoidFunction;
+    onSuccess?: VoidFunction;
 }
 export declare const useDeleteCurrentCart: ({ onError, onSuccess, }?: UseDeleteCurrentCartArgs) => import("@tanstack/react-query").UseMutationResult<CartModel, Error, void, unknown>;
 export {};

package/dist/shared/api/storefront/hooks/cart/use-save-cart-for-later.d.ts

@@ -1,7 +1,7 @@
 import { CartModel } from '../../model/storefront.model';
 interface UseSaveCartForLaterArgs {
-    onError?: () => void;
-    onSuccess?: () => void;
+    onError?: VoidFunction;
+    onSuccess?: VoidFunction;
 }
 export declare function useSaveCartForLater({ onError, onSuccess, }?: UseSaveCartForLaterArgs): import("@tanstack/react-query").UseMutationResult<CartModel, Error, {
     cart: CartModel;

package/dist/shared/api/storefront/hooks/customer/use-patch-bill-to-address.d.ts

@@ -6,6 +6,6 @@ export declare function usePatchBillToAddress({ skipInvalidation, }?: {
     isLoading: boolean;
     isSuccess: boolean;
     mutate: (args_0: {
-        billTo: import("../../model/storefront.model").BillToModel;
+        billTo: import("../../model/storefront.model").PatchBillToModel;
     }) => Promise<import("../../model/storefront.model").BillToModel>;
 };

package/dist/shared/api/storefront/hooks/website/use-fetch-countries-with-languages.d.ts

@@ -1,3 +1,5 @@
-export declare function useFetchCountriesWithLanguages({ enabled, }?: {
+import { Country } from '../../model/storefront.model';
+export declare function useFetchCountriesWithLanguages<TReturnType = Country[]>({ enabled, select, }?: {
     enabled?: boolean;
-}): import("@tanstack/react-query").UseQueryResult<import("../../../../..").Country[], Error>;
+    select?: (data: Country[]) => TReturnType;
+}): import("@tanstack/react-query").UseQueryResult<TReturnType, Error>;

package/dist/shared/api/storefront/hooks/website/use-fetch-countries-with-languages.js

@@ -2,12 +2,13 @@ import { useQuery } from '@tanstack/react-query';
 import { TIME } from '../../../../utils/time.js';
 import { fetchCountriesWithLanguages } from '../../services/website-service.js';
 
-function useFetchCountriesWithLanguages({ enabled = true, } = { enabled: true }) {
+function useFetchCountriesWithLanguages({ enabled = true, select, } = { enabled: true }) {
     return useQuery({
         enabled,
         gcTime: 24 * TIME.HOUR,
         queryFn: fetchCountriesWithLanguages,
-        queryKey: ['country-languages'],
+        queryKey: ['country-with-languages'],
+        select,
         staleTime: 24 * TIME.HOUR,
     });
 }

package/dist/shared/api/storefront/hooks/website/{use-fetch-countries.d.ts → use-fetch-country-models.d.ts}

@@ -1,3 +1,3 @@
-export declare function useFetchCountries({ enabled }?: {
+export declare function useFetchCountryModels({ enabled }?: {
     enabled: boolean;
 }): import("@tanstack/react-query").UseQueryResult<import("../../model/storefront.model").CountryModel[], Error>;

package/dist/shared/api/storefront/hooks/website/use-fetch-country-models.js

@@ -0,0 +1,16 @@
+import { useQuery } from '@tanstack/react-query';
+import { TIME } from '../../../../utils/time.js';
+import { fetchCountriesLanguages } from '../../services/website-service.js';
+
+function useFetchCountryModels({ enabled = true } = { enabled: true }) {
+    return useQuery({
+        enabled,
+        gcTime: 24 * TIME.HOUR,
+        queryFn: fetchCountriesLanguages,
+        queryKey: ['countries'],
+        select: data => data.countries,
+        staleTime: 24 * TIME.HOUR,
+    });
+}
+
+export { useFetchCountryModels };

package/dist/shared/api/storefront/model/storefront.model.d.ts

@@ -966,8 +966,15 @@ export interface CartModel extends BaseModel {
     vmiLocationId?: string | null;
     warehouses: WarehouseDto[] | null;
 }
+export type PatchBillToModel = Partial<Omit<BillToModel, 'country'> & {
+    country?: CountryModel | {
+        id: string;
+    } | null;
+}> & {
+    id: string;
+};
 export type PatchCartModel = Partial<Omit<CartModel, 'billTo'> & {
-    billTo?: BillToModel | {
+    billTo?: PatchBillToModel | {
         id: string;
     } | null;
 }> & {
@@ -3037,3 +3044,16 @@ export interface AdyenPaymentModel {
     pspReference: string;
     resultCode: AdyenResultCode;
 }
+export interface Language {
+    cultureCode: string;
+    description: string;
+    id: string;
+    languageCode: string;
+}
+export interface Country {
+    abbreviation: string;
+    currencyCode: string;
+    id: string;
+    languages: Language[];
+    name: string;
+}

package/dist/shared/api/storefront/services/customer-service.d.ts

@@ -1,10 +1,10 @@
-import { BillToCollectionModel, BillToModel, ShipToCollectionModel } from 'shared/api/storefront/model/storefront.model';
+import { BillToCollectionModel, BillToModel, PatchBillToModel, ShipToCollectionModel } from 'shared/api/storefront/model/storefront.model';
 export declare function fetchBillToAddresses(): Promise<BillToCollectionModel>;
 export declare function fetchShipToAddresses({ shipToId }: {
     shipToId: string;
 }): Promise<ShipToCollectionModel>;
-export declare function patchBillToAddress({ billTo }: {
-    billTo: BillToModel;
+export declare function patchBillToAddress({ billTo, }: {
+    billTo: PatchBillToModel;
 }): Promise<BillToModel>;
 export declare function fetchFulfillmentMethods({ customerId, }: {
     customerId: string;

package/dist/shared/api/storefront/services/customer-service.js

@@ -15,7 +15,7 @@ async function fetchShipToAddresses({ shipToId }) {
     });
     return body;
 }
-async function patchBillToAddress({ billTo }) {
+async function patchBillToAddress({ billTo, }) {
     const { body: updatedBillTo } = await request({
         body: billTo,
         credentials: 'include',

package/dist/shared/api/storefront/services/website-service.d.ts

@@ -1,6 +1,4 @@
-import { Country } from '../../../model/countries-languages';
-import { CountryModel, LanguageModel, SessionModel, SettingsCollectionModel } from '../model/storefront.model';
-export declare function fetchCountries(): Promise<CountryModel[]>;
+import { Country, CountryModel, LanguageModel, SessionModel, SettingsCollectionModel } from '../model/storefront.model';
 export declare function fetchCountriesLanguages(): Promise<{
     countries: CountryModel[];
     languages: LanguageModel[];

package/dist/shared/api/storefront/services/website-service.js

@@ -1,24 +1,6 @@
 import { config } from '../../../../config.js';
-import { isCountryCode, isLanguageCode, isCultureCode } from '../../../../intl/types.js';
 import { request } from '../../../fetch/request.js';
 
-const countryIsoCodeToLanguageIsoCode = {
-    '*': ['EN'],
-    AT: ['DE'],
-    BE: ['NL', 'FR'],
-    CH: ['FR', 'DE', 'IT'],
-    DE: ['DE'],
-    FR: ['FR'],
-    IT: ['IT'],
-    LU: ['FR', 'DE'],
-    NL: ['EN', 'NL'],
-};
-async function fetchCountries() {
-    const { body } = await request({
-        url: `${config.SHOP_API_URL}/api/v1/websites/current/countries?expand=isActive`,
-    });
-    return body.countries || [];
-}
 async function fetchCountriesLanguages() {
     const { body } = await request({
         url: `${config.SHOP_API_URL}/api/v1/websites/current?expand=languages%2Ccountries`,
@@ -29,33 +11,10 @@ async function fetchCountriesLanguages() {
     };
 }
 async function fetchCountriesWithLanguages() {
-    const { countries, languages } = await fetchCountriesLanguages();
-    return countries.map((country) => {
-        const abbreviation = country.abbreviation.toUpperCase();
-        if (!isCountryCode(abbreviation))
-            throw new Error(`Invalid country code: ${abbreviation}`);
-        return {
-            abbreviation,
-            id: country.id,
-            languages: languages
-                .filter(language => countryIsoCodeToLanguageIsoCode[country.abbreviation]?.includes(language.languageCode) ??
-                countryIsoCodeToLanguageIsoCode['*'].includes(language.languageCode.toUpperCase()))
-                .map((language) => {
-                const languageCode = language.languageCode.toUpperCase();
-                if (!isLanguageCode(languageCode))
-                    throw new Error(`Invalid language code: ${languageCode}`);
-                if (!isCultureCode(language.cultureCode))
-                    throw new Error(`Invalid culture code: ${language.cultureCode}`);
-                return {
-                    cultureCode: language.cultureCode,
-                    description: language.description,
-                    id: language.id,
-                    languageCode,
-                };
-            }),
-            name: country.name,
-        };
+    const { body } = await request({
+        url: `${config.SHOP_API_URL}/api/v1/custom/countrylanguage`,
     });
+    return body;
 }
 async function updateLocale({ countryId, languageId, }) {
     const { body } = await request({
@@ -80,4 +39,4 @@ async function fetchSettings() {
     return body.settingsCollection;
 }
 
-export { fetchCountries, fetchCountriesLanguages, fetchCountriesWithLanguages, fetchSettings, updateLocale };
+export { fetchCountriesLanguages, fetchCountriesWithLanguages, fetchSettings, updateLocale };

package/dist/shared/data/cart.data.d.ts

@@ -0,0 +1,2 @@
+import { CartModel } from '../api/storefront/model/storefront.model';
+export declare const cart: CartModel;