@graphcommerce/magento-customer 10.0.0 → 10.0.1-canary.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 10.0.1-canary.0
+
+### Patch Changes
+
+- [#2568](https://github.com/graphcommerce-org/graphcommerce/pull/2568) [`dc57da4`](https://github.com/graphcommerce-org/graphcommerce/commit/dc57da4897365ddb2b779eab3ad2b3a350ed115c) - Moved from form.watch to useWatch everywhere which works even if the fields are later initialized. ([@paales](https://github.com/paales))
+
+- [#2568](https://github.com/graphcommerce-org/graphcommerce/pull/2568) [`f1b60ac`](https://github.com/graphcommerce-org/graphcommerce/commit/f1b60accf5e8fdbcba15b7567dce7ff68f37db88) - Solve issue where the cache wasn't available from the context anymore in @apollo/client@4 now uses the operation.client.cache ([@paales](https://github.com/paales))
+
 ## 10.0.0
 
 ### Major Changes
@@ -126,294 +134,6 @@
 
 - [#2493](https://github.com/graphcommerce-org/graphcommerce/pull/2493) [`623e993`](https://github.com/graphcommerce-org/graphcommerce/commit/623e993579b05e053d2d2f29684649cd4f4586de) - `<WaitForCustomer />` now accepts all props of the FullPageMessage ([@paales](https://github.com/paales))
 
-## 10.0.0-canary.72
-
-## 10.0.0-canary.71
-
-## 10.0.0-canary.70
-
-### Major Changes
-
-- [#2565](https://github.com/graphcommerce-org/graphcommerce/pull/2565) [`c96dfcd`](https://github.com/graphcommerce-org/graphcommerce/commit/c96dfcdca981baca387c270ad9e2b9515cdd00cc) - Updated to Apollo Client 4 ([@paales](https://github.com/paales))
-
-## 10.0.0-canary.69
-
-## 10.0.0-canary.68
-
-### Major Changes
-
-- [#2557](https://github.com/graphcommerce-org/graphcommerce/pull/2557) [`ceaadd8`](https://github.com/graphcommerce-org/graphcommerce/commit/ceaadd87f0648982a068a3b07b1fa149c9127f49) - ## Material UI v5 → v7 Migration
-
-  This release upgrades Material UI from v5 to v7 with full CSS variables support. ([@paales](https://github.com/paales))
-
-## 10.0.0-canary.67
-
-### Patch Changes
-
-- [#2540](https://github.com/graphcommerce-org/graphcommerce/pull/2540) [`36e2bac`](https://github.com/graphcommerce-org/graphcommerce/commit/36e2bacb4fe765ce1fcd24dc36736e90bb17a7dc) - Add billingAddress permission (EDITABLE | READONLY) that controls whether the end user can update their billing address in the account section and checkout. ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
-
-## 10.0.0-canary.66
-
-## 10.0.0-canary.65
-
-## 10.0.0-canary.64
-
-## 10.0.0-canary.63
-
-## 10.0.0-canary.62
-
-### Patch Changes
-
-- [#2553](https://github.com/graphcommerce-org/graphcommerce/pull/2553) [`66ba029`](https://github.com/graphcommerce-org/graphcommerce/commit/66ba029d2cc9dee6f8ff8c92a628d4fc0cf4d309) - Unset token when on magento 248 to prevent repeated graphql-authentication errors ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
-
-## 10.0.0-canary.61
-
-## 10.0.0-canary.60
-
-## 10.0.0-canary.59
-
-## 10.0.0-canary.58
-
-## 10.0.0-canary.57
-
-## 10.0.0-canary.56
-
-### Major Changes
-
-- [#2546](https://github.com/graphcommerce-org/graphcommerce/pull/2546) [`ed9332a`](https://github.com/graphcommerce-org/graphcommerce/commit/ed9332a7f78966d932041d9a7725641edc92b28d) - ## GraphCommerce 10 - Turbopack Support
-
-  This major release brings full Turbopack compatibility, dramatically improving development speed.
-
-  ### 🚀 Turbopack-Compatible Interceptor System
-
-  The entire plugin/interceptor system has been rewritten to work with Turbopack:
-
-  - **No more Webpack plugins** - Removed `InterceptorPlugin` webpack plugin entirely
-  - **File-based interception** - Original files are moved to `.original.tsx` and replaced with interceptor content
-  - **Direct imports** - Interceptors import from `.original` files instead of embedding source
-  - **New CLI commands**:
-    - `graphcommerce codegen-interceptors` - Generate interceptor files
-    - `graphcommerce cleanup-interceptors` - Reset interceptor system, restore original files
-  - **Stable file hashing** - Deterministic interceptor generation for better caching
-
-  ### ⚙️ Treeshakable Configuration System
-
-  Replaced Webpack `DefinePlugin`-based `import.meta.graphCommerce` with a new generated configuration system:
-
-  - **New `codegen-config-values` command** - Generates TypeScript files with precise typing
-  - **Schema-driven** - Dynamically introspects Zod schemas to determine all available properties
-  - **Fully treeshakable** - Unused config values are eliminated from the bundle
-  - **Type-safe** - Uses `Get<GraphCommerceConfig, 'path'>` for nested property access
-  - **Separate files for nested objects** - Optimal treeshaking for complex configurations
-
-  ### 🔧 withGraphCommerce Changes
-
-  - **Removed** `InterceptorPlugin` - No longer needed with file-based interception
-  - **Removed** `DefinePlugin` for `import.meta.graphCommerce` - Replaced with generated config
-  - **Removed** `@mui/*` alias rewrites - No longer required
-  - **Added** Turbopack loader rules for `.yaml`, `.yml`, and `.po` files
-  - **Added** `serverExternalPackages` for all `@whatwg-node/*` packages
-  - **Added** `optimizePackageImports` for better bundle optimization
-  - **Added** `images.qualities: [52, 75]` for Next.js image optimization
-
-  ### 📦 Lingui Configuration
-
-  - **Renamed** `lingui.config.js` → `lingui.config.ts` with TypeScript support
-  - **Updated** `@graphcommerce/lingui-next/config` to TypeScript with proper exports
-  - **Simplified** formatter options
-
-  ### ⚛️ React 19 & Next.js 16 Compatibility
-
-  - Updated `RefObject<T>` types for React 19 (now includes `null` by default)
-  - Replaced deprecated `React.VFC` with `React.FC`
-  - Fixed `useRef` calls to require explicit initial values
-  - Updated `MutableRefObject` usage in `framer-scroller`
-
-  ### 📋 ESLint 9 Flat Config
-
-  - Migrated from legacy `.eslintrc` to new flat config format (`eslint.config.mjs`)
-  - Updated `@typescript-eslint/*` packages to v8
-  - Fixed AST selector for `SxProps` rule (`typeParameters` → `typeArguments`)
-
-  ### 🔄 Apollo Client
-
-  - Fixed deprecated `name` option → `clientAwareness: { name: 'ssr' }`
-  - Updated error handling types to accept `ApolloError | null | undefined`
-
-  ### ⚠️ Breaking Changes
-
-  - **Node.js 24.x not supported** - Restricted to `>=20 <24.0.0` due to [nodejs/undici#4290](https://github.com/nodejs/undici/issues/4290)
-  - **Interceptor files changed** - Original components now at `.original.tsx`
-  - **Config access changed** - Use generated config values instead of `import.meta.graphCommerce`
-  - **ESLint config format** - Must use flat config (`eslint.config.mjs`)
-  - **Lingui config** - Rename `lingui.config.js` to `lingui.config.ts`
-
-  ### 🗑️ Removed
-
-  - `InterceptorPlugin` webpack plugin
-  - `configToImportMeta` utility
-  - Webpack `DefinePlugin` usage for config
-  - `@mui/*` modern alias rewrites
-  - Debug plugins (`CircularDependencyPlugin`, `DuplicatesPlugin`) ([@paales](https://github.com/paales))
-
-## 9.1.0-canary.55
-
-### Patch Changes
-
-- [#2539](https://github.com/graphcommerce-org/graphcommerce/pull/2539) [`427833d`](https://github.com/graphcommerce-org/graphcommerce/commit/427833d3fa46ec6096853bdc3dfd81321df6e63b) - Forward address field props ([@paales](https://github.com/paales))
-
-- [#2539](https://github.com/graphcommerce-org/graphcommerce/pull/2539) [`183d8dd`](https://github.com/graphcommerce-org/graphcommerce/commit/183d8ddef6059f07ffe585b0f05a51731b12b371) - Remove odd nonNullable that is also available in @graphcommmerce/next-ui ([@paales](https://github.com/paales))
-
-## 9.1.0-canary.54
-
-## 9.1.0-canary.53
-
-## 9.1.0-canary.52
-
-## 9.1.0-canary.51
-
-## 9.1.0-canary.50
-
-## 9.1.0-canary.49
-
-## 9.1.0-canary.48
-
-## 9.1.0-canary.47
-
-## 9.1.0-canary.46
-
-## 9.1.0-canary.45
-
-## 9.1.0-canary.44
-
-## 9.1.0-canary.43
-
-## 9.1.0-canary.42
-
-## 9.1.0-canary.41
-
-## 9.1.0-canary.40
-
-### Patch Changes
-
-- [#2529](https://github.com/graphcommerce-org/graphcommerce/pull/2529) [`b331f4d`](https://github.com/graphcommerce-org/graphcommerce/commit/b331f4d060c1385569fbbe1592ac245832de55bc) - Remove all usages of the NoSsr component as the GraphQL layer already handles this. ([@paales](https://github.com/paales))
-
-## 9.1.0-canary.39
-
-## 9.1.0-canary.38
-
-## 9.1.0-canary.37
-
-## 9.1.0-canary.36
-
-## 9.1.0-canary.35
-
-## 9.1.0-canary.34
-
-## 9.1.0-canary.33
-
-## 9.1.0-canary.32
-
-## 9.1.0-canary.31
-
-### Patch Changes
-
-- [#2524](https://github.com/graphcommerce-org/graphcommerce/pull/2524) [`dcc46aa`](https://github.com/graphcommerce-org/graphcommerce/commit/dcc46aae34f5eda6a633f472289ac4488ac96492) - Solve issue where the user is getting a 400 error when logging in because the password is not being sent. The password field was disabled before the form was submitted, causing the password not to be sent. ([@paales](https://github.com/paales))
-
-## 9.1.0-canary.30
-
-## 9.1.0-canary.29
-
-## 9.1.0-canary.28
-
-## 9.1.0-canary.27
-
-## 9.1.0-canary.26
-
-## 9.1.0-canary.25
-
-## 9.1.0-canary.24
-
-## 9.1.0-canary.23
-
-## 9.1.0-canary.22
-
-## 9.1.0-canary.21
-
-## 9.1.0-canary.20
-
-## 9.1.0-canary.19
-
-### Minor Changes
-
-- [#2499](https://github.com/graphcommerce-org/graphcommerce/pull/2499) [`20703bc`](https://github.com/graphcommerce-org/graphcommerce/commit/20703bc5c453fb7ee61eb4350e207e84a749bf5e) - Magento 2.4.7: Implemented the `customer_account_create` and `customer_account_edit` forms using the `attributeForm` query for the registration page and customer information form. The forms respect the settings configured in the 'Customer Configuration section'. It allows configuration for `prefix`, `middlename`, `suffix`,`dob`, `gender` and other fields. This also makes the frontend compatible with Adobe Commerce's Customer Attributes module. ([@paales](https://github.com/paales))
-
-- [#2499](https://github.com/graphcommerce-org/graphcommerce/pull/2499) [`30f9371`](https://github.com/graphcommerce-org/graphcommerce/commit/30f9371503959b990c65058a88be6f61b4859140) - Added support for viewing Invoices/Shipments and Credit Memo's ([@paales](https://github.com/paales))
-
-### Patch Changes
-
-- [#2499](https://github.com/graphcommerce-org/graphcommerce/pull/2499) [`6cb4815`](https://github.com/graphcommerce-org/graphcommerce/commit/6cb4815a0faf4cc2f60c13d9384e3a96b6bdb2bb) - Deleting an account will now require reauthentication and moved the menu item to the Authentication section ([@paales](https://github.com/paales))
-
-- [#2499](https://github.com/graphcommerce-org/graphcommerce/pull/2499) [`2409514`](https://github.com/graphcommerce-org/graphcommerce/commit/240951428ac0bdc11649f4190b6d51c004680b34) - Order/Invoice/CreditMemo and Shipment views ([@paales](https://github.com/paales))
-
-## 9.1.0-canary.18
-
-## 9.1.0-canary.17
-
-## 9.1.0-canary.16
-
-## 9.1.0-canary.15
-
-### Patch Changes
-
-- [#2493](https://github.com/graphcommerce-org/graphcommerce/pull/2493) [`0cb3ace`](https://github.com/graphcommerce-org/graphcommerce/commit/0cb3aceb09967493ecdd5040446447ff32cc3f43) - Created a AccountDashboardQueryFragment instead of only a query to allow for adding customerDownloadableProducts to the dashboard query ([@paales](https://github.com/paales))
-
-- [#2493](https://github.com/graphcommerce-org/graphcommerce/pull/2493) [`c1f04dc`](https://github.com/graphcommerce-org/graphcommerce/commit/c1f04dcb4ddd621361e6c930fb42afae0aabe9f9) - Migrate to default OrderItem resolver and remove useOrderCardItemImages as OrderItem now returns a product. Add a custom resolver for 2.4.5 and 2.4.6 that implements the functionality for older versions. ([@paales](https://github.com/paales))
-
-- [#2493](https://github.com/graphcommerce-org/graphcommerce/pull/2493) [`c1f04dc`](https://github.com/graphcommerce-org/graphcommerce/commit/c1f04dcb4ddd621361e6c930fb42afae0aabe9f9) - Created a refactored the AccountOrders page and refactored the OrderCard. ([@paales](https://github.com/paales))
-
-- [#2493](https://github.com/graphcommerce-org/graphcommerce/pull/2493) [`db56933`](https://github.com/graphcommerce-org/graphcommerce/commit/db569336dddd3e955ff0b5b00cafa25079f1adee) - Implemented order sorting for account overview and account list and implement custom resolver for Magento 2.4.5 (which is slow but works). ([@paales](https://github.com/paales))
-
-- [#2493](https://github.com/graphcommerce-org/graphcommerce/pull/2493) [`db56933`](https://github.com/graphcommerce-org/graphcommerce/commit/db569336dddd3e955ff0b5b00cafa25079f1adee) - Use OrderStateLabel in my account instead of OrderStateLabelInline and deprecate that one. ([@paales](https://github.com/paales))
-
-- [#2493](https://github.com/graphcommerce-org/graphcommerce/pull/2493) [`dc387da`](https://github.com/graphcommerce-org/graphcommerce/commit/dc387da4c32585c251fe9dec90aa010e2a435df5) - OrderTotals/OrderDetails now only renders addres information if available ([@paales](https://github.com/paales))
-
-- [#2493](https://github.com/graphcommerce-org/graphcommerce/pull/2493) [`623e993`](https://github.com/graphcommerce-org/graphcommerce/commit/623e993579b05e053d2d2f29684649cd4f4586de) - `<WaitForCustomer />` now accepts all props of the FullPageMessage ([@paales](https://github.com/paales))
-
-## 9.0.4-canary.14
-
-## 9.0.4-canary.13
-
-## 9.0.4-canary.12
-
-## 9.0.4-canary.11
-
-## 9.0.4-canary.10
-
-## 9.0.4-canary.9
-
-## 9.0.4-canary.8
-
-## 9.0.4-canary.7
-
-## 9.0.4-canary.6
-
-## 9.0.4-canary.5
-
-## 9.0.4-canary.4
-
-### Patch Changes
-
-- [`5ca6fb9`](https://github.com/graphcommerce-org/graphcommerce/commit/5ca6fb94f6f275210c77493d05bad7c1620ff5a3) - When a user reorders their cart without interacting with their cart previously a new cart wouldn't be created. ([@paales](https://github.com/paales))
-
-## 9.0.4-canary.3
-
-## 9.0.4-canary.2
-
-## 9.0.4-canary.1
-
-## 9.0.4-canary.0
-
 ## 9.0.0
 
 ### Major Changes

package/components/AccountSignInUpForm/AccountSignInUpForm.tsx

@@ -10,6 +10,7 @@ import {
   FormRow,
   LayoutTitle,
 } from '@graphcommerce/next-ui'
+import { useWatch } from '@graphcommerce/react-hook-form'
 import { Trans } from '@lingui/react/macro'
 import type { SxProps, Theme } from '@mui/material'
 import { Alert, Box, CircularProgress, Link, Typography } from '@mui/material'
@@ -43,7 +44,7 @@ export function AccountSignInUpForm(props: AccountSignInUpFormProps) {
   const { firstname = '' } = customerQuery.data?.customer ?? {}
 
   const { mode, form, submit } = useAccountSignInUpForm()
-  const { formState, control, error, setError, clearErrors, watch } = form
+  const { formState, control, error, setError, clearErrors } = form
   const router = useRouter()
 
   const client = useApolloClient()
@@ -57,7 +58,7 @@ export function AccountSignInUpForm(props: AccountSignInUpFormProps) {
     mode === 'signin' ||
     (mode === 'signup' && canSignUp)
 
-  const emailValue = watch('email')
+  const emailValue = useWatch({ control, name: 'email' })
 
   return (
     <FormDiv sx={sx} className={classes.root}>

package/components/SignInForm/SignInForm.tsx

@@ -23,11 +23,9 @@ export function SignInForm(props: SignInFormProps) {
     email,
     onBeforeSubmit(variables) {
       if (!email) {
-        // eslint-disable-next-line @typescript-eslint/no-use-before-define
         setError('email', { message: t`Please enter a valid email address` })
         return false
       }
-      // eslint-disable-next-line @typescript-eslint/no-use-before-define
       clearErrors()
       return variables
     },

package/components/UpdateCustomerEmailForm/UpdateCustomerEmailForm.tsx

@@ -9,7 +9,7 @@ import {
   FormRow,
   MessageSnackbar,
 } from '@graphcommerce/next-ui'
-import { emailPattern, useFormGqlMutation } from '@graphcommerce/react-hook-form'
+import { emailPattern, useFormGqlMutation, useWatch } from '@graphcommerce/react-hook-form'
 import { t } from '@lingui/core/macro'
 import { Trans } from '@lingui/react/macro'
 import { ApolloCustomerErrorSnackbar } from '../ApolloCustomerError'
@@ -41,7 +41,7 @@ export function UpdateCustomerEmailForm(props: UpdateCustomerEmailFormProps) {
     },
   )
 
-  const { handleSubmit, error, required, formState, watch, reset, control } = form
+  const { handleSubmit, error, required, formState, reset, control } = form
   const [remainingError, authenticationError] = graphqlErrorByCategory({
     category: 'graphql-authentication',
     error,
@@ -49,7 +49,7 @@ export function UpdateCustomerEmailForm(props: UpdateCustomerEmailFormProps) {
   const submit = handleSubmit(() => {
     reset()
   })
-  const watchNewEmail = watch('email')
+  const watchNewEmail = useWatch({ control, name: 'email' })
 
   return (
     <Form onSubmit={submit} noValidate>

package/hooks/useAccountSignInUpForm.tsx

@@ -2,7 +2,7 @@ import { usePageContext } from '@graphcommerce/framer-next-pages'
 import { useQuery } from '@graphcommerce/graphql'
 import { enableGuestCheckoutLogin } from '@graphcommerce/next-config/config'
 import { useUrlQuery } from '@graphcommerce/next-ui'
-import { useFormGqlQuery } from '@graphcommerce/react-hook-form'
+import { useFormGqlQuery, useWatch } from '@graphcommerce/react-hook-form'
 import { useEffect } from 'react'
 import type { IsEmailAvailableQuery, IsEmailAvailableQueryVariables } from './IsEmailAvailable.gql'
 import { IsEmailAvailableDocument } from './IsEmailAvailable.gql'
@@ -40,8 +40,9 @@ export function useAccountSignInUpForm(props: UseFormIsEmailAvailableProps = {})
     },
     { fetchPolicy: 'cache-and-network' },
   )
-  const { formState, data, handleSubmit, setValue, trigger } = form
+  const { formState, data, handleSubmit, setValue, trigger, control } = form
   const { isSubmitSuccessful, isValid } = formState
+  const requestedMode = useWatch({ control, name: 'requestedMode' })
 
   useEffect(() => {
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -68,7 +69,7 @@ export function useAccountSignInUpForm(props: UseFormIsEmailAvailableProps = {})
   if (token && valid) mode = 'signedin'
   else if (token && !valid) mode = 'session-expired'
   else if (isToggleMethod) {
-    mode = form.watch('requestedMode') ?? 'signin'
+    mode = requestedMode ?? 'signin'
   } else {
     // 1. Nothing is entered
     mode = 'email'

package/link/customerLink.ts

@@ -1,5 +1,3 @@
-import { globalApolloClient } from '@graphcommerce/graphql'
-import type { ApolloCache } from '@graphcommerce/graphql/apollo'
 import {
   ApolloLink,
   CombinedGraphQLErrors,
@@ -17,7 +15,6 @@ export type PushRouter = Pick<NextRouter, 'push' | 'events' | 'locale'>
 
 declare module '@apollo/client' {
   interface DefaultContext {
-    cache?: ApolloCache
     headers?: Record<string, string>
   }
 }
@@ -51,25 +48,24 @@ export async function pushWithPromise(router: Pick<NextRouter, 'push' | 'events'
   })
 }
 
-const addTokenHeader = new SetContextLink((prevContext) => {
+const addTokenHeader = new SetContextLink((prevContext, operation) => {
   const headers: Record<string, string> = { ...prevContext.headers }
 
   try {
-    const query = prevContext.cache?.readQuery({ query: CustomerTokenDocument })
+    const query = operation.client.cache.readQuery({ query: CustomerTokenDocument })
 
     if (query?.customerToken?.token && query?.customerToken?.valid !== false) {
       headers.authorization = `Bearer ${query?.customerToken?.token}`
     }
     return { headers }
-  } catch (error) {
+  } catch {
     return { headers }
   }
 })
 
 const customerErrorLink = (router: PushRouter) =>
   new ErrorLink(({ error, operation, forward }) => {
-    const client = globalApolloClient.current
-    if (!client) return undefined
+    const { client } = operation
 
     // Check if this is a GraphQL error
     if (!CombinedGraphQLErrors.is(error)) return undefined

package/link/xMagentoCacheIdHeader.ts

@@ -4,9 +4,11 @@ import { map } from '@graphcommerce/graphql/rxjs'
 import { CustomerTokenDocument } from '../hooks'
 
 export const xMagentoCacheIdHeader = new ApolloLink((operation, forward) => {
+  const { cache } = operation.client
+
   operation.setContext((context: DefaultContext) => {
-    const xMagentoCacheId = context.cache?.readQuery({ query: CustomerTokenDocument })
-      ?.customerToken?.xMagentoCacheId
+    const xMagentoCacheId = cache?.readQuery({ query: CustomerTokenDocument })?.customerToken
+      ?.xMagentoCacheId
     if (!xMagentoCacheId) return context
 
     return { ...context, headers: { ...context.headers, 'x-magento-cache-id': xMagentoCacheId } }
@@ -14,7 +16,6 @@ export const xMagentoCacheIdHeader = new ApolloLink((operation, forward) => {
 
   return forward(operation).pipe(
     map((data) => {
-      const { cache } = operation.getContext()
       if (!cache) return data
 
       const xMagentoCacheId = (

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-customer",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "10.0.0",
+  "version": "10.0.1-canary.0",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -21,20 +21,20 @@
     "./plugins/magentoCustomerPrivateQueryContext": "./plugins/magentoCustomerPrivateQueryContext.ts"
   },
   "peerDependencies": {
-    "@graphcommerce/ecommerce-ui": "^10.0.0",
-    "@graphcommerce/eslint-config-pwa": "^10.0.0",
-    "@graphcommerce/framer-next-pages": "^10.0.0",
-    "@graphcommerce/framer-utils": "^10.0.0",
-    "@graphcommerce/graphql": "^10.0.0",
-    "@graphcommerce/graphql-mesh": "^10.0.0",
-    "@graphcommerce/image": "^10.0.0",
-    "@graphcommerce/magento-graphql": "^10.0.0",
-    "@graphcommerce/magento-store": "^10.0.0",
-    "@graphcommerce/next-config": "^10.0.0",
-    "@graphcommerce/next-ui": "^10.0.0",
-    "@graphcommerce/prettier-config-pwa": "^10.0.0",
-    "@graphcommerce/react-hook-form": "^10.0.0",
-    "@graphcommerce/typescript-config-pwa": "^10.0.0",
+    "@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-utils": "^10.0.1-canary.0",
+    "@graphcommerce/graphql": "^10.0.1-canary.0",
+    "@graphcommerce/graphql-mesh": "^10.0.1-canary.0",
+    "@graphcommerce/image": "^10.0.1-canary.0",
+    "@graphcommerce/magento-graphql": "^10.0.1-canary.0",
+    "@graphcommerce/magento-store": "^10.0.1-canary.0",
+    "@graphcommerce/next-config": "^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",
     "@lingui/core": "^5",
     "@lingui/macro": "^5",
     "@lingui/react": "^5",

package/typePolicies.ts

@@ -5,15 +5,22 @@ import { CustomerTokenDocument } from './hooks/CustomerToken.gql'
 const generateCustomerToken: FieldPolicy<Mutation['generateCustomerToken']> = {
   keyArgs: () => '',
   merge(_existing, incoming, options) {
+    console.log('[generateCustomerToken] merge called', {
+      isReference: options.isReference(incoming),
+      incoming,
+    })
     if (!options.isReference(incoming)) return incoming
 
+    const token = options.readField('token', incoming) as string
+    console.log('[generateCustomerToken] Writing token to cache:', token?.substring(0, 20))
+
     options.cache.writeQuery({
       query: CustomerTokenDocument,
       broadcast: true,
       data: {
         customerToken: {
           __typename: 'CustomerToken',
-          token: options.readField('token', incoming) as string,
+          token,
           createdAt: new Date().toUTCString(),
           valid: true,
           xMagentoCacheId: null,
@@ -21,6 +28,10 @@ const generateCustomerToken: FieldPolicy<Mutation['generateCustomerToken']> = {
       },
     })
 
+    // Verify write
+    const verify = options.cache.readQuery({ query: CustomerTokenDocument })
+    console.log('[generateCustomerToken] Verify after write:', verify)
+
     return incoming
   },
 }