Merge pull request #14 from netlify/cleanup-detectors

Clean up detectors

Author: biilmann

src/detectors/cra.js

@@ -5,39 +5,27 @@ module.exports = function() {
     return false
   }
 
-  const package = JSON.parse(readFileSync('package.json', { encoding: 'utf8' }))
-  if (!(package.dependencies && package.dependencies['react-scripts'])) {
+  const packageSettings = JSON.parse(readFileSync('package.json', { encoding: 'utf8' }))
+  const { dependencies, scripts } = packageSettings
+  if (!(dependencies && dependencies['react-scripts'])) {
     return false
   }
 
-  const settings = {
+  const npmCommand = scripts && ((scripts.start && 'start') || (scripts.serve && 'serve') || (scripts.run && 'run'))
+
+  if (!npmCommand) {
+    console.error("Couldn't determine the script to run. Use the -c flag.")
+    process.exit(1)
+  }
+
+  const yarnExists = existsSync('yarn.lock')
+  return {
+    cmd: yarnExists ? 'yarn' : 'npm',
     port: 8888,
     proxyPort: 3000,
     env: { ...process.env, BROWSER: 'none', PORT: 3000 },
-    args: [],
+    args: yarnExists || npmCommand != 'start' ? ['run', npmCommand] : [npmCommand],
     urlRegexp: new RegExp(`(http://)([^:]+:)${3000}(/)?`, 'g'),
     dist: 'dist'
   }
-
-  if (package) {
-    if (existsSync('yarn.lock')) {
-      settings.cmd = 'yarn'
-    } else {
-      settings.cmd = 'npm'
-      settings.args.push('run')
-    }
-
-    if (package.scripts.start) {
-      settings.args.push('start')
-    } else if (package.scripts.serve) {
-      settings.args.push('serve')
-    } else if (package.scripts.run) {
-      settings.args.push('run')
-    } else {
-      console.error("Couldn't determine the script to run. Use the -c flag.")
-      process.exit(1)
-    }
-
-    return settings
-  }
 }

src/detectors/eleventy.js

@@ -5,7 +5,7 @@ module.exports = function() {
     return false
   }
 
-  const settings = {
+  return {
     port: 8888,
     proxyPort: 8080,
     env: { ...process.env },
@@ -14,6 +14,4 @@ module.exports = function() {
     urlRegexp: new RegExp(`(http://)([^:]+:)${8080}(/)?`, 'g'),
     dist: '_site'
   }
-
-  return settings
 }

src/detectors/gatsby.js

@@ -5,22 +5,14 @@ module.exports = function() {
     return false
   }
 
-  const settings = {
+  const yarnExists = existsSync('yarn.lock')
+  return {
+    cmd: yarnExists ? 'yarn' : 'npm',
     port: 8888,
     proxyPort: 8000,
     env: { ...process.env },
-    args: [],
+    args: yarnExists ? ['run', 'dev'] : ['dev'],
     urlRegexp: new RegExp(`(http://)([^:]+:)${8000}(/)?`, 'g'),
     dist: 'public'
   }
-
-  if (existsSync('yarn.lock')) {
-    settings.cmd = 'yarn'
-  } else {
-    settings.cmd = 'npm'
-    settings.args.push('run')
-  }
-  settings.args.push('dev')
-
-  return settings
 }

src/detectors/hugo.js

@@ -5,7 +5,7 @@ module.exports = function() {
     return false
   }
 
-  const settings = {
+  return {
     port: 8888,
     proxyPort: 1313,
     env: { ...process.env },
@@ -14,6 +14,4 @@ module.exports = function() {
     urlRegexp: new RegExp(`(http://)([^:]+:)${1313}(/)?`, 'g'),
     dist: 'public'
   }
-
-  return settings
 }

src/detectors/jekyll.js

@@ -5,7 +5,7 @@ module.exports = function() {
     return false
   }
 
-  const settings = {
+  return {
     port: 8888,
     proxyPort: 4000,
     env: { ...process.env },
@@ -14,6 +14,4 @@ module.exports = function() {
     urlRegexp: new RegExp(`(http://)([^:]+:)${4000}(/)?`, 'g'),
     dist: '_site'
   }
-
-  return settings
 }

src/detectors/react-static.js

@@ -5,22 +5,14 @@ module.exports = function() {
     return false
   }
 
-  const settings = {
+  const yarnExists = existsSync('yarn.lock')
+  return {
+    cmd: yarnExists ? 'yarn' : 'npm',
     port: 8888,
     proxyPort: 3000,
     env: { ...process.env },
-    args: [],
+    args: yarnExists ? ['run', 'start'] : ['start'],
     urlRegexp: new RegExp(`(http://)([^:]+:)${3000}(/)?`, 'g'),
     dist: 'dist'
   }
-
-  if (existsSync('yarn.lock')) {
-    settings.cmd = 'yarn'
-  } else {
-    settings.cmd = 'npm'
-    settings.args.push('run')
-  }
-  settings.args.push('start')
-
-  return settings
 }