remove exportsConvention for css

webpack · Apr 20, 2024 · bf2571b · bf2571b
1 parent 42160d0
commit bf2571b
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 89 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/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 {

diff --git a/test/__snapshots__/ConfigCacheTestCases.longtest.js.snap b/test/__snapshots__/ConfigCacheTestCases.longtest.js.snap
@@ -3213,16 +3213,16 @@ Array [
 }
 
 .local1,
-.local2 :global .global,
+.local2 .global,
 .local3 {
 	color: green;
 }
 
-:global .global :local .local4 {
+.global ._-_css-modules_style_module_css-local4 {
 	color: yellow;
 }
 
-.local5:global(.global).local6 {
+.local5.global.local6 {
 	color: blue;
 }
 
@@ -3290,7 +3290,7 @@ Array [
 	overflow: hidden;
 }
 
-:global(:global(:local(.nested1)).nested2).nested3 {
+._-_css-modules_style_module_css-nested1.nested2.nested3 {
 	color: pink;
 }
 
@@ -3339,7 +3339,7 @@ Array [
 	--local-color: red;
 }
 
-.globalVars :global {
+.globalVars {
 	color: var(--global-color);
 	--global-color: red;
 }
@@ -3425,7 +3425,7 @@ Array [
 	}
 }
 
-:GLOBAL .globalUpperCase :LOCAL .localUpperCase {
+.globalUpperCase ._-_css-modules_style_module_css-localUpperCase {
 	color: yellow;
 }
 
@@ -3434,7 +3434,7 @@ Array [
 	--LOCAL-COLOR: red;
 }
 
-.globalVarsUpperCase :GLOBAL {
+.globalVarsUpperCase {
 	COLOR: VAR(--GLOBAR-COLOR);
 	--GLOBAR-COLOR: red;
 }
@@ -3598,31 +3598,31 @@ Array [
 .nested-with-local-pseudo {
 	color: red;
 
-	:local .local-nested {
+	._-_css-modules_style_module_css-local-nested {
 		color: red;
 	}
 
-	:global .global-nested {
+	.global-nested {
 		color: red;
 	}
 
-	:local(.local-nested) {
+	._-_css-modules_style_module_css-local-nested {
 		color: red;
 	}
 
-	:global(.global-nested) {
+	.global-nested {
 		color: red;
 	}
 
-	:local .local-nested, :global .global-nested-next {
+	._-_css-modules_style_module_css-local-nested, .global-nested-next {
 		color: red;
 	}
 
-	:local(.local-nested), :global(.global-nested-next) {
+	._-_css-modules_style_module_css-local-nested, .global-nested-next {
 		color: red;
 	}
 
-	:global .foo, .bar {
+	.foo, .bar {
 		color: red;
 	}
 }
@@ -3643,12 +3643,12 @@ Array [
 	}
 }
 
-:global .global-foo {
+.global-foo {
 	.nested-global {
 		color: red;
 	}
 
-	:local .local-in-global {
+	._-_css-modules_style_module_css-local-in-global {
 		color: blue;
 	}
 }
@@ -3661,9 +3661,9 @@ Array [
 	}
 }
 
-:global .class :local .in-local-global-scope,
-:global .class :local .in-local-global-scope,
-:local .class-local-scope :global .in-local-global-scope {
+.class ._-_css-modules_style_module_css-in-local-global-scope,
+.class ._-_css-modules_style_module_css-in-local-global-scope,
+._-_css-modules_style_module_css-class-local-scope .in-local-global-scope {
 	color: red;
 }
 
@@ -3739,14 +3739,14 @@ Array [
 	bar: env(foo, var(--baz));
 }
 
-:global      .global-foo, :local        .bar {
-	:local      .local-in-global       {
+.global-foo, ._-_css-modules_style_module_css-bar {
+	._-_css-modules_style_module_css-local-in-global       {
 		color: blue;
 	}
 
 	@media screen {
-		:global .my-global-class-again,
-		:local .my-global-class-again {
+		.my-global-class-again,
+		._-_css-modules_style_module_css-my-global-class-again {
 			color: red;
 		}
 	}
@@ -3766,12 +3766,12 @@ Array [
 	}
 }
 
-:global .again-global {
+.again-global {
 	color:red;
 }
 
-:global .again-again-global {
-	:global .again-again-global {
+.again-again-global {
+	.again-again-global {
 		color: red;
 	}
 }
@@ -3780,22 +3780,22 @@ Array [
 	--foo: red;
 }
 
-:global .again-again-global {
+.again-again-global {
 	color: var(--foo);
 
-	:global .again-again-global {
+	.again-again-global {
 		color: var(--foo);
 	}
 }
 
-:global .again-again-global {
+.again-again-global {
 	animation: slidein 3s;
 
-	:global .again-again-global, .class, :global(:global(:local(.nested1)).nested2).nested3 {
+	.again-again-global, .class, ._-_css-modules_style_module_css-nested1.nested2.nested3 {
 		animation: slidein 3s;
 	}
 
-  .local2 :global .global,
+  .local2 .global,
 	.local3 {
 		color: red;
 	}
@@ -3850,31 +3850,28 @@ Array [
 	}
 }
 
-:local(.class) {
+._-_style_css-class {
 	color: red;
 }
 
-:local .class {
+._-_style_css-class {
 	color: green;
 }
 
-:global(.class) {
+.class {
 	color: blue;
 }
 
-:global .class {
+.class {
 	color: white;
 }
 
-:export {
-	foo: bar;
-}
 
 .class {
 	animation: test 1s, test;
 }
 
-head{--webpack-main:\\\\.\\\\.\\\\/css-modules\\\\/style\\\\.module\\\\.css,\\\\.\\\\/style\\\\.css;}",
+head{--webpack-main:local4:_-_css-modules_style_module_css-local4/nested1:_-_css-modules_style_module_css-nested1/localUpperCase:_-_css-modules_style_module_css-localUpperCase/local-nested:_-_css-modules_style_module_css-local-nested/local-in-global:_-_css-modules_style_module_css-local-in-global/in-local-global-scope:_-_css-modules_style_module_css-in-local-global-scope/class-local-scope:_-_css-modules_style_module_css-class-local-scope/bar:_-_css-modules_style_module_css-bar/my-global-class-again:_-_css-modules_style_module_css-my-global-class-again/\\\\.\\\\.\\\\/css-modules\\\\/style\\\\.module\\\\.css,class:_-_style_css-class/foo:bar/\\\\.\\\\/style\\\\.css;}",
 ]
 `;