adjust config and fix jsdoc

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "code"]
 	path = code
 	url = https://github.com/apollographql/apollo-client.git
+[submodule "docs/themes/meteor"]
+	path = docs/themes/meteor
+	url = https://github.com/meteor/hexo-theme-meteor.git

docs/_config.yml

@@ -28,16 +28,15 @@ sidebar_categories:
     - polymer
     - ember
 
-# not sure if we should rename this?
-github_repo: apollostack/docs
+github_repo: apollographql/apollo-client
 content_root: source
 
 typescript_api_box:
   data_file: docs.json
 
 social_links:
-  github: 'https://github.com/apollostack'
-  twitter: '@apollostack'
+  github: 'https://github.com/apollographql'
+  twitter: '@apollographql'
 
 # API keys
 apis:
@@ -46,14 +45,14 @@ apis:
 
 # URL
 ## If your site is put in a subdirectory, set url as 'http://yoursite.com/child' and root as '/child/'
-url: http://dev.apollodata.com/core
-root: /core/
+url: https://www.apollographql.com/docs/core
+root: /docs/core/
 permalink: :year/:month/:day/:title/
 permalink_defaults:
 
 # Directory
 source_dir: source
-public_dir: public
+public_dir: public/docs/core
 tag_dir: tags
 archive_dir: archives
 category_dir: categories

docs/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "hexo": {
-    "version": "3.2.2"
+    "version": "3.3.8"
   },
   "dependencies": {
     "hexo": "3.3.8",
@@ -22,12 +22,10 @@
     "hexo-s3-deploy": "^1.2.1"
   },
   "scripts": {
-    "postinstall":
-      "cd code && npm install && npm uninstall typescript && npm install typescript@2.1.6",
-    "build": "cd code; typedoc --json ../docs.json --ignoreCompilerErrors",
+    "build":
+      "cd ../packages/apollo-client; typedoc --json ../../docs/docs.json --ignoreCompilerErrors",
     "prestart": "npm run build",
     "start": "hexo serve",
-    "predeploy": "npm run build",
     "deploy": "hexo-s3-deploy"
   }
 }

docs/source/apollo-client-api.md

@@ -16,17 +16,10 @@ The `ApolloClient` class is the core API for Apollo, and the one you'll need to
 {% tsapibox ApolloClient.readFragment %}
 {% tsapibox ApolloClient.writeQuery %}
 {% tsapibox ApolloClient.writeFragment %}
-{% tsapibox ApolloClient.reducer %}
-{% tsapibox ApolloClient.dataId %}
-{% tsapibox ApolloClient.dataIdFromObject %}
-{% tsapibox ApolloClient.middleware %}
-{% tsapibox ApolloClient.initStore %}
-{% tsapibox ApolloClient.setStore %}
 {% tsapibox ApolloClient.resetStore %}
 
 <h2 id="ObservableQuery">ObservableQuery</h2>
 
-{% tsapibox ObservableQuery.subscribe %}
 {% tsapibox ObservableQuery.variables %}
 {% tsapibox ObservableQuery.result %}
 {% tsapibox ObservableQuery.currentResult %}
@@ -46,41 +39,3 @@ The `ApolloClient` class is the core API for Apollo, and the one you'll need to
 {% tsapibox ApolloError.networkError %}
 {% tsapibox ApolloError.extraInfo %}
 
-<h2 id="DataProxy">DataProxy</h2>
-
-An interface to the normalized data in your store. `ApolloClient` implements this interface and so do various other objects you may receive when updating the store. A `DataProxy` is used in the `update` function on `client.mutate` to give you a window into your normalized data.
-
-This interface is currently only used in the context of the `update` function provided to [`ApolloClient.mutate`](apollo-client-api.html#ApolloClient.mutate).
-
-{% tsapibox DataProxy.readQuery %}
-{% tsapibox DataProxy.readFragment %}
-{% tsapibox DataProxy.writeQuery %}
-{% tsapibox DataProxy.writeFragment %}
-
-<h2 id="utilities">Utilities</h2>
-
-{% tsapibox createNetworkInterface %}
-<!--  XXX: fix aliasing-->
-{% tsapibox addTypenameToSelectionSet %}
-
-<h2 id="types">Types</h2>
-
-{% tsapibox ApolloQueryResult %}
-{% tsapibox ApolloCurrentResult %}
-{% tsapibox ApolloStore %}
-{% tsapibox NetworkStatus %}
-{% tsapibox NetworkInterface %}
-{% tsapibox NetworkInterfaceOptions %}
-{% tsapibox HTTPNetworkInterface %}
-{% tsapibox BatchedNetworkInterface %}
-{% tsapibox NormalizedCache %}
-{% tsapibox ApolloReducerConfig %}
-{% tsapibox MutationBehaviorReducerArgs %}
-{% tsapibox MutationArrayInsertBehavior %}
-{% tsapibox MutationArrayDeleteBehavior %}
-{% tsapibox MutationDeleteBehavior %}
-{% tsapibox Request %}
-{% tsapibox StoreObject %}
-{% tsapibox FragmentMap %}
-{% tsapibox Observer %}
-{% tsapibox Subscription %}