Merge branch 'master' into patch-1

Author: Sashko Stubailo

docs/source/advanced/boost-migration.md

@@ -132,7 +132,7 @@ import { InMemoryCache } from 'apollo-cache-inmemory';
 import { HttpLink } from 'apollo-link-http';
 import { onError } from 'apollo-link-error';
 import { withClientState } from 'apollo-link-state';
-import { ApolloLink } from 'apollo-link';
+import { ApolloLink, Observable } from 'apollo-link';
 
 const cache = new InMemoryCache({
   cacheRedirects: {
@@ -154,7 +154,7 @@ const request = async (operation) => {
 
 const requestLink = new ApolloLink((operation, forward) =>
   new Observable(observer => {
-    let handle: any;
+    let handle;
     Promise.resolve(operation)
       .then(oper => request(oper))
       .then(() => {
@@ -167,7 +167,7 @@ const requestLink = new ApolloLink((operation, forward) =>
       .catch(observer.error.bind(observer));
 
     return () => {
-      if (handle) handle.unsubscribe;
+      if (handle) handle.unsubscribe();
     };
   })
 );

docs/source/advanced/caching.md

@@ -303,6 +303,8 @@ mutate({
 Using `update` gives you full control over the cache, allowing you to make changes to your data model in response to a mutation in any way you like. `update` is the recommended way of updating the cache after a query. It is explained in full [here](../api/react-apollo.html#graphql-mutation-options-update).
 
 ```javascript
+import CommentAppQuery from '../queries/CommentAppQuery';
+
 const SUBMIT_COMMENT_MUTATION = gql`
   mutation submitComment($repoFullName: String!, $commentContent: String!) {
     submitComment(

docs/source/essentials/mutations.md

@@ -266,6 +266,8 @@ 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>

docs/source/recipes/authentication.md

@@ -35,7 +35,7 @@ app.use(cors(corsOptions));
 ```
 ## Header
 
-Another common way to identify yourself when using HTTP is to send along an authorization header. Apollo Links allow to create middlewares that let you modify requests before they are sent to the server. It's easy to add an `authorization` header to every HTTP request. In this example, we'll pull the login token from `localStorage` every time a request is sent:
+Another common way to identify yourself when using HTTP is to send along an authorization header. It's easy to add an `authorization` header to every HTTP request by chaining together Apollo Links. In this example, we'll pull the login token from `localStorage` every time a request is sent:
 
 ```js
 import { ApolloClient } from 'apollo-client';

docs/source/recipes/babel.md

@@ -9,6 +9,8 @@ To avoid this runtime overhead, you can precompile your queries created with `gr
 1. Using [babel-plugin-graphql-tag](#using-babel-plugin-graphql-tag)
 2. Using [graphql-tag.macro](#using-graphql-tagmacro)
 
+If you prefer to keep your GraphQL code in separate files (`.graphql` or `.gql`) you can use [babel-plugin-inline-import-graphql-ast](https://github.com/detrohutt/babel-plugin-inline-import-graphql-ast). This plugin still uses `graphql-tag` under the hood, but transparently. You simply `import` your operations/fragments as if each were an export from your GraphQL file. This carries the same precompilation benefits as the above approaches.
+
 ## Using babel-plugin-graphql-tag
 
 This approach will allow you to use the `graphql-tag` library as usual, and when processing the files with this babel plugin, the calls to that library will be replaced by the precompiled result.
@@ -69,9 +71,52 @@ const query = gql`
 `;
 ```
 
+## Using babel-plugin-graphql-tag
+
+Install the plugin in your dev dependencies:
+
+```
+# with npm
+npm install --save-dev babel-plugin-inline-import-graphql-ast
+
+# or with yarn
+yarn add --dev babel-plugin-inline-import-graphql-ast
+```
+
+Then add the plugin in your `.babelrc` configuration file:
+
+```
+{
+  "plugins": [
+    "inline-import-graphql-ast"
+  ]
+}
+```
+
+Now any `import` statements importing from a GraphQL file type will return a ready-to-use GraphQL DocumentNode object.
+
+```javascript
+import React, { Component } from 'react';
+import { graphql } from 'react-apollo';
+import myImportedQuery from './productsQuery.graphql';
+// or for files with multiple operations:
+// import { query1, query2 } from './queries.graphql';
+
+class QueryingComponent extends Component {
+  render() {
+    if (this.props.data.loading) return <h3>Loading...</h3>;
+    return <div>{`This is my data: ${this.props.data.queryName}`}</div>;
+  }
+}
+
+export default graphql(myImportedQuery)(QueryingComponent);
+```
+
 ## Fragments
 
-Both approaches work with fragments. You can have fragments defined in a different call to `gql` (either in the same file or in a different one). You can then include them into the main query using interpolation, like this:
+All of these approaches support the use of fragments. 
+
+For the first two approaches, you can have fragments defined in a different call to `gql` (either in the same file or in a different one). You can then include them into the main query using interpolation, like this:
 
 ```js
 import gql from 'graphql-tag';
@@ -97,3 +142,5 @@ const query = gql`
   ${fragments.hello}
 `;
 ```
+
+With `babel-plugin-inline-import-graphql-ast`, you can just include your fragment in your GraphQL file along-side whatever uses it, or even import it from a separate file using the GraphQL `#import` syntax. See the [README](https://github.com/detrohutt/babel-plugin-inline-import-graphql-ast) for more information.

packages/apollo-boost/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-boost",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "The easiest way to get started with Apollo Client",
   "author": "Peggy Rayzis <peggy@apollographql.com>",
   "contributors": [
@@ -33,8 +33,8 @@
     "filesize": "npm run build && npm run build:browser"
   },
   "dependencies": {
-    "apollo-cache-inmemory": "^1.1.12",
-    "apollo-client": "^2.2.8",
+    "apollo-cache-inmemory": "^1.2.0",
+    "apollo-client": "^2.3.0",
     "apollo-link": "^1.0.6",
     "apollo-link-error": "^1.0.3",
     "apollo-link-http": "^1.3.1",
@@ -44,7 +44,7 @@
   "devDependencies": {
     "@types/graphql": "0.12.7",
     "@types/jest": "21.1.10",
-    "apollo-cache": "^1.1.7",
+    "apollo-cache": "^1.1.8",
     "browserify": "15.2.0",
     "graphql": "0.13.2",
     "jest": "20.0.4",

packages/apollo-cache-inmemory/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change log
 
-### vNext
+### 1.2.0
 - Various optimizations for cache read performance [#3300](https://github.com/apollographql/apollo-client/pull/3300)
 - Fix typo in documentation
 

packages/apollo-cache-inmemory/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-cache-inmemory",
-  "version": "1.1.12",
+  "version": "1.2.0",
   "description": "Core abstract of Caching layer for Apollo Client",
   "author": "James Baxley <james@meteor.com>",
   "contributors": [
@@ -39,9 +39,9 @@
     "filesize": "npm run build:browser"
   },
   "dependencies": {
-    "apollo-cache": "^1.1.7",
-    "apollo-utilities": "^1.0.11",
-    "graphql-anywhere": "^4.1.8"
+    "apollo-cache": "^1.1.8",
+    "apollo-utilities": "^1.0.12",
+    "graphql-anywhere": "^4.1.9"
   },
   "peerDependencies": {
     "graphql": "0.11.7 || ^0.12.0 || ^0.13.0"

packages/apollo-cache/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-cache",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "Core abstract of Caching layer for Apollo Client",
   "author": "James Baxley <james@meteor.com>",
   "contributors": [
@@ -38,7 +38,7 @@
     "filesize": "npm run build && npm run build:browser"
   },
   "dependencies": {
-    "apollo-utilities": "^1.0.11"
+    "apollo-utilities": "^1.0.12"
   },
   "devDependencies": {
     "@types/graphql": "0.12.7",

packages/apollo-client/CHANGELOG.md

@@ -1,7 +1,7 @@
 
 # Change log
 
-### vNEXT
+### 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)
 

packages/apollo-client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "apollo-client",
   "private": true,
-  "version": "2.2.8",
+  "version": "2.3.0",
   "description": "A simple yet functional GraphQL client.",
   "main": "./lib/bundle.umd.js",
   "module": "./lib/index.js",
@@ -46,10 +46,10 @@
   "license": "MIT",
   "dependencies": {
     "@types/zen-observable": "^0.5.3",
-    "apollo-cache": "^1.1.7",
+    "apollo-cache": "^1.1.8",
     "apollo-link": "^1.0.0",
     "apollo-link-dedup": "^1.0.0",
-    "apollo-utilities": "^1.0.11",
+    "apollo-utilities": "^1.0.12",
     "symbol-observable": "^1.0.2",
     "zen-observable": "^0.8.0"
   },
@@ -63,7 +63,7 @@
     "@types/jest": "21.1.10",
     "@types/lodash": "4.14.108",
     "@types/node": "8.10.11",
-    "apollo-cache-inmemory": "^1.1.12",
+    "apollo-cache-inmemory": "^1.2.0",
     "benchmark": "2.1.4",
     "browserify": "15.2.0",
     "bundlesize": "0.17.0",

packages/apollo-utilities/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-utilities",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Utilities for working with GraphQL ASTs",
   "author": "James Baxley <james@meteor.com>",
   "contributors": [

packages/graphql-anywhere/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change log
 
-## vNEXT
+## 4.1.9
 - Various optimizations for cache read performance [#3300](https://github.com/apollographql/apollo-client/pull/3300)
 
 ### 4.1.8

packages/graphql-anywhere/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-anywhere",
-  "version": "4.1.8",
+  "version": "4.1.9",
   "description": "Run GraphQL queries with no schema and just one resolver",
   "main": "./lib/bundle.umd.js",
   "module": "./lib/index.js",
@@ -15,10 +15,8 @@
     "watch": "tsc -w",
     "prepublishOnly": "npm run build",
     "lint": "tslint --type-check -p tsconfig.json src/*.ts",
-    "build:browser":
-      "browserify ./lib/bundle.umd.js -o=./lib/bundle.js --i apollo-utilities && npm run minify:browser",
-    "minify:browser":
-      "uglifyjs -c -m -o ./lib/bundle.min.js -- ./lib/bundle.js",
+    "build:browser": "browserify ./lib/bundle.umd.js -o=./lib/bundle.js --i apollo-utilities && npm run minify:browser",
+    "minify:browser": "uglifyjs -c -m -o ./lib/bundle.min.js -- ./lib/bundle.js",
     "filesize": "npm run build:browser"
   },
   "repository": {
@@ -35,10 +33,12 @@
     "react"
   ],
   "author": "Sashko Stubailo <sashko@stubailo.com>",
-  "contributors": ["James Burgess <jamesmillerburgess@gmail.com>"],
+  "contributors": [
+    "James Burgess <jamesmillerburgess@gmail.com>"
+  ],
   "license": "MIT",
   "dependencies": {
-    "apollo-utilities": "^1.0.11"
+    "apollo-utilities": "^1.0.12"
   },
   "devDependencies": {
     "@types/graphql": "0.12.7",
@@ -65,6 +65,11 @@
       ".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
     },
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
-    "moduleFileExtensions": ["ts", "tsx", "js", "json"]
+    "moduleFileExtensions": [
+      "ts",
+      "tsx",
+      "js",
+      "json"
+    ]
   }
 }