Merge branch 'agnostic' of github.com:vercel/commerce into agnostic

components/cart/CartItem/CartItem.tsx

@@ -4,11 +4,10 @@ import Image from 'next/image'
 import Link from 'next/link'
 import s from './CartItem.module.css'
 import { Trash, Plus, Minus } from '@components/icons'
-import {useUI} from '@components/ui/context'
+import { useUI } from '@components/ui/context'
 import usePrice from '@framework/product/use-price'
 import useUpdateItem from '@framework/cart/use-update-item'
 import useRemoveItem from '@framework/cart/use-remove-item'
-import { CartItem } from 'framework/types'
 
 const Item = ({
   item,
@@ -93,7 +92,10 @@ const Item = ({
       </div>
       <div className="flex-1 flex flex-col text-base">
         <Link href={`/product/${item.url.split('/')[3]}`}>
-          <span className="font-bold mb-5 text-lg cursor-pointer" onClick={() => closeSidebarIfPresent()}>
+          <span
+            className="font-bold mb-5 text-lg cursor-pointer"
+            onClick={() => closeSidebarIfPresent()}
+          >
             {item.name}
           </span>
         </Link>

components/cart/CartSidebarView/CartSidebarView.tsx

@@ -94,7 +94,7 @@ const CartSidebarView: FC = () => {
               My Cart
             </h2>
             <ul className="py-6 space-y-6 sm:py-0 sm:space-y-0 sm:divide-y sm:divide-accents-3 border-t border-accents-3">
-              {data.products.map((item: any) => (
+              {data?.products?.map((item) => (
                 <CartItem
                   key={item.id}
                   item={item}

components/product/ProductCard/ProductCard.tsx

@@ -3,7 +3,7 @@ import cn from 'classnames'
 import Link from 'next/link'
 import s from './ProductCard.module.css'
 import Image, { ImageProps } from 'next/image'
-import WishlistButton from '@components/wishlist/WishlistButton'
+// import WishlistButton from '@components/wishlist/WishlistButton'
 
 interface Props {
   className?: string
@@ -57,11 +57,11 @@ const ProductCard: FC<Props> = ({
                   {product.price.currencyCode}
                 </span>
               </div>
-              <WishlistButton
+              {/* <WishlistButton
                 className={s.wishlistButton}
                 productId={product.id}
                 variant={product.variants[0]}
-              />
+              /> */}
             </div>
             <div className={s.imageContainer}>
               {product?.images && (

components/product/ProductView/ProductView.tsx

@@ -12,7 +12,7 @@ import usePrice from '@framework/product/use-price'
 import { useAddItem } from '@framework/cart'
 
 import { getVariant, SelectedOptions } from '../helpers'
-import WishlistButton from '@components/wishlist/WishlistButton'
+// import WishlistButton from '@components/wishlist/WishlistButton'
 
 interface Props {
   className?: string
@@ -24,7 +24,7 @@ const ProductView: FC<Props> = ({ product }) => {
   const addItem = useAddItem()
   const { price } = usePrice({
     amount: product.price.value,
-    baseAmount: product.price.retailValue,
+    baseAmount: product.price.retailPrice,
     currencyCode: product.price.currencyCode!,
   })
   const { openSidebar } = useUI()
@@ -152,11 +152,11 @@ const ProductView: FC<Props> = ({ product }) => {
             </Button>
           </div>
         </div>
-        <WishlistButton
+        {/* <WishlistButton
           className={s.wishlistButton}
           productId={product.id}
           variant={product.variants[0]!}
-        />
+        /> */}
       </div>
     </Container>
   )

components/wishlist/WishlistButton/index.ts

@@ -1 +0,0 @@
-export { default } from './WishlistButton'

package.json

@@ -103,7 +103,7 @@
     "webpack": "5.11.1"
   },
   "engines": {
-    "node": ">=14"
+    "node": "12.x"
   },
   "license": "MIT"
 }

tsconfig.json

@@ -33,5 +33,5 @@
     "**/*.tsx",
     "**/*.js"
   ],
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules", "components/wishlist"]
 }