From 6df8ed6ac87b372730e0538e0d16c7d818c07518 Mon Sep 17 00:00:00 2001
From: Gareth Jones <Jones258@Gmail.com>
Date: Mon, 8 Jul 2024 15:37:10 +1200
Subject: [PATCH] feat: allow `webpack-merge` v6 (#502)

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c44c212..7b964abe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ Changes since the last non-beta release.
 
 ### Changed
 - Update outdated GitHub Actions to use Node.js 20.0 versions instead [PR 497](https://github.com/shakacode/shakapacker/pull/497) by [adriangohjw](https://github.com/adriangohjw).
+- Allow `webpack-merge` v6 to be used [PR 502](https://github.com/shakacode/shakapacker/pull/502) by [G-Rath](https://github.com/g-rath).
 
 ### Fixed
 
diff --git a/package.json b/package.json
index d01e28cf..577f0ba3 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "webpack-assets-manifest": "^5.0.6",
     "webpack-cli": "^4.9.2 || ^5.0.0",
     "webpack-dev-server": "^4.9.0 || ^5.0.0",
-    "webpack-merge": "^5.8.0"
+    "webpack-merge": "^5.8.0 || ^6.0.0"
   },
   "peerDependenciesMeta": {
     "@types/babel__core": {