Merge cfd712f into c21953b

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ### vNEXT
 
+- Support `v1.0.0-rc.2` of `apollo-client` [PR #39](https://github.com/kamilkisiela/apollo-client-rxjs/pull/39)
+
 ### v0.5.1
 
 - Remove `lodash` completely [PR #34](https://github.com/kamilkisiela/apollo-client-rxjs/pull/34)

package.json

@@ -42,29 +42,29 @@
     "prepublish": "npm run clean && npm run build"
   },
   "peerDependencies": {
-    "apollo-client": "^0.7.2 || ^0.8.0",
+    "apollo-client": ">=0.7.2 <=0.10.1 || >=1.0.0-beta <2.0.0",
     "rxjs": "^5.0.0-beta.12 || ^5.0.0-rc.1 || ^5.0.0"
   },
   "devDependencies": {
-    "@types/chai": "^3.4.32",
-    "@types/isomorphic-fetch": "0.0.30",
-    "@types/mocha": "^2.2.31",
+    "@types/chai": "^3.4.35",
+    "@types/mocha": "^2.2.40",
     "@types/node": "^6.0.38",
-    "@types/sinon": "^1.16.29",
-    "apollo-client": "^0.8.0",
+    "@types/sinon": "^1.16.35",
+    "apollo-client": "^1.0.0-rc.2",
+    "apollo-test-utils": "^0.2.0",
     "chai": "^3.5.0",
-    "graphql": "^0.8.2",
-    "graphql-tag": "^1.1.2",
+    "graphql": "^0.9.1",
+    "graphql-tag": "^1.3.1",
     "isomorphic-fetch": "^2.2.1",
     "istanbul": "^0.4.5",
     "mocha": "^3.2.0",
-    "remap-istanbul": "^0.8.2",
-    "rimraf": "^2.5.4",
-    "rollup": "^0.37.0",
-    "rxjs": "^5.0.3",
-    "sinon": "^1.17.5",
-    "source-map-support": "^0.4.6",
-    "tslint": "^4.1.1",
-    "typescript": "^2.1.0"
+    "remap-istanbul": "^0.9.1",
+    "rimraf": "^2.6.1",
+    "rollup": "^0.41.5",
+    "rxjs": "^5.2.0",
+    "sinon": "^2.0.0",
+    "source-map-support": "^0.4.12",
+    "tslint": "^4.5.1",
+    "typescript": "^2.2.1"
   }
 }

tests/fixtures/heroes.ts

@@ -1,13 +1,12 @@
 import { DocumentNode } from 'graphql';
 import { ApolloClient, ObservableQuery } from 'apollo-client';
+import { mockNetworkInterface } from 'apollo-test-utils';
 
 import { RxObservableQuery } from '../../src/RxObservableQuery';
 import { RxApolloClient } from '../../src/RxApolloClient';
 
 import gql from 'graphql-tag';
 
-import mockNetworkInterface from '../mocks/mockNetworkInterface';
-
 // data
 
 export interface Hero {

tests/index.ts

@@ -1,6 +1,6 @@
 import 'isomorphic-fetch';
 
-// tslint:disable-next-line:no-var-requires 
+// tslint:disable-next-line:no-var-requires
 require('source-map-support').install();
 
 import './utils';