webpack 3.8.0 → 3.10.0

package/README.md

@@ -24,6 +24,9 @@
 	<a href="https://opencollective.com/webpack#sponsors">
 		<img src="https://opencollective.com/webpack/sponsors/badge.svg">
 	</a>
+	<a href="https://github.com/webpack/webpack/graphs/contributors">
+		<img src="https://img.shields.io/github/contributors/webpack/webpack.svg">
+	</a>
 	<a href="https://gitter.im/webpack/webpack">
 		<img src="https://badges.gitter.im/webpack/webpack.svg">
 	</a>

package/bin/webpack.js

@@ -333,16 +333,19 @@ yargs.parse(process.argv.slice(2), (err, argv, output) => {
 		var compiler;
 		try {
 			compiler = webpack(options);
-		} catch(e) {
-			var WebpackOptionsValidationError = require("../lib/WebpackOptionsValidationError");
-			if(e instanceof WebpackOptionsValidationError) {
+		} catch(err) {
+			if(err.name === "WebpackOptionsValidationError") {
 				if(argv.color)
-					console.error("\u001b[1m\u001b[31m" + e.message + "\u001b[39m\u001b[22m");
+					console.error(
+						`\u001b[1m\u001b[31m${err.message}\u001b[39m\u001b[22m`
+					);
 				else
-					console.error(e.message);
-				process.exit(1); // eslint-disable-line no-process-exit
+					console.error(err.message);
+				// eslint-disable-next-line no-process-exit
+				process.exit(1);
 			}
-			throw e;
+
+			throw err;
 		}
 
 		if(argv.progress) {

package/lib/Compilation.js

@@ -1425,7 +1425,7 @@ class Compilation extends Tapable {
 	}
 
 	createChildCompiler(name, outputOptions, plugins) {
-		var idx = (this.childrenCounters[name] || 0);
+		const idx = (this.childrenCounters[name] || 0);
 		this.childrenCounters[name] = idx + 1;
 		return this.compiler.createChildCompiler(this, name, idx, outputOptions, plugins);
 	}

package/lib/Compiler.js

@@ -6,6 +6,7 @@
 
 const path = require("path");
 const Tapable = require("tapable");
+const util = require("util");
 
 const Compilation = require("./Compilation");
 const Stats = require("./Stats");
@@ -186,35 +187,30 @@ class Compiler extends Tapable {
 			loader: null,
 			context: null
 		};
-		let deprecationReported = false;
 		this.parser = {
-			plugin: (hook, fn) => {
-				if(!deprecationReported) {
-					console.warn("webpack: Using compiler.parser is deprecated.\n" +
-						"Use compiler.plugin(\"compilation\", function(compilation, data) {\n  data.normalModuleFactory.plugin(\"parser\", function(parser, options) { parser.plugin(/* ... */); });\n}); instead. " +
-						"It was called " + new Error().stack.split("\n")[2].trim() + ".");
-					deprecationReported = true;
-				}
-				this.plugin("compilation", (compilation, data) => {
-					data.normalModuleFactory.plugin("parser", parser => {
-						parser.plugin(hook, fn);
+			plugin: util.deprecate(
+				(hook, fn) => {
+					this.plugin("compilation", (compilation, data) => {
+						data.normalModuleFactory.plugin("parser", parser => {
+							parser.plugin(hook, fn);
+						});
 					});
-				});
-			},
-			apply: () => {
-				const args = arguments;
-				if(!deprecationReported) {
-					console.warn("webpack: Using compiler.parser is deprecated.\n" +
-						"Use compiler.plugin(\"compilation\", function(compilation, data) {\n  data.normalModuleFactory.plugin(\"parser\", function(parser, options) { parser.apply(/* ... */); });\n}); instead. " +
-						"It was called " + new Error().stack.split("\n")[2].trim() + ".");
-					deprecationReported = true;
-				}
-				this.plugin("compilation", (compilation, data) => {
-					data.normalModuleFactory.plugin("parser", parser => {
-						parser.apply.apply(parser, args);
+				},
+				"webpack: Using compiler.parser is deprecated.\n" +
+				"Use compiler.plugin(\"compilation\", function(compilation, data) {\n  data.normalModuleFactory.plugin(\"parser\", function(parser, options) { parser.plugin(/* ... */); });\n}); instead. "
+			),
+			apply: util.deprecate(
+				() => {
+					const args = arguments;
+					this.plugin("compilation", (compilation, data) => {
+						data.normalModuleFactory.plugin("parser", parser => {
+							parser.apply.apply(parser, args);
+						});
 					});
-				});
-			}
+				},
+				"webpack: Using compiler.parser is deprecated.\n" +
+				"Use compiler.plugin(\"compilation\", function(compilation, data) {\n  data.normalModuleFactory.plugin(\"parser\", function(parser, options) { parser.apply(/* ... */); });\n}); instead. "
+			)
 		};
 
 		this.options = {};

package/lib/DllModuleFactory.js

@@ -4,8 +4,8 @@
 */
 "use strict";
 
-var Tapable = require("tapable");
-var DllModule = require("./DllModule");
+const Tapable = require("tapable");
+const DllModule = require("./DllModule");
 
 class DllModuleFactory extends Tapable {
 	constructor() {

package/lib/DllReferencePlugin.js

@@ -42,7 +42,7 @@ class DllReferencePlugin {
 				manifest = params["dll reference " + manifest];
 			}
 			const name = this.options.name || manifest.name;
-			const sourceType = this.options.sourceType || "var";
+			const sourceType = this.options.sourceType || (manifest && manifest.type) || "var";
 			const externals = {};
 			const source = "dll-reference " + name;
 			externals[source] = name;

package/lib/EvalSourceMapDevToolModuleTemplatePlugin.js

@@ -55,7 +55,7 @@ class EvalSourceMapDevToolModuleTemplatePlugin {
 			sourceMap.sources = moduleFilenames;
 			if(sourceMap.sourcesContent) {
 				sourceMap.sourcesContent = sourceMap.sourcesContent.map(function(content, i) {
-					return `${content}\n\n\n${ModuleFilenameHelpers.createFooter(modules[i], this.requestShortener)}`;
+					return typeof content === "string" ? `${content}\n\n\n${ModuleFilenameHelpers.createFooter(modules[i], this.requestShortener)}` : null;
 				}, this);
 			}
 			sourceMap.sourceRoot = options.sourceRoot || "";

package/lib/ExternalsPlugin.js

@@ -4,7 +4,7 @@
 */
 "use strict";
 
-var ExternalModuleFactoryPlugin = require("./ExternalModuleFactoryPlugin");
+const ExternalModuleFactoryPlugin = require("./ExternalModuleFactoryPlugin");
 
 class ExternalsPlugin {
 	constructor(type, externals) {

package/lib/FlagDependencyUsagePlugin.js

@@ -30,7 +30,7 @@ class FlagDependencyUsagePlugin {
 					else if(usedExports === true)
 						module.usedExports = true;
 					else if(Array.isArray(usedExports)) {
-						var old = module.usedExports ? module.usedExports.length : -1;
+						const old = module.usedExports ? module.usedExports.length : -1;
 						module.usedExports = addToSet(module.usedExports || [], usedExports);
 						if(module.usedExports.length === old)
 							return;

package/lib/HotModuleReplacementPlugin.js

@@ -25,6 +25,11 @@ module.exports = class HotModuleReplacementPlugin {
 		const requestTimeout = this.requestTimeout;
 		const hotUpdateChunkFilename = compiler.options.output.hotUpdateChunkFilename;
 		const hotUpdateMainFilename = compiler.options.output.hotUpdateMainFilename;
+		compiler.plugin("additional-pass", callback => {
+			if(multiStep)
+				return setTimeout(callback, fullBuildTimeout);
+			return callback();
+		});
 		compiler.plugin("compilation", (compilation, params) => {
 			const hotUpdateChunkTemplate = compilation.hotUpdateChunkTemplate;
 			if(!hotUpdateChunkTemplate) return;
@@ -88,11 +93,6 @@ module.exports = class HotModuleReplacementPlugin {
 				if(multiStep && !recompilation && !initialPass)
 					return true;
 			});
-			compiler.plugin("additional-pass", callback => {
-				if(multiStep)
-					return setTimeout(callback, fullBuildTimeout);
-				return callback();
-			});
 			compilation.plugin("additional-chunk-assets", function() {
 				const records = this.records;
 				if(records.hash === this.hash) return;

package/lib/JsonpMainTemplatePlugin.js

@@ -195,8 +195,8 @@ class JsonpMainTemplatePlugin {
 function hotDisposeChunk(chunkId) {
 	delete installedChunks[chunkId];
 }
-var parentHotUpdateCallback = this[${JSON.stringify(hotUpdateFunction)}];
-this[${JSON.stringify(hotUpdateFunction)}] = ${runtimeSource}`;
+var parentHotUpdateCallback = window[${JSON.stringify(hotUpdateFunction)}];
+window[${JSON.stringify(hotUpdateFunction)}] = ${runtimeSource}`;
 		});
 		mainTemplate.plugin("hash", function(hash) {
 			hash.update("jsonp");

package/lib/OptionsDefaulter.js

@@ -6,7 +6,7 @@
 
 function getProperty(obj, name) {
 	name = name.split(".");
-	for(var i = 0; i < name.length - 1; i++) {
+	for(let i = 0; i < name.length - 1; i++) {
 		obj = obj[name[i]];
 		if(typeof obj !== "object" || !obj) return;
 	}
@@ -15,7 +15,7 @@ function getProperty(obj, name) {
 
 function setProperty(obj, name, value) {
 	name = name.split(".");
-	for(var i = 0; i < name.length - 1; i++) {
+	for(let i = 0; i < name.length - 1; i++) {
 		if(typeof obj[name[i]] !== "object" && typeof obj[name[i]] !== "undefined") return;
 		if(!obj[name[i]]) obj[name[i]] = {};
 		obj = obj[name[i]];

package/lib/SourceMapDevToolPlugin.js

@@ -158,7 +158,7 @@ class SourceMapDevToolPlugin {
 					const moduleFilenames = modules.map(m => moduleToSourceNameMapping.get(m));
 					sourceMap.sources = moduleFilenames;
 					if(sourceMap.sourcesContent && !options.noSources) {
-						sourceMap.sourcesContent = sourceMap.sourcesContent.map((content, i) => `${content}\n\n\n${ModuleFilenameHelpers.createFooter(modules[i], requestShortener)}`);
+						sourceMap.sourcesContent = sourceMap.sourcesContent.map((content, i) => typeof content === "string" ? `${content}\n\n\n${ModuleFilenameHelpers.createFooter(modules[i], requestShortener)}` : null);
 					} else {
 						sourceMap.sourcesContent = undefined;
 					}
@@ -181,14 +181,14 @@ class SourceMapDevToolPlugin {
 						}
 						let sourceMapFile = compilation.getPath(sourceMapFilename, {
 							chunk,
-							filename,
+							filename: options.fileContext ? path.relative(options.fileContext, filename) : filename,
 							query,
 							basename: basename(filename)
 						});
 						if(sourceMapFile.indexOf("[contenthash]") !== -1) {
 							sourceMapFile = sourceMapFile.replace(/\[contenthash\]/g, crypto.createHash("md5").update(sourceMapString).digest("hex"));
 						}
-						const sourceMapUrl = path.relative(path.dirname(file), sourceMapFile).replace(/\\/g, "/");
+						const sourceMapUrl = options.publicPath ? options.publicPath + sourceMapFile.replace(/\\/g, "/") : path.relative(path.dirname(file), sourceMapFile).replace(/\\/g, "/");
 						if(currentSourceMappingURLComment !== false) {
 							asset.__SourceMapDevToolData[file] = compilation.assets[file] = new ConcatSource(new RawSource(source), currentSourceMappingURLComment.replace(/\[url\]/g, sourceMapUrl));
 						}

package/lib/UmdMainTemplatePlugin.js

@@ -171,7 +171,7 @@ class UmdMainTemplatePlugin {
 					"		for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];\n" +
 					"	}\n"
 				) +
-				"})(this, function(" + externalsArguments(externals) + ") {\nreturn ", "webpack/universalModuleDefinition"), source, ";\n})");
+				"})(typeof self !== 'undefined' ? self : this, function(" + externalsArguments(externals) + ") {\nreturn ", "webpack/universalModuleDefinition"), source, ";\n})");
 		});
 		mainTemplate.plugin("global-hash-paths", (paths) => {
 			if(this.names.root) paths = paths.concat(this.names.root);

package/lib/WebpackOptionsValidationError.js

@@ -35,10 +35,21 @@ const getSchemaPartText = (schemaPart, additionalPath) => {
 	while(schemaPart.$ref) schemaPart = getSchemaPart(schemaPart.$ref);
 	let schemaText = WebpackOptionsValidationError.formatSchema(schemaPart);
 	if(schemaPart.description)
-		schemaText += `\n${schemaPart.description}`;
+		schemaText += `\n-> ${schemaPart.description}`;
 	return schemaText;
 };
 
+const getSchemaPartDescription = schemaPart => {
+	while(schemaPart.$ref) schemaPart = getSchemaPart(schemaPart.$ref);
+	if(schemaPart.description)
+		return `\n-> ${schemaPart.description}`;
+	return "";
+};
+
+const filterChildren = children => {
+	return children.filter(err => err.keyword !== "anyOf" && err.keyword !== "allOf" && err.keyword !== "oneOf");
+};
+
 const indent = (str, prefix, firstLine) => {
 	if(firstLine) {
 		return prefix + str.replace(/\n(?!$)/g, "\n" + prefix);
@@ -143,8 +154,16 @@ class WebpackOptionsValidationError extends WebpackError {
 			return baseMessage;
 		} else if(err.keyword === "oneOf" || err.keyword === "anyOf") {
 			if(err.children && err.children.length > 0) {
+				if(err.schema.length === 1) {
+					const lastChild = err.children[err.children.length - 1];
+					const remainingChildren = err.children.slice(0, err.children.length - 1);
+					return WebpackOptionsValidationError.formatValidationError(Object.assign({}, lastChild, {
+						children: remainingChildren,
+						parentSchema: Object.assign({}, err.parentSchema, lastChild.parentSchema)
+					}));
+				}
 				return `${dataPath} should be one of these:\n${getSchemaPartText(err.parentSchema)}\n` +
-					`Details:\n${err.children.map(err => " * " + indent(WebpackOptionsValidationError.formatValidationError(err), "   ", false)).join("\n")}`;
+					`Details:\n${filterChildren(err.children).map(err => " * " + indent(WebpackOptionsValidationError.formatValidationError(err), "   ", false)).join("\n")}`;
 			}
 			return `${dataPath} should be one of these:\n${getSchemaPartText(err.parentSchema)}`;
 
@@ -158,29 +177,33 @@ class WebpackOptionsValidationError extends WebpackError {
 		} else if(err.keyword === "type") {
 			switch(err.params.type) {
 				case "object":
-					return `${dataPath} should be an object.`;
+					return `${dataPath} should be an object.${getSchemaPartDescription(err.parentSchema)}`;
 				case "string":
-					return `${dataPath} should be a string.`;
+					return `${dataPath} should be a string.${getSchemaPartDescription(err.parentSchema)}`;
 				case "boolean":
-					return `${dataPath} should be a boolean.`;
+					return `${dataPath} should be a boolean.${getSchemaPartDescription(err.parentSchema)}`;
 				case "number":
-					return `${dataPath} should be a number.`;
+					return `${dataPath} should be a number.${getSchemaPartDescription(err.parentSchema)}`;
 				case "array":
 					return `${dataPath} should be an array:\n${getSchemaPartText(err.parentSchema)}`;
 			}
 			return `${dataPath} should be ${err.params.type}:\n${getSchemaPartText(err.parentSchema)}`;
 		} else if(err.keyword === "instanceof") {
-			return `${dataPath} should be an instance of ${getSchemaPartText(err.parentSchema)}.`;
+			return `${dataPath} should be an instance of ${getSchemaPartText(err.parentSchema)}`;
 		} else if(err.keyword === "required") {
 			const missingProperty = err.params.missingProperty.replace(/^\./, "");
 			return `${dataPath} misses the property '${missingProperty}'.\n${getSchemaPartText(err.parentSchema, ["properties", missingProperty])}`;
-		} else if(err.keyword === "minLength" || err.keyword === "minItems") {
+		} else if(err.keyword === "minimum") {
+			return `${dataPath} ${err.message}.${getSchemaPartDescription(err.parentSchema)}`;
+		} else if(err.keyword === "uniqueItems") {
+			return `${dataPath} should not contain the item '${err.data[err.params.i]}' twice.${getSchemaPartDescription(err.parentSchema)}`;
+		} else if(err.keyword === "minLength" || err.keyword === "minItems" || err.keyword === "minProperties") {
 			if(err.params.limit === 1)
-				return `${dataPath} should not be empty.`;
+				return `${dataPath} should not be empty.${getSchemaPartDescription(err.parentSchema)}`;
 			else
-				return `${dataPath} ${err.message}`;
+				return `${dataPath} ${err.message}${getSchemaPartDescription(err.parentSchema)}`;
 		} else if(err.keyword === "absolutePath") {
-			const baseMessage = `${dataPath}: ${err.message}`;
+			const baseMessage = `${dataPath}: ${err.message}${getSchemaPartDescription(err.parentSchema)}`;
 			if(dataPath === "configuration.output.filename") {
 				return `${baseMessage}\n` +
 					"Please use output.path to specify absolute path and output.filename for the file name.";

package/lib/dependencies/AMDDefineDependency.js

@@ -25,7 +25,7 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate {
 		return {
 			f: [
 				"var __WEBPACK_AMD_DEFINE_RESULT__;",
-				`!(__WEBPACK_AMD_DEFINE_RESULT__ = #.call(exports, __webpack_require__, exports, module),
+				`!(__WEBPACK_AMD_DEFINE_RESULT__ = (#).call(exports, __webpack_require__, exports, module),
 				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`
 			],
 			o: [
@@ -42,7 +42,7 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate {
 			],
 			af: [
 				"var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;",
-				`!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, __WEBPACK_AMD_DEFINE_RESULT__ = #.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__),
+				`!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, __WEBPACK_AMD_DEFINE_RESULT__ = (#).apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__),
 				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`
 			],
 			ao: [
@@ -70,7 +70,7 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate {
 			],
 			laf: [
 				"var __WEBPACK_AMD_DEFINE_ARRAY__, XXX;",
-				"!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, XXX = (#.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)))"
+				"!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, XXX = ((#).apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)))"
 			],
 			lao: [
 				"var XXX;",

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -23,6 +23,18 @@ function isBoundFunctionExpression(expr) {
 	return true;
 }
 
+function isUnboundFunctionExpression(expr) {
+	if(expr.type === "FunctionExpression") return true;
+	if(expr.type === "ArrowFunctionExpression") return true;
+	return false;
+}
+
+function isCallable(expr) {
+	if(isUnboundFunctionExpression(expr)) return true;
+	if(isBoundFunctionExpression(expr)) return true;
+	return false;
+}
+
 class AMDDefineDependencyParserPlugin {
 	constructor(options) {
 		this.options = options;
@@ -38,7 +50,7 @@ class AMDDefineDependencyParserPlugin {
 			let array, fn, obj, namedModule;
 			switch(expr.arguments.length) {
 				case 1:
-					if(expr.arguments[0].type === "FunctionExpression" || isBoundFunctionExpression(expr.arguments[0])) {
+					if(isCallable(expr.arguments[0])) {
 						// define(f() {...})
 						fn = expr.arguments[0];
 					} else if(expr.arguments[0].type === "ObjectExpression") {
@@ -54,7 +66,7 @@ class AMDDefineDependencyParserPlugin {
 					if(expr.arguments[0].type === "Literal") {
 						namedModule = expr.arguments[0].value;
 						// define("...", ...)
-						if(expr.arguments[1].type === "FunctionExpression" || isBoundFunctionExpression(expr.arguments[1])) {
+						if(isCallable(expr.arguments[1])) {
 							// define("...", f() {...})
 							fn = expr.arguments[1];
 						} else if(expr.arguments[1].type === "ObjectExpression") {
@@ -67,7 +79,7 @@ class AMDDefineDependencyParserPlugin {
 						}
 					} else {
 						array = expr.arguments[0];
-						if(expr.arguments[1].type === "FunctionExpression" || isBoundFunctionExpression(expr.arguments[1])) {
+						if(isCallable(expr.arguments[1])) {
 							// define([...], f() {})
 							fn = expr.arguments[1];
 						} else if(expr.arguments[1].type === "ObjectExpression") {
@@ -84,7 +96,7 @@ class AMDDefineDependencyParserPlugin {
 					// define("...", [...], f() {...})
 					namedModule = expr.arguments[0].value;
 					array = expr.arguments[1];
-					if(expr.arguments[2].type === "FunctionExpression" || isBoundFunctionExpression(expr.arguments[2])) {
+					if(isCallable(expr.arguments[2])) {
 						// define("...", [...], f() {})
 						fn = expr.arguments[2];
 					} else if(expr.arguments[2].type === "ObjectExpression") {
@@ -102,7 +114,7 @@ class AMDDefineDependencyParserPlugin {
 			let fnParams = null;
 			let fnParamsOffset = 0;
 			if(fn) {
-				if(fn.type === "FunctionExpression") fnParams = fn.params;
+				if(isUnboundFunctionExpression(fn)) fnParams = fn.params;
 				else if(isBoundFunctionExpression(fn)) {
 					fnParams = fn.callee.object.params;
 					fnParamsOffset = fn.arguments.length - 1;
@@ -134,7 +146,7 @@ class AMDDefineDependencyParserPlugin {
 				});
 			}
 			let inTry;
-			if(fn && fn.type === "FunctionExpression") {
+			if(fn && isUnboundFunctionExpression(fn)) {
 				inTry = parser.scope.inTry;
 				parser.inScope(fnParams, () => {
 					parser.scope.renames = fnRenames;

package/lib/dependencies/AMDRequireDependency.js

@@ -44,8 +44,8 @@ AMDRequireDependency.Template = class AMDRequireDependencyTemplate {
 
 			source.replace(depBlock.outerRange[0], depBlock.arrayRange[0] - 1, startBlock);
 			source.insert(depBlock.arrayRange[0] + 0.9, "var __WEBPACK_AMD_REQUIRE_ARRAY__ = ");
-			source.replace(depBlock.arrayRange[1], depBlock.functionRange[0] - 1, "; (");
-			source.insert(depBlock.functionRange[1], ".apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__));");
+			source.replace(depBlock.arrayRange[1], depBlock.functionRange[0] - 1, "; ((");
+			source.insert(depBlock.functionRange[1], ").apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__));");
 			source.replace(depBlock.functionRange[1], depBlock.errorCallbackRange[0] - 1, errorRangeBlock);
 			source.replace(depBlock.errorCallbackRange[1], depBlock.outerRange[1] - 1, endBlock);
 			return;
@@ -57,8 +57,8 @@ AMDRequireDependency.Template = class AMDRequireDependencyTemplate {
 			const endBlock = `}${depBlock.functionBindThis ? ".bind(this)" : ""}${wrapper[1]}__webpack_require__.oe${wrapper[2]}`;
 			source.replace(depBlock.outerRange[0], depBlock.arrayRange[0] - 1, startBlock);
 			source.insert(depBlock.arrayRange[0] + 0.9, "var __WEBPACK_AMD_REQUIRE_ARRAY__ = ");
-			source.replace(depBlock.arrayRange[1], depBlock.functionRange[0] - 1, "; (");
-			source.insert(depBlock.functionRange[1], ".apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__));");
+			source.replace(depBlock.arrayRange[1], depBlock.functionRange[0] - 1, "; ((");
+			source.insert(depBlock.functionRange[1], ").apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__));");
 			source.replace(depBlock.functionRange[1], depBlock.outerRange[1] - 1, endBlock);
 		}
 	}

package/lib/dependencies/HarmonyDetectionParserPlugin.js

@@ -9,7 +9,7 @@ const HarmonyCompatibilityDependency = require("./HarmonyCompatibilityDependency
 module.exports = class HarmonyDetectionParserPlugin {
 	apply(parser) {
 		parser.plugin("program", (ast) => {
-			var isHarmony = ast.body.some(statement => {
+			const isHarmony = ast.body.some(statement => {
 				return /^(Import|Export).*Declaration$/.test(statement.type);
 			});
 			if(isHarmony) {
@@ -32,7 +32,7 @@ module.exports = class HarmonyDetectionParserPlugin {
 				module.exportsArgument = "__webpack_exports__";
 			}
 		});
-		var nonHarmonyIdentifiers = ["define", "exports"];
+		const nonHarmonyIdentifiers = ["define", "exports"];
 		nonHarmonyIdentifiers.forEach(identifer => {
 			parser.plugin(`evaluate typeof ${identifer}`, nullInHarmony);
 			parser.plugin(`typeof ${identifer}`, skipInHarmony);

package/lib/dependencies/HarmonyImportDependency.js

@@ -3,7 +3,7 @@
 	Author Tobias Koppers @sokra
 */
 "use strict";
-var ModuleDependency = require("./ModuleDependency");
+const ModuleDependency = require("./ModuleDependency");
 
 class HarmonyImportDependency extends ModuleDependency {
 	constructor(request, importedVar, range) {

package/lib/dependencies/LocalModulesHelpers.js

@@ -14,8 +14,8 @@ const lookup = (parent, mod) => {
 		segs = mod.split("/");
 	path.pop();
 
-	for(var i = 0; i < segs.length; i++) {
-		var seg = segs[i];
+	for(let i = 0; i < segs.length; i++) {
+		const seg = segs[i];
 		if(seg === "..") path.pop();
 		else if(seg !== ".") path.push(seg);
 	}
@@ -25,7 +25,7 @@ const lookup = (parent, mod) => {
 
 LocalModulesHelpers.addLocalModule = (state, name) => {
 	if(!state.localModules) state.localModules = [];
-	var m = new LocalModule(state.module, name, state.localModules.length);
+	const m = new LocalModule(state.module, name, state.localModules.length);
 	state.localModules.push(m);
 	return m;
 };
@@ -36,7 +36,7 @@ LocalModulesHelpers.getLocalModule = (state, name, namedModule) => {
 		// resolve dependency name relative to the defining named module
 		name = lookup(namedModule, name);
 	}
-	for(var i = 0; i < state.localModules.length; i++) {
+	for(let i = 0; i < state.localModules.length; i++) {
 		if(state.localModules[i].name === name)
 			return state.localModules[i];
 	}

package/lib/dependencies/RequireIncludeDependency.js

@@ -11,6 +11,14 @@ class RequireIncludeDependency extends ModuleDependency {
 		this.range = range;
 	}
 
+	getReference() {
+		if(!this.module) return null;
+		return {
+			module: this.module,
+			importedNames: [] // This doesn't use any export
+		};
+	}
+
 	get type() {
 		return "require.include";
 	}

package/lib/optimize/ConcatenatedModule.js

@@ -7,6 +7,7 @@
 const Module = require("../Module");
 const Template = require("../Template");
 const Parser = require("../Parser");
+const crypto = require("crypto");
 const acorn = require("acorn");
 const escope = require("escope");
 const ReplaceSource = require("webpack-sources/lib/ReplaceSource");
@@ -210,6 +211,7 @@ class ConcatenatedModule extends Module {
 				Object.assign(this.assets, m.assets);
 			}
 		}
+		this._identifier = this._createIdentifier();
 	}
 
 	get modules() {
@@ -219,12 +221,7 @@ class ConcatenatedModule extends Module {
 	}
 
 	identifier() {
-		return this._orderedConcatenationList.map(info => {
-			switch(info.type) {
-				case "concatenated":
-					return info.module.identifier();
-			}
-		}).filter(Boolean).join(" ");
+		return this._identifier;
 	}
 
 	readableIdentifier(requestShortener) {
@@ -297,6 +294,19 @@ class ConcatenatedModule extends Module {
 		return list;
 	}
 
+	_createIdentifier() {
+		let orderedConcatenationListIdentifiers = "";
+		for(let i = 0; i < this._orderedConcatenationList.length; i++) {
+			if(this._orderedConcatenationList[i].type === "concatenated") {
+				orderedConcatenationListIdentifiers += this._orderedConcatenationList[i].module.identifier();
+				orderedConcatenationListIdentifiers += " ";
+			}
+		}
+		const hash = crypto.createHash("md5");
+		hash.update(orderedConcatenationListIdentifiers);
+		return this.rootModule.identifier() + " " + hash.digest("hex");
+	}
+
 	source(dependencyTemplates, outputOptions, requestShortener) {
 		// Metainfo for each module
 		const modulesWithInfo = this._orderedConcatenationList.map((info, idx) => {

package/lib/webworker/WebWorkerMainTemplatePlugin.js

@@ -82,8 +82,8 @@ class WebWorkerMainTemplatePlugin {
 			});
 
 			return source + "\n" +
-				`var parentHotUpdateCallback = this[${JSON.stringify(hotUpdateFunction)}];\n` +
-				`this[${JSON.stringify(hotUpdateFunction)}] = ` +
+				`var parentHotUpdateCallback = self[${JSON.stringify(hotUpdateFunction)}];\n` +
+				`self[${JSON.stringify(hotUpdateFunction)}] = ` +
 				Template.getFunctionContent(require("./WebWorkerMainTemplate.runtime.js"))
 				.replace(/\/\/\$semicolon/g, ";")
 				.replace(/\$require\$/g, this.requireFn)