webpack 4.39.1 → 4.40.1

package/README.md

@@ -14,6 +14,7 @@
 [![builds2][builds2]][builds2-url]
 [![coverage][cover]][cover-url]
 [![licenses][licenses]][licenses-url]
+[![PR's welcome][prs]][prs-url]
 
   <br>
   <a href="https://dependabot.com/compatibility-score.html?dependency-name=webpack&package-manager=npm_and_yarn&new-version=latest">
@@ -346,7 +347,7 @@ If you create a loader or plugin, we would <3 for you to open source it, and put
 
 <h2 align="center">Support</h2>
 
-We consider webpack to be a low-level tool used not only individually but also layered beneath other awesome tools. Because of its flexibility, webpack isn't always the _easiest_ entry-level solution, however we do believe it is the most powerful. That said, we're always looking for ways improve and simplify the tool without compromising functionality. If you have any ideas on ways to accomplish this, we're all ears!
+We consider webpack to be a low-level tool used not only individually but also layered beneath other awesome tools. Because of its flexibility, webpack isn't always the _easiest_ entry-level solution, however we do believe it is the most powerful. That said, we're always looking for ways to improve and simplify the tool without compromising functionality. If you have any ideas on ways to accomplish this, we're all ears!
 
 If you're just getting started, take a look at [our new docs and concepts page](https://webpack.js.org/concepts/). This has a high level overview that is great for beginners!!
 
@@ -767,6 +768,9 @@ src="https://static.monei.net/monei-logo.svg" height="30" alt="MONEI"></a>
 [tests]: https://img.shields.io/travis/webpack/webpack/master.svg
 [tests-url]: https://travis-ci.org/webpack/webpack
 
+[prs]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg
+[prs-url]: https://webpack.js.org/contribute/
+
 [builds-url]: https://ci.appveyor.com/project/sokra/webpack/branch/master
 [builds]: https://ci.appveyor.com/api/projects/status/github/webpack/webpack?svg=true
 

package/lib/BannerPlugin.js

@@ -81,7 +81,6 @@ class BannerPlugin {
 							continue;
 						}
 
-						let basename;
 						let query = "";
 						let filename = file;
 						const hash = compilation.hash;
@@ -94,11 +93,10 @@ class BannerPlugin {
 
 						const lastSlashIndex = filename.lastIndexOf("/");
 
-						if (lastSlashIndex === -1) {
-							basename = filename;
-						} else {
-							basename = filename.substr(lastSlashIndex + 1);
-						}
+						const basename =
+							lastSlashIndex === -1
+								? filename
+								: filename.substr(lastSlashIndex + 1);
 
 						const data = {
 							hash,
@@ -110,10 +108,9 @@ class BannerPlugin {
 
 						const comment = compilation.getPath(banner(data), data);
 
-						compilation.assets[file] = new ConcatSource(
-							comment,
-							"\n",
-							compilation.assets[file]
+						compilation.updateAsset(
+							file,
+							old => new ConcatSource(comment, "\n", old)
 						);
 					}
 				}

package/lib/CachePlugin.js

@@ -24,21 +24,19 @@ class CachePlugin {
 					compilation.hooks.childCompiler.tap(
 						"CachePlugin",
 						(childCompiler, compilerName, compilerIndex) => {
-							if (cache) {
-								let childCache;
-								if (!cache.children) {
-									cache.children = {};
-								}
-								if (!cache.children[compilerName]) {
-									cache.children[compilerName] = [];
-								}
-								if (cache.children[compilerName][compilerIndex]) {
-									childCache = cache.children[compilerName][compilerIndex];
-								} else {
-									cache.children[compilerName].push((childCache = {}));
-								}
-								registerCacheToCompiler(childCompiler, childCache);
+							let childCache;
+							if (!cache.children) {
+								cache.children = {};
 							}
+							if (!cache.children[compilerName]) {
+								cache.children[compilerName] = [];
+							}
+							if (cache.children[compilerName][compilerIndex]) {
+								childCache = cache.children[compilerName][compilerIndex];
+							} else {
+								cache.children[compilerName].push((childCache = {}));
+							}
+							registerCacheToCompiler(childCompiler, childCache);
 						}
 					);
 				});

package/lib/ChunkGroup.js

@@ -70,12 +70,12 @@ class ChunkGroup {
 		this.chunks = [];
 		/** @type {OriginRecord[]} */
 		this.origins = [];
-		/** Indicies in top-down order */
+		/** Indices in top-down order */
 		/** @private @type {Map<Module, number>} */
-		this._moduleIndicies = new Map();
-		/** Indicies in bottom-up order */
+		this._moduleIndices = new Map();
+		/** Indices in bottom-up order */
 		/** @private @type {Map<Module, number>} */
-		this._moduleIndicies2 = new Map();
+		this._moduleIndices2 = new Map();
 	}
 
 	/**
@@ -174,7 +174,7 @@ class ChunkGroup {
 	/**
 	 * add a chunk into ChunkGroup. Is pushed on or prepended
 	 * @param {Chunk} chunk chunk being pushed into ChunkGroupS
-	 * @returns {boolean} returns true if chunk addition was ssuccesful.
+	 * @returns {boolean} returns true if chunk addition was successful.
 	 */
 	pushChunk(chunk) {
 		const oldIdx = this.chunks.indexOf(chunk);
@@ -187,8 +187,8 @@ class ChunkGroup {
 
 	/**
 	 * @param {Chunk} oldChunk chunk to be replaced
-	 * @param {Chunk} newChunk New chunkt that will be replaced
-	 * @returns {boolean} rerturns true for
+	 * @param {Chunk} newChunk New chunk that will be replaced with
+	 * @returns {boolean} returns true if the replacement was successful
 	 */
 	replaceChunk(oldChunk, newChunk) {
 		const oldIdx = this.chunks.indexOf(oldChunk);
@@ -369,7 +369,7 @@ class ChunkGroup {
 
 		/**
 		 * we need to iterate again over the children
-		 * to remove this from the childs parents.
+		 * to remove this from the child's parents.
 		 * This can not be done in the above loop
 		 * as it is not guaranteed that `this._parents` contains anything.
 		 */
@@ -460,7 +460,7 @@ class ChunkGroup {
 	 * @returns {void}
 	 */
 	setModuleIndex(module, index) {
-		this._moduleIndicies.set(module, index);
+		this._moduleIndices.set(module, index);
 	}
 
 	/**
@@ -469,7 +469,7 @@ class ChunkGroup {
 	 * @returns {number} index
 	 */
 	getModuleIndex(module) {
-		return this._moduleIndicies.get(module);
+		return this._moduleIndices.get(module);
 	}
 
 	/**
@@ -479,7 +479,7 @@ class ChunkGroup {
 	 * @returns {void}
 	 */
 	setModuleIndex2(module, index) {
-		this._moduleIndicies2.set(module, index);
+		this._moduleIndices2.set(module, index);
 	}
 
 	/**
@@ -488,7 +488,7 @@ class ChunkGroup {
 	 * @returns {number} index
 	 */
 	getModuleIndex2(module) {
-		return this._moduleIndicies2.get(module);
+		return this._moduleIndices2.get(module);
 	}
 
 	checkConstraints() {

package/lib/Compilation.js

@@ -37,11 +37,11 @@ const compareLocations = require("./compareLocations");
 const { Logger, LogType } = require("./logging/Logger");
 const ErrorHelpers = require("./ErrorHelpers");
 const buildChunkGraph = require("./buildChunkGraph");
+const WebpackError = require("./WebpackError");
 
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("./WebpackError")} WebpackError */
 /** @typedef {import("./DependenciesBlockVariable")} DependenciesBlockVariable */
 /** @typedef {import("./dependencies/SingleEntryDependency")} SingleEntryDependency */
 /** @typedef {import("./dependencies/MultiEntryDependency")} MultiEntryDependency */
@@ -104,6 +104,21 @@ const buildChunkGraph = require("./buildChunkGraph");
  * @property {string[]=} trace
  */
 
+/**
+ * @typedef {Object} AssetInfo
+ * @property {boolean=} immutable true, if the asset can be long term cached forever (contains a hash)
+ * @property {number=} size size in bytes, only set after asset has been emitted
+ * @property {boolean=} development true, when asset is only used for development and doesn't count towards user-facing assets
+ * @property {boolean=} hotModuleReplacement true, when asset ships data for updating an existing application (HMR)
+ */
+
+/**
+ * @typedef {Object} Asset
+ * @property {string} name the filename of the asset
+ * @property {Source} source source of the asset
+ * @property {AssetInfo} info info about the asset
+ */
+
 /**
  * @param {Chunk} a first chunk to sort by id
  * @param {Chunk} b second chunk to sort by id
@@ -206,6 +221,25 @@ const addAllToSet = (set, otherSet) => {
 	}
 };
 
+/**
+ * @param {Source} a a source
+ * @param {Source} b another source
+ * @returns {boolean} true, when both sources are equal
+ */
+const isSourceEqual = (a, b) => {
+	if (a === b) return true;
+	// TODO webpack 5: check .buffer() instead, it's called anyway during emit
+	/** @type {Buffer|string} */
+	let aSource = a.source();
+	/** @type {Buffer|string} */
+	let bSource = b.source();
+	if (aSource === bSource) return true;
+	if (typeof aSource === "string" && typeof bSource === "string") return false;
+	if (!Buffer.isBuffer(aSource)) aSource = Buffer.from(aSource, "utf-8");
+	if (!Buffer.isBuffer(bSource)) bSource = Buffer.from(bSource, "utf-8");
+	return aSource.equals(bSource);
+};
+
 class Compilation extends Tapable {
 	/**
 	 * Creates an instance of Compilation.
@@ -446,6 +480,7 @@ class Compilation extends Tapable {
 		this.entries = [];
 		/** @private @type {{name: string, request: string, module: Module}[]} */
 		this._preparedEntrypoints = [];
+		/** @type {Map<string, Entrypoint>} */
 		this.entrypoints = new Map();
 		/** @type {Chunk[]} */
 		this.chunks = [];
@@ -465,6 +500,8 @@ class Compilation extends Tapable {
 		this.additionalChunkAssets = [];
 		/** @type {CompilationAssets} */
 		this.assets = {};
+		/** @type {Map<string, AssetInfo>} */
+		this.assetsInfo = new Map();
 		/** @type {WebpackError[]} */
 		this.errors = [];
 		/** @type {WebpackError[]} */
@@ -1233,6 +1270,7 @@ class Compilation extends Tapable {
 		this.namedChunkGroups.clear();
 		this.additionalChunkAssets.length = 0;
 		this.assets = {};
+		this.assetsInfo.clear();
 		for (const module of this.modules) {
 			module.unseal();
 		}
@@ -1963,13 +2001,107 @@ class Compilation extends Tapable {
 		this.hash = this.fullHash.substr(0, hashDigestLength);
 	}
 
+	/**
+	 * @param {string} file file name
+	 * @param {Source} source asset source
+	 * @param {AssetInfo} assetInfo extra asset information
+	 * @returns {void}
+	 */
+	emitAsset(file, source, assetInfo = {}) {
+		if (this.assets[file]) {
+			if (!isSourceEqual(this.assets[file], source)) {
+				// TODO webpack 5: make this an error instead
+				this.warnings.push(
+					new WebpackError(
+						`Conflict: Multiple assets emit different content to the same filename ${file}`
+					)
+				);
+				this.assets[file] = source;
+				this.assetsInfo.set(file, assetInfo);
+				return;
+			}
+			const oldInfo = this.assetsInfo.get(file);
+			this.assetsInfo.set(file, Object.assign({}, oldInfo, assetInfo));
+			return;
+		}
+		this.assets[file] = source;
+		this.assetsInfo.set(file, assetInfo);
+	}
+
+	/**
+	 * @param {string} file file name
+	 * @param {Source | function(Source): Source} newSourceOrFunction new asset source or function converting old to new
+	 * @param {AssetInfo | function(AssetInfo | undefined): AssetInfo} assetInfoUpdateOrFunction new asset info or function converting old to new
+	 */
+	updateAsset(
+		file,
+		newSourceOrFunction,
+		assetInfoUpdateOrFunction = undefined
+	) {
+		if (!this.assets[file]) {
+			throw new Error(
+				`Called Compilation.updateAsset for not existing filename ${file}`
+			);
+		}
+		if (typeof newSourceOrFunction === "function") {
+			this.assets[file] = newSourceOrFunction(this.assets[file]);
+		} else {
+			this.assets[file] = newSourceOrFunction;
+		}
+		if (assetInfoUpdateOrFunction !== undefined) {
+			const oldInfo = this.assetsInfo.get(file);
+			if (typeof assetInfoUpdateOrFunction === "function") {
+				this.assetsInfo.set(file, assetInfoUpdateOrFunction(oldInfo || {}));
+			} else {
+				this.assetsInfo.set(
+					file,
+					Object.assign({}, oldInfo, assetInfoUpdateOrFunction)
+				);
+			}
+		}
+	}
+
+	getAssets() {
+		/** @type {Asset[]} */
+		const array = [];
+		for (const assetName of Object.keys(this.assets)) {
+			if (Object.prototype.hasOwnProperty.call(this.assets, assetName)) {
+				array.push({
+					name: assetName,
+					source: this.assets[assetName],
+					info: this.assetsInfo.get(assetName) || {}
+				});
+			}
+		}
+		return array;
+	}
+
+	/**
+	 * @param {string} name the name of the asset
+	 * @returns {Asset | undefined} the asset or undefined when not found
+	 */
+	getAsset(name) {
+		if (!Object.prototype.hasOwnProperty.call(this.assets, name))
+			return undefined;
+		return {
+			name,
+			source: this.assets[name],
+			info: this.assetsInfo.get(name) || {}
+		};
+	}
+
 	createModuleAssets() {
 		for (let i = 0; i < this.modules.length; i++) {
 			const module = this.modules[i];
 			if (module.buildInfo.assets) {
+				const assetsInfo = module.buildInfo.assetsInfo;
 				for (const assetName of Object.keys(module.buildInfo.assets)) {
 					const fileName = this.getPath(assetName);
-					this.assets[fileName] = module.buildInfo.assets[assetName];
+					this.emitAsset(
+						fileName,
+						module.buildInfo.assets[assetName],
+						assetsInfo ? assetsInfo.get(assetName) : undefined
+					);
 					this.hooks.moduleAsset.call(module, fileName);
 				}
 			}
@@ -2003,7 +2135,12 @@ class Compilation extends Tapable {
 					const cacheName = fileManifest.identifier;
 					const usedHash = fileManifest.hash;
 					filenameTemplate = fileManifest.filenameTemplate;
-					file = this.getPath(filenameTemplate, fileManifest.pathOptions);
+					const pathAndInfo = this.getPathWithInfo(
+						filenameTemplate,
+						fileManifest.pathOptions
+					);
+					file = pathAndInfo.path;
+					const assetInfo = pathAndInfo.info;
 
 					// check if the same filename was already written by another chunk
 					const alreadyWritten = alreadyWrittenFiles.get(file);
@@ -2051,12 +2188,7 @@ class Compilation extends Tapable {
 							};
 						}
 					}
-					if (this.assets[file] && this.assets[file] !== source) {
-						throw new Error(
-							`Conflict: Multiple assets emit to the same filename ${file}`
-						);
-					}
-					this.assets[file] = source;
+					this.emitAsset(file, source, assetInfo);
 					chunk.files.push(file);
 					this.hooks.chunkAsset.call(chunk, file);
 					alreadyWrittenFiles.set(file, {
@@ -2084,6 +2216,17 @@ class Compilation extends Tapable {
 		return this.mainTemplate.getAssetPath(filename, data);
 	}
 
+	/**
+	 * @param {string} filename used to get asset path with hash
+	 * @param {TODO=} data // TODO: figure out this param type
+	 * @returns {{ path: string, info: AssetInfo }} interpolated path and asset info
+	 */
+	getPathWithInfo(filename, data) {
+		data = data || {};
+		data.hash = data.hash || this.hash;
+		return this.mainTemplate.getAssetPathWithInfo(filename, data);
+	}
+
 	/**
 	 * This function allows you to run another instance of webpack inside of webpack however as
 	 * a child with different settings and configurations (if desired) applied. It copies all hooks, plugins

package/lib/Compiler.js

@@ -329,8 +329,8 @@ class Compiler extends Tapable {
 			if (err) return callback(err);
 
 			this.parentCompilation.children.push(compilation);
-			for (const name of Object.keys(compilation.assets)) {
-				this.parentCompilation.assets[name] = compilation.assets[name];
+			for (const { name, source, info } of compilation.getAssets()) {
+				this.parentCompilation.emitAsset(name, source, info);
 			}
 
 			const entries = Array.from(
@@ -356,9 +356,9 @@ class Compiler extends Tapable {
 			if (err) return callback(err);
 
 			asyncLib.forEachLimit(
-				compilation.assets,
+				compilation.getAssets(),
 				15,
-				(source, file, callback) => {
+				({ name: file, source }, callback) => {
 					let targetFile = file;
 					const queryStringIdx = targetFile.indexOf("?");
 					if (queryStringIdx >= 0) {
@@ -396,10 +396,18 @@ class Compiler extends Tapable {
 									// if yes, we skip writing the file
 									// as it's already there
 									// (we assume one doesn't remove files while the Compiler is running)
+
+									compilation.updateAsset(file, cacheEntry.sizeOnlySource, {
+										size: cacheEntry.sizeOnlySource.size()
+									});
+
 									return callback();
 								}
 							}
 
+							// TODO webpack 5: if info.immutable check if file already exists in output
+							// skip emitting if it's already there
+
 							// get the binary (Buffer) content from the Source
 							/** @type {Buffer} */
 							let content;
@@ -418,7 +426,9 @@ class Compiler extends Tapable {
 							// This allows to GC all memory allocated by the Source
 							// (expect when the Source is stored in any other cache)
 							cacheEntry.sizeOnlySource = new SizeOnlySource(content.length);
-							compilation.assets[file] = cacheEntry.sizeOnlySource;
+							compilation.updateAsset(file, cacheEntry.sizeOnlySource, {
+								size: content.length
+							});
 
 							// Write the file to output file system
 							this.outputFileSystem.writeFile(targetPath, content, err => {

package/lib/Entrypoint.js

@@ -52,8 +52,8 @@ class Entrypoint extends ChunkGroup {
 
 	/**
 	 * @param {Chunk} oldChunk chunk to be replaced
-	 * @param {Chunk} newChunk New chunkt that will be replaced
-	 * @returns {boolean} rerturns true for
+	 * @param {Chunk} newChunk New chunk that will be replaced with
+	 * @returns {boolean} returns true if the replacement was successful
 	 */
 	replaceChunk(oldChunk, newChunk) {
 		if (this.runtimeChunk === oldChunk) this.runtimeChunk = newChunk;

package/lib/HotModuleReplacementPlugin.js

@@ -277,12 +277,19 @@ module.exports = class HotModuleReplacementPlugin {
 										compilation.moduleTemplates.javascript,
 										compilation.dependencyTemplates
 									);
-									const filename = compilation.getPath(hotUpdateChunkFilename, {
+									const {
+										path: filename,
+										info: assetInfo
+									} = compilation.getPathWithInfo(hotUpdateChunkFilename, {
 										hash: records.hash,
 										chunk: currentChunk
 									});
 									compilation.additionalChunkAssets.push(filename);
-									compilation.assets[filename] = source;
+									compilation.emitAsset(
+										filename,
+										source,
+										Object.assign({ hotModuleReplacement: true }, assetInfo)
+									);
 									hotUpdateMainContent.c[chunkId] = true;
 									currentChunk.files.push(filename);
 									compilation.hooks.chunkAsset.call(currentChunk, filename);
@@ -292,10 +299,17 @@ module.exports = class HotModuleReplacementPlugin {
 							}
 						}
 						const source = new RawSource(JSON.stringify(hotUpdateMainContent));
-						const filename = compilation.getPath(hotUpdateMainFilename, {
+						const {
+							path: filename,
+							info: assetInfo
+						} = compilation.getPathWithInfo(hotUpdateMainFilename, {
 							hash: records.hash
 						});
-						compilation.assets[filename] = source;
+						compilation.emitAsset(
+							filename,
+							source,
+							Object.assign({ hotModuleReplacement: true }, assetInfo)
+						);
 					}
 				);
 

package/lib/MainTemplate.js

@@ -122,7 +122,7 @@ module.exports = class MainTemplate extends Tapable {
 				"moduleExpression"
 			]),
 			currentHash: new SyncWaterfallHook(["source", "requestedLength"]),
-			assetPath: new SyncWaterfallHook(["path", "options"]),
+			assetPath: new SyncWaterfallHook(["path", "options", "assetInfo"]),
 			hash: new SyncHook(["hash"]),
 			hashForChunk: new SyncHook(["hash", "chunk"]),
 			globalHashPaths: new SyncWaterfallHook(["paths"]),
@@ -521,6 +521,13 @@ module.exports = class MainTemplate extends Tapable {
 		return this.hooks.assetPath.call(path, options);
 	}
 
+	getAssetPathWithInfo(path, options) {
+		const assetInfo = {};
+		// TODO webpack 5: refactor assetPath hook to receive { path, info } object
+		const newPath = this.hooks.assetPath.call(path, options, assetInfo);
+		return { path: newPath, info: assetInfo };
+	}
+
 	/**
 	 * Updates hash with information from this template
 	 * @param {Hash} hash the hash to update

package/lib/NormalModule.js

@@ -210,15 +210,17 @@ class NormalModule extends Module {
 					}
 				};
 			},
-			emitFile: (name, content, sourceMap) => {
+			emitFile: (name, content, sourceMap, assetInfo) => {
 				if (!this.buildInfo.assets) {
 					this.buildInfo.assets = Object.create(null);
+					this.buildInfo.assetsInfo = new Map();
 				}
 				this.buildInfo.assets[name] = this.createSourceForAsset(
 					name,
 					content,
 					sourceMap
 				);
+				this.buildInfo.assetsInfo.set(name, assetInfo);
 			},
 			rootContext: options.context,
 			webpack: true,
@@ -432,7 +434,9 @@ class NormalModule extends Module {
 		this.buildInfo = {
 			cacheable: false,
 			fileDependencies: new Set(),
-			contextDependencies: new Set()
+			contextDependencies: new Set(),
+			assets: undefined,
+			assetsInfo: undefined
 		};
 
 		return this.doBuild(options, compilation, resolver, fs, err => {

package/lib/Parser.js

@@ -29,7 +29,7 @@ const defaultParserOptions = {
 	onComment: null
 };
 
-// regexp to match at lease one "magic comment"
+// regexp to match at least one "magic comment"
 const webpackCommentRegExp = new RegExp(/(^|\W)webpack[A-Z]{1,}[A-Za-z]{1,}:/);
 
 const EMPTY_COMMENT_OPTIONS = {

package/lib/SourceMapDevToolPlugin.js

@@ -175,14 +175,20 @@ class SourceMapDevToolPlugin {
 					reportProgress(0.0);
 					const tasks = [];
 					files.forEach(({ file, chunk }, idx) => {
-						const asset = compilation.assets[file];
+						const asset = compilation.getAsset(file).source;
 						const cache = assetsCache.get(asset);
 						/**
 						 * If presented in cache, reassigns assets. Cache assets already have source maps.
 						 */
 						if (cache && cache.file === file) {
 							for (const cachedFile in cache.assets) {
-								compilation.assets[cachedFile] = cache.assets[cachedFile];
+								if (cachedFile === file) {
+									compilation.updateAsset(cachedFile, cache.assets[cachedFile]);
+								} else {
+									compilation.emitAsset(cachedFile, cache.assets[cachedFile], {
+										development: true
+									});
+								}
 								/**
 								 * Add file to chunk, if not presented there
 								 */
@@ -353,20 +359,24 @@ class SourceMapDevToolPlugin {
 							 * Add source map url to compilation asset, if {@link currentSourceMappingURLComment} presented
 							 */
 							if (currentSourceMappingURLComment !== false) {
-								assets[file] = compilation.assets[file] = new ConcatSource(
+								const asset = new ConcatSource(
 									new RawSource(source),
 									compilation.getPath(
 										currentSourceMappingURLComment,
 										Object.assign({ url: sourceMapUrl }, pathParams)
 									)
 								);
+								assets[file] = asset;
+								compilation.updateAsset(file, asset);
 							}
 							/**
 							 * Add source map file to compilation assets and chunk files
 							 */
-							assets[sourceMapFile] = compilation.assets[
-								sourceMapFile
-							] = new RawSource(sourceMapString);
+							const asset = new RawSource(sourceMapString);
+							assets[sourceMapFile] = asset;
+							compilation.emitAsset(sourceMapFile, asset, {
+								development: true
+							});
 							chunk.files.push(sourceMapFile);
 						} else {
 							if (currentSourceMappingURLComment === false) {
@@ -377,7 +387,7 @@ class SourceMapDevToolPlugin {
 							/**
 							 * Add source map as data url to asset
 							 */
-							assets[file] = compilation.assets[file] = new ConcatSource(
+							const asset = new ConcatSource(
 								new RawSource(source),
 								currentSourceMappingURLComment
 									.replace(/\[map\]/g, () => sourceMapString)
@@ -390,6 +400,8 @@ class SourceMapDevToolPlugin {
 											).toString("base64")}`
 									)
 							);
+							assets[file] = asset;
+							compilation.updateAsset(file, asset);
 						}
 					});
 					reportProgress(1.0);

package/lib/Stats.js

@@ -404,26 +404,27 @@ class Stats {
 		}
 		if (showAssets) {
 			const assetsByFile = {};
-			const compilationAssets = Object.keys(compilation.assets).sort();
+			const compilationAssets = compilation
+				.getAssets()
+				.sort((a, b) => (a.name < b.name ? -1 : 1));
 			obj.assetsByChunkName = {};
 			obj.assets = compilationAssets
-				.map(asset => {
+				.map(({ name, source, info }) => {
 					const obj = {
-						name: asset,
-						size: compilation.assets[asset].size(),
+						name,
+						size: source.size(),
 						chunks: [],
 						chunkNames: [],
+						info,
 						// TODO webpack 5: remove .emitted
-						emitted:
-							compilation.assets[asset].emitted ||
-							compilation.emittedAssets.has(asset)
+						emitted: source.emitted || compilation.emittedAssets.has(name)
 					};
 
 					if (showPerformance) {
-						obj.isOverSizeLimit = compilation.assets[asset].isOverSizeLimit;
+						obj.isOverSizeLimit = source.isOverSizeLimit;
 					}
 
-					assetsByFile[asset] = obj;
+					assetsByFile[name] = obj;
 					return obj;
 				})
 				.filter(createAssetFilter());
@@ -1040,7 +1041,14 @@ class Stats {
 						color: colors.bold
 					},
 					{
-						value: asset.emitted ? "[emitted]" : "",
+						value: [
+							asset.emitted && "[emitted]",
+							asset.info.immutable && "[immutable]",
+							asset.info.development && "[dev]",
+							asset.info.hotModuleReplacement && "[hmr]"
+						]
+							.filter(Boolean)
+							.join(" "),
 						color: colors.green
 					},
 					{

package/lib/TemplatedPathPlugin.js

@@ -23,8 +23,9 @@ const REGEXP_HASH_FOR_TEST = new RegExp(REGEXP_HASH.source, "i"),
 	REGEXP_CONTENTHASH_FOR_TEST = new RegExp(REGEXP_CONTENTHASH.source, "i"),
 	REGEXP_NAME_FOR_TEST = new RegExp(REGEXP_NAME.source, "i");
 
-const withHashLength = (replacer, handlerFn) => {
+const withHashLength = (replacer, handlerFn, assetInfo) => {
 	const fn = (match, hashLength, ...args) => {
+		if (assetInfo) assetInfo.immutable = true;
 		const length = hashLength && parseInt(hashLength, 10);
 		if (length && handlerFn) {
 			return handlerFn(length);
@@ -59,7 +60,7 @@ const escapePathVariables = value => {
 		: value;
 };
 
-const replacePathVariables = (path, data) => {
+const replacePathVariables = (path, data, assetInfo) => {
 	const chunk = data.chunk;
 	const chunkId = chunk && chunk.id;
 	const chunkName = chunk && (chunk.name || chunk.id);
@@ -97,19 +98,23 @@ const replacePathVariables = (path, data) => {
 		path
 			.replace(
 				REGEXP_HASH,
-				withHashLength(getReplacer(data.hash), data.hashWithLength)
+				withHashLength(getReplacer(data.hash), data.hashWithLength, assetInfo)
 			)
 			.replace(
 				REGEXP_CHUNKHASH,
-				withHashLength(getReplacer(chunkHash), chunkHashWithLength)
+				withHashLength(getReplacer(chunkHash), chunkHashWithLength, assetInfo)
 			)
 			.replace(
 				REGEXP_CONTENTHASH,
-				withHashLength(getReplacer(contentHash), contentHashWithLength)
+				withHashLength(
+					getReplacer(contentHash),
+					contentHashWithLength,
+					assetInfo
+				)
 			)
 			.replace(
 				REGEXP_MODULEHASH,
-				withHashLength(getReplacer(moduleHash), moduleHashWithLength)
+				withHashLength(getReplacer(moduleHash), moduleHashWithLength, assetInfo)
 			)
 			.replace(REGEXP_ID, getReplacer(chunkId))
 			.replace(REGEXP_MODULEID, getReplacer(moduleId))

package/lib/buildChunkGraph.js

@@ -28,11 +28,13 @@ const GraphHelpers = require("./GraphHelpers");
 
 /**
  * @typedef {Object} ChunkGroupInfo
+ * @property {ChunkGroup} chunkGroup the chunk group
  * @property {Set<Module>} minAvailableModules current minimal set of modules available at this point
  * @property {boolean} minAvailableModulesOwned true, if minAvailableModules is owned and can be modified
  * @property {Set<Module>[]} availableModulesToBeMerged enqueued updates to the minimal set of available modules
  * @property {QueueItem[]} skippedItems queue items that were skipped because module is already available in parent chunks (need to reconsider when minAvailableModules is shrinking)
  * @property {Set<Module>} resultingAvailableModules set of modules available including modules from this chunk group
+ * @property {Set<ChunkGroup>} children set of children chunk groups, that will be revisited when availableModules shrink
  */
 
 /**
@@ -196,11 +198,13 @@ const visitModules = (
 			});
 		}
 		chunkGroupInfoMap.set(chunkGroup, {
+			chunkGroup,
 			minAvailableModules: new Set(),
 			minAvailableModulesOwned: true,
 			availableModulesToBeMerged: [],
 			skippedItems: [],
-			resultingAvailableModules: undefined
+			resultingAvailableModules: undefined,
+			children: undefined
 		});
 		return queue;
 	};
@@ -418,7 +422,7 @@ const visitModules = (
 		}
 		logger.timeEnd("visiting");
 
-		if (queueConnect.size > 0) {
+		while (queueConnect.size > 0) {
 			logger.time("calculating available modules");
 
 			// Figure out new parents for chunk groups
@@ -435,17 +439,26 @@ const visitModules = (
 					}
 				}
 				info.resultingAvailableModules = resultingAvailableModules;
+				if (info.children === undefined) {
+					info.children = targets;
+				} else {
+					for (const target of targets) {
+						info.children.add(target);
+					}
+				}
 
 				// 2. Update chunk group info
 				for (const target of targets) {
 					let chunkGroupInfo = chunkGroupInfoMap.get(target);
 					if (chunkGroupInfo === undefined) {
 						chunkGroupInfo = {
+							chunkGroup: target,
 							minAvailableModules: undefined,
 							minAvailableModulesOwned: undefined,
 							availableModulesToBeMerged: [],
 							skippedItems: [],
-							resultingAvailableModules: undefined
+							resultingAvailableModules: undefined,
+							children: undefined
 						};
 						chunkGroupInfoMap.set(target, chunkGroupInfo);
 					}
@@ -463,7 +476,7 @@ const visitModules = (
 				// Execute the merge
 				for (const info of outdatedChunkGroupInfo) {
 					const availableModulesToBeMerged = info.availableModulesToBeMerged;
-					let minAvailableModules = info.minAvailableModules;
+					let cachedMinAvailableModules = info.minAvailableModules;
 
 					// 1. Get minimal available modules
 					// It doesn't make sense to traverse a chunk again with more available modules.
@@ -474,29 +487,31 @@ const visitModules = (
 					}
 					let changed = false;
 					for (const availableModules of availableModulesToBeMerged) {
-						if (minAvailableModules === undefined) {
-							minAvailableModules = availableModules;
-							info.minAvailableModules = minAvailableModules;
+						if (cachedMinAvailableModules === undefined) {
+							cachedMinAvailableModules = availableModules;
+							info.minAvailableModules = cachedMinAvailableModules;
 							info.minAvailableModulesOwned = false;
 							changed = true;
 						} else {
 							if (info.minAvailableModulesOwned) {
 								// We own it and can modify it
-								for (const m of minAvailableModules) {
+								for (const m of cachedMinAvailableModules) {
 									if (!availableModules.has(m)) {
-										minAvailableModules.delete(m);
+										cachedMinAvailableModules.delete(m);
 										changed = true;
 									}
 								}
 							} else {
-								for (const m of minAvailableModules) {
+								for (const m of cachedMinAvailableModules) {
 									if (!availableModules.has(m)) {
-										// minAvailableModules need to be modified
+										// cachedMinAvailableModules need to be modified
 										// but we don't own it
-										// construct a new Set as intersection of minAvailableModules and availableModules
+										// construct a new Set as intersection of cachedMinAvailableModules and availableModules
 										/** @type {Set<Module>} */
 										const newSet = new Set();
-										const iterator = minAvailableModules[Symbol.iterator]();
+										const iterator = cachedMinAvailableModules[
+											Symbol.iterator
+										]();
 										/** @type {IteratorResult<Module>} */
 										let it;
 										while (!(it = iterator.next()).done) {
@@ -510,9 +525,16 @@ const visitModules = (
 												newSet.add(module);
 											}
 										}
-										minAvailableModules = newSet;
+										cachedMinAvailableModules = newSet;
 										info.minAvailableModulesOwned = true;
 										info.minAvailableModules = newSet;
+
+										// Update the cache from the first queue
+										// if the chunkGroup is currently cached
+										if (chunkGroup === info.chunkGroup) {
+											minAvailableModules = cachedMinAvailableModules;
+										}
+
 										changed = true;
 										break;
 									}
@@ -528,6 +550,19 @@ const visitModules = (
 						queue.push(queueItem);
 					}
 					info.skippedItems.length = 0;
+
+					// 3. Reconsider children chunk groups
+					if (info.children !== undefined) {
+						const chunkGroup = info.chunkGroup;
+						for (const c of info.children) {
+							let connectList = queueConnect.get(chunkGroup);
+							if (connectList === undefined) {
+								connectList = new Set();
+								queueConnect.set(chunkGroup, connectList);
+							}
+							connectList.add(c);
+						}
+					}
 				}
 				outdatedChunkGroupInfo.clear();
 				logger.timeEnd("merging available modules");

package/lib/debug/ProfilingPlugin.js

@@ -391,8 +391,8 @@ const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
 					id,
 					cat: defaultCategory
 				});
+				const callback = args.pop();
 				fn(...args, (...r) => {
-					const callback = args.pop();
 					tracer.trace.end({
 						name,
 						id,

package/lib/logging/Logger.js

@@ -32,14 +32,14 @@ const LogType = Object.freeze({
 
 exports.LogType = LogType;
 
-/** @typedef {LogType} LogTypeEnum */
+/** @typedef {keyof LogType} LogTypeEnum */
 
 const LOG_SYMBOL = Symbol("webpack logger raw log method");
 const TIMERS_SYMBOL = Symbol("webpack logger times");
 
 class WebpackLogger {
 	/**
-	 * @param {function(LogType, any[]=): void} log log function
+	 * @param {function(LogTypeEnum, any[]=): void} log log function
 	 */
 	constructor(log) {
 		this[LOG_SYMBOL] = log;

package/lib/logging/createConsoleLogger.js

@@ -47,7 +47,8 @@ const filterToFunction = item => {
 };
 
 /**
- * @enum {number} */
+ * @enum {number}
+ */
 const LogLevel = {
 	none: 6,
 	false: 6,

package/lib/optimize/ConcatenatedModule.js

@@ -375,6 +375,14 @@ class ConcatenatedModule extends Module {
 					}
 					Object.assign(this.buildInfo.assets, m.buildInfo.assets);
 				}
+				if (m.buildInfo.assetsInfo) {
+					if (this.buildInfo.assetsInfo === undefined) {
+						this.buildInfo.assetsInfo = new Map();
+					}
+					for (const [key, value] of m.buildInfo.assetsInfo) {
+						this.buildInfo.assetsInfo.set(key, value);
+					}
+				}
 			}
 		}
 		this._identifier = this._createIdentifier();

package/lib/performance/SizeLimitsPlugin.js

@@ -7,6 +7,9 @@ const EntrypointsOverSizeLimitWarning = require("./EntrypointsOverSizeLimitWarni
 const AssetsOverSizeLimitWarning = require("./AssetsOverSizeLimitWarning");
 const NoAsyncChunksWarning = require("./NoAsyncChunksWarning");
 
+/** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../Entrypoint")} Entrypoint */
+
 module.exports = class SizeLimitsPlugin {
 	constructor(options) {
 		this.hints = options.hints;
@@ -14,54 +17,71 @@ module.exports = class SizeLimitsPlugin {
 		this.maxEntrypointSize = options.maxEntrypointSize;
 		this.assetFilter = options.assetFilter;
 	}
+
+	/**
+	 * @param {Compiler} compiler webpack compiler
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		const entrypointSizeLimit = this.maxEntrypointSize;
 		const assetSizeLimit = this.maxAssetSize;
 		const hints = this.hints;
-		const assetFilter = this.assetFilter || (asset => !asset.endsWith(".map"));
+		const assetFilter =
+			this.assetFilter || ((name, source, info) => !info.development);
 
 		compiler.hooks.afterEmit.tap("SizeLimitsPlugin", compilation => {
 			const warnings = [];
 
+			/**
+			 * @param {Entrypoint} entrypoint an entrypoint
+			 * @returns {number} the size of the entrypoint
+			 */
 			const getEntrypointSize = entrypoint =>
 				entrypoint.getFiles().reduce((currentSize, file) => {
-					if (assetFilter(file) && compilation.assets[file]) {
-						return currentSize + compilation.assets[file].size();
+					const asset = compilation.getAsset(file);
+					if (
+						asset &&
+						assetFilter(asset.name, asset.source, asset.info) &&
+						asset.source
+					) {
+						return currentSize + (asset.info.size || asset.source.size());
 					}
 
 					return currentSize;
 				}, 0);
 
 			const assetsOverSizeLimit = [];
-			for (const assetName of Object.keys(compilation.assets)) {
-				if (!assetFilter(assetName)) {
+			for (const { name, source, info } of compilation.getAssets()) {
+				if (!assetFilter(name, source, info) || !source) {
 					continue;
 				}
 
-				const asset = compilation.assets[assetName];
-				const size = asset.size();
+				const size = info.size || source.size();
 				if (size > assetSizeLimit) {
 					assetsOverSizeLimit.push({
-						name: assetName,
-						size: size
+						name,
+						size
 					});
-					asset.isOverSizeLimit = true;
+					/** @type {any} */ (source).isOverSizeLimit = true;
 				}
 			}
 
+			const fileFilter = name => {
+				const asset = compilation.getAsset(name);
+				return assetFilter(asset.name, asset.source, asset.info);
+			};
+
 			const entrypointsOverLimit = [];
-			for (const pair of compilation.entrypoints) {
-				const name = pair[0];
-				const entry = pair[1];
+			for (const [name, entry] of compilation.entrypoints) {
 				const size = getEntrypointSize(entry);
 
 				if (size > entrypointSizeLimit) {
 					entrypointsOverLimit.push({
 						name: name,
 						size: size,
-						files: entry.getFiles().filter(assetFilter)
+						files: entry.getFiles().filter(fileFilter)
 					});
-					entry.isOverSizeLimit = true;
+					/** @type {any} */ (entry).isOverSizeLimit = true;
 				}
 			}
 

package/lib/wasm/WebAssemblyGenerator.js

@@ -70,7 +70,7 @@ const getImportedGlobals = ast => {
 
 	t.traverse(ast, {
 		ModuleImport({ node }) {
-			if (t.isGlobalType(node.descr) === true) {
+			if (t.isGlobalType(node.descr)) {
 				importedGlobals.push(node);
 			}
 		}
@@ -79,12 +79,18 @@ const getImportedGlobals = ast => {
 	return importedGlobals;
 };
 
+/**
+ * Get the count for imported func
+ *
+ * @param {Object} ast Module's AST
+ * @returns {Number} - count
+ */
 const getCountImportedFunc = ast => {
 	let count = 0;
 
 	t.traverse(ast, {
 		ModuleImport({ node }) {
-			if (t.isFuncImportDescr(node.descr) === true) {
+			if (t.isFuncImportDescr(node.descr)) {
 				count++;
 			}
 		}
@@ -133,7 +139,7 @@ const getNextFuncIndex = (ast, countImportedFunc) => {
 };
 
 /**
- * Create a init instruction for a global
+ * Creates an init instruction for a global type
  * @param {t.GlobalType} globalType the global type
  * @returns {t.Instruction} init expression
  */
@@ -156,7 +162,7 @@ const createDefaultInitForGlobal = globalType => {
 /**
  * Rewrite the import globals:
  * - removes the ModuleImport instruction
- * - injects at the same offset a mutable global of the same time
+ * - injects at the same offset a mutable global of the same type
  *
  * Since the imported globals are before the other global declarations, our
  * indices will be preserved.
@@ -172,7 +178,7 @@ const rewriteImportedGlobals = state => bin => {
 
 	bin = editWithAST(state.ast, bin, {
 		ModuleImport(path) {
-			if (t.isGlobalType(path.node.descr) === true) {
+			if (t.isGlobalType(path.node.descr)) {
 				const globalType = path.node.descr;
 
 				globalType.mutability = "var";
@@ -206,8 +212,8 @@ const rewriteImportedGlobals = state => bin => {
 
 				additionalInitCode.push(
 					/**
-					 * get_global in global initilizer only work for imported globals.
-					 * They have the same indices than the init params, so use the
+					 * get_global in global initializer only works for imported globals.
+					 * They have the same indices as the init params, so use the
 					 * same index.
 					 */
 					t.instruction("get_local", [initialGlobalidx]),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.39.1",
+  "version": "4.40.1",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
@@ -53,8 +53,8 @@
     "husky": "^1.1.3",
     "i18n-webpack-plugin": "^1.0.0",
     "istanbul": "^0.4.5",
-    "jest": "24.1.0",
-    "jest-junit": "^6.2.1",
+    "jest": "^24.9.0",
+    "jest-junit": "^8.0.0",
     "json-loader": "^0.5.7",
     "json-schema-to-typescript": "^6.0.1",
     "less": "^3.9.0",
@@ -120,12 +120,12 @@
     "pretest": "yarn lint",
     "prelint": "yarn setup",
     "lint": "yarn code-lint && yarn jest-lint && yarn type-lint && yarn special-lint",
-    "code-lint": "eslint --cache \"{setup,lib,bin,hot,buildin,benchmark,tooling,schemas}/**/*.js\" \"test/*.js\" \"test/{configCases,watchCases,statsCases,hotCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
+    "code-lint": "eslint . --ext '.js' --cache",
     "type-lint": "tsc --pretty",
     "special-lint": "node tooling/inherit-types && node tooling/format-schemas && node tooling/compile-to-definitions",
     "special-lint-fix": "node tooling/inherit-types --write --override && node tooling/format-schemas --write && node tooling/compile-to-definitions --write",
     "fix": "yarn code-lint --fix && yarn special-lint-fix",
-    "pretty": "prettier --loglevel warn --write \"*.{ts,js,json,yml,yaml}\" \"{setup,lib,bin,hot,buildin,benchmark,tooling,schemas}/**/*.{js,json}\" \"test/*.js\" \"test/{configCases,watchCases,statsCases,hotCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
+    "pretty": "prettier --loglevel warn --write \"*.{ts,js,json,yml,yaml}\" \"{setup,lib,bin,hot,buildin,benchmark,tooling,schemas}/**/*.{js,json}\" \"test/*.js\" \"test/helpers/*.js\" \"test/{configCases,watchCases,statsCases,hotCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
     "jest-lint": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.lint.js\" --no-verbose",
     "benchmark": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.benchmark.js\" --runInBand",
     "cover": "yarn cover:all && yarn cover:report",