webpack 5.91.0 → 5.92.0

package/lib/cache/getLazyHashedEtag.js

@@ -11,7 +11,7 @@ const createHash = require("../util/createHash");
 /** @typedef {typeof import("../util/Hash")} HashConstructor */
 
 /**
- * @typedef {Object} HashableObject
+ * @typedef {object} HashableObject
  * @property {function(Hash): void} updateHash
  */
 

package/lib/cli.js

@@ -10,7 +10,7 @@ const webpackSchema = require("../schemas/WebpackOptions.json");
 
 // TODO add originPath to PathItem for better errors
 /**
- * @typedef {Object} PathItem
+ * @typedef {object} PathItem
  * @property {any} schema the part of the schema
  * @property {string} path the path in the config
  */
@@ -18,7 +18,7 @@ const webpackSchema = require("../schemas/WebpackOptions.json");
 /** @typedef {"unknown-argument" | "unexpected-non-array-in-path" | "unexpected-non-object-in-path" | "multiple-values-unexpected" | "invalid-value"} ProblemType */
 
 /**
- * @typedef {Object} Problem
+ * @typedef {object} Problem
  * @property {ProblemType} type
  * @property {string} path
  * @property {string} argument
@@ -28,14 +28,14 @@ const webpackSchema = require("../schemas/WebpackOptions.json");
  */
 
 /**
- * @typedef {Object} LocalProblem
+ * @typedef {object} LocalProblem
  * @property {ProblemType} type
  * @property {string} path
  * @property {string=} expected
  */
 
 /**
- * @typedef {Object} ArgumentConfig
+ * @typedef {object} ArgumentConfig
  * @property {string} description
  * @property {string} [negatedDescription]
  * @property {string} path
@@ -45,7 +45,7 @@ const webpackSchema = require("../schemas/WebpackOptions.json");
  */
 
 /**
- * @typedef {Object} Argument
+ * @typedef {object} Argument
  * @property {string} description
  * @property {"string"|"number"|"boolean"} simpleType
  * @property {boolean} multiple

package/lib/config/browserslistTargetHandler.js

@@ -16,7 +16,7 @@ const path = require("path");
 const inputRx = /^(?:((?:[A-Z]:)?[/\\].*?))?(?::(.+?))?$/i;
 
 /**
- * @typedef {Object} BrowserslistHandlerConfig
+ * @typedef {object} BrowserslistHandlerConfig
  * @property {string=} configPath
  * @property {string=} env
  * @property {string=} query
@@ -344,6 +344,12 @@ const resolve = browsers => {
 		importScripts: false,
 		importScriptsInWorker: true,
 		nodeBuiltins: nodeProperty,
+		nodePrefixForCoreModules:
+			nodeProperty &&
+			!browsers.some(b => /^node 15/.test(b)) &&
+			rawChecker({
+				node: [14, 18]
+			}),
 		require: nodeProperty
 	};
 };

package/lib/config/defaults.js

@@ -27,7 +27,8 @@ const {
 	getDefaultTarget
 } = require("./target");
 
-/** @typedef {import("../../declarations/WebpackOptions").CacheOptionsNormalized} CacheOptions */
+/** @typedef {import("../../declarations/WebpackOptions").CacheOptions} CacheOptions */
+/** @typedef {import("../../declarations/WebpackOptions").CacheOptionsNormalized} CacheOptionsNormalized */
 /** @typedef {import("../../declarations/WebpackOptions").Context} Context */
 /** @typedef {import("../../declarations/WebpackOptions").CssGeneratorOptions} CssGeneratorOptions */
 /** @typedef {import("../../declarations/WebpackOptions").CssParserOptions} CssParserOptions */
