@apollo/client 3.7.0-rc.0 → 3.7.1

package/README.md

@@ -27,6 +27,7 @@ Learn how to use Apollo Client with self-paced hands-on training on Odyssey, Apo
 - [@hwillson](https://github.com/hwillson)
 - [@jpvajda](https://github.com/jpvajda)
 - [@mrdoombringer](https://github.com/mrdoombringer)
+- [@jerelmiller](https://github.com/jerelmiller)
 
 ## Who is Apollo?
 

package/apollo-client.cjs

@@ -1300,7 +1300,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.7.0-rc.0';
+var version = '3.7.1';
 
 function isNodeResponse(value) {
     return !!value.body;
@@ -1548,6 +1548,17 @@ function parseHeaders(headerText) {
     return headersInit;
 }
 function parseJsonBody(response, bodyText) {
+    if (response.status >= 300) {
+        var getResult = function () {
+            try {
+                return JSON.parse(bodyText);
+            }
+            catch (err) {
+                return bodyText;
+            }
+        };
+        throwServerError(response, getResult(), "Response not successful: Received status code ".concat(response.status));
+    }
     try {
         return JSON.parse(bodyText);
     }
@@ -4339,8 +4350,10 @@ var ObservableQuery = (function (_super) {
         }
         return result;
     };
-    ObservableQuery.prototype.isDifferentFromLastResult = function (newResult) {
-        return !this.last || !equality.equal(this.last.result, newResult);
+    ObservableQuery.prototype.isDifferentFromLastResult = function (newResult, variables) {
+        return (!this.last ||
+            !equality.equal(this.last.result, newResult) ||
+            (variables && !equality.equal(this.last.variables, variables)));
     };
     ObservableQuery.prototype.getLast = function (key, variablesMustMatch) {
         var last = this.last;
@@ -4648,7 +4661,7 @@ var ObservableQuery = (function (_super) {
     };
     ObservableQuery.prototype.reportResult = function (result, variables) {
         var lastError = this.getLastError();
-        if (lastError || this.isDifferentFromLastResult(result)) {
+        if (lastError || this.isDifferentFromLastResult(result, variables)) {
             if (lastError || !result.partial || this.options.returnPartialData) {
                 this.updateLastResult(result, variables);
             }
@@ -6936,6 +6949,7 @@ function useMutation(mutation, options) {
 }
 
 function useSubscription(subscription, options) {
+    var hasIssuedDeprecationWarningRef = React.useRef(false);
     var client = useApolloClient(options === null || options === void 0 ? void 0 : options.client);
     verifyDocumentType(subscription, exports.DocumentType.Subscription);
     var _a = React.useState({
@@ -6944,6 +6958,19 @@ function useSubscription(subscription, options) {
         data: void 0,
         variables: options === null || options === void 0 ? void 0 : options.variables,
     }), result = _a[0], setResult = _a[1];
+    if (!hasIssuedDeprecationWarningRef.current) {
+        hasIssuedDeprecationWarningRef.current = true;
+        if (options === null || options === void 0 ? void 0 : options.onSubscriptionData) {
+            __DEV__ && tsInvariant.invariant.warn(options.onData
+                ? "'useSubscription' supports only the 'onSubscriptionData' or 'onData' option, but not both. Only the 'onData' option will be used."
+                : "'onSubscriptionData' is deprecated and will be removed in a future major version. Please use the 'onData' option instead.");
+        }
+        if (options === null || options === void 0 ? void 0 : options.onSubscriptionComplete) {
+            __DEV__ && tsInvariant.invariant.warn(options.onComplete
+                ? "'useSubscription' supports only the 'onSubscriptionComplete' or 'onComplete' option, but not both. Only the 'onComplete' option will be used."
+                : "'onSubscriptionComplete' is deprecated and will be removed in a future major version. Please use the 'onComplete' option instead.");
+        }
+    }
     var _b = React.useState(function () {
         if (options === null || options === void 0 ? void 0 : options.skip) {
             return null;
@@ -7017,10 +7044,18 @@ function useSubscription(subscription, options) {
                     variables: options === null || options === void 0 ? void 0 : options.variables,
                 };
                 setResult(result);
-                (_b = (_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.onSubscriptionData) === null || _b === void 0 ? void 0 : _b.call(_a, {
-                    client: client,
-                    subscriptionData: result
-                });
+                if ((_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.onData) {
+                    ref.current.options.onData({
+                        client: client,
+                        data: result
+                    });
+                }
+                else if ((_b = ref.current.options) === null || _b === void 0 ? void 0 : _b.onSubscriptionData) {
+                    ref.current.options.onSubscriptionData({
+                        client: client,
+                        subscriptionData: result
+                    });
+                }
             },
             error: function (error) {
                 var _a, _b;
@@ -7034,7 +7069,12 @@ function useSubscription(subscription, options) {
             },
             complete: function () {
                 var _a, _b;
-                (_b = (_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.onSubscriptionComplete) === null || _b === void 0 ? void 0 : _b.call(_a);
+                if ((_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.onComplete) {
+                    ref.current.options.onComplete();
+                }
+                else if ((_b = ref.current.options) === null || _b === void 0 ? void 0 : _b.onSubscriptionComplete) {
+                    ref.current.options.onSubscriptionComplete();
+                }
             },
         });
         return function () {
@@ -7066,13 +7106,11 @@ function useFragment_experimental(options) {
     var resultRef = React.useRef();
     var latestDiff = cache.diff(diffOptions);
     return useSyncExternalStore(function (forceUpdate) {
-        var immediate = true;
-        return cache.watch(tslib.__assign(tslib.__assign({}, diffOptions), { immediate: immediate, callback: function (diff) {
-                if (!immediate && !equality.equal(diff, latestDiff)) {
+        return cache.watch(tslib.__assign(tslib.__assign({}, diffOptions), { immediate: true, callback: function (diff) {
+                if (!equality.equal(diff, latestDiff)) {
                     resultRef.current = diffToResult(latestDiff = diff);
                     forceUpdate();
                 }
-                immediate = false;
             } }));
     }, function () {
         var latestDiffToResult = diffToResult(latestDiff);