From 567f59cebfa5c0d90ad38e6db65cbc3f3d78fbba Mon Sep 17 00:00:00 2001
From: Gareth Jones <3151613+G-Rath@users.noreply.github.com>
Date: Mon, 9 Jun 2025 13:24:09 +1200
Subject: [PATCH 1/2] fix: install the latest major version of peer
 dependencies

---
 lib/install/template.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/install/template.rb b/lib/install/template.rb
index ca42a7f68..25e5bfdd3 100644
--- a/lib/install/template.rb
+++ b/lib/install/template.rb
@@ -136,7 +136,7 @@ def fetch_peer_dependencies
   dev_dependencies_to_add = []
 
   peers.each do |(package, version)|
-    major_version = version.match(/(\d+)/)[1]
+    major_version = version.split("||").last.match(/(\d+)/)[1]
     entry = "#{package}@#{major_version}"
 
     if dev_dependency_packages.include? package

From a63de5537f3cc55dfc8f5cdfc8c73763c1a7874d Mon Sep 17 00:00:00 2001
From: Gareth Jones <3151613+G-Rath@users.noreply.github.com>
Date: Mon, 9 Jun 2025 13:40:33 +1200
Subject: [PATCH 2/2] docs: add changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c177c6b2a..815c5e38b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Changes since the last non-beta release.
 
 ### Fixed
 
+- Install the latest major version of peer dependencies [PR 576](https://github.com/shakacode/shakapacker/pull/576) by [G-Rath](https://github.com/g-rath).
 - Remove duplicate word in comment from generated `shakapacker.yml` config [PR 572](https://github.com/shakacode/shakapacker/pull/572) by [G-Rath](https://github.com/g-rath).
 
 ## [v8.3.0] - April 25, 2025