fix(bundles): remove work-around rx.js module detection.
Updates rx to the newest version, because a fix is needed. Closes #1245
This commit is contained in:
parent
ca958464c4
commit
c349eb4fa4
17
gulpfile.js
17
gulpfile.js
|
@ -872,7 +872,13 @@ var bundleConfig = {
|
||||||
paths: {
|
paths: {
|
||||||
"*": "dist/js/prod/es6/*.es6",
|
"*": "dist/js/prod/es6/*.es6",
|
||||||
"rx/*": "node_modules/rx/*.js"
|
"rx/*": "node_modules/rx/*.js"
|
||||||
}
|
},
|
||||||
|
meta: {
|
||||||
|
// auto-detection fails to detect properly here - https://github.com/systemjs/builder/issues/123
|
||||||
|
'rx/dist/rx.all': {
|
||||||
|
format: 'cjs'
|
||||||
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// production build
|
// production build
|
||||||
|
@ -901,10 +907,13 @@ gulp.task('bundle.js.min', ['build.js.prod'], function() {
|
||||||
|
|
||||||
// development build
|
// development build
|
||||||
gulp.task('bundle.js.dev', ['build.js.dev'], function() {
|
gulp.task('bundle.js.dev', ['build.js.dev'], function() {
|
||||||
return bundler.bundle(
|
var devBundleConfig = merge(true, bundleConfig);
|
||||||
merge(true, bundleConfig, {
|
devBundleConfig.paths =
|
||||||
|
merge(true, devBundleConfig.paths, {
|
||||||
"*": "dist/js/dev/es6/*.es6"
|
"*": "dist/js/dev/es6/*.es6"
|
||||||
}),
|
});
|
||||||
|
return bundler.bundle(
|
||||||
|
devBundleConfig,
|
||||||
'angular2/angular2',
|
'angular2/angular2',
|
||||||
'./dist/build/angular2.dev.js',
|
'./dist/build/angular2.dev.js',
|
||||||
{
|
{
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
"gulp-modify": "0.0.4",
|
"gulp-modify": "0.0.4",
|
||||||
"gulp-replace": "^0.5.3",
|
"gulp-replace": "^0.5.3",
|
||||||
"node-uuid": "1.4.x",
|
"node-uuid": "1.4.x",
|
||||||
"rx": "2.4.6",
|
"rx": "2.5.1",
|
||||||
"selenium-webdriver": "2.45.1",
|
"selenium-webdriver": "2.45.1",
|
||||||
"systemjs": "^0.9.1",
|
"systemjs": "^0.9.1",
|
||||||
"traceur": "0.0.87",
|
"traceur": "0.0.87",
|
||||||
|
|
|
@ -15,6 +15,5 @@ module.exports.bundle = function(buildConfig, moduleName, outputFile, outputConf
|
||||||
module.exports.modify = function(srcs, concatName) {
|
module.exports.modify = function(srcs, concatName) {
|
||||||
return gulp.src(srcs)
|
return gulp.src(srcs)
|
||||||
.pipe(concat(concatName))
|
.pipe(concat(concatName))
|
||||||
.pipe(replace('use strict', '')) // remove after https://github.com/systemjs/builder/issues/123 is fixed.
|
|
||||||
.pipe(replace('sourceMappingURL', 'sourceMappingURLDisabled')) // TODO: add concat for sourceMaps
|
.pipe(replace('sourceMappingURL', 'sourceMappingURLDisabled')) // TODO: add concat for sourceMaps
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue