@apollo/client 3.9.9 → 3.9.11

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @apollo/client
 
+## 3.9.11
+
+### Patch Changes
+
+- [#11769](https://github.com/apollographql/apollo-client/pull/11769) [`04132af`](https://github.com/apollographql/apollo-client/commit/04132af121c9b48d6e03eb733b9b91f825defbac) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fix an issue where using `skipToken` or the `skip` option with `useSuspenseQuery` in React's strict mode would perform a network request.
+
+## 3.9.10
+
+### Patch Changes
+
+- [#11738](https://github.com/apollographql/apollo-client/pull/11738) [`b1a5eb8`](https://github.com/apollographql/apollo-client/commit/b1a5eb80cae8bdf2e9d8627f1eab65e088c43438) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fix an issue where rerendering `useBackgroundQuery` after the `queryRef` had been disposed, either via the auto dispose timeout or by unmounting `useReadQuery`, would cause the `queryRef` to be recreated potentially resulting in another network request.
+
+- [#11738](https://github.com/apollographql/apollo-client/pull/11738) [`b1a5eb8`](https://github.com/apollographql/apollo-client/commit/b1a5eb80cae8bdf2e9d8627f1eab65e088c43438) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Allow queryRefs to be disposed of synchronously when a suspense hook unmounts. This prevents some situations where using a suspense hook with the same query/variables as the disposed queryRef accidentally used the disposed queryRef rather than creating a new instance.
+
+- [#11670](https://github.com/apollographql/apollo-client/pull/11670) [`cc5c03b`](https://github.com/apollographql/apollo-client/commit/cc5c03b2690f452483d83eecb68611a23055d99e) Thanks [@phryneas](https://github.com/phryneas)! - Bail out of `executeSubSelectedArray` calls if the array has 0 elements.
+
 ## 3.9.9
 
 ### Patch Changes

package/apollo-client.cjs

@@ -31,7 +31,7 @@ function _interopNamespace(e) {
 var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
-var version = "3.9.9";
+var version = "3.9.11";
 
 function maybe(thunk) {
     try {
@@ -3318,12 +3318,14 @@ var StoreReader =  (function () {
                     }
                 }
                 else if (isArray(fieldValue)) {
-                    fieldValue = handleMissing(_this.executeSubSelectedArray({
-                        field: selection,
-                        array: fieldValue,
-                        enclosingRef: enclosingRef,
-                        context: context,
-                    }), resultName);
+                    if (fieldValue.length > 0) {
+                        fieldValue = handleMissing(_this.executeSubSelectedArray({
+                            field: selection,
+                            array: fieldValue,
+                            enclosingRef: enclosingRef,
+                            context: context,
+                        }), resultName);
+                    }
                 }
                 else if (!selection.selectionSet) {
                     if (context.canonizeResults) {
@@ -8153,16 +8155,17 @@ var InternalQueryReference =  (function () {
     InternalQueryReference.prototype.reinitialize = function () {
         var observable = this.observable;
         var originalFetchPolicy = this.watchQueryOptions.fetchPolicy;
+        var avoidNetworkRequests = originalFetchPolicy === "no-cache" || originalFetchPolicy === "standby";
         try {
-            if (originalFetchPolicy !== "no-cache") {
-                observable.resetLastResults();
-                observable.silentSetOptions({ fetchPolicy: "cache-first" });
+            if (avoidNetworkRequests) {
+                observable.silentSetOptions({ fetchPolicy: "standby" });
             }
             else {
-                observable.silentSetOptions({ fetchPolicy: "standby" });
+                observable.resetLastResults();
+                observable.silentSetOptions({ fetchPolicy: "cache-first" });
             }
             this.subscribeToQuery();
-            if (originalFetchPolicy === "no-cache") {
+            if (avoidNetworkRequests) {
                 return;
             }
             observable.resetDiff();
@@ -8183,11 +8186,9 @@ var InternalQueryReference =  (function () {
             }
             disposed = true;
             _this.references--;
-            setTimeout(function () {
-                if (!_this.references) {
-                    _this.dispose();
-                }
-            });
+            if (!_this.references) {
+                _this.dispose();
+            }
         };
     };
     InternalQueryReference.prototype.softRetain = function () {
@@ -8355,6 +8356,10 @@ var SuspenseCache =  (function () {
         }
         return ref.current;
     };
+    SuspenseCache.prototype.add = function (cacheKey, queryRef) {
+        var ref = this.queryRefs.lookupArray(cacheKey);
+        ref.current = queryRef;
+    };
     return SuspenseCache;
 }());
 
@@ -8409,6 +8414,12 @@ function _useSuspenseQuery(query, options) {
             dispose();
         };
     }, [queryRef]);
+    React__namespace.useEffect(function () {
+        if (queryRef.disposed) {
+            suspenseCache.add(cacheKey, queryRef);
+            queryRef.reinitialize();
+        }
+    });
     var skipResult = React__namespace.useMemo(function () {
         var error = toApolloError(queryRef.result);
         return {
@@ -8516,6 +8527,11 @@ function _useBackgroundQuery(query, options) {
         var promise = queryRef.applyOptions(watchQueryOptions);
         updateWrappedQueryRef(wrappedQueryRef, promise);
     }
+    React__namespace.useEffect(function () {
+        if (queryRef.disposed) {
+            suspenseCache.add(cacheKey, queryRef);
+        }
+    });
     var fetchMore = React__namespace.useCallback(function (options) {
         var promise = queryRef.fetchMore(options);
         setWrappedQueryRef(wrapQueryRef(queryRef));
@@ -8618,7 +8634,12 @@ function _useReadQuery(queryRef) {
         internalQueryRef.reinitialize();
         updateWrappedQueryRef(queryRef, internalQueryRef.promise);
     }
-    React__namespace.useEffect(function () { return internalQueryRef.retain(); }, [internalQueryRef]);
+    React__namespace.useEffect(function () {
+        if (internalQueryRef.disposed) {
+            internalQueryRef.reinitialize();
+        }
+        return internalQueryRef.retain();
+    }, [internalQueryRef]);
     var promise = useSyncExternalStore(React__namespace.useCallback(function (forceUpdate) {
         return internalQueryRef.listen(function (promise) {
             updateWrappedQueryRef(queryRef, promise);