Skip to content

chore(deps): update RxJS #10648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kara merged 1 commit into from
Aug 23, 2016
Merged

chore(deps): update RxJS #10648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/@angular/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"author": "angular",
"license": "MIT",
"peerDependencies": {
"rxjs": "5.0.0-beta.6",
"rxjs": "5.0.0-beta.11",
"zone.js": "^0.6.6"
},
"repository": {
Expand Down
16 changes: 16 additions & 0 deletions modules/@angular/core/testing/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

export * from './async';
export * from './component_fixture';
export * from './fake_async';
export * from './test_bed';
export * from './testing';
export * from './metadata_override';

export * from '../private_export_testing';
3 changes: 2 additions & 1 deletion modules/@angular/examples/core/pipes/ts/async_pipe/async_pipe_example.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
import {Component, NgModule} from '@angular/core';
import {BrowserModule} from '@angular/platform-browser';
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
import {Observable, Subscriber} from 'rxjs/Rx';
import {Observable} from 'rxjs/Observable';
import {Subscriber} from 'rxjs/Subscriber';

// #docregion AsyncPipePromise
@Component({
Expand Down
4 changes: 3 additions & 1 deletion modules/@angular/examples/facade/ts/async/observable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
*/

// #docregion Observable
import {Observable, Subscriber} from 'rxjs/Rx';
import {Observable} from 'rxjs/Observable';
import {Subscriber} from 'rxjs/Subscriber';

var obs = new Observable<number>((obs: Subscriber<number>) => {
var i = 0;
setInterval(() => { obs.next(++i); }, 1000);
Expand Down
3 changes: 2 additions & 1 deletion modules/@angular/examples/facade/ts/async/observable_patched.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
// #docregion Observable
import 'rxjs/add/operator/map';

import {Observable, Subscriber} from 'rxjs/Rx';
import {Observable} from 'rxjs/Observable';
import {Subscriber} from 'rxjs/Subscriber';

var obs = new Observable<number>((obs: Subscriber<any>) => {
var i = 0;
Expand Down
3 changes: 2 additions & 1 deletion modules/@angular/examples/facade/ts/async/observable_pure.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
*/

// #docregion Observable
import {Observable, Subscriber} from 'rxjs/Rx';
import {Observable} from 'rxjs/Observable';
import {Subscriber} from 'rxjs/Subscriber';
import {map} from 'rxjs/operator/map';

var obs = new Observable<number>((sub: Subscriber<number>) => {
Expand Down
2 changes: 1 addition & 1 deletion modules/@angular/http/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"author": "angular",
"license": "MIT",
"peerDependencies": {
"rxjs": "5.0.0-beta.6",
"rxjs": "5.0.0-beta.11",
"@angular/core": "0.0.0-PLACEHOLDER",
"@angular/platform-browser": "0.0.0-PLACEHOLDER"
},
Expand Down
2 changes: 1 addition & 1 deletion modules/@angular/router/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@angular/common": "0.0.0-PLACEHOLDER",
"@angular/platform-browser": "0.0.0-PLACEHOLDER",
"@angular/platform-browser-dynamic": "0.0.0-PLACEHOLDER",
"rxjs": "5.0.0-beta.6"
"rxjs": "5.0.0-beta.11"
},
"typings": "index.d.ts"
}
21 changes: 12 additions & 9 deletions modules/playground/src/bootstrap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
writeScriptTag('/all/playground/vendor/zone.js');
writeScriptTag('/all/playground/vendor/long-stack-trace-zone.js');
writeScriptTag('/all/playground/vendor/system.src.js');
writeScriptTag('/all/playground/vendor/Reflect.js');
writeScriptTag('/all/playground/vendor/rxjs/bundles/Rx.js', 'playgroundBootstrap()');
writeScriptTag('/all/playground/vendor/Reflect.js', 'playgroundBootstrap()');

(<any>global).playgroundBootstrap = playgroundBootstrap;

function playgroundBootstrap() {
Expand All @@ -36,19 +36,24 @@
'@angular/upgrade': '/packages-dist/upgrade/bundles/upgrade.umd.js',
'@angular/router': '/packages-dist/router/bundles/router.umd.js',
'@angular/core/src/facade': '/all/@angular/core/src/facade',
'rxjs': location.pathname.replace(/\w+\.html$/i, '') + 'rxjs'
'rxjs': '/all/playground/vendor/rxjs'
},
packages: {
'app': {defaultExtension: 'js'},
'@angular/core/src/facade': {defaultExtension: 'js'}
'@angular/core/src/facade': {defaultExtension: 'js'},
'rxjs': {defaultExtension: 'js'}
}
});
} else {
console.warn(
'Not using the Angular bundles. Don\'t use this configuration for e2e/performance tests!');

System.config({
map: {'index': 'index.js', '@angular': '/all/@angular'},
map: {
'index': 'index.js',
'@angular': '/all/@angular',
'rxjs': '/all/playground/vendor/rxjs'
},
packages: {
'app': {defaultExtension: 'js'},
'@angular/core': {main: 'index.js', defaultExtension: 'js'},
Expand All @@ -58,10 +63,8 @@
'@angular/forms': {main: 'index.js', defaultExtension: 'js'},
'@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'},
'@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'},
'@angular/upgrade': {main: 'index.js', defaultExtension: 'js'}
// 'rxjs': {
// defaultExtension: 'js'
// }
'@angular/upgrade': {main: 'index.js', defaultExtension: 'js'},
'rxjs': {defaultExtension: 'js'}
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion modules/rollup-test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"rollup-plugin-node-resolve": "^1.5.0",
"rollup-plugin-typescript": "^0.7.3",
"rollup-plugin-uglify": "^0.3.1",
"rxjs-es": "^5.0.0-beta.6",
"rxjs-es": "^5.0.0-beta.11",
"typescript": "^1.9.0-dev.20160423",
"uglify-js": "^2.6.2"
},
Expand Down
8 changes: 4 additions & 4 deletions npm-shrinkwrap.clean.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1599,9 +1599,6 @@
"buffers": {
"version": "0.1.1"
},
"bufferutil": {
"version": "1.2.1"
},
"builtin-modules": {
"version": "1.1.1"
},
Expand Down Expand Up @@ -4807,7 +4804,7 @@
"version": "1.1.5"
},
"rxjs": {
"version": "5.0.0-beta.6"
"version": "5.0.0-beta.11"
},
"sass-graph": {
"version": "2.0.1",
Expand Down Expand Up @@ -5127,6 +5124,9 @@
"supports-color": {
"version": "0.2.0"
},
"symbol-observable": {
"version": "1.0.2"

@IgorMinar IgorMinar Aug 16, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need this?

@robwormald robwormald Aug 16, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it comes from RxJS.

},
"symlink-or-copy": {
"version": "1.0.1"
},
Expand Down
16 changes: 8 additions & 8 deletions npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"dependencies": {
"es6-shim": "^0.35.0",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6",
"rxjs": "5.0.0-beta.11",
"zone.js": "^0.6.17"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion tools/typings-test/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ cp -R -v tools/typings-test/* $TMP
# create package.json so that npm install doesn't pollute any parent node_modules's directory
npm init --yes
npm install ${LINKABLE_PKGS[*]}
npm install @types/es6-promise @types/es6-collections @types/jasmine rxjs@5.0.0-beta.6
npm install @types/es6-promise @types/es6-collections @types/jasmine rxjs@5.0.0-beta.11
npm install typescript@1.8.10
$(npm bin)/tsc --version
$(npm bin)/tsc -p tsconfig.json
Expand Down