ff-stream-web

commit f1801f037e2b04e6e1358239131b453f7a64c7c2
parent 04c0b170d16a56d1aa231fddc5e5490cf3940d00
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Tue,  8 Jul 2014 12:02:11 +0400

Update webpack from 1.3.1-beta6 to 1.3.1-beta7

Diffstat:
M
gulpfile.js
 | 
9
++++-----
M
package.json
 | 
2
+-

2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/gulpfile.js b/gulpfile.js
@@ -20,15 +20,12 @@ var argv = require('minimist')(process.argv.slice(2));
 // Settings
 var DEBUG = !argv.release;
 var WATCH = Boolean(argv.watch);
+var LOG = Boolean(argv.log);
 
 // Node.js runtime dependencies and their version numbers
 var pkgs = require('./package.json').dependencies;
 Object.keys(pkgs).forEach(function (key) { return pkgs[key] = pkgs[key].substring(1); });
 
-// Configure Webpack bundler
-var bundler = webpack(require('./config/webpack.config.js')(DEBUG));
-
-
 // Clean up
 // -----------------------------------------------------------------------------
 gulp.task('clean', function (cb) {
@@ -80,11 +77,13 @@ gulp.task('styles', function () {
 // Create JavaScript bundle
 // -----------------------------------------------------------------------------
 gulp.task('bundle', function (cb) {
+    var bundler = webpack(require('./config/webpack.config.js')(DEBUG));
+
     function bundle (err, stats) {
         if (err) {
             throw new $.util.PluginError('webpack', err);
         }
-        $.util.log('[webpack]', stats.toString({colors: true}));
+        LOG && $.util.log('[webpack]', stats.toString({colors: true}));
         return cb();
     }
 
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "rimraf": "^2.2.8",
     "run-sequence": "^0.3.6",
     "url-loader": "^0.5.5",
-    "webpack": "^1.3.1-beta6"
+    "webpack": "^1.3.1-beta7"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"