fix: logic for eval-only

alexander-akait · alexander-akait · commit 6d02aea1aaad · 2025-10-28T16:30:48.000+03:00
diff --git a/lib/NodeStuffPlugin.js b/lib/NodeStuffPlugin.js
@@ -267,7 +267,19 @@ class NodeStuffPlugin {
 								break;
 							}
 							case "eval-only":
-								if (filename === "import.meta.filename") {
+								// Keep `import.meta.filename` in the source code for the ES module output
+								if (compilation.outputOptions.module) {
+									const { importMetaName } = compilation.outputOptions;
+
+									parser.hooks.expression
+										.for(filename)
+										.tap(
+											PLUGIN_NAME,
+											toConstantDependency(parser, `${importMetaName}.filename`)
+										);
+								}
+								// Replace `import.meta.filename` with `__filename` for the non-ES module output
+								else if (filename === "import.meta.filename") {
 									parser.hooks.expression
 										.for(filename)
 										.tap(
@@ -334,7 +346,19 @@ class NodeStuffPlugin {
 								break;
 							}
 							case "eval-only":
-								if (dirname === "import.meta.dirname") {
+								// Keep `import.meta.dirname` in the source code for the ES module output and replace `__dirname` on `import.meta.dirname`
+								if (compilation.outputOptions.module) {
+									const { importMetaName } = compilation.outputOptions;
+
+									parser.hooks.expression
+										.for(dirname)
+										.tap(
+											PLUGIN_NAME,
+											toConstantDependency(parser, `${importMetaName}.dirname`)
+										);
+								}
+								// Replace `import.meta.dirname` with `__dirname` for the non-ES module output
+								else if (dirname === "import.meta.dirname") {
 									parser.hooks.expression
 										.for(dirname)
 										.tap(
diff --git a/test/configCases/node/filename-and-dirname/index.js b/test/configCases/node/filename-and-dirname/index.js
@@ -33,7 +33,10 @@ it("should bundle", async () => {
 		case false:
 		case "eval-only": {
 			const dirname = __STATS__.children[__STATS_I__].outputPath;
-			const filename = path.join(__STATS__.children[__STATS_I__].outputPath, `./bundle${__STATS_I__}.js`);
+			const filename = path.join(
+				__STATS__.children[__STATS_I__].outputPath,
+				FORMAT === "esm" ? `./bundle${__STATS_I__}.mjs` : `./bundle${__STATS_I__}.js`
+			);
 
 			expect(dirnameCommonJS).toBe(dirname);
 			expect(filenameCommonJS).toBe(filename);
diff --git a/test/configCases/node/filename-and-dirname/webpack.config.js b/test/configCases/node/filename-and-dirname/webpack.config.js
@@ -20,61 +20,61 @@ config.push(
 			},
 			plugins: [
 				new webpack.DefinePlugin({
-					NODE_VALUE: typeof value === "boolean" ? value : JSON.stringify(value)
+					NODE_VALUE:
+						typeof value === "boolean" ? value : JSON.stringify(value),
+					FORMAT: JSON.stringify("cjs")
 				})
 			]
 		}))
 );
 
 // ES modules
 config.push(
-	...values
-		.filter((item) => item !== "eval-only")
-		.map((value) => ({
-			target: "node",
-			node: {
-				__filename: value,
-				__dirname: value
-			},
-			output: {
-				module: true
-			},
-			experiments: {
-				outputModule: true
-			},
-			plugins: [
-				new webpack.DefinePlugin({
-					NODE_VALUE: typeof value === "boolean" ? value : JSON.stringify(value)
-				})
-			]
-		}))
+	...values.map((value) => ({
+		target: "node",
+		node: {
+			__filename: value,
+			__dirname: value
+		},
+		output: {
+			module: true
+		},
+		experiments: {
+			outputModule: true
+		},
+		plugins: [
+			new webpack.DefinePlugin({
+				NODE_VALUE: typeof value === "boolean" ? value : JSON.stringify(value),
+				FORMAT: JSON.stringify("esm")
+			})
+		]
+	}))
 );
 
 // // ES modules with support `import.meta.dirname` and `import.meta.filename`
 config.push(
-	...values
-		.filter((item) => item !== "eval-only")
-		.map((value) => ({
-			target: "node",
-			node: {
-				__filename: value,
-				__dirname: value
-			},
-			output: {
-				module: true,
-				environment: {
-					importMetaDirnameAndFilename: true
-				}
-			},
-			experiments: {
-				outputModule: true
-			},
-			plugins: [
-				new webpack.DefinePlugin({
-					NODE_VALUE: typeof value === "boolean" ? value : JSON.stringify(value)
-				})
-			]
-		}))
+	...values.map((value) => ({
+		target: "node",
+		node: {
+			__filename: value,
+			__dirname: value
+		},
+		output: {
+			module: true,
+			environment: {
+				importMetaDirnameAndFilename: true
+			}
+		},
+		experiments: {
+			outputModule: true
+		},
+		plugins: [
+			new webpack.DefinePlugin({
+				NODE_VALUE: typeof value === "boolean" ? value : JSON.stringify(value),
+				FORMAT: JSON.stringify("esm")
+			})
+		]
+	}))
 );
 
 config.push({
