@graphcommerce/magento-cart-shipping-method 3.0.16 → 3.0.19

package/AvailableShippingMethod/AvailableShippingMethod.tsx

@@ -1,6 +1,6 @@
 import { Money } from '@graphcommerce/magento-store'
 import { ToggleButton, ToggleButtonProps, extendableComponent } from '@graphcommerce/next-ui'
-import { Trans } from '@lingui/macro'
+import { Trans } from '@lingui/react'
 import { Box, FormHelperText } from '@mui/material'
 import React from 'react'
 import type { SetOptional } from 'type-fest'
@@ -84,7 +84,7 @@ export const AvailableShippingMethod = React.forwardRef(
             },
           }}
         >
-          {amount?.value === 0 ? <Trans>Free</Trans> : <Money {...amount} />}
+          {amount?.value === 0 ? <Trans id='Free' /> : <Money {...amount} />}
         </Box>
 
         {error_message ? (

package/CHANGELOG.md

@@ -1,5 +1,75 @@
 # Change Log
 
+## 3.0.19
+
+### Patch Changes
+
+- Updated dependencies [[`0363b9671`](https://github.com/graphcommerce-org/graphcommerce/commit/0363b9671db7c2932321d97faf6f1eb385238397), [`3ac90b57c`](https://github.com/graphcommerce-org/graphcommerce/commit/3ac90b57c68b96f9d81771d6664ed9435a28fc1d), [`ed2b67a06`](https://github.com/graphcommerce-org/graphcommerce/commit/ed2b67a0618d9db97e79ed2a8226e0ae12403943)]:
+  - @graphcommerce/next-ui@4.8.0
+  - @graphcommerce/magento-cart@4.2.15
+  - @graphcommerce/framer-scroller@2.1.11
+  - @graphcommerce/magento-cart-shipping-address@3.0.18
+  - @graphcommerce/magento-store@4.2.4
+
+## 3.0.18
+
+### Patch Changes
+
+- Updated dependencies [[`c30893857`](https://github.com/graphcommerce-org/graphcommerce/commit/c3089385791291e812a48c2691a39a2325ee0439)]:
+  - @graphcommerce/magento-store@4.2.3
+  - @graphcommerce/magento-cart@4.2.14
+  - @graphcommerce/magento-cart-shipping-address@3.0.17
+
+## 3.0.17
+
+### Patch Changes
+
+- [#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 [[`50188e378`](https://github.com/graphcommerce-org/graphcommerce/commit/50188e378b4c77561ebc600958ea11cd114fa61a), [`f698ff85d`](https://github.com/graphcommerce-org/graphcommerce/commit/f698ff85df6bb0922288471bb3c81856091b8061)]:
+  - @graphcommerce/react-hook-form@3.1.3
+  - @graphcommerce/framer-scroller@2.1.10
+  - @graphcommerce/magento-cart@4.2.13
+  - @graphcommerce/magento-cart-shipping-address@3.0.16
+  - @graphcommerce/magento-store@4.2.2
+  - @graphcommerce/next-ui@4.7.2
+  - @graphcommerce/graphql@3.1.3
+
 ## 3.0.16
 
 ### Patch Changes

package/ShippingMethodForm/ShippingMethodForm.tsx

@@ -13,7 +13,8 @@ import {
   extendableComponent,
 } from '@graphcommerce/next-ui'
 import { Controller, useFormCompose, UseFormComposeOptions } from '@graphcommerce/react-hook-form'
-import { t, Trans } from '@lingui/macro'
+import { i18n } from '@lingui/core'
+import { Trans } from '@lingui/react'
 import { FormControl, Alert, Box } from '@mui/material'
 import { AvailableShippingMethod } from '../AvailableShippingMethod/AvailableShippingMethod'
 import { GetShippingMethodsDocument } from './GetShippingMethods.gql'
@@ -106,7 +107,11 @@ export function ShippingMethodForm(props: ShippingMethodFormProps) {
                 },
               }}
             >
-              <IconSvg src={iconChevronLeft} size='small' aria-label={t`Scroll Left`} />
+              <IconSvg
+                src={iconChevronLeft}
+                size='small'
+                aria-label={i18n._(/* i18n */ `Scroll Left`)}
+              />
             </ScrollerButton>
           </Box>
 
@@ -171,7 +176,7 @@ export function ShippingMethodForm(props: ShippingMethodFormProps) {
                         carrier_code='none'
                         carrier_title='No shipping methods available'
                       >
-                        <Trans>Please fill in your address to see shipping methods</Trans>
+                        <Trans id='Please fill in your address to see shipping methods' />
                       </AvailableShippingMethod>
                     )}
                   </Scroller>
@@ -223,7 +228,11 @@ export function ShippingMethodForm(props: ShippingMethodFormProps) {
               }}
               className={classes.buttonRoot}
             >
-              <IconSvg src={iconChevronRight} size='small' aria-label={t`Scroll Right`} />
+              <IconSvg
+                src={iconChevronRight}
+                size='small'
+                aria-label={i18n._(/* i18n */ `Scroll Right`)}
+              />
             </ScrollerButton>
           </Box>
         </ScrollerProvider>

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-cart-shipping-method",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "3.0.16",
+  "version": "3.0.19",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,24 +12,25 @@
     }
   },
   "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",
     "type-fest": "^2.12.2"
   },
   "dependencies": {
-    "@graphcommerce/framer-scroller": "2.1.9",
-    "@graphcommerce/graphql": "3.1.2",
+    "@graphcommerce/framer-scroller": "2.1.11",
+    "@graphcommerce/graphql": "3.1.3",
     "@graphcommerce/image": "3.1.5",
-    "@graphcommerce/magento-cart": "4.2.12",
-    "@graphcommerce/magento-cart-shipping-address": "3.0.15",
-    "@graphcommerce/magento-store": "4.2.1",
-    "@graphcommerce/next-ui": "4.7.1",
-    "@graphcommerce/react-hook-form": "3.1.2"
+    "@graphcommerce/magento-cart": "4.2.15",
+    "@graphcommerce/magento-cart-shipping-address": "3.0.18",
+    "@graphcommerce/magento-store": "4.2.4",
+    "@graphcommerce/next-ui": "4.8.0",
+    "@graphcommerce/react-hook-form": "3.1.3"
   },
   "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",