feat: tree-shaking with apollo-client and apollo-client-rxjs

Author: kamilkisiela

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ### vNEXT
 
-- Support `es6` modules and `tree-shaking` ([PR #151](https://github.com/apollostack/angular2-apollo/pull/151))
+- Support `es6` modules and `tree-shaking` ([PR #151](https://github.com/apollostack/angular2-apollo/pull/151), [PR #206](https://github.com/apollostack/angular2-apollo/pull/206))
 - Make our `Ahead-of-Time` compilation compatible with Angular 2.3.0 ([PR #189](https://github.com/apollostack/angular2-apollo/pull/189), [PR #195](https://github.com/apollostack/angular2-apollo/pull/195))
 
 ### v0.8.0

package.json

@@ -32,11 +32,11 @@
   },
   "peerDependencies": {
     "@angular/core": "^2.0.0",
-    "apollo-client": "^0.5.1",
+    "apollo-client": "^0.5.25",
     "rxjs": "^5.0.0-beta.12 || ^5.0.0-rc.1"
   },
   "dependencies": {
-    "apollo-client-rxjs": "~0.2.3"
+    "apollo-client-rxjs": "~0.2.5"
   },
   "devDependencies": {
     "@angular/common": "^2.3.1",
@@ -51,7 +51,7 @@
     "@types/jest": "^15.1.32",
     "@types/lodash": "^4.14.34",
     "@types/node": "^6.0.38",
-    "apollo-client": "^0.5.1",
+    "apollo-client": "^0.5.25",
     "ghooks": "^1.3.2",
     "graphql-tag": "^1.0.0",
     "jest": "^17.0.0",

rollup.config.js

@@ -5,6 +5,10 @@ export default {
   moduleName: 'ng.apollo',
   globals: {
     '@angular/core': 'ng.core',
-    'rxjs/Observable': 'Rx'
+    'rxjs/Observable': 'Rx',
+    'rxjs/observable/from': 'Rx.Observable',
+    'rxjs/observable/fromPromise': 'Rx.Observable',
+    'apollo-client-rxjs': 'apollo.rxjs',
+    'apollo-client': 'apollo',
   }
 }

src/Angular2Apollo.ts

@@ -2,13 +2,12 @@ import { OpaqueToken, Injectable, Inject } from '@angular/core';
 import { rxify } from 'apollo-client-rxjs';
 import { ApolloClient, ApolloQueryResult, WatchQueryOptions, MutationOptions, SubscriptionOptions } from 'apollo-client';
 import { Observable } from 'rxjs/Observable';
+import { from } from 'rxjs/observable/from';
+import { fromPromise } from 'rxjs/observable/fromPromise';
 import { FragmentDefinition } from 'graphql';
 
 import { ApolloQueryObservable } from './ApolloQueryObservable';
 
-import 'rxjs/add/observable/from';
-import 'rxjs/add/observable/fromPromise';
-
 export interface DeprecatedWatchQueryOptions extends WatchQueryOptions {
   fragments?: FragmentDefinition[];
 }
@@ -27,18 +26,18 @@ export class Angular2Apollo {
   }
 
   public query(options: DeprecatedWatchQueryOptions): Observable<ApolloQueryResult> {
-    return Observable.fromPromise(this.client.query(options));
+    return fromPromise(this.client.query(options));
   }
 
   public mutate(options: MutationOptions): Observable<ApolloQueryResult> {
-    return Observable.fromPromise(this.client.mutate(options));
+    return fromPromise(this.client.mutate(options));
   }
 
   public subscribe(options: SubscriptionOptions): Observable<any> {
     if (typeof this.client.subscribe === 'undefined') {
       throw new Error(`Your version of ApolloClient doesn't support subscriptions`);
     }
 
-    return Observable.from(this.client.subscribe(options));
+    return from(this.client.subscribe(options));
   }
 }