webpack 5.100.1 → 5.101.0

package/lib/RuntimeTemplate.js

@@ -8,6 +8,9 @@
 const InitFragment = require("./InitFragment");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const Template = require("./Template");
+const {
+	getOutgoingAsyncModules
+} = require("./async-modules/AsyncModuleHelpers");
 const {
 	getMakeDeferredNamespaceModeFromExportsType,
 	getOptimizedDeferredModule
@@ -46,12 +49,12 @@ This should not happen.
 It's in these chunks: ${
 	Array.from(
 		chunkGraph.getModuleChunksIterable(module),
-		c => c.name || c.id || c.debugId
+		(c) => c.name || c.id || c.debugId
 	).join(", ") || "none"
 } (If module is in no chunk this indicates a bug in some chunk/module optimization logic)
 Module has these incoming connections: ${Array.from(
 	chunkGraph.moduleGraph.getIncomingConnections(module),
-	connection =>
+	(connection) =>
 		`\n - ${
 			connection.originModule && connection.originModule.identifier()
 		} ${connection.dependency && connection.dependency.type} ${
@@ -159,6 +162,16 @@ class RuntimeTemplate {
 		return this.outputOptions.environment.nodePrefixForCoreModules;
 	}
 
+	/**
+	 * @param {string} mod a module
+	 * @returns {string} a module with `node:` prefix when supported, otherwise an original name
+	 */
+	renderNodePrefixForCoreModule(mod) {
+		return this.outputOptions.environment.nodePrefixForCoreModules
+			? `"node:${mod}"`
+			: `"${mod}"`;
+	}
+
 	/**
 	 * @param {string} returnValue return value
 	 * @param {string} args arguments
@@ -226,7 +239,7 @@ class RuntimeTemplate {
 		if (concatenationCost <= templateCost) return this._es5Concatenation(args);
 
 		return `\`${args
-			.map(arg => (typeof arg === "string" ? arg : `\${${arg.expr}}`))
+			.map((arg) => (typeof arg === "string" ? arg : `\${${arg.expr}}`))
 			.join("")}\``;
 	}
 
@@ -237,7 +250,7 @@ class RuntimeTemplate {
 	 */
 	_es5Concatenation(args) {
 		const str = args
-			.map(arg => (typeof arg === "string" ? JSON.stringify(arg) : arg.expr))
+			.map((arg) => (typeof arg === "string" ? JSON.stringify(arg) : arg.expr))
 			.join(" + ");
 
 		// when the first two args are expression, we need to prepend "" + to force string
@@ -287,7 +300,9 @@ class RuntimeTemplate {
 		return this.supportsDestructuring()
 			? `var {${items.join(", ")}} = ${value};`
 			: Template.asString(
-					items.map(item => `var ${item} = ${value}${propertyAccess([item])};`)
+					items.map(
+						(item) => `var ${item} = ${value}${propertyAccess([item])};`
+					)
 				);
 	}
 
@@ -329,12 +344,12 @@ class RuntimeTemplate {
 		if (this.outputOptions.pathinfo) {
 			content = [message, request, chunkName, chunkReason]
 				.filter(Boolean)
-				.map(item => this.requestShortener.shorten(item))
+				.map((item) => this.requestShortener.shorten(item))
 				.join(" | ");
 		} else {
 			content = [message, chunkName, chunkReason]
 				.filter(Boolean)
-				.map(item => this.requestShortener.shorten(item))
+				.map((item) => this.requestShortener.shorten(item))
 				.join(" | ");
 		}
 		if (!content) return "";
@@ -760,14 +775,14 @@ class RuntimeTemplate {
 		if (typeof runtimeCondition === "boolean") return `${runtimeCondition}`;
 		/** @type {Set<string>} */
 		const positiveRuntimeIds = new Set();
-		forEachRuntime(runtimeCondition, runtime =>
+		forEachRuntime(runtimeCondition, (runtime) =>
 			positiveRuntimeIds.add(
 				`${chunkGraph.getRuntimeId(/** @type {string} */ (runtime))}`
 			)
 		);
 		/** @type {Set<string>} */
 		const negativeRuntimeIds = new Set();
-		forEachRuntime(subtractRuntime(runtime, runtimeCondition), runtime =>
+		forEachRuntime(subtractRuntime(runtime, runtimeCondition), (runtime) =>
 			negativeRuntimeIds.add(
 				`${chunkGraph.getRuntimeId(/** @type {string} */ (runtime))}`
 			)
@@ -814,28 +829,6 @@ class RuntimeTemplate {
 			];
 		}
 
-		/** @type {Set<Module>} */
-		const innerAsyncDependencies = new Set();
-		defer = defer && (module.buildMeta ? !module.buildMeta.async : true);
-
-		if (this.compilation.options.experiments.deferImport && defer) {
-			const seen = new Set();
-			(function gatherInnerAsyncDependencies(mod) {
-				if (!moduleGraph.isAsync(mod) || seen.has(mod)) return;
-				seen.add(mod);
-				if (mod.buildMeta && mod.buildMeta.async) {
-					innerAsyncDependencies.add(mod);
-				} else {
-					for (const dep of mod.dependencies) {
-						const module = moduleGraph.getModule(dep);
-						if (module) {
-							gatherInnerAsyncDependencies(module);
-						}
-					}
-				}
-			})(module);
-		}
-
 		if (chunkGraph.getModuleId(module) === null) {
 			if (weak) {
 				// only weak referenced modules don't get an id
@@ -872,18 +865,22 @@ class RuntimeTemplate {
 		);
 		runtimeRequirements.add(RuntimeGlobals.require);
 		let importContent;
-		if (defer) {
+		if (defer && !(/** @type {BuildMeta} */ (module.buildMeta).async)) {
+			/** @type {Set<Module>} */
+			const outgoingAsyncModules = getOutgoingAsyncModules(moduleGraph, module);
+
 			importContent = `/* deferred harmony import */ ${optDeclaration}${importVar} = ${getOptimizedDeferredModule(
 				this,
 				exportsType,
 				moduleId,
-				Array.from(innerAsyncDependencies, mod => chunkGraph.getModuleId(mod))
+				Array.from(outgoingAsyncModules, (mod) => chunkGraph.getModuleId(mod))
 			)};\n`;
-		} else {
-			importContent = `/* harmony import */ ${optDeclaration}${importVar} = ${RuntimeGlobals.require}(${moduleId});\n`;
+
+			return [importContent, ""];
 		}
+		importContent = `/* harmony import */ ${optDeclaration}${importVar} = ${RuntimeGlobals.require}(${moduleId});\n`;
 
-		if (exportsType === "dynamic" && !defer) {
+		if (exportsType === "dynamic") {
 			runtimeRequirements.add(RuntimeGlobals.compatGetDefaultExport);
 			return [
 				importContent,
@@ -935,8 +932,6 @@ class RuntimeTemplate {
 				request
 			});
 		}
-
-		defer = defer && (module.buildMeta ? !module.buildMeta.async : true);
 		if (!Array.isArray(exportName)) {
 			exportName = exportName ? [exportName] : [];
 		}
@@ -946,10 +941,13 @@ class RuntimeTemplate {
 			(originModule.buildMeta).strictHarmonyModule
 		);
 
+		const isDeferred =
+			defer && !(/** @type {BuildMeta} */ (module.buildMeta).async);
+
 		if (defaultInterop) {
 			// when the defaultInterop is used (when a ESM imports a CJS module),
 			if (exportName.length > 0 && exportName[0] === "default") {
-				if (defer && exportsType !== "namespace") {
+				if (isDeferred && exportsType !== "namespace") {
 					const access = `${importVar}.a${propertyAccess(exportName, 1)}`;
 					if (isCall || asiSafe === undefined) {
 						return access;
@@ -994,7 +992,7 @@ class RuntimeTemplate {
 				) {
 					return "/* __esModule */true";
 				}
-			} else if (defer) {
+			} else if (isDeferred) {
 				// now exportName.length is 0
 				// fall through to the end of this function, create the namespace there.
 			} else if (
@@ -1037,7 +1035,7 @@ class RuntimeTemplate {
 				? ""
 				: `${Template.toNormalComment(propertyAccess(exportName))} `;
 			const access = `${importVar}${
-				defer ? ".a" : ""
+				isDeferred ? ".a" : ""
 			}${comment}${propertyAccess(used)}`;
 			if (isCall && callContext === false) {
 				return asiSafe
@@ -1048,7 +1046,7 @@ class RuntimeTemplate {
 			}
 			return access;
 		}
-		if (defer) {
+		if (isDeferred) {
 			initFragments.push(
 				new InitFragment(
 					`var ${importVar}_deferred_namespace_cache;\n`,
@@ -1098,7 +1096,7 @@ class RuntimeTemplate {
 			return `Promise.resolve(${comment.trim()})`;
 		}
 		const chunks = chunkGroup.chunks.filter(
-			chunk => !chunk.hasRuntime() && chunk.id !== null
+			(chunk) => !chunk.hasRuntime() && chunk.id !== null
 		);
 		const comment = this.comment({
 			message,
@@ -1130,7 +1128,7 @@ class RuntimeTemplate {
 			 * @param {Chunk} chunk chunk
 			 * @returns {string} require chunk id code
 			 */
-			const requireChunkId = chunk =>
+			const requireChunkId = (chunk) =>
 				`${RuntimeGlobals.ensureChunk}(${JSON.stringify(chunk.id)}${
 					fetchPriority ? `, ${JSON.stringify(fetchPriority)}` : ""
 				})`;

package/lib/SizeFormatHelpers.js

@@ -9,7 +9,7 @@
  * @param {number} size the size in bytes
  * @returns {string} the formatted size
  */
-module.exports.formatSize = size => {
+module.exports.formatSize = (size) => {
 	if (typeof size !== "number" || Number.isNaN(size) === true) {
 		return "unknown size";
 	}

package/lib/SourceMapDevToolModuleOptionsPlugin.js

@@ -27,17 +27,17 @@ class SourceMapDevToolModuleOptionsPlugin {
 	apply(compilation) {
 		const options = this.options;
 		if (options.module !== false) {
-			compilation.hooks.buildModule.tap(PLUGIN_NAME, module => {
+			compilation.hooks.buildModule.tap(PLUGIN_NAME, (module) => {
 				module.useSourceMap = true;
 			});
-			compilation.hooks.runtimeModule.tap(PLUGIN_NAME, module => {
+			compilation.hooks.runtimeModule.tap(PLUGIN_NAME, (module) => {
 				module.useSourceMap = true;
 			});
 		} else {
-			compilation.hooks.buildModule.tap(PLUGIN_NAME, module => {
+			compilation.hooks.buildModule.tap(PLUGIN_NAME, (module) => {
 				module.useSimpleSourceMap = true;
 			});
-			compilation.hooks.runtimeModule.tap(PLUGIN_NAME, module => {
+			compilation.hooks.runtimeModule.tap(PLUGIN_NAME, (module) => {
 				module.useSimpleSourceMap = true;
 			});
 		}

package/lib/SourceMapDevToolPlugin.js

@@ -65,7 +65,7 @@ const URL_FORMATTING_REGEXP = /^\n\/\/(.*)$/;
  * @param {RegExp} regexp Stateful Regular Expression to be reset
  * @returns {void}
  */
-const resetRegexpState = regexp => {
+const resetRegexpState = (regexp) => {
 	regexp.lastIndex = -1;
 };
 
@@ -74,7 +74,7 @@ const resetRegexpState = regexp => {
  * @param {string} str String to quote
  * @returns {string} Escaped string
  */
-const quoteMeta = str => str.replace(METACHARACTERS_REGEXP, "\\$&");
+const quoteMeta = (str) => str.replace(METACHARACTERS_REGEXP, "\\$&");
 
 /**
  * Creating {@link SourceMapTask} for given file
@@ -112,7 +112,7 @@ const getTaskForFile = (
 	const context = /** @type {string} */ (compilation.options.context);
 	const root = compilation.compiler.root;
 	const cachedAbsolutify = makePathsAbsolute.bindContextCache(context, root);
-	const modules = sourceMap.sources.map(source => {
+	const modules = sourceMap.sources.map((source) => {
 		if (!source.startsWith("webpack://")) return source;
 		source = cachedAbsolutify(source.slice(10));
 		const module = compilation.findModule(source);
@@ -179,7 +179,7 @@ class SourceMapDevToolPlugin {
 			options
 		);
 
-		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			new SourceMapDevToolModuleOptionsPlugin(options).apply(compilation);
 
 			compilation.hooks.processAssets.tapAsync(
@@ -348,7 +348,7 @@ class SourceMapDevToolPlugin {
 								callback();
 							});
 						},
-						err => {
+						(err) => {
 							if (err) {
 								return callback(err);
 							}
@@ -431,7 +431,7 @@ class SourceMapDevToolPlugin {
 										"attach SourceMap"
 									);
 
-									const moduleFilenames = modules.map(m =>
+									const moduleFilenames = modules.map((m) =>
 										moduleToSourceNameMapping.get(m)
 									);
 									sourceMap.sources = /** @type {string[]} */ (moduleFilenames);
@@ -454,7 +454,7 @@ class SourceMapDevToolPlugin {
 											: quoteMeta(contenthash);
 										sourceMap.file = sourceMap.file.replace(
 											new RegExp(pattern, "g"),
-											m => "x".repeat(m.length)
+											(m) => "x".repeat(m.length)
 										);
 									}
 
@@ -584,7 +584,7 @@ class SourceMapDevToolPlugin {
 										compilation.updateAsset(file, asset);
 									}
 
-									task.cacheItem.store({ assets, assetsInfo }, err => {
+									task.cacheItem.store({ assets, assetsInfo }, (err) => {
 										reportProgress(
 											0.5 + (0.5 * ++taskIndex) / tasks.length,
 											task.file,
@@ -597,7 +597,7 @@ class SourceMapDevToolPlugin {
 										callback();
 									});
 								},
-								err => {
+								(err) => {
 									reportProgress(1);
 									callback(err);
 								}

package/lib/Stats.js

@@ -36,7 +36,7 @@ class Stats {
 	hasWarnings() {
 		return (
 			this.compilation.getWarnings().length > 0 ||
-			this.compilation.children.some(child => child.getStats().hasWarnings())
+			this.compilation.children.some((child) => child.getStats().hasWarnings())
 		);
 	}
 
@@ -46,7 +46,7 @@ class Stats {
 	hasErrors() {
 		return (
 			this.compilation.errors.length > 0 ||
-			this.compilation.children.some(child => child.getStats().hasErrors())
+			this.compilation.children.some((child) => child.getStats().hasErrors())
 		);
 	}
 

package/lib/Template.js

@@ -296,7 +296,7 @@ class Template {
 			return null;
 		}
 		/** @type {{id: string|number, source: Source|string}[]} */
-		const allModules = modules.map(module => ({
+		const allModules = modules.map((module) => ({
 			id: /** @type {ModuleId} */ (chunkGraph.getModuleId(module)),
 			source: renderModule(module) || "false"
 		}));

package/lib/TemplatedPathPlugin.js

@@ -24,7 +24,7 @@ const REGEXP = /\[\\*([\w:]+)\\*\]/gi;
  * @param {string | number} id id
  * @returns {string | number} result
  */
-const prepareId = id => {
+const prepareId = (id) => {
 	if (typeof id !== "string") return id;
 
 	if (/^"\s\+*.*\+\s*"$/.test(id)) {
@@ -389,7 +389,7 @@ class TemplatedPathPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.compilation.tap(plugin, compilation => {
+		compiler.hooks.compilation.tap(plugin, (compilation) => {
 			compilation.hooks.assetPath.tap(plugin, replacePathVariables);
 		});
 	}

package/lib/UseStrictPlugin.js

@@ -36,7 +36,7 @@ class UseStrictPlugin {
 				 * @param {JavascriptParserOptions} parserOptions the javascript parser options
 				 */
 				const handler = (parser, parserOptions) => {
-					parser.hooks.program.tap(PLUGIN_NAME, ast => {
+					parser.hooks.program.tap(PLUGIN_NAME, (ast) => {
 						const firstNode = ast.body[0];
 						if (
 							firstNode &&

package/lib/WarnCaseSensitiveModulesPlugin.js

@@ -20,7 +20,7 @@ class WarnCaseSensitiveModulesPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			compilation.hooks.seal.tap(PLUGIN_NAME, () => {
 				/** @type {Map<string, Map<string, Module>>} */
 				const moduleWithoutCase = new Map();

package/lib/WarnDeprecatedOptionPlugin.js

@@ -30,7 +30,7 @@ class WarnDeprecatedOptionPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
 			compilation.warnings.push(
 				new DeprecatedOptionWarning(this.option, this.value, this.suggestion)
 			);

package/lib/WarnNoModeSetPlugin.js

@@ -18,7 +18,7 @@ class WarnNoModeSetPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
 			compilation.warnings.push(new NoModeWarning());
 		});
 	}

package/lib/WatchIgnorePlugin.js

@@ -45,8 +45,8 @@ class IgnoringWatchFileSystem {
 		 * @param {string} path path to check
 		 * @returns {boolean} true, if path is ignored
 		 */
-		const ignored = path =>
-			this.paths.some(p =>
+		const ignored = (path) =>
+			this.paths.some((p) =>
 				p instanceof RegExp ? p.test(path) : path.indexOf(p) === 0
 			);
 

package/lib/Watching.js

@@ -159,14 +159,14 @@ class Watching {
 
 		const run = () => {
 			if (this.compiler.idle) {
-				return this.compiler.cache.endIdle(err => {
+				return this.compiler.cache.endIdle((err) => {
 					if (err) return this._done(err);
 					this.compiler.idle = false;
 					run();
 				});
 			}
 			if (this._needRecords) {
-				return this.compiler.readRecords(err => {
+				return this.compiler.readRecords((err) => {
 					if (err) return this._done(err);
 
 					this._needRecords = false;
@@ -175,7 +175,7 @@ class Watching {
 			}
 			this.invalid = false;
 			this._invalidReported = false;
-			this.compiler.hooks.watchRun.callAsync(this.compiler, err => {
+			this.compiler.hooks.watchRun.callAsync(this.compiler, (err) => {
 				if (err) return this._done(err);
 				/**
 				 * @param {Error | null} err error
@@ -196,13 +196,13 @@ class Watching {
 					process.nextTick(() => {
 						const logger = compilation.getLogger("webpack.Compiler");
 						logger.time("emitAssets");
-						this.compiler.emitAssets(compilation, err => {
+						this.compiler.emitAssets(compilation, (err) => {
 							logger.timeEnd("emitAssets");
 							if (err) return this._done(err, compilation);
 							if (this.invalid) return this._done(null, compilation);
 
 							logger.time("emitRecords");
-							this.compiler.emitRecords(err => {
+							this.compiler.emitRecords((err) => {
 								logger.timeEnd("emitRecords");
 								if (err) return this._done(err, compilation);
 
@@ -215,11 +215,11 @@ class Watching {
 									compilation.endTime = Date.now();
 									logger.time("done hook");
 									const stats = new Stats(compilation);
-									this.compiler.hooks.done.callAsync(stats, err => {
+									this.compiler.hooks.done.callAsync(stats, (err) => {
 										logger.timeEnd("done hook");
 										if (err) return this._done(err, compilation);
 
-										this.compiler.hooks.additionalPass.callAsync(err => {
+										this.compiler.hooks.additionalPass.callAsync((err) => {
 											if (err) return this._done(err, compilation);
 											this.compiler.compile(onCompiled);
 										});
@@ -288,7 +288,7 @@ class Watching {
 				logger.time("storeBuildDependencies");
 				this.compiler.cache.storeBuildDependencies(
 					compilation.buildDependencies,
-					err => {
+					(err) => {
 						logger.timeEnd("storeBuildDependencies");
 						if (err) return handleError(err);
 						this._go();
@@ -311,7 +311,7 @@ class Watching {
 		const cbs = this.callbacks;
 		this.callbacks = [];
 		logger.time("done hook");
-		this.compiler.hooks.done.callAsync(/** @type {Stats} */ (stats), err => {
+		this.compiler.hooks.done.callAsync(/** @type {Stats} */ (stats), (err) => {
 			logger.timeEnd("done hook");
 			if (err) return handleError(err, cbs);
 			this.handler(null, stats);
@@ -319,7 +319,7 @@ class Watching {
 			this.compiler.cache.storeBuildDependencies(
 				/** @type {Compilation} */
 				(compilation).buildDependencies,
-				err => {
+				(err) => {
 					logger.timeEnd("storeBuildDependencies");
 					if (err) return handleError(err, cbs);
 					logger.time("beginIdle");
@@ -480,7 +480,7 @@ class Watching {
 			/**
 			 * @param {WebpackError | null} err error if any
 			 */
-			const shutdown = err => {
+			const shutdown = (err) => {
 				this.compiler.hooks.watchClose.call();
 				const closeCallbacks =
 					/** @type {Callback<void>[]} */
@@ -493,7 +493,7 @@ class Watching {
 				logger.time("storeBuildDependencies");
 				this.compiler.cache.storeBuildDependencies(
 					compilation.buildDependencies,
-					err2 => {
+					(err2) => {
 						logger.timeEnd("storeBuildDependencies");
 						shutdown(err || err2);
 					}

package/lib/WebpackIsIncludedPlugin.js

@@ -47,10 +47,10 @@ class WebpackIsIncludedPlugin {
 				 * @param {JavascriptParser} parser the parser
 				 * @returns {void}
 				 */
-				const handler = parser => {
+				const handler = (parser) => {
 					parser.hooks.call
 						.for("__webpack_is_included__")
-						.tap(PLUGIN_NAME, expr => {
+						.tap(PLUGIN_NAME, (expr) => {
 							if (
 								expr.type !== "CallExpression" ||
 								expr.arguments.length !== 1 ||

package/lib/WebpackOptionsApply.js

@@ -438,6 +438,13 @@ class WebpackOptionsApply extends OptionsApply {
 			new HttpUriPlugin(httpOptions).apply(compiler);
 		}
 
+		if (options.experiments.deferImport) {
+			const JavascriptParser = require("./javascript/JavascriptParser");
+			const importPhases = require("acorn-import-phases");
+
+			JavascriptParser.extend(importPhases({ source: false }));
+		}
+
 		new EntryOptionPlugin().apply(compiler);
 		compiler.hooks.entryOption.call(
 			/** @type {string} */
@@ -851,7 +858,7 @@ class WebpackOptionsApply extends OptionsApply {
 		}
 		compiler.resolverFactory.hooks.resolveOptions
 			.for("normal")
-			.tap(CLASS_NAME, resolveOptions => {
+			.tap(CLASS_NAME, (resolveOptions) => {
 				resolveOptions = cleverMerge(options.resolve, resolveOptions);
 				resolveOptions.fileSystem =
 					/** @type {InputFileSystem} */
@@ -860,7 +867,7 @@ class WebpackOptionsApply extends OptionsApply {
 			});
 		compiler.resolverFactory.hooks.resolveOptions
 			.for("context")
-			.tap(CLASS_NAME, resolveOptions => {
+			.tap(CLASS_NAME, (resolveOptions) => {
 				resolveOptions = cleverMerge(options.resolve, resolveOptions);
 				resolveOptions.fileSystem =
 					/** @type {InputFileSystem} */
@@ -870,7 +877,7 @@ class WebpackOptionsApply extends OptionsApply {
 			});
 		compiler.resolverFactory.hooks.resolveOptions
 			.for("loader")
-			.tap(CLASS_NAME, resolveOptions => {
+			.tap(CLASS_NAME, (resolveOptions) => {
 				resolveOptions = cleverMerge(options.resolveLoader, resolveOptions);
 				resolveOptions.fileSystem =
 					/** @type {InputFileSystem} */

package/lib/asset/AssetGenerator.js

@@ -57,8 +57,8 @@ const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
 /**
  * @template T
  * @template U
- * @param {string | Array<T> | Set<T> | undefined} a a
- * @param {string | Array<U> | Set<U> | undefined} b b
+ * @param {null | string | Array<T> | Set<T> | undefined} a a
+ * @param {null | string | Array<U> | Set<U> | undefined} b b
  * @returns {Array<T> & Array<U>} array
  */
 const mergeMaybeArrays = (a, b) => {
@@ -152,7 +152,7 @@ const encodeDataUri = (encoding, source) => {
 				(encodedContent)
 			).replace(
 				/[!'()*]/g,
-				character =>
+				(character) =>
 					`%${/** @type {number} */ (character.codePointAt(0)).toString(16)}`
 			);
 			break;

package/lib/asset/AssetModulesPlugin.js

@@ -31,7 +31,7 @@ const memoize = require("../util/memoize");
  * @param {string} name name of definitions
  * @returns {Schema} definition
  */
-const getSchema = name => {
+const getSchema = (name) => {
 	const { definitions } = require("../../schemas/WebpackOptions.json");
 
 	return {
@@ -93,7 +93,7 @@ class AssetModulesPlugin {
 			(compilation, { normalModuleFactory }) => {
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE)
-					.tap(PLUGIN_NAME, parserOptions => {
+					.tap(PLUGIN_NAME, (parserOptions) => {
 						validateParserOptions(parserOptions);
 						parserOptions = cleverMerge(
 							/** @type {AssetParserOptions} */
@@ -115,21 +115,21 @@ class AssetModulesPlugin {
 					});
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE_INLINE)
-					.tap(PLUGIN_NAME, _parserOptions => {
+					.tap(PLUGIN_NAME, (_parserOptions) => {
 						const AssetParser = getAssetParser();
 
 						return new AssetParser(true);
 					});
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE_RESOURCE)
-					.tap(PLUGIN_NAME, _parserOptions => {
+					.tap(PLUGIN_NAME, (_parserOptions) => {
 						const AssetParser = getAssetParser();
 
 						return new AssetParser(false);
 					});
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE_SOURCE)
-					.tap(PLUGIN_NAME, _parserOptions => {
+					.tap(PLUGIN_NAME, (_parserOptions) => {
 						const AssetSourceParser = getAssetSourceParser();
 
 						return new AssetSourceParser();
@@ -142,7 +142,7 @@ class AssetModulesPlugin {
 				]) {
 					normalModuleFactory.hooks.createGenerator
 						.for(type)
-						.tap(PLUGIN_NAME, generatorOptions => {
+						.tap(PLUGIN_NAME, (generatorOptions) => {
 							validateGeneratorOptions[type](generatorOptions);
 
 							let dataUrl;