Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: deep merge resolvers #11760

Merged
merged 21 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5d6a069
feat: deep merge resolvers by default
alessbell Apr 5, 2024
912220a
chore: add changeset
alessbell Apr 5, 2024
12a5f36
chore: update comment
alessbell Apr 8, 2024
0fb94cc
chore: add reset test, remove option
alessbell Apr 10, 2024
696a15d
chore: update changeset
alessbell Apr 10, 2024
49d9557
Merge branch 'release-3.10' into issue-11758-merging-resolvers
alessbell Apr 10, 2024
cd40f9c
Merge branch 'release-3.10' of github.com:apollographql/apollo-client…
alessbell Apr 10, 2024
c10dd8b
chore: update changeset
alessbell Apr 10, 2024
52afa27
Merge branch 'release-3.10' into issue-11758-merging-resolvers
alessbell Apr 10, 2024
ce4f9cd
fix: update function names in tests
alessbell Apr 10, 2024
178eb83
fix: remove unused useTrackRenders
alessbell Apr 12, 2024
b6bf236
Merge branch 'release-3.10' of github.com:apollographql/apollo-client…
alessbell Apr 12, 2024
f51a233
Merge branch 'release-3.10' into issue-11758-merging-resolvers
alessbell Apr 12, 2024
25872f6
chore: fix tests post-merge and merge resolvers in .fork
alessbell Apr 12, 2024
b36407b
Merge branch 'release-3.10' into issue-11758-merging-resolvers
alessbell Apr 12, 2024
b95cad4
chore: comment out flaky test
alessbell Apr 12, 2024
07a568a
Merge branch 'issue-11758-merging-resolvers' of github.com:apollograp…
alessbell Apr 12, 2024
712d338
chore: update comment with link to issue
alessbell Apr 12, 2024
0d49273
commit failing test
alessbell Apr 12, 2024
0130771
chore: fix merge conflicts
alessbell Apr 15, 2024
c6eaea4
chore: remove old comment
alessbell Apr 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/cold-dancers-call.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@apollo/client": minor
---

`createTestSchema` now uses graphql-tools `mergeResolvers` to merge resolvers instead of a shallow merge.
1 change: 1 addition & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
"@babel/parser": "7.24.1",
"@changesets/changelog-github": "0.5.0",
"@changesets/cli": "2.27.1",
"@graphql-tools/merge": "^9.0.3",
"@graphql-tools/schema": "10.0.3",
"@graphql-tools/utils": "10.0.13",
"@microsoft/api-extractor": "7.42.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,8 @@ describe("failure path", () => {
);

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