@@ -60,12 +61,20 @@ const {
 /** @typedef {import("../../declarations/WebpackOptions").RuleSetRules} RuleSetRules */
 /** @typedef {import("../../declarations/WebpackOptions").SnapshotOptions} SnapshotOptions */
 /** @typedef {import("../../declarations/WebpackOptions").Target} Target */
-/** @typedef {import("../../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
+/** @typedef {import("../../declarations/WebpackOptions").WebpackOptions} WebpackOptions */
+/** @typedef {import("../../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptionsNormalized */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Module")} Module */
+/** @typedef {import("./target").PlatformTargetProperties} PlatformTargetProperties */
 /** @typedef {import("./target").TargetProperties} TargetProperties */
 
+/**
+ * @typedef {object} ResolvedOptions
+ * @property {PlatformTargetProperties | false} platform - platform target properties
+ */
+
 const NODE_MODULES_REGEXP = /[\\/]node_modules[\\/]/i;
+const DEFAULT_CACHE_NAME = "default";
 
 /**
  * Sets a constant default value when undefined
@@ -137,7 +146,7 @@ const A = (obj, prop, factory) => {
 };
 
 /**
- * @param {WebpackOptions} options options to be modified
+ * @param {WebpackOptionsNormalized} options options to be modified
  * @returns {void}
  */
 const applyWebpackOptionsBaseDefaults = options => {
@@ -146,10 +155,11 @@ const applyWebpackOptionsBaseDefaults = options => {
 };
 
 /**
- * @param {WebpackOptions} options options to be modified
- * @returns {void}
+ * @param {WebpackOptionsNormalized} options options to be modified
+ * @param {number} [compilerIndex] index of compiler
+ * @returns {ResolvedOptions} Resolved options after apply defaults
  */
-const applyWebpackOptionsDefaults = options => {
+const applyWebpackOptionsDefaults = (options, compilerIndex) => {
 	F(options, "context", () => process.cwd());
 	F(options, "target", () => {
 		return getDefaultTarget(/** @type {string} */ (options.context));
@@ -201,10 +211,11 @@ const applyWebpackOptionsDefaults = options => {
 		development ? { type: /** @type {"memory"} */ ("memory") } : false
 	);
 	applyCacheDefaults(options.cache, {
-		name: name || "default",
+		name: name || DEFAULT_CACHE_NAME,
 		mode: mode || "production",
 		development,
-		cacheUnaffected: options.experiments.cacheUnaffected
+		cacheUnaffected: options.experiments.cacheUnaffected,
+		compilerIndex
 	});
 	const cache = !!options.cache;
 
@@ -242,7 +253,6 @@ const applyWebpackOptionsDefaults = options => {
 			(options.experiments.outputModule),
 		development,
 		entry: options.entry,
-		module: options.module,
 		futureDefaults
 	});
 
@@ -252,7 +262,9 @@ const applyWebpackOptionsDefaults = options => {
 	});
 
 	applyLoaderDefaults(
-		/** @type {NonNullable<WebpackOptions["loader"]>} */ (options.loader),
+		/** @type {NonNullable<WebpackOptionsNormalized["loader"]>} */ (
+			options.loader
+		),
 		{ targetProperties, environment: options.output.environment }
 	);
 
@@ -269,7 +281,7 @@ const applyWebpackOptionsDefaults = options => {
 
 	applyNodeDefaults(options.node, {
 		futureDefaults:
-			/** @type {NonNullable<WebpackOptions["experiments"]["futureDefaults"]>} */
+			/** @type {NonNullable<WebpackOptionsNormalized["experiments"]["futureDefaults"]>} */
 			(options.experiments.futureDefaults),
 		outputModule: options.output.module,
 		targetProperties
@@ -283,7 +295,7 @@ const applyWebpackOptionsDefaults = options => {
 			: false
 	);
 	applyPerformanceDefaults(
-		/** @type {NonNullable<WebpackOptions["performance"]>} */
+		/** @type {NonNullable<WebpackOptionsNormalized["performance"]>} */
 		(options.performance),
 		{
 			production
@@ -316,11 +328,25 @@ const applyWebpackOptionsDefaults = options => {
 		getResolveLoaderDefaults({ cache }),
 		options.resolveLoader
 	);
+
+	return {
+		platform:
+			targetProperties === false
+				? targetProperties
+				: {
+						web: targetProperties.web,
+						browser: targetProperties.browser,
+						webworker: targetProperties.webworker,
+						node: targetProperties.node,
+						nwjs: targetProperties.nwjs,
+						electron: targetProperties.electron
+					}
+	};
 };
 
 /**
  * @param {ExperimentsNormalized} experiments options
- * @param {Object} options options
+ * @param {object} options options
  * @param {boolean} options.production is production
  * @param {boolean} options.development is development mode
  * @param {TargetProperties | false} options.targetProperties target properties
@@ -355,22 +381,27 @@ const applyExperimentsDefaults = (
 };
 
 /**
- * @param {CacheOptions} cache options
- * @param {Object} options options
+ * @param {CacheOptionsNormalized} cache options
+ * @param {object} options options
  * @param {string} options.name name
  * @param {Mode} options.mode mode
  * @param {boolean} options.development is development mode
+ * @param {number} [options.compilerIndex] index of compiler
  * @param {Experiments["cacheUnaffected"]} options.cacheUnaffected the cacheUnaffected experiment is enabled
  * @returns {void}
  */
 const applyCacheDefaults = (
 	cache,
-	{ name, mode, development, cacheUnaffected }
+	{ name, mode, development, cacheUnaffected, compilerIndex }
 ) => {
 	if (cache === false) return;
 	switch (cache.type) {
 		case "filesystem":
-			F(cache, "name", () => name + "-" + mode);
+			F(cache, "name", () =>
+				compilerIndex !== undefined
+					? `${name + "-" + mode}__compiler${compilerIndex + 1}__`
+					: name + "-" + mode
+			);
 			D(cache, "version", "");
 			F(cache, "cacheDirectory", () => {
 				const cwd = process.cwd();
@@ -433,7 +464,7 @@ const applyCacheDefaults = (
 
 /**
  * @param {SnapshotOptions} snapshot options
- * @param {Object} options options
+ * @param {object} options options
  * @param {boolean} options.production is production
  * @param {boolean} options.futureDefaults is future defaults enabled
  * @returns {void}
@@ -509,7 +540,7 @@ const applySnapshotDefaults = (snapshot, { production, futureDefaults }) => {
 
 /**
  * @param {JavascriptParserOptions} parserOptions parser options
- * @param {Object} options options
+ * @param {object} options options
  * @param {boolean} options.futureDefaults is future defaults enabled
  * @param {boolean} options.isNode is node target platform
  * @returns {void}
@@ -541,7 +572,7 @@ const applyJavascriptParserOptionsDefaults = (
 
 /**
  * @param {CssGeneratorOptions} generatorOptions generator options
- * @param {Object} options options
+ * @param {object} options options
  * @param {TargetProperties | false} options.targetProperties target properties
  * @returns {void}
  */
@@ -554,12 +585,12 @@ const applyCssGeneratorOptionsDefaults = (
 		"exportsOnly",
 		!targetProperties || !targetProperties.document
 	);
-	D(generatorOptions, "exportsConvention", "as-is");
+	D(generatorOptions, "esModule", true);
 };
 
 /**
  * @param {ModuleOptions} module options
- * @param {Object} options options
+ * @param {object} options options
  * @param {boolean} options.cache is caching enabled
  * @param {boolean} options.syncWebAssembly is syncWebAssembly enabled
  * @param {boolean} options.asyncWebAssembly is asyncWebAssembly enabled
@@ -649,6 +680,7 @@ const applyModuleDefaults = (
 			"localIdentName",
 			"[uniqueName]-[id]-[local]"
 		);
+		D(module.generator["css/auto"], "exportsConvention", "as-is");
 
 		F(module.generator, "css/module", () => ({}));
 		D(
@@ -656,6 +688,7 @@ const applyModuleDefaults = (
 			"localIdentName",
 			"[uniqueName]-[id]-[local]"
 		);
+		D(module.generator["css/module"], "exportsConvention", "as-is");
 
 		F(module.generator, "css/global", () => ({}));
 		D(
@@ -663,6 +696,7 @@ const applyModuleDefaults = (
 			"localIdentName",
 			"[uniqueName]-[id]-[local]"
 		);
+		D(module.generator["css/global"], "exportsConvention", "as-is");
 	}
 
 	A(module, "defaultRules", () => {
@@ -804,6 +838,10 @@ const applyModuleDefaults = (
 			{
 				assert: { type: "json" },
 				type: JSON_MODULE_TYPE
+			},
+			{
+				with: { type: "json" },
+				type: JSON_MODULE_TYPE
 			}
 		);
 		return rules;
@@ -812,14 +850,13 @@ const applyModuleDefaults = (
 
 /**
  * @param {Output} output options
- * @param {Object} options options
+ * @param {object} options options
  * @param {string} options.context context
  * @param {TargetProperties | false} options.targetProperties target properties
  * @param {boolean} options.isAffectedByBrowserslist is affected by browserslist
  * @param {boolean} options.outputModule is outputModule experiment enabled
  * @param {boolean} options.development is development mode
  * @param {Entry} options.entry entry option
- * @param {ModuleOptions} options.module module option
  * @param {boolean} options.futureDefaults is future defaults enabled
  * @returns {void}
  */
@@ -832,7 +869,6 @@ const applyOutputDefaults = (
 		outputModule,
 		development,
 		entry,
-		module,
 		futureDefaults
 	}
 ) => {
@@ -984,7 +1020,7 @@ const applyOutputDefaults = (
 					if (tp.nodeBuiltins) return "async-node";
 					break;
 				case "module":
-					if (tp.dynamicImport) return "import";
+					if (tp.dynamicImport || output.module) return "import";
 					break;
 			}
 			if (
@@ -1009,7 +1045,7 @@ const applyOutputDefaults = (
 					if (tp.nodeBuiltins) return "async-node";
 					break;
 				case "module":
-					if (tp.dynamicImportInWorker) return "import";
+					if (tp.dynamicImportInWorker || output.module) return "import";
 					break;
 			}
 			if (
@@ -1121,6 +1157,15 @@ const applyOutputDefaults = (
 		() =>
 			tp && optimistic(/** @type {boolean | undefined} */ (tp.optionalChaining))
 	);
+	F(
+		environment,
+		"nodePrefixForCoreModules",
+		() =>
+			tp &&
+			optimistic(
+				/** @type {boolean | undefined} */ (tp.nodePrefixForCoreModules)
+			)
+	);
 	F(
 		environment,
 		"templateLiteral",
@@ -1145,6 +1190,11 @@ const applyOutputDefaults = (
 			output.module
 		)
 	);
+	F(
+		environment,
+		"document",
+		() => tp && optimistic(/** @type {boolean | undefined} */ (tp.document))
+	);
 
 	const { trustedTypes } = output;
 	if (trustedTypes) {
@@ -1216,7 +1266,7 @@ const applyOutputDefaults = (
 
 /**
  * @param {ExternalsPresets} externalsPresets options
- * @param {Object} options options
+ * @param {object} options options
  * @param {TargetProperties | false} options.targetProperties target properties
  * @param {boolean} options.buildHttp buildHttp experiment enabled
  * @returns {void}
@@ -1283,7 +1333,7 @@ const applyExternalsPresetsDefaults = (
 
 /**
  * @param {Loader} loader options
- * @param {Object} options options
+ * @param {object} options options
  * @param {TargetProperties | false} options.targetProperties target properties
  * @param {Environment} options.environment environment
  * @returns {void}
@@ -1307,7 +1357,7 @@ const applyLoaderDefaults = (loader, { targetProperties, environment }) => {
 
 /**
  * @param {WebpackNode} node options
- * @param {Object} options options
+ * @param {object} options options
  * @param {TargetProperties | false} options.targetProperties target properties
  * @param {boolean} options.futureDefaults is future defaults enabled
  * @param {boolean} options.outputModule is output type is module
@@ -1338,7 +1388,7 @@ const applyNodeDefaults = (
 
 /**
  * @param {Performance} performance options
- * @param {Object} options options
+ * @param {object} options options
  * @param {boolean} options.production is production
  * @returns {void}
  */
@@ -1351,7 +1401,7 @@ const applyPerformanceDefaults = (performance, { production }) => {
 
 /**
  * @param {Optimization} optimization options
- * @param {Object} options options
+ * @param {object} options options
  * @param {boolean} options.production is production
  * @param {boolean} options.development is development
  * @param {boolean} options.css is css enabled
@@ -1443,7 +1493,7 @@ const applyOptimizationDefaults = (
 };
 
 /**
- * @param {Object} options options
+ * @param {object} options options
  * @param {boolean} options.cache is cache enable
  * @param {string} options.context build context
  * @param {TargetProperties | false} options.targetProperties target properties
@@ -1503,6 +1553,7 @@ const getResolveDefaults = ({
 		exportsFields: ["exports"],
 		roots: [context],
 		mainFields: ["main"],
+		importsFields: ["imports"],
 		byDependency: {
 			wasm: esmDeps(),
 			esm: esmDeps(),
@@ -1548,7 +1599,7 @@ const getResolveDefaults = ({
 };
 
 /**
- * @param {Object} options options
+ * @param {object} options options
  * @param {boolean} options.cache is cache enable
  * @returns {ResolveOptions} resolve options
  */

package/lib/config/target.js

@@ -21,7 +21,7 @@ const getDefaultTarget = context => {
 };
 
 /**
- * @typedef {Object} PlatformTargetProperties
+ * @typedef {object} PlatformTargetProperties
  * @property {boolean | null} web web platform, importing of http(s) and std: is available
  * @property {boolean | null} browser browser platform, running in a normal web browser
  * @property {boolean | null} webworker (Web)Worker platform, running in a web/shared/service worker
@@ -31,16 +31,17 @@ const getDefaultTarget = context => {
  */
 
 /**
- * @typedef {Object} ElectronContextTargetProperties
+ * @typedef {object} ElectronContextTargetProperties
  * @property {boolean | null} electronMain in main context
  * @property {boolean | null} electronPreload in preload context
  * @property {boolean | null} electronRenderer in renderer context with node integration
  */
 
 /**
- * @typedef {Object} ApiTargetProperties
+ * @typedef {object} ApiTargetProperties
  * @property {boolean | null} require has require function available
  * @property {boolean | null} nodeBuiltins has node.js built-in modules available
+ * @property {boolean | null} nodePrefixForCoreModules node.js allows to use `node:` prefix for core modules
  * @property {boolean | null} document has document available (allows script tags)
  * @property {boolean | null} importScripts has importScripts available
  * @property {boolean | null} importScriptsInWorker has importScripts available when creating a worker
@@ -49,7 +50,7 @@ const getDefaultTarget = context => {
  */
 
 /**
- * @typedef {Object} EcmaTargetProperties
+ * @typedef {object} EcmaTargetProperties
  * @property {boolean | null} globalThis has globalThis variable available
  * @property {boolean | null} bigIntLiteral big int literal syntax is available
  * @property {boolean | null} const const and let variable declarations are available
@@ -168,8 +169,8 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 	[
 		"[async-]node[X[.Y]]",
 		"Node.js in version X.Y. The 'async-' prefix will load chunks asynchronously via 'fs' and 'vm' instead of 'require()'. Examples: node14.5, async-node10.",
-		/^(async-)?node(\d+(?:\.(\d+))?)?$/,
-		(asyncFlag, major, minor) => {
+		/^(async-)?node((\d+)(?:\.(\d+))?)?$/,
+		(asyncFlag, _, major, minor) => {
 			const v = versionDependent(major, minor);
 			// see https://node.green/
 			return {
@@ -182,6 +183,8 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 
 				require: !asyncFlag,
 				nodeBuiltins: true,
+				// v16.0.0, v14.18.0
+				nodePrefixForCoreModules: +major < 15 ? v(14, 18) : v(16),
 				global: true,
 				document: false,
 				fetchWasm: false,
@@ -206,8 +209,8 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 	[
 		"electron[X[.Y]]-main/preload/renderer",
 		"Electron in version X.Y. Script is running in main, preload resp. renderer context.",
-		/^electron(\d+(?:\.(\d+))?)?-(main|preload|renderer)$/,
-		(major, minor, context) => {
+		/^electron((\d+)(?:\.(\d+))?)?-(main|preload|renderer)$/,
+		(_, major, minor, context) => {
 			const v = versionDependent(major, minor);
 			// see https://node.green/ + https://github.com/electron/releases
 			return {
@@ -224,6 +227,10 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 
 				global: true,
 				nodeBuiltins: true,
+				// 15.0.0	- Node.js	v16.5
+				// 14.0.0 - Mode.js v14.17, but prefixes only since v14.18
+				nodePrefixForCoreModules: v(15),
+
 				require: true,
 				document: context === "renderer",
 				fetchWasm: context === "renderer",
@@ -248,8 +255,8 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 	[
 		"nwjs[X[.Y]] / node-webkit[X[.Y]]",
 		"NW.js in version X.Y.",
-		/^(?:nwjs|node-webkit)(\d+(?:\.(\d+))?)?$/,
-		(major, minor) => {
+		/^(?:nwjs|node-webkit)((\d+)(?:\.(\d+))?)?$/,
+		(_, major, minor) => {
 			const v = versionDependent(major, minor);
 			// see https://node.green/ + https://github.com/nwjs/nw.js/blob/nw48/CHANGELOG.md
 			return {
@@ -341,7 +348,7 @@ const mergeTargetProperties = targetProperties => {
 			keys.add(/** @type {keyof TargetProperties} */ (key));
 		}
 	}
-	/** @type {Object} */
+	/** @type {object} */
 	const result = {};
 	for (const key of keys) {
 		let hasTrue = false;

package/lib/container/ContainerEntryModule.js

@@ -34,7 +34,7 @@ const ContainerExposedDependency = require("./ContainerExposedDependency");
 /** @typedef {import("./ContainerEntryDependency")} ContainerEntryDependency */
 
 /**
- * @typedef {Object} ExposeOptions
+ * @typedef {object} ExposeOptions
  * @property {string[]} import requests to exposed modules (last one is exported)
  * @property {string} name custom chunk name for the exposed module
  */

package/lib/css/CssExportsGenerator.js

@@ -16,6 +16,8 @@ const { cssExportConvention } = require("../util/conventions");
 /** @typedef {import("../../declarations/WebpackOptions").CssGeneratorExportsConvention} CssGeneratorExportsConvention */
 /** @typedef {import("../../declarations/WebpackOptions").CssGeneratorLocalIdentName} CssGeneratorLocalIdentName */
 /** @typedef {import("../Dependency")} Dependency */
+/** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
+/** @typedef {import("../DependencyTemplate").CssExportsData} CssExportsData */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Generator").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
@@ -31,19 +33,38 @@ const TYPES = new Set(["javascript"]);
 
 class CssExportsGenerator extends Generator {
 	/**
-	 * @param {CssGeneratorExportsConvention} convention the convention of the exports name
+	 * @param {CssGeneratorExportsConvention | undefined} convention the convention of the exports name
 	 * @param {CssGeneratorLocalIdentName | undefined} localIdentName css export local ident name
+	 * @param {boolean} esModule whether to use ES modules syntax
 	 */
-	constructor(convention, localIdentName) {
+	constructor(convention, localIdentName, esModule) {
 		super();
-		/** @type {CssGeneratorExportsConvention} */
+		/** @type {CssGeneratorExportsConvention | undefined} */
 		this.convention = convention;
 		/** @type {CssGeneratorLocalIdentName | undefined} */
 		this.localIdentName = localIdentName;
+		/** @type {boolean} */
+		this.esModule = esModule;
 	}
 
-	// TODO add getConcatenationBailoutReason to allow concatenation
-	// but how to make it have a module id
+	/**
+	 * @param {NormalModule} module module for which the bailout reason should be determined
+	 * @param {ConcatenationBailoutReasonContext} context context
+	 * @returns {string | undefined} reason why this module can't be concatenated, undefined when it can be concatenated
+	 */
+	getConcatenationBailoutReason(module, context) {
+		if (!this.esModule) {
+			return "Module is not an ECMAScript module";
+		}
+		// TODO webpack 6: remove /\[moduleid\]/.test
+		if (
+			/\[id\]/.test(this.localIdentName) ||
+			/\[moduleid\]/.test(this.localIdentName)
+		) {
+			return "The localIdentName includes moduleId ([id] or [moduleid])";
+		}
+		return undefined;
+	}
 
 	/**
 	 * @param {NormalModule} module module for which the code should be generated
@@ -54,14 +75,18 @@ class CssExportsGenerator extends Generator {
 		const source = new ReplaceSource(new RawSource(""));
 		/** @type {InitFragment<TODO>[]} */
 		const initFragments = [];
-		/** @type {Map<string, string>} */
-		const cssExports = new Map();
+		/** @type {CssExportsData} */
+		const cssExportsData = {
+			esModule: this.esModule,
+			exports: new Map()
+		};
 
 		generateContext.runtimeRequirements.add(RuntimeGlobals.module);
 
 		let chunkInitFragments;
 		const runtimeRequirements = new Set();
 
+		/** @type {DependencyTemplateContext} */
 		const templateContext = {
 			runtimeTemplate: generateContext.runtimeTemplate,
 			dependencyTemplates: generateContext.dependencyTemplates,
@@ -73,7 +98,7 @@ class CssExportsGenerator extends Generator {
 			concatenationScope: generateContext.concatenationScope,
 			codeGenerationResults: generateContext.codeGenerationResults,
 			initFragments,
-			cssExports,
+			cssExportsData,
 			get chunkInitFragments() {
 				if (!chunkInitFragments) {
 					const data = generateContext.getData();
@@ -109,7 +134,7 @@ class CssExportsGenerator extends Generator {
 		if (generateContext.concatenationScope) {
 			const source = new ConcatSource();
 			const usedIdentifiers = new Set();
-			for (const [name, v] of cssExports) {
+			for (const [name, v] of cssExportsData.exports) {
 				for (let k of cssExportConvention(name, this.convention)) {
 					let identifier = Template.toIdentifier(k);
 					let i = 0;
@@ -127,26 +152,27 @@ class CssExportsGenerator extends Generator {
 			}
 			return source;
 		} else {
-			const otherUsed =
+			const needNsObj =
+				this.esModule &&
 				generateContext.moduleGraph
 					.getExportsInfo(module)
 					.otherExportsInfo.getUsed(generateContext.runtime) !==
-				UsageState.Unused;
-			if (otherUsed) {
+					UsageState.Unused;
+			if (needNsObj) {
 				generateContext.runtimeRequirements.add(
 					RuntimeGlobals.makeNamespaceObject
 				);
 			}
-			const newCssExports = [];
-			for (let [k, v] of cssExports) {
+			const newExports = [];
+			for (let [k, v] of cssExportsData.exports) {
 				for (let name of cssExportConvention(k, this.convention)) {
-					newCssExports.push(`\t${JSON.stringify(name)}: ${JSON.stringify(v)}`);
+					newExports.push(`\t${JSON.stringify(name)}: ${JSON.stringify(v)}`);
 				}
 			}
 			return new RawSource(
-				`${otherUsed ? `${RuntimeGlobals.makeNamespaceObject}(` : ""}${
+				`${needNsObj ? `${RuntimeGlobals.makeNamespaceObject}(` : ""}${
 					module.moduleArgument
-				}.exports = {\n${newCssExports.join(",\n")}\n}${otherUsed ? ")" : ""};`
+				}.exports = {\n${newExports.join(",\n")}\n}${needNsObj ? ")" : ""};`
 			);
 		}
 	}