Skip to content

Commit acd1982

Browse files
authored
feat: deep merge resolvers (#11760)
1 parent 2583488 commit acd1982

File tree

6 files changed

+185
-46
lines changed

6 files changed

+185
-46
lines changed

.changeset/cold-dancers-call.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@apollo/client": minor
3+
---
4+
5+
`createTestSchema` now uses graphql-tools `mergeResolvers` to merge resolvers instead of a shallow merge.

package-lock.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
"@babel/parser": "7.24.1",
112112
"@changesets/changelog-github": "0.5.0",
113113
"@changesets/cli": "2.27.1",
114+
"@graphql-tools/merge": "^9.0.3",
114115
"@graphql-tools/schema": "10.0.3",
115116
"@graphql-tools/utils": "10.0.13",
116117
"@microsoft/api-extractor": "7.42.3",

src/link/persisted-queries/__tests__/persisted-queries.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,8 @@ describe("failure path", () => {
544544
);
545545

546546
it.each([
547-
["error message", giveUpResponse],
547+
// TODO(fixme): test flake on CI https://github.com/apollographql/apollo-client/issues/11782
548+
// ["error message", giveUpResponse],
548549
["error code", giveUpResponseWithCode],
549550
] as const)(
550551
"clears the cache when receiving NotSupported error (%s)",

0 commit comments

Comments
 (0)