fix: pass through execArgs from config (#1142)

* fix: pass through execArgs from config

Also updating some deps and linting tweaks

* chore: add message on postinstall

Lost funds from gratipay and codesponsor 😢

lib/config/exec.js

@@ -19,10 +19,12 @@ function execFromPackage() {
     if (pkg.main !== undefined) {
       // no app found to run - so give them a tip and get the feck out
       return { exec: null, script: pkg.main };
-    } else if (pkg.scripts && pkg.scripts.start) {
+    }
+
+    if (pkg.scripts && pkg.scripts.start) {
       return { exec: pkg.scripts.start };
     }
-  } catch (e) {}
+  } catch (e) { }
 
   return null;
 }
@@ -84,7 +86,7 @@ function exec(nodemonOptions, execMap) {
     execDefined = true;
   }
 
-  options.execArgs = [];
+  options.execArgs = nodemonOptions.execArgs || [];
 
   if (Array.isArray(options.exec)) {
     options.execArgs = options.exec;

lib/config/load.js

@@ -79,6 +79,7 @@ function load(settings, options, config, callback) {
         args: options.args,
         scriptPosition: options.scriptPosition,
         nodeArgs: options.nodeArgs,
+        execArgs: options.execArgs,
         ext: options.ext,
         env: options.env,
       }, options.execMap);
@@ -172,7 +173,7 @@ function normaliseRules(options, ready) {
  */
 function loadFile(options, config, dir, ready) {
   if (!ready) {
-    ready = function () {};
+    ready = function () { };
   }
 
   var callback = function (settings) {
@@ -216,7 +217,7 @@ function loadFile(options, config, dir, ready) {
 
 function loadPackageJSON(config, ready) {
   if (!ready) {
-    ready = function () {};
+    ready = function () { };
   }
 
   utils.log.detail('Looking in package.json for nodemonConfig');

lib/monitor/match.js

@@ -137,9 +137,9 @@ function match(files, monitor, ext) {
     if (aIsIgnore || bIsIgnore) {
       if (aIsIgnore) {
         return -1;
-      } else {
-        return 1;
       }
+
+      return 1;
     }
 
     if (r === 0) {
@@ -151,7 +151,9 @@ function match(files, monitor, ext) {
 
     if (prefix === '!') {
       return '!**' + (prefix !== path.sep ? path.sep : '') + s.slice(1);
-    } else if (s.slice(0, 2) === '..') {
+    }
+
+    if (s.slice(0, 2) === '..') {
       return path.resolve(process.cwd(), s);
     }
     return '**' + (prefix !== path.sep ? path.sep : '') + s;

lib/monitor/run.js

@@ -8,7 +8,7 @@ var watch = require('./watch').watch;
 var config = require('../config');
 var child = null; // the actual child process we spawn
 var killedAfterChange = false;
-var noop = function () {};
+var noop = function () { };
 var restart = null;
 var psTree = require('ps-tree');
 var hasPS = true;
@@ -39,8 +39,8 @@ function run(options) {
 
   if (config.options.stdout) {
     stdio = ['pipe',
-             process.stdout,
-             process.stderr,];
+      process.stdout,
+      process.stderr,];
   }
 
   var sh = 'sh';
@@ -63,9 +63,9 @@ function run(options) {
     // if the executable path contains a space the whole string must be quoted
     // to get windows treat it as 1 argument for cmd.exe
     if (executable.indexOf(' ') !== -1 && executable[0] !== '\"'
-        && executable[executable.length - 1] !== '\"') {
+      && executable[executable.length - 1] !== '\"') {
       // remove all quotes from executable (possible backward compat hacks)
-      executable = executable.replace (/\"/g, '');
+      executable = executable.replace(/\"/g, '');
     }
   }
 
@@ -155,7 +155,9 @@ function run(options) {
       // exit the monitor, but do it gracefully
       if (signal === config.signal) {
         return restart();
-      } else if (code === 0) { // clean exit - wait until file change to restart
+      }
+
+      if (code === 0) { // clean exit - wait until file change to restart
         if (runCmd) {
           utils.log.status('clean exit - waiting for changes before restart');
         }
@@ -170,7 +172,7 @@ function run(options) {
         }
       } else {
         utils.log.fail('app crashed - waiting for file changes before' +
-        ' starting...');
+          ' starting...');
         child = null;
       }
     }
@@ -258,7 +260,7 @@ function run(options) {
 
 function kill(child, signal, callback) {
   if (!callback) {
-    callback = function () {};
+    callback = function () { };
   }
 
   if (utils.isWindows) {

lib/utils/index.js

@@ -68,10 +68,9 @@ var utils = (module.exports = {
         // around it to indicate that it is a single argument
         if (arg.indexOf(' ') === -1) {
           return arg;
-        } else {
-          // this should correctly escape nested quotes
-          return JSON.stringify(arg);
         }
+        // this should correctly escape nested quotes
+        return JSON.stringify(arg);
       })
       )
       .join(' ')