fix: base64safe regex

webpack · Jun 5, 2024 · 3b2d3b1 · 3b2d3b1
1 parent 2d6ed3c
commit 3b2d3b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/interpolateName.js b/lib/interpolateName.js
@@ -77,7 +77,7 @@ function interpolateName(loaderContext, name, options = {}) {
       // `hash` and `contenthash` are same in `loader-utils` context
       // let's keep `hash` for backward compatibility
       .replace(
-        /\[(?:([^[:\]]+):)?(?:hash|contenthash)(?::([a-z]+\d*))?(?::(\d+))?\]/gi,
+        /\[(?:([^[:\]]+):)?(?:hash|contenthash)(?::([a-z]+\d*(?:safe)?))?(?::(\d+))?\]/gi,
         (all, hashType, digestType, maxLength) =>
           getHashDigest(content, hashType, digestType, parseInt(maxLength, 10))
       );

diff --git a/test/interpolateName.test.js b/test/interpolateName.test.js
@@ -118,6 +118,12 @@ describe("interpolateName()", () => {
       "test content",
       "modal.lHP90NiApDwht3eNNIch.css",
     ],
+    [
+      "/lib/components/modal/modal.css",
+      "[name].[md5:contenthash:base64safe:20].[ext]",
+      "test content",
+      "modal.8osQznuT8jOAwdzg_nek.css",
+    ],
     // Should not interpret without `hash` or `contenthash`
     [
       "/lib/components/modal/modal.css",