Merge pull request #532 from netlify/raees/dir-flag-fix

Dev: Respect the dir flag for serving directory
netlify · Sep 13, 2019 · dae855c · dae855c
2 parents c6b9618 + 22dd87c
commit dae855c
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/commands/dev/index.js b/src/commands/dev/index.js
@@ -184,9 +184,15 @@ class DevCommand extends Command {
 
     let settings = await serverSettings(Object.assign({}, config.dev, flags))
 
-    if (!(settings && settings.command)) {
-      this.log(`${NETLIFYDEVWARN} No dev server detected, using simple static server`)
-      let dist = (config.dev && config.dev.publish) || (config.build && config.build.publish)
+    if (flags.dir || !(settings && settings.command)) {
+      let dist
+      if (flags.dir) {
+        this.log(`${NETLIFYDEVWARN} Using simple static server because --dir flag was specified`)
+        dist = flags.dir
+      } else {
+        this.log(`${NETLIFYDEVWARN} No dev server detected, using simple static server`)
+        dist = (config.dev && config.dev.publish) || (config.build && config.build.publish)
+      }
       if (!dist) {
         this.log(`${NETLIFYDEVLOG} Using current working directory`)
         this.log(`${NETLIFYDEVWARN} Unable to determine public folder to serve files from.`)