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

package/apollo-client.cjs

@@ -3,10 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var process$1 = require('ts-invariant/process');
-var graphql = require('graphql');
-var equal = require('@wry/equality');
 var invariant$1 = require('ts-invariant');
+var equal = require('@wry/equality');
+var graphql = require('graphql');
 var zenObservableTs = require('zen-observable-ts');
 require('symbol-observable');
 var optimism = require('optimism');
@@ -29,12 +28,11 @@ function _interopNamespace(e) {
     return Object.freeze(n);
 }
 
-var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 var invariant__default = /*#__PURE__*/_interopDefaultLegacy(invariant$1);
+var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 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.7';
 
 function maybe(thunk) {
     try {
@@ -46,8 +44,7 @@ function maybe(thunk) {
 var global$1 = (maybe(function () { return globalThis; }) ||
     maybe(function () { return window; }) ||
     maybe(function () { return self; }) ||
-    maybe(function () { return global; }) ||
-    maybe(function () { return maybe.constructor("return this")(); }));
+    maybe(function () { return global; }) || maybe(function () { return maybe.constructor("return this")(); }));
 
 var prefixCounts = new Map();
 function makeUniqueId(prefix) {
@@ -111,17 +108,6 @@ function getErrorMsg(message, messageArgs) {
         }))));
 }
 
