From 1b03528acaae97d545abac32bef4b4d3604f7f0d Mon Sep 17 00:00:00 2001
From: Gaetan Craig-Riou <gaetan.riou@gmail.com>
Date: Fri, 16 Jan 2026 15:45:54 +1100
Subject: [PATCH] Switch to v349_with-relaxed-dependencies for select2

It allows us to remove dependency on `rails-sass`
Sass files are handled by `shakapacker/wepack`, so we no use for
`rails-sass`
---
 Gemfile      |  5 ++---
 Gemfile.lock | 42 +++++++++++++++++-------------------------
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/Gemfile b/Gemfile
index 44c1d371f1..068c1868b1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -126,9 +126,8 @@ gem 'angular_rails_csrf'
 
 gem 'jquery-rails', '4.4.0'
 gem 'jquery-ui-rails', '~> 4.2'
-# TODO move away from sass-rails, master branch will get rid of dependency, so we can move to
-# https://github.com/sass/embedded-host-node
-gem "select2-rails", github: "openfoodfoundation/select2-rails", branch: "v349_with_thor_v1"
+gem "select2-rails", github: "openfoodfoundation/select2-rails",
+                     branch: "v349_with-relaxed-dependencies"
 
 gem 'good_migrations'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 500251293e..a089dcdc10 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,11 +10,10 @@ GIT
 
 GIT
   remote: https://github.com/openfoodfoundation/select2-rails.git
-  revision: fc240e85fbdf1878ff3c39d972c0cd9a312f5ed4
-  branch: v349_with_thor_v1
+  revision: 9693e0cc5b04938da46692d3fa83aa8934791981
+  branch: v349_with-relaxed-dependencies
   specs:
     select2-rails (3.4.9)
-      sass-rails
       thor (>= 0.14)
 
 GIT
@@ -305,7 +304,7 @@ GEM
       eventmachine (>= 1.0.0.beta.1)
     email_validator (2.2.4)
       activemodel
-    erb (6.0.0)
+    erb (6.0.1)
     erubi (1.13.1)
     et-orbi (1.3.0)
       tzinfo
@@ -330,7 +329,7 @@ GEM
       webrick (~> 1.7)
       websocket-driver (>= 0.6, < 0.8)
     ffaker (2.25.0)
-    ffi (1.17.2)
+    ffi (1.17.2-x86_64-linux-gnu)
     flipper (1.3.6)
       concurrent-ruby (< 2)
     flipper-active_record (1.3.6)
@@ -515,8 +514,7 @@ GEM
       net-protocol
     newrelic_rpm (9.24.0)
     nio4r (2.7.5)
-    nokogiri (1.18.10)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
     nokogiri-html5-inference (0.3.0)
       nokogiri (~> 1.14)
@@ -575,7 +573,7 @@ GEM
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    pg (1.6.2)
+    pg (1.6.2-x86_64-linux)
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
@@ -584,7 +582,7 @@ GEM
     pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (5.2.6)
+    psych (5.3.1)
       date
       stringio
     public_suffix (7.0.0)
@@ -686,7 +684,7 @@ GEM
       logger (~> 1.5)
       ostruct (~> 0.6)
       readline (~> 0.0)
-    rdoc (6.16.0)
+    rdoc (7.0.1)
       erb
       psych (>= 4.0.0)
       tsort
@@ -806,13 +804,6 @@ GEM
     sanitize (7.0.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.16.8)
-    sass (3.4.25)
-    sass-rails (5.0.8)
-      railties (>= 5.2.0)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
     sd_notify (0.1.1)
     securerandom (0.4.1)
     semantic_range (3.1.0)
@@ -824,11 +815,12 @@ GEM
       semantic_range (>= 2.3.0)
     shoulda-matchers (7.0.1)
       activesupport (>= 7.1)
-    sidekiq (7.2.4)
-      concurrent-ruby (< 2)
-      connection_pool (>= 2.3.0)
-      rack (>= 2.2.4)
-      redis-client (>= 0.19.0)
+    sidekiq (7.3.10)
+      base64
+      connection_pool (>= 2.3.0, < 3)
+      logger
+      rack (>= 2.2.4, < 3.3)
+      redis-client (>= 0.23.0, < 1)
     sidekiq-scheduler (5.0.3)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 6, < 8)
@@ -876,7 +868,7 @@ GEM
       railties (>= 5.2)
       redis (>= 4.0, < 6.0)
     stringex (2.8.6)
-    stringio (3.1.8)
+    stringio (3.2.0)
     stripe (15.5.0)
     swd (2.0.3)
       activesupport (>= 3)
@@ -963,10 +955,10 @@ GEM
     xml-simple (1.1.8)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.7.3)
+    zeitwerk (2.7.4)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   actionpack-action_caching