fix: css/global not handle the exports name

webpack · Apr 22, 2024 · 4b50219 · 4b50219
2 parents 6d58e8d + bf2571b
commit 4b50219
Show file tree

Hide file tree

Showing 16 changed files with 110 additions and 145 deletions.
diff --git a/declarations/WebpackOptions.d.ts b/declarations/WebpackOptions.d.ts
@@ -2888,10 +2888,6 @@ export interface CssAutoParserOptions {
  * Generator options for css modules.
  */
 export interface CssGeneratorOptions {
-	/**
-	 * Specifies the convention of exported names.
-	 */
-	exportsConvention?: CssGeneratorExportsConvention;
 	/**
 	 * Avoid generating and loading a stylesheet and only embed exports from css into output javascript files.
 	 */

diff --git a/lib/config/defaults.js b/lib/config/defaults.js
@@ -553,7 +553,6 @@ const applyCssGeneratorOptionsDefaults = (
 		"exportsOnly",
 		!targetProperties || !targetProperties.document
 	);
-	D(generatorOptions, "exportsConvention", "as-is");
 };
 
 /**
@@ -648,20 +647,23 @@ const applyModuleDefaults = (
 			"localIdentName",
 			"[uniqueName]-[id]-[local]"
 		);
+		D(module.generator["css/auto"], "exportsConvention", "as-is");
 
 		F(module.generator, "css/module", () => ({}));
 		D(
 			module.generator["css/module"],
 			"localIdentName",
 			"[uniqueName]-[id]-[local]"
 		);
+		D(module.generator["css/module"], "exportsConvention", "as-is");
 
 		F(module.generator, "css/global", () => ({}));
 		D(
 			module.generator["css/global"],
 			"localIdentName",
 			"[uniqueName]-[id]-[local]"
 		);
+		D(module.generator["css/global"], "exportsConvention", "as-is");
 	}
 
 	A(module, "defaultRules", () => {

diff --git a/lib/css/CssExportsGenerator.js b/lib/css/CssExportsGenerator.js
@@ -31,12 +31,12 @@ 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
 	 */
 	constructor(convention, localIdentName) {
 		super();
-		/** @type {CssGeneratorExportsConvention} */
+		/** @type {CssGeneratorExportsConvention | undefined} */
 		this.convention = convention;
 		/** @type {CssGeneratorLocalIdentName | undefined} */
 		this.localIdentName = localIdentName;

diff --git a/lib/css/CssGenerator.js b/lib/css/CssGenerator.js
@@ -24,12 +24,12 @@ const TYPES = new Set(["css"]);
 
 class CssGenerator 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
 	 */
 	constructor(convention, localIdentName) {
 		super();
-		/** @type {CssGeneratorExportsConvention} */
+		/** @type {CssGeneratorExportsConvention | undefined} */
 		this.convention = convention;
 		/** @type {CssGeneratorLocalIdentName | undefined} */
 		this.localIdentName = localIdentName;

diff --git a/lib/css/CssModulesPlugin.js b/lib/css/CssModulesPlugin.js
@@ -219,12 +219,12 @@ class CssModulesPlugin {
 							const { namedExports } = parserOptions;
 
 							switch (type) {
-								case CSS_MODULE_TYPE:
+								case CSS_MODULE_TYPE_GLOBAL:
 								case CSS_MODULE_TYPE_AUTO:
 									return new CssParser({
 										namedExports
 									});
-								case CSS_MODULE_TYPE_GLOBAL:
+								case CSS_MODULE_TYPE:
 									return new CssParser({
 										allowModeSwitch: false,
 										namedExports

diff --git a/lib/css/CssParser.js b/lib/css/CssParser.js
@@ -600,11 +600,13 @@ class CssParser extends Parser {
 
 						return newPos;
 					}
-					const { line: sl, column: sc } = locConverter.get(pos);
-					const { line: el, column: ec } = locConverter.get(newPos);
-					const dep = new CssLocalIdentifierDependency(name, [pos, newPos]);
-					dep.setLoc(sl, sc, el, ec);
-					module.addDependency(dep);
+					if (isLocalMode()) {
+						const { line: sl, column: sc } = locConverter.get(pos);
+						const { line: el, column: ec } = locConverter.get(newPos);
+						const dep = new CssLocalIdentifierDependency(name, [pos, newPos]);
+						dep.setLoc(sl, sc, el, ec);
+						module.addDependency(dep);
+					}
 					pos = newPos;
 					return pos + 1;
 				} else if (this.allowModeSwitch && name === "@property") {
@@ -630,17 +632,19 @@ class CssParser extends Parser {
 
 						return propertyNameEnd;
 					}
-					const { line: sl, column: sc } = locConverter.get(pos);
-					const { line: el, column: ec } = locConverter.get(propertyNameEnd);
 					const name = propertyName.slice(2);
-					const dep = new CssLocalIdentifierDependency(
-						name,
-						[propertyNameStart, propertyNameEnd],
-						"--"
-					);
-					dep.setLoc(sl, sc, el, ec);
-					module.addDependency(dep);
 					declaredCssVariables.add(name);
+					if (isLocalMode()) {
+						const { line: sl, column: sc } = locConverter.get(pos);
+						const { line: el, column: ec } = locConverter.get(propertyNameEnd);
+						const dep = new CssLocalIdentifierDependency(
+							name,
+							[propertyNameStart, propertyNameEnd],
+							"--"
+						);
+						dep.setLoc(sl, sc, el, ec);
+						module.addDependency(dep);
+					}
 					pos = propertyNameEnd;
 					return pos + 1;
 				} else if (

diff --git a/lib/util/conventions.js b/lib/util/conventions.js
@@ -9,7 +9,7 @@
 
 /**
  * @param {string} input input
- * @param {CssGeneratorExportsConvention} convention convention
+ * @param {CssGeneratorExportsConvention | undefined} convention convention
  * @returns {Set<string>} results
  */
 exports.cssExportConvention = (input, convention) => {

diff --git a/schemas/WebpackOptions.check.js b/schemas/WebpackOptions.check.js
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -432,9 +432,6 @@
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "exportsConvention": {
-          "$ref": "#/definitions/CssGeneratorExportsConvention"
-        },
         "exportsOnly": {
           "$ref": "#/definitions/CssGeneratorExportsOnly"
         }

diff --git a/schemas/plugins/css/CssGeneratorOptions.check.js b/schemas/plugins/css/CssGeneratorOptions.check.js
diff --git a/test/Defaults.unittest.js b/test/Defaults.unittest.js
@@ -2255,6 +2255,7 @@ describe("snapshots", () => {
 			+     "css": true,
 			+     "futureDefaults": true,
 			@@ ... @@
+			+       },
 			+       Object {
 			+         "rules": Array [
 			+           Object {
@@ -2272,18 +2273,18 @@ describe("snapshots", () => {
 			+       Object {
 			+         "mimetype": "application/wasm",
 			+         "rules": Array [
-			@@ ... @@
+			+           Object {
 			+             "descriptionData": Object {
 			+               "type": "module",
 			+             },
 			+             "resolve": Object {
 			+               "fullySpecified": true,
 			+             },
-			+           },
+			@@ ... @@
 			+         ],
 			+         "type": "webassembly/async",
 			+       },
-			+       Object {
+			@@ ... @@
 			+         "resolve": Object {
 			+           "fullySpecified": true,
 			+           "preferRelative": true,
@@ -2312,16 +2313,18 @@ describe("snapshots", () => {
 			-     "generator": Object {},
 			+     "generator": Object {
 			+       "css": Object {
-			+         "exportsConvention": "as-is",
 			+         "exportsOnly": false,
 			+       },
 			+       "css/auto": Object {
+			+         "exportsConvention": "as-is",
 			+         "localIdentName": "[uniqueName]-[id]-[local]",
 			+       },
 			+       "css/global": Object {
+			+         "exportsConvention": "as-is",
 			+         "localIdentName": "[uniqueName]-[id]-[local]",
 			+       },
 			+       "css/module": Object {
+			+         "exportsConvention": "as-is",
 			+         "localIdentName": "[uniqueName]-[id]-[local]",
 			+       },
 			+     },

diff --git a/test/__snapshots__/Cli.basictest.js.snap b/test/__snapshots__/Cli.basictest.js.snap
@@ -1475,26 +1475,6 @@ Object {
     "multiple": false,
     "simpleType": "string",
   },
-  "module-generator-css-exports-convention": Object {
-    "configs": Array [
-      Object {
-        "description": "Specifies the convention of exported names.",
-        "multiple": false,
-        "path": "module.generator.css.exportsConvention",
-        "type": "enum",
-        "values": Array [
-          "as-is",
-          "camel-case",
-          "camel-case-only",
-          "dashes",
-          "dashes-only",
-        ],
-      },
-    ],
-    "description": "Specifies the convention of exported names.",
-    "multiple": false,
-    "simpleType": "string",
-  },
   "module-generator-css-exports-only": Object {
     "configs": Array [
       Object {