webpack 5.99.9 → 5.100.1

package/lib/Compilation.js

@@ -5,17 +5,17 @@
 
 "use strict";
 
+const util = require("util");
 const asyncLib = require("neo-async");
 const {
+	AsyncParallelHook,
+	AsyncSeriesBailHook,
+	AsyncSeriesHook,
 	HookMap,
-	SyncHook,
 	SyncBailHook,
-	SyncWaterfallHook,
-	AsyncSeriesHook,
-	AsyncSeriesBailHook,
-	AsyncParallelHook
+	SyncHook,
+	SyncWaterfallHook
 } = require("tapable");
-const util = require("util");
 const { CachedSource } = require("webpack-sources");
 const { MultiItemCache } = require("./CacheFacade");
 const Chunk = require("./Chunk");
@@ -56,7 +56,7 @@ const Stats = require("./Stats");
 const WebpackError = require("./WebpackError");
 const buildChunkGraph = require("./buildChunkGraph");
 const BuildCycleError = require("./errors/BuildCycleError");
-const { Logger, LogType } = require("./logging/Logger");
+const { LogType, Logger } = require("./logging/Logger");
 const StatsFactory = require("./stats/StatsFactory");
 const StatsPrinter = require("./stats/StatsPrinter");
 const { equals: arrayEquals } = require("./util/ArrayHelpers");
@@ -66,18 +66,18 @@ const { getOrInsert } = require("./util/MapHelpers");
 const WeakTupleMap = require("./util/WeakTupleMap");
 const { cachedCleverMerge } = require("./util/cleverMerge");
 const {
+	compareIds,
 	compareLocations,
-	concatComparators,
+	compareModulesByIdentifier,
 	compareSelect,
-	compareIds,
 	compareStringsNumeric,
-	compareModulesByIdentifier
+	concatComparators
 } = require("./util/comparators");
 const createHash = require("./util/createHash");
 const {
 	arrayToSetDeprecation,
-	soonFrozenObjectDeprecation,
-	createFakeHook
+	createFakeHook,
+	soonFrozenObjectDeprecation
 } = require("./util/deprecation");
 const processAsyncTree = require("./util/processAsyncTree");
 const { getRuntimeKey } = require("./util/runtime");
@@ -102,6 +102,7 @@ const { isSourceEqual } = require("./util/source");
 /** @typedef {import("./Compiler").MemCache} MemCache */
 /** @typedef {import("./Compiler").WeakReferences} WeakReferences */
 /** @typedef {import("./Compiler").ModuleMemCachesItem} ModuleMemCachesItem */
+/** @typedef {import("./Compiler").Records} Records */
 /** @typedef {import("./DependenciesBlock")} DependenciesBlock */
 /** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("./Dependency").ReferencedExport} ReferencedExport */
@@ -391,8 +392,6 @@ const { isSourceEqual } = require("./util/source");
 
 /** @typedef {Set<Module>} NotCodeGeneratedModules */
 
-/** @typedef {Record<string, TODO>} Records */
-
 /** @type {AssetInfo} */
 const EMPTY_ASSET_INFO = Object.freeze({});
 
