feature(core): update RxJS to 5.0.0-beta.11 (#10648)

This commit is contained in:
Rob Wormald 2016-08-22 17:17:23 -07:00 committed by Kara
parent 3c561475c8
commit ca41b4f5ff
14 changed files with 55 additions and 31 deletions

View File

@ -8,7 +8,7 @@
"author": "angular", "author": "angular",
"license": "MIT", "license": "MIT",
"peerDependencies": { "peerDependencies": {
"rxjs": "5.0.0-beta.6", "rxjs": "5.0.0-beta.11",
"zone.js": "^0.6.6" "zone.js": "^0.6.6"
}, },
"repository": { "repository": {

View File

@ -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';

View File

@ -9,7 +9,8 @@
import {Component, NgModule} from '@angular/core'; import {Component, NgModule} from '@angular/core';
import {BrowserModule} from '@angular/platform-browser'; import {BrowserModule} from '@angular/platform-browser';
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; 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 // #docregion AsyncPipePromise
@Component({ @Component({

View File

@ -7,7 +7,9 @@
*/ */
// #docregion Observable // #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 obs = new Observable<number>((obs: Subscriber<number>) => {
var i = 0; var i = 0;
setInterval(() => { obs.next(++i); }, 1000); setInterval(() => { obs.next(++i); }, 1000);

View File

@ -9,7 +9,8 @@
// #docregion Observable // #docregion Observable
import 'rxjs/add/operator/map'; 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 obs = new Observable<number>((obs: Subscriber<any>) => {
var i = 0; var i = 0;

View File

@ -7,7 +7,8 @@
*/ */
// #docregion Observable // #docregion Observable
import {Observable, Subscriber} from 'rxjs/Rx'; import {Observable} from 'rxjs/Observable';
import {Subscriber} from 'rxjs/Subscriber';
import {map} from 'rxjs/operator/map'; import {map} from 'rxjs/operator/map';
var obs = new Observable<number>((sub: Subscriber<number>) => { var obs = new Observable<number>((sub: Subscriber<number>) => {

View File

@ -8,7 +8,7 @@
"author": "angular", "author": "angular",
"license": "MIT", "license": "MIT",
"peerDependencies": { "peerDependencies": {
"rxjs": "5.0.0-beta.6", "rxjs": "5.0.0-beta.11",
"@angular/core": "0.0.0-PLACEHOLDER", "@angular/core": "0.0.0-PLACEHOLDER",
"@angular/platform-browser": "0.0.0-PLACEHOLDER" "@angular/platform-browser": "0.0.0-PLACEHOLDER"
}, },

View File

@ -25,7 +25,7 @@
"@angular/common": "0.0.0-PLACEHOLDER", "@angular/common": "0.0.0-PLACEHOLDER",
"@angular/platform-browser": "0.0.0-PLACEHOLDER", "@angular/platform-browser": "0.0.0-PLACEHOLDER",
"@angular/platform-browser-dynamic": "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" "typings": "index.d.ts"
} }

View File

@ -13,8 +13,8 @@
writeScriptTag('/all/playground/vendor/zone.js'); writeScriptTag('/all/playground/vendor/zone.js');
writeScriptTag('/all/playground/vendor/long-stack-trace-zone.js'); writeScriptTag('/all/playground/vendor/long-stack-trace-zone.js');
writeScriptTag('/all/playground/vendor/system.src.js'); writeScriptTag('/all/playground/vendor/system.src.js');
writeScriptTag('/all/playground/vendor/Reflect.js'); writeScriptTag('/all/playground/vendor/Reflect.js', 'playgroundBootstrap()');
writeScriptTag('/all/playground/vendor/rxjs/bundles/Rx.js', 'playgroundBootstrap()');
(<any>global).playgroundBootstrap = playgroundBootstrap; (<any>global).playgroundBootstrap = playgroundBootstrap;
function playgroundBootstrap() { function playgroundBootstrap() {
@ -36,11 +36,12 @@
'@angular/upgrade': '/packages-dist/upgrade/bundles/upgrade.umd.js', '@angular/upgrade': '/packages-dist/upgrade/bundles/upgrade.umd.js',
'@angular/router': '/packages-dist/router/bundles/router.umd.js', '@angular/router': '/packages-dist/router/bundles/router.umd.js',
'@angular/core/src/facade': '/all/@angular/core/src/facade', '@angular/core/src/facade': '/all/@angular/core/src/facade',
'rxjs': location.pathname.replace(/\w+\.html$/i, '') + 'rxjs' 'rxjs': '/all/playground/vendor/rxjs'
}, },
packages: { packages: {
'app': {defaultExtension: 'js'}, 'app': {defaultExtension: 'js'},
'@angular/core/src/facade': {defaultExtension: 'js'} '@angular/core/src/facade': {defaultExtension: 'js'},
'rxjs': {defaultExtension: 'js'}
} }
}); });
} else { } else {
@ -48,7 +49,11 @@
'Not using the Angular bundles. Don\'t use this configuration for e2e/performance tests!'); 'Not using the Angular bundles. Don\'t use this configuration for e2e/performance tests!');
System.config({ System.config({
map: {'index': 'index.js', '@angular': '/all/@angular'}, map: {
'index': 'index.js',
'@angular': '/all/@angular',
'rxjs': '/all/playground/vendor/rxjs'
},
packages: { packages: {
'app': {defaultExtension: 'js'}, 'app': {defaultExtension: 'js'},
'@angular/core': {main: 'index.js', defaultExtension: 'js'}, '@angular/core': {main: 'index.js', defaultExtension: 'js'},
@ -58,10 +63,8 @@
'@angular/forms': {main: 'index.js', defaultExtension: 'js'}, '@angular/forms': {main: 'index.js', defaultExtension: 'js'},
'@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-browser': {main: 'index.js', defaultExtension: 'js'},
'@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'}, '@angular/platform-browser-dynamic': {main: 'index.js', defaultExtension: 'js'},
'@angular/upgrade': {main: 'index.js', defaultExtension: 'js'} '@angular/upgrade': {main: 'index.js', defaultExtension: 'js'},
// 'rxjs': { 'rxjs': {defaultExtension: 'js'}
// defaultExtension: 'js'
// }
} }
}); });
} }

View File

@ -23,7 +23,7 @@
"rollup-plugin-node-resolve": "^1.5.0", "rollup-plugin-node-resolve": "^1.5.0",
"rollup-plugin-typescript": "^0.7.3", "rollup-plugin-typescript": "^0.7.3",
"rollup-plugin-uglify": "^0.3.1", "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", "typescript": "^1.9.0-dev.20160423",
"uglify-js": "^2.6.2" "uglify-js": "^2.6.2"
}, },

