From 7a3df06eb573d36142bd1a8e03c5ce8752d300b3 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Wed, 24 May 2017 15:10:37 +0200
Subject: fix build issues and add typedoc

---
 node_modules/webpack/lib/JsonpMainTemplatePlugin.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'node_modules/webpack/lib/JsonpMainTemplatePlugin.js')

diff --git a/node_modules/webpack/lib/JsonpMainTemplatePlugin.js b/node_modules/webpack/lib/JsonpMainTemplatePlugin.js
index 8034ca5d5..daba5b3e3 100644
--- a/node_modules/webpack/lib/JsonpMainTemplatePlugin.js
+++ b/node_modules/webpack/lib/JsonpMainTemplatePlugin.js
@@ -19,7 +19,9 @@ class JsonpMainTemplatePlugin {
 					this.indent(
 						chunk.ids.map(id => `${JSON.stringify(id)}: 0`).join(",\n")
 					),
-					"};"
+					"};",
+					"",
+					"var resolvedPromise = new Promise(function(resolve) { resolve(); });"
 				]);
 			}
 			return source;
@@ -28,7 +30,7 @@ class JsonpMainTemplatePlugin {
 			const chunkFilename = this.outputOptions.chunkFilename;
 			const chunkMaps = chunk.getChunkMaps();
 			const crossOriginLoading = this.outputOptions.crossOriginLoading;
-			const chunkLoadTimeout = this.outputOptions.chunkLoadTimeout || 120000;
+			const chunkLoadTimeout = this.outputOptions.chunkLoadTimeout;
 			const scriptSrcPath = this.applyPluginsWaterfall("asset-path", JSON.stringify(chunkFilename), {
 				hash: `" + ${this.renderCurrentHashCode(hash)} + "`,
 				hashWithLength: length => `" + ${this.renderCurrentHashCode(hash, length)} + "`,
@@ -81,7 +83,7 @@ class JsonpMainTemplatePlugin {
 			return this.asString([
 				"if(installedChunks[chunkId] === 0) {",
 				this.indent([
-					"return Promise.resolve();"
+					"return resolvedPromise;"
 				]),
 				"}",
 				"",
-- 
cgit v1.2.3