From dbd96f369d1de44d9086fde4700a25fea74753ca Mon Sep 17 00:00:00 2001 From: Hugh Willson Date: Tue, 29 May 2018 16:57:12 -0400 Subject: [PATCH] Remove `rxjs-compat` use While merging in https://github.com/apollographql/apollo-client/pull/3500 we encountered `rxjs` `from` issues in some of the tests. I added `rxjs-compat` to work around these issues, but this shouldn't be needed. This commit aims to revert the `rxjs-compat` changes, to see if the CI gods will now be appeased. --- packages/apollo-client/package.json | 1 - packages/apollo-client/src/core/__tests__/QueryManager/index.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/apollo-client/package.json b/packages/apollo-client/package.json index 564e311b825..aa2c379717d 100644 --- a/packages/apollo-client/package.json +++ b/packages/apollo-client/package.json @@ -79,7 +79,6 @@ "lodash": "4.17.10", "rollup": "0.59.4", "rxjs": "6.2.0", - "rxjs-compat": "^6.2.0", "ts-jest": "20.0.14", "tslint": "5.10.0", "typescript": "2.8.3", diff --git a/packages/apollo-client/src/core/__tests__/QueryManager/index.ts b/packages/apollo-client/src/core/__tests__/QueryManager/index.ts index 89a47e70649..7229a29bf4d 100644 --- a/packages/apollo-client/src/core/__tests__/QueryManager/index.ts +++ b/packages/apollo-client/src/core/__tests__/QueryManager/index.ts @@ -1,5 +1,5 @@ // externals -import { from } from 'rxjs/observable/from'; +import { from } from 'rxjs'; import { map } from 'rxjs/operators'; import { assign } from 'lodash'; import gql from 'graphql-tag';