fix: ident generation

Author: alexander-akait

src/utils.js

@@ -69,11 +69,17 @@ function defaultGetLocalIdent(
   options
 ) {
   const { context, hashPrefix } = options;
+  // eslint-disable-next-line no-underscore-dangle
+  const { matchResource } = loaderContext._module;
   const { resourcePath } = loaderContext;
   const request = normalizePath(path.relative(context, resourcePath));
 
   // eslint-disable-next-line no-param-reassign
-  options.content = `${hashPrefix + request}\x00${localName}`;
+  options.content = `${
+    hashPrefix +
+    (typeof matchResource !== "undefined" ? `${matchResource}\x00` : "") +
+    request
+  }\x00${localName}`;
 
   return interpolateName(loaderContext, localIdentName, options);
 }

test/__snapshots__/loader.test.js.snap

@@ -665,66 +665,66 @@ exports[`loader should work with inline module syntax: result 1`] = `
 Array [
   Array [
     "other.modules.css!=!../../src/index.js?[ident]!./index-loader-syntax.modules.css",
-    "._1ZJhuRHDA53bY_Z4Qfm2b4 {
+    "._3FhluglYfH54WWRd2Lmpsy {
   color: red;
 }
 
-.j3CQSVq_DdDvo0Ew74yQi {
+._3danpknEEa0R3CZCkFeRI0 {
   color: white;
 }",
     "",
   ],
   Array [
     "button.modules.css!=!./index-loader-syntax-sass.css",
-    ".iuzmhXWrT3_Z-zKS-rMGM {
+    ".C6WgXrKWbFsSifATWfzu {
   width: 5px;
 }",
     "",
   ],
   Array [
     "other.modules.scss!=!../../src/index.js?[ident]!./index-loader-syntax-sass.modules.css",
-    "._1fGl5mRxLFCqIet0X3JYrB > ._2pVMnENaxk1YmKug-4EMYF {
+    "._2r_y8mGYyCwfbs1_VPTK5C > ._1yssyumFL0m4gBbuzRhER2 {
   color: red;
 }",
     "",
   ],
   Array [
     "other.modules.css!=!../../src/index.js?[ident]!./index-loader-syntax.modules.css",
-    "._1ZJhuRHDA53bY_Z4Qfm2b4 {
+    "._3FhluglYfH54WWRd2Lmpsy {
   color: red;
 }
 
-.j3CQSVq_DdDvo0Ew74yQi {
+._3danpknEEa0R3CZCkFeRI0 {
   color: white;
 }
 
-.B7fdaUjwJ3YVou1v7dYEE {
+._3lQ9E7_p8EySCyfUghDtwz {
   from: custom;
 }",
     "",
   ],
   Array [
     "other.modules.css!=!../../src/index.js?[ident]!./index-loader-syntax.modules.css",
-    "._1ZJhuRHDA53bY_Z4Qfm2b4 {
+    "._3FhluglYfH54WWRd2Lmpsy {
   color: red;
 }
 
-.j3CQSVq_DdDvo0Ew74yQi {
+._3danpknEEa0R3CZCkFeRI0 {
   color: white;
 }
 
-.B7fdaUjwJ3YVou1v7dYEE {
+._3lQ9E7_p8EySCyfUghDtwz {
   from: custom;
 }",
     "",
   ],
   Array [
     "other.modules.scss!=!../../src/index.js?[ident]!./index-loader-syntax-sass.modules.css",
-    "._1fGl5mRxLFCqIet0X3JYrB > ._2pVMnENaxk1YmKug-4EMYF {
+    "._2r_y8mGYyCwfbs1_VPTK5C > ._1yssyumFL0m4gBbuzRhER2 {
   color: red;
 }
 
-._1kK_VYa-N303wnLgpvL-7d {
+._3B3N-_-uymcqQkGiRwYhjx {
   from: custom;
 }",
     "",
@@ -738,14 +738,21 @@ Array [
   ],
   Array [
     "button.modules.css!=!./index-loader-syntax-sass.css",
-    ".iuzmhXWrT3_Z-zKS-rMGM {
+    ".C6WgXrKWbFsSifATWfzu {
   width: 5px;
 }",
     "",
   ],
   Array [
-    "button.module.scss!=!./base64-loader/index.js?[ident]!./simple.js",
-    "._1DaPRMj4jImbX3XSIzjaR4 {
+    "button.module.scss!=!./base64-loader/index.js?[ident]!./simple.js?foo=bar",
+    "._1Z1CpM4SYZX9egsUO4gNTz {
+  color: red;
+}",
+    "",
+  ],
+  Array [
+    "other.module.scss!=!./base64-loader/index.js?[ident]!./simple.js?foo=baz",
+    "._1KqQu-H04lA8NLg4-NKnDf {
   color: red;
 }",
     "",

test/fixtures/index-loader-syntax.js

@@ -1,7 +1,9 @@
 import one from './index-loader-syntax.css';
 import two from 'button.modules.css!=!./index-loader-syntax-sass.css';
-import three from './button.module.scss!=!./base64-loader?LmZvbyB7IGNvbG9yOiByZWQ7IH0=!./simple.js';
+// Hash should be different
+import three from './button.module.scss!=!./base64-loader?LmZvbyB7IGNvbG9yOiByZWQ7IH0=!./simple.js?foo=bar';
+import four from './other.module.scss!=!./base64-loader?LmZvbyB7IGNvbG9yOiByZWQ7IH0=!./simple.js?foo=baz';
 
-__export__ = [...one, ...two, ...three];
+__export__ = [...one, ...two, ...three, ...four];
 
-export default [...one, ...two, ...three];
+export default [...one, ...two, ...three, ...four];

test/sourceMap-option.test.js

@@ -501,7 +501,7 @@ describe('"sourceMap" option', () => {
 
       expect(chunkName).toBe(
         webpack.version[0] === "5"
-          ? "main.a531550ffe767c49e881.bundle.js"
+          ? "main.89840c70616b788038a2.bundle.js"
           : "main.19efc497c5c37fc5e355.bundle.js"
       );
       expect(