webpack 4.10.1 → 4.12.0

package/lib/optimize/SplitChunksPlugin.js

@@ -36,7 +36,9 @@ const getRequests = chunk => {
 
 const getModulesSize = modules => {
 	let sum = 0;
-	for (const m of modules) sum += m.size();
+	for (const m of modules) {
+		sum += m.size();
+	}
 	return sum;
 };
 
@@ -172,8 +174,9 @@ module.exports = class SplitChunksPlugin {
 	static normalizeCacheGroups({ cacheGroups, automaticNameDelimiter }) {
 		if (typeof cacheGroups === "function") {
 			// TODO webpack 5 remove this
-			if (cacheGroups.length !== 1)
+			if (cacheGroups.length !== 1) {
 				return module => cacheGroups(module, module.getChunks());
+			}
 			return cacheGroups;
 		}
 		if (cacheGroups && typeof cacheGroups === "object") {
@@ -192,12 +195,7 @@ module.exports = class SplitChunksPlugin {
 						if (result) {
 							if (results === undefined) results = [];
 							for (const r of Array.isArray(result) ? result : [result]) {
-								const result = Object.assign(
-									{
-										key
-									},
-									r
-								);
+								const result = Object.assign({ key }, r);
 								if (result.name) result.getName = () => result.name;
 								if (result.chunks) {
 									result.chunksFilter = SplitChunksPlugin.normalizeChunksFilter(
@@ -240,23 +238,34 @@ module.exports = class SplitChunksPlugin {
 	static checkTest(test, module) {
 		if (test === undefined) return true;
 		if (typeof test === "function") {
-			if (test.length !== 1) return test(module, module.getChunks());
+			if (test.length !== 1) {
+				return test(module, module.getChunks());
+			}
 			return test(module);
 		}
 		if (typeof test === "boolean") return test;
 		if (typeof test === "string") {
-			if (module.nameForCondition && module.nameForCondition().startsWith(test))
+			if (
+				module.nameForCondition &&
+				module.nameForCondition().startsWith(test)
+			) {
 				return true;
+			}
 			for (const chunk of module.chunksIterable) {
-				if (chunk.name && chunk.name.startsWith(test)) return true;
+				if (chunk.name && chunk.name.startsWith(test)) {
+					return true;
+				}
 			}
 			return false;
 		}
 		if (test instanceof RegExp) {
-			if (module.nameForCondition && test.test(module.nameForCondition()))
+			if (module.nameForCondition && test.test(module.nameForCondition())) {
 				return true;
+			}
 			for (const chunk of module.chunksIterable) {
-				if (chunk.name && test.test(chunk.name)) return true;
+				if (chunk.name && test.test(chunk.name)) {
+					return true;
+				}
 			}
 			return false;
 		}
@@ -447,8 +456,9 @@ module.exports = class SplitChunksPlugin {
 					for (const module of compilation.modules) {
 						// Get cache group
 						let cacheGroups = this.options.getCacheGroups(module);
-						if (!Array.isArray(cacheGroups) || cacheGroups.length === 0)
+						if (!Array.isArray(cacheGroups) || cacheGroups.length === 0) {
 							continue;
+						}
 
 						// Prepare some values
 						const chunksKey = getKey(module.chunksIterable);
@@ -555,18 +565,20 @@ module.exports = class SplitChunksPlugin {
 								if (pair[1] === item.modules.size) {
 									const chunk = pair[0];
 									if (chunk.hasEntryModule()) continue;
-									if (!newChunk || !newChunk.name) newChunk = chunk;
-									else if (
+									if (!newChunk || !newChunk.name) {
+										newChunk = chunk;
+									} else if (
 										chunk.name &&
 										chunk.name.length < newChunk.name.length
-									)
+									) {
 										newChunk = chunk;
-									else if (
+									} else if (
 										chunk.name &&
 										chunk.name.length === newChunk.name.length &&
 										chunk.name < newChunk.name
-									)
+									) {
 										newChunk = chunk;
+									}
 									chunkName = undefined;
 									isReused = true;
 								}
@@ -683,8 +695,9 @@ module.exports = class SplitChunksPlugin {
 								}
 								if (info.modules.size !== oldSize) {
 									info.size = getModulesSize(info.modules);
-									if (info.size < info.cacheGroup.minSize)
+									if (info.size < info.cacheGroup.minSize) {
 										chunksInfoMap.delete(key);
+									}
 								}
 							}
 						}

package/lib/performance/AssetsOverSizeLimitWarning.js

@@ -9,21 +9,21 @@ const SizeFormatHelpers = require("../SizeFormatHelpers");
 
 module.exports = class AssetsOverSizeLimitWarning extends WebpackError {
 	constructor(assetsOverSizeLimit, assetLimit) {
-		super();
-
-		this.name = "AssetsOverSizeLimitWarning";
-		this.assets = assetsOverSizeLimit;
-		const assetLists = this.assets
+		const assetLists = assetsOverSizeLimit
 			.map(
 				asset =>
 					`\n  ${asset.name} (${SizeFormatHelpers.formatSize(asset.size)})`
 			)
 			.join("");
-		this.message = `asset size limit: The following asset(s) exceed the recommended size limit (${SizeFormatHelpers.formatSize(
+
+		super(`asset size limit: The following asset(s) exceed the recommended size limit (${SizeFormatHelpers.formatSize(
 			assetLimit
 		)}).
 This can impact web performance.
-Assets: ${assetLists}`;
+Assets: ${assetLists}`);
+
+		this.name = "AssetsOverSizeLimitWarning";
+		this.assets = assetsOverSizeLimit;
 
 		Error.captureStackTrace(this, this.constructor);
 	}

package/lib/performance/EntrypointsOverSizeLimitWarning.js

@@ -9,11 +9,7 @@ const SizeFormatHelpers = require("../SizeFormatHelpers");
 
 module.exports = class EntrypointsOverSizeLimitWarning extends WebpackError {
 	constructor(entrypoints, entrypointLimit) {
-		super();
-
-		this.name = "EntrypointsOverSizeLimitWarning";
-		this.entrypoints = entrypoints;
-		const entrypointList = this.entrypoints
+		const entrypointList = entrypoints
 			.map(
 				entrypoint =>
 					`\n  ${entrypoint.name} (${SizeFormatHelpers.formatSize(
@@ -21,10 +17,13 @@ module.exports = class EntrypointsOverSizeLimitWarning extends WebpackError {
 					)})\n${entrypoint.files.map(asset => `      ${asset}`).join("\n")}`
 			)
 			.join("");
-		this.message = `entrypoint size limit: The following entrypoint(s) combined asset size exceeds the recommended limit (${SizeFormatHelpers.formatSize(
+		super(`entrypoint size limit: The following entrypoint(s) combined asset size exceeds the recommended limit (${SizeFormatHelpers.formatSize(
 			entrypointLimit
 		)}). This can impact web performance.
-Entrypoints:${entrypointList}\n`;
+Entrypoints:${entrypointList}\n`);
+
+		this.name = "EntrypointsOverSizeLimitWarning";
+		this.entrypoints = entrypoints;
 
 		Error.captureStackTrace(this, this.constructor);
 	}

package/lib/performance/NoAsyncChunksWarning.js

@@ -8,13 +8,13 @@ const WebpackError = require("../WebpackError");
 
 module.exports = class NoAsyncChunksWarning extends WebpackError {
 	constructor() {
-		super();
+		super(
+			"webpack performance recommendations: \n" +
+				"You can limit the size of your bundles by using import() or require.ensure to lazy load some parts of your application.\n" +
+				"For more info visit https://webpack.js.org/guides/code-splitting/"
+		);
 
 		this.name = "NoAsyncChunksWarning";
-		this.message =
-			"webpack performance recommendations: \n" +
-			"You can limit the size of your bundles by using import() or require.ensure to lazy load some parts of your application.\n" +
-			"For more info visit https://webpack.js.org/guides/code-splitting/";
 
 		Error.captureStackTrace(this, this.constructor);
 	}

package/lib/util/SortableSet.js

@@ -94,12 +94,15 @@ class SortableSet extends Set {
 	}
 
 	_invalidateCache() {
-		if (this._cache !== undefined) this._cache.clear();
+		if (this._cache !== undefined) {
+			this._cache.clear();
+		}
 	}
 
 	_invalidateOrderedCache() {
-		if (this._cacheOrderIndependent !== undefined)
+		if (this._cacheOrderIndependent !== undefined) {
 			this._cacheOrderIndependent.clear();
+		}
 	}
 }
 

package/lib/util/StackedSetMap.js

@@ -25,8 +25,11 @@ class StackedSetMap {
 	}
 
 	delete(item) {
-		if (this.stack.length > 1) this.map.set(item, TOMBSTONE);
-		else this.map.delete(item);
+		if (this.stack.length > 1) {
+			this.map.set(item, TOMBSTONE);
+		} else {
+			this.map.delete(item);
+		}
 	}
 
 	has(item) {
@@ -47,10 +50,11 @@ class StackedSetMap {
 
 	get(item) {
 		const topValue = this.map.get(item);
-		if (topValue !== undefined)
+		if (topValue !== undefined) {
 			return topValue === TOMBSTONE || topValue === UNDEFINED_MARKER
 				? undefined
 				: topValue;
+		}
 		if (this.stack.length > 1) {
 			for (var i = this.stack.length - 2; i >= 0; i--) {
 				const value = this.stack[i].get(item);
@@ -71,8 +75,11 @@ class StackedSetMap {
 		this.map = new Map();
 		for (const data of this.stack) {
 			for (const pair of data) {
-				if (pair[1] === TOMBSTONE) this.map.delete(pair[0]);
-				else this.map.set(pair[0], pair[1]);
+				if (pair[1] === TOMBSTONE) {
+					this.map.delete(pair[0]);
+				} else {
+					this.map.set(pair[0], pair[1]);
+				}
 			}
 		}
 		this.stack = [this.map];

package/lib/wasm/UnsupportedWebAssemblyFeatureError.js

@@ -8,9 +8,8 @@ const WebpackError = require("../WebpackError");
 module.exports = class UnsupportedWebAssemblyFeatureError extends WebpackError {
 	/** @param {string} message Error message */
 	constructor(message) {
-		super();
+		super(message);
 		this.name = "UnsupportedWebAssemblyFeatureError";
-		this.message = message;
 		this.hideStack = true;
 
 		Error.captureStackTrace(this, this.constructor);

package/lib/wasm/WasmFinalizeExportsPlugin.js

@@ -0,0 +1,66 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+	*/
+"use strict";
+
+const UnsupportedWebAssemblyFeatureError = require("../wasm/UnsupportedWebAssemblyFeatureError");
+
+class WasmFinalizeExportsPlugin {
+	apply(compiler) {
+		compiler.hooks.compilation.tap("WasmFinalizeExportsPlugin", compilation => {
+			compilation.hooks.finishModules.tap(
+				"WasmFinalizeExportsPlugin",
+				modules => {
+					for (const module of modules) {
+						// 1. if a WebAssembly module
+						if (module.type.startsWith("webassembly") === true) {
+							const jsIncompatibleExports =
+								module.buildMeta.jsIncompatibleExports;
+
+							if (jsIncompatibleExports === undefined) {
+								continue;
+							}
+
+							for (const reason of module.reasons) {
+								// 2. is referenced by a non-WebAssembly module
+								if (reason.module.type.startsWith("webassembly") === false) {
+									const ref = reason.dependency.getReference();
+
+									const importedNames = ref.importedNames;
+
+									if (Array.isArray(importedNames)) {
+										importedNames.forEach(name => {
+											// 3. and uses a func with an incompatible JS signature
+											if (
+												Object.prototype.hasOwnProperty.call(
+													jsIncompatibleExports,
+													name
+												)
+											) {
+												// 4. error
+												/** @type {any} */
+												const error = new UnsupportedWebAssemblyFeatureError(
+													`Export "${name}" with ${
+														jsIncompatibleExports[name]
+													} can only be used for direct wasm to wasm dependencies`
+												);
+												error.module = module;
+												error.origin = reason.module;
+												error.originLoc = reason.dependency.loc;
+												error.dependencies = [reason.dependency];
+												compilation.errors.push(error);
+											}
+										});
+									}
+								}
+							}
+						}
+					}
+				}
+			);
+		});
+	}
+}
+
+module.exports = WasmFinalizeExportsPlugin;

package/lib/wasm/WasmMainTemplatePlugin.js

@@ -27,12 +27,16 @@ function getAllWasmModules(chunk) {
 /**
  * generates the import object function for a module
  * @param {Module} module the module
+ * @param {boolean} mangle mangle imports
  * @returns {string} source code
  */
-function generateImportObject(module) {
+function generateImportObject(module, mangle) {
 	const waitForInstances = new Map();
 	const properties = [];
-	const usedWasmDependencies = WebAssemblyUtils.getUsedDependencies(module);
+	const usedWasmDependencies = WebAssemblyUtils.getUsedDependencies(
+		module,
+		mangle
+	);
 	for (const usedDep of usedWasmDependencies) {
 		const dep = usedDep.dependency;
 		const importedModule = dep.module;
@@ -41,15 +45,17 @@ function generateImportObject(module) {
 		const description = dep.description;
 		const direct = dep.onlyDirectImport;
 
-		const propertyName = usedDep.name;
+		const module = usedDep.module;
+		const name = usedDep.name;
 
 		if (direct) {
 			const instanceVar = `m${waitForInstances.size}`;
 			waitForInstances.set(instanceVar, importedModule.id);
-			properties.push(
-				`${JSON.stringify(propertyName)}: ${instanceVar}` +
-					`[${JSON.stringify(usedName)}]`
-			);
+			properties.push({
+				module,
+				name,
+				value: `${instanceVar}[${JSON.stringify(usedName)}]`
+			});
 		} else {
 			const params = description.signature.params.map(
 				(param, k) => "p" + k + param.valtype
@@ -58,18 +64,53 @@ function generateImportObject(module) {
 			const mod = `installedModules[${JSON.stringify(importedModule.id)}]`;
 			const func = `${mod}.exports[${JSON.stringify(usedName)}]`;
 
-			properties.push(
-				Template.asString([
-					`${JSON.stringify(propertyName)}: ` +
-						(importedModule.type.startsWith("webassembly")
-							? `${mod} ? ${func} : `
-							: "") +
-						`function(${params}) {`,
+			properties.push({
+				module,
+				name,
+				value: Template.asString([
+					(importedModule.type.startsWith("webassembly")
+						? `${mod} ? ${func} : `
+						: "") + `function(${params}) {`,
 					Template.indent([`return ${func}(${params});`]),
 					"}"
 				])
-			);
+			});
+		}
+	}
+
+	let importObject;
+	if (mangle) {
+		importObject = [
+			"return {",
+			Template.indent([
+				properties.map(p => `${JSON.stringify(p.name)}: ${p.value}`).join(",\n")
+			]),
+			"};"
+		];
+	} else {
+		const propertiesByModule = new Map();
+		for (const p of properties) {
+			let list = propertiesByModule.get(p.module);
+			if (list === undefined) {
+				propertiesByModule.set(p.module, (list = []));
+			}
+			list.push(p);
 		}
+		importObject = [
+			"return {",
+			Template.indent([
+				Array.from(propertiesByModule, ([module, list]) => {
+					return Template.asString([
+						`${JSON.stringify(module)}: {`,
+						Template.indent([
+							list.map(p => `${JSON.stringify(p.name)}: ${p.value}`).join(",\n")
+						]),
+						"}"
+					]);
+				}).join(",\n")
+			]),
+			"};"
+		];
 	}
 
 	if (waitForInstances.size === 1) {
@@ -80,11 +121,7 @@ function generateImportObject(module) {
 			`${JSON.stringify(module.id)}: function() {`,
 			Template.indent([
 				`return promiseResolve().then(function() { return ${promise}; }).then(function(${variable}) {`,
-				Template.indent([
-					"return {",
-					Template.indent([properties.join(",\n")]),
-					"};"
-				]),
+				Template.indent(importObject),
 				"});"
 			]),
 			"},"
@@ -102,12 +139,7 @@ function generateImportObject(module) {
 			`${JSON.stringify(module.id)}: function() {`,
 			Template.indent([
 				`return promiseResolve().then(function() { return Promise.all([${promises}]); }).then(function(array) {`,
-				Template.indent([
-					`var ${variables};`,
-					"return {",
-					Template.indent([properties.join(",\n")]),
-					"};"
-				]),
+				Template.indent([`var ${variables};`, ...importObject]),
 				"});"
 			]),
 			"},"
@@ -115,20 +147,17 @@ function generateImportObject(module) {
 	} else {
 		return Template.asString([
 			`${JSON.stringify(module.id)}: function() {`,
-			Template.indent([
-				"return {",
-				Template.indent([properties.join(",\n")]),
-				"};"
-			]),
+			Template.indent(importObject),
 			"},"
 		]);
 	}
 }
 
 class WasmMainTemplatePlugin {
-	constructor(generateLoadBinaryCode, supportsStreaming) {
+	constructor({ generateLoadBinaryCode, supportsStreaming, mangleImports }) {
 		this.generateLoadBinaryCode = generateLoadBinaryCode;
 		this.supportsStreaming = supportsStreaming;
+		this.mangleImports = mangleImports;
 	}
 	apply(mainTemplate) {
 		mainTemplate.hooks.localVars.tap(
@@ -136,7 +165,9 @@ class WasmMainTemplatePlugin {
 			(source, chunk) => {
 				const wasmModules = getAllWasmModules(chunk);
 				if (wasmModules.length === 0) return source;
-				const importObjects = wasmModules.map(generateImportObject);
+				const importObjects = wasmModules.map(module => {
+					return generateImportObject(module, this.mangleImports);
+				});
 				return Template.asString([
 					source,
 					"",
@@ -179,10 +210,11 @@ class WasmMainTemplatePlugin {
 							hashWithLength(length) {
 								const shortChunkHashMap = Object.create(null);
 								for (const wasmModuleId of Object.keys(chunkModuleMaps.hash)) {
-									if (typeof chunkModuleMaps.hash[wasmModuleId] === "string")
+									if (typeof chunkModuleMaps.hash[wasmModuleId] === "string") {
 										shortChunkHashMap[wasmModuleId] = chunkModuleMaps.hash[
 											wasmModuleId
 										].substr(0, length);
+									}
 								}
 								return `" + ${JSON.stringify(
 									shortChunkHashMap
@@ -191,6 +223,12 @@ class WasmMainTemplatePlugin {
 						}
 					}
 				);
+				const createImportObject = content =>
+					this.mangleImports
+						? `{ ${JSON.stringify(
+								WebAssemblyUtils.MANGLED_MODULE
+						  )}: ${content} }`
+						: content;
 				return Template.asString([
 					source,
 					"",
@@ -218,15 +256,17 @@ class WasmMainTemplatePlugin {
 										Template.indent([
 											"promise = Promise.all([WebAssembly.compileStreaming(req), importObject]).then(function(items) {",
 											Template.indent([
-												"return WebAssembly.instantiate(items[0], " +
-													`{ ${WebAssemblyUtils.MANGLED_MODULE}: items[1] });`
+												`return WebAssembly.instantiate(items[0], ${createImportObject(
+													"items[1]"
+												)});`
 											]),
 											"});"
 										]),
 										"} else if(typeof WebAssembly.instantiateStreaming === 'function') {",
 										Template.indent([
-											"promise = WebAssembly.instantiateStreaming(req, " +
-												`{ ${WebAssemblyUtils.MANGLED_MODULE}: importObject });`
+											`promise = WebAssembly.instantiateStreaming(req, ${createImportObject(
+												"importObject"
+											)});`
 										])
 								  ])
 								: Template.asString([
@@ -240,8 +280,9 @@ class WasmMainTemplatePlugin {
 											]),
 											"]).then(function(items) {",
 											Template.indent([
-												"return WebAssembly.instantiate(items[0], " +
-													`{ ${WebAssemblyUtils.MANGLED_MODULE}: items[1] });`
+												`return WebAssembly.instantiate(items[0], ${createImportObject(
+													"items[1]"
+												)});`
 											]),
 											"});"
 										])
@@ -251,8 +292,9 @@ class WasmMainTemplatePlugin {
 								"var bytesPromise = req.then(function(x) { return x.arrayBuffer(); });",
 								"promise = bytesPromise.then(function(bytes) {",
 								Template.indent([
-									"return WebAssembly.instantiate(bytes, " +
-										`{ ${WebAssemblyUtils.MANGLED_MODULE}: importObject });`
+									`return WebAssembly.instantiate(bytes, ${createImportObject(
+										"importObject"
+									)});`
 								]),
 								"});"
 							]),
@@ -274,8 +316,9 @@ class WasmMainTemplatePlugin {
 		mainTemplate.hooks.requireExtensions.tap(
 			"WasmMainTemplatePlugin",
 			(source, chunk) => {
-				if (!chunk.hasModuleInGraph(m => m.type.startsWith("webassembly")))
+				if (!chunk.hasModuleInGraph(m => m.type.startsWith("webassembly"))) {
 					return source;
+				}
 				return Template.asString([
 					source,
 					"",
@@ -288,6 +331,7 @@ class WasmMainTemplatePlugin {
 			hash.update("WasmMainTemplatePlugin");
 			hash.update("1");
 			hash.update(`${mainTemplate.outputOptions.webassemblyModuleFilename}`);
+			hash.update(`${this.mangleImports}`);
 		});
 		mainTemplate.hooks.hashForChunk.tap(
 			"WasmMainTemplatePlugin",