webpack 4.10.1 → 4.12.0

package/lib/Stats.js

@@ -56,8 +56,8 @@ class Stats {
 	formatFilePath(filePath) {
 		const OPTIONS_REGEXP = /^(\s|\S)*!/;
 		return filePath.includes("!")
-			? `${filePath.replace(OPTIONS_REGEXP, "")} (${filePath})\n`
-			: `${filePath}\n`;
+			? `${filePath.replace(OPTIONS_REGEXP, "")} (${filePath})`
+			: `${filePath}`;
 	}
 
 	hasWarnings() {
@@ -114,10 +114,15 @@ class Stats {
 				); // eslint-disable-line no-useless-escape
 				return ident => regExp.test(ident);
 			}
-			if (item && typeof item === "object" && typeof item.test === "function")
+			if (item && typeof item === "object" && typeof item.test === "function") {
 				return ident => item.test(ident);
-			if (typeof item === "function") return item;
-			if (typeof item === "boolean") return () => item;
+			}
+			if (typeof item === "function") {
+				return item;
+			}
+			if (typeof item === "boolean") {
+				return () => item;
+			}
 		};
 
 		const compilation = this.compilation;
@@ -260,10 +265,9 @@ class Stats {
 
 		const formatError = e => {
 			let text = "";
-			if (typeof e === "string")
-				e = {
-					message: e
-				};
+			if (typeof e === "string") {
+				e = { message: e };
+			}
 			if (e.chunk) {
 				text += `chunk ${e.chunk.name || e.chunk.id}${
 					e.chunk.hasRuntime()
@@ -284,13 +288,23 @@ class Stats {
 				text += this.formatFilePath(
 					e.module.readableIdentifier(requestShortener)
 				);
+				if (typeof e.loc === "object") {
+					const locInfo = formatLocation(e.loc);
+					if (locInfo) text += ` ${locInfo}`;
+				}
+				text += "\n";
 			}
 			text += e.message;
-			if (showErrorDetails && e.details) text += `\n${e.details}`;
-			if (showErrorDetails && e.missing)
+			if (showErrorDetails && e.details) {
+				text += `\n${e.details}`;
+			}
+			if (showErrorDetails && e.missing) {
 				text += e.missing.map(item => `\n[${item}]`).join("");
+			}
 			if (showModuleTrace && e.origin) {
-				text += `\n @ ${e.origin.readableIdentifier(requestShortener)}`;
+				text += `\n @ ${this.formatFilePath(
+					e.origin.readableIdentifier(requestShortener)
+				)}`;
 				if (typeof e.originLoc === "object") {
 					const locInfo = formatLocation(e.originLoc);
 					if (locInfo) text += ` ${locInfo}`;
@@ -392,11 +406,13 @@ class Stats {
 						}
 						if (chunk.name) {
 							assetsByFile[asset].chunkNames.push(chunk.name);
-							if (obj.assetsByChunkName[chunk.name])
+							if (obj.assetsByChunkName[chunk.name]) {
 								obj.assetsByChunkName[chunk.name] = []
 									.concat(obj.assetsByChunkName[chunk.name])
 									.concat([asset]);
-							else obj.assetsByChunkName[chunk.name] = asset;
+							} else {
+								obj.assetsByChunkName[chunk.name] = asset;
+							}
 						}
 					}
 				}
@@ -520,15 +536,20 @@ class Stats {
 						};
 						if (reason.dependency) {
 							const locInfo = formatLocation(reason.dependency.loc);
-							if (locInfo) obj.loc = locInfo;
+							if (locInfo) {
+								obj.loc = locInfo;
+							}
 						}
 						return obj;
 					})
 					.sort((a, b) => a.moduleId - b.moduleId);
 			}
 			if (showUsedExports) {
-				if (module.used === true) obj.usedExports = module.usedExports;
-				else if (module.used === false) obj.usedExports = false;
+				if (module.used === true) {
+					obj.usedExports = module.usedExports;
+				} else if (module.used === false) {
+					obj.usedExports = false;
+				}
 			}
 			if (showProvidedExports) {
 				obj.providedExports = Array.isArray(module.buildMeta.providedExports)
@@ -662,12 +683,13 @@ class Stats {
 				const obj = new Stats(child).toJson(childOptions, forToString);
 				delete obj.hash;
 				delete obj.version;
-				if (child.name)
+				if (child.name) {
 					obj.name = identifierUtils.makePathsRelative(
 						context,
 						child.name,
 						compilation.cache
 					);
+				}
 				return obj;
 			});
 		}
@@ -745,7 +767,9 @@ class Stats {
 			const rows = array.length;
 			const cols = array[0].length;
 			const colSizes = new Array(cols);
-			for (let col = 0; col < cols; col++) colSizes[col] = 0;
+			for (let col = 0; col < cols; col++) {
+				colSizes[col] = 0;
+			}
 			for (let row = 0; row < rows; row++) {
 				for (let col = 0; col < cols; col++) {
 					const value = `${getText(array, row, col)}`;
@@ -759,11 +783,18 @@ class Stats {
 					const format = array[row][col].color;
 					const value = `${getText(array, row, col)}`;
 					let l = value.length;
-					if (align[col] === "l") format(value);
-					for (; l < colSizes[col] && col !== cols - 1; l++) colors.normal(" ");
-					if (align[col] === "r") format(value);
-					if (col + 1 < cols && colSizes[col] !== 0)
+					if (align[col] === "l") {
+						format(value);
+					}
+					for (; l < colSizes[col] && col !== cols - 1; l++) {
+						colors.normal(" ");
+					}
+					if (align[col] === "r") {
+						format(value);
+					}
+					if (col + 1 < cols && colSizes[col] !== 0) {
 						colors.normal(splitter || "  ");
+					}
 				}
 				newline();
 			}
@@ -981,21 +1012,26 @@ class Stats {
 				colors.magenta(" [prefetched]");
 			}
 			if (module.failed) colors.red(" [failed]");
-			if (module.warnings)
+			if (module.warnings) {
 				colors.yellow(
 					` [${module.warnings} warning${module.warnings === 1 ? "" : "s"}]`
 				);
-			if (module.errors)
+			}
+			if (module.errors) {
 				colors.red(
 					` [${module.errors} error${module.errors === 1 ? "" : "s"}]`
 				);
+			}
 		};
 
 		const processModuleContent = (module, prefix) => {
 			if (Array.isArray(module.providedExports)) {
 				colors.normal(prefix);
-				if (module.providedExports.length === 0) colors.cyan("[no exports]");
-				else colors.cyan(`[exports: ${module.providedExports.join(", ")}]`);
+				if (module.providedExports.length === 0) {
+					colors.cyan("[no exports]");
+				} else {
+					colors.cyan(`[exports: ${module.providedExports.join(", ")}]`);
+				}
 				newline();
 			}
 			if (module.usedExports !== undefined) {
@@ -1285,7 +1321,9 @@ class Stats {
 			);
 		}
 
-		while (buf[buf.length - 1] === "\n") buf.pop();
+		while (buf[buf.length - 1] === "\n") {
+			buf.pop();
+		}
 		return buf.join("");
 	}
 
@@ -1356,13 +1394,18 @@ class Stats {
 	static getChildOptions(options, idx) {
 		let innerOptions;
 		if (Array.isArray(options.children)) {
-			if (idx < options.children.length) innerOptions = options.children[idx];
+			if (idx < options.children.length) {
+				innerOptions = options.children[idx];
+			}
 		} else if (typeof options.children === "object" && options.children) {
 			innerOptions = options.children;
 		}
-		if (typeof innerOptions === "boolean" || typeof innerOptions === "string")
+		if (typeof innerOptions === "boolean" || typeof innerOptions === "string") {
 			innerOptions = Stats.presetToOptions(innerOptions);
-		if (!innerOptions) return options;
+		}
+		if (!innerOptions) {
+			return options;
+		}
 		const childOptions = Object.assign({}, options);
 		delete childOptions.children; // do not inherit children
 		return Object.assign(childOptions, innerOptions);

package/lib/Template.js

@@ -114,13 +114,16 @@ class Template {
 	 */
 	static numberToIdentifer(n) {
 		// lower case
-		if (n < DELTA_A_TO_Z)
+		if (n < DELTA_A_TO_Z) {
 			return String.fromCharCode(START_LOWERCASE_ALPHABET_CODE + n);
+		}
 
 		// upper case
-		n -= DELTA_A_TO_Z;
-		if (n < DELTA_A_TO_Z)
-			return String.fromCharCode(START_UPPERCASE_ALPHABET_CODE + n);
+		if (n < DELTA_A_TO_Z * 2) {
+			return String.fromCharCode(
+				START_UPPERCASE_ALPHABET_CODE + n - DELTA_A_TO_Z
+			);
+		}
 
 		// use multiple letters
 		return (

package/lib/TemplatedPathPlugin.js

@@ -39,10 +39,11 @@ const getReplacer = (value, allowEmpty) => {
 		// last argument in replacer is the entire input string
 		const input = args[args.length - 1];
 		if (value === null || value === undefined) {
-			if (!allowEmpty)
+			if (!allowEmpty) {
 				throw new Error(
 					`Path variable ${match} not implemented in this context: ${input}`
 				);
+			}
 			return "";
 		} else {
 			return `${value}`;
@@ -150,8 +151,9 @@ class TemplatedPathPlugin {
 					const outputOptions = mainTemplate.outputOptions;
 					const chunkFilename =
 						outputOptions.chunkFilename || outputOptions.filename;
-					if (REGEXP_CHUNKHASH_FOR_TEST.test(chunkFilename))
+					if (REGEXP_CHUNKHASH_FOR_TEST.test(chunkFilename)) {
 						hash.update(JSON.stringify(chunk.getChunkMaps(true).hash));
+					}
 					if (REGEXP_CONTENTHASH_FOR_TEST.test(chunkFilename)) {
 						hash.update(
 							JSON.stringify(
@@ -159,8 +161,9 @@ class TemplatedPathPlugin {
 							)
 						);
 					}
-					if (REGEXP_NAME_FOR_TEST.test(chunkFilename))
+					if (REGEXP_NAME_FOR_TEST.test(chunkFilename)) {
 						hash.update(JSON.stringify(chunk.getChunkMaps(true).name));
+					}
 				}
 			);
 		});

package/lib/UmdMainTemplatePlugin.js

@@ -144,16 +144,21 @@ class UmdMainTemplatePlugin {
 						.map(m => {
 							let expr;
 							let request = m.request;
-							if (typeof request === "object") request = request[type];
-							if (typeof request === "undefined")
+							if (typeof request === "object") {
+								request = request[type];
+							}
+							if (typeof request === "undefined") {
 								throw new Error(
 									"Missing external configuration for type:" + type
 								);
+							}
 							if (Array.isArray(request)) {
 								expr = `require(${JSON.stringify(
 									request[0]
 								)})${accessorToObjectAccess(request.slice(1))}`;
-							} else expr = `require(${JSON.stringify(request)})`;
+							} else {
+								expr = `require(${JSON.stringify(request)})`;
+							}
 							if (m.optional) {
 								expr = `(function webpackLoadOptionalExternalModule() { try { return ${expr}; } catch(e) {} }())`;
 							}

package/lib/UnsupportedFeatureWarning.js

@@ -1,21 +1,22 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const WebpackError = require("./WebpackError");
-
-class UnsupportedFeatureWarning extends WebpackError {
-	constructor(module, message) {
-		super();
-
-		this.name = "UnsupportedFeatureWarning";
-		this.message = message;
-		this.origin = this.module = module;
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-}
-
-module.exports = UnsupportedFeatureWarning;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const WebpackError = require("./WebpackError");
+
+class UnsupportedFeatureWarning extends WebpackError {
+	constructor(module, message, loc) {
+		super(message);
+
+		this.name = "UnsupportedFeatureWarning";
+		this.module = module;
+		this.loc = loc;
+		this.hideStack = true;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+}
+
+module.exports = UnsupportedFeatureWarning;

package/lib/WarnCaseSensitiveModulesPlugin.js

@@ -24,8 +24,9 @@ class WarnCaseSensitiveModulesPlugin {
 					}
 					for (const pair of moduleWithoutCase) {
 						const array = pair[1];
-						if (array.length > 1)
+						if (array.length > 1) {
 							compilation.warnings.push(new CaseSensitiveModulesWarning(array));
+						}
 					}
 				});
 			}

package/lib/Watching.js

@@ -128,8 +128,9 @@ class Watching {
 			) => {
 				this.pausedWatcher = this.watcher;
 				this.watcher = null;
-				if (err) return this.handler(err);
-
+				if (err) {
+					return this.handler(err);
+				}
 				this.compiler.fileTimestamps = fileTimestamps;
 				this.compiler.contextTimestamps = contextTimestamps;
 				this._invalidate();

package/lib/WebpackOptionsApply.js

@@ -58,6 +58,7 @@ const NamedModulesPlugin = require("./NamedModulesPlugin");
 const NamedChunksPlugin = require("./NamedChunksPlugin");
 const DefinePlugin = require("./DefinePlugin");
 const SizeLimitsPlugin = require("./performance/SizeLimitsPlugin");
+const WasmFinalizeExportsPlugin = require("./wasm/WasmFinalizeExportsPlugin");
 
 class WebpackOptionsApply extends OptionsApply {
 	constructor() {
@@ -86,7 +87,9 @@ class WebpackOptionsApply extends OptionsApply {
 					FetchCompileWasmTemplatePlugin = require("./web/FetchCompileWasmTemplatePlugin");
 					NodeSourcePlugin = require("./node/NodeSourcePlugin");
 					new JsonpTemplatePlugin().apply(compiler);
-					new FetchCompileWasmTemplatePlugin().apply(compiler);
+					new FetchCompileWasmTemplatePlugin({
+						mangleImports: options.optimization.mangleWasmImports
+					}).apply(compiler);
 					new FunctionModulePlugin().apply(compiler);
 					new NodeSourcePlugin(options.node).apply(compiler);
 					new LoaderTargetPlugin(options.target).apply(compiler);
@@ -96,7 +99,9 @@ class WebpackOptionsApply extends OptionsApply {
 					FetchCompileWasmTemplatePlugin = require("./web/FetchCompileWasmTemplatePlugin");
 					NodeSourcePlugin = require("./node/NodeSourcePlugin");
 					new WebWorkerTemplatePlugin().apply(compiler);
-					new FetchCompileWasmTemplatePlugin().apply(compiler);
+					new FetchCompileWasmTemplatePlugin({
+						mangleImports: options.optimization.mangleWasmImports
+					}).apply(compiler);
 					new FunctionModulePlugin().apply(compiler);
 					new NodeSourcePlugin(options.node).apply(compiler);
 					new LoaderTargetPlugin(options.target).apply(compiler);
@@ -110,7 +115,9 @@ class WebpackOptionsApply extends OptionsApply {
 					new NodeTemplatePlugin({
 						asyncChunkLoading: options.target === "async-node"
 					}).apply(compiler);
-					new ReadFileCompileWasmTemplatePlugin().apply(compiler);
+					new ReadFileCompileWasmTemplatePlugin({
+						mangleImports: options.optimization.mangleWasmImports
+					}).apply(compiler);
 					new FunctionModulePlugin().apply(compiler);
 					new NodeTargetPlugin().apply(compiler);
 					new LoaderTargetPlugin("node").apply(compiler);
@@ -194,7 +201,7 @@ class WebpackOptionsApply extends OptionsApply {
 		}
 
 		if (options.output.library || options.output.libraryTarget !== "var") {
-			let LibraryTemplatePlugin = require("./LibraryTemplatePlugin");
+			const LibraryTemplatePlugin = require("./LibraryTemplatePlugin");
 			new LibraryTemplatePlugin(
 				options.output.library,
 				options.output.libraryTarget,
@@ -238,7 +245,7 @@ class WebpackOptionsApply extends OptionsApply {
 						: modern
 							? "\n//# source" + "MappingURL=[url]"
 							: null;
-			let Plugin = evalWrapped
+			const Plugin = evalWrapped
 				? EvalSourceMapDevToolPlugin
 				: SourceMapDevToolPlugin;
 			new Plugin({
@@ -273,7 +280,9 @@ class WebpackOptionsApply extends OptionsApply {
 
 		new JavascriptModulesPlugin().apply(compiler);
 		new JsonModulesPlugin().apply(compiler);
-		new WebAssemblyModulesPlugin().apply(compiler);
+		new WebAssemblyModulesPlugin({
+			mangleImports: options.optimization.mangleWasmImports
+		}).apply(compiler);
 
 		new EntryOptionPlugin().apply(compiler);
 		compiler.hooks.entryOption.call(options.context, options.entry);
@@ -298,38 +307,56 @@ class WebpackOptionsApply extends OptionsApply {
 		new ImportPlugin(options.module).apply(compiler);
 		new SystemPlugin(options.module).apply(compiler);
 
-		if (typeof options.mode !== "string")
+		if (typeof options.mode !== "string") {
 			new WarnNoModeSetPlugin().apply(compiler);
+		}
 
 		new EnsureChunkConditionsPlugin().apply(compiler);
-		if (options.optimization.removeAvailableModules)
+		if (options.optimization.removeAvailableModules) {
 			new RemoveParentModulesPlugin().apply(compiler);
-		if (options.optimization.removeEmptyChunks)
+		}
+		if (options.optimization.removeEmptyChunks) {
 			new RemoveEmptyChunksPlugin().apply(compiler);
-		if (options.optimization.mergeDuplicateChunks)
+		}
+		if (options.optimization.mergeDuplicateChunks) {
 			new MergeDuplicateChunksPlugin().apply(compiler);
-		if (options.optimization.flagIncludedChunks)
+		}
+		if (options.optimization.flagIncludedChunks) {
 			new FlagIncludedChunksPlugin().apply(compiler);
-		if (options.optimization.occurrenceOrder)
+		}
+		if (options.optimization.occurrenceOrder) {
 			new OccurrenceOrderPlugin(true).apply(compiler);
-		if (options.optimization.sideEffects)
+		}
+		if (options.optimization.sideEffects) {
 			new SideEffectsFlagPlugin().apply(compiler);
-		if (options.optimization.providedExports)
+		}
+		if (options.optimization.providedExports) {
 			new FlagDependencyExportsPlugin().apply(compiler);
-		if (options.optimization.usedExports)
+		}
+		if (options.optimization.usedExports) {
 			new FlagDependencyUsagePlugin().apply(compiler);
-		if (options.optimization.concatenateModules)
+		}
+		if (options.optimization.concatenateModules) {
 			new ModuleConcatenationPlugin().apply(compiler);
-		if (options.optimization.splitChunks)
+		}
+		if (options.optimization.splitChunks) {
 			new SplitChunksPlugin(options.optimization.splitChunks).apply(compiler);
-		if (options.optimization.runtimeChunk)
+		}
+		if (options.optimization.runtimeChunk) {
 			new RuntimeChunkPlugin(options.optimization.runtimeChunk).apply(compiler);
-		if (options.optimization.noEmitOnErrors)
+		}
+		if (options.optimization.noEmitOnErrors) {
 			new NoEmitOnErrorsPlugin().apply(compiler);
-		if (options.optimization.namedModules)
+		}
+		if (options.optimization.checkWasmTypes) {
+			new WasmFinalizeExportsPlugin().apply(compiler);
+		}
+		if (options.optimization.namedModules) {
 			new NamedModulesPlugin().apply(compiler);
-		if (options.optimization.namedChunks)
+		}
+		if (options.optimization.namedChunks) {
 			new NamedChunksPlugin().apply(compiler);
+		}
 		if (options.optimization.nodeEnv) {
 			new DefinePlugin({
 				"process.env.NODE_ENV": JSON.stringify(options.optimization.nodeEnv)
@@ -354,15 +381,16 @@ class WebpackOptionsApply extends OptionsApply {
 		new WarnCaseSensitiveModulesPlugin().apply(compiler);
 
 		if (options.cache) {
-			let CachePlugin = require("./CachePlugin");
+			const CachePlugin = require("./CachePlugin");
 			new CachePlugin(
 				typeof options.cache === "object" ? options.cache : null
 			).apply(compiler);
 		}
 
 		compiler.hooks.afterPlugins.call(compiler);
-		if (!compiler.inputFileSystem)
+		if (!compiler.inputFileSystem) {
 			throw new Error("No input filesystem provided");
+		}
 		compiler.resolverFactory.hooks.resolveOptions
 			.for("normal")
 			.tap("WebpackOptionsApply", resolveOptions => {

package/lib/WebpackOptionsDefaulter.js

@@ -136,10 +136,11 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 			}
 		});
 		this.set("output.devtoolNamespace", "make", options => {
-			if (Array.isArray(options.output.library))
+			if (Array.isArray(options.output.library)) {
 				return options.output.library.join(".");
-			else if (typeof options.output.library === "object")
+			} else if (typeof options.output.library === "object") {
 				return options.output.library.root || "";
+			}
 			return options.output.library || "";
 		});
 		this.set("output.libraryTarget", "var");
@@ -253,6 +254,10 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("optimization.noEmitOnErrors", "make", options =>
 			isProductionLikeMode(options)
 		);
+		this.set("optimization.checkWasmTypes", "make", options =>
+			isProductionLikeMode(options)
+		);
+		this.set("optimization.mangleWasmImports", false);
 		this.set(
 			"optimization.namedModules",
 			"make",
@@ -293,11 +298,10 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 				}
 			}
 		]);
-		this.set(
-			"optimization.nodeEnv",
-			"make",
-			options => options.mode || "production"
-		);
+		this.set("optimization.nodeEnv", "make", options => {
+			// TODO: In webpack 5, it should return `false` when mode is `none`
+			return options.mode || "production";
+		});
 
 		this.set("resolve", "call", value => Object.assign({}, value));
 		this.set("resolve.unsafeCache", true);
@@ -305,9 +309,11 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		this.set("resolve.extensions", [".wasm", ".mjs", ".js", ".json"]);
 		this.set("resolve.mainFiles", ["index"]);
 		this.set("resolve.aliasFields", "make", options => {
-			if (options.target === "web" || options.target === "webworker")
+			if (options.target === "web" || options.target === "webworker") {
 				return ["browser"];
-			else return [];
+			} else {
+				return [];
+			}
 		});
 		this.set("resolve.mainFields", "make", options => {
 			if (