From 96bd810b14d33ebec2e284ba552cee6336731cb8 Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin@shakacode.com>
Date: Mon, 30 Mar 2026 15:12:13 -1000
Subject: [PATCH] Fix release task docs and modern Ruby bundle resolution

---
 CONTRIBUTING.md             |  1 +
 Gemfile                     |  4 ++++
 Gemfile.lock                | 18 +++++++++++-------
 rakelib/create_release.rake |  2 +-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index efc775d42..0e4ce3228 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -117,6 +117,7 @@ It outputs an ironically webpacked couple of files into `lib/assets/react-source
   - Update the [changelog](CHANGELOG.md) (find recent changes on GitHub by listing commits or showing closed PRs)
   - Regular versions: `bundle exec rake create_release\[2.7.0\]`
   - RC versions: `bundle exec rake create_release\[2.7.0.rc.2\]`
+  - Dry run: `bundle exec rake create_release\[2.7.0,true\]`
   - Note, `rake create_release` runs `rake react:update` and `rake ujs:update`
 
 ## Styleguides
diff --git a/Gemfile b/Gemfile
index c56c88f84..7de009072 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,3 +3,7 @@
 source "http://rubygems.org"
 
 gemspec
+
+# Keep development bundle compatible with both Ruby 2.7 CI and newer local Rubies.
+# Nokogiri 1.19+ requires Ruby 3.2+, which breaks the repo's Ruby 2.7 matrix.
+gem "nokogiri", "~> 1.15.7"
diff --git a/Gemfile.lock b/Gemfile.lock
index 268bc299d..43493fb2b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -87,7 +87,7 @@ GEM
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
     builder (3.2.4)
-    byebug (11.0.1)
+    byebug (11.1.3)
     capybara (3.37.1)
       addressable
       matrix
@@ -157,7 +157,7 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.6)
+    mini_portile2 (2.8.9)
     minitest (5.17.0)
     minitest-retry (0.2.2)
       minitest (>= 5.0)
@@ -172,12 +172,14 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.7)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-darwin)
+    nokogiri (1.15.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-linux)
+    nokogiri (1.15.7-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.15.7-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -190,7 +192,7 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (4.0.6)
-    racc (1.6.2)
+    racc (1.8.1)
     rack (2.2.6.4)
     rack-test (2.0.2)
       rack (>= 1.3)
@@ -256,6 +258,7 @@ GEM
     zeitwerk (2.6.6)
 
 PLATFORMS
+  arm64-darwin-23
   ruby
   x86_64-darwin-20
   x86_64-linux
@@ -273,6 +276,7 @@ DEPENDENCIES
   jbuilder
   listen (~> 3.0.0)
   minitest-retry
+  nokogiri (~> 1.15.7)
   package_json
   pry-byebug (~> 3.8.0)
   rails (~> 7.0.7, >= 7.0.7.2)
diff --git a/rakelib/create_release.rake b/rakelib/create_release.rake
index e3c1159eb..6989e8252 100644
--- a/rakelib/create_release.rake
+++ b/rakelib/create_release.rake
@@ -15,7 +15,7 @@ desc("Releases both the gem and node package using the given version.
   2nd argument: Perform a dry run by passing 'true' as a second argument.
 
   Note, accept defaults for npmjs options. Script will pause to get 2FA tokens.
-  Example: `rake release[2.1.0,false]`")
+  Example: `rake create_release[2.1.0,false]`")
 
 task :create_release, %i[gem_version dry_run] do |_t, args|
   args_hash = args.to_hash