@graphcommerce/magento-cart 8.0.6-canary.4 → 8.1.0-canary.11

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change Log
 
+## 8.1.0-canary.11
+
+## 8.1.0-canary.10
+
+## 8.1.0-canary.9
+
+## 8.1.0-canary.8
+
+### Patch Changes
+
+- [#2247](https://github.com/graphcommerce-org/graphcommerce/pull/2247) [`a56a7c6`](https://github.com/graphcommerce-org/graphcommerce/commit/a56a7c67cf27dfb91bf763a873beeec562ab3156) - Solve an issue where the cart would be sometimes undefined, but Partial was too eleborate
+  ([@paales](https://github.com/paales))
+
+## 8.1.0-canary.7
+
+## 8.1.0-canary.6
+
+## 8.1.0-canary.5
+
 ## 8.0.6-canary.4
 
 ## 8.0.6-canary.3

package/components/CartStartCheckout/CartStartCheckout.tsx

@@ -5,14 +5,15 @@ import { Box, Button, ButtonProps, SxProps, Theme } from '@mui/material'
 import React from 'react'
 import { CartStartCheckoutFragment } from './CartStartCheckout.gql'
 
-export type CartStartCheckoutProps = Partial<CartStartCheckoutFragment> & {
+export type CartStartCheckoutProps = {
   children?: React.ReactNode
   sx?: SxProps<Theme>
   buttonProps?: ButtonProps<'button'>
   disabled?: boolean
+  cart?: CartStartCheckoutFragment | null | undefined
   onStart?: (
     e: React.MouseEvent<HTMLButtonElement>,
-    cart: Partial<CartStartCheckoutFragment>,
+    cart: CartStartCheckoutFragment | null | undefined,
   ) => void
 }
 
@@ -32,11 +33,11 @@ export function CartStartCheckout(props: CartStartCheckoutProps) {
     buttonProps: { onClick, ...buttonProps } = {},
     disabled,
     sx = [],
-    ...cart
+    cart,
   } = props
 
-  const hasTotals = (cart.prices?.grand_total?.value ?? 0) > 0
-  const hasErrors = cart.items?.some((item) => (item?.errors?.length ?? 0) > 0)
+  const hasTotals = (cart?.prices?.grand_total?.value ?? 0) > 0
+  const hasErrors = cart?.items?.some((item) => (item?.errors?.length ?? 0) > 0)
 
   return (
     <Box
@@ -74,7 +75,7 @@ export function CartStartCheckout(props: CartStartCheckoutProps) {
         </Box>{' '}
         {hasTotals && (
           <span className={classes.checkoutMoney}>
-            <Money {...cart.prices?.grand_total} />
+            <Money {...cart?.prices?.grand_total} />
           </span>
         )}
       </Button>

package/components/CartStartCheckout/CartStartCheckoutLinkOrButton.tsx

@@ -4,13 +4,14 @@ import { SxProps, Theme } from '@mui/material'
 import React from 'react'
 import { CartStartCheckoutFragment } from './CartStartCheckout.gql'
 
-export type CartStartCheckoutLinkOrButtonProps = Partial<CartStartCheckoutFragment> & {
+export type CartStartCheckoutLinkOrButtonProps = {
   children?: React.ReactNode
   sx?: SxProps<Theme>
   disabled?: boolean
+  cart?: CartStartCheckoutFragment | null | undefined
   onStart?: (
     e: React.MouseEvent<HTMLButtonElement & HTMLAnchorElement & HTMLSpanElement>,
-    cart: Partial<CartStartCheckoutFragment>,
+    cart: CartStartCheckoutFragment | null | undefined,
   ) => void
   linkOrButtonProps?: LinkOrButtonProps
 }
@@ -21,11 +22,11 @@ export function CartStartCheckoutLinkOrButton(props: CartStartCheckoutLinkOrButt
     onStart,
     disabled,
     linkOrButtonProps: { onClick, button, ...linkOrButtonProps } = {},
-    ...cart
+    cart,
   } = props
 
-  const hasTotals = (cart.prices?.grand_total?.value ?? 0) > 0
-  const hasErrors = cart.items?.some((item) => (item?.errors?.length ?? 0) > 0)
+  const hasTotals = (cart?.prices?.grand_total?.value ?? 0) > 0
+  const hasErrors = cart?.items?.some((item) => (item?.errors?.length ?? 0) > 0)
 
   return (
     <LinkOrButton

package/package.json

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

package/plugins/MagentoCartGraphqlProvider.tsx

@@ -1,12 +1,14 @@
 import { GraphQLProviderProps } from '@graphcommerce/graphql'
-import type { PluginProps } from '@graphcommerce/next-config'
+import type { PluginConfig, PluginProps } from '@graphcommerce/next-config'
 import { cartErrorLink } from '../link/createCartErrorLink'
 import { cartTypePolicies, migrateCart } from '../typePolicies'
 
-export const component = 'GraphQLProvider'
-export const exported = '@graphcommerce/graphql'
+export const config: PluginConfig = {
+  type: 'component',
+  module: '@graphcommerce/graphql',
+}
 
-function MagentoCartGraphqlProvider(props: PluginProps<GraphQLProviderProps>) {
+export function GraphQLProvider(props: PluginProps<GraphQLProviderProps>) {
   const { Prev, links = [], policies = [], migrations = [], ...rest } = props
   return (
     <Prev
@@ -17,5 +19,3 @@ function MagentoCartGraphqlProvider(props: PluginProps<GraphQLProviderProps>) {
     />
   )
 }
-
-export const Plugin = MagentoCartGraphqlProvider

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()