@apollo/client 4.1.4 → 4.1.6

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @apollo/client
 
+## 4.1.6
+
+### Patch Changes
+
+- [#13128](https://github.com/apollographql/apollo-client/pull/13128) [`6c0b8e4`](https://github.com/apollographql/apollo-client/commit/6c0b8e4301609b62ed599340589c978e4f51f020) Thanks [@pavelivanov](https://github.com/pavelivanov)! - Fix `useQuery` hydration mismatch when `ssr: false` and `skip: true` are used together
+
+  When both options were combined, the server would return `loading: false` (because `useSSRQuery` checks `skip` first), but the client's `getServerSnapshot` was returning `ssrDisabledResult` with `loading: true`, causing a hydration mismatch.
+
+## 4.1.5
+
+### Patch Changes
+
+- [#13155](https://github.com/apollographql/apollo-client/pull/13155) [`3ba1583`](https://github.com/apollographql/apollo-client/commit/3ba1583f93c40343501acd9d598ce506537d1c9b) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fix an issue where `useQuery` would poll with `pollInterval` when `skip` was initialized to `true`.
+
+- [#13135](https://github.com/apollographql/apollo-client/pull/13135) [`fd42142`](https://github.com/apollographql/apollo-client/commit/fd42142495d24859a9bc7145a85bc8f8d857ec88) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fix issue where `client.query` would apply options from `defaultOptions.watchQuery`.
+
 ## 4.1.4
 
 ### Patch Changes

package/__cjs/core/ObservableQuery.cjs

@@ -855,7 +855,14 @@ class ObservableQuery {
             return;
         }
         const { pollingInfo, options: { fetchPolicy, pollInterval }, } = this;
-        if (!pollInterval || !this.hasObservers() || fetchPolicy === "cache-only") {
+        const shouldCancelPolling = () => {
+            const { options } = this;
+            return (!options.pollInterval ||
+                !this.hasObservers() ||
+                options.fetchPolicy === "cache-only" ||
+                options.fetchPolicy === "standby");
+        };
+        if (shouldCancelPolling()) {
             if (environment_1.__DEV__) {
                 if (!this.didWarnCacheOnlyPolling &&
                     pollInterval &&
@@ -873,6 +880,11 @@ class ObservableQuery {
         const info = pollingInfo || (this.pollingInfo = {});
         info.interval = pollInterval;
         const maybeFetch = () => {
+            // defense against options changing after the setTimeout changes in case
+            // the call site forgets to call cancelPolling
+            if (shouldCancelPolling()) {
+                return this.cancelPolling();
+            }
             if (this.pollingInfo) {
                 if (!(0, utilities_1.isNetworkRequestInFlight)(this.networkStatus) &&
                     !this.options.skipPollAttempt?.()) {