Update to [email protected] (#4)

kamilkisiela · Oct 26, 2016 · 9f2a800 · 9f2a800
1 parent 60c18d3
commit 9f2a800
Show file tree

Hide file tree

Showing 17 changed files with 154 additions and 76 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,12 @@
 # Change log
 
+### vNEXT
+
+- Added support for ApolloClient `v0.5.0` [PR #4](https://github.com/kamilkisiela/apollo-client-rxjs/pull/4)
+- BREAKING CHANGE No longer support ApolloClient `v0.4.X` [PR #4](https://github.com/kamilkisiela/apollo-client-rxjs/pull/4)
+
 ### v0.1.0
 
-- Add `updateQuery` to `RxObservableQuery` [PR #2](https://github.com/kamilkisiela/apollo-client-rxjs/pull/2)
+- Added `updateQuery` to `RxObservableQuery` [PR #2](https://github.com/kamilkisiela/apollo-client-rxjs/pull/2)
 
 ### v0.0.1
diff --git a/package.json b/package.json
@@ -41,32 +41,32 @@
     "lodash.assign": "^4.2.0",
     "lodash.isfunction": "^3.0.8",
     "lodash.omit": "^4.5.0",
-    "rxjs": "^5.0.0-beta.6"
+    "rxjs": "^5.0.0-rc.1"
   },
   "peerDependencies": {
-    "apollo-client": "^0.4.13"
+    "apollo-client": "^0.5.0"
   },
   "devDependencies": {
     "@types/chai": "^3.4.32",
+    "@types/es6-shim": "^0.31.32",
     "@types/isomorphic-fetch": "0.0.30",
     "@types/lodash": "^4.14.34",
     "@types/mocha": "^2.2.31",
     "@types/node": "^6.0.38",
     "@types/sinon": "^1.16.29",
-    "apollo-client": "^0.4.13",
+    "apollo-client": "^0.5.0",
     "chai": "^3.5.0",
-    "es6-promise": "^3.2.1",
-    "graphql": "^0.6.2",
-    "graphql-tag": "^0.1.11",
-    "graphql-typings": "0.0.1-beta-2",
+    "graphql": "^0.7.2",
+    "graphql-tag": "^0.1.15",
     "isomorphic-fetch": "^2.2.1",
     "istanbul": "^0.4.4",
-    "mocha": "^3.0.2",
-    "remap-istanbul": "^0.6.4",
+    "mocha": "^3.1.2",
+    "remap-istanbul": "^0.7.0",
     "rimraf": "^2.5.4",
     "sinon": "^1.17.5",
-    "source-map-support": "^0.4.2",
-    "tslint": "^3.14.0",
-    "typescript": "2.0.0"
+    "source-map-support": "^0.4.5",
+    "tslint": "^3.15.1",
+    "typed-graphql": "^1.0.2",
+    "typescript": "^2.0.0"
   }
 }
diff --git a/src/RxApolloClient.ts b/src/RxApolloClient.ts
@@ -1,10 +1,7 @@
-import { ApolloQueryResult } from 'apollo-client';
-import { WatchQueryOptions } from 'apollo-client/watchQueryOptions';
+import { ApolloClient, WatchQueryOptions } from 'apollo-client';
 import { RxObservableQuery } from './RxObservableQuery';
 import { createWithObservableVariables } from './utils/variables';
 
-import ApolloClient from 'apollo-client';
-
 import 'rxjs/add/operator/switchMap';
 
 export class RxApolloClient extends ApolloClient {

diff --git a/src/RxObservableQuery.ts b/src/RxObservableQuery.ts
@@ -3,8 +3,7 @@ import { Subscriber } from 'rxjs/Subscriber';
 import { Subscription } from 'rxjs/Subscription';
 import { Operator } from 'rxjs/Operator';
 import { $$observable } from 'rxjs/symbol/observable';
-import { ObservableQuery } from 'apollo-client/ObservableQuery';
-import { ApolloQueryResult } from 'apollo-client';
+import { ApolloQueryResult, ObservableQuery } from 'apollo-client';
 
 import { ObservableQueryRef } from './utils/ObservableQueryRef';
 
@@ -68,11 +67,11 @@ export class RxObservableQuery<T> extends Observable<T> {
 
   private getObservableQuery(): ObservableQuery {
     if (this.apollo instanceof ObservableQueryRef) {
-      const ref = <ObservableQueryRef> this.apollo;
+      const ref = this.apollo as ObservableQueryRef;
       return ref.getRef();
     }
 
-    return <ObservableQuery> this.apollo;
+    return this.apollo as ObservableQuery;
   }
 
   private checkMethod(method: string): void {

diff --git a/src/rxify.ts b/src/rxify.ts
@@ -1,10 +1,8 @@
-import { ApolloQueryResult } from 'apollo-client';
-import { ObservableQuery } from 'apollo-client/ObservableQuery';
+import { ApolloClient, ApolloQueryResult, ObservableQuery } from 'apollo-client';
 
 import { createWithObservableVariables } from './utils/variables';
 import { RxObservableQuery } from './RxObservableQuery';
 
-import ApolloClient from 'apollo-client';
 import isFunction = require('lodash.isfunction');
 
 export type WatchQueryFn = (options?: any) => ObservableQuery;

diff --git a/src/utils/ObservableQueryRef.ts b/src/utils/ObservableQueryRef.ts
@@ -1,4 +1,4 @@
-import { ObservableQuery } from 'apollo-client/ObservableQuery';
+import { ObservableQuery } from 'apollo-client';
 
 export class ObservableQueryRef {
   private ref: ObservableQuery;

diff --git a/src/utils/variables.ts b/src/utils/variables.ts
@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
-import { ObservableQuery } from 'apollo-client/ObservableQuery';
+import { ObservableQuery } from 'apollo-client';
 
 import { ObservableQueryRef } from './ObservableQueryRef';
 import { RxObservableQuery } from '../RxObservableQuery';

diff --git a/tests/RxApolloClient/index.ts b/tests/RxApolloClient/index.ts
@@ -1,9 +1,8 @@
 import { assert } from 'chai';
+import { ApolloClient } from 'apollo-client';
 
 import { RxApolloClient } from '../../src/RxApolloClient';
 
-import ApolloClient from 'apollo-client';
-
 import './watchQuery';
 import './query';
 import './mutate';

diff --git a/tests/RxApolloClient/watchQuery.ts b/tests/RxApolloClient/watchQuery.ts
@@ -20,7 +20,7 @@ describe('RxApolloClient.watchQuery', () => {
         assert.deepEqual(result.data, heroes.data);
         done();
       },
-      error() {
+      error(error) {
         done(new Error('should not be called'));
       }
     });
@@ -33,7 +33,7 @@ describe('RxApolloClient.watchQuery', () => {
 
     obs.subscribe({
       next(result) {},
-      error() {
+      error(error) {
         done(new Error('should not be called'));
       }
     });

diff --git a/tests/RxObservableQuery.ts b/tests/RxObservableQuery.ts
@@ -1,14 +1,11 @@
 import { assert } from 'chai';
 import { spy, stub } from 'sinon';
-import { ApolloQueryResult } from 'apollo-client';
-import { ObservableQuery } from 'apollo-client/ObservableQuery';
+import { ApolloClient, ApolloQueryResult, ObservableQuery } from 'apollo-client';
 
 import * as heroes from './fixtures/heroes';
 import { RxObservableQuery } from '../src/RxObservableQuery';
 import { ObservableQueryRef } from '../src/utils/ObservableQueryRef';
 
-import ApolloClient from 'apollo-client';
-
 import 'rxjs/add/operator/map';
 
 describe('RxObservableQuery', () => {
@@ -57,26 +54,6 @@ describe('RxObservableQuery', () => {
       });
     });
 
-    it('should be able to receive an error', (done: MochaDone) => {
-      rxObsQuery.subscribe({
-        next() {
-          //
-        },
-        error() {
-          done(new Error('should not be called'));
-        },
-      });
-
-      rxObsQuery.subscribe({
-        next() {
-          done(new Error('should not be called'));
-        },
-        error() {
-          done();
-        },
-      });
-    });
-
     it('should be able to use a operator', (done: MochaDone) => {
       rxObsQuery.map(result => result.data).subscribe({
         next(result) {

diff --git a/tests/fixtures/heroes.ts b/tests/fixtures/heroes.ts
@@ -1,12 +1,10 @@
 import { Document } from 'graphql';
-import { ApolloQueryResult } from 'apollo-client';
-import { ObservableQuery } from 'apollo-client/ObservableQuery';
+import { ApolloClient, ApolloQueryResult, ObservableQuery } from 'apollo-client';
 
 import { RxObservableQuery } from '../../src/RxObservableQuery';
 import { RxApolloClient } from '../../src/RxApolloClient';
 
 import gql from 'graphql-tag';
-import ApolloClient from 'apollo-client';
 
 import mockNetworkInterface from '../mocks/mockNetworkInterface';
 
@@ -54,7 +52,7 @@ export interface MockedClientResult {
 export function mockClient(): MockedClientResult {
   const networkInterface = createNetworkInterface();
 
-  const client = new ApolloClient({ networkInterface });
+  const client = new ApolloClient({ networkInterface, addTypename: false });
   const obsQuery = client.watchQuery({ query });
   const rxObsQuery = new RxObservableQuery(obsQuery);
 
@@ -72,7 +70,7 @@ export interface MockedRxClientResult extends MockedClientResult {
 export function mockRxClient(): MockedRxClientResult {
   const networkInterface = createNetworkInterface();
 
-  const client = new RxApolloClient({ networkInterface });
+  const client = new RxApolloClient({ networkInterface, addTypename: false });
   const obsQuery = client.watchQuery({ query });
   const rxObsQuery = new RxObservableQuery(obsQuery);
 

diff --git a/tests/index.ts b/tests/index.ts
@@ -1,4 +1,3 @@
-import 'es6-promise';
 import 'isomorphic-fetch';
 
 // tslint:disable-next-line:no-var-requires