Update accentor

This commit is contained in:
Charlotte Van Petegem 2022-02-25 14:51:12 +01:00
parent db10861103
commit 6933c7bc3f
No known key found for this signature in database
GPG key ID: 019E764B7184435A
8 changed files with 5924 additions and 10733 deletions

View file

@ -4,15 +4,13 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '~> 3.1.0' ruby '~> 3.1.0'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.1' gem 'rails', '~> 7.0'
# Use postgresql as the database for Active Record # Use postgresql as the database for Active Record
gem 'pg', '>= 1.2.3', '< 2.0' gem 'pg', '>= 1.2.3', '< 2.0'
# Use Puma as the app server # Use Puma as the app server
gem 'puma', '~> 5.6' gem 'puma', '~> 5.6'
# Use ActiveModelSerializer for serializing to JSON # Use ActiveModelSerializer for serializing to JSON
gem 'active_model_serializers', '~> 0.10' gem 'active_model_serializers', '~> 0.10'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use ActiveModel has_secure_password # Use ActiveModel has_secure_password
gem 'bcrypt', '~> 3.1' gem 'bcrypt', '~> 3.1'
@ -20,21 +18,24 @@ gem 'delayed_job_active_record', '~> 4.1'
gem 'delayed_cron_job', '~> 0.9' gem 'delayed_cron_job', '~> 0.9'
gem 'wahwah', '~> 1.1.1' gem 'wahwah', '~> 1.2.0'
gem 'has_scope', '~> 0.8' gem 'has_scope', '~> 0.8'
gem 'pundit', '~> 2.1' gem 'pundit', '~> 2.2'
gem 'will_paginate', '~> 3.3' gem 'will_paginate', '~> 3.3'
# Use ActiveStorage variant # Use ActiveStorage variant
gem 'image_processing', '~> 1.12.1' gem 'image_processing', '~> 1.12.1'
# Reduces boot times through caching; required in config/boot.rb # Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.4.6', require: false gem 'bootsnap', '~> 1.10.3', require: false
# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible # Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
gem 'rack-cors', '~> 1.1' gem 'rack-cors', '~> 1.1'
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
group :test do group :test do
gem 'codecov', '~> 0.6.0', require: false gem 'codecov', '~> 0.6.0', require: false
gem 'mocha', '~> 1.13.0', require: false gem 'mocha', '~> 1.13.0', require: false
@ -50,15 +51,7 @@ group :development, :test do
end end
group :development do group :development do
gem 'annotate', '~> 3.1' # Remove workaround in lib/tasks/annotate.rb when https://github.com/ctran/annotate_models/issues/696 is fixed gem 'annotate', '~> 3.2' # Remove workaround in lib/tasks/annotate.rb when https://github.com/ctran/annotate_models/issues/696 is fixed
gem 'rubocop-minitest', '~> 0.17.1' gem 'rubocop-minitest', '~> 0.17.2'
gem 'rubocop-rails', '~> 2.13' gem 'rubocop-rails', '~> 2.13'
gem 'listen', '>= 3.1.5', '< 3.8'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring', '~> 2.1'
gem 'spring-watcher-listen', '~> 2.0'
end end
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]

View file

