From 85e698b46d346aac541486b9a5da38db1b10f108 Mon Sep 17 00:00:00 2001 From: Ryan Berdeen Date: Sun, 22 Jan 2017 20:42:08 -0500 Subject: [PATCH 1/2] fix #752: don't rely on truthiness for port --- bin/webpack-dev-server.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/webpack-dev-server.js b/bin/webpack-dev-server.js index f81b2bf62d..19424e9340 100755 --- a/bin/webpack-dev-server.js +++ b/bin/webpack-dev-server.js @@ -39,6 +39,8 @@ function colorError(useColor, msg) { return msg; } +const defaultTo = (v, def) => v == null ? def : v; + const yargs = require("yargs") .usage(`${versionInfo() }\nUsage: https://webpack.js.org/configuration/dev-server/`); @@ -317,8 +319,8 @@ function processOptions(wpOpt) { // that wouldn't throw errors. E.g. both argv.port and options.port // were specified, but since argv.port is 8080, options.port will be // tried first instead. - options.port = argv.port === DEFAULT_PORT ? (options.port || argv.port) : (argv.port || options.port); - if(options.port) { + options.port = argv.port === DEFAULT_PORT ? defaultTo(options.port, argv.port) : defaultTo(argv.port, options.port); + if(options.port != null) { startDevServer(wpOpt, options); return; } From c9fddf7dc2660ccd8110bc1924a71f913762e990 Mon Sep 17 00:00:00 2001 From: Ryan Berdeen Date: Wed, 14 Jun 2017 12:30:27 -0400 Subject: [PATCH 2/2] better variable name --- bin/webpack-dev-server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/webpack-dev-server.js b/bin/webpack-dev-server.js index 19424e9340..c9a8085a8f 100755 --- a/bin/webpack-dev-server.js +++ b/bin/webpack-dev-server.js @@ -39,7 +39,7 @@ function colorError(useColor, msg) { return msg; } -const defaultTo = (v, def) => v == null ? def : v; +const defaultTo = (value, def) => value == null ? def : value; const yargs = require("yargs") .usage(`${versionInfo()