webpack 2.3.3 → 2.5.1

package/lib/ProgressPlugin.js

@@ -157,9 +157,9 @@ class ProgressPlugin {
 				state = state.replace(/^\d+\/\d+\s+/, "");
 				if(percentage === 0) {
 					lastState = null;
-					lastStateTime = +new Date();
+					lastStateTime = Date.now();
 				} else if(state !== lastState || percentage === 1) {
-					const now = +new Date();
+					const now = Date.now();
 					if(lastState) {
 						const stateMsg = `${now - lastStateTime}ms ${lastState}`;
 						goToLineStart(stateMsg);

package/lib/RawModule.js

@@ -36,7 +36,7 @@ module.exports = class RawModule extends Module {
 	}
 
 	build(options, compilations, resolver, fs, callback) {
-		this.builtTime = new Date().getTime();
+		this.builtTime = Date.now();
 		callback();
 	}
 

package/lib/RecordIdsPlugin.js

@@ -4,14 +4,10 @@
 */
 "use strict";
 
-function makeRelative(compiler, identifier) {
-	const context = compiler.context;
-	return identifier.split("|").map(str => str.split("!").map(str => path.relative(context, str)).join("!")).join("|");
-}
-
-const path = require("path");
+const identifierUtils = require("./util/identifier");
 
 class RecordIdsPlugin {
+
 	apply(compiler) {
 		compiler.plugin("compilation", compilation => {
 			compilation.plugin("record-modules", (modules, records) => {
@@ -19,7 +15,7 @@ class RecordIdsPlugin {
 				if(!records.modules.byIdentifier) records.modules.byIdentifier = {};
 				if(!records.modules.usedIds) records.modules.usedIds = {};
 				modules.forEach(function(module) {
-					if(!module.portableId) module.portableId = makeRelative(compiler, module.identifier());
+					if(!module.portableId) module.portableId = identifierUtils.makePathsRelative(compiler.context, module.identifier());
 					const identifier = module.portableId;
 					records.modules.byIdentifier[identifier] = module.id;
 					records.modules.usedIds[module.id] = module.id;
@@ -31,7 +27,7 @@ class RecordIdsPlugin {
 					const usedIds = {};
 					modules.forEach(function(module) {
 						if(module.id !== null) return;
-						if(!module.portableId) module.portableId = makeRelative(compiler, module.identifier());
+						if(!module.portableId) module.portableId = identifierUtils.makePathsRelative(compiler.context, module.identifier());
 						const identifier = module.portableId;
 						const id = records.modules.byIdentifier[identifier];
 						if(id === undefined) return;
@@ -55,7 +51,7 @@ class RecordIdsPlugin {
 					block = block.parent;
 				}
 				if(!block.identifier) return null;
-				ident.unshift(makeRelative(compiler, block.identifier()));
+				ident.unshift(identifierUtils.makePathsRelative(compiler.context, block.identifier()));
 				return ident.join(":");
 			}
 			compilation.plugin("record-chunks", (chunks, records) => {

package/lib/SetVarMainTemplatePlugin.js

@@ -26,7 +26,7 @@ class SetVarMainTemplatePlugin {
 				return new ConcatSource(prefix, source);
 			}
 		});
-		mainTemplate.plugin("global-hash-paths", function(paths) {
+		mainTemplate.plugin("global-hash-paths", (paths) => {
 			if(this.varExpression) paths.push(this.varExpression);
 			return paths;
 		});

package/lib/SourceMapDevToolPlugin.js

@@ -2,169 +2,165 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var path = require("path");
-var RequestShortener = require("./RequestShortener");
-var ConcatSource = require("webpack-sources").ConcatSource;
-var RawSource = require("webpack-sources").RawSource;
-var ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
-var SourceMapDevToolModuleOptionsPlugin = require("./SourceMapDevToolModuleOptionsPlugin");
+"use strict";
 
-function SourceMapDevToolPlugin(options) {
-	if(arguments.length > 1)
-		throw new Error("SourceMapDevToolPlugin only takes one argument (pass an options object)");
-	if(typeof options === "string") {
-		options = {
-			sourceMapFilename: options
-		};
+const path = require("path");
+const RequestShortener = require("./RequestShortener");
+const ConcatSource = require("webpack-sources").ConcatSource;
+const RawSource = require("webpack-sources").RawSource;
+const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
+const SourceMapDevToolModuleOptionsPlugin = require("./SourceMapDevToolModuleOptionsPlugin");
+
+const basename = (name) => {
+	if(name.indexOf("/") < 0) return name;
+	return name.substr(name.lastIndexOf("/") + 1);
+};
+
+class SourceMapDevToolPlugin {
+	constructor(options) {
+		if(arguments.length > 1)
+			throw new Error("SourceMapDevToolPlugin only takes one argument (pass an options object)");
+		// TODO: remove in webpack 3
+		if(typeof options === "string") {
+			options = {
+				sourceMapFilename: options
+			};
+		}
+		if(!options) options = {};
+		this.sourceMapFilename = options.filename;
+		this.sourceMappingURLComment = options.append === false ? false : options.append || "\n//# sourceMappingURL=[url]";
+		this.moduleFilenameTemplate = options.moduleFilenameTemplate || "webpack:///[resourcePath]";
+		this.fallbackModuleFilenameTemplate = options.fallbackModuleFilenameTemplate || "webpack:///[resourcePath]?[hash]";
+		this.options = options;
 	}
-	if(!options) options = {};
-	this.sourceMapFilename = options.filename;
-	this.sourceMappingURLComment = options.append === false ? false : options.append || "\n//# sourceMappingURL=[url]";
-	this.moduleFilenameTemplate = options.moduleFilenameTemplate || "webpack:///[resourcePath]";
-	this.fallbackModuleFilenameTemplate = options.fallbackModuleFilenameTemplate || "webpack:///[resourcePath]?[hash]";
-	this.options = options;
-}
-module.exports = SourceMapDevToolPlugin;
-SourceMapDevToolPlugin.prototype.apply = function(compiler) {
-	var sourceMapFilename = this.sourceMapFilename;
-	var sourceMappingURLComment = this.sourceMappingURLComment;
-	var moduleFilenameTemplate = this.moduleFilenameTemplate;
-	var fallbackModuleFilenameTemplate = this.fallbackModuleFilenameTemplate;
-	var requestShortener = new RequestShortener(compiler.context);
-	var options = this.options;
-	options.test = options.test || /\.(js|css)($|\?)/i;
-	compiler.plugin("compilation", function(compilation) {
-		new SourceMapDevToolModuleOptionsPlugin(options).apply(compilation);
-		compilation.plugin("after-optimize-chunk-assets", function(chunks) {
-			var allModules = [];
-			var allModuleFilenames = [];
-			var tasks = [];
-			chunks.forEach(function(chunk) {
-				chunk.files.filter(ModuleFilenameHelpers.matchObject.bind(undefined, options)).map(function(file) {
-					var asset = this.assets[file];
-					if(asset.__SourceMapDevToolData) {
-						var data = asset.__SourceMapDevToolData;
-						for(var cachedFile in data) {
-							this.assets[cachedFile] = data[cachedFile];
-							if(cachedFile !== file)
-								chunk.files.push(cachedFile);
+
+	apply(compiler) {
+		const sourceMapFilename = this.sourceMapFilename;
+		const sourceMappingURLComment = this.sourceMappingURLComment;
+		const moduleFilenameTemplate = this.moduleFilenameTemplate;
+		const fallbackModuleFilenameTemplate = this.fallbackModuleFilenameTemplate;
+		const requestShortener = new RequestShortener(compiler.context);
+		const options = this.options;
+		options.test = options.test || /\.(js|css)($|\?)/i;
+		compiler.plugin("compilation", compilation => {
+			new SourceMapDevToolModuleOptionsPlugin(options).apply(compilation);
+			compilation.plugin("after-optimize-chunk-assets", function(chunks) {
+				let allModules = [];
+				let allModuleFilenames = [];
+				const tasks = [];
+				chunks.forEach(function(chunk) {
+					chunk.files.filter(ModuleFilenameHelpers.matchObject.bind(undefined, options)).map(function(file) {
+						const asset = compilation.assets[file];
+						if(asset.__SourceMapDevToolFile === file && asset.__SourceMapDevToolData) {
+							const data = asset.__SourceMapDevToolData;
+							for(const cachedFile in data) {
+								compilation.assets[cachedFile] = data[cachedFile];
+								if(cachedFile !== file)
+									chunk.files.push(cachedFile);
+							}
+							return;
 						}
-						return;
-					}
-					var source;
-					var sourceMap;
-					if(asset.sourceAndMap) {
-						var sourceAndMap = asset.sourceAndMap(options);
-						sourceMap = sourceAndMap.map;
-						source = sourceAndMap.source;
+						let source, sourceMap;
+						if(asset.sourceAndMap) {
+							const sourceAndMap = asset.sourceAndMap(options);
+							sourceMap = sourceAndMap.map;
+							source = sourceAndMap.source;
+						} else {
+							sourceMap = asset.map(options);
+							source = asset.source();
+						}
+						if(sourceMap) {
+							return {
+								chunk,
+								file,
+								asset,
+								source,
+								sourceMap
+							};
+						}
+					}).filter(Boolean).map(task => {
+						const modules = task.sourceMap.sources.map(source => {
+							const module = compilation.findModule(source);
+							return module || source;
+						});
+						const moduleFilenames = modules.map(module => ModuleFilenameHelpers.createFilename(module, moduleFilenameTemplate, requestShortener));
+						task.modules = modules;
+						task.moduleFilenames = moduleFilenames;
+						return task;
+					}).forEach(task => {
+						allModules = allModules.concat(task.modules);
+						allModuleFilenames = allModuleFilenames.concat(task.moduleFilenames);
+						tasks.push(task);
+					});
+				});
+				allModuleFilenames = ModuleFilenameHelpers.replaceDuplicates(allModuleFilenames, (filename, i) => ModuleFilenameHelpers.createFilename(allModules[i], fallbackModuleFilenameTemplate, requestShortener), (ai, bi) => {
+					let a = allModules[ai];
+					let b = allModules[bi];
+					a = !a ? "" : typeof a === "string" ? a : a.identifier();
+					b = !b ? "" : typeof b === "string" ? b : b.identifier();
+					return a.length - b.length;
+				});
+				allModuleFilenames = ModuleFilenameHelpers.replaceDuplicates(allModuleFilenames, (filename, i, n) => {
+					for(let j = 0; j < n; j++)
+						filename += "*";
+					return filename;
+				});
+				tasks.forEach(task => {
+					task.moduleFilenames = allModuleFilenames.slice(0, task.moduleFilenames.length);
+					allModuleFilenames = allModuleFilenames.slice(task.moduleFilenames.length);
+				});
+				tasks.forEach(function(task) {
+					const chunk = task.chunk;
+					const file = task.file;
+					const asset = task.asset;
+					const sourceMap = task.sourceMap;
+					const source = task.source;
+					const moduleFilenames = task.moduleFilenames;
+					const modules = task.modules;
+					sourceMap.sources = moduleFilenames;
+					if(sourceMap.sourcesContent && !options.noSources) {
+						sourceMap.sourcesContent = sourceMap.sourcesContent.map((content, i) => `${content}\n\n\n${ModuleFilenameHelpers.createFooter(modules[i], requestShortener)}`);
 					} else {
-						sourceMap = asset.map(options);
-						source = asset.source();
+						sourceMap.sourcesContent = undefined;
 					}
-					if(sourceMap) {
-						return {
-							chunk: chunk,
-							file: file,
-							asset: asset,
-							source: source,
-							sourceMap: sourceMap
-						};
-					}
-				}, this).filter(Boolean).map(function(task) {
-					var modules = task.sourceMap.sources.map(function(source) {
-						var module = compilation.findModule(source);
-						return module || source;
-					});
-					var moduleFilenames = modules.map(function(module) {
-						return ModuleFilenameHelpers.createFilename(module, moduleFilenameTemplate, requestShortener);
-					});
-					task.modules = modules;
-					task.moduleFilenames = moduleFilenames;
-					return task;
-				}, this).forEach(function(task) {
-					allModules = allModules.concat(task.modules);
-					allModuleFilenames = allModuleFilenames.concat(task.moduleFilenames);
-					tasks.push(task);
-				}, this);
-			}, this);
-			allModuleFilenames = ModuleFilenameHelpers.replaceDuplicates(allModuleFilenames, function(filename, i) {
-				return ModuleFilenameHelpers.createFilename(allModules[i], fallbackModuleFilenameTemplate, requestShortener);
-			}, function(ai, bi) {
-				var a = allModules[ai];
-				var b = allModules[bi];
-				a = !a ? "" : typeof a === "string" ? a : a.identifier();
-				b = !b ? "" : typeof b === "string" ? b : b.identifier();
-				return a.length - b.length;
-			});
-			allModuleFilenames = ModuleFilenameHelpers.replaceDuplicates(allModuleFilenames, function(filename, i, n) {
-				for(var j = 0; j < n; j++)
-					filename += "*";
-				return filename;
-			});
-			tasks.forEach(function(task) {
-				task.moduleFilenames = allModuleFilenames.slice(0, task.moduleFilenames.length);
-				allModuleFilenames = allModuleFilenames.slice(task.moduleFilenames.length);
-			}, this);
-			tasks.forEach(function(task) {
-				var chunk = task.chunk;
-				var file = task.file;
-				var asset = task.asset;
-				var sourceMap = task.sourceMap;
-				var source = task.source;
-				var moduleFilenames = task.moduleFilenames;
-				var modules = task.modules;
-				sourceMap.sources = moduleFilenames;
-				if(sourceMap.sourcesContent && !options.noSources) {
-					sourceMap.sourcesContent = sourceMap.sourcesContent.map(function(content, i) {
-						return content + "\n\n\n" + ModuleFilenameHelpers.createFooter(modules[i], requestShortener);
-					});
-				} else {
-					sourceMap.sourcesContent = undefined;
-				}
-				sourceMap.sourceRoot = options.sourceRoot || "";
-				sourceMap.file = file;
-				asset.__SourceMapDevToolData = {};
-				var currentSourceMappingURLComment = sourceMappingURLComment;
-				if(currentSourceMappingURLComment !== false && /\.css($|\?)/i.test(file)) {
-					currentSourceMappingURLComment = currentSourceMappingURLComment.replace(/^\n\/\/(.*)$/, "\n/*$1*/");
-				}
-				if(sourceMapFilename) {
-					var filename = file,
-						query = "";
-					var idx = filename.indexOf("?");
-					if(idx >= 0) {
-						query = filename.substr(idx);
-						filename = filename.substr(0, idx);
+					sourceMap.sourceRoot = options.sourceRoot || "";
+					sourceMap.file = file;
+					asset.__SourceMapDevToolFile = file;
+					asset.__SourceMapDevToolData = {};
+					let currentSourceMappingURLComment = sourceMappingURLComment;
+					if(currentSourceMappingURLComment !== false && /\.css($|\?)/i.test(file)) {
+						currentSourceMappingURLComment = currentSourceMappingURLComment.replace(/^\n\/\/(.*)$/, "\n/*$1*/");
 					}
-					var sourceMapFile = this.getPath(sourceMapFilename, {
-						chunk: chunk,
-						filename: filename,
-						query: query,
-						basename: basename(filename)
-					});
-					var sourceMapUrl = path.relative(path.dirname(file), sourceMapFile).replace(/\\/g, "/");
-					if(currentSourceMappingURLComment !== false) {
-						asset.__SourceMapDevToolData[file] = this.assets[file] = new ConcatSource(new RawSource(source), currentSourceMappingURLComment.replace(/\[url\]/g, sourceMapUrl));
+					if(sourceMapFilename) {
+						let filename = file;
+						let query = "";
+						const idx = filename.indexOf("?");
+						if(idx >= 0) {
+							query = filename.substr(idx);
+							filename = filename.substr(0, idx);
+						}
+						const sourceMapFile = compilation.getPath(sourceMapFilename, {
+							chunk,
+							filename,
+							query,
+							basename: basename(filename)
+						});
+						const sourceMapUrl = 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));
+						}
+						asset.__SourceMapDevToolData[sourceMapFile] = compilation.assets[sourceMapFile] = new RawSource(JSON.stringify(sourceMap));
+						chunk.files.push(sourceMapFile);
+					} else {
+						asset.__SourceMapDevToolData[file] = compilation.assets[file] = new ConcatSource(new RawSource(source), currentSourceMappingURLComment
+							.replace(/\[map\]/g, () => JSON.stringify(sourceMap))
+							.replace(/\[url\]/g, () => `data:application/json;charset=utf-8;base64,${new Buffer(JSON.stringify(sourceMap), "utf-8").toString("base64")}`) // eslint-disable-line
+						);
 					}
-					asset.__SourceMapDevToolData[sourceMapFile] = this.assets[sourceMapFile] = new RawSource(JSON.stringify(sourceMap));
-					chunk.files.push(sourceMapFile);
-				} else {
-					asset.__SourceMapDevToolData[file] = this.assets[file] = new ConcatSource(new RawSource(source), currentSourceMappingURLComment
-						.replace(/\[map\]/g, function() {
-							return JSON.stringify(sourceMap);
-						})
-						.replace(/\[url\]/g, function() {
-							return "data:application/json;charset=utf-8;base64," +
-								new Buffer(JSON.stringify(sourceMap), "utf8").toString("base64"); //eslint-disable-line
-						})
-					);
-				}
-			}, this);
+				});
+			});
 		});
-	});
-};
-
-function basename(name) {
-	if(name.indexOf("/") < 0) return name;
-	return name.substr(name.lastIndexOf("/") + 1);
+	}
 }
+
+module.exports = SourceMapDevToolPlugin;

package/lib/Stats.js

@@ -16,6 +16,34 @@ class Stats {
 		this.hash = compilation.hash;
 	}
 
+	static filterWarnings(warnings, warningsFilter) {
+		// we dont have anything to filter so all warnings can be shown
+		if(!warningsFilter) {
+			return warnings;
+		}
+
+		// create a chain of filters
+		// if they return "true" a warning should be surpressed
+		const normalizedWarningsFilters = [].concat(warningsFilter).map(filter => {
+			if(typeof filter === "string") {
+				return warning => warning.indexOf(filter) > -1;
+			}
+
+			if(filter instanceof RegExp) {
+				return warning => filter.test(warning);
+			}
+
+			if(typeof filter === "function") {
+				return filter;
+			}
+
+			throw new Error(`Can only filter warnings with Strings or RegExps. (Given: ${filter})`);
+		});
+		return warnings.filter(warning => {
+			return !normalizedWarningsFilters.some(check => check(warning));
+		});
+	}
+
 	hasWarnings() {
 		return this.compilation.warnings.length > 0;
 	}
@@ -67,9 +95,11 @@ class Stats {
 		const showProvidedExports = optionOrFallback(options.providedExports, !forToString);
 		const showChildren = optionOrFallback(options.children, true);
 		const showSource = optionOrFallback(options.source, !forToString);
+		const showModuleTrace = optionOrFallback(options.moduleTrace, true);
 		const showErrors = optionOrFallback(options.errors, true);
 		const showErrorDetails = optionOrFallback(options.errorDetails, !forToString);
 		const showWarnings = optionOrFallback(options.warnings, true);
+		const warningsFilter = optionOrFallback(options.warningsFilter, null);
 		const showPublicPath = optionOrFallback(options.publicPath, !forToString);
 		const excludeModules = [].concat(optionOrFallback(options.exclude, [])).map(str => {
 			if(typeof str !== "string") return str;
@@ -135,7 +165,7 @@ class Stats {
 			text += e.message;
 			if(showErrorDetails && e.details) text += `\n${e.details}`;
 			if(showErrorDetails && e.missing) text += e.missing.map(item => `\n[${item}]`).join("");
-			if(e.dependencies && e.origin) {
+			if(showModuleTrace && e.dependencies && e.origin) {
 				text += `\n @ ${e.origin.readableIdentifier(requestShortener)}`;
 				e.dependencies.forEach(dep => {
 					if(!dep.loc) return;
@@ -155,7 +185,7 @@ class Stats {
 
 		const obj = {
 			errors: compilation.errors.map(formatError),
-			warnings: compilation.warnings.map(formatError)
+			warnings: Stats.filterWarnings(compilation.warnings.map(formatError), warningsFilter)
 		};
 
 		//We just hint other renderers since actually omitting
@@ -270,9 +300,7 @@ class Stats {
 						type: reason.dependency.type,
 						userRequest: reason.dependency.userRequest
 					};
-					const dep = reason.dependency;
-					if(dep.templateModules) obj.templateModules = dep.templateModules.map(module => module.id);
-					const locInfo = formatLocation(dep.loc);
+					const locInfo = formatLocation(reason.dependency.loc);
 					if(locInfo) obj.loc = locInfo;
 					return obj;
 				}).sort((a, b) => a.moduleId - b.moduleId);
@@ -614,7 +642,6 @@ class Stats {
 					colors.normal(reason.type);
 					colors.normal(" ");
 					colors.cyan(reason.userRequest);
-					if(reason.templateModules) colors.cyan(reason.templateModules.join(" "));
 					colors.normal(" [");
 					colors.normal(reason.moduleId);
 					colors.normal("] ");
@@ -758,6 +785,7 @@ class Stats {
 				newline();
 			}
 		}
+
 		if(obj._showWarnings && obj.warnings) {
 			obj.warnings.forEach(warning => {
 				newline();

package/lib/TemplatedPathPlugin.js

@@ -18,6 +18,7 @@ const REGEXP_HASH_FOR_TEST = new RegExp(REGEXP_HASH.source, "i"),
 	REGEXP_CHUNKHASH_FOR_TEST = new RegExp(REGEXP_CHUNKHASH.source, "i"),
 	REGEXP_NAME_FOR_TEST = new RegExp(REGEXP_NAME.source, "i");
 
+// TODO: remove in webpack 3
 // Backwards compatibility; expose regexes on Template object
 const Template = require("./Template");
 Template.REGEXP_HASH = REGEXP_HASH;

package/lib/UnsupportedFeatureWarning.js

@@ -4,8 +4,9 @@
 */
 "use strict";
 
-class UnsupportedFeatureWarning extends Error {
+const WebpackError = require("./WebpackError");
 
+class UnsupportedFeatureWarning extends WebpackError {
 	constructor(module, message) {
 		super();
 

package/lib/WebpackError.js

@@ -0,0 +1,11 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Jarid Margolin @jaridmargolin
+*/
+"use strict";
+
+module.exports = class WebpackError extends Error {
+	inspect() {
+		return this.stack + (this.details ? `\n${this.details}` : "");
+	}
+};

package/lib/WebpackOptionsApply.js

@@ -81,7 +81,7 @@ class WebpackOptionsApply extends OptionsApply {
 						let WebWorkerTemplatePlugin = require("./webworker/WebWorkerTemplatePlugin");
 						NodeSourcePlugin = require("./node/NodeSourcePlugin");
 						compiler.apply(
-							new WebWorkerTemplatePlugin(options.output),
+							new WebWorkerTemplatePlugin(),
 							new FunctionModulePlugin(options.output),
 							new NodeSourcePlugin(options.node),
 							new LoaderTargetPlugin("webworker")
@@ -206,9 +206,9 @@ class WebpackOptionsApply extends OptionsApply {
 			noSources = options.devtool.indexOf("nosources") >= 0;
 			legacy = options.devtool.indexOf("@") >= 0;
 			modern = options.devtool.indexOf("#") >= 0;
-			comment = legacy && modern ? "\n/*\n//@ sourceMappingURL=[url]\n//# sourceMappingURL=[url]\n*/" :
-				legacy ? "\n/*\n//@ sourceMappingURL=[url]\n*/" :
-				modern ? "\n//# sourceMappingURL=[url]" :
+			comment = legacy && modern ? "\n/*\n//@ source" + "MappingURL=[url]\n//# source" + "MappingURL=[url]\n*/" :
+				legacy ? "\n/*\n//@ source" + "MappingURL=[url]\n*/" :
+				modern ? "\n//# source" + "MappingURL=[url]" :
 				null;
 			let Plugin = evalWrapped ? EvalSourceMapDevToolPlugin : SourceMapDevToolPlugin;
 			compiler.apply(new Plugin({

package/lib/WebpackOptionsValidationError.js

@@ -4,6 +4,7 @@
 */
 "use strict";
 
+const WebpackError = require("./WebpackError");
 const webpackOptionsSchema = require("../schemas/webpackOptionsSchema.json");
 
 const getSchemaPart = (path, parents, additionalPath) => {
@@ -46,13 +47,11 @@ const indent = (str, prefix, firstLine) => {
 	}
 };
 
-class WebpackOptionsValidationError extends Error {
-
+class WebpackOptionsValidationError extends WebpackError {
 	constructor(validationErrors) {
 		super();
 
 		this.name = "WebpackOptionsValidationError";
-
 		this.message = "Invalid configuration object. " +
 			"Webpack has been initialised using a configuration object that does not match the API schema.\n" +
 			validationErrors.map(err => " - " + indent(WebpackOptionsValidationError.formatValidationError(err), "   ", false)).join("\n");

package/lib/dependencies/AMDDefineDependency.js

@@ -6,12 +6,13 @@
 const NullDependency = require("./NullDependency");
 
 class AMDDefineDependency extends NullDependency {
-	constructor(range, arrayRange, functionRange, objectRange) {
+	constructor(range, arrayRange, functionRange, objectRange, namedModule) {
 		super();
 		this.range = range;
 		this.arrayRange = arrayRange;
 		this.functionRange = functionRange;
 		this.objectRange = objectRange;
+		this.namedModule = namedModule;
 	}
 
 	get type() {
@@ -56,17 +57,16 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate {
 				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`
 			],
 			lf: [
-				"var XXX;",
-				"!(XXX = #.call(exports, __webpack_require__, exports, module))"
+				"var XXX, XXXmodule;",
+				"!(XXXmodule = { id: YYY, exports: {}, loaded: false }, XXX = #.call(XXXmodule.exports, __webpack_require__, XXXmodule.exports, XXXmodule), XXXmodule.loaded = true, XXX === undefined && (XXX = XXXmodule.exports))"
 			],
 			lo: [
 				"var XXX;",
 				"!(XXX = #)"
 			],
 			lof: [
-				"var __WEBPACK_AMD_DEFINE_FACTORY__, XXX;",
-				`!(__WEBPACK_AMD_DEFINE_FACTORY__ = (#), XXX = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
-				(__WEBPACK_AMD_DEFINE_FACTORY__.call(exports, __webpack_require__, exports, module)) : __WEBPACK_AMD_DEFINE_FACTORY__))`
+				"var XXX, XXXfactory, XXXmodule;",
+				"!(XXXfactory = (#), (XXXmodule = { id: YYY, exports: {}, loaded: false }), XXX = (typeof XXXfactory === 'function' ? (XXXfactory.call(XXXmodule.exports, __webpack_require__, XXXmodule.exports, XXXmodule)) : XXXfactory), (XXXmodule.loaded = true), XXX === undefined && (XXX = XXXmodule.exports))"
 			],
 			laf: [
 				"var __WEBPACK_AMD_DEFINE_ARRAY__, XXX;",
@@ -112,6 +112,10 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate {
 			definition = definition.replace(/XXX/g, localModuleVar.replace(/\$/g, "$$$$"));
 		}
 
+		if(dependency.namedModule) {
+			text = text.replace(/YYY/g, JSON.stringify(dependency.namedModule));
+		}
+
 		const texts = text.split("#");
 
 		if(definition) source.insert(0, definition);

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -155,7 +155,14 @@ class AMDDefineDependencyParserPlugin {
 			} else if(fn || obj) {
 				parser.walkExpression(fn || obj);
 			}
-			const dep = new AMDDefineDependency(expr.range, array ? array.range : null, fn ? fn.range : null, obj ? obj.range : null);
+
+			const dep = new AMDDefineDependency(
+				expr.range,
+				array ? array.range : null,
+				fn ? fn.range : null,
+				obj ? obj.range : null,
+				namedModule ? namedModule : null
+			);
 			dep.loc = expr.loc;
 			if(namedModule) {
 				dep.localModule = LocalModulesHelpers.addLocalModule(parser.state, namedModule);

package/lib/dependencies/AMDPlugin.js

@@ -61,10 +61,10 @@ class AMDPlugin {
 				if(typeof parserOptions.amd !== "undefined" && !parserOptions.amd)
 					return;
 
-				function setExpressionToModule(expr, module) {
-					parser.plugin("expression " + expr, (expr) => {
+				function setExpressionToModule(outerExpr, module) {
+					parser.plugin("expression " + outerExpr, (expr) => {
 						const dep = new AMDRequireItemDependency(module, expr.range);
-						dep.userRequest = expr;
+						dep.userRequest = outerExpr;
 						dep.loc = expr.loc;
 						parser.state.current.addDependency(dep);
 						return true;