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

Fix apollo #2045

Merged
merged 4 commits into from
Feb 2, 2022
Merged

Fix apollo #2045

merged 4 commits into from
Feb 2, 2022

Conversation

ZauberNerd
Copy link
Contributor

Pin @apollo/client to 3.4.17 because of a bug in the SSR implementation of useLazyQuery.
apollographql/apollo-client#9108

Also, clean up leftovers from react-apollo for which we have removed support in Hops 15.

Bors merge bot cheat sheet

We are using bors-ng to automate merging of our pull requests. The following table provides a summary of commands that are available to reviewers (members of this repository with push access) and delegates (in case of bors delegate+ or bors delegate=[list]).

Syntax Description
bors merge Run the test suite and push to master if it passes. Short for "reviewed: looks good."
bors merge- Cancel an r+, r=, merge, or merge=
bors try Run the test suite without pushing to master.
bors try- Cancel a try
bors delegate+ Allow the pull request author to merge their changes.
bors delegate=[list] Allow the listed users to r+ this pull request's changes.
bors retry Run the previous command a second time.

This is a short collection of opinionated commands. For a full list of the commands read the bors reference.

This matcher was used to match `react-apollo` in the root `package.json`
in the `canarist` configuration, because we pinned it there.
I'm not sure why we did in the first place, but for now we want to pin
@apollo/client in the regular dependencies to 3.4.17 because of:
apollographql/apollo-client#9108
@ZauberNerd ZauberNerd added 📦 master Apply this label to a pull request, if it has to be cherry-picked to the maste-branch. 📦 v15 Apply this label to a pull request, if it has to be cherry-picked to the v15.x-branch after merging. labels Jan 19, 2022
@Poltergeist Poltergeist force-pushed the fix-apollo branch 3 times, most recently from dcbc6b7 to 2ae072b Compare January 24, 2022 13:55
Poltergeist
Poltergeist previously approved these changes Jan 24, 2022
Copy link
Contributor

@Poltergeist Poltergeist left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@ZauberNerd ZauberNerd merged commit 9f97080 into master Feb 2, 2022
@ZauberNerd ZauberNerd deleted the fix-apollo branch February 2, 2022 11:21
@hops-release-bot hops-release-bot bot mentioned this pull request Feb 2, 2022
@hops-release-bot
Copy link

Cherry-pick failed on branch v15.x!

Please check out PR #2071 & resolve the conflicts.

@hops-release-bot hops-release-bot bot mentioned this pull request Feb 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
📦 master Apply this label to a pull request, if it has to be cherry-picked to the maste-branch. 📦 v15 Apply this label to a pull request, if it has to be cherry-picked to the v15.x-branch after merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants