Merge pull request #368 from chrishowes/wolfeidau

[MERGABLE] Added a flag for public ip to seed the inline frame.

Author: sokra

bin/webpack-dev-server.js

@@ -51,6 +51,8 @@ var optimist = require("optimist")
 
 .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);
@@ -67,6 +69,9 @@ var options = wpOpt.devServer || firstWpOpt.devServer || {};
 if(argv.host !== "localhost" || !options.host)
 	options.host = argv.host;
 
+if(!options.public)
+	options.public = argv.public;
+
 if(argv.port !== 8080 || !options.port)
 	options.port = argv.port;
 
@@ -160,7 +165,7 @@ if(argv["open"])
 var protocol = options.https ? "https" : "http";
 
 if(options.inline) {
-	var devClient = [require.resolve("../client/") + "?" + protocol + "://" + options.host + ":" + options.port];
+	var devClient = [require.resolve("../client/") + "?" + protocol + "://" + (options.public || (options.host + ":" + options.port))];
 
 	if(options.hot)
 		devClient.push("webpack/hot/dev-server");