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 (v15.x) #2071

Merged
merged 4 commits into from
Feb 16, 2022
Merged

Fix apollo (v15.x) #2071

merged 4 commits into from
Feb 16, 2022

Conversation

hops-release-bot[bot]
Copy link

⚠️ This PR is the successor of #2045 and has been created automatically because the previous PR's commits could not be cherry-picked. ⚠️

Please resolve the conflicts and merge this PR afterwards by running the following command:

git fetch origin && \
git fetch origin pull/2045/head && \
git checkout fix-apollo-v15.x && \
git reset --hard HEAD^ && \
git cherry-pick 3eda02be0672227ba19648dc383dcfa4e3e40ef8 bb1b9ad144a1021a205147a437c00f0aad6184f6 523cb3cfd373f7e83eba4991b9822c2e22aede0c f0246b6b9e379389c94dce94139e9e8596dd251d

After successfully resolving all conflicts, you need to force-push your changes.

git push --force origin fix-apollo-v15.x

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.

@hops-release-bot hops-release-bot bot added the 📦 v15 Apply this label to a pull request, if it has to be cherry-picked to the v15.x-branch after merging. label Feb 2, 2022
@hops-release-bot hops-release-bot bot mentioned this pull request Feb 2, 2022
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 marked this pull request as ready for review February 3, 2022 09:13
@ZauberNerd ZauberNerd merged commit 3a52d17 into release-bot/next-v15.x Feb 16, 2022
@ZauberNerd ZauberNerd deleted the fix-apollo-v15.x branch February 16, 2022 13:30
@hops-release-bot hops-release-bot bot mentioned this pull request Feb 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
📦 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.

1 participant