Revert breaking changes

- Sets default of `exportLocalsConvention` back to "camelCase" when
  using named exports
- Use previous output format for "camelCase"
- Tests for "asIs" option

Author: laverdet

CHANGELOG.md

@@ -2,13 +2,6 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### **7.0.0**
-
-### ⚠ BREAKING CHANGES
-
-* minimum supported `Node.js` version is `16.0.0`
-* default value of `exportLocalsConvention` is now `"asIs"`, even when the `namedExport` option is set
-
 ### [6.8.1](https://github.com/webpack-contrib/css-loader/compare/v6.8.0...v6.8.1) (2023-05-28)
 
 

README.md

@@ -1117,6 +1117,18 @@ Default: `false`
 
 Enables/disables ES modules named export for locals.
 
+> **Warning**
+>
+> Names of locals are converted to camelcase, i.e. the `exportLocalsConvention` option has
+> `camelCaseOnly` value by default. You can set this back to any other valid option but selectors
+> which are not valid JavaScript identifiers may run into problems which do not implement the entire
+> modules specification.
+
+> **Warning**
+>
+> It is not allowed to use JavaScript reserved words in css class names unless
+> `exportLocalsConvention` is `"asIs"`.
+
 **styles.css**
 
 ```css
@@ -1131,9 +1143,11 @@ Enables/disables ES modules named export for locals.
 **index.js**
 
 ```js
-import { "foo-baz" as fooBaz, bar } from "./styles.css";
+import * as styles from "./styles.css";
 
-console.log(fooBaz, bar);
+console.log(styles.fooBaz, styles.bar);
+// or if using `exportLocalsConvention: "asIs"`:
+console.log(styles["foo-baz"], styles.bar);
 ```
 
 You can enable a ES module named export using:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "7.0.0-pre",
+  "version": "6.8.1",
   "description": "css loader module for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/css-loader",
@@ -13,7 +13,7 @@
   },
   "main": "dist/cjs.js",
   "engines": {
-    "node": ">= 16.0.0"
+    "node": ">= 12.13.0"
   },
   "scripts": {
     "start": "npm run build -- -w",

src/utils.js

@@ -587,9 +587,14 @@ function getModulesOptions(rawOptions, exportType, loaderContext) {
     // eslint-disable-next-line no-undefined
     getLocalIdent: undefined,
     namedExport: needNamedExport || false,
-    exportLocalsConvention: "asIs",
+    exportLocalsConvention:
+      (rawModulesOptions.namedExport === true || needNamedExport) &&
+      typeof rawModulesOptions.exportLocalsConvention === "undefined"
+        ? "camelCaseOnly"
+        : "asIs",
     exportOnlyLocals: false,
     ...rawModulesOptions,
+    useExportsAs: rawModulesOptions.exportLocalsConvention === "asIs",
   };
 
   let exportLocalsConventionType;
@@ -672,6 +677,17 @@ function getModulesOptions(rawOptions, exportType, loaderContext) {
         "The 'modules.namedExport' option requires the 'esModules' option to be enabled"
       );
     }
+
+    if (
+      typeof exportLocalsConventionType === "string" &&
+      exportLocalsConventionType !== "asIs" &&
+      exportLocalsConventionType !== "camelCaseOnly" &&
+      exportLocalsConventionType !== "dashesOnly"
+    ) {
+      throw new Error(
+        'The "modules.namedExport" option requires the "modules.exportLocalsConvention" option to be "camelCaseOnly" or "dashesOnly"'
+      );
+    }
   }
 
   return modulesOptions;
@@ -1150,25 +1166,24 @@ function getExportCode(
         : new Set([names]);
 
       for (const name of normalizedNames) {
+        const serializedValue = isTemplateLiteralSupported
+          ? convertToTemplateLiteral(value)
+          : JSON.stringify(value);
         if (options.modules.namedExport) {
-          identifierId += 1;
-          const id = `_${identifierId.toString(16)}`;
-          localsCode += `var ${id} = ${
-            isTemplateLiteralSupported
-              ? convertToTemplateLiteral(value)
-              : JSON.stringify(value)
-          };\n`;
-          localsCode += `export { ${id} as ${JSON.stringify(name)} };\n`;
+          if (options.modules.useExportsAs) {
+            identifierId += 1;
+            const id = `_${identifierId.toString(16)}`;
+            localsCode += `var ${id} = ${serializedValue};\n`;
+            localsCode += `export { ${id} as ${JSON.stringify(name)} };\n`;
+          } else {
+            localsCode += `export var ${name} = ${serializedValue};\n`;
+          }
         } else {
           if (localsCode) {
             localsCode += `,\n`;
           }
 
-          localsCode += `\t${JSON.stringify(name)}: ${
-            isTemplateLiteralSupported
-              ? convertToTemplateLiteral(value)
-              : JSON.stringify(value)
-          }`;
+          localsCode += `\t${JSON.stringify(name)}: ${serializedValue}`;
         }
       }
     };