refactor(async): replace RxJS with RxNext

Closes #3110
Closes #4201

modules/angular2/package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "traceur": "<%= packageJson.dependencies.traceur %>",
     "reflect-metadata": "<%= packageJson.dependencies['reflect-metadata'] %>",
-    "rx": "<%= packageJson.dependencies['rx'] %>",
+    "@reactivex/rxjs": "<%= packageJson.dependencies['@reactivex/rxjs'] %>",
     "zone.js": "<%= packageJson.dependencies['zone.js'] %>"
   },
   "devDependencies": <%= JSON.stringify(packageJson.defaultDevDependencies) %>,

modules/angular2/src/core/facade/async.ts

@@ -1,6 +1,7 @@
 ///<reference path="../../../typings/tsd.d.ts" />
 import {global, isPresent} from 'angular2/src/core/facade/lang';
-import * as Rx from 'rx';
+// TODO(jeffbcross): use ES6 import once typings are available
+var Subject = require('@reactivex/rxjs/dist/cjs/Subject');
 
 export {Promise};
 
@@ -75,7 +76,7 @@ export class ObservableWrapper {
 
   static isObservable(obs: any): boolean { return obs instanceof Observable; }
 
-  static dispose(subscription: any) { subscription.dispose(); }
+  static dispose(subscription: any) { subscription.unsubscribe(); }
 
   static callNext(emitter: EventEmitter, value: any) { emitter.next(value); }
 
@@ -128,30 +129,19 @@ export class Observable {
  * Once a reference implementation of the spec is available, switch to it.
  */
 export class EventEmitter extends Observable {
-  _subject: Rx.Subject<any> = new Rx.Subject<any>();
-  _immediateScheduler = (<any>Rx.Scheduler).immediate;
+  _subject = new Subject();
 
-  observer(generator: any): Rx.IDisposable {
-    return this._subject.observeOn(this._immediateScheduler)
-        .subscribe((value) => { setTimeout(() => generator.next(value)); },
-                   (error) => generator.throw ? generator.throw(error) : null,
-                   () => generator.return ? generator.return () : null);
+  observer(generator: any): any {
+    return this._subject.subscribe((value) => { setTimeout(() => generator.next(value)); },
+                                   (error) => generator.throw ? generator.throw(error) : null,
+                                   () => generator.return ? generator.return () : null);
   }
 
-  toRx(): Rx.Observable<any> { return this._subject; }
+  toRx(): any { return this; }
 
-  /**
-   * Emits a `value`.
-   */
-  next(value: any) { this._subject.onNext(value); }
+  next(value: any) { this._subject.next(value); }
 
-  /**
-   * Emits an `error`.
-   */
-  throw(error: any) { this._subject.onError(error); }
+  throw(error: any) { this._subject.error(error); }
 
-  /**
-   * Closes the stream.
-   */
-  return (value?: any) { this._subject.onCompleted(); }
+  return (value?: any) { this._subject.complete(); }
 }

modules/angular2/src/http/interfaces.ts

@@ -1,5 +1,3 @@
-/// <reference path="../../typings/rx/rx.d.ts" />
-
 import {
   ReadyStates,
   RequestModesOpts,

modules/angular2/src/http/package.json

@@ -9,7 +9,7 @@
   "repository": <%= JSON.stringify(packageJson.repository) %>,
   "dependencies": {
     "angular2": "<%= packageJson.version %>",
-    "rx": "<%= packageJson.dependencies['rx'] %>",
+    "@reactivex/rxjs": "<%= packageJson.dependencies['@reactivex/rxjs'] %>",
     "reflect-metadata": "<%= packageJson.dependencies['reflect-metadata'] %>",
     "traceur": "<%= packageJson.dependencies['traceur'] %>"
   },

modules/angular2/test/web_workers/shared/mock_event_emitter.ts

@@ -1,5 +1,4 @@
 import {EventEmitter} from 'angular2/src/core/facade/async';
-import * as Rx from 'rx';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 
 export class MockEventEmitter extends EventEmitter {
@@ -7,7 +6,7 @@ export class MockEventEmitter extends EventEmitter {
 
   constructor() { super(); }
 
-  observer(generator: any): Rx.IDisposable {
+  observer(generator: any): any {
     this._nextFns.push(generator.next);
     return new MockDisposable();
   }
@@ -17,6 +16,7 @@ export class MockEventEmitter extends EventEmitter {
   }
 }
 
-class MockDisposable implements Rx.IDisposable {
-  dispose(): void {}
+class MockDisposable {
+  isUnsubscribed: boolean = false;
+  unsubscribe(): void {}
 }

modules/angular2/tsd.json

@@ -17,14 +17,6 @@
     "node/node.d.ts": {
       "commit": "51738fdf1643d269067861b405e87503b7479236"
     },
-    "rx/rx.d.ts": {
-      "commit": "3882d337bb0808cde9fe4c08012508a48c135482"
-    },
-
-    "rx/rx-lite.d.ts": {
-      "commit": "3882d337bb0808cde9fe4c08012508a48c135482"
-    },
-
 
     "selenium-webdriver/selenium-webdriver.d.ts": {
       "commit": "be0b6b394f77a59e192ad7cfec18078706e44db5"

modules/angular2_material/package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "angular2": "<%= packageJson.version %>",
     "traceur": "<%= packageJson.dependencies.traceur %>",
-    "rx": "<%= packageJson.dependencies['rx'] %>",
+    "@reactivex/rxjs": "<%= packageJson.dependencies['@reactivex/rxjs'] %>",
     "zone.js": "<%= packageJson.dependencies['zone.js'] %>"
   },
   "devDependencies": <%= JSON.stringify(packageJson.defaultDevDependencies) %>

modules/examples/src/http/index.ts

@@ -1,5 +1,3 @@
-/// <reference path="../../../angular2/typings/rx/rx.d.ts" />
-
 import {bootstrap} from 'angular2/bootstrap';
 import {HTTP_BINDINGS} from 'angular2/http';
 import {HttpCmp} from './http_comp';

modules/examples/src/jsonp/index.ts

@@ -1,5 +1,3 @@
-/// <reference path="../../../angular2/typings/rx/rx.d.ts" />
-
 import {bootstrap} from 'angular2/bootstrap';
 import {JSONP_BINDINGS} from 'angular2/http';
 import {JsonpCmp} from './jsonp_comp';

modules/examples/src/web_workers/images/loader.js

@@ -4,10 +4,7 @@ importScripts("b64.js");
 
 System.config({
   baseURL: '/',
-  defaultJSExtensions: true,
-  paths: {
-    'rx': 'examples/src/web_workers/images/rx.js'
-  }
+  defaultJSExtensions: true
 });
 
 System.import("examples/src/web_workers/images/background_index")

modules/examples/src/web_workers/kitchen_sink/loader.js

@@ -2,10 +2,7 @@ $SCRIPTS$
 
 System.config({
   baseURL: '/',
-  defaultJSExtensions: true,
-  paths: {
-    'rx': 'examples/src/web_workers/kitchen_sink/rx.js'
-  }
+  defaultJSExtensions: true
 });
 
 System.import("examples/src/web_workers/kitchen_sink/background_index")

modules/examples/src/web_workers/message_broker/loader.js

@@ -1,10 +1,9 @@
 $SCRIPTS$
 
-    System.config({
-      baseURL: '/',
-      defaultJSExtensions: true,
-      paths: {'rx': 'examples/src/web_workers/message_broker/rx.js'}
-    });
+System.config({
+  baseURL: '/',
+  defaultJSExtensions: true
+});
 
 System.import("examples/src/web_workers/message_broker/background_index")
     .then(

modules/examples/src/web_workers/todo/loader.js

@@ -2,10 +2,7 @@ $SCRIPTS$
 
 System.config({
   baseURL: '/',
-  defaultJSExtensions: true,
-  paths: {
-    'rx': 'examples/src/web_workers/todo/rx.js'
-  }
+  defaultJSExtensions: true
 });
 
 System.import("examples/src/web_workers/todo/background_index")