Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -690,12 +690,11 @@ gulp.task('build.payload.js', ['build.js'], function(done) {
});

gulp.task('!build.payload.js.webpack', function() {
var q = require('q');
var webpack = q.denodeify(require('webpack'));
var webpack = require('./tools/build/webpack/promiseify');

var ES5_PROD_ROOT = __dirname + '/' + CONFIG.dest.js.prod.es5;

return q.all(PAYLOAD_TESTS_CONFIG.ts.cases.map(function(caseName) {
return Promise.all(PAYLOAD_TESTS_CONFIG.ts.cases.map(function(caseName) {
var CASE_PATH = PAYLOAD_TESTS_CONFIG.ts.dist(caseName, 'webpack');

return webpack({
Expand Down Expand Up @@ -1253,8 +1252,7 @@ gulp.task('!bundles.js.docs', ['clean'], function() {
});

gulp.task('!bundles.js.umd', ['build.js.dev'], function() {
var q = require('q');
var webpack = q.denodeify(require('webpack'));
var webpack = require('./tools/build/webpack/promiseify');

function resolveOptions(devOrProd) {
return {
Expand Down Expand Up @@ -1310,7 +1308,7 @@ gulp.task('!bundles.js.umd', ['build.js.dev'], function() {
};
}

return q.all([
return Promise.all([
webpack(webPackConf([__dirname + '/tools/build/webpack/angular2-all.umd.js'], 'angular2-all',
'dev')),
webpack(webPackConf([__dirname + '/tools/build/webpack/angular2-all.umd.js'], 'angular2-all',
Expand Down
32 changes: 32 additions & 0 deletions tools/build/webpack/promiseify.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
var webpack = require('webpack');

/**
* Wraps the original `webpack` function to convert execution
* result to a promise and properly report errors.
*
* @param options
* @returns {Function}
*/
function webPackPromiseify(options) {

return new Promise(function (resolve, reject) {

webpack(options, function(err, stats) {
var jsonStats = stats.toJson() || {};
var statsErrors = jsonStats.errors || [];

if (err) {
return reject(err);
}

if (statsErrors.length) {
return reject(statsErrors);
}

return resolve(stats);
});

});
}

module.exports = webPackPromiseify;