@apollo/client 3.8.0-beta.6 → 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.6';
+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) {
@@ -701,7 +687,7 @@ function removeDirectivesFromDocument(directives, doc) {
                 return getInUseByFragmentName(ancestor.name.value);
             }
         }
-        __DEV__ && invariant.error(81);
+        globalThis.__DEV__ !== false && invariant.error(81);
         return null;
     };
     var operationCount = 0;
@@ -1054,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);
         }
@@ -1067,7 +1053,7 @@ function shallowFreeze(obj) {
     return obj;
 }
 function maybeDeepFreeze(obj) {
-    if (__DEV__) {
+    if (globalThis.__DEV__ !== false) {
         deepFreeze(obj);
     }
     return obj;
@@ -1379,7 +1365,7 @@ function toPromise(observable) {
         observable.subscribe({
             next: function (data) {
                 if (completed) {
-                    __DEV__ && invariant.warn(40);
+                    globalThis.__DEV__ !== false && invariant.warn(40);
                 }
                 else {
                     completed = true;
@@ -1529,7 +1515,7 @@ var ApolloLink = (function () {
     ApolloLink.concat = function (first, second) {
         var firstLink = toLink(first);
         if (isTerminating(firstLink)) {
-            __DEV__ && invariant.warn(33, firstLink);
+            globalThis.__DEV__ !== false && invariant.warn(33, firstLink);
             return firstLink;
         }
         var nextLink = toLink(second);
@@ -2083,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 = {
@@ -2146,7 +2132,7 @@ var createHttpLink = function (linkOptions) {
             options.headers = options.headers || {};
             var acceptHeader = "multipart/mixed;";
             if (isSubscription && hasDefer) {
-                __DEV__ && invariant.warn(36);
+                globalThis.__DEV__ !== false && invariant.warn(36);
             }
             if (isSubscription) {
                 acceptHeader += 'boundary=graphql;subscriptionSpec=1.0,application/json';
@@ -2898,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);
                         }
                     }
@@ -2923,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);
                         }
                     }
@@ -3190,7 +3176,7 @@ var StoreReader = (function () {
                     context: context,
                 }), i);
             }
-            if (__DEV__) {
+            if (globalThis.__DEV__ !== false) {
                 assertSelectionSetForIdValue(context.store, field, item);
             }
             return item;
@@ -3635,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);
                     }
@@ -3788,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;
@@ -3872,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) {
@@ -3960,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 {
@@ -4014,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) {
@@ -4205,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);
 }
@@ -4365,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) {
@@ -4528,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) {
@@ -4583,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;
@@ -4701,7 +4688,7 @@ var ObservableQuery = (function (_super) {
             else {
                 result.partial = true;
             }
-            if (__DEV__ &&
+            if (globalThis.__DEV__ !== false &&
                 !diff.complete &&
                 !this.options.partialRefetch &&
                 !result.loading &&
@@ -4761,11 +4748,11 @@ 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(
+                globalThis.__DEV__ !== false && invariant.warn(
                     18,
                     variables,
                     ((_a = queryDef.name) === null || _a === void 0 ? void 0 : _a.value) || queryDef
@@ -4857,7 +4844,7 @@ var ObservableQuery = (function (_super) {
                     options.onError(err);
                     return;
                 }
-                __DEV__ && invariant.error(19, err);
+                globalThis.__DEV__ !== false && invariant.error(19, err);
             },
         });
         this.subscriptions.add(subscription);
@@ -5112,11 +5099,11 @@ function reobserveCacheFirst(obsQuery) {
     return obsQuery.reobserve();
 }
 function defaultSubscriptionObserverErrorCallback(error) {
-    __DEV__ && invariant.error(21, error.message, error.stack);
+    globalThis.__DEV__ !== false && invariant.error(21, error.message, error.stack);
 }
 function logMissingFieldErrors(missing) {
-    if (__DEV__ && missing) {
-        __DEV__ && invariant.debug(22, missing);
+    if (globalThis.__DEV__ !== false && missing) {
+        globalThis.__DEV__ !== false && invariant.debug(22, missing);
     }
 }
 function skipCacheDataFor(fetchPolicy) {
@@ -6000,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);
     };
@@ -6183,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" ? 31 : 32, nameOrDoc);
+                    globalThis.__DEV__ !== false && invariant.warn(typeof nameOrDoc === "string" ? 31 : 32, nameOrDoc);
                 }
             });
         }
@@ -6502,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);
@@ -6605,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
@@ -6629,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 &&
@@ -6648,7 +6635,7 @@ var ApolloClient = (function () {
                     }
                 }
                 if (url) {
-                    __DEV__ && invariant.log("Download the Apollo DevTools for a better development " +
+                    globalThis.__DEV__ !== false && invariant.log("Download the Apollo DevTools for a better development " +
                         "experience: %s", url);
                 }
             }
@@ -6801,7 +6788,7 @@ var ApolloClient = (function () {
         result.queries = queries;
         result.results = results;
         result.catch(function (error) {
-            __DEV__ && invariant.debug(15, error);
+            globalThis.__DEV__ !== false && invariant.debug(15, error);
         });
         return result;
     };
@@ -6838,8 +6825,15 @@ var contextKey = canUseSymbol
     : '__APOLLO_CONTEXT__';
 function getApolloContext() {
     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' }));
+    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;
 
@@ -6863,7 +6857,7 @@ var ApolloProvider = function (_a) {
 };
 
 function useApolloClient(override) {
-    var context = React.useContext(getApolloContext());
+    var context = React__namespace.useContext(getApolloContext());
     var client = override || context.client;
     invariant(!!client, 47);
     return client;
@@ -6874,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(57);
+        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) {
@@ -7016,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; });
     };
@@ -7054,7 +7048,7 @@ var InternalState = (function () {
         }
     }
     InternalState.prototype.forceUpdate = function () {
-        __DEV__ && invariant.warn(48);
+        globalThis.__DEV__ !== false && invariant.warn(48);
     };
     InternalState.prototype.executeQuery = function (options) {
         var _this = this;
@@ -7084,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 () { };
             }
@@ -7217,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),
@@ -7259,7 +7253,7 @@ var InternalState = (function () {
                     _this.onCompleted(result.data);
                 }
             }).catch(function (error) {
-                __DEV__ && invariant.warn(error);
+                globalThis.__DEV__ !== false && invariant.warn(error);
             });
         }
     };
