Use getApolloState instead relying on reduxRootKey

Author: sheerun

package.json

@@ -49,10 +49,10 @@
   "peerDependencies": {
     "react": "0.14.x || 15.* || ^15.0.0",
     "redux": "^2.0.0 || ^3.0.0",
-    "apollo-client": "^0.4.12"
+    "apollo-client": "^0.4.19"
   },
   "devDependencies": {
-    "apollo-client": "0.4.13",
+    "apollo-client": "0.4.19",
     "babel-jest": "^14.1.0",
     "babel-preset-react-native": "^1.9.0",
     "browserify": "^13.0.0",

src/graphql.tsx

@@ -213,7 +213,7 @@ export default function graphql(
       // if this query is in the store, don't block execution
       try {
         readQueryFromStore({
-          store: client.store.getState()[client.reduxRootKey].data,
+          store: client.queryManager.getApolloState().data,
           query: opts.query,
           variables: opts.variables,
           fragmentMap: createFragmentMap(opts.fragments),
@@ -331,7 +331,6 @@ export default function graphql(
           return;
         }
 
-        const { reduxRootKey } = this.client;
         const queryOptions = this.calculateOptions(this.props);
         const fragments = calculateFragments(queryOptions.fragments);
         const { variables, forceFetch, skip } = queryOptions as QueryOptions;
@@ -363,7 +362,7 @@ export default function graphql(
         if (!forceFetch) {
           try {
             const result = readQueryFromStore({
-              store: this.store.getState()[reduxRootKey].data,
+              store: this.client.queryManager.getApolloState().data,
               query: document,
               variables,
               fragmentMap: createFragmentMap(fragments),
@@ -445,7 +444,6 @@ export default function graphql(
       }
 
       handleQueryData(observableQuery: ObservableQuery, { variables }: WatchQueryOptions): void {
-        const { reduxRootKey } = this.client;
         // bind each handle to updating and rerendering when data
         // has been recieved
         let refetch,
@@ -457,7 +455,8 @@ export default function graphql(
 
         const next = ({ data = oldData, loading, error }: any) => {
           const { queryId } = observableQuery;
-          let initialVariables = this.store.getState()[reduxRootKey].queries[queryId].variables;
+
+          let initialVariables = this.client.queryManager.getApolloState().queries[queryId].variables;
 
           const resultKeyConflict: boolean = (
             'errors' in data ||

src/server.ts

@@ -106,14 +106,14 @@ export function renderToStringWithData(component) {
   return getDataFromTree(component)
     .then(({ client }) => {
       let markup = ReactDOM.renderToString(component);
-      let initialState = client.store.getState();
-      const key = client.reduxRootKey;
-      // XXX apollo client requires a lot in the store
-      // can we make this samller?
-      for (let queryId in initialState[key].queries) {
+      let apolloState = client.queryManager.getApolloState();
+
+      for (let queryId in apolloState.queries) {
         let fieldsToNotShip = ['minimizedQuery', 'minimizedQueryString'];
-        for (let field of fieldsToNotShip)  delete initialState[key].queries[queryId][field];
+        for (let field of fieldsToNotShip) delete apolloState.queries[queryId][field];
       }
-      return { markup, initialState };
+
+      // it's OK, because apolloState is nested somewhere in globalState
+      return { markup, initialState: client.store.getState() };
     });
 }