@apollo/client 3.6.5 → 3.6.8

package/README.md

@@ -19,12 +19,11 @@ The Apollo Client API reference can be found at: <br/>
 Learn how to use Apollo Client with self-paced hands-on training on Odyssey, Apollo's official learning platform: <br/>
 [https://odyssey.apollographql.com/](https://odyssey.apollographql.com/)
 
-## Maintainers
+## Apollo Maintainers
 
-- [@benjamn](https://github.com/benjamn) (Apollo)
-- [@brainkim](https://github.com/brainkim) (Apollo)
-- [@jcreighton](https://github.com/jcreighton) (Netflix)
-- [@hwillson](https://github.com/hwillson) (Apollo)
+- [@benjamn](https://github.com/benjamn)
+- [@hwillson](https://github.com/hwillson)
+- [@jpvajda](https://github.com/jpvajda)
 
 ## Who is Apollo?
 

package/apollo-client.cjs

@@ -1300,7 +1300,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.6.5';
+var version = '3.6.8';
 
 var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -3119,7 +3119,7 @@ function makeFieldFunctionOptions(policies, objectOrReference, fieldSpec, contex
         cache: policies.cache,
         canRead: canRead,
         readField: function () {
-            return policies.readField(normalizeReadFieldOptions(arguments, objectOrReference, context), context);
+            return policies.readField(normalizeReadFieldOptions(arguments, objectOrReference, variables), context);
         },
         mergeObjects: makeMergeObjectsFunction(context.store),
     };
@@ -4331,7 +4331,7 @@ var ObservableQuery = (function (_super) {
         };
         if (!useDisposableConcast) {
             if (this.concast && this.observer) {
-                this.concast.removeObserver(this.observer, true);
+                this.concast.removeObserver(this.observer);
             }
             this.concast = concast;
             this.observer = observer;
@@ -6300,7 +6300,7 @@ var InternalState = (function () {
             this.watchQueryOptions = watchQueryOptions;
             if (currentWatchQueryOptions && this.observable) {
                 this.optionsToIgnoreOnce.delete(currentWatchQueryOptions);
-                this.observable.reobserve(watchQueryOptions);
+                this.observable.reobserve(this.getObsQueryOptions());
                 this.previousData = ((_a = this.result) === null || _a === void 0 ? void 0 : _a.data) || this.previousData;
                 this.result = void 0;
             }
@@ -6321,6 +6321,17 @@ var InternalState = (function () {
             this.result = void 0;
         }
     };
+    InternalState.prototype.getObsQueryOptions = function () {
+        var toMerge = [];
+        var globalDefaults = this.client.defaultOptions.watchQuery;
+        if (globalDefaults)
+            toMerge.push(globalDefaults);
+        if (this.queryHookOptions.defaultOptions) {
+            toMerge.push(this.queryHookOptions.defaultOptions);
+        }
+        toMerge.push(compact(this.observable && this.observable.options, this.watchQueryOptions));
+        return toMerge.reduce(mergeOptions);
+    };
     InternalState.prototype.createWatchQueryOptions = function (_a) {
         var _b;
         if (_a === void 0) { _a = {}; }
@@ -6361,7 +6372,7 @@ var InternalState = (function () {
             this.renderPromises
                 && this.renderPromises.getSSRObservable(this.watchQueryOptions)
                 || this.observable
-                || this.client.watchQuery(mergeOptions(this.queryHookOptions.defaultOptions, this.watchQueryOptions));
+                || this.client.watchQuery(this.getObsQueryOptions());
         this.obsQueryFields = React.useMemo(function () { return ({
             refetch: obsQuery.refetch.bind(obsQuery),
             reobserve: obsQuery.reobserve.bind(obsQuery),
@@ -6411,7 +6422,7 @@ var InternalState = (function () {
         if (queryResult)
             return queryResult;
         var data = result.data; result.partial; var resultWithoutPartial = tslib.__rest(result, ["data", "partial"]);
-        this.toQueryResultCache.set(result, queryResult = tslib.__assign(tslib.__assign(tslib.__assign({ data: data }, resultWithoutPartial), this.obsQueryFields), { client: this.client, observable: this.observable, variables: this.observable.variables, called: true, previousData: this.previousData }));
+        this.toQueryResultCache.set(result, queryResult = tslib.__assign(tslib.__assign(tslib.__assign({ data: data }, resultWithoutPartial), this.obsQueryFields), { client: this.client, observable: this.observable, variables: this.observable.variables, called: !this.queryHookOptions.skip, previousData: this.previousData }));
         if (!queryResult.error && isNonEmptyArray(result.errors)) {
             queryResult.error = new ApolloError({ graphQLErrors: result.errors });
         }