Merge branch 'slightlytyler-master'

Author: opiepj

lib/index.js

@@ -137,14 +137,17 @@ var createClass = function () {
   };
 }();
 
-var exec = require('child_process').exec;
+var toArray = function (arr) {
+  return Array.isArray(arr) ? arr : Array.from(arr);
+};
+
+var spawn = require('child_process').spawn;
 var defaultOptions = {
   onBuildStart: [],
   onBuildEnd: [],
   onBuildExit: [],
   dev: true,
-  verbose: false,
-  throwOnExecError: false
+  verbose: false
 };
 
 function puts(error, stdout, stderr) {
@@ -153,15 +156,29 @@ function puts(error, stdout, stderr) {
   }
 }
 
-function putsThrow(error, stdout, stderr) {
-  if (error) {
-    throw error;
+function serializeScript(script) {
+  if (typeof script === 'string') {
+    var _script$split = script.split(' '),
+        _script$split2 = toArray(_script$split),
+        _command = _script$split2[0],
+        _args = _script$split2.slice(1);
+
+    return { command: _command, args: _args };
   }
+  var command = script.command,
+      args = script.args;
+
+  return { command: command, args: args };
 }
 
-function spreadStdoutAndStdErr(proc) {
-  proc.stdout.pipe(process.stdout);
-  proc.stderr.pipe(process.stdout);
+function handleScript(script) {
+  var _serializeScript = serializeScript(script),
+      command = _serializeScript.command,
+      args = _serializeScript.args;
+
+  var proc = spawn(command, args, { stdio: 'inherit' });
+
+  proc.on('close', puts);
 }
 
 function validateInput(options) {
@@ -204,13 +221,7 @@ var WebpackShellPlugin = function () {
         }
         if (_this.options.onBuildStart.length) {
           console.log('Executing pre-build scripts');
-          _this.options.onBuildStart.forEach(function (script) {
-            if (_this.options.throwOnExecError) {
-              spreadStdoutAndStdErr(exec(script, putsThrow));
-            } else {
-              spreadStdoutAndStdErr(exec(script, puts));
-            }
-          });
+          _this.options.onBuildStart.forEach(handleScript);
           if (_this.options.dev) {
             _this.options.onBuildStart = [];
           }
@@ -220,13 +231,7 @@ var WebpackShellPlugin = function () {
       compiler.plugin('emit', function (compilation, callback) {
         if (_this.options.onBuildEnd.length) {
           console.log('Executing post-build scripts');
-          _this.options.onBuildEnd.forEach(function (script) {
-            if (_this.options.throwOnExecError) {
-              spreadStdoutAndStdErr(exec(script, putsThrow));
-            } else {
-              spreadStdoutAndStdErr(exec(script, puts));
-            }
-          });
+          _this.options.onBuildEnd.forEach(handleScript);
           if (_this.options.dev) {
             _this.options.onBuildEnd = [];
           }
@@ -237,13 +242,7 @@ var WebpackShellPlugin = function () {
       compiler.plugin('done', function () {
         if (_this.options.onBuildExit.length) {
           console.log('Executing additional scripts before exit');
-          _this.options.onBuildExit.forEach(function (script) {
-            if (_this.options.throwOnExecError) {
-              spreadStdoutAndStdErr(exec(script, putsThrow));
-            } else {
-              spreadStdoutAndStdErr(exec(script, puts));
-            }
-          });
+          _this.options.onBuildExit.forEach(handleScript);
         }
       });
     }

src/webpack-shell-plugin.js

@@ -1,11 +1,10 @@
-const exec = require('child_process').exec;
+const spawn = require('child_process').spawn;
 const defaultOptions = {
   onBuildStart: [],
   onBuildEnd: [],
   onBuildExit: [],
   dev: true,
-  verbose: false,
-  throwOnExecError: false
+  verbose: false
 };
 
 function puts(error, stdout, stderr) {
@@ -14,15 +13,20 @@ function puts(error, stdout, stderr) {
   }
 }
 
-function putsThrow(error, stdout, stderr) {
-  if (error) {
-    throw error;
+function serializeScript(script) {
+  if (typeof script === 'string') {
+    const [command, ...args] = script.split(' ');
+    return {command, args};
   }
+  const {command, args} = script;
+  return {command, args};
 }
 
-function spreadStdoutAndStdErr(proc) {
-  proc.stdout.pipe(process.stdout);
-  proc.stderr.pipe(process.stdout);
+function handleScript(script) {
+  const {command, args} = serializeScript(script);
+  const proc = spawn(command, args, {stdio: 'inherit'});
+
+  proc.on('close', puts);
 }
 
 function validateInput(options) {
@@ -60,14 +64,7 @@ export default class WebpackShellPlugin {
       }
       if (this.options.onBuildStart.length) {
         console.log('Executing pre-build scripts');
-        this.options.onBuildStart.forEach((script) => {
-          if (this.options.throwOnExecError) {
-            spreadStdoutAndStdErr(exec(script, putsThrow));
-          }
-          else {
-            spreadStdoutAndStdErr(exec(script, puts));
-          }
-        });
+        this.options.onBuildStart.forEach(handleScript);
         if (this.options.dev) {
           this.options.onBuildStart = [];
         }
@@ -77,14 +74,7 @@ export default class WebpackShellPlugin {
     compiler.plugin('emit', (compilation, callback) => {
       if (this.options.onBuildEnd.length) {
         console.log('Executing post-build scripts');
-        this.options.onBuildEnd.forEach((script) => {
-          if (this.options.throwOnExecError) {
-            spreadStdoutAndStdErr(exec(script, putsThrow));
-          }
-          else {
-            spreadStdoutAndStdErr(exec(script, puts));
-          }
-        });
+        this.options.onBuildEnd.forEach(handleScript);
         if (this.options.dev) {
           this.options.onBuildEnd = [];
         }
@@ -95,14 +85,7 @@ export default class WebpackShellPlugin {
     compiler.plugin('done', () => {
       if (this.options.onBuildExit.length) {
         console.log('Executing additional scripts before exit');
-        this.options.onBuildExit.forEach((script) => {
-          if (this.options.throwOnExecError) {
-            spreadStdoutAndStdErr(exec(script, putsThrow));
-          }
-          else {
-            spreadStdoutAndStdErr(exec(script, puts));
-          }
-        });
+        this.options.onBuildExit.forEach(handleScript);
       }
     });
   }

webpack.config.js

@@ -22,4 +22,4 @@ module.exports = {
     new WebpackShellPlugin({onBuildStart:['echo "Webpack Start"'], onBuildEnd:['echo "Webpack End"']}),
     new webpack.HotModuleReplacementPlugin()
   ]
-};
+};