@apollo/client 4.0.0-alpha.3 → 4.0.0-alpha.5

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/eleven-kangaroos-jump.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+Remove `variables` from the result returned from `useSubscription`.

package/.changeset/forty-shrimps-fry.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+Subscriptions now emit a `SubscribeResult` instead of a `FetchResult`. As a result, the `errors` field has been removed in favor of `error`.

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/grumpy-vans-type.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+Unify error behavior on mutations for GraphQL errors and network errors by ensuring network errors are subject to the `errorPolicy`. Network errors created when using an `errorPolicy` of `all` will now resolve the promise and be returned on the `error` property of the result, or stripped away when the `errorPolicy` is `none`.

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/little-spoons-kick.md

@@ -0,0 +1,7 @@
+---
+"@apollo/client": major
+---
+
+`client.mutate` now returns a `MutateResult` instead of `FetchResult`. As a result, the `errors` property has been removed in favor of `error` which is set if either a network error occured or GraphQL errors are returned from the server.
+
+`useMutation` now also returns a `MutateResult` instead of a `FetchResult`.

package/.changeset/loud-cows-raise.md

@@ -0,0 +1,7 @@
+---
+"@apollo/client": patch
+---
+
+`useQuery` with `ssr: false` - previously, `skip` had a higher priortity than `ssr: false` while `ssr: false` had a higher priority than `fetchPolicy: "standby"` (which is roughly equivalent to `skip`).
+
+This priority has been adjusted so now both `skip` and `fetchPolicy: "standby"` have a higher priority than `ssr: false` and will return `loading: false`, while `ssr: false` will only come after those and will return `loading: true` if those are not set.

package/.changeset/many-buses-allow.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Fix an issue where passing `onError` to `useMutation` would resolve the promise returned by the `mutate` function instead of rejecting when using an `errorPolicy` of `none`.

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/poor-eels-punch.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+Mutations no longer report errors if the GraphQL result from the server contains an empty array of errors.

package/.changeset/pre.json

@@ -16,23 +16,33 @@
     "cuddly-spiders-tie",
     "curvy-pianos-count",
     "dirty-trees-pump",
+    "eighty-squids-fix",
+    "eleven-kangaroos-jump",
     "empty-rabbits-move",
     "fluffy-shoes-applaud",
     "forty-hairs-occur",
+    "forty-shrimps-fry",
     "four-ghosts-watch",
     "fresh-moose-hope",
+    "funny-jeans-invent",
     "good-dolphins-peel",
     "gorgeous-chefs-tap",
+    "grumpy-vans-type",
     "healthy-apes-sneeze",
     "hip-vans-act",
     "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",
+    "little-spoons-kick",
+    "loud-cows-raise",
     "lucky-hats-push",
+    "many-buses-allow",
     "many-papayas-hide",
     "metal-needles-search",
     "mighty-penguins-wink",
@@ -41,11 +51,14 @@
     "nervous-goats-allow",
     "nice-donkeys-reflect",
     "nice-waves-work",
+    "odd-lemons-relax",
     "polite-bees-care",
+    "poor-eels-punch",
     "popular-games-sleep",
     "purple-lions-cough",
     "rare-houses-prove",
     "real-gorillas-move",
+    "real-teachers-peel",
     "rich-eagles-cross",
     "rich-kids-carry",
     "rude-fans-study",
@@ -53,6 +66,7 @@
     "shiny-carrots-invent",
     "short-jokes-jam",
     "silly-knives-exist",
+    "slimy-chicken-melt",
     "slimy-maps-press",
     "slow-ravens-explain",
     "small-buttons-rhyme",
@@ -67,12 +81,16 @@
     "tall-bikes-develop",
     "tall-cups-suffer",
     "tame-doors-shop",
+    "thick-books-grin",
     "tidy-squids-poke",
+    "tough-rockets-allow",
     "tough-taxis-smoke",
     "tough-tips-drop",
+    "tricky-tables-shave",
     "twenty-snakes-sort",
     "unlucky-kiwis-sell",
     "unlucky-sheep-change",
