@apollo/client 3.8.0-beta.5 → 3.8.0-beta.6

package/apollo-client.cjs

@@ -34,7 +34,7 @@ var invariant__default = /*#__PURE__*/_interopDefaultLegacy(invariant$1);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-var version = '3.8.0-beta.5';
+var version = '3.8.0-beta.6';
 
 function maybe(thunk) {
     try {
@@ -132,7 +132,7 @@ function shouldInclude(_a, variables) {
         var evaledValue = false;
         if (ifArgument.value.kind === 'Variable') {
             evaledValue = variables && variables[ifArgument.value.name.value];
-            invariant(evaledValue !== void 0, 66, directive.name.value);
+            invariant(evaledValue !== void 0, 65, directive.name.value);
         }
         else {
             evaledValue = ifArgument.value.value;
@@ -168,12 +168,12 @@ function getInclusionDirectives(directives) {
                 return;
             var directiveArguments = directive.arguments;
             var directiveName = directive.name.value;
-            invariant(directiveArguments && directiveArguments.length === 1, 67, directiveName);
+            invariant(directiveArguments && directiveArguments.length === 1, 66, directiveName);
             var ifArgument = directiveArguments[0];
-            invariant(ifArgument.name && ifArgument.name.value === 'if', 68, directiveName);
+            invariant(ifArgument.name && ifArgument.name.value === 'if', 67, directiveName);
             var ifValue = ifArgument.value;
             invariant(ifValue &&
-                (ifValue.kind === 'Variable' || ifValue.kind === 'BooleanValue'), 69, directiveName);
+                (ifValue.kind === 'Variable' || ifValue.kind === 'BooleanValue'), 68, directiveName);
             result.push({ directive: directive, ifArgument: ifArgument });
         });
     }
@@ -200,7 +200,7 @@ function getFragmentQueryDocument(document, fragmentName) {
     document.definitions.forEach(function (definition) {
         if (definition.kind === 'OperationDefinition') {
             throw newInvariantError(
-                70,
+                69,
                 definition.operation,
                 definition.name ? " named '".concat(definition.name.value, "'") : ''
             );
@@ -210,7 +210,7 @@ function getFragmentQueryDocument(document, fragmentName) {
         }
     });
     if (typeof actualFragmentName === 'undefined') {
-        invariant(fragments.length === 1, 71, fragments.length);
+        invariant(fragments.length === 1, 70, fragments.length);
         actualFragmentName = fragments[0].name.value;
     }
     var query = tslib.__assign(tslib.__assign({}, document), { definitions: tslib.__spreadArray([
@@ -251,7 +251,7 @@ function getFragmentFromSelection(selection, fragmentMap) {
                 return fragmentMap(fragmentName);
             }
             var fragment = fragmentMap && fragmentMap[fragmentName];
-            invariant(fragment, 72, fragmentName);
+            invariant(fragment, 71, fragmentName);
             return fragment || null;
         }
         default:
@@ -329,7 +329,7 @@ function valueToObjectRepresentation(argObj, name, value, variables) {
         argObj[name.value] = null;
     }
     else {
-        throw newInvariantError(81, name.value, value.kind);
+        throw newInvariantError(80, name.value, value.kind);
     }
 }
 function storeKeyNameFromField(field, variables) {
@@ -474,16 +474,16 @@ function isInlineFragment(selection) {
 }
 
 function checkDocument(doc) {
-    invariant(doc && doc.kind === 'Document', 73);
+    invariant(doc && doc.kind === 'Document', 72);
     var operations = doc.definitions
         .filter(function (d) { return d.kind !== 'FragmentDefinition'; })
         .map(function (definition) {
         if (definition.kind !== 'OperationDefinition') {
-            throw newInvariantError(74, definition.kind);
+            throw newInvariantError(73, definition.kind);
         }
         return definition;
     });
-    invariant(operations.length <= 1, 75, operations.length);
+    invariant(operations.length <= 1, 74, operations.length);
     return doc;
 }
 function getOperationDefinition(doc) {
@@ -506,14 +506,14 @@ function getFragmentDefinitions(doc) {
 }
 function getQueryDefinition(doc) {
     var queryDef = getOperationDefinition(doc);
-    invariant(queryDef && queryDef.operation === 'query', 76);
+    invariant(queryDef && queryDef.operation === 'query', 75);
     return queryDef;
 }
 function getFragmentDefinition(doc) {
-    invariant(doc.kind === 'Document', 77);
-    invariant(doc.definitions.length <= 1, 78);
+    invariant(doc.kind === 'Document', 76);
+    invariant(doc.definitions.length <= 1, 77);
     var fragmentDef = doc.definitions[0];
-    invariant(fragmentDef.kind === 'FragmentDefinition', 79);
+    invariant(fragmentDef.kind === 'FragmentDefinition', 78);
     return fragmentDef;
 }
 function getMainDefinition(queryDoc) {
@@ -536,7 +536,7 @@ function getMainDefinition(queryDoc) {
     if (fragmentDefinition) {
         return fragmentDefinition;
     }
-    throw newInvariantError(80);
+    throw newInvariantError(79);
 }
 function getDefaultValues(definition) {
     var defaultValues = Object.create(null);
@@ -608,7 +608,7 @@ var DocumentTransform = (function () {
             return;
         var cacheKeys = this.getCacheKey(document);
         if (cacheKeys) {
-            invariant(Array.isArray(cacheKeys), 65);
+            invariant(Array.isArray(cacheKeys), 64);
             return this.stableCacheKeys.lookupArray(cacheKeys);
         }
     };
@@ -701,7 +701,7 @@ function removeDirectivesFromDocument(directives, doc) {
                 return getInUseByFragmentName(ancestor.name.value);
             }
         }
-        __DEV__ && invariant.error(82);
+        __DEV__ && invariant.error(81);
         return null;
     };
     var operationCount = 0;
@@ -978,6 +978,7 @@ function createFulfilledPromise(value) {
 }
 function createRejectedPromise(reason) {
     var promise = Promise.reject(reason);
+    promise.catch(function () { });
     promise.status = 'rejected';
     promise.reason = reason;
     return promise;
@@ -1378,7 +1379,7 @@ function toPromise(observable) {
         observable.subscribe({
             next: function (data) {
                 if (completed) {
-                    __DEV__ && invariant.warn(41);
+                    __DEV__ && invariant.warn(40);
                 }
                 else {
                     completed = true;
@@ -1421,7 +1422,7 @@ function validateOperation(operation) {
     for (var _i = 0, _a = Object.keys(operation); _i < _a.length; _i++) {
         var key = _a[_i];
         if (OPERATION_FIELDS.indexOf(key) < 0) {
-            throw newInvariantError(42, key);
+            throw newInvariantError(41, key);
         }
     }
     return operation;
@@ -1528,7 +1529,7 @@ var ApolloLink = (function () {
     ApolloLink.concat = function (first, second) {
         var firstLink = toLink(first);
         if (isTerminating(firstLink)) {
-            __DEV__ && invariant.warn(34, firstLink);
+            __DEV__ && invariant.warn(33, firstLink);
             return firstLink;
         }
         var nextLink = toLink(second);
@@ -1552,7 +1553,7 @@ var ApolloLink = (function () {
         return ApolloLink.concat(this, next);
     };
     ApolloLink.prototype.request = function (operation, forward) {
-        throw newInvariantError(35);
+        throw newInvariantError(34);
     };
     ApolloLink.prototype.onError = function (error, observer) {
         if (observer && observer.error) {
@@ -1927,7 +1928,7 @@ var serializeFetchParameter = function (p, label) {
         serialized = JSON.stringify(p);
     }
     catch (e) {
-        var parseError = newInvariantError(38, label, e.message);
+        var parseError = newInvariantError(37, label, e.message);
         parseError.parseError = e;
         throw parseError;
     }
@@ -2010,7 +2011,7 @@ function removeDuplicateHeaders(headers, preserveHeaderCase) {
 
 var checkFetcher = function (fetcher) {
     if (!fetcher && typeof fetch === 'undefined') {
-        throw newInvariantError(36);
+        throw newInvariantError(35);
     }
 };
 
@@ -2145,7 +2146,7 @@ var createHttpLink = function (linkOptions) {
             options.headers = options.headers || {};
             var acceptHeader = "multipart/mixed;";
             if (isSubscription && hasDefer) {
-                __DEV__ && invariant.warn(37);
+                __DEV__ && invariant.warn(36);
             }
             if (isSubscription) {
                 acceptHeader += 'boundary=graphql;subscriptionSpec=1.0,application/json';
@@ -4765,7 +4766,7 @@ var ObservableQuery = (function (_super) {
             var vars = queryDef.variableDefinitions;
             if (!vars || !vars.some(function (v) { return v.variable.name.value === "variables"; })) {
                 __DEV__ && invariant.warn(
-                    19,
+                    18,
                     variables,
                     ((_a = queryDef.name) === null || _a === void 0 ? void 0 : _a.value) || queryDef
                 );
@@ -4856,7 +4857,7 @@ var ObservableQuery = (function (_super) {
                     options.onError(err);
                     return;
                 }
-                __DEV__ && invariant.error(20, err);
+                __DEV__ && invariant.error(19, err);
             },
         });
         this.subscriptions.add(subscription);
@@ -4869,6 +4870,10 @@ var ObservableQuery = (function (_super) {
     ObservableQuery.prototype.setOptions = function (newOptions) {
         return this.reobserve(newOptions);
     };
+    ObservableQuery.prototype.silentSetOptions = function (newOptions) {
+        var mergedOptions = compact(this.options, newOptions || {});
+        assign(this.options, mergedOptions);
+    };
     ObservableQuery.prototype.setVariables = function (variables) {
         if (equal.equal(this.variables, variables)) {
             return this.observers.size
@@ -4954,7 +4959,7 @@ var ObservableQuery = (function (_super) {
             pollingInfo.interval === pollInterval) {
             return;
         }
-        invariant(pollInterval, 21);
+        invariant(pollInterval, 20);
         var info = pollingInfo || (this.pollingInfo = {});
         info.interval = pollInterval;
         var maybeFetch = function () {
@@ -5107,11 +5112,11 @@ function reobserveCacheFirst(obsQuery) {
     return obsQuery.reobserve();
 }
 function defaultSubscriptionObserverErrorCallback(error) {
-    __DEV__ && invariant.error(22, error.message, error.stack);
+    __DEV__ && invariant.error(21, error.message, error.stack);
 }
 function logMissingFieldErrors(missing) {
     if (__DEV__ && missing) {
-        __DEV__ && invariant.debug(23, missing);
+        __DEV__ && invariant.debug(22, missing);
     }
 }
 function skipCacheDataFor(fetchPolicy) {
@@ -5293,7 +5298,7 @@ var LocalState = (function () {
                         }
                         else {
                             fragment = fragmentMap[selection.name.value];
-                            invariant(fragment, 17, selection.name.value);
+                            invariant(fragment, 16, selection.name.value);
                         }
                         if (fragment && fragment.typeCondition) {
                             typeCondition = fragment.typeCondition.name.value;
@@ -5406,7 +5411,7 @@ var LocalState = (function () {
                     },
                     FragmentSpread: function (spread, _, __, ___, ancestors) {
                         var fragment = fragmentMap[spread.name.value];
-                        invariant(fragment, 18, spread.name.value);
+                        invariant(fragment, 17, spread.name.value);
                         var fragmentSelections = collectByDefinition(fragment);
                         if (fragmentSelections.size > 0) {
                             ancestors.forEach(function (node) {
@@ -5743,7 +5748,7 @@ var QueryManager = (function () {
         this.queries.forEach(function (_info, queryId) {
             _this.stopQueryNoBroadcast(queryId);
         });
-        this.cancelPendingFetches(newInvariantError(24));
+        this.cancelPendingFetches(newInvariantError(23));
     };
     QueryManager.prototype.cancelPendingFetches = function (error) {
         this.fetchCancelFns.forEach(function (cancel) { return cancel(error); });
@@ -5757,9 +5762,9 @@ var QueryManager = (function () {
             return tslib.__generator(this, function (_h) {
                 switch (_h.label) {
                     case 0:
-                        invariant(mutation, 25);
+                        invariant(mutation, 24);
                         invariant(fetchPolicy === 'network-only' ||
-                            fetchPolicy === 'no-cache', 26);
+                            fetchPolicy === 'no-cache', 25);
                         mutationId = this.generateMutationId();
                         mutation = this.cache.transformForLink(this.transform(mutation));
                         hasClientExports = this.getDocumentInfo(mutation).hasClientExports;
@@ -6077,10 +6082,10 @@ var QueryManager = (function () {
     QueryManager.prototype.query = function (options, queryId) {
         var _this = this;
         if (queryId === void 0) { queryId = this.generateQueryId(); }
-        invariant(options.query, 27);
-        invariant(options.query.kind === 'Document', 28);
-        invariant(!options.returnPartialData, 29);
-        invariant(!options.pollInterval, 30);
+        invariant(options.query, 26);
+        invariant(options.query.kind === 'Document', 27);
+        invariant(!options.returnPartialData, 28);
+        invariant(!options.pollInterval, 29);
         return this.fetchQuery(queryId, tslib.__assign(tslib.__assign({}, options), { query: this.transform(options.query) })).finally(function () { return _this.stopQuery(queryId); });
     };
     QueryManager.prototype.generateQueryId = function () {
@@ -6105,7 +6110,7 @@ var QueryManager = (function () {
         if (options === void 0) { options = {
             discardWatches: true,
         }; }
-        this.cancelPendingFetches(newInvariantError(31));
+        this.cancelPendingFetches(newInvariantError(30));
         this.queries.forEach(function (queryInfo) {
             if (queryInfo.observableQuery) {
                 queryInfo.networkStatus = exports.NetworkStatus.loading;
@@ -6181,7 +6186,7 @@ var QueryManager = (function () {
         if (__DEV__ && queryNamesAndDocs.size) {
             queryNamesAndDocs.forEach(function (included, nameOrDoc) {
                 if (!included) {
-                    __DEV__ && invariant.warn(typeof nameOrDoc === "string" ? 32 : 33, nameOrDoc);
+                    __DEV__ && invariant.warn(typeof nameOrDoc === "string" ? 31 : 32, nameOrDoc);
                 }
             });
         }
@@ -6643,7 +6648,8 @@ var ApolloClient = (function () {
                     }
                 }
                 if (url) {
-                    __DEV__ && invariant.log(14, url);
+                    __DEV__ && invariant.log("Download the Apollo DevTools for a better development " +
+                        "experience: %s", url);
                 }
             }
         }
@@ -6706,7 +6712,7 @@ var ApolloClient = (function () {
         if (this.defaultOptions.query) {
             options = mergeOptions(this.defaultOptions.query, options);
         }
-        invariant(options.fetchPolicy !== 'cache-and-network', 15);
+        invariant(options.fetchPolicy !== 'cache-and-network', 14);
         if (this.disableNetworkFetches && options.fetchPolicy === 'network-only') {
             options = tslib.__assign(tslib.__assign({}, options), { fetchPolicy: 'cache-first' });
         }
@@ -6795,7 +6801,7 @@ var ApolloClient = (function () {
         result.queries = queries;
         result.results = results;
         result.catch(function (error) {
-            __DEV__ && invariant.debug(16, error);
+            __DEV__ && invariant.debug(15, error);
         });
         return result;
     };
@@ -6831,7 +6837,7 @@ var contextKey = canUseSymbol
     ? Symbol.for('__APOLLO_CONTEXT__')
     : '__APOLLO_CONTEXT__';
 function getApolloContext() {
-    invariant('createContext' in React__namespace, 44);
+    invariant('createContext' in React__namespace, 43);
     var contextStorage = global$1[contextKey] || (global$1[contextKey] = Object.create(null));
     return contextStorage[React__namespace.version] || (contextStorage[React__namespace.version] = Object.assign(React__namespace.createContext({}), { displayName: 'ApolloContext' }));
 }
@@ -6840,7 +6846,7 @@ var resetApolloContext = getApolloContext;
 var ApolloConsumer = function (props) {
     var ApolloContext = getApolloContext();
     return (React__namespace.createElement(ApolloContext.Consumer, null, function (context) {
-        invariant(context && context.client, 43);
+        invariant(context && context.client, 42);
         return props.children(context.client);
     }));
 };
@@ -6852,14 +6858,14 @@ var ApolloProvider = function (_a) {
     var context = React__namespace.useMemo(function () {
         return tslib.__assign(tslib.__assign({}, parentContext), { client: client || parentContext.client, suspenseCache: suspenseCache || parentContext.suspenseCache });
     }, [parentContext, client, suspenseCache]);
-    invariant(context.client, 45);
+    invariant(context.client, 44);
     return (React__namespace.createElement(ApolloContext.Provider, { value: context }, children));
 };
 
 function useApolloClient(override) {
     var context = React.useContext(getApolloContext());
     var client = override || context.client;
-    invariant(!!client, 48);
+    invariant(!!client, 47);
     return client;
 }
 
@@ -6872,7 +6878,7 @@ var useSyncExternalStore = realHook$1 || (function (subscribe, getSnapshot, getS
         !didWarnUncachedGetSnapshot &&
         value !== getSnapshot()) {
         didWarnUncachedGetSnapshot = true;
-        __DEV__ && invariant.error(58);
+        __DEV__ && invariant.error(57);
     }
     var _a = React__namespace.useState({ inst: { value: value, getSnapshot: getSnapshot } }), inst = _a[0].inst, forceUpdate = _a[1];
     if (canUseLayoutEffect) {
@@ -6935,7 +6941,7 @@ function parser(document) {
     if (cached)
         return cached;
     var variables, type, name;
-    invariant(!!document && !!document.kind, 59, document);
+    invariant(!!document && !!document.kind, 58, document);
     var fragments = [];
     var queries = [];
     var mutations = [];
@@ -6961,10 +6967,10 @@ function parser(document) {
         }
     }
     invariant(!fragments.length ||
-        (queries.length || mutations.length || subscriptions.length), 60);
+        (queries.length || mutations.length || subscriptions.length), 59);
     invariant(
         queries.length + mutations.length + subscriptions.length <= 1,
-        61,
+        60,
         document,
         queries.length,
         subscriptions.length,
@@ -6978,7 +6984,7 @@ function parser(document) {
         : mutations.length
             ? mutations
             : subscriptions;
-    invariant(definitions.length === 1, 62, document, definitions.length);
+    invariant(definitions.length === 1, 61, document, definitions.length);
     var definition = definitions[0];
     variables = definition.variableDefinitions || [];
     if (definition.name && definition.name.kind === 'Name') {
@@ -6997,7 +7003,7 @@ function verifyDocumentType(document, type) {
     var usedOperationName = operationName(operation.type);
     invariant(
         operation.type === type,
-        63,
+        62,
         requiredOperationName,
         requiredOperationName,
         usedOperationName
@@ -7048,7 +7054,7 @@ var InternalState = (function () {
         }
     }
     InternalState.prototype.forceUpdate = function () {
-        __DEV__ && invariant.warn(49);
+        __DEV__ && invariant.warn(48);
     };
     InternalState.prototype.executeQuery = function (options) {
         var _this = this;
@@ -7459,10 +7465,10 @@ function useSubscription(subscription, options) {
     if (!hasIssuedDeprecationWarningRef.current) {
         hasIssuedDeprecationWarningRef.current = true;
         if (options === null || options === void 0 ? void 0 : options.onSubscriptionData) {
-            __DEV__ && invariant.warn(options.onData ? 51 : 52);
+            __DEV__ && invariant.warn(options.onData ? 50 : 51);
         }
         if (options === null || options === void 0 ? void 0 : options.onSubscriptionComplete) {
-            __DEV__ && invariant.warn(options.onComplete ? 53 : 54);
+            __DEV__ && invariant.warn(options.onComplete ? 52 : 53);
         }
     }
     var _b = React.useState(function () {
@@ -7673,7 +7679,7 @@ var __use = realHook ||
 function useSuspenseCache(override) {
     var context = React.useContext(getApolloContext());
     var suspenseCache = override || context.suspenseCache;
-    invariant(suspenseCache, 55);
+    invariant(suspenseCache, 54);
     return suspenseCache;
 }
 
@@ -7688,11 +7694,10 @@ function useSuspenseQuery(query, options) {
     var queryRef = suspenseCache.getQueryRef(cacheKey, function () {
         return client.watchQuery(watchQueryOptions);
     });
-    var currentFetchPolicy = queryRef.watchQueryOptions.fetchPolicy;
     var _b = React.useState(function () { return new Map([[queryRef.key, queryRef.promise]]); }), promiseCache = _b[0], setPromiseCache = _b[1];
     var promise = promiseCache.get(queryRef.key);
-    if (currentFetchPolicy === 'standby' && fetchPolicy !== currentFetchPolicy) {
-        promise = queryRef.reobserve({ fetchPolicy: fetchPolicy });
+    if (queryRef.didChangeOptions(watchQueryOptions)) {
+        promise = queryRef.applyOptions(watchQueryOptions);
         promiseCache.set(queryRef.key, promise);
     }
     if (!promise) {
@@ -7716,7 +7721,7 @@ function useSuspenseQuery(query, options) {
             error: error,
         };
     }, [queryRef.result]);
-    var result = watchQueryOptions.fetchPolicy === 'standby' ? skipResult : __use(promise);
+    var result = fetchPolicy === 'standby' ? skipResult : __use(promise);
     var fetchMore = React.useCallback(function (options) {
         var promise = queryRef.fetchMore(options);
         setPromiseCache(function (previousPromiseCache) {
@@ -7758,11 +7763,11 @@ function validateFetchPolicy(fetchPolicy) {
         'no-cache',
         'cache-and-network',
     ];
-    invariant(supportedFetchPolicies.includes(fetchPolicy), 56, fetchPolicy);
+    invariant(supportedFetchPolicies.includes(fetchPolicy), 55, fetchPolicy);
 }
 function validatePartialDataReturn(fetchPolicy, returnPartialData) {
     if (fetchPolicy === 'no-cache' && returnPartialData) {
-        __DEV__ && invariant.warn(57);
+        __DEV__ && invariant.warn(56);
     }
 }
 function toApolloError(result) {
@@ -7796,6 +7801,14 @@ function useWatchQueryOptions(_a) {
 }
 
 var QUERY_REFERENCE_SYMBOL = Symbol();
+var OBSERVED_CHANGED_OPTIONS = [
+    'canonizeResults',
+    'context',
+    'errorPolicy',
+    'fetchPolicy',
+    'refetchWritePolicy',
+    'returnPartialData',
+];
 var InternalQueryReference = (function () {
     function InternalQueryReference(observable, options) {
         var _this = this;
@@ -7839,6 +7852,25 @@ var InternalQueryReference = (function () {
         enumerable: false,
         configurable: true
     });
+    InternalQueryReference.prototype.didChangeOptions = function (watchQueryOptions) {
+        var _this = this;
+        return OBSERVED_CHANGED_OPTIONS.some(function (option) {
+            return !equal.equal(_this.watchQueryOptions[option], watchQueryOptions[option]);
+        });
+    };
+    InternalQueryReference.prototype.applyOptions = function (watchQueryOptions) {
+        var currentFetchPolicy = this.watchQueryOptions.fetchPolicy;
+        if (currentFetchPolicy === 'standby' &&
+            currentFetchPolicy !== watchQueryOptions.fetchPolicy) {
+            this.promise = this.observable.reobserve(watchQueryOptions);
+        }
+        else {
+            this.observable.silentSetOptions(watchQueryOptions);
+            this.result = tslib.__assign(tslib.__assign({}, this.result), this.observable.getCurrentResult());
+            this.promise = createFulfilledPromise(this.result);
+        }
+        return this.promise;
+    };
     InternalQueryReference.prototype.listen = function (listener) {
         var _this = this;
         clearTimeout(this.autoDisposeTimeoutId);
@@ -7903,10 +7935,7 @@ var InternalQueryReference = (function () {
             }
             return;
         }
-        this.result = result;
-        this.promise = result.data
-            ? createFulfilledPromise(result)
-            : createRejectedPromise(result);
+        this.promise = createRejectedPromise(error);
         this.deliver(this.promise);
     };
     InternalQueryReference.prototype.deliver = function (promise) {
@@ -7920,16 +7949,15 @@ function useBackgroundQuery(query, options) {
     var suspenseCache = useSuspenseCache(options.suspenseCache);
     var client = useApolloClient(options.client);
     var watchQueryOptions = useWatchQueryOptions({ client: client, query: query, options: options });
-    var fetchPolicy = watchQueryOptions.fetchPolicy, variables = watchQueryOptions.variables;
+    var variables = watchQueryOptions.variables;
     var _a = options.queryKey, queryKey = _a === void 0 ? [] : _a;
     var cacheKey = [client, query, canonicalStringify(variables)].concat(queryKey);
     var queryRef = suspenseCache.getQueryRef(cacheKey, function () {
         return client.watchQuery(watchQueryOptions);
     });
-    var currentFetchPolicy = queryRef.watchQueryOptions.fetchPolicy;
     var _b = React.useState(function () { return new Map([[queryRef.key, queryRef.promise]]); }), promiseCache = _b[0], setPromiseCache = _b[1];
-    if (currentFetchPolicy === 'standby' && fetchPolicy !== currentFetchPolicy) {
-        var promise = queryRef.reobserve({ fetchPolicy: fetchPolicy });
+    if (queryRef.didChangeOptions(watchQueryOptions)) {
+        var promise = queryRef.applyOptions(watchQueryOptions);
         promiseCache.set(queryRef.key, promise);
     }
     useTrackedQueryRefs(queryRef);
@@ -7963,7 +7991,7 @@ function useBackgroundQuery(query, options) {
 function useReadQuery(queryRef) {
     var _a = React.useState(0), forceUpdate = _a[1];
     var internalQueryRef = queryRef[QUERY_REFERENCE_SYMBOL];
-    invariant__default(internalQueryRef.promiseCache, 50);
+    invariant__default(internalQueryRef.promiseCache, 49);
     var skipResult = React.useMemo(function () {
         var error = toApolloError(internalQueryRef.result);
         return {