Client-build, Webpack: add tasks to grunt for the common webpack tasks, update readme

client/GruntFile.js

@@ -24,5 +24,5 @@ module.exports = function(grunt) {
     // see the sub directory grunt-tasks/ for individual task definitions
     grunt.loadTasks( 'grunt-tasks' );
     // note: 'handlebars' *not* 'templates' since handlebars doesn't call uglify
-    grunt.registerTask( 'default', [ 'check-modules', 'handlebars', 'uglify' ] );
+    grunt.registerTask( 'default', [ 'check-modules', 'handlebars', 'uglify', 'webpack' ] );
 };

client/README.md

@@ -44,8 +44,34 @@ A complete rebuild can be done with the following (from the `client` directory):
 
 This will:
 
-1. compress the files in client/galaxy/scripts and place them in static/scripts
-2. generate source maps and place them in static/maps
+1. recompile the client templates (handlebars, etc.)
+2. compress the files in client/galaxy/scripts and place them in static/scripts
+3. generate source maps and place them in static/maps
+4. rebuild the webpack-based client apps
+
+
+Rebuilding Scripts Only
+=======================
+
+To re-minify all the individual javascript files:
+
+    grunt scripts
+
+
+Rebuilding Webpack Apps
+=======================
+
+To rebuild the webpack bundles for apps (compressed for production):
+
+    grunt webpack
+
+To rebuild the apps without compression:
+
+    grunt webpack-dev
+
+To rebuild without compression and watch and rebuild when scripts change:
+
+    grunt webpack-watch
 
 
 Templates

client/grunt-tasks/install-libs.js

@@ -86,7 +86,7 @@ module.exports = function( grunt ){
         }
     }
 
-    grunt.loadNpmTasks( 'grunt-bower-install-simple');
+    grunt.loadNpmTasks( 'grunt-bower-install-simple' );
 
     grunt.registerTask( 'copy-libs', 'copy external libraries to src', copyLibs );
     grunt.registerTask( 'install-libs', 'fetch external libraries and copy to src',

client/package.json

@@ -19,7 +19,6 @@
     "grunt-contrib-watch": "^0.6.1",
     "grunt-exec": "^0.4.6",
     "grunt-spritesmith": "^4.7.1",
-    "grunt-webpack": "^1.0.8",
     "handlebars": "^4.0.4",
     "handlebars-loader": "^1.1.4",
     "i18n-webpack-plugin": "^0.2.7",