@apollo/client 3.6.0-beta.0 → 3.6.0-beta.11

package/apollo-client.cjs

@@ -18,11 +18,11 @@ function _interopNamespace(e) {
     if (e && e.__esModule) return e;
     var n = Object.create(null);
     if (e) {
-        Object.keys(e).forEach(function (k) {
+        for (var k in e) {
             n[k] = e[k];
-        });
+        }
     }
-    n['default'] = e;
+    n["default"] = e;
     return Object.freeze(n);
 }
 
@@ -45,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, 37);
+            __DEV__ ? tsInvariant.invariant(evaledValue !== void 0, "Invalid variable referenced in @".concat(directive.name.value, " directive.")) : tsInvariant.invariant(evaledValue !== void 0, 37);
         }
         else {
             evaledValue = ifArgument.value.value;
@@ -82,12 +82,12 @@ 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, 38);
+            __DEV__ ? tsInvariant.invariant(directiveArguments && directiveArguments.length === 1, "Incorrect number of arguments for the @".concat(directiveName, " directive.")) : tsInvariant.invariant(directiveArguments && directiveArguments.length === 1, 38);
             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', 39);
+            __DEV__ ? tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', "Invalid argument for the @".concat(directiveName, " directive.")) : tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', 39);
             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'), "Argument for the @".concat(directiveName, " directive must be a variable or a boolean value.")) : tsInvariant.invariant(ifValue &&
                 (ifValue.kind === 'Variable' || ifValue.kind === 'BooleanValue'), 40);
             result.push({ directive: directive, ifArgument: ifArgument });
         });
@@ -100,7 +100,7 @@ function getFragmentQueryDocument(document, fragmentName) {
     var fragments = [];
     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 + "'" : '') + ". " +
+            throw __DEV__ ? new tsInvariant.InvariantError("Found a ".concat(definition.operation, " operation").concat(definition.name ? " named '".concat(definition.name.value, "'") : '', ". ") +
                 'No operations are allowed when using a fragment as a query. Only fragments are allowed.') : new tsInvariant.InvariantError(41);
         }
         if (definition.kind === 'FragmentDefinition') {
@@ -108,7 +108,7 @@ function getFragmentQueryDocument(document, fragmentName) {
         }
     });
     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, 42);
