From a92df2150e0205fd0b2580863c5e9694966bcf0d Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 24 Mar 2023 10:45:47 +0100 Subject: [PATCH] (feat) updated dependencies --- .nvmrc | 2 +- .ruby-version | 2 +- CHANGELOG.md | 8 ++++++-- Dockerfile | 2 +- Gemfile | 4 ++-- Gemfile.lock | 16 ++++++++-------- lib/fab_manager.rb | 2 +- package.json | 2 +- yarn.lock | 8 ++++---- 9 files changed, 25 insertions(+), 21 deletions(-) diff --git a/.nvmrc b/.nvmrc index 23d9c36a1..55bffd620 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16.13.2 +18.15.0 diff --git a/.ruby-version b/.ruby-version index c877459a0..72b3400f1 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-3.1.3 +ruby-3.2.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 78cc6c8fc..e396a1be3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,17 @@ # Changelog Fab-manager -- Updated ruby to 3.1 +- Updated ruby to 3.2 - Updated rails to 6.1 - Updated puma to 6.1 - Updated responders to 3.0 - Updated devise to 4.9 -- Updated sassc to 2.3 +- Updated sassc to 2.4 - Updated sentry to 5.8 - Updated web-console to 4.2 +- Updated shakapacker to 6.6 +- Updated bootsnap to 1.16 +- Updated pg to 1.4 +- Updated nodejs to 18.15 - Fix a bug: broken display after a plan category was deleted ## v5.9.1 2023 March 22 diff --git a/Dockerfile b/Dockerfile index 41cb03a50..51b22e744 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.1.3-alpine +FROM ruby:3.2.1-alpine MAINTAINER contact@fab-manager.com # Install upgrade system packages diff --git a/Gemfile b/Gemfile index 4d551bd68..fa6371d02 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 6.1' gem 'bootsnap' # Use Puma as web server gem 'puma', '6.1.0' -gem 'shakapacker', '6.5.5' +gem 'shakapacker', '6.6.0' # rails 6 compatibility with ruby 3 (may not be required after upgrade to rails 7) gem 'matrix' @@ -139,7 +139,7 @@ gem 'icalendar' gem 'tzinfo-data' # compilation of dynamic stylesheets (home page & theme) -gem 'sassc', '= 2.3.0' +gem 'sassc', '= 2.4.0' gem 'redis-session-store' diff --git a/Gemfile.lock b/Gemfile.lock index fcb6fa164..8b61b06b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -84,8 +84,8 @@ GEM bcrypt (3.1.18) bindata (2.4.10) bindex (0.8.1) - bootsnap (1.4.6) - msgpack (~> 1.0) + bootsnap (1.16.0) + msgpack (~> 1.2) brpoplpush-redis_script (0.1.2) concurrent-ruby (~> 1.0, >= 1.0.5) redis (>= 1.0, <= 5.0) @@ -244,7 +244,7 @@ GEM builder minitest (>= 5.0) ruby-progressbar - msgpack (1.3.3) + msgpack (1.6.1) multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.1.1) @@ -307,7 +307,7 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.2.2) + pg (1.4.6) pg_search (2.3.2) activerecord (>= 5.2) activesupport (>= 5.2) @@ -408,7 +408,7 @@ GEM rufus-scheduler (3.8.1) fugit (~> 1.1, >= 1.1.6) safe_yaml (1.0.5) - sassc (2.3.0) + sassc (2.4.0) ffi (~> 1.9) seed_dump (3.3.1) activerecord (>= 4) @@ -420,7 +420,7 @@ GEM sentry-ruby (5.8.0) concurrent-ruby (~> 1.0, >= 1.0.2) sha3 (1.0.5) - shakapacker (6.5.5) + shakapacker (6.6.0) activesupport (>= 5.2) rack-proxy (>= 0.6.1) railties (>= 5.2) @@ -582,12 +582,12 @@ DEPENDENCIES rubocop-rails rubyXL rubyzip (>= 1.3.0) - sassc (= 2.3.0) + sassc (= 2.4.0) seed_dump sentry-rails sentry-ruby sha3 - shakapacker (= 6.5.5) + shakapacker (= 6.6.0) sidekiq (>= 6.0.7) sidekiq-scheduler sidekiq-unique-jobs (~> 7.1.23) diff --git a/lib/fab_manager.rb b/lib/fab_manager.rb index 5d450ea61..9007be9e6 100644 --- a/lib/fab_manager.rb +++ b/lib/fab_manager.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -load 'plugin/instance' +load 'plugin/instance.rb' # the FabManager application module FabManager diff --git a/package.json b/package.json index 368690a3a..e3956285e 100644 --- a/package.json +++ b/package.json @@ -172,7 +172,7 @@ "resolve-url-loader": "^4.0.0", "sass": "^1.49.9", "sass-loader": "^12.6.0", - "shakapacker": "6.5.5", + "shakapacker": "6.6.0", "slugify": "^1.6.5", "sortablejs": "^1.15.0", "style-loader": "^3.3.1", diff --git a/yarn.lock b/yarn.lock index e02cd67c9..c0abcb7e3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9594,10 +9594,10 @@ setprototypeof@1.2.0: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== -shakapacker@6.5.5: - version "6.5.5" - resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-6.5.5.tgz#34c027b3d3b34b8241a946d4af256df81c0c04f7" - integrity sha512-KsDhjihjmkJVpdnuDvHj70RzRjreXcnMQtePp+TkHzi4sXO8gwt0btoTNrwuLrgxOfac7UQadDFYFGzJwoPz5w== +shakapacker@6.6.0: + version "6.6.0" + resolved "https://registry.yarnpkg.com/shakapacker/-/shakapacker-6.6.0.tgz#1e372a7ce6fa93f1a7bd1820737b8168679eb220" + integrity sha512-7sNnv8PXMlgm2Ob7vZOayLKu0+PPMN3q0HEyAlkFIJtHJt7wA3p1rObhlk0/OrNeBa4dio/9HiBUeEU7bZsHvw== dependencies: glob "^7.2.0" js-yaml "^4.1.0"