Merge branch 'master' into fix-mocksubscriptionlink-multiple-subscrip…

…tions

CHANGELOG.md

@@ -50,6 +50,12 @@
 - **[BREAKING]** `ApolloError`'s thrown by Apollo Client no longer prefix error messages with `GraphQL error:` or `Network error:`. To differentiate between GraphQL/network errors, refer to `ApolloError`'s public `graphQLErrors` and `networkError` properties. <br/>
   [@lorensr](https://github.com/lorensr) in [#3892](https://github.com/apollographql/apollo-client/pull/3892)
 
+- **[BREAKING]** Support for the `@live` directive has been removed, but might be restored in the future if a more thorough implementation is proposed. <br/>
+  [@benjamn](https://github.com/benjamn) in [#6221](https://github.com/apollographql/apollo-client/pull/6221)
+
+- **[BREAKING?]** Refactor `QueryManager` to make better use of observables and enforce `fetchPolicy` more reliably. <br/>
+  [@benjamn](https://github.com/benjamn) in [#6221](https://github.com/apollographql/apollo-client/pull/6221)
+
 - `InMemoryCache` now supports tracing garbage collection and eviction. Note that the signature of the `evict` method has been simplified in a potentially backwards-incompatible way. <br/>
   [@benjamn](https://github.com/benjamn) in [#5310](https://github.com/apollographql/apollo-client/pull/5310)
 

config/jest.config.js

@@ -5,7 +5,7 @@ module.exports = {
   },
   globals: {
     'ts-jest': {
-      diagnostics: false,
+      diagnostics: true,
     },
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'json'],

docs/source/api/link/introduction.md

@@ -262,7 +262,7 @@ const logTimeLink = new ApolloLink((operation, forward) => {
 const link = timeStartLink.concat(logTimeLink)
 ```
 
-This example shows defines links, `timeStartLink` and `logTimeLink`. The `timeStartLink` assigns the current time to the context's `start` field. When the operation completes, the `logTimeLink` then subtracts the value of `start` from the current time to determine the total duration of the operation.
+This example defines two links, `timeStartLink` and `logTimeLink`. The `timeStartLink` assigns the current time to the context's `start` field. When the operation completes, the `logTimeLink` then subtracts the value of `start` from the current time to determine the total duration of the operation.
 
 The context's initial value can be set by Apollo Client before the link chain begins its execution. In this example, a call to `client.query` adds a `saveOffline` field to the context, which is then read by the custom link defined at the top:
 

docs/source/networking/authentication.mdx

@@ -43,6 +43,7 @@ Another common way to identify yourself when using HTTP is to send along an auth
 
 ```js
 import { ApolloClient, createHttpLink, InMemoryCache } from '@apollo/client';
+import { setContext } from '@apollo/link-context';
 
 const httpLink = createHttpLink({
   uri: '/graphql',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/client",
-  "version": "3.0.0-beta.44",
+  "version": "3.0.0-beta.46",
   "description": "A fully-featured caching GraphQL client.",
   "private": true,
   "keywords": [
@@ -77,6 +77,7 @@
   "devDependencies": {
     "@testing-library/react": "9.4.1",
     "@types/fast-json-stable-stringify": "2.0.0",
+    "@types/fetch-mock": "^7.3.2",
     "@types/jest": "24.0.25",
     "@types/lodash": "4.14.149",
     "@types/node": "12.12.36",

src/__tests__/ApolloClient.ts

@@ -16,7 +16,7 @@ describe('ApolloClient', () => {
 
     beforeEach(() => {
       oldFetch = window.fetch;
-      window.fetch = () => null;
+      window.fetch = () => null as any;
     })
 
     afterEach(() => {
@@ -1175,7 +1175,6 @@ describe('ApolloClient', () => {
               if (result.id && result.__typename) {
                 return result.__typename + result.id;
               }
-              return null;
             },
             addTypename: true,
           }),
@@ -1202,7 +1201,7 @@ describe('ApolloClient', () => {
                 expect(stripSymbols(readData)).toEqual(data);
 
                 // modify readData and writeQuery
-                const bestFriends = readData.people.friends.filter(
+                const bestFriends = readData!.people.friends.filter(
                   x => x.type === 'best',
                 );
                 // this should re call next
@@ -1254,7 +1253,7 @@ describe('ApolloClient', () => {
                 expect(stripSymbols(readData)).toEqual(data);
 
                 // modify readData and writeQuery
-                const friends = readData.people.friends;
+                const friends = readData!.people.friends;
                 friends[0].type = 'okayest';
                 friends[1].type = 'okayest';
 
@@ -1290,13 +1289,13 @@ describe('ApolloClient', () => {
                   type: 'okayest',
                 };
                 const nextFriends = stripSymbols(
-                  nextResult.data.people.friends,
+                  nextResult.data!.people.friends,
                 );
                 expect(nextFriends[0]).toEqual(expectation0);
                 expect(nextFriends[1]).toEqual(expectation1);
 
                 const readFriends = stripSymbols(
-                  client.readQuery<Data>({ query }).people.friends,
+                  client.readQuery<Data>({ query })!.people.friends,
                 );
                 expect(readFriends[0]).toEqual(expectation0);
                 expect(readFriends[1]).toEqual(expectation1);
@@ -1319,12 +1318,12 @@ describe('ApolloClient', () => {
                 expect(stripSymbols(observable.getCurrentResult().data)).toEqual(
                   data,
                 );
-                const bestFriends = result.data.people.friends.filter(
+                const bestFriends = result.data!.people.friends.filter(
                   x => x.type === 'best',
                 );
                 // this should re call next
                 client.writeFragment({
-                  id: `Person${result.data.people.id}`,
+                  id: `Person${result.data!.people.id}`,
                   fragment: gql`
                     fragment bestFriends on Person {
                       friends {
@@ -1349,7 +1348,7 @@ describe('ApolloClient', () => {
               }
 
               if (count === 2) {
-                expect(stripSymbols(result.data.people.friends)).toEqual([
+                expect(stripSymbols(result.data!.people.friends)).toEqual([
                   bestFriend,
                 ]);
                 done();
@@ -1370,11 +1369,11 @@ describe('ApolloClient', () => {
                 expect(stripSymbols(observable.getCurrentResult().data)).toEqual(
                   data,
                 );
-                const friends = result.data.people.friends;
+                const friends = result.data!.people.friends;
 
                 // this should re call next
                 client.writeFragment({
-                  id: `Person${result.data.people.id}`,
+                  id: `Person${result.data!.people.id}`,
                   fragment: gql`
                     fragment bestFriends on Person {
                       friends {
@@ -1403,7 +1402,7 @@ describe('ApolloClient', () => {
               }
 
               if (count === 2) {
-                const nextFriends = stripSymbols(result.data.people.friends);
+                const nextFriends = stripSymbols(result.data!.people.friends);
                 expect(nextFriends[0]).toEqual({
                   ...bestFriend,
                   type: 'okayest',
@@ -2216,8 +2215,11 @@ describe('ApolloClient', () => {
           }
         `,
       };
-      const _query = client.queryManager!.query;
-      client.queryManager!.query = options => {
+
+      // @ts-ignore
+      const queryManager = client.queryManager;
+      const _query = queryManager.query;
+      queryManager.query = options => {
         queryOptions = options;
         return _query(options);
       };