Merge branch 'bjrmatos-master'

Author: opiepj

lib/index.js

@@ -34,15 +34,18 @@ var defaultOptions = {
   onBuildEnd: [],
   onBuildExit: [],
   dev: true,
-  verbose: false,
-  watch: false
+  verbose: false
 };
 
 function puts(error, stdout, stderr) {
   if (error) {
     console.log('Error: ', error, stderr);
   }
-  console.log(stdout);
+}
+
+function spreadStdoutAndStdErr(proc) {
+  proc.stdout.pipe(process.stdout);
+  proc.stderr.pipe(process.stdout);
 }
 
 function validateInput(options) {
@@ -86,7 +89,7 @@ var WebpackShellPlugin = function () {
         if (_this.options.onBuildStart.length) {
           console.log('Executing pre-build scripts');
           _this.options.onBuildStart.forEach(function (script) {
-            exec(script, puts);
+            spreadStdoutAndStdErr(exec(script, puts));
           });
           if (_this.options.dev) {
             _this.options.onBuildStart = [];
@@ -95,14 +98,10 @@ var WebpackShellPlugin = function () {
       });
 
       compiler.plugin('emit', function (compilation, callback) {
-        for (var key in compilation.options) {
-          console.log(key);
-        }
-        console.log('EMITTING');
         if (_this.options.onBuildEnd.length) {
           console.log('Executing post-build scripts');
           _this.options.onBuildEnd.forEach(function (script) {
-            exec(script, puts);
+            spreadStdoutAndStdErr(exec(script, puts));
           });
           if (_this.options.dev) {
             _this.options.onBuildEnd = [];
@@ -115,7 +114,7 @@ var WebpackShellPlugin = function () {
         if (_this.options.onBuildExit.length) {
           console.log('Executing additional scripts before exit');
           _this.options.onBuildExit.forEach(function (script) {
-            exec(script, puts);
+            spreadStdoutAndStdErr(exec(script, puts));
           });
         }
       });

src/webpack-shell-plugin.js

@@ -11,7 +11,11 @@ function puts(error, stdout, stderr) {
   if (error) {
     console.log('Error: ', error, stderr);
   }
-  console.log(stdout);
+}
+
+function spreadStdoutAndStdErr(proc) {
+  proc.stdout.pipe(process.stdout);
+  proc.stderr.pipe(process.stdout);
 }
 
 function validateInput(options) {
@@ -28,7 +32,7 @@ function validateInput(options) {
 }
 
 function mergeOptions(options, defaults) {
-  for (var key in defaults) {
+  for (let key in defaults) {
     if (options.hasOwnProperty(key)) {
       defaults[key] = options[key];
     }
@@ -50,7 +54,7 @@ export default class WebpackShellPlugin {
       if (this.options.onBuildStart.length) {
         console.log('Executing pre-build scripts');
         this.options.onBuildStart.forEach((script) => {
-          exec(script, puts);
+          spreadStdoutAndStdErr(exec(script, puts));
         });
         if (this.options.dev) {
           this.options.onBuildStart = [];
@@ -62,7 +66,7 @@ export default class WebpackShellPlugin {
       if (this.options.onBuildEnd.length) {
         console.log('Executing post-build scripts');
         this.options.onBuildEnd.forEach((script) => {
-          exec(script, puts);
+          spreadStdoutAndStdErr(exec(script, puts));
         });
         if (this.options.dev) {
           this.options.onBuildEnd = [];
@@ -75,7 +79,7 @@ export default class WebpackShellPlugin {
       if (this.options.onBuildExit.length) {
         console.log('Executing additional scripts before exit');
         this.options.onBuildExit.forEach((script) => {
-          exec(script, puts);
+          spreadStdoutAndStdErr(exec(script, puts));
         });
       }
     });