webpack 5.108.3 → 5.109.0

package/lib/HotModuleReplacementPlugin.js

@@ -22,6 +22,7 @@ const { chunkHasCss } = require("./css/CssModulesPlugin");
 const ConstDependency = require("./dependencies/ConstDependency");
 const ImportMetaHotAcceptDependency = require("./dependencies/ImportMetaHotAcceptDependency");
 const ImportMetaHotDeclineDependency = require("./dependencies/ImportMetaHotDeclineDependency");
+const { isImportMetaFieldEnabled } = require("./dependencies/ImportMetaPlugin");
 const ModuleHotAcceptDependency = require("./dependencies/ModuleHotAcceptDependency");
 const ModuleHotDeclineDependency = require("./dependencies/ModuleHotDeclineDependency");
 const WebpackError = require("./errors/WebpackError");
@@ -141,7 +142,7 @@ class HotModuleReplacementPlugin {
 					/** @type {Range} */ (expr.callee.range),
 					runtimeRequirements
 				);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.loc = parser.getLocation(expr);
 				module.addPresentationalDependency(dep);
 				/** @type {BuildInfo} */
 				(module.buildInfo).moduleConcatenationBailout =
@@ -168,10 +169,7 @@ class HotModuleReplacementPlugin {
 								/** @type {Range} */ (param.range)
 							);
 							dep.optional = true;
-							dep.setLocWithIndex(
-								/** @type {DependencyLocation} */ (expr.loc),
-								idx
-							);
+							dep.setLocWithIndex(parser.getLocation(expr), idx);
 							module.addDependency(dep);
 							requests.push(request);
 						}
@@ -204,7 +202,7 @@ class HotModuleReplacementPlugin {
 				/** @type {Range} */ (expr.callee.range),
 				runtimeRequirements
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			module.addPresentationalDependency(dep);
 			/** @type {BuildInfo} */
 			(module.buildInfo).moduleConcatenationBailout = "Hot Module Replacement";
@@ -225,10 +223,7 @@ class HotModuleReplacementPlugin {
 						/** @type {Range} */ (param.range)
 					);
 					dep.optional = true;
-					dep.setLocWithIndex(
-						/** @type {DependencyLocation} */ (expr.loc),
-						idx
-					);
+					dep.setLocWithIndex(parser.getLocation(expr), idx);
 					module.addDependency(dep);
 				}
 			}
@@ -247,7 +242,7 @@ class HotModuleReplacementPlugin {
 				/** @type {Range} */ (expr.range),
 				runtimeRequirements
 			);
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			module.addPresentationalDependency(dep);
 			/** @type {BuildInfo} */
 			(module.buildInfo).moduleConcatenationBailout = "Hot Module Replacement";
@@ -960,9 +955,13 @@ To fix this, make sure to include [runtime] in the output.hotUpdateMainFilename
 
 				normalModuleFactory.hooks.parser
 					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
-					.tap(PLUGIN_NAME, (parser) => {
+					.tap(PLUGIN_NAME, (parser, parserOptions) => {
 						applyModuleHot(parser);
-						applyImportMetaHot(parser);
+						if (
+							isImportMetaFieldEnabled(parserOptions.importMeta, "webpackHot")
+						) {
+							applyImportMetaHot(parser);
+						}
 					});
 				normalModuleFactory.hooks.parser
 					.for(JAVASCRIPT_MODULE_TYPE_DYNAMIC)
@@ -971,8 +970,12 @@ To fix this, make sure to include [runtime] in the output.hotUpdateMainFilename
 					});
 				normalModuleFactory.hooks.parser
 					.for(JAVASCRIPT_MODULE_TYPE_ESM)
-					.tap(PLUGIN_NAME, (parser) => {
-						applyImportMetaHot(parser);
+					.tap(PLUGIN_NAME, (parser, parserOptions) => {
+						if (
+							isImportMetaFieldEnabled(parserOptions.importMeta, "webpackHot")
+						) {
+							applyImportMetaHot(parser);
+						}
 					});
 				normalModuleFactory.hooks.module.tap(PLUGIN_NAME, (module) => {
 					if (module instanceof NormalModule) module.hot = true;

package/lib/LazyBarrel.js

@@ -68,7 +68,7 @@ class LazyBarrelInfo {
 		this._requestToDepGroup = new Map();
 		/** @type {Set<string> | undefined} locally provided export names */
 		this._terminalIds = undefined;
-		/** @type {Set<string> | undefined} request keys of star re-exports */
+		/** @type {Set<string> | undefined} requests of star re-exports */
 		this._fallbackRequests = undefined;
 	}
 
@@ -125,6 +125,14 @@ class LazyBarrelInfo {
 		return this._requestToDepGroup.size === 0;
 	}
 
+	/**
+	 * Returns the requests of the still-lazy groups.
+	 * @returns {Iterable<string>} still-lazy requests
+	 */
+	getLazyRequests() {
+		return this._requestToDepGroup.keys();
+	}
+
 	/**
 	 * Drops the export-name lookups once no group stays deferred; they only serve
 	 * to find still-deferred groups, so keeping them per module wastes memory.
@@ -202,13 +210,32 @@ class LazyBarrelController {
 	}
 
 	/**
-	 * Releases all per-module deferral state. Lazy barrel only acts while the
-	 * module graph is built, so the bookkeeping is dead weight once make is done.
+	 * Releases all per-module deferral state. The last consumer is
+	 * `FlagDependencyExportsPlugin`'s cache key during `finishModules`, so the
+	 * bookkeeping is dead weight once sealing starts.
 	 */
 	clear() {
 		this._modules = new WeakMap();
 	}
 
+	/**
+	 * requests of the re-export targets `module` still keeps lazy.
+	 * `FlagDependencyExportsPlugin` folds them into its provided-exports cache
+	 * key, so a barrel whose built targets differ from a cached run does not
+	 * reuse that run's stale exports.
+	 * @param {Module} module the module
+	 * @returns {Iterable<string> | undefined} still-lazy requests, if any
+	 */
+	getLazyRequests(module) {
+		const factoryMeta = module.factoryMeta;
+		if (factoryMeta === undefined || !factoryMeta.sideEffectFree) return;
+		const state = this._modules.get(module);
+		if (state === undefined) return;
+		const info = state.lazyBarrelInfo;
+		if (info === undefined || info.isEmpty()) return;
+		return info.getLazyRequests();
+	}
+
 	/**
 	 * Classifies the re-export dependencies of a side-effect-free module (lazy barrel)
 	 * into deferrable groups and marks the deferred ones.

package/lib/Module.js

@@ -106,6 +106,7 @@ const makeSerializable = require("./util/makeSerializable");
  * @typedef {object} ConcatenationBailoutReasonContext
  * @property {ModuleGraph} moduleGraph the module graph
  * @property {ChunkGraph} chunkGraph the chunk graph
+ * @property {boolean=} concatenateCommonJsModules whether eligible CommonJS modules may be concatenated
  */
 
 /** @typedef {Set<string>} RuntimeRequirements */
@@ -179,6 +180,7 @@ const makeSerializable = require("./util/makeSerializable");
  * Module type specific properties live in the `Known*BuildInfo` typedef of the dedicated module class.
  * @typedef {object} KnownBuildInfo
  * @property {boolean=} cacheable
+ * @property {string[]=} notCacheableReasons reasons why the module is not cacheable (e.g. paths of loaders that marked it)
  * @property {boolean=} strict
  * @property {string=} moduleArgument
  * @property {string=} exportsArgument
@@ -186,6 +188,7 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {Map<string, AssetInfo | undefined>=} assetsInfo
  * @property {Set<string>=} topLevelDeclarations top level declaration names
  * @property {boolean=} isCircular true when the module is part of a circular dependency chain
+ * @property {boolean=} usesTopLevelAwaitForOf module uses top-level `for await…of`, which can't be lowered to a generator
  */
 
 /** @typedef {string | Set<string>} ValueCacheVersion */

package/lib/ModuleFilenameHelpers.js

@@ -327,9 +327,9 @@ ModuleFilenameHelpers.replaceDuplicates = (array, fn, comparator) => {
  * ```js
  * ModuleFilenameHelpers.matchPart("foo.js", "foo"); // true
  * ModuleFilenameHelpers.matchPart("foo.js", "foo.js"); // true
- * ModuleFilenameHelpers.matchPart("foo.js", "foo."); // false
+ * ModuleFilenameHelpers.matchPart("foo.js", "foo."); // true
  * ModuleFilenameHelpers.matchPart("foo.js", "foo*"); // false
- * ModuleFilenameHelpers.matchPart("foo.js", "foo.*"); // true
+ * ModuleFilenameHelpers.matchPart("foo.js", "foo.*"); // false
  * ModuleFilenameHelpers.matchPart("foo.js", /^foo/); // true
  * ModuleFilenameHelpers.matchPart("foo.js", [/^foo/, "bar"]); // true
  * ModuleFilenameHelpers.matchPart("foo.js", [/^foo/, "bar"]); // true

package/lib/ModuleTypeConstants.js

@@ -108,6 +108,12 @@ const ASSET_MODULE_TYPE_BYTES = "asset/bytes";
  */
 const ASSET_MODULE_TYPE_RAW_DATA_URL = "asset/raw-data-url";
 
+/**
+ * @type {Readonly<"asset/webmanifest">}
+ * This is the module type used for a Web App Manifest whose icon URLs are bundled as assets.
+ */
+const ASSET_MODULE_TYPE_WEBMANIFEST = "asset/webmanifest";
+
 /**
  * @type {Readonly<"runtime">}
  * This is the module type used for the webpack runtime abstractions.
@@ -149,7 +155,7 @@ const WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY = "lazy-compilation-proxy";
 /** @typedef {"webassembly/async" | "webassembly/sync"} WebAssemblyModuleTypes */
 /** @typedef {"css" | "css/global" | "css/module" | "css/auto"} CssModuleTypes */
 /** @typedef {"html"} HTMLModuleType */
-/** @typedef {"asset" | "asset/inline" | "asset/resource" | "asset/source" | "asset/raw-data-url"} AssetModuleTypes */
+/** @typedef {"asset" | "asset/inline" | "asset/resource" | "asset/source" | "asset/raw-data-url" | "asset/webmanifest"} AssetModuleTypes */
 /** @typedef {"runtime" | "fallback-module" | "remote-module" | "provide-module" | "consume-shared-module" | "lazy-compilation-proxy"} WebpackModuleTypes */
 /** @typedef {string} UnknownModuleTypes */
 /** @typedef {JavaScriptModuleTypes | JSONModuleType | WebAssemblyModuleTypes | CssModuleTypes | HTMLModuleType | AssetModuleTypes | WebpackModuleTypes | UnknownModuleTypes} ModuleTypes */
@@ -160,6 +166,7 @@ module.exports.ASSET_MODULE_TYPE_INLINE = ASSET_MODULE_TYPE_INLINE;
 module.exports.ASSET_MODULE_TYPE_RAW_DATA_URL = ASSET_MODULE_TYPE_RAW_DATA_URL;
 module.exports.ASSET_MODULE_TYPE_RESOURCE = ASSET_MODULE_TYPE_RESOURCE;
 module.exports.ASSET_MODULE_TYPE_SOURCE = ASSET_MODULE_TYPE_SOURCE;
+module.exports.ASSET_MODULE_TYPE_WEBMANIFEST = ASSET_MODULE_TYPE_WEBMANIFEST;
 /** @type {CssModuleTypes[]} */
 module.exports.CSS_MODULES = [
 	CSS_MODULE_TYPE,

package/lib/MultiCompiler.js

@@ -102,6 +102,8 @@ module.exports = class MultiCompiler {
 		this.dependencies = new WeakMap();
 		/** @type {boolean} */
 		this.running = false;
+		/** @type {MultiWatching | undefined} */
+		this.watching = undefined;
 
 		/** @type {(Stats | null)[]} */
 		const compilerStats = this.compilers.map(() => null);
@@ -662,10 +664,12 @@ module.exports = class MultiCompiler {
 				},
 				handler
 			);
-			return new MultiWatching(watchings, this);
+			this.watching = new MultiWatching(watchings, this);
+			return this.watching;
 		}
 
-		return new MultiWatching([], this);
+		this.watching = new MultiWatching([], this);
+		return this.watching;
 	}
 
 	/**
@@ -709,6 +713,13 @@ module.exports = class MultiCompiler {
 	 * @returns {void}
 	 */
 	close(callback) {
+		if (this.watching) {
+			// When there is still an active watching, close this first
+			this.watching.close((_err) => {
+				this.close(callback);
+			});
+			return;
+		}
 		asyncLib.each(
 			this.compilers,
 			(compiler, callback) => {

package/lib/MultiWatching.js

@@ -69,6 +69,7 @@ class MultiWatching {
 				watching.close(finishedCallback);
 			},
 			(err) => {
+				if (this.compiler.watching === this) this.compiler.watching = undefined;
 				this.compiler.hooks.watchClose.call();
 				if (typeof callback === "function") {
 					this.compiler.running = false;

package/lib/NodeStuffPlugin.js

@@ -34,7 +34,8 @@ const { parseResource } = require("./util/identifier");
 const PLUGIN_NAME = "NodeStuffPlugin";
 const URL_MODULE_CONSTANT_FUNCTION_NAME = "__webpack_fileURLToPath__";
 
-const { IMPORT_META_DIRNAME, IMPORT_META_FILENAME } = ImportMetaPlugin;
+const { IMPORT_META_DIRNAME, IMPORT_META_FILENAME, isImportMetaFieldEnabled } =
+	ImportMetaPlugin;
 
 class NodeStuffPlugin {
 	/**
@@ -97,7 +98,7 @@ class NodeStuffPlugin {
 
 					parser.hooks.expression.for("global").tap(PLUGIN_NAME, (expr) => {
 						const dep = getGlobalDep(expr);
-						dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+						dep.loc = parser.getLocation(expr);
 						parser.state.module.addPresentationalDependency(dep);
 
 						if (withWarning) {
@@ -113,7 +114,7 @@ class NodeStuffPlugin {
 
 					parser.hooks.rename.for("global").tap(PLUGIN_NAME, (expr) => {
 						const dep = getGlobalDep(expr);
-						dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+						dep.loc = parser.getLocation(expr);
 						parser.state.module.addPresentationalDependency(dep);
 						return false;
 					});
@@ -138,7 +139,7 @@ class NodeStuffPlugin {
 								/** @type {Range} */
 								(expr.range)
 							);
-							dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+							dep.loc = parser.getLocation(expr);
 							parser.state.module.addPresentationalDependency(dep);
 							return true;
 						});
@@ -180,7 +181,7 @@ class NodeStuffPlugin {
 								(expr.range),
 								`__webpack_${property}__`
 							);
-							dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+							dep.loc = parser.getLocation(expr);
 							parser.state.module.addPresentationalDependency(dep);
 
 							if (warning) {
@@ -201,7 +202,7 @@ class NodeStuffPlugin {
 								if (warning) {
 									parser.state.module.addWarning(
 										new NodeStuffInWebError(
-											usingProperty.loc,
+											parser.getLocation(usingProperty),
 											expressionName,
 											warning
 										)
@@ -278,7 +279,7 @@ class NodeStuffPlugin {
 									CachedConstDependency.PLACE_CHUNK
 								);
 
-								dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+								dep.loc = parser.getLocation(expr);
 								parser.state.module.addPresentationalDependency(dep);
 								return;
 							}
@@ -297,7 +298,7 @@ class NodeStuffPlugin {
 								`__webpack_${property}__`,
 								ExternalModuleDependency.PLACE_CHUNK
 							);
-							dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+							dep.loc = parser.getLocation(expr);
 							parser.state.module.addPresentationalDependency(dep);
 
 							return true;
@@ -324,9 +325,7 @@ class NodeStuffPlugin {
 										`__webpack_${property}__`,
 										CachedConstDependency.PLACE_CHUNK
 									);
-									dep.loc = /** @type {DependencyLocation} */ (
-										usingProperty.loc
-									);
+									dep.loc = parser.getLocation(usingProperty);
 									parser.state.module.addPresentationalDependency(dep);
 									return `${property}: __webpack_${property}__,`;
 								}
@@ -346,7 +345,7 @@ class NodeStuffPlugin {
 									ExternalModuleDependency.PLACE_CHUNK
 								);
 
-								dep.loc = /** @type {DependencyLocation} */ (usingProperty.loc);
+								dep.loc = parser.getLocation(usingProperty);
 								parser.state.module.addPresentationalDependency(dep);
 
 								return `${property}: __webpack_${property}__,`;
@@ -359,23 +358,24 @@ class NodeStuffPlugin {
 				 * Dirname and filename handler.
 				 * @param {JavascriptParser} parser the parser
 				 * @param {NodeOptions} nodeOptions options
-				 * @param {{ dirname: "__dirname" | "import.meta.dirname", filename: "__filename" | "import.meta.filename" }} identifiers options
+				 * @param {{ dirname: "__dirname" | "import.meta.dirname", filename: "__filename" | "import.meta.filename", dirnameEnabled?: boolean, filenameEnabled?: boolean }} identifiers options
 				 * @returns {void}
 				 */
 				const dirnameAndFilenameHandler = (
 					parser,
 					nodeOptions,
-					{ dirname, filename }
+					{ dirname, filename, dirnameEnabled = true, filenameEnabled = true }
 				) => {
-					// Keep `import.meta.filename` in code
+					// Keep `import.meta.filename` in code.
 					if (
+						filenameEnabled &&
 						nodeOptions.__filename === false &&
 						filename === IMPORT_META_FILENAME
 					) {
 						setModuleConstant(parser, filename, () => filename, "filename");
 					}
 
-					if (nodeOptions.__filename) {
+					if (filenameEnabled && nodeOptions.__filename) {
 						switch (nodeOptions.__filename) {
 							case "mock":
 								setConstant(parser, filename, "/index.js", "filename");
@@ -446,15 +446,16 @@ class NodeStuffPlugin {
 							});
 					}
 
-					// Keep `import.meta.dirname` in code
+					// Keep `import.meta.dirname` in code.
 					if (
+						dirnameEnabled &&
 						nodeOptions.__dirname === false &&
 						dirname === IMPORT_META_DIRNAME
 					) {
 						setModuleConstant(parser, dirname, () => dirname, "dirname");
 					}
 
-					if (nodeOptions.__dirname) {
+					if (dirnameEnabled && nodeOptions.__dirname) {
 						switch (nodeOptions.__dirname) {
 							case "mock":
 								setConstant(parser, dirname, "/", "dirname");
@@ -537,19 +538,24 @@ class NodeStuffPlugin {
 				 */
 				const handler = (parser, parserOptions, a, b) => {
 					if (b && parserOptions.node === false) {
-						// Keep `import.meta.dirname` and `import.meta.filename` in code
-						setModuleConstant(
-							parser,
-							IMPORT_META_DIRNAME,
-							() => IMPORT_META_DIRNAME,
-							"dirname"
-						);
-						setModuleConstant(
-							parser,
-							IMPORT_META_FILENAME,
-							() => IMPORT_META_FILENAME,
-							"filename"
-						);
+						if (isImportMetaFieldEnabled(parserOptions.importMeta, "dirname")) {
+							setModuleConstant(
+								parser,
+								IMPORT_META_DIRNAME,
+								() => IMPORT_META_DIRNAME,
+								"dirname"
+							);
+						}
+						if (
+							isImportMetaFieldEnabled(parserOptions.importMeta, "filename")
+						) {
+							setModuleConstant(
+								parser,
+								IMPORT_META_FILENAME,
+								() => IMPORT_META_FILENAME,
+								"filename"
+							);
+						}
 						return;
 					}
 
@@ -570,10 +576,22 @@ class NodeStuffPlugin {
 						});
 					}
 
-					if (b && parserOptions.importMeta !== false) {
+					if (
+						b &&
+						(isImportMetaFieldEnabled(parserOptions.importMeta, "dirname") ||
+							isImportMetaFieldEnabled(parserOptions.importMeta, "filename"))
+					) {
 						dirnameAndFilenameHandler(parser, localOptions, {
 							dirname: IMPORT_META_DIRNAME,
-							filename: IMPORT_META_FILENAME
+							filename: IMPORT_META_FILENAME,
+							dirnameEnabled: isImportMetaFieldEnabled(
+								parserOptions.importMeta,
+								"dirname"
+							),
+							filenameEnabled: isImportMetaFieldEnabled(
+								parserOptions.importMeta,
+								"filename"
+							)
 						});
 					}
 				};