@evenicanpm/storefront-core 1.8.1 → 2.0.0

package/src/hooks/use-overflow-detect.ts

@@ -1,13 +1,13 @@
 "use client";
 
-import { useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 
 export default function useOverflowDetect() {
 	const elementRef = useRef<HTMLElement | null>(null);
 	const [isLeftOverflowing, setLeftIsOverflowing] = useState(false);
 	const [isRightOverflowing, setRightIsOverflowing] = useState(false);
 
-	function checkOverflow() {
+	const checkOverflow = useCallback(() => {
 		const element = elementRef.current;
 
 		if (element) {
@@ -19,7 +19,7 @@ export default function useOverflowDetect() {
 
 			if (elementRect.right > viewportWidth) setRightIsOverflowing(true);
 		}
-	}
+	}, []);
 
 	useEffect(() => {
 		window.addEventListener("resize", checkOverflow);
@@ -28,7 +28,7 @@ export default function useOverflowDetect() {
 		return () => {
 			window.removeEventListener("resize", checkOverflow);
 		};
-	}, []);
+	}, [checkOverflow]);
 
 	return { elementRef, isRightOverflowing, isLeftOverflowing, checkOverflow };
 }

package/src/lib/cart-cookie-handler.ts

@@ -29,8 +29,8 @@ const getCartCookieWithAuthStatus = async () => {
 };
 
 export {
-	getCartCookie,
-	setCartCookie,
 	deleteCartCookie,
+	getCartCookie,
 	getCartCookieWithAuthStatus,
+	setCartCookie,
 };

package/src/lib/category-helpers.ts

@@ -106,8 +106,8 @@ const normalizeCategoryName = (string_: string) =>
 	string_.toLowerCase().replaceAll(" ", "-");
 
 export {
-	mapCategoryToHierarchy,
 	generateUrl,
 	getFriendlyName,
+	mapCategoryToHierarchy,
 	normalizeCategoryName,
 };

package/src/lib/lib.ts

@@ -58,4 +58,4 @@ function currency(price: number, fraction = 2) {
 	return formatCurrency;
 }
 
-export { currency, getDateDifference, calculateDiscount, renderProductCount };
+export { calculateDiscount, currency, getDateDifference, renderProductCount };

package/src/lib/refiner-utils.ts

@@ -26,7 +26,7 @@ const areRefinersEqual = (r1: ProductRefinerValue, r2: ProductRefinerValue) =>
 	r1.RightValueBoundString === r2.RightValueBoundString;
 
 export {
-	convertRefinerToParameter,
-	convertParameterToRefiner,
 	areRefinersEqual,
+	convertParameterToRefiner,
+	convertRefinerToParameter,
 };

package/src/{pages-v2 → pages}/account/account-navigation.tsx

@@ -4,16 +4,16 @@
 import getUser from "@evenicanpm/storefront-core/src/api-manager/services/user/queries/get-user";
 import getUserCounts from "@evenicanpm/storefront-core/src/api-manager/services/user/queries/get-user-counts";
 // GLOBAL CUSTOM COMPONENTS
-import FlexBox from "@evenicanpm/storefront-core/src/components-v2/flex-box/flex-box";
+import FlexBox from "@evenicanpm/storefront-core/src/components/flex-box/flex-box";
 import {
 	Paragraph,
 	Span,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 // STYLED COMPONENTS
 import {
 	MainContainer,
 	StyledNavLink,
-} from "@evenicanpm/storefront-core/src/pages-v2/account/styles";
+} from "@evenicanpm/storefront-core/src/pages/account/styles";
 import { usePathname } from "next/navigation";
 import { useTranslations } from "next-intl";
 import { createContext, Fragment, type ReactNode } from "react";
@@ -125,7 +125,7 @@ const AccountNavigation = ({ items, children }: AccountNavigationProps) => {
 									<AccountNavigation.Item
 										key={item.title}
 										{...item}
-										isActive={pathname.includes(item.href)}
+										isActive={pathname?.includes(item.href) ?? false}
 										label={t(item.title)}
 									/>
 								))}

package/src/{pages-v2 → pages}/account/addresses/address-item.tsx

@@ -5,8 +5,8 @@ import type { Address } from "@evenicanpm/storefront-core/src/api-manager/schema
 import useDeleteAddress from "@evenicanpm/storefront-core/src/api-manager/services/address/mutations/delete-address";
 import useUpdateUser from "@evenicanpm/storefront-core/src/api-manager/services/user/mutations/update-user";
 // Custom Components
