build(npm): update rxjs to 2.0.0-beta.6

Closes angular#6871
jeffbcross · Apr 13, 2016 · c6c2e70 · c6c2e70
1 parent cf085dd
commit c6c2e70
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 46 deletions.
diff --git a/modules/angular2/src/http/backends/jsonp_backend.ts b/modules/angular2/src/http/backends/jsonp_backend.ts
@@ -52,7 +52,7 @@ export class JSONPConnection_ extends JSONPConnection {
       throw makeTypeError(JSONP_ERR_WRONG_METHOD);
     }
     this.request = req;
-    this.response = new Observable((responseObserver: Observer<Response>) => {
+    this.response = new Observable<Response>((responseObserver: Observer<Response>) => {
 
       this.readyState = ReadyState.Loading;
       let id = this._id = _dom.nextRequestID();

diff --git a/modules/angular2/src/http/backends/mock_backend.ts b/modules/angular2/src/http/backends/mock_backend.ts
@@ -6,7 +6,7 @@ import {Connection, ConnectionBackend} from '../interfaces';
 import {isPresent} from 'angular2/src/facade/lang';
 import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
 import {Subject} from 'rxjs/Subject';
-import {ReplaySubject} from 'rxjs/subject/ReplaySubject';
+import {ReplaySubject} from 'rxjs/ReplaySubject';
 import {take} from 'rxjs/operator/take';
 
 /**

diff --git a/modules/angular2/src/http/backends/xhr_backend.ts b/modules/angular2/src/http/backends/xhr_backend.ts
@@ -29,7 +29,7 @@ export class XHRConnection implements Connection {
   readyState: ReadyState;
   constructor(req: Request, browserXHR: BrowserXhr, baseResponseOptions?: ResponseOptions) {
     this.request = req;
-    this.response = new Observable((responseObserver: Observer<Response>) => {
+    this.response = new Observable<Response>((responseObserver: Observer<Response>) => {
       let _xhr: XMLHttpRequest = browserXHR.build();
       _xhr.open(RequestMethod[req.method].toUpperCase(), req.url);
       // load event handler

diff --git a/modules/angular2/test/http/backends/mock_backend_spec.ts b/modules/angular2/test/http/backends/mock_backend_spec.ts
@@ -22,7 +22,7 @@ import {Map} from 'angular2/src/facade/collection';
 import {RequestOptions, BaseRequestOptions} from 'angular2/src/http/base_request_options';
 import {BaseResponseOptions, ResponseOptions} from 'angular2/src/http/base_response_options';
 import {ResponseType} from 'angular2/src/http/enums';
-import {ReplaySubject} from 'rxjs/subject/ReplaySubject';
+import {ReplaySubject} from 'rxjs/ReplaySubject';
 
 export function main() {
   describe('MockBackend', () => {

diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
@@ -2231,9 +2231,6 @@
         "glob": {
           "version": "4.3.5",
           "dependencies": {
-            "inflight": {
-              "version": "1.0.4"
-            },
             "minimatch": {
               "version": "2.0.10"
             }
@@ -4602,12 +4599,7 @@
       }
     },
     "rc": {
-      "version": "1.1.6",
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0"
-        }
-      }
+      "version": "1.1.6"
     },
     "rcfinder": {
       "version": "0.1.8",
@@ -4807,7 +4799,7 @@
       "version": "1.1.5"
     },
     "rxjs": {
-      "version": "5.0.0-beta.2"
+      "version": "5.0.0-beta.6"
     },
     "sass-graph": {
       "version": "2.0.1",
@@ -4870,12 +4862,7 @@
       "version": "5.1.0"
     },
     "semver-diff": {
-      "version": "2.1.0",
-      "dependencies": {
-        "semver": {
-          "version": "5.1.0"
-        }
-      }
+      "version": "2.1.0"
     },
     "semver-utils": {
       "version": "1.1.1"

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
   "dependencies": {
     "es6-shim": "^0.35.0",
     "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.2",
+    "rxjs": "5.0.0-beta.6",
     "zone.js": "^0.6.10"
   },
   "devDependencies": {