css-loader 3.5.0 → 3.6.0

package/CHANGELOG.md

@@ -2,6 +2,35 @@
 
 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.6.0](https://github.com/webpack-contrib/css-loader/compare/v3.5.3...v3.6.0) (2020-06-13)
+
+
+### Features
+
+* allow `modules.auto` to be a filter function ([#1086](https://github.com/webpack-contrib/css-loader/issues/1086)) ([0902353](https://github.com/webpack-contrib/css-loader/commit/0902353c328d4d18e8ed2755fe9c83c03c53df81))
+
+### [3.5.3](https://github.com/webpack-contrib/css-loader/compare/v3.5.2...v3.5.3) (2020-04-24)
+
+
+### Bug Fixes
+
+* add file from an error to file dependencies ([841423f](https://github.com/webpack-contrib/css-loader/commit/841423fca2932c18f8ac0cf0a1f0012fc0a62fb6))
+* avoid query string in source maps ([#1082](https://github.com/webpack-contrib/css-loader/issues/1082)) ([f64de13](https://github.com/webpack-contrib/css-loader/commit/f64de13f7377eff9501348cf26213212ca696913))
+
+### [3.5.2](https://github.com/webpack-contrib/css-loader/compare/v3.5.1...v3.5.2) (2020-04-10)
+
+
+### Bug Fixes
+
+* schema for the `modules.auto` option ([#1075](https://github.com/webpack-contrib/css-loader/issues/1075)) ([8c9ffe7](https://github.com/webpack-contrib/css-loader/commit/8c9ffe7c6df11232b63173c757baa71ed36f6145))
+
+### [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/README.md

@@ -542,7 +542,7 @@ module.exports = {
 
 ##### `auto`
 
-Type: `Boolean|RegExp`
+Type: `Boolean|RegExp|Function`
 Default: `'undefined'`
 
 Allows auto enable css modules based on filename.
@@ -576,7 +576,7 @@ module.exports = {
 
 ###### `RegExp`
 
-Enable css modules for files based on a filename and satisfying your regex.
+Enable css modules for files based on the filename satisfying your regex check.
 
 **webpack.config.js**
 
@@ -598,6 +598,30 @@ module.exports = {
 };
 ```
 
+###### `Function`
+
+Enable css modules for files based on the filename satisfying your filter function check.
+
+**webpack.config.js**
+
+```js
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.css$/i,
+        loader: 'css-loader',
+        options: {
+          modules: {
+            auto: (resourcePath) => resourcePath.endsWith('.custom-module.css'),
+          },
+        },
+      },
+    ],
+  },
+};
+```
+
 ##### `mode`
 
 Type: `String|Function`
@@ -1117,8 +1141,8 @@ Please take a moment to read our contributing guidelines if you haven't yet done
 [node-url]: https://nodejs.org
 [deps]: https://david-dm.org/webpack-contrib/css-loader.svg
 [deps-url]: https://david-dm.org/webpack-contrib/css-loader
-[tests]: https://dev.azure.com/webpack-contrib/css-loader/_apis/build/status/webpack-contrib.css-loader?branchName=master
-[tests-url]: https://dev.azure.com/webpack-contrib/css-loader/_build/latest?definitionId=2&branchName=master
+[tests]: https://github.com/webpack-contrib/css-loader/workflows/css-loader/badge.svg
+[tests-url]: https://github.com/webpack-contrib/css-loader/actions
 [cover]: https://codecov.io/gh/webpack-contrib/css-loader/branch/master/graph/badge.svg
 [cover-url]: https://codecov.io/gh/webpack-contrib/css-loader
 [chat]: https://badges.gitter.im/webpack/webpack.svg

package/dist/index.js

@@ -81,8 +81,8 @@ function loader(content, map, meta) {
   }
 
   (0, _postcss.default)(plugins).process(content, {
-    from: this.remainingRequest.split('!').pop(),
-    to: this.currentRequest.split('!').pop(),
+    from: this.resourcePath,
+    to: this.resourcePath,
     map: options.sourceMap ? {
       // Some loaders (example `"postcss-loader": "1.x.x"`) always generates source map, we should remove it
       prev: sourceMap && map ? (0, _utils.normalizeSourceMap)(map) : null,
@@ -134,6 +134,10 @@ function loader(content, map, meta) {
     const exportCode = (0, _utils.getExportCode)(exports, exportType, localsConvention, icssReplacements, esModule);
     return callback(null, `${importCode}${moduleCode}${exportCode}`);
   }).catch(error => {
+    if (error.file) {
+      this.addDependency(error.file);
+    }
+
     callback(error.name === 'CssSyntaxError' ? new _CssSyntaxError.default(error) : error);
   });
 }

package/dist/options.json

@@ -39,7 +39,10 @@
             "auto": {
               "anyOf": [
                 {
-                  "type": "object"
+                  "instanceof": "RegExp"
+                },
+                {
+                  "instanceof": "Function"
                 },
                 {
                   "type": "boolean"

package/dist/utils.js

@@ -124,6 +124,10 @@ function shouldUseModulesPlugins(modules, resourcePath) {
     return modules.auto.test(resourcePath);
   }
 
+  if (typeof modules.auto === 'function') {
+    return modules.auto(resourcePath);
+  }
+
   return true;
 }
 
@@ -300,25 +304,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 +331,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 +349,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.6.0",
   "description": "css loader module for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/css-loader",
@@ -48,48 +48,46 @@
     "icss-utils": "^4.1.1",
     "loader-utils": "^1.2.3",
     "normalize-path": "^3.0.0",
-    "postcss": "^7.0.27",
+    "postcss": "^7.0.32",
     "postcss-modules-extract-imports": "^2.0.0",
     "postcss-modules-local-by-default": "^3.0.2",
     "postcss-modules-scope": "^2.2.0",
     "postcss-modules-values": "^3.0.0",
-    "postcss-value-parser": "^4.0.3",
-    "schema-utils": "^2.6.5",
+    "postcss-value-parser": "^4.1.0",
+    "schema-utils": "^2.7.0",
     "semver": "^6.3.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.8.4",
-    "@babel/core": "^7.9.0",
-    "@babel/preset-env": "^7.9.0",
+    "@babel/cli": "^7.10.1",
+    "@babel/core": "^7.10.2",
+    "@babel/preset-env": "^7.10.2",
     "@commitlint/cli": "^8.3.5",
     "@commitlint/config-conventional": "^8.3.4",
     "@webpack-contrib/defaults": "^6.3.0",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
-    "babel-jest": "^25.2.6",
-    "commitlint-azure-pipelines-cli": "^1.0.3",
+    "babel-jest": "^25.5.1",
     "cross-env": "^7.0.2",
     "del": "^5.1.0",
-    "del-cli": "^3.0.0",
+    "del-cli": "^3.0.1",
     "es-check": "^5.1.0",
     "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.10.1",
-    "eslint-plugin-import": "^2.20.2",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-import": "^2.21.2",
     "file-loader": "^6.0.0",
-    "husky": "^4.2.3",
-    "jest": "^25.2.7",
-    "jest-junit": "^10.0.0",
-    "lint-staged": "^10.1.2",
-    "memfs": "^3.1.2",
+    "husky": "^4.2.5",
+    "jest": "^25.5.4",
+    "lint-staged": "^10.2.10",
+    "memfs": "^3.2.0",
     "npm-run-all": "^4.1.5",
     "postcss-loader": "^3.0.0",
     "postcss-preset-env": "^6.7.0",
-    "prettier": "^2.0.3",
-    "sass": "^1.26.3",
+    "prettier": "^2.0.5",
+    "sass": "^1.26.8",
     "sass-loader": "^8.0.2",
-    "standard-version": "^7.1.0",
+    "standard-version": "^8.0.0",
     "strip-ansi": "^6.0.0",
-    "url-loader": "^4.0.0",
-    "webpack": "^4.42.1"
+    "url-loader": "^4.1.0",
+    "webpack": "^4.43.0"
   },
   "keywords": [
     "webpack",