set output.environment.module=true when output.module enabled

zhangming · Feb 2, 2022 · 3f10a17 · 3f10a17
1 parent 4bc6150
commit 3f10a17
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/config/defaults.js b/lib/config/defaults.js
@@ -907,6 +907,7 @@ const applyOutputDefaults = (
 	D(output, "strictModuleExceptionHandling", false);
 
 	const optimistic = v => v || v === undefined;
+	const conditionallyOptimistic = (v, c) => (v === undefined && c) || v;
 	F(
 		output.environment,
 		"arrowFunction",
@@ -921,7 +922,11 @@ const applyOutputDefaults = (
 	F(output.environment, "forOf", () => tp && optimistic(tp.forOf));
 	F(output.environment, "bigIntLiteral", () => tp && tp.bigIntLiteral);
 	F(output.environment, "dynamicImport", () => tp && tp.dynamicImport);
-	F(output.environment, "module", () => tp && tp.module);
+	F(
+		output.environment,
+		"module",
+		() => tp && conditionallyOptimistic(tp.module, output.module)
+	);
 
 	const { trustedTypes } = output;
 	if (trustedTypes) {

diff --git a/test/Defaults.unittest.js b/test/Defaults.unittest.js
@@ -882,6 +882,9 @@ describe("Defaults", () => {
 		-     "chunkFilename": "[name].js",
 		+     "chunkFilename": "[name].mjs",
 		@@ ... @@
+		-       "module": undefined,
+		+       "module": true,
+		@@ ... @@
 		-     "filename": "[name].js",
 		+     "filename": "[name].mjs",
 		@@ ... @@