css-loader 6.8.0 → 6.9.0

package/README.md

@@ -1538,7 +1538,7 @@ import "./styles.css";
 
 > **Warning**
 >
-> The `esModules` option should be enabled if you want to use it with [`CSS modules`](https://github.com/webpack-contrib/css-loader#modules), by default for locals will be used [named export](https://github.com/webpack-contrib/css-loader#namedexport).
+> The `esModule` option should be enabled if you want to use it with [`CSS modules`](https://github.com/webpack-contrib/css-loader#modules), by default for locals will be used [named export](https://github.com/webpack-contrib/css-loader#namedexport).
 
 The default export is `string`.
 
@@ -1577,7 +1577,7 @@ console.log(sheet);
 
 > **Warning**
 >
-> The `esModules` option should be enabled if you want to use it with [`CSS modules`](https://github.com/webpack-contrib/css-loader#modules), by default for locals will be used [named export](https://github.com/webpack-contrib/css-loader#namedexport).
+> The `esModule` option should be enabled if you want to use it with [`CSS modules`](https://github.com/webpack-contrib/css-loader#modules), by default for locals will be used [named export](https://github.com/webpack-contrib/css-loader#namedexport).
 
 > **Warning**
 >
@@ -1688,7 +1688,7 @@ module.exports = {
 
 For `production` builds it's recommended to extract the CSS from your bundle being able to use parallel loading of CSS/JS resources later on.
 This can be achieved by using the [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin), because it creates separate css files.
-For `development` mode (including `webpack-dev-server`) you can use [style-loader](https://github.com/webpack-contrib/style-loader), because it injects CSS into the DOM using multiple <style></style> and works faster.
+For `development` mode (including `webpack-dev-server`) you can use [style-loader](https://github.com/webpack-contrib/style-loader), because it injects CSS into the DOM using multiple `<style></style>` and works faster.
 
 > **Note**
 >

package/dist/index.js

@@ -19,7 +19,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 async function loader(content, map, meta) {
   const rawOptions = this.getOptions(_options.default);
   const callback = this.async();
-  if (this._compiler && this._compiler.options && this._compiler.options.experiments && this._compiler.options.experiments.css && this._module && this._module.type === "css") {
+  if (this._compiler && this._compiler.options && this._compiler.options.experiments && this._compiler.options.experiments.css && this._module && (this._module.type === "css" || this._module.type === "css/auto" || this._module.type === "css/global" || this._module.type === "css/module")) {
     this.emitWarning(new Error('You can\'t use `experiments.css` (`experiments.futureDefaults` enable built-in CSS support by default) and `css-loader` together, please set `experiments.css` to `false` or set `{ type: "javascript/auto" }` for rules with `css-loader` in your webpack config (now css-loader does nothing).'));
     callback(null, content, map, meta);
     return;
@@ -79,7 +79,6 @@ async function loader(content, map, meta) {
       // Support data urls as input in new URL added in webpack@5.38.0
     }));
   }
-
   const icssPluginImports = [];
   const icssPluginApi = [];
   const needToUseIcssPlugin = (0, _utils.shouldUseIcssPlugin)(options);

package/dist/plugins/postcss-icss-parser.js

@@ -110,5 +110,4 @@ const plugin = (options = {}) => {
   };
 };
 plugin.postcss = true;
-var _default = plugin;
-exports.default = _default;
+var _default = exports.default = plugin;

package/dist/plugins/postcss-import-parser.js

@@ -279,5 +279,4 @@ const plugin = (options = {}) => {
   };
 };
 plugin.postcss = true;
-var _default = plugin;
-exports.default = _default;
+var _default = exports.default = plugin;

package/dist/plugins/postcss-url-parser.js

@@ -353,5 +353,4 @@ const plugin = (options = {}) => {
   };
 };
 plugin.postcss = true;
-var _default = plugin;
-exports.default = _default;
+var _default = exports.default = plugin;

package/dist/utils.js

@@ -41,8 +41,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
   Author Tobias Koppers @sokra
 */
 
-const WEBPACK_IGNORE_COMMENT_REGEXP = /webpackIgnore:(\s+)?(true|false)/;
-exports.WEBPACK_IGNORE_COMMENT_REGEXP = WEBPACK_IGNORE_COMMENT_REGEXP;
+const WEBPACK_IGNORE_COMMENT_REGEXP = exports.WEBPACK_IGNORE_COMMENT_REGEXP = /webpackIgnore:(\s+)?(true|false)/;
 const matchRelativePath = /^\.\.?[/\\]/;
 function isAbsolutePath(str) {
   return _path.default.posix.isAbsolute(str) || _path.default.win32.isAbsolute(str);
@@ -545,7 +544,7 @@ function getModulesOptions(rawOptions, exportType, loaderContext) {
   }
   if (needNamedExport) {
     if (rawOptions.esModule === false) {
-      throw new Error("The 'exportType' option with the 'css-style-sheet' or 'string' value requires the 'esModules' option to be enabled");
+      throw new Error("The 'exportType' option with the 'css-style-sheet' or 'string' value requires the 'esModule' option to be enabled");
     }
     if (modulesOptions.namedExport === false) {
       throw new Error("The 'exportType' option with the 'css-style-sheet' or 'string' value requires the 'modules.namedExport' option to be enabled");
@@ -553,7 +552,7 @@ function getModulesOptions(rawOptions, exportType, loaderContext) {
   }
   if (modulesOptions.namedExport === true) {
     if (rawOptions.esModule === false) {
-      throw new Error("The 'modules.namedExport' option requires the 'esModules' option to be enabled");
+      throw new Error("The 'modules.namedExport' option requires the 'esModule' option to be enabled");
     }
     if (typeof exportLocalsConventionType === "string" && exportLocalsConventionType !== "camelCaseOnly" && exportLocalsConventionType !== "dashesOnly") {
       throw new Error('The "modules.namedExport" option requires the "modules.exportLocalsConvention" option to be "camelCaseOnly" or "dashesOnly"');
@@ -619,7 +618,7 @@ function getModulesPlugins(options, loaderContext) {
     plugins = [_postcssModulesValues.default, (0, _postcssModulesLocalByDefault.default)({
       mode
     }), (0, _postcssModulesExtractImports.default)(), (0, _postcssModulesScope.default)({
-      generateScopedName(exportName) {
+      generateScopedName(exportName, resourceFile, rawCss, node) {
         let localIdent;
         if (typeof getLocalIdent !== "undefined") {
           localIdent = getLocalIdent(loaderContext, localIdentName, unescape(exportName), {
@@ -629,7 +628,8 @@ function getModulesPlugins(options, loaderContext) {
             hashDigest: localIdentHashDigest,
             hashDigestLength: localIdentHashDigestLength,
             hashStrategy,
-            regExp: localIdentRegExp
+            regExp: localIdentRegExp,
+            node
           });
         }
 
@@ -643,7 +643,8 @@ function getModulesPlugins(options, loaderContext) {
             hashDigest: localIdentHashDigest,
             hashDigestLength: localIdentHashDigestLength,
             hashStrategy,
-            regExp: localIdentRegExp
+            regExp: localIdentRegExp,
+            node
           });
           return escapeLocalIdent(localIdent).replace(/\\\[local\\]/gi, exportName);
         }
@@ -1009,37 +1010,41 @@ function combineRequests(preRequest, url) {
   const idx = url.indexOf("!=!");
   return idx !== -1 ? url.slice(0, idx + 3) + preRequest + url.slice(idx + 3) : preRequest + url;
 }
-function warningFactory(obj) {
+function warningFactory(warning) {
   let message = "";
-  if (typeof obj.line !== "undefined") {
-    message += `(${obj.line}:${obj.column}) `;
+  if (typeof warning.line !== "undefined") {
+    message += `(${warning.line}:${warning.column}) `;
   }
-  if (typeof obj.plugin !== "undefined") {
-    message += `from "${obj.plugin}" plugin: `;
+  if (typeof warning.plugin !== "undefined") {
+    message += `from "${warning.plugin}" plugin: `;
   }
-  message += obj.text;
-  if (obj.node) {
-    message += `\n\nCode:\n  ${obj.node.toString()}\n`;
+  message += warning.text;
+  if (warning.node) {
+    message += `\n\nCode:\n  ${warning.node.toString()}\n`;
   }
-  const warning = new Error(message);
-  warning.stack = null;
-  return warning;
+  const obj = new Error(message, {
+    cause: warning
+  });
+  obj.stack = null;
+  return obj;
 }
-function syntaxErrorFactory(obj) {
+function syntaxErrorFactory(error) {
   let message = "\nSyntaxError\n\n";
-  if (typeof obj.line !== "undefined") {
-    message += `(${obj.line}:${obj.column}) `;
+  if (typeof error.line !== "undefined") {
+    message += `(${error.line}:${error.column}) `;
   }
-  if (typeof obj.plugin !== "undefined") {
-    message += `from "${obj.plugin}" plugin: `;
+  if (typeof error.plugin !== "undefined") {
+    message += `from "${error.plugin}" plugin: `;
   }
-  message += obj.file ? `${obj.file} ` : "<css input> ";
-  message += `${obj.reason}`;
-  const code = obj.showSourceCode();
+  message += error.file ? `${error.file} ` : "<css input> ";
+  message += `${error.reason}`;
+  const code = error.showSourceCode();
   if (code) {
     message += `\n\n${code}\n`;
   }
-  const error = new Error(message);
-  error.stack = null;
-  return error;
+  const obj = new Error(message, {
+    cause: error
+  });
+  obj.stack = null;
+  return obj;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "6.8.0",
+  "version": "6.9.0",
   "description": "css loader module for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/css-loader",
@@ -47,44 +47,44 @@
   },
   "dependencies": {
     "icss-utils": "^5.1.0",
-    "postcss": "^8.4.21",
+    "postcss": "^8.4.31",
     "postcss-modules-extract-imports": "^3.0.0",
     "postcss-modules-local-by-default": "^4.0.3",
-    "postcss-modules-scope": "^3.0.0",
+    "postcss-modules-scope": "^3.1.0",
     "postcss-modules-values": "^4.0.0",
     "postcss-value-parser": "^4.2.0",
-    "semver": "^7.3.8"
+    "semver": "^7.5.4"
   },
   "devDependencies": {
-    "@babel/cli": "^7.21.0",
-    "@babel/core": "^7.21.4",
-    "@babel/preset-env": "^7.21.4",
+    "@babel/cli": "^7.23.4",
+    "@babel/core": "^7.23.7",
+    "@babel/preset-env": "^7.23.7",
     "@commitlint/cli": "^16.3.0",
     "@commitlint/config-conventional": "^16.2.4",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
     "babel-jest": "^28.1.3",
     "cross-env": "^7.0.3",
-    "cspell": "^6.31.1",
+    "cspell": "^6.31.2",
     "del": "^6.1.1",
     "del-cli": "^4.0.1",
     "es-check": "^7.1.0",
-    "eslint": "^8.37.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint": "^8.54.0",
+    "eslint-config-prettier": "^8.9.0",
+    "eslint-plugin-import": "^2.29.0",
     "file-loader": "^6.2.0",
     "husky": "^7.0.1",
     "jest": "^28.1.3",
     "jest-environment-jsdom": "^28.1.3",
-    "less": "^4.1.3",
+    "less": "^4.2.0",
     "less-loader": "^10.0.1",
     "lint-staged": "^12.5.0",
-    "memfs": "^3.4.13",
+    "memfs": "^3.5.3",
     "mini-css-extract-plugin": "^2.7.5",
     "npm-run-all": "^4.1.5",
     "postcss-loader": "^6.2.1",
     "postcss-preset-env": "^7.8.3",
     "prettier": "^2.8.7",
-    "sass": "^1.60.0",
+    "sass": "^1.69.7",
     "sass-loader": "^12.6.0",
     "standard-version": "^9.5.0",
     "strip-ansi": "^6.0.0",
@@ -92,7 +92,7 @@
     "stylus": "^0.59.0",
     "stylus-loader": "^6.1.0",
     "url-loader": "^4.1.1",
-    "webpack": "^5.77.0"
+    "webpack": "^5.89.0"
   },
   "keywords": [
     "webpack",