Merge pull request webpack#404 from undoZen/module-hot-data

sokra · sokra · commit 73650a554b40 · 2014-08-14T10:02:00.000+02:00
fix module.hot.data
diff --git a/lib/HotModuleReplacementPlugin.js b/lib/HotModuleReplacementPlugin.js
@@ -137,7 +137,6 @@ HotModuleReplacementPlugin.prototype.apply = function(compiler) {
 				source + ",",
 				"hot: hotCreateModule(" + varModuleId + "),",
 				"parents: [hotCurrentParent],",
-				"data: hotCurrentModuleData[" + varModuleId + "],",
 				"children: []"
 			]);
 		});
@@ -273,7 +272,10 @@ var hotInitCode = Template.getFunctionContent(function() {
 			removeStatusHandler: function(l) {
 				var idx = hotStatusHandlers.indexOf(l);
 				if(idx >= 0) hotStatusHandlers.splice(idx, 1);
-			}
+			},
+
+			//inherit from previous dispose call
+			data: hotCurrentModuleData[moduleId]
 		};
 		return hot;
 	}
diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js
@@ -46,7 +46,7 @@ function MainTemplate(outputOptions) {
 			"",
 			"// Create a new module (and put it into the cache)",
 			"var module = installedModules[moduleId] = {",
-			this.indent(this.applyPluginsWaterfall("module-obj", chunk, hash, "moduleId")),
+			this.indent(this.applyPluginsWaterfall("module-obj", "", chunk, hash, "moduleId")),
 			"};",
 			"",
 			"// Execute the module function",
