@graphcommerce/magento-cart 10.0.1-canary.0 → 10.0.1-canary.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 10.0.1-canary.1
+
+### Patch Changes
+
+- [#2571](https://github.com/graphcommerce-org/graphcommerce/pull/2571) [`78a2a8a`](https://github.com/graphcommerce-org/graphcommerce/commit/78a2a8a919346e1f9bccddf7e52682f4adb9a4e0) - Solve issue where the @client fields could not be resolved correctly. ([@paales](https://github.com/paales))
+
 ## 10.0.1-canary.0
 
 ### Patch Changes

package/hooks/useCartQuery.ts

@@ -3,9 +3,9 @@ import type {
   TypedDocumentNode,
   WatchQueryFetchPolicy,
 } from '@graphcommerce/graphql'
-import { useQuery } from '@graphcommerce/graphql'
-import { CombinedGraphQLErrors } from '@apollo/client/errors'
+import { CombinedGraphQLErrors, useQuery } from '@graphcommerce/graphql'
 import type { useQuery as useQueryType } from '@apollo/client/react'
+import { t } from '@lingui/core/macro'
 import { GraphQLError } from 'graphql'
 import { useRouter } from 'next/router'
 import { useCartShouldLoginToContinue } from './useCartPermissions'
@@ -61,7 +61,7 @@ export function useCartQuery<
       ...query,
       error: new CombinedGraphQLErrors({
         errors: [
-          new GraphQLError('Action can not be performed by the current user', {
+          new GraphQLError(t`You must be logged in to view your cart.`, {
             extensions: { category: 'graphql-authorization' },
           }),
         ],

package/hooks/useFormGqlMutationCart.ts

@@ -1,14 +1,11 @@
-import {
-  CombinedGraphQLErrors,
-  TypedDocumentNode,
-  useApolloClient,
-  useMutation,
-} from '@graphcommerce/graphql'
+import type { TypedDocumentNode, useMutation } from '@graphcommerce/graphql'
+import { CombinedGraphQLErrors, useApolloClient } from '@graphcommerce/graphql'
 import type {
   UseFormGqlMutationReturn,
   UseFormGraphQlOptions,
 } from '@graphcommerce/react-hook-form'
 import { useFormGqlMutation } from '@graphcommerce/react-hook-form'
+import { t } from '@lingui/core/macro'
 import { GraphQLError, Kind } from 'graphql'
 import { useCartIdContext } from '../components/CartIdContext'
 import { isProtectedCartOperation } from '../link/isProtectedCartOperation'
@@ -69,7 +66,7 @@ export function useFormGqlMutationCart<
       ...result,
       error: new CombinedGraphQLErrors({
         errors: [
-          new GraphQLError('Action can not be performed by the current user', {
+          new GraphQLError(t`You must be logged in to modify your cart.`, {
             extensions: { category: 'graphql-authorization' },
           }),
         ],

package/package.json

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

package/typePolicies.ts

@@ -35,6 +35,8 @@ export const cartTypePolicies: StrictTypedTypePolicies = {
     fields: {
       cart: (_, { args, toReference }) =>
         toReference({ __typename: 'Cart', id: (args as QuerycartArgs)?.cart_id }),
+      // https://github.com/apollographql/apollo-client/issues/12930
+      currentCartId: { merge: (existing, incoming) => incoming ?? existing },
     },
   },
   Mutation: {