Skip to content

Commit

Permalink
chore(build): upgrade systemjs-builder
Browse files Browse the repository at this point in the history 
upgrade systemjs-builder to 0.14.x

BREAKING CHANGE:

URLs are now first-class module names. All names are normalized into URLs into the registry as part of the normalization process. See https://github.com/systemjs/systemjs/releases/tag/0.17.0 and whatwg/loader#52 for more details.
  • Loading branch information
@robwormald
robwormald committed Oct 6, 2015
1 parent 74c852b commit b8e988c
Show file tree
Hide file tree
Showing 5 changed files with 203 additions and 111 deletions.
30 changes: 17 additions & 13 deletions gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1061,7 +1061,8 @@ gulp.task('!build.js.cjs', function() {


var bundleConfig = {
paths: {"*": "dist/js/prod/es5/*.js"},
baseURL: 'dist/js/prod/es5',
defaultJSExtensions: true,
// Files that end up empty after transpilation confuse system-builder
// and need to be explitily listed here.
// TODO: upgrade system builder and find a way to declare all input as cjs.
Expand Down Expand Up @@ -1119,10 +1120,9 @@ 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 = merge(true, devBundleConfig, {
baseURL: 'dist/js/dev/es5'
});
return bundler.bundle(
devBundleConfig,
'angular2/angular2',
Expand All @@ -1139,8 +1139,9 @@ gulp.task('!bundle.js.dev', ['build.js.dev'], function() {

// WebWorker build
gulp.task("!bundle.web_worker.js.dev", ["build.js.dev"], function() {
var devBundleConfig = merge(true, bundleConfig);
devBundleConfig.paths = merge(true, devBundleConfig.paths, {"*": "dist/js/dev/es5/*.js"});
var devBundleConfig = merge(true, bundleConfig, {
baseURL: 'dist/js/dev/es5'
});
return bundler.bundle(
devBundleConfig,
'angular2/web_worker/ui',
Expand All @@ -1156,8 +1157,9 @@ gulp.task("!bundle.web_worker.js.dev", ["build.js.dev"], function() {
});

gulp.task('!router.bundle.js.dev', ['build.js.dev'], function() {
var devBundleConfig = merge(true, bundleConfig);
devBundleConfig.paths = merge(true, devBundleConfig.paths, {"*": "dist/js/dev/es5/*.js"});
var devBundleConfig = merge(true, bundleConfig,{
baseURL: 'dist/js/dev/es5'
});
return bundler.bundle(
devBundleConfig,
'angular2/router - angular2/angular2',
Expand All @@ -1166,8 +1168,9 @@ gulp.task('!router.bundle.js.dev', ['build.js.dev'], function() {
});

gulp.task('!test.bundle.js.dev', ['build.js.dev'], function() {
var devBundleConfig = merge(true, bundleConfig);
devBundleConfig.paths = merge(true, devBundleConfig.paths, {"*": "dist/js/dev/es5/*.js"});
var devBundleConfig = merge(true, bundleConfig,{
baseURL: 'dist/js/dev/es5'
});
return bundler.bundle(
devBundleConfig,
'angular2/test + angular2/mock - angular2/angular2',
Expand All @@ -1181,8 +1184,9 @@ gulp.task('!test.bundle.js.dev', ['build.js.dev'], function() {
// use System loader polyfills (like system.js and es6 loader).
// see: https://github.com/systemjs/builder (SFX bundles).
gulp.task('!bundle.js.sfx.dev', ['build.js.dev'], function() {
var devBundleConfig = merge(true, bundleConfig);
devBundleConfig.paths = merge(true, devBundleConfig.paths, {'*': 'dist/js/dev/es5/*.js'});
var devBundleConfig = merge(true, bundleConfig,{
baseURL: 'dist/js/dev/es5'
});
return bundler.bundle(devBundleConfig, 'angular2/angular2_sfx',
'./dist/build/angular2.sfx.dev.js', {sourceMaps: true},
/* self-executing */ true)
Expand Down
71 changes: 53 additions & 18 deletions npm-shrinkwrap.clean.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10551,10 +10551,47 @@
}
},
"systemjs-builder": {
"version": "0.10.6",
"version": "0.14.7",
"dependencies": {
"algorithms": {
"version": "0.9.1"
},
"es6-template-strings": {
"version": "2.0.0",
"dependencies": {
"es5-ext": {
"version": "0.10.8",
"dependencies": {
"es6-iterator": {
"version": "2.0.0",
"dependencies": {
"d": {
"version": "0.1.1"
}
}
},
"es6-symbol": {
"version": "3.0.0",
"dependencies": {
"d": {
"version": "0.1.1"
}
}
}
}
},
"esniff": {
"version": "1.0.0",
"dependencies": {
"d": {
"version": "0.1.1"
}
}
}
}
},
"glob": {
"version": "5.0.5",
"version": "5.0.15",
"dependencies": {
"inflight": {
"version": "1.0.4",
Expand All @@ -10581,39 +10618,37 @@
}
},
"mkdirp": {
"version": "0.5.0",
"version": "0.5.1",
"dependencies": {
"minimist": {
"version": "0.0.8"
}
}
},
"rsvp": {
"version": "3.0.18"
"version": "3.1.0"
},
"source-map": {
"version": "0.4.2",
"version": "0.4.4",
"dependencies": {
"amdefine": {
"version": "0.1.0"
"version": "1.0.0"
}
}
},
"systemjs": {
"version": "0.16.11",
"version": "0.19.3",
"dependencies": {
"es6-module-loader": {
"version": "0.16.6",
"dependencies": {
"when": {
"version": "3.7.3"
}
}
"version": "0.17.8"
},
"when": {
"version": "3.7.3"
}
}
},
"traceur": {
"version": "0.0.88",
"version": "0.0.91",
"dependencies": {
"commander": {
"version": "2.6.0"
Expand Down Expand Up @@ -10652,7 +10687,7 @@
"version": "0.1.32",
"dependencies": {
"amdefine": {
"version": "0.1.0"
"version": "1.0.0"
}
}
}
Expand All @@ -10661,7 +10696,7 @@
}
},
"uglify-js": {
"version": "2.4.21",
"version": "2.4.24",
"dependencies": {
"async": {
"version": "0.2.10"
Expand All @@ -10670,7 +10705,7 @@
"version": "0.1.34",
"dependencies": {
"amdefine": {
"version": "0.1.0"
"version": "1.0.0"
}
}
},
Expand All @@ -10681,7 +10716,7 @@
"version": "3.5.4",
"dependencies": {
"camelcase": {
"version": "1.0.2"
"version": "1.2.1"
},
"decamelize": {
"version": "1.0.0"
Expand Down
Loading

0 comments on commit b8e988c

Please sign in to comment.