webpack 4.10.1 → 4.12.0

package/lib/dependencies/WebAssemblyExportImportedDependency.js

@@ -0,0 +1,29 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const DependencyReference = require("./DependencyReference");
+const ModuleDependency = require("./ModuleDependency");
+
+class WebAssemblyExportImportedDependency extends ModuleDependency {
+	constructor(exportName, request, name) {
+		super(request);
+		/** @type {string} */
+		this.exportName = exportName;
+		/** @type {string} */
+		this.name = name;
+	}
+
+	getReference() {
+		if (!this.module) return null;
+		return new DependencyReference(this.module, [this.name], false);
+	}
+
+	get type() {
+		return "wasm export import";
+	}
+}
+
+module.exports = WebAssemblyExportImportedDependency;

package/lib/dependencies/WebAssemblyImportDependency.js

@@ -32,7 +32,7 @@ class WebAssemblyImportDependency extends ModuleDependency {
 		) {
 			return [
 				new UnsupportedWebAssemblyFeatureError(
-					`Import with ${
+					`Import "${this.name}" from "${this.request}" with ${
 						this.onlyDirectImport
 					} can only be used for direct wasm to wasm dependencies`
 				)

package/lib/formatLocation.js

@@ -14,11 +14,15 @@ const formatPosition = pos => {
 		case "number":
 			return `${pos}`;
 		case "object":
-			if (typeof pos.line === "number" && typeof pos.column === "number")
+			if (typeof pos.line === "number" && typeof pos.column === "number") {
 				return `${pos.line}:${pos.column}`;
-			else if (typeof pos.line === "number") return `${pos.line}:?`;
-			else if (typeof pos.index === "number") return `+${pos.index}`;
-			else return "";
+			} else if (typeof pos.line === "number") {
+				return `${pos.line}:?`;
+			} else if (typeof pos.index === "number") {
+				return `+${pos.index}`;
+			} else {
+				return "";
+			}
 		default:
 			return "";
 	}
@@ -39,11 +43,15 @@ const formatLocation = loc => {
 					typeof loc.end.line === "number" &&
 					typeof loc.end.column === "number" &&
 					loc.start.line === loc.end.line
-				)
+				) {
 					return `${formatPosition(loc.start)}-${loc.end.column}`;
-				return `${formatPosition(loc.start)}-${formatPosition(loc.end)}`;
+				} else {
+					return `${formatPosition(loc.start)}-${formatPosition(loc.end)}`;
+				}
+			}
+			if (loc.start) {
+				return formatPosition(loc.start);
 			}
-			if (loc.start) return formatPosition(loc.start);
 			return formatPosition(loc);
 		default:
 			return "";

package/lib/node/NodeMainTemplateAsync.runtime.js

@@ -10,7 +10,7 @@ module.exports = function() {
 		require("fs").readFile(filename, "utf-8", function(err, content) {
 			if (err) {
 				if ($require$.onError) return $require$.oe(err);
-				else throw err;
+				throw err;
 			}
 			var chunk = {};
 			require("vm").runInThisContext(

package/lib/node/NodeMainTemplatePlugin.js

@@ -116,10 +116,11 @@ module.exports = class NodeMainTemplatePlugin {
 													hashWithLength: length => {
 														const shortChunkHashMap = {};
 														for (const chunkId of Object.keys(chunkMaps.hash)) {
-															if (typeof chunkMaps.hash[chunkId] === "string")
+															if (typeof chunkMaps.hash[chunkId] === "string") {
 																shortChunkHashMap[chunkId] = chunkMaps.hash[
 																	chunkId
 																].substr(0, length);
+															}
 														}
 														return `" + ${JSON.stringify(
 															shortChunkHashMap
@@ -201,10 +202,11 @@ module.exports = class NodeMainTemplatePlugin {
 								hashWithLength: length => {
 									const shortChunkHashMap = {};
 									for (const chunkId of Object.keys(chunkMaps.hash)) {
-										if (typeof chunkMaps.hash[chunkId] === "string")
+										if (typeof chunkMaps.hash[chunkId] === "string") {
 											shortChunkHashMap[chunkId] = chunkMaps.hash[
 												chunkId
 											].substr(0, length);
+										}
 									}
 									return `" + ${JSON.stringify(
 										shortChunkHashMap
@@ -278,11 +280,12 @@ module.exports = class NodeMainTemplatePlugin {
 							hashWithLength: length => {
 								const shortChunkHashMap = {};
 								for (const chunkId of Object.keys(chunkMaps.hash)) {
-									if (typeof chunkMaps.hash[chunkId] === "string")
+									if (typeof chunkMaps.hash[chunkId] === "string") {
 										shortChunkHashMap[chunkId] = chunkMaps.hash[chunkId].substr(
 											0,
 											length
 										);
+									}
 								}
 								return `" + ${JSON.stringify(shortChunkHashMap)}[chunkId] + "`;
 							},

package/lib/node/NodeSourcePlugin.js

@@ -13,22 +13,26 @@ module.exports = class NodeSourcePlugin {
 	}
 	apply(compiler) {
 		const options = this.options;
-		if (options === false)
+		if (options === false) {
 			// allow single kill switch to turn off this plugin
 			return;
+		}
 
 		const getPathToModule = (module, type) => {
 			if (type === true || (type === undefined && nodeLibsBrowser[module])) {
-				if (!nodeLibsBrowser[module])
+				if (!nodeLibsBrowser[module]) {
 					throw new Error(
 						`No browser version for node.js core module ${module} available`
 					);
+				}
 				return nodeLibsBrowser[module];
 			} else if (type === "mock") {
 				return require.resolve(`node-libs-browser/mock/${module}`);
 			} else if (type === "empty") {
 				return require.resolve("node-libs-browser/mock/empty");
-			} else return module;
+			} else {
+				return module;
+			}
 		};
 
 		const addExpression = (parser, name, module, type, suffix) => {
@@ -58,9 +62,9 @@ module.exports = class NodeSourcePlugin {
 					if (parserOptions.node === false) return;
 
 					let localOptions = options;
-					if (parserOptions.node)
+					if (parserOptions.node) {
 						localOptions = Object.assign({}, localOptions, parserOptions.node);
-
+					}
 					if (localOptions.global) {
 						parser.hooks.expression
 							.for("global")

package/lib/node/NodeWatchFileSystem.js

@@ -17,22 +17,33 @@ class NodeWatchFileSystem {
 	}
 
 	watch(files, dirs, missing, startTime, options, callback, callbackUndelayed) {
-		if (!Array.isArray(files)) throw new Error("Invalid arguments: 'files'");
-		if (!Array.isArray(dirs)) throw new Error("Invalid arguments: 'dirs'");
-		if (!Array.isArray(missing))
+		if (!Array.isArray(files)) {
+			throw new Error("Invalid arguments: 'files'");
+		}
+		if (!Array.isArray(dirs)) {
+			throw new Error("Invalid arguments: 'dirs'");
+		}
+		if (!Array.isArray(missing)) {
 			throw new Error("Invalid arguments: 'missing'");
-		if (typeof callback !== "function")
+		}
+		if (typeof callback !== "function") {
 			throw new Error("Invalid arguments: 'callback'");
-		if (typeof startTime !== "number" && startTime)
+		}
+		if (typeof startTime !== "number" && startTime) {
 			throw new Error("Invalid arguments: 'startTime'");
-		if (typeof options !== "object")
+		}
+		if (typeof options !== "object") {
 			throw new Error("Invalid arguments: 'options'");
-		if (typeof callbackUndelayed !== "function" && callbackUndelayed)
+		}
+		if (typeof callbackUndelayed !== "function" && callbackUndelayed) {
 			throw new Error("Invalid arguments: 'callbackUndelayed'");
+		}
 		const oldWatcher = this.watcher;
 		this.watcher = new Watchpack(options);
 
-		if (callbackUndelayed) this.watcher.once("change", callbackUndelayed);
+		if (callbackUndelayed) {
+			this.watcher.once("change", callbackUndelayed);
+		}
 
 		this.watcher.once("aggregated", (changes, removals) => {
 			changes = changes.concat(removals);
@@ -68,12 +79,18 @@ class NodeWatchFileSystem {
 				}
 			},
 			getFileTimestamps: () => {
-				if (this.watcher) return objectToMap(this.watcher.getTimes());
-				else return new Map();
+				if (this.watcher) {
+					return objectToMap(this.watcher.getTimes());
+				} else {
+					return new Map();
+				}
 			},
 			getContextTimestamps: () => {
-				if (this.watcher) return objectToMap(this.watcher.getTimes());
-				else return new Map();
+				if (this.watcher) {
+					return objectToMap(this.watcher.getTimes());
+				} else {
+					return new Map();
+				}
 			}
 		};
 	}

package/lib/node/ReadFileCompileWasmTemplatePlugin.js

@@ -8,6 +8,10 @@ const Template = require("../Template");
 const WasmMainTemplatePlugin = require("../wasm/WasmMainTemplatePlugin");
 
 class ReadFileCompileWasmTemplatePlugin {
+	constructor(options) {
+		this.options = options || {};
+	}
+
 	apply(compiler) {
 		compiler.hooks.thisCompilation.tap(
 			"ReadFileCompileWasmTemplatePlugin",
@@ -40,8 +44,13 @@ class ReadFileCompileWasmTemplatePlugin {
 					]);
 
 				const plugin = new WasmMainTemplatePlugin(
-					generateLoadBinaryCode,
-					false
+					Object.assign(
+						{
+							generateLoadBinaryCode,
+							supportsStreaming: false
+						},
+						this.options
+					)
 				);
 				plugin.apply(compilation.mainTemplate);
 			}

package/lib/optimize/AggressiveSplittingPlugin.js

@@ -26,14 +26,18 @@ class AggressiveSplittingPlugin {
 		validateOptions(schema, options || {}, "Aggressive Splitting Plugin");
 
 		this.options = options || {};
-		if (typeof this.options.minSize !== "number")
+		if (typeof this.options.minSize !== "number") {
 			this.options.minSize = 30 * 1024;
-		if (typeof this.options.maxSize !== "number")
+		}
+		if (typeof this.options.maxSize !== "number") {
 			this.options.maxSize = 50 * 1024;
-		if (typeof this.options.chunkOverhead !== "number")
+		}
+		if (typeof this.options.chunkOverhead !== "number") {
 			this.options.chunkOverhead = 0;
-		if (typeof this.options.entryChunkMultiplicator !== "number")
+		}
+		if (typeof this.options.entryChunkMultiplicator !== "number") {
 			this.options.entryChunkMultiplicator = 1;
+		}
 	}
 	apply(compiler) {
 		compiler.hooks.thisCompilation.tap(
@@ -82,8 +86,9 @@ class AggressiveSplittingPlugin {
 
 						const applySplit = splitData => {
 							// Cannot split if id is already taken
-							if (splitData.id !== undefined && usedIds.has(splitData.id))
+							if (splitData.id !== undefined && usedIds.has(splitData.id)) {
 								return false;
+							}
 
 							// Get module objects from names
 							const selectedModules = splitData.modules.map(name =>
@@ -188,8 +193,9 @@ class AggressiveSplittingPlugin {
 								for (let k = 0; k < modules.length; k++) {
 									const module = modules[k];
 									const newSize = selectedModulesSize + module.size();
-									if (newSize > maxSize && selectedModulesSize >= minSize)
+									if (newSize > maxSize && selectedModulesSize >= minSize) {
 										break;
+									}
 									selectedModulesSize = newSize;
 									selectedModules.push(module);
 								}

package/lib/optimize/ConcatenatedModule.js

@@ -114,20 +114,22 @@ const getFinalName = (
 		case "concatenated": {
 			const directExport = info.exportMap.get(exportName);
 			if (directExport) {
-				if (exportName === true)
+				if (exportName === true) {
 					ensureNsObjSource(
 						info,
 						moduleToInfoMap,
 						requestShortener,
 						strictHarmonyModule
 					);
+				}
 				const name = info.internalNames.get(directExport);
-				if (!name)
+				if (!name) {
 					throw new Error(
 						`The export "${directExport}" in "${info.module.readableIdentifier(
 							requestShortener
 						)}" has no internal name`
 					);
+				}
 				return name;
 			}
 			const reexport = info.reexportMap.get(exportName);
