From 0378e55fabcaa519b27966f6e7d05db66db22b0a Mon Sep 17 00:00:00 2001 From: Rob Wormald Date: Tue, 27 Oct 2015 19:17:58 -0700 Subject: [PATCH] chore(package): update RxJS version --- modules/angular2/src/core/facade/async.ts | 3 +-- modules/angular2/test/public_api_spec.ts | 1 + npm-shrinkwrap.clean.json | 2 +- npm-shrinkwrap.json | 6 +++--- package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/angular2/src/core/facade/async.ts b/modules/angular2/src/core/facade/async.ts index 107e4162b3..4c949484a2 100644 --- a/modules/angular2/src/core/facade/async.ts +++ b/modules/angular2/src/core/facade/async.ts @@ -4,6 +4,7 @@ import {global, isPresent} from 'angular2/src/core/facade/lang'; import {PromiseWrapper, Promise, PromiseCompleter} from 'angular2/src/core/facade/promise'; export {PromiseWrapper, Promise, PromiseCompleter} from 'angular2/src/core/facade/promise'; import {Subject, Subscription, Observable as RxObservable} from '@reactivex/rxjs/dist/cjs/Rx'; +export {Subject} from '@reactivex/rxjs/dist/cjs/Rx'; import Operator from '@reactivex/rxjs/dist/cjs/Operator'; export namespace NodeJS { @@ -125,5 +126,3 @@ export class Observable extends RxObservable { return observable; } } - -export {Subject} diff --git a/modules/angular2/test/public_api_spec.ts b/modules/angular2/test/public_api_spec.ts index 37d20be3c6..58f0062369 100644 --- a/modules/angular2/test/public_api_spec.ts +++ b/modules/angular2/test/public_api_spec.ts @@ -699,6 +699,7 @@ var NG_API = [ 'Subject.sampleTime():js', 'Subject.scan():js', 'Subject.share():js', + 'Subject.shareBehavior():js', 'Subject.shareReplay():js', 'Subject.single():js', 'Subject.skip():js', diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json index cf66cc82bd..420da89b59 100644 --- a/npm-shrinkwrap.clean.json +++ b/npm-shrinkwrap.clean.json @@ -1,7 +1,7 @@ { "dependencies": { "@reactivex/rxjs": { - "version": "5.0.0-alpha.6" + "version": "5.0.0-alpha.7" }, "angular": { "version": "1.4.7" diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 30806e5996..749443ed2f 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -3,9 +3,9 @@ "version": "2.0.0-alpha.44", "dependencies": { "@reactivex/rxjs": { - "version": "5.0.0-alpha.6", - "from": "@reactivex/rxjs@5.0.0-alpha.6", - "resolved": "http://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.0.0-alpha.6.tgz" + "version": "5.0.0-alpha.7", + "from": "http://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.0.0-alpha.7.tgz", + "resolved": "http://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.0.0-alpha.7.tgz" }, "angular": { "version": "1.4.7", diff --git a/package.json b/package.json index e23631316c..dd76afe2d4 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "test": "gulp test.all.js && gulp test.all.dart" }, "dependencies": { - "@reactivex/rxjs": "5.0.0-alpha.6", + "@reactivex/rxjs": "5.0.0-alpha.7", "reflect-metadata": "0.1.2", "zone.js": "0.5.8" },