Update accentor
This commit is contained in:
Charlotte Van Petegem
parent
db10861103
commit
6933c7bc3f
8 changed files with 5924 additions and 10733 deletions
|
|
@ -4,15 +4,13 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
|
|||
ruby '~> 3.1.0'
|
||||
|
||||
# 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
|
||||
gem 'pg', '>= 1.2.3', '< 2.0'
|
||||
# Use Puma as the app server
|
||||
gem 'puma', '~> 5.6'
|
||||
# Use ActiveModelSerializer for serializing to JSON
|
||||
gem 'active_model_serializers', '~> 0.10'
|
||||
# Use Redis adapter to run Action Cable in production
|
||||
# gem 'redis', '~> 4.0'
|
||||
# Use ActiveModel has_secure_password
|
||||
gem 'bcrypt', '~> 3.1'
|
||||
|
||||
|
|
@ -20,21 +18,24 @@ gem 'delayed_job_active_record', '~> 4.1'
|
|||
|
||||
gem 'delayed_cron_job', '~> 0.9'
|
||||
|
||||
gem 'wahwah', '~> 1.1.1'
|
||||
gem 'wahwah', '~> 1.2.0'
|
||||
|
||||
gem 'has_scope', '~> 0.8'
|
||||
gem 'pundit', '~> 2.1'
|
||||
gem 'pundit', '~> 2.2'
|
||||
gem 'will_paginate', '~> 3.3'
|
||||
|
||||
# Use ActiveStorage variant
|
||||
gem 'image_processing', '~> 1.12.1'
|
||||
|
||||
# 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
|
||||
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
|
||||
gem 'codecov', '~> 0.6.0', require: false
|
||||
gem 'mocha', '~> 1.13.0', require: false
|
||||
|
|
@ -50,15 +51,7 @@ group :development, :test do
|
|||
end
|
||||
|
||||
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 'rubocop-minitest', '~> 0.17.1'
|
||||
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.2'
|
||||
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
|
||||
|
||||
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
|
||||
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
|
||||
|
|
|
|||
|
|
@ -1,40 +1,47 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actioncable (6.1.4.4)
|
||||
actionpack (= 6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
actioncable (7.0.2.2)
|
||||
actionpack (= 7.0.2.2)
|
||||
activesupport (= 7.0.2.2)
|
||||
nio4r (~> 2.0)
|
||||
websocket-driver (>= 0.6.1)
|
||||
actionmailbox (6.1.4.4)
|
||||
actionpack (= 6.1.4.4)
|
||||
activejob (= 6.1.4.4)
|
||||
activerecord (= 6.1.4.4)
|
||||
activestorage (= 6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
actionmailbox (7.0.2.2)
|
||||
actionpack (= 7.0.2.2)
|
||||
activejob (= 7.0.2.2)
|
||||
activerecord (= 7.0.2.2)
|
||||
activestorage (= 7.0.2.2)
|
||||
activesupport (= 7.0.2.2)
|
||||
mail (>= 2.7.1)
|
||||
actionmailer (6.1.4.4)
|
||||
actionpack (= 6.1.4.4)
|
||||
actionview (= 6.1.4.4)
|
||||
activejob (= 6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
net-imap
|
||||
net-pop
|
||||
net-smtp
|
||||
actionmailer (7.0.2.2)
|
||||
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)
|
||||
net-imap
|
||||
net-pop
|
||||
net-smtp
|
||||
rails-dom-testing (~> 2.0)
|
||||
actionpack (6.1.4.4)
|
||||
actionview (= 6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
rack (~> 2.0, >= 2.0.9)
|
||||
actionpack (7.0.2.2)
|
||||
actionview (= 7.0.2.2)
|
||||
activesupport (= 7.0.2.2)
|
||||
rack (~> 2.0, >= 2.2.0)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||
actiontext (6.1.4.4)
|
||||
actionpack (= 6.1.4.4)
|
||||
activerecord (= 6.1.4.4)
|
||||
activestorage (= 6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
actiontext (7.0.2.2)
|
||||
actionpack (= 7.0.2.2)
|
||||
activerecord (= 7.0.2.2)
|
||||
activestorage (= 7.0.2.2)
|
||||
activesupport (= 7.0.2.2)
|
||||
globalid (>= 0.6.0)
|
||||
nokogiri (>= 1.8.5)
|
||||
actionview (6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
actionview (7.0.2.2)
|
||||
activesupport (= 7.0.2.2)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
|
|
@ -44,29 +51,28 @@ GEM
|
|||
activemodel (>= 4.1, < 7.1)
|
||||
case_transform (>= 0.2)
|
||||
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
|
||||
activejob (6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
activejob (7.0.2.2)
|
||||
activesupport (= 7.0.2.2)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
activerecord (6.1.4.4)
|
||||
activemodel (= 6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
activestorage (6.1.4.4)
|
||||
actionpack (= 6.1.4.4)
|
||||
activejob (= 6.1.4.4)
|
||||
activerecord (= 6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
marcel (~> 1.0.0)
|
||||
activemodel (7.0.2.2)
|
||||
activesupport (= 7.0.2.2)
|
||||
activerecord (7.0.2.2)
|
||||
activemodel (= 7.0.2.2)
|
||||
activesupport (= 7.0.2.2)
|
||||
activestorage (7.0.2.2)
|
||||
actionpack (= 7.0.2.2)
|
||||
activejob (= 7.0.2.2)
|
||||
activerecord (= 7.0.2.2)
|
||||
activesupport (= 7.0.2.2)
|
||||
marcel (~> 1.0)
|
||||
mini_mime (>= 1.1.0)
|
||||
activesupport (6.1.4.4)
|
||||
activesupport (7.0.2.2)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
zeitwerk (~> 2.3)
|
||||
annotate (3.1.1)
|
||||
activerecord (>= 3.2, < 7.0)
|
||||
annotate (3.2.0)
|
||||
activerecord (>= 3.2, < 8.0)
|
||||
rake (>= 10.4, < 14.0)
|
||||
ast (2.4.2)
|
||||
bcrypt (3.1.16)
|
||||
|
|
@ -87,6 +93,7 @@ GEM
|
|||
delayed_job_active_record (4.1.7)
|
||||
activerecord (>= 3.0, < 8.0)
|
||||
delayed_job (>= 3.0, < 5)
|
||||
digest (3.1.0)
|
||||
docile (1.4.0)
|
||||
erubi (1.10.0)
|
||||
et-orbi (1.2.6)
|
||||
|
|
@ -107,16 +114,14 @@ GEM
|
|||
has_scope (0.8.0)
|
||||
actionpack (>= 5.2)
|
||||
activesupport (>= 5.2)
|
||||
i18n (1.8.11)
|
||||
i18n (1.10.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
image_processing (1.12.1)
|
||||
mini_magick (>= 4.9.5, < 5)
|
||||
ruby-vips (>= 2.0.17, < 3)
|
||||
io-wait (0.2.1)
|
||||
jsonapi-renderer (0.2.2)
|
||||
listen (3.7.1)
|
||||
rb-fsevent (~> 0.10, >= 0.10.3)
|
||||
rb-inotify (~> 0.9, >= 0.9.10)
|
||||
loofah (2.13.0)
|
||||
loofah (2.14.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.7.1)
|
||||
|
|
@ -128,7 +133,22 @@ GEM
|
|||
mini_portile2 (2.7.1)
|
||||
minitest (5.15.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)
|
||||
nokogiri (1.13.1)
|
||||
mini_portile2 (~> 2.7.0)
|
||||
|
|
@ -136,10 +156,10 @@ GEM
|
|||
parallel (1.21.0)
|
||||
parser (3.1.0.0)
|
||||
ast (~> 2.4.1)
|
||||
pg (1.3.1)
|
||||
pg (1.3.2)
|
||||
puma (5.6.2)
|
||||
nio4r (~> 2.0)
|
||||
pundit (2.1.1)
|
||||
pundit (2.2.0)
|
||||
activesupport (>= 3.0.0)
|
||||
raabro (1.4.0)
|
||||
racc (1.6.0)
|
||||
|
|
@ -148,38 +168,35 @@ GEM
|
|||
rack (>= 2.0.0)
|
||||
rack-test (1.1.0)
|
||||
rack (>= 1.0, < 3)
|
||||
rails (6.1.4.4)
|
||||
actioncable (= 6.1.4.4)
|
||||
actionmailbox (= 6.1.4.4)
|
||||
actionmailer (= 6.1.4.4)
|
||||
actionpack (= 6.1.4.4)
|
||||
actiontext (= 6.1.4.4)
|
||||
actionview (= 6.1.4.4)
|
||||
activejob (= 6.1.4.4)
|
||||
activemodel (= 6.1.4.4)
|
||||
activerecord (= 6.1.4.4)
|
||||
activestorage (= 6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
rails (7.0.2.2)
|
||||
actioncable (= 7.0.2.2)
|
||||
actionmailbox (= 7.0.2.2)
|
||||
actionmailer (= 7.0.2.2)
|
||||
actionpack (= 7.0.2.2)
|
||||
actiontext (= 7.0.2.2)
|
||||
actionview (= 7.0.2.2)
|
||||
activejob (= 7.0.2.2)
|
||||
activemodel (= 7.0.2.2)
|
||||
activerecord (= 7.0.2.2)
|
||||
activestorage (= 7.0.2.2)
|
||||
activesupport (= 7.0.2.2)
|
||||
bundler (>= 1.15.0)
|
||||
railties (= 6.1.4.4)
|
||||
sprockets-rails (>= 2.0.0)
|
||||
railties (= 7.0.2.2)
|
||||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.4.2)
|
||||
loofah (~> 2.3)
|
||||
railties (6.1.4.4)
|
||||
actionpack (= 6.1.4.4)
|
||||
activesupport (= 6.1.4.4)
|
||||
railties (7.0.2.2)
|
||||
actionpack (= 7.0.2.2)
|
||||
activesupport (= 7.0.2.2)
|
||||
method_source
|
||||
rake (>= 0.13)
|
||||
rake (>= 12.2)
|
||||
thor (~> 1.0)
|
||||
zeitwerk (~> 2.5)
|
||||
rainbow (3.1.1)
|
||||
rake (13.0.6)
|
||||
rb-fsevent (0.11.0)
|
||||
rb-inotify (0.10.1)
|
||||
ffi (~> 1.0)
|
||||
regexp_parser (2.2.0)
|
||||
regexp_parser (2.2.1)
|
||||
rexml (3.2.5)
|
||||
rubocop (1.25.1)
|
||||
parallel (~> 1.10)
|
||||
|
|
@ -192,7 +209,7 @@ GEM
|
|||
unicode-display_width (>= 1.4.0, < 3.0)
|
||||
rubocop-ast (1.15.1)
|
||||
parser (>= 3.0.1.1)
|
||||
rubocop-minitest (0.17.1)
|
||||
rubocop-minitest (0.17.2)
|
||||
rubocop (>= 0.90, < 2.0)
|
||||
rubocop-rails (2.13.2)
|
||||
activesupport (>= 4.2.0)
|
||||
|
|
@ -207,36 +224,27 @@ GEM
|
|||
simplecov_json_formatter (~> 0.1)
|
||||
simplecov-html (0.12.3)
|
||||
simplecov_json_formatter (0.1.3)
|
||||
spring (2.1.1)
|
||||
spring-watcher-listen (2.0.1)
|
||||
listen (>= 2.7, < 4.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)
|
||||
strscan (3.0.1)
|
||||
thor (1.2.1)
|
||||
timeout (0.2.0)
|
||||
tzinfo (2.0.4)
|
||||
concurrent-ruby (~> 1.0)
|
||||
unicode-display_width (2.1.0)
|
||||
wahwah (1.1.1)
|
||||
wahwah (1.2.0)
|
||||
websocket-driver (0.7.5)
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.5)
|
||||
will_paginate (3.3.1)
|
||||
zeitwerk (2.5.3)
|
||||
zeitwerk (2.5.4)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
active_model_serializers (~> 0.10)
|
||||
annotate (~> 3.1)
|
||||
annotate (~> 3.2)
|
||||
bcrypt (~> 3.1)
|
||||
bootsnap (>= 1.4.6)
|
||||
bootsnap (~> 1.10.3)
|
||||
byebug
|
||||
codecov (~> 0.6.0)
|
||||
delayed_cron_job (~> 0.9)
|
||||
|
|
@ -245,20 +253,17 @@ DEPENDENCIES
|
|||
faker (~> 2.19)
|
||||
has_scope (~> 0.8)
|
||||
image_processing (~> 1.12.1)
|
||||
listen (>= 3.1.5, < 3.8)
|
||||
mocha (~> 1.13.0)
|
||||
pg (>= 1.2.3, < 2.0)
|
||||
puma (~> 5.6)
|
||||
pundit (~> 2.1)
|
||||
pundit (~> 2.2)
|
||||
rack-cors (~> 1.1)
|
||||
rails (~> 6.1)
|
||||
rubocop-minitest (~> 0.17.1)
|
||||
rails (~> 7.0)
|
||||
rubocop-minitest (~> 0.17.2)
|
||||
rubocop-rails (~> 2.13)
|
||||
simplecov (~> 0.21)
|
||||
spring (~> 2.1)
|
||||
spring-watcher-listen (~> 2.0)
|
||||
tzinfo-data
|
||||
wahwah (~> 1.1.1)
|
||||
wahwah (~> 1.2.0)
|
||||
will_paginate (~> 3.3)
|
||||
|
||||
RUBY VERSION
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
owner = "accentor";
|
||||
repo = "api";
|
||||
rev = "main";
|
||||
sha256 = "WPbAUZg62otClZm48sThntzQpL6AEU0G4VN8i1ov6f4=";
|
||||
sha256 = "iGH1BmWKNS1mkSppLT9NrC3VqL0E1OjdbnbhX8FTbPs=";
|
||||
};
|
||||
});
|
||||
webPackage = (pkgs.accentor-web.override {
|
||||
|
|
@ -43,11 +43,13 @@
|
|||
yarnLock = ./yarn.lock;
|
||||
yarnNix = ./yarn.nix;
|
||||
}).overrideAttrs (old: {
|
||||
IN_NIX = "true";
|
||||
patches = (old.patches or []) ++ [ ./no_caching_in_nix.patch ];
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "accentor";
|
||||
repo = "web";
|
||||
rev = "main";
|
||||
sha256 = "weq3MY1JYNta3aTjHgUWuLSZArsWFOdKYmLnyKvmZjM=";
|
||||
sha256 = "pqZ0OFYWl0bQ2xD7UPW3KPhWH5gfunUzsNVqH9HL1dI=";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
21
modules/services/accentor/no_caching_in_nix.patch
Normal file
21
modules/services/accentor/no_caching_in_nix.patch
Normal 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")
|
||||
|
|
@ -28,23 +28,25 @@
|
|||
"vuex-persist": "^3.1.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@intlify/vue-i18n-loader": "^4.0.0",
|
||||
"@vue/cli-plugin-babel": "^4.5.15",
|
||||
"@vue/cli-plugin-eslint": "^4.5.15",
|
||||
"@vue/cli-service": "^4.5.15",
|
||||
"@babel/core": "^7.12.16",
|
||||
"@babel/eslint-parser": "^7.12.16",
|
||||
"@intlify/vue-i18n-loader": "4.0.0",
|
||||
"@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",
|
||||
"babel-eslint": "^10.1.0",
|
||||
"eslint": "^6.8.0",
|
||||
"eslint-plugin-prettier": "^3.4.1",
|
||||
"eslint": "^7.32.0",
|
||||
"eslint-config-prettier": "^8.3.0",
|
||||
"eslint-plugin-prettier": "^3.1.0",
|
||||
"eslint-plugin-vue": "^8.4.1",
|
||||
"eslint-plugin-vuetify": "^1.1.0",
|
||||
"prettier": "^2.5.1",
|
||||
"sass": "^1.49.7",
|
||||
"sass": "^1.49.8",
|
||||
"sass-loader": "^10.1.1",
|
||||
"vue-cli-plugin-i18n": "^2.3.1",
|
||||
"vue-cli-plugin-vuetify": "^2.4.5",
|
||||
"vue-template-compiler": "^2.6.14",
|
||||
"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
Loading…
Add table
Add a link
Reference in a new issue