Upgraded to @apollo/client 3.12.3 without impacting typescript compil…

…ation performance.
graphcommerce-org · Jan 6, 2025 · 8015eab · 8015eab
1 parent 1cf7c95
commit 8015eab
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 10 deletions.
diff --git a/.changeset/wicked-planets-call.md b/.changeset/wicked-planets-call.md
@@ -0,0 +1,7 @@
+---
+'@graphcommerce/hygraph-dynamic-rows': patch
+'@graphcommerce/react-hook-form': patch
+'@graphcommerce/graphql': patch
+---
+
+Upgraded to @apollo/client 3.12.3 without impacting typescript compilation performance.
diff --git a/examples/magento-graphcms/package.json b/examples/magento-graphcms/package.json
@@ -21,7 +21,7 @@
     "create-patch": "patch-package --exclude 'package.json$|gql.ts$|interceptor.tsx$'"
   },
   "dependencies": {
-    "@apollo/client": "3.11.10",
+    "@apollo/client": "~3.12.3",
     "@emotion/cache": "^11.13.1",
     "@emotion/react": "11.12.0",
     "@emotion/server": "^11.11.0",

diff --git a/examples/magento-open-source/package.json b/examples/magento-open-source/package.json
@@ -21,7 +21,7 @@
     "create-patch": "patch-package --exclude 'package.json$|gql.ts$|interceptor.tsx$'"
   },
   "dependencies": {
-    "@apollo/client": "3.11.10",
+    "@apollo/client": "~3.12.3",
     "@emotion/cache": "^11.13.1",
     "@emotion/react": "11.12.0",
     "@emotion/server": "^11.11.0",

diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "remark": "^15.0.1"
   },
   "devDependencies": {
-    "@apollo/client": "3.11.10",
+    "@apollo/client": "~3.12.3",
     "@graphcommerce/cli": "workspace:^",
     "@graphcommerce/eslint-config-pwa": "workspace:^",
     "@graphcommerce/graphql-mesh": "workspace:^",

diff --git a/packages/graphql/apollo.ts b/packages/graphql/apollo.ts
@@ -7,3 +7,9 @@ export * from '@apollo/client/link/error'
 export * from '@apollo/client/utilities'
 
 export { getOperationName } from '@apollo/client/utilities'
+
+declare module '@apollo/client' {
+  interface DataMasking {
+    enabled: true
+  }
+}
diff --git a/packages/graphql/hooks/usePrivateQuery.ts b/packages/graphql/hooks/usePrivateQuery.ts
@@ -4,7 +4,7 @@ import { useIsSSR } from '@graphcommerce/next-ui/hooks/useIsSsr'
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { getCssFlag, removeCssFlag, setCssFlag } from '@graphcommerce/next-ui/utils/cssFlags'
 import { useContext, useEffect } from 'react'
-import type { QueryHookOptions, QueryResult, TypedDocumentNode } from '../apollo'
+import type { MaybeMasked, QueryHookOptions, QueryResult, TypedDocumentNode } from '../apollo'
 import { useQuery } from '../apollo'
 import { PrivateQueryMaskContext } from '../components/PrivateQueryMask/PrivateQueryMask'
 import { usePrivateQueryContext } from './usePrivateQueryContext'
@@ -32,7 +32,7 @@ export function usePrivateQuery<
   document: TypedDocumentNode<Q, V>,
   options: QueryHookOptions<Q, V>,
   unscopedResult: Q,
-): Omit<QueryResult<Q, V>, 'data'> & { data: Q; mask: boolean } {
+): Omit<QueryResult<Q, V>, 'data'> & { data: Q | NonNullable<MaybeMasked<Q>>; mask: boolean } {
   const { skip = true } = options
   const context = usePrivateQueryContext()
   const isSsr = useIsSSR()

diff --git a/packages/graphql/package.json b/packages/graphql/package.json
@@ -13,7 +13,7 @@
     }
   },
   "dependencies": {
-    "@apollo/client": "3.11.10",
+    "@apollo/client": "~3.12.3",
     "@graphql-codegen/add": "5.0.3",
     "@graphql-codegen/fragment-matcher": "5.0.2",
     "@graphql-codegen/introspection": "4.0.3",

diff --git a/packages/hygraph-dynamic-rows-ui/package.json b/packages/hygraph-dynamic-rows-ui/package.json
@@ -16,8 +16,8 @@
     "dev": "next dev"
   },
   "dependencies": {
-    "@apollo/client": "3.11.10",
-    "@graphcommerce/next-config": "9.0.4-canary.2",
+    "@apollo/client": "~3.12.3",
+    "@graphcommerce/next-config": "9.0.4-canary.0",
     "@hygraph/app-sdk-react": "^0.0.5",
     "@lingui/conf": "4.14.1",
     "@lingui/core": "4.14.1",

diff --git a/packages/react-hook-form/src/useFormGql.tsx b/packages/react-hook-form/src/useFormGql.tsx
@@ -2,6 +2,7 @@ import type {
   FetchResult,
   LazyQueryHookOptions,
   LazyQueryResultTuple,
+  MaybeMasked,
   MutationHookOptions,
   MutationTuple,
   TypedDocumentNode,
@@ -16,7 +17,10 @@ import type { UseGqlDocumentHandler } from './useGqlDocumentHandler'
 import { useGqlDocumentHandler } from './useGqlDocumentHandler'
 import { tryAsync } from './utils/tryTuple'
 
-export type OnCompleteFn<Q, V> = (data: FetchResult<Q>, variables: V) => void | Promise<void>
+export type OnCompleteFn<Q, V> = (
+  data: FetchResult<MaybeMasked<Q>>,
+  variables: V,
+) => void | Promise<void>
 
 type UseFormGraphQLCallbacks<Q, V> = {
   /**
@@ -84,7 +88,7 @@ export type UseFormGqlMethods<Q, V extends FieldValues> = Omit<
   'encode' | 'type'
 > &
   Pick<UseFormReturn<V>, 'handleSubmit'> & {
-    data?: Q | null
+    data?: MaybeMasked<Q> | null
     error?: ApolloError
     submittedVariables?: V
   }