Merge pull request #68 from netlify/makeDetectorsSafer

minor bugfixes to #67

Author: swyxio

src/commands/dev/index.js

@@ -96,7 +96,7 @@ function startDevServer(settings, log, error) {
     return
   }
 
-  const ps = execa(settings.cmd, settings.args, { env: settings.env, stdio: 'inherit', shell: true })
+  const ps = execa(settings.command, settings.args, { env: settings.env, stdio: 'inherit', shell: true })
   ps.on('close', code => process.exit(code))
   ps.on('SIGINT', process.exit)
   ps.on('SIGTERM', process.exit)
@@ -133,7 +133,7 @@ class DevCommand extends Command {
     }
     process.env.NETLIFY_DEV = 'true'
     let settings = serverSettings(config.dev)
-    if (!(settings && settings.cmd)) {
+    if (!(settings && settings.command)) {
       this.log('No dev server detected, using simple static server')
       const dist = (config.dev && config.dev.publish) || (config.build && config.build.publish)
       settings = {

src/detect-server.js

@@ -17,23 +17,21 @@ module.exports.serverSettings = devConfig => {
     settings = settings || {}
     if (devConfig.command) {
       settings.command = devConfig.command.split(/\s/)[0]
-      assignLoudly(devConfig, 'command', settings, 'command')
+      assignLoudly(settings, 'command', devConfig, 'command')
       settings.args = devConfig.command.split(/\s/).slice(1)
-      assignLoudly(devConfig, 'args', settings, 'args')
     }
     if (devConfig.port) {
-      assignLoudly(devConfig, 'port', settings, 'proxyPort')
+      assignLoudly(settings, 'proxyPort', devConfig, 'port')
       settings.urlRegexp = devConfig.urlRegexp || new RegExp(`(http://)([^:]+:)${devConfig.port}(/)?`, 'g')
     }
-    assignLoudly(devConfig, 'publish', settings, 'dist')
+    assignLoudly(settings, 'dist', devConfig, 'publish')
   }
 
   return settings
 }
 
-// does assignAndTellUserIfNetlifyTomlDevBlockOverride
-// mutates the settings field
-function assignLoudly(devConfig, field, settings, settingsField) {
+// mutates the settings field from the devConfig field, but tell the user if it does
+function assignLoudly(settings, settingsField, devConfig, field) {
   if (settings[settingsField] !== devConfig[field]) {
     // silent if command is exactly same
     console.log(`Using ${field} from netlify.toml [dev] block: `, devConfig[field])

src/detectors/README.md

@@ -6,7 +6,7 @@
 
 ```ts
 {
-    cmd: String, // e.g. yarn, npm
+    command: String, // e.g. yarn, npm
     port: Number, // e.g. 8888
     proxyPort: Number, // e.g. 3000
     env: Object, // env variables, see examples