merging in webpack/master to wolfeidau/add_public_host_flag

Author: chrishowes

.editorconfig

@@ -0,0 +1,5 @@
+root = true
+
+[*.js]
+indent_style=tab
+trim_trailing_whitespace=true

.eslintrc

@@ -0,0 +1,28 @@
+{
+	"env": {
+		"node": true
+	},
+	"plugins": [
+		"nodeca"
+	],
+	"rules": {
+		"strict": 0,
+		"camelcase": 0,
+		"curly": 0,
+		"indent": [0, "tab"],
+		"nodeca/indent": [2, "tabs", 1],
+		"eol-last": 2,
+		"no-shadow": 0,
+		"no-redeclare": 2,
+		"no-extra-bind": 2,
+		"no-empty": 0,
+		"no-process-exit": 2,
+		"no-underscore-dangle": 0,
+		"no-use-before-define": 0,
+		"no-unused-vars": 0,
+		"consistent-return": 0,
+		"no-inner-declarations": 2,
+		"no-loop-func": 2,
+		"space-before-function-paren": [2, "never"]
+	}
+}

.jsbeautifyrc

@@ -0,0 +1,25 @@
+{
+  "js": {
+    "allowed_file_extensions": ["js", "json", "jshintrc", "jsbeautifyrc"],
+    "brace_style": "collapse",
+    "break_chained_methods": false,
+    "e4x": true,
+    "eval_code": false,
+    "end_with_newline": true,
+    "indent_char": "\t",
+    "indent_level": 0,
+    "indent_size": 1,
+    "indent_with_tabs": true,
+    "jslint_happy": false,
+    "jslint_happy_align_switch_case": true,
+    "space_after_anon_function": false,
+    "keep_array_indentation": false,
+    "keep_function_indentation": false,
+    "max_preserve_newlines": 2,
+    "preserve_newlines": true,
+    "space_before_conditional": false,
+    "space_in_paren": false,
+    "unescape_strings": false,
+    "wrap_line_length": 0
+  }
+}

.travis.yml

@@ -0,0 +1,5 @@
+sudo: false
+language: node_js
+node_js:
+  - node
+script: npm run travis

bin/webpack-dev-server.js

@@ -2,6 +2,7 @@
 
 var path = require("path");
 var url = require("url");
+var open = require("open");
 var fs = require("fs");
 
 // Local version replaces global one
@@ -17,44 +18,50 @@ var webpack = require("webpack");
 
 var optimist = require("optimist")
 
-	.usage("webpack-dev-server " + require("../package.json").version + "\n" +
-			"Usage: http://webpack.github.io/docs/webpack-dev-server.html")
+.usage("webpack-dev-server " + require("../package.json").version + "\n" +
+	"Usage: http://webpack.github.io/docs/webpack-dev-server.html")
 
-	.boolean("lazy").describe("lazy")
+.boolean("lazy").describe("lazy")
 
-	.boolean("info").describe("info").default("info", true)
+.boolean("stdin").describe("stdin", "close when stdin ends")
 
-	.boolean("quiet").describe("quiet")
+.boolean("info").describe("info").default("info", true)
 
-	.boolean("inline").describe("inline", "Inline the webpack-dev-server logic into the bundle.")
+.boolean("quiet").describe("quiet")
 
-	.boolean("https").describe("https")
+.boolean("inline").describe("inline", "Inline the webpack-dev-server logic into the bundle.")
 
-	.string("key").describe("key", "Path to a SSL key.")
+.boolean("https").describe("https")
 
-	.string("cert").describe("cert", "Path to a SSL certificate.")
+.string("key").describe("key", "Path to a SSL key.")
 
-	.string("cacert").describe("cacert", "Path to a SSL CA certificate.")
+.string("cert").describe("cert", "Path to a SSL certificate.")
 
-	.string("content-base").describe("content-base", "A directory or URL to serve HTML content from.")
+.string("cacert").describe("cacert", "Path to a SSL CA certificate.")
 
-	.string("content-base-target").describe("content-base-target", "Proxy requests to this target.")
+.string("content-base").describe("content-base", "A directory or URL to serve HTML content from.")
 
-	.boolean("history-api-fallback").describe("history-api-fallback", "Fallback to /index.html for Single Page Applications.")
+.string("content-base-target").describe("content-base-target", "Proxy requests to this target.")
 
