Skip to content

Commit ca41b4f

Browse files
robwormaldkara
robwormald
authored and
kara
committed
feature(core): update RxJS to 5.0.0-beta.11 (angular#10648)
1 parent 3c56147 commit ca41b4f

14 files changed

Lines changed: 55 additions & 31 deletions

File tree

‎modules/@angular/core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"author": "angular",
99
"license": "MIT",
1010
"peerDependencies": {
11-
"rxjs": "5.0.0-beta.6",
11+
"rxjs": "5.0.0-beta.11",
1212
"zone.js": "^0.6.6"
1313
},
1414
"repository": {

‎modules/@angular/core/testing/index.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/**
2+
* @license
3+
* Copyright Google Inc. All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
9+
export * from './async';
10+
export * from './component_fixture';
11+
export * from './fake_async';
12+
export * from './test_bed';
13+
export * from './testing';
14+
export * from './metadata_override';
15+
16+
export * from '../private_export_testing';

‎modules/@angular/examples/core/pipes/ts/async_pipe/async_pipe_example.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
import {Component, NgModule} from '@angular/core';
1010
import {BrowserModule} from '@angular/platform-browser';
1111
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
12-
import {Observable, Subscriber} from 'rxjs/Rx';
12+
import {Observable} from 'rxjs/Observable';
13+
import {Subscriber} from 'rxjs/Subscriber';
1314

1415
// #docregion AsyncPipePromise
1516
@Component({

‎modules/@angular/examples/facade/ts/async/observable.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
*/
88

99
// #docregion Observable
10-
import {Observable, Subscriber} from 'rxjs/Rx';
10+
import {Observable} from 'rxjs/Observable';
11+
import {Subscriber} from 'rxjs/Subscriber';
12+
1113
var obs = new Observable<number>((obs: Subscriber<number>) => {
1214
var i = 0;
1315
setInterval(() => { obs.next(++i); }, 1000);

‎modules/@angular/examples/facade/ts/async/observable_patched.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
// #docregion Observable
1010
import 'rxjs/add/operator/map';
1111

12-
import {Observable, Subscriber} from 'rxjs/Rx';
12+
import {Observable} from 'rxjs/Observable';
13+
import {Subscriber} from 'rxjs/Subscriber';
1314

1415
var obs = new Observable<number>((obs: Subscriber<any>) => {
1516
var i = 0;

‎modules/@angular/examples/facade/ts/async/observable_pure.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
*/
88

99
// #docregion Observable
10-
import {Observable, Subscriber} from 'rxjs/Rx';
10+
import {Observable} from 'rxjs/Observable';
11+
import {Subscriber} from 'rxjs/Subscriber';
1112
import {map} from 'rxjs/operator/map';
1213

1314
var obs = new Observable<number>((sub: Subscriber<number>) => {

‎modules/@angular/http/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"author": "angular",
99
"license": "MIT",
1010
"peerDependencies": {
11-
"rxjs": "5.0.0-beta.6",
11+
"rxjs": "5.0.0-beta.11",
1212
"@angular/core": "0.0.0-PLACEHOLDER",
1313
"@angular/platform-browser": "0.0.0-PLACEHOLDER"
1414
},

‎modules/@angular/router/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@angular/common": "0.0.0-PLACEHOLDER",
2626
"@angular/platform-browser": "0.0.0-PLACEHOLDER",
2727
"@angular/platform-browser-dynamic": "0.0.0-PLACEHOLDER",
28-
"rxjs": "5.0.0-beta.6"
28+
"rxjs": "5.0.0-beta.11"
2929
},
3030
"typings": "index.d.ts"
3131
}

‎modules/playground/src/bootstrap.ts‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
writeScriptTag('/all/playground/vendor/zone.js');
1414
writeScriptTag('/all/playground/vendor/long-stack-trace-zone.js');
1515
writeScriptTag('/all/playground/vendor/system.src.js');
16-
writeScriptTag('/all/playground/vendor/Reflect.js');
17-
writeScriptTag('/all/playground/vendor/rxjs/bundles/Rx.js', 'playgroundBootstrap()');
16+
writeScriptTag('/all/playground/vendor/Reflect.js', 'playgroundBootstrap()');
17+
1818
(<any>global).playgroundBootstrap = playgroundBootstrap;
1919

2020
function playgroundBootstrap() {
@@ -36,19 +36,24 @@
3636
'@angular/upgrade': '/packages-dist/upgrade/bundles/upgrade.umd.js',
3737
'@angular/router': '/packages-dist/router/bundles/router.umd.js',
3838
'@angular/core/src/facade': '/all/@angular/core/src/facade',
39-
'rxjs': location.pathname.replace(/\w+\.html$/i, '') + 'rxjs'
39+
'rxjs': '/all/playground/vendor/rxjs'
4040
},
4141
packages: {
4242
'app': {defaultExtension: 'js'},
43-
'@angular/core/src/facade': {defaultExtension: 'js'}
43+
'@angular/core/src/facade': {defaultExtension: 'js'},
44+
'rxjs': {defaultExtension: 'js'}
4445
}
4546
});
4647
} else {
4748
console.warn(
4849
'Not using the Angular bundles. Don\'t use this configuration for e2e/performance tests!');
4950

5051
System.config({
51-
map: {'index': 'index.js', '@angular': '/all/@angular'},
52+
map: {
53+
'index': 'index.js',
54+
'@angular': '/all/@angular',
55+
'rxjs': '/all/playground/vendor/rxjs'
56+
},
5257
packages: {
5358
'app': {defaultExtension: 'js'},
5459
'@angular/core': {main: 'index.js', defaultExtension: 'js'},
@@ -58,10 +63,8 @@
5863
'@angular/forms': {main: 'index.js', defaultExtension: 'js'},
5964
'@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'},
6065
'@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'},
61-
'@angular/upgrade': {main: 'index.js', defaultExtension: 'js'}
62-
// 'rxjs': {
63-
// defaultExtension: 'js'
64-
// }
66+
'@angular/upgrade': {main: 'index.js', defaultExtension: 'js'},
67+
'rxjs': {defaultExtension: 'js'}
6568
}
6669
});
6770
}

‎modules/rollup-test/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"rollup-plugin-node-resolve": "^1.5.0",
2424
"rollup-plugin-typescript": "^0.7.3",
2525
"rollup-plugin-uglify": "^0.3.1",
26-
"rxjs-es": "^5.0.0-beta.6",
26+
"rxjs-es": "^5.0.0-beta.11",
2727
"typescript": "^1.9.0-dev.20160423",
2828
"uglify-js": "^2.6.2"
2929
},

0 commit comments

Comments
 (0)