@apollo/client 3.7.0-beta.5 → 3.7.0-beta.6

package/README.md

@@ -22,6 +22,7 @@ Learn how to use Apollo Client with self-paced hands-on training on Odyssey, Apo
 ## Apollo Maintainers
 
 - [@benjamn](https://github.com/benjamn)
+- [@alessbell](https://github.com/alessbell)
 - [@hwillson](https://github.com/hwillson)
 - [@jpvajda](https://github.com/jpvajda)
 

package/apollo-client.cjs

@@ -1298,7 +1298,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.7.0-beta.5';
+var version = '3.7.0-beta.6';
 
 var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -4231,7 +4231,8 @@ var ObservableQuery = (function (_super) {
     ObservableQuery.prototype.applyNextFetchPolicy = function (reason, options) {
         if (options.nextFetchPolicy) {
             var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a, _b = options.initialFetchPolicy, initialFetchPolicy = _b === void 0 ? fetchPolicy : _b;
-            if (typeof options.nextFetchPolicy === "function") {
+            if (fetchPolicy === "standby") ;
+            else if (typeof options.nextFetchPolicy === "function") {
                 options.fetchPolicy = options.nextFetchPolicy(fetchPolicy, {
                     reason: reason,
                     options: options,
@@ -4320,7 +4321,8 @@ var ObservableQuery = (function (_super) {
             if (newOptions &&
                 newOptions.variables &&
                 !equality.equal(newOptions.variables, oldVariables) &&
-                (!newOptions.fetchPolicy || newOptions.fetchPolicy === oldFetchPolicy)) {
+                options.fetchPolicy !== "standby" &&
+                options.fetchPolicy === oldFetchPolicy) {
                 this.applyNextFetchPolicy("variables-changed", options);
                 if (newNetworkStatus === void 0) {
                     newNetworkStatus = exports.NetworkStatus.setVariables;
@@ -5570,20 +5572,23 @@ var QueryManager = (function () {
         });
         var fromVariables = function (variables) {
             normalized.variables = variables;
-            return _this.fetchQueryByPolicy(queryInfo, normalized, networkStatus);
+            var concastSources = _this.fetchQueryByPolicy(queryInfo, normalized, networkStatus);
+            if (normalized.fetchPolicy !== "standby" &&
+                concastSources.length > 0 &&
+                queryInfo.observableQuery) {
+                queryInfo.observableQuery["applyNextFetchPolicy"]("after-fetch", options);
+            }
+            return concastSources;
         };
+        var cleanupCancelFn = function () { return _this.fetchCancelFns.delete(queryId); };
         this.fetchCancelFns.set(queryId, function (reason) {
+            cleanupCancelFn();
             setTimeout(function () { return concast.cancel(reason); });
         });
         var concast = new Concast(this.transform(normalized.query).hasClientExports
             ? this.localState.addExportedVariables(normalized.query, normalized.variables, normalized.context).then(fromVariables)
             : fromVariables(normalized.variables));
-        concast.beforeNext(function () {
-            _this.fetchCancelFns.delete(queryId);
-            if (queryInfo.observableQuery) {
-                queryInfo.observableQuery["applyNextFetchPolicy"]("after-fetch", options);
-            }
-        });
+        concast.promise.then(cleanupCancelFn, cleanupCancelFn);
         return concast;
     };
     QueryManager.prototype.refetchQueries = function (_a) {
@@ -6411,13 +6416,18 @@ var InternalState = (function () {
         this.handleErrorOrCompleted(nextResult);
     };
     InternalState.prototype.handleErrorOrCompleted = function (result) {
+        var _this = this;
         if (!result.loading) {
-            if (result.error) {
-                this.onError(result.error);
-            }
-            else if (result.data) {
-                this.onCompleted(result.data);
-            }
+            Promise.resolve().then(function () {
+                if (result.error) {
+                    _this.onError(result.error);
+                }
+                else if (result.data) {
+                    _this.onCompleted(result.data);
+                }
+            }).catch(function (error) {
+                __DEV__ && tsInvariant.invariant.warn(error);
+            });
         }
     };
     InternalState.prototype.getCurrentResult = function () {