Use devServer.port if it's configured

Fixes #423
insin · Jan 26, 2018 · 6a5ba9a · 6a5ba9a
1 parent cd2ed69
commit 6a5ba9a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+## Changed
+
+- `port` config in [`devServer` config](https://github.com/insin/nwb/blob/master/docs/Configuration.md#devserver-object) will now be used if configured [[#423](https://github.com/insin/nwb/issues/423)]
+
 # 0.21.2 / 2018-01-17
 
 ## Fixed

diff --git a/src/webpackServer.js b/src/webpackServer.js
@@ -13,9 +13,7 @@ import {clearConsole, deepToString} from './utils'
  * Get the port to run the server on, detecting if the intended port is
  * available first and prompting the user if not.
  */
-function getServerPort(args, cb) {
-  let intendedPort = args.port || DEFAULT_PORT
-
+function getServerPort(args, intendedPort, cb) {
   detect(intendedPort, (err, suggestedPort) => {
     if (err) return cb(err)
     // No need to prompt if the intended port is available
@@ -65,8 +63,7 @@ export default function webpackServer(args, buildConfig, cb) {
     return cb(e)
   }
 
-  // Other config can be provided by the user via the CLI
-  getServerPort(args, (err, port) => {
+  getServerPort(args, args.port || serverConfig.port || DEFAULT_PORT, (err, port) => {
     if (err) return cb(err)
     // A null port indicates the user chose not to run the server when prompted
     if (port === null) return cb()