@ -1,40 +1,47 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (6.1.4.4) actioncable (7.0.2.2)
actionpack (= 6.1.4.4) actionpack (= 7.0.2.2)
activesupport (= 6.1.4.4) activesupport (= 7.0.2.2)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (6.1.4.4) actionmailbox (7.0.2.2)
actionpack (= 6.1.4.4) actionpack (= 7.0.2.2)
activejob (= 6.1.4.4) activejob (= 7.0.2.2)
activerecord (= 6.1.4.4) activerecord (= 7.0.2.2)
activestorage (= 6.1.4.4) activestorage (= 7.0.2.2)
activesupport (= 6.1.4.4) activesupport (= 7.0.2.2)
mail (>= 2.7.1) mail (>= 2.7.1)
actionmailer (6.1.4.4) net-imap
actionpack (= 6.1.4.4) net-pop
actionview (= 6.1.4.4) net-smtp
activejob (= 6.1.4.4) actionmailer (7.0.2.2)
activesupport (= 6.1.4.4) actionpack (= 7.0.2.2)
actionview (= 7.0.2.2)
activejob (= 7.0.2.2)
activesupport (= 7.0.2.2)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (6.1.4.4) actionpack (7.0.2.2)
actionview (= 6.1.4.4) actionview (= 7.0.2.2)
activesupport (= 6.1.4.4) activesupport (= 7.0.2.2)
rack (~> 2.0, >= 2.0.9) rack (~> 2.0, >= 2.2.0)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.4.4) actiontext (7.0.2.2)
actionpack (= 6.1.4.4) actionpack (= 7.0.2.2)
activerecord (= 6.1.4.4) activerecord (= 7.0.2.2)
activestorage (= 6.1.4.4) activestorage (= 7.0.2.2)
activesupport (= 6.1.4.4) activesupport (= 7.0.2.2)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (6.1.4.4) actionview (7.0.2.2)
activesupport (= 6.1.4.4) activesupport (= 7.0.2.2)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
@ -44,29 +51,28 @@ GEM
activemodel (>= 4.1, < 7.1) activemodel (>= 4.1, < 7.1)
case_transform (>= 0.2) case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3) jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (6.1.4.4) activejob (7.0.2.2)
activesupport (= 6.1.4.4) activesupport (= 7.0.2.2)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.1.4.4) activemodel (7.0.2.2)
activesupport (= 6.1.4.4) activesupport (= 7.0.2.2)
activerecord (6.1.4.4) activerecord (7.0.2.2)
activemodel (= 6.1.4.4) activemodel (= 7.0.2.2)
activesupport (= 6.1.4.4) activesupport (= 7.0.2.2)
activestorage (6.1.4.4) activestorage (7.0.2.2)
actionpack (= 6.1.4.4) actionpack (= 7.0.2.2)
activejob (= 6.1.4.4) activejob (= 7.0.2.2)
activerecord (= 6.1.4.4) activerecord (= 7.0.2.2)
activesupport (= 6.1.4.4) activesupport (= 7.0.2.2)
marcel (~> 1.0.0) marcel (~> 1.0)
mini_mime (>= 1.1.0) mini_mime (>= 1.1.0)
activesupport (6.1.4.4) activesupport (7.0.2.2)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
tzinfo (~> 2.0) tzinfo (~> 2.0)
zeitwerk (~> 2.3) annotate (3.2.0)
annotate (3.1.1) activerecord (>= 3.2, < 8.0)
activerecord (>= 3.2, < 7.0)
rake (>= 10.4, < 14.0) rake (>= 10.4, < 14.0)
ast (2.4.2) ast (2.4.2)
bcrypt (3.1.16) bcrypt (3.1.16)
@ -87,6 +93,7 @@ GEM
delayed_job_active_record (4.1.7) delayed_job_active_record (4.1.7)
activerecord (>= 3.0, < 8.0) activerecord (>= 3.0, < 8.0)
delayed_job (>= 3.0, < 5) delayed_job (>= 3.0, < 5)
digest (3.1.0)
docile (1.4.0) docile (1.4.0)
erubi (1.10.0) erubi (1.10.0)
et-orbi (1.2.6) et-orbi (1.2.6)
@ -107,16 +114,14 @@ GEM
has_scope (0.8.0) has_scope (0.8.0)
actionpack (>= 5.2) actionpack (>= 5.2)
activesupport (>= 5.2) activesupport (>= 5.2)
i18n (1.8.11) i18n (1.10.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
image_processing (1.12.1) image_processing (1.12.1)
mini_magick (>= 4.9.5, < 5) mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3) ruby-vips (>= 2.0.17, < 3)
io-wait (0.2.1)
jsonapi-renderer (0.2.2) jsonapi-renderer (0.2.2)
listen (3.7.1) loofah (2.14.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.13.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.7.1)
@ -128,7 +133,22 @@ GEM
mini_portile2 (2.7.1) mini_portile2 (2.7.1)
minitest (5.15.0) minitest (5.15.0)
mocha (1.13.0) mocha (1.13.0)
msgpack (1.4.4) msgpack (1.4.5)
net-imap (0.2.3)
digest
net-protocol
strscan
net-pop (0.1.1)
digest
net-protocol
timeout
net-protocol (0.1.2)
io-wait
timeout
net-smtp (0.3.1)
digest
net-protocol
timeout
nio4r (2.5.8) nio4r (2.5.8)
nokogiri (1.13.1) nokogiri (1.13.1)
mini_portile2 (~> 2.7.0) mini_portile2 (~> 2.7.0)
@ -136,10 +156,10 @@ GEM
parallel (1.21.0) parallel (1.21.0)
parser (3.1.0.0) parser (3.1.0.0)
ast (~> 2.4.1) ast (~> 2.4.1)
pg (1.3.1) pg (1.3.2)
puma (5.6.2) puma (5.6.2)
nio4r (~> 2.0) nio4r (~> 2.0)
pundit (2.1.1) pundit (2.2.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
raabro (1.4.0) raabro (1.4.0)
racc (1.6.0) racc (1.6.0)
@ -148,38 +168,35 @@ GEM
rack (>= 2.0.0) rack (>= 2.0.0)
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (6.1.4.4) rails (7.0.2.2)
actioncable (= 6.1.4.4) actioncable (= 7.0.2.2)
actionmailbox (= 6.1.4.4) actionmailbox (= 7.0.2.2)
actionmailer (= 6.1.4.4) actionmailer (= 7.0.2.2)
actionpack (= 6.1.4.4) actionpack (= 7.0.2.2)
actiontext (= 6.1.4.4) actiontext (= 7.0.2.2)
actionview (= 6.1.4.4) actionview (= 7.0.2.2)
activejob (= 6.1.4.4) activejob (= 7.0.2.2)
activemodel (= 6.1.4.4) activemodel (= 7.0.2.2)
activerecord (= 6.1.4.4) activerecord (= 7.0.2.2)
activestorage (= 6.1.4.4) activestorage (= 7.0.2.2)
activesupport (= 6.1.4.4) activesupport (= 7.0.2.2)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 6.1.4.4) railties (= 7.0.2.2)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2) rails-html-sanitizer (1.4.2)
loofah (~> 2.3) loofah (~> 2.3)
railties (6.1.4.4) railties (7.0.2.2)
actionpack (= 6.1.4.4) actionpack (= 7.0.2.2)
activesupport (= 6.1.4.4) activesupport (= 7.0.2.2)
method_source method_source
rake (>= 0.13) rake (>= 12.2)
thor (~> 1.0) thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.1.1) rainbow (3.1.1)
rake (13.0.6) rake (13.0.6)
rb-fsevent (0.11.0) regexp_parser (2.2.1)
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (2.2.0)
rexml (3.2.5) rexml (3.2.5)
rubocop (1.25.1) rubocop (1.25.1)
parallel (~> 1.10) parallel (~> 1.10)
@ -192,7 +209,7 @@ GEM
unicode-display_width (>= 1.4.0, < 3.0) unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.15.1) rubocop-ast (1.15.1)
parser (>= 3.0.1.1) parser (>= 3.0.1.1)
rubocop-minitest (0.17.1) rubocop-minitest (0.17.2)
rubocop (>= 0.90, < 2.0) rubocop (>= 0.90, < 2.0)
rubocop-rails (2.13.2) rubocop-rails (2.13.2)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
@ -207,36 +224,27 @@ GEM
simplecov_json_formatter (~> 0.1) simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3) simplecov-html (0.12.3)
simplecov_json_formatter (0.1.3) simplecov_json_formatter (0.1.3)
spring (2.1.1) strscan (3.0.1)
spring-watcher-listen (2.0.1) thor (1.2.1)
listen (>= 2.7, < 4.0) timeout (0.2.0)
spring (>= 1.2, < 3.0)
sprockets (4.0.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
thor (1.1.0)
tzinfo (2.0.4) tzinfo (2.0.4)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
unicode-display_width (2.1.0) unicode-display_width (2.1.0)
wahwah (1.1.1) wahwah (1.2.0)
websocket-driver (0.7.5) websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5) websocket-extensions (0.1.5)
will_paginate (3.3.1) will_paginate (3.3.1)
zeitwerk (2.5.3) zeitwerk (2.5.4)
PLATFORMS PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
active_model_serializers (~> 0.10) active_model_serializers (~> 0.10)
annotate (~> 3.1) annotate (~> 3.2)
bcrypt (~> 3.1) bcrypt (~> 3.1)
bootsnap (>= 1.4.6) bootsnap (~> 1.10.3)
byebug byebug
codecov (~> 0.6.0) codecov (~> 0.6.0)
delayed_cron_job (~> 0.9) delayed_cron_job (~> 0.9)
@ -245,20 +253,17 @@ DEPENDENCIES
faker (~> 2.19) faker (~> 2.19)
has_scope (~> 0.8) has_scope (~> 0.8)
image_processing (~> 1.12.1) image_processing (~> 1.12.1)
listen (>= 3.1.5, < 3.8)
mocha (~> 1.13.0) mocha (~> 1.13.0)
pg (>= 1.2.3, < 2.0) pg (>= 1.2.3, < 2.0)
puma (~> 5.6) puma (~> 5.6)
pundit (~> 2.1) pundit (~> 2.2)
rack-cors (~> 1.1) rack-cors (~> 1.1)
rails (~> 6.1) rails (~> 7.0)
rubocop-minitest (~> 0.17.1) rubocop-minitest (~> 0.17.2)
rubocop-rails (~> 2.13) rubocop-rails (~> 2.13)
simplecov (~> 0.21) simplecov (~> 0.21)
spring (~> 2.1)
spring-watcher-listen (~> 2.0)
tzinfo-data tzinfo-data
wahwah (~> 1.1.1) wahwah (~> 1.2.0)
will_paginate (~> 3.3) will_paginate (~> 3.3)
RUBY VERSION RUBY VERSION

