@apollo/client 3.3.14 → 3.3.15

package/apollo-client.cjs.js

@@ -1234,7 +1234,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.3.14';
+var version = '3.3.15';
 
 var hasOwnProperty$1 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -4765,10 +4765,10 @@ var QueryManager = (function () {
         return observable;
     };
     QueryManager.prototype.getResultsFromLink = function (queryInfo, allowCacheWrite, options) {
-        var lastRequestId = queryInfo.lastRequestId;
+        var requestId = queryInfo.lastRequestId = this.generateRequestId();
         return asyncMap(this.getObservableFromLink(queryInfo.document, options.context, options.variables), function (result) {
             var hasErrors = isNonEmptyArray(result.errors);
-            if (lastRequestId >= queryInfo.lastRequestId) {
+            if (requestId >= queryInfo.lastRequestId) {
                 if (hasErrors && options.errorPolicy === "none") {
                     throw queryInfo.markError(new ApolloError({
                         graphQLErrors: result.errors,
@@ -4790,7 +4790,7 @@ var QueryManager = (function () {
             var error = isApolloError(networkError)
                 ? networkError
                 : new ApolloError({ networkError: networkError });
-            if (lastRequestId >= queryInfo.lastRequestId) {
+            if (requestId >= queryInfo.lastRequestId) {
                 queryInfo.markError(error);
             }
             throw error;
@@ -4855,7 +4855,6 @@ var QueryManager = (function () {
         queryInfo.init({
             document: query,
             variables: variables,
-            lastRequestId: this.generateRequestId(),
             networkStatus: networkStatus,
         });
         var readCache = function () { return queryInfo.getDiff(variables); };
@@ -5694,17 +5693,13 @@ var QueryData = (function (_super) {
             this.previous.result = ssrLoading;
             return ssrLoading;
         }
-        var result;
         if (this.ssrInitiated()) {
-            if (skip) {
-                result = this.getQueryResult();
-            }
-            else {
-                result =
-                    this.context.renderPromises.addQueryPromise(this, this.getQueryResult) || ssrLoading;
+            var result = this.getQueryResult() || ssrLoading;
+            if (result.loading && !skip) {
+                this.context.renderPromises.addQueryPromise(this, function () { return null; });
             }
+            return result;
         }
-        return result;
     };
     QueryData.prototype.prepareObservableQueryOptions = function () {
         var options = this.getOptions();