From 9ff10bf9391fe3c1e8735bdf64f1f9702ce8e2a2 Mon Sep 17 00:00:00 2001 From: Kamil Kisiela Date: Thu, 5 Jan 2017 07:30:15 +0100 Subject: [PATCH] Support ApolloClient 0.6 (#18) --- CHANGELOG.md | 14 ++++++++------ package.json | 11 +++++------ tests/fixtures/heroes.ts | 6 +++--- tests/mocks/mockNetworkInterface.ts | 14 +++++++------- tsconfig.json | 1 - typings.d.ts | 1 - 6 files changed, 23 insertions(+), 24 deletions(-) delete mode 100644 typings.d.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index b63fdf8..7d087f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,14 +2,16 @@ ### vNEXT +- Update to `apollo-client@0.6.0` [PR #18](https://github.com/kamilkisiela/apollo-client-rxjs/pull/18) + ### v0.2.4 - Use `lodash` instead of individual packages [PR #14](https://github.com/kamilkisiela/apollo-client-rxjs/pull/14) -- Made every `RxObservableQuery` asynchronous [PR #13](https://github.com/kamilkisiela/apollo-client-rxjs/pull/13) +- Make every `RxObservableQuery` asynchronous [PR #13](https://github.com/kamilkisiela/apollo-client-rxjs/pull/13) ### v0.2.3 -- Updated to `apollo-client@0.5.1` [PR #11](https://github.com/kamilkisiela/apollo-client-rxjs/pull/11) +- Update to `apollo-client@0.5.1` [PR #11](https://github.com/kamilkisiela/apollo-client-rxjs/pull/11) ### v0.2.2 @@ -17,16 +19,16 @@ ### v0.2.1 -- Added support for `rxjs@5.0.0-beta.12` [PR #6](https://github.com/kamilkisiela/apollo-client-rxjs/pull/6) +- Add support for `rxjs@5.0.0-beta.12` [PR #6](https://github.com/kamilkisiela/apollo-client-rxjs/pull/6) ### v0.2.0 -- Added `subscribeToMore` function [PR #5](https://github.com/kamilkisiela/apollo-client-rxjs/pull/5) -- Added support for ApolloClient `v0.5.0` [PR #4](https://github.com/kamilkisiela/apollo-client-rxjs/pull/4) +- Add `subscribeToMore` function [PR #5](https://github.com/kamilkisiela/apollo-client-rxjs/pull/5) +- Add 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 -- Added `updateQuery` to `RxObservableQuery` [PR #2](https://github.com/kamilkisiela/apollo-client-rxjs/pull/2) +- Add `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 index 0b17c41..992ae7b 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,8 @@ "lodash": "^4.17.2" }, "peerDependencies": { - "apollo-client": "^0.5.1", - "rxjs": "^5.0.0-beta.12 || ^5.0.0-rc.1" + "apollo-client": "^0.6.0", + "rxjs": "^5.0.0-beta.12 || ^5.0.0-rc.1 || ^5.0.0" }, "devDependencies": { "@types/chai": "^3.4.32", @@ -51,20 +51,19 @@ "@types/mocha": "^2.2.31", "@types/node": "^6.0.38", "@types/sinon": "^1.16.29", - "apollo-client": "^0.5.1", + "apollo-client": "^0.6.0", "chai": "^3.5.0", - "graphql": "^0.7.2", + "graphql": "^0.8.0", "graphql-tag": "^0.1.15", "isomorphic-fetch": "^2.2.1", "istanbul": "^0.4.4", "mocha": "^3.1.2", "remap-istanbul": "^0.7.0", "rimraf": "^2.5.4", - "rxjs": "^5.0.0-rc.1", + "rxjs": "^5.0.0", "sinon": "^1.17.5", "source-map-support": "^0.4.5", "tslint": "^3.15.1", - "typed-graphql": "^1.0.2", "typescript": "^2.0.0" } } diff --git a/tests/fixtures/heroes.ts b/tests/fixtures/heroes.ts index 100e0a3..2da5e38 100644 --- a/tests/fixtures/heroes.ts +++ b/tests/fixtures/heroes.ts @@ -1,4 +1,4 @@ -import { Document } from 'graphql'; +import { DocumentNode } from 'graphql'; import { ApolloClient, ApolloQueryResult, ObservableQuery } from 'apollo-client'; import { RxObservableQuery } from '../../src/RxObservableQuery'; @@ -10,7 +10,7 @@ import mockNetworkInterface from '../mocks/mockNetworkInterface'; // data -export const query: Document = gql` +export const query: DocumentNode = gql` query heroes { allHeroes { heroes { @@ -25,7 +25,7 @@ export const data = { }, }; -export const queryWithVariables: Document = gql` +export const queryWithVariables: DocumentNode = gql` query heroes { allHeroes { heroes { diff --git a/tests/mocks/mockNetworkInterface.ts b/tests/mocks/mockNetworkInterface.ts index 2e53a18..3394ca6 100644 --- a/tests/mocks/mockNetworkInterface.ts +++ b/tests/mocks/mockNetworkInterface.ts @@ -6,8 +6,8 @@ import { } from 'apollo-client/transport/networkInterface'; import { - GraphQLResult, - Document, + ExecutionResult, + DocumentNode, } from 'graphql'; import { @@ -36,19 +36,19 @@ export function mockBatchedNetworkInterface( export interface ParsedRequest { variables?: Object; - query?: Document; + query?: DocumentNode; debugName?: string; } export interface MockedResponse { request: ParsedRequest; - result?: GraphQLResult; + result?: ExecutionResult; error?: Error; delay?: number; } export interface MockedSubscriptionResult { - result?: GraphQLResult; + result?: ExecutionResult; error?: Error; delay?: number; } @@ -185,8 +185,8 @@ export class MockSubscriptionNetworkInterface extends MockNetworkInterface imple export class MockBatchedNetworkInterface extends MockNetworkInterface implements BatchedNetworkInterface { - public batchQuery(requests: Request[]): Promise { - const resultPromises: Promise[] = []; + public batchQuery(requests: Request[]): Promise { + const resultPromises: Promise[] = []; requests.forEach((request) => { resultPromises.push(this.query(request)); }); diff --git a/tsconfig.json b/tsconfig.json index c653809..7b6d923 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,7 +12,6 @@ "noImplicitAny": false }, "files": [ - "typings.d.ts", "src/index.ts", "tests/index.ts" ] diff --git a/typings.d.ts b/typings.d.ts deleted file mode 100644 index f43cdb8..0000000 --- a/typings.d.ts +++ /dev/null @@ -1 +0,0 @@ -///