From 3b2d3b1379b644aeefbbe859c0baeadd0b732710 Mon Sep 17 00:00:00 2001
From: denisx <github.com@denisx.com>
Date: Wed, 5 Jun 2024 18:12:27 +0300
Subject: [PATCH 1/2] fix: base64safe regex

---
 lib/interpolateName.js       | 2 +-
 test/interpolateName.test.js | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/interpolateName.js b/lib/interpolateName.js
index 60a898c..0d58da8 100644
--- 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
index 77d9a17..6f67127 100644
--- 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",

From 06fcc0aac9928779d5e2e0fdc58dddd5d4c49ea3 Mon Sep 17 00:00:00 2001
From: "alexander.akait" <sheo13666q@gmail.com>
Date: Wed, 5 Jun 2024 18:13:20 +0300
Subject: [PATCH 2/2] chore(release): 3.3.1

---
 CHANGELOG.md | 7 +++++++
 package.json | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10dad6d..0ef90c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.3.1](https://github.com/webpack/loader-utils/compare/v3.3.0...v3.3.1) (2024-06-05)
+
+
+### Bug Fixes
+
+* base64safe regex ([3b2d3b1](https://github.com/webpack/loader-utils/commit/3b2d3b1379b644aeefbbe859c0baeadd0b732710))
+
 ## [3.3.0](https://github.com/webpack/loader-utils/compare/v3.2.2...v3.3.0) (2024-06-04)
 
 
diff --git a/package.json b/package.json
index 9268bf1..5b02cc4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "loader-utils",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "author": "Tobias Koppers @sokra",
   "description": "utils for webpack loaders",
   "dependencies": {},