webpack 4.14.0 → 4.16.1

package/lib/RuleSet.js

@@ -75,13 +75,13 @@ normalized:
 "use strict";
 
 const notMatcher = matcher => {
-	return function(str) {
+	return str => {
 		return !matcher(str);
 	};
 };
 
 const orMatcher = items => {
-	return function(str) {
+	return str => {
 		for (let i = 0; i < items.length; i++) {
 			if (items[i](str)) return true;
 		}
@@ -90,7 +90,7 @@ const orMatcher = items => {
 };
 
 const andMatcher = items => {
-	return function(str) {
+	return str => {
 		for (let i = 0; i < items.length; i++) {
 			if (!items[i](str)) return false;
 		}

package/lib/SingleEntryPlugin.js

@@ -5,13 +5,27 @@
 "use strict";
 const SingleEntryDependency = require("./dependencies/SingleEntryDependency");
 
+/** @typedef {import("./Compiler")} Compiler */
+
 class SingleEntryPlugin {
+	/**
+	 * An entry plugin which will handle
+	 * creation of the SingleEntryDependency
+	 *
+	 * @param {string} context context path
+	 * @param {string} entry entry path
+	 * @param {string} name entry key name
+	 */
 	constructor(context, entry, name) {
 		this.context = context;
 		this.entry = entry;
 		this.name = name;
 	}
 
+	/**
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
 			"SingleEntryPlugin",
@@ -34,9 +48,14 @@ class SingleEntryPlugin {
 		);
 	}
 
+	/**
+	 * @param {string} entry entry request
+	 * @param {string} name entry name
+	 * @returns {SingleEntryDependency} the dependency
+	 */
 	static createDependency(entry, name) {
 		const dep = new SingleEntryDependency(entry);
-		dep.loc = name;
+		dep.loc = { name };
 		return dep;
 	}
 }

package/lib/Stats.js

@@ -15,6 +15,12 @@ const optionsOrFallback = (...args) => {
 	return optionValues.find(optionValue => typeof optionValue !== "undefined");
 };
 
+const compareId = (a, b) => {
+	if (a < b) return -1;
+	if (a > b) return 1;
+	return 0;
+};
+
 class Stats {
 	constructor(compilation) {
 		this.compilation = compilation;
@@ -108,10 +114,11 @@ class Stats {
 			if (typeof item === "string") {
 				const regExp = new RegExp(
 					`[\\\\/]${item.replace(
+						// eslint-disable-next-line no-useless-escape
 						/[-[\]{}()*+?.\\^$|]/g,
 						"\\$&"
 					)}([\\\\/]|$|!|\\?)`
-				); // eslint-disable-line no-useless-escape
+				);
 				return ident => regExp.test(ident);
 			}
 			if (item && typeof item === "object" && typeof item.test === "function") {
@@ -542,7 +549,7 @@ class Stats {
 						}
 						return obj;
 					})
-					.sort((a, b) => a.moduleId - b.moduleId);
+					.sort(compareId);
 			}
 			if (showUsedExports) {
 				if (module.used === true) {
@@ -613,9 +620,9 @@ class Stats {
 					names: chunk.name ? [chunk.name] : [],
 					files: chunk.files.slice(),
 					hash: chunk.renderedHash,
-					siblings: Array.from(siblings).sort(),
-					parents: Array.from(parents).sort(),
-					children: Array.from(children).sort(),
+					siblings: Array.from(siblings).sort(compareId),
+					parents: Array.from(parents).sort(compareId),
+					children: Array.from(children).sort(compareId),
 					childrenByOrder: childIdByOrder
 				};
 				if (showChunkModules) {

package/lib/Template.js

@@ -22,6 +22,8 @@ const COMMENT_END_REGEX = /\*\//g;
 const PATH_NAME_NORMALIZE_REPLACE_REGEX = /[^a-zA-Z0-9_!§$()=\-^°]+/g;
 const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 
+/** @typedef {import("webpack-sources").Source} Source */
+
 /**
  * @typedef {Object} HasId
  * @property {number | string} id
@@ -230,6 +232,7 @@ class Template {
 			source.add("[]");
 			return source;
 		}
+		/** @type {{id: string|number, source: Source|string}[]} */
 		var allModules = modules.map(module => {
 			return {
 				id: module.id,
@@ -241,7 +244,7 @@ class Template {
 		if (removedModules && removedModules.length > 0) {
 			for (const id of removedModules) {
 				allModules.push({
-					id: id,
+					id,
 					source: "false"
 				});
 			}

package/lib/UmdMainTemplatePlugin.js

@@ -107,14 +107,14 @@ class UmdMainTemplatePlugin {
 				requiredExternals = externals;
 			}
 
-			function replaceKeys(str) {
+			const replaceKeys = str => {
 				return mainTemplate.getAssetPath(str, {
 					hash,
 					chunk
 				});
-			}
+			};
 
-			function externalsDepsArray(modules) {
+			const externalsDepsArray = modules => {
 				return `[${replaceKeys(
 					modules
 						.map(m =>
@@ -124,9 +124,9 @@ class UmdMainTemplatePlugin {
 						)
 						.join(", ")
 				)}]`;
-			}
+			};
 
-			function externalsRootArray(modules) {
+			const externalsRootArray = modules => {
 				return replaceKeys(
 					modules
 						.map(m => {
@@ -136,9 +136,9 @@ class UmdMainTemplatePlugin {
 						})
 						.join(", ")
 				);
-			}
+			};
 
-			function externalsRequireArray(type) {
+			const externalsRequireArray = type => {
 				return replaceKeys(
 					externals
 						.map(m => {
@@ -166,20 +166,20 @@ class UmdMainTemplatePlugin {
 						})
 						.join(", ")
 				);
-			}
+			};
 
-			function externalsArguments(modules) {
+			const externalsArguments = modules => {
 				return modules
 					.map(
 						m =>
 							`__WEBPACK_EXTERNAL_MODULE_${Template.toIdentifier(`${m.id}`)}__`
 					)
 					.join(", ");
-			}
+			};
 
-			function libraryName(library) {
+			const libraryName = library => {
 				return JSON.stringify(replaceKeys([].concat(library).pop()));
-			}
+			};
 
 			let amdFactory;
 			if (optionalExternals.length > 0) {

package/lib/UseStrictPlugin.js

@@ -6,7 +6,7 @@
 
 const ConstDependency = require("./dependencies/ConstDependency");
 
-/** @typedef {import("./Compiler.js")} Compiler */
+/** @typedef {import("./Compiler")} Compiler */
 
 class UseStrictPlugin {
 	/**

package/lib/WebpackError.js

@@ -13,6 +13,10 @@ class WebpackError extends Error {
 		super(message);
 
 		this.details = undefined;
+		this.missing = undefined;
+		this.origin = undefined;
+		this.dependencies = undefined;
+		this.module = undefined;
 
 		Error.captureStackTrace(this, this.constructor);
 	}

package/lib/WebpackOptionsApply.js

@@ -46,7 +46,9 @@ const RemoveParentModulesPlugin = require("./optimize/RemoveParentModulesPlugin"
 const RemoveEmptyChunksPlugin = require("./optimize/RemoveEmptyChunksPlugin");
 const MergeDuplicateChunksPlugin = require("./optimize/MergeDuplicateChunksPlugin");
 const FlagIncludedChunksPlugin = require("./optimize/FlagIncludedChunksPlugin");
-const OccurrenceOrderPlugin = require("./optimize/OccurrenceOrderPlugin");
+const OccurrenceChunkOrderPlugin = require("./optimize/OccurrenceChunkOrderPlugin");
+const OccurrenceModuleOrderPlugin = require("./optimize/OccurrenceModuleOrderPlugin");
+const NaturalChunkOrderPlugin = require("./optimize/NaturalChunkOrderPlugin");
 const SideEffectsFlagPlugin = require("./optimize/SideEffectsFlagPlugin");
 const FlagDependencyUsagePlugin = require("./FlagDependencyUsagePlugin");
 const FlagDependencyExportsPlugin = require("./FlagDependencyExportsPlugin");
@@ -171,9 +173,13 @@ class WebpackOptionsApply extends OptionsApply {
 					break;
 				case "electron-renderer":
 					JsonpTemplatePlugin = require("./web/JsonpTemplatePlugin");
+					FetchCompileWasmTemplatePlugin = require("./web/FetchCompileWasmTemplatePlugin");
 					NodeTargetPlugin = require("./node/NodeTargetPlugin");
 					ExternalsPlugin = require("./ExternalsPlugin");
 					new JsonpTemplatePlugin().apply(compiler);
+					new FetchCompileWasmTemplatePlugin({
+						mangleImports: options.optimization.mangleWasmImports
+					}).apply(compiler);
 					new FunctionModulePlugin().apply(compiler);
 					new NodeTargetPlugin().apply(compiler);
 					new ExternalsPlugin("commonjs", [
@@ -325,9 +331,6 @@ class WebpackOptionsApply extends OptionsApply {
 		if (options.optimization.flagIncludedChunks) {
 			new FlagIncludedChunksPlugin().apply(compiler);
 		}
-		if (options.optimization.occurrenceOrder) {
-			new OccurrenceOrderPlugin(true).apply(compiler);
-		}
 		if (options.optimization.sideEffects) {
 			new SideEffectsFlagPlugin().apply(compiler);
 		}
@@ -352,14 +355,93 @@ class WebpackOptionsApply extends OptionsApply {
 		if (options.optimization.checkWasmTypes) {
 			new WasmFinalizeExportsPlugin().apply(compiler);
 		}
-		if (options.optimization.namedModules) {
-			new NamedModulesPlugin().apply(compiler);
+		let moduleIds = options.optimization.moduleIds;
+		if (moduleIds === undefined) {
+			// TODO webpack 5 remove all these options
+			if (options.optimization.occurrenceOrder) {
+				moduleIds = "size";
+			}
+			if (options.optimization.namedModules) {
+				moduleIds = "named";
+			}
+			if (options.optimization.hashedModuleIds) {
+				moduleIds = "hashed";
+			}
+			if (moduleIds === undefined) {
+				moduleIds = "natural";
+			}
 		}
-		if (options.optimization.hashedModuleIds) {
-			new HashedModuleIdsPlugin().apply(compiler);
+		if (moduleIds) {
+			switch (moduleIds) {
+				case "natural":
+					// TODO webpack 5: see hint in Compilation.sortModules
+					break;
+				case "named":
+					new NamedModulesPlugin().apply(compiler);
+					break;
+				case "hashed":
+					new HashedModuleIdsPlugin().apply(compiler);
+					break;
+				case "size":
+					new OccurrenceModuleOrderPlugin({
+						prioritiseInitial: true
+					}).apply(compiler);
+					break;
+				case "total-size":
+					new OccurrenceModuleOrderPlugin({
+						prioritiseInitial: false
+					}).apply(compiler);
+					break;
+				default:
+					throw new Error(
+						`webpack bug: moduleIds: ${moduleIds} is not implemented`
+					);
+			}
+		}
+		let chunkIds = options.optimization.chunkIds;
+		if (chunkIds === undefined) {
+			// TODO webpack 5 remove all these options
+			if (options.optimization.occurrenceOrder) {
+				// This looks weird but it's for backward-compat
+				// This bug already existed before adding this feature
+				chunkIds = "total-size";
+			}
+			if (options.optimization.namedChunks) {
+				chunkIds = "named";
+			}
+			if (chunkIds === undefined) {
+				chunkIds = "natural";
+			}
 		}
-		if (options.optimization.namedChunks) {
-			new NamedChunksPlugin().apply(compiler);
+		if (chunkIds) {
+			switch (chunkIds) {
+				case "natural":
+					new NaturalChunkOrderPlugin().apply(compiler);
+					break;
+				case "named":
+					// TODO webapck 5: for backward-compat this need to have OccurrenceChunkOrderPlugin too
+					// The NamedChunksPlugin doesn't give every chunk a name
+					// This should be fixed, and the OccurrenceChunkOrderPlugin should be removed here.
+					new OccurrenceChunkOrderPlugin({
+						prioritiseInitial: false
+					}).apply(compiler);
+					new NamedChunksPlugin().apply(compiler);
+					break;
+				case "size":
+					new OccurrenceChunkOrderPlugin({
+						prioritiseInitial: true
+					}).apply(compiler);
+					break;
+				case "total-size":
+					new OccurrenceChunkOrderPlugin({
+						prioritiseInitial: false
+					}).apply(compiler);
+					break;
+				default:
+					throw new Error(
+						`webpack bug: chunkIds: ${chunkIds} is not implemented`
+					);
+			}
 		}
 		if (options.optimization.nodeEnv) {
 			new DefinePlugin({

package/lib/WebpackOptionsDefaulter.js

@@ -17,6 +17,16 @@ const isWebLikeTarget = options => {
 	return options.target === "web" || options.target === "webworker";
 };
 
+const getDevtoolNamespace = library => {
+	// if options.output.library is a string
+	if (Array.isArray(library)) {
+		return library.join(".");
+	} else if (typeof library === "object") {
+		return getDevtoolNamespace(library.root);
+	}
+	return library || "";
+};
+
 class WebpackOptionsDefaulter extends OptionsDefaulter {
 	constructor() {
 		super();
@@ -136,12 +146,7 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 			}
 		});
 		this.set("output.devtoolNamespace", "make", options => {
-			if (Array.isArray(options.output.library)) {
-				return options.output.library.join(".");
-			} else if (typeof options.output.library === "object") {
-				return options.output.library.root || "";
-			}
-			return options.output.library || "";
+			return getDevtoolNamespace(options.output.library);
 		});
 		this.set("output.libraryTarget", "var");
 		this.set("output.path", path.join(process.cwd(), "dist"));
@@ -201,6 +206,9 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("optimization.flagIncludedChunks", "make", options =>
 			isProductionLikeMode(options)
 		);
+		// TODO webpack 5 add `moduleIds: "named"` default for development
+		// TODO webpack 5 add `moduleIds: "size"` default for production
+		// TODO webpack 5 remove optimization.occurrenceOrder
 		this.set("optimization.occurrenceOrder", "make", options =>
 			isProductionLikeMode(options)
 		);
@@ -215,6 +223,9 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 			isProductionLikeMode(options)
 		);
 		this.set("optimization.splitChunks", {});
+		this.set("optimization.splitChunks.hidePathInfo", "make", options => {
+			return isProductionLikeMode(options);
+		});
 		this.set("optimization.splitChunks.chunks", "async");
 		this.set("optimization.splitChunks.minSize", "make", options => {
 			return isProductionLikeMode(options) ? 30000 : 10000;
@@ -230,11 +241,13 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("optimization.splitChunks.name", true);
 		this.set("optimization.splitChunks.cacheGroups", {});
 		this.set("optimization.splitChunks.cacheGroups.default", {
+			automaticNamePrefix: "",
 			reuseExistingChunk: true,
 			minChunks: 2,
 			priority: -20
 		});
 		this.set("optimization.splitChunks.cacheGroups.vendors", {
+			automaticNamePrefix: "vendors",
 			test: /[\\/]node_modules[\\/]/,
 			priority: -10
 		});
@@ -258,12 +271,16 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 			isProductionLikeMode(options)
 		);
 		this.set("optimization.mangleWasmImports", false);
+		// TODO webpack 5 remove optimization.namedModules
 		this.set(
 			"optimization.namedModules",
 			"make",
 			options => options.mode === "development"
 		);
 		this.set("optimization.hashedModuleIds", false);
+		// TODO webpack 5 add `chunkIds: "named"` default for development
+		// TODO webpack 5 add `chunkIds: "size"` default for production
+		// TODO webpack 5 remove optimization.namedChunks
 		this.set(
 			"optimization.namedChunks",
 			"make",

package/lib/WebpackOptionsValidationError.js

@@ -332,7 +332,6 @@ class WebpackOptionsValidationError extends WebpackError {
 			}
 			return baseMessage;
 		} else {
-			// eslint-disable-line no-fallthrough
 			return `${dataPath} ${err.message} (${JSON.stringify(
 				err,
 				null,

package/lib/compareLocations.js

@@ -4,23 +4,13 @@
 */
 "use strict";
 
-/**
- * @typedef {Object} LineAndColumn
- * @property {number=} line
- * @property {number=} column
- */
-
-/**
- * @typedef {Object} NodeLocation
- * @property {LineAndColumn=} start
- * @property {LineAndColumn=} end
- * @property {number=} index
- */
+/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
 
+// TODO webpack 5 remove string type from a and b
 /**
  * Compare two locations
- * @param {string|NodeLocation} a A location node
- * @param {string|NodeLocation} b A location node
+ * @param {string|DependencyLocation} a A location node
+ * @param {string|DependencyLocation} b A location node
  * @returns {-1|0|1} sorting comparator value
  */
 module.exports = (a, b) => {
@@ -38,7 +28,7 @@ module.exports = (a, b) => {
 		if (typeof b === "string") {
 			return -1;
 		} else if (typeof b === "object") {
-			if (a.start && b.start) {
+			if ("start" in a && "start" in b) {
 				const ap = a.start;
 				const bp = b.start;
 				if (ap.line < bp.line) return -1;
@@ -46,8 +36,14 @@ module.exports = (a, b) => {
 				if (ap.column < bp.column) return -1;
 				if (ap.column > bp.column) return 1;
 			}
-			if (a.index < b.index) return -1;
-			if (a.index > b.index) return 1;
+			if ("name" in a && "name" in b) {
+				if (a.name < b.name) return -1;
+				if (a.name > b.name) return 1;
+			}
+			if ("index" in a && "index" in b) {
+				if (a.index < b.index) return -1;
+				if (a.index > b.index) return 1;
+			}
 			return 0;
 		} else {
 			return 0;

package/lib/debug/ProfilingPlugin.js

@@ -5,7 +5,8 @@ const schema = require("../../schemas/plugins/debug/ProfilingPlugin.json");
 let inspector = undefined;
 
 try {
-	inspector = require("inspector"); // eslint-disable-line node/no-missing-require
+	// eslint-disable-next-line node/no-missing-require
+	inspector = require("inspector");
 } catch (e) {
 	console.log("Unable to CPU profile in < node 8.0");
 }
@@ -84,7 +85,7 @@ class Profiler {
  * @param {string} outputPath The location where to write the log.
  * @returns {Trace} The trace object
  */
-function createTrace(outputPath) {
+const createTrace = outputPath => {
 	const trace = new Tracer({
 		noStream: true
 	});
@@ -136,10 +137,10 @@ function createTrace(outputPath) {
 				callback();
 			});
 			// Tear down the readable trace stream.
-			trace.destroy();
+			trace.push(null);
 		}
 	};
-}
+};
 
 const pluginName = "ProfilingPlugin";
 
@@ -354,7 +355,6 @@ const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
 	switch (type) {
 		case "promise":
 			return (...args) => {
-				// eslint-disable-line
 				const id = ++tracer.counter;
 				tracer.trace.begin({
 					name,
@@ -373,7 +373,6 @@ const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
 			};
 		case "async":
 			return (...args) => {
-				// eslint-disable-line
 				const id = ++tracer.counter;
 				tracer.trace.begin({
 					name,
@@ -392,7 +391,6 @@ const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
 			};
 		case "sync":
 			return (...args) => {
-				// eslint-disable-line
 				const id = ++tracer.counter;
 				// Do not instrument ourself due to the CPU
 				// profile needing to be the last event in the trace.

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -23,17 +23,17 @@ const isBoundFunctionExpression = expr => {
 	return true;
 };
 
-function isUnboundFunctionExpression(expr) {
+const isUnboundFunctionExpression = expr => {
 	if (expr.type === "FunctionExpression") return true;
 	if (expr.type === "ArrowFunctionExpression") return true;
 	return false;
-}
+};
 
-function isCallable(expr) {
+const isCallable = expr => {
 	if (isUnboundFunctionExpression(expr)) return true;
 	if (isBoundFunctionExpression(expr)) return true;
 	return false;
-}
+};
 
 class AMDDefineDependencyParserPlugin {
 	constructor(options) {
@@ -80,7 +80,6 @@ class AMDDefineDependencyParserPlugin {
 						request
 					))
 				) {
-					// eslint-disable-line no-cond-assign
 					dep = new LocalModuleDependency(localModule, undefined, false);
 					dep.loc = expr.loc;
 					parser.state.current.addDependency(dep);
@@ -121,7 +120,6 @@ class AMDDefineDependencyParserPlugin {
 					namedModule
 				))
 			) {
-				// eslint-disable-line no-cond-assign
 				dep = new LocalModuleDependency(localModule, param.range, false);
 			} else {
 				dep = this.newRequireItemDependency(param.string, param.range);

package/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js

@@ -79,7 +79,6 @@ class AMDRequireDependenciesBlockParserPlugin {
 						request
 					))
 				) {
-					// eslint-disable-line no-cond-assign
 					dep = new LocalModuleDependency(localModule, undefined, false);
 					dep.loc = expr.loc;
 					parser.state.current.addDependency(dep);
@@ -127,7 +126,6 @@ class AMDRequireDependenciesBlockParserPlugin {
 					param.string
 				))
 			) {
-				// eslint-disable-line no-cond-assign
 				dep = new LocalModuleDependency(localModule, param.range, false);
 			} else {
 				dep = this.newRequireItemDependency(param.string, param.range);

package/lib/dependencies/AMDRequireItemDependency.js

@@ -1,22 +1,22 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-const ModuleDependency = require("./ModuleDependency");
-const ModuleDependencyTemplateAsRequireId = require("./ModuleDependencyTemplateAsRequireId");
-
-class AMDRequireItemDependency extends ModuleDependency {
-	constructor(request, range) {
-		super(request);
-		this.range = range;
-	}
-
-	get type() {
-		return "amd require";
-	}
-}
-
-AMDRequireItemDependency.Template = ModuleDependencyTemplateAsRequireId;
-
-module.exports = AMDRequireItemDependency;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+const ModuleDependency = require("./ModuleDependency");
+const ModuleDependencyTemplateAsRequireId = require("./ModuleDependencyTemplateAsRequireId");
+
+class AMDRequireItemDependency extends ModuleDependency {
+	constructor(request, range) {
+		super(request);
+		this.range = range;
+	}
+
+	get type() {
+		return "amd require";
+	}
+}
+
+AMDRequireItemDependency.Template = ModuleDependencyTemplateAsRequireId;
+
+module.exports = AMDRequireItemDependency;