Merge branch 'master' into release-3.2

CHANGELOG.md

@@ -5,6 +5,18 @@
 - Substantially improve type inference for data and variables types using `TypedDocumentNode<Data, Variables>` type instead of `DocumentNode`. <br/>
   [@dotansimha](https://github.com/dotansimha) in [#6720](https://github.com/apollographql/apollo-client/pull/6720)
 
+## Apollo Client 3.1.3
+
+## Bug Fixes
+
+- Consider only `result.data` (rather than all properties of `result`) when settling cache feuds. <br/>
+  [@danReynolds](https://github.com/danReynolds) in [#6777](https://github.com/apollographql/apollo-client/pull/6777)
+
+## Improvements
+
+- Provide [jscodeshift](https://www.npmjs.com/package/jscodeshift) transform for automatically converting Apollo Client 2.x `import` declarations to use Apollo Client 3.x packages. [Instructions](https://github.com/apollographql/apollo-client/tree/master/codemods/ac2-to-ac3). <br/>
+  [@dminkovsky](https://github.com/dminkovsky) and [@jcreighton](https://github.com/jcreighton) in [#6486](https://github.com/apollographql/apollo-client/pull/6486)
+
 ## Apollo Client 3.1.2
 
 ## Bug Fixes

src/core/QueryInfo.ts

@@ -235,7 +235,8 @@ export class QueryInfo {
         // of writeQuery, so we can store the new diff quietly and ignore
         // it when we receive it redundantly from the watch callback.
         this.cache.performTransaction(cache => {
-          if (equal(result, this.lastWrittenResult) &&
+          if (this.lastWrittenResult &&
+              equal(result.data, this.lastWrittenResult.data) &&
               equal(options.variables, this.lastWrittenVars)) {
             // If result is the same as the last result we received from
             // the network (and the variables match too), avoid writing