Merge branch 'web-worker-hmr' of https://github.com/elliottsj/webpack-dev-server into elliottsj-web-worker-hmr

# Conflicts:
#	client/index.js

Author: sokra

client/index.js

@@ -1,15 +1,16 @@
 var url = require('url');
 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) :
-	(scriptHost ? scriptHost : "/"), false, true
-);
+var urlParts;
+if (typeof __resourceQuery === "string" && __resourceQuery) {
+	// If this bundle is inlined, use the resource query to get the correct url.
+	urlParts = url.parse(__resourceQuery.substr(1));
+} else {
+	// Else, get the url from the <script> this file was called with.
+	var scriptElements = document.getElementsByTagName("script");
+	var scriptHost = scriptElements[scriptElements.length-1].getAttribute("src").replace(/\/[^\/]+$/, "");
+	urlParts = url.parse((scriptHost ? scriptHost : "/"), false, true);
+}
 
 var sock = null;
 var hot = false;
@@ -88,7 +89,12 @@ newConnection();
 function reloadApp() {
 	if(hot) {
 		console.log("[WDS] App hot update...");
-		window.postMessage("webpackHotUpdate" + currentHash, "*");
+		var hotEmitter = require("webpack/hot/emitter");
+		hotEmitter.emit("webpackHotUpdate", currentHash);
+		if(typeof window !== "undefined") {
+			// broadcast update to window
+			window.postMessage("webpackHotUpdate" + currentHash, "*");
+		}
 	} else {
 		console.log("[WDS] App updated. Reloading...");
 		window.location.reload();