webpack 4.35.3 → 4.38.0

package/lib/JavascriptModulesPlugin.js

@@ -148,9 +148,8 @@ class JavascriptModulesPlugin {
 							hash.update(m.hash);
 						}
 					}
-					chunk.contentHash.javascript = hash
-						.digest(hashDigest)
-						.substr(0, hashDigestLength);
+					const digest = /** @type {string} */ (hash.digest(hashDigest));
+					chunk.contentHash.javascript = digest.substr(0, hashDigestLength);
 				});
 			}
 		);

package/lib/ModuleFilenameHelpers.js

@@ -44,7 +44,8 @@ const getBefore = (str, token) => {
 const getHash = str => {
 	const hash = createHash("md4");
 	hash.update(str);
-	return hash.digest("hex").substr(0, 4);
+	const digest = /** @type {string} */ (hash.digest("hex"));
+	return digest.substr(0, 4);
 };
 
 const asRegExp = test => {

package/lib/NamedModulesPlugin.js

@@ -10,7 +10,8 @@ const RequestShortener = require("./RequestShortener");
 const getHash = str => {
 	const hash = createHash("md4");
 	hash.update(str);
-	return hash.digest("hex").substr(0, 4);
+	const digest = /** @type {string} */ (hash.digest("hex"));
+	return digest.substr(0, 4);
 };
 
 class NamedModulesPlugin {

package/lib/NormalModule.js

@@ -147,16 +147,20 @@ class NormalModule extends Module {
 
 	createLoaderContext(resolver, options, compilation, fs) {
 		const requestShortener = compilation.runtimeTemplate.requestShortener;
+		const getCurrentLoaderName = () => {
+			const currentLoader = this.getCurrentLoader(loaderContext);
+			if (!currentLoader) return "(not in loader scope)";
+			return requestShortener.shorten(currentLoader.loader);
+		};
 		const loaderContext = {
 			version: 2,
 			emitWarning: warning => {
 				if (!(warning instanceof Error)) {
 					warning = new NonErrorEmittedError(warning);
 				}
-				const currentLoader = this.getCurrentLoader(loaderContext);
 				this.warnings.push(
 					new ModuleWarning(this, warning, {
-						from: requestShortener.shorten(currentLoader.loader)
+						from: getCurrentLoaderName()
 					})
 				);
 			},
@@ -164,13 +168,20 @@ class NormalModule extends Module {
 				if (!(error instanceof Error)) {
 					error = new NonErrorEmittedError(error);
 				}
-				const currentLoader = this.getCurrentLoader(loaderContext);
 				this.errors.push(
 					new ModuleError(this, error, {
-						from: requestShortener.shorten(currentLoader.loader)
+						from: getCurrentLoaderName()
 					})
 				);
 			},
+			getLogger: name => {
+				const currentLoader = this.getCurrentLoader(loaderContext);
+				return compilation.getLogger(() =>
+					[currentLoader && currentLoader.loader, name, this.identifier()]
+						.filter(Boolean)
+						.join("|")
+				);
+			},
 			// TODO remove in webpack 5
 			exec: (code, filename) => {
 				// @ts-ignore Argument of type 'this' is not assignable to parameter of type 'Module'.
@@ -405,7 +416,7 @@ class NormalModule extends Module {
 		}
 		hash.update("meta");
 		hash.update(JSON.stringify(this.buildMeta));
-		this._buildHash = hash.digest("hex");
+		this._buildHash = /** @type {string} */ (hash.digest("hex"));
 	}
 
 	build(options, compilation, resolver, fs, callback) {

package/lib/NormalModuleFactory.js

@@ -17,7 +17,7 @@ const {
 const NormalModule = require("./NormalModule");
 const RawModule = require("./RawModule");
 const RuleSet = require("./RuleSet");
-const cachedMerge = require("./util/cachedMerge");
+const { cachedCleverMerge } = require("./util/cleverMerge");
 
 const EMPTY_RESOLVE_OPTIONS = {};
 
@@ -304,7 +304,7 @@ class NormalModuleFactory extends Tapable {
 							typeof settings[r.type] === "object" &&
 							settings[r.type] !== null
 						) {
-							settings[r.type] = cachedMerge(settings[r.type], r.value);
+							settings[r.type] = cachedCleverMerge(settings[r.type], r.value);
 						} else {
 							settings[r.type] = r.value;
 						}

package/lib/OptionsDefaulter.js

@@ -6,8 +6,8 @@
 
 /**
  * Gets the value at path of object
- * @param {object} obj - object to query
- * @param {string} path - query path
+ * @param {object} obj object to query
+ * @param {string} path query path
  * @returns {any} - if {@param path} requests element from array, then `undefined` will be returned
  */
 const getProperty = (obj, path) => {
@@ -21,9 +21,9 @@ const getProperty = (obj, path) => {
 
 /**
  * Sets the value at path of object. Stops execution, if {@param path} requests element from array to be set
- * @param {object} obj - object to query
- * @param {string} path - query path
- * @param {any} value - value to be set
+ * @param {object} obj object to query
+ * @param {string} path query path
+ * @param {any} value value to be set
  * @returns {void}
  */
 const setProperty = (obj, path, value) => {
@@ -65,7 +65,7 @@ class OptionsDefaulter {
 
 	/**
 	 * Enhancing {@param options} with default values
-	 * @param {object} options - provided options
+	 * @param {object} options provided options
 	 * @returns {object} - enhanced options
 	 * @throws {Error} - will throw error, if configuration value is other then `undefined` or {@link ConfigType}
 	 */
@@ -122,9 +122,9 @@ class OptionsDefaulter {
 
 	/**
 	 * Builds up default values
-	 * @param {string} name - option path
-	 * @param {ConfigType | any} config - if {@param def} is provided, then only {@link ConfigType} is allowed
-	 * @param {MakeConfigHandler | CallConfigHandler | AppendConfigValues} [def] - defaults
+	 * @param {string} name option path
+	 * @param {ConfigType | any} config if {@param def} is provided, then only {@link ConfigType} is allowed
+	 * @param {MakeConfigHandler | CallConfigHandler | AppendConfigValues} [def] defaults
 	 * @returns {void}
 	 */
 	set(name, config, def) {

package/lib/ProgressPlugin.js

@@ -263,7 +263,6 @@ class ProgressPlugin {
 					recordModules: "record modules",
 					recordChunks: "record chunks",
 					beforeHash: "hashing",
-					contentHash: "content hashing",
 					afterHash: "after hashing",
 					recordHash: "record hash",
 					beforeModuleAssets: "module assets processing",

package/lib/ResolverFactory.js

@@ -6,9 +6,12 @@
 
 const { Tapable, HookMap, SyncHook, SyncWaterfallHook } = require("tapable");
 const Factory = require("enhanced-resolve").ResolverFactory;
+const { cachedCleverMerge } = require("./util/cleverMerge");
 
 /** @typedef {import("enhanced-resolve").Resolver} Resolver */
 
+const EMTPY_RESOLVE_OPTIONS = {};
+
 module.exports = class ResolverFactory extends Tapable {
 	constructor() {
 		super();
@@ -22,30 +25,24 @@ module.exports = class ResolverFactory extends Tapable {
 			let match;
 			match = /^resolve-options (.+)$/.exec(options.name);
 			if (match) {
-				this.hooks.resolveOptions.tap(
-					match[1],
-					options.fn.name || "unnamed compat plugin",
-					options.fn
-				);
+				this.hooks.resolveOptions
+					.for(match[1])
+					.tap(options.fn.name || "unnamed compat plugin", options.fn);
 				return true;
 			}
 			match = /^resolver (.+)$/.exec(options.name);
 			if (match) {
-				this.hooks.resolver.tap(
-					match[1],
-					options.fn.name || "unnamed compat plugin",
-					options.fn
-				);
+				this.hooks.resolver
+					.for(match[1])
+					.tap(options.fn.name || "unnamed compat plugin", options.fn);
 				return true;
 			}
 		});
-		this.cache1 = new WeakMap();
 		this.cache2 = new Map();
 	}
 
 	get(type, resolveOptions) {
-		const cachedResolver = this.cache1.get(resolveOptions);
-		if (cachedResolver) return cachedResolver();
+		resolveOptions = resolveOptions || EMTPY_RESOLVE_OPTIONS;
 		const ident = `${type}|${JSON.stringify(resolveOptions)}`;
 		const resolver = this.cache2.get(ident);
 		if (resolver) return resolver;
@@ -66,7 +63,7 @@ module.exports = class ResolverFactory extends Tapable {
 		resolver.withOptions = options => {
 			const cacheEntry = childCache.get(options);
 			if (cacheEntry !== undefined) return cacheEntry;
-			const mergedOptions = Object.assign({}, originalResolveOptions, options);
+			const mergedOptions = cachedCleverMerge(originalResolveOptions, options);
 			const resolver = this.get(type, mergedOptions);
 			childCache.set(options, resolver);
 			return resolver;

package/lib/SourceMapDevToolPlugin.js

@@ -14,25 +14,52 @@ const validateOptions = require("schema-utils");
 const schema = require("../schemas/plugins/SourceMapDevToolPlugin.json");
 
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
+/** @typedef {import("./Chunk")} Chunk */
+/** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("source-map").RawSourceMap} SourceMap */
+/** @typedef {import("./Module")} Module */
+/** @typedef {import("./Compilation")} Compilation */
+/** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./Compilation")} SourceMapDefinition */
 
+/**
+ * @typedef {object} SourceMapTask
+ * @property {Source} asset
+ * @property {Array<string | Module>} [modules]
+ * @property {string} source
+ * @property {string} file
+ * @property {SourceMap} sourceMap
+ * @property {Chunk} chunk
+ */
+
+/**
+ * @param {string} name file path
+ * @returns {string} file name
+ */
 const basename = name => {
 	if (!name.includes("/")) return name;
 	return name.substr(name.lastIndexOf("/") + 1);
 };
 
+/**
+ * @type {WeakMap<Source, {file: string, assets: {[k: string]: ConcatSource | RawSource}}>}
+ */
 const assetsCache = new WeakMap();
 
-const getTaskForFile = (file, chunk, options, compilation) => {
-	const asset = compilation.assets[file];
-	const cache = assetsCache.get(asset);
-	if (cache && cache.file === file) {
-		for (const cachedFile in cache.assets) {
-			compilation.assets[cachedFile] = cache.assets[cachedFile];
-			if (cachedFile !== file) chunk.files.push(cachedFile);
-		}
-		return;
-	}
+/**
+ * Creating {@link SourceMapTask} for given file
+ * @param {string} file current compiled file
+ * @param {Source} asset the asset
+ * @param {Chunk} chunk related chunk
+ * @param {SourceMapDevToolPluginOptions} options source map options
+ * @param {Compilation} compilation compilation instance
+ * @returns {SourceMapTask | undefined} created task instance or `undefined`
+ */
+const getTaskForFile = (file, asset, chunk, options, compilation) => {
 	let source, sourceMap;
+	/**
+	 * Check if asset can build source map
+	 */
 	if (asset.sourceAndMap) {
 		const sourceAndMap = asset.sourceAndMap(options);
 		sourceMap = sourceAndMap.map;
@@ -55,7 +82,8 @@ const getTaskForFile = (file, chunk, options, compilation) => {
 
 class SourceMapDevToolPlugin {
 	/**
-	 * @param {SourceMapDevToolPluginOptions=} options options object
+	 * @param {SourceMapDevToolPluginOptions} [options] options object
+	 * @throws {Error} throws error, if got more than 1 arguments
 	 */
 	constructor(options) {
 		if (arguments.length > 1) {
@@ -68,21 +96,31 @@ class SourceMapDevToolPlugin {
 
 		validateOptions(schema, options, "SourceMap DevTool Plugin");
 
+		/** @type {string | false} */
 		this.sourceMapFilename = options.filename;
 		/** @type {string | false} */
 		this.sourceMappingURLComment =
 			options.append === false
 				? false
 				: options.append || "\n//# sourceMappingURL=[url]";
+		/** @type {string | Function} */
 		this.moduleFilenameTemplate =
 			options.moduleFilenameTemplate || "webpack://[namespace]/[resourcePath]";
+		/** @type {string | Function} */
 		this.fallbackModuleFilenameTemplate =
 			options.fallbackModuleFilenameTemplate ||
 			"webpack://[namespace]/[resourcePath]?[hash]";
+		/** @type {string} */
 		this.namespace = options.namespace || "";
+		/** @type {SourceMapDevToolPluginOptions} */
 		this.options = options;
 	}
 
+	/**
+	 * Apply compiler
+	 * @param {Compiler} compiler compiler instance
+	 * @returns {void}
+	 */
 	apply(compiler) {
 		const sourceMapFilename = this.sourceMapFilename;
 		const sourceMappingURLComment = this.sourceMappingURLComment;
@@ -102,12 +140,21 @@ class SourceMapDevToolPlugin {
 			new SourceMapDevToolModuleOptionsPlugin(options).apply(compilation);
 
 			compilation.hooks.afterOptimizeChunkAssets.tap(
-				{
-					name: "SourceMapDevToolPlugin",
-					context: true
-				},
+				/** @type {TODO} */
+				({ name: "SourceMapDevToolPlugin", context: true }),
+				/**
+				 * @param {object} context hook context
+				 * @param {Array<Chunk>} chunks resulted chunks
+				 * @throws {Error} throws error, if `sourceMapFilename === false && sourceMappingURLComment === false`
+				 * @returns {void}
+				 */
 				(context, chunks) => {
+					/** @type {Map<string | Module, string>} */
 					const moduleToSourceNameMapping = new Map();
+					/**
+					 * @type {Function}
+					 * @returns {void}
+					 */
 					const reportProgress =
 						context && context.reportProgress
 							? context.reportProgress
@@ -128,12 +175,35 @@ class SourceMapDevToolPlugin {
 					reportProgress(0.0);
 					const tasks = [];
 					files.forEach(({ file, chunk }, idx) => {
+						const asset = compilation.assets[file];
+						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];
+								/**
+								 * Add file to chunk, if not presented there
+								 */
+								if (cachedFile !== file) chunk.files.push(cachedFile);
+							}
+							return;
+						}
+
 						reportProgress(
 							(0.5 * idx) / files.length,
 							file,
 							"generate SourceMap"
 						);
-						const task = getTaskForFile(file, chunk, options, compilation);
+						/** @type {SourceMapTask | undefined} */
+						const task = getTaskForFile(
+							file,
+							asset,
+							chunk,
+							options,
+							compilation
+						);
 
 						if (task) {
 							const modules = task.sourceMap.sources.map(source => {
@@ -165,10 +235,15 @@ class SourceMapDevToolPlugin {
 					});
 
 					reportProgress(0.5, "resolve sources");
+					/** @type {Set<string>} */
 					const usedNamesSet = new Set(moduleToSourceNameMapping.values());
+					/** @type {Set<string>} */
 					const conflictDetectionSet = new Set();
 
-					// all modules in defined order (longest identifier first)
+					/**
+					 * all modules in defined order (longest identifier first)
+					 * @type {Array<string | Module>}
+					 */
 					const allModules = Array.from(moduleToSourceNameMapping.keys()).sort(
 						(a, b) => {
 							const ai = typeof a === "string" ? a : a.identifier();
@@ -254,7 +329,7 @@ class SourceMapDevToolPlugin {
 								query = filename.substr(idx);
 								filename = filename.substr(0, idx);
 							}
-							let sourceMapFile = compilation.getPath(sourceMapFilename, {
+							const pathParams = {
 								chunk,
 								filename: options.fileContext
 									? path.relative(options.fileContext, filename)
@@ -264,21 +339,31 @@ class SourceMapDevToolPlugin {
 								contentHash: createHash("md4")
 									.update(sourceMapString)
 									.digest("hex")
-							});
+							};
+							let sourceMapFile = compilation.getPath(
+								sourceMapFilename,
+								pathParams
+							);
 							const sourceMapUrl = options.publicPath
 								? options.publicPath + sourceMapFile.replace(/\\/g, "/")
 								: path
 										.relative(path.dirname(file), sourceMapFile)
 										.replace(/\\/g, "/");
+							/**
+							 * Add source map url to compilation asset, if {@link currentSourceMappingURLComment} presented
+							 */
 							if (currentSourceMappingURLComment !== false) {
 								assets[file] = compilation.assets[file] = new ConcatSource(
 									new RawSource(source),
-									currentSourceMappingURLComment.replace(
-										/\[url\]/g,
-										sourceMapUrl
+									compilation.getPath(
+										currentSourceMappingURLComment,
+										Object.assign({ url: sourceMapUrl }, pathParams)
 									)
 								);
 							}
+							/**
+							 * Add source map file to compilation assets and chunk files
+							 */
 							assets[sourceMapFile] = compilation.assets[
 								sourceMapFile
 							] = new RawSource(sourceMapString);
@@ -289,6 +374,9 @@ class SourceMapDevToolPlugin {
 									"SourceMapDevToolPlugin: append can't be false when no filename is provided"
 								);
 							}
+							/**
+							 * Add source map as data url to asset
+							 */
 							assets[file] = compilation.assets[file] = new ConcatSource(
 								new RawSource(source),
 								currentSourceMappingURLComment