@apollo/client 3.4.6 → 3.4.10

package/apollo-client.cjs.js

@@ -5,10 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var tsInvariant = require('ts-invariant');
 var equality = require('@wry/equality');
-var process$1 = require('ts-invariant/process');
-var graphql = require('graphql');
 var zenObservableTs = require('zen-observable-ts');
 require('symbol-observable');
+var graphql = require('graphql');
 var optimism = require('optimism');
 var context = require('@wry/context');
 var trie = require('@wry/trie');
@@ -36,37 +35,6 @@ function maybe(thunk) {
     catch (_a) { }
 }
 
-var global$1 = (maybe(function () { return globalThis; }) ||
-    maybe(function () { return window; }) ||
-    maybe(function () { return self; }) ||
-    maybe(function () { return global; }) ||
-    maybe(function () { return Function("return this")(); }));
-
-var __ = "__";
-var GLOBAL_KEY = [__, __].join("DEV");
-function getDEV() {
-    try {
-        return Boolean(__DEV__);
-    }
-    catch (_a) {
-        Object.defineProperty(global$1, GLOBAL_KEY, {
-            value: maybe(function () { return process.env.NODE_ENV; }) !== "production",
-            enumerable: false,
-            configurable: true,
-            writable: true,
-        });
-        return global$1[GLOBAL_KEY];
-    }
-}
-var DEV = getDEV();
-
-function removeTemporaryGlobals() {
-    graphql.isType(null);
-    return process$1.remove();
-}
-
-removeTemporaryGlobals();
-
 function shouldInclude(_a, variables) {
     var directives = _a.directives;
     if (!directives || !directives.length) {
@@ -77,7 +45,7 @@ function shouldInclude(_a, variables) {
         var evaledValue = false;
         if (ifArgument.value.kind === 'Variable') {
             evaledValue = variables && variables[ifArgument.value.name.value];
-            __DEV__ ? tsInvariant.invariant(evaledValue !== void 0, "Invalid variable referenced in @" + directive.name.value + " directive.") : tsInvariant.invariant(evaledValue !== void 0, 43);
+            __DEV__ ? tsInvariant.invariant(evaledValue !== void 0, "Invalid variable referenced in @" + directive.name.value + " directive.") : tsInvariant.invariant(evaledValue !== void 0, 39);
         }
         else {
             evaledValue = ifArgument.value.value;
@@ -114,13 +82,13 @@ function getInclusionDirectives(directives) {
                 return;
             var directiveArguments = directive.arguments;
             var directiveName = directive.name.value;
-            __DEV__ ? tsInvariant.invariant(directiveArguments && directiveArguments.length === 1, "Incorrect number of arguments for the @" + directiveName + " directive.") : tsInvariant.invariant(directiveArguments && directiveArguments.length === 1, 44);
+            __DEV__ ? tsInvariant.invariant(directiveArguments && directiveArguments.length === 1, "Incorrect number of arguments for the @" + directiveName + " directive.") : tsInvariant.invariant(directiveArguments && directiveArguments.length === 1, 40);
             var ifArgument = directiveArguments[0];
-            __DEV__ ? tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', "Invalid argument for the @" + directiveName + " directive.") : tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', 45);
+            __DEV__ ? tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', "Invalid argument for the @" + directiveName + " directive.") : tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', 41);
             var ifValue = ifArgument.value;
             __DEV__ ? tsInvariant.invariant(ifValue &&
                 (ifValue.kind === 'Variable' || ifValue.kind === 'BooleanValue'), "Argument for the @" + directiveName + " directive must be a variable or a boolean value.") : tsInvariant.invariant(ifValue &&
-                (ifValue.kind === 'Variable' || ifValue.kind === 'BooleanValue'), 46);
+                (ifValue.kind === 'Variable' || ifValue.kind === 'BooleanValue'), 42);
             result.push({ directive: directive, ifArgument: ifArgument });
         });
     }