+        __DEV__ ? tsInvariant.invariant(fragments.length === 1, "Found ".concat(fragments.length, " fragments. `fragmentName` must be provided when there is not exactly 1 fragment.")) : tsInvariant.invariant(fragments.length === 1, 42);
         actualFragmentName = fragments[0].name.value;
     }
     var query = tslib.__assign(tslib.__assign({}, document), { definitions: tslib.__spreadArray([
@@ -145,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, 43);
+            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named ".concat(selection.name.value, ".")) : tsInvariant.invariant(fragment, 43);
             return fragment;
         }
         default:
@@ -227,7 +227,7 @@ function valueToObjectRepresentation(argObj, name, value, variables) {
         argObj[name.value] = null;
     }
     else {
-        throw __DEV__ ? new tsInvariant.InvariantError("The inline argument \"" + name.value + "\" of kind \"" + value.kind + "\"" +
+        throw __DEV__ ? new tsInvariant.InvariantError("The inline argument \"".concat(name.value, "\" of kind \"").concat(value.kind, "\"") +
             'is not supported. Use variables instead of inline arguments to ' +
             'overcome this limitation.') : new tsInvariant.InvariantError(52);
     }
@@ -279,7 +279,7 @@ var getStoreKeyName = Object.assign(function (fieldName, args, directives) {
             filterKeys.forEach(function (key) {
                 filteredArgs_1[key] = args[key];
             });
-            return directives['connection']['key'] + "(" + stringify(filteredArgs_1) + ")";
+            return "".concat(directives['connection']['key'], "(").concat(stringify(filteredArgs_1), ")");
         }
         else {
             return directives['connection']['key'];
@@ -288,17 +288,17 @@ var getStoreKeyName = Object.assign(function (fieldName, args, directives) {
     var completeFieldName = fieldName;
     if (args) {
         var stringifiedArgs = stringify(args);
-        completeFieldName += "(" + stringifiedArgs + ")";
+        completeFieldName += "(".concat(stringifiedArgs, ")");
     }
     if (directives) {
         Object.keys(directives).forEach(function (key) {
             if (KNOWN_DIRECTIVES.indexOf(key) !== -1)
                 return;
             if (directives[key] && Object.keys(directives[key]).length) {
-                completeFieldName += "@" + key + "(" + stringify(directives[key]) + ")";
+                completeFieldName += "@".concat(key, "(").concat(stringify(directives[key]), ")");
             }
             else {
-                completeFieldName += "@" + key;
+                completeFieldName += "@".concat(key);
             }
         });
     }
@@ -368,11 +368,11 @@ function checkDocument(doc) {
         .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(45);
+            throw __DEV__ ? new tsInvariant.InvariantError("Schema type definitions not allowed in queries. Found: \"".concat(definition.kind, "\"")) : new tsInvariant.InvariantError(45);
         }
         return definition;
     });
-    __DEV__ ? tsInvariant.invariant(operations.length <= 1, "Ambiguous GraphQL document: contains " + operations.length + " operations") : tsInvariant.invariant(operations.length <= 1, 46);
+    __DEV__ ? tsInvariant.invariant(operations.length <= 1, "Ambiguous GraphQL document: contains ".concat(operations.length, " operations")) : tsInvariant.invariant(operations.length <= 1, 46);
     return doc;
 }
 function getOperationDefinition(doc) {
@@ -703,7 +703,7 @@ function removeClientSetsFromDocument(document) {
     return modifiedDoc;
 }
 
-var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
+var hasOwnProperty$4 = Object.prototype.hasOwnProperty;
 function mergeDeep() {
     var sources = [];
     for (var _i = 0; _i < arguments.length; _i++) {
@@ -740,7 +740,7 @@ var DeepMerger = (function () {
         }
         if (isNonNullObject(source) && isNonNullObject(target)) {
             Object.keys(source).forEach(function (sourceKey) {
-                if (hasOwnProperty$3.call(target, sourceKey)) {
+                if (hasOwnProperty$4.call(target, sourceKey)) {
                     var targetValue = target[sourceKey];
                     if (source[sourceKey] !== targetValue) {
                         var result = _this.reconciler.apply(_this, tslib.__spreadArray([target, source, sourceKey], context, false));
@@ -1077,7 +1077,7 @@ var prefixCounts = new Map();
 function makeUniqueId(prefix) {
     var count = prefixCounts.get(prefix) || 1;
     prefixCounts.set(prefix, count + 1);
-    return prefix + ":" + count + ":" + Math.random().toString(36).slice(2);
+    return "".concat(prefix, ":").concat(count, ":").concat(Math.random().toString(36).slice(2));
 }
 
 function stringifyForDisplay(value) {
@@ -1142,7 +1142,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(24);
+            throw __DEV__ ? new tsInvariant.InvariantError("illegal argument: ".concat(key)) : new tsInvariant.InvariantError(24);
         }
     }
     return operation;
@@ -1291,9 +1291,9 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.6.0-beta.0';
+var version = '3.6.0-beta.11';
 
-var hasOwnProperty$2 = Object.prototype.hasOwnProperty;
+var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
     return function (response) { return response
         .text()
@@ -1312,14 +1312,14 @@ function parseAndCheckHttpResponse(operations) {
     })
         .then(function (result) {
         if (response.status >= 300) {
-            throwServerError(response, result, "Response not successful: Received status code " + response.status);
+            throwServerError(response, result, "Response not successful: Received status code ".concat(response.status));
         }
         if (!Array.isArray(result) &&
-            !hasOwnProperty$2.call(result, 'data') &&
-            !hasOwnProperty$2.call(result, 'errors')) {
-            throwServerError(response, result, "Server response was missing for query '" + (Array.isArray(operations)
+            !hasOwnProperty$3.call(result, 'data') &&
+            !hasOwnProperty$3.call(result, 'errors')) {
+            throwServerError(response, result, "Server response was missing for query '".concat(Array.isArray(operations)
                 ? operations.map(function (op) { return op.operationName; })
-                : operations.operationName) + "'.");
+                : operations.operationName, "'."));
         }
         return result;
     }); };
@@ -1331,7 +1331,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(21);
+        var parseError = __DEV__ ? new tsInvariant.InvariantError("Network request failed. ".concat(label, " is not serializable: ").concat(e.message)) : new tsInvariant.InvariantError(21);
         parseError.parseError = e;
         throw parseError;
     }
@@ -1355,17 +1355,27 @@ var fallbackHttpConfig = {
     options: defaultOptions,
 };
 var defaultPrinter = function (ast, printer) { return printer(ast); };
-var selectHttpOptionsAndBody = function (operation, printer, fallbackConfig) {
+function selectHttpOptionsAndBody(operation, fallbackConfig) {
     var configs = [];
-    for (var _i = 3; _i < arguments.length; _i++) {
-        configs[_i - 3] = arguments[_i];
+    for (var _i = 2; _i < arguments.length; _i++) {
+        configs[_i - 2] = arguments[_i];
     }
-    var options = tslib.__assign(tslib.__assign({}, fallbackConfig.options), { headers: fallbackConfig.headers, credentials: fallbackConfig.credentials });
-    var http = fallbackConfig.http || {};
+    configs.unshift(fallbackConfig);
+    return selectHttpOptionsAndBodyInternal.apply(void 0, tslib.__spreadArray([operation,
+        defaultPrinter], configs, false));
+}
+function selectHttpOptionsAndBodyInternal(operation, printer) {
+    var configs = [];
+    for (var _i = 2; _i < arguments.length; _i++) {
+        configs[_i - 2] = arguments[_i];
+    }
+    var options = {};
+    var http = {};
     configs.forEach(function (config) {
         options = tslib.__assign(tslib.__assign(tslib.__assign({}, options), config.options), { headers: tslib.__assign(tslib.__assign({}, options.headers), headersToLowerCase(config.headers)) });
-        if (config.credentials)
+        if (config.credentials) {
             options.credentials = config.credentials;
+        }
         http = tslib.__assign(tslib.__assign({}, http), config.http);
     });
     var operationName = operation.operationName, extensions = operation.extensions, variables = operation.variables, query = operation.query;
@@ -1378,7 +1388,7 @@ var selectHttpOptionsAndBody = function (operation, printer, fallbackConfig) {
         options: options,
         body: body,
     };
-};
+}
 function headersToLowerCase(headers) {
     if (headers) {
         var normalized_1 = Object.create(null);
@@ -1421,7 +1431,7 @@ var selectURI = function (operation, fallbackURI) {
 function rewriteURIForGET(chosenURI, body) {
     var queryParams = [];
     var addQueryParam = function (key, value) {
-        queryParams.push(key + "=" + encodeURIComponent(value));
+        queryParams.push("".concat(key, "=").concat(encodeURIComponent(value)));
     };
     if ('query' in body) {
         addQueryParam('query', body.query);
@@ -1493,7 +1503,7 @@ var createHttpLink = function (linkOptions) {
             credentials: context.credentials,
             headers: contextHeaders,
         };
-        var _b = selectHttpOptionsAndBody(operation, print, fallbackHttpConfig, linkConfig, contextConfig), options = _b.options, body = _b.body;
+        var _b = selectHttpOptionsAndBodyInternal(operation, print, fallbackHttpConfig, linkConfig, contextConfig), options = _b.options, body = _b.body;
         if (body.variables && !includeUnusedVariables) {
             var unusedNames_1 = new Set(Object.keys(body.variables));
             graphql.visit(operation.query, {
@@ -1686,7 +1696,7 @@ function defaultDataIdFromObject(_a, context) {
         if (id === void 0)
             id = _id;
         if (id !== void 0) {
-            return __typename + ":" + ((typeof id === "number" ||
+            return "".concat(__typename, ":").concat((typeof id === "number" ||
                 typeof id === "string") ? id : JSON.stringify(id));
         }
     }
@@ -1716,7 +1726,7 @@ function fieldNameFromStoreName(storeFieldName) {
 }
 function selectionSetMatchesResult(selectionSet, result, variables) {
     if (isNonNullObject(result)) {
-        return Array.isArray(result)
+        return isArray(result)
             ? result.every(function (item) { return selectionSetMatchesResult(selectionSet, item, variables); })
             : selectionSet.selections.every(function (field) {
                 if (isField(field) && shouldInclude(field, variables)) {
@@ -1733,11 +1743,12 @@ function selectionSetMatchesResult(selectionSet, result, variables) {
 function storeValueIsStoreObject(value) {
     return isNonNullObject(value) &&
         !isReference(value) &&
-        !Array.isArray(value);
+        !isArray(value);
 }
 function makeProcessedFieldsMerger() {
     return new DeepMerger;
 }
+var isArray = function (a) { return Array.isArray(a); };
 
 var DELETE = Object.create(null);
 var delModifier = function () { return DELETE; };
@@ -2200,7 +2211,7 @@ function supportsResultCaching(store) {
 
 function shallowCopy(value) {
     if (isNonNullObject(value)) {
-        return Array.isArray(value)
+        return isArray(value)
             ? value.slice(0)
             : tslib.__assign({ __proto__: Object.getPrototypeOf(value) }, value);
     }
@@ -2422,7 +2433,7 @@ var StoreReader = (function () {
             !context.store.has(objectOrReference.__ref)) {
             return {
                 result: this.canon.empty,
-                missing: "Dangling reference to missing " + objectOrReference.__ref + " object",
+                missing: "Dangling reference to missing ".concat(objectOrReference.__ref, " object"),
             };
         }
         var variables = context.variables, policies = context.policies, store = context.store;
@@ -2457,13 +2468,13 @@ var StoreReader = (function () {
                 if (fieldValue === void 0) {
                     if (!addTypenameToDocument.added(selection)) {
                         missing = context.merge(missing, (_a = {},
-                            _a[resultName] = "Can't find field '" + selection.name.value + "' on " + (isReference(objectOrReference)
+                            _a[resultName] = "Can't find field '".concat(selection.name.value, "' on ").concat(isReference(objectOrReference)
                                 ? objectOrReference.__ref + " object"
                                 : "object " + JSON.stringify(objectOrReference, null, 2)),
                             _a));
                     }
                 }
-                else if (Array.isArray(fieldValue)) {
+                else if (isArray(fieldValue)) {
                     fieldValue = handleMissing(_this.executeSubSelectedArray({
                         field: selection,
                         array: fieldValue,
@@ -2522,7 +2533,7 @@ var StoreReader = (function () {
             if (item === null) {
                 return null;
             }
-            if (Array.isArray(item)) {
+            if (isArray(item)) {
                 return handleMissing(_this.executeSubSelectedArray({
                     field: field,
                     array: item,
@@ -2567,7 +2578,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), 5);
+                __DEV__ ? tsInvariant.invariant(!isReference(value), "Missing selection set for object of type ".concat(getTypenameFromStoreObject(store, value), " returned for query field ").concat(field.name.value)) : tsInvariant.invariant(!isReference(value), 5);
                 Object.values(value).forEach(workSet_1.add, workSet_1);
             }
         });
@@ -2654,10 +2665,10 @@ function keyFieldsFnFromSpecifier(specifier) {
                 hasOwn.call(object, schemaKeyPath[0])) {
                 extracted = extractKeyPath(object, schemaKeyPath, extractKey);
             }
-            __DEV__ ? tsInvariant.invariant(extracted !== void 0, "Missing field '" + schemaKeyPath.join('.') + "' while extracting keyFields from " + JSON.stringify(object)) : tsInvariant.invariant(extracted !== void 0, 2);
+            __DEV__ ? tsInvariant.invariant(extracted !== void 0, "Missing field '".concat(schemaKeyPath.join('.'), "' while extracting keyFields from ").concat(JSON.stringify(object))) : tsInvariant.invariant(extracted !== void 0, 2);
             return extracted;
         });
-        return context.typename + ":" + JSON.stringify(keyObject);
+        return "".concat(context.typename, ":").concat(JSON.stringify(keyObject));
     });
 }
 function keyArgsFnFromSpecifier(specifier) {
@@ -2716,13 +2727,13 @@ function getSpecifierPaths(spec) {
         var paths_1 = info.paths = [];
         var currentPath_1 = [];
         spec.forEach(function (s, i) {
-            if (Array.isArray(s)) {
+            if (isArray(s)) {
                 getSpecifierPaths(s).forEach(function (p) { return paths_1.push(currentPath_1.concat(p)); });
                 currentPath_1.length = 0;
             }
             else {
                 currentPath_1.push(s);
-                if (!Array.isArray(spec[i + 1])) {
+                if (!isArray(spec[i + 1])) {
                     paths_1.push(currentPath_1.slice(0));
                     currentPath_1.length = 0;
                 }
@@ -2737,14 +2748,14 @@ function extractKey(object, key) {
 function extractKeyPath(object, path, extract) {
     extract = extract || extractKey;
     return normalize(path.reduce(function reducer(obj, key) {
-        return Array.isArray(obj)
+        return isArray(obj)
             ? obj.map(function (child) { return reducer(child, key); })
             : obj && extract(obj, key);
     }, object));
 }
 function normalize(value) {
     if (isNonNullObject(value)) {
-        if (Array.isArray(value)) {
+        if (isArray(value)) {
             return value.map(normalize);
         }
         return collectSpecifierPaths(Object.keys(value).sort(), function (path) { return extractKeyPath(value, path); });
@@ -2807,7 +2818,7 @@ var Policies = (function () {
         var keyFn = policy && policy.keyFn || this.config.dataIdFromObject;
         while (keyFn) {
             var specifierOrId = keyFn(object, context);
-            if (Array.isArray(specifierOrId)) {
+            if (isArray(specifierOrId)) {
                 keyFn = keyFieldsFnFromSpecifier(specifierOrId);
             }
             else {
@@ -2850,7 +2861,7 @@ var Policies = (function () {
         setMerge(existing, incoming.merge);
         existing.keyFn =
             keyFields === false ? nullKeyFieldsFn :
-                Array.isArray(keyFields) ? keyFieldsFnFromSpecifier(keyFields) :
+                isArray(keyFields) ? keyFieldsFnFromSpecifier(keyFields) :
                     typeof keyFields === "function" ? keyFields :
                         existing.keyFn;
         if (fields) {
@@ -2864,7 +2875,7 @@ var Policies = (function () {
                     var keyArgs = incoming.keyArgs, read = incoming.read, merge = incoming.merge;
                     existing.keyFn =
                         keyArgs === false ? simpleKeyArgsFn :
-                            Array.isArray(keyArgs) ? keyArgsFnFromSpecifier(keyArgs) :
+                            isArray(keyArgs) ? keyArgsFnFromSpecifier(keyArgs) :
                                 typeof keyArgs === "function" ? keyArgs :
                                     existing.keyFn;
                     if (typeof read === "function") {
@@ -2883,7 +2894,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 ".concat(which, " __typename more than once")) : tsInvariant.invariant(!old || old === which, 3);
             if (old)
                 delete this.rootIdsByTypename[old];
             this.rootIdsByTypename[typename] = rootId;
@@ -2967,7 +2978,7 @@ var Policies = (function () {
                 if (supertypeSet.has(supertype)) {
                     if (!typenameSupertypeSet.has(supertype)) {
                         if (checkingFuzzySubtypes) {
-                            __DEV__ && tsInvariant.invariant.warn("Inferring subtype " + typename + " of supertype " + supertype);
+                            __DEV__ && tsInvariant.invariant.warn("Inferring subtype ".concat(typename, " of supertype ").concat(supertype));
                         }
                         typenameSupertypeSet.add(supertype);
                     }
@@ -3009,7 +3020,7 @@ var Policies = (function () {
             var args = argsFromFieldSpecifier(fieldSpec);
             while (keyFn) {
                 var specifierOrString = keyFn(args, context);
-                if (Array.isArray(specifierOrString)) {
+                if (isArray(specifierOrString)) {
                     keyFn = keyArgsFnFromSpecifier(specifierOrString);
                 }
                 else {
@@ -3121,7 +3132,7 @@ function normalizeReadFieldOptions(readFieldArgs, objectOrReference, variables)
         }
     }
     if (__DEV__ && options.from === void 0) {
-        __DEV__ && tsInvariant.invariant.warn("Undefined 'from' passed to readField with arguments " + stringifyForDisplay(Array.from(readFieldArgs)));
+        __DEV__ && tsInvariant.invariant.warn("Undefined 'from' passed to readField with arguments ".concat(stringifyForDisplay(Array.from(readFieldArgs))));
     }
     if (void 0 === options.variables) {
         options.variables = variables;
@@ -3130,7 +3141,7 @@ function normalizeReadFieldOptions(readFieldArgs, objectOrReference, variables)
 }
 function makeMergeObjectsFunction(store) {
     return function mergeObjects(existing, incoming) {
-        if (Array.isArray(existing) || Array.isArray(incoming)) {
+        if (isArray(existing) || isArray(incoming)) {
             throw __DEV__ ? new tsInvariant.InvariantError("Cannot automatically merge arrays") : new tsInvariant.InvariantError(4);
         }
         if (isNonNullObject(existing) &&
@@ -3161,7 +3172,7 @@ function makeMergeObjectsFunction(store) {
 }
 
 function getContextFlavor(context, clientOnly, deferred) {
-    var key = "" + clientOnly + deferred;
+    var key = "".concat(clientOnly).concat(deferred);
     var flavored = context.flavors.get(key);
     if (!flavored) {
         context.flavors.set(key, flavored = (context.clientOnly === clientOnly &&
@@ -3203,7 +3214,7 @@ var StoreWriter = (function () {
             context: context,
         });
         if (!isReference(ref)) {
-            throw __DEV__ ? new tsInvariant.InvariantError("Could not identify object " + JSON.stringify(result)) : new tsInvariant.InvariantError(6);
+            throw __DEV__ ? new tsInvariant.InvariantError("Could not identify object ".concat(JSON.stringify(result))) : new tsInvariant.InvariantError(6);
         }
         context.incomingById.forEach(function (_a, dataId) {
             var storeObject = _a.storeObject, mergeTree = _a.mergeTree, fieldNodeSet = _a.fieldNodeSet;
@@ -3308,7 +3319,7 @@ var StoreWriter = (function () {
                 !context.deferred &&
                 !addTypenameToDocument.added(field) &&
                 !policies.getReadFunction(typename, field.name.value)) {
-                __DEV__ && tsInvariant.invariant.error(("Missing field '" + resultKeyNameFromField(field) + "' while writing result " + JSON.stringify(result, null, 2)).substring(0, 1000));
+                __DEV__ && tsInvariant.invariant.error("Missing field '".concat(resultKeyNameFromField(field), "' while writing result ").concat(JSON.stringify(result, null, 2)).substring(0, 1000));
             }
         });
         try {
@@ -3359,7 +3370,7 @@ var StoreWriter = (function () {
         if (!field.selectionSet || value === null) {
             return __DEV__ ? cloneDeep(value) : value;
         }
-        if (Array.isArray(value)) {
+        if (isArray(value)) {
             return value.map(function (item, i) {
                 var value = _this.processFieldValue(item, field, context, getChildMergeTree(mergeTree, i));
                 maybeRecycleChildMergeTree(mergeTree, i);
@@ -3424,7 +3435,7 @@ var StoreWriter = (function () {
         var _a;
         var _this = this;
         if (mergeTree.map.size && !isReference(incoming)) {
-            var e_1 = (!Array.isArray(incoming) &&
+            var e_1 = (!isArray(incoming) &&
                 (isReference(existing) || storeValueIsStoreObject(existing))) ? existing : void 0;
             var i_1 = incoming;
             if (e_1 && !getStorageArgs) {
@@ -3432,7 +3443,7 @@ var StoreWriter = (function () {
             }
             var changedFields_1;
             var getValue_1 = function (from, name) {
-                return Array.isArray(from)
+                return isArray(from)
                     ? (typeof name === "number" ? from[name] : void 0)
                     : context.store.getFieldValue(from, String(name));
             };
@@ -3454,7 +3465,7 @@ var StoreWriter = (function () {
                 }
             });
             if (changedFields_1) {
-                incoming = (Array.isArray(i_1) ? i_1.slice(0) : tslib.__assign({}, i_1));
+                incoming = (isArray(i_1) ? i_1.slice(0) : tslib.__assign({}, i_1));
                 changedFields_1.forEach(function (value, name) {
                     incoming[name] = value;
                 });
@@ -3530,13 +3541,13 @@ function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
     var parentType = store.getFieldValue(existingRef, "__typename") ||
         store.getFieldValue(incomingObj, "__typename");
     var fieldName = fieldNameFromStoreName(storeFieldName);
-    var typeDotName = parentType + "." + fieldName;
+    var typeDotName = "".concat(parentType, ".").concat(fieldName);
     if (warnings.has(typeDotName))
         return;
     warnings.add(typeDotName);
     var childTypenames = [];
-    if (!Array.isArray(existing) &&
-        !Array.isArray(incoming)) {
+    if (!isArray(existing) &&
+        !isArray(incoming)) {
         [existing, incoming].forEach(function (child) {
             var typename = store.getFieldValue(child, "__typename");
             if (typeof typename === "string" &&
@@ -3545,10 +3556,10 @@ function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
             }
         });
     }
-    __DEV__ && tsInvariant.invariant.warn("Cache data may be lost when replacing the " + fieldName + " field of a " + parentType + " object.\n\nTo address this problem (which is not a bug in Apollo Client), " + (childTypenames.length
+    __DEV__ && tsInvariant.invariant.warn("Cache data may be lost when replacing the ".concat(fieldName, " field of a ").concat(parentType, " object.\n\nTo address this problem (which is not a bug in Apollo Client), ").concat(childTypenames.length
         ? "either ensure all objects of type " +
             childTypenames.join(" and ") + " have an ID or a custom merge function, or "
-        : "") + "define a custom merge function for the " + typeDotName + " field, so InMemoryCache can safely merge these objects:\n\n  existing: " + JSON.stringify(existing).slice(0, 1000) + "\n  incoming: " + JSON.stringify(incoming).slice(0, 1000) + "\n\nFor more information about these options, please refer to the documentation:\n\n  * Ensuring entity objects have IDs: https://go.apollo.dev/c/generating-unique-identifiers\n  * Defining custom merge functions: https://go.apollo.dev/c/merging-non-normalized-objects\n");
+        : "", "define a custom merge function for the ").concat(typeDotName, " field, so InMemoryCache can safely merge these objects:\n\n  existing: ").concat(JSON.stringify(existing).slice(0, 1000), "\n  incoming: ").concat(JSON.stringify(incoming).slice(0, 1000), "\n\nFor more information about these options, please refer to the documentation:\n\n  * Ensuring entity objects have IDs: https://go.apollo.dev/c/generating-unique-identifiers\n  * Defining custom merge functions: https://go.apollo.dev/c/merging-non-normalized-objects\n"));
 }
 
 var InMemoryCache = (function (_super) {
@@ -3855,11 +3866,11 @@ var generateErrorMessage = function (err) {
             var errorMessage = error
                 ? error.message
                 : 'Error message not found.';
-            message += errorMessage + "\n";
+            message += "".concat(errorMessage, "\n");
         });
     }
     if (err.networkError) {
-        message += err.networkError.message + "\n";
+        message += "".concat(err.networkError.message, "\n");
     }
     message = message.replace(/\n$/, '');
     return message;
@@ -3894,8 +3905,7 @@ function isNetworkRequestInFlight(networkStatus) {
     return networkStatus ? networkStatus < 7 : false;
 }
 
-var assign = Object.assign, hasOwnProperty$1 = Object.hasOwnProperty;
-var warnedAboutUpdateQuery = false;
+var assign = Object.assign, hasOwnProperty$2 = Object.hasOwnProperty;
 var ObservableQuery = (function (_super) {
     tslib.__extends(ObservableQuery, _super);
     function ObservableQuery(_a) {
@@ -3929,11 +3939,10 @@ var ObservableQuery = (function (_super) {
         _this.observers = new Set();
         _this.subscriptions = new Set();
         _this.isTornDown = false;
-        _this.options = options;
+        _this.options = tslib.__assign({ initialFetchPolicy: options.fetchPolicy || "cache-first" }, options);
         _this.queryId = queryInfo.queryId || queryManager.generateQueryId();
         var opDef = getOperationDefinition(options.query);
         _this.queryName = opDef && opDef.name && opDef.name.value;
-        _this.initialFetchPolicy = options.fetchPolicy || "cache-first";
         _this.queryManager = queryManager;
         _this.queryInfo = queryInfo;
         return _this;
@@ -4041,7 +4050,7 @@ var ObservableQuery = (function (_super) {
             pollInterval: 0,
         };
         var fetchPolicy = this.options.fetchPolicy;
-        if (fetchPolicy === 'standby' || fetchPolicy === 'cache-and-network') {
+        if (fetchPolicy === 'cache-and-network') {
             reobserveOptions.fetchPolicy = fetchPolicy;
         }
         else if (fetchPolicy === 'no-cache') {
@@ -4050,11 +4059,11 @@ var ObservableQuery = (function (_super) {
         else {
             reobserveOptions.fetchPolicy = 'network-only';
         }
-        if (__DEV__ && variables && hasOwnProperty$1.call(variables, "variables")) {
+        if (__DEV__ && variables && hasOwnProperty$2.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 })?");
+                __DEV__ && tsInvariant.invariant.warn("Called refetch(".concat(JSON.stringify(variables), ") for query ").concat(((_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)) {
@@ -4067,35 +4076,49 @@ var ObservableQuery = (function (_super) {
         var _this = this;
         var combinedOptions = tslib.__assign(tslib.__assign({}, (fetchMoreOptions.query ? fetchMoreOptions : tslib.__assign(tslib.__assign(tslib.__assign({}, this.options), fetchMoreOptions), { variables: tslib.__assign(tslib.__assign({}, this.options.variables), fetchMoreOptions.variables) }))), { fetchPolicy: "no-cache" });
         var qid = this.queryManager.generateQueryId();
+        var queryInfo = this.queryInfo;
+        var originalNetworkStatus = queryInfo.networkStatus;
+        queryInfo.networkStatus = exports.NetworkStatus.fetchMore;
         if (combinedOptions.notifyOnNetworkStatusChange) {
-            this.queryInfo.networkStatus = exports.NetworkStatus.fetchMore;
             this.observe();
         }
+        var updatedQuerySet = new Set();
         return this.queryManager.fetchQuery(qid, combinedOptions, exports.NetworkStatus.fetchMore).then(function (fetchMoreResult) {
-            var data = fetchMoreResult.data;
-            var updateQuery = fetchMoreOptions.updateQuery;
-            if (updateQuery) {
-                if (__DEV__ &&
-                    !warnedAboutUpdateQuery) {
-                    __DEV__ && tsInvariant.invariant.warn("The updateQuery callback for fetchMore is deprecated, and will be removed\nin the next major version of Apollo Client.\n\nPlease convert updateQuery functions to field policies with appropriate\nread and merge functions, or use/adapt a helper function (such as\nconcatPagination, offsetLimitPagination, or relayStylePagination) from\n@apollo/client/utilities.\n\nThe field policy system handles pagination more effectively than a\nhand-written updateQuery function, and you only need to define the policy\nonce, rather than every time you call fetchMore.");
-                    warnedAboutUpdateQuery = true;
-                }
-                _this.updateQuery(function (previous) { return updateQuery(previous, {
-                    fetchMoreResult: data,
-                    variables: combinedOptions.variables,
-                }); });
-            }
-            else {
-                _this.queryManager.cache.writeQuery({
-                    query: combinedOptions.query,
-                    variables: combinedOptions.variables,
-                    data: data,
-                });
-            }
+            _this.queryManager.removeQuery(qid);
+            if (queryInfo.networkStatus === exports.NetworkStatus.fetchMore) {
+                queryInfo.networkStatus = originalNetworkStatus;
+            }
+            _this.queryManager.cache.batch({
+                update: function (cache) {
+                    var updateQuery = fetchMoreOptions.updateQuery;
+                    if (updateQuery) {
+                        cache.updateQuery({
+                            query: _this.options.query,
+                            variables: _this.variables,
+                            returnPartialData: true,
+                            optimistic: false,
+                        }, function (previous) { return updateQuery(previous, {
+                            fetchMoreResult: fetchMoreResult.data,
+                            variables: combinedOptions.variables,
+                        }); });
+                    }
+                    else {
+                        cache.writeQuery({
+                            query: combinedOptions.query,
+                            variables: combinedOptions.variables,
+                            data: fetchMoreResult.data,
+                        });
+                    }
+                },
+                onWatchUpdated: function (watch) {
+                    updatedQuerySet.add(watch.query);
+                },
+            });
             return fetchMoreResult;
         }).finally(function () {
-            _this.queryManager.stopQuery(qid);
-            _this.reobserve();
+            if (!updatedQuerySet.has(_this.options.query)) {
+                reobserveCacheFirst(_this);
+            }
         });
     };
     ObservableQuery.prototype.subscribeToMore = function (options) {
@@ -4148,7 +4171,7 @@ var ObservableQuery = (function (_super) {
             return Promise.resolve();
         }
         return this.reobserve({
-            fetchPolicy: this.initialFetchPolicy,
+            fetchPolicy: this.options.initialFetchPolicy,
             variables: variables,
         }, exports.NetworkStatus.setVariables);
     };
@@ -4180,6 +4203,26 @@ var ObservableQuery = (function (_super) {
         this.options.pollInterval = 0;
         this.updatePolling();
     };
+    ObservableQuery.prototype.applyNextFetchPolicy = function (reason, options) {
+        if (options.nextFetchPolicy) {
+            var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a, _b = options.initialFetchPolicy, initialFetchPolicy = _b === void 0 ? fetchPolicy : _b;
+            if (typeof options.nextFetchPolicy === "function") {
+                options.fetchPolicy = options.nextFetchPolicy(fetchPolicy, {
+                    reason: reason,
+                    options: options,
+                    observable: this,
+                    initialFetchPolicy: initialFetchPolicy,
+                });
+            }
+            else if (reason === "variables-changed") {
+                options.fetchPolicy = initialFetchPolicy;
+            }
+            else {
+                options.fetchPolicy = options.nextFetchPolicy;
+            }
+        }
+        return options.fetchPolicy;
+    };
     ObservableQuery.prototype.fetch = function (options, newNetworkStatus) {
         this.queryManager.setObservableQuery(this);
         return this.queryManager.fetchQueryObservable(this.queryId, options, newNetworkStatus);
@@ -4242,16 +4285,18 @@ var ObservableQuery = (function (_super) {
             newNetworkStatus === exports.NetworkStatus.fetchMore ||
             newNetworkStatus === exports.NetworkStatus.poll;
         var oldVariables = this.options.variables;
+        var oldFetchPolicy = this.options.fetchPolicy;
+        var mergedOptions = mergeOptions(this.options, newOptions || {});
         var options = useDisposableConcast
-            ? compact(this.options, newOptions)
-            : assign(this.options, compact(newOptions));
+            ? mergedOptions
+            : assign(this.options, mergedOptions);
         if (!useDisposableConcast) {
             this.updatePolling();
             if (newOptions &&
                 newOptions.variables &&
-                !newOptions.fetchPolicy &&
-                !equality.equal(newOptions.variables, oldVariables)) {
-                options.fetchPolicy = this.initialFetchPolicy;
+                !equality.equal(newOptions.variables, oldVariables) &&
+                (!newOptions.fetchPolicy || newOptions.fetchPolicy === oldFetchPolicy)) {
+                this.applyNextFetchPolicy("variables-changed", options);
                 if (newNetworkStatus === void 0) {
                     newNetworkStatus = exports.NetworkStatus.setVariables;
                 }
@@ -4281,8 +4326,11 @@ var ObservableQuery = (function (_super) {
         this.reportResult(this.getCurrentResult(false), this.variables);
     };
     ObservableQuery.prototype.reportResult = function (result, variables) {
-        if (this.getLastError() || this.isDifferentFromLastResult(result)) {
-            this.updateLastResult(result, variables);
+        var lastError = this.getLastError();
+        if (lastError || this.isDifferentFromLastResult(result)) {
+            if (lastError || !result.partial || this.options.returnPartialData) {
+                this.updateLastResult(result, variables);
+            }
             iterateObserversSafely(this.observers, 'next', result);
         }
     };
@@ -4312,20 +4360,29 @@ var ObservableQuery = (function (_super) {
     return ObservableQuery;
 }(zenObservableTs.Observable));
 fixObservableSubclass(ObservableQuery);
+function reobserveCacheFirst(obsQuery) {
+    var _a = obsQuery.options, fetchPolicy = _a.fetchPolicy, nextFetchPolicy = _a.nextFetchPolicy;
+    if (fetchPolicy === "cache-and-network" ||
+        fetchPolicy === "network-only") {
+        return obsQuery.reobserve({
+            fetchPolicy: "cache-first",
+            nextFetchPolicy: function () {
+                this.nextFetchPolicy = nextFetchPolicy;
+                if (typeof nextFetchPolicy === "function") {
+                    return nextFetchPolicy.apply(this, arguments);
+                }
+                return fetchPolicy;
+            },
+        });
+    }
+    return obsQuery.reobserve();
+}
 function defaultSubscriptionObserverErrorCallback(error) {
     __DEV__ && tsInvariant.invariant.error('Unhandled error', error.message, error.stack);
 }
 function logMissingFieldErrors(missing) {
     if (__DEV__ && missing) {
-        __DEV__ && tsInvariant.invariant.debug("Missing cache result fields: " + JSON.stringify(missing), missing);
-    }
-}
-function applyNextFetchPolicy(options) {
-    var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a, nextFetchPolicy = options.nextFetchPolicy;
-    if (nextFetchPolicy) {
-        options.fetchPolicy = typeof nextFetchPolicy === "function"
-            ? nextFetchPolicy.call(options, fetchPolicy)
-            : nextFetchPolicy;
+        __DEV__ && tsInvariant.invariant.debug("Missing cache result fields: ".concat(JSON.stringify(missing)), missing);
     }
 }
 
@@ -4498,7 +4555,7 @@ var LocalState = (function () {
                         }
                         else {
                             fragment = fragmentMap[selection.name.value];
-                            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named " + selection.name.value) : tsInvariant.invariant(fragment, 9);
+                            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named ".concat(selection.name.value)) : tsInvariant.invariant(fragment, 9);
                         }
                         if (fragment && fragment.typeCondition) {
                             typeCondition = fragment.typeCondition.name.value;
@@ -4710,11 +4767,12 @@ var QueryInfo = (function () {
         if (oq) {
             oq["queryInfo"] = this;
             this.listeners.add(this.oqListener = function () {
-                if (_this.getDiff().fromOptimisticTransaction) {
+                var diff = _this.getDiff();
+                if (diff.fromOptimisticTransaction) {
                     oq["observe"]();
                 }
                 else {
-                    oq.reobserve();
+                    reobserveCacheFirst(oq);
                 }
             });
         }
@@ -4856,10 +4914,10 @@ function shouldWriteResult(result, errorPolicy) {
     return writeWithErrors;
 }
 
-var hasOwnProperty = Object.prototype.hasOwnProperty;
+var hasOwnProperty$1 = Object.prototype.hasOwnProperty;
 var QueryManager = (function () {
     function QueryManager(_a) {
-        var cache = _a.cache, link = _a.link, _b = _a.queryDeduplication, queryDeduplication = _b === void 0 ? false : _b, onBroadcast = _a.onBroadcast, _c = _a.ssrMode, ssrMode = _c === void 0 ? false : _c, _d = _a.clientAwareness, clientAwareness = _d === void 0 ? {} : _d, localState = _a.localState, assumeImmutableResults = _a.assumeImmutableResults;
+        var cache = _a.cache, link = _a.link, defaultOptions = _a.defaultOptions, _b = _a.queryDeduplication, queryDeduplication = _b === void 0 ? false : _b, onBroadcast = _a.onBroadcast, _c = _a.ssrMode, ssrMode = _c === void 0 ? false : _c, _d = _a.clientAwareness, clientAwareness = _d === void 0 ? {} : _d, localState = _a.localState, assumeImmutableResults = _a.assumeImmutableResults;
         this.clientAwareness = {};
         this.queries = new Map();
         this.fetchCancelFns = new Map();
@@ -4870,6 +4928,7 @@ var QueryManager = (function () {
         this.inFlightLinkObservables = new Map();
         this.cache = cache;
         this.link = link;
+        this.defaultOptions = defaultOptions || Object.create(null);
         this.queryDeduplication = queryDeduplication;
         this.clientAwareness = clientAwareness;
         this.localState = localState || new LocalState({ cache: cache });
@@ -4891,11 +4950,12 @@ var QueryManager = (function () {
         this.fetchCancelFns.clear();
     };
     QueryManager.prototype.mutate = function (_a) {
-        var mutation = _a.mutation, variables = _a.variables, optimisticResponse = _a.optimisticResponse, updateQueries = _a.updateQueries, _b = _a.refetchQueries, refetchQueries = _b === void 0 ? [] : _b, _c = _a.awaitRefetchQueries, awaitRefetchQueries = _c === void 0 ? false : _c, updateWithProxyFn = _a.update, onQueryUpdated = _a.onQueryUpdated, _d = _a.errorPolicy, errorPolicy = _d === void 0 ? 'none' : _d, _e = _a.fetchPolicy, fetchPolicy = _e === void 0 ? 'network-only' : _e, keepRootFields = _a.keepRootFields, context = _a.context;
+        var _b, _c;
+        var mutation = _a.mutation, variables = _a.variables, optimisticResponse = _a.optimisticResponse, updateQueries = _a.updateQueries, _d = _a.refetchQueries, refetchQueries = _d === void 0 ? [] : _d, _e = _a.awaitRefetchQueries, awaitRefetchQueries = _e === void 0 ? false : _e, updateWithProxyFn = _a.update, onQueryUpdated = _a.onQueryUpdated, _f = _a.fetchPolicy, fetchPolicy = _f === void 0 ? ((_b = this.defaultOptions.mutate) === null || _b === void 0 ? void 0 : _b.fetchPolicy) || "network-only" : _f, _g = _a.errorPolicy, errorPolicy = _g === void 0 ? ((_c = this.defaultOptions.mutate) === null || _c === void 0 ? void 0 : _c.errorPolicy) || "none" : _g, keepRootFields = _a.keepRootFields, context = _a.context;
         return tslib.__awaiter(this, void 0, void 0, function () {
             var mutationId, mutationStoreValue, self;
-            return tslib.__generator(this, function (_f) {
-                switch (_f.label) {
+            return tslib.__generator(this, function (_h) {
+                switch (_h.label) {
                     case 0:
                         __DEV__ ? tsInvariant.invariant(mutation, 'mutation option is required. You must specify your GraphQL document in the mutation option.') : tsInvariant.invariant(mutation, 12);
                         __DEV__ ? tsInvariant.invariant(fetchPolicy === 'network-only' ||
@@ -4907,8 +4967,8 @@ var QueryManager = (function () {
                         if (!this.transform(mutation).hasClientExports) return [3, 2];
                         return [4, this.localState.addExportedVariables(mutation, variables, context)];
                     case 1:
-                        variables = (_f.sent());
-                        _f.label = 2;
+                        variables = (_h.sent());
+                        _h.label = 2;
                     case 2:
                         mutationStoreValue = this.mutationStore &&
                             (this.mutationStore[mutationId] = {
@@ -5009,7 +5069,7 @@ var QueryManager = (function () {
                 this.queries.forEach(function (_a, queryId) {
                     var observableQuery = _a.observableQuery;
                     var queryName = observableQuery && observableQuery.queryName;
-                    if (!queryName || !hasOwnProperty.call(updateQueries_1, queryName)) {
+                    if (!queryName || !hasOwnProperty$1.call(updateQueries_1, queryName)) {
                         return;
                     }
                     var updater = updateQueries_1[queryName];
@@ -5289,7 +5349,7 @@ var QueryManager = (function () {
         if (__DEV__ && queryNamesAndDocs.size) {
             queryNamesAndDocs.forEach(function (included, nameOrDoc) {
                 if (!included) {
-                    __DEV__ && tsInvariant.invariant.warn("Unknown query " + (typeof nameOrDoc === "string" ? "named " : "") + JSON.stringify(nameOrDoc, null, 2) + " requested in refetchQueries options.include array");
+                    __DEV__ && tsInvariant.invariant.warn("Unknown query ".concat(typeof nameOrDoc === "string" ? "named " : "").concat(JSON.stringify(nameOrDoc, null, 2), " requested in refetchQueries options.include array"));
                 }
             });
         }
@@ -5361,8 +5421,10 @@ var QueryManager = (function () {
     };
     QueryManager.prototype.removeQuery = function (queryId) {
         this.fetchCancelFns.delete(queryId);
-        this.getQuery(queryId).stop();
-        this.queries.delete(queryId);
+        if (this.queries.has(queryId)) {
+            this.getQuery(queryId).stop();
+            this.queries.delete(queryId);
+        }
     };
     QueryManager.prototype.broadcastQueries = function () {
         if (this.onBroadcast)
@@ -5446,10 +5508,11 @@ var QueryManager = (function () {
             var aqr = {
                 data: result.data,
                 loading: false,
-                networkStatus: queryInfo.networkStatus || exports.NetworkStatus.ready,
+                networkStatus: exports.NetworkStatus.ready,
             };
             if (hasErrors && options.errorPolicy !== "ignore") {
                 aqr.errors = result.errors;
+                aqr.networkStatus = exports.NetworkStatus.error;
             }
             return aqr;
         }, function (networkError) {
@@ -5468,7 +5531,8 @@ var QueryManager = (function () {
         var query = this.transform(options.query).document;
         var variables = this.getVariables(query, options.variables);
         var queryInfo = this.getQuery(queryId);
-        var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a, _b = options.errorPolicy, errorPolicy = _b === void 0 ? "none" : _b, _c = options.returnPartialData, returnPartialData = _c === void 0 ? false : _c, _d = options.notifyOnNetworkStatusChange, notifyOnNetworkStatusChange = _d === void 0 ? false : _d, _e = options.context, context = _e === void 0 ? {} : _e;
+        var defaults = this.defaultOptions.watchQuery;
+        var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? defaults && defaults.fetchPolicy || "cache-first" : _a, _b = options.errorPolicy, errorPolicy = _b === void 0 ? defaults && defaults.errorPolicy || "none" : _b, _c = options.returnPartialData, returnPartialData = _c === void 0 ? false : _c, _d = options.notifyOnNetworkStatusChange, notifyOnNetworkStatusChange = _d === void 0 ? false : _d, _e = options.context, context = _e === void 0 ? {} : _e;
         var normalized = Object.assign({}, options, {
             query: query,
             variables: variables,
@@ -5490,7 +5554,9 @@ var QueryManager = (function () {
             : fromVariables(normalized.variables));
         concast.cleanup(function () {
             _this.fetchCancelFns.delete(queryId);
-            applyNextFetchPolicy(options);
+            if (queryInfo.observableQuery) {
+                queryInfo.observableQuery["applyNextFetchPolicy"]("after-fetch", options);
+            }
         });
         return concast;
     };
@@ -5686,7 +5752,6 @@ function mergeOptions(defaults, options) {
 var ApolloClient = (function () {
     function ApolloClient(options) {
         var _this = this;
-        this.defaultOptions = {};
         this.resetStoreCallbacks = [];
         this.clearStoreCallbacks = [];
         var uri = options.uri, credentials = options.credentials, headers = options.headers, cache = options.cache, _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' &&
@@ -5707,7 +5772,7 @@ var ApolloClient = (function () {
         this.cache = cache;
         this.disableNetworkFetches = ssrMode || ssrForceFetchDelay > 0;
         this.queryDeduplication = queryDeduplication;
-        this.defaultOptions = defaultOptions || {};
+        this.defaultOptions = defaultOptions || Object.create(null);
         this.typeDefs = typeDefs;
         if (ssrForceFetchDelay) {
             setTimeout(function () { return (_this.disableNetworkFetches = false); }, ssrForceFetchDelay);
@@ -5754,6 +5819,7 @@ var ApolloClient = (function () {
         this.queryManager = new QueryManager({
             cache: this.cache,
             link: this.link,
+            defaultOptions: this.defaultOptions,
             queryDeduplication: queryDeduplication,
             ssrMode: ssrMode,
             clientAwareness: {
@@ -5880,7 +5946,7 @@ var ApolloClient = (function () {
         result.queries = queries;
         result.results = results;
         result.catch(function (error) {
-            __DEV__ && tsInvariant.invariant.debug("In client.refetchQueries, Promise.all promise rejected with error " + error);
+            __DEV__ && tsInvariant.invariant.debug("In client.refetchQueries, Promise.all promise rejected with error ".concat(error));
         });
         return result;
     };
@@ -5956,8 +6022,8 @@ function useApolloClient(override) {
     var context = React.useContext(getApolloContext());
     var client = override || 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' +
-        'ApolloClient instance in via options.') : tsInvariant.invariant(!!client, 29);
+        'Wrap the root component in an <ApolloProvider>, or pass an ApolloClient ' +
+        'instance in via options.') : tsInvariant.invariant(!!client, 29);
     return client;
 }
 
@@ -5988,7 +6054,7 @@ function parser(document) {
     if (cached)
         return cached;
     var variables, type, name;
-    __DEV__ ? tsInvariant.invariant(!!document && !!document.kind, "Argument of " + document + " passed to parser was not a valid GraphQL " +
+    __DEV__ ? tsInvariant.invariant(!!document && !!document.kind, "Argument of ".concat(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, 30);
     var fragments = document.definitions.filter(function (x) { return x.kind === 'FragmentDefinition'; });
@@ -6006,8 +6072,8 @@ function parser(document) {
         "You must include a query, subscription or mutation as well") : tsInvariant.invariant(!fragments.length ||
         (queries.length || mutations.length || subscriptions.length), 31);
     __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. ") +
+        "".concat(document, " had ").concat(queries.length, " queries, ").concat(subscriptions.length, " ") +
+        "subscriptions and ".concat(mutations.length, " mutations. ") +
         "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(queries.length + mutations.length + subscriptions.length <= 1, 32);
     type = queries.length ? exports.DocumentType.Query : exports.DocumentType.Mutation;
     if (!queries.length && !mutations.length)
@@ -6017,8 +6083,8 @@ function parser(document) {
         : mutations.length
             ? mutations
             : subscriptions;
-    __DEV__ ? tsInvariant.invariant(definitions.length === 1, "react-apollo only supports one definition per HOC. " + document + " had " +
-        (definitions.length + " definitions. ") +
+    __DEV__ ? tsInvariant.invariant(definitions.length === 1, "react-apollo only supports one definition per HOC. ".concat(document, " had ") +
+        "".concat(definitions.length, " definitions. ") +
         "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(definitions.length === 1, 33);
     var definition = definitions[0];
     variables = definition.variableDefinitions || [];
@@ -6036,278 +6102,341 @@ function verifyDocumentType(document, type) {
     var operation = parser(document);
     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, 34);
+    __DEV__ ? tsInvariant.invariant(operation.type === type, "Running a ".concat(requiredOperationName, " requires a graphql ") +
+        "".concat(requiredOperationName, ", but a ").concat(usedOperationName, " was used instead.")) : tsInvariant.invariant(operation.type === type, 34);
 }
 
+var hasOwnProperty = Object.prototype.hasOwnProperty;
 function useQuery(query, options) {
-    var _a;
-    var context = React.useContext(getApolloContext());
-    var client = useApolloClient(options === null || options === void 0 ? void 0 : options.client);
-    verifyDocumentType(query, exports.DocumentType.Query);
-    var _b = React.useState(function () {
-        var watchQueryOptions = createWatchQueryOptions(query, options);
-        var obsQuery = null;
-        if (context.renderPromises) {
-            obsQuery = context.renderPromises.getSSRObservable(watchQueryOptions);
-        }
-        if (!obsQuery) {
-            obsQuery = client.watchQuery(watchQueryOptions);
-            if (context.renderPromises) {
-                context.renderPromises.registerSSRObservable(obsQuery, watchQueryOptions);
-            }
-        }
-        if (context.renderPromises &&
-            (options === null || options === void 0 ? void 0 : options.ssr) !== false &&
-            !(options === null || options === void 0 ? void 0 : options.skip) &&
-            obsQuery.getCurrentResult().loading) {
-            context.renderPromises.addQueryPromise({
-                getOptions: function () { return createWatchQueryOptions(query, options); },
-                fetchData: function () { return new Promise(function (resolve) {
-                    var sub = obsQuery.subscribe({
-                        next: function (result) {
-                            if (!result.loading) {
+    if (options === void 0) { options = Object.create(null); }
+    return useInternalState(useApolloClient(options.client), query).useQuery(options);
+}
+function useInternalState(client, query) {
+    var stateRef = React.useRef();
+    if (!stateRef.current ||
+        client !== stateRef.current.client ||
+        query !== stateRef.current.query) {
+        stateRef.current = new InternalState(client, query);
+    }
+    var state = stateRef.current;
+    var _a = React.useState(0); _a[0]; var setTick = _a[1];
+    state.forceUpdate = function () {
+        setTick(function (tick) { return tick + 1; });
+    };
+    return state;
+}
+var InternalState = (function () {
+    function InternalState(client, query) {
+        this.client = client;
+        this.query = query;
+        this.toQueryResultCache = new (canUseWeakMap ? WeakMap : Map)();
+        verifyDocumentType(query, exports.DocumentType.Query);
+    }
+    InternalState.prototype.forceUpdate = function () {
+    };
+    InternalState.prototype.useQuery = function (options) {
+        this.renderPromises = React.useContext(getApolloContext()).renderPromises;
+        this.useOptions(options);
+        var obsQuery = this.useObservableQuery();
+        this.useSubscriptionEffect(obsQuery);
+        var result = this.getCurrentResult();
+        this.unsafeHandlePartialRefetch(result);
+        return this.toQueryResult(result);
+    };
+    InternalState.prototype.useOptions = function (options) {
+        var watchQueryOptions = this.createWatchQueryOptions(this.queryHookOptions = options);
+        if (!equality.equal(watchQueryOptions, this.watchQueryOptions)) {
+            this.watchQueryOptions = watchQueryOptions;
+        }
+        this.ssrDisabled = !!(options.ssr === false ||
+            options.skip);
+        this.onCompleted = options.onCompleted || InternalState.prototype.onCompleted;
+        this.onError = options.onError || InternalState.prototype.onError;
+    };
+    InternalState.prototype.createWatchQueryOptions = function (_a) {
+        if (_a === void 0) { _a = {}; }
+        var skip = _a.skip; _a.ssr; _a.onCompleted; _a.onError; _a.displayName; var defaultOptions = _a.defaultOptions, otherOptions = tslib.__rest(_a, ["skip", "ssr", "onCompleted", "onError", "displayName", "defaultOptions"]);
+        var toMerge = [];
+        var globalDefaults = this.client.defaultOptions.watchQuery;
+        if (globalDefaults)
+            toMerge.push(globalDefaults);
+        if (defaultOptions)
+            toMerge.push(defaultOptions);
+        var latestOptions = this.observable && this.observable.options;
+        if (latestOptions && toMerge.length) {
+            var defaults_1 = toMerge.reduce(mergeOptions, Object.create(null));
+            toMerge.length = 1;
+            toMerge[0] = defaults_1;
+            Object.keys(defaults_1).forEach(function (defaultOptionName) {
+                var currentOptionValue = latestOptions[defaultOptionName];
+                if (hasOwnProperty.call(latestOptions, defaultOptionName) &&
+                    !equality.equal(defaults_1[defaultOptionName], currentOptionValue)) {
+                    defaults_1[defaultOptionName] = defaultOptionName === "variables"
+                        ? tslib.__assign(tslib.__assign({}, defaults_1.variables), currentOptionValue) : currentOptionValue;
+                }
+            });
+        }
+        toMerge.push(otherOptions);
+        var merged = toMerge.reduce(mergeOptions, Object.create(null));
+        var watchQueryOptions = Object.assign(merged, { query: this.query });
+        if (this.renderPromises &&
+            (watchQueryOptions.fetchPolicy === 'network-only' ||
+                watchQueryOptions.fetchPolicy === 'cache-and-network')) {
+            watchQueryOptions.fetchPolicy = 'cache-first';
+        }
+        else if (!watchQueryOptions.fetchPolicy) {
+            watchQueryOptions.fetchPolicy = 'cache-first';
+        }
+        if (skip) {
+            var _b = watchQueryOptions.initialFetchPolicy, initialFetchPolicy = _b === void 0 ? watchQueryOptions.fetchPolicy : _b;
+            Object.assign(watchQueryOptions, {
+                initialFetchPolicy: initialFetchPolicy,
+                fetchPolicy: 'standby',
+            });
+        }
+        if (!watchQueryOptions.variables) {
+            watchQueryOptions.variables = {};
+        }
+        return watchQueryOptions;
+    };
+    InternalState.prototype.onCompleted = function (data) { };
+    InternalState.prototype.onError = function (error) { };
+    InternalState.prototype.useObservableQuery = function () {
+        var _this = this;
+        var obsQuery = this.observable =
+            this.renderPromises
+                && this.renderPromises.getSSRObservable(this.watchQueryOptions)
+                || this.observable
+                || this.client.watchQuery(this.watchQueryOptions);
+        this.obsQueryFields = React.useMemo(function () { return ({
+            refetch: obsQuery.refetch.bind(obsQuery),
+            reobserve: obsQuery.reobserve.bind(obsQuery),
+            fetchMore: obsQuery.fetchMore.bind(obsQuery),
+            updateQuery: obsQuery.updateQuery.bind(obsQuery),
+            startPolling: obsQuery.startPolling.bind(obsQuery),
+            stopPolling: obsQuery.stopPolling.bind(obsQuery),
+            subscribeToMore: obsQuery.subscribeToMore.bind(obsQuery),
+        }); }, [obsQuery]);
+        if (this.renderPromises) {
+            this.renderPromises.registerSSRObservable(obsQuery);
+            if (!this.ssrDisabled && obsQuery.getCurrentResult().loading) {
+                this.renderPromises.addQueryPromise({
+                    getOptions: function () { return obsQuery.options; },
+                    fetchData: function () { return new Promise(function (resolve) {
+                        var sub = obsQuery.subscribe({
+                            next: function (result) {
+                                if (!result.loading) {
+                                    resolve();
+                                    sub.unsubscribe();
+                                }
+                            },
+                            error: function () {
                                 resolve();
                                 sub.unsubscribe();
-                            }
-                        },
-                        error: function () {
-                            resolve();
-                            sub.unsubscribe();
-                        },
-                        complete: function () {
-                            resolve();
-                        },
-                    });
-                }); },
-            }, function () { return null; });
+                            },
+                            complete: function () {
+                                resolve();
+                            },
+                        });
+                    }); },
+                }, function () { return null; });
+                obsQuery.setOptions(this.watchQueryOptions).catch(function () { });
+            }
         }
+        var prevOptionsRef = React.useRef({
+            watchQueryOptions: this.watchQueryOptions,
+        });
+        React.useEffect(function () {
+            if (_this.renderPromises) ;
+            else if (_this.watchQueryOptions !== prevOptionsRef.current.watchQueryOptions) {
+                obsQuery.setOptions(_this.watchQueryOptions).catch(function () { });
+                prevOptionsRef.current.watchQueryOptions = _this.watchQueryOptions;
+                _this.setResult(obsQuery.getCurrentResult());
+            }
+        }, [obsQuery, this.watchQueryOptions]);
         return obsQuery;
-    }), obsQuery = _b[0], setObsQuery = _b[1];
-    var _c = React.useState(function () {
-        var _a, _b;
-        var result = obsQuery.getCurrentResult();
-        if (!result.loading && options) {
+    };
+    InternalState.prototype.useSubscriptionEffect = function (obsQuery) {
+        var _this = this;
+        React.useEffect(function () {
+            if (_this.renderPromises) {
+                return;
+            }
+            var onNext = function () {
+                var previousResult = _this.result;
+                var result = obsQuery.getCurrentResult();
+                if (previousResult &&
+                    previousResult.loading === result.loading &&
+                    previousResult.networkStatus === result.networkStatus &&
+                    equality.equal(previousResult.data, result.data)) {
+                    return;
+                }
+                _this.setResult(result);
+            };
+            var onError = function (error) {
+                var last = obsQuery["last"];
+                subscription.unsubscribe();
+                try {
+                    obsQuery.resetLastResults();
+                    subscription = obsQuery.subscribe(onNext, onError);
+                }
+                finally {
+                    obsQuery["last"] = last;
+                }
+                if (!hasOwnProperty.call(error, 'graphQLErrors')) {
+                    throw error;
+                }
+                var previousResult = _this.result;
+                if (!previousResult ||
+                    (previousResult && previousResult.loading) ||
+                    !equality.equal(error, previousResult.error)) {
+                    _this.setResult({
+                        data: (previousResult && previousResult.data),
+                        error: error,
+                        loading: false,
+                        networkStatus: exports.NetworkStatus.error,
+                    });
+                }
+            };
+            var subscription = obsQuery.subscribe(onNext, onError);
+            return function () { return subscription.unsubscribe(); };
+        }, [
+            obsQuery,
+            this.renderPromises,
+            this.client.disableNetworkFetches,
+        ]);
+    };
+    InternalState.prototype.setResult = function (nextResult) {
+        var previousResult = this.result;
+        if (previousResult && previousResult.data) {
+            this.previousData = previousResult.data;
+        }
+        this.result = nextResult;
+        this.forceUpdate();
+        this.handleErrorOrCompleted(nextResult);
+    };
+    InternalState.prototype.handleErrorOrCompleted = function (result) {
+        if (!result.loading) {
             if (result.error) {
-                (_a = options.onError) === null || _a === void 0 ? void 0 : _a.call(options, result.error);
+                this.onError(result.error);
             }
             else if (result.data) {
-                (_b = options.onCompleted) === null || _b === void 0 ? void 0 : _b.call(options, result.data);
+                this.onCompleted(result.data);
             }
         }
-        return result;
-    }), result = _c[0], setResult = _c[1];
-    var ref = React.useRef({
-        client: client,
-        query: query,
-        options: options,
-        result: result,
-        previousData: void 0,
-        watchQueryOptions: createWatchQueryOptions(query, options),
-    });
-    React.useEffect(function () {
-        var _a, _b;
-        var watchQueryOptions = createWatchQueryOptions(query, options);
-        var nextResult;
-        if (ref.current.client !== client || !equality.equal(ref.current.query, query)) {
-            var obsQuery_1 = client.watchQuery(watchQueryOptions);
-            setObsQuery(obsQuery_1);
-            nextResult = obsQuery_1.getCurrentResult();
-        }
-        else if (!equality.equal(ref.current.watchQueryOptions, watchQueryOptions)) {
-            obsQuery.setOptions(watchQueryOptions).catch(function () { });
-            nextResult = obsQuery.getCurrentResult();
-            ref.current.watchQueryOptions = watchQueryOptions;
-        }
-        if (nextResult) {
-            var previousResult = ref.current.result;
-            if (previousResult.data) {
-                ref.current.previousData = previousResult.data;
-            }
-            setResult(ref.current.result = nextResult);
-            if (!nextResult.loading && options) {
-                if (!result.loading) {
-                    if (result.error) {
-                        (_a = options.onError) === null || _a === void 0 ? void 0 : _a.call(options, result.error);
-                    }
-                    else if (result.data) {
-                        (_b = options.onCompleted) === null || _b === void 0 ? void 0 : _b.call(options, result.data);
-                    }
-                }
-            }
+    };
+    InternalState.prototype.getCurrentResult = function () {
+        var result = this.result;
+        if (!result) {
+            result = this.result = this.observable.getCurrentResult();
+            this.handleErrorOrCompleted(result);
         }
-        Object.assign(ref.current, { client: client, query: query, options: options });
-    }, [obsQuery, client, query, options]);
-    React.useEffect(function () {
-        if (context.renderPromises) {
-            return;
+        if ((this.renderPromises || this.client.disableNetworkFetches) &&
+            this.queryHookOptions.ssr === false) {
+            result = {
+                loading: true,
+                data: void 0,
+                error: void 0,
+                networkStatus: exports.NetworkStatus.loading,
+            };
         }
-        var subscription = obsQuery.subscribe(onNext, onError);
-        function onNext() {
-            var _a, _b;
-            var previousResult = ref.current.result;
-            var result = obsQuery.getCurrentResult();
-            if (previousResult &&
-                previousResult.loading === result.loading &&
-                previousResult.networkStatus === result.networkStatus &&
-                equality.equal(previousResult.data, result.data)) {
-                return;
-            }
-            if (previousResult.data) {
-                ref.current.previousData = previousResult.data;
-            }
-            setResult(ref.current.result = result);
-            if (!result.loading) {
-                (_b = (_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.onCompleted) === null || _b === void 0 ? void 0 : _b.call(_a, result.data);
-            }
+        else if (this.queryHookOptions.skip ||
+            this.watchQueryOptions.fetchPolicy === 'standby') {
+            result = {
+                loading: false,
+                data: void 0,
+                error: void 0,
+                networkStatus: exports.NetworkStatus.ready,
+            };
         }
-        function onError(error) {
-            var _a, _b;
-            var last = obsQuery["last"];
-            subscription.unsubscribe();
-            try {
-                obsQuery.resetLastResults();
-                subscription = obsQuery.subscribe(onNext, onError);
-            }
-            finally {
-                obsQuery["last"] = last;
-            }
-            if (!error.hasOwnProperty('graphQLErrors')) {
-                throw error;
-            }
-            var previousResult = ref.current.result;
-            if ((previousResult && previousResult.loading) ||
-                !equality.equal(error, previousResult.error)) {
-                setResult(ref.current.result = {
-                    data: previousResult.data,
-                    error: error,
-                    loading: false,
-                    networkStatus: exports.NetworkStatus.error,
-                });
-                (_b = (_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.onError) === null || _b === void 0 ? void 0 : _b.call(_a, error);
-            }
+        return result;
+    };
+    InternalState.prototype.toQueryResult = function (result) {
+        var queryResult = this.toQueryResultCache.get(result);
+        if (queryResult)
+            return queryResult;
+        var data = result.data; result.partial; var resultWithoutPartial = tslib.__rest(result, ["data", "partial"]);
+        this.toQueryResultCache.set(result, queryResult = tslib.__assign(tslib.__assign(tslib.__assign({ data: data }, resultWithoutPartial), this.obsQueryFields), { client: this.client, observable: this.observable, variables: this.observable.variables, called: true, previousData: this.previousData }));
+        if (!queryResult.error && isNonEmptyArray(result.errors)) {
+            queryResult.error = new ApolloError({ graphQLErrors: result.errors });
         }
-        return function () { return subscription.unsubscribe(); };
-    }, [obsQuery, context.renderPromises, client.disableNetworkFetches]);
-    var partial;
-    (_a = result, partial = _a.partial, result = tslib.__rest(_a, ["partial"]));
-    {
-        if (partial &&
-            (options === null || options === void 0 ? void 0 : options.partialRefetch) &&
+        return queryResult;
+    };
+    InternalState.prototype.unsafeHandlePartialRefetch = function (result) {
+        if (result.partial &&
+            this.queryHookOptions.partialRefetch &&
             !result.loading &&
             (!result.data || Object.keys(result.data).length === 0) &&
-            obsQuery.options.fetchPolicy !== 'cache-only') {
-            result = tslib.__assign(tslib.__assign({}, result), { loading: true, networkStatus: exports.NetworkStatus.refetch });
-            obsQuery.refetch();
-        }
-        if (context.renderPromises &&
-            (options === null || options === void 0 ? void 0 : options.ssr) !== false &&
-            !(options === null || options === void 0 ? void 0 : options.skip) &&
-            result.loading) {
-            obsQuery.setOptions(createWatchQueryOptions(query, options)).catch(function () { });
+            this.observable.options.fetchPolicy !== 'cache-only') {
+            Object.assign(result, {
+                loading: true,
+                networkStatus: exports.NetworkStatus.refetch,
+            });
+            this.observable.refetch();
         }
-    }
-    if ((context.renderPromises || client.disableNetworkFetches) &&
-        (options === null || options === void 0 ? void 0 : options.ssr) === false) {
-        result = ref.current.result = {
-            loading: true,
-            data: void 0,
-            error: void 0,
-            networkStatus: exports.NetworkStatus.loading,
-        };
-    }
-    else if ((options === null || options === void 0 ? void 0 : options.skip) || (options === null || options === void 0 ? void 0 : options.fetchPolicy) === 'standby') {
-        result = {
-            loading: false,
-            data: void 0,
-            error: void 0,
-            networkStatus: exports.NetworkStatus.ready,
-        };
-    }
-    if (result.errors && result.errors.length) {
-        result = tslib.__assign(tslib.__assign({}, result), { error: result.error || new ApolloError({ graphQLErrors: result.errors }) });
-    }
-    var obsQueryFields = React.useMemo(function () { return ({
-        refetch: obsQuery.refetch.bind(obsQuery),
-        fetchMore: obsQuery.fetchMore.bind(obsQuery),
-        updateQuery: obsQuery.updateQuery.bind(obsQuery),
-        startPolling: obsQuery.startPolling.bind(obsQuery),
-        stopPolling: obsQuery.stopPolling.bind(obsQuery),
-        subscribeToMore: obsQuery.subscribeToMore.bind(obsQuery),
-    }); }, [obsQuery]);
-    return tslib.__assign(tslib.__assign(tslib.__assign({}, obsQueryFields), { variables: obsQuery.variables, client: client, called: true, previousData: ref.current.previousData }), result);
-}
-function createWatchQueryOptions(query, options) {
-    var _a;
-    if (options === void 0) { options = {}; }
-    var skip = options.skip; options.ssr; options.onCompleted; options.onError; options.displayName; var watchQueryOptions = tslib.__rest(options, ["skip", "ssr", "onCompleted", "onError", "displayName"]);
-    if (skip) {
-        watchQueryOptions.fetchPolicy = 'standby';
-    }
-    else if (((_a = watchQueryOptions.context) === null || _a === void 0 ? void 0 : _a.renderPromises) &&
-        (watchQueryOptions.fetchPolicy === 'network-only' ||
-            watchQueryOptions.fetchPolicy === 'cache-and-network')) {
-        watchQueryOptions.fetchPolicy = 'cache-first';
-    }
-    else if (!watchQueryOptions.fetchPolicy) {
-        watchQueryOptions.fetchPolicy = 'cache-first';
-    }
-    return tslib.__assign({ query: query }, watchQueryOptions);
-}
+    };
+    return InternalState;
+}());
 
 var EAGER_METHODS = [
     'refetch',
+    'reobserve',
     'fetchMore',
     'updateQuery',
     'startPolling',
     'subscribeToMore',
 ];
 function useLazyQuery(query, options) {
-    var _a = React.useState({
-        called: false,
-        resolves: [],
-    }), execution = _a[0], setExecution = _a[1];
-    var execute = React.useCallback(function (executeOptions) {
-        var resolve;
-        var promise = new Promise(function (resolve1) { return (resolve = resolve1); });
-        setExecution(function (execution) {
-            if (execution.called) {
-                result && result.refetch(executeOptions === null || executeOptions === void 0 ? void 0 : executeOptions.variables);
-            }
-            return {
-                called: true,
-                resolves: tslib.__spreadArray(tslib.__spreadArray([], execution.resolves, true), [resolve], false),
-                options: executeOptions,
-            };
-        });
-        return promise;
-    }, []);
-    var result = useQuery(query, tslib.__assign(tslib.__assign(tslib.__assign({}, options), execution.options), { fetchPolicy: execution.called ? options === null || options === void 0 ? void 0 : options.fetchPolicy : 'standby', skip: undefined }));
-    React.useEffect(function () {
-        var resolves = execution.resolves;
-        if (!result.loading && resolves.length) {
-            setExecution(function (execution) { return (tslib.__assign(tslib.__assign({}, execution), { resolves: [] })); });
-            resolves.forEach(function (resolve) { return resolve(result); });
-        }
-    }, [result, execution]);
-    if (!execution.called) {
-        result = tslib.__assign(tslib.__assign({}, result), { loading: false, data: void 0, error: void 0, called: false });
+    var internalState = useInternalState(useApolloClient(options && options.client), query);
+    var execOptionsRef = React.useRef();
+    var defaultOptions = internalState.client.defaultOptions.watchQuery;
+    var initialFetchPolicy = (options && options.fetchPolicy) ||
+        (execOptionsRef.current && execOptionsRef.current.fetchPolicy) ||
+        (defaultOptions && defaultOptions.fetchPolicy) ||
+        "cache-first";
+    var useQueryResult = internalState.useQuery(tslib.__assign(tslib.__assign(tslib.__assign({}, options), execOptionsRef.current), { skip: !execOptionsRef.current }));
+    var result = Object.assign(useQueryResult, {
+        called: !!execOptionsRef.current,
+    });
+    var eagerMethods = React.useMemo(function () {
+        var eagerMethods = {};
         var _loop_1 = function (key) {
             var method = result[key];
-            result[key] = function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
+            eagerMethods[key] = function () {
+                if (!execOptionsRef.current) {
+                    execOptionsRef.current = Object.create(null);
+                    internalState.forceUpdate();
                 }
-                setExecution(function (execution) { return (tslib.__assign(tslib.__assign({}, execution), { called: true })); });
-                return method.apply(void 0, args);
+                return method.apply(this, arguments);
             };
         };
         for (var _i = 0, EAGER_METHODS_1 = EAGER_METHODS; _i < EAGER_METHODS_1.length; _i++) {
             var key = EAGER_METHODS_1[_i];
             _loop_1(key);
         }
-    }
+        return eagerMethods;
+    }, []);
+    Object.assign(result, eagerMethods);
+    var execute = React.useCallback(function (executeOptions) {
+        var promise = result.reobserve(execOptionsRef.current = executeOptions ? tslib.__assign(tslib.__assign({}, executeOptions), { fetchPolicy: executeOptions.fetchPolicy || initialFetchPolicy }) : {
+            fetchPolicy: initialFetchPolicy,
+        }).then(function (apolloQueryResult) {
+            apolloQueryResult = apolloQueryResult || internalState["getCurrentResult"]();
+            if (apolloQueryResult.error ||
+                isNonEmptyArray(apolloQueryResult.errors)) {
+                var _a = result.observable.options.errorPolicy, errorPolicy = _a === void 0 ? "none" : _a;
+                if (errorPolicy === "none") {
+                    throw apolloQueryResult.error || new ApolloError({
+                        graphQLErrors: apolloQueryResult.errors,
+                    });
+                }
+            }
+            return internalState.toQueryResult(apolloQueryResult);
+        }).then(function (queryResult) { return Object.assign(queryResult, eagerMethods); });
+        internalState.forceUpdate();
+        promise.catch(function () { });
+        return promise;
+    }, []);
     return [execute, result];
 }
 
@@ -6323,79 +6452,73 @@ function useMutation(mutation, options) {
         result: result,
         mutationId: 0,
         isMounted: true,
-        execute: null,
         client: client,
         mutation: mutation,
         options: options,
     });
-    var execute = React.useMemo(function () {
-        if (ref.current.execute != null &&
-            ref.current.client === client &&
-            equality.equal(options, ref.current.options) &&
-            equality.equal(mutation, ref.current.mutation)) {
-            return ref.current.execute;
-        }
-        ref.current.client = client;
-        ref.current.options = options;
-        ref.current.mutation = mutation;
-        ref.current.execute = function (executeOptions) {
-            if (executeOptions === void 0) { executeOptions = {}; }
-            var baseOptions = tslib.__assign(tslib.__assign({}, options), { mutation: mutation });
-            if (!ref.current.result.loading && !baseOptions.ignoreResults) {
-                setResult(ref.current.result = {
-                    loading: true,
-                    error: void 0,
-                    data: void 0,
+    {
+        Object.assign(ref.current, { client: client, options: options, mutation: mutation });
+    }
+    var execute = React.useCallback(function (executeOptions) {
+        if (executeOptions === void 0) { executeOptions = {}; }
+        var _a = ref.current, client = _a.client, options = _a.options, mutation = _a.mutation;
+        var baseOptions = tslib.__assign(tslib.__assign({}, options), { mutation: mutation });
+        if (!ref.current.result.loading && !baseOptions.ignoreResults) {
+            setResult(ref.current.result = {
+                loading: true,
+                error: void 0,
+                data: void 0,
+                called: true,
+                client: client,
+            });
+        }
+        var mutationId = ++ref.current.mutationId;
+        var clientOptions = mergeOptions(baseOptions, executeOptions);
+        return client.mutate(clientOptions).then(function (response) {
+            var _a, _b;
+            var data = response.data, errors = response.errors;
+            var error = errors && errors.length > 0
+                ? new ApolloError({ graphQLErrors: errors })
+                : void 0;
+            if (mutationId === ref.current.mutationId &&
+                !clientOptions.ignoreResults) {
+                var result_1 = {
                     called: true,
+                    loading: false,
+                    data: data,
+                    error: error,
                     client: client,
-                });
-            }
-            var mutationId = ++ref.current.mutationId;
-            var clientOptions = mergeOptions(baseOptions, executeOptions);
-            return client.mutate(clientOptions).then(function (response) {
-                var _a;
-                var data = response.data, errors = response.errors;
-                var error = errors && errors.length > 0
-                    ? new ApolloError({ graphQLErrors: errors })
-                    : void 0;
-                if (mutationId === ref.current.mutationId &&
-                    !baseOptions.ignoreResults) {
-                    var result_1 = {
-                        called: true,
-                        loading: false,
-                        data: data,
-                        error: error,
-                        client: client,
-                    };
-                    if (ref.current.isMounted && !equality.equal(ref.current.result, result_1)) {
-                        setResult(ref.current.result = result_1);
-                    }
-                }
-                (_a = baseOptions.onCompleted) === null || _a === void 0 ? void 0 : _a.call(baseOptions, response.data);
-                return response;
-            }).catch(function (error) {
-                if (mutationId === ref.current.mutationId &&
-                    ref.current.isMounted) {
-                    var result_2 = {
-                        loading: false,
-                        error: error,
-                        data: void 0,
-                        called: true,
-                        client: client,
-                    };
-                    if (!equality.equal(ref.current.result, result_2)) {
-                        setResult(ref.current.result = result_2);
-                    }
+                };
+                if (ref.current.isMounted && !equality.equal(ref.current.result, result_1)) {
+                    setResult(ref.current.result = result_1);
                 }
-                if (baseOptions.onError) {
-                    baseOptions.onError(error);
-                    return { data: void 0, errors: error };
+            }
+            (_a = baseOptions.onCompleted) === null || _a === void 0 ? void 0 : _a.call(baseOptions, response.data);
+            (_b = executeOptions.onCompleted) === null || _b === void 0 ? void 0 : _b.call(executeOptions, response.data);
+            return response;
+        }).catch(function (error) {
+            var _a, _b;
+            if (mutationId === ref.current.mutationId &&
+                ref.current.isMounted) {
+                var result_2 = {
+                    loading: false,
+                    error: error,
+                    data: void 0,
+                    called: true,
+                    client: client,
+                };
+                if (!equality.equal(ref.current.result, result_2)) {
+                    setResult(ref.current.result = result_2);
                 }
-                throw error;
-            });
-        };
-        return ref.current.execute;
-    }, [client, mutation, options]);
+            }
+            if (baseOptions.onError || clientOptions.onError) {
+                (_a = baseOptions.onError) === null || _a === void 0 ? void 0 : _a.call(baseOptions, error);
+                (_b = executeOptions.onError) === null || _b === void 0 ? void 0 : _b.call(executeOptions, error);
+                return { data: void 0, errors: error };
+            }
+            throw error;
+        });
+    }, []);
     var reset = React.useCallback(function () {
         setResult({ called: false, loading: false, client: client });
     }, []);
@@ -6432,14 +6555,16 @@ function useSubscription(subscription, options) {
         if (typeof shouldResubscribe === 'function') {
             shouldResubscribe = !!shouldResubscribe(options);
         }
-        if ((options === null || options === void 0 ? void 0 : options.skip) && !(options === null || options === void 0 ? void 0 : options.skip) !== !((_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.skip)) {
-            setResult({
-                loading: false,
-                data: void 0,
-                error: void 0,
-                variables: options === null || options === void 0 ? void 0 : options.variables,
-            });
-            setObservable(null);
+        if (options === null || options === void 0 ? void 0 : options.skip) {
+            if (!(options === null || options === void 0 ? void 0 : options.skip) !== !((_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.skip)) {
+                setResult({
+                    loading: false,
+                    data: void 0,
+                    error: void 0,
+                    variables: options === null || options === void 0 ? void 0 : options.variables,
+                });
+                setObservable(null);
+            }
         }
         else if (shouldResubscribe !== false && (client !== ref.current.client ||
             subscription !== ref.current.subscription ||
@@ -6532,7 +6657,6 @@ exports.HttpLink = HttpLink;
 exports.InMemoryCache = InMemoryCache;
 exports.MissingFieldError = MissingFieldError;
 exports.ObservableQuery = ObservableQuery;
-exports.applyNextFetchPolicy = applyNextFetchPolicy;
 exports.checkFetcher = checkFetcher;
 exports.concat = concat;
 exports.createHttpLink = createHttpLink;
@@ -6557,6 +6681,7 @@ exports.parser = parser;
 exports.resetApolloContext = getApolloContext;
 exports.rewriteURIForGET = rewriteURIForGET;
 exports.selectHttpOptionsAndBody = selectHttpOptionsAndBody;
+exports.selectHttpOptionsAndBodyInternal = selectHttpOptionsAndBodyInternal;
 exports.selectURI = selectURI;
 exports.serializeFetchParameter = serializeFetchParameter;
 exports.split = split;