@evenicanpm/storefront-core 1.8.4 → 2.0.1

package/src/{components-v2 → components}/product-quantity-buttons/index.tsx

@@ -6,8 +6,7 @@
 import {
 	type QuantityButtonProps,
 	QuantityButtons,
-} from "@evenicanpm/storefront-core/src/components-v2/product-quantity-buttons/compound/quantity-buttons-root";
-import React from "react";
+} from "@evenicanpm/storefront-core/src/components/product-quantity-buttons/compound/quantity-buttons-root";
 
 /**
  * Pre-composed version of quantity buttons.

package/src/{components-v2 → components}/product-quantity-variants/ProductQuantity.stories.tsx

@@ -1,7 +1,6 @@
 // Replace your-framework with the framework you are using, e.g. react-vite, nextjs, nextjs-vite, etc.
 
-import type { Meta, StoryObj } from "@storybook/react";
-import React from "react";
+import type { Meta } from "@storybook/react";
 import { product } from "../../../__mocks__/product-dimensions";
 import QuantityButtons from "./index";
 
@@ -12,7 +11,6 @@ const meta = {
 } satisfies Meta<typeof QuantityButtons>;
 
 export default meta;
-type Story = StoryObj<typeof meta>;
 
 export const Interactive = () => {
 	return <QuantityButtons product={product} />;

package/src/{components-v2 → components}/product-quantity-variants/__tests__/product-quantity-variants.test.tsx

@@ -1,7 +1,7 @@
+import type { ProductDetails } from "@evenicanpm/storefront-core/src/api-manager/schemas/product.schema";
 import { render, screen } from "@testing-library/react";
 import { vi } from "vitest";
 import QuantityVariantsSelect from "../index";
-import type { ProductDetails } from "@evenicanpm/storefront-core/src/api-manager/schemas/product.schema";
 
 vi.mock("next-intl", () => ({
 	useTranslations: () => (key: string) => key,
@@ -24,20 +24,22 @@ vi.mock(
 	"@evenicanpm/storefront-core/src/api-manager/services/product/queries/get-product-availability",
 	() => ({
 		default: {
-			useData: vi.fn(() => ({ data: { OrgUnitAvailabilities: [] } })),
+			useData: vi.fn(() => ({
+				data: { AggregatedProductInventoryAvailabilities: [] },
+			})),
 		},
 	}),
 );
 
 vi.mock(
-	"@evenicanpm/storefront-core/src/components-v2/product-dimensions",
+	"@evenicanpm/storefront-core/src/components/product-dimensions",
 	() => ({
 		default: () => <div data-testid="dimensions">Dimensions</div>,
 	}),
 );
 
 vi.mock(
-	"@evenicanpm/storefront-core/src/components-v2/product-quantity-buttons",
+	"@evenicanpm/storefront-core/src/components/product-quantity-buttons",
 	() => ({
 		default: () => <div data-testid="quantity-buttons">Quantity</div>,
 	}),

package/src/{components-v2 → components}/product-quantity-variants/index.tsx

@@ -3,9 +3,9 @@
 import type { ProductDetails } from "@evenicanpm/storefront-core/src/api-manager/schemas/product.schema";
 import getProductAvailability from "@evenicanpm/storefront-core/src/api-manager/services/product/queries/get-product-availability";
 // LOCAL COMPONENTS
-import ProductDimensions from "@evenicanpm/storefront-core/src/components-v2/product-dimensions";
+import ProductDimensions from "@evenicanpm/storefront-core/src/components/product-dimensions";
 // GLOBAL CUSTOM COMPONENTS
-import QuantityButtons from "@evenicanpm/storefront-core/src/components-v2/product-quantity-buttons";
+import QuantityButtons from "@evenicanpm/storefront-core/src/components/product-quantity-buttons";
 import useCart, {
 	type AddToCartBopisInput,
 } from "@evenicanpm/storefront-core/src/hooks/use-cart";

package/src/{components-v2 → components}/products-view/ProductsGrid.stories.tsx

@@ -1,7 +1,6 @@
 // Replace your-framework with the framework you are using, e.g. react-vite, nextjs, nextjs-vite, etc.
 
-import type { Meta, StoryObj } from "@storybook/react";
-import React from "react";
+import type { Meta } from "@storybook/react";
 import { data, prices } from "../../../__mocks__/products";
 import { ProductsGrid } from "./index";
 
@@ -12,7 +11,6 @@ const meta = {
 } satisfies Meta<typeof ProductsGrid>;
 
 export default meta;
-type Story = StoryObj<typeof meta>;
 
 export const Interactive = () => {
 	return <ProductsGrid products={data.products} productPrices={prices} />;

package/src/{components-v2 → components}/products-view/ProductsList.stories.tsx

@@ -1,7 +1,6 @@
 // Replace your-framework with the framework you are using, e.g. react-vite, nextjs, nextjs-vite, etc.
 
-import type { Meta, StoryObj } from "@storybook/react";
-import React from "react";
+import type { Meta } from "@storybook/react";
 import { data, prices } from "../../../__mocks__/products";
 import { ProductsList } from "./index";
 
@@ -12,7 +11,6 @@ const meta = {
 } satisfies Meta<typeof ProductsList>;
 
 export default meta;
-type Story = StoryObj<typeof meta>;
 
 export const Interactive = () => {
 	return <ProductsList products={data.products} productPrices={prices} />;

package/src/{components-v2 → components}/products-view/__tests__/products-view.test.tsx

@@ -1,21 +1,36 @@
+import type { ProductSearchResult as Product } from "@msdyn365-commerce/retail-proxy";
 import { render } from "@testing-library/react";
+import type { ReactNode } from "react";
 import { vi } from "vitest";
-import { ProductsGrid, ProductsList } from "../index";
-import type { ProductSearchResult as Product } from "@msdyn365-commerce/retail-proxy";
+import {
+	ProductsGrid,
+	ProductsList,
+	type Props as ProductsViewProps,
+} from "../index";
+
+type MockChildrenProps = { children?: ReactNode };
 
 vi.mock("next-intl", () => ({
 	useTranslations: () => (key: string) => key,
 }));
 
+vi.mock("@evenicanpm/storefront-core/src/hooks/use-favorite", () => ({
+	default: () => ({
+		isFavorite: false,
+		toggleFavorite: vi.fn(),
+		loading: false,
+	}),
+}));
+
 vi.mock(
-	"@evenicanpm/storefront-core/src/components-v2/products-view/compound/products-grid-view",
+	"@evenicanpm/storefront-core/src/components/products-view/compound/products-grid-view",
 	() => ({
 		default: Object.assign(
-			({ children }: any) => (
+			({ children }: MockChildrenProps) => (
 				<div data-testid="products-grid-view">{children}</div>
 			),
 			{
-				Grid: ({ children }: any) => (
+				Grid: ({ children }: MockChildrenProps) => (
 					<div data-testid="products-grid">{children}</div>
 				),
 				Card: () => <div data-testid="product-card">Card</div>,
@@ -25,14 +40,14 @@ vi.mock(
 );
 
 vi.mock(
-	"@evenicanpm/storefront-core/src/components-v2/products-view/compound/products-list-view",
+	"@evenicanpm/storefront-core/src/components/products-view/compound/products-list-view",
 	() => ({
 		default: Object.assign(
-			({ children }: any) => (
+			({ children }: MockChildrenProps) => (
 				<div data-testid="products-list-view">{children}</div>
 			),
 			{
-				List: ({ children }: any) => (
+				List: ({ children }: MockChildrenProps) => (
 					<div data-testid="products-list">{children}</div>
 				),
 				Card: () => <div data-testid="product-card">Card</div>,
@@ -72,9 +87,11 @@ describe("ProductsView components", () => {
 		});
 
 		it("renders with product prices", () => {
-			const prices = [{ price: 100, adjustedPrice: 80, productId: 1 }];
+			const prices = [
+				{ price: 100, adjustedPrice: 80, productId: 1 },
+			] as NonNullable<ProductsViewProps["productPrices"]>;
 			const { container } = render(
-				<ProductsGrid products={mockProducts} productPrices={prices as any} />,
+				<ProductsGrid products={mockProducts} productPrices={prices} />,
 			);
 			expect(
 				container.querySelector("[data-testid='products-grid-view']"),
@@ -118,9 +135,11 @@ describe("ProductsView components", () => {
 		});
 
 		it("renders with product prices", () => {
-			const prices = [{ price: 100, adjustedPrice: 80, productId: 1 }];
+			const prices = [
+				{ price: 100, adjustedPrice: 80, productId: 1 },
+			] as NonNullable<ProductsViewProps["productPrices"]>;
 			const { container } = render(
-				<ProductsList products={mockProducts} productPrices={prices as any} />,
+				<ProductsList products={mockProducts} productPrices={prices} />,
 			);
 			expect(
 				container.querySelector("[data-testid='products-list-view']"),

package/src/{components-v2 → components}/products-view/compound/products-grid-view.tsx

@@ -4,14 +4,14 @@
 
 import type { ProductPrice } from "@evenicanpm/storefront-core/src/api-manager/schemas/product.schema";
 // GLOBAL CUSTOM COMPONENTS
-import { FlexBetween } from "@evenicanpm/storefront-core/src/components-v2/flex-box/index";
-import ProductCardPlp from "@evenicanpm/storefront-core/src/components-v2/product-cards/product-card-plp/product-card";
+import { FlexBetween } from "@evenicanpm/storefront-core/src/components/flex-box/index";
+import ProductCardPlp from "@evenicanpm/storefront-core/src/components/product-cards/product-card-plp/product-card";
 import {
 	ProductsViewCardContext,
 	ProductsViewContext,
 	useProductsView,
-} from "@evenicanpm/storefront-core/src/components-v2/products-view/compound/context";
-import type { ProductsViewProps } from "@evenicanpm/storefront-core/src/components-v2/products-view/compound/types";
+} from "@evenicanpm/storefront-core/src/components/products-view/compound/context";
+import type { ProductsViewProps } from "@evenicanpm/storefront-core/src/components/products-view/compound/types";
 // DATA MODEL
 import type { ProductSearchResult as Product } from "@msdyn365-commerce/retail-proxy";
 import Grid from "@mui/material/Grid2";
@@ -58,9 +58,9 @@ ProductsGridView.Grid = ({ children }: { children: React.ReactElement }) => {
 	return (
 		<>
 			{products.map((product, i) => {
-				const matchingPrice = productPrices?.find(
-					(price) => price.ProductId === product.RecordId,
-				);
+				const matchingPrice = Array.isArray(productPrices)
+					? productPrices.find((price) => price.ProductId === product.RecordId)
+					: undefined;
 
 				return (
 					<ProductsViewCardContext.Provider

package/src/{components-v2 → components}/products-view/compound/products-list-view.tsx

@@ -4,13 +4,13 @@
 
 import type { ProductPrice } from "@evenicanpm/storefront-core/src/api-manager/schemas/product.schema";
 // GLOBAL CUSTOM COMPONENTS
-import FlexBetween from "@evenicanpm/storefront-core/src/components-v2/flex-box/flex-between";
-import { ProductCardPlpList } from "@evenicanpm/storefront-core/src/components-v2/product-cards/product-card-plp-list/index";
+import FlexBetween from "@evenicanpm/storefront-core/src/components/flex-box/flex-between";
+import { ProductCardPlpList } from "@evenicanpm/storefront-core/src/components/product-cards/product-card-plp-list/index";
 import {
 	ProductsViewContext,
 	useProductsView,
-} from "@evenicanpm/storefront-core/src/components-v2/products-view/compound/context";
-import type { ProductsViewProps } from "@evenicanpm/storefront-core/src/components-v2/products-view/compound/types";
+} from "@evenicanpm/storefront-core/src/components/products-view/compound/context";
+import type { ProductsViewProps } from "@evenicanpm/storefront-core/src/components/products-view/compound/types";
 // DATA MODEL
 import type { ProductSearchResult as Product } from "@msdyn365-commerce/retail-proxy";
 import { cloneElement } from "react";

package/src/{components-v2 → components}/products-view/compound/types.ts

@@ -1,4 +1,4 @@
-import type { ProductsViewContext } from "@evenicanpm/storefront-core/src/components-v2/products-view/compound/context";
+import type { ProductsViewContext } from "@evenicanpm/storefront-core/src/components/products-view/compound/context";
 import type { PropsWithChildren, ReactNode } from "react";
 
 /**

package/src/{components-v2 → components}/products-view/index.tsx

@@ -1,9 +1,9 @@
 import type { ProductPrice } from "@evenicanpm/storefront-core/src/api-manager/schemas/product.schema";
-import ProductsGridView from "@evenicanpm/storefront-core/src/components-v2/products-view/compound/products-grid-view";
-import ProductsListView from "@evenicanpm/storefront-core/src/components-v2/products-view/compound/products-list-view";
+import ProductsGridView from "@evenicanpm/storefront-core/src/components/products-view/compound/products-grid-view";
+import ProductsListView from "@evenicanpm/storefront-core/src/components/products-view/compound/products-list-view";
 // DATA MODEL
 import type { ProductSearchResult as Product } from "@msdyn365-commerce/retail-proxy";
-import React, { type ReactNode } from "react";
+import type { ReactNode } from "react";
 
 export interface Props {
 	/** List of products to display */

