css-loader 5.2.0 → 5.2.4

package/CHANGELOG.md

@@ -2,6 +2,33 @@
 
 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.2.4](https://github.com/webpack-contrib/css-loader/compare/v5.2.3...v5.2.4) (2021-04-19)
+
+
+### Bug Fixes
+
+* do not crash on 'false' aliases ([#1292](https://github.com/webpack-contrib/css-loader/issues/1292)) ([e913cb1](https://github.com/webpack-contrib/css-loader/commit/e913cb1d73a4f5c3c4464e0446a885e9f677a005))
+
+### [5.2.3](https://github.com/webpack-contrib/css-loader/compare/v5.2.2...v5.2.3) (2021-04-19)
+
+### Bug Fixes
+
+* improve performance
+
+### [5.2.2](https://github.com/webpack-contrib/css-loader/compare/v5.2.1...v5.2.2) (2021-04-16)
+
+
+### Bug Fixes
+
+* avoid escape nonASCII characters in local names ([0722733](https://github.com/webpack-contrib/css-loader/commit/072273308a8ab4b7efdae31440689dc81978ca1d))
+
+### [5.2.1](https://github.com/webpack-contrib/css-loader/compare/v5.2.0...v5.2.1) (2021-04-09)
+
+
+### Bug Fixes
+
+* do not crash on unescaped svg data uri ([#1288](https://github.com/webpack-contrib/css-loader/issues/1288)) ([4f289c5](https://github.com/webpack-contrib/css-loader/commit/4f289c5e4df6c666fdf6dd3402560ae74d4bf7ee))
+
 ## [5.2.0](https://github.com/webpack-contrib/css-loader/compare/v5.1.4...v5.2.0) (2021-03-24)
 
 

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

@@ -47,6 +47,12 @@ const plugin = (options = {}) => {
             context
           } = options;
           const resolvedUrl = await (0, _utils.resolveRequests)(resolver, context, [...new Set([normalizedUrl, request])]);
+
+          if (!resolvedUrl) {
+            return;
+          } // eslint-disable-next-line consistent-return
+
+
           return {
             url: resolvedUrl,
             prefix,
@@ -60,12 +66,14 @@ const plugin = (options = {}) => {
       const results = await Promise.all(tasks);
 
       for (let index = 0; index <= results.length - 1; index++) {
-        const {
-          url,
-          prefix,
-          tokens
-        } = results[index];
-        const newUrl = prefix ? `${prefix}!${url}` : url;
+        const item = results[index];
+
+        if (!item) {
+          // eslint-disable-next-line no-continue
+          continue;
+        }
+
+        const newUrl = item.prefix ? `${item.prefix}!${item.url}` : item.url;
         const importKey = newUrl;
         let importName = imports.get(importKey);
 
@@ -85,9 +93,9 @@ const plugin = (options = {}) => {
           });
         }
 
-        for (const [replacementIndex, token] of Object.keys(tokens).entries()) {
+        for (const [replacementIndex, token] of Object.keys(item.tokens).entries()) {
           const replacementName = `___CSS_LOADER_ICSS_IMPORT_${index}_REPLACEMENT_${replacementIndex}___`;
-          const localName = tokens[token];
+          const localName = item.tokens[token];
           importReplacements[token] = replacementName;
           options.replacements.push({
             replacementName,

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

@@ -19,7 +19,7 @@ function parseNode(atRule, key) {
 
   if (atRule.raws && atRule.raws.afterName && atRule.raws.afterName.trim().length > 0) {
     const lastCommentIndex = atRule.raws.afterName.lastIndexOf("/*");
-    const matched = atRule.raws.afterName.slice(lastCommentIndex).match(_utils.webpackIgnoreCommentRegexp);
+    const matched = atRule.raws.afterName.slice(lastCommentIndex).match(_utils.WEBPACK_IGNORE_COMMENT_REGEXP);
 
     if (matched && matched[2] === "true") {
       return;
@@ -29,7 +29,7 @@ function parseNode(atRule, key) {
   const prevNode = atRule.prev();
 
   if (prevNode && prevNode.type === "comment") {
-    const matched = prevNode.text.match(_utils.webpackIgnoreCommentRegexp);
+    const matched = prevNode.text.match(_utils.WEBPACK_IGNORE_COMMENT_REGEXP);
 
     if (matched && matched[2] === "true") {
       return;
@@ -155,12 +155,10 @@ const plugin = (options = {}) => {
               const needKeep = await options.filter(url, media);
 
               if (!needKeep) {
-                return null;
+                return;
               }
             }
 
-            atRule.remove();
-
             if (isRequestable) {
               const request = (0, _utils.requestify)(url, options.rootContext);
               const {
@@ -168,6 +166,13 @@ const plugin = (options = {}) => {
                 context
               } = options;
               const resolvedUrl = await (0, _utils.resolveRequests)(resolver, context, [...new Set([request, url])]);
+
+              if (!resolvedUrl) {
+                return;
+              }
+
+              atRule.remove(); // eslint-disable-next-line consistent-return
+
               return {
                 url: resolvedUrl,
                 media,
@@ -176,6 +181,8 @@ const plugin = (options = {}) => {
               };
             }
 
+            atRule.remove(); // eslint-disable-next-line consistent-return
+
             return {
               url,
               media,

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

@@ -45,7 +45,7 @@ function getWebpackIgnoreCommentValue(index, nodes, inBetween) {
     return;
   }
 
-  const matched = prevValueNode.value.match(_utils.webpackIgnoreCommentRegexp);
+  const matched = prevValueNode.value.match(_utils.WEBPACK_IGNORE_COMMENT_REGEXP);
   return matched && matched[2] === "true";
 }
 
@@ -74,7 +74,7 @@ function parseDeclaration(declaration, key, result) {
 
   if (declaration.raws && declaration.raws.between) {
     const lastCommentIndex = declaration.raws.between.lastIndexOf("/*");
-    const matched = declaration.raws.between.slice(lastCommentIndex).match(_utils.webpackIgnoreCommentRegexp);
+    const matched = declaration.raws.between.slice(lastCommentIndex).match(_utils.WEBPACK_IGNORE_COMMENT_REGEXP);
 
     if (matched) {
       inBetween = matched[2] === "true";
@@ -85,7 +85,7 @@ function parseDeclaration(declaration, key, result) {
   const prevNode = declaration.prev();
 
   if (prevNode && prevNode.type === "comment") {
-    const matched = prevNode.text.match(_utils.webpackIgnoreCommentRegexp);
+    const matched = prevNode.text.match(_utils.WEBPACK_IGNORE_COMMENT_REGEXP);
 
     if (matched) {
       isIgnoreOnDeclaration = matched[2] === "true";
@@ -268,7 +268,7 @@ const plugin = (options = {}) => {
               const needKeep = await options.filter(url);
 
               if (!needKeep) {
-                return null;
+                return;
               }
             }
 
@@ -282,18 +282,23 @@ const plugin = (options = {}) => {
               context
             } = options;
             const resolvedUrl = await (0, _utils.resolveRequests)(resolver, context, [...new Set([request, url])]);
+
+            if (!resolvedUrl) {
+              return;
+            } // eslint-disable-next-line consistent-return
+
+
             return { ...parsedDeclaration,
               url: resolvedUrl,
               hash
             };
           }));
-          const results = await Promise.all(resolvedDeclarations);
           const urlToNameMap = new Map();
           const urlToReplacementMap = new Map();
           let hasUrlImportHelper = false;
 
-          for (let index = 0; index <= results.length - 1; index++) {
-            const item = results[index];
+          for (let index = 0; index <= resolvedDeclarations.length - 1; index++) {
+            const item = resolvedDeclarations[index];
 
             if (!item) {
               // eslint-disable-next-line no-continue

package/dist/utils.js

@@ -22,7 +22,7 @@ exports.resolveRequests = resolveRequests;
 exports.isUrlRequestable = isUrlRequestable;
 exports.sort = sort;
 exports.combineRequests = combineRequests;
-exports.webpackIgnoreCommentRegexp = void 0;
+exports.WEBPACK_IGNORE_COMMENT_REGEXP = void 0;
 
 var _url = require("url");
 
@@ -30,8 +30,6 @@ var _path = _interopRequireDefault(require("path"));
 
 var _loaderUtils = require("loader-utils");
 
-var _cssesc = _interopRequireDefault(require("cssesc"));
-
 var _postcssModulesValues = _interopRequireDefault(require("postcss-modules-values"));
 
 var _postcssModulesLocalByDefault = _interopRequireDefault(require("postcss-modules-local-by-default"));
@@ -48,26 +46,137 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
   MIT License http://www.opensource.org/licenses/mit-license.php
   Author Tobias Koppers @sokra
 */
-const whitespace = "[\\x20\\t\\r\\n\\f]";
-const unescapeRegExp = new RegExp(`\\\\([\\da-f]{1,6}${whitespace}?|(${whitespace})|.)`, "ig");
-const matchNativeWin32Path = /^[A-Z]:[/\\]|^\\\\/i;
-const webpackIgnoreCommentRegexp = /webpackIgnore:(\s+)?(true|false)/;
-exports.webpackIgnoreCommentRegexp = webpackIgnoreCommentRegexp;
+const WEBPACK_IGNORE_COMMENT_REGEXP = /webpackIgnore:(\s+)?(true|false)/; // eslint-disable-next-line no-useless-escape
+
+exports.WEBPACK_IGNORE_COMMENT_REGEXP = WEBPACK_IGNORE_COMMENT_REGEXP;
+const regexSingleEscape = /[ -,.\/:-@[\]\^`{-~]/;
+const regexExcessiveSpaces = /(^|\\+)?(\\[A-F0-9]{1,6})\x20(?![a-fA-F0-9\x20])/g;
+
+function escape(string) {
+  let output = "";
+  let counter = 0;
+
+  while (counter < string.length) {
+    // eslint-disable-next-line no-plusplus
+    const character = string.charAt(counter++);
+    let value; // eslint-disable-next-line no-control-regex
+
+    if (/[\t\n\f\r\x0B]/.test(character)) {
+      const codePoint = character.charCodeAt();
+      value = `\\${codePoint.toString(16).toUpperCase()} `;
+    } else if (character === "\\" || regexSingleEscape.test(character)) {
+      value = `\\${character}`;
+    } else {
+      value = character;
+    }
 
-function unescape(str) {
-  return str.replace(unescapeRegExp, (_, escaped, escapedWhitespace) => {
-    const high = `0x${escaped}` - 0x10000;
-    /* eslint-disable line-comment-position */
-    // NaN means non-codepoint
-    // Workaround erroneous numeric interpretation of +"0x"
-    // eslint-disable-next-line no-self-compare
-
-    return high !== high || escapedWhitespace ? escaped : high < 0 ? // BMP codepoint
-    String.fromCharCode(high + 0x10000) : // Supplemental Plane codepoint (surrogate pair)
-    // eslint-disable-next-line no-bitwise
-    String.fromCharCode(high >> 10 | 0xd800, high & 0x3ff | 0xdc00);
-    /* eslint-enable line-comment-position */
+    output += value;
+  }
+
+  const firstChar = string.charAt(0);
+
+  if (/^-[-\d]/.test(output)) {
+    output = `\\-${output.slice(1)}`;
+  } else if (/\d/.test(firstChar)) {
+    output = `\\3${firstChar} ${output.slice(1)}`;
+  } // Remove spaces after `\HEX` escapes that are not followed by a hex digit,
+  // since they’re redundant. Note that this is only possible if the escape
+  // sequence isn’t preceded by an odd number of backslashes.
+
+
+  output = output.replace(regexExcessiveSpaces, ($0, $1, $2) => {
+    if ($1 && $1.length % 2) {
+      // It’s not safe to remove the space, so don’t.
+      return $0;
+    } // Strip the space.
+
+
+    return ($1 || "") + $2;
   });
+  return output;
+}
+
+function gobbleHex(str) {
+  const lower = str.toLowerCase();
+  let hex = "";
+  let spaceTerminated = false; // eslint-disable-next-line no-undefined
+
+  for (let i = 0; i < 6 && lower[i] !== undefined; i++) {
+    const code = lower.charCodeAt(i); // check to see if we are dealing with a valid hex char [a-f|0-9]
+
+    const valid = code >= 97 && code <= 102 || code >= 48 && code <= 57; // https://drafts.csswg.org/css-syntax/#consume-escaped-code-point
+
+    spaceTerminated = code === 32;
+
+    if (!valid) {
+      break;
+    }
+
+    hex += lower[i];
+  }
+
+  if (hex.length === 0) {
+    // eslint-disable-next-line no-undefined
+    return undefined;
+  }
+
+  const codePoint = parseInt(hex, 16);
+  const isSurrogate = codePoint >= 0xd800 && codePoint <= 0xdfff; // Add special case for
+  // "If this number is zero, or is for a surrogate, or is greater than the maximum allowed code point"
+  // https://drafts.csswg.org/css-syntax/#maximum-allowed-code-point
+
+  if (isSurrogate || codePoint === 0x0000 || codePoint > 0x10ffff) {
+    return ["\uFFFD", hex.length + (spaceTerminated ? 1 : 0)];
+  }
+
+  return [String.fromCodePoint(codePoint), hex.length + (spaceTerminated ? 1 : 0)];
+}
+
+const CONTAINS_ESCAPE = /\\/;
+
+function unescape(str) {
+  const needToProcess = CONTAINS_ESCAPE.test(str);
+
+  if (!needToProcess) {
+    return str;
+  }
+
+  let ret = "";
+
+  for (let i = 0; i < str.length; i++) {
+    if (str[i] === "\\") {
+      const gobbled = gobbleHex(str.slice(i + 1, i + 7)); // eslint-disable-next-line no-undefined
+
+      if (gobbled !== undefined) {
+        ret += gobbled[0];
+        i += gobbled[1]; // eslint-disable-next-line no-continue
+
+        continue;
+      } // Retain a pair of \\ if double escaped `\\\\`
+      // https://github.com/postcss/postcss-selector-parser/commit/268c9a7656fb53f543dc620aa5b73a30ec3ff20e
+
+
+      if (str[i + 1] === "\\") {
+        ret += "\\";
+        i += 1; // eslint-disable-next-line no-continue
+
+        continue;
+      } // if \\ is at the end of the string retain it
+      // https://github.com/postcss/postcss-selector-parser/commit/01a6b346e3612ce1ab20219acc26abdc259ccefb
+
+
+      if (str.length === i + 1) {
+        ret += str[i];
+      } // eslint-disable-next-line no-continue
+
+
+      continue;
+    }
+
+    ret += str[i];
+  }
+
+  return ret;
 }
 
 function normalizePath(file) {
@@ -80,10 +189,9 @@ const filenameReservedRegex = /[<>:"/\\|?*]/g; // eslint-disable-next-line no-co
 const reControlChars = /[\u0000-\u001f\u0080-\u009f]/g;
 
 function escapeLocalIdent(localident) {
-  return (0, _cssesc.default)(localident // For `[hash]` placeholder
-  .replace(/^((-?[0-9])|--)/, "_$1").replace(filenameReservedRegex, "-").replace(reControlChars, "-").replace(/\./g, "-"), {
-    isIdentifier: true
-  });
+  // TODO simplify in the next major release
+  return escape(localident // For `[hash]` placeholder
+  .replace(/^((-?[0-9])|--)/, "_$1").replace(filenameReservedRegex, "-").replace(reControlChars, "-").replace(/\./g, "-"));
 }
 
 function defaultGetLocalIdent(loaderContext, localIdentName, localName, options) {
@@ -100,6 +208,8 @@ function defaultGetLocalIdent(loaderContext, localIdentName, localName, options)
   return (0, _loaderUtils.interpolateName)(loaderContext, localIdentName, options);
 }
 
+const NATIVE_WIN32_PATH = /^[A-Z]:[/\\]|^\\\\/i;
+
 function normalizeUrl(url, isStringValue) {
   let normalizedUrl = url.replace(/^( |\t\n|\r\n|\r|\f)*/g, "").replace(/( |\t\n|\r\n|\r|\f)*$/g, "");
 
@@ -107,11 +217,23 @@ function normalizeUrl(url, isStringValue) {
     normalizedUrl = normalizedUrl.replace(/\\(\n|\r\n|\r|\f)/g, "");
   }
 
-  if (matchNativeWin32Path.test(url)) {
-    return decodeURI(normalizedUrl);
+  if (NATIVE_WIN32_PATH.test(url)) {
+    try {
+      normalizedUrl = decodeURI(normalizedUrl);
+    } catch (error) {// Ignore
+    }
+
+    return normalizedUrl;
+  }
+
+  normalizedUrl = unescape(normalizedUrl);
+
+  try {
+    normalizedUrl = decodeURI(normalizedUrl);
+  } catch (error) {// Ignore
   }
 
-  return decodeURI(unescape(normalizedUrl));
+  return normalizedUrl;
 }
 
 function requestify(url, rootContext) {
@@ -629,7 +751,7 @@ function isUrlRequestable(url) {
   } // Absolute URLs
 
 
-  if (/^[a-z][a-z0-9+.-]*:/i.test(url) && !matchNativeWin32Path.test(url)) {
+  if (/^[a-z][a-z0-9+.-]*:/i.test(url) && !NATIVE_WIN32_PATH.test(url)) {
     return false;
   } // `#` URLs
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "5.2.0",
+  "version": "5.2.4",
   "description": "css loader module for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/css-loader",
@@ -43,32 +43,31 @@
   },
   "dependencies": {
     "camelcase": "^6.2.0",
-    "cssesc": "^3.0.0",
     "icss-utils": "^5.1.0",
     "loader-utils": "^2.0.0",
-    "postcss": "^8.2.8",
+    "postcss": "^8.2.10",
     "postcss-modules-extract-imports": "^3.0.0",
     "postcss-modules-local-by-default": "^4.0.0",
     "postcss-modules-scope": "^3.0.0",
     "postcss-modules-values": "^4.0.0",
     "postcss-value-parser": "^4.1.0",
     "schema-utils": "^3.0.0",
-    "semver": "^7.3.4"
+    "semver": "^7.3.5"
   },
   "devDependencies": {
-    "@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",
+    "@babel/cli": "^7.13.14",
+    "@babel/core": "^7.13.15",
+    "@babel/preset-env": "^7.13.15",
+    "@commitlint/cli": "^12.1.1",
+    "@commitlint/config-conventional": "^12.1.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.3",
-    "eslint": "^7.22.0",
-    "eslint-config-prettier": "^8.1.0",
+    "eslint": "^7.24.0",
+    "eslint-config-prettier": "^8.2.0",
     "eslint-plugin-import": "^2.22.1",
     "file-loader": "^6.2.0",
     "husky": "^4.3.8",
@@ -76,21 +75,21 @@
     "less": "^4.1.1",
     "less-loader": "^7.1.0",
     "lint-staged": "^10.5.4",
-    "memfs": "^3.2.0",
-    "mini-css-extract-plugin": "^1.3.9",
+    "memfs": "^3.2.2",
+    "mini-css-extract-plugin": "^1.4.1",
     "npm-run-all": "^4.1.5",
     "postcss-loader": "^4.0.4",
     "postcss-preset-env": "^6.7.0",
     "prettier": "^2.1.2",
     "sass": "^1.32.8",
     "sass-loader": "^10.1.0",
-    "standard-version": "^9.1.1",
+    "standard-version": "^9.2.0",
     "strip-ansi": "^6.0.0",
     "style-loader": "^2.0.0",
     "stylus": "^0.54.8",
     "stylus-loader": "^4.3.0",
     "url-loader": "^4.1.1",
-    "webpack": "^5.26.0"
+    "webpack": "^5.34.0"
   },
   "keywords": [
     "webpack",