webpack 5.103.0 → 5.104.1

package/lib/css/CssModulesPlugin.js

@@ -17,6 +17,7 @@ const Compilation = require("../Compilation");
 const CssModule = require("../CssModule");
 const { tryRunOrWebpackError } = require("../HookWebpackError");
 const HotUpdateChunk = require("../HotUpdateChunk");
+const { CSS_IMPORT_TYPE, CSS_TYPE } = require("../ModuleSourceTypeConstants");
 const {
 	CSS_MODULE_TYPE,
 	CSS_MODULE_TYPE_AUTO,
@@ -25,15 +26,10 @@ const {
 } = require("../ModuleTypeConstants");
 const NormalModule = require("../NormalModule");
 const RuntimeGlobals = require("../RuntimeGlobals");
-const SelfModuleFactory = require("../SelfModuleFactory");
 const Template = require("../Template");
 const WebpackError = require("../WebpackError");
 const CssIcssExportDependency = require("../dependencies/CssIcssExportDependency");
-const CssIcssFromIdentifierDependency = require("../dependencies/CssIcssFromIdentifierDependency");
-const CssIcssGlobalIdentifierDependency = require("../dependencies/CssIcssGlobalIdentifierDependency");
 const CssIcssImportDependency = require("../dependencies/CssIcssImportDependency");
-const CssIcssLocalIdentifierDependency = require("../dependencies/CssIcssLocalIdentifierDependency");
-const CssIcssSelfLocalIdentifierDependency = require("../dependencies/CssIcssSelfLocalIdentifierDependency");
 const CssIcssSymbolDependency = require("../dependencies/CssIcssSymbolDependency");
 const CssImportDependency = require("../dependencies/CssImportDependency");
 const CssUrlDependency = require("../dependencies/CssUrlDependency");
@@ -130,8 +126,8 @@ const validateGeneratorOptions = {
 		generatorValidationOptions
 	),
 	"css/auto": createSchemaValidation(
-		require("../../schemas/plugins/css/CssAutoGeneratorOptions.check"),
-		() => getSchema("CssAutoGeneratorOptions"),
+		require("../../schemas/plugins/css/CssModuleGeneratorOptions.check"),
+		() => getSchema("CssModuleGeneratorOptions"),
 		generatorValidationOptions
 	),
 	"css/module": createSchemaValidation(
@@ -140,8 +136,8 @@ const validateGeneratorOptions = {
 		generatorValidationOptions
 	),
 	"css/global": createSchemaValidation(
-		require("../../schemas/plugins/css/CssGlobalGeneratorOptions.check"),
-		() => getSchema("CssGlobalGeneratorOptions"),
+		require("../../schemas/plugins/css/CssModuleGeneratorOptions.check"),
+		() => getSchema("CssModuleGeneratorOptions"),
 		generatorValidationOptions
 	)
 };
@@ -157,8 +153,8 @@ const validateParserOptions = {
 		parserValidationOptions
 	),
 	"css/auto": createSchemaValidation(
-		require("../../schemas/plugins/css/CssAutoParserOptions.check"),
-		() => getSchema("CssAutoParserOptions"),
+		require("../../schemas/plugins/css/CssModuleParserOptions.check"),
+		() => getSchema("CssModuleParserOptions"),
 		parserValidationOptions
 	),
 	"css/module": createSchemaValidation(
@@ -167,8 +163,8 @@ const validateParserOptions = {
 		parserValidationOptions
 	),
 	"css/global": createSchemaValidation(
-		require("../../schemas/plugins/css/CssGlobalParserOptions.check"),
-		() => getSchema("CssGlobalParserOptions"),
+		require("../../schemas/plugins/css/CssModuleParserOptions.check"),
+		() => getSchema("CssModuleParserOptions"),
 		parserValidationOptions
 	)
 };
@@ -219,7 +215,6 @@ class CssModulesPlugin {
 			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				const hooks = CssModulesPlugin.getCompilationHooks(compilation);
-				const selfFactory = new SelfModuleFactory(compilation.moduleGraph);
 				compilation.dependencyFactories.set(
 					CssImportDependency,
 					normalModuleFactory
@@ -236,18 +231,6 @@ class CssModulesPlugin {
 					CssUrlDependency,
 					new CssUrlDependency.Template()
 				);
-				compilation.dependencyTemplates.set(
-					CssIcssLocalIdentifierDependency,
-					new CssIcssLocalIdentifierDependency.Template()
-				);
-				compilation.dependencyFactories.set(
-					CssIcssSelfLocalIdentifierDependency,
-					selfFactory
-				);
-				compilation.dependencyTemplates.set(
-					CssIcssSelfLocalIdentifierDependency,
-					new CssIcssSelfLocalIdentifierDependency.Template()
-				);
 				compilation.dependencyFactories.set(
 					CssIcssImportDependency,
 					normalModuleFactory
@@ -256,22 +239,6 @@ class CssModulesPlugin {
 					CssIcssImportDependency,
 					new CssIcssImportDependency.Template()
 				);
-				compilation.dependencyFactories.set(
-					CssIcssFromIdentifierDependency,
-					normalModuleFactory
-				);
-				compilation.dependencyTemplates.set(
-					CssIcssFromIdentifierDependency,
-					new CssIcssFromIdentifierDependency.Template()
-				);
-				compilation.dependencyFactories.set(
-					CssIcssGlobalIdentifierDependency,
-					normalModuleFactory
-				);
-				compilation.dependencyTemplates.set(
-					CssIcssGlobalIdentifierDependency,
-					new CssIcssGlobalIdentifierDependency.Template()
-				);
 				compilation.dependencyTemplates.set(
 					CssIcssExportDependency,
 					new CssIcssExportDependency.Template()
@@ -293,45 +260,31 @@ class CssModulesPlugin {
 					normalModuleFactory.hooks.createParser
 						.for(type)
 						.tap(PLUGIN_NAME, (parserOptions) => {
-							validateParserOptions[type](parserOptions);
-							const {
-								url,
-								import: importOption,
-								namedExports,
-								exportType
-							} = parserOptions;
-
 							switch (type) {
 								case CSS_MODULE_TYPE:
-									return new CssParser({
-										importOption,
-										url,
-										namedExports,
-										exportType
-									});
+									validateParserOptions[type](parserOptions);
+
+									return new CssParser(parserOptions);
 								case CSS_MODULE_TYPE_GLOBAL:
+									validateParserOptions[type](parserOptions);
+
 									return new CssParser({
 										defaultMode: "global",
-										importOption,
-										url,
-										namedExports,
-										exportType
+										...parserOptions
 									});
 								case CSS_MODULE_TYPE_MODULE:
+									validateParserOptions[type](parserOptions);
+
 									return new CssParser({
 										defaultMode: "local",
-										importOption,
-										url,
-										namedExports,
-										exportType
+										...parserOptions
 									});
 								case CSS_MODULE_TYPE_AUTO:
+									validateParserOptions[type](parserOptions);
+
 									return new CssParser({
 										defaultMode: "auto",
-										importOption,
-										url,
-										namedExports,
-										exportType
+										...parserOptions
 									});
 							}
 						});
@@ -778,7 +731,7 @@ class CssModulesPlugin {
 				(
 					chunkGraph.getOrderedChunkModulesIterableBySourceType(
 						chunk,
-						"css-import",
+						CSS_IMPORT_TYPE,
 						compareModulesByIdOrIdentifier(chunkGraph)
 					)
 				),
@@ -790,7 +743,7 @@ class CssModulesPlugin {
 				(
 					chunkGraph.getOrderedChunkModulesIterableBySourceType(
 						chunk,
-						"css",
+						CSS_TYPE,
 						compareModulesByIdOrIdentifier(chunkGraph)
 					)
 				),
@@ -920,8 +873,8 @@ class CssModulesPlugin {
 				const moduleSourceContent =
 					/** @type {Source} */
 					(
-						codeGenResult.sources.get("css") ||
-							codeGenResult.sources.get("css-import")
+						codeGenResult.sources.get(CSS_TYPE) ||
+							codeGenResult.sources.get(CSS_IMPORT_TYPE)
 					);
 				const moduleSource = CssModulesPlugin.renderModule(
 					module,
@@ -970,9 +923,11 @@ class CssModulesPlugin {
 	 */
 	static chunkHasCss(chunk, chunkGraph) {
 		return (
-			Boolean(chunkGraph.getChunkModulesIterableBySourceType(chunk, "css")) ||
 			Boolean(
-				chunkGraph.getChunkModulesIterableBySourceType(chunk, "css-import")
+				chunkGraph.getChunkModulesIterableBySourceType(chunk, CSS_TYPE)
+			) ||
+			Boolean(
+				chunkGraph.getChunkModulesIterableBySourceType(chunk, CSS_IMPORT_TYPE)
 			)
 		);
 	}