angular · vsavkin · Sep 11, 2015 · Sep 14, 2015 · Sep 14, 2015 · Sep 15, 2015
diff --git a/docs/typescript-definition-package/index.js b/docs/typescript-definition-package/index.js
@@ -50,7 +50,7 @@ module.exports = new Package('angular-v2-docs', [jsdocPackage, nunjucksPackage,
   createTypeDefinitionFile.typeDefinitions = [
     {
       id: 'angular2/angular2',
-      references: ['../es6-promise/es6-promise.d.ts', '../rx/rx.d.ts'],
+      references: ['../es6-promise/es6-promise.d.ts'],
       modules: {
         'angular2/angular2': {namespace: 'ng', id: 'angular2/angular2'},
         'angular2/web_worker/worker': {namespace: 'ngWorker', id: 'angular2/web_worker/worker'},

diff --git a/docs/typescript-package/processors/readTypeScriptModules.js b/docs/typescript-package/processors/readTypeScriptModules.js
@@ -359,8 +359,8 @@ module.exports = function readTypeScriptModules(tsParser, modules, getFileInfo,
   function getType(sourceFile, type) {
     var text = getText(sourceFile, type);
     while (text.indexOf(".") >= 0) {
-      // Keep namespaced symbols in Rx
-      if (text.match(/^\s*Rx\./)) break;
+      // Keep namespaced symbols in RxNext
+      if (text.match(/^\s*RxNext\./)) break;
       // handle the case List<thing.stuff> -> List<stuff>
       text = text.replace(/([^.<]*)\.([^>]*)/, "$2");
     }

diff --git a/gulpfile.js b/gulpfile.js
@@ -991,11 +991,14 @@ gulp.task('!build.js.cjs', function() {
 
 
 var bundleConfig = {
-  paths: {"*": "dist/js/prod/es5/*.js", "rx": "node_modules/rx/dist/rx.js"},
+  paths: {
+    "*": "dist/js/prod/es5/*.js",
+    "@reactivex/rxjs": "dist/js/prod/es5/@reactivex/Rx.js"
+  },
   meta: {
-    'angular2/src/router/route_definition': {format: 'cjs'},
-    // auto-detection fails to detect properly here - https://github.com/systemjs/builder/issues/123
-    'rx': {format: 'cjs'}
+    'angular2/src/router/route_definition': {
+      format: 'cjs'
+    }
   }
 };
 
@@ -1046,7 +1049,11 @@ gulp.task('!bundle.js.min', ['build.js.prod'], function() {
 // development build
 gulp.task('!bundle.js.dev', ['build.js.dev'], function() {
   var devBundleConfig = merge(true, bundleConfig);
-  devBundleConfig.paths = merge(true, devBundleConfig.paths, {"*": "dist/js/dev/es5/*.js"});
+  devBundleConfig.paths =
+      merge(true, devBundleConfig.paths, {
+       "*": "dist/js/dev/es5/*.js",
+       "@reactivex/rxjs": "dist/js/dev/es5/@reactivex/Rx.js"
+      });
   return bundler.bundle(
       devBundleConfig,
       'angular2/angular2',
@@ -1124,7 +1131,7 @@ gulp.task('!bundle.js.prod.deps', ['!bundle.js.prod'], function() {
       'angular2.js'
     ),
     bundler.modify(
-        ['node_modules/reflect-metadata/Reflect.js', 'node_modules/rx/dist/rx.lite.js', 'dist/build/http.js'],
+        ['node_modules/reflect-metadata/Reflect.js', 'dist/build/http.js'],
         'http.js'
     )).pipe(gulp.dest('dist/js/bundle'));
 });
@@ -1136,7 +1143,7 @@ gulp.task('!bundle.js.min.deps', ['!bundle.js.min'], function() {
       'angular2.min.js'
     ),
     bundler.modify(
-        ['node_modules/reflect-metadata/Reflect.js', 'node_modules/rx/dist/rx.lite.js','dist/build/http.min.js'],
+        ['node_modules/reflect-metadata/Reflect.js', 'dist/build/http.min.js'],
         'http.min.js'
     ))
     .pipe(uglify())
@@ -1153,9 +1160,9 @@ var JS_DEV_DEPS = [
 
 // Splice in RX license if rx is in the bundle.
 function insertRXLicense(source) {
-  var n = source.indexOf('System.register("rx"');
+  var n = source.indexOf('System.register("@reactivex/rxjs"');
   if (n >= 0) {
-    var rxLicense = licenseWrap('node_modules/rx/license.txt');
+    var rxLicense = licenseWrap('node_modules/@reactivex/rxjs/LICENSE.txt');
     return source.slice(0, n) + rxLicense + source.slice(n);
   } else {
     return source;

diff --git a/karma-js.conf.js b/karma-js.conf.js
@@ -21,7 +21,7 @@ module.exports = function(config) {
       // Including systemjs because it defines `__eval`, which produces correct stack traces.
       'modules/angular2/src/test_lib/shims_for_IE.js',
       'node_modules/systemjs/dist/system.src.js',
-      {pattern: 'node_modules/rx/dist/rx.js', included: false, watched: false, served: true},
+      {pattern: 'node_modules/@reactivex/rxjs/dist/cjs/**', included: false, watched: false, served: true},
       'node_modules/reflect-metadata/Reflect.js',
       'tools/build/file2modulename.js',
       'test-main.js',

diff --git a/modules/angular2/manual_typings/globals.d.ts b/modules/angular2/manual_typings/globals.d.ts
@@ -5,6 +5,27 @@
 /// <reference path="../typings/zone/zone.d.ts"/>
 declare var assert: any;
 
+// TODO: Replace with a real d.ts file
+declare module '@reactivex/rxjs' {
+  class Subject<T> {
+    subscribe(a, b, c): any;
+    next(a): any;
+    error(a): any;
+    complete(): any;
+  }
+
+  class Observable<T> {
+    subscribe(a, b, c): any;
+  }
+
+
+  class Subscription<T> {
+    isUnsubscribed: boolean;
+    unsubscribe(): void;
+  }
+}
+
+
 // FIXME: K must be string!
 // FIXME: should have an index signature, `[k: string]: V;`
 interface StringMap<K extends string, V> {}

diff --git a/modules/angular2/package.json b/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) %>,

diff --git a/modules/angular2/src/core/facade/async.ts b/modules/angular2/src/core/facade/async.ts
@@ -1,6 +1,6 @@
 ///<reference path="../../../typings/tsd.d.ts" />
 import {global, isPresent} from 'angular2/src/core/facade/lang';
-import * as Rx from 'rx';
+import * as RxNext from '@reactivex/rxjs';
 
 export {Promise};
 
@@ -75,7 +75,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 +128,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;
-
-  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);
+  _subject: RxNext.Subject<any> = new RxNext.Subject<any>();
+
+  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(); }
 }
diff --git a/modules/angular2/src/http/interfaces.ts b/modules/angular2/src/http/interfaces.ts
@@ -1,5 +1,3 @@
-/// <reference path="../../typings/rx/rx.d.ts" />
-
 import {
   ReadyStates,
   RequestModesOpts,

diff --git a/modules/angular2/src/http/package.json b/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'] %>"
   },

diff --git a/modules/angular2/test/web_workers/shared/mock_event_emitter.ts b/modules/angular2/test/web_workers/shared/mock_event_emitter.ts
@@ -1,13 +1,13 @@
 import {EventEmitter} from 'angular2/src/core/facade/async';
-import * as Rx from 'rx';
+import * as RxNext from '@reactivex/rxjs';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 
 export class MockEventEmitter extends EventEmitter {
   private _nextFns: Function[] = [];
 
   constructor() { super(); }
 
-  observer(generator: any): Rx.IDisposable {
+  observer(generator: any): RxNext.Subscription<any> {
     this._nextFns.push(generator.next);
     return new MockDisposable();
   }
@@ -17,6 +17,7 @@ export class MockEventEmitter extends EventEmitter {
   }
 }
 
-class MockDisposable implements Rx.IDisposable {
-  dispose(): void {}
+class MockDisposable implements RxNext.Subscription<any> {
+  isUnsubscribed: boolean = false;
+  unsubscribe(): void {}
 }
diff --git a/modules/angular2/tsd.json b/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"

diff --git a/modules/angular2_material/package.json b/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) %>