Working up towards 2.0 release

.gitignore

@@ -45,3 +45,10 @@ yarn.lock
 
 # npm
 package-lock.json
+
+# docs
+db.json
+*.log
+docs/public/*
+!docs/public/_redirects
+.idea/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "docs/themes/meteor"]
+	path = docs/themes/meteor
+	url = https://github.com/meteor/hexo-theme-meteor.git

Upgrade.md

@@ -42,7 +42,7 @@ If you are interested in contributing to the 2.0 release that is SO great!! Ther
 ## Installation instructions
 The 2.0 of apollo is split into a few packages. To try it out in your app you can install the following
 ```bash
-npm i --save apollo-client@beta apollo-cache-inmemory@beta apollo-link-http@beta
+npm i --save apollo-client@next apollo-cache-inmemory@next apollo-link-http
 ```
 
 This will give you the replacement for networkInterfaces (links), the current apollo-cache (cache-inmemory) and the new client.
@@ -83,16 +83,16 @@ import { onPageLoad } from 'meteor/server-render';
 
 // apollo imports
 import ApolloClient from 'apollo-client';
-import Link from 'apollo-link-http';
-import Cache from 'apollo-cache-inmemory'
+import { HttpLink } from 'apollo-link-http';
+import { InMemoryCache } from 'apollo-cache-inmemory'
 import { ApolloProvider } from 'react-apollo';
 
 import { App } from '/imports/app';
 
 export const start = () => {
   const client = new ApolloClient({
-    link: new Link({ uri: 'http://localhost:3000' }),
-    cache: new Cache().restore(window.__APOLLO_STATE__),
+    link: new HttpLink({ uri: 'http://localhost:3000' }),
+    cache: new InMemoryCache().restore(window.__APOLLO_STATE__),
   });
 
   const WrappedApp = (
@@ -128,20 +128,22 @@ becomes
 
 ```js
 import ApolloClient from "apollo-client";
-import InMemoryCache from "apollo-cache-inmemory";
+import { InMemoryCache } from "apollo-cache-inmemory";
 
 const cache = new InMemoryCache({
   fragmentMatcher: // matcher,
   dataIdFromObject: // custom function,
   addTypename: true,
-  customResolvers: // custom resolvers
+  cacheResolvers: // cache resolvers
 });
 
 const client = new ApolloClient({
   cache: cache.restore(window.__APOLLO_STATE__ || {})
 });
 ```
 
+*Note* If you were using `customResolvers`, the name of that has been changed to be `cacheResolvers` to be more descriptive of what it does. `customResolvers` will still be supported throughout the 2.0 though to be backwards compatible and ease the upgrade path
+
 
 If you have previously used `getInitialState` for SSR, that API has been moved to the cache itself instead of on the client. The before:
 
@@ -159,14 +161,13 @@ becomes
 
 ```js
 import ApolloClient from "apollo-client";
-import InMemoryCache from "apollo-cache-inmemory";
+import { InMemoryCache } from "apollo-cache-inmemory";
 
-const cache = new InMemoryCache();
-const client = new ApolloClient({ cache });
+const client = new ApolloClient({ cache: new InMemoryCache() });
 
 // do some data loading things using getDataFromTree
 
-const state = cache.extract();
+const state = client.cache.extract();
 ```
 
 

docs/README.md

@@ -0,0 +1,14 @@
+# docs
+
+[![Greenkeeper badge](https://badges.greenkeeper.io/apollographql/core-docs.svg)](https://greenkeeper.io/)
+
+To run:
+
+```
+git submodule init
+git submodule update
+cd code && npm install
+cd ..
+npm install
+npm start
+```

docs/_config.yml

@@ -0,0 +1,125 @@
+# Hexo Configuration
+## Docs: http://hexo.io/docs/configuration.html
+## Source: https://github.com/hexojs/hexo/
+
+# Site
+title: Apollo Client Guide
+propertytitle: Using GraphQL with Apollo Client
+subtitle: React Guide
+description: A guide to using the Apollo GraphQL Client with React.
+author:
+language:
+timezone:
+versions:
+  - '1'
+
+# This setting also defines the page order used to generate the Previous/Next links at the bottom of each page
+sidebar_categories:
+  # Basics
+  null:
+    - index
+    - basics/integrations
+    - basics/setup
+    - basics/queries
+    - basics/mutations
+    - basics/network-layer
+    - basics/error-handling
+    - basics/fragments
+    - basics/subscriptions
+  Features:
+    - features/changelog
+    - features/caching
+    - features/developer-tooling
+    - features/network-customization
+    - features/optimistic-ui
+    - features/react-native
+    - features/static-typing
+  Recipes:
+    - recipes/authentication
+    - recipes/babel
+    - recipes/meteor
+    - recipes/pagination
+    - recipes/prefetching
+    - recipes/query-splitting
+    - recipes/server-side-rendering
+    - recipes/simple-example
+    - recipes/webpack
+    # - recipes/client-side-data
+    # - recipes/using-with-rest
+    # - recipes/offline
+    # - recipes/custom-fetching
+  Reference:
+    - reference/index
+
+
+github_repo: apollographql/apollo-client
+content_root: docs/source
+
+social_links:
+  github: 'https://github.com/apollographql'
+  twitter: '@apollographql'
+
+# API keys
+apis:
+  segment: wgrIo8Bul0Ujl8USETG3DB6hONdy4kTg
+  gtm: GTM-PNFDVBB
+
+# URL
+## If your site is put in a subdirectory, set url as 'http://yoursite.com/child' and root as '/child/'
+url: https://www.apollographql.com/docs/react
+root: /docs/react/
+permalink: :year/:month/:day/:title/
+permalink_defaults:
+
+# Directory
+source_dir: source
+public_dir: public/docs/react
+tag_dir: tags
+archive_dir: archives
+category_dir: categories
+code_dir: downloads/code
+i18n_dir: :lang
+skip_render:
+
+# Writing
+new_post_name: :title.md # File name of new posts
+default_layout: post
+titlecase: false # Transform title into titlecase
+external_link: true # Open external links in new tab
+filename_case: 0
+render_drafts: false
+post_asset_folder: false
+relative_link: false
+future: true
+highlight:
+  enable: true
+  line_number: true
+  auto_detect: true
+  tab_replace:
+
+# Category & Tag
+default_category: uncategorized
+category_map:
+tag_map:
+
+# Date / Time format
+## Hexo uses Moment.js to parse and display date
+## You can customize the date format as defined in
+## http://momentjs.com/docs/#/displaying/format/
+date_format: YYYY-MM-DD
+time_format: HH:mm:ss
+
+# Pagination
+## Set per_page to 0 to disable pagination
+per_page: 10
+pagination_dir: page
+
+# Extensions
+## Plugins: http://hexo.io/plugins/
+## Themes: http://hexo.io/themes/
+theme: meteor
+
+# Deployment
+## Docs: http://hexo.io/docs/deployment.html
+deploy:
+  type:

docs/assets/theme-colors.less

@@ -0,0 +1 @@
+@color-primary: #22A699;

docs/package.json

@@ -0,0 +1,23 @@
+{
+  "name": "hexo-site",
+  "version": "0.0.0",
+  "private": true,
+  "hexo": {
+    "version": "3.3.8"
+  },
+  "dependencies": {
+    "hexo": "3.3.8",
+    "hexo-generator-archive": "^0.1.2",
+    "hexo-generator-category": "^0.1.2",
+    "hexo-generator-index": "^0.2.0",
+    "hexo-generator-tag": "^0.2.0",
+    "hexo-renderer-ejs": "^0.2.0",
+    "hexo-renderer-less": "^0.2.0",
+    "hexo-renderer-marked": "^0.2.4",
+    "hexo-server": "^0.2.0"
+  },
+  "scripts": {
+    "build": "hexo generate",
+    "start": "hexo serve"
+  }
+}

docs/public/_redirects

@@ -0,0 +1 @@
+/ /docs/react/

docs/source/basics/error-handling.md

@@ -0,0 +1,17 @@
+---
+title: Error Handling
+subtitle: Subtitle
+description: Description
+---
+
+<h2 title="topic">Topic</h2>
+
+<h3 title="subtopic">Sub Topic</h3>
+
+```js
+// code block
+```
+
+<h2 title="best-practices">Best Practices</h2>
+
+<h2 title="API">API Documentation</h2>