-var DEV = ("__DEV__" in global$1
-    ? Boolean(global$1.__DEV__)
-    : maybe(function () { return process.env.NODE_ENV; }) !== "production");
-
-function removeTemporaryGlobals() {
-    return typeof graphql.Source === "function" ? process$1.remove() : process$1.remove();
-}
-
-var __DEV__ = DEV;
-removeTemporaryGlobals();
-
 function shouldInclude(_a, variables) {
     var directives = _a.directives;
     if (!directives || !directives.length) {
@@ -132,7 +118,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 +154,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 +186,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 +196,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 +237,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 +315,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 +460,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 +492,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 +522,7 @@ function getMainDefinition(queryDoc) {
     if (fragmentDefinition) {
         return fragmentDefinition;
     }
-    throw newInvariantError(80);
+    throw newInvariantError(79);
 }
 function getDefaultValues(definition) {
     var defaultValues = Object.create(null);
@@ -608,7 +594,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 +687,7 @@ function removeDirectivesFromDocument(directives, doc) {
                 return getInUseByFragmentName(ancestor.name.value);
             }
         }
-        __DEV__ && invariant.error(82);
+        globalThis.__DEV__ !== false && invariant.error(81);
         return null;
     };
     var operationCount = 0;
@@ -978,6 +964,7 @@ function createFulfilledPromise(value) {
 }
 function createRejectedPromise(reason) {
     var promise = Promise.reject(reason);
+    promise.catch(function () { });
     promise.status = 'rejected';
     promise.reason = reason;
     return promise;
@@ -1053,7 +1040,7 @@ function deepFreeze(value) {
     return value;
 }
 function shallowFreeze(obj) {
-    if (__DEV__ && !Object.isFrozen(obj)) {
+    if (globalThis.__DEV__ !== false && !Object.isFrozen(obj)) {
         try {
             Object.freeze(obj);
         }
@@ -1066,7 +1053,7 @@ function shallowFreeze(obj) {
     return obj;
 }
 function maybeDeepFreeze(obj) {
-    if (__DEV__) {
+    if (globalThis.__DEV__ !== false) {
         deepFreeze(obj);
     }
     return obj;
@@ -1378,7 +1365,7 @@ function toPromise(observable) {
         observable.subscribe({
             next: function (data) {
                 if (completed) {
-                    __DEV__ && invariant.warn(41);
+                    globalThis.__DEV__ !== false && invariant.warn(40);
                 }
                 else {
                     completed = true;
@@ -1421,7 +1408,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 +1515,7 @@ var ApolloLink = (function () {
     ApolloLink.concat = function (first, second) {
         var firstLink = toLink(first);
         if (isTerminating(firstLink)) {
-            __DEV__ && invariant.warn(34, firstLink);
+            globalThis.__DEV__ !== false && invariant.warn(33, firstLink);
             return firstLink;
         }
         var nextLink = toLink(second);
@@ -1552,7 +1539,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 +1914,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 +1997,7 @@ function removeDuplicateHeaders(headers, preserveHeaderCase) {
 
 var checkFetcher = function (fetcher) {
     if (!fetcher && typeof fetch === 'undefined') {
-        throw newInvariantError(36);
+        throw newInvariantError(35);
     }
 };
 
@@ -2082,7 +2069,7 @@ var backupFetch = maybe(function () { return fetch; });
 var createHttpLink = function (linkOptions) {
     if (linkOptions === void 0) { linkOptions = {}; }
     var _a = linkOptions.uri, uri = _a === void 0 ? '/graphql' : _a, preferredFetch = linkOptions.fetch, _b = linkOptions.print, print = _b === void 0 ? defaultPrinter : _b, includeExtensions = linkOptions.includeExtensions, preserveHeaderCase = linkOptions.preserveHeaderCase, useGETForQueries = linkOptions.useGETForQueries, _c = linkOptions.includeUnusedVariables, includeUnusedVariables = _c === void 0 ? false : _c, requestOptions = tslib.__rest(linkOptions, ["uri", "fetch", "print", "includeExtensions", "preserveHeaderCase", "useGETForQueries", "includeUnusedVariables"]);
-    if (__DEV__) {
+    if (globalThis.__DEV__ !== false) {
         checkFetcher(preferredFetch || backupFetch);
     }
     var linkConfig = {
@@ -2145,7 +2132,7 @@ var createHttpLink = function (linkOptions) {
             options.headers = options.headers || {};
             var acceptHeader = "multipart/mixed;";
             if (isSubscription && hasDefer) {
-                __DEV__ && invariant.warn(37);
+                globalThis.__DEV__ !== false && invariant.warn(36);
             }
             if (isSubscription) {
                 acceptHeader += 'boundary=graphql;subscriptionSpec=1.0,application/json';
@@ -2897,7 +2884,7 @@ var ObjectCanon = (function () {
                     var node = this.pool.lookupArray(array);
                     if (!node.array) {
                         this.known.add(node.array = array);
-                        if (__DEV__) {
+                        if (globalThis.__DEV__ !== false) {
                             Object.freeze(array);
                         }
                     }
@@ -2922,7 +2909,7 @@ var ObjectCanon = (function () {
                         keys.sorted.forEach(function (key, i) {
                             obj_1[key] = array_1[firstValueIndex_1 + i];
                         });
-                        if (__DEV__) {
+                        if (globalThis.__DEV__ !== false) {
                             Object.freeze(obj_1);
                         }
                     }
@@ -3189,7 +3176,7 @@ var StoreReader = (function () {
                     context: context,
                 }), i);
             }
-            if (__DEV__) {
+            if (globalThis.__DEV__ !== false) {
                 assertSelectionSetForIdValue(context.store, field, item);
             }
             return item;
@@ -3634,7 +3621,7 @@ var Policies = (function () {
                 if (supertypeSet.has(supertype)) {
                     if (!typenameSupertypeSet.has(supertype)) {
                         if (checkingFuzzySubtypes) {
-                            __DEV__ && invariant.warn(4, typename, supertype);
+                            globalThis.__DEV__ !== false && invariant.warn(4, typename, supertype);
                         }
                         typenameSupertypeSet.add(supertype);
                     }
@@ -3787,8 +3774,8 @@ function normalizeReadFieldOptions(readFieldArgs, objectOrReference, variables)
             options.from = objectOrReference;
         }
     }
-    if (__DEV__ && options.from === void 0) {
-        __DEV__ && invariant.warn(5, stringifyForDisplay(Array.from(readFieldArgs)));
+    if (globalThis.__DEV__ !== false && options.from === void 0) {
+        globalThis.__DEV__ !== false && invariant.warn(5, stringifyForDisplay(Array.from(readFieldArgs)));
     }
     if (void 0 === options.variables) {
         options.variables = variables;
@@ -3871,7 +3858,7 @@ var StoreWriter = (function () {
                 }
                 storeObject = applied;
             }
-            if (__DEV__ && !context.overwrite) {
+            if (globalThis.__DEV__ !== false && !context.overwrite) {
                 var fieldsWithSelectionSets_1 = Object.create(null);
                 fieldNodeSet.forEach(function (field) {
                     if (field.selectionSet) {
@@ -3959,12 +3946,12 @@ var StoreWriter = (function () {
                     _a[storeFieldName] = incomingValue,
                     _a));
             }
-            else if (__DEV__ &&
+            else if (globalThis.__DEV__ !== false &&
                 !context.clientOnly &&
                 !context.deferred &&
                 !addTypenameToDocument.added(field) &&
                 !policies.getReadFunction(typename, field.name.value)) {
-                __DEV__ && invariant.error(10, resultKeyNameFromField(field), result);
+                globalThis.__DEV__ !== false && invariant.error(10, resultKeyNameFromField(field), result);
             }
         });
         try {
@@ -4013,7 +4000,7 @@ var StoreWriter = (function () {
     StoreWriter.prototype.processFieldValue = function (value, field, context, mergeTree) {
         var _this = this;
         if (!field.selectionSet || value === null) {
-            return __DEV__ ? cloneDeep(value) : value;
+            return globalThis.__DEV__ !== false ? cloneDeep(value) : value;
         }
         if (isArray(value)) {
             return value.map(function (item, i) {
@@ -4204,7 +4191,7 @@ function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
             }
         });
     }
-    __DEV__ && invariant.warn(12, fieldName, parentType, childTypenames.length
+    globalThis.__DEV__ !== false && invariant.warn(12, fieldName, parentType, childTypenames.length
         ? "either ensure all objects of type " + childTypenames.join(" and ") + " have an ID or a custom merge function, or "
         : "", typeDotName, existing, incoming);
 }
@@ -4364,7 +4351,7 @@ var InMemoryCache = (function (_super) {
             return this.policies.identify(object)[0];
         }
         catch (e) {
-            __DEV__ && invariant.warn(e);
+            globalThis.__DEV__ !== false && invariant.warn(e);
         }
     };
     InMemoryCache.prototype.evict = function (options) {
@@ -4527,10 +4514,11 @@ function isNetworkRequestSettled(networkStatus) {
 function equalByQuery(query, _a, _b, variables) {
     var aData = _a.data, aRest = tslib.__rest(_a, ["data"]);
     var bData = _b.data, bRest = tslib.__rest(_b, ["data"]);
-    return equal__default(aRest, bRest) && equalBySelectionSet(getMainDefinition(query).selectionSet, aData, bData, {
-        fragmentMap: createFragmentMap(getFragmentDefinitions(query)),
-        variables: variables,
-    });
+    return (equal__default(aRest, bRest) &&
+        equalBySelectionSet(getMainDefinition(query).selectionSet, aData, bData, {
+            fragmentMap: createFragmentMap(getFragmentDefinitions(query)),
+            variables: variables,
+        }));
 }
 function equalBySelectionSet(selectionSet, aResult, bResult, context) {
     if (aResult === bResult) {
@@ -4582,10 +4570,10 @@ function equalBySelectionSet(selectionSet, aResult, bResult, context) {
     });
 }
 function selectionHasNonreactiveDirective(selection) {
-    return !!selection.directives && selection.directives.some(directiveIsNonreactive);
+    return (!!selection.directives && selection.directives.some(directiveIsNonreactive));
 }
 function directiveIsNonreactive(dir) {
-    return dir.name.value === "nonreactive";
+    return dir.name.value === 'nonreactive';
 }
 
 var assign = Object.assign, hasOwnProperty$2 = Object.hasOwnProperty;
@@ -4700,7 +4688,7 @@ var ObservableQuery = (function (_super) {
             else {
                 result.partial = true;
             }
-            if (__DEV__ &&
+            if (globalThis.__DEV__ !== false &&
                 !diff.complete &&
                 !this.options.partialRefetch &&
                 !result.loading &&
@@ -4760,12 +4748,12 @@ var ObservableQuery = (function (_super) {
         else {
             reobserveOptions.fetchPolicy = 'network-only';
         }
-        if (__DEV__ && variables && hasOwnProperty$2.call(variables, "variables")) {
+        if (globalThis.__DEV__ !== false && variables && hasOwnProperty$2.call(variables, "variables")) {
             var queryDef = getQueryDefinition(this.query);
             var vars = queryDef.variableDefinitions;
             if (!vars || !vars.some(function (v) { return v.variable.name.value === "variables"; })) {
-                __DEV__ && invariant.warn(
-                    19,
+                globalThis.__DEV__ !== false && invariant.warn(
+                    18,
                     variables,
                     ((_a = queryDef.name) === null || _a === void 0 ? void 0 : _a.value) || queryDef
                 );
@@ -4856,7 +4844,7 @@ var ObservableQuery = (function (_super) {
                     options.onError(err);
                     return;
                 }
-                __DEV__ && invariant.error(20, err);
+                globalThis.__DEV__ !== false && invariant.error(19, err);
             },
         });
         this.subscriptions.add(subscription);
@@ -4869,6 +4857,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 +4946,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 +5099,11 @@ function reobserveCacheFirst(obsQuery) {
     return obsQuery.reobserve();
 }
 function defaultSubscriptionObserverErrorCallback(error) {
-    __DEV__ && invariant.error(22, error.message, error.stack);
+    globalThis.__DEV__ !== false && invariant.error(21, error.message, error.stack);
 }
 function logMissingFieldErrors(missing) {
-    if (__DEV__ && missing) {
-        __DEV__ && invariant.debug(23, missing);
+    if (globalThis.__DEV__ !== false && missing) {
+        globalThis.__DEV__ !== false && invariant.debug(22, missing);
     }
 }
 function skipCacheDataFor(fetchPolicy) {
@@ -5293,7 +5285,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 +5398,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 +5735,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 +5749,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;
@@ -5995,7 +5987,7 @@ var QueryManager = (function () {
                 _this.markMutationResult(tslib.__assign(tslib.__assign({}, mutation), { result: { data: data } }), cache);
             }
             catch (error) {
-                __DEV__ && invariant.error(error);
+                globalThis.__DEV__ !== false && invariant.error(error);
             }
         }, mutation.mutationId);
     };
@@ -6077,10 +6069,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 +6097,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;
@@ -6178,10 +6170,10 @@ var QueryManager = (function () {
                 queries.set(queryId, oq);
             });
         }
-        if (__DEV__ && queryNamesAndDocs.size) {
+        if (globalThis.__DEV__ !== false && queryNamesAndDocs.size) {
             queryNamesAndDocs.forEach(function (included, nameOrDoc) {
                 if (!included) {
-                    __DEV__ && invariant.warn(typeof nameOrDoc === "string" ? 32 : 33, nameOrDoc);
+                    globalThis.__DEV__ !== false && invariant.warn(typeof nameOrDoc === "string" ? 31 : 32, nameOrDoc);
                 }
             });
         }
@@ -6497,7 +6489,7 @@ var QueryManager = (function () {
         var resultsFromCache = function (diff, networkStatus) {
             if (networkStatus === void 0) { networkStatus = queryInfo.networkStatus || exports.NetworkStatus.loading; }
             var data = diff.result;
-            if (__DEV__ &&
+            if (globalThis.__DEV__ !== false &&
                 !returnPartialData &&
                 !equal.equal(data, {})) {
                 logMissingFieldErrors(diff.missing);
@@ -6600,7 +6592,7 @@ var ApolloClient = (function () {
         }
         var uri = options.uri, credentials = options.credentials, headers = options.headers, cache = options.cache, documentTransform = options.documentTransform, _a = options.ssrMode, ssrMode = _a === void 0 ? false : _a, _b = options.ssrForceFetchDelay, ssrForceFetchDelay = _b === void 0 ? 0 : _b, _c = options.connectToDevTools, connectToDevTools = _c === void 0 ? typeof window === 'object' &&
             !window.__APOLLO_CLIENT__ &&
-            __DEV__ : _c, _d = options.queryDeduplication, queryDeduplication = _d === void 0 ? true : _d, defaultOptions = options.defaultOptions, _e = options.assumeImmutableResults, assumeImmutableResults = _e === void 0 ? cache.assumeImmutableResults : _e, resolvers = options.resolvers, typeDefs = options.typeDefs, fragmentMatcher = options.fragmentMatcher, clientAwarenessName = options.name, clientAwarenessVersion = options.version;
+            globalThis.__DEV__ !== false : _c, _d = options.queryDeduplication, queryDeduplication = _d === void 0 ? true : _d, defaultOptions = options.defaultOptions, _e = options.assumeImmutableResults, assumeImmutableResults = _e === void 0 ? cache.assumeImmutableResults : _e, resolvers = options.resolvers, typeDefs = options.typeDefs, fragmentMatcher = options.fragmentMatcher, clientAwarenessName = options.name, clientAwarenessVersion = options.version;
         var link = options.link;
         if (!link) {
             link = uri
@@ -6624,7 +6616,7 @@ var ApolloClient = (function () {
         if (connectToDevTools && typeof window === 'object') {
             window.__APOLLO_CLIENT__ = this;
         }
-        if (!hasSuggestedDevtools && connectToDevTools && __DEV__) {
+        if (!hasSuggestedDevtools && connectToDevTools && globalThis.__DEV__ !== false) {
             hasSuggestedDevtools = true;
             if (typeof window !== 'undefined' &&
                 window.document &&
@@ -6643,7 +6635,8 @@ var ApolloClient = (function () {
                     }
                 }
                 if (url) {
-                    __DEV__ && invariant.log(14, url);
+                    globalThis.__DEV__ !== false && invariant.log("Download the Apollo DevTools for a better development " +
+                        "experience: %s", url);
                 }
             }
         }
@@ -6706,7 +6699,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 +6788,7 @@ var ApolloClient = (function () {
         result.queries = queries;
         result.results = results;
         result.catch(function (error) {
-            __DEV__ && invariant.debug(16, error);
+            globalThis.__DEV__ !== false && invariant.debug(15, error);
         });
         return result;
     };
@@ -6831,16 +6824,23 @@ var contextKey = canUseSymbol
     ? Symbol.for('__APOLLO_CONTEXT__')
     : '__APOLLO_CONTEXT__';
 function getApolloContext() {
-    invariant('createContext' in React__namespace, 44);
-    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' }));
+    invariant('createContext' in React__namespace, 43);
+    var contextStorage = global$1[contextKey] || (global$1[contextKey] = new Map());
+    var value = contextStorage.get(React__namespace.createContext);
+    if (!value) {
+        value = Object.assign(React__namespace.createContext({}), {
+            displayName: 'ApolloContext',
+        });
+        contextStorage.set(React__namespace.createContext, value);
+    }
+    return value;
 }
 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 +6852,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 context = React__namespace.useContext(getApolloContext());
     var client = override || context.client;
-    invariant(!!client, 48);
+    invariant(!!client, 47);
     return client;
 }
 
@@ -6868,11 +6868,11 @@ var uSESKey = "useSyncExternalStore";
 var realHook$1 = React__namespace[uSESKey];
 var useSyncExternalStore = realHook$1 || (function (subscribe, getSnapshot, getServerSnapshot) {
     var value = getSnapshot();
-    if (__DEV__ &&
+    if (globalThis.__DEV__ !== false &&
         !didWarnUncachedGetSnapshot &&
         value !== getSnapshot()) {
         didWarnUncachedGetSnapshot = true;
-        __DEV__ && invariant.error(58);
+        globalThis.__DEV__ !== false && invariant.error(57);
     }
     var _a = React__namespace.useState({ inst: { value: value, getSnapshot: getSnapshot } }), inst = _a[0].inst, forceUpdate = _a[1];
     if (canUseLayoutEffect) {
@@ -6935,7 +6935,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 +6961,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 +6978,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 +6997,7 @@ function verifyDocumentType(document, type) {
     var usedOperationName = operationName(operation.type);
     invariant(
         operation.type === type,
-        63,
+        62,
         requiredOperationName,
         requiredOperationName,
         usedOperationName
@@ -7010,14 +7010,14 @@ function useQuery(query, options) {
     return useInternalState(useApolloClient(options.client), query).useQuery(options);
 }
 function useInternalState(client, query) {
-    var stateRef = React.useRef();
+    var stateRef = React__namespace.useRef();
     if (!stateRef.current ||
         client !== stateRef.current.client ||
         query !== stateRef.current.query) {
         stateRef.current = new InternalState(client, query, stateRef.current);
     }
     var state = stateRef.current;
-    var _a = React.useState(0); _a[0]; var setTick = _a[1];
+    var _a = React__namespace.useState(0); _a[0]; var setTick = _a[1];
     state.forceUpdate = function () {
         setTick(function (tick) { return tick + 1; });
     };
@@ -7048,7 +7048,7 @@ var InternalState = (function () {
         }
     }
     InternalState.prototype.forceUpdate = function () {
-        __DEV__ && invariant.warn(49);
+        globalThis.__DEV__ !== false && invariant.warn(48);
     };
     InternalState.prototype.executeQuery = function (options) {
         var _this = this;
@@ -7078,10 +7078,10 @@ var InternalState = (function () {
     };
     InternalState.prototype.useQuery = function (options) {
         var _this = this;
-        this.renderPromises = React.useContext(getApolloContext()).renderPromises;
+        this.renderPromises = React__namespace.useContext(getApolloContext()).renderPromises;
         this.useOptions(options);
         var obsQuery = this.useObservableQuery();
-        var result = useSyncExternalStore(React.useCallback(function () {
+        var result = useSyncExternalStore(React__namespace.useCallback(function () {
             if (_this.renderPromises) {
                 return function () { };
             }
@@ -7211,7 +7211,7 @@ var InternalState = (function () {
                 && this.renderPromises.getSSRObservable(this.watchQueryOptions)
                 || this.observable
                 || this.client.watchQuery(this.getObsQueryOptions());
-        this.obsQueryFields = React.useMemo(function () { return ({
+        this.obsQueryFields = React__namespace.useMemo(function () { return ({
             refetch: obsQuery.refetch.bind(obsQuery),
             reobserve: obsQuery.reobserve.bind(obsQuery),
             fetchMore: obsQuery.fetchMore.bind(obsQuery),
@@ -7253,7 +7253,7 @@ var InternalState = (function () {
                     _this.onCompleted(result.data);
                 }
             }).catch(function (error) {
-                __DEV__ && invariant.warn(error);
+                globalThis.__DEV__ !== false && invariant.warn(error);
             });
         }
     };
@@ -7305,9 +7305,9 @@ var EAGER_METHODS = [
 ];
 function useLazyQuery(query, options) {
     var _a;
-    var execOptionsRef = React.useRef();
-    var optionsRef = React.useRef();
-    var queryRef = React.useRef();
+    var execOptionsRef = React__namespace.useRef();
+    var optionsRef = React__namespace.useRef();
+    var queryRef = React__namespace.useRef();
     var merged = mergeOptions(options, execOptionsRef.current || {});
     var document = (_a = merged === null || merged === void 0 ? void 0 : merged.query) !== null && _a !== void 0 ? _a : query;
     optionsRef.current = merged;
@@ -7319,7 +7319,7 @@ function useLazyQuery(query, options) {
     var result = Object.assign(useQueryResult, {
         called: !!execOptionsRef.current,
     });
-    var eagerMethods = React.useMemo(function () {
+    var eagerMethods = React__namespace.useMemo(function () {
         var eagerMethods = {};
         var _loop_1 = function (key) {
             var method = result[key];
@@ -7338,7 +7338,7 @@ function useLazyQuery(query, options) {
         return eagerMethods;
     }, []);
     Object.assign(result, eagerMethods);
-    var execute = React.useCallback(function (executeOptions) {
+    var execute = React__namespace.useCallback(function (executeOptions) {
         execOptionsRef.current = executeOptions ? tslib.__assign(tslib.__assign({}, executeOptions), { fetchPolicy: executeOptions.fetchPolicy || initialFetchPolicy }) : {
             fetchPolicy: initialFetchPolicy,
         };
@@ -7355,12 +7355,12 @@ function useLazyQuery(query, options) {
 function useMutation(mutation, options) {
     var client = useApolloClient(options === null || options === void 0 ? void 0 : options.client);
     verifyDocumentType(mutation, exports.DocumentType.Mutation);
-    var _a = React.useState({
+    var _a = React__namespace.useState({
         called: false,
         loading: false,
         client: client,
     }), result = _a[0], setResult = _a[1];
-    var ref = React.useRef({
+    var ref = React__namespace.useRef({
         result: result,
         mutationId: 0,
         isMounted: true,
@@ -7371,7 +7371,7 @@ function useMutation(mutation, options) {
     {
         Object.assign(ref.current, { client: client, options: options, mutation: mutation });
     }
-    var execute = React.useCallback(function (executeOptions) {
+    var execute = React__namespace.useCallback(function (executeOptions) {
         if (executeOptions === void 0) { executeOptions = {}; }
         var _a = ref.current, options = _a.options, mutation = _a.mutation;
         var baseOptions = tslib.__assign(tslib.__assign({}, options), { mutation: mutation });
@@ -7432,12 +7432,12 @@ function useMutation(mutation, options) {
             throw error;
         });
     }, []);
-    var reset = React.useCallback(function () {
+    var reset = React__namespace.useCallback(function () {
         if (ref.current.isMounted) {
             setResult({ called: false, loading: false, client: client });
         }
     }, []);
-    React.useEffect(function () {
+    React__namespace.useEffect(function () {
         ref.current.isMounted = true;
         return function () {
             ref.current.isMounted = false;
@@ -7447,10 +7447,10 @@ function useMutation(mutation, options) {
 }
 
 function useSubscription(subscription, options) {
-    var hasIssuedDeprecationWarningRef = React.useRef(false);
+    var hasIssuedDeprecationWarningRef = React__namespace.useRef(false);
     var client = useApolloClient(options === null || options === void 0 ? void 0 : options.client);
     verifyDocumentType(subscription, exports.DocumentType.Subscription);
-    var _a = React.useState({
+    var _a = React__namespace.useState({
         loading: !(options === null || options === void 0 ? void 0 : options.skip),
         error: void 0,
         data: void 0,
@@ -7459,13 +7459,13 @@ 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);
+            globalThis.__DEV__ !== false && invariant.warn(options.onData ? 50 : 51);
         }
         if (options === null || options === void 0 ? void 0 : options.onSubscriptionComplete) {
-            __DEV__ && invariant.warn(options.onComplete ? 53 : 54);
+            globalThis.__DEV__ !== false && invariant.warn(options.onComplete ? 52 : 53);
         }
     }
-    var _b = React.useState(function () {
+    var _b = React__namespace.useState(function () {
         if (options === null || options === void 0 ? void 0 : options.skip) {
             return null;
         }
@@ -7476,14 +7476,14 @@ function useSubscription(subscription, options) {
             context: options === null || options === void 0 ? void 0 : options.context,
         });
     }), observable = _b[0], setObservable = _b[1];
-    var canResetObservableRef = React.useRef(false);
-    React.useEffect(function () {
+    var canResetObservableRef = React__namespace.useRef(false);
+    React__namespace.useEffect(function () {
         return function () {
             canResetObservableRef.current = true;
         };
     }, []);
-    var ref = React.useRef({ client: client, subscription: subscription, options: options });
-    React.useEffect(function () {
+    var ref = React__namespace.useRef({ client: client, subscription: subscription, options: options });
+    React__namespace.useEffect(function () {
         var _a, _b, _c, _d;
         var shouldResubscribe = options === null || options === void 0 ? void 0 : options.shouldResubscribe;
         if (typeof shouldResubscribe === 'function') {
@@ -7524,7 +7524,7 @@ function useSubscription(subscription, options) {
         }
         Object.assign(ref.current, { client: client, subscription: subscription, options: options });
     }, [client, subscription, options, canResetObservableRef.current]);
-    React.useEffect(function () {
+    React__namespace.useEffect(function () {
         if (!observable) {
             return;
         }
@@ -7591,8 +7591,8 @@ function useSubscription(subscription, options) {
 
 function useReactiveVar(rv) {
     var value = rv();
-    var setValue = React.useState(value)[1];
-    React.useEffect(function () {
+    var setValue = React__namespace.useState(value)[1];
+    React__namespace.useEffect(function () {
         var probablySameValue = rv();
         if (value !== probablySameValue) {
             setValue(probablySameValue);
@@ -7608,7 +7608,7 @@ function useFragment(options) {
     var cache = useApolloClient().cache;
     var fragment = options.fragment, fragmentName = options.fragmentName, from = options.from, _a = options.optimistic, optimistic = _a === void 0 ? true : _a, rest = tslib.__rest(options, ["fragment", "fragmentName", "from", "optimistic"]);
     var diffOptions = tslib.__assign(tslib.__assign({}, rest), { returnPartialData: true, id: typeof from === "string" ? from : cache.identify(from), query: cache["getFragmentDoc"](fragment, fragmentName), optimistic: optimistic });
-    var resultRef = React.useRef();
+    var resultRef = React__namespace.useRef();
     var latestDiff = cache.diff(diffOptions);
     var getSnapshot = function () {
         var latestDiffToResult = diffToResult(latestDiff);
@@ -7638,25 +7638,15 @@ function diffToResult(diff) {
 }
 
 function useDeepMemo(memoFn, deps) {
-    var ref = React.useRef();
+    var ref = React__namespace.useRef();
     if (!ref.current || !equal.equal(ref.current.deps, deps)) {
         ref.current = { value: memoFn(), deps: deps };
     }
     return ref.current.value;
 }
 
-function useStrictModeSafeCleanupEffect(cleanup) {
-    var timeout;
-    React.useEffect(function () {
-        clearTimeout(timeout);
-        return function () {
-            timeout = setTimeout(cleanup);
-        };
-    }, []);
-}
-
 var useKey = 'use';
-var realHook = React__default[useKey];
+var realHook = React__namespace[useKey];
 var __use = realHook ||
     function __use(promise) {
         var statefulPromise = wrapPromiseWithState(promise);
@@ -7671,9 +7661,9 @@ var __use = realHook ||
     };
 
 function useSuspenseCache(override) {
-    var context = React.useContext(getApolloContext());
+    var context = React__namespace.useContext(getApolloContext());
     var suspenseCache = override || context.suspenseCache;
-    invariant(suspenseCache, 55);
+    invariant(suspenseCache, 54);
     return suspenseCache;
 }
 
@@ -7688,26 +7678,29 @@ 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 _b = React__namespace.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) {
         promise = queryRef.promise;
         promiseCache.set(queryRef.key, promise);
     }
-    useTrackedQueryRefs(queryRef);
-    React.useEffect(function () {
-        return queryRef.listen(function (promise) {
+    React__namespace.useEffect(function () {
+        var dispose = queryRef.retain();
+        var removeListener = queryRef.listen(function (promise) {
             setPromiseCache(function (promiseCache) {
                 return new Map(promiseCache).set(queryRef.key, promise);
             });
         });
+        return function () {
+            removeListener();
+            dispose();
+        };
     }, [queryRef]);
-    var skipResult = React.useMemo(function () {
+    var skipResult = React__namespace.useMemo(function () {
         var error = toApolloError(queryRef.result);
         return {
             loading: false,
@@ -7716,23 +7709,23 @@ function useSuspenseQuery(query, options) {
             error: error,
         };
     }, [queryRef.result]);
-    var result = watchQueryOptions.fetchPolicy === 'standby' ? skipResult : __use(promise);
-    var fetchMore = React.useCallback(function (options) {
+    var result = fetchPolicy === 'standby' ? skipResult : __use(promise);
+    var fetchMore = React__namespace.useCallback(function (options) {
         var promise = queryRef.fetchMore(options);
         setPromiseCache(function (previousPromiseCache) {
-            return new Map(previousPromiseCache).set(queryRef.key, promise);
+            return new Map(previousPromiseCache).set(queryRef.key, queryRef.promise);
         });
         return promise;
     }, [queryRef]);
-    var refetch = React.useCallback(function (variables) {
+    var refetch = React__namespace.useCallback(function (variables) {
         var promise = queryRef.refetch(variables);
         setPromiseCache(function (previousPromiseCache) {
-            return new Map(previousPromiseCache).set(queryRef.key, promise);
+            return new Map(previousPromiseCache).set(queryRef.key, queryRef.promise);
         });
         return promise;
     }, [queryRef]);
-    var subscribeToMore = React.useCallback(function (options) { return queryRef.observable.subscribeToMore(options); }, [queryRef]);
-    return React.useMemo(function () {
+    var subscribeToMore = React__namespace.useCallback(function (options) { return queryRef.observable.subscribeToMore(options); }, [queryRef]);
+    return React__namespace.useMemo(function () {
         return {
             client: client,
             data: result.data,
@@ -7758,11 +7751,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);
+        globalThis.__DEV__ !== false && invariant.warn(56);
     }
 }
 function toApolloError(result) {
@@ -7770,13 +7763,6 @@ function toApolloError(result) {
         ? new ApolloError({ graphQLErrors: result.errors })
         : result.error;
 }
-function useTrackedQueryRefs(queryRef) {
-    var trackedQueryRefs = React.useRef(new Set());
-    trackedQueryRefs.current.add(queryRef);
-    useStrictModeSafeCleanupEffect(function () {
-        trackedQueryRefs.current.forEach(function (sub) { return sub.dispose(); });
-    });
-}
 function useWatchQueryOptions(_a) {
     var client = _a.client, query = _a.query, options = _a.options;
     return useDeepMemo(function () {
@@ -7785,7 +7771,7 @@ function useWatchQueryOptions(_a) {
             ((_a = client.defaultOptions.watchQuery) === null || _a === void 0 ? void 0 : _a.fetchPolicy) ||
             'cache-first';
         var watchQueryOptions = tslib.__assign(tslib.__assign({}, options), { fetchPolicy: fetchPolicy, query: query, notifyOnNetworkStatusChange: false, nextFetchPolicy: void 0 });
-        if (__DEV__) {
+        if (globalThis.__DEV__ !== false) {
             validateOptions(watchQueryOptions);
         }
         if (options.skip) {
@@ -7796,16 +7782,25 @@ 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;
         var _a;
         this.listeners = new Set();
-        this.initialized = false;
-        this.refetching = false;
+        this.status = 'loading';
+        this.references = 0;
         this.listen = this.listen.bind(this);
         this.handleNext = this.handleNext.bind(this);
         this.handleError = this.handleError.bind(this);
+        this.initiateFetch = this.initiateFetch.bind(this);
         this.dispose = this.dispose.bind(this);
         this.observable = observable;
         this.result = observable.getCurrentResult(false);
@@ -7815,21 +7810,25 @@ var InternalQueryReference = (function () {
         }
         if (isNetworkRequestSettled(this.result.networkStatus) ||
             (this.result.data &&
-                (!this.result.partial || this.observable.options.returnPartialData))) {
+                (!this.result.partial || this.watchQueryOptions.returnPartialData))) {
             this.promise = createFulfilledPromise(this.result);
-            this.initialized = true;
-            this.refetching = false;
+            this.status = 'idle';
         }
-        this.subscription = observable.subscribe({
-            next: this.handleNext,
-            error: this.handleError,
-        });
-        if (!this.promise) {
+        else {
             this.promise = new Promise(function (resolve, reject) {
                 _this.resolve = resolve;
                 _this.reject = reject;
             });
         }
+        this.subscription = observable
+            .filter(function (_a) {
+            var data = _a.data;
+            return !equal.equal(data, {});
+        })
+            .subscribe({
+            next: this.handleNext,
+            error: this.handleError,
+        });
         this.autoDisposeTimeoutId = setTimeout(this.dispose, (_a = options.autoDisposeTimeoutMs) !== null && _a !== void 0 ? _a : 30000);
     }
     Object.defineProperty(InternalQueryReference.prototype, "watchQueryOptions", {
@@ -7839,28 +7838,61 @@ var InternalQueryReference = (function () {
         enumerable: false,
         configurable: true
     });
-    InternalQueryReference.prototype.listen = function (listener) {
+    InternalQueryReference.prototype.retain = function () {
         var _this = this;
+        this.references++;
         clearTimeout(this.autoDisposeTimeoutId);
+        var disposed = false;
+        return function () {
+            if (disposed) {
+                return;
+            }
+            disposed = true;
+            _this.references--;
+            setTimeout(function () {
+                if (!_this.references) {
+                    _this.dispose();
+                }
+            });
+        };
+    };
+    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 _a = this.watchQueryOptions, currentFetchPolicy = _a.fetchPolicy, currentCanonizeResults = _a.canonizeResults;
+        if (currentFetchPolicy === 'standby' &&
+            currentFetchPolicy !== watchQueryOptions.fetchPolicy) {
+            this.observable.reobserve(watchQueryOptions);
+            this.initiateFetch();
+        }
+        else {
+            this.observable.silentSetOptions(watchQueryOptions);
+            if (currentCanonizeResults !== watchQueryOptions.canonizeResults) {
+                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;
         this.listeners.add(listener);
         return function () {
             _this.listeners.delete(listener);
         };
     };
     InternalQueryReference.prototype.refetch = function (variables) {
-        this.refetching = true;
         var promise = this.observable.refetch(variables);
-        this.promise = promise;
+        this.initiateFetch();
         return promise;
     };
     InternalQueryReference.prototype.fetchMore = function (options) {
         var promise = this.observable.fetchMore(options);
-        this.promise = promise;
-        return promise;
-    };
-    InternalQueryReference.prototype.reobserve = function (watchQueryOptions) {
-        var promise = this.observable.reobserve(watchQueryOptions);
-        this.promise = promise;
+        this.initiateFetch();
         return promise;
     };
     InternalQueryReference.prototype.dispose = function () {
@@ -7870,48 +7902,57 @@ var InternalQueryReference = (function () {
     InternalQueryReference.prototype.onDispose = function () {
     };
     InternalQueryReference.prototype.handleNext = function (result) {
-        if (!this.initialized || this.refetching) {
-            if (!isNetworkRequestSettled(result.networkStatus)) {
-                return;
-            }
-            if (this.result.data && result.data === void 0) {
-                result.data = this.result.data;
+        var _a;
+        switch (this.status) {
+            case 'loading': {
+                if (result.data === void 0) {
+                    result.data = this.result.data;
+                }
+                this.status = 'idle';
+                this.result = result;
+                (_a = this.resolve) === null || _a === void 0 ? void 0 : _a.call(this, result);
+                break;
             }
-            this.initialized = true;
-            this.refetching = false;
-            this.result = result;
-            if (this.resolve) {
-                this.resolve(result);
+            case 'idle': {
+                if (result.data === this.result.data) {
+                    return;
+                }
+                if (result.data === void 0) {
+                    result.data = this.result.data;
+                }
+                this.result = result;
+                this.promise = createFulfilledPromise(result);
+                this.deliver(this.promise);
+                break;
             }
-            return;
-        }
-        if (result.data === this.result.data) {
-            return;
         }
-        this.result = result;
-        this.promise = createFulfilledPromise(result);
-        this.deliver(this.promise);
     };
     InternalQueryReference.prototype.handleError = function (error) {
-        var result = tslib.__assign(tslib.__assign({}, this.result), { error: error, networkStatus: exports.NetworkStatus.error });
-        this.result = result;
-        if (!this.initialized || this.refetching) {
-            this.initialized = true;
-            this.refetching = false;
-            if (this.reject) {
-                this.reject(error);
+        var _a;
+        switch (this.status) {
+            case 'loading': {
+                this.status = 'idle';
+                (_a = this.reject) === null || _a === void 0 ? void 0 : _a.call(this, error);
+                break;
+            }
+            case 'idle': {
+                this.promise = createRejectedPromise(error);
+                this.deliver(this.promise);
             }
-            return;
         }
-        this.result = result;
-        this.promise = result.data
-            ? createFulfilledPromise(result)
-            : createRejectedPromise(result);
-        this.deliver(this.promise);
     };
     InternalQueryReference.prototype.deliver = function (promise) {
         this.listeners.forEach(function (listener) { return listener(promise); });
     };
+    InternalQueryReference.prototype.initiateFetch = function () {
+        var _this = this;
+        this.status = 'loading';
+        this.promise = new Promise(function (resolve, reject) {
+            _this.resolve = resolve;
+            _this.reject = reject;
+        });
+        this.promise.catch(function () { });
+    };
     return InternalQueryReference;
 }());
 
@@ -7920,35 +7961,34 @@ 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 });
+    var _b = React__namespace.useState(function () { return new Map([[queryRef.key, queryRef.promise]]); }), promiseCache = _b[0], setPromiseCache = _b[1];
+    if (queryRef.didChangeOptions(watchQueryOptions)) {
+        var promise = queryRef.applyOptions(watchQueryOptions);
         promiseCache.set(queryRef.key, promise);
     }
-    useTrackedQueryRefs(queryRef);
-    var fetchMore = React.useCallback(function (options) {
+    React__namespace.useEffect(function () { return queryRef.retain(); }, [queryRef]);
+    var fetchMore = React__namespace.useCallback(function (options) {
         var promise = queryRef.fetchMore(options);
         setPromiseCache(function (promiseCache) {
-            return new Map(promiseCache).set(queryRef.key, promise);
+            return new Map(promiseCache).set(queryRef.key, queryRef.promise);
         });
         return promise;
     }, [queryRef]);
-    var refetch = React.useCallback(function (variables) {
+    var refetch = React__namespace.useCallback(function (variables) {
         var promise = queryRef.refetch(variables);
         setPromiseCache(function (promiseCache) {
-            return new Map(promiseCache).set(queryRef.key, promise);
+            return new Map(promiseCache).set(queryRef.key, queryRef.promise);
         });
         return promise;
     }, [queryRef]);
     queryRef.promiseCache = promiseCache;
-    return React.useMemo(function () {
+    return React__namespace.useMemo(function () {
         var _a;
         return [
             (_a = {}, _a[QUERY_REFERENCE_SYMBOL] = queryRef, _a),
@@ -7961,10 +8001,10 @@ function useBackgroundQuery(query, options) {
 }
 
 function useReadQuery(queryRef) {
-    var _a = React.useState(0), forceUpdate = _a[1];
+    var _a = React__namespace.useState(0), forceUpdate = _a[1];
     var internalQueryRef = queryRef[QUERY_REFERENCE_SYMBOL];
-    invariant__default(internalQueryRef.promiseCache, 50);
-    var skipResult = React.useMemo(function () {
+    invariant__default(internalQueryRef.promiseCache, 49);
+    var skipResult = React__namespace.useMemo(function () {
         var error = toApolloError(internalQueryRef.result);
         return {
             loading: false,
@@ -7978,7 +8018,7 @@ function useReadQuery(queryRef) {
         promise = internalQueryRef.promise;
         internalQueryRef.promiseCache.set(internalQueryRef.key, promise);
     }
-    React.useEffect(function () {
+    React__namespace.useEffect(function () {
         return internalQueryRef.listen(function (promise) {
             internalQueryRef.promiseCache.set(internalQueryRef.key, promise);
             forceUpdate(function (prevState) { return prevState + 1; });
@@ -7987,7 +8027,7 @@ function useReadQuery(queryRef) {
     var result = internalQueryRef.watchQueryOptions.fetchPolicy === 'standby'
         ? skipResult
         : __use(promise);
-    return React.useMemo(function () {
+    return React__namespace.useMemo(function () {
         return {
             data: result.data,
             networkStatus: result.networkStatus,