From 0746762fe8366dcef1533d4ad18c107a1d222160 Mon Sep 17 00:00:00 2001 From: Victor Gerbrands Date: Wed, 28 Jun 2023 15:30:23 +0200 Subject: [PATCH] fix: merge issues --- app/product/[handle]/page.tsx | 10 +- app/search/[collection]/opengraph-image.tsx | 4 +- app/search/[collection]/page.tsx | 6 +- components/cart/actions.ts | 17 +- components/cart/delete-item-button.tsx | 23 +- components/cart/edit-item-quantity-button.tsx | 55 ++-- yarn.lock | 298 +++++++++--------- 7 files changed, 197 insertions(+), 216 deletions(-) diff --git a/app/product/[handle]/page.tsx b/app/product/[handle]/page.tsx index c73509847..6573882bb 100644 --- a/app/product/[handle]/page.tsx +++ b/app/product/[handle]/page.tsx @@ -2,10 +2,10 @@ import type { Metadata } from 'next'; import { notFound } from 'next/navigation'; import { Suspense } from 'react'; +import { AddToCart } from 'components/cart/add-to-cart'; import Grid from 'components/grid'; import Footer from 'components/layout/footer'; import ProductGridItems from 'components/layout/product-grid-items'; -import { AddToCart } from 'components/cart/add-to-cart'; import { Gallery } from 'components/product/gallery'; import { VariantSelector } from 'components/product/variant-selector'; import Prose from 'components/prose'; @@ -69,9 +69,8 @@ export default async function ProductPage({ params }: { params: { handle: string availability: product.availableForSale ? 'https://schema.org/InStock' : 'https://schema.org/OutOfStock', - priceCurrency: product.priceRange.minVariantPrice.currencyCode, - highPrice: product.priceRange.maxVariantPrice.amount, - lowPrice: product.priceRange.minVariantPrice.amount + priceCurrency: product.priceRange.maxVariantPrice.currencyCode, + highPrice: product.priceRange.maxVariantPrice.amount } }; @@ -99,6 +98,7 @@ export default async function ProductPage({ params }: { params: { handle: string )}
+ {/* @ts-expect-error server component */} {product.descriptionHtml ? ( @@ -109,8 +109,10 @@ export default async function ProductPage({ params }: { params: { handle: string
+ {/* @ts-expect-error server component */} + {/* @ts-expect-error server component */}