fixed wrong this within modules fixes webpack#97

jhnns · jhnns · commit 2dd0ba95520d · 2013-10-01T02:31:45.000+02:00
diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js
@@ -95,13 +95,13 @@ MainTemplate.prototype.renderRequireContent = function(hash, chunk) {
 		"};",
 		"",
 		"// Execute the module function",
-		"modules[moduleId].call(null, module, module.exports, " + this.renderRequireFunctionForModule(hash, chunk, "moduleId") + ");",
+		"modules[moduleId].call(module.exports, module, module.exports, " + this.renderRequireFunctionForModule(hash, chunk, "moduleId") + ");",
 		"",
 		"// Flag the module as loaded",
 		"module.loaded = true;",
 		"",
 		"// Return the exports of the module",
-		"return module.exports;",
+		"return module.exports;"
 	];
 };
 
@@ -155,8 +155,8 @@ MainTemplate.prototype.renderInitModules = function(hash, chunk, moduleTemplate,
 };
 
 MainTemplate.prototype.renderAddModule = function(hash, chunk, varModuleId, varModule) {
-	return ["modules[" + varModuleId + "] = " + varModule + ";"]
-}
+	return ["modules[" + varModuleId + "] = " + varModule + ";"];
+};
 
 MainTemplate.prototype.updateHash = function(hash) {
 	hash.update("maintemplate");
diff --git a/lib/NormalModule.js b/lib/NormalModule.js
@@ -106,7 +106,7 @@ NormalModule.prototype.source = function(dependencyTemplates, outputOptions, req
 				if(varNames.length == 0) return;
 
 				varStartCode += "/* WEBPACK VAR INJECTION */(function(require, " + varNames.join(", ") + ") {";
-				varEndCode = "}(require, " + varExpressions.map(function(e) {return e.source()}).join(", ") + "))" + varEndCode;
+				varEndCode = "}.call(exports, require, " + varExpressions.map(function(e) {return e.source()}).join(", ") + "))" + varEndCode;
 
 				varNames.length = 0;
 				varExpressions.length = 0;