@@ -325,13 +327,18 @@ class ConcatenatedModule extends Module {
 					}
 				}
 				// populate warnings
-				for (const warning of m.warnings) this.warnings.push(warning);
+				for (const warning of m.warnings) {
+					this.warnings.push(warning);
+				}
 				// populate errors
-				for (const error of m.errors) this.errors.push(error);
+				for (const error of m.errors) {
+					this.errors.push(error);
+				}
 
 				if (m.buildInfo.assets) {
-					if (this.buildInfo.assets === undefined)
+					if (this.buildInfo.assets === undefined) {
 						this.buildInfo.assets = Object.create(null);
+					}
 					Object.assign(this.buildInfo.assets, m.buildInfo.assets);
 				}
 			}
@@ -450,10 +457,13 @@ class ConcatenatedModule extends Module {
 					const reexportMap = new Map();
 					for (const dep of info.module.dependencies) {
 						if (dep instanceof HarmonyExportSpecifierDependency) {
-							if (!exportMap.has(dep.name)) exportMap.set(dep.name, dep.id);
+							if (!exportMap.has(dep.name)) {
+								exportMap.set(dep.name, dep.id);
+							}
 						} else if (dep instanceof HarmonyExportExpressionDependency) {
-							if (!exportMap.has("default"))
+							if (!exportMap.has("default")) {
 								exportMap.set("default", "__WEBPACK_MODULE_DEFAULT_EXPORT__");
+							}
 						} else if (
 							dep instanceof HarmonyExportImportedSpecifierDependency
 						) {
@@ -478,8 +488,9 @@ class ConcatenatedModule extends Module {
 								}
 							} else if (importedModule) {
 								for (const name of importedModule.buildMeta.providedExports) {
-									if (dep.activeExports.has(name) || name === "default")
+									if (dep.activeExports.has(name) || name === "default") {
 										continue;
+									}
 									if (!reexportMap.has(name)) {
 										reexportMap.set(name, {
 											module: importedModule,

package/lib/optimize/MergeDuplicateChunksPlugin.js

@@ -31,8 +31,9 @@ class MergeDuplicateChunksPlugin {
 											!notDuplicates.has(dup)
 										) {
 											// delay allocating the new Set until here, reduce memory pressure
-											if (possibleDuplicates === undefined)
+											if (possibleDuplicates === undefined) {
 												possibleDuplicates = new Set();
+											}
 											possibleDuplicates.add(dup);
 										}
 									}
@@ -42,8 +43,9 @@ class MergeDuplicateChunksPlugin {
 									// validate existing possible duplicates
 									for (const dup of possibleDuplicates) {
 										// remove possible duplicate when module is not contained
-										if (!dup.containsModule(module))
+										if (!dup.containsModule(module)) {
 											possibleDuplicates.delete(dup);
+										}
 									}
 									// when all chunks has been removed we can break here
 									if (possibleDuplicates.size === 0) break;
@@ -58,8 +60,9 @@ class MergeDuplicateChunksPlugin {
 								for (const otherChunk of possibleDuplicates) {
 									if (otherChunk.hasRuntime() !== chunk.hasRuntime()) continue;
 									// merge them
-									if (chunk.integrate(otherChunk, "duplicate"))
+									if (chunk.integrate(otherChunk, "duplicate")) {
 										chunks.splice(chunks.indexOf(otherChunk), 1);
+									}
 								}
 							}
 

package/lib/optimize/ModuleConcatenationPlugin.js

@@ -172,19 +172,21 @@ class ModuleConcatenationPlugin {
 										)
 										.sort();
 									const explanations = Array.from(importingExplanations).sort();
-									if (names.length > 0 && explanations.length === 0)
+									if (names.length > 0 && explanations.length === 0) {
 										return `Module is referenced from these modules with unsupported syntax: ${names.join(
 											", "
 										)}`;
-									else if (names.length === 0 && explanations.length > 0)
+									} else if (names.length === 0 && explanations.length > 0) {
 										return `Module is referenced by: ${explanations.join(
 											", "
 										)}`;
-									else if (names.length > 0 && explanations.length > 0)
+									} else if (names.length > 0 && explanations.length > 0) {
 										return `Module is referenced from these modules with unsupported syntax: ${names.join(
 											", "
 										)} and by: ${explanations.join(", ")}`;
-									else return "Module is referenced in a unsupported way";
+									} else {
+										return "Module is referenced in a unsupported way";
+									}
 								});
 								continue;
 							}
@@ -226,8 +228,9 @@ class ModuleConcatenationPlugin {
 							if (!currentConfiguration.isEmpty()) {
 								concatConfigurations.push(currentConfiguration);
 								for (const module of currentConfiguration.getModules()) {
-									if (module !== currentConfiguration.rootModule)
+									if (module !== currentConfiguration.rootModule) {
 										usedAsInner.add(module);
+									}
 								}
 							}
 						}
@@ -250,13 +253,13 @@ class ModuleConcatenationPlugin {
 								newModule.optimizationBailout.push(requestShortener => {
 									const reason = getBailoutReason(warning[0], requestShortener);
 									const reasonWithPrefix = reason ? ` (<- ${reason})` : "";
-									if (warning[0] === warning[1])
+									if (warning[0] === warning[1]) {
 										return formatBailoutReason(
 											`Cannot concat with ${warning[0].readableIdentifier(
 												requestShortener
 											)}${reasonWithPrefix}`
 										);
-									else
+									} else {
 										return formatBailoutReason(
 											`Cannot concat with ${warning[0].readableIdentifier(
 												requestShortener
@@ -264,6 +267,7 @@ class ModuleConcatenationPlugin {
 												requestShortener
 											)}${reasonWithPrefix}`
 										);
+									}
 								});
 							}
 							const chunks = concatConfiguration.rootModule.getChunks();
@@ -276,12 +280,19 @@ class ModuleConcatenationPlugin {
 							for (const chunk of chunks) {
 								chunk.addModule(newModule);
 								newModule.addChunk(chunk);
-								if (chunk.entryModule === concatConfiguration.rootModule)
+								if (chunk.entryModule === concatConfiguration.rootModule) {
 									chunk.entryModule = newModule;
+								}
 							}
 							compilation.modules.push(newModule);
 							for (const reason of newModule.reasons) {
-								reason.dependency.module = newModule;
+								if (reason.dependency.module === concatConfiguration.rootModule)
+									reason.dependency.module = newModule;
+								if (
+									reason.dependency.redirectedModule ===
+									concatConfiguration.rootModule
+								)
+									reason.dependency.redirectedModule = newModule;
 							}
 							// TODO: remove when LTS node version contains fixed v8 version
 							// @see https://github.com/webpack/webpack/pull/6613
@@ -293,7 +304,9 @@ class ModuleConcatenationPlugin {
 									let reasons = dep.module.reasons;
 									for (let j = 0; j < reasons.length; j++) {
 										let reason = reasons[j];
-										if (reason.dependency === dep) reason.module = newModule;
+										if (reason.dependency === dep) {
+											reason.module = newModule;
+										}
 									}
 								}
 							}

package/lib/optimize/OccurrenceOrderPlugin.js

@@ -36,15 +36,22 @@ class OccurrenceOrderPlugin {
 					}
 
 					const countOccursInEntry = (sum, r) => {
-						if (!r.module) return sum;
+						if (!r.module) {
+							return sum;
+						}
 						return sum + initialChunkChunkMap.get(r.module);
 					};
 					const countOccurs = (sum, r) => {
-						if (!r.module) return sum;
+						if (!r.module) {
+							return sum;
+						}
 						let factor = 1;
-						if (typeof r.dependency.getNumberOfIdOccurrences === "function")
+						if (typeof r.dependency.getNumberOfIdOccurrences === "function") {
 							factor = r.dependency.getNumberOfIdOccurrences();
-						if (factor === 0) return sum;
+						}
+						if (factor === 0) {
+							return sum;
+						}
 						return sum + factor * r.module.getNumberOfChunks();
 					};
 

package/lib/optimize/RemoveParentModulesPlugin.js

@@ -34,7 +34,9 @@ class RemoveParentModulesPlugin {
 				for (const chunkGroup of compilation.entrypoints.values()) {
 					// initialize available modules for chunks without parents
 					availableModulesMap.set(chunkGroup, new Set());
-					for (const child of chunkGroup.childrenIterable) queue.enqueue(child);
+					for (const child of chunkGroup.childrenIterable) {
+						queue.enqueue(child);
+					}
 				}
 
 				while (queue.length > 0) {
@@ -49,8 +51,9 @@ class RemoveParentModulesPlugin {
 								// if we have not own info yet: create new entry
 								availableModules = new Set(availableModulesInParent);
 								for (const chunk of parent.chunks) {
-									for (const m of chunk.modulesIterable)
+									for (const m of chunk.modulesIterable) {
 										availableModules.add(m);
+									}
 								}
 								availableModulesMap.set(chunkGroup, availableModules);
 								changed = true;
@@ -69,8 +72,9 @@ class RemoveParentModulesPlugin {
 					}
 					if (changed) {
 						// if something changed: enqueue our children
-						for (const child of chunkGroup.childrenIterable)
+						for (const child of chunkGroup.childrenIterable) {
 							queue.enqueue(child);
+						}
 					}
 				}
 
@@ -88,11 +92,17 @@ class RemoveParentModulesPlugin {
 					const numberOfModules = chunk.getNumberOfModules();
 					const toRemove = new Set();
 					if (numberOfModules < availableModules.size) {
-						for (const m of chunk.modulesIterable)
-							if (availableModules.has(m)) toRemove.add(m);
+						for (const m of chunk.modulesIterable) {
+							if (availableModules.has(m)) {
+								toRemove.add(m);
+							}
+						}
 					} else {
-						for (const m of availableModules)
-							if (chunk.containsModule(m)) toRemove.add(m);
+						for (const m of availableModules) {
+							if (chunk.containsModule(m)) {
+								toRemove.add(m);
+							}
+						}
 					}
 					for (const module of toRemove) {
 						module.rewriteChunkInReasons(

package/lib/optimize/SideEffectsFlagPlugin.js

@@ -41,10 +41,11 @@ class SideEffectsFlagPlugin {
 				return module;
 			});
 			nmf.hooks.module.tap("SideEffectsFlagPlugin", (module, data) => {
-				if (data.settings.sideEffects === false)
+				if (data.settings.sideEffects === false) {
 					module.factoryMeta.sideEffectFree = true;
-				else if (data.settings.sideEffects === true)
+				} else if (data.settings.sideEffects === true) {
 					module.factoryMeta.sideEffectFree = false;
+				}
 			});
 		});
 		compiler.hooks.compilation.tap("SideEffectsFlagPlugin", compilation => {
@@ -105,6 +106,7 @@ class SideEffectsFlagPlugin {
 					for (const pair of reexportMaps) {
 						const module = pair[0];
 						const map = pair[1];
+						let newReasons = undefined;
 						for (let i = 0; i < module.reasons.length; i++) {
 							const reason = module.reasons[i];
 							const dep = reason.dependency;
@@ -116,7 +118,6 @@ class SideEffectsFlagPlugin {
 								if (mapping) {
 									dep.redirectedModule = mapping.module;
 									dep.redirectedId = mapping.exportName;
-									module.reasons.splice(i--, 1);
 									mapping.module.addReason(
 										reason.module,
 										dep,
@@ -125,8 +126,18 @@ class SideEffectsFlagPlugin {
 											  " (skipped side-effect-free modules)"
 											: "(skipped side-effect-free modules)"
 									);
+									// removing the currect reason, by not adding it to the newReasons array
+									// lazily create the newReasons array
+									if (newReasons === undefined) {
+										newReasons = i === 0 ? [] : module.reasons.slice(0, i);
+									}
+									continue;
 								}
 							}
+							if (newReasons !== undefined) newReasons.push(reason);
+						}
+						if (newReasons !== undefined) {
+							module.reasons = newReasons;
 						}
 					}
 				}