@@ -531,8 +530,9 @@ class Compilation {
 								if (
 									/** @type {ProcessedAssets} */
 									(processedAssets).has(this.assets)
-								)
+								) {
 									additionalAssetsFn(assets);
+								}
 							});
 						}
 						return {
@@ -549,8 +549,9 @@ class Compilation {
 								} catch (err) {
 									return callback(/** @type {Error} */ (err));
 								}
-								if (processedAssets !== undefined)
+								if (processedAssets !== undefined) {
 									processedAssets.add(this.assets);
+								}
 								const newAssets = popNewAssets(assets);
 								if (newAssets !== undefined) {
 									this.hooks.processAdditionalAssets.callAsync(
@@ -570,8 +571,9 @@ class Compilation {
 									if (
 										/** @type {ProcessedAssets} */
 										(processedAssets).has(this.assets)
-									)
+									) {
 										return additionalAssetsFn(assets, callback);
+									}
 									callback();
 								}
 							);
@@ -592,8 +594,9 @@ class Compilation {
 									 */
 									err => {
 										if (err) return callback(err);
-										if (processedAssets !== undefined)
+										if (processedAssets !== undefined) {
 											processedAssets.add(this.assets);
+										}
 										const newAssets = popNewAssets(assets);
 										if (newAssets !== undefined) {
 											this.hooks.processAdditionalAssets.callAsync(
@@ -613,8 +616,9 @@ class Compilation {
 								if (
 									/** @type {ProcessedAssets} */
 									(processedAssets).has(this.assets)
-								)
+								) {
 									return additionalAssetsFn(assets);
+								}
 								return Promise.resolve();
 							});
 						}
@@ -628,8 +632,9 @@ class Compilation {
 								const p = fn(assets);
 								if (!p || !p.then) return p;
 								return p.then(() => {
-									if (processedAssets !== undefined)
+									if (processedAssets !== undefined) {
 										processedAssets.add(this.assets);
+									}
 									const newAssets = popNewAssets(assets);
 									if (newAssets !== undefined) {
 										return this.hooks.processAdditionalAssets.promise(
@@ -678,7 +683,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 				{
 					name,
 					/** @type {AsyncSeriesHook<T>["intercept"]} */
-					intercept(interceptor) {
+					intercept(_interceptor) {
 						throw new Error(errorMessage("it's using 'intercept'"));
 					},
 					/** @type {AsyncSeriesHook<T>["tap"]} */
@@ -1232,7 +1237,6 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 			// properties in the prototype chain
 			/** @type {Partial<NormalizedStatsOptions>} */
 			const options = {};
-			// eslint-disable-next-line guard-for-in
 			for (const key in optionsOrPreset) {
 				options[key] = optionsOrPreset[/** @type {keyof StatsOptions} */ (key)];
 			}
@@ -1445,8 +1449,9 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 			}
 			this._modules.set(identifier, module);
 			this.modules.add(module);
-			if (this._backCompat)
+			if (this._backCompat) {
 				ModuleGraph.setModuleGraphForModule(module, this.moduleGraph);
+			}
 			if (currentProfile !== undefined) {
 				currentProfile.markIntegrationEnd();
 			}
@@ -1739,8 +1744,9 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 													inProgressTransitive = -1;
 													onTransitiveTasksFinished(err);
 												}
-												if (--inProgressTransitive === 0)
+												if (--inProgressTransitive === 0) {
 													return onTransitiveTasksFinished();
+												}
 											}
 										);
 										if (--inProgressSorting === 0) onDependenciesSorted();
@@ -1891,8 +1897,9 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 
 		this._modules.set(module.identifier(), module);
 		this.modules.add(module);
-		if (this._backCompat)
+		if (this._backCompat) {
 			ModuleGraph.setModuleGraphForModule(module, this.moduleGraph);
+		}
 
 		this._handleModuleBuildAndDependencies(
 			originModule,
@@ -2442,8 +2449,8 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 	 */
 	_rebuildModule(module, callback) {
 		this.hooks.rebuildModule.call(module);
-		const oldDependencies = module.dependencies.slice();
-		const oldBlocks = module.blocks.slice();
+		const oldDependencies = [...module.dependencies];
+		const oldBlocks = [...module.blocks];
 		module.invalidateBuild();
 		this.buildQueue.invalidate(module);
 		this.buildModule(module, err => {
@@ -2693,7 +2700,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 			}
 			if (module.blocks.length > 0) {
 				blocks = [];
-				const queue = Array.from(module.blocks);
+				const queue = [...module.blocks];
 				for (const block of queue) {
 					const chunkGroup = chunkGraph.getBlockChunkGroup(block);
 					if (chunkGroup) {
@@ -2725,7 +2732,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 				}
 			}
 			if (blocks !== undefined) {
-				const queue = Array.from(module.blocks);
+				const queue = [...module.blocks];
 				let i = 0;
 				for (const block of queue) {
 					const chunkGroup = chunkGraph.getBlockChunkGroup(block);
@@ -2783,7 +2790,9 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 		this.factorizeQueue.clear();
 		if (this.profile) {
 			this.logger.time("finish module profiles");
+
 			const ParallelismFactorCalculator = require("./util/ParallelismFactorCalculator");
+
 			const p = new ParallelismFactorCalculator();
 			const moduleGraph = this.moduleGraph;
 			/** @type {Map<Module, ModuleProfile>} */
@@ -3456,8 +3465,9 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 				}
 			}
 
-			if (this.reportDependencyErrorsAndWarnings(module, block.blocks))
+			if (this.reportDependencyErrorsAndWarnings(module, block.blocks)) {
 				hasProblems = true;
+			}
 		}
 		return hasProblems;
 	}
@@ -3842,8 +3852,9 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 	 */
 	addRuntimeModule(chunk, module, chunkGraph = this.chunkGraph) {
 		// Deprecated ModuleGraph association
-		if (this._backCompat)
+		if (this._backCompat) {
 			ModuleGraph.setModuleGraphForModule(module, this.moduleGraph);
+		}
 
 		// add it to the list
 		this.modules.add(module);
@@ -3915,7 +3926,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 			}
 		}
 		const chunkGroup = new ChunkGroup(groupOptions);
-		if (module)
+		if (module) {
 			chunkGroup.addOrigin(
 				module,
 				/** @type {DependencyLocation} */
@@ -3923,6 +3934,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 				/** @type {string} */
 				(request)
 			);
+		}
 		const chunk = this.addChunk(name);
 
 		connectChunkGroupAndChunk(chunkGroup, chunk);
@@ -3992,8 +4004,9 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 		}
 		const chunk = new Chunk(name, this._backCompat);
 		this.chunks.add(chunk);
-		if (this._backCompat)
+		if (this._backCompat) {
 			ChunkGraph.setChunkGraphForChunk(chunk, this.chunkGraph);
+		}
 		if (name) {
 			this.namedChunks.set(name, chunk);
 		}
@@ -4089,7 +4102,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 
 	/**
 	 * @param {Module} module module relationship for removal
-	 * @param {DependenciesBlockLike} block //TODO: good description
+	 * @param {DependenciesBlockLike} block dependencies block
 	 * @returns {void}
 	 */
 	removeReasonsOfDependencyBlock(module, block) {
@@ -4367,16 +4380,21 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 		/** @type {Chunk[]} */
 		const unorderedRuntimeChunks = [];
 		/** @type {Chunk[]} */
-		const otherChunks = [];
+		const initialChunks = [];
+		/** @type {Chunk[]} */
+		const asyncChunks = [];
 		for (const c of this.chunks) {
 			if (c.hasRuntime()) {
 				unorderedRuntimeChunks.push(c);
+			} else if (c.canBeInitial()) {
+				initialChunks.push(c);
 			} else {
-				otherChunks.push(c);
+				asyncChunks.push(c);
 			}
 		}
 		unorderedRuntimeChunks.sort(byId);
-		otherChunks.sort(byId);
+		initialChunks.sort(byId);
+		asyncChunks.sort(byId);
 
 		/** @typedef {{ chunk: Chunk, referencedBy: RuntimeChunkInfo[], remaining: number }} RuntimeChunkInfo */
 		/** @type {Map<Chunk, RuntimeChunkInfo>} */
@@ -4391,7 +4409,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 		let remaining = 0;
 		for (const info of runtimeChunksMap.values()) {
 			for (const other of new Set(
-				Array.from(info.chunk.getAllReferencedAsyncEntrypoints()).map(
+				[...info.chunk.getAllReferencedAsyncEntrypoints()].map(
 					e => e.chunks[e.chunks.length - 1]
 				)
 			)) {
@@ -4542,8 +4560,9 @@ This prevents using hashes of each other and should be avoided.`);
 			}
 			this.logger.timeAggregate("hashing: hash chunks");
 		};
-		for (const chunk of otherChunks) processChunk(chunk);
+		for (const chunk of asyncChunks) processChunk(chunk);
 		for (const chunk of runtimeChunks) processChunk(chunk);
+		for (const chunk of initialChunks) processChunk(chunk);
 		if (errors.length > 0) {
 			errors.sort(compareSelect(err => err.module, compareModulesByIdentifier));
 			for (const error of errors) {
@@ -4767,7 +4786,9 @@ This prevents using hashes of each other and should be avoided.`);
 						newEntry = entry.map(x => (x === file ? newFile : x));
 					} else if (entry === file) {
 						newEntry = newFile;
-					} else continue;
+					} else {
+						continue;
+					}
 					this.assetsInfo.set(name, {
 						...info,
 						related: {
@@ -5258,7 +5279,7 @@ This prevents using hashes of each other and should be avoided.`);
 						runtimeTemplate,
 						errors,
 						codeGenerationResults,
-						(err, codeGenerated) => {
+						(err, _codeGenerated) => {
 							callback(err);
 						}
 					);
@@ -5495,6 +5516,7 @@ This prevents using hashes of each other and should be avoided.`);
 											(moduleArgumentsMap.get(runtimeModule))
 										);
 									}
+
 									exports = __webpack_require__(module.identifier());
 								} catch (execErr) {
 									const { message, stack, module } =
@@ -5594,7 +5616,7 @@ Compilation.prototype.factorizeModule = /**
 	(options: FactorizeModuleOptions & { factoryResult?: false }, callback: ModuleCallback): void;
 	(options: FactorizeModuleOptions & { factoryResult: true }, callback: ModuleFactoryResultCallback): void;
 }} */ (
-	function (options, callback) {
+	function factorizeModule(options, callback) {
 		this.factorizeQueue.add(options, /** @type {TODO} */ (callback));
 	}
 );
@@ -5624,7 +5646,7 @@ Object.defineProperty(compilationPrototype, "cache", {
 		 * @this {Compilation} the compilation
 		 * @returns {Cache} the cache
 		 */
-		function () {
+		function cache() {
 			return this.compiler.cache;
 		},
 		"Compilation.cache was removed in favor of Compilation.getCache()",
@@ -5632,9 +5654,9 @@ Object.defineProperty(compilationPrototype, "cache", {
 	),
 	set: util.deprecate(
 		/**
-		 * @param {EXPECTED_ANY} v value
+		 * @param {EXPECTED_ANY} _v value
 		 */
-		v => {},
+		_v => {},
 		"Compilation.cache was removed in favor of Compilation.getCache()",
 		"DEP_WEBPACK_COMPILATION_CACHE"
 	)

package/lib/Compiler.js

@@ -8,13 +8,12 @@
 const parseJson = require("json-parse-even-better-errors");
 const asyncLib = require("neo-async");
 const {
-	SyncHook,
-	SyncBailHook,
 	AsyncParallelHook,
-	AsyncSeriesHook
+	AsyncSeriesHook,
+	SyncBailHook,
+	SyncHook
 } = require("tapable");
 const { SizeOnlySource } = require("webpack-sources");
-const webpack = require(".");
 const Cache = require("./Cache");
 const CacheFacade = require("./CacheFacade");
 const ChunkGraph = require("./ChunkGraph");
@@ -29,9 +28,10 @@ const Stats = require("./Stats");
 const Watching = require("./Watching");
 const WebpackError = require("./WebpackError");
 const { Logger } = require("./logging/Logger");
-const { join, dirname, mkdirp } = require("./util/fs");
+const { dirname, join, mkdirp } = require("./util/fs");
 const { makePathsRelative } = require("./util/identifier");
 const { isSourceEqual } = require("./util/source");
+const webpack = require(".");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/WebpackOptions").EntryNormalized} Entry */
@@ -42,10 +42,19 @@ const { isSourceEqual } = require("./util/source");
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
 /** @typedef {import("./Dependency")} Dependency */
+/** @typedef {import("./HotModuleReplacementPlugin").ChunkHashes} ChunkHashes */
+/** @typedef {import("./HotModuleReplacementPlugin").ChunkModuleHashes} ChunkModuleHashes */
+/** @typedef {import("./HotModuleReplacementPlugin").ChunkModuleIds} ChunkModuleIds */
+/** @typedef {import("./HotModuleReplacementPlugin").ChunkRuntime} ChunkRuntime */
+/** @typedef {import("./HotModuleReplacementPlugin").FullHashChunkModuleHashes} FullHashChunkModuleHashes */
+/** @typedef {import("./HotModuleReplacementPlugin").HotIndex} HotIndex */
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./Module").BuildInfo} BuildInfo */
+/** @typedef {import("./RecordIdsPlugin").RecordsChunks} RecordsChunks */
+/** @typedef {import("./RecordIdsPlugin").RecordsModules} RecordsModules */
 /** @typedef {import("./config/target").PlatformTargetProperties} PlatformTargetProperties */
 /** @typedef {import("./logging/createConsoleLogger").LoggingFunction} LoggingFunction */
+/** @typedef {import("./optimize/AggressiveSplittingPlugin").SplitData} SplitData */
 /** @typedef {import("./util/fs").IStats} IStats */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("./util/fs").IntermediateFileSystem} IntermediateFileSystem */
@@ -80,6 +89,22 @@ const { isSourceEqual } = require("./util/source");
  * @param {Compilation=} compilation
  */
 
+/**
+ * @typedef {object} KnownRecords
+ * @property {SplitData[]=} aggressiveSplits
+ * @property {RecordsChunks=} chunks
+ * @property {RecordsModules=} modules
+ * @property {string=} hash
+ * @property {HotIndex=} hotIndex
+ * @property {FullHashChunkModuleHashes=} fullHashChunkModuleHashes
+ * @property {ChunkModuleHashes=} chunkModuleHashes
+ * @property {ChunkHashes=} chunkHashes
+ * @property {ChunkRuntime=} chunkRuntime
+ * @property {ChunkModuleIds=} chunkModuleIds
+ */
+
+/** @typedef {KnownRecords & Record<string, KnownRecords[]> & Record<string, EXPECTED_ANY>} Records */
+
 /**
  * @typedef {object} AssetEmittedInfo
  * @property {Buffer} content
@@ -238,11 +263,11 @@ class Compiler {
 		/** @type {WatchFileSystem | null} */
 		this.watchFileSystem = null;
 
-		/** @type {string|null} */
+		/** @type {string | null} */
 		this.recordsInputPath = null;
-		/** @type {string|null} */
+		/** @type {string | null} */
 		this.recordsOutputPath = null;
-		/** @type {Record<string, TODO>} */
+		/** @type {Records} */
 		this.records = {};
 		/** @type {Set<string | RegExp>} */
 		this.managedPaths = new Set();
@@ -1075,8 +1100,10 @@ ${other}`);
 		};
 
 		const recordsOutputPathDirectory = dirname(
-			/** @type {OutputFileSystem} */ (this.outputFileSystem),
-			/** @type {string} */ (this.recordsOutputPath)
+			/** @type {OutputFileSystem} */
+			(this.outputFileSystem),
+			/** @type {string} */
+			(this.recordsOutputPath)
 		);
 		if (!recordsOutputPathDirectory) {
 			return writeFile();
@@ -1140,7 +1167,7 @@ ${other}`);
 
 					try {
 						this.records = parseJson(
-							/** @type {Buffer} */ (content).toString("utf-8")
+							/** @type {Buffer} */ (content).toString("utf8")
 						);
 					} catch (parseErr) {
 						return callback(
@@ -1201,7 +1228,9 @@ ${other}`);
 			this.records[relativeCompilerName] = [];
 		}
 		if (this.records[relativeCompilerName][compilerIndex]) {
-			childCompiler.records = this.records[relativeCompilerName][compilerIndex];
+			childCompiler.records =
+				/** @type {Records} */
+				(this.records[relativeCompilerName][compilerIndex]);
 		} else {
 			this.records[relativeCompilerName].push((childCompiler.records = {}));
 		}
@@ -1231,11 +1260,12 @@ ${other}`);
 				childCompiler.hooks[
 					/** @type {keyof Compiler["hooks"]} */
 					(name)
-				].taps =
-					this.hooks[
+				].taps = [
+					...this.hooks[
 						/** @type {keyof Compiler["hooks"]} */
 						(name)
-					].taps.slice();
+					].taps
+				];
 			}
 		}
 
@@ -1361,7 +1391,7 @@ ${other}`);
 	close(callback) {
 		if (this.watching) {
 			// When there is still an active watching, close this first
-			this.watching.close(err => {
+			this.watching.close(_err => {
 				this.close(callback);
 			});
 			return;

package/lib/ConcatenationScope.js

@@ -15,13 +15,14 @@ const {
 /** @typedef {import("./optimize/ConcatenatedModule").ModuleInfo} ModuleInfo */
 
 const MODULE_REFERENCE_REGEXP =
-	/^__WEBPACK_MODULE_REFERENCE__(\d+)_([\da-f]+|ns)(_call)?(_directImport)?(?:_asiSafe(\d))?__$/;
+	/^__WEBPACK_MODULE_REFERENCE__(\d+)_([\da-f]+|ns)(_call)?(_directImport)?(_deferredImport)?(?:_asiSafe(\d))?__$/;
 
 /**
  * @typedef {object} ModuleReferenceOptions
  * @property {string[]} ids the properties/exports of the module
  * @property {boolean} call true, when this referenced export is called
  * @property {boolean} directImport true, when this referenced export is directly imported (not via property access)
+ * @property {boolean} deferredImport true, when this referenced export is deferred
  * @property {boolean | undefined} asiSafe if the position is ASI safe or unknown
  */
 
@@ -90,21 +91,28 @@ class ConcatenationScope {
 	 */
 	createModuleReference(
 		module,
-		{ ids = undefined, call = false, directImport = false, asiSafe = false }
+		{
+			ids = undefined,
+			call = false,
+			directImport = false,
+			deferredImport = false,
+			asiSafe = false
+		}
 	) {
 		const info = /** @type {ModuleInfo} */ (this._modulesMap.get(module));
 		const callFlag = call ? "_call" : "";
 		const directImportFlag = directImport ? "_directImport" : "";
+		const deferredImportFlag = deferredImport ? "_deferredImport" : "";
 		const asiSafeFlag = asiSafe
 			? "_asiSafe1"
 			: asiSafe === false
 				? "_asiSafe0"
 				: "";
 		const exportData = ids
-			? Buffer.from(JSON.stringify(ids), "utf-8").toString("hex")
+			? Buffer.from(JSON.stringify(ids), "utf8").toString("hex")
 			: "ns";
 		// a "._" is appended to allow "delete ...", which would cause a SyntaxError in strict mode
-		return `__WEBPACK_MODULE_REFERENCE__${info.index}_${exportData}${callFlag}${directImportFlag}${asiSafeFlag}__._`;
+		return `__WEBPACK_MODULE_REFERENCE__${info.index}_${exportData}${callFlag}${directImportFlag}${deferredImportFlag}${asiSafeFlag}__._`;
 	}
 
 	/**
@@ -123,15 +131,16 @@ class ConcatenationScope {
 		const match = MODULE_REFERENCE_REGEXP.exec(name);
 		if (!match) return null;
 		const index = Number(match[1]);
-		const asiSafe = match[5];
+		const asiSafe = match[6];
 		return {
 			index,
 			ids:
 				match[2] === "ns"
 					? []
-					: JSON.parse(Buffer.from(match[2], "hex").toString("utf-8")),
+					: JSON.parse(Buffer.from(match[2], "hex").toString("utf8")),
 			call: Boolean(match[3]),
 			directImport: Boolean(match[4]),
+			deferredImport: Boolean(match[5]),
 			asiSafe: asiSafe ? asiSafe === "1" : undefined
 		};
 	}

package/lib/ConstPlugin.js

@@ -68,6 +68,7 @@ const collectDeclaration = (declarations, pattern) => {
  * @returns {Array<string>} hoisted declarations
  */
 const getHoistedDeclarations = (branch, includeFunctionDeclarations) => {
+	/** @type {Set<string>} */
 	const declarations = new Set();
 	/** @type {Array<Statement | null | undefined>} */
 	const stack = [branch];
@@ -129,7 +130,7 @@ const getHoistedDeclarations = (branch, includeFunctionDeclarations) => {
 				break;
 		}
 	}
-	return Array.from(declarations);
+	return [...declarations];
 };
 
 const PLUGIN_NAME = "ConstPlugin";
@@ -159,7 +160,7 @@ class ConstPlugin {
 				 * @param {JavascriptParser} parser the parser
 				 */
 				const handler = parser => {
-					parser.hooks.terminate.tap(PLUGIN_NAME, statement => true);
+					parser.hooks.terminate.tap(PLUGIN_NAME, _statement => true);
 					parser.hooks.statementIf.tap(PLUGIN_NAME, statement => {
 						if (parser.scope.isAsmJs) return;
 						const param = parser.evaluateExpression(statement.test);
@@ -189,8 +190,9 @@ class ConstPlugin {
 							parser.scope.isAsmJs ||
 							// Check top level scope here again
 							parser.scope.topLevelScope === true
-						)
+						) {
 							return;
+						}
 						this.eliminateUnusedStatement(parser, statement);
 						return true;
 					});

package/lib/ContextModule.js

@@ -16,15 +16,15 @@ const Template = require("./Template");
 const WebpackError = require("./WebpackError");
 const {
 	compareLocations,
-	concatComparators,
+	compareModulesById,
 	compareSelect,
-	keepOriginalOrder,
-	compareModulesById
+	concatComparators,
+	keepOriginalOrder
 } = require("./util/comparators");
 const {
 	contextify,
-	parseResource,
-	makePathsRelative
+	makePathsRelative,
+	parseResource
 } = require("./util/identifier");
 const makeSerializable = require("./util/makeSerializable");
 
@@ -412,8 +412,9 @@ class ContextModule extends Module {
 		const buildInfo = /** @type {BuildInfo} */ (this.buildInfo);
 
 		// always build when we have no snapshot and context
-		if (!buildInfo.snapshot)
+		if (!buildInfo.snapshot) {
 			return callback(null, Boolean(this.context || this.options.resource));
+		}
 
 		fileSystemInfo.checkSnapshotValid(buildInfo.snapshot, (err, valid) => {
 			callback(err, !valid);
@@ -996,10 +997,11 @@ module.exports = webpackAsyncContext;`;
 				if (hasFakeMap) {
 					arrayStart.push(fakeMap[moduleId]);
 				}
-				map[item.userRequest] = arrayStart.concat(
-					/** @type {Chunk[]} */
+				map[item.userRequest] = [
+					...arrayStart,
+					.../** @type {Chunk[]} */
 					(item.chunks).map(chunk => /** @type {ChunkId} */ (chunk.id))
-				);
+				];
 			}
 		}
 
@@ -1186,11 +1188,13 @@ module.exports = webpackEmptyAsyncContext;`;
 		const set = new Set();
 		const allDeps =
 			this.dependencies.length > 0
-				? /** @type {ContextElementDependency[]} */ (this.dependencies).slice()
+				? /** @type {ContextElementDependency[]} */ [...this.dependencies]
 				: [];
-		for (const block of this.blocks)
-			for (const dep of block.dependencies)
+		for (const block of this.blocks) {
+			for (const dep of block.dependencies) {
 				allDeps.push(/** @type {ContextElementDependency} */ (dep));
+			}
+		}
 		set.add(RuntimeGlobals.module);
 		set.add(RuntimeGlobals.hasOwnProperty);
 		if (allDeps.length > 0) {