From 71d46e26b248c8832d560e9d03f6d3e6a601c199 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 28 May 2025 04:39:17 -0400
Subject: [PATCH] Update `rack` to version 3 (#34816)

---
 .github/renovate.json5            |  1 -
 Gemfile                           |  1 -
 Gemfile.lock                      | 18 +++++++++---------
 config/initializers/mime_types.rb |  3 ---
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 7b1b25a19b..1850a45bbc 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -39,7 +39,6 @@
       // Require Dependency Dashboard Approval for major version bumps of these Ruby packages
       matchManagers: ['bundler'],
       matchPackageNames: [
-        'rack', // Needs to be synced with Rails version
         'strong_migrations', // Requires manual upgrade
         'sidekiq', // Requires manual upgrade
         'sidekiq-unique-jobs', // Requires manual upgrades and sync with Sidekiq version
diff --git a/Gemfile b/Gemfile
index 616889a82d..c4b57eef79 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,6 @@ ruby '>= 3.2.0', '< 3.5.0'
 
 gem 'propshaft'
 gem 'puma', '~> 6.3'
-gem 'rack', '~> 2.2.7'
 gem 'rails', '~> 8.0'
 gem 'thor', '~> 1.2'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index fcd21bdb5f..aa74475b24 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -633,7 +633,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.16)
+    rack (3.1.15)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (2.0.2)
@@ -645,18 +645,19 @@ GEM
       faraday-follow_redirects
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
-    rack-protection (3.2.0)
+    rack-protection (4.1.1)
       base64 (>= 0.1.0)
-      rack (~> 2.2, >= 2.2.4)
+      logger (>= 1.6.0)
+      rack (>= 3.0.0, < 4)
     rack-proxy (0.7.7)
       rack
-    rack-session (1.0.2)
-      rack (< 3)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
     rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (1.0.1)
-      rack (< 3)
-      webrick
+    rackup (2.2.1)
+      rack (>= 3)
     rails (8.0.2)
       actioncable (= 8.0.2)
       actionmailbox (= 8.0.2)
@@ -1044,7 +1045,6 @@ DEPENDENCIES
   public_suffix (~> 6.0)
   puma (~> 6.3)
   pundit (~> 2.3)
-  rack (~> 2.2.7)
   rack-attack (~> 6.6)
   rack-cors (~> 2.0)
   rack-test (~> 2.1)
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index dde308cbc1..4cf6bfbf34 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -2,6 +2,3 @@
 
 Mime::Type.register 'application/json', :json, %w(text/x-json application/jsonrequest application/jrd+json application/activity+json application/ld+json)
 Mime::Type.register 'text/xml',         :xml,  %w(application/xml application/atom+xml application/xrd+xml)
-
-# WebP is not defined in Rack 2.2.
-Rack::Mime::MIME_TYPES['.webp'] = 'image/webp'