diff --git a/modules/angular2/src/facade/lang.ts b/modules/angular2/src/facade/lang.ts index 6166d537b2..a026d0fd26 100644 --- a/modules/angular2/src/facade/lang.ts +++ b/modules/angular2/src/facade/lang.ts @@ -451,7 +451,7 @@ declare var Symbol; var _symbolIterator = null; export function getSymbolIterator(): string | symbol { if (isBlank(_symbolIterator)) { - if (isPresent(Symbol) && isPresent(Symbol.iterator)) { + if (isPresent((globalScope).Symbol) && isPresent(Symbol.iterator)) { _symbolIterator = Symbol.iterator; } else { // es6-shim specific logic diff --git a/modules/angular2/src/http/backends/jsonp_backend.ts b/modules/angular2/src/http/backends/jsonp_backend.ts index ddbe69eba2..008d662d47 100644 --- 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) => { + this.response = new Observable((responseObserver: Observer) => { 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 index 91021359b2..14fbd9d419 100644 --- 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 index e545abc5d5..e0ae05ed00 100644 --- 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) => { + this.response = new Observable((responseObserver: Observer) => { 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 index 60e88f8f34..7b7e99cf96 100644 --- 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 index 741ac10f1d..31b5385226 100644 --- a/npm-shrinkwrap.clean.json +++ b/npm-shrinkwrap.clean.json @@ -4602,12 +4602,7 @@ } }, "rc": { - "version": "1.1.6", - "dependencies": { - "minimist": { - "version": "1.2.0" - } - } + "version": "1.1.6" }, "rcfinder": { "version": "0.1.8", @@ -4807,7 +4802,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 +4865,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 index c4ab00d955..5404ff5f4c 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -7336,14 +7336,7 @@ "rc": { "version": "1.1.6", "from": "rc@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz", - "dependencies": { - "minimist": { - "version": "1.2.0", - "from": "minimist@>=1.2.0 <2.0.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" - } - } + "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz" }, "rcfinder": { "version": "0.1.8", @@ -7665,9 +7658,9 @@ "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-1.1.5.tgz" }, "rxjs": { - "version": "5.0.0-beta.2", - "from": "rxjs@5.0.0-beta.2", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.0.0-beta.2.tgz" + "version": "5.0.0-beta.6", + "from": "rxjs@5.0.0-beta.6", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.0.0-beta.6.tgz" }, "sass-graph": { "version": "2.0.1", @@ -7768,14 +7761,7 @@ "semver-diff": { "version": "2.1.0", "from": "semver-diff@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz", - "dependencies": { - "semver": { - "version": "5.1.0", - "from": "semver@>=5.0.3 <6.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz" - } - } + "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz" }, "semver-utils": { "version": "1.1.1", diff --git a/package.json b/package.json index 6cdb9843ae..a928443efd 100644 --- 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.12" }, "devDependencies": {