@graphcommerce/graphql 9.1.0-canary.34 → 9.1.0-canary.35

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 9.1.0-canary.35
+
+### Patch Changes
+
+- [#2528](https://github.com/graphcommerce-org/graphcommerce/pull/2528) [`c52604f`](https://github.com/graphcommerce-org/graphcommerce/commit/c52604f89e1776fc1f0913f016b8b24fa194c6b7) - Solve issue where the persistenceMapper didn't use the same typePolicies and other configuration from the cache, causing potential issues. ([@paales](https://github.com/paales))
+
+- [#2528](https://github.com/graphcommerce-org/graphcommerce/pull/2528) [`529d7a8`](https://github.com/graphcommerce-org/graphcommerce/commit/529d7a88a4e010cb3e50c1358e2ac43e80e0bf38) - Solve issue where the ApolloClient cache wasn't scoped properly causing the wrong currency to be shown when switching currency. ([@paales](https://github.com/paales))
+
 ## 9.1.0-canary.34
 
 ## 9.1.0-canary.33

package/components/GraphQLProvider/GraphQLProvider.tsx

@@ -10,7 +10,7 @@ import fragments from '../../generated/fragments.json'
 import { createCacheReviver } from './createCacheReviver'
 import { errorLink } from './errorLink'
 import { measurePerformanceLink } from './measurePerformanceLink'
-import { mergeTypePolicies } from './typePolicies'
+import { dataIdFromObject, mergeTypePolicies } from './typePolicies'
 
 export const globalApolloClient: { current: ApolloClient<NormalizedCacheObject> | null } = {
   current: null,
@@ -47,6 +47,7 @@ export function GraphQLProvider(props: GraphQLProviderProps) {
       new InMemoryCache({
         possibleTypes: fragments.possibleTypes,
         typePolicies: mergeTypePolicies(config.current.policies),
+        dataIdFromObject,
       }),
     [],
   )

package/components/GraphQLProvider/createCacheReviver.ts

@@ -3,7 +3,7 @@ import type { ApolloCache, ApolloClient, NormalizedCacheObject } from '../../apo
 import { mergeDeep } from '../../apollo'
 import type { ApolloClientConfig } from '../../config'
 import { migrateCacheHandler } from './migrateCache'
-import { persistenceMapper } from './persistenceMapper'
+import { createPersistenceMapper } from './persistenceMapper'
 import { getTypePoliciesVersion } from './typePolicies'
 
 const APOLLO_CACHE_PERSIST = 'apollo-cache-persist'
@@ -36,7 +36,7 @@ export async function createCacheReviver(
         maxSize: false,
         key: APOLLO_CACHE_PERSIST,
         debounce: 10,
-        persistenceMapper,
+        persistenceMapper: createPersistenceMapper(createCache),
       })
 
       const reset = async () => {

package/components/GraphQLProvider/persistenceMapper.ts

@@ -1,5 +1,4 @@
-import type { NormalizedCacheObject } from '@apollo/client'
-import { InMemoryCache } from '@apollo/client'
+import type { ApolloCache, NormalizedCacheObject } from '@apollo/client'
 
 function pruneKey(cacheValue: unknown, path: string[]) {
   if (typeof cacheValue !== 'object' || cacheValue === null) return
@@ -22,29 +21,31 @@ function pruneCache(cacheObject: object, patterns: string[]) {
   patterns.forEach((pattern) => pruneKey(cacheObject, pattern.split('.')))
 }
 
-export const persistenceMapper = (data: string): Promise<string> => {
-  const parsedCache = JSON.parse(data) as NormalizedCacheObject
-
-  pruneCache(parsedCache, [
-    'ROOT_MUTATION',
-    'ROOT_QUERY.attributesForm',
-    'ROOT_QUERY.attributesList',
-    'ROOT_QUERY.categories*',
-    'ROOT_QUERY.products*',
-    'ROOT_QUERY.countries',
-    'ROOT_QUERY.checkoutAgreements',
-    'ROOT_QUERY.storeConfig',
-    'ROOT_QUERY.currency',
-    'ROOT_QUERY.guestOrder',
-    'ROOT_QUERY.cmsBlocks',
-    'ROOT_QUERY.__type*',
-    '*Product:{"uid":"*"}.crosssell_products',
-    'ROOT_QUERY.recaptchaV3Config',
-  ])
-
-  const cache = new InMemoryCache({})
-  cache.restore(parsedCache)
-  cache.gc()
-  const newCache = cache.extract()
-  return Promise.resolve(JSON.stringify(newCache))
-}
+export const createPersistenceMapper =
+  (createCache: () => ApolloCache<NormalizedCacheObject>) =>
+  (data: string): Promise<string> => {
+    const parsedCache = JSON.parse(data) as NormalizedCacheObject
+
+    pruneCache(parsedCache, [
+      'ROOT_MUTATION',
+      'ROOT_QUERY.attributesForm',
+      'ROOT_QUERY.attributesList',
+      'ROOT_QUERY.categories*',
+      'ROOT_QUERY.products*',
+      'ROOT_QUERY.countries',
+      'ROOT_QUERY.checkoutAgreements',
+      'ROOT_QUERY.storeConfig',
+      'ROOT_QUERY.currency',
+      'ROOT_QUERY.guestOrder',
+      'ROOT_QUERY.cmsBlocks',
+      'ROOT_QUERY.__type*',
+      '*Product:{"uid":"*"}.crosssell_products',
+      'ROOT_QUERY.recaptchaV3Config',
+    ])
+
+    const cache = createCache()
+    cache.restore(parsedCache)
+    cache.gc()
+    const newCache = cache.extract()
+    return Promise.resolve(JSON.stringify(newCache))
+  }

package/components/GraphQLProvider/typePolicies.ts

@@ -1,4 +1,5 @@
 import type { StrictTypedTypePolicies } from '@graphcommerce/graphql'
+import type { KeyFieldsFunction } from '@apollo/client/cache/inmemory/policies'
 import { mergeDeep } from '../../apollo'
 
 export const mergeTypePolicies = (policies: StrictTypedTypePolicies[]): StrictTypedTypePolicies =>
@@ -16,3 +17,5 @@ const generateIdentifyer = (s: string) =>
 
 export const getTypePoliciesVersion = (policies: StrictTypedTypePolicies[]) =>
   generateIdentifyer(JSON.stringify(policies))
+
+export const dataIdFromObject: KeyFieldsFunction = () => undefined

package/hooks/usePrivateQueryContext.ts

@@ -14,8 +14,6 @@ export function getPrivateQueryContext(
  * Other plugins should be able to define their own scopes and create a plugin on this method to
  * augment the specific scope.
  *
- * @see @graphcommerce/magento-customer/plugins/magentoCustomerGetInContext.ts
- *
  * Note: ONLY return a value if the frontend should use the privateContext directive.
  */
 export const usePrivateQueryContext = (): PrivateContext | null => null

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/graphql",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.1.0-canary.34",
+  "version": "9.1.0-canary.35",
   "sideEffects": false,
   "main": "index.ts",
   "prettier": "@graphcommerce/prettier-config-pwa",
@@ -27,11 +27,11 @@
     "graphql": "^16.10.0"
   },
   "peerDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^9.1.0-canary.34",
-    "@graphcommerce/graphql-codegen-near-operation-file": "9.1.0-canary.34",
-    "@graphcommerce/graphql-codegen-relay-optimizer-plugin": "9.1.0-canary.34",
-    "@graphcommerce/prettier-config-pwa": "^9.1.0-canary.34",
-    "@graphcommerce/typescript-config-pwa": "^9.1.0-canary.34",
+    "@graphcommerce/eslint-config-pwa": "^9.1.0-canary.35",
+    "@graphcommerce/graphql-codegen-near-operation-file": "9.1.0-canary.35",
+    "@graphcommerce/graphql-codegen-relay-optimizer-plugin": "9.1.0-canary.35",
+    "@graphcommerce/prettier-config-pwa": "^9.1.0-canary.35",
+    "@graphcommerce/typescript-config-pwa": "^9.1.0-canary.35",
     "@graphql-mesh/plugin-http-details-extensions": "*",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"