+    "warm-ties-sit",
     "yellow-cats-judge",
     "young-phones-fold",
     "young-turtles-explode"

package/.changeset/real-teachers-peel.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+Unify error behavior on subscriptions for GraphQL errors and network errors by ensuring network errors are subject to the `errorPolicy`. Network errors that terminate the connection will now be emitted on the `error` property passed to the `next` callback followed by a call to the `complete` callback.

package/.changeset/slimy-chicken-melt.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+Remove deprecated `onSubscriptionData` and `onSubscriptionComplete` callbacks from `useSubscription`. Use `onData` and `onComplete` instead.

package/.changeset/thick-books-grin.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": minor
+---
+
+Split out SSR-specific code from useQuery hook, remove RenderPromises

package/.changeset/tough-rockets-allow.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Fix an issue where additional response properties were returned on the result returned from `client.mutate`, such as `@defer` payload fields. These properties are now stripped out to correspond to the TypeScript type.

package/.changeset/tricky-tables-shave.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+GraphQL errors or network errors emitted while using an `errorPolicy` of `ignore` in subscriptions will no longer emit a result if there is no `data` emitted along with the error.

package/.changeset/warm-ties-sit.md

@@ -0,0 +1,7 @@
+---
+"@apollo/client": major
+---
+
+Subscriptions no longer emit errors in the `error` callback and instead provide errors on the `error` property on the result passed to the `next` callback. As a result, errors will no longer automatically terminate the connection allowing additional results to be emitted when the connection stays open.
+
+When an error terminates the downstream connection, a `next` event will be emitted with an `error` property followed by a `complete` event instead.

package/CHANGELOG.md

@@ -1,5 +1,89 @@
 # @apollo/client
 
