Merge branch 'master' into release-2.5.0

dpetrenko · Feb 13, 2019 · 9cb166e · 9cb166e
2 parents ada6057 + 5217dba
commit 9cb166e
Show file tree

Hide file tree

Showing 7 changed files with 485 additions and 747 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,15 +8,20 @@
   ([#4243](https://github.com/apollographql/apollo-client/pull/4243))" <br/>
   [PR #4337](https://github.com/apollographql/apollo-client/pull/4337)
 
-### Apollo Client (vNext)
+## Apollo Client (2.4.13)
+
+### Apollo Client (2.4.13)
 
 - Resolve "invalidate" -> "invalidated" typo in `QueryManager`.  <br/>
   [@quazzie](https://github.com/quazzie) in [#4041](https://github.com/apollographql/apollo-client/pull/4041)
+
 - Properly type `setQuery` and fix now typed callers.  <br/>
   [@danilobuerger](https://github.com/danilobuerger) in [#4369](https://github.com/apollographql/apollo-client/pull/4369)
+
 - Align with the React Apollo decision that result `data` should be
   `TData | undefined` instead of `TData | {}`.  <br/>
   [@danilobuerger](https://github.com/danilobuerger) in [#4356](https://github.com/apollographql/apollo-client/pull/4356)
+
 - Documentation updates.  <br/>
   [@danilobuerger](https://github.com/danilobuerger) in [#4340](https://github.com/apollographql/apollo-client/pull/4340)  <br />
   [@justyn-clark](https://github.com/justyn-clark) in [#4383](https://github.com/apollographql/apollo-client/pull/4383)  <br />

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -20,7 +20,7 @@
     "poke-site": "1.3.1",
     "start-server-and-test": "1.7.11",
     "typedoc": "0.14.2",
-    "typescript": "3.3.1"
+    "typescript": "3.3.3"
   },
   "scripts": {
     "start": "npm run build && chexo apollo-hexo-config -- server",