View file

@ -35,7 +35,7 @@
owner = "accentor"; owner = "accentor";
repo = "api"; repo = "api";
rev = "main"; rev = "main";
sha256 = "WPbAUZg62otClZm48sThntzQpL6AEU0G4VN8i1ov6f4="; sha256 = "iGH1BmWKNS1mkSppLT9NrC3VqL0E1OjdbnbhX8FTbPs=";
}; };
}); });
webPackage = (pkgs.accentor-web.override { webPackage = (pkgs.accentor-web.override {
@ -43,11 +43,13 @@
yarnLock = ./yarn.lock; yarnLock = ./yarn.lock;
yarnNix = ./yarn.nix; yarnNix = ./yarn.nix;
}).overrideAttrs (old: { }).overrideAttrs (old: {
IN_NIX = "true";
patches = (old.patches or []) ++ [ ./no_caching_in_nix.patch ];
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "accentor"; owner = "accentor";
repo = "web"; repo = "web";
rev = "main"; rev = "main";
sha256 = "weq3MY1JYNta3aTjHgUWuLSZArsWFOdKYmLnyKvmZjM="; sha256 = "pqZ0OFYWl0bQ2xD7UPW3KPhWH5gfunUzsNVqH9HL1dI=";
}; };
}); });
}; };