+## 4.0.0-alpha.5
+
+### Major Changes
+
+- [#12478](https://github.com/apollographql/apollo-client/pull/12478) [`5ea6a45`](https://github.com/apollographql/apollo-client/commit/5ea6a45b3ec2f0d526abe78ae03c42bb519f87c7) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Remove `variables` from the result returned from `useSubscription`.
+
+- [#12476](https://github.com/apollographql/apollo-client/pull/12476) [`6afff60`](https://github.com/apollographql/apollo-client/commit/6afff60beece953406af2cbe07f7ccbf973cadaa) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Subscriptions now emit a `SubscribeResult` instead of a `FetchResult`. As a result, the `errors` field has been removed in favor of `error`.
+
+- [#12475](https://github.com/apollographql/apollo-client/pull/12475) [`3de63eb`](https://github.com/apollographql/apollo-client/commit/3de63ebcdf95a87adc31e6b4a39cae5391ed945a) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Unify error behavior on mutations for GraphQL errors and network errors by ensuring network errors are subject to the `errorPolicy`. Network errors created when using an `errorPolicy` of `all` will now resolve the promise and be returned on the `error` property of the result, or stripped away when the `errorPolicy` is `none`.
+
+- [#12475](https://github.com/apollographql/apollo-client/pull/12475) [`3de63eb`](https://github.com/apollographql/apollo-client/commit/3de63ebcdf95a87adc31e6b4a39cae5391ed945a) Thanks [@jerelmiller](https://github.com/jerelmiller)! - `client.mutate` now returns a `MutateResult` instead of `FetchResult`. As a result, the `errors` property has been removed in favor of `error` which is set if either a network error occured or GraphQL errors are returned from the server.
+
+  `useMutation` now also returns a `MutateResult` instead of a `FetchResult`.
+
+- [#12475](https://github.com/apollographql/apollo-client/pull/12475) [`3de63eb`](https://github.com/apollographql/apollo-client/commit/3de63ebcdf95a87adc31e6b4a39cae5391ed945a) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Mutations no longer report errors if the GraphQL result from the server contains an empty array of errors.
+
+- [#12476](https://github.com/apollographql/apollo-client/pull/12476) [`6afff60`](https://github.com/apollographql/apollo-client/commit/6afff60beece953406af2cbe07f7ccbf973cadaa) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Unify error behavior on subscriptions for GraphQL errors and network errors by ensuring network errors are subject to the `errorPolicy`. Network errors that terminate the connection will now be emitted on the `error` property passed to the `next` callback followed by a call to the `complete` callback.
+
+- [#12478](https://github.com/apollographql/apollo-client/pull/12478) [`5ea6a45`](https://github.com/apollographql/apollo-client/commit/5ea6a45b3ec2f0d526abe78ae03c42bb519f87c7) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Remove deprecated `onSubscriptionData` and `onSubscriptionComplete` callbacks from `useSubscription`. Use `onData` and `onComplete` instead.
+
+- [#12476](https://github.com/apollographql/apollo-client/pull/12476) [`6afff60`](https://github.com/apollographql/apollo-client/commit/6afff60beece953406af2cbe07f7ccbf973cadaa) Thanks [@jerelmiller](https://github.com/jerelmiller)! - GraphQL errors or network errors emitted while using an `errorPolicy` of `ignore` in subscriptions will no longer emit a result if there is no `data` emitted along with the error.
+
+- [#12476](https://github.com/apollographql/apollo-client/pull/12476) [`6afff60`](https://github.com/apollographql/apollo-client/commit/6afff60beece953406af2cbe07f7ccbf973cadaa) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Subscriptions no longer emit errors in the `error` callback and instead provide errors on the `error` property on the result passed to the `next` callback. As a result, errors will no longer automatically terminate the connection allowing additional results to be emitted when the connection stays open.
+
+  When an error terminates the downstream connection, a `next` event will be emitted with an `error` property followed by a `complete` event instead.
+
+### Minor Changes
+
+- [#12487](https://github.com/apollographql/apollo-client/pull/12487) [`b695e5e`](https://github.com/apollographql/apollo-client/commit/b695e5e10ab0eb47948e914b610f67c40267349e) Thanks [@phryneas](https://github.com/phryneas)! - Split out SSR-specific code from useQuery hook, remove RenderPromises
+
+### Patch Changes
+
+- [#12487](https://github.com/apollographql/apollo-client/pull/12487) [`b695e5e`](https://github.com/apollographql/apollo-client/commit/b695e5e10ab0eb47948e914b610f67c40267349e) Thanks [@phryneas](https://github.com/phryneas)! - `useQuery` with `ssr: false` - previously, `skip` had a higher priortity than `ssr: false` while `ssr: false` had a higher priority than `fetchPolicy: "standby"` (which is roughly equivalent to `skip`).
+
+  This priority has been adjusted so now both `skip` and `fetchPolicy: "standby"` have a higher priority than `ssr: false` and will return `loading: false`, while `ssr: false` will only come after those and will return `loading: true` if those are not set.
+
+- [#12475](https://github.com/apollographql/apollo-client/pull/12475) [`3de63eb`](https://github.com/apollographql/apollo-client/commit/3de63ebcdf95a87adc31e6b4a39cae5391ed945a) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fix an issue where passing `onError` to `useMutation` would resolve the promise returned by the `mutate` function instead of rejecting when using an `errorPolicy` of `none`.
+
+- [#12475](https://github.com/apollographql/apollo-client/pull/12475) [`3de63eb`](https://github.com/apollographql/apollo-client/commit/3de63ebcdf95a87adc31e6b4a39cae5391ed945a) Thanks [@jerelmiller](https://github.com/jerelmiller)! - Fix an issue where additional response properties were returned on the result returned from `client.mutate`, such as `@defer` payload fields. These properties are now stripped out to correspond to the TypeScript type.
+
+## 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

package/__cjs/cache/core/cache.cjs

@@ -94,7 +94,7 @@ class ApolloCache {
         if (environment_1.__DEV__) {
             const actualFragmentName = fragmentName || (0, utilities_1.getFragmentDefinition)(fragment).name.value;
             if (!id) {
-                __DEV__ && invariant_1.invariant.warn(97, actualFragmentName);
+                __DEV__ && invariant_1.invariant.warn(93, actualFragmentName);
             }
         }
         const diffOptions = {

package/__cjs/cache/inmemory/entityStore.cjs

@@ -81,7 +81,7 @@ class EntityStore {
         // then there are no fields to be merged, so we're done.
         if (!incoming)
             return;
-        (0, invariant_1.invariant)(typeof dataId === "string", 83);
+        (0, invariant_1.invariant)(typeof dataId === "string", 79);
         const merged = new utilities_1.DeepMerger(storeObjectReconciler).merge(existing, incoming);
         // Even if merged === existing, existing may have come from a lower
         // layer, so we always need to set this.data[dataId] on this level.
@@ -181,7 +181,7 @@ class EntityStore {
                             if (environment_1.__DEV__) {
                                 const checkReference = (ref) => {
                                     if (this.lookup(ref.__ref) === undefined) {
-                                        __DEV__ && invariant_1.invariant.warn(84, ref);
+                                        __DEV__ && invariant_1.invariant.warn(80, ref);
                                         return true;
                                     }
                                 };
@@ -210,7 +210,7 @@ class EntityStore {
                                             }
                                         }
                                         if (seenReference && someNonReference !== undefined) {
-                                            __DEV__ && invariant_1.invariant.warn(85, someNonReference);
+                                            __DEV__ && invariant_1.invariant.warn(81, someNonReference);
                                             break;
                                         }
                                     }

package/__cjs/cache/inmemory/key-extractor.cjs

@@ -41,7 +41,7 @@ function keyFieldsFnFromSpecifier(specifier) {
                     // context.readField for this extraction.
                     extracted = extractKeyPath(object, schemaKeyPath, extractKey);
                 }
-                (0, invariant_1.invariant)(extracted !== void 0, 86, schemaKeyPath.join("."), object);
+                (0, invariant_1.invariant)(extracted !== void 0, 82, schemaKeyPath.join("."), object);
                 return extracted;
             }));
             return `${context.typename}:${JSON.stringify(keyObject)}`;

package/__cjs/cache/inmemory/policies.cjs

@@ -203,7 +203,7 @@ class Policies {
         const rootId = "ROOT_" + which.toUpperCase();
         const old = this.rootTypenamesById[rootId];
         if (typename !== old) {
-            (0, invariant_1.invariant)(!old || old === which, 87, which);
+            (0, invariant_1.invariant)(!old || old === which, 83, which);
             // First, delete any old __typename associated with this rootId from
             // rootIdsByTypename.
             if (old)
@@ -348,7 +348,7 @@ class Policies {
                 if (supertypeSet.has(supertype)) {
                     if (!typenameSupertypeSet.has(supertype)) {
                         if (checkingFuzzySubtypes) {
-                            __DEV__ && invariant_1.invariant.warn(88, typename, supertype);
+                            __DEV__ && invariant_1.invariant.warn(84, typename, supertype);
                         }
                         // Record positive results for faster future lookup.
                         // Unfortunately, we cannot safely cache negative results,
@@ -559,7 +559,7 @@ function normalizeReadFieldOptions(readFieldArgs, objectOrReference, variables)
         }
     }
     if (environment_1.__DEV__ && options.from === void 0) {
-        __DEV__ && invariant_1.invariant.warn(89, (0, utilities_1.stringifyForDisplay)(Array.from(readFieldArgs)));
+        __DEV__ && invariant_1.invariant.warn(85, (0, utilities_1.stringifyForDisplay)(Array.from(readFieldArgs)));
     }
     if (void 0 === options.variables) {
         options.variables = variables;
@@ -569,7 +569,7 @@ function normalizeReadFieldOptions(readFieldArgs, objectOrReference, variables)
 function makeMergeObjectsFunction(store) {
     return function mergeObjects(existing, incoming) {
         if ((0, helpers_js_1.isArray)(existing) || (0, helpers_js_1.isArray)(incoming)) {
-            throw (0, invariant_1.newInvariantError)(90);
+            throw (0, invariant_1.newInvariantError)(86);
         }
         // These dynamic checks are necessary because the parameters of a
         // custom merge function can easily have the any type, so the type

package/__cjs/cache/inmemory/readFromStore.cjs

@@ -197,7 +197,7 @@ class StoreReader {
             else {
                 const fragment = (0, utilities_1.getFragmentFromSelection)(selection, context.lookupFragment);
                 if (!fragment && selection.kind === graphql_1.Kind.FRAGMENT_SPREAD) {
-                    throw (0, invariant_1.newInvariantError)(91, selection.name.value);
+                    throw (0, invariant_1.newInvariantError)(87, selection.name.value);
                 }
                 if (fragment && policies.fragmentMatches(fragment, typename)) {
                     fragment.selectionSet.selections.forEach(workSet.add, workSet);
@@ -281,7 +281,7 @@ function assertSelectionSetForIdValue(store, field, fieldValue) {
             if ((0, utilities_1.isNonNullObject)(value)) {
                 (0, invariant_1.invariant)(
                     !(0, utilities_1.isReference)(value),
-                    92,
+                    88,
                     (0, helpers_js_1.getTypenameFromStoreObject)(store, value),
                     field.name.value
                 );

package/__cjs/cache/inmemory/writeToStore.cjs

@@ -72,7 +72,7 @@ class StoreWriter {
             context,
         });
         if (!(0, utilities_1.isReference)(ref)) {
-            throw (0, invariant_1.newInvariantError)(93, result);
+            throw (0, invariant_1.newInvariantError)(89, result);
         }
         // So far, the store has not been modified, so now it's time to process
         // context.incomingById and merge those incoming fields into context.store.
@@ -222,7 +222,7 @@ class StoreWriter {
                 // provide a default value, so its absence from the written data should
                 // not be cause for alarm.
                 !policies.getReadFunction(typename, field.name.value)) {
-                __DEV__ && invariant_1.invariant.error(94, (0, utilities_1.resultKeyNameFromField)(field), result);
+                __DEV__ && invariant_1.invariant.error(90, (0, utilities_1.resultKeyNameFromField)(field), result);
             }
         });
         // Identify the result object, even if dataId was already provided,
@@ -369,7 +369,7 @@ class StoreWriter {
                 else {
                     const fragment = (0, utilities_1.getFragmentFromSelection)(selection, context.lookupFragment);
                     if (!fragment && selection.kind === graphql_1.Kind.FRAGMENT_SPREAD) {
-                        throw (0, invariant_1.newInvariantError)(95, selection.name.value);
+                        throw (0, invariant_1.newInvariantError)(91, selection.name.value);
                     }
                     if (fragment &&
                         policies.fragmentMatches(fragment, typename, result, context.variables)) {
@@ -542,7 +542,7 @@ function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
             }
         });
     }
-    __DEV__ && invariant_1.invariant.warn(96, fieldName, parentType, childTypenames.length ?
+    __DEV__ && invariant_1.invariant.warn(92, fieldName, parentType, childTypenames.length ?
         "either ensure all objects of type " +
             childTypenames.join(" and ") +
             " have an ID or a custom merge function, or "

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;
@@ -65,7 +81,7 @@ class ApolloClient {
      */
     constructor(options) {
         if (!options.cache) {
-            throw (0, invariant_1.newInvariantError)(62);
+            throw (0, invariant_1.newInvariantError)(58);
         }
         const { uri, credentials, headers, cache, documentTransform, ssrMode = false, ssrForceFetchDelay = 0, 
         // Expose the client instance as window.__APOLLO_CLIENT__ and call
@@ -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);
     }
     /**
@@ -233,10 +245,7 @@ class ApolloClient {
         if (this.defaultOptions.query) {
             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" };
-        }
+        (0, invariant_1.invariant)(options.fetchPolicy !== "cache-and-network", 59);
         return this.queryManager.query(options);
     }
     /**
@@ -456,7 +465,7 @@ class ApolloClient {
         // result.queries and result.results instead, you shouldn't have to worry
         // about preventing uncaught rejections for the Promise.all result.
         result.catch((error) => {
-            __DEV__ && invariant_1.invariant.debug(64, error);
+            __DEV__ && invariant_1.invariant.debug(60, error);
         });
         return result;
     }