package/src/{components-v2/side-nav → components/progress}/index.ts

@@ -1 +1 @@
-export { default } from "@evenicanpm/storefront-core/src/components-v2/side-nav/side-nav";
+export { default } from "@evenicanpm/storefront-core/src/components/progress/progress";

package/src/{components-v2 → components}/progress/progress.tsx

@@ -30,9 +30,9 @@ export default function ProgressBar() {
 
 		const handleMutation: MutationCallback = () => {
 			const anchorElements = document.querySelectorAll("a[href]");
-			anchorElements.forEach((anchor) =>
-				anchor.addEventListener("click", handleAnchorClick),
-			);
+			anchorElements.forEach((anchor) => {
+				anchor.addEventListener("click", handleAnchorClick);
+			});
 		};
 
 		const mutationObserver = new MutationObserver(handleMutation);

package/src/{components-v2 → components}/scrollbar/Scrollbar.stories.tsx

@@ -1,7 +1,6 @@
 // Replace your-framework with the framework you are using, e.g. react-vite, nextjs, nextjs-vite, etc.
 
-import type { Meta, StoryObj } from "@storybook/react";
-import React from "react";
+import type { Meta } from "@storybook/react";
 import Scrollbar from "./index";
 
 const meta = {
@@ -11,7 +10,6 @@ const meta = {
 } satisfies Meta<typeof Scrollbar>;
 
 export default meta;
-type Story = StoryObj<typeof meta>;
 
 export const WithLink = () => (
 	<div style={{ height: "500px" }}>

package/src/{components-v2 → components}/scrollbar/__tests__/scrollbar.test.tsx

@@ -1,9 +1,15 @@
 import { render, screen } from "@testing-library/react";
+import type { HTMLAttributes, ReactNode } from "react";
 import { vi } from "vitest";
 import Scrollbar from "../scrollbar";
 
+type SimplebarMockProps = HTMLAttributes<HTMLDivElement> & {
+	children?: ReactNode;
+	autoHide?: boolean;
+};
+
 vi.mock("simplebar-react", () => ({
-	default: ({ children, autoHide, ...props }: any) => (
+	default: ({ children, autoHide, ...props }: SimplebarMockProps) => (
 		<div data-testid="custom-scrollbar" data-autohide={autoHide} {...props}>
 			{children}
 		</div>

package/src/{components-v2/progress → components/scrollbar}/index.ts

@@ -1 +1 @@
-export { default } from "@evenicanpm/storefront-core/src/components-v2/progress/progress";
+export { default } from "@evenicanpm/storefront-core/src/components/scrollbar/scrollbar";

package/src/{components-v2 → components}/scrollbar/scrollbar.tsx

@@ -3,7 +3,7 @@ import type { ReactNode } from "react";
 import type { Props } from "simplebar-react";
 import "simplebar-react/dist/simplebar.min.css";
 // STYLED COMPONENT
-import { StyledScrollBar } from "@evenicanpm/storefront-core/src/components-v2/scrollbar/styles";
+import { StyledScrollBar } from "@evenicanpm/storefront-core/src/components/scrollbar/styles";
 
 // =============================================================
 interface ScrollbarProps extends Props {

package/src/{components-v2 → components}/search-bar/SearchBarLarge.stories.tsx

@@ -1,7 +1,6 @@
 // Replace your-framework with the framework you are using, e.g. react-vite, nextjs, nextjs-vite, etc.
 
-import type { Meta, StoryObj } from "@storybook/react";
-import React from "react";
+import type { Meta } from "@storybook/react";
 import { SearchBarViewLg } from "./index";
 
 const meta = {
@@ -12,6 +11,5 @@ const meta = {
 } satisfies Meta<typeof SearchBarViewLg>;
 
 export default meta;
-type Story = StoryObj<typeof meta>;
 
 export const WithLink = () => <SearchBarViewLg></SearchBarViewLg>;

package/src/{components-v2 → components}/search-bar/__tests__/search-bar.test.tsx

@@ -7,8 +7,14 @@ vi.mock("next-intl", () => ({
 	useTranslations: () => (key: string) => key,
 }));
 
+vi.mock("next/navigation", () => ({
+	useRouter: () => ({
+		push: vi.fn(),
+	}),
+}));
+
 vi.mock(
-	"@evenicanpm/storefront-core/src/components-v2/search-bar/compound/search-bar-root",
+	"@evenicanpm/storefront-core/src/components/search-bar/compound/search-bar-root",
 	() => ({
 		default: Object.assign(
 			({

package/src/{components-v2 → components}/search-bar/compound/results-item-lg.tsx

@@ -2,13 +2,12 @@
  * @module SearchBar
  */
 
-import ProductCardSearch from "@evenicanpm/storefront-core/src/components-v2/product-cards/product-card-search";
+import ProductCardSearch from "@evenicanpm/storefront-core/src/components/product-cards/product-card-search";
 import {
 	useSearchContext,
 	useSearchResultItem,
-} from "@evenicanpm/storefront-core/src/components-v2/search-bar/compound/context";
+} from "@evenicanpm/storefront-core/src/components/search-bar/compound/context";
 import Grid from "@mui/material/Grid";
-import React from "react";
 
 /**
  * Large, vertical result item card, used for desktop view.

package/src/{components-v2 → components}/search-bar/compound/results-item-sm.tsx

@@ -2,21 +2,20 @@
  * @module SearchBar
  */
 
-import LazyImage from "@evenicanpm/storefront-core/src/components-v2/LazyImage";
-import NavLink from "@evenicanpm/storefront-core/src/components-v2/nav-link/nav-link";
+import LazyImage from "@evenicanpm/storefront-core/src/components/LazyImage";
+import NavLink from "@evenicanpm/storefront-core/src/components/nav-link/nav-link";
 import {
 	useSearchContext,
 	useSearchResultItem,
-} from "@evenicanpm/storefront-core/src/components-v2/search-bar/compound/context";
+} from "@evenicanpm/storefront-core/src/components/search-bar/compound/context";
 import {
 	H4,
 	Span,
-} 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";
 import { currency } from "@evenicanpm/storefront-core/src/lib/lib";
 import { Box, Grid } from "@mui/material";
 import MenuItem from "@mui/material/MenuItem";
-import React from "react";
 
 /**
  * Small, horizontal result item card, used for mobile view.

package/src/{components-v2 → components}/search-bar/compound/results-suspense.tsx

@@ -3,11 +3,11 @@
  */
 "use client";
 
-import { useSearchContext } from "@evenicanpm/storefront-core/src/components-v2/search-bar/compound/context";
-import SearchResult from "@evenicanpm/storefront-core/src/components-v2/search-bar/compound/results";
-import ResultItemCardLg from "@evenicanpm/storefront-core/src/components-v2/search-bar/compound/results-item-lg";
-import ResultItemCardSm from "@evenicanpm/storefront-core/src/components-v2/search-bar/compound/results-item-sm";
-import { SearchResultCard } from "@evenicanpm/storefront-core/src/components-v2/search-bar/styles/index";
+import { useSearchContext } from "@evenicanpm/storefront-core/src/components/search-bar/compound/context";
+import SearchResult from "@evenicanpm/storefront-core/src/components/search-bar/compound/results";
+import ResultItemCardLg from "@evenicanpm/storefront-core/src/components/search-bar/compound/results-item-lg";
+import ResultItemCardSm from "@evenicanpm/storefront-core/src/components/search-bar/compound/results-item-sm";
+import { SearchResultCard } from "@evenicanpm/storefront-core/src/components/search-bar/styles/index";
 import { CircularProgress } from "@mui/material";
 import type React from "react";
 import { Suspense } from "react";

package/src/{components-v2 → components}/search-bar/compound/results.tsx

@@ -6,8 +6,8 @@ import searchProducts from "@evenicanpm/storefront-core/src/api-manager/services
 import {
 	SearchResultItemContext,
 	useSearchContext,
-} from "@evenicanpm/storefront-core/src/components-v2/search-bar/compound/context";
-import { SearchResultCard } from "@evenicanpm/storefront-core/src/components-v2/search-bar/styles/index";
+} from "@evenicanpm/storefront-core/src/components/search-bar/compound/context";
+import { SearchResultCard } from "@evenicanpm/storefront-core/src/components/search-bar/styles/index";
 import Grid from "@mui/material/Grid";
 import { useTranslations } from "next-intl";
 import type React from "react";

package/src/{components-v2 → components}/search-bar/compound/search-bar-root.tsx

@@ -4,13 +4,13 @@
 "use client";
 
 // contexts
-import { SearchContext } from "@evenicanpm/storefront-core/src/components-v2/search-bar/compound/context";
+import { SearchContext } from "@evenicanpm/storefront-core/src/components/search-bar/compound/context";
 // components
-import SearchResultSuspense from "@evenicanpm/storefront-core/src/components-v2/search-bar/compound/results-suspense";
-import TextField from "@evenicanpm/storefront-core/src/components-v2/search-bar/compound/textfield";
-import { useClickOutside } from "@evenicanpm/storefront-core/src/components-v2/search-bar/hooks/use-click-outside";
+import SearchResultSuspense from "@evenicanpm/storefront-core/src/components/search-bar/compound/results-suspense";
+import TextField from "@evenicanpm/storefront-core/src/components/search-bar/compound/textfield";
+import { useClickOutside } from "@evenicanpm/storefront-core/src/components/search-bar/hooks/use-click-outside";
 // local hooks
-import useSearch from "@evenicanpm/storefront-core/src/components-v2/search-bar/hooks/use-search";
+import useSearch from "@evenicanpm/storefront-core/src/components/search-bar/hooks/use-search";
 import Box from "@mui/material/Box";
 import type React from "react";
 import { useRef } from "react";

package/src/{components-v2 → components}/search-bar/compound/textfield-adornment-category.tsx

@@ -3,14 +3,13 @@
  */
 "use client";
 import getCategories from "@evenicanpm/storefront-core/src/api-manager/services/categories/queries/get-categories";
-import Menu from "@evenicanpm/storefront-core/src/components-v2/BazaarMenu";
-import { DropDownHandler } from "@evenicanpm/storefront-core/src/components-v2/search-bar/styles/index";
-import { findCategoryNameById } from "@evenicanpm/storefront-core/src/components-v2/search-bar/utils/findCategoryNameById";
+import Menu from "@evenicanpm/storefront-core/src/components/BazaarMenu";
+import { DropDownHandler } from "@evenicanpm/storefront-core/src/components/search-bar/styles/index";
+import { findCategoryNameById } from "@evenicanpm/storefront-core/src/components/search-bar/utils/findCategoryNameById";
 import TouchRipple from "@mui/material/ButtonBase";
 import MenuItem from "@mui/material/MenuItem";
 import useTheme from "@mui/material/styles/useTheme";
 import { useTranslations } from "next-intl";
-import React from "react";
 import { MdKeyboardArrowDown as KeyboardArrowDownOutlined } from "react-icons/md";
 
 type DisplayCategory = {

package/src/{components-v2 → components}/search-bar/compound/textfield-adornment-search-icon.tsx

@@ -2,7 +2,7 @@
  * @module SearchBar
  */
 
-import Search from "@evenicanpm/storefront-core/src/components-v2/icons/search";
+import Search from "@evenicanpm/storefront-core/src/components/icons/search";
 import { IconButton } from "@mui/material";
 import Box from "@mui/material/Box";
 

package/src/{components-v2 → components}/search-bar/compound/textfield.tsx

@@ -2,15 +2,14 @@
  * @module SearchBar
  */
 "use client";
-import { useSearchContext } from "@evenicanpm/storefront-core/src/components-v2/search-bar/compound/context";
-import AdornmentButton from "@evenicanpm/storefront-core/src/components-v2/search-bar/compound/textfield-adornment-button";
-import CategoryDropdown from "@evenicanpm/storefront-core/src/components-v2/search-bar/compound/textfield-adornment-category";
-import SearchIconAdornment from "@evenicanpm/storefront-core/src/components-v2/search-bar/compound/textfield-adornment-search-icon";
-import { INPUT_SX } from "@evenicanpm/storefront-core/src/components-v2/search-bar/styles/index";
+import { useSearchContext } from "@evenicanpm/storefront-core/src/components/search-bar/compound/context";
+import AdornmentButton from "@evenicanpm/storefront-core/src/components/search-bar/compound/textfield-adornment-button";
+import CategoryDropdown from "@evenicanpm/storefront-core/src/components/search-bar/compound/textfield-adornment-category";
+import SearchIconAdornment from "@evenicanpm/storefront-core/src/components/search-bar/compound/textfield-adornment-search-icon";
+import { INPUT_SX } from "@evenicanpm/storefront-core/src/components/search-bar/styles/index";
 import { useMediaQuery, useTheme } from "@mui/material";
 import TextField from "@mui/material/TextField";
 import { useTranslations } from "next-intl";
-import React from "react";
 
 /**
  * The actual input field for the search bar.

package/src/{components-v2 → components}/search-bar/index.tsx

@@ -1,7 +1,7 @@
 /**
  * @module SearchBar
  */
-import SearchBar from "@evenicanpm/storefront-core/src/components-v2/search-bar/compound/search-bar-root";
+import SearchBar from "@evenicanpm/storefront-core/src/components/search-bar/compound/search-bar-root";
 
 interface Props {
 	handleCloseDrawer?: () => void;

package/src/{components-v2 → components}/search-bar/utils/findCategoryNameById.ts

@@ -5,9 +5,9 @@ import type { Category } from "@msdyn365-commerce/retail-proxy";
  */
 export const findCategoryNameById = (
 	searchCategory: number,
-	categories: any,
-	t: Function,
-) => {
+	categories: Category[] | undefined,
+	t: (key: string) => string,
+): string => {
 	if (searchCategory === 0) {
 		return t("Navigation.allCategoriesLabel");
 	}

package/src/{components-v2 → components}/section/__tests__/section.test.tsx

@@ -1,5 +1,6 @@
 import { render, screen } from "@testing-library/react";
-import { vi } from "vitest";
+import type { ReactNode } from "react";
+import { describe, expect, it, vi } from "vitest";
 import { Section } from "../compound/section";
 
 vi.mock("next-intl", () => ({
@@ -14,7 +15,13 @@ vi.mock(
 );
 
 vi.mock("@mui/material/Container", () => ({
-	default: ({ className, children }: any) => (
+	default: ({
+		className,
+		children,
+	}: {
+		className?: string;
+		children?: ReactNode;
+	}) => (
 		<div data-testid="mui-container" className={className}>
 			{children}
 		</div>
@@ -28,7 +35,7 @@ describe("Section", () => {
 				<div>Section Content</div>
 			</Section>,
 		);
-		expect(screen.getByText("Section Content")).toBeInTheDocument();
+		expect(screen.getByText("Section Content")).toBeTruthy();
 	});
 
 	it("renders with Container component", () => {
@@ -69,7 +76,7 @@ describe("Section", () => {
 				<div>Spaced Content</div>
 			</Section>,
 		);
-		expect(screen.getByText("Spaced Content")).toBeInTheDocument();
+		expect(screen.getByText("Spaced Content")).toBeTruthy();
 	});
 
 	it("exposes Header subcomponent", () => {
@@ -84,9 +91,9 @@ describe("Section", () => {
 				<div>Child 3</div>
 			</Section>,
 		);
-		expect(screen.getByText("Child 1")).toBeInTheDocument();
-		expect(screen.getByText("Child 2")).toBeInTheDocument();
-		expect(screen.getByText("Child 3")).toBeInTheDocument();
+		expect(screen.getByText("Child 1")).toBeTruthy();
+		expect(screen.getByText("Child 2")).toBeTruthy();
+		expect(screen.getByText("Child 3")).toBeTruthy();
 	});
 
 	it("accepts custom sx styling", () => {

package/src/{components-v2 → components}/section/compound/section-header.tsx

@@ -6,9 +6,9 @@
 import {
 	FlexBetween,
 	FlexBox,
-} from "@evenicanpm/storefront-core/src/components-v2/flex-box/index";
+} from "@evenicanpm/storefront-core/src/components/flex-box/index";
 // Local Custom Components
-import { H2 } from "@evenicanpm/storefront-core/src/components-v2/Typography";
+import { H2 } from "@evenicanpm/storefront-core/src/components/Typography";
 import useSettings from "@evenicanpm/storefront-core/src/hooks/use-settings";
 // Mui Icon Components
 import ArrowLeft from "@mui/icons-material/ArrowLeft";

package/src/{components-v2 → components}/section/compound/section.tsx

@@ -2,7 +2,7 @@
  * @module Section
  */
 
-import { SectionHeader } from "@evenicanpm/storefront-core/src/components-v2/section/compound/section-header";
+import { SectionHeader } from "@evenicanpm/storefront-core/src/components/section/compound/section-header";
 import Box, { type BoxProps } from "@mui/material/Box";
 import Container from "@mui/material/Container";
 import type { ReactNode } from "react";

package/src/{components-v2 → components}/section/index.ts

@@ -1 +1 @@
-export { Section } from "@evenicanpm/storefront-core/src/components-v2/section/compound/section";
+export { Section } from "@evenicanpm/storefront-core/src/components/section/compound/section";