@@ -133,14 +101,14 @@ function getFragmentQueryDocument(document, fragmentName) {
     document.definitions.forEach(function (definition) {
         if (definition.kind === 'OperationDefinition') {
             throw __DEV__ ? new tsInvariant.InvariantError("Found a " + definition.operation + " operation" + (definition.name ? " named '" + definition.name.value + "'" : '') + ". " +
-                'No operations are allowed when using a fragment as a query. Only fragments are allowed.') : new tsInvariant.InvariantError(47);
+                'No operations are allowed when using a fragment as a query. Only fragments are allowed.') : new tsInvariant.InvariantError(43);
         }
         if (definition.kind === 'FragmentDefinition') {
             fragments.push(definition);
         }
     });
     if (typeof actualFragmentName === 'undefined') {
-        __DEV__ ? tsInvariant.invariant(fragments.length === 1, "Found " + fragments.length + " fragments. `fragmentName` must be provided when there is not exactly 1 fragment.") : tsInvariant.invariant(fragments.length === 1, 48);
+        __DEV__ ? tsInvariant.invariant(fragments.length === 1, "Found " + fragments.length + " fragments. `fragmentName` must be provided when there is not exactly 1 fragment.") : tsInvariant.invariant(fragments.length === 1, 44);
         actualFragmentName = fragments[0].name.value;
     }
     var query = tslib.__assign(tslib.__assign({}, document), { definitions: tslib.__spreadArray([
@@ -177,7 +145,7 @@ function getFragmentFromSelection(selection, fragmentMap) {
             return selection;
         case 'FragmentSpread': {
             var fragment = fragmentMap && fragmentMap[selection.name.value];
-            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named " + selection.name.value + ".") : tsInvariant.invariant(fragment, 49);
+            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named " + selection.name.value + ".") : tsInvariant.invariant(fragment, 45);
             return fragment;
         }
         default:
@@ -261,7 +229,7 @@ function valueToObjectRepresentation(argObj, name, value, variables) {
     else {
         throw __DEV__ ? new tsInvariant.InvariantError("The inline argument \"" + name.value + "\" of kind \"" + value.kind + "\"" +
             'is not supported. Use variables instead of inline arguments to ' +
-            'overcome this limitation.') : new tsInvariant.InvariantError(58);
+            'overcome this limitation.') : new tsInvariant.InvariantError(54);
     }
 }
 function storeKeyNameFromField(field, variables) {
@@ -395,16 +363,16 @@ function isInlineFragment(selection) {
 }
 
 function checkDocument(doc) {
-    __DEV__ ? tsInvariant.invariant(doc && doc.kind === 'Document', "Expecting a parsed GraphQL document. Perhaps you need to wrap the query string in a \"gql\" tag? http://docs.apollostack.com/apollo-client/core.html#gql") : tsInvariant.invariant(doc && doc.kind === 'Document', 50);
+    __DEV__ ? tsInvariant.invariant(doc && doc.kind === 'Document', "Expecting a parsed GraphQL document. Perhaps you need to wrap the query string in a \"gql\" tag? http://docs.apollostack.com/apollo-client/core.html#gql") : tsInvariant.invariant(doc && doc.kind === 'Document', 46);
     var operations = doc.definitions
         .filter(function (d) { return d.kind !== 'FragmentDefinition'; })
         .map(function (definition) {
         if (definition.kind !== 'OperationDefinition') {
-            throw __DEV__ ? new tsInvariant.InvariantError("Schema type definitions not allowed in queries. Found: \"" + definition.kind + "\"") : new tsInvariant.InvariantError(51);
+            throw __DEV__ ? new tsInvariant.InvariantError("Schema type definitions not allowed in queries. Found: \"" + definition.kind + "\"") : new tsInvariant.InvariantError(47);
         }
         return definition;
     });
-    __DEV__ ? tsInvariant.invariant(operations.length <= 1, "Ambiguous GraphQL document: contains " + operations.length + " operations") : tsInvariant.invariant(operations.length <= 1, 52);
+    __DEV__ ? tsInvariant.invariant(operations.length <= 1, "Ambiguous GraphQL document: contains " + operations.length + " operations") : tsInvariant.invariant(operations.length <= 1, 48);
     return doc;
 }
 function getOperationDefinition(doc) {
@@ -423,14 +391,14 @@ function getFragmentDefinitions(doc) {
 }
 function getQueryDefinition(doc) {
     var queryDef = getOperationDefinition(doc);
-    __DEV__ ? tsInvariant.invariant(queryDef && queryDef.operation === 'query', 'Must contain a query definition.') : tsInvariant.invariant(queryDef && queryDef.operation === 'query', 53);
+    __DEV__ ? tsInvariant.invariant(queryDef && queryDef.operation === 'query', 'Must contain a query definition.') : tsInvariant.invariant(queryDef && queryDef.operation === 'query', 49);
     return queryDef;
 }
 function getFragmentDefinition(doc) {
-    __DEV__ ? tsInvariant.invariant(doc.kind === 'Document', "Expecting a parsed GraphQL document. Perhaps you need to wrap the query string in a \"gql\" tag? http://docs.apollostack.com/apollo-client/core.html#gql") : tsInvariant.invariant(doc.kind === 'Document', 54);
-    __DEV__ ? tsInvariant.invariant(doc.definitions.length <= 1, 'Fragment must have exactly one definition.') : tsInvariant.invariant(doc.definitions.length <= 1, 55);
+    __DEV__ ? tsInvariant.invariant(doc.kind === 'Document', "Expecting a parsed GraphQL document. Perhaps you need to wrap the query string in a \"gql\" tag? http://docs.apollostack.com/apollo-client/core.html#gql") : tsInvariant.invariant(doc.kind === 'Document', 50);
+    __DEV__ ? tsInvariant.invariant(doc.definitions.length <= 1, 'Fragment must have exactly one definition.') : tsInvariant.invariant(doc.definitions.length <= 1, 51);
     var fragmentDef = doc.definitions[0];
-    __DEV__ ? tsInvariant.invariant(fragmentDef.kind === 'FragmentDefinition', 'Must be a fragment definition.') : tsInvariant.invariant(fragmentDef.kind === 'FragmentDefinition', 56);
+    __DEV__ ? tsInvariant.invariant(fragmentDef.kind === 'FragmentDefinition', 'Must be a fragment definition.') : tsInvariant.invariant(fragmentDef.kind === 'FragmentDefinition', 52);
     return fragmentDef;
 }
 function getMainDefinition(queryDoc) {
@@ -453,7 +421,7 @@ function getMainDefinition(queryDoc) {
     if (fragmentDefinition) {
         return fragmentDefinition;
     }
-    throw __DEV__ ? new tsInvariant.InvariantError('Expected a parsed GraphQL query with a query, mutation, subscription, or a fragment.') : new tsInvariant.InvariantError(57);
+    throw __DEV__ ? new tsInvariant.InvariantError('Expected a parsed GraphQL query with a query, mutation, subscription, or a fragment.') : new tsInvariant.InvariantError(53);
 }
 function getDefaultValues(definition) {
     var defaultValues = Object.create(null);
@@ -735,7 +703,7 @@ function removeClientSetsFromDocument(document) {
     return modifiedDoc;
 }
 
-var hasOwnProperty$2 = Object.prototype.hasOwnProperty;
+var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 function mergeDeep() {
     var sources = [];
     for (var _i = 0; _i < arguments.length; _i++) {
@@ -772,7 +740,7 @@ var DeepMerger = (function () {
         }
         if (isNonNullObject(source) && isNonNullObject(target)) {
             Object.keys(source).forEach(function (sourceKey) {
-                if (hasOwnProperty$2.call(target, sourceKey)) {
+                if (hasOwnProperty$3.call(target, sourceKey)) {
                     var targetValue = target[sourceKey];
                     if (source[sourceKey] !== targetValue) {
                         var result = _this.reconciler.apply(_this, tslib.__spreadArray([target, source, sourceKey], context));
@@ -952,7 +920,7 @@ var Concast = (function (_super) {
                 var sub = _this.sub;
                 if (sub !== null) {
                     if (sub)
-                        Promise.resolve().then(function () { return sub.unsubscribe(); });
+                        setTimeout(function () { return sub.unsubscribe(); });
                     _this.sub = null;
                     _this.latest = ["error", error];
                     _this.reject(error);
@@ -1101,8 +1069,6 @@ function stringifyForDisplay(value) {
     }).split(JSON.stringify(undefId)).join("<undefined>");
 }
 
-__DEV__ ? tsInvariant.invariant("boolean" === typeof DEV, DEV) : tsInvariant.invariant("boolean" === typeof DEV, 59);
-
 function fromError(errorValue) {
     return new zenObservableTs.Observable(function (observer) {
         observer.error(errorValue);
@@ -1158,7 +1124,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 __DEV__ ? new tsInvariant.InvariantError("illegal argument: " + key) : new tsInvariant.InvariantError(29);
+            throw __DEV__ ? new tsInvariant.InvariantError("illegal argument: " + key) : new tsInvariant.InvariantError(26);
         }
     }
     return operation;
@@ -1281,7 +1247,7 @@ var ApolloLink = (function () {
         return ApolloLink.concat(this, next);
     };
     ApolloLink.prototype.request = function (operation, forward) {
-        throw __DEV__ ? new tsInvariant.InvariantError('request is not implemented') : new tsInvariant.InvariantError(23);
+        throw __DEV__ ? new tsInvariant.InvariantError('request is not implemented') : new tsInvariant.InvariantError(21);
     };
     ApolloLink.prototype.onError = function (error, observer) {
         if (observer && observer.error) {
@@ -1307,9 +1273,9 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.4.6';
+var version = '3.4.10';
 
-var hasOwnProperty$1 = Object.prototype.hasOwnProperty;
+var hasOwnProperty$2 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
     return function (response) { return response
         .text()
@@ -1331,8 +1297,8 @@ function parseAndCheckHttpResponse(operations) {
             throwServerError(response, result, "Response not successful: Received status code " + response.status);
         }
         if (!Array.isArray(result) &&
-            !hasOwnProperty$1.call(result, 'data') &&
-            !hasOwnProperty$1.call(result, 'errors')) {
+            !hasOwnProperty$2.call(result, 'data') &&
+            !hasOwnProperty$2.call(result, 'errors')) {
             throwServerError(response, result, "Server response was missing for query '" + (Array.isArray(operations)
                 ? operations.map(function (op) { return op.operationName; })
                 : operations.operationName) + "'.");
@@ -1347,7 +1313,7 @@ var serializeFetchParameter = function (p, label) {
         serialized = JSON.stringify(p);
     }
     catch (e) {
-        var parseError = __DEV__ ? new tsInvariant.InvariantError("Network request failed. " + label + " is not serializable: " + e.message) : new tsInvariant.InvariantError(26);
+        var parseError = __DEV__ ? new tsInvariant.InvariantError("Network request failed. " + label + " is not serializable: " + e.message) : new tsInvariant.InvariantError(23);
         parseError.parseError = e;
         throw parseError;
     }
@@ -1407,7 +1373,7 @@ function headersToLowerCase(headers) {
 
 var checkFetcher = function (fetcher) {
     if (!fetcher && typeof fetch === 'undefined') {
-        throw __DEV__ ? new tsInvariant.InvariantError("\n\"fetch\" has not been found globally and no fetcher has been configured. To fix this, install a fetch package (like https://www.npmjs.com/package/cross-fetch), instantiate the fetcher, and pass it into your HttpLink constructor. For example:\n\nimport fetch from 'cross-fetch';\nimport { ApolloClient, HttpLink } from '@apollo/client';\nconst client = new ApolloClient({\n  link: new HttpLink({ uri: '/graphql', fetch })\n});\n    ") : new tsInvariant.InvariantError(25);
+        throw __DEV__ ? new tsInvariant.InvariantError("\n\"fetch\" has not been found globally and no fetcher has been configured. To fix this, install a fetch package (like https://www.npmjs.com/package/cross-fetch), instantiate the fetcher, and pass it into your HttpLink constructor. For example:\n\nimport fetch from 'cross-fetch';\nimport { ApolloClient, HttpLink } from '@apollo/client';\nconst client = new ApolloClient({\n  link: new HttpLink({ uri: '/graphql', fetch })\n});\n    ") : new tsInvariant.InvariantError(22);
     }
 };
 
@@ -1787,7 +1753,7 @@ var EntityStore = (function () {
             : newer;
         if (!incoming)
             return;
-        __DEV__ ? tsInvariant.invariant(typeof dataId === "string", "store.merge expects a string ID") : tsInvariant.invariant(typeof dataId === "string", 2);
+        __DEV__ ? tsInvariant.invariant(typeof dataId === "string", "store.merge expects a string ID") : tsInvariant.invariant(typeof dataId === "string", 1);
         var merged = new DeepMerger(storeObjectReconciler).merge(existing, incoming);
         this.data[dataId] = merged;
         if (merged !== existing) {
@@ -2378,7 +2344,7 @@ var StoreReader = (function () {
             !context.store.has(objectOrReference.__ref)) {
             return {
                 result: this.canon.empty,
-                missing: [missingFromInvariant(__DEV__ ? new tsInvariant.InvariantError("Dangling reference to missing " + objectOrReference.__ref + " object") : new tsInvariant.InvariantError(6), context)],
+                missing: [missingFromInvariant(__DEV__ ? new tsInvariant.InvariantError("Dangling reference to missing " + objectOrReference.__ref + " object") : new tsInvariant.InvariantError(5), context)],
             };
         }
         var variables = context.variables, policies = context.policies, store = context.store;
@@ -2417,7 +2383,7 @@ var StoreReader = (function () {
                     if (!addTypenameToDocument.added(selection)) {
                         getMissing().push(missingFromInvariant(__DEV__ ? new tsInvariant.InvariantError("Can't find field '" + selection.name.value + "' on " + (isReference(objectOrReference)
                             ? objectOrReference.__ref + " object"
-                            : "object " + JSON.stringify(objectOrReference, null, 2))) : new tsInvariant.InvariantError(7), context));
+                            : "object " + JSON.stringify(objectOrReference, null, 2))) : new tsInvariant.InvariantError(6), context));
                     }
                 }
                 else if (Array.isArray(fieldValue)) {
@@ -2514,7 +2480,7 @@ function assertSelectionSetForIdValue(store, field, fieldValue) {
         var workSet_1 = new Set([fieldValue]);
         workSet_1.forEach(function (value) {
             if (isNonNullObject(value)) {
-                __DEV__ ? tsInvariant.invariant(!isReference(value), "Missing selection set for object of type " + getTypenameFromStoreObject(store, value) + " returned for query field " + field.name.value) : tsInvariant.invariant(!isReference(value), 8);
+                __DEV__ ? tsInvariant.invariant(!isReference(value), "Missing selection set for object of type " + getTypenameFromStoreObject(store, value) + " returned for query field " + field.name.value) : tsInvariant.invariant(!isReference(value), 7);
                 Object.values(value).forEach(workSet_1.add, workSet_1);
             }
         });
@@ -2553,12 +2519,12 @@ var StoreWriter = (function () {
             context: context,
         });
         if (!isReference(ref)) {
-            throw __DEV__ ? new tsInvariant.InvariantError("Could not identify object " + JSON.stringify(result)) : new tsInvariant.InvariantError(9);
+            throw __DEV__ ? new tsInvariant.InvariantError("Could not identify object " + JSON.stringify(result)) : new tsInvariant.InvariantError(8);
         }
         context.incomingById.forEach(function (_a, dataId) {
             var fields = _a.fields, mergeTree = _a.mergeTree, selections = _a.selections;
             var entityRef = makeReference(dataId);
-            if (mergeTree.map.size) {
+            if (mergeTree && mergeTree.map.size) {
                 var applied = _this.applyMerges(mergeTree, entityRef, fields, context);
                 if (isReference(applied)) {
                     return;
@@ -2576,7 +2542,7 @@ var StoreWriter = (function () {
                     }
                 });
                 var hasMergeFunction_1 = function (storeFieldName) {
-                    var childTree = mergeTree.map.get(storeFieldName);
+                    var childTree = mergeTree && mergeTree.map.get(storeFieldName);
                     return Boolean(childTree && childTree.info && childTree.info.merge);
                 };
                 Object.keys(fields).forEach(function (storeFieldName) {
@@ -2685,7 +2651,7 @@ var StoreWriter = (function () {
             else {
                 context.incomingById.set(dataId, {
                     fields: incomingFields,
-                    mergeTree: mergeTree,
+                    mergeTree: mergeTreeIsEmpty(mergeTree) ? void 0 : mergeTree,
                     selections: selections,
                 });
             }
@@ -3050,7 +3016,7 @@ var Policies = (function () {
         var rootId = "ROOT_" + which.toUpperCase();
         var old = this.rootTypenamesById[rootId];
         if (typename !== old) {
-            __DEV__ ? tsInvariant.invariant(!old || old === which, "Cannot change root " + which + " __typename more than once") : tsInvariant.invariant(!old || old === which, 3);
+            __DEV__ ? tsInvariant.invariant(!old || old === which, "Cannot change root " + which + " __typename more than once") : tsInvariant.invariant(!old || old === which, 2);
             if (old)
                 delete this.rootIdsByTypename[old];
             this.rootIdsByTypename[typename] = rootId;
@@ -3294,7 +3260,7 @@ function makeFieldFunctionOptions(policies, objectOrReference, fieldSpec, contex
 function makeMergeObjectsFunction(store) {
     return function mergeObjects(existing, incoming) {
         if (Array.isArray(existing) || Array.isArray(incoming)) {
-            throw __DEV__ ? new tsInvariant.InvariantError("Cannot automatically merge arrays") : new tsInvariant.InvariantError(4);
+            throw __DEV__ ? new tsInvariant.InvariantError("Cannot automatically merge arrays") : new tsInvariant.InvariantError(3);
         }
         if (isNonNullObject(existing) &&
             isNonNullObject(incoming)) {
@@ -3375,24 +3341,27 @@ function makeAliasMap(selectionSet, fragmentMap) {
 }
 function computeKeyObject(response, specifier, strict, aliasMap) {
     var keyObj = Object.create(null);
-    var prevKey;
+    var lastResponseKey;
+    var lastActualKey;
     specifier.forEach(function (s) {
         if (Array.isArray(s)) {
-            if (typeof prevKey === "string") {
+            if (typeof lastActualKey === "string" &&
+                typeof lastResponseKey === "string") {
                 var subsets = aliasMap && aliasMap.subsets;
-                var subset = subsets && subsets[prevKey];
-                keyObj[prevKey] = computeKeyObject(response[prevKey], s, strict, subset);
+                var subset = subsets && subsets[lastActualKey];
+                keyObj[lastActualKey] =
+                    computeKeyObject(response[lastResponseKey], s, strict, subset);
             }
         }
         else {
             var aliases = aliasMap && aliasMap.aliases;
             var responseName = aliases && aliases[s] || s;
             if (hasOwn.call(response, responseName)) {
-                keyObj[prevKey = s] = response[responseName];
+                keyObj[lastActualKey = s] = response[lastResponseKey = responseName];
             }
             else {
-                __DEV__ ? tsInvariant.invariant(!strict, "Missing field '" + responseName + "' while computing key fields") : tsInvariant.invariant(!strict, 5);
-                prevKey = void 0;
+                __DEV__ ? tsInvariant.invariant(!strict, "Missing field '" + responseName + "' while computing key fields") : tsInvariant.invariant(!strict, 4);
+                lastResponseKey = lastActualKey = void 0;
             }
         }
     });
@@ -3684,7 +3653,6 @@ var InMemoryCache = (function (_super) {
     return InMemoryCache;
 }(ApolloCache));
 
-__DEV__ ? tsInvariant.invariant("boolean" === typeof DEV, DEV) : tsInvariant.invariant("boolean" === typeof DEV, 22);
 function isApolloError(err) {
     return err.hasOwnProperty('graphQLErrors');
 }
@@ -3736,6 +3704,7 @@ function isNetworkRequestInFlight(networkStatus) {
     return networkStatus ? networkStatus < 7 : false;
 }
 
+var assign = Object.assign, hasOwnProperty$1 = Object.hasOwnProperty;
 var warnedAboutUpdateQuery = false;
 var ObservableQuery = (function (_super) {
     tslib.__extends(ObservableQuery, _super);
@@ -3751,11 +3720,12 @@ var ObservableQuery = (function (_super) {
             catch (_a) { }
             var first = !_this.observers.size;
             _this.observers.add(observer);
-            if (_this.lastError) {
-                observer.error && observer.error(_this.lastError);
+            var last = _this.last;
+            if (last && last.error) {
+                observer.error && observer.error(last.error);
             }
-            else if (_this.lastResult) {
-                observer.next && observer.next(_this.lastResult);
+            else if (last && last.result) {
+                observer.next && observer.next(last.result);
             }
             if (first) {
                 _this.reobserve().catch(function () { });
@@ -3768,18 +3738,6 @@ var ObservableQuery = (function (_super) {
         }) || this;
         _this.observers = new Set();
         _this.subscriptions = new Set();
-        _this.observer = {
-            next: function (result) {
-                if (_this.lastError || _this.isDifferentFromLastResult(result)) {
-                    _this.updateLastResult(result);
-                    iterateObserversSafely(_this.observers, 'next', result);
-                }
-            },
-            error: function (error) {
-                _this.updateLastResult(tslib.__assign(tslib.__assign({}, _this.lastResult), { error: error, errors: error.graphQLErrors, networkStatus: exports.NetworkStatus.error, loading: false }));
-                iterateObserversSafely(_this.observers, 'error', _this.lastError = error);
-            },
-        };
         _this.isTornDown = false;
         _this.options = options;
         _this.queryId = queryInfo.queryId || queryManager.generateQueryId();
@@ -3818,15 +3776,24 @@ var ObservableQuery = (function (_super) {
     };
     ObservableQuery.prototype.getCurrentResult = function (saveAsLastResult) {
         if (saveAsLastResult === void 0) { saveAsLastResult = true; }
-        var _a = this, lastResult = _a.lastResult, _b = _a.options.fetchPolicy, fetchPolicy = _b === void 0 ? "cache-first" : _b;
+        var lastResult = this.getLastResult(true);
         var networkStatus = this.queryInfo.networkStatus ||
             (lastResult && lastResult.networkStatus) ||
             exports.NetworkStatus.ready;
         var result = tslib.__assign(tslib.__assign({}, lastResult), { loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus });
-        if (!this.queryManager.transform(this.options.query).hasForcedResolvers) {
+        var _a = this.options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a;
+        var shouldReturnCachedData = lastResult || (fetchPolicy !== 'network-only' &&
+            fetchPolicy !== 'no-cache' &&
+            fetchPolicy !== 'standby');
+        if (shouldReturnCachedData &&
+            !this.queryManager.transform(this.options.query).hasForcedResolvers) {
             var diff = this.queryInfo.getDiff();
-            result.data = (diff.complete ||
-                this.options.returnPartialData) ? diff.result : void 0;
+            if (diff.complete || this.options.returnPartialData) {
+                result.data = diff.result;
+            }
+            if (equality.equal(result.data, {})) {
+                result.data = void 0;
+            }
             if (diff.complete) {
                 if (result.networkStatus === exports.NetworkStatus.loading &&
                     (fetchPolicy === 'cache-first' ||
@@ -3854,24 +3821,31 @@ var ObservableQuery = (function (_super) {
         return result;
     };
     ObservableQuery.prototype.isDifferentFromLastResult = function (newResult) {
-        return !equality.equal(this.lastResultSnapshot, newResult);
+        return !this.last || !equality.equal(this.last.result, newResult);
     };
-    ObservableQuery.prototype.getLastResult = function () {
-        return this.lastResult;
+    ObservableQuery.prototype.getLast = function (key, variablesMustMatch) {
+        var last = this.last;
+        if (last &&
+            last[key] &&
+            (!variablesMustMatch || equality.equal(last.variables, this.variables))) {
+            return last[key];
+        }
+    };
+    ObservableQuery.prototype.getLastResult = function (variablesMustMatch) {
+        return this.getLast("result", variablesMustMatch);
     };
-    ObservableQuery.prototype.getLastError = function () {
-        return this.lastError;
+    ObservableQuery.prototype.getLastError = function (variablesMustMatch) {
+        return this.getLast("error", variablesMustMatch);
     };
     ObservableQuery.prototype.resetLastResults = function () {
-        delete this.lastResult;
-        delete this.lastResultSnapshot;
-        delete this.lastError;
+        delete this.last;
         this.isTornDown = false;
     };
     ObservableQuery.prototype.resetQueryStoreErrors = function () {
         this.queryManager.resetErrors(this.queryId);
     };
     ObservableQuery.prototype.refetch = function (variables) {
+        var _a;
         var reobserveOptions = {
             pollInterval: 0,
         };
@@ -3882,6 +3856,13 @@ var ObservableQuery = (function (_super) {
         else if (fetchPolicy !== 'cache-and-network') {
             reobserveOptions.fetchPolicy = 'network-only';
         }
+        if (__DEV__ && variables && hasOwnProperty$1.call(variables, "variables")) {
+            var queryDef = getQueryDefinition(this.options.query);
+            var vars = queryDef.variableDefinitions;
+            if (!vars || !vars.some(function (v) { return v.variable.name.value === "variables"; })) {
+                __DEV__ && tsInvariant.invariant.warn("Called refetch(" + JSON.stringify(variables) + ") for query " + (((_a = queryDef.name) === null || _a === void 0 ? void 0 : _a.value) || JSON.stringify(queryDef)) + ", which does not declare a $variables variable.\nDid you mean to call refetch(variables) instead of refetch({ variables })?");
+            }
+        }
         if (variables && !equality.equal(this.options.variables, variables)) {
             reobserveOptions.variables = this.options.variables = tslib.__assign(tslib.__assign({}, this.options.variables), variables);
         }
@@ -3978,12 +3959,10 @@ var ObservableQuery = (function (_super) {
         }, exports.NetworkStatus.setVariables);
     };
     ObservableQuery.prototype.updateQuery = function (mapFn) {
-        var _a;
         var queryManager = this.queryManager;
         var result = queryManager.cache.diff({
             query: this.options.query,
             variables: this.variables,
-            previousResult: (_a = this.lastResult) === null || _a === void 0 ? void 0 : _a.data,
             returnPartialData: true,
             optimistic: false,
         }).result;
@@ -4028,7 +4007,7 @@ var ObservableQuery = (function (_super) {
             pollingInfo.interval === pollInterval) {
             return;
         }
-        __DEV__ ? tsInvariant.invariant(pollInterval, 'Attempted to start a polling query without a polling interval.') : tsInvariant.invariant(pollInterval, 13);
+        __DEV__ ? tsInvariant.invariant(pollInterval, 'Attempted to start a polling query without a polling interval.') : tsInvariant.invariant(pollInterval, 12);
         var info = pollingInfo || (this.pollingInfo = {});
         info.interval = pollInterval;
         var maybeFetch = function () {
@@ -4052,18 +4031,18 @@ var ObservableQuery = (function (_super) {
         };
         poll();
     };
-    ObservableQuery.prototype.updateLastResult = function (newResult) {
-        var previousResult = this.lastResult;
-        this.lastResult = newResult;
-        this.lastResultSnapshot = this.queryManager.assumeImmutableResults
-            ? newResult
-            : cloneDeep(newResult);
+    ObservableQuery.prototype.updateLastResult = function (newResult, variables) {
+        if (variables === void 0) { variables = this.variables; }
+        this.last = tslib.__assign(tslib.__assign({}, this.last), { result: this.queryManager.assumeImmutableResults
+                ? newResult
+                : cloneDeep(newResult), variables: variables });
         if (!isNonEmptyArray(newResult.errors)) {
-            delete this.lastError;
+            delete this.last.error;
         }
-        return previousResult;
+        return this.last;
     };
     ObservableQuery.prototype.reobserve = function (newOptions, newNetworkStatus) {
+        var _this = this;
         this.isTornDown = false;
         var useDisposableConcast = newNetworkStatus === exports.NetworkStatus.refetch ||
             newNetworkStatus === exports.NetworkStatus.fetchMore ||
@@ -4071,7 +4050,7 @@ var ObservableQuery = (function (_super) {
         var oldVariables = this.options.variables;
         var options = useDisposableConcast
             ? compact(this.options, newOptions)
-            : Object.assign(this.options, compact(newOptions));
+            : assign(this.options, compact(newOptions));
         if (!useDisposableConcast) {
             this.updatePolling();
             if (newOptions &&
@@ -4084,18 +4063,39 @@ var ObservableQuery = (function (_super) {
                 }
             }
         }
+        var variables = options.variables && tslib.__assign({}, options.variables);
         var concast = this.fetch(options, newNetworkStatus);
+        var observer = {
+            next: function (result) {
+                _this.reportResult(result, variables);
+            },
+            error: function (error) {
+                _this.reportError(error, variables);
+            },
+        };
         if (!useDisposableConcast) {
-            if (this.concast) {
+            if (this.concast && this.observer) {
                 this.concast.removeObserver(this.observer, true);
             }
             this.concast = concast;
+            this.observer = observer;
         }
-        concast.addObserver(this.observer);
+        concast.addObserver(observer);
         return concast.promise;
     };
     ObservableQuery.prototype.observe = function () {
-        this.observer.next(this.getCurrentResult(false));
+        this.reportResult(this.getCurrentResult(false), this.variables);
+    };
+    ObservableQuery.prototype.reportResult = function (result, variables) {
+        if (this.getLastError() || this.isDifferentFromLastResult(result)) {
+            this.updateLastResult(result, variables);
+            iterateObserversSafely(this.observers, 'next', result);
+        }
+    };
+    ObservableQuery.prototype.reportError = function (error, variables) {
+        var errorResult = tslib.__assign(tslib.__assign({}, this.getLastResult()), { error: error, errors: error.graphQLErrors, networkStatus: exports.NetworkStatus.error, loading: false });
+        this.updateLastResult(errorResult, variables);
+        iterateObserversSafely(this.observers, 'error', this.last.error = error);
     };
     ObservableQuery.prototype.hasObservers = function () {
         return this.observers.size > 0;
@@ -4103,9 +4103,10 @@ var ObservableQuery = (function (_super) {
     ObservableQuery.prototype.tearDownQuery = function () {
         if (this.isTornDown)
             return;
-        if (this.concast) {
+        if (this.concast && this.observer) {
             this.concast.removeObserver(this.observer);
             delete this.concast;
+            delete this.observer;
         }
         this.stopPolling();
         this.subscriptions.forEach(function (sub) { return sub.unsubscribe(); });
@@ -4303,7 +4304,7 @@ var LocalState = (function () {
                         }
                         else {
                             fragment = fragmentMap[selection.name.value];
-                            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named " + selection.name.value) : tsInvariant.invariant(fragment, 12);
+                            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named " + selection.name.value) : tsInvariant.invariant(fragment, 11);
                         }
                         if (fragment && fragment.typeCondition) {
                             typeCondition = fragment.typeCondition.name.value;
@@ -4689,7 +4690,7 @@ var QueryManager = (function () {
         this.queries.forEach(function (_info, queryId) {
             _this.stopQueryNoBroadcast(queryId);
         });
-        this.cancelPendingFetches(__DEV__ ? new tsInvariant.InvariantError('QueryManager stopped while query was in flight') : new tsInvariant.InvariantError(14));
+        this.cancelPendingFetches(__DEV__ ? new tsInvariant.InvariantError('QueryManager stopped while query was in flight') : new tsInvariant.InvariantError(13));
     };
     QueryManager.prototype.cancelPendingFetches = function (error) {
         this.fetchCancelFns.forEach(function (cancel) { return cancel(error); });
@@ -4702,10 +4703,10 @@ var QueryManager = (function () {
             return tslib.__generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
-                        __DEV__ ? tsInvariant.invariant(mutation, 'mutation option is required. You must specify your GraphQL document in the mutation option.') : tsInvariant.invariant(mutation, 15);
+                        __DEV__ ? tsInvariant.invariant(mutation, 'mutation option is required. You must specify your GraphQL document in the mutation option.') : tsInvariant.invariant(mutation, 14);
                         __DEV__ ? tsInvariant.invariant(fetchPolicy === 'network-only' ||
                             fetchPolicy === 'no-cache', "Mutations support only 'network-only' or 'no-cache' fetchPolicy strings. The default `network-only` behavior automatically writes mutation results to the cache. Passing `no-cache` skips the cache write.") : tsInvariant.invariant(fetchPolicy === 'network-only' ||
-                            fetchPolicy === 'no-cache', 16);
+                            fetchPolicy === 'no-cache', 15);
                         mutationId = this.generateMutationId();
                         mutation = this.transform(mutation).document;
                         variables = this.getVariables(mutation, variables);
@@ -4990,10 +4991,10 @@ var QueryManager = (function () {
         var _this = this;
         if (queryId === void 0) { queryId = this.generateQueryId(); }
         __DEV__ ? tsInvariant.invariant(options.query, 'query option is required. You must specify your GraphQL document ' +
-            'in the query option.') : tsInvariant.invariant(options.query, 17);
-        __DEV__ ? tsInvariant.invariant(options.query.kind === 'Document', 'You must wrap the query string in a "gql" tag.') : tsInvariant.invariant(options.query.kind === 'Document', 18);
-        __DEV__ ? tsInvariant.invariant(!options.returnPartialData, 'returnPartialData option only supported on watchQuery.') : tsInvariant.invariant(!options.returnPartialData, 19);
-        __DEV__ ? tsInvariant.invariant(!options.pollInterval, 'pollInterval option only supported on watchQuery.') : tsInvariant.invariant(!options.pollInterval, 20);
+            'in the query option.') : tsInvariant.invariant(options.query, 16);
+        __DEV__ ? tsInvariant.invariant(options.query.kind === 'Document', 'You must wrap the query string in a "gql" tag.') : tsInvariant.invariant(options.query.kind === 'Document', 17);
+        __DEV__ ? tsInvariant.invariant(!options.returnPartialData, 'returnPartialData option only supported on watchQuery.') : tsInvariant.invariant(!options.returnPartialData, 18);
+        __DEV__ ? tsInvariant.invariant(!options.pollInterval, 'pollInterval option only supported on watchQuery.') : tsInvariant.invariant(!options.pollInterval, 19);
         return this.fetchQuery(queryId, options).finally(function () { return _this.stopQuery(queryId); });
     };
     QueryManager.prototype.generateQueryId = function () {
@@ -5015,7 +5016,7 @@ var QueryManager = (function () {
             queryInfo.stop();
     };
     QueryManager.prototype.clearStore = function () {
-        this.cancelPendingFetches(__DEV__ ? new tsInvariant.InvariantError('Store reset while query was in flight (not completed in link chain)') : new tsInvariant.InvariantError(21));
+        this.cancelPendingFetches(__DEV__ ? new tsInvariant.InvariantError('Store reset while query was in flight (not completed in link chain)') : new tsInvariant.InvariantError(20));
         this.queries.forEach(function (queryInfo) {
             if (queryInfo.observableQuery) {
                 queryInfo.networkStatus = exports.NetworkStatus.loading;
@@ -5290,7 +5291,7 @@ var QueryManager = (function () {
             return _this.fetchQueryByPolicy(queryInfo, normalized, networkStatus);
         };
         this.fetchCancelFns.set(queryId, function (reason) {
-            Promise.resolve().then(function () { return concast.cancel(reason); });
+            setTimeout(function () { return concast.cancel(reason); });
         });
         var concast = new Concast(this.transform(normalized.query).hasClientExports
             ? this.localState.addExportedVariables(normalized.query, normalized.variables, normalized.context).then(fromVariables)
@@ -5508,7 +5509,7 @@ var ApolloClient = (function () {
         if (!cache) {
             throw __DEV__ ? new tsInvariant.InvariantError("To initialize Apollo Client, you must specify a 'cache' property " +
                 "in the options object. \n" +
-                "For more information, please visit: https://go.apollo.dev/c/docs") : new tsInvariant.InvariantError(10);
+                "For more information, please visit: https://go.apollo.dev/c/docs") : new tsInvariant.InvariantError(9);
         }
         this.link = link;
         this.cache = cache;
@@ -5604,7 +5605,7 @@ var ApolloClient = (function () {
         __DEV__ ? tsInvariant.invariant(options.fetchPolicy !== 'cache-and-network', 'The cache-and-network fetchPolicy does not work with client.query, because ' +
             'client.query can only return a single result. Please use client.watchQuery ' +
             'to receive multiple results from the cache and the network, or consider ' +
-            'using a different fetchPolicy, such as cache-first or network-only.') : tsInvariant.invariant(options.fetchPolicy !== 'cache-and-network', 11);
+            'using a different fetchPolicy, such as cache-first or network-only.') : tsInvariant.invariant(options.fetchPolicy !== 'cache-and-network', 10);
         if (this.disableNetworkFetches && options.fetchPolicy === 'network-only') {
             options = tslib.__assign(tslib.__assign({}, options), { fetchPolicy: 'cache-first' });
         }
@@ -5730,7 +5731,7 @@ var ApolloConsumer = function (props) {
     var ApolloContext = getApolloContext();
     return React__namespace.createElement(ApolloContext.Consumer, null, function (context) {
         __DEV__ ? tsInvariant.invariant(context && context.client, 'Could not find "client" in the context of ApolloConsumer. ' +
-            'Wrap the root component in an <ApolloProvider>.') : tsInvariant.invariant(context && context.client, 30);
+            'Wrap the root component in an <ApolloProvider>.') : tsInvariant.invariant(context && context.client, 27);
         return props.children(context.client);
     });
 };
@@ -5744,7 +5745,7 @@ var ApolloProvider = function (_a) {
             context = Object.assign({}, context, { client: client });
         }
         __DEV__ ? tsInvariant.invariant(context.client, 'ApolloProvider was not passed a client instance. Make ' +
-            'sure you pass in your client via the "client" prop.') : tsInvariant.invariant(context.client, 31);
+            'sure you pass in your client via the "client" prop.') : tsInvariant.invariant(context.client, 28);
         return (React__namespace.createElement(ApolloContext.Provider, { value: context }, children));
     });
 };
@@ -5752,7 +5753,7 @@ var ApolloProvider = function (_a) {
 function useApolloClient() {
     var client = React__namespace.useContext(getApolloContext()).client;
     __DEV__ ? tsInvariant.invariant(client, 'No Apollo Client instance can be found. Please ensure that you ' +
-        'have called `ApolloProvider` higher up in your tree.') : tsInvariant.invariant(client, 36);
+        'have called `ApolloProvider` higher up in your tree.') : tsInvariant.invariant(client, 33);
     return client;
 }
 
@@ -5785,7 +5786,7 @@ function parser(document) {
     var variables, type, name;
     __DEV__ ? tsInvariant.invariant(!!document && !!document.kind, "Argument of " + document + " passed to parser was not a valid GraphQL " +
         "DocumentNode. You may need to use 'graphql-tag' or another method " +
-        "to convert your operation into a document") : tsInvariant.invariant(!!document && !!document.kind, 38);
+        "to convert your operation into a document") : tsInvariant.invariant(!!document && !!document.kind, 34);
     var fragments = document.definitions.filter(function (x) { return x.kind === 'FragmentDefinition'; });
     var queries = document.definitions.filter(function (x) {
         return x.kind === 'OperationDefinition' && x.operation === 'query';
@@ -5799,11 +5800,11 @@ function parser(document) {
     __DEV__ ? tsInvariant.invariant(!fragments.length ||
         (queries.length || mutations.length || subscriptions.length), "Passing only a fragment to 'graphql' is not yet supported. " +
         "You must include a query, subscription or mutation as well") : tsInvariant.invariant(!fragments.length ||
-        (queries.length || mutations.length || subscriptions.length), 39);
+        (queries.length || mutations.length || subscriptions.length), 35);
     __DEV__ ? tsInvariant.invariant(queries.length + mutations.length + subscriptions.length <= 1, "react-apollo only supports a query, subscription, or a mutation per HOC. " +
         (document + " had " + queries.length + " queries, " + subscriptions.length + " ") +
         ("subscriptions and " + mutations.length + " mutations. ") +
-        "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(queries.length + mutations.length + subscriptions.length <= 1, 40);
+        "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(queries.length + mutations.length + subscriptions.length <= 1, 36);
     type = queries.length ? exports.DocumentType.Query : exports.DocumentType.Mutation;
     if (!queries.length && !mutations.length)
         type = exports.DocumentType.Subscription;
@@ -5814,7 +5815,7 @@ function parser(document) {
             : subscriptions;
     __DEV__ ? tsInvariant.invariant(definitions.length === 1, "react-apollo only supports one definition per HOC. " + document + " had " +
         (definitions.length + " definitions. ") +
-        "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(definitions.length === 1, 41);
+        "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(definitions.length === 1, 37);
     var definition = definitions[0];
     variables = definition.variableDefinitions || [];
     if (definition.name && definition.name.kind === 'Name') {
@@ -5855,7 +5856,7 @@ var OperationData = (function () {
             (this.context && this.context.client);
         __DEV__ ? tsInvariant.invariant(!!client, 'Could not find "client" in the context or passed in as an option. ' +
             'Wrap the root component in an <ApolloProvider>, or pass an ' +
-            'ApolloClient instance in via options.') : tsInvariant.invariant(!!client, 32);
+            'ApolloClient instance in via options.') : tsInvariant.invariant(!!client, 29);
         var isNew = false;
         if (client !== this.client) {
             isNew = true;
@@ -5872,7 +5873,7 @@ var OperationData = (function () {
         var requiredOperationName = operationName(type);
         var usedOperationName = operationName(operation.type);
         __DEV__ ? tsInvariant.invariant(operation.type === type, "Running a " + requiredOperationName + " requires a graphql " +
-            (requiredOperationName + ", but a " + usedOperationName + " was used instead.")) : tsInvariant.invariant(operation.type === type, 33);
+            (requiredOperationName + ", but a " + usedOperationName + " was used instead.")) : tsInvariant.invariant(operation.type === type, 30);
     };
     return OperationData;
 }());
@@ -6166,9 +6167,7 @@ var QueryData = (function (_super) {
         var _b = _a === void 0 ? {} : _a, _c = _b.lazy, lazy = _c === void 0 ? false : _c;
         this.isMounted = true;
         var options = this.getOptions();
-        if (this.currentObservable &&
-            !this.ssrInitiated() &&
-            !this.client.disableNetworkFetches) {
+        if (this.currentObservable && !this.ssrInitiated()) {
             this.startQuerySubscription();
         }
         if (!lazy || this.runLazy) {
@@ -6288,14 +6287,14 @@ var QueryData = (function (_super) {
         this.removeQuerySubscription();
         var currentObservable = this.currentObservable;
         if (currentObservable) {
-            var lastError = currentObservable.getLastError();
-            var lastResult = currentObservable.getLastResult();
-            currentObservable.resetLastResults();
-            this.startQuerySubscription();
-            Object.assign(currentObservable, {
-                lastError: lastError,
-                lastResult: lastResult
-            });
+            var last = currentObservable["last"];
+            try {
+                currentObservable.resetLastResults();
+                this.startQuerySubscription();
+            }
+            finally {
+                currentObservable["last"] = last;
+            }
         }
     };
     QueryData.prototype.getExecuteResult = function () {