@graphcommerce/magento-wishlist 1.0.0 → 1.0.3

package/CHANGELOG.md

@@ -1,5 +1,80 @@
 # @graphcommerce/magento-wishlist
 
+## 1.0.3
+
+### Patch Changes
+
+- [#1444](https://github.com/graphcommerce-org/graphcommerce/pull/1444) [`3b623efdd`](https://github.com/graphcommerce-org/graphcommerce/commit/3b623efdd1d26cc533b707ad4ef08c00989539a1) Thanks [@timhofman](https://github.com/timhofman)! - Lowest product price was based on regular_price instead of final_price
+
+* [#1451](https://github.com/graphcommerce-org/graphcommerce/pull/1451) [`f698ff85d`](https://github.com/graphcommerce-org/graphcommerce/commit/f698ff85df6bb0922288471bb3c81856091b8061) Thanks [@paales](https://github.com/paales)! - Removed all occurences of @lingui/macro and moved to @lingui/macro / @lingui/core in preparation to move to swc.
+
+  Since we've removed @lingui/macro, all occurences need to be replaced with @lingui/core and @lingui/react.
+
+  All occurences of `<Trans>` and `t` need to be replaced:
+
+  ```tsx
+  import { Trans, t } from '@lingui/macro'
+
+  function MyComponent() {
+    const foo = 'bar'
+    return (
+      <div aria-label={t`Account ${foo}`}>
+        <Trans>My Translation {foo}</Trans>
+      </div>
+    )
+  }
+  ```
+
+  Needs to be replaced with:
+
+  ```tsx
+  import { Trans } from '@lingui/react'
+  import { i18n } from '@lingui/core'
+
+  function MyComponent() {
+    const foo = 'bar'
+    return (
+      <div aria-label={i18n._(/* i18n */ `Account {foo}`, { foo })}>
+        <Trans key='My Translation {foo}' values={{ foo }}></Trans>
+      </div>
+    )
+  }
+  ```
+
+  [More examples for Trans](https://lingui.js.org/ref/macro.html#examples-of-jsx-macros) and [more examples for `t`](https://lingui.js.org/ref/macro.html#examples-of-js-macros)
+
+* Updated dependencies [[`f698ff85d`](https://github.com/graphcommerce-org/graphcommerce/commit/f698ff85df6bb0922288471bb3c81856091b8061)]:
+  - @graphcommerce/magento-cart@4.2.13
+  - @graphcommerce/magento-customer@4.2.11
+  - @graphcommerce/magento-product@4.3.3
+  - @graphcommerce/magento-product-configurable@4.1.3
+  - @graphcommerce/magento-store@4.2.2
+  - @graphcommerce/next-ui@4.7.2
+  - @graphcommerce/graphql@3.1.3
+
+## 1.0.2
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @graphcommerce/magento-cart@4.2.12
+  - @graphcommerce/magento-customer@4.2.10
+  - @graphcommerce/magento-product@4.3.2
+  - @graphcommerce/magento-product-configurable@4.1.2
+
+## 1.0.1
+
+### Patch Changes
+
+- Updated dependencies [[`25ef6cf08`](https://github.com/graphcommerce-org/graphcommerce/commit/25ef6cf08c278105307d6f604b7135d637e9046c), [`80e30bb77`](https://github.com/graphcommerce-org/graphcommerce/commit/80e30bb77015755fbc00a7935d590f80c1c1c18c)]:
+  - @graphcommerce/graphql@3.1.2
+  - @graphcommerce/magento-customer@4.2.9
+  - @graphcommerce/magento-cart@4.2.11
+  - @graphcommerce/magento-product@4.3.1
+  - @graphcommerce/magento-product-configurable@4.1.1
+  - @graphcommerce/magento-store@4.2.1
+  - @graphcommerce/next-ui@4.7.1
+
 ## 1.0.0
 
 ### Major Changes

package/components/ProductWishlistChip/ProductWishlistChipBase.tsx

@@ -3,7 +3,7 @@
 import { useQuery, useMutation, useApolloClient } from '@graphcommerce/graphql'
 import { CustomerTokenDocument } from '@graphcommerce/magento-customer'
 import { IconSvg, iconHeart, extendableComponent } from '@graphcommerce/next-ui'
-import { t } from '@lingui/macro'
+import { i18n } from '@lingui/core'
 import { SxProps, Theme, IconButton } from '@mui/material'
 import { useState, useEffect } from 'react'
 import { useWishlistEnabled } from '../../hooks'
@@ -169,8 +169,16 @@ export function ProductWishlistChipBase(props: ProductWishlistChipProps) {
         }),
         ...(Array.isArray(sx) ? sx : [sx]),
       ]}
-      title={inWishlist ? t`Remove from wishlist` : t`Add to wishlist`}
-      aria-label={inWishlist ? t`Remove from wishlist` : t`Add to wishlist`}
+      title={
+        inWishlist
+          ? i18n._(/* i18n */ `Remove from wishlist`)
+          : i18n._(/* i18n */ `Add to wishlist`)
+      }
+      aria-label={
+        inWishlist
+          ? i18n._(/* i18n */ `Remove from wishlist`)
+          : i18n._(/* i18n */ `Add to wishlist`)
+      }
     >
       {inWishlist ? activeHeart : heart}
     </IconButton>

package/components/WishlistFab/WishlistFab.tsx

@@ -1,7 +1,7 @@
 import { useQuery } from '@graphcommerce/graphql'
 import { CustomerTokenDocument } from '@graphcommerce/magento-customer'
 import { iconHeart, DesktopHeaderBadge, IconSvg, extendableComponent } from '@graphcommerce/next-ui'
-import { t } from '@lingui/macro'
+import { i18n } from '@lingui/core'
 import { Fab, FabProps as FabPropsType, NoSsr, SxProps, Theme } from '@mui/material'
 import PageLink from 'next/link'
 import React, { useEffect } from 'react'
@@ -55,7 +55,7 @@ function WishlistFabContent(props: WishlistFabContentProps) {
       <Fab
         color='inherit'
         data-test-id='wishlist-fab'
-        aria-label={t`Wishlist`}
+        aria-label={i18n._(/* i18n */ `Wishlist`)}
         size='large'
         className={classes.root}
         {...FabProps}

package/components/WishlistItem/ProductAddToCart.tsx

@@ -14,7 +14,7 @@ import {
   extendableComponent,
   AnimatedRow,
 } from '@graphcommerce/next-ui'
-import { Trans } from '@lingui/macro'
+import { Trans } from '@lingui/react'
 import { ButtonProps, Box, Alert } from '@mui/material'
 import { AnimatePresence } from 'framer-motion'
 import PageLink from 'next/link'
@@ -89,7 +89,7 @@ export function ProductAddToCart(
           size='medium'
           {...buttonProps}
         >
-          <Trans>Add to Cart</Trans>
+          <Trans id='Add to Cart' />
         </Button>
       </Box>
 
@@ -120,14 +120,16 @@ export function ProductAddToCart(
               color='secondary'
               endIcon={<IconSvg src={iconChevronRight} />}
             >
-              <Trans>View shopping cart</Trans>
+              <Trans id='View shopping cart' />
             </Button>
           </PageLink>
         }
       >
-        <Trans>
-          <strong>{name}</strong> has been added to your shopping cart!
-        </Trans>
+        <Trans
+          id='<0>{name}</0> has been added to your shopping cart!'
+          components={{ 0: <strong /> }}
+          values={{ name }}
+        />
       </MessageSnackbar>
     </Box>
   )

package/components/WishlistItem/WishlistItem.tsx

@@ -23,7 +23,7 @@ export function WishlistItem(props: WishlistItemProps) {
       <ProductAddToCart
         variables={{ sku: sku ?? '', quantity: 1 }}
         name={name ?? ''}
-        price={price_range.minimum_price.regular_price}
+        price={price_range.minimum_price.final_price}
       />
     </WishlistItemBase>
   )

package/components/WishlistItem/WishlistItemBase.tsx

@@ -7,7 +7,8 @@ import { CustomerTokenDocument } from '@graphcommerce/magento-customer'
 import { useProductLink } from '@graphcommerce/magento-product'
 import { Money } from '@graphcommerce/magento-store'
 import { responsiveVal, extendableComponent, iconEllypsis, IconSvg } from '@graphcommerce/next-ui'
-import { Trans, t } from '@lingui/macro'
+import { Trans } from '@lingui/react'
+import { i18n } from '@lingui/core'
 import { Badge, Box, Link, SxProps, Theme, Typography } from '@mui/material'
 import IconButton from '@mui/material/IconButton'
 import Menu from '@mui/material/Menu'
@@ -293,7 +294,7 @@ export function WishlistItemBase(props: WishlistItemBaseProps) {
         }}
       >
         <MenuItem key='remove' id='remove' onClick={handleClose}>
-          <Trans>Remove Product</Trans>
+          <Trans id='Remove Product' />
         </MenuItem>
       </Menu>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphcommerce/magento-wishlist",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "browserslist": [
@@ -13,23 +13,24 @@
     }
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^4.1.6",
+    "@graphcommerce/eslint-config-pwa": "^4.1.7",
     "@graphcommerce/prettier-config-pwa": "^4.0.6",
-    "@graphcommerce/typescript-config-pwa": "^4.0.2",
+    "@graphcommerce/typescript-config-pwa": "^4.0.3",
     "@playwright/test": "^1.21.1"
   },
   "dependencies": {
-    "@graphcommerce/graphql": "3.1.1",
+    "@graphcommerce/graphql": "3.1.3",
     "@graphcommerce/image": "3.1.5",
-    "@graphcommerce/magento-cart": "4.2.10",
-    "@graphcommerce/magento-customer": "4.2.8",
-    "@graphcommerce/magento-product": "4.3.0",
-    "@graphcommerce/magento-product-configurable": "4.1.0",
-    "@graphcommerce/magento-store": "4.2.0",
-    "@graphcommerce/next-ui": "4.7.0"
+    "@graphcommerce/magento-cart": "4.2.13",
+    "@graphcommerce/magento-customer": "4.2.11",
+    "@graphcommerce/magento-product": "4.3.3",
+    "@graphcommerce/magento-product-configurable": "4.1.3",
+    "@graphcommerce/magento-store": "4.2.2",
+    "@graphcommerce/next-ui": "4.7.2"
   },
   "peerDependencies": {
-    "@lingui/macro": "^3.13.2",
+    "@lingui/react": "^3.13.2",
+    "@lingui/core": "^3.13.2",
     "@mui/material": "^5.5.3",
     "framer-motion": "^6.2.4",
     "next": "^12.1.2",