@apollo/client 4.0.0-alpha.2 → 4.0.0-alpha.4

package/.changeset/eighty-squids-fix.md

@@ -0,0 +1,15 @@
+---
+"@apollo/client": major
+---
+
+`ObservableQuery.setOptions` has been removed as it was an alias of `reobserve`. Prefer using `reobserve` directly instead.
+
+```diff
+const observable = client.watchQuery(options);
+
+// Use reobserve to set new options and reevaluate the query
+- observable.setOptions(newOptions);
++ observable.reobserve(newOptions);
+```
+
+As a result of this change, `reobserve` has been marked for public use and is no longer considered an internal API. The `newNetworkStatus` argument has been removed to facilitate this change.

package/.changeset/four-ghosts-watch.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+Network errors triggered by queries now adhere to the `errorPolicy`. This means that GraphQL errors and network errors now behave the same way. Previously promise-based APIs, such as `client.query`, would reject the promise with the network error even if `errorPolicy` was set to `ignore`. The promise is now resolved with the `error` property set to the network error instead.

package/.changeset/funny-jeans-invent.md

@@ -0,0 +1,16 @@
+---
+"@apollo/client": major
+---
+
+`ssrMode`, `ssrForceFetchDelay` and `disableNetworkFetches` have been reworked:
+
+Previously, a `ObservableQuery` created by `client.query` or `client.watchQuery`
+while one of those were active would permanently be changed from a `fetchPolicy`
+of `"network-only"` or `"cache-and-network"` to `"cache-first"`, and stay that way
+even long after `disableNetworkFetches` would have been deactivated.
+
+Now, the `ObservableQuery` will keep their original `fetchPolicy`, but queries
+made during `disableNetworkFetches` will just apply the `fetchPolicy` replacement
+at request time, just for that one request.
+
+`ApolloClient.disableNetworkFetches` has been renamed to `ApolloClient.prioritizeCacheValues` to better reflect this behaviour.

package/.changeset/khaki-spies-work.md

@@ -0,0 +1,11 @@
+---
+"@apollo/client": major
+---
+
+Flatten out React hook types. As a result, the base types have been removed. Prefer using the hook types instead. Removed types include:
+- `BaseMutationOptions`
+- `BaseQueryOptions`
+- `BaseSubscriptionOptions`
+- `ObservableQueryFields`
+- `MutationSharedOptions`
+- `QueryFunctionOptions`

package/.changeset/light-apes-rescue.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+`useQuery` no longer returns `reobserve` as part of its result. It was possible to use `reobserve` to set new options on the underlying `ObservableQuery` instance which differed from the options passed to the hook. This could result in unexpected results. Instead prefer to rerender the hook with new options.

package/.changeset/odd-lemons-relax.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Rename all React hook result types and options. These types have all moved under a namespace that matches the hook name. For example, `useQuery` exports `useQuery.Options` and `useQuery.Result` types. As such, the old hook types have been deprecated and will be removed in v5.

package/.changeset/pre.json

@@ -16,10 +16,13 @@
     "cuddly-spiders-tie",
     "curvy-pianos-count",
     "dirty-trees-pump",
+    "eighty-squids-fix",
     "empty-rabbits-move",
     "fluffy-shoes-applaud",
     "forty-hairs-occur",
+    "four-ghosts-watch",
     "fresh-moose-hope",
+    "funny-jeans-invent",
     "good-dolphins-peel",
     "gorgeous-chefs-tap",
     "healthy-apes-sneeze",
@@ -27,8 +30,10 @@
     "hot-cycles-notice",
     "itchy-drinks-refuse",
     "itchy-roses-accept",
+    "khaki-spies-work",
     "kind-fishes-develop",
     "late-trainers-peel",
+    "light-apes-rescue",
     "light-dolphins-taste",
     "light-sloths-end",
     "lucky-hats-push",
@@ -40,6 +45,7 @@
     "nervous-goats-allow",
     "nice-donkeys-reflect",
     "nice-waves-work",
+    "odd-lemons-relax",
     "polite-bees-care",
     "popular-games-sleep",
     "purple-lions-cough",
@@ -70,6 +76,7 @@
     "tough-taxis-smoke",
     "tough-tips-drop",
     "twenty-snakes-sort",
+    "unlucky-kiwis-sell",
     "unlucky-sheep-change",
     "yellow-cats-judge",
     "young-phones-fold",

