Merge branch 'master' into release-2.5.0

CHANGELOG.md

@@ -14,13 +14,16 @@
   [@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 | undefinedi` instead of `TData | {}`.  <br/>
+- 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 />
   [@jtassin](https://github.com/jtassin) in [#4287](https://github.com/apollographql/apollo-client/pull/4287)  <br />
+  [@Gongreg](https://github.com/Gongreg) in [#4386](https://github.com/apollographql/apollo-client/pull/4386)  <br />
+  [@davecardwell](https://github.com/davecardwell) in [#4399](https://github.com/apollographql/apollo-client/pull/4399)  <br />
+  [@michaelknoch](https://github.com/michaelknoch) in [#4384](https://github.com/apollographql/apollo-client/pull/4384)  <br />
 
 ## Apollo Client (2.4.12)
 

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.2.4"
+    "typescript": "3.3.1"
   },
   "scripts": {
     "start": "npm run build && chexo apollo-hexo-config -- server",

docs/source/advanced/caching.md

@@ -416,7 +416,7 @@ Fundamentally, paginated queries are the same as any other query with the except
 
 To solve this Apollo Client 1.6 introduced the `@connection` directive to specify a custom store key for results. A connection allows us to set the cache key for a field and to filter which arguments actually alter the query.
 
-To have a stable cache location for query results, Apollo Client 1.6 introduced the `@connection` directive, which can be used to specify a custom store key for results. To use the `@connection` directive, simply add the directive to the segment of the query you want a custom store key for and provide the `key` parameter to specify the store key. In addition to the `key` parameter, you can also include the optional `filter` parameter, which takes an array of query argument names to include in the generated custom store key.
+To use the `@connection` directive, simply add the directive to the segment of the query you want a custom store key for and provide the `key` parameter to specify the store key. In addition to the `key` parameter, you can also include the optional `filter` parameter, which takes an array of query argument names to include in the generated custom store key.
 
 ```
 const query = gql`query Feed($type: FeedType!, $offset: Int, $limit: Int) {

docs/source/api/apollo-client.md

@@ -54,6 +54,7 @@ The `ApolloClient` class is the core API for Apollo, and the one you'll need to
 {% tsapibox ApolloClient.clearStore %}
 {% tsapibox ApolloClient.onClearStore %}
 {% tsapibox ApolloClient.stop %}
+{% tsapibox ApolloClient.reFetchObservableQueries %}
 
 <h2 id="ObservableQuery">ObservableQuery</h2>
 

docs/source/recipes/react-native.md

@@ -38,3 +38,11 @@ There are some Apollo examples written in React Native that you may wish to refe
 2. A [GitHub API Example](https://github.com/apollographql/GitHub-GraphQL-API-Example) built to work with GitHub's new GraphQL API.
 
 > If you've got an example to post here, please hit the "Edit on GitHub" button above and let us know!
+
+<h2 id="apollo-dev-tools">Apollo Dev Tools</h2>
+
+[React Native Debugger](https://github.com/jhen0409/react-native-debugger) supports the [Apollo Client Devtools](https://github.com/apollographql/apollo-client-devtools):
+
+1. Install React Native Debugger and open it.
+2. Enable "Debug JS Remotely" in your app.
+3. (Optional) If you do not see the Developer Tools panel or the Apollo tab is missing in them, toggle the Developer Tools by right clicking anywhere and selecting "Toggle Developer Tools".