fix incorrect update of the WebWorker Template

sokra · sokra · commit a6f0ca9c07a0 · 2017-11-21T12:56:55.000+01:00
diff --git a/lib/webworker/WebWorkerChunkTemplatePlugin.js b/lib/webworker/WebWorkerChunkTemplatePlugin.js
@@ -13,7 +13,7 @@ class WebWorkerChunkTemplatePlugin {
 		chunkTemplate.plugin("render", (modules, chunk) => {
 			const chunkCallbackName = chunkTemplate.outputOptions.chunkCallbackName || Template.toIdentifier("webpackChunk" + (chunkTemplate.outputOptions.library || ""));
 			const source = new ConcatSource();
-			source.add(`${chunkCallbackName}(${JSON.stringify(chunk.ids)},`);
+			source.add(`self[${JSON.stringify(chunkCallbackName)}](${JSON.stringify(chunk.ids)},`);
 			source.add(modules);
 			source.add(")");
 			return source;
diff --git a/lib/webworker/WebWorkerMainTemplatePlugin.js b/lib/webworker/WebWorkerMainTemplatePlugin.js
@@ -27,7 +27,7 @@ class WebWorkerMainTemplatePlugin {
 		mainTemplate.plugin("require-ensure", (_, chunk, hash) => {
 			const chunkFilename = mainTemplate.outputOptions.chunkFilename;
 			return mainTemplate.asString([
-				"return new Promise(function(resolve) {",
+				"promises.push(Promise.resolve().then(function() {",
 				mainTemplate.indent([
 					"// \"1\" is the signal for \"already loaded\"",
 					"if(!installedChunks[chunkId]) {",
@@ -42,17 +42,16 @@ class WebWorkerMainTemplatePlugin {
 						}) + ");"
 					]),
 					"}",
-					"resolve();"
 				]),
-				"});"
+				"}));"
 			]);
 		});
 		mainTemplate.plugin("bootstrap", (source, chunk, hash) => {
 			if(chunk.getNumberOfChunks() > 0) {
 				const chunkCallbackName = mainTemplate.outputOptions.chunkCallbackName || Template.toIdentifier("webpackChunk" + (mainTemplate.outputOptions.library || ""));
 				return mainTemplate.asString([
 					source,
-					`mainTemplate[${JSON.stringify(chunkCallbackName)}] = function webpackChunkCallback(chunkIds, moreModules) {`,
+					`self[${JSON.stringify(chunkCallbackName)}] = function webpackChunkCallback(chunkIds, moreModules) {`,
 					mainTemplate.indent([
 						"for(var moduleId in moreModules) {",
 						mainTemplate.indent(mainTemplate.renderAddModule(hash, chunk, "moduleId", "moreModules[moduleId]")),