package/.changeset/unlucky-kiwis-sell.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+Remove the `called` property from `useQuery`.

package/CHANGELOG.md

@@ -1,5 +1,57 @@
 # @apollo/client
 
+## 4.0.0-alpha.4
+
+### Major Changes
+
+- [#12463](https://github.com/apollographql/apollo-client/pull/12463) [`3868df8`](https://github.com/apollographql/apollo-client/commit/3868df81f973dc7b5a79fadf4dc1b0e291003b7f) Thanks [@jerelmiller](https://github.com/jerelmiller)! - `ObservableQuery.setOptions` has been removed as it was an alias of `reobserve`. Prefer using `reobserve` directly instead.
+
+  ```diff
+  const observable = client.watchQuery(options);
+
+  // Use reobserve to set new options and reevaluate the query
+  - observable.setOptions(newOptions);
+  + observable.reobserve(newOptions);
+  ```
+
+  As a result of this change, `reobserve` has been marked for public use and is no longer considered an internal API. The `newNetworkStatus` argument has been removed to facilitate this change.
+
+- [#12470](https://github.com/apollographql/apollo-client/pull/12470) [`d32902f`](https://github.com/apollographql/apollo-client/commit/d32902f26a4c5dea30421ee52aeea52df3e5334e) Thanks [@phryneas](https://github.com/phryneas)! - `ssrMode`, `ssrForceFetchDelay` and `disableNetworkFetches` have been reworked:
+
+  Previously, a `ObservableQuery` created by `client.query` or `client.watchQuery`
+  while one of those were active would permanently be changed from a `fetchPolicy`
+  of `"network-only"` or `"cache-and-network"` to `"cache-first"`, and stay that way
+  even long after `disableNetworkFetches` would have been deactivated.
+
+  Now, the `ObservableQuery` will keep their original `fetchPolicy`, but queries
+  made during `disableNetworkFetches` will just apply the `fetchPolicy` replacement
+  at request time, just for that one request.
+
+  `ApolloClient.disableNetworkFetches` has been renamed to `ApolloClient.prioritizeCacheValues` to better reflect this behaviour.
+
+- [#12465](https://github.com/apollographql/apollo-client/pull/12465) [`a132163`](https://github.com/apollographql/apollo-client/commit/a1321637cafb4023d6df416e9467294114d8346b) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Flatten out React hook types. As a result, the base types have been removed. Prefer using the hook types instead. Removed types include:
+
+  - `BaseMutationOptions`
+  - `BaseQueryOptions`
+  - `BaseSubscriptionOptions`
+  - `ObservableQueryFields`
+  - `MutationSharedOptions`
+  - `QueryFunctionOptions`
+
+- [#12463](https://github.com/apollographql/apollo-client/pull/12463) [`3868df8`](https://github.com/apollographql/apollo-client/commit/3868df81f973dc7b5a79fadf4dc1b0e291003b7f) Thanks [@jerelmiller](https://github.com/jerelmiller)! - `useQuery` no longer returns `reobserve` as part of its result. It was possible to use `reobserve` to set new options on the underlying `ObservableQuery` instance which differed from the options passed to the hook. This could result in unexpected results. Instead prefer to rerender the hook with new options.
+
+### Patch Changes
+
+- [#12465](https://github.com/apollographql/apollo-client/pull/12465) [`a132163`](https://github.com/apollographql/apollo-client/commit/a1321637cafb4023d6df416e9467294114d8346b) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Rename all React hook result types and options. These types have all moved under a namespace that matches the hook name. For example, `useQuery` exports `useQuery.Options` and `useQuery.Result` types. As such, the old hook types have been deprecated and will be removed in v5.
+
+## 4.0.0-alpha.3
+
+### Major Changes
+
+- [#12457](https://github.com/apollographql/apollo-client/pull/12457) [`32e85ea`](https://github.com/apollographql/apollo-client/commit/32e85ea9eb93c1ffb10d6f70e9e2775e1326e9aa) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Network errors triggered by queries now adhere to the `errorPolicy`. This means that GraphQL errors and network errors now behave the same way. Previously promise-based APIs, such as `client.query`, would reject the promise with the network error even if `errorPolicy` was set to `ignore`. The promise is now resolved with the `error` property set to the network error instead.
+
+- [#12464](https://github.com/apollographql/apollo-client/pull/12464) [`0595f39`](https://github.com/apollographql/apollo-client/commit/0595f39deba52ac43fa0780b742564134ec7ab89) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Remove the `called` property from `useQuery`.
+
 ## 4.0.0-alpha.2
 
 ### Major Changes
@@ -471,6 +523,12 @@
 
 - [#12384](https://github.com/apollographql/apollo-client/pull/12384) [`6aa6fd3`](https://github.com/apollographql/apollo-client/commit/6aa6fd316cfdb31ebbe3e3133cca2965604e7ca1) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Don't emit a partial cache result from `cache-only` queries when `returnPartialData` is `false`.
 
+## 3.13.5
+
+### Patch Changes
+
+- [#12461](https://github.com/apollographql/apollo-client/pull/12461) [`12c8d06`](https://github.com/apollographql/apollo-client/commit/12c8d06f1ef7cfbece8e3a63b7ad09d91334f663) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fix an issue where a `cache-first` query would return the result for previous variables when a cache update is issued after simultaneously changing variables and skipping the query.
+
 ## 3.13.4
 
 ### Patch Changes

package/__cjs/core/ApolloClient.cjs

@@ -26,7 +26,23 @@ let hasSuggestedDevtools = false;
 class ApolloClient {
     link;
     cache;
+    /**
+     * @deprecated `disableNetworkFetches` has been renamed to `prioritizeCacheValues`.
+     */
     disableNetworkFetches;
+    set prioritizeCacheValues(value) {
+        this.queryManager.prioritizeCacheValues = value;
+    }
+    /**
+     * Whether to prioritize cache values over network results when `query` or `watchQuery` is called.
+     * This will essentially turn a `"network-only"` or `"cache-and-network"` fetchPolicy into a `"cache-first"` fetchPolicy,
+     * but without influencing the `fetchPolicy` of the created `ObservableQuery` long-term.
+     *
+     * This can e.g. be used to prioritize the cache during the first render after SSR.
+     */
+    get prioritizeCacheValues() {
+        return this.queryManager.prioritizeCacheValues;
+    }
     version;
     queryDeduplication;
     defaultOptions;
@@ -79,7 +95,6 @@ class ApolloClient {
         }
         this.link = link;
         this.cache = cache;
-        this.disableNetworkFetches = ssrMode || ssrForceFetchDelay > 0;
         this.queryDeduplication = queryDeduplication;
         this.defaultOptions = defaultOptions || {};
         this.typeDefs = typeDefs;
@@ -90,9 +105,6 @@ class ApolloClient {
         if (this.devtoolsConfig.enabled === undefined) {
             this.devtoolsConfig.enabled = environment_1.__DEV__;
         }
-        if (ssrForceFetchDelay) {
-            setTimeout(() => (this.disableNetworkFetches = false), ssrForceFetchDelay);
-        }
         this.watchQuery = this.watchQuery.bind(this);
         this.query = this.query.bind(this);
         this.mutate = this.mutate.bind(this);
@@ -129,6 +141,12 @@ class ApolloClient {
                 }
                 : void 0,
         });
+        this.prioritizeCacheValues = ssrMode || ssrForceFetchDelay > 0;
+        if (ssrForceFetchDelay) {
+            setTimeout(() => {
+                this.prioritizeCacheValues = false;
+            }, ssrForceFetchDelay);
+        }
         if (this.devtoolsConfig.enabled)
             this.connectToDevTools();
     }
@@ -212,12 +230,6 @@ class ApolloClient {
         if (this.defaultOptions.watchQuery) {
             options = (0, utilities_1.mergeOptions)(this.defaultOptions.watchQuery, options);
         }
-        // XXX Overwriting options is probably not the best way to do this long term...
-        if (this.disableNetworkFetches &&
-            (options.fetchPolicy === "network-only" ||
-                options.fetchPolicy === "cache-and-network")) {
-            options = { ...options, fetchPolicy: "cache-first" };
-        }
         return this.queryManager.watchQuery(options);
     }
     /**
@@ -234,9 +246,6 @@ class ApolloClient {
             options = (0, utilities_1.mergeOptions)(this.defaultOptions.query, options);
         }
         (0, invariant_1.invariant)(options.fetchPolicy !== "cache-and-network", 63);
-        if (this.disableNetworkFetches && options.fetchPolicy === "network-only") {
-            options = { ...options, fetchPolicy: "cache-first" };
-        }
         return this.queryManager.query(options);
     }
     /**