webpack 2.6.0 → 2.6.1

package/lib/FunctionModuleTemplatePlugin.js

@@ -28,7 +28,7 @@ class FunctionModuleTemplatePlugin {
 				if(Array.isArray(module.providedExports))
 					source.add("/* exports provided: " + module.providedExports.join(", ") + " */\n");
 				else if(module.providedExports)
-					source.add("/* unknown exports provided */\n");
+					source.add("/* no static exports found */\n");
 				if(Array.isArray(module.usedExports))
 					source.add("/* exports used: " + module.usedExports.join(", ") + " */\n");
 				else if(module.usedExports)

package/lib/JsonpMainTemplatePlugin.js

@@ -19,9 +19,7 @@ class JsonpMainTemplatePlugin {
 					this.indent(
 						chunk.ids.map(id => `${JSON.stringify(id)}: 0`).join(",\n")
 					),
-					"};",
-					"",
-					"var resolvedPromise = new Promise(function(resolve) { resolve(); });"
+					"};"
 				]);
 			}
 			return source;
@@ -81,26 +79,27 @@ class JsonpMainTemplatePlugin {
 		});
 		mainTemplate.plugin("require-ensure", function(_, chunk, hash) {
 			return this.asString([
-				"if(installedChunks[chunkId] === 0) {",
+				"var installedChunkData = installedChunks[chunkId];",
+				"if(installedChunkData === 0) {",
 				this.indent([
-					"return resolvedPromise;"
+					"return new Promise(function(resolve) { resolve(); });"
 				]),
 				"}",
 				"",
 				"// a Promise means \"currently loading\".",
-				"if(installedChunks[chunkId]) {",
+				"if(installedChunkData) {",
 				this.indent([
-					"return installedChunks[chunkId][2];"
+					"return installedChunkData[2];"
 				]),
 				"}",
 				"",
 				"// setup Promise in chunk cache",
 				"var promise = new Promise(function(resolve, reject) {",
 				this.indent([
-					"installedChunks[chunkId] = [resolve, reject];"
+					"installedChunkData = installedChunks[chunkId] = [resolve, reject];"
 				]),
 				"});",
-				"installedChunks[chunkId][2] = promise;",
+				"installedChunkData[2] = promise;",
 				"",
 				"// start chunk loading",
 				"var head = document.getElementsByTagName('head')[0];",

package/lib/dependencies/RequireEnsureDependenciesBlock.js

@@ -11,14 +11,8 @@ module.exports = class RequireEnsureDependenciesBlock extends AsyncDependenciesB
 		super(chunkName, module, loc);
 		this.expr = expr;
 		const successBodyRange = successExpression && successExpression.body && successExpression.body.range;
-		const errorBodyRange = errorExpression && errorExpression.body && errorExpression.body.range;
-		this.range = null;
 		if(successBodyRange) {
-			if(errorBodyRange) {
-				this.range = [successBodyRange[0] + 1, errorBodyRange[1] - 1];
-			} else {
-				this.range = [successBodyRange[0] + 1, successBodyRange[1] - 1];
-			}
+			this.range = [successBodyRange[0] + 1, successBodyRange[1] - 1];
 		}
 		this.chunkNameRange = chunkNameRange;
 		const dep = new RequireEnsureDependency(this);

package/lib/webworker/WebWorkerMainTemplatePlugin.js

@@ -21,9 +21,7 @@ class WebWorkerMainTemplatePlugin {
 							return id + ": 1";
 						}).join(",\n")
 					),
-					"};",
-					"",
-					"var resolvedPromise = new Promise(function(resolve) { resolve(); });"
+					"};"
 				]);
 			}
 			return source;
@@ -31,22 +29,26 @@ class WebWorkerMainTemplatePlugin {
 		mainTemplate.plugin("require-ensure", function(_, chunk, hash) {
 			const chunkFilename = this.outputOptions.chunkFilename;
 			return this.asString([
-				"// \"1\" is the signal for \"already loaded\"",
-				"if(!installedChunks[chunkId]) {",
+				"return new Promise(function(resolve) {",
 				this.indent([
-					"importScripts(" +
-					this.applyPluginsWaterfall("asset-path", JSON.stringify(chunkFilename), {
-						hash: "\" + " + this.renderCurrentHashCode(hash) + " + \"",
-						hashWithLength: function(length) {
-							return "\" + " + this.renderCurrentHashCode(hash, length) + " + \"";
-						}.bind(this),
-						chunk: {
-							id: "\" + chunkId + \""
-						}
-					}) + ");"
+					"// \"1\" is the signal for \"already loaded\"",
+					"if(!installedChunks[chunkId]) {",
+					this.indent([
+						"importScripts(" +
+						this.applyPluginsWaterfall("asset-path", JSON.stringify(chunkFilename), {
+							hash: "\" + " + this.renderCurrentHashCode(hash) + " + \"",
+							hashWithLength: function(length) {
+								return "\" + " + this.renderCurrentHashCode(hash, length) + " + \"";
+							}.bind(this),
+							chunk: {
+								id: "\" + chunkId + \""
+							}
+						}) + ");"
+					]),
+					"}",
+					"resolve();"
 				]),
-				"}",
-				"return resolvedPromise;"
+				"});"
 			]);
 		});
 		mainTemplate.plugin("bootstrap", function(source, chunk, hash) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "dependencies": {