From 3d8b2d9f01484a1ed21e2717644662a9f0480b42 Mon Sep 17 00:00:00 2001 From: Brot & Games <43862266+brotandgames@users.noreply.github.com> Date: Tue, 15 Oct 2024 21:56:31 +0200 Subject: [PATCH] Resolve tabler issue (#172) * Bump bootstrap from ~> 5.0.0 to ~> 5.3 * bundle update * Downgrade bootstrap from 5 to 4 * Add note on tabler-rubygem is only compatible with bootstrap 4 --- Gemfile | 6 +++++- Gemfile.lock | 41 ++++++++++++++++++++--------------------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/Gemfile b/Gemfile index f6ed939..85c6c6b 100644 --- a/Gemfile +++ b/Gemfile @@ -60,7 +60,9 @@ end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby] -gem "bootstrap", "~> 5.0.0" +# tabler-rubygem is only compatible with bootstrap 4 +# The `bg-variant` mixin has been deprecated as of v4.4.0. It will be removed entirely in v5. +gem "bootstrap", "~> 4" # https://stackoverflow.com/questions/78617432/strange-bundle-update-issue-disappearing-net-pop-0-1-2-dependency gem "net-pop", github: "ruby/net-pop" gem "prometheus-client" @@ -69,3 +71,5 @@ gem "simple_form" gem "tabler-rubygem" gem "yabeda-prometheus" gem "yabeda-rails" + +gem "sassc-rails", "~> 2.1" diff --git a/Gemfile.lock b/Gemfile.lock index bca2537..a33c548 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -79,10 +79,9 @@ GEM bindex (0.8.1) bootsnap (1.18.4) msgpack (~> 1.2) - bootstrap (5.0.2) + bootstrap (4.6.2.1) autoprefixer-rails (>= 9.1.0) - popper_js (>= 2.9.2, < 3) - sassc-rails (>= 2.0.0) + popper_js (>= 1.16.1, < 2) builder (3.3.0) byebug (11.1.3) capybara (3.40.0) @@ -151,8 +150,8 @@ GEM minitest (5.25.1) mocha (2.4.5) ruby2_keywords (>= 0.0.5) - msgpack (1.7.2) - net-imap (0.4.16) + msgpack (1.7.3) + net-imap (0.4.17) date net-protocol net-protocol (0.2.2) @@ -171,7 +170,7 @@ GEM parser (3.3.5.0) ast (~> 2.4.1) racc - popper_js (2.11.8) + popper_js (1.16.1) prometheus-client (4.2.3) base64 public_suffix (6.0.1) @@ -179,7 +178,7 @@ GEM nio4r (~> 2.0) raabro (1.4.0) racc (1.8.1) - rack (2.2.9) + rack (2.2.10) rack-mini-profiler (2.3.4) rack (>= 1.2.0) rack-test (2.1.0) @@ -218,21 +217,20 @@ GEM rb-inotify (0.11.1) ffi (~> 1.0) regexp_parser (2.9.2) - rexml (3.3.7) - rubocop (1.65.1) + rexml (3.3.8) + rubocop (1.66.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.4, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.31.1, < 2.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.32.3) parser (>= 3.3.1.0) - rubocop-performance (1.21.1) + rubocop-performance (1.22.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-next-core (1.0.3) @@ -280,18 +278,18 @@ GEM mini_portile2 (~> 2.8.0) sqlite3 (1.7.3-arm64-darwin) sqlite3 (1.7.3-x86_64-linux) - standard (1.40.0) + standard (1.41.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.65.0) + rubocop (~> 1.66.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.4) + standard-performance (~> 1.5) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.4.0) + standard-performance (1.5.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.21.0) + rubocop-performance (~> 1.22.0) standardrb (1.0.1) standard tabler-rubygem (0.1.4) @@ -314,7 +312,7 @@ GEM nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (~> 4.0, < 4.11) - webmock (3.23.1) + webmock (3.24.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -324,7 +322,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - yabeda (0.12.0) + yabeda (0.13.1) anyway_config (>= 1.0, < 3) concurrent-ruby dry-initializer @@ -338,7 +336,7 @@ GEM railties yabeda (~> 0.8) yard (0.9.37) - zeitwerk (2.6.18) + zeitwerk (2.7.0) PLATFORMS arm64-darwin-21 @@ -347,7 +345,7 @@ PLATFORMS DEPENDENCIES bootsnap (>= 1.4.4) - bootstrap (~> 5.0.0) + bootstrap (~> 4) byebug capybara (>= 3.26) jbuilder (~> 2.9) @@ -362,6 +360,7 @@ DEPENDENCIES rails (~> 6.1) rufus-scheduler sass-rails (~> 5) + sassc-rails (~> 2.1) selenium-webdriver (>= 4.0.0.rc1) simple_form spring