webpack-dev-server 2.6.1 → 2.7.1

package/bin/webpack-dev-server.js

@@ -204,6 +204,11 @@ yargs.options({
 		default: "localhost",
 		describe: "The hostname/ip address the server will bind to",
 		group: CONNECTION_GROUP
+	},
+	"allowed-hosts": {
+		type: "string",
+		describe: "A comma-delimited string of hosts that are allowed to access the dev server",
+		group: CONNECTION_GROUP
 	}
 });
 
@@ -233,6 +238,9 @@ function processOptions(wpOpt) {
 	if(argv.host !== "localhost" || !options.host)
 		options.host = argv.host;
 
+	if(argv["allowed-hosts"])
+		options.allowedHosts = argv["allowed-hosts"].split(",");
+
 	if(argv.public)
 		options.public = argv.public;
 
@@ -338,9 +346,12 @@ function processOptions(wpOpt) {
 
 	if(argv["open"] || argv["open-page"]) {
 		options.open = true;
-		options.openPage = argv["open-page"] || "";
+		options.openPage = argv["open-page"];
 	}
 
+	if(options.open && !options.openPage)
+		options.openPage = "";
+
 	if(argv["useLocalIp"])
 		options.useLocalIp = true;
 
@@ -440,6 +451,8 @@ function startDevServer(wpOpt, options) {
 
 function reportReadiness(uri, options) {
 	const useColor = argv.color;
+	const contentBase = Array.isArray(options.contentBase) ? options.contentBase.join(", ") : options.contentBase;
+
 	if(!options.quiet) {
 		let startSentence = `Project is running at ${colorInfo(useColor, uri)}`
 		if(options.socket) {
@@ -448,19 +461,21 @@ function reportReadiness(uri, options) {
 		console.log((argv["progress"] ? "\n" : "") + startSentence);
 
 		console.log(`webpack output is served from ${colorInfo(useColor, options.publicPath)}`);
+
+		if(contentBase)
+			console.log(`Content not from webpack is served from ${colorInfo(useColor, contentBase)}`);
+
+		if(options.historyApiFallback)
+			console.log(`404s will fallback to ${colorInfo(useColor, options.historyApiFallback.index || "/index.html")}`);
+
+		if(options.bonjour)
+			console.log("Broadcasting \"http\" with subtype of \"webpack\" via ZeroConf DNS (Bonjour)");
 	}
-	const contentBase = Array.isArray(options.contentBase) ? options.contentBase.join(", ") : options.contentBase;
-	if(contentBase)
-		console.log(`Content not from webpack is served from ${colorInfo(useColor, contentBase)}`);
-	if(options.historyApiFallback)
-		console.log(`404s will fallback to ${colorInfo(useColor, options.historyApiFallback.index || "/index.html")}`);
 	if(options.open) {
 		open(uri + options.openPage).catch(function() {
 			console.log("Unable to open browser. If you are running in a headless environment, please do not use the open flag.");
 		});
 	}
-	if(options.bonjour)
-		console.log("Broadcasting \"http\" with subtype of \"webpack\" via ZeroConf DNS (Bonjour)");
 }
 
 function broadcastZeroconf(options) {