View File

@ -1599,9 +1599,6 @@
"buffers": { "buffers": {
"version": "0.1.1" "version": "0.1.1"
}, },
"bufferutil": {
"version": "1.2.1"
},
"builtin-modules": { "builtin-modules": {
"version": "1.1.1" "version": "1.1.1"
}, },
@ -4807,7 +4804,7 @@
"version": "1.1.5" "version": "1.1.5"
}, },
"rxjs": { "rxjs": {
"version": "5.0.0-beta.6" "version": "5.0.0-beta.11"
}, },
"sass-graph": { "sass-graph": {
"version": "2.0.1", "version": "2.0.1",
@ -5127,6 +5124,9 @@
"supports-color": { "supports-color": {
"version": "0.2.0" "version": "0.2.0"
}, },
"symbol-observable": {
"version": "1.0.2"
},
"symlink-or-copy": { "symlink-or-copy": {
"version": "1.0.1" "version": "1.0.1"
}, },

16
npm-shrinkwrap.json generated
View File

@ -2499,11 +2499,6 @@
"from": "buffers@>=0.1.1 <0.2.0", "from": "buffers@>=0.1.1 <0.2.0",
"resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz" "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"
}, },
"bufferutil": {
"version": "1.2.1",
"from": "bufferutil@>=1.2.0 <1.3.0",
"resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz"
},
"builtin-modules": { "builtin-modules": {
"version": "1.1.1", "version": "1.1.1",
"from": "builtin-modules@>=1.0.0 <2.0.0", "from": "builtin-modules@>=1.0.0 <2.0.0",
@ -7669,9 +7664,9 @@
"resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-1.1.5.tgz" "resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-1.1.5.tgz"
}, },
"rxjs": { "rxjs": {
"version": "5.0.0-beta.6", "version": "5.0.0-beta.11",
"from": "rxjs@5.0.0-beta.6", "from": "rxjs@5.0.0-beta.11",
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.0.0-beta.6.tgz" "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.0.0-beta.11.tgz"
}, },
"sass-graph": { "sass-graph": {
"version": "2.0.1", "version": "2.0.1",
@ -8179,6 +8174,11 @@
"from": "supports-color@>=0.2.0 <0.3.0", "from": "supports-color@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz" "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
}, },
"symbol-observable": {
"version": "1.0.2",
"from": "symbol-observable@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.2.tgz"
},
"symlink-or-copy": { "symlink-or-copy": {
"version": "1.0.1", "version": "1.0.1",
"from": "symlink-or-copy@>=1.0.1 <2.0.0", "from": "symlink-or-copy@>=1.0.1 <2.0.0",

View File

@ -20,7 +20,7 @@
"dependencies": { "dependencies": {
"es6-shim": "^0.35.0", "es6-shim": "^0.35.0",
"reflect-metadata": "^0.1.3", "reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6", "rxjs": "5.0.0-beta.11",
"zone.js": "^0.6.17" "zone.js": "^0.6.17"
}, },
"devDependencies": { "devDependencies": {

View File

@ -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 # create package.json so that npm install doesn't pollute any parent node_modules's directory
npm init --yes npm init --yes
npm install ${LINKABLE_PKGS[*]} 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 install typescript@1.8.10
$(npm bin)/tsc --version $(npm bin)/tsc --version
$(npm bin)/tsc -p tsconfig.json $(npm bin)/tsc -p tsconfig.json