Allow to share hotUpdateCallback

sokra · sokra · commit 887852f6df97 · 2014-08-25T10:19:04.000+02:00
fixes webpack#423
diff --git a/lib/HotModuleReplacementPlugin.js b/lib/HotModuleReplacementPlugin.js
@@ -318,6 +318,7 @@ var hotInitCode = Template.getFunctionContent(function() {
 	var hotWaitingFiles = 0;
 	var hotChunksLoading = 0;
 	var hotWaitingFilesMap = {};
+	var hotRequestedFilesMap = {};
 	var hotAvailibleFilesMap = {};
 	var hotCallback;
 
@@ -336,6 +337,7 @@ var hotInitCode = Template.getFunctionContent(function() {
 				return;
 			}
 
+			hotRequestedFilesMap = {};
 			hotAvailibleFilesMap = {};
 			hotWaitingFilesMap = {};
 			for(var i = 0; i < update.c.length; i++)
@@ -355,6 +357,9 @@ var hotInitCode = Template.getFunctionContent(function() {
 	}
 
 	function hotAddUpdateChunk(chunkId, moreModules) {
+		if(!hotAvailibleFilesMap[chunkId] || !hotRequestedFilesMap[chunkId])
+			return;
+		hotRequestedFilesMap[chunkId] = false;
 		for(var moduleId in moreModules) {
 			hotUpdate[moduleId] = moreModules[moduleId];
 		}
@@ -367,6 +372,7 @@ var hotInitCode = Template.getFunctionContent(function() {
 		if(!hotAvailibleFilesMap[chunkId]) {
 			hotWaitingFilesMap[chunkId] = true;
 		} else {
+			hotRequestedFilesMap[chunkId] = true;
 			hotWaitingFiles++;
 			hotDownloadUpdateChunk(chunkId);
 		}
diff --git a/lib/JsonpMainTemplatePlugin.js b/lib/JsonpMainTemplatePlugin.js
@@ -120,9 +120,12 @@ JsonpMainTemplatePlugin.prototype.apply = function(mainTemplate) {
 			.replace(Template.REGEXP_ID, "\" + chunkId + \"");
 		var currentHotUpdateMainFilename = JSON.stringify(hotUpdateMainFilename)
 			.replace(Template.REGEXP_HASH, "\" + " + this.renderCurrentHashCode(hash) + " + \"");
-		return source + "\nthis[" + JSON.stringify(hotUpdateFunction) + "] = " + Template.getFunctionContent(function() {
+		return source + "\n"+
+			"var parentHotUpdateCallback = this[" + JSON.stringify(hotUpdateFunction) + "];\n" +
+			"this[" + JSON.stringify(hotUpdateFunction) + "] = " + Template.getFunctionContent(function() {
 			function webpackHotUpdateCallback(chunkId, moreModules) {
 				hotAddUpdateChunk(chunkId, moreModules);
+				if(parentHotUpdateCallback) parentHotUpdateCallback(chunkId, moreModules);
 			}
 
 			function hotDownloadUpdateChunk(chunkId) {
