merge

Author: sw-yx

package-lock.json

@@ -6,19 +6,20 @@
   "bugs": "https://github.com/netlify/netlify-dev-plugin/issues",
   "dependencies": {
     "@netlify/cli-utils": "^1.0.1",
+    "@netlify/rules-proxy": "^0.1.0",
     "@netlify/zip-it-and-ship-it": "^0.1.3",
     "@oclif/command": "^1",
     "@oclif/config": "^1",
     "ascii-table": "0.0.9",
     "copy-template-dir": "^1.4.0",
+    "execa": "^1.0.0",
     "fs-extra": "^7.0.1",
     "fuzzy": "^0.1.3",
     "get-port": "^4.1.0",
     "http-proxy": "^1.17.0",
     "inquirer": "^6.2.2",
     "inquirer-autocomplete-prompt": "^1.0.1",
     "netlify": "2.4.1",
-    "@netlify/rules-proxy": "0.1.0",
     "node-fetch": "^2.3.0",
     "opn": "^5.5.0",
     "safe-join": "^0.1.2",

package.json

@@ -1,4 +1,4 @@
-const { spawn } = require('child_process')
+const execa = require('execa')
 const Command = require('@netlify/cli-utils')
 const { getAddons } = require('netlify/src/addons')
 
@@ -15,7 +15,7 @@ class ExecCommand extends Command {
         }
       })
     }
-    spawn(this.argv[0], this.argv.slice(1), { env: process.env, stdio: 'inherit' })
+    execa(this.argv[0], this.argv.slice(1), { env: process.env, stdio: 'inherit' })
   }
 }
 

src/commands/dev/exec.js

@@ -1,5 +1,5 @@
 const { flags } = require('@oclif/command')
-const { spawn } = require('child_process')
+const execa = require('execa')
 const http = require('http')
 const httpProxy = require('http-proxy')
 const waitPort = require('wait-port')
@@ -11,10 +11,6 @@ const Command = require('@netlify/cli-utils')
 const { getAddons } = require('netlify/src/addons')
 const { track } = require('@netlify/cli-utils/src/utils/telemetry')
 
-function cleanExit() {
-  process.exit()
-}
-
 function isFunction(settings, req) {
   return settings.functionsPort && req.url.match(/^\/.netlify\/functions\/.+/)
 }
@@ -99,22 +95,10 @@ function startDevServer(settings, log, error) {
     return
   }
 
-  const ps = spawn(settings.cmd, settings.args, { env: settings.env })
-
-  ps.stdout.on('data', data => {
-    log(`${data}`.replace(settings.urlRegexp, `$1$2${settings.port}$3`))
-  })
-
-  ps.stderr.on('data', data => {
-    log(`Error reading data: ${data}`)
-  })
-
-  ps.on('close', code => {
-    process.exit(code)
-  })
-
-  ps.on('SIGINT', cleanExit)
-  ps.on('SIGTERM', cleanExit)
+  const ps = execa(settings.cmd, 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)
 }
 
 class DevCommand extends Command {

src/commands/dev/index.js

@@ -4,7 +4,7 @@
 
 var chalk = require('chalk')
 var execSync = require('child_process').execSync
-var spawn = require('cross-spawn')
+var execa = require('execa')
 var opn = require('opn')
 
 // https://github.com/sindresorhus/opn#app
@@ -37,9 +37,7 @@ function getBrowserEnv() {
 
 function executeNodeScript(scriptPath, url) {
   const extraArgs = process.argv.slice(2)
-  const child = spawn('node', [scriptPath, ...extraArgs, url], {
-    stdio: 'inherit'
-  })
+  const child = spawn('node', [scriptPath, ...extraArgs, url], { stdio: 'inherit' })
   child.on('close', code => {
     if (code !== 0) {
       console.log()