@@ -7311,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;
@@ -7325,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];
@@ -7344,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,
         };
@@ -7361,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,
@@ -7377,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 });
@@ -7438,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;
@@ -7453,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,
@@ -7465,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 ? 50 : 51);
+            globalThis.__DEV__ !== false && invariant.warn(options.onData ? 50 : 51);
         }
         if (options === null || options === void 0 ? void 0 : options.onSubscriptionComplete) {
-            __DEV__ && invariant.warn(options.onComplete ? 52 : 53);
+            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;
         }
@@ -7482,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') {
@@ -7530,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;
         }
@@ -7597,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);
@@ -7614,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);
@@ -7644,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);
@@ -7677,7 +7661,7 @@ var __use = realHook ||
     };
 
 function useSuspenseCache(override) {
-    var context = React.useContext(getApolloContext());
+    var context = React__namespace.useContext(getApolloContext());
     var suspenseCache = override || context.suspenseCache;
     invariant(suspenseCache, 54);
     return suspenseCache;
@@ -7694,7 +7678,7 @@ function useSuspenseQuery(query, options) {
     var queryRef = suspenseCache.getQueryRef(cacheKey, function () {
         return client.watchQuery(watchQueryOptions);
     });
-    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 (queryRef.didChangeOptions(watchQueryOptions)) {
         promise = queryRef.applyOptions(watchQueryOptions);
@@ -7704,15 +7688,19 @@ function useSuspenseQuery(query, options) {
         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,
@@ -7722,22 +7710,22 @@ function useSuspenseQuery(query, options) {
         };
     }, [queryRef.result]);
     var result = fetchPolicy === 'standby' ? skipResult : __use(promise);
-    var fetchMore = React.useCallback(function (options) {
+    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,
@@ -7767,7 +7755,7 @@ function validateFetchPolicy(fetchPolicy) {
 }
 function validatePartialDataReturn(fetchPolicy, returnPartialData) {
     if (fetchPolicy === 'no-cache' && returnPartialData) {
-        __DEV__ && invariant.warn(56);
+        globalThis.__DEV__ !== false && invariant.warn(56);
     }
 }
 function toApolloError(result) {
@@ -7775,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 () {
@@ -7790,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) {
@@ -7814,11 +7795,12 @@ var InternalQueryReference = (function () {
         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);
@@ -7828,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", {
@@ -7852,6 +7838,24 @@ var InternalQueryReference = (function () {
         enumerable: false,
         configurable: true
     });
+    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) {
@@ -7859,40 +7863,36 @@ var InternalQueryReference = (function () {
         });
     };
     InternalQueryReference.prototype.applyOptions = function (watchQueryOptions) {
-        var currentFetchPolicy = this.watchQueryOptions.fetchPolicy;
+        var _a = this.watchQueryOptions, currentFetchPolicy = _a.fetchPolicy, currentCanonizeResults = _a.canonizeResults;
         if (currentFetchPolicy === 'standby' &&
             currentFetchPolicy !== watchQueryOptions.fetchPolicy) {
-            this.promise = this.observable.reobserve(watchQueryOptions);
+            this.observable.reobserve(watchQueryOptions);
+            this.initiateFetch();
         }
         else {
             this.observable.silentSetOptions(watchQueryOptions);
-            this.result = tslib.__assign(tslib.__assign({}, this.result), this.observable.getCurrentResult());
-            this.promise = createFulfilledPromise(this.result);
+            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;
-        clearTimeout(this.autoDisposeTimeoutId);
         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 () {
@@ -7902,45 +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.promise = createRejectedPromise(error);
-        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;
 }());
 
@@ -7955,28 +7967,28 @@ function useBackgroundQuery(query, options) {
     var queryRef = suspenseCache.getQueryRef(cacheKey, function () {
         return client.watchQuery(watchQueryOptions);
     });
-    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];
     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),
@@ -7989,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, 49);
-    var skipResult = React.useMemo(function () {
+    var skipResult = React__namespace.useMemo(function () {
         var error = toApolloError(internalQueryRef.result);
         return {
             loading: false,
@@ -8006,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; });
@@ -8015,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,