webpack-dev-server 2.2.1 → 2.4.2

package/README.md

@@ -19,8 +19,6 @@ Use [webpack](https://webpack.js.org) with a development server that provides li
 
 It uses [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) under the hood, which provides fast in-memory access to the webpack assets.
 
-**Note: There are known issues with Node.js v7 and webpack / webpack-dev-server. Please use Node.js v6 for the moment.**
-
 <h2 align="center">Install</h2>
 
 ```

package/bin/webpack-dev-server.js

@@ -5,8 +5,9 @@ const path = require("path");
 const open = require("opn");
 const fs = require("fs");
 const net = require("net");
-const url = require("url");
 const portfinder = require("portfinder");
+const addDevServerEntrypoints = require("../lib/util/addDevServerEntrypoints");
+const createDomain = require("../lib/util/createDomain");
 
 // Local version replaces global one
 try {
@@ -246,7 +247,11 @@ function processOptions(wpOpt) {
 	if(options.contentBase === undefined) {
 		if(argv["content-base"]) {
 			options.contentBase = argv["content-base"];
-			if(/^[0-9]$/.test(options.contentBase))
+			if(Array.isArray(options.contentBase)) {
+				options.contentBase = options.contentBase.map(function(val) {
+					return path.resolve(val);
+				});
+			} else if(/^[0-9]$/.test(options.contentBase))
 				options.contentBase = +options.contentBase;
 			else if(!/^(https?:)?\/\//.test(options.contentBase))
 				options.contentBase = path.resolve(options.contentBase);
@@ -327,33 +332,7 @@ function processOptions(wpOpt) {
 }
 
 function startDevServer(wpOpt, options) {
-	const protocol = options.https ? "https" : "http";
-
-	// the formatted domain (url without path) of the webpack server
-	const domain = url.format({
-		protocol: protocol,
-		hostname: options.host,
-		port: options.socket ? 0 : options.port.toString()
-	});
-
-	if(options.inline !== false) {
-		const devClient = [`${require.resolve("../client/")}?${options.public ? `${protocol}://${options.public}` : domain}`];
-
-		if(options.hotOnly)
-			devClient.push("webpack/hot/only-dev-server");
-		else if(options.hot)
-			devClient.push("webpack/hot/dev-server");
-
-		[].concat(wpOpt).forEach(function(wpOpt) {
-			if(typeof wpOpt.entry === "object" && !Array.isArray(wpOpt.entry)) {
-				Object.keys(wpOpt.entry).forEach(function(key) {
-					wpOpt.entry[key] = devClient.concat(wpOpt.entry[key]);
-				});
-			} else {
-				wpOpt.entry = devClient.concat(wpOpt.entry);
-			}
-		});
-	}
+	addDevServerEntrypoints(wpOpt, options);
 
 	let compiler;
 	try {
@@ -372,7 +351,7 @@ function startDevServer(wpOpt, options) {
 		}));
 	}
 
-	const uri = domain + (options.inline !== false || options.lazy === true ? "/" : "/webpack-dev-server/");
+	const uri = createDomain(options) + (options.inline !== false || options.lazy === true ? "/" : "/webpack-dev-server/");
 
 	let server;
 	try {
@@ -386,6 +365,13 @@ function startDevServer(wpOpt, options) {
 		throw e;
 	}
 
+	["SIGINT", "SIGTERM"].forEach(function(sig) {
+		process.on(sig, function() {
+			server.close();
+			process.exit(); // eslint-disable-line no-process-exit
+		});
+	});
+
 	if(options.socket) {
 		server.listeningApp.on("error", function(e) {
 			if(e.code === "EADDRINUSE") {
@@ -434,8 +420,11 @@ function reportReadiness(uri, options) {
 		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);
+	if(options.open) {
+		open(uri).catch(function() {
+			console.log("Unable to open browser. If you are running in a headless environment, please do not use the open flag.");
+		});
+	}
 }
 
 processOptions(wpOpt);