css-loader 3.5.0 → 3.5.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.
 
+### [3.5.1](https://github.com/webpack-contrib/css-loader/compare/v3.5.0...v3.5.1) (2020-04-07)
+
+
+### Bug Fixes
+
+* don't generate an invalid code for `locals` ([#1072](https://github.com/webpack-contrib/css-loader/issues/1072)) ([866b84a](https://github.com/webpack-contrib/css-loader/commit/866b84acd7fd47651f741ca1e6cf7081c2bbe357))
+
 ## [3.5.0](https://github.com/webpack-contrib/css-loader/compare/v3.4.2...v3.5.0) (2020-04-06)
 
 

package/dist/utils.js

@@ -300,25 +300,26 @@ function getExportCode(exports, exportType, localsConvention, icssReplacements,
   let code = '';
   let localsCode = '';
 
-  const addExportToLocalsCode = (name, value, index) => {
-    const isLastItem = index === exports.length - 1;
-    localsCode += `\t${JSON.stringify(name)}: ${JSON.stringify(value)}${isLastItem ? '' : ',\n'}`;
-  };
+  const addExportToLocalsCode = (name, value) => {
+    if (localsCode) {
+      localsCode += `,\n`;
+    }
 
-  for (const [index, item] of exports.entries()) {
-    const {
-      name,
-      value
-    } = item;
+    localsCode += `\t${JSON.stringify(name)}: ${JSON.stringify(value)}`;
+  };
 
+  for (const {
+    name,
+    value
+  } of exports) {
     switch (localsConvention) {
       case 'camelCase':
         {
-          addExportToLocalsCode(name, value, index);
+          addExportToLocalsCode(name, value);
           const modifiedName = (0, _camelcase.default)(name);
 
           if (modifiedName !== name) {
-            addExportToLocalsCode(modifiedName, value, index);
+            addExportToLocalsCode(modifiedName, value);
           }
 
           break;
@@ -326,17 +327,17 @@ function getExportCode(exports, exportType, localsConvention, icssReplacements,
 
       case 'camelCaseOnly':
         {
-          addExportToLocalsCode((0, _camelcase.default)(name), value, index);
+          addExportToLocalsCode((0, _camelcase.default)(name), value);
           break;
         }
 
       case 'dashes':
         {
           addExportToLocalsCode(name, value);
-          const modifiedName = dashesCamelCase(name, index);
+          const modifiedName = dashesCamelCase(name);
 
           if (modifiedName !== name) {
-            addExportToLocalsCode(modifiedName, value, index);
+            addExportToLocalsCode(modifiedName, value);
           }
 
           break;
@@ -344,13 +345,13 @@ function getExportCode(exports, exportType, localsConvention, icssReplacements,
 
       case 'dashesOnly':
         {
-          addExportToLocalsCode(dashesCamelCase(name), value, index);
+          addExportToLocalsCode(dashesCamelCase(name), value);
           break;
         }
 
       case 'asIs':
       default:
-        addExportToLocalsCode(name, value, index);
+        addExportToLocalsCode(name, value);
         break;
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "css loader module for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/css-loader",