Merge branch 'master' into fix/null-and-undefined

uxtx · Jan 19, 2017 · 1b9a18f · 1b9a18f
2 parents cff90dd + c28783a
commit 1b9a18f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -32,6 +32,7 @@ Oleksandr Stubailo <[email protected]>
 Olivier Ricordeau <[email protected]>
 Pavol Fulop <[email protected]>
 Pavol Fulop <[email protected]>
+Rasmus Eneman <[email protected]>
 Robin Ricard <[email protected]>
 Sashko Stubailo <[email protected]>
 Sashko Stubailo <[email protected]>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,13 +3,15 @@
 Expect active development and potentially significant breaking changes in the `0.x` track. We'll try to be diligent about releasing a `1.0` version in a timely fashion (ideally within 3 to 6 months), to signal the start of a more stable API.
 
 ### vNEXT
+- ...
 - Allow optional mutation arguments. [PR #1174](https://github.com/apollostack/apollo-client/pull/1174)
+- Fix typings error with `strictNullChecks` [PR #1188](https://github.com/apollostack/apollo-client/pull/1188)
 
 ### 0.7.3
 - *Fixed breaking change:* readQueryFromStore was incomptibale with Typescript 2.0 compiler. [PR #1171](https://github.com/apollostack/apollo-client/pull/1171)
 
 ### 0.7.2
-Re-release of 0.7.1 with proper internal directory structure 
+Re-release of 0.7.1 with proper internal directory structure
 
 ### 0.7.1
 - *Undo breaking change:* Add whatwg-fetch polyfill (most likely only until version 1.0) [PR #1155](https://github.com/apollostack/apollo-client/pull/1155)

diff --git a/src/ApolloClient.ts b/src/ApolloClient.ts
@@ -136,22 +136,7 @@ export default class ApolloClient {
    * with identical parameters (query, variables, operationName) is already in flight.
    *
    */
-  constructor({
-    networkInterface,
-    reduxRootKey,
-    reduxRootSelector,
-    initialState,
-    dataIdFromObject,
-    resultComparator,
-    ssrMode = false,
-    ssrForceFetchDelay = 0,
-    mutationBehaviorReducers = {} as MutationBehaviorReducerMap,
-    addTypename = true,
-    resultTransformer,
-    customResolvers,
-    connectToDevTools,
-    queryDeduplication = false,
-  }: {
+  constructor(options: {
     networkInterface?: NetworkInterface,
     reduxRootKey?: string,
     reduxRootSelector?: string | ApolloStateSelector,
@@ -167,6 +152,22 @@ export default class ApolloClient {
     connectToDevTools?: boolean,
     queryDeduplication?: boolean,
   } = {}) {
+    let {
+      networkInterface,
+      reduxRootKey,
+      reduxRootSelector,
+      initialState,
+      dataIdFromObject,
+      resultComparator,
+      ssrMode = false,
+      ssrForceFetchDelay = 0,
+      mutationBehaviorReducers = {} as MutationBehaviorReducerMap,
+      addTypename = true,
+      resultTransformer,
+      customResolvers,
+      connectToDevTools,
+      queryDeduplication = false,
+    } = options;
     if (reduxRootKey && reduxRootSelector) {
       throw new Error('Both "reduxRootKey" and "reduxRootSelector" are configured, but only one of two is allowed.');
     }