Merge branch 'master' into options-schema

Author: SpaceK33z

bin/webpack-dev-server.js

@@ -5,6 +5,7 @@ var open = require("opn");
 var fs = require("fs");
 var net = require("net");
 var url = require("url");
+var portfinder = require("portfinder");
 
 // Local version replaces global one
 try {
@@ -53,6 +54,11 @@ var CONNECTION_GROUP = "Connection options:";
 var RESPONSE_GROUP = "Response options:";
 var BASIC_GROUP = "Basic options:";
 
+// Taken out of yargs because we must know if
+// it wasn't given by the user, in which case
+// we should use portfinder.
+var DEFAULT_PORT = 8080;
+
 yargs.options({
 	"lazy": {
 		type: "boolean",
@@ -150,7 +156,6 @@ yargs.options({
 	},
 	"port": {
 		describe: "The port",
-		default: 8080,
 		group: CONNECTION_GROUP
 	},
 	"socket": {
@@ -197,9 +202,6 @@ function processOptions(wpOpt) {
 	if(argv.public)
 		options.public = argv.public;
 
-	if(argv.port !== 8080 || !options.port)
-		options.port = argv.port;
-
 	if(argv.socket)
 		options.socket = argv.socket;
 
@@ -296,6 +298,25 @@ function processOptions(wpOpt) {
 	if(argv["open"])
 		options.open = true;
 
+	// Kind of weird, but ensures prior behavior isn't broken in cases
+	// 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) {
+		startDevServer(wpOpt, options);
+		return;
+	}
+
+	portfinder.basePort = DEFAULT_PORT;
+	portfinder.getPort(function(err, port) {
+		if(err) throw err;
+		options.port = port;
+		startDevServer(wpOpt, options);
+	});
+}
+
+function startDevServer(wpOpt, options) {
 	var protocol = options.https ? "https" : "http";
 
 	// the formatted domain (url without path) of the webpack server

examples/https/README.md

@@ -8,7 +8,7 @@ A fake certificate is used to enable https.
 
 You can provide the following SSL options to override the fake certificate:
 
-* Certificate options e.g. `node ../../bin/webpack-dev-server.js --open --https --cacert=../../ssl/ca.pem --cert=../../ssl/server.crt --key=../../ssl/server.key`
+* Certificate options e.g. `node ../../bin/webpack-dev-server.js --open --https --cert=../../ssl/server.pem --key=../../ssl/server.pem`
 * PFX and Passphrase e.g. `node ../../bin/webpack-dev-server.js --open --https --pfx=./test_cert.pfx --pfx-passphrase=sample`
 
 ## What should happen

examples/modus-inline/webpack.config.js

@@ -2,9 +2,20 @@ module.exports = {
 	context: __dirname,
 	entry: "./app.js",
 	module: {
-		loaders: [
-			{ test: /\.less$/, loader: "style!css!less" },
-			{ test: /\.png$/, loader: "file?prefix=img/" }
+		rules: [
+			{
+				test: /\.less$/,
+				use: [
+					{ loader: "style-loader" },
+					{ loader: "css-loader" },
+					{ loader: "less-loader" }
+				]
+			},
+			{
+				test: /\.png$/,
+				loader: "file-loader",
+				options: { prefix: "img/" }
+			}
 		]
 	}
 }

examples/webpack-config-array/webpack.config.js

@@ -4,9 +4,20 @@ module.exports = [
 		context: __dirname,
 		entry: "./app.js",
 		module: {
-			loaders: [
-				{ test: /\.less$/, loader: "style!css!less" },
-				{ test: /\.png$/, loader: "file?prefix=img/" }
+			rules: [
+				{
+					test: /\.less$/,
+					use: [
+						{ loader: "style-loader" },
+						{ loader: "css-loader" },
+						{ loader: "less-loader" }
+					]
+				},
+				{
+					test: /\.png$/,
+					loader: "file-loader",
+					options: { prefix: "img/" }
+				}
 			]
 		}
 	},
@@ -17,9 +28,20 @@ module.exports = [
 			filename: "bundle2.js"
 		},
 		module: {
-			loaders: [
-				{ test: /\.less$/, loader: "style!css!less" },
-				{ test: /\.png$/, loader: "url?limit=100000" }
+			rules: [
+				{
+					test: /\.less$/,
+					use: [
+						{ loader: "style-loader" },
+						{ loader: "css-loader" },
+						{ loader: "less-loader" }
+					]
+				},
+				{
+					test: /\.png$/,
+					loader: "url-loader",
+					options: { limit: 100000 }
+				}
 			]
 		},
 		plugins: [

lib/Server.js

@@ -132,16 +132,6 @@ function Server(compiler, options) {
 
 		proxy: function() {
 			if(options.proxy) {
-				/**
-				 * Assume a proxy configuration specified as:
-				 * proxy: 'a url'
-				 */
-				if(typeof options.proxy === "string") {
-					options.proxy = [{
-						context: options.proxy
-					}];
-				}
-
 				/**
 				 * Assume a proxy configuration specified as:
 				 * proxy: {

package.json

@@ -13,6 +13,7 @@
     "express": "^4.13.3",
     "http-proxy-middleware": "~0.17.1",
     "opn": "4.0.2",
+    "portfinder": "^1.0.9",
     "serve-index": "^1.7.2",
     "sockjs": "0.3.18",
     "sockjs-client": "1.1.1",