Merge pull request #3930 from apollographql/issue-3863-again

Avoid React 16.13.0 update during render warning

Author: hwillson

Changelog.md

@@ -1,5 +1,10 @@
 # Change log
 
+## 3.1.5 (2020-04-14)
+
+- Another pass at preventing new data re-render attempts during an existing render (the solution published with React Apollo 3.1.4 wasn't as all encompassing as it needs to be). This helps avoid React 16.13.0's "Cannot update a component from inside the function body of a different component" warning (https://github.com/facebook/react/pull/17099). <br/>
+  [@hwillson](https://github.com/hwillson) in [#3930](https://github.com/apollographql/react-apollo/pull/3930)
+
 ## 3.1.4 (2020-04-03)
 
 - Prevent new data re-render attempts during an existing render. This helps avoid React 16.13.0's "Cannot update a component from inside the function body of a different component" warning (https://github.com/facebook/react/pull/17099). <br/>
@@ -1181,7 +1186,7 @@ import { getDataFromTree, renderToStringWithData } from 'react-apollo';
 renderToStringWithData(component).then({ markup, initialState });
 
 // new -- you must get it yourself
-renderToStringWithData(component).then(markup => {
+renderToStringWithData(component).then((markup) => {
   const initialState = client.store.getState()[client.reduxRootKey];
 
   // ...