css-loader 5.2.6 → 6.2.0

package/dist/utils.js

@@ -23,14 +23,14 @@ exports.isUrlRequestable = isUrlRequestable;
 exports.sort = sort;
 exports.combineRequests = combineRequests;
 exports.camelCase = camelCase;
+exports.stringifyRequest = stringifyRequest;
+exports.isDataUrl = isDataUrl;
 exports.WEBPACK_IGNORE_COMMENT_REGEXP = void 0;
 
 var _url = require("url");
 
 var _path = _interopRequireDefault(require("path"));
 
-var _loaderUtils = require("loader-utils");
-
 var _postcssModulesValues = _interopRequireDefault(require("postcss-modules-values"));
 
 var _postcssModulesLocalByDefault = _interopRequireDefault(require("postcss-modules-local-by-default"));
@@ -45,9 +45,78 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
   MIT License http://www.opensource.org/licenses/mit-license.php
   Author Tobias Koppers @sokra
 */
-const WEBPACK_IGNORE_COMMENT_REGEXP = /webpackIgnore:(\s+)?(true|false)/; // eslint-disable-next-line no-useless-escape
-
+const WEBPACK_IGNORE_COMMENT_REGEXP = /webpackIgnore:(\s+)?(true|false)/;
 exports.WEBPACK_IGNORE_COMMENT_REGEXP = WEBPACK_IGNORE_COMMENT_REGEXP;
+const matchRelativePath = /^\.\.?[/\\]/;
+
+function isAbsolutePath(str) {
+  return _path.default.posix.isAbsolute(str) || _path.default.win32.isAbsolute(str);
+}
+
+function isRelativePath(str) {
+  return matchRelativePath.test(str);
+}
+
+function stringifyRequest(loaderContext, request) {
+  const splitted = request.split("!");
+  const {
+    context
+  } = loaderContext;
+  return JSON.stringify(splitted.map(part => {
+    // First, separate singlePath from query, because the query might contain paths again
+    const splittedPart = part.match(/^(.*?)(\?.*)/);
+    const query = splittedPart ? splittedPart[2] : "";
+    let singlePath = splittedPart ? splittedPart[1] : part;
+
+    if (isAbsolutePath(singlePath) && context) {
+      singlePath = _path.default.relative(context, singlePath);
+
+      if (isAbsolutePath(singlePath)) {
+        // If singlePath still matches an absolute path, singlePath was on a different drive than context.
+        // In this case, we leave the path platform-specific without replacing any separators.
+        // @see https://github.com/webpack/loader-utils/pull/14
+        return singlePath + query;
+      }
+
+      if (isRelativePath(singlePath) === false) {
+        // Ensure that the relative path starts at least with ./ otherwise it would be a request into the modules directory (like node_modules).
+        singlePath = `./${singlePath}`;
+      }
+    }
+
+    return singlePath.replace(/\\/g, "/") + query;
+  }).join("!"));
+} // We can't use path.win32.isAbsolute because it also matches paths starting with a forward slash
+
+
+const IS_NATIVE_WIN32_PATH = /^[a-z]:[/\\]|^\\\\/i;
+const IS_MODULE_REQUEST = /^[^?]*~/;
+
+function urlToRequest(url, root) {
+  let request;
+
+  if (IS_NATIVE_WIN32_PATH.test(url)) {
+    // absolute windows path, keep it
+    request = url;
+  } else if (typeof root !== "undefined" && /^\//.test(url)) {
+    request = root + url;
+  } else if (/^\.\.?\//.test(url)) {
+    // A relative url stays
+    request = url;
+  } else {
+    // every other url is threaded like a relative url
+    request = `./${url}`;
+  } // A `~` makes the url an module
+
+
+  if (IS_MODULE_REQUEST.test(request)) {
+    request = request.replace(IS_MODULE_REQUEST, "");
+  }
+
+  return request;
+} // eslint-disable-next-line no-useless-escape
+
+
 const regexSingleEscape = /[ -,.\/:-@[\]\^`{-~]/;
 const regexExcessiveSpaces = /(^|\\+)?(\\[A-F0-9]{1,6})\x20(?![a-fA-F0-9\x20])/g;
 
@@ -253,8 +322,79 @@ function defaultGetLocalIdent(loaderContext, localIdentName, localName, options)
 
   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);
+  options.content = `${relativeMatchResource}${relativeResourcePath}\x00${localName}`;
+  let {
+    hashFunction,
+    hashDigest,
+    hashDigestLength
+  } = options;
+  const mathes = localIdentName.match(/\[(?:([^:\]]+):)?(?:(hash|contenthash|fullhash))(?::([a-z]+\d*))?(?::(\d+))?\]/i);
+
+  if (mathes) {
+    const hashName = mathes[2] || hashFunction;
+    hashFunction = mathes[1] || hashFunction;
+    hashDigest = mathes[3] || hashDigest;
+    hashDigestLength = mathes[4] || hashDigestLength; // `hash` and `contenthash` are same in `loader-utils` context
+    // let's keep `hash` for backward compatibility
+    // eslint-disable-next-line no-param-reassign
+
+    localIdentName = localIdentName.replace(/\[(?:([^:\]]+):)?(?:hash|contenthash|fullhash)(?::([a-z]+\d*))?(?::(\d+))?\]/gi, () => hashName === "fullhash" ? "[fullhash]" : "[contenthash]");
+  } // eslint-disable-next-line no-underscore-dangle
+
+
+  const hash = loaderContext._compiler.webpack.util.createHash(hashFunction);
+
+  const {
+    hashSalt
+  } = options;
+
+  if (hashSalt) {
+    hash.update(hashSalt);
+  }
+
+  hash.update(options.content);
+  const localIdentHash = hash.digest(hashDigest).slice(0, hashDigestLength).replace(/[/+]/g, "_").replace(/^\d/g, "_"); // TODO need improve on webpack side, we should allow to pass hash/contentHash without chunk property, also `data` for `getPath` should be looks good without chunk property
+
+  const ext = _path.default.extname(loaderContext.resourcePath);
+
+  const base = _path.default.basename(loaderContext.resourcePath);
+
+  const name = base.slice(0, base.length - ext.length);
+  const data = {
+    filename: _path.default.relative(options.context, loaderContext.resourcePath),
+    contentHash: localIdentHash,
+    chunk: {
+      name,
+      hash: localIdentHash,
+      contentHash: localIdentHash
+    }
+  }; // eslint-disable-next-line no-underscore-dangle
+
+  let result = loaderContext._compilation.getPath(localIdentName, data);
+
+  if (options.regExp) {
+    const match = loaderContext.resourcePath.match(options.regExp);
+
+    if (match) {
+      match.forEach((matched, i) => {
+        result = result.replace(new RegExp(`\\[${i}\\]`, "ig"), matched);
+      });
+    }
+  }
+
+  return result;
+}
+
+function fixedEncodeURIComponent(str) {
+  return str.replace(/[!'()*]/g, c => `%${c.charCodeAt(0).toString(16)}`);
+}
+
+function isDataUrl(url) {
+  if (/^data:/i.test(url)) {
+    return true;
+  }
+
+  return false;
 }
 
 const NATIVE_WIN32_PATH = /^[A-Z]:[/\\]|^\\\\/i;
@@ -277,6 +417,11 @@ function normalizeUrl(url, isStringValue) {
 
   normalizedUrl = unescape(normalizedUrl);
 
+  if (isDataUrl(url)) {
+    // Todo fixedEncodeURIComponent is workaround. Webpack resolver shouldn't handle "!" in dataURL
+    return fixedEncodeURIComponent(normalizedUrl);
+  }
+
   try {
     normalizedUrl = decodeURI(normalizedUrl);
   } catch (error) {// Ignore
@@ -285,12 +430,25 @@ function normalizeUrl(url, isStringValue) {
   return normalizedUrl;
 }
 
-function requestify(url, rootContext) {
-  if (/^file:/i.test(url)) {
-    return (0, _url.fileURLToPath)(url);
+function requestify(url, rootContext, needToResolveURL = true) {
+  if (needToResolveURL) {
+    if (/^file:/i.test(url)) {
+      return (0, _url.fileURLToPath)(url);
+    }
+
+    return url.charAt(0) === "/" ? urlToRequest(url, rootContext) : urlToRequest(url);
   }
 
-  return url.charAt(0) === "/" ? (0, _loaderUtils.urlToRequest)(url, rootContext) : (0, _loaderUtils.urlToRequest)(url);
+  if (url.charAt(0) === "/" || /^file:/i.test(url)) {
+    return url;
+  } // A `~` makes the url an module
+
+
+  if (IS_MODULE_REQUEST.test(url)) {
+    return url.replace(IS_MODULE_REQUEST, "");
+  }
+
+  return url;
 }
 
 function getFilter(filter, resourcePath) {
@@ -304,6 +462,11 @@ function getFilter(filter, resourcePath) {
 }
 
 function getValidLocalName(localName, exportLocalsConvention) {
+  if (typeof exportLocalsConvention === "function") {
+    const result = exportLocalsConvention(localName);
+    return Array.isArray(result) ? result[0] : result;
+  }
+
   if (exportLocalsConvention === "dashesOnly") {
     return dashesCamelCase(localName);
   }
@@ -311,77 +474,86 @@ function getValidLocalName(localName, exportLocalsConvention) {
   return camelCase(localName);
 }
 
-const moduleRegExp = /\.module(s)?\.\w+$/i;
-const icssRegExp = /\.icss\.\w+$/i;
+const IS_MODULES = /\.module(s)?\.\w+$/i;
+const IS_ICSS = /\.icss\.\w+$/i;
 
 function getModulesOptions(rawOptions, loaderContext) {
+  if (typeof rawOptions.modules === "boolean" && rawOptions.modules === false) {
+    return false;
+  }
+
   const resourcePath = // eslint-disable-next-line no-underscore-dangle
   loaderContext._module && loaderContext._module.matchResource || loaderContext.resourcePath;
-  let isIcss;
+  let auto;
+  let rawModulesOptions;
 
   if (typeof rawOptions.modules === "undefined") {
-    const isModules = moduleRegExp.test(resourcePath);
-
-    if (!isModules) {
-      isIcss = icssRegExp.test(resourcePath);
-    }
+    rawModulesOptions = {};
+    auto = true;
+  } else if (typeof rawOptions.modules === "boolean") {
+    rawModulesOptions = {};
+  } else if (typeof rawOptions.modules === "string") {
+    rawModulesOptions = {
+      mode: rawOptions.modules
+    };
+  } else {
+    rawModulesOptions = rawOptions.modules;
+    ({
+      auto
+    } = rawModulesOptions);
+  } // eslint-disable-next-line no-underscore-dangle
 
-    if (!isModules && !isIcss) {
-      return false;
-    }
-  } else if (typeof rawOptions.modules === "boolean" && rawOptions.modules === false) {
-    return false;
-  }
 
-  let modulesOptions = {
-    compileType: isIcss ? "icss" : "module",
-    auto: true,
+  const {
+    outputOptions
+  } = loaderContext._compilation;
+  const modulesOptions = {
+    auto,
     mode: "local",
     exportGlobals: false,
     localIdentName: "[hash:base64]",
     localIdentContext: loaderContext.rootContext,
-    localIdentHashPrefix: "",
+    localIdentHashSalt: outputOptions.hashSalt,
+    localIdentHashFunction: outputOptions.hashFunction,
+    localIdentHashDigest: outputOptions.hashDigest,
+    localIdentHashDigestLength: outputOptions.hashDigestLength,
     // eslint-disable-next-line no-undefined
     localIdentRegExp: undefined,
     // eslint-disable-next-line no-undefined
     getLocalIdent: undefined,
     namedExport: false,
-    exportLocalsConvention: "asIs",
-    exportOnlyLocals: false
+    exportLocalsConvention: rawModulesOptions.namedExport === true && typeof rawModulesOptions.exportLocalsConvention === "undefined" ? "camelCaseOnly" : "asIs",
+    exportOnlyLocals: false,
+    ...rawModulesOptions
   };
 
-  if (typeof rawOptions.modules === "boolean" || typeof rawOptions.modules === "string") {
-    modulesOptions.mode = typeof rawOptions.modules === "string" ? rawOptions.modules : "local";
-  } else {
-    if (rawOptions.modules) {
-      if (typeof rawOptions.modules.auto === "boolean") {
-        const isModules = rawOptions.modules.auto && moduleRegExp.test(resourcePath);
-
-        if (!isModules) {
-          return false;
-        }
-      } else if (rawOptions.modules.auto instanceof RegExp) {
-        const isModules = rawOptions.modules.auto.test(resourcePath);
+  if (typeof modulesOptions.auto === "boolean") {
+    const isModules = modulesOptions.auto && IS_MODULES.test(resourcePath);
+    let isIcss;
 
-        if (!isModules) {
-          return false;
-        }
-      } else if (typeof rawOptions.modules.auto === "function") {
-        const isModule = rawOptions.modules.auto(resourcePath);
+    if (!isModules) {
+      isIcss = IS_ICSS.test(resourcePath);
 
-        if (!isModule) {
-          return false;
-        }
+      if (isIcss) {
+        modulesOptions.mode = "icss";
       }
+    }
 
-      if (rawOptions.modules.namedExport === true && typeof rawOptions.modules.exportLocalsConvention === "undefined") {
-        modulesOptions.exportLocalsConvention = "camelCaseOnly";
-      }
+    if (!isModules && !isIcss) {
+      return false;
     }
+  } else if (modulesOptions.auto instanceof RegExp) {
+    const isModules = modulesOptions.auto.test(resourcePath);
 
-    modulesOptions = { ...modulesOptions,
-      ...(rawOptions.modules || {})
-    };
+    if (!isModules) {
+      return false;
+    }
+  } else if (typeof modulesOptions.auto === "function") {
+    const isModule = modulesOptions.auto(resourcePath);
+
+    if (!isModule) {
+      return false;
+    }
   }
 
   if (typeof modulesOptions.mode === "function") {
@@ -393,15 +565,11 @@ function getModulesOptions(rawOptions, loaderContext) {
       throw new Error('The "modules.namedExport" option requires the "esModules" option to be enabled');
     }
 
-    if (modulesOptions.exportLocalsConvention !== "camelCaseOnly" && modulesOptions.exportLocalsConvention !== "dashesOnly") {
+    if (typeof modulesOptions.exportLocalsConvention === "string" && modulesOptions.exportLocalsConvention !== "camelCaseOnly" && modulesOptions.exportLocalsConvention !== "dashesOnly") {
       throw new Error('The "modules.namedExport" option requires the "modules.exportLocalsConvention" option to be "camelCaseOnly" or "dashesOnly"');
     }
   }
 
-  if (/\[emoji(?::(\d+))?\]/i.test(modulesOptions.localIdentName)) {
-    loaderContext.emitWarning("Emoji is deprecated and will be removed in next major release.");
-  }
-
   return modulesOptions;
 }
 
@@ -442,11 +610,15 @@ function shouldUseURLPlugin(options) {
 }
 
 function shouldUseModulesPlugins(options) {
-  return options.modules.compileType === "module";
+  if (typeof options.modules === "boolean" && options.modules === false) {
+    return false;
+  }
+
+  return options.modules.mode !== "icss";
 }
 
 function shouldUseIcssPlugin(options) {
-  return options.icss === true || Boolean(options.modules);
+  return Boolean(options.modules);
 }
 
 function getModulesPlugins(options, loaderContext) {
@@ -455,7 +627,10 @@ function getModulesPlugins(options, loaderContext) {
     getLocalIdent,
     localIdentName,
     localIdentContext,
-    localIdentHashPrefix,
+    localIdentHashSalt,
+    localIdentHashFunction,
+    localIdentHashDigest,
+    localIdentHashDigestLength,
     localIdentRegExp
   } = options.modules;
   let plugins = [];
@@ -470,7 +645,10 @@ function getModulesPlugins(options, loaderContext) {
         if (typeof getLocalIdent !== "undefined") {
           localIdent = getLocalIdent(loaderContext, localIdentName, unescape(exportName), {
             context: localIdentContext,
-            hashPrefix: localIdentHashPrefix,
+            hashSalt: localIdentHashSalt,
+            hashFunction: localIdentHashFunction,
+            hashDigest: localIdentHashDigest,
+            hashDigestLength: localIdentHashDigestLength,
             regExp: localIdentRegExp
           });
         } // A null/undefined value signals that we should invoke the default
@@ -480,7 +658,10 @@ function getModulesPlugins(options, loaderContext) {
         if (typeof localIdent === "undefined" || localIdent === null) {
           localIdent = defaultGetLocalIdent(loaderContext, localIdentName, unescape(exportName), {
             context: localIdentContext,
-            hashPrefix: localIdentHashPrefix,
+            hashSalt: localIdentHashSalt,
+            hashFunction: localIdentHashFunction,
+            hashDigest: localIdentHashDigest,
+            hashDigestLength: localIdentHashDigestLength,
             regExp: localIdentRegExp
           });
           return escapeLocalIdent(localIdent).replace(/\\\[local\\]/gi, exportName);
@@ -498,7 +679,6 @@ function getModulesPlugins(options, loaderContext) {
   return plugins;
 }
 
-const IS_NATIVE_WIN32_PATH = /^[a-z]:[/\\]|^\\\\/i;
 const ABSOLUTE_SCHEME = /^[a-z0-9+\-.]+:/i;
 
 function getURLType(source) {
@@ -582,14 +762,15 @@ function getImportCode(imports, options) {
     const {
       importName,
       url,
-      icss
+      icss,
+      type
     } = item;
 
     if (options.esModule) {
       if (icss && options.modules.namedExport) {
         code += `import ${options.modules.exportOnlyLocals ? "" : `${importName}, `}* as ${importName}_NAMED___ from ${url};\n`;
       } else {
-        code += `import ${importName} from ${url};\n`;
+        code += type === "url" ? `var ${importName} = new URL(${url}, import.meta.url);\n` : `import ${importName} from ${url};\n`;
       }
     } else {
       code += `var ${importName} = require(${url});\n`;
@@ -685,15 +866,19 @@ function getExportCode(exports, replacements, needToUseIcssPlugin, options) {
 
   let localsCode = "";
 
-  const addExportToLocalsCode = (name, value) => {
-    if (options.modules.namedExport) {
-      localsCode += `export var ${name} = ${JSON.stringify(value)};\n`;
-    } else {
-      if (localsCode) {
-        localsCode += `,\n`;
-      }
+  const addExportToLocalsCode = (names, value) => {
+    const normalizedNames = Array.isArray(names) ? new Set(names) : new Set([names]);
 
-      localsCode += `\t${JSON.stringify(name)}: ${JSON.stringify(value)}`;
+    for (const name of normalizedNames) {
+      if (options.modules.namedExport) {
+        localsCode += `export var ${name} = ${JSON.stringify(value)};\n`;
+      } else {
+        if (localsCode) {
+          localsCode += `,\n`;
+        }
+
+        localsCode += `\t${JSON.stringify(name)}: ${JSON.stringify(value)}`;
+      }
     }
   };
 
@@ -701,16 +886,17 @@ function getExportCode(exports, replacements, needToUseIcssPlugin, options) {
     name,
     value
   } of exports) {
+    if (typeof options.modules.exportLocalsConvention === "function") {
+      addExportToLocalsCode(options.modules.exportLocalsConvention(name), value); // eslint-disable-next-line no-continue
+
+      continue;
+    }
+
     switch (options.modules.exportLocalsConvention) {
       case "camelCase":
         {
-          addExportToLocalsCode(name, value);
           const modifiedName = camelCase(name);
-
-          if (modifiedName !== name) {
-            addExportToLocalsCode(modifiedName, value);
-          }
-
+          addExportToLocalsCode([name, modifiedName], value);
           break;
         }
 
@@ -722,13 +908,8 @@ function getExportCode(exports, replacements, needToUseIcssPlugin, options) {
 
       case "dashes":
         {
-          addExportToLocalsCode(name, value);
           const modifiedName = dashesCamelCase(name);
-
-          if (modifiedName !== name) {
-            addExportToLocalsCode(modifiedName, value);
-          }
-
+          addExportToLocalsCode([name, modifiedName], value);
           break;
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "5.2.6",
+  "version": "6.2.0",
   "description": "css loader module for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/css-loader",
@@ -13,7 +13,7 @@
   },
   "main": "dist/cjs.js",
   "engines": {
-    "node": ">= 10.13.0"
+    "node": ">= 12.13.0"
   },
   "scripts": {
     "start": "npm run build -- -w",
@@ -39,56 +39,54 @@
     "dist"
   ],
   "peerDependencies": {
-    "webpack": "^4.27.0 || ^5.0.0"
+    "webpack": "^5.0.0"
   },
   "dependencies": {
     "icss-utils": "^5.1.0",
-    "loader-utils": "^2.0.0",
     "postcss": "^8.2.15",
     "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.5"
   },
   "devDependencies": {
-    "@babel/cli": "^7.14.3",
-    "@babel/core": "^7.14.3",
-    "@babel/preset-env": "^7.14.2",
+    "@babel/cli": "^7.14.5",
+    "@babel/core": "^7.14.6",
+    "@babel/preset-env": "^7.14.7",
     "@commitlint/cli": "^12.1.4",
     "@commitlint/config-conventional": "^12.1.4",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
-    "babel-jest": "^26.6.3",
+    "babel-jest": "^27.0.6",
     "cross-env": "^7.0.3",
     "del": "^6.0.0",
-    "del-cli": "^3.0.1",
-    "es-check": "^5.2.3",
-    "eslint": "^7.26.0",
+    "del-cli": "^4.0.1",
+    "es-check": "^5.2.4",
+    "eslint": "^7.30.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.23.2",
+    "eslint-plugin-import": "^2.23.4",
     "file-loader": "^6.2.0",
-    "husky": "^6.0.0",
-    "jest": "^26.6.3",
+    "husky": "^7.0.1",
+    "jest": "^27.0.6",
     "less": "^4.1.1",
-    "less-loader": "^7.1.0",
-    "lint-staged": "^11.0.0",
+    "less-loader": "^10.0.1",
+    "lint-staged": "^11.0.1",
     "memfs": "^3.2.2",
-    "mini-css-extract-plugin": "^1.6.0",
+    "mini-css-extract-plugin": "^2.1.0",
     "npm-run-all": "^4.1.5",
-    "postcss-loader": "^4.3.0",
+    "postcss-loader": "^6.1.1",
     "postcss-preset-env": "^6.7.0",
-    "prettier": "^2.3.0",
-    "sass": "^1.32.13",
-    "sass-loader": "^10.2.0",
-    "standard-version": "^9.3.0",
+    "prettier": "^2.3.2",
+    "sass": "^1.35.2",
+    "sass-loader": "^12.1.0",
+    "standard-version": "^9.3.1",
     "strip-ansi": "^6.0.0",
-    "style-loader": "^2.0.0",
+    "style-loader": "^3.1.0",
     "stylus": "^0.54.8",
-    "stylus-loader": "^4.3.3",
+    "stylus-loader": "^6.1.0",
     "url-loader": "^4.1.1",
-    "webpack": "^5.37.1"
+    "webpack": "^5.45.1"
   },
   "keywords": [
     "webpack",