feat: allow webpack-merge v6 (#502)

shakacode · Jul 8, 2024 · 6df8ed6 · 6df8ed6
1 parent b60efcc
commit 6df8ed6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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": {