skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(async): replace RxJS with RxNext

Browse Source 
Closes #3110
Closes #4201
This commit is contained in:
vsavkin
2015-09-11 15:38:09 -07:00
committed by Jeff Cross
parent 7b3161a229
commit 16bf335a4a
25 changed files with 61 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gulpfile.js
+14 -9
View File
@@ -1017,11 +1017,13 @@ gulp.task('!build.js.cjs', function() {
var bundleConfig = {
paths: {"*": "dist/js/prod/es5/*.js", "rx": "node_modules/rx/dist/rx.js"},
paths: {
"*": "dist/js/prod/es5/*.js"
},
meta: {
'angular2/src/router/route_definition': {format: 'cjs'},
// auto-detection fails to detect properly here - https://github.com/systemjs/builder/issues/123
'rx': {format: 'cjs'}
'angular2/src/router/route_definition': {
format: 'cjs'
}
}
};
@@ -1072,7 +1074,10 @@ gulp.task('!bundle.js.min', ['build.js.prod'], function() {
// development build
gulp.task('!bundle.js.dev', ['build.js.dev'], function() {
var devBundleConfig = merge(true, bundleConfig);
devBundleConfig.paths = merge(true, devBundleConfig.paths, {"*": "dist/js/dev/es5/*.js"});
devBundleConfig.paths =
merge(true, devBundleConfig.paths, {
"*": "dist/js/dev/es5/*.js"
});
return bundler.bundle(
devBundleConfig,
'angular2/angular2',
@@ -1150,7 +1155,7 @@ gulp.task('!bundle.js.prod.deps', ['!bundle.js.prod'], function() {
'angular2.js'
),
bundler.modify(
['node_modules/reflect-metadata/Reflect.js', 'node_modules/rx/dist/rx.lite.js', 'dist/build/http.js'],
['node_modules/reflect-metadata/Reflect.js', 'dist/build/http.js'],
'http.js'
)).pipe(gulp.dest('dist/js/bundle'));
});
@@ -1162,7 +1167,7 @@ gulp.task('!bundle.js.min.deps', ['!bundle.js.min'], function() {
'angular2.min.js'
),
bundler.modify(
['node_modules/reflect-metadata/Reflect.js', 'node_modules/rx/dist/rx.lite.js','dist/build/http.min.js'],
['node_modules/reflect-metadata/Reflect.js', 'dist/build/http.min.js'],
'http.min.js'
))
.pipe(uglify())
@@ -1179,9 +1184,9 @@ var JS_DEV_DEPS = [
// Splice in RX license if rx is in the bundle.
function insertRXLicense(source) {
var n = source.indexOf('System.register("rx"');
var n = source.indexOf('System.register("@reactivex/rxjs/dist/cjs/Subject"');
if (n >= 0) {
var rxLicense = licenseWrap('node_modules/rx/license.txt');
var rxLicense = licenseWrap('node_modules/@reactivex/rxjs/LICENSE.txt');
return source.slice(0, n) + rxLicense + source.slice(n);
} else {
return source;