Merge branch 'master' into remove-boost-emoji

apollographql · May 15, 2018 · 6ae7a2d · 6ae7a2d
2 parents d32bf17 + 92f9296
commit 6ae7a2d
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 12 deletions.
diff --git a/dangerfile.ts b/dangerfile.ts
@@ -116,7 +116,4 @@ if (!isBot) {
     );
   });
   raiseIssueAboutPaths(fail, onlyTestFiles, 'an `only` was left in the test');
-
-  // Politely ask for their name in the authors file
-  message('Please add your name and email to the AUTHORS file (optional)');
 }
diff --git a/docs/source/essentials/mutations.md b/docs/source/essentials/mutations.md
@@ -266,8 +266,6 @@ The render prop function that you pass to the `children` prop of `Mutation` is c
   <dd>Any errors returned from the mutation</dd>
   <dt>`called`: boolean</dt>
   <dd>A boolean indicating if the mutate function has been called</dd>
-  <dt>`client`: ApolloClient</dt>
-  <dd>Your `ApolloClient` instance. Useful for invoking cache methods outside the context of the update function, such as `client.writeData` and `client.readQuery`.</dd>
 </dl>
 
 <h2 id="next-steps">Next steps</h2>

diff --git a/packages/apollo-client/CHANGELOG.md b/packages/apollo-client/CHANGELOG.md
@@ -1,6 +1,12 @@
-
 # Change log
 
+### vNext
+
+- Fixed an issue involving `Object.setPrototypeOf()` not working on JSC
+  (Android), by instead setting the `prototype` of `this` manually.
+  [Issue #3236](https://github.com/apollographql/apollo-client/issues/3236)
+  [PR #3306](https://github.com/apollographql/apollo-client/pull/3306)
+
 ### 2.3.0
 - fixed edge case bug of changing fetchPolicies right after resetStore with no variables present
 - Various optimizations for cache read performance [#3300](https://github.com/apollographql/apollo-client/pull/3300)
@@ -18,7 +24,7 @@
 [PR#3068](https://github.com/apollographql/apollo-client/pull/3068)
 - onResetStore callbacks occur before refetching Observable Queries[PR#3010](https://github.com/apollographql/apollo-client/pull/3010)
 - Error message for in flight queries during `resetStore` includes link completion note[PR#3010](https://github.com/apollographql/apollo-client/pull/3010)
-- `ApolloError` can now be checked with `instanceof` operator 
+- `ApolloError` can now be checked with `instanceof` operator
 - Fix navigator being undefined on React Native [PR##3164](https://github.com/apollographql/apollo-client/pull/3164)
 - Remove spread of variables preventing issues with removing keys [#3081](https://github.com/apollographql/apollo-client/pull/3081)
 

diff --git a/packages/apollo-client/package.json b/packages/apollo-client/package.json
@@ -62,7 +62,7 @@
     "@types/isomorphic-fetch": "0.0.34",
     "@types/jest": "21.1.10",
     "@types/lodash": "4.14.108",
-    "@types/node": "8.10.13",
+    "@types/node": "8.10.14",
     "apollo-cache-inmemory": "^1.2.1",
     "benchmark": "2.1.4",
     "browserify": "15.2.0",
@@ -82,7 +82,7 @@
     "tslint": "5.10.0",
     "typescript": "2.4.2",
     "uglify-js": "3.3.24",
-    "webpack": "3.10.0",
+    "webpack": "3.12.0",
     "webpack-bundle-analyzer": "2.11.2"
   },
   "optionalDependencies": {

diff --git a/packages/apollo-client/src/errors/ApolloError.ts b/packages/apollo-client/src/errors/ApolloError.ts
@@ -65,6 +65,8 @@ export class ApolloError extends Error {
 
     this.extraInfo = extraInfo;
 
-    Object.setPrototypeOf(this, ApolloError.prototype);
+    // We're not using `Object.setPrototypeOf` here as it isn't fully
+    // supported on Android (see issue #3236).
+    (this as any).__proto__ = ApolloError.prototype;
   }
 }
diff --git a/packages/apollo-utilities/package.json b/packages/apollo-utilities/package.json
@@ -41,7 +41,7 @@
     "@types/graphql": "0.12.7",
     "@types/jest": "21.1.10",
     "@types/lodash": "4.14.108",
-    "@types/node": "8.10.13",
+    "@types/node": "8.10.14",
     "browserify": "15.2.0",
     "flow-bin": "0.72.0",
     "graphql": "0.13.2",

diff --git a/packages/graphql-anywhere/.npmignore b/packages/graphql-anywhere/.npmignore
@@ -0,0 +1 @@
+src
diff --git a/packages/graphql-anywhere/CHANGELOG.md b/packages/graphql-anywhere/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change log
 
+### vNext
+
+- Source files are now excluded when publishing to npm.
+  [Issue #2806](https://github.com/apollographql/apollo-client/issues/2806)
+  [PR #3454](https://github.com/apollographql/apollo-client/pull/3454)
+
 ### 4.1.10
 - Fix [#3393](https://github.com/apollographql/apollo-client/issues/3393)
   [PR #3403](https://github.com/apollographql/apollo-client/pull/3403)

diff --git a/packages/graphql-anywhere/package.json b/packages/graphql-anywhere/package.json
@@ -45,7 +45,7 @@
     "@types/isomorphic-fetch": "0.0.34",
     "@types/jest": "21.1.10",
     "@types/lodash": "4.14.108",
-    "@types/node": "8.10.13",
+    "@types/node": "8.10.14",
     "@types/react": "16.0.34",
     "@types/react-dom": "16.0.4",
     "browserify": "15.2.0",