View file

@ -5,32 +5,32 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0z3ab9n901craqd3p1yl87kawci0vfw1xlh4d0zkj7lx8hpk10sn"; sha256 = "09zgli2dqahs3zy7y36awpcy0xps0mgr29sf6rb44gf4pzfllmrv";
type = "gem"; type = "gem";
}; };
version = "6.1.4.4"; version = "7.0.2.2";
}; };
actionmailbox = { actionmailbox = {
dependencies = [ "actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" ]; dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0q94js7ifm0a76xcwxin98bhr8nz0zqcsqi4y7j2mfwm3hq3bh0i"; sha256 = "0a9dxirl1jglng1gnb19nlxbv711b96mxzqjc5bhpmar8fa87k85";
type = "gem"; type = "gem";
}; };
version = "6.1.4.4"; version = "7.0.2.2";
}; };
actionmailer = { actionmailer = {
dependencies = [ "actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing" ]; dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1gncnc5xl1ff70mfnqcys2qy65201yjrkwxx0hb5hl7jlamgvz9h"; sha256 = "0wlm00w2n46ijyij1pj1ki646nyf86qh9dqj43y3a1027r8a940d";
type = "gem"; type = "gem";
}; };
version = "6.1.4.4"; version = "7.0.2.2";
}; };
actionpack = { actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@ -38,21 +38,21 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "171ida68hrk21cq1zz1kfl9h94a3qw5p3afviqzsirl0kx6qjyv9"; sha256 = "0qf8hfqrs0940jjqik4dixika3mmi808dkikqfjcbvc0d9640ipw";
type = "gem"; type = "gem";
}; };
version = "6.1.4.4"; version = "7.0.2.2";
}; };
actiontext = { actiontext = {
dependencies = [ "actionpack" "activerecord" "activestorage" "activesupport" "nokogiri" ]; dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1j9591z8lsp9lx3l75699prw6rgkhhlrfaj4lh5klcdffvxzkvi3"; sha256 = "1dljxklzljj77kfymmfwpsljnmiwbknnvgpcwmrvxhb96gszkngy";
type = "gem"; type = "gem";
}; };
version = "6.1.4.4"; version = "7.0.2.2";
}; };
actionview = { actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -60,10 +60,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1lm2pf35p6q4ff78z175h6ihmzfg2j7ssn41374rb9iy9gpiiidm"; sha256 = "0q67w0y90fia7zbipap3b49rbq5yrj36ip5ab1pgz4k0aps35sn1";
type = "gem"; type = "gem";
}; };
version = "6.1.4.4"; version = "7.0.2.2";
}; };
active_model_serializers = { active_model_serializers = {
dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"];
@ -82,10 +82,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0sf0nfjcj1na4v6zaxz6hjglax99yznaymjzpk1fi7mk71qf5hx4"; sha256 = "12hfz13jnxh4j5lxn9nhfaar9qcsjmwkk3x281w96mjsxajrgsyr";
type = "gem"; type = "gem";
}; };
version = "6.1.4.4"; version = "7.0.2.2";
}; };
activemodel = { activemodel = {
dependencies = ["activesupport"]; dependencies = ["activesupport"];
@ -93,10 +93,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0g3qdz8dw6zkgz45jd13lwfdnm7rhgczv1pssw63g9k6qj3bkxjm"; sha256 = "131jaswygjchf7mn998nl61bpg6qsfgyzdp3mc48q650hf5i4chk";
type = "gem"; type = "gem";
}; };
version = "6.1.4.4"; version = "7.0.2.2";
}; };
activerecord = { activerecord = {
dependencies = ["activemodel" "activesupport"]; dependencies = ["activemodel" "activesupport"];
@ -104,10 +104,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "090d4wl1pq06m9mibpck0m5nm8h45fwhs3fjx27297kjmnv4gzik"; sha256 = "0czkk2wrc2h5ghn2sqzz1p0n2f8z3xbd13vc43lxgwgzcjmcy3s7";
type = "gem"; type = "gem";
}; };
version = "6.1.4.4"; version = "7.0.2.2";
}; };
activestorage = { activestorage = {
dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];
@ -115,21 +115,21 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0a6mmm1s8abv11ycqs6cq55kr6j89jpclkcnra9w2k47rl047vk4"; sha256 = "0s6ql42xa89bc8gl6sxr23llzkg4a4716p1d6rghqbyvkwm095vr";
type = "gem"; type = "gem";
}; };
version = "6.1.4.4"; version = "7.0.2.2";
}; };
activesupport = { activesupport = {
dependencies = [ "concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk" ]; dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0rvnz9lsf9mrkpji748sf51f54m027snkw6rm8flyvf7fq18rm98"; sha256 = "1zdj3sc0l88jck9sl099vwxf3fc7bk5cs37f5wmq728blrp3s8y0";
type = "gem"; type = "gem";
}; };
version = "6.1.4.4"; version = "7.0.2.2";
}; };
annotate = { annotate = {
dependencies = ["activerecord" "rake"]; dependencies = ["activerecord" "rake"];
@ -137,10 +137,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1dxrfppwfg13vqmambbs56xjj8qsdgcy58r2yc44vvy3z1g5yflw"; sha256 = "1lw0fxb5mirsdp3bp20gjyvs7clvi19jbxnrm2ihm20kzfhvlqcs";
type = "gem"; type = "gem";
}; };
version = "3.1.1"; version = "3.2.0";
}; };
ast = { ast = {
groups = ["default" "development"]; groups = ["default" "development"];
@ -187,14 +187,11 @@
groups = ["development" "test"]; groups = ["development" "test"];
platforms = [{ platforms = [{
engine = "maglev"; engine = "maglev";
} } {
{
engine = "mingw"; engine = "mingw";
} } {
{
engine = "mingw"; engine = "mingw";
} } {
{
engine = "ruby"; engine = "ruby";
}]; }];
source = { source = {
@ -279,6 +276,16 @@
}; };
version = "4.1.7"; version = "4.1.7";
}; };
digest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00vwzvxgby22h7jhwadqqf9ssbkp3ag2pl4g7q3zf1y8mlk7rk39";
type = "gem";
};
version = "3.1.0";
};
docile = { docile = {
groups = ["default" "test"]; groups = ["default" "test"];
platforms = []; platforms = [];
@ -344,7 +351,7 @@
version = "2.19.0"; version = "2.19.0";
}; };
ffi = { ffi = {
groups = [ "default" "development" ]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
@ -392,10 +399,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
type = "gem"; type = "gem";
}; };
version = "1.8.11"; version = "1.10.0";
}; };
image_processing = { image_processing = {
dependencies = ["mini_magick" "ruby-vips"]; dependencies = ["mini_magick" "ruby-vips"];
@ -408,6 +415,16 @@
}; };
version = "1.12.1"; version = "1.12.1";
}; };
io-wait = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10jj6xz15qaw8gkck5wv3a3xg1zdfsarrandkglfbf75x4xmkrfz";
type = "gem";
};
version = "0.2.1";
};
jsonapi-renderer = { jsonapi-renderer = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
@ -418,27 +435,16 @@
}; };
version = "0.2.2"; version = "0.2.2";
}; };
listen = {
dependencies = [ "rb-fsevent" "rb-inotify" ];
groups = [ "development" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v";
type = "gem";
};
version = "3.7.1";
};
loofah = { loofah = {
dependencies = ["crass" "nokogiri"]; dependencies = ["crass" "nokogiri"];
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "17rvbrqcci1579d7dpbsfmz1f9g7msk82lyh9ip5h29dkrnixcgg"; sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w";
type = "gem"; type = "gem";
}; };
version = "2.13.0"; version = "2.14.0";
}; };
mail = { mail = {
dependencies = ["mini_mime"]; dependencies = ["mini_mime"];
@ -526,10 +532,54 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0b98w2j7g89ihnc753hh3if68r5qrmdp9n2j6mvqy2yl73sbv739"; sha256 = "1cshgsx3hmpgx639xyqjqa2q3hgrhlyr9rpwhsglsx529alqq125";
type = "gem"; type = "gem";
}; };
version = "1.4.4"; version = "1.4.5";
};
net-imap = {
dependencies = ["digest" "net-protocol" "strscan"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rl79ykmxa2k4dlk6ykrb9l0a4h101q1gd8c4qv3cl0p9h68zmbn";
type = "gem";
};
version = "0.2.3";
};
net-pop = {
dependencies = ["digest" "net-protocol" "timeout"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1slsl3xlbf0cqzmf2q1rfqbm61xvxzmr0h9zprwlbm1xn1cvn9xb";
type = "gem";
};
version = "0.1.1";
};
net-protocol = {
dependencies = ["io-wait" "timeout"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rrzdar609d8c96ikpw2yif44pp5k3n3cpjld31ia0rgmz9z59gv";
type = "gem";
};
version = "0.1.2";
};
net-smtp = {
dependencies = ["digest" "net-protocol" "timeout"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1s358kfv9mnfxcjbpr1d5a2gs1q7wkw7ffpn86mf1b3s9p31bw9s";
type = "gem";
};
version = "0.3.1";
}; };
nio4r = { nio4r = {
groups = ["default"]; groups = ["default"];
@ -578,10 +628,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1zn1miz2h3pki11jwf6f474540kvai3sc43jp8smi3mjx8brvws0"; sha256 = "0m776cj2hik15wi730vhgczd5v9s0xmi45q2hgcf5m5cnqvfih35";
type = "gem"; type = "gem";
}; };
version = "1.3.1"; version = "1.3.2";
}; };
puma = { puma = {
dependencies = ["nio4r"]; dependencies = ["nio4r"];
@ -600,10 +650,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1i3rccbzyw46xrx1ic95r11v15ia2kj8naiyi68gdvxfrisk1fxm"; sha256 = "17z2f7w3syh3c04c8m1v9pvb9pfpymk8b5plszr5l24hx374xvsd";
type = "gem"; type = "gem";
}; };
version = "2.1.1"; version = "2.2.0";
}; };
raabro = { raabro = {
groups = ["default"]; groups = ["default"];
@ -658,15 +708,15 @@
version = "1.1.0"; version = "1.1.0";
}; };
rails = { rails = {
dependencies = [ "actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails" ]; dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "10vylypjzfp6c34zx175x7ql7h27llmjdhgjxp5bn2zmrx3lac8l"; sha256 = "0zziyr3vhxn1said316wrkymsysq7q1ici33rx10l4p2648y54rk";
type = "gem"; type = "gem";
}; };
version = "6.1.4.4"; version = "7.0.2.2";
}; };
rails-dom-testing = { rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"]; dependencies = ["activesupport" "nokogiri"];
@ -691,15 +741,15 @@
version = "1.4.2"; version = "1.4.2";
}; };
railties = { railties = {
dependencies = [ "actionpack" "activesupport" "method_source" "rake" "thor" ]; dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"];
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1nmyds2www6dmqbbd5ggq31gxxb9mwxd5llzmb3iyczssk6l7lla"; sha256 = "0wsdd22xy114c14hb8hqvg5riawik6xlgk73b9b8jk23vrhwm1n7";
type = "gem"; type = "gem";
}; };
version = "6.1.4.4"; version = "7.0.2.2";
}; };
rainbow = { rainbow = {
groups = ["default" "development"]; groups = ["default" "development"];
@ -721,36 +771,15 @@
}; };
version = "13.0.6"; version = "13.0.6";
}; };
rb-fsevent = {
groups = [ "default" "development" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1qsx9c4jr11vr3a9s5j83avczx9qn9rjaf32gxpc2v451hvbc0is";
type = "gem";
};
version = "0.11.0";
};
rb-inotify = {
dependencies = [ "ffi" ];
groups = [ "default" "development" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
type = "gem";
};
version = "0.10.1";
};
regexp_parser = { regexp_parser = {
groups = ["default" "development"]; groups = ["default" "development"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "008yn8j44414qxhn1c0nxp4a70rq0bqhz70hnjpgx8cjh2g0makp"; sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm";
type = "gem"; type = "gem";
}; };
version = "2.2.0"; version = "2.2.1";
}; };
rexml = { rexml = {
groups = ["default" "development"]; groups = ["default" "development"];
@ -790,10 +819,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0r4iyxxlgin0gy1rzi40lfn3iwl2c9b4dxc493ynbvknl9h1f9qi"; sha256 = "1irb3qb4sx9mjpksmqz9nh5x9s6r2synzxjnzkimvmlhk827jn1m";
type = "gem"; type = "gem";
}; };
version = "0.17.1"; version = "0.17.2";
}; };
rubocop-rails = { rubocop-rails = {
dependencies = ["activesupport" "rack" "rubocop"]; dependencies = ["activesupport" "rack" "rubocop"];
@ -858,58 +887,35 @@
}; };
version = "0.1.3"; version = "0.1.3";
}; };
spring = { strscan = {
groups = [ "development" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1x2wz1y2b0kp7mlk9k8zkl39rddk2l3x34b7dar3bh3axd1cs30d";
type = "gem";
};
version = "2.1.1";
};
spring-watcher-listen = {
dependencies = [ "listen" "spring" ];
groups = [ "development" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1ybz9nsngfz4psvgnbr3gdk5ibqqhq47lsjkwh5yq4f8brpr10yz";
type = "gem";
};
version = "2.0.1";
};
sprockets = {
dependencies = [ "concurrent-ruby" "rack" ];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0ikgwbl6jv3frfiy3xhg5yxw9d0064rgzghar1rg391xmrc4gm38"; sha256 = "05bzfzfwvs5ngl14yf303nvrg5wjx3srgbjqkki7x65cm66w948p";
type = "gem"; type = "gem";
}; };
version = "4.0.2"; version = "3.0.1";
};
sprockets-rails = {
dependencies = [ "actionpack" "activesupport" "sprockets" ];
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1b9i14qb27zs56hlcc2hf139l0ghbqnjpmfi0054dxycaxvk5min";
type = "gem";
};
version = "3.4.2";
}; };
thor = { thor = {
groups = ["default" "development" "test"]; groups = ["default" "development" "test"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";
type = "gem"; type = "gem";
}; };
version = "1.1.0"; version = "1.2.1";
};
timeout = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10bx1hcyrjqgq6a848fc1i0cgrvx42gcy8hk4vp90y6zc7k8xzbk";
type = "gem";
};
version = "0.2.0";
}; };
tzinfo = { tzinfo = {
dependencies = ["concurrent-ruby"]; dependencies = ["concurrent-ruby"];
@ -937,10 +943,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0dk750bhy0l3adnzkkklyima816k7shi54g9byrlw2mq2nnw5s5i"; sha256 = "1i7my835pk51whfvhpjb3i7spchrb3fzm30z44sn6lrplz5hxh2i";
type = "gem"; type = "gem";
}; };
version = "1.1.1"; version = "1.2.0";
}; };
websocket-driver = { websocket-driver = {
dependencies = ["websocket-extensions"]; dependencies = ["websocket-extensions"];
@ -978,9 +984,9 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx"; sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m";
type = "gem"; type = "gem";
}; };
version = "2.5.3"; version = "2.5.4";
}; };
} }

