From 8b2af6708b7ee95654b4c849574ef623e5775283 Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Sat, 1 Nov 2025 10:24:12 +0100 Subject: [PATCH] Update dependencies --- Gemfile | 4 +- Gemfile.lock | 140 ++++++++++++++++++++++++++------------------------- db/schema.rb | 18 +++---- package.json | 2 +- yarn.lock | 45 +++++++++++++---- 5 files changed, 120 insertions(+), 89 deletions(-) diff --git a/Gemfile b/Gemfile index 5a8cb297..68e172ff 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" ruby file: ".ruby-version" -gem "rails", "~> 8.0.3" +gem "rails", "~> 8.1.1" gem "sqlite3" gem "puma" @@ -12,7 +12,7 @@ gem "sprockets-rails" gem "cssbundling-rails" gem "importmap-rails" -gem "activeadmin", "4.0.0.beta17" # github: "activeadmin/activeadmin", branch: "master" +gem "activeadmin", "4.0.0.beta18" # github: "activeadmin/activeadmin", branch: "master" gem "devise" # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/Gemfile.lock b/Gemfile.lock index 67a6aa3b..9e67baa0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,29 +1,31 @@ GEM remote: https://rubygems.org/ specs: - actioncable (8.0.3) - actionpack (= 8.0.3) - activesupport (= 8.0.3) + action_text-trix (2.1.15) + railties + actioncable (8.1.1) + actionpack (= 8.1.1) + activesupport (= 8.1.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (8.0.3) - actionpack (= 8.0.3) - activejob (= 8.0.3) - activerecord (= 8.0.3) - activestorage (= 8.0.3) - activesupport (= 8.0.3) + actionmailbox (8.1.1) + actionpack (= 8.1.1) + activejob (= 8.1.1) + activerecord (= 8.1.1) + activestorage (= 8.1.1) + activesupport (= 8.1.1) mail (>= 2.8.0) - actionmailer (8.0.3) - actionpack (= 8.0.3) - actionview (= 8.0.3) - activejob (= 8.0.3) - activesupport (= 8.0.3) + actionmailer (8.1.1) + actionpack (= 8.1.1) + actionview (= 8.1.1) + activejob (= 8.1.1) + activesupport (= 8.1.1) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (8.0.3) - actionview (= 8.0.3) - activesupport (= 8.0.3) + actionpack (8.1.1) + actionview (= 8.1.1) + activesupport (= 8.1.1) nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) @@ -31,20 +33,21 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (8.0.3) - actionpack (= 8.0.3) - activerecord (= 8.0.3) - activestorage (= 8.0.3) - activesupport (= 8.0.3) + actiontext (8.1.1) + action_text-trix (~> 2.1.15) + actionpack (= 8.1.1) + activerecord (= 8.1.1) + activestorage (= 8.1.1) + activesupport (= 8.1.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (8.0.3) - activesupport (= 8.0.3) + actionview (8.1.1) + activesupport (= 8.1.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activeadmin (4.0.0.beta17) + activeadmin (4.0.0.beta18) arbre (~> 2.0) csv formtastic (>= 5.0) @@ -53,29 +56,29 @@ GEM kaminari (>= 1.2.1) railties (>= 7.0) ransack (>= 4.0) - activejob (8.0.3) - activesupport (= 8.0.3) + activejob (8.1.1) + activesupport (= 8.1.1) globalid (>= 0.3.6) - activemodel (8.0.3) - activesupport (= 8.0.3) - activerecord (8.0.3) - activemodel (= 8.0.3) - activesupport (= 8.0.3) + activemodel (8.1.1) + activesupport (= 8.1.1) + activerecord (8.1.1) + activemodel (= 8.1.1) + activesupport (= 8.1.1) timeout (>= 0.4.0) - activestorage (8.0.3) - actionpack (= 8.0.3) - activejob (= 8.0.3) - activerecord (= 8.0.3) - activesupport (= 8.0.3) + activestorage (8.1.1) + actionpack (= 8.1.1) + activejob (= 8.1.1) + activerecord (= 8.1.1) + activesupport (= 8.1.1) marcel (~> 1.0) - activesupport (8.0.3) + activesupport (8.1.1) base64 - benchmark (>= 0.3) bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + json logger (>= 1.4.2) minitest (>= 5.1) securerandom (>= 0.3) @@ -87,7 +90,6 @@ GEM activesupport (>= 7.0) base64 (0.3.0) bcrypt (3.1.20) - benchmark (0.5.0) bigdecimal (3.3.1) builder (3.3.0) capybara (3.40.0) @@ -105,7 +107,7 @@ GEM cssbundling-rails (1.4.3) railties (>= 6.0.0) csv (3.3.5) - date (3.4.1) + date (3.5.0) debug (1.11.0) irb (~> 1.10) reline (>= 0.3.8) @@ -117,7 +119,7 @@ GEM warden (~> 1.2.3) docile (1.4.1) drb (2.2.3) - erb (5.1.1) + erb (5.1.3) erubi (1.13.1) formtastic (5.0.0) actionpack (>= 6.0.0) @@ -143,6 +145,7 @@ GEM pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) + json (2.15.2) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -159,7 +162,8 @@ GEM loofah (2.24.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) - mail (2.8.1) + mail (2.9.0) + logger mini_mime (>= 0.1.1) net-imap net-pop @@ -178,7 +182,7 @@ GEM timeout net-smtp (0.5.1) net-protocol - nio4r (2.7.4) + nio4r (2.7.5) nokogiri (1.18.10) mini_portile2 (~> 2.8.2) racc (~> 1.4) @@ -205,20 +209,20 @@ GEM rack (>= 1.3) rackup (2.2.1) rack (>= 3) - rails (8.0.3) - actioncable (= 8.0.3) - actionmailbox (= 8.0.3) - actionmailer (= 8.0.3) - actionpack (= 8.0.3) - actiontext (= 8.0.3) - actionview (= 8.0.3) - activejob (= 8.0.3) - activemodel (= 8.0.3) - activerecord (= 8.0.3) - activestorage (= 8.0.3) - activesupport (= 8.0.3) + rails (8.1.1) + actioncable (= 8.1.1) + actionmailbox (= 8.1.1) + actionmailer (= 8.1.1) + actionpack (= 8.1.1) + actiontext (= 8.1.1) + actionview (= 8.1.1) + activejob (= 8.1.1) + activemodel (= 8.1.1) + activerecord (= 8.1.1) + activestorage (= 8.1.1) + activesupport (= 8.1.1) bundler (>= 1.15.0) - railties (= 8.0.3) + railties (= 8.1.1) rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest @@ -226,21 +230,21 @@ GEM rails-html-sanitizer (1.6.2) loofah (~> 2.21) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - railties (8.0.3) - actionpack (= 8.0.3) - activesupport (= 8.0.3) + railties (8.1.1) + actionpack (= 8.1.1) + activesupport (= 8.1.1) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) tsort (>= 0.2) zeitwerk (~> 2.6) - rake (13.3.0) + rake (13.3.1) ransack (4.4.1) activerecord (>= 7.2) activesupport (>= 7.2) i18n - rdoc (6.15.0) + rdoc (6.15.1) erb psych (>= 4.0.0) tsort @@ -251,9 +255,9 @@ GEM actionpack (>= 7.0) railties (>= 7.0) rexml (3.4.4) - rubyzip (3.2.0) + rubyzip (3.2.1) securerandom (0.4.1) - selenium-webdriver (4.37.0) + selenium-webdriver (4.38.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) @@ -282,11 +286,11 @@ GEM sqlite3 (2.7.4-x86_64-linux-gnu) stringio (3.1.7) thor (1.4.0) - timeout (0.4.3) + timeout (0.4.4) tsort (0.2.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - uri (1.0.4) + uri (1.1.0) useragent (0.16.11) warden (1.2.9) rack (>= 2.0.9) @@ -306,14 +310,14 @@ PLATFORMS x86_64-linux DEPENDENCIES - activeadmin (= 4.0.0.beta17) + activeadmin (= 4.0.0.beta18) capybara cssbundling-rails debug devise importmap-rails puma - rails (~> 8.0.3) + rails (~> 8.1.1) selenium-webdriver simplecov simplecov-cobertura diff --git a/db/schema.rb b/db/schema.rb index 88ef8df3..dba45d3a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,15 +10,15 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.0].define(version: 2024_01_06_142000) do +ActiveRecord::Schema[8.1].define(version: 2024_01_06_142000) do create_table "active_admin_comments", force: :cascade do |t| - t.string "namespace" - t.text "body" - t.string "resource_type" - t.integer "resource_id" - t.string "author_type" t.integer "author_id" + t.string "author_type" + t.text "body" t.datetime "created_at", null: false + t.string "namespace" + t.integer "resource_id" + t.string "resource_type" t.datetime "updated_at", null: false t.index ["author_type", "author_id"], name: "index_active_admin_comments_on_author" t.index ["namespace"], name: "index_active_admin_comments_on_namespace" @@ -26,12 +26,12 @@ end create_table "admin_users", force: :cascade do |t| + t.datetime "created_at", null: false t.string "email", default: "", null: false t.string "encrypted_password", default: "", null: false - t.string "reset_password_token" - t.datetime "reset_password_sent_at" t.datetime "remember_created_at" - t.datetime "created_at", null: false + t.datetime "reset_password_sent_at" + t.string "reset_password_token" t.datetime "updated_at", null: false t.index ["email"], name: "index_admin_users_on_email", unique: true t.index ["reset_password_token"], name: "index_admin_users_on_reset_password_token", unique: true diff --git a/package.json b/package.json index 6ea8a4f2..fc276ddc 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "app", "private": "true", "dependencies": { - "@activeadmin/activeadmin": "4.0.0-beta17", + "@activeadmin/activeadmin": "4.0.0-beta18", "tailwindcss": "^3.4.18" }, "scripts": { diff --git a/yarn.lock b/yarn.lock index e9d2a6a8..2c5f88a6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,14 +2,24 @@ # yarn lockfile v1 -"@activeadmin/activeadmin@4.0.0-beta17": - version "4.0.0-beta17" - resolved "https://registry.yarnpkg.com/@activeadmin/activeadmin/-/activeadmin-4.0.0-beta17.tgz#ac6f48eea77409ee775f6394fe79b79a47039852" - integrity sha512-BYs91o0OgatyeDDqEyuqoFbybd6SevPVEzt12acnQ9S2qb1AOPGfyLbiJNo9wzEHou6K0vnzQzDXUadU42wyRA== +"@activeadmin/activeadmin@4.0.0-beta18": + version "4.0.0-beta18" + resolved "https://registry.yarnpkg.com/@activeadmin/activeadmin/-/activeadmin-4.0.0-beta18.tgz#4734c46811738f42296c2caf549057ccfe49a77a" + integrity sha512-kU9UBXdky/UuoqfrvA3kN/w8pAkjyz05RdSMGW5inyv0IocuzwNmgwPcdM0KGAFHoftosEI+6wnsQkREWXEUuw== dependencies: - "@rails/ujs" "7.1.501" + "@activeadmin/activeadmin" "^3.3.0" + "@rails/ujs" "7.1.600" flowbite "3.1.2" +"@activeadmin/activeadmin@^3.3.0": + version "3.3.0" + resolved "https://registry.yarnpkg.com/@activeadmin/activeadmin/-/activeadmin-3.3.0.tgz#f5163cf2235a2a42efda8aa78863c61d2fc863bc" + integrity sha512-YVWHMI+dml5/iKleZJQ3VTvb6kbg/v8F7gsyOmxxqbxqJ6ofEK9X8CKUljA11IAWNpxV7i7ygG2WwZdMsgtcpA== + dependencies: + jquery "^3.4.1" + jquery-ui "^1.13.3" + jquery-ujs "^1.2.2" + "@alloc/quick-lru@^5.2.0": version "5.2.0" resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30" @@ -84,10 +94,10 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== -"@rails/ujs@7.1.501": - version "7.1.501" - resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.1.501.tgz#e560a7b6885a12a659c4beb47f4336c8a9353056" - integrity sha512-7EDRGUlgns12IgP3SXVSaxA3CwRzbLOypPXn1EqEZiZ/NS/PwaQ/oa7Z2VRO4B46JifoVr0PYg+G5ERSGQJHxQ== +"@rails/ujs@7.1.600": + version "7.1.600" + resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.1.600.tgz#781d2737f3a81da81e78d93ec779099871288965" + integrity sha512-ntMYJ8++n1zcIJ1g75or7Va9IU3ueCHgp9IJk7Ny7eFEbu0Kx40EHZ2FNhoxoUEjlF5NifCFCbvoK5rDK5HpIQ== "@rollup/plugin-node-resolve@^15.2.3": version "15.3.1" @@ -432,6 +442,23 @@ jiti@^1.21.7: resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.7.tgz#9dd81043424a3d28458b193d965f0d18a2300ba9" integrity sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A== +jquery-ui@^1.13.3: + version "1.14.1" + resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.14.1.tgz#ba342ea3ffff662b787595391f607d923313e040" + integrity sha512-DhzsYH8VeIvOaxwi+B/2BCsFFT5EGjShdzOcm5DssWjtcpGWIMsn66rJciDA6jBruzNiLf1q0KvwMoX1uGNvnQ== + dependencies: + jquery ">=1.12.0 <5.0.0" + +jquery-ujs@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.3.tgz#dcac6026ab7268e5ee41faf9d31c997cd4ddd603" + integrity sha512-59wvfx5vcCTHMeQT1/OwFiAj+UffLIwjRIoXdpO7Z7BCFGepzq9T9oLVeoItjTqjoXfUrHJvV7QU6pUR+UzOoA== + +"jquery@>=1.12.0 <5.0.0", jquery@^3.4.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de" + integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg== + lilconfig@^3.1.1, lilconfig@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.3.tgz#a1bcfd6257f9585bf5ae14ceeebb7b559025e4c4"