@graphcommerce/magento-cart 8.1.0-canary.3 → 8.1.0-canary.6

package/CHANGELOG.md

@@ -1,6 +1,68 @@
 # Change Log
 
-## 8.1.0-canary.3
+## 8.1.0-canary.6
+
+## 8.1.0-canary.5
+
+## 8.0.6-canary.4
+
+## 8.0.6-canary.3
+
+## 8.0.6-canary.2
+
+### Patch Changes
+
+- [#2234](https://github.com/graphcommerce-org/graphcommerce/pull/2234) [`0767bc4`](https://github.com/graphcommerce-org/graphcommerce/commit/0767bc40f7b596209f24ca4e745ff0441f3275c9) - Upgrade input components to no longer use muiRegister, which improves INP scores
+  ([@FrankHarland](https://github.com/FrankHarland))
+
+- [#2234](https://github.com/graphcommerce-org/graphcommerce/pull/2234) [`530076e`](https://github.com/graphcommerce-org/graphcommerce/commit/530076e3664703cb8b577b7fcf1998a420819f60) - Moved all usages of useFormPersist to the <FormPersist/> component to prevent rerenders.
+  ([@FrankHarland](https://github.com/FrankHarland))
+
+## 8.0.6-canary.1
+
+## 8.0.6-canary.0
+
+## 8.0.5
+
+## 8.0.5-canary.10
+
+## 8.0.5-canary.9
+
+## 8.0.5-canary.8
+
+## 8.0.5-canary.7
+
+## 8.0.5-canary.6
+
+## 8.0.5-canary.5
+
+## 8.0.5-canary.4
+
+## 8.0.5-canary.3
+
+## 8.0.5-canary.2
+
+## 8.0.5-canary.1
+
+## 8.0.5-canary.0
+
+## 8.0.4
+
+### Patch Changes
+
+- [#2221](https://github.com/graphcommerce-org/graphcommerce/pull/2221) [`0ba1fdc`](https://github.com/graphcommerce-org/graphcommerce/commit/0ba1fdc9a2d005f47cd1725fe723e77da4cc5b9d) - After a user just logged in the checkout, the useFormGqlMutationCart would still run even though the cart was locked.
+  ([@paales](https://github.com/paales))
+
+## 8.0.4-canary.1
+
+## 8.0.4-canary.0
+
+### Patch Changes
+
+- [#2221](https://github.com/graphcommerce-org/graphcommerce/pull/2221) [`0ba1fdc`](https://github.com/graphcommerce-org/graphcommerce/commit/0ba1fdc9a2d005f47cd1725fe723e77da4cc5b9d) - After a user just logged in the checkout, the useFormGqlMutationCart would still run even though the cart was locked.
+  ([@paales](https://github.com/paales))
+
+## 8.0.3
 
 ### Patch Changes
 
@@ -10,7 +72,26 @@
 - [#2205](https://github.com/graphcommerce-org/graphcommerce/pull/2205) [`3fbf3da`](https://github.com/graphcommerce-org/graphcommerce/commit/3fbf3da8a67f2fbaa7fa974a37cbbf34613844e4) - Solve an issue where the user would be presented with the Session expired dialog when the user would be logging in during the checkout process.
   ([@paales](https://github.com/paales))
 
-## 8.1.0-canary.2
+- [#2207](https://github.com/graphcommerce-org/graphcommerce/pull/2207) [`9876b13`](https://github.com/graphcommerce-org/graphcommerce/commit/9876b139b2c12c860a16af97eddea761d1059110) - Remove redundant query on the success page for logged in customers
+  ([@paales](https://github.com/paales))
+
+## 8.0.3-canary.6
+
+## 8.0.3-canary.5
+
+## 8.0.3-canary.4
+
+## 8.0.3-canary.3
+
+## 8.0.3-canary.2
+
+### Patch Changes
+
+- [#2205](https://github.com/graphcommerce-org/graphcommerce/pull/2205) [`d67c89d`](https://github.com/graphcommerce-org/graphcommerce/commit/d67c89d464a60f0e2618dab670b63a39f6291341) - Deprecate the allowUrl option for useCartQuery, it was already enabled by default and should never be set to false.
+  ([@paales](https://github.com/paales))
+
+- [#2205](https://github.com/graphcommerce-org/graphcommerce/pull/2205) [`3fbf3da`](https://github.com/graphcommerce-org/graphcommerce/commit/3fbf3da8a67f2fbaa7fa974a37cbbf34613844e4) - Solve an issue where the user would be presented with the Session expired dialog when the user would be logging in during the checkout process.
+  ([@paales](https://github.com/paales))
 
 ## 8.0.3-canary.1
 

package/components/CartAgreementsForm/CartAgreementsForm.tsx

@@ -2,10 +2,10 @@ import { CheckboxElement } from '@graphcommerce/ecommerce-ui'
 import { useQuery } from '@graphcommerce/graphql'
 import { extendableComponent, FormDiv } from '@graphcommerce/next-ui'
 import {
+  FormPersist,
   useForm,
   useFormCompose,
   UseFormComposeOptions,
-  useFormPersist,
 } from '@graphcommerce/react-hook-form'
 import { i18n } from '@lingui/core'
 import { Box, Link, SxProps, Theme } from '@mui/material'
@@ -39,8 +39,6 @@ export function CartAgreementsForm(props: CartAgreementsFormProps) {
     console.log(values)
   })
 
-  useFormPersist({ form, name: 'PaymentAgreementsForm' })
-
   useFormCompose({ form, step, submit, key: 'PaymentAgreementsForm' })
 
   if (data?.checkoutAgreements?.length === 0) return null
@@ -50,6 +48,7 @@ export function CartAgreementsForm(props: CartAgreementsFormProps) {
       className={classes.form}
       sx={[(theme) => ({ pt: theme.spacings.md }), ...(Array.isArray(sx) ? sx : [sx])]}
     >
+      <FormPersist form={form} name='PaymentAgreementsForm' />
       <form noValidate onSubmit={submit} name='cartAgreements'>
         <Box className={classes.formInner} sx={{ typography: 'body1', display: 'inline-block' }}>
           {data?.checkoutAgreements &&

package/components/CartStartCheckout/CartStartCheckout.graphql

@@ -4,7 +4,6 @@ fragment CartStartCheckout on Cart @injectable {
       ...Money
     }
   }
-
   items {
     errors {
       message

package/components/CartStartCheckout/CartStartCheckout.tsx

@@ -5,12 +5,15 @@ import { Box, Button, ButtonProps, SxProps, Theme } from '@mui/material'
 import React from 'react'
 import { CartStartCheckoutFragment } from './CartStartCheckout.gql'
 
-export type CartStartCheckoutProps = CartStartCheckoutFragment & {
+export type CartStartCheckoutProps = Partial<CartStartCheckoutFragment> & {
   children?: React.ReactNode
   sx?: SxProps<Theme>
   buttonProps?: ButtonProps<'button'>
   disabled?: boolean
-  onStart?: (e: React.MouseEvent<HTMLButtonElement>, cart: CartStartCheckoutFragment) => void
+  onStart?: (
+    e: React.MouseEvent<HTMLButtonElement>,
+    cart: Partial<CartStartCheckoutFragment>,
+  ) => void
 }
 
 const name = 'CartStartCheckout' as const

package/components/CartStartCheckout/CartStartCheckoutLinkOrButton.tsx

@@ -4,13 +4,13 @@ import { SxProps, Theme } from '@mui/material'
 import React from 'react'
 import { CartStartCheckoutFragment } from './CartStartCheckout.gql'
 
-export type CartStartCheckoutLinkOrButtonProps = CartStartCheckoutFragment & {
+export type CartStartCheckoutLinkOrButtonProps = Partial<CartStartCheckoutFragment> & {
   children?: React.ReactNode
   sx?: SxProps<Theme>
   disabled?: boolean
   onStart?: (
     e: React.MouseEvent<HTMLButtonElement & HTMLAnchorElement & HTMLSpanElement>,
-    cart: CartStartCheckoutFragment,
+    cart: Partial<CartStartCheckoutFragment>,
   ) => void
   linkOrButtonProps?: LinkOrButtonProps
 }

package/components/CartSummary/CartSummary.tsx

@@ -21,7 +21,7 @@ const { classes } = extendableComponent<OwnerState, typeof compName, typeof part
 export function CartSummary(props: CartSummaryProps) {
   const { children, editable, sx = [] } = props
 
-  const { data } = useCartQuery(GetCartSummaryDocument, { allowUrl: true })
+  const { data } = useCartQuery(GetCartSummaryDocument)
   const { href: historyHref, onClick: historyOnClick } = useHistoryLink({
     href: '/checkout',
   })

package/components/CartTotals/CartTotals.graphql

@@ -11,7 +11,7 @@ fragment CartTotals on Cart
         ...Money
       }
     }
-    # https://github.com/magento/magento2/pull/31322
+    # todo: https://github.com/magento/magento2/pull/31322
     available_shipping_methods {
       carrier_code
       method_code

package/hooks/useFormGqlMutationCart.ts

@@ -1,9 +1,10 @@
-import { MutationHookOptions, TypedDocumentNode } from '@graphcommerce/graphql'
+import { MutationHookOptions, TypedDocumentNode, useApolloClient } from '@graphcommerce/graphql'
 import {
   useFormGqlMutation,
   UseFormGqlMutationReturn,
   UseFormGraphQlOptions,
 } from '@graphcommerce/react-hook-form'
+import { CurrentCartIdDocument } from './CurrentCartId.gql'
 import { useCartIdCreate } from './useCartIdCreate'
 
 export function useFormGqlMutationCart<
@@ -15,14 +16,20 @@ export function useFormGqlMutationCart<
   operationOptions?: MutationHookOptions<Q, V>,
 ): UseFormGqlMutationReturn<Q, V> {
   const cartId = useCartIdCreate()
+  const client = useApolloClient()
 
-  const onBeforeSubmit = async (variables: V) => {
-    const vars = { ...variables, cartId: await cartId() }
-    return options.onBeforeSubmit ? options.onBeforeSubmit(vars) : vars
-  }
   const result = useFormGqlMutation<Q, V>(
     document,
-    { ...options, onBeforeSubmit },
+    {
+      ...options,
+      onBeforeSubmit: async (variables) => {
+        const vars = { ...variables, cartId: await cartId() }
+
+        const res = client.cache.readQuery({ query: CurrentCartIdDocument })
+        if (res?.currentCartId?.locked) return false
+        return options.onBeforeSubmit ? options.onBeforeSubmit(vars) : vars
+      },
+    },
     { errorPolicy: 'all', ...operationOptions },
   )
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-cart",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.1.0-canary.3",
+  "version": "8.1.0-canary.6",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,20 +12,20 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/ecommerce-ui": "^8.1.0-canary.3",
-    "@graphcommerce/eslint-config-pwa": "^8.1.0-canary.3",
-    "@graphcommerce/framer-next-pages": "^8.1.0-canary.3",
-    "@graphcommerce/framer-scroller": "^8.1.0-canary.3",
-    "@graphcommerce/framer-utils": "^8.1.0-canary.3",
-    "@graphcommerce/graphql": "^8.1.0-canary.3",
-    "@graphcommerce/image": "^8.1.0-canary.3",
-    "@graphcommerce/magento-customer": "^8.1.0-canary.3",
-    "@graphcommerce/magento-graphql": "^8.1.0-canary.3",
-    "@graphcommerce/magento-store": "^8.1.0-canary.3",
-    "@graphcommerce/next-ui": "^8.1.0-canary.3",
-    "@graphcommerce/prettier-config-pwa": "^8.1.0-canary.3",
-    "@graphcommerce/react-hook-form": "^8.1.0-canary.3",
-    "@graphcommerce/typescript-config-pwa": "^8.1.0-canary.3",
+    "@graphcommerce/ecommerce-ui": "^8.1.0-canary.6",
+    "@graphcommerce/eslint-config-pwa": "^8.1.0-canary.6",
+    "@graphcommerce/framer-next-pages": "^8.1.0-canary.6",
+    "@graphcommerce/framer-scroller": "^8.1.0-canary.6",
+    "@graphcommerce/framer-utils": "^8.1.0-canary.6",
+    "@graphcommerce/graphql": "^8.1.0-canary.6",
+    "@graphcommerce/image": "^8.1.0-canary.6",
+    "@graphcommerce/magento-customer": "^8.1.0-canary.6",
+    "@graphcommerce/magento-graphql": "^8.1.0-canary.6",
+    "@graphcommerce/magento-store": "^8.1.0-canary.6",
+    "@graphcommerce/next-ui": "^8.1.0-canary.6",
+    "@graphcommerce/prettier-config-pwa": "^8.1.0-canary.6",
+    "@graphcommerce/react-hook-form": "^8.1.0-canary.6",
+    "@graphcommerce/typescript-config-pwa": "^8.1.0-canary.6",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
     "@lingui/react": "^4.2.1",

package/plugins/useSignInFormMergeCart.ts

@@ -1,12 +1,12 @@
 import { useApolloClient } from '@graphcommerce/graphql'
-import type { useSignInForm } from '@graphcommerce/magento-customer/hooks/useSignInForm'
+import type { useSignInForm } from '@graphcommerce/magento-customer'
 import type { MethodPlugin } from '@graphcommerce/next-config'
 import { cartLock, readCartId, useAssignCurrentCartId } from '../hooks'
 import { CustomerCartDocument } from '../hooks/CustomerCart.gql'
 import { MergeCartsDocument } from '../hooks/MergeCarts.gql'
 
 export const func = 'useSignInForm'
-export const exported = '@graphcommerce/magento-customer/hooks/useSignInForm'
+export const exported = '@graphcommerce/magento-customer'
 
 const useSignInFormMergeCart: MethodPlugin<typeof useSignInForm> = (useSignInForm, options) => {
   const client = useApolloClient()

package/typePolicies.ts

@@ -9,6 +9,9 @@ export const cartTypePolicies: StrictTypedTypePolicies = {
   CartPrices: {
     merge: (exiting, incoming, { mergeObjects }) => mergeObjects(exiting, incoming),
   },
+  CartItemPrices: {
+    merge: (exiting, incoming, { mergeObjects }) => mergeObjects(exiting, incoming),
+  },
   Cart: {
     fields: {
       shipping_addresses: {