View file

@ -0,0 +1,21 @@
diff --git a/vue.config.js b/vue.config.js
index 5ec914b..4d09b24 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -14,7 +14,16 @@ module.exports = {
},
},
},
+ configureWebpack: config => {
+ config.cache = process.env.IN_NIX !== "true";
+ },
chainWebpack: (config) => {
+ config.module.rule("js").use("babel-loader").tap((opt) =>
+ Object.assign(opt, { cacheDirectory: process.env.IN_NIX !== "true" })
+ );
+ config.plugin("eslint").tap((args) =>
+ [Object.assign(args[0], { cache: process.env.IN_NIX !== "true" })]
+ );
["vue-modules", "vue", "normal-modules", "normal"].forEach((match) => {
config.module
.rule("scss")

View file

@ -28,23 +28,25 @@
"vuex-persist": "^3.1.3" "vuex-persist": "^3.1.3"
}, },
"devDependencies": { "devDependencies": {
"@intlify/vue-i18n-loader": "^4.0.0", "@babel/core": "^7.12.16",
"@vue/cli-plugin-babel": "^4.5.15", "@babel/eslint-parser": "^7.12.16",
"@vue/cli-plugin-eslint": "^4.5.15", "@intlify/vue-i18n-loader": "4.0.0",
"@vue/cli-service": "^4.5.15", "@vue/cli-plugin-babel": "~5.0.1",
"@vue/cli-plugin-eslint": "~5.0.1",
"@vue/cli-service": "~5.0.1",
"@vue/eslint-config-prettier": "^6.0.0", "@vue/eslint-config-prettier": "^6.0.0",
"babel-eslint": "^10.1.0", "eslint": "^7.32.0",
"eslint": "^6.8.0", "eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.1", "eslint-plugin-prettier": "^3.1.0",
"eslint-plugin-vue": "^8.4.1", "eslint-plugin-vue": "^8.4.1",
"eslint-plugin-vuetify": "^1.1.0", "eslint-plugin-vuetify": "^1.1.0",
"prettier": "^2.5.1", "prettier": "^2.5.1",
"sass": "^1.49.7", "sass": "^1.49.8",
"sass-loader": "^10.1.1", "sass-loader": "^10.1.1",
"vue-cli-plugin-i18n": "^2.3.1", "vue-cli-plugin-i18n": "^2.3.1",
"vue-cli-plugin-vuetify": "^2.4.5", "vue-cli-plugin-vuetify": "^2.4.5",
"vue-template-compiler": "^2.6.14", "vue-template-compiler": "^2.6.14",
"vuetify-loader": "^1.7.3", "vuetify-loader": "^1.7.3",
"webpack": "^4.46.0" "webpack": "^5.0.0"
} }
} }

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff