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

Conflicts #2108

Merged
merged 55 commits into from
Sep 4, 2017
Merged

Conflicts #2108

merged 55 commits into from
Sep 4, 2017

Conversation

jbaxleyiii
Copy link
Contributor

This is a branch to fix conflicts on the 2.0 alpha [trivial]

stevenhao and others added 30 commits August 4, 2017 00:18
The mistake was introduced by 5863eac when consolidating the two examples for `new ApolloClient`.
* fixed two queries in flight bug for Apollo Link

* Changelog updated
* fixing the networkInterface config applying

* CHANGELOG added
* Fixed single response and added subscriptions to links

* remove Observable Network Interface and include subscriptions map for current interface

* Subscripitons unit tests and subscribe method calls correctly to handler

* Update Changelog to reflect subscriptions with Links

* bumped graphql types version and include asynciterable ts library
* fix: flow: prevent RequestOptions null error

* fix: flow: prevent RequestOptions null error (with test)
* bump changelog

* version bump

* import ZenObservable types from apollo-link-core

* bump apollo-link-core version number
chore(deps): pin dependency all-contributors-cli to v4.4.0
- [Object] means array of length 1 with Object. Instead we want Array<Object>
- ___* were typos. The correct values from code is __*
renovate bot and others added 22 commits August 24, 2017 09:59
chore(deps): update dependency @types/node to v8.0.25
A logic error was causing the `readStoreResolver` from applying
a `previousResult` to a top-level ID obtained via a custom resolver.

Effectively, this bug was causing the result of any query routed through
a custom resolver to fail reference equality checks, even if the result
is served completely from the cache and is completely unchanged.

This commit adds a regression test.
@mention-bot
Copy link

@jbaxleyiii, thanks for your PR! By analyzing the history of the files in this pull request, we identified @calebmer, @stubailo and @helfer to be potential reviewers.

@apollo-cla
Copy link

Warnings
⚠️

❗ Big PR

Messages
📖

Please add your name and email to the AUTHORS file (optional)

📖

If this was a change that affects the external API, please update the docs and post a link to the PR in the discussion

Generated by 🚫 dangerJS

@codecov
Copy link

codecov bot commented Sep 4, 2017

Codecov Report

Merging #2108 into 2.0-alpha will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           2.0-alpha    #2108   +/-   ##
==========================================
  Coverage      83.23%   83.23%           
==========================================
  Files             36       36           
  Lines           1879     1879           
  Branches         439      439           
==========================================
  Hits            1564     1564           
  Misses           308      308           
  Partials           7        7

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 780534d...81f13bb. Read the comment docs.

@jbaxleyiii jbaxleyiii merged commit 81942a8 into 2.0-alpha Sep 4, 2017
@jbaxleyiii jbaxleyiii deleted the conflicts branch September 4, 2017 02:50
jbaxleyiii pushed a commit that referenced this pull request Sep 4, 2017
This reverts commit 81942a8.
@jbaxleyiii jbaxleyiii mentioned this pull request Sep 4, 2017
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 2, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants