webpack 5.108.4 → 5.109.0

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"
+							)
 						});
 					}
 				};