fix: use official hash* options for hashes

webpack-contrib · Sep 20, 2024 · f2c32b2 · f2c32b2
1 parent 06587e5
commit f2c32b2
Showing 1 changed file with 21 additions and 6 deletions.
diff --git a/src/utils.js b/src/utils.js
@@ -519,8 +519,6 @@ function getModulesOptions(rawOptions, esModule, exportType, loaderContext) {
     ({ auto } = rawModulesOptions);
   }
 
-  // eslint-disable-next-line no-underscore-dangle
-  const { outputOptions } = loaderContext._compilation;
   const needNamedExport =
     exportType === "css-style-sheet" || exportType === "string";
   const namedExport =
@@ -539,10 +537,27 @@ function getModulesOptions(rawOptions, esModule, exportType, loaderContext) {
     exportGlobals: false,
     localIdentName: "[hash:base64]",
     localIdentContext: loaderContext.rootContext,
-    localIdentHashSalt: outputOptions.hashSalt,
-    localIdentHashFunction: outputOptions.hashFunction,
-    localIdentHashDigest: outputOptions.hashDigest,
-    localIdentHashDigestLength: outputOptions.hashDigestLength,
+    // eslint-disable-next-line no-underscore-dangle
+    localIdentHashSalt:
+      loaderContext.hashSalt ||
+      // TODO remove in the next major release
+      // eslint-disable-next-line no-underscore-dangle
+      loaderContext._compilation.outputOptions.hashSalt,
+    localIdentHashFunction:
+      loaderContext.hashFunction ||
+      // TODO remove in the next major release
+      // eslint-disable-next-line no-underscore-dangle
+      loaderContext._compilation.outputOptions.hashFunction,
+    localIdentHashDigest:
+      loaderContext.hashDigest ||
+      // TODO remove in the next major release
+      // eslint-disable-next-line no-underscore-dangle
+      loaderContext._compilation.outputOptions.hashDigest,
+    localIdentHashDigestLength:
+      loaderContext.hashDigestLength ||
+      // TODO remove in the next major release
+      // eslint-disable-next-line no-underscore-dangle
+      loaderContext._compilation.outputOptions.hashDigestLength,
     // eslint-disable-next-line no-undefined
     localIdentRegExp: undefined,
     // eslint-disable-next-line no-undefined