@graphcommerce/magento-cart 10.0.0-canary.68 → 10.0.0

package/CHANGELOG.md

@@ -1,5 +1,141 @@
 # Change Log
 
+## 10.0.0
+
+### 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))
+
+- [#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))
+
+- [#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))
+
+### Patch Changes
+
+- [#2539](https://github.com/graphcommerce-org/graphcommerce/pull/2539) [`cf44b1f`](https://github.com/graphcommerce-org/graphcommerce/commit/cf44b1f723b7f2073a21abd6821768427cb95315) - Added hideTotals to MultiCartStartCheckout ([@paales](https://github.com/paales))
+
+- [`d7ad6a3`](https://github.com/graphcommerce-org/graphcommerce/commit/d7ad6a32acdd0c9540656feae9fbb1d5f5f3dbf9) - Additional export for GetCartTotals ([@paales](https://github.com/paales))
+
+- [#2539](https://github.com/graphcommerce-org/graphcommerce/pull/2539) [`af4463d`](https://github.com/graphcommerce-org/graphcommerce/commit/af4463dcbc6903241c8804ffba2f43b2b8e1a00b) - When running a cart mutation and the cartId is already passed to the form we use that value instead of retrieving the current cart again. ([@paales](https://github.com/paales))
+
+- [#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))
+
+- [#2539](https://github.com/graphcommerce-org/graphcommerce/pull/2539) [`415f9fb`](https://github.com/graphcommerce-org/graphcommerce/commit/415f9fb50454fb20cb533235969dd9ab4ffc134b) - Allow setting the cartId in the form for useFormGqlMutationCart by setting the cartId in the form AND allow setting the cartId for a whole context by wrapping with CartIdProvider ([@paales](https://github.com/paales))
+
+- [#2539](https://github.com/graphcommerce-org/graphcommerce/pull/2539) [`4e3f3f2`](https://github.com/graphcommerce-org/graphcommerce/commit/4e3f3f2df58638ba8ffc68ee9f274cdd6c45d6d4) - Allow setting the redirect value in the AddProductsToCartForm as a form value. ([@paales](https://github.com/paales))
+
+- [#2537](https://github.com/graphcommerce-org/graphcommerce/pull/2537) [`1f37f05`](https://github.com/graphcommerce-org/graphcommerce/commit/1f37f05200e3015bf36d450bffff40c5d551ec54) - Forwarded ref to AddProductsToCartButton ([@paales](https://github.com/paales))
+
+- [#2479](https://github.com/graphcommerce-org/graphcommerce/pull/2479) [`ae5e72c`](https://github.com/graphcommerce-org/graphcommerce/commit/ae5e72ccf1c8218ace3cca1c4e52ec8d46821a27) - Solve issue where the total of the cart was zero due to discount or store credit the user couldn't proceed to the checkout. We now check for items and errors instead of the total. ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
+
+- [#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))
+
+- [#2521](https://github.com/graphcommerce-org/graphcommerce/pull/2521) [`6847259`](https://github.com/graphcommerce-org/graphcommerce/commit/6847259715b0cebcc3f7415ed06cc38814663811) - Solve typescript issue were product types were added incorrectly. ([@paales](https://github.com/paales))
+
+- [#2499](https://github.com/graphcommerce-org/graphcommerce/pull/2499) [`35fdadd`](https://github.com/graphcommerce-org/graphcommerce/commit/35fdadd8896619a2c84e91e39279f5928c0c9007) - Removed deprecated fields from AddProductsToCartForm ([@paales](https://github.com/paales))
+
+- [#2485](https://github.com/graphcommerce-org/graphcommerce/pull/2485) [`6533728`](https://github.com/graphcommerce-org/graphcommerce/commit/65337280c6f4291cf4354e6ed9659f03388ca8d4) - When ordering a virtual product the checkout would still reference a Track & Trace ([@paales](https://github.com/paales))
+
+- [#2539](https://github.com/graphcommerce-org/graphcommerce/pull/2539) [`af4463d`](https://github.com/graphcommerce-org/graphcommerce/commit/af4463dcbc6903241c8804ffba2f43b2b8e1a00b) - Solve issue where if the onBeforeSubmit would return false, it would still error if submitted while the cart is locked. ([@paales](https://github.com/paales))
+
+- [#2499](https://github.com/graphcommerce-org/graphcommerce/pull/2499) [`b26f573`](https://github.com/graphcommerce-org/graphcommerce/commit/b26f57307ab1d08f628183dd86e487ec9aa1e5cf) - Moved all functionality from the @graphcommerce/magento-cart-billing-address package to the @graphcommerce/magento-cart package. All occurences of @graphcommerce/magento-cart-billing-address should be removed for your codebase. ([@paales](https://github.com/paales))
+
+- [#2539](https://github.com/graphcommerce-org/graphcommerce/pull/2539) [`1a06135`](https://github.com/graphcommerce-org/graphcommerce/commit/1a061357f4ccb430dd13194f755815474e140520) - Allow awaitable async requests for onStart on checkout button ([@paales](https://github.com/paales))
+
+- [#2493](https://github.com/graphcommerce-org/graphcommerce/pull/2493) [`4cde990`](https://github.com/graphcommerce-org/graphcommerce/commit/4cde990dbeecdba8a00d0e34a1095fb14d8a0ad6) - When the cart totals are updated via a mutation, make sure to also fetch the id when the query is used so that automatically updates. ([@paales](https://github.com/paales))
+
+- [#2493](https://github.com/graphcommerce-org/graphcommerce/pull/2493) [`7ae2909`](https://github.com/graphcommerce-org/graphcommerce/commit/7ae2909d57e58f00f18acb198028c601ccd857c5) - CartTotals now accepts a readOnly prop to handle plugins showing information based on that prop ([@paales](https://github.com/paales))
+
+- [#2493](https://github.com/graphcommerce-org/graphcommerce/pull/2493) [`b6f76b6`](https://github.com/graphcommerce-org/graphcommerce/commit/b6f76b61f235d3336d8d296f1bed61c9f5daf325) - Solve issue where available_payment_methods would give an apollo client error that it couldn’t be properly merged ([@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

package/hooks/useAssignCurrentCartId.ts

@@ -6,7 +6,7 @@ import { CurrentCartIdDocument } from './CurrentCartId.gql'
 
 export const CART_ID_COOKIE = 'cart'
 
-export function writeCartId(cache: ApolloCache<object>, id: string | null = null) {
+export function writeCartId(cache: ApolloCache, id: string | null = null) {
   cache.writeQuery({
     query: CurrentCartIdDocument,
     data: { currentCartId: { __typename: 'CurrentCartId', locked: false, id } },
@@ -14,11 +14,11 @@ export function writeCartId(cache: ApolloCache<object>, id: string | null = null
   })
 }
 
-export function readCartId(cache: ApolloCache<object>) {
+export function readCartId(cache: ApolloCache) {
   return cache.readQuery({ query: CurrentCartIdDocument })?.currentCartId
 }
 
-export function cartLock(cache: ApolloCache<object>, locked: boolean) {
+export function cartLock(cache: ApolloCache, locked: boolean) {
   const currentCartId = cache.readQuery({ query: CurrentCartIdDocument })?.currentCartId
   if (currentCartId?.id && currentCartId.locked !== locked) {
     cache.writeQuery({

package/hooks/useCartQuery.ts

@@ -1,10 +1,23 @@
-import type { QueryHookOptions, TypedDocumentNode } from '@graphcommerce/graphql'
-import { ApolloError, useQuery } from '@graphcommerce/graphql'
+import type {
+  OperationVariables,
+  TypedDocumentNode,
+  WatchQueryFetchPolicy,
+} from '@graphcommerce/graphql'
+import { useQuery } from '@graphcommerce/graphql'
+import { CombinedGraphQLErrors } from '@apollo/client/errors'
+import type { useQuery as useQueryType } from '@apollo/client/react'
 import { GraphQLError } from 'graphql'
 import { useRouter } from 'next/router'
 import { useCartShouldLoginToContinue } from './useCartPermissions'
 import { useCurrentCartId } from './useCurrentCartId'
 
+type CartQueryOptions<Q, V extends OperationVariables> = Omit<
+  useQueryType.Options<Q, V>,
+  'variables'
+> & {
+  variables?: Omit<V, 'cartId'>
+}
+
 /**
  * Requires the query to have a `$cartId: String!` argument. It will automatically inject the
  * currently active cart_id.
@@ -15,12 +28,10 @@ import { useCurrentCartId } from './useCurrentCartId'
  * const { data } = useCartQuery(CartFabQueryDocument)
  * ```
  */
-export function useCartQuery<Q, V extends { cartId: string; [index: string]: unknown }>(
-  document: TypedDocumentNode<Q, V>,
-  options: QueryHookOptions<Q, Omit<V, 'cartId'>> = {},
-) {
-  const { ...queryOptions } = options
-
+export function useCartQuery<
+  Q,
+  V extends OperationVariables & { cartId: string; [index: string]: unknown },
+>(document: TypedDocumentNode<Q, V>, options?: CartQueryOptions<Q, V>) {
   const router = useRouter()
   const { currentCartId, locked } = useCurrentCartId()
 
@@ -29,23 +40,27 @@ export function useCartQuery<Q, V extends { cartId: string; [index: string]: unk
   const cartId = usingUrl ? urlCartId : currentCartId
   const shouldLoginToContinue = useCartShouldLoginToContinue()
 
-  if (usingUrl || locked) queryOptions.fetchPolicy = 'cache-only'
+  let fetchPolicy: WatchQueryFetchPolicy | undefined = options?.fetchPolicy
+  let returnPartialData: boolean | undefined = options?.returnPartialData
 
-  if (usingUrl && typeof queryOptions.returnPartialData === 'undefined')
-    queryOptions.returnPartialData = true
+  if (usingUrl || locked) fetchPolicy = 'cache-only'
+  if (usingUrl && typeof returnPartialData === 'undefined') returnPartialData = true
 
-  queryOptions.variables = { cartId, ...options?.variables } as V
+  const variables = { cartId, ...options?.variables } as V
 
   const query = useQuery(document, {
-    ...(queryOptions as QueryHookOptions<Q, V>),
-    skip: queryOptions.skip || !cartId || shouldLoginToContinue,
+    ...options,
+    fetchPolicy,
+    returnPartialData,
+    variables,
+    skip: options?.skip || !cartId || shouldLoginToContinue,
   })
 
-  if (shouldLoginToContinue && !queryOptions?.skip) {
+  if (shouldLoginToContinue && !options?.skip) {
     return {
       ...query,
-      error: new ApolloError({
-        graphQLErrors: [
+      error: new CombinedGraphQLErrors({
+        errors: [
           new GraphQLError('Action can not be performed by the current user', {
             extensions: { category: 'graphql-authorization' },
           }),

package/hooks/useCurrentCartId.ts

@@ -1,4 +1,3 @@
-import type { QueryHookOptions } from '@graphcommerce/graphql'
 import { useQuery } from '@graphcommerce/graphql'
 import type { CurrentCartIdQuery, CurrentCartIdQueryVariables } from './CurrentCartId.gql'
 import { CurrentCartIdDocument } from './CurrentCartId.gql'
@@ -6,8 +5,8 @@ import { CurrentCartIdDocument } from './CurrentCartId.gql'
 export function useCurrentCartId<
   Q extends CurrentCartIdQuery,
   V extends CurrentCartIdQueryVariables,
->(options: QueryHookOptions<Q, V> = {}) {
-  const queryResults = useQuery<Q, V>(CurrentCartIdDocument, options)
+>(options: Partial<useQuery.Options<Q, V>> = {}) {
+  const queryResults = useQuery<Q, V>(CurrentCartIdDocument, options as useQuery.Options<Q, V>)
 
   return {
     currentCartId: queryResults.data?.currentCartId?.id || '',

package/hooks/useFormGqlMutationCart.ts

@@ -1,5 +1,9 @@
-import type { MutationHookOptions, TypedDocumentNode } from '@graphcommerce/graphql'
-import { ApolloError, useApolloClient } from '@graphcommerce/graphql'
+import {
+  CombinedGraphQLErrors,
+  TypedDocumentNode,
+  useApolloClient,
+  useMutation,
+} from '@graphcommerce/graphql'
 import type {
   UseFormGqlMutationReturn,
   UseFormGraphQlOptions,
@@ -18,7 +22,7 @@ export function useFormGqlMutationCart<
 >(
   document: TypedDocumentNode<Q, V>,
   options: UseFormGraphQlOptions<Q, V> & { submitWhileLocked?: boolean } = {},
-  operationOptions?: MutationHookOptions<Q, V>,
+  operationOptions?: useMutation.Options<NoInfer<Q>, NoInfer<V>>,
 ): UseFormGqlMutationReturn<Q, V> {
   const cartIdCreate = useCartIdCreate()
   const cartIdFromContext = useCartIdContext()
@@ -63,8 +67,8 @@ export function useFormGqlMutationCart<
   if (shouldLoginToContinue && result.formState.isSubmitted && shouldBlockOperation) {
     return {
       ...result,
-      error: new ApolloError({
-        graphQLErrors: [
+      error: new CombinedGraphQLErrors({
+        errors: [
           new GraphQLError('Action can not be performed by the current user', {
             extensions: { category: 'graphql-authorization' },
           }),

package/link/cartLink.ts

@@ -1,6 +1,6 @@
-import type { Operation } from '@graphcommerce/graphql'
-import { fromPromise, globalApolloClient } from '@graphcommerce/graphql'
-import { ApolloLink, Observable, onError } from '@graphcommerce/graphql/apollo'
+import { globalApolloClient } from '@graphcommerce/graphql'
+import { ApolloLink, CombinedGraphQLErrors, ErrorLink } from '@graphcommerce/graphql/apollo'
+import { filter, from, of, switchMap } from '@graphcommerce/graphql/rxjs'
 import { CustomerTokenDocument, getCustomerAccountCanSignIn } from '@graphcommerce/magento-customer'
 import type { PushRouter } from '@graphcommerce/magento-customer/link/customerLink'
 import { pushWithPromise } from '@graphcommerce/magento-customer/link/customerLink'
@@ -14,8 +14,8 @@ import { CreateEmptyCartDocument } from '../hooks/CreateEmptyCart.gql'
 import { getCartEnabledForUser } from '../utils'
 import { isProtectedCartOperation } from './isProtectedCartOperation'
 
-type CartOperation = Operation & { variables: { cartId: string } }
-function isCartOperation(operation: Operation): operation is CartOperation {
+type CartOperation = ApolloLink.Operation & { variables: { cartId: string } }
+function isCartOperation(operation: ApolloLink.Operation): operation is CartOperation {
   return typeof operation.variables.cartId === 'string'
 }
 
@@ -24,13 +24,16 @@ function errorIsIncluded(errorPath: readonly (string | number)[] | undefined, ke
   return keys.some((value) => value === error)
 }
 
-const cartErrorLink = onError(({ graphQLErrors, operation, forward }) => {
+const cartErrorLink = new ErrorLink(({ error, operation, forward }) => {
   if (!globalApolloClient.current) return undefined
 
   const client = globalApolloClient.current
   const { cache } = client
 
-  if (!isCartOperation(operation) || !graphQLErrors) return undefined
+  // Check if this is a GraphQL error
+  if (!CombinedGraphQLErrors.is(error)) return undefined
+
+  if (!isCartOperation(operation)) return undefined
 
   const isErrorCategory = (err: GraphQLFormattedError, category: ErrorCategory) =>
     err.extensions?.category === category
@@ -54,7 +57,7 @@ const cartErrorLink = onError(({ graphQLErrors, operation, forward }) => {
       // 'applyCouponToCart',
       // 'removeCouponFromCart'
     ])
-  const cartErr = graphQLErrors.find((err) => isNoSuchEntityError(err))
+  const cartErr = error.errors.find((err) => isNoSuchEntityError(err))
 
   if (!cartErr) return undefined
 
@@ -63,9 +66,9 @@ const cartErrorLink = onError(({ graphQLErrors, operation, forward }) => {
     if (urlParams.get('cart_id')) return forward(operation)
   }
 
-  return fromPromise(client?.mutate({ mutation: CreateEmptyCartDocument }))
-    .filter((value) => Boolean(value))
-    .flatMap((cartData) => {
+  return from(client?.mutate({ mutation: CreateEmptyCartDocument })).pipe(
+    filter((value) => Boolean(value)),
+    switchMap((cartData) => {
       const cartId = cartData.data?.createEmptyCart
       if (!cartId) return forward(operation)
 
@@ -74,7 +77,8 @@ const cartErrorLink = onError(({ graphQLErrors, operation, forward }) => {
 
       // retry the request, returning the new observable
       return forward(operation)
-    })
+    }),
+  )
 })
 
 const cartPermissionLink = (router: PushRouter) =>
@@ -82,7 +86,7 @@ const cartPermissionLink = (router: PushRouter) =>
     const { locale } = router
     const { cache } = operation.getContext()
 
-    if (!isProtectedCartOperation(operation.operationName)) return forward(operation)
+    if (!isProtectedCartOperation(operation.operationName ?? '')) return forward(operation)
 
     const check = () => Boolean(cache?.readQuery({ query: CustomerTokenDocument }))
     if (getCartEnabledForUser(locale, check)) return forward(operation)
@@ -95,33 +99,35 @@ const cartPermissionLink = (router: PushRouter) =>
     const oldHeaders = operation.getContext().headers
     const signInAgainPromise = pushWithPromise(router, '/account/signin')
 
-    return fromPromise(signInAgainPromise).flatMap(() => {
-      const tokenQuery = cache?.readQuery({ query: CustomerTokenDocument })
-
-      if (tokenQuery?.customerToken?.valid) {
-        // Customer is authenticated, retrying request.
-        operation.setContext({
-          headers: {
-            ...oldHeaders,
-            authorization: `Bearer ${tokenQuery?.customerToken?.token}`,
-          },
+    return from(signInAgainPromise).pipe(
+      switchMap(() => {
+        const tokenQuery = cache?.readQuery({ query: CustomerTokenDocument })
+
+        if (tokenQuery?.customerToken?.valid) {
+          // Customer is authenticated, retrying request.
+          operation.setContext({
+            headers: {
+              ...oldHeaders,
+              authorization: `Bearer ${tokenQuery?.customerToken?.token}`,
+            },
+          })
+          return forward(operation)
+        }
+
+        return of({
+          data: null,
+          errors: [
+            new GraphQLError(t`Please login to add products to your cart`, {
+              extensions: { category: 'graphql-authorization' },
+            }),
+          ],
         })
-        return forward(operation)
-      }
-
-      return Observable.of({
-        data: null,
-        errors: [
-          new GraphQLError(t`Please login to add products to your cart`, {
-            extensions: { category: 'graphql-authorization' },
-          }),
-        ],
-      })
-    })
+      }),
+    )
   })
 
 export const cartLink = (router: PushRouter) => {
-  const links = [cartErrorLink]
+  const links: ApolloLink[] = [cartErrorLink]
 
   if (!(permissions?.cart === 'ENABLED')) {
     links.push(cartPermissionLink(router))

package/package.json

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

package/plugins/useSignInFormMergeCart.ts

@@ -22,12 +22,12 @@ export const useSignInForm: FunctionPlugin<typeof useSignInFormType> = (useSignI
 
       cartLock(client.cache, true)
 
-      const destinationCartId = (
-        await client.query({
-          query: CustomerCartDocument,
-          fetchPolicy: 'network-only',
-        })
-      ).data.customerCart.id
+      const customerCartResult = await client.query({
+        query: CustomerCartDocument,
+        fetchPolicy: 'network-only',
+      })
+      const destinationCartId = customerCartResult.data?.customerCart?.id
+      if (!destinationCartId) return
 
       try {
         const sourceCartId = readCartId(client.cache)?.id

package/test/fillCartAgreementsForm.ts

@@ -3,10 +3,7 @@ import type { ApolloClient, NormalizedCacheObject } from '@graphcommerce/graphql
 import type { Page } from '@playwright/test'
 import { CartAgreementsDocument } from '../components/CartAgreementsForm/CartAgreements.gql'
 
-export async function fillCartAgreementsForm(
-  page: Page,
-  client: ApolloClient<NormalizedCacheObject>,
-) {
+export async function fillCartAgreementsForm(page: Page, client: ApolloClient) {
   const res = (await client.query({ query: CartAgreementsDocument })).data
 
   for await (const agreement of res.checkoutAgreements ?? []) {

package/typePolicies.ts

@@ -1,8 +1,4 @@
-import type {
-  ApolloCache,
-  NormalizedCacheObject,
-  StrictTypedTypePolicies,
-} from '@graphcommerce/graphql'
+import type { ApolloCache, StrictTypedTypePolicies } from '@graphcommerce/graphql'
 import type { CartPrices, QuerycartArgs, ShippingCartAddress } from '@graphcommerce/graphql-mesh'
 import { CartFabDocument } from './components/CartFab/CartFab.gql'
 import { readCartId, writeCartId } from './hooks'
@@ -57,10 +53,7 @@ export const cartTypePolicies: StrictTypedTypePolicies = {
   },
 }
 
-export const migrateCart = (
-  oldCache: ApolloCache<NormalizedCacheObject>,
-  newCache: ApolloCache<NormalizedCacheObject>,
-) => {
+export const migrateCart = (oldCache: ApolloCache, newCache: ApolloCache) => {
   const cartId = readCartId(oldCache)?.id
 
   if (cartId) {