aboutsummaryrefslogtreecommitdiff
path: root/node_modules/webpack/lib/JsonpMainTemplatePlugin.js
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-05-24 15:10:37 +0200
committerFlorian Dold <florian.dold@gmail.com>2017-05-24 15:11:17 +0200
commit7a3df06eb573d36142bd1a8e03c5ce8752d300b3 (patch)
tree70bfaea8884c374876f607774850a3a51c0cb381 /node_modules/webpack/lib/JsonpMainTemplatePlugin.js
parentaca1143cb9eed16cf37f04e475e4257418dd18ac (diff)
fix build issues and add typedoc
Diffstat (limited to 'node_modules/webpack/lib/JsonpMainTemplatePlugin.js')
-rw-r--r--node_modules/webpack/lib/JsonpMainTemplatePlugin.js8
1 files changed, 5 insertions, 3 deletions
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;"
]),
"}",
"",