-import { Paragraph } from "@evenicanpm/storefront-core/src/components-v2/Typography";
-import TableRow from "@evenicanpm/storefront-core/src/pages-v2/account/table-row";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/Typography";
+import TableRow from "@evenicanpm/storefront-core/src/pages/account/table-row";
 import { useNotification } from "@evenicanpm/storefront-core/src/providers/notifications/use-notification";
 import { Box, Button, Chip } from "@mui/material";
 import IconButton from "@mui/material/IconButton";

package/src/{pages-v2 → pages}/account/dashboard-header.tsx

@@ -1,10 +1,10 @@
 "use client";
 
-import FlexBox from "@evenicanpm/storefront-core/src/components-v2/flex-box/flex-box";
+import FlexBox from "@evenicanpm/storefront-core/src/components/flex-box/flex-box";
 // GLOBAL CUSTOM COMPONENTS
-import SideNav from "@evenicanpm/storefront-core/src/components-v2/side-nav/index";
-import { H2 } from "@evenicanpm/storefront-core/src/components-v2/Typography";
-import Navigation from "@evenicanpm/storefront-core/src/pages-v2/account/account-navigation";
+import SideNav from "@evenicanpm/storefront-core/src/components/side-nav/index";
+import { H2 } from "@evenicanpm/storefront-core/src/components/Typography";
+import Navigation from "@evenicanpm/storefront-core/src/pages/account/account-navigation";
 import {
 	Box,
 	Button,

package/src/{pages-v2 → pages}/account/orders/icons/delivery.tsx

@@ -2,6 +2,7 @@ import createSvgIcon from "@mui/material/utils/createSvgIcon";
 
 const Delivery = createSvgIcon(
 	<svg fill="currentColor" viewBox="0 0 32 32">
+		<title>Delivery</title>
 		<path d="M24.0531 1.69349L23.7031 2.33374C23.5704 2.57647 23.3708 2.77603 23.1281 2.90874L22.4878 3.25874C22.4584 3.27482 22.4339 3.29852 22.4167 3.32735C22.3996 3.35619 22.3906 3.38909 22.3906 3.42262C22.3906 3.45614 22.3996 3.48905 22.4167 3.51788C22.4339 3.54671 22.4584 3.57041 22.4878 3.58649L23.1281 3.93649C23.3708 4.0692 23.5704 4.26876 23.7031 4.51149L24.0531 5.15174C24.0691 5.18122 24.0928 5.20583 24.1217 5.22297C24.1506 5.24011 24.1835 5.24916 24.2171 5.24916C24.2506 5.24916 24.2836 5.24011 24.3124 5.22297C24.3413 5.20583 24.365 5.18122 24.3811 5.15174L24.7311 4.51149C24.8639 4.26884 25.0634 4.0693 25.3061 3.93649L25.9463 3.58649C25.9757 3.57041 26.0003 3.54671 26.0174 3.51788C26.0345 3.48905 26.0435 3.45614 26.0435 3.42262C26.0435 3.38909 26.0345 3.35619 26.0174 3.32735C26.0003 3.29852 25.9757 3.27482 25.9463 3.25874L25.3061 2.90874C25.0634 2.77593 24.8639 2.5764 24.7311 2.33374L24.3811 1.69349C24.365 1.66401 24.3413 1.63941 24.3124 1.62226C24.2836 1.60512 24.2506 1.59607 24.2171 1.59607C24.1835 1.59607 24.1506 1.60512 24.1217 1.62226C24.0928 1.63941 24.0691 1.66401 24.0531 1.69349Z" />
 		<path d="M27.4868 6.42496L27.2408 6.87496C27.1475 7.04555 27.0072 7.18577 26.8366 7.27896L26.3866 7.52496C26.3659 7.53626 26.3487 7.55292 26.3367 7.57317C26.3247 7.59343 26.3184 7.61654 26.3184 7.64008C26.3184 7.66363 26.3247 7.68674 26.3367 7.70699C26.3487 7.72725 26.3659 7.7439 26.3866 7.75521L26.8366 8.00121C27.0072 8.0944 27.1475 8.23462 27.2408 8.40521L27.4868 8.85521C27.4981 8.87593 27.5147 8.89323 27.535 8.90528C27.5552 8.91733 27.5784 8.9237 27.602 8.9237C27.6255 8.9237 27.6487 8.91733 27.6689 8.90528C27.6892 8.89323 27.7058 8.87593 27.7171 8.85521L27.9631 8.40521C28.0562 8.23422 28.1964 8.09357 28.3671 7.99996L28.8171 7.75396C28.8377 7.74265 28.855 7.726 28.867 7.70574C28.879 7.68549 28.8853 7.66238 28.8853 7.63883C28.8853 7.61529 28.879 7.59218 28.867 7.57192C28.855 7.55167 28.8377 7.53501 28.8171 7.52371L28.3671 7.27771C28.1966 7.18443 28.0564 7.04423 27.9631 6.87371L27.7171 6.42371C27.7057 6.40305 27.689 6.38584 27.6687 6.37389C27.6483 6.36195 27.6252 6.35571 27.6016 6.35584C27.578 6.35596 27.5549 6.36245 27.5347 6.37462C27.5145 6.38678 27.498 6.40417 27.4868 6.42496Z" />
 		<path d="M22.72 27.117C22.2155 26.7778 21.395 26.9463 20.616 27.144C20.3484 27.2145 20.0852 27.3007 19.8278 27.402C19.3339 27.6067 18.806 27.717 18.2715 27.727C17.6673 27.717 16.961 27.5575 16.5123 27.8078C16.4668 27.8331 16.4165 27.8487 16.3647 27.8536C16.3129 27.8584 16.2606 27.8524 16.2112 27.8359C16.1618 27.8195 16.1164 27.7929 16.0779 27.7579C16.0393 27.723 16.0084 27.6803 15.9873 27.6328C15.951 27.541 15.9505 27.439 15.9859 27.3469C16.0214 27.2548 16.0901 27.1794 16.1785 27.1355C16.8433 26.7855 17.6623 27.0173 18.3395 27.1148C18.742 27.1795 19.1513 27.1907 19.5568 27.1483C19.6799 27.1304 19.7915 27.066 19.8685 26.9684C19.9456 26.8707 19.9823 26.7472 19.971 26.6233C19.9497 26.5028 19.8999 26.3892 19.8257 26.2919C19.7515 26.1946 19.6551 26.1165 19.5445 26.064C19.1475 25.8553 17.709 25.464 16.7735 25.273C15.285 24.9739 13.739 25.1859 12.386 25.8748C11.6408 26.2278 9.50876 27.6795 8.98101 28.504C8.90689 28.6092 8.8747 28.7382 8.89076 28.8658C8.94426 29.3465 10.3875 30.7326 10.8303 30.8761C10.9111 30.9062 10.9981 30.9159 11.0836 30.9044C11.1692 30.8929 11.2505 30.8605 11.3205 30.8101C11.5873 30.6386 12.174 30.0625 12.765 29.855C13.8595 29.47 15.6748 29.8025 16.5585 29.7815C17.8585 29.7503 22.201 28.6373 22.8718 28.0315C23.1388 27.7913 23.0415 27.333 22.72 27.117Z" />

package/src/{pages-v2 → pages}/account/orders/icons/package-box.tsx

@@ -2,6 +2,7 @@ import createSvgIcon from "@mui/material/utils/createSvgIcon";
 
 const PackageBox = createSvgIcon(
 	<svg fill="currentColor" viewBox="0 0 32 32">
+		<title>Package Box</title>
 		<path d="M7.40692 11.3465L20.5779 4.304L16.0004 2L2.41992 8.836L7.40692 11.3465Z" />
 		<path d="M24.5773 6.3175L11.4062 13.36L15.9998 15.6725L29.5803 8.83601L24.5773 6.3175Z" />
 		<path d="M15.625 16.3275L11 13.9995V19.1145L9 17.101H7V11.986L2 9.46948V23.1415L15.625 30V16.3275Z" />

package/src/{pages-v2 → pages}/account/orders/icons/truck-filled.tsx

@@ -2,6 +2,7 @@ import createSvgIcon from "@mui/material/utils/createSvgIcon";
 
 const TruckFilled = createSvgIcon(
 	<svg fill="currentColor" viewBox="0 0 36 36">
+		<title>Truck</title>
 		<path
 			fillRule="evenodd"
 			clipRule="evenodd"

package/src/{pages-v2 → pages}/account/orders/order-progress.tsx

@@ -1,13 +1,13 @@
 import {
 	FlexBetween,
 	FlexBox,
-} from "@evenicanpm/storefront-core/src/components-v2/flex-box/index";
+} from "@evenicanpm/storefront-core/src/components/flex-box/index";
 // GLOBAL CUSTOM COMPONENTS
-import { Paragraph } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/Typography";
 // CUSTOM ICON COMPONENTS
-import Delivery from "@evenicanpm/storefront-core/src/pages-v2/account/orders/icons/delivery";
-import PackageBox from "@evenicanpm/storefront-core/src/pages-v2/account/orders/icons/package-box";
-import TruckFilled from "@evenicanpm/storefront-core/src/pages-v2/account/orders/icons/truck-filled";
+import Delivery from "@evenicanpm/storefront-core/src/pages/account/orders/icons/delivery";
+import PackageBox from "@evenicanpm/storefront-core/src/pages/account/orders/icons/package-box";
+import TruckFilled from "@evenicanpm/storefront-core/src/pages/account/orders/icons/truck-filled";
 import Avatar from "@mui/material/Avatar";
 import Box from "@mui/material/Box";
 import Card from "@mui/material/Card";

package/src/{pages-v2 → pages}/account/orders/order-row.tsx

@@ -2,9 +2,9 @@ import type { SalesOrder } from "@evenicanpm/storefront-core/src/api-manager/sch
 import {
 	H6,
 	Paragraph,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 import useCurrencyFormatter from "@evenicanpm/storefront-core/src/lib/currency-formatter";
-import TableRow from "@evenicanpm/storefront-core/src/pages-v2/account/table-row";
+import TableRow from "@evenicanpm/storefront-core/src/pages/account/table-row";
 import type { ChipProps } from "@mui/material";
 import Box from "@mui/material/Box";
 import Chip from "@mui/material/Chip";

package/src/{pages-v2 → pages}/account/orders/order-summary.tsx

@@ -1,10 +1,10 @@
 import type { SalesOrder } from "@evenicanpm/storefront-core/src/api-manager/schemas/order.schema";
-import { FlexBetween } from "@evenicanpm/storefront-core/src/components-v2/flex-box/index";
+import { FlexBetween } from "@evenicanpm/storefront-core/src/components/flex-box/index";
 import {
 	H5,
 	H6,
 	Paragraph,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 import useCurrencyFormatter from "@evenicanpm/storefront-core/src/lib/currency-formatter";
 import Card from "@mui/material/Card";
 import Divider from "@mui/material/Divider";
@@ -86,9 +86,9 @@ OrderSummary.ListItem = ({
 	title: string;
 	property: keyof SalesOrder;
 }) => {
+	const t = useTranslations("Account.OrderDetails");
 	const context = useContext(OrderSummaryContext);
 	if (!context) return null;
-	const t = useTranslations("Account.OrderDetails");
 	const { order, formatCurrency } = context;
 
 	const value = order[property];
@@ -104,10 +104,10 @@ OrderSummary.ListItem = ({
 OrderSummary.Divider = Divider;
 
 OrderSummary.Total = () => {
+	const t = useTranslations("Account.OrderDetails");
 	const context = useContext(OrderSummaryContext);
 	if (!context) return null;
 	const { order, formatCurrency } = context;
-	const t = useTranslations("Account.OrderDetails");
 
 	return (
 		<FlexBetween mb={2}>

package/src/{pages-v2 → pages}/account/orders/ordered-products.tsx

@@ -5,12 +5,12 @@ import type {
 import {
 	FlexBetween,
 	FlexBox,
-} from "@evenicanpm/storefront-core/src/components-v2/flex-box/index";
+} from "@evenicanpm/storefront-core/src/components/flex-box/index";
 import {
 	H6,
 	Paragraph,
 	Span,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 import buildDetailUrl from "@evenicanpm/storefront-core/src/lib/build-detail-url";
 import useCurrencyFormatter from "@evenicanpm/storefront-core/src/lib/currency-formatter";
 import { ProductDimensionType } from "@msdyn365-commerce/retail-proxy";

package/src/{pages-v2 → pages}/account/profile/profile-button.test.tsx

@@ -1,4 +1,4 @@
-import ProfileButton from "@evenicanpm/storefront-core/src/pages-v2/account/profile/profile-button";
+import ProfileButton from "@evenicanpm/storefront-core/src/pages/account/profile/profile-button";
 import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { vi } from "vitest";
 import { getMsalInstance, getRequestConfig, initializeMsal } from "@/auth/msal";
@@ -9,7 +9,7 @@ vi.mock("@/auth/msal", () => ({
 	getRequestConfig: vi.fn(),
 }));
 
-vi.mock("@evenicanpm/storefront-core/src/components-v2/T/index", () => ({
+vi.mock("@evenicanpm/storefront-core/src/components/T/index", () => ({
 	default: ({ path }: { path: string }) => <span>{path}</span>,
 }));
 

package/src/{pages-v2 → pages}/account/profile/profile-button.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import type { RedirectRequest } from "@azure/msal-browser";
-import T from "@evenicanpm/storefront-core/src/components-v2/T/index";
+import T from "@evenicanpm/storefront-core/src/components/T/index";
 import { Button } from "@mui/material";
 import { useEffect, useState } from "react";
 import { getMsalInstance, getRequestConfig, initializeMsal } from "@/auth/msal";

package/src/{pages-v2 → pages}/account/profile/user-info.tsx

@@ -3,11 +3,11 @@
 // API
 import type { User } from "@evenicanpm/storefront-core/src/api-manager/schemas/user.schema";
 // GLOBAL CUSTOM COMPONENTS
-import FlexBox from "@evenicanpm/storefront-core/src/components-v2/flex-box/flex-box";
+import FlexBox from "@evenicanpm/storefront-core/src/components/flex-box/flex-box";
 import {
 	Small,
 	Span,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 import Card from "@mui/material/Card";
 import type { Theme } from "@mui/material/styles";
 import useMediaQuery from "@mui/material/useMediaQuery";

package/src/{pages-v2 → pages}/account/styles.ts

@@ -1,4 +1,4 @@
-import NavLink from "@evenicanpm/storefront-core/src/components-v2/nav-link/nav-link";
+import NavLink from "@evenicanpm/storefront-core/src/components/nav-link/nav-link";
 import Card from "@mui/material/Card";
 import styled from "@mui/material/styles/styled";
 

package/src/{pages-v2 → pages}/account/wishlist/create-new-list.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import useCreateWishlist from "@evenicanpm/storefront-core/src/api-manager/services/user/mutations/create-wishlist";
-import { H5 } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { H5 } from "@evenicanpm/storefront-core/src/components/Typography";
 import { useNotification } from "@evenicanpm/storefront-core/src/providers/notifications/use-notification";
 import {
 	Box,
@@ -69,7 +69,7 @@ const CreateNewList = ({
 
 	useEffect(() => {
 		if (open) formik.resetForm();
-	}, [open]);
+	}, [open, formik.resetForm]);
 
 	const handleClose = () => {
 		if (isFunction(onClose)) onClose();

package/src/{pages-v2 → pages}/account/wishlist/create-wishlist-button.tsx

@@ -1,7 +1,7 @@
 "use client";
 
-import T from "@evenicanpm/storefront-core/src/components-v2/T";
-import CreateNewList from "@evenicanpm/storefront-core/src/pages-v2/account/wishlist/create-new-list";
+import T from "@evenicanpm/storefront-core/src/components/T";
+import CreateNewList from "@evenicanpm/storefront-core/src/pages/account/wishlist/create-new-list";
 import { Button } from "@mui/material";
 import { useState } from "react";
 

package/src/{pages-v2 → pages}/account/wishlist/wishlist-item.tsx

@@ -6,9 +6,9 @@ import type {
 } from "@evenicanpm/storefront-core/src/api-manager/schemas/user.schema";
 // API
 import useDeleteWishlist from "@evenicanpm/storefront-core/src/api-manager/services/user/mutations/delete-wishlist";
-import { NavLink3 } from "@evenicanpm/storefront-core/src/components-v2/nav-link";
-import { Paragraph } from "@evenicanpm/storefront-core/src/components-v2/Typography";
-import TableRow from "@evenicanpm/storefront-core/src/pages-v2/account/table-row";
+import { NavLink3 } from "@evenicanpm/storefront-core/src/components/nav-link";
+import { Paragraph } from "@evenicanpm/storefront-core/src/components/Typography";
+import TableRow from "@evenicanpm/storefront-core/src/pages/account/table-row";
 import { useNotification } from "@evenicanpm/storefront-core/src/providers/notifications/use-notification";
 import { Box, IconButton } from "@mui/material";
 import type { SxProps } from "@mui/material/styles";

package/src/{pages-v2 → pages}/blog/blog-card.tsx

@@ -1,12 +1,12 @@
 // GLOBAL CUSTOM COMPONENTS
 
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
-import { ZoomLazyImage } from "@evenicanpm/storefront-core/src/components-v2/LazyImage";
-import { NavLink2 } from "@evenicanpm/storefront-core/src/components-v2/nav-link";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
+import { ZoomLazyImage } from "@evenicanpm/storefront-core/src/components/LazyImage";
+import { NavLink2 } from "@evenicanpm/storefront-core/src/components/nav-link";
 import {
 	H3,
 	Paragraph,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 // MUI ICON COMPONENTS
 import AccessTime from "@mui/icons-material/AccessTime";
 import Box from "@mui/material/Box";

package/src/{pages-v2 → pages}/cart/__tests__/cart-item.test.tsx

@@ -1,6 +1,6 @@
 import type { Cart } from "@evenicanpm/storefront-core/src/api-manager/schemas/cart.schema";
+import cartData from "@evenicanpm/storefront-core/src/pages/cart/__tests__/cart-with-items.json";
 import CartItem from "@evenicanpm/storefront-core/src/pages/cart/cart-item";
-import cartData from "@evenicanpm/storefront-core/src/pages-v2/cart/__tests__/cart-with-items.json";
 import { NotificationProvider } from "@evenicanpm/storefront-core/src/providers/notifications/notification-context";
 import ENUS from "@messages/en-US.json";
 import fr from "@messages/fr.json";

package/src/{pages-v2 → pages}/cart/__tests__/checkout-form.test.tsx

@@ -1,6 +1,6 @@
 import type { Cart } from "@evenicanpm/storefront-core/src/api-manager/schemas/cart.schema";
+import cartData from "@evenicanpm/storefront-core/src/pages/cart/__tests__/cart-with-items.json";
 import CheckoutForm from "@evenicanpm/storefront-core/src/pages/cart/checkout-form";
-import cartData from "@evenicanpm/storefront-core/src/pages-v2/cart/__tests__/cart-with-items.json";
 import { NotificationProvider } from "@evenicanpm/storefront-core/src/providers/notifications/notification-context";
 import ENUS from "@messages/en-US.json";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";

package/src/{pages-v2 → pages}/cart/__tests__/estimate-shipping.test.tsx

@@ -1,7 +1,7 @@
 import type { Cart } from "@evenicanpm/storefront-core/src/api-manager/schemas/cart.schema";
-import cartData from "@evenicanpm/storefront-core/src/pages-v2/cart/__tests__/cart-with-items.json";
-import countries from "@evenicanpm/storefront-core/src/pages-v2/cart/__tests__/countries.json";
-import EstimateShipping from "@evenicanpm/storefront-core/src/pages-v2/cart/estimate-shipping";
+import cartData from "@evenicanpm/storefront-core/src/pages/cart/__tests__/cart-with-items.json";
+import countries from "@evenicanpm/storefront-core/src/pages/cart/__tests__/countries.json";
+import EstimateShipping from "@evenicanpm/storefront-core/src/pages/cart/estimate-shipping";
 import { NotificationProvider } from "@evenicanpm/storefront-core/src/providers/notifications/notification-context";
 import ENUS from "@messages/en-US.json";
 import type { CountryRegionInfo } from "@msdyn365-commerce/retail-proxy";
@@ -27,10 +27,10 @@ describe("Estimate Shipping", () => {
 	it("Should Default Country to USA", async () => {
 		const _countries = countries as CountryRegionInfo[];
 		const america = _countries.find((c) => c.ISOCode === "US");
-		let selectedCountry;
-		const setCountryFn = vi.fn(
-			(c: CountryRegionInfo) => (selectedCountry = c.ISOCode),
-		);
+		let selectedCountry: string | undefined;
+		const setCountryFn = vi.fn((c: CountryRegionInfo) => {
+			selectedCountry = c.ISOCode;
+		});
 		render(
 			<Wrapper>
 				<EstimateShipping
@@ -56,10 +56,10 @@ describe("Estimate Shipping", () => {
 	it("Should Default Country to Canada", async () => {
 		const _countries = countries as CountryRegionInfo[];
 		const canada = _countries.find((c) => c.ISOCode === "CA");
-		let selectedCountry;
-		const setCountryFn = vi.fn(
-			(c: CountryRegionInfo) => (selectedCountry = c.ISOCode),
-		);
+		let selectedCountry: string | undefined;
+		const setCountryFn = vi.fn((c: CountryRegionInfo) => {
+			selectedCountry = c.ISOCode;
+		});
 		render(
 			<Wrapper>
 				<EstimateShipping

package/src/{pages-v2 → pages}/cart/cart-item.tsx

@@ -3,18 +3,18 @@
 import type { CartLine } from "@evenicanpm/storefront-core/src/api-manager/schemas/cart.schema";
 import useDeleteCartLine from "@evenicanpm/storefront-core/src/api-manager/services/cart/mutations/delete-cart-line";
 import useUpdateCartLines from "@evenicanpm/storefront-core/src/api-manager/services/cart/mutations/update-cart-lines";
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
-import Image from "@evenicanpm/storefront-core/src/components-v2/ImageWithFallback";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
+import Image from "@evenicanpm/storefront-core/src/components/ImageWithFallback";
 // Local components
 import {
 	H6,
 	Span,
 	Tiny,
-} from "@evenicanpm/storefront-core/src/components-v2/Typography";
+} from "@evenicanpm/storefront-core/src/components/Typography";
 import { getProductDetailUrl } from "@evenicanpm/storefront-core/src/lib/build-product-detail-url";
 // Utils
 import useCurrencyFormatter from "@evenicanpm/storefront-core/src/lib/currency-formatter";
-import { Wrapper } from "@evenicanpm/storefront-core/src/pages-v2/cart/wrapper";
+import { Wrapper } from "@evenicanpm/storefront-core/src/pages/cart/wrapper";
 // API
 import { ProductDimensionType } from "@msdyn365-commerce/retail-proxy";
 // MUI Icons
@@ -32,7 +32,13 @@ import {
 import Link from "next/link";
 import { useTranslations } from "next-intl";
 import type React from "react";
-import { createContext, useContext, useMemo, useState } from "react";
+import {
+	createContext,
+	useCallback,
+	useContext,
+	useMemo,
+	useState,
+} from "react";
 
 type CartItemContextValue = {
 	cartLine: CartLine;
@@ -84,30 +90,39 @@ function CartItemRoot({
 	const qty = cartLine.Quantity || 1;
 	const isLoading = updatePending || deletePending;
 
-	const performUpdate = (updated: CartLine) => {
-		updateCartLine({ cartLine: [updated], cartId, version: cartVersion });
-	};
+	const performUpdate = useCallback(
+		(updated: CartLine) => {
+			updateCartLine({ cartLine: [updated], cartId, version: cartVersion });
+		},
+		[cartId, cartVersion, updateCartLine],
+	);
 
-	const increase = () => performUpdate({ ...cartLine, Quantity: qty + 1 });
-	const decrease = () => {
+	const increase = useCallback(
+		() => performUpdate({ ...cartLine, Quantity: qty + 1 }),
+		[cartLine, qty, performUpdate],
+	);
+	const decrease = useCallback(() => {
 		if (qty === 1) return;
 		performUpdate({ ...cartLine, Quantity: qty - 1 });
-	};
-	const remove = () =>
-		deleteCartLine({
-			cartLine: [{ ...cartLine, Quantity: 0 }],
-			cartId,
-			version: cartVersion,
-		});
+	}, [cartLine, qty, performUpdate]);
+	const remove = useCallback(
+		() =>
+			deleteCartLine({
+				cartLine: [{ ...cartLine, Quantity: 0 }],
+				cartId,
+				version: cartVersion,
+			}),
+		[cartLine, cartId, cartVersion, deleteCartLine],
+	);
 
-	const saveComment = () => {
+	const saveComment = useCallback(() => {
 		performUpdate({ ...cartLine, Comment: comment });
 		setIsWritingComment(false);
-	};
-	const cancelComment = () => {
+	}, [cartLine, comment, performUpdate]);
+	const cancelComment = useCallback(() => {
 		setComment(cartLine.Comment || "");
 		setIsWritingComment(false);
-	};
+	}, [cartLine.Comment]);
 
 	const value = useMemo<CartItemContextValue>(
 		() => ({
@@ -126,7 +141,20 @@ function CartItemRoot({
 			saveComment,
 			cancelComment,
 		}),
-		[cartLine, cartId, cartVersion, qty, isLoading, isWritingComment, comment],
+		[
+			cartLine,
+			cartId,
+			cartVersion,
+			qty,
+			isLoading,
+			isWritingComment,
+			comment,
+			increase,
+			decrease,
+			remove,
+			saveComment,
+			cancelComment,
+		],
 	);
 
 	return (

package/src/{pages-v2 → pages}/cart/checkout-form.tsx

@@ -4,10 +4,10 @@ import getStates from "@evenicanpm/storefront-core/src/api-manager/services/addr
 import {
 	FlexBetween,
 	FlexBox,
-} from "@evenicanpm/storefront-core/src/components-v2/flex-box";
-import { Span } from "@evenicanpm/storefront-core/src/components-v2/Typography";
-import CouponEntry from "@evenicanpm/storefront-core/src/pages-v2/cart/coupon-entry";
-import EstimateShipping from "@evenicanpm/storefront-core/src/pages-v2/cart/estimate-shipping";
+} from "@evenicanpm/storefront-core/src/components/flex-box";
+import { Span } from "@evenicanpm/storefront-core/src/components/Typography";
+import CouponEntry from "@evenicanpm/storefront-core/src/pages/cart/coupon-entry";
+import EstimateShipping from "@evenicanpm/storefront-core/src/pages/cart/estimate-shipping";
 import type {
 	CountryRegionInfo,
 	Coupon,

package/src/{pages-v2 → pages}/cart/coupon-entry.tsx

@@ -2,8 +2,8 @@
 
 import useAddDiscountCode from "@evenicanpm/storefront-core/src/api-manager/services/cart/mutations/add-discount-code";
 import useRemoveDiscountcode from "@evenicanpm/storefront-core/src/api-manager/services/cart/mutations/remove-discount-code";
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
-import { Span } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
+import { Span } from "@evenicanpm/storefront-core/src/components/Typography";
 import type { Coupon } from "@msdyn365-commerce/retail-proxy";
 import Close from "@mui/icons-material/Close";
 import {

package/src/{pages-v2 → pages}/cart/estimate-shipping.tsx

@@ -1,7 +1,7 @@
 import type { Address } from "@evenicanpm/storefront-core/src/api-manager/schemas/address.schema";
 import useGetDeliveryOptions from "@evenicanpm/storefront-core/src/api-manager/services/address/mutations/get-delivery-options";
-import CountryInput from "@evenicanpm/storefront-core/src/components-v2/countries-input";
-import { Span } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import CountryInput from "@evenicanpm/storefront-core/src/components/countries-input";
+import { Span } from "@evenicanpm/storefront-core/src/components/Typography";
 import useCurrencyFormatter from "@evenicanpm/storefront-core/src/lib/currency-formatter";
 import type {
 	CountryRegionInfo,

package/src/{pages-v2 → pages}/checkout/checkout-alt-form/checkout-form.tsx

@@ -4,7 +4,7 @@ import type { Cart } from "@evenicanpm/storefront-core/src/api-manager/schemas/c
 import useCheckout from "@evenicanpm/storefront-core/src/api-manager/services/cart/mutations/checkout";
 import getChannelConfiguration from "@evenicanpm/storefront-core/src/api-manager/services/organization/queries/get-channel-configuration";
 import { PageSlug } from "@evenicanpm/storefront-core/src/lib/page-slugs";
-import CheckoutStep from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-form/checkout-step";
+import CheckoutStep from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-form/checkout-step";
 import { useNotification } from "@evenicanpm/storefront-core/src/providers/notifications/use-notification";
 import type { CardPaymentAcceptResult } from "@msdyn365-commerce/retail-proxy";
 import { Box, Button } from "@mui/material";
@@ -43,7 +43,7 @@ interface InjectedStepProps {
 	isLastStep: boolean;
 }
 
-import type { CheckoutStepComponentProps } from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-form/checkout-step";
+import type { CheckoutStepComponentProps } from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-form/checkout-step";
 
 interface StepProps<T extends object> {
 	title: string;

package/src/{pages-v2 → pages}/checkout/checkout-alt-form/checkout-step.tsx

@@ -1,8 +1,8 @@
 import type { Cart } from "@evenicanpm/storefront-core/src/api-manager/schemas/cart.schema";
-import Card from "@evenicanpm/storefront-core/src/components-v2/BazaarCard";
-import { FlexBox } from "@evenicanpm/storefront-core/src/components-v2/flex-box";
-import { Span } from "@evenicanpm/storefront-core/src/components-v2/Typography";
-import StepHeading from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-form/step-heading";
+import Card from "@evenicanpm/storefront-core/src/components/BazaarCard";
+import { FlexBox } from "@evenicanpm/storefront-core/src/components/flex-box";
+import { Span } from "@evenicanpm/storefront-core/src/components/Typography";
+import StepHeading from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-form/step-heading";
 import { Button, useTheme } from "@mui/material";
 import Grid from "@mui/material/Grid2";
 import { useTranslations } from "next-intl";

package/src/{pages-v2 → pages}/checkout/checkout-alt-form/index.ts

@@ -1 +1 @@
-export { default as CheckoutForm } from "@evenicanpm/storefront-core/src/pages-v2/checkout/checkout-alt-form/checkout-form";
+export { default as CheckoutForm } from "@evenicanpm/storefront-core/src/pages/checkout/checkout-alt-form/checkout-form";