From 027f8d2bfe1616c365fb614d67341a0b9477f373 Mon Sep 17 00:00:00 2001 From: spalger Date: Thu, 19 May 2016 15:33:06 -0700 Subject: [PATCH] combine webpack build configs --- grunt/browser_clients.js | 4 +--- grunt/config/webpack.js | 8 +++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/grunt/browser_clients.js b/grunt/browser_clients.js index 0bfeed088..95d3612dc 100644 --- a/grunt/browser_clients.js +++ b/grunt/browser_clients.js @@ -17,9 +17,7 @@ module.exports = function (grunt) { grunt.task.run([ 'clean:dist', - 'webpack:browser_client', - 'webpack:angular_client', - 'webpack:jquery_client', + 'webpack:browser_clients', 'uglify:dist', 'concat:dist_banners' ]); diff --git a/grunt/config/webpack.js b/grunt/config/webpack.js index 013595d97..86406ddd8 100644 --- a/grunt/config/webpack.js +++ b/grunt/config/webpack.js @@ -1,5 +1,7 @@ module.exports = { - browser_client: require('../../webpack_config/browser'), - angular_client: require('../../webpack_config/angular'), - jquery_client: require('../../webpack_config/jquery'), + browser_clients: [ + require('../../webpack_config/browser'), + require('../../webpack_config/angular'), + require('../../webpack_config/jquery'), + ] }