-	.boolean("compress").describe("compress", "enable gzip compression")
+.boolean("history-api-fallback").describe("history-api-fallback", "Fallback to /index.html for Single Page Applications.")
 
-	.describe("port", "The port").default("port", 8080)
+.boolean("compress").describe("compress", "enable gzip compression")
 
-	.describe("public", "The public hostname/ip address of the server")
+.boolean("open").describe("open", "Open default browser")
 
-	.describe("host", "The hostname/ip address the server will bind to").default("host", "localhost");
+.describe("port", "The port").default("port", 8080)
+
+.describe("public", "The public hostname/ip address of the server")
+
+.describe("host", "The hostname/ip address the server will bind to").default("host", "localhost");
 
 require("webpack/bin/config-optimist")(optimist);
 
 var argv = optimist.argv;
 
-var wpOpt = require("webpack/bin/convert-argv")(optimist, argv, { outputFilename: "/bundle.js" });
+var wpOpt = require("webpack/bin/convert-argv")(optimist, argv, {
+	outputFilename: "/bundle.js"
+});
 var firstWpOpt = Array.isArray(wpOpt) ? wpOpt[0] : wpOpt;
 
 var options = wpOpt.devServer || firstWpOpt.devServer || {};
@@ -84,6 +91,14 @@ if(!options.filename)
 
 if(!options.watchOptions)
 	options.watchOptions = firstWpOpt.watchOptions;
+
+if(argv["stdin"]) {
+	process.stdin.on('end', function() {
+		process.exit(0);
+	});
+	process.stdin.resume();
+}
+
 if(!options.watchDelay && !options.watchOptions) // TODO remove in next major version
 	options.watchDelay = firstWpOpt.watchDelay;
 
@@ -97,7 +112,9 @@ if(argv["content-base"]) {
 	else if(!/^(https?:)?\/\//.test(options.contentBase))
 		options.contentBase = path.resolve(options.contentBase);
 } else if(argv["content-base-target"]) {
-	options.contentBase = { target: argv["content-base-target"] };
+	options.contentBase = {
+		target: argv["content-base-target"]
+	};
 } else if(!options.contentBase) {
 	options.contentBase = process.cwd();
 }
@@ -142,6 +159,9 @@ if(argv["history-api-fallback"])
 if(argv["compress"])
 	options.compress = true;
 
+if(argv["open"])
+	options.open = true;
+
 var protocol = options.https ? "https" : "http";
 
 if(options.inline) {
@@ -161,16 +181,19 @@ if(options.inline) {
 }
 
 new Server(webpack(wpOpt), options).listen(options.port, options.host, function(err) {
+	var uri = protocol + "://" + options.host + ":" + options.port + "/";
+	if(!options.inline)
+		uri += "webpack-dev-server/";
+
 	if(err) throw err;
-	if(options.inline)
-		console.log(protocol + "://" + options.host + ":" + options.port + "/");
-	else
-		console.log(protocol + "://" + options.host + ":" + options.port + "/webpack-dev-server/");
+	console.log(uri);
 	console.log("webpack result is served from " + options.publicPath);
 	if(typeof options.contentBase === "object")
 		console.log("requests are proxied to " + options.contentBase.target);
 	else
 		console.log("content is served from " + options.contentBase);
 	if(options.historyApiFallback)
 		console.log("404s will fallback to %s", options.historyApiFallback.index || "/index.html");
+	if(options.open)
+		open(uri);
 });

client/index.js

@@ -1,77 +1,89 @@
 var url = require('url');
-var io = require("socket.io-client");
+var SockJS = require("sockjs-client");
 var stripAnsi = require('strip-ansi');
 var scriptElements = document.getElementsByTagName("script");
+var scriptHost = scriptElements[scriptElements.length-1].getAttribute("src").replace(/\/[^\/]+$/, "");
 
+// If this bundle is inlined, use the resource query to get the correct url.
+// Else, get the url from the <script> this file was called with.
 var urlParts = url.parse(typeof __resourceQuery === "string" && __resourceQuery ?
 	__resourceQuery.substr(1) :
-	scriptElements[scriptElements.length-1].getAttribute("src").replace(/\/[^\/]+$/, "")
-);
-
-io = io.connect(
-	url.format({
-		protocol: urlParts.protocol,
-		auth: urlParts.auth,
-		hostname: (urlParts.hostname === '0.0.0.0') ? window.location.hostname : urlParts.hostname,
-		port: urlParts.port
-	}), {
-		path: urlParts.path === '/' ? null : urlParts.path
-	}
+	(scriptHost ? scriptHost : "/"), false, true
 );
 
+var sock = null;
 var hot = false;
 var initial = true;
 var currentHash = "";
 
-io.on("hot", function() {
-	hot = true;
-	console.log("[WDS] Hot Module Replacement enabled.");
-});
-
-io.on("invalid", function() {
-	console.log("[WDS] App updated. Recompiling...");
-});
-
-io.on("hash", function(hash) {
-	currentHash = hash;
-});
-
-io.on("still-ok", function() {
-	console.log("[WDS] Nothing changed.")
-});
+var onSocketMsg = {
+	hot: function() {
+		hot = true;
+		console.log("[WDS] Hot Module Replacement enabled.");
+	},
+	invalid: function() {
+		console.log("[WDS] App updated. Recompiling...");
+	},
+	hash: function(hash) {
+		currentHash = hash;
+	},
+	"still-ok": function() {
+		console.log("[WDS] Nothing changed.")
+	},
+	ok: function() {
+		if(initial) return initial = false;
+		reloadApp();
+	},
+	warnings: function(warnings) {
+		console.log("[WDS] Warnings while compiling.");
+		for(var i = 0; i < warnings.length; i++)
+			console.warn(stripAnsi(warnings[i]));
+		if(initial) return initial = false;
+		reloadApp();
+	},
+	errors: function(errors) {
+		console.log("[WDS] Errors while compiling.");
+		for(var i = 0; i < errors.length; i++)
+			console.error(stripAnsi(errors[i]));
+		if(initial) return initial = false;
+		reloadApp();
+	},
+	"proxy-error": function(errors) {
+		console.log("[WDS] Proxy error.");
+		for(var i = 0; i < errors.length; i++)
+			console.error(stripAnsi(errors[i]));
+		if(initial) return initial = false;
+		reloadApp();
+	}
+};
 
-io.on("ok", function() {
-	if(initial) return initial = false;
-	reloadApp();
-});
+var newConnection = function() {
+	sock = new SockJS(url.format({
+		protocol: urlParts.protocol,
+		auth: urlParts.auth,
+		hostname: (urlParts.hostname === '0.0.0.0') ? window.location.hostname : urlParts.hostname,
+		port: urlParts.port,
+		pathname: urlParts.path == null || urlParts.path === '/' ? "/sockjs-node" : urlParts.path
+	}));
 
-io.on("warnings", function(warnings) {
-	console.log("[WDS] Warnings while compiling.");
-	for(var i = 0; i < warnings.length; i++)
-		console.warn(stripAnsi(warnings[i]));
-	if(initial) return initial = false;
-	reloadApp();
-});
+	sock.onclose = function() {
+		console.error("[WDS] Disconnected!");
 
-io.on("errors", function(errors) {
-	console.log("[WDS] Errors while compiling.");
-	for(var i = 0; i < errors.length; i++)
-		console.error(stripAnsi(errors[i]));
-	if(initial) return initial = false;
-	reloadApp();
-});
+		// Try to reconnect.
+		sock = null;
+		setTimeout(function () {
+			newConnection();
+		}, 2000);
+	};
 
-io.on("proxy-error", function(errors) {
-	console.log("[WDS] Proxy error.");
-	for(var i = 0; i < errors.length; i++)
-		console.error(stripAnsi(errors[i]));
-	if(initial) return initial = false;
-	reloadApp();
-});
+	sock.onmessage = function(e) {
+		// This assumes that all data sent via the websocket is JSON.
+		var msg = JSON.parse(e.data);
+		onSocketMsg[msg.type](msg.data);
+	};
+};
 
-io.on("disconnect", function() {
-	console.error("[WDS] Disconnected!");
-});
+newConnection();
 
 function reloadApp() {
 	if(hot) {

client/live.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0"/><script type="text/javascript" charset="utf-8" src="/__webpack_dev_server__/live.bundle.js"></script></head><body></body></html>
+<!DOCTYPE html><html><head><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta charset="utf-8"/><meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0"/><script type="text/javascript" charset="utf-8" src="/__webpack_dev_server__/live.bundle.js"></script></head><body></body></html>