executeModules is an array, test hasOwnProperty

sokra · sokra · commit fd5b8960b714 · 2016-06-04T11:45:07.000+02:00
webpack#2232 fixes webpack#2546
diff --git a/lib/JsonpMainTemplatePlugin.js b/lib/JsonpMainTemplatePlugin.js
@@ -82,7 +82,7 @@ JsonpMainTemplatePlugin.prototype.apply = function(mainTemplate) {
 		return this.asString([
 			"if(installedChunks[chunkId] === 0)",
 			this.indent([
-				"return Promise.resolve()"
+				"return Promise.resolve();"
 			]),
 			"",
 			"// an Promise means \"currently loading\".",
@@ -112,7 +112,7 @@ JsonpMainTemplatePlugin.prototype.apply = function(mainTemplate) {
 				"",
 				"// install a JSONP callback for chunk loading",
 				"var parentJsonpFunction = window[" + JSON.stringify(jsonpFunction) + "];",
-				"window[" + JSON.stringify(jsonpFunction) + "] = function webpackJsonpCallback(chunkIds, moreModules, executeModule) {",
+				"window[" + JSON.stringify(jsonpFunction) + "] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {",
 				this.indent([
 					"// add \"moreModules\" to the modules object,",
 					"// then flag all \"chunkIds\" as loaded and fire callback",
@@ -126,17 +126,26 @@ JsonpMainTemplatePlugin.prototype.apply = function(mainTemplate) {
 					]),
 					"}",
 					"for(moduleId in moreModules) {",
-					this.indent(this.renderAddModule(hash, chunk, "moduleId", "moreModules[moduleId]")),
+					this.indent([
+						"if(Object.prototype.hasOwnProperty.call(moreModules, moduleId))",
+						this.indent(this.renderAddModule(hash, chunk, "moduleId", "moreModules[moduleId]")),
+					]),
 					"}",
-					"if(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules);",
+					"if(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);",
 					"while(resolves.length)",
-					this.indent("resolves.shift()();"), (this.entryPointInChildren(chunk) ? [
-						"if(executeModule + 1) { // typeof executeModule === \"number\"",
+					this.indent("resolves.shift()();"),
+					this.entryPointInChildren(chunk) ? [
+						"if(executeModules) {",
 						this.indent([
-							"return " + this.requireFn + "(executeModule);"
+							"for(moduleId in executeModules) {",
+							this.indent([
+								"if(Object.prototype.hasOwnProperty.call(executeModules, moduleId))",
+								this.indent("return " + this.requireFn + "(moduleId);")
+							]),
+							"}"
 						]),
 						"}"
-					] : "")
+					] : ""
 				]),
 				"};"
 			]);
