Support 2.0 (#980)

* Fix issue from broken deploy

* suppor the 2.0 by checking initStore existence

Changelog.md

@@ -1,6 +1,7 @@
 # Change log
 
 ### vNext
+- Feature: Support apollo-client 2.0
 - Fix: Scope query recyclers by client [#876](https://github.com/apollographql/react-apollo/pull/876)
 - MockNetworkInterface match mock requests regardless of variable order [#973](https://github.com/apollographql/react-apollo/pull/973)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-apollo",
-  "version": "1.4.12",
+  "version": "1.4.13",
   "description": "React data container for Apollo Client",
   "main": "lib/react-apollo.umd.js",
   "module": "./lib/index.js",
@@ -142,7 +142,7 @@
     "uglify-js": "3.0.27"
   },
   "dependencies": {
-    "apollo-client": "^1.4.0",
+    "apollo-client": "^1.4.0 || ^2.0.0-0",
     "graphql-anywhere": "^3.0.0",
     "graphql-tag": "^2.0.0",
     "hoist-non-react-statics": "^2.2.0",

src/ApolloProvider.tsx

@@ -43,13 +43,17 @@ export default class ApolloProvider extends Component<ProviderProps, any> {
         'sure you pass in your client via the "client" prop.',
     );
 
-    if (!props.store) {
+    if (!props.store && typeof props.client.initStore === 'function') {
       props.client.initStore();
     }
   }
 
   componentWillReceiveProps(nextProps) {
-    if (nextProps.client !== this.props.client && !nextProps.store) {
+    if (
+      nextProps.client !== this.props.client &&
+      !nextProps.store &&
+      typeof nextProps.client.initStore === 'function'
+    ) {
       nextProps.client.initStore();
     }
   }

test/react-web/client/ApolloProvider.test.tsx

@@ -132,6 +132,16 @@ describe('<ApolloProvider /> Component', () => {
     expect(wrapper.contains(<div className="unique" />)).toBe(true);
   });
 
+  it('should support the 2.0', () => {
+    const wrapper = shallow(
+      <ApolloProvider client={{}}>
+        <div className="unique" />
+      </ApolloProvider>,
+    );
+
+    expect(wrapper.contains(<div className="unique" />)).toBe(true);
+  });
+
   it('should require a client', () => {
     const originalConsoleError = console.error;
     console.error = () => {