@graphcommerce/magento-cart 4.1.0 → 4.1.3

package/CHANGELOG.md

@@ -1,5 +1,110 @@
 # Change Log
 
+## 4.1.3
+
+### Patch Changes
+
+- [#1292](https://github.com/ho-nl/m2-pwa/pull/1292)
+  [`5a1ba9e66`](https://github.com/ho-nl/m2-pwa/commit/5a1ba9e664abbac89c4f5f71f7d6d6ed1aefa5c0)
+  Thanks [@paales](https://github.com/paales)! - Renamed SvgIcon to IconSvg to prevent collisions
+  with MUI
+
+* [#1292](https://github.com/ho-nl/m2-pwa/pull/1292)
+  [`63f9b56eb`](https://github.com/ho-nl/m2-pwa/commit/63f9b56eb68ba790567ff1427e599fd2c3c8f1ee)
+  Thanks [@paales](https://github.com/paales)! - added responsive size to the Fab component
+
+* Updated dependencies
+  [[`5a1ba9e66`](https://github.com/ho-nl/m2-pwa/commit/5a1ba9e664abbac89c4f5f71f7d6d6ed1aefa5c0),
+  [`990df655b`](https://github.com/ho-nl/m2-pwa/commit/990df655b73b469718d6cb5837ee65dfe2ad6a1d),
+  [`63f9b56eb`](https://github.com/ho-nl/m2-pwa/commit/63f9b56eb68ba790567ff1427e599fd2c3c8f1ee)]:
+  - @graphcommerce/ecommerce-ui@1.0.2
+  - @graphcommerce/magento-customer@4.1.3
+  - @graphcommerce/next-ui@4.2.0
+
+## 4.1.2
+
+### Patch Changes
+
+- [`973ff8645`](https://github.com/ho-nl/m2-pwa/commit/973ff86452a70ade9f4db13fdda6e963d7220e96)
+  Thanks [@paales](https://github.com/paales)! - made packages public
+
+- Updated dependencies
+  [[`4bb963d75`](https://github.com/ho-nl/m2-pwa/commit/4bb963d7595b5ce6e3a4924cc2e3e8b0210cdcd6),
+  [`973ff8645`](https://github.com/ho-nl/m2-pwa/commit/973ff86452a70ade9f4db13fdda6e963d7220e96),
+  [`81ea406d5`](https://github.com/ho-nl/m2-pwa/commit/81ea406d54d6b5c662c030a7fea444abc4117a20),
+  [`3a719c88c`](https://github.com/ho-nl/m2-pwa/commit/3a719c88cad1eab58602de28c41adc0fc4827e1d),
+  [`5ffcb56bf`](https://github.com/ho-nl/m2-pwa/commit/5ffcb56bfcbe49ebeaf24f9341e819a145ab9a14)]:
+  - @graphcommerce/framer-next-pages@3.1.0
+  - @graphcommerce/ecommerce-ui@1.0.1
+  - @graphcommerce/framer-scroller@2.0.3
+  - @graphcommerce/graphql@3.0.3
+  - @graphcommerce/image@3.1.0
+  - @graphcommerce/magento-customer@4.1.2
+  - @graphcommerce/magento-graphql@3.0.3
+  - @graphcommerce/magento-store@4.0.3
+  - @graphcommerce/next-ui@4.1.2
+  - @graphcommerce/react-hook-form@3.0.3
+
+## 4.1.1
+
+### Patch Changes
+
+- [#1274](https://github.com/ho-nl/m2-pwa/pull/1274)
+  [`381e4c86a`](https://github.com/ho-nl/m2-pwa/commit/381e4c86a8321ce96e1fa5c7d3c0a0c0ff3e02c7)
+  Thanks [@paales](https://github.com/paales)! - Moved `ApolloErrorAlert`, `ApolloErrorFullPage` and
+  `ApolloErrorSnackbar` to the ecommerce-ui package.
+
+  Created `ComposedSubmitButton` and `ComposedSubmitLinkOrButton` to reduce complexity from
+  `magento-graphcms` example.
+
+  Removed dependency an `@graphcommerce/react-hook-form` from `magento-graphcms` example.
+
+  Added dependency `@graphcommerce/ecommerce-ui` from `magento-graphcms` example.
+
+* [#1276](https://github.com/ho-nl/m2-pwa/pull/1276)
+  [`ce09388e0`](https://github.com/ho-nl/m2-pwa/commit/ce09388e0d7ef33aee660612340f6fbae15ceec2)
+  Thanks [@paales](https://github.com/paales)! - We've moved lots of internal packages from
+  `dependencies` to `peerDependencies`. The result of this is that there will be significantly less
+  duplicate packages in the node_modules folders.
+
+- [#1274](https://github.com/ho-nl/m2-pwa/pull/1274)
+  [`b08a8eb1d`](https://github.com/ho-nl/m2-pwa/commit/b08a8eb1d024b9d3e7712ef034029151670db275)
+  Thanks [@paales](https://github.com/paales)! - Fixed extraction of translations and updated
+  various translations for english 🇺🇸🇬🇧 and dutch 🇳🇱
+
+* [#1276](https://github.com/ho-nl/m2-pwa/pull/1276)
+  [`52a45bba4`](https://github.com/ho-nl/m2-pwa/commit/52a45bba4dc6dd6df3c81f5023df7d23ed8a534d)
+  Thanks [@paales](https://github.com/paales)! - Upgraded to
+  [NextJS 12.1](https://nextjs.org/blog/next-12-1)! This is just for compatibility, but we'll be
+  implementing
+  [On-demand Incremental Static Regeneration](https://nextjs.org/blog/next-12-1#on-demand-incremental-static-regeneration-beta)
+  soon.
+
+  This will greatly reduce the requirement to rebuid stuff and we'll add a management UI on the
+  frontend to be able to revalidate pages manually.
+
+- [#1274](https://github.com/ho-nl/m2-pwa/pull/1274)
+  [`5a4809b1a`](https://github.com/ho-nl/m2-pwa/commit/5a4809b1a705aa32f620f520085df48ee25f9949)
+  Thanks [@paales](https://github.com/paales)! - make sure the discount is rendered side-by-side
+
+- Updated dependencies
+  [[`381e4c86a`](https://github.com/ho-nl/m2-pwa/commit/381e4c86a8321ce96e1fa5c7d3c0a0c0ff3e02c7),
+  [`351347afe`](https://github.com/ho-nl/m2-pwa/commit/351347afeae5bd837408d46c7593bcf5473dc621),
+  [`ce09388e0`](https://github.com/ho-nl/m2-pwa/commit/ce09388e0d7ef33aee660612340f6fbae15ceec2),
+  [`e7c8e2756`](https://github.com/ho-nl/m2-pwa/commit/e7c8e2756d637cbcd2e793d62ef5721d35d9fa7b),
+  [`b08a8eb1d`](https://github.com/ho-nl/m2-pwa/commit/b08a8eb1d024b9d3e7712ef034029151670db275),
+  [`52a45bba4`](https://github.com/ho-nl/m2-pwa/commit/52a45bba4dc6dd6df3c81f5023df7d23ed8a534d)]:
+  - @graphcommerce/ecommerce-ui@1.0.0
+  - @graphcommerce/framer-next-pages@3.0.2
+  - @graphcommerce/magento-customer@4.1.1
+  - @graphcommerce/next-ui@4.1.1
+  - @graphcommerce/react-hook-form@3.0.2
+  - @graphcommerce/framer-scroller@2.0.2
+  - @graphcommerce/graphql@3.0.2
+  - @graphcommerce/image@3.0.2
+  - @graphcommerce/magento-graphql@3.0.2
+  - @graphcommerce/magento-store@4.0.2
+
 ## 4.1.0
 
 ### Minor Changes

package/components/ApolloCartError/ApolloCartErrorAlert.tsx

@@ -1,11 +1,10 @@
+import { ApolloErrorAlert, ApolloErrorAlertProps } from '@graphcommerce/ecommerce-ui'
 import { useQuery } from '@graphcommerce/graphql'
 import { CustomerTokenDocument } from '@graphcommerce/magento-customer'
 import { graphqlErrorByCategory } from '@graphcommerce/magento-graphql'
-import { ApolloErrorAlert, ApolloErrorAlertProps } from '@graphcommerce/next-ui'
 import { t } from '@lingui/macro'
 import { Button } from '@mui/material'
 import Link from 'next/link'
-import React from 'react'
 import { useClearCurrentCartId } from '../../hooks/useClearCurrentCartId'
 
 export type ApolloCartErrorAlertProps = ApolloErrorAlertProps

package/components/ApolloCartError/ApolloCartErrorFullPage.tsx

@@ -1,10 +1,6 @@
+import { ApolloErrorFullPage, ApolloErrorFullPageProps } from '@graphcommerce/ecommerce-ui'
 import { graphqlErrorByCategory } from '@graphcommerce/magento-graphql'
-import {
-  ApolloErrorFullPage,
-  ApolloErrorFullPageProps,
-  iconSadFace,
-  SvgIcon,
-} from '@graphcommerce/next-ui'
+import { iconSadFace, IconSvg } from '@graphcommerce/next-ui'
 import { Button } from '@mui/material'
 import { useClearCurrentCartId } from '../../hooks/useClearCurrentCartId'
 
@@ -20,7 +16,7 @@ export function ApolloCartErrorFullPage(props: ApolloCartErrorFullPageProps) {
   return (
     <ApolloErrorFullPage
       error={error}
-      icon={<SvgIcon src={iconSadFace} size='xxl' />}
+      icon={<IconSvg src={iconSadFace} size='xxl' />}
       button={action}
       {...passedProps}
     />

package/components/ApolloCartError/ApolloCartErrorSnackbar.tsx

@@ -1,5 +1,5 @@
+import { ApolloErrorSnackbarProps, ApolloErrorSnackbar } from '@graphcommerce/ecommerce-ui'
 import { graphqlErrorByCategory } from '@graphcommerce/magento-graphql'
-import { ApolloErrorSnackbarProps, ApolloErrorSnackbar } from '@graphcommerce/next-ui'
 import { Button } from '@mui/material'
 import React from 'react'
 import { useClearCurrentCartId } from '../../hooks/useClearCurrentCartId'

package/components/CartFab/CartFab.tsx

@@ -1,10 +1,10 @@
 import {
   extendableComponent,
   iconShoppingBag,
-  responsiveVal,
   DesktopHeaderBadge,
-  SvgIcon,
+  IconSvg,
   useScrollY,
+  useFabSize,
 } from '@graphcommerce/next-ui'
 import { t } from '@lingui/macro'
 import { alpha, Fab, FabProps, NoSsr, styled, useTheme, Box, SxProps, Theme } from '@mui/material'
@@ -43,8 +43,8 @@ function CartFabContent(props: CartFabContentProps) {
   const paper1 = alpha(theme2.palette.background.paper, 1)
   const backgroundColor = useTransform(scrollY, [0, 10], [paper0, paper1])
 
-  const cartIcon = icon ?? <SvgIcon src={iconShoppingBag} size='large' />
-  const fabIconSize = responsiveVal(42, 56) // @todo generalize this
+  const cartIcon = icon ?? <IconSvg src={iconShoppingBag} size='large' />
+  const fabIconSize = useFabSize('responsive')
 
   return (
     <Box
@@ -60,11 +60,9 @@ function CartFabContent(props: CartFabContentProps) {
           {...fabProps}
           aria-label={t`Cart`}
           color='inherit'
-          size='large'
+          size='responsive'
           style={{ backgroundColor }}
           sx={(theme) => ({
-            width: fabIconSize,
-            height: fabIconSize,
             [theme.breakpoints.down('md')]: {
               backgroundColor: `${theme.palette.background.paper} !important`,
             },

package/components/CartItemSummary/index.tsx

@@ -5,7 +5,7 @@ import {
   iconChevronRight,
   responsiveVal,
   SectionContainer,
-  SvgIcon,
+  IconSvg,
   extendableComponent,
 } from '@graphcommerce/next-ui'
 import { Trans } from '@lingui/macro'
@@ -83,7 +83,7 @@ export default function CartItemSummary(props: OrderSummaryProps) {
                 left: 8,
               }}
             >
-              <SvgIcon src={iconChevronLeft} />
+              <IconSvg src={iconChevronLeft} />
             </ScrollerButton>
             <Box className={classes.scrollerContainer} sx={{ padding: '1px' }}>
               <Scroller className={classes.scroller}>
@@ -125,7 +125,7 @@ export default function CartItemSummary(props: OrderSummaryProps) {
                 right: 8,
               }}
             >
-              <SvgIcon src={iconChevronRight} />
+              <IconSvg src={iconChevronRight} />
             </ScrollerButton>
           </ScrollerProvider>
         </Box>

package/components/CartStartCheckout/CartStartCheckout.tsx

@@ -1,5 +1,5 @@
 import { Money } from '@graphcommerce/magento-store'
-import { iconChevronRight, SvgIcon, extendableComponent } from '@graphcommerce/next-ui'
+import { iconChevronRight, IconSvg, extendableComponent } from '@graphcommerce/next-ui'
 import { Trans } from '@lingui/macro'
 import { Box, Button, SxProps, Theme } from '@mui/material'
 import PageLink from 'next/link'
@@ -34,7 +34,7 @@ export default function CartStartCheckout(props: CartStartCheckoutProps) {
           color='secondary'
           size='large'
           className={classes.checkoutButton}
-          endIcon={<SvgIcon src={iconChevronRight} />}
+          endIcon={<IconSvg src={iconChevronRight} />}
           disabled={!hasTotals}
           sx={(theme) => ({
             marginTop: theme.spacings.md,

package/components/CartSummary/index.tsx

@@ -102,7 +102,7 @@ export default function CartSummary(props: CartSummaryProps) {
             <Box>
               <SectionContainer
                 variantLeft='h5'
-                labelLeft={t`Billing Address`}
+                labelLeft={t`Billing address`}
                 sx={{ '& .SectionHeader': { marginTop: 0, paddingBottom: '8px' } }}
                 labelRight={
                   editable ? (

package/components/CartTotals/CartTotals.tsx

@@ -94,10 +94,12 @@ export default function CartTotals(props: CartTotalsProps) {
 
           return (
             <AnimatedRow
+              key={discount?.label}
               sx={(theme) => ({
-                fontWeight: theme.typography.fontWeightBold,
+                display: 'flex',
+                justifyContent: 'space-between',
+                typography: 'subtitle1',
               })}
-              key={discount?.label}
             >
               <Box>{discount?.label}</Box>
               <Box className={classes.money} sx={{ whiteSpace: 'nowrap' }}>
@@ -154,7 +156,6 @@ export default function CartTotals(props: CartTotalsProps) {
               display: 'flex',
               justifyContent: 'space-between',
               typography: 'subtitle1',
-              fontWeight: theme.typography.fontWeightBold,
               color: theme.palette.primary.main,
             })}
           >
@@ -175,7 +176,7 @@ export default function CartTotals(props: CartTotalsProps) {
               sx={{
                 display: 'flex',
                 justifyContent: 'space-between',
-                typography: 'subtitle1',
+                typography: 'body1',
                 color: 'text.disabled',
                 paddingTop: 0,
               }}

package/components/EmptyCart/EmptyCart.tsx

@@ -1,4 +1,4 @@
-import { FullPageMessage, SvgIcon, iconShoppingBag } from '@graphcommerce/next-ui'
+import { FullPageMessage, IconSvg, iconShoppingBag } from '@graphcommerce/next-ui'
 import { Trans } from '@lingui/macro'
 import { Button } from '@mui/material'
 import Link from 'next/link'
@@ -11,7 +11,7 @@ export default function EmptyCart(props: EmptyCartProps) {
   return (
     <FullPageMessage
       title={<Trans>Your cart is empty</Trans>}
-      icon={<SvgIcon src={iconShoppingBag} size='xxl' />}
+      icon={<IconSvg src={iconShoppingBag} size='xxl' />}
       button={
         <Link href='/' passHref>
           <Button variant='pill' color='secondary' size='large'>

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-cart",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "4.1.0",
+  "version": "4.1.3",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,21 +12,24 @@
     }
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^4.0.1",
-    "@graphcommerce/prettier-config-pwa": "^4.0.1",
-    "@graphcommerce/typescript-config-pwa": "^4.0.1",
-    "@playwright/test": "^1.18.1"
+    "@graphcommerce/eslint-config-pwa": "^4.0.3",
+    "@graphcommerce/prettier-config-pwa": "^4.0.2",
+    "@graphcommerce/typescript-config-pwa": "^4.0.2",
+    "@playwright/test": "^1.19.1"
   },
   "dependencies": {
-    "@graphcommerce/framer-next-pages": "^3.0.1",
-    "@graphcommerce/framer-scroller": "^2.0.1",
-    "@graphcommerce/graphql": "^3.0.1",
-    "@graphcommerce/image": "^3.0.1",
-    "@graphcommerce/magento-customer": "^4.1.0",
-    "@graphcommerce/magento-graphql": "^3.0.1",
-    "@graphcommerce/magento-store": "^4.0.1",
-    "@graphcommerce/next-ui": "^4.1.0",
-    "@graphcommerce/react-hook-form": "^3.0.1",
+    "@graphcommerce/ecommerce-ui": "^1.0.2",
+    "@graphcommerce/framer-next-pages": "^3.1.0",
+    "@graphcommerce/framer-scroller": "^2.0.3",
+    "@graphcommerce/graphql": "^3.0.3",
+    "@graphcommerce/image": "^3.1.0",
+    "@graphcommerce/magento-customer": "^4.1.3",
+    "@graphcommerce/magento-graphql": "^3.0.3",
+    "@graphcommerce/magento-store": "^4.0.3",
+    "@graphcommerce/next-ui": "^4.2.0",
+    "@graphcommerce/react-hook-form": "^3.0.3"
+  },
+  "peerDependencies": {
     "@lingui/macro": "^3.13.2",
     "@mui/material": "^5.4.1",
     "framer-motion": "^6.2.4",