Merge branch 'main' into pr/update-ref-faster

apollographql · Jan 29, 2025 · 134e5c3 · 134e5c3
2 parents 6288b71 + 68e29dd
commit 134e5c3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/docs/source/data/fragments.mdx b/docs/source/data/fragments.mdx
@@ -1135,7 +1135,7 @@ const config: CodegenConfig = {
 ##### With the `client-preset`
 
 <Note>
-Support for the `@unmask` directive was introduced with `@graphql-codegen/client-preset` [v4.5.1](https://github.com/dotansimha/graphql-code-generator/releases/tag/release-1732308151614)
+Support for the `@unmask` directive was introduced with `@graphql-codegen/client-preset` [v4.6.0](https://github.com/dotansimha/graphql-code-generator/releases/tag/release-1738065376043)
 </Note>
 
 You can't use the `client-preset` [Fragment Masking](https://the-guild.dev/graphql/codegen/plugins/presets/preset-client#fragment-masking) and Apollo Client's data masking features simultaneously.
@@ -1157,11 +1157,11 @@ To migrate from CodeGen's fragment masking feature to Apollo Client's data maski
             // ...
             // disables the incompatible GraphQL Codegen fragment masking feature
             fragmentMasking: false,
+          },
+          config: {
             customDirectives: {
               apolloUnmask: true
             }
-          },
-          config: {
             inlineFragmentTypes: "mask",
           }
         }

diff --git a/src/react/hooks/__tests__/useBackgroundQuery.test.tsx b/src/react/hooks/__tests__/useBackgroundQuery.test.tsx
@@ -339,7 +339,7 @@ it("will resubscribe after disposed when mounting useReadQuery", async () => {
   }
 
   // Wait long enough for auto dispose to kick in
-  await wait(50);
+  await wait(80);
 
   expect(client.getObservableQueries().size).toBe(0);
   expect(client).not.toHaveSuspenseCacheEntryUsing(query);

diff --git a/src/react/hooks/__tests__/useQuery.test.tsx b/src/react/hooks/__tests__/useQuery.test.tsx
@@ -2916,7 +2916,7 @@ describe("useQuery Hook", () => {
       const { takeSnapshot, unmount } = await renderHookToSnapshotStream(
         () =>
           useQuery(query, {
-            pollInterval: 10,
+            pollInterval: 25,
             fetchPolicy: "cache-and-network",
           }),
         {
@@ -2955,7 +2955,7 @@ describe("useQuery Hook", () => {
         expect(requestSpy).toHaveBeenCalledTimes(1);
       }
 
-      await wait(10);
+      await wait(25);
 
       {
         const result = await takeSnapshot();