css-loader 6.3.0 → 6.4.0

package/dist/plugins/index.js

@@ -3,16 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "importParser", {
+Object.defineProperty(exports, "icssParser", {
   enumerable: true,
   get: function () {
-    return _postcssImportParser.default;
+    return _postcssIcssParser.default;
   }
 });
-Object.defineProperty(exports, "icssParser", {
+Object.defineProperty(exports, "importParser", {
   enumerable: true,
   get: function () {
-    return _postcssIcssParser.default;
+    return _postcssImportParser.default;
   }
 });
 Object.defineProperty(exports, "urlParser", {

package/dist/utils.js

@@ -3,29 +3,29 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.normalizeOptions = normalizeOptions;
-exports.shouldUseModulesPlugins = shouldUseModulesPlugins;
-exports.shouldUseImportPlugin = shouldUseImportPlugin;
-exports.shouldUseURLPlugin = shouldUseURLPlugin;
-exports.shouldUseIcssPlugin = shouldUseIcssPlugin;
-exports.normalizeUrl = normalizeUrl;
-exports.requestify = requestify;
+exports.WEBPACK_IGNORE_COMMENT_REGEXP = void 0;
+exports.camelCase = camelCase;
+exports.combineRequests = combineRequests;
+exports.getExportCode = getExportCode;
 exports.getFilter = getFilter;
+exports.getImportCode = getImportCode;
+exports.getModuleCode = getModuleCode;
 exports.getModulesOptions = getModulesOptions;
 exports.getModulesPlugins = getModulesPlugins;
-exports.normalizeSourceMap = normalizeSourceMap;
 exports.getPreRequester = getPreRequester;
-exports.getImportCode = getImportCode;
-exports.getModuleCode = getModuleCode;
-exports.getExportCode = getExportCode;
-exports.resolveRequests = resolveRequests;
+exports.isDataUrl = isDataUrl;
 exports.isUrlRequestable = isUrlRequestable;
+exports.normalizeOptions = normalizeOptions;
+exports.normalizeSourceMap = normalizeSourceMap;
+exports.normalizeUrl = normalizeUrl;
+exports.requestify = requestify;
+exports.resolveRequests = resolveRequests;
+exports.shouldUseIcssPlugin = shouldUseIcssPlugin;
+exports.shouldUseImportPlugin = shouldUseImportPlugin;
+exports.shouldUseModulesPlugins = shouldUseModulesPlugins;
+exports.shouldUseURLPlugin = shouldUseURLPlugin;
 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");
 
@@ -313,22 +313,16 @@ function escapeLocalIdent(localident) {
 }
 
 function defaultGetLocalIdent(loaderContext, localIdentName, localName, options) {
-  let relativeMatchResource = "";
   const {
-    context
+    context,
+    hashSalt
   } = options;
   const {
     resourcePath
-  } = loaderContext; // 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(context, loaderContext._module.matchResource))}\x00`;
-  }
-
+  } = loaderContext;
   const relativeResourcePath = normalizePath(_path.default.relative(context, resourcePath)); // eslint-disable-next-line no-param-reassign
 
-  options.content = `${relativeMatchResource}${relativeResourcePath}\x00${localName}`;
+  options.content = `${relativeResourcePath}\x00${localName}`;
   let {
     hashFunction,
     hashDigest,
@@ -345,21 +339,28 @@ function defaultGetLocalIdent(loaderContext, localIdentName, localName, options)
     // 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
+  }
 
+  let localIdentHash = "";
 
-  const hash = loaderContext._compiler.webpack.util.createHash(hashFunction);
+  for (let tier = 0; localIdentHash.length < hashDigestLength; tier++) {
+    // eslint-disable-next-line no-underscore-dangle
+    const hash = loaderContext._compiler.webpack.util.createHash(hashFunction);
 
-  const {
-    hashSalt
-  } = options;
+    if (hashSalt) {
+      hash.update(hashSalt);
+    }
 
-  if (hashSalt) {
-    hash.update(hashSalt);
-  }
+    const tierSalt = Buffer.allocUnsafe(4);
+    tierSalt.writeUInt32LE(tier);
+    hash.update(tierSalt);
+    hash.update(options.content);
+    localIdentHash = (localIdentHash + hash.digest(hashDigest) // Remove all leading digits
+    ).replace(/^\d+/, "") // Replace all slashes with underscores (same as in base64url)
+    .replace(/\//g, "_") // Remove everything that is not an alphanumeric or underscore
+    .replace(/[^A-Za-z0-9_]+/g, "").slice(0, hashDigestLength);
+  } // 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
 
-  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(resourcePath);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "6.3.0",
+  "version": "6.4.0",
   "description": "css loader module for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/css-loader",