@graphcommerce/magento-cart 7.0.0-canary.21 → 7.0.1-canary.0

package/CHANGELOG.md

@@ -1,6 +1,198 @@
 # Change Log
 
-## 7.0.0-canary.21
+## 7.0.1-canary.0
+
+## 7.0.0
+
+### Minor Changes
+
+- [#1962](https://github.com/graphcommerce-org/graphcommerce/pull/1962) [`518b6ca24`](https://github.com/graphcommerce-org/graphcommerce/commit/518b6ca248fc94624dc06eb02de5b3eac0fc9483) - Created a new `<ValidatedPasswordElement/>` which validates according to Magento's validation groups and implement on all locations. Move remaining password fields to `<PasswordElement />` ([@carlocarels90](https://github.com/carlocarels90))
+
+### Patch Changes
+
+- [#1916](https://github.com/graphcommerce-org/graphcommerce/pull/1916) [`ee2f814f4`](https://github.com/graphcommerce-org/graphcommerce/commit/ee2f814f4d91898f106036e92be4e560d638509d) - When the customer is logging in and the merge cart functionality throws an error, it would not set the current customer's cart as active, but keep the faulty cart active. ([@paales](https://github.com/paales))
+
+- [#2031](https://github.com/graphcommerce-org/graphcommerce/pull/2031) [`4d8fc9e99`](https://github.com/graphcommerce-org/graphcommerce/commit/4d8fc9e998fc9361282833316ec9564da0644ed6) - Eslint fixes and suppress accepted warnings ([@paales](https://github.com/paales))
+
+- [#1914](https://github.com/graphcommerce-org/graphcommerce/pull/1914) [`000556331`](https://github.com/graphcommerce-org/graphcommerce/commit/000556331f5379c71d7edca541fd0b145b7dc435) - When there is an error in the cart, disable the checkout buttons ([@paales](https://github.com/paales))
+
+- [#1942](https://github.com/graphcommerce-org/graphcommerce/pull/1942) [`045d0a6cb`](https://github.com/graphcommerce-org/graphcommerce/commit/045d0a6cbbfc6339852c19dd21f349bb51c38fcd) - When the ApolloCartError would throw an authorization error it would link to the wrong page ([@paales](https://github.com/paales))
+
+- [#1914](https://github.com/graphcommerce-org/graphcommerce/pull/1914) [`38d6c4888`](https://github.com/graphcommerce-org/graphcommerce/commit/38d6c488850013b36cae9f388996039219c1327e) - Errors in the cart didn't allow for recovery from the faulty state ([@paales](https://github.com/paales))
+
+- [#1914](https://github.com/graphcommerce-org/graphcommerce/pull/1914) [`5d115a11a`](https://github.com/graphcommerce-org/graphcommerce/commit/5d115a11a417f35c3315879c785d24ae32e64663) - When a customer tries to add a product to an invalid customer cart, discard the cart and create a new cart ([@paales](https://github.com/paales))
+
+## 6.2.0-canary.98
+
+## 6.2.0-canary.97
+
+## 6.2.0-canary.96
+
+## 6.2.0-canary.95
+
+## 6.2.0-canary.94
+
+## 6.2.0-canary.93
+
+## 6.2.0-canary.92
+
+## 6.2.0-canary.91
+
+## 6.2.0-canary.90
+
+## 6.2.0-canary.89
+
+### Patch Changes
+
+- [#2031](https://github.com/graphcommerce-org/graphcommerce/pull/2031) [`4d8fc9e99`](https://github.com/graphcommerce-org/graphcommerce/commit/4d8fc9e998fc9361282833316ec9564da0644ed6) - Eslint fixes and suppress accepted warnings ([@paales](https://github.com/paales))
+
+## 6.2.0-canary.88
+
+## 6.2.0-canary.87
+
+## 6.2.0-canary.86
+
+## 6.2.0-canary.85
+
+## 6.2.0-canary.84
+
+## 6.2.0-canary.83
+
+## 6.2.0-canary.82
+
+## 6.2.0-canary.81
+
+## 6.2.0-canary.80
+
+## 6.2.0-canary.79
+
+### Patch Changes
+
+- [#2013](https://github.com/graphcommerce-org/graphcommerce/pull/2013) [`c57bdf8a4`](https://github.com/graphcommerce-org/graphcommerce/commit/c57bdf8a4ce936c3eedc4dfada3a464a113ac68a) - Updated @mui and framer-motion packages to latest versions ([@paales](https://github.com/paales))
+
+## 6.2.0-canary.78
+
+## 6.2.0-canary.77
+
+## 6.2.0-canary.76
+
+## 6.2.0-canary.75
+
+## 6.2.0-canary.74
+
+## 6.2.0-canary.73
+
+## 6.2.0-canary.72
+
+## 6.2.0-canary.71
+
+## 6.2.0-canary.70
+
+## 6.2.0-canary.69
+
+## 6.2.0-canary.68
+
+## 6.2.0-canary.67
+
+## 6.2.0-canary.66
+
+## 6.2.0-canary.65
+
+## 6.2.0-canary.64
+
+## 6.2.0-canary.63
+
+## 6.2.0-canary.62
+
+## 6.2.0-canary.61
+
+## 6.2.0-canary.60
+
+## 6.2.0-canary.59
+
+## 6.2.0-canary.58
+
+## 6.2.0-canary.57
+
+## 6.2.0-canary.56
+
+## 6.2.0-canary.55
+
+## 6.2.0-canary.54
+
+## 6.2.0-canary.53
+
+## 6.2.0-canary.52
+
+## 6.2.0-canary.51
+
+## 6.2.0-canary.50
+
+## 6.2.0-canary.49
+
+## 6.2.0-canary.48
+
+## 6.2.0-canary.47
+
+## 6.2.0-canary.46
+
+## 6.2.0-canary.45
+
+### Minor Changes
+
+- [#1962](https://github.com/graphcommerce-org/graphcommerce/pull/1962) [`518b6ca24`](https://github.com/graphcommerce-org/graphcommerce/commit/518b6ca248fc94624dc06eb02de5b3eac0fc9483) - Created a new `<ValidatedPasswordElement/>` which validates according to Magento's validation groups and implement on all locations. Move remaining password fields to `<PasswordElement />` ([@carlocarels90](https://github.com/carlocarels90))
+
+## 6.2.0-canary.44
+
+## 6.2.0-canary.43
+
+## 6.2.0-canary.42
+
+## 6.2.0-canary.41
+
+## 6.2.0-canary.40
+
+## 6.2.0-canary.39
+
+## 6.2.0-canary.38
+
+## 6.2.0-canary.37
+
+## 6.2.0-canary.36
+
+## 6.2.0-canary.35
+
+## 6.2.0-canary.34
+
+## 6.2.0-canary.33
+
+## 6.2.0-canary.32
+
+## 6.2.0-canary.31
+
+## 6.2.0-canary.30
+
+### Patch Changes
+
+- [#1942](https://github.com/graphcommerce-org/graphcommerce/pull/1942) [`045d0a6cb`](https://github.com/graphcommerce-org/graphcommerce/commit/045d0a6cbbfc6339852c19dd21f349bb51c38fcd) - When the ApolloCartError would throw an authorization error it would link to the wrong page ([@paales](https://github.com/paales))
+
+## 6.2.0-canary.29
+
+## 6.2.0-canary.28
+
+## 6.2.0-canary.27
+
+## 6.2.0-canary.26
+
+## 6.2.0-canary.25
+
+## 6.2.0-canary.24
+
+## 6.2.0-canary.23
+
+## 6.2.0-canary.22
+
+## 6.2.0-canary.21
 
 ## 6.2.0-canary.20
 

package/components/ApolloCartError/ApolloCartErrorAlert.tsx

@@ -42,7 +42,7 @@ export function ApolloCartErrorAlert(props: ApolloCartErrorAlertProps) {
             <Button onClick={clear} color='error' size='small'>
               <Trans id='Sign out' />
             </Button>
-            <Button href='/account/login' color='error' size='small'>
+            <Button href='/account/signin' color='error' size='small'>
               <Trans id='Sign in' />
             </Button>
           </>

package/components/CartAgreementsForm/CartAgreementsForm.tsx

@@ -2,23 +2,13 @@ import { CheckboxElement } from '@graphcommerce/ecommerce-ui'
 import { useQuery } from '@graphcommerce/graphql'
 import { extendableComponent, FormDiv } from '@graphcommerce/next-ui'
 import {
-  Controller,
   useForm,
   useFormCompose,
   UseFormComposeOptions,
   useFormPersist,
 } from '@graphcommerce/react-hook-form'
 import { i18n } from '@lingui/core'
-import {
-  Box,
-  Checkbox,
-  FormControl,
-  FormControlLabel,
-  FormHelperText,
-  Link,
-  SxProps,
-  Theme,
-} from '@mui/material'
+import { Box, Link, SxProps, Theme } from '@mui/material'
 import React from 'react'
 import { CartAgreementsDocument } from './CartAgreements.gql'
 
@@ -42,7 +32,7 @@ export function CartAgreementsForm(props: CartAgreementsFormProps) {
 
   const form = useForm()
 
-  const { handleSubmit, formState, control } = form
+  const { handleSubmit, control } = form
 
   const submit = handleSubmit((values) => {
     // eslint-disable-next-line no-console

package/components/CartItemSummary/CartItemSummary.tsx

@@ -83,7 +83,7 @@ export function CartItemSummary(props: OrderSummaryProps) {
             >
               <IconSvg src={iconChevronLeft} />
             </ScrollerButton>
-            <Box className={classes.scrollerContainer} sx={{ padding: '1px' }}>
+            <Box className={classes.scrollerContainer} sx={{ padding: '1px', display: 'flex' }}>
               <Scroller className={classes.scroller}>
                 {items?.map((item) => (
                   <React.Fragment key={item?.uid}>

package/components/CartStartCheckout/CartStartCheckoutLinkOrButton.tsx

@@ -9,7 +9,7 @@ export type CartStartCheckoutLinkOrButtonProps = CartStartCheckoutFragment & {
   sx?: SxProps<Theme>
   disabled?: boolean
   onStart?: (
-    e: React.MouseEvent<HTMLButtonElement | HTMLAnchorElement>,
+    e: React.MouseEvent<HTMLButtonElement & HTMLAnchorElement & HTMLSpanElement>,
     cart: CartStartCheckoutFragment,
   ) => void
   linkOrButtonProps?: LinkOrButtonProps
@@ -30,7 +30,9 @@ export function CartStartCheckoutLinkOrButton(props: CartStartCheckoutLinkOrButt
   return (
     <LinkOrButton
       href='/checkout'
-      onClick={(e: React.MouseEvent<HTMLButtonElement | HTMLAnchorElement>) => {
+      onClick={(
+        e: React.MouseEvent<HTMLButtonElement & HTMLAnchorElement & HTMLSpanElement, MouseEvent>,
+      ) => {
         onClick?.(e)
         onStart?.(e, cart)
       }}

package/components/CartTotals/CartTotals.tsx

@@ -68,6 +68,7 @@ export function CartTotals(props: CartTotalsProps) {
 
           '&.containerMargin': {
             marginTop: theme.spacings.md,
+            px: theme.spacings.xs,
           },
         }),
         ...(Array.isArray(sx) ? sx : [sx]),

package/components/EmptyCart/EmptyCart.tsx

@@ -14,6 +14,7 @@ export function EmptyCart(props: EmptyCartProps) {
 
   return (
     <FullPageMessage
+      sx={(theme) => ({ mt: { md: theme.spacings.md } })}
       title={<Trans id='Your cart is empty' />}
       icon={<IconSvg src={iconShoppingBag} size='xxl' />}
       button={

package/components/InlineAccount/InlineAccount.tsx

@@ -6,6 +6,7 @@ import {
 } from '@graphcommerce/magento-customer'
 import { Button, FormRow, extendableComponent } from '@graphcommerce/next-ui'
 import { Trans } from '@lingui/react'
+// eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { Box, SxProps, TextField, Theme, Typography } from '@mui/material'
 import React, { useState } from 'react'
 import { useCartQuery } from '../../hooks/useCartQuery'
@@ -49,6 +50,7 @@ export function InlineAccount(props: InlineAccountProps) {
             borderRadius: '4px',
             border: `1px solid ${theme.palette.divider}`,
             padding: theme.spacings.md,
+            marginTop: theme.spacings.sm,
           }),
           ...(Array.isArray(sx) ? sx : [sx]),
         ]}
@@ -116,7 +118,21 @@ export function InlineAccount(props: InlineAccountProps) {
         )}
 
         {loggedIn && (
-          <Box className={classes.innerContainer}>
+          <Box
+            className={classes.innerContainer}
+            sx={(theme) => ({
+              display: 'flex',
+              justifyContent: 'space-between',
+              flexDirection: 'column',
+              alignItems: 'flex-start',
+              gap: theme.spacings.md,
+              [theme.breakpoints.up('sm')]: {
+                alignItems: 'flex-end',
+                flexDirection: 'unset',
+                gap: 0,
+              },
+            })}
+          >
             <div>
               <Typography variant='h4' className={classes.title}>
                 {title ?? <Trans id='Have an account?' />}

package/hooks/useCartQuery.ts

@@ -34,7 +34,7 @@ export function useCartQuery<Q, V extends { cartId: string; [index: string]: unk
   queryOptions.variables = { cartId, ...options?.variables } as V
   queryOptions.skip = queryOptions?.skip || !cartId
 
-  const result = useQuery(document, queryOptions)
+  const result = useQuery(document, queryOptions as QueryHookOptions<Q, V>)
 
   return {
     ...result,

package/hooks/useCurrentCartId.ts

@@ -1,14 +1,14 @@
-import { OperationVariables, QueryHookOptions, useQuery } from '@graphcommerce/graphql'
-import { CurrentCartIdDocument, CurrentCartIdQuery } from './CurrentCartId.gql'
+import { QueryHookOptions, useQuery } from '@graphcommerce/graphql'
+import {
+  CurrentCartIdDocument,
+  CurrentCartIdQuery,
+  CurrentCartIdQueryVariables,
+} from './CurrentCartId.gql'
 
-type UseCurrentCartIdOptions<Q, V extends OperationVariables> = QueryHookOptions<
-  Q & Pick<CurrentCartIdQuery, 'currentCartId'>,
-  V
->
-
-export function useCurrentCartId<Q, V extends OperationVariables>(
-  options: UseCurrentCartIdOptions<Q, V> = {},
-) {
-  const queryResults = useQuery(CurrentCartIdDocument, { ...options })
+export function useCurrentCartId<
+  Q extends CurrentCartIdQuery,
+  V extends CurrentCartIdQueryVariables,
+>(options: QueryHookOptions<Q, V> = {}) {
+  const queryResults = useQuery<Q, V>(CurrentCartIdDocument, options)
   return { currentCartId: queryResults.data?.currentCartId?.id || '', ...queryResults }
 }

package/hooks/useFormGqlMutationCart.ts

@@ -7,7 +7,7 @@ import {
 import { useCartIdCreate } from './useCartIdCreate'
 
 export function useFormGqlMutationCart<
-  Q extends Record<string, any>,
+  Q extends Record<string, unknown>,
   V extends { cartId: string; [index: string]: unknown },
 >(
   document: TypedDocumentNode<Q, V>,

package/link/createCartErrorLink.ts

@@ -1,9 +1,9 @@
 import { fromPromise, globalApolloClient, Operation } from '@graphcommerce/graphql'
 import { onError } from '@graphcommerce/graphql/apollo'
+import { ErrorCategory } from '@graphcommerce/magento-graphql'
+import type { GraphQLError } from 'graphql'
 import { writeCartId } from '../hooks'
 import { CreateEmptyCartDocument } from '../hooks/CreateEmptyCart.gql'
-import { GraphQLError } from 'graphql'
-import { ErrorCategory } from '@graphcommerce/magento-graphql'
 
 type CartOperation = Operation & { variables: { cartId: string } }
 function isCartOperation(operation: Operation): operation is CartOperation {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-cart",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "7.0.0-canary.21",
+  "version": "7.0.1-canary.0",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,26 +12,27 @@
     }
   },
   "devDependencies": {
-    "@graphcommerce/eslint-config-pwa": "7.0.0-canary.21",
-    "@graphcommerce/prettier-config-pwa": "7.0.0-canary.21",
-    "@graphcommerce/typescript-config-pwa": "7.0.0-canary.21"
+    "@graphcommerce/eslint-config-pwa": "7.0.1-canary.0",
+    "@graphcommerce/prettier-config-pwa": "7.0.1-canary.0",
+    "@graphcommerce/typescript-config-pwa": "7.0.1-canary.0"
   },
   "dependencies": {
-    "@graphcommerce/ecommerce-ui": "7.0.0-canary.21",
-    "@graphcommerce/framer-utils": "7.0.0-canary.21",
-    "@graphcommerce/framer-next-pages": "7.0.0-canary.21",
-    "@graphcommerce/framer-scroller": "7.0.0-canary.21",
-    "@graphcommerce/graphql": "7.0.0-canary.21",
-    "@graphcommerce/image": "7.0.0-canary.21",
-    "@graphcommerce/magento-customer": "7.0.0-canary.21",
-    "@graphcommerce/magento-graphql": "7.0.0-canary.21",
-    "@graphcommerce/magento-store": "7.0.0-canary.21",
-    "@graphcommerce/next-ui": "7.0.0-canary.21",
-    "@graphcommerce/react-hook-form": "7.0.0-canary.21"
+    "@graphcommerce/ecommerce-ui": "7.0.1-canary.0",
+    "@graphcommerce/framer-utils": "7.0.1-canary.0",
+    "@graphcommerce/framer-next-pages": "7.0.1-canary.0",
+    "@graphcommerce/framer-scroller": "7.0.1-canary.0",
+    "@graphcommerce/graphql": "7.0.1-canary.0",
+    "@graphcommerce/image": "7.0.1-canary.0",
+    "@graphcommerce/magento-customer": "7.0.1-canary.0",
+    "@graphcommerce/magento-graphql": "7.0.1-canary.0",
+    "@graphcommerce/magento-store": "7.0.1-canary.0",
+    "@graphcommerce/next-ui": "7.0.1-canary.0",
+    "@graphcommerce/react-hook-form": "7.0.1-canary.0"
   },
   "peerDependencies": {
-    "@lingui/react": "^3.13.2",
-    "@lingui/core": "^3.13.2",
+    "@lingui/react": "^4.2.1",
+    "@lingui/core": "^4.2.1",
+    "@lingui/macro": "^4.2.1",
     "@mui/material": "^5.10.16",
     "framer-motion": "^10.0.0",
     "next": "^13.2.0",

package/test/fillCartAgreementsForm.ts

@@ -1,3 +1,4 @@
+/* eslint-disable import/no-extraneous-dependencies */
 import { ApolloClient, NormalizedCacheObject } from '@graphcommerce/graphql'
 import { Page } from '@playwright/test'
 import { CartAgreementsDocument } from '../components/CartAgreementsForm/CartAgreements.gql'