Merge branch 'fix_nesting_webpack_require' of https://github.com/jRiest/webpack into jRiest-fix_nesting_webpack_require

sokra · sokra · commit e9d06a730ac4 · 2015-05-30T13:17:46.000+02:00
diff --git a/lib/FunctionModuleTemplatePlugin.js b/lib/FunctionModuleTemplatePlugin.js
@@ -12,7 +12,11 @@ module.exports = FunctionModuleTemplatePlugin;
 FunctionModuleTemplatePlugin.prototype.apply = function(moduleTemplate) {
 	moduleTemplate.plugin("render", function(moduleSource, module) {
 		var source = new ConcatSource();
-		source.add("/***/ function(" + ["module", "exports", "__webpack_require__"].concat(module.arguments || []).join(", ") + ") {\n\n");
+		var defaultArguments = ["module", "exports"];
+		if (!module.external) {
+			defaultArguments.push("__webpack_require__");
+		}
+		source.add("/***/ function(" + defaultArguments.concat(module.arguments || []).join(", ") + ") {\n\n");
 		source.add(new PrefixSource(this.outputOptions.sourcePrefix, moduleSource));
 		source.add("\n\n/***/ }");
 		return source;
