@graphcommerce/magento-cart 4.2.15 → 4.3.2

package/CHANGELOG.md

@@ -1,5 +1,44 @@
 # Change Log
 
+## 4.3.2
+
+### Patch Changes
+
+- [#1485](https://github.com/graphcommerce-org/graphcommerce/pull/1485) [`d6262de71`](https://github.com/graphcommerce-org/graphcommerce/commit/d6262de71d2254a2b0b492e1a60f9e141767470e) Thanks [@paales](https://github.com/paales)! - move to useCustomerSession instead of using the tokenquery directly and fix ssr issues
+
+* [#1483](https://github.com/graphcommerce-org/graphcommerce/pull/1483) [`e3005fe63`](https://github.com/graphcommerce-org/graphcommerce/commit/e3005fe6306093d47b08c6756c21c8175649e30b) Thanks [@FrankHarland](https://github.com/FrankHarland)! - actually apply sx prop on cartsummary
+
+* Updated dependencies [[`d6262de71`](https://github.com/graphcommerce-org/graphcommerce/commit/d6262de71d2254a2b0b492e1a60f9e141767470e), [`c8c246b8a`](https://github.com/graphcommerce-org/graphcommerce/commit/c8c246b8aaab0621b68a2fca2a1c529a56fad962)]:
+  - @graphcommerce/magento-customer@4.4.0
+  - @graphcommerce/next-ui@4.8.2
+  - @graphcommerce/ecommerce-ui@1.0.14
+  - @graphcommerce/framer-scroller@2.1.13
+  - @graphcommerce/magento-store@4.2.6
+
+## 4.3.1
+
+### Patch Changes
+
+- Updated dependencies [[`a9df81310`](https://github.com/graphcommerce-org/graphcommerce/commit/a9df81310c051876dd82fb2819105dece47cc213), [`55c2dcde7`](https://github.com/graphcommerce-org/graphcommerce/commit/55c2dcde7869ee51b84494af653b3edfd43904a4), [`597e2f413`](https://github.com/graphcommerce-org/graphcommerce/commit/597e2f413bdb5b76793b40ab631ce61390e26e81), [`f167f9963`](https://github.com/graphcommerce-org/graphcommerce/commit/f167f99630966a7de43717937d43669e66132494)]:
+  - @graphcommerce/next-ui@4.8.1
+  - @graphcommerce/framer-scroller@2.1.12
+  - @graphcommerce/framer-next-pages@3.2.2
+  - @graphcommerce/ecommerce-ui@1.0.13
+  - @graphcommerce/magento-customer@4.3.2
+  - @graphcommerce/magento-store@4.2.5
+  - @graphcommerce/image@3.1.6
+
+## 4.3.0
+
+### Minor Changes
+
+- [#1472](https://github.com/graphcommerce-org/graphcommerce/pull/1472) [`cf575395c`](https://github.com/graphcommerce-org/graphcommerce/commit/cf575395c16e9c571f75d4563004c3018a29aeaa) Thanks [@mikekeehnen](https://github.com/mikekeehnen)! - Added translations to cart errors
+
+### Patch Changes
+
+- Updated dependencies [[`a12db31b9`](https://github.com/graphcommerce-org/graphcommerce/commit/a12db31b9db9d27d86f59c1bfe58a0879999b9d3)]:
+  - @graphcommerce/magento-customer@4.3.1
+
 ## 4.2.15
 
 ### Patch Changes

package/components/ApolloCartError/ApolloCartErrorAlert.tsx

@@ -17,7 +17,11 @@ export function ApolloCartErrorAlert(props: ApolloCartErrorAlertProps) {
   let action: JSX.Element | undefined
 
   const [, noSuchEntity] = graphqlErrorByCategory({ category: 'graphql-no-such-entity', error })
-  action = noSuchEntity ? <Button onClick={clear}>Reset Cart</Button> : undefined
+  action = noSuchEntity ? (
+    <Button onClick={clear}>
+      <Trans id='Reset Cart' />
+    </Button>
+  ) : undefined
 
   const [, authorizationError] = graphqlErrorByCategory({
     category: 'graphql-authorization',

package/components/ApolloCartError/ApolloCartErrorFullPage.tsx

@@ -1,6 +1,7 @@
 import { ApolloErrorFullPage, ApolloErrorFullPageProps } from '@graphcommerce/ecommerce-ui'
 import { graphqlErrorByCategory } from '@graphcommerce/magento-graphql'
 import { iconSadFace, IconSvg } from '@graphcommerce/next-ui'
+import { Trans } from '@lingui/react'
 import { Button } from '@mui/material'
 import { useClearCurrentCartId } from '../../hooks/useClearCurrentCartId'
 
@@ -11,7 +12,11 @@ export function ApolloCartErrorFullPage(props: ApolloCartErrorFullPageProps) {
   const clear = useClearCurrentCartId()
 
   const [, noSuchEntity] = graphqlErrorByCategory({ category: 'graphql-no-such-entity', error })
-  const action = noSuchEntity ? <Button onClick={clear}>Reset Cart</Button> : undefined
+  const action = noSuchEntity ? (
+    <Button onClick={clear}>
+      <Trans id='Reset Cart' />
+    </Button>
+  ) : undefined
 
   return (
     <ApolloErrorFullPage

package/components/ApolloCartError/ApolloCartErrorSnackbar.tsx

@@ -1,5 +1,6 @@
 import { ApolloErrorSnackbarProps, ApolloErrorSnackbar } from '@graphcommerce/ecommerce-ui'
 import { graphqlErrorByCategory } from '@graphcommerce/magento-graphql'
+import { Trans } from '@lingui/react'
 import { Button } from '@mui/material'
 import React from 'react'
 import { useClearCurrentCartId } from '../../hooks/useClearCurrentCartId'
@@ -13,7 +14,7 @@ export function ApolloCartErrorSnackbar(props: ApolloCartErrorSnackbarProps) {
   const [, noSuchEntity] = graphqlErrorByCategory({ category: 'graphql-no-such-entity', error })
   const action = noSuchEntity ? (
     <Button onClick={clear} variant='pill' color='secondary'>
-      Reset Cart
+      <Trans id='Reset Cart' />
     </Button>
   ) : undefined
 

package/components/CartSummary/CartSummary.tsx

@@ -1,6 +1,5 @@
 import { useHistoryLink } from '@graphcommerce/framer-next-pages'
 import { SectionContainer, extendableComponent } from '@graphcommerce/next-ui'
-import { i18n } from '@lingui/core'
 import { Trans } from '@lingui/react'
 import { Box, Link, SxProps, Theme, Typography } from '@mui/material'
 import PageLink from 'next/link'
@@ -21,7 +20,7 @@ const parts = ['root', 'detailsContainer', 'sectionHeaderWrapper'] as const
 const { classes } = extendableComponent<OwnerState, typeof compName, typeof parts>(compName, parts)
 
 export function CartSummary(props: CartSummaryProps) {
-  const { children, editable } = props
+  const { children, editable, sx = [] } = props
 
   const { data } = useCartQuery(GetCartSummaryDocument, { allowUrl: true })
   const { href: historyHref, onClick: historyOnClick } = useHistoryLink({
@@ -35,12 +34,15 @@ export function CartSummary(props: CartSummaryProps) {
   return (
     <Box
       className={classes.root}
-      sx={(theme) => ({
-        margin: `${theme.spacings.sm} 0`,
-        '& div:last-of-type': {
-          borderRadius: '0 0 4px 4px',
-        },
-      })}
+      sx={[
+        (theme) => ({
+          margin: `${theme.spacings.sm} 0`,
+          '& div:last-of-type': {
+            borderRadius: '0 0 4px 4px',
+          },
+        }),
+        ...(Array.isArray(sx) ? sx : [sx]),
+      ]}
     >
       <Box
         className={classes.detailsContainer}

package/components/InlineAccount/InlineAccount.tsx

@@ -1,8 +1,8 @@
 import { useQuery } from '@graphcommerce/graphql'
 import {
   SignUpFormInline,
-  CustomerTokenDocument,
   IsEmailAvailableDocument,
+  useCustomerSession,
 } from '@graphcommerce/magento-customer'
 import { Button, FormRow, extendableComponent } from '@graphcommerce/next-ui'
 import { Trans } from '@lingui/react'
@@ -30,15 +30,12 @@ export function InlineAccount(props: InlineAccountProps) {
   const { loading, data } = useCartQuery(InlineAccountDocument)
   const cart = data?.cart
 
-  const { data: customerTokenData } = useQuery(CustomerTokenDocument)
+  const { loggedIn } = useCustomerSession()
   const { data: isEmailAvailableData } = useQuery(IsEmailAvailableDocument, {
     variables: { email: cart?.email ?? '' },
   })
 
   const { firstname, lastname } = cart?.shipping_addresses?.[0] ?? {}
-  const signedIn = Boolean(
-    customerTokenData?.customerToken && customerTokenData?.customerToken.valid,
-  )
   const canSignUp = isEmailAvailableData?.isEmailAvailable?.is_email_available === true
 
   if (!canSignUp) return null
@@ -56,7 +53,7 @@ export function InlineAccount(props: InlineAccountProps) {
           ...(Array.isArray(sx) ? sx : [sx]),
         ]}
       >
-        {!signedIn && canSignUp && (
+        {!loggedIn && canSignUp && (
           <>
             <Box
               className={classes.innerContainer}
@@ -118,7 +115,7 @@ export function InlineAccount(props: InlineAccountProps) {
           </>
         )}
 
-        {signedIn && (
+        {loggedIn && (
           <Box className={classes.innerContainer}>
             <div>
               <Typography variant='h4' className={classes.title}>

package/hooks/useMergeCustomerCart.ts

@@ -1,9 +1,5 @@
 import { useMutation, useQuery } from '@graphcommerce/graphql'
-import {
-  CustomerTokenDocument,
-  useCustomerSession,
-  useExtractCustomerErrors,
-} from '@graphcommerce/magento-customer'
+import { useCustomerSession, useExtractCustomerErrors } from '@graphcommerce/magento-customer'
 import { useEffect } from 'react'
 import { CustomerCartDocument } from './CustomerCart.gql'
 import { UseMergeCustomerCartDocument } from './UseMergeCustomerCart.gql'

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-cart",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "4.2.15",
+  "version": "4.3.2",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -18,15 +18,15 @@
     "@playwright/test": "^1.21.1"
   },
   "dependencies": {
-    "@graphcommerce/ecommerce-ui": "1.0.12",
-    "@graphcommerce/framer-next-pages": "3.2.1",
-    "@graphcommerce/framer-scroller": "2.1.11",
+    "@graphcommerce/ecommerce-ui": "1.0.14",
+    "@graphcommerce/framer-next-pages": "3.2.2",
+    "@graphcommerce/framer-scroller": "2.1.13",
     "@graphcommerce/graphql": "3.1.3",
-    "@graphcommerce/image": "3.1.5",
-    "@graphcommerce/magento-customer": "4.3.0",
+    "@graphcommerce/image": "3.1.6",
+    "@graphcommerce/magento-customer": "4.4.0",
     "@graphcommerce/magento-graphql": "3.0.12",
-    "@graphcommerce/magento-store": "4.2.4",
-    "@graphcommerce/next-ui": "4.8.0",
+    "@graphcommerce/magento-store": "4.2.6",
+    "@graphcommerce/next-ui": "4.8.2",
     "@graphcommerce/react-hook-form": "3.1.3"
   },
   "peerDependencies": {