css-loader 5.1.0 → 5.1.4

package/CHANGELOG.md

@@ -2,6 +2,36 @@
 
 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.
 
+### [5.1.4](https://github.com/webpack-contrib/css-loader/compare/v5.1.3...v5.1.4) (2021-03-24)
+
+
+### Bug Fixes
+
+* crash with thread-loader ([#1281](https://github.com/webpack-contrib/css-loader/issues/1281)) ([7095a7c](https://github.com/webpack-contrib/css-loader/commit/7095a7ca7d985d5447aed80cf3e41a4f8c19b954))
+
+### [5.1.3](https://github.com/webpack-contrib/css-loader/compare/v5.1.2...v5.1.3) (2021-03-15)
+
+
+### Bug Fixes
+
+* the `auto` option works using inline module syntax ([#1274](https://github.com/webpack-contrib/css-loader/issues/1274)) ([1db2f4d](https://github.com/webpack-contrib/css-loader/commit/1db2f4df3ff9ae8f0667a2304853c8e7cdd0afc1))
+* ident generation for CSS modules using inline module syntax ([#1274](https://github.com/webpack-contrib/css-loader/issues/1274)) ([1db2f4d](https://github.com/webpack-contrib/css-loader/commit/1db2f4df3ff9ae8f0667a2304853c8e7cdd0afc1))
+
+### [5.1.2](https://github.com/webpack-contrib/css-loader/compare/v5.1.1...v5.1.2) (2021-03-10)
+
+
+### Bug Fixes
+
+* handling `@import` with spaces before and after and any extensions ([#1272](https://github.com/webpack-contrib/css-loader/issues/1272)) ([0c47cf7](https://github.com/webpack-contrib/css-loader/commit/0c47cf7ccbe3635900e8e8840650f69a7eca004d))
+* inline loader syntax in `@import` and modules ([3f49ed0](https://github.com/webpack-contrib/css-loader/commit/3f49ed0864457f9467f560856377c890c392aee7))
+
+### [5.1.1](https://github.com/webpack-contrib/css-loader/compare/v5.1.0...v5.1.1) (2021-03-01)
+
+
+### Bug Fixes
+
+* crash on modified AST from `postcss-loader` ([#1268](https://github.com/webpack-contrib/css-loader/issues/1268)) ([d2a1a84](https://github.com/webpack-contrib/css-loader/commit/d2a1a84afc63fdfb2a4ce6668ed9f2d7f1ba56ca))
+
 ## [5.1.0](https://github.com/webpack-contrib/css-loader/compare/v5.0.2...v5.1.0) (2021-02-25)
 
 

package/dist/index.js

@@ -63,8 +63,7 @@ async function loader(content, map, meta) {
       conditionNames: ["style"],
       extensions: [".css"],
       mainFields: ["css", "style", "main", "..."],
-      mainFiles: ["index", "..."],
-      restrictions: [/\.css$/i]
+      mainFiles: ["index", "..."]
     });
     plugins.push((0, _plugins.importParser)({
       imports: importPluginImports,
@@ -73,7 +72,7 @@ async function loader(content, map, meta) {
       rootContext: this.rootContext,
       filter: (0, _utils.getFilter)(options.import, this.resourcePath),
       resolver,
-      urlHandler: url => (0, _loaderUtils.stringifyRequest)(this, (0, _utils.getPreRequester)(this)(options.importLoaders) + url)
+      urlHandler: url => (0, _loaderUtils.stringifyRequest)(this, (0, _utils.combineRequests)((0, _utils.getPreRequester)(this)(options.importLoaders), url))
     }));
   }
 
@@ -115,7 +114,7 @@ async function loader(content, map, meta) {
       context: this.context,
       rootContext: this.rootContext,
       resolver: icssResolver,
-      urlHandler: url => (0, _loaderUtils.stringifyRequest)(this, (0, _utils.getPreRequester)(this)(options.importLoaders) + url)
+      urlHandler: url => (0, _loaderUtils.stringifyRequest)(this, (0, _utils.combineRequests)((0, _utils.getPreRequester)(this)(options.importLoaders), url))
     }));
   } // Reuse CSS AST (PostCSS AST e.g 'postcss-loader') to avoid reparsing
 

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

@@ -17,7 +17,7 @@ function visitor(result, parsedResults, node, key) {
     return;
   }
 
-  if (node.raws.afterName && node.raws.afterName.trim().length > 0) {
+  if (node.raws && node.raws.afterName && node.raws.afterName.trim().length > 0) {
     const lastCommentIndex = node.raws.afterName.lastIndexOf("/*");
     const matched = node.raws.afterName.slice(lastCommentIndex).match(_utils.webpackIgnoreCommentRegexp);
 

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

@@ -70,10 +70,10 @@ function visitor(result, parsedResults, node, key) {
     return;
   }
 
-  const parsed = (0, _postcssValueParser.default)(typeof node.raws.value === "undefined" ? node[key] : node.raws.value.raw);
+  const parsed = (0, _postcssValueParser.default)(node.raws && node.raws.value && node.raws.value.raw ? node.raws.value.raw : node[key]);
   let inBetween;
 
-  if (typeof node.raws.between !== "undefined") {
+  if (node.raws && node.raws.between) {
     const lastCommentIndex = node.raws.between.lastIndexOf("/*");
     const matched = node.raws.between.slice(lastCommentIndex).match(_utils.webpackIgnoreCommentRegexp);
 

package/dist/utils.js

@@ -21,6 +21,7 @@ exports.getExportCode = getExportCode;
 exports.resolveRequests = resolveRequests;
 exports.isUrlRequestable = isUrlRequestable;
 exports.sort = sort;
+exports.combineRequests = combineRequests;
 exports.webpackIgnoreCommentRegexp = void 0;
 
 var _url = require("url");
@@ -86,21 +87,21 @@ function escapeLocalIdent(localident) {
 }
 
 function defaultGetLocalIdent(loaderContext, localIdentName, localName, options) {
-  const {
-    context,
-    hashPrefix
-  } = options;
-  const {
-    resourcePath
-  } = loaderContext;
-  const request = normalizePath(_path.default.relative(context, resourcePath)); // eslint-disable-next-line no-param-reassign
+  let relativeMatchResource = ""; // eslint-disable-next-line no-underscore-dangle
+
+  if (loaderContext._module && loaderContext._module.matchResource) {
+    relativeMatchResource = `${normalizePath( // eslint-disable-next-line no-underscore-dangle
+    _path.default.relative(options.context, loaderContext._module.matchResource))}\x00`;
+  }
 
-  options.content = `${hashPrefix + request}\x00${localName}`;
+  const relativeResourcePath = normalizePath(_path.default.relative(options.context, loaderContext.resourcePath)); // eslint-disable-next-line no-param-reassign
+
+  options.content = `${options.hashPrefix}${relativeMatchResource}${relativeResourcePath}\x00${localName}`;
   return (0, _loaderUtils.interpolateName)(loaderContext, localIdentName, options);
 }
 
 function normalizeUrl(url, isStringValue) {
-  let normalizedUrl = url;
+  let normalizedUrl = url.replace(/^( |\t\n|\r\n|\r|\f)*/g, "").replace(/( |\t\n|\r\n|\r|\f)*$/g, "");
 
   if (isStringValue && /\\(\n|\r\n|\r|\f)/.test(normalizedUrl)) {
     normalizedUrl = normalizedUrl.replace(/\\(\n|\r\n|\r|\f)/g, "");
@@ -143,9 +144,8 @@ const moduleRegExp = /\.module(s)?\.\w+$/i;
 const icssRegExp = /\.icss\.\w+$/i;
 
 function getModulesOptions(rawOptions, loaderContext) {
-  const {
-    resourcePath
-  } = loaderContext;
+  const resourcePath = // eslint-disable-next-line no-underscore-dangle
+  loaderContext._module && loaderContext._module.matchResource || loaderContext.resourcePath;
   let isIcss;
 
   if (typeof rawOptions.modules === "undefined") {
@@ -643,4 +643,9 @@ function isUrlRequestable(url) {
 
 function sort(a, b) {
   return a.index - b.index;
+}
+
+function combineRequests(preRequest, url) {
+  const idx = url.indexOf("!=!");
+  return idx !== -1 ? url.slice(0, idx + 3) + preRequest + url.slice(idx + 3) : preRequest + url;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "5.1.0",
+  "version": "5.1.4",
   "description": "css loader module for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/css-loader",
@@ -33,8 +33,7 @@
     "pretest": "npm run lint",
     "test": "npm run test:coverage",
     "prepare": "npm run build",
-    "release": "standard-version",
-    "defaults": "webpack-defaults"
+    "release": "standard-version"
   },
   "files": [
     "dist"
@@ -47,7 +46,7 @@
     "cssesc": "^3.0.0",
     "icss-utils": "^5.1.0",
     "loader-utils": "^2.0.0",
-    "postcss": "^8.2.6",
+    "postcss": "^8.2.8",
     "postcss-modules-extract-imports": "^3.0.0",
     "postcss-modules-local-by-default": "^4.0.0",
     "postcss-modules-scope": "^3.0.0",
@@ -57,20 +56,19 @@
     "semver": "^7.3.4"
   },
   "devDependencies": {
-    "@babel/cli": "^7.12.17",
-    "@babel/core": "^7.12.17",
-    "@babel/preset-env": "^7.12.17",
-    "@commitlint/cli": "^11.0.0",
-    "@commitlint/config-conventional": "^11.0.0",
-    "@webpack-contrib/defaults": "^6.3.0",
+    "@babel/cli": "^7.13.10",
+    "@babel/core": "^7.13.10",
+    "@babel/preset-env": "^7.13.10",
+    "@commitlint/cli": "^12.0.1",
+    "@commitlint/config-conventional": "^12.0.1",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
     "babel-jest": "^26.6.3",
     "cross-env": "^7.0.3",
     "del": "^6.0.0",
     "del-cli": "^3.0.1",
-    "es-check": "^5.2.0",
-    "eslint": "^7.20.0",
-    "eslint-config-prettier": "^7.2.0",
+    "es-check": "^5.2.3",
+    "eslint": "^7.22.0",
+    "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-import": "^2.22.1",
     "file-loader": "^6.2.0",
     "husky": "^4.3.8",
@@ -79,7 +77,7 @@
     "less-loader": "^7.1.0",
     "lint-staged": "^10.5.4",
     "memfs": "^3.2.0",
-    "mini-css-extract-plugin": "^1.3.8",
+    "mini-css-extract-plugin": "^1.3.9",
     "npm-run-all": "^4.1.5",
     "postcss-loader": "^4.0.4",
     "postcss-preset-env": "^6.7.0",
@@ -92,7 +90,7 @@
     "stylus": "^0.54.8",
     "stylus-loader": "^4.3.0",
     "url-loader": "^4.1.1",
-    "webpack": "^5.23.0"
+    "webpack": "^5.26.0"
   },
   "keywords": [
     "webpack",