Skip to content

Commit 6df8ed6

Browse files
authored
feat: allow webpack-merge v6 (#502)
1 parent b60efcc commit 6df8ed6

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Changes since the last non-beta release.
1212

1313
### Changed
1414
- 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).
15+
- Allow `webpack-merge` v6 to be used [PR 502](https://github.com/shakacode/shakapacker/pull/502) by [G-Rath](https://github.com/g-rath).
1516

1617
### Fixed
1718

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"webpack-assets-manifest": "^5.0.6",
6363
"webpack-cli": "^4.9.2 || ^5.0.0",
6464
"webpack-dev-server": "^4.9.0 || ^5.0.0",
65-
"webpack-merge": "^5.8.0"
65+
"webpack-merge": "^5.8.0 || ^6.0.0"
6666
},
6767
"peerDependenciesMeta": {
6868
"@types/babel__core": {

0 commit comments

Comments
 (0)