From 262a118db75d9dcbfd838518b6cd3d1fba324624 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 5 Feb 2022 15:44:48 +0100 Subject: [PATCH] Update accentor --- modules/services/accentor/Gemfile | 4 ++-- modules/services/accentor/Gemfile.lock | 16 ++++++++-------- modules/services/accentor/default.nix | 4 ++-- modules/services/accentor/gemset.nix | 20 ++++++++++---------- modules/services/accentor/package.json | 6 +++--- modules/services/accentor/yarn.lock | 24 ++++++++++++------------ modules/services/accentor/yarn.nix | 24 ++++++++++++------------ 7 files changed, 49 insertions(+), 49 deletions(-) diff --git a/modules/services/accentor/Gemfile b/modules/services/accentor/Gemfile index 58fafe86..00d263a0 100644 --- a/modules/services/accentor/Gemfile +++ b/modules/services/accentor/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 6.1' # Use postgresql as the database for Active Record gem 'pg', '>= 1.2.3', '< 2.0' # Use Puma as the app server -gem 'puma', '~> 5.5' +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 @@ -51,7 +51,7 @@ 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.0' + gem 'rubocop-minitest', '~> 0.17.1' gem 'rubocop-rails', '~> 2.13' gem 'listen', '>= 3.1.5', '< 3.8' diff --git a/modules/services/accentor/Gemfile.lock b/modules/services/accentor/Gemfile.lock index 765e298a..f1bec439 100644 --- a/modules/services/accentor/Gemfile.lock +++ b/modules/services/accentor/Gemfile.lock @@ -70,7 +70,7 @@ GEM rake (>= 10.4, < 14.0) ast (2.4.2) bcrypt (3.1.16) - bootsnap (1.10.2) + bootsnap (1.10.3) msgpack (~> 1.2) builder (3.2.4) byebug (11.1.3) @@ -136,8 +136,8 @@ GEM parallel (1.21.0) parser (3.1.0.0) ast (~> 2.4.1) - pg (1.2.3) - puma (5.5.2) + pg (1.3.1) + puma (5.6.1) nio4r (~> 2.0) pundit (2.1.1) activesupport (>= 3.0.0) @@ -181,9 +181,9 @@ GEM ffi (~> 1.0) regexp_parser (2.2.0) rexml (3.2.5) - rubocop (1.24.1) + rubocop (1.25.1) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml @@ -192,7 +192,7 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.15.1) parser (>= 3.0.1.1) - rubocop-minitest (0.17.0) + rubocop-minitest (0.17.1) rubocop (>= 0.90, < 2.0) rubocop-rails (2.13.2) activesupport (>= 4.2.0) @@ -248,11 +248,11 @@ DEPENDENCIES listen (>= 3.1.5, < 3.8) mocha (~> 1.13.0) pg (>= 1.2.3, < 2.0) - puma (~> 5.5) + puma (~> 5.6) pundit (~> 2.1) rack-cors (~> 1.1) rails (~> 6.1) - rubocop-minitest (~> 0.17.0) + rubocop-minitest (~> 0.17.1) rubocop-rails (~> 2.13) simplecov (~> 0.21) spring (~> 2.1) diff --git a/modules/services/accentor/default.nix b/modules/services/accentor/default.nix index 83e382b9..be48ff09 100644 --- a/modules/services/accentor/default.nix +++ b/modules/services/accentor/default.nix @@ -35,7 +35,7 @@ owner = "accentor"; repo = "api"; rev = "main"; - sha256 = "SnA8YC+RAZKcjy68kgl0CusvXWowj3LCqjLxqrB+h5w="; + sha256 = "uryL9TTE+PNfeIZacfznKR7iXVaMQj7G7y8rmL7Cie8="; }; }); webPackage = (pkgs.accentor-web.override { @@ -47,7 +47,7 @@ owner = "accentor"; repo = "web"; rev = "main"; - sha256 = "qSnenPKb2GZilIp1CGg8SKObjMKZfJ7s8w9UuhbX8h4="; + sha256 = "weq3MY1JYNta3aTjHgUWuLSZArsWFOdKYmLnyKvmZjM="; }; }); }; diff --git a/modules/services/accentor/gemset.nix b/modules/services/accentor/gemset.nix index b0b85aad..d79b21a0 100644 --- a/modules/services/accentor/gemset.nix +++ b/modules/services/accentor/gemset.nix @@ -168,10 +168,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18j6zbw26y9kf4b2ihprg380jzw97mm9h17nhd8jvsmdxhvz4yvv"; + sha256 = "053hx5hz1zdcqwywlnabzf0gkrrchhzh66p1bfzvrryb075lsqm1"; type = "gem"; }; - version = "1.10.2"; + version = "1.10.3"; }; builder = { groups = [ "default" "development" "test" ]; @@ -578,10 +578,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; + sha256 = "1zn1miz2h3pki11jwf6f474540kvai3sc43jp8smi3mjx8brvws0"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.1"; }; puma = { dependencies = [ "nio4r" ]; @@ -589,10 +589,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn"; + sha256 = "03blhf8snz59433zsv7apwqy1hg92yhkb5am9x2dpqr0c4i6hscs"; type = "gem"; }; - version = "5.5.2"; + version = "5.6.1"; }; pundit = { dependencies = [ "activesupport" ]; @@ -768,10 +768,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sn7ag295blmhpwv6x472m3fd0n25swz9imqwpk0hg21rdcdw7p0"; + sha256 = "1l3q96il8zx5zl041lxvmfrndxxpk08fksza1gqshhjjzms7c2rk"; type = "gem"; }; - version = "1.24.1"; + version = "1.25.1"; }; rubocop-ast = { dependencies = [ "parser" ]; @@ -790,10 +790,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ahqgfbikqzgif0c1r6bkrrn8rg3jcdx567wrj1irg46snwb26w2"; + sha256 = "0r4iyxxlgin0gy1rzi40lfn3iwl2c9b4dxc493ynbvknl9h1f9qi"; type = "gem"; }; - version = "0.17.0"; + version = "0.17.1"; }; rubocop-rails = { dependencies = [ "activesupport" "rack" "rubocop" ]; diff --git a/modules/services/accentor/package.json b/modules/services/accentor/package.json index 50b7c460..d1080ccb 100644 --- a/modules/services/accentor/package.json +++ b/modules/services/accentor/package.json @@ -23,7 +23,7 @@ "vue-meta": "^2.4.0", "vue-router": "^3.5.3", "vuedraggable": "^2.24.3", - "vuetify": "^2.6.2", + "vuetify": "^2.6.3", "vuex": "^3.6.2", "vuex-persist": "^3.1.3" }, @@ -36,10 +36,10 @@ "babel-eslint": "^10.1.0", "eslint": "^6.8.0", "eslint-plugin-prettier": "^3.4.1", - "eslint-plugin-vue": "^8.3.0", + "eslint-plugin-vue": "^8.4.1", "eslint-plugin-vuetify": "^1.1.0", "prettier": "^2.5.1", - "sass": "^1.49.0", + "sass": "^1.49.7", "sass-loader": "^10.1.1", "vue-cli-plugin-i18n": "^2.3.1", "vue-cli-plugin-vuetify": "^2.4.5", diff --git a/modules/services/accentor/yarn.lock b/modules/services/accentor/yarn.lock index ca97154e..716e92c5 100644 --- a/modules/services/accentor/yarn.lock +++ b/modules/services/accentor/yarn.lock @@ -3532,10 +3532,10 @@ eslint-plugin-vue@^7.0.0: semver "^6.3.0" vue-eslint-parser "^7.10.0" -eslint-plugin-vue@^8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-8.3.0.tgz#2ae4f915ed3541a58c4a4c1145c1e60b86aa7e85" - integrity sha512-IIuLHw4vQxGlHcoP2dG6t/2OVdQf2qoyAzEGAxreU1afZOHGA7y3TWq8I+r3ZA6Wjs6xpeUWGHlT31QGr9Rb5g== +eslint-plugin-vue@^8.4.1: + version "8.4.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-8.4.1.tgz#0a25493bbfee6baa21614e637e3fd390617c0bb4" + integrity sha512-nmWOhNmDx9TZ+yP9ZhezTkZUupSHsYA2TocRm+efPSXMOyFrVczVlaIuQcLBjCtI8CbkBiUQ3VcyQsjlIhDrhA== dependencies: eslint-utils "^3.0.0" natural-compare "^1.4.0" @@ -7337,10 +7337,10 @@ sass-loader@^10.1.1: schema-utils "^3.0.0" semver "^7.3.2" -sass@^1.49.0: - version "1.49.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.0.tgz#65ec1b1d9a6bc1bae8d2c9d4b392c13f5d32c078" - integrity sha512-TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw== +sass@^1.49.7: + version "1.49.7" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.7.tgz#22a86a50552b9b11f71404dfad1b9ff44c6b0c49" + integrity sha512-13dml55EMIR2rS4d/RDHHP0sXMY3+30e1TKsyXaSz3iLWVoDWEoboY8WzJd5JMnxrRHffKO3wq2mpJ0jxRJiEQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -8613,10 +8613,10 @@ vuetify-loader@^1.7.3: file-loader "^6.2.0" loader-utils "^2.0.0" -vuetify@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.6.2.tgz#1ed4d3c9e734d55202bd566b789cce0e0013279a" - integrity sha512-nx3uZkO8MZNMshUEh1xKaQ1hQYepNwWFn3FVxKt+XBVf7ZFscd0GS/a3KZo4B3baXQmziCQAZKNIQF5IWeaIUw== +vuetify@^2.6.3: + version "2.6.3" + resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.6.3.tgz#b33ede2da958a40c6ced0ad1f4eda737984b3967" + integrity sha512-Zfiz2DZnp1DvxqGaSCGqGjv4mPNAurJJ5Xwy7bzNzIySGLlRdlO8UH6aNWnSgfaAsLP3voxadSGDm6tKM8Ys7w== vuex-persist@^3.1.3: version "3.1.3" diff --git a/modules/services/accentor/yarn.nix b/modules/services/accentor/yarn.nix index d078a1cb..1bf4ca5a 100644 --- a/modules/services/accentor/yarn.nix +++ b/modules/services/accentor/yarn.nix @@ -3594,11 +3594,11 @@ }; } { - name = "eslint_plugin_vue___eslint_plugin_vue_8.3.0.tgz"; + name = "eslint_plugin_vue___eslint_plugin_vue_8.4.1.tgz"; path = fetchurl { - name = "eslint_plugin_vue___eslint_plugin_vue_8.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-8.3.0.tgz"; - sha512 = "IIuLHw4vQxGlHcoP2dG6t/2OVdQf2qoyAzEGAxreU1afZOHGA7y3TWq8I+r3ZA6Wjs6xpeUWGHlT31QGr9Rb5g=="; + name = "eslint_plugin_vue___eslint_plugin_vue_8.4.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-8.4.1.tgz"; + sha512 = "nmWOhNmDx9TZ+yP9ZhezTkZUupSHsYA2TocRm+efPSXMOyFrVczVlaIuQcLBjCtI8CbkBiUQ3VcyQsjlIhDrhA=="; }; } { @@ -7938,11 +7938,11 @@ }; } { - name = "sass___sass_1.49.0.tgz"; + name = "sass___sass_1.49.7.tgz"; path = fetchurl { - name = "sass___sass_1.49.0.tgz"; - url = "https://registry.yarnpkg.com/sass/-/sass-1.49.0.tgz"; - sha512 = "TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw=="; + name = "sass___sass_1.49.7.tgz"; + url = "https://registry.yarnpkg.com/sass/-/sass-1.49.7.tgz"; + sha512 = "13dml55EMIR2rS4d/RDHHP0sXMY3+30e1TKsyXaSz3iLWVoDWEoboY8WzJd5JMnxrRHffKO3wq2mpJ0jxRJiEQ=="; }; } { @@ -9370,11 +9370,11 @@ }; } { - name = "vuetify___vuetify_2.6.2.tgz"; + name = "vuetify___vuetify_2.6.3.tgz"; path = fetchurl { - name = "vuetify___vuetify_2.6.2.tgz"; - url = "https://registry.yarnpkg.com/vuetify/-/vuetify-2.6.2.tgz"; - sha512 = "nx3uZkO8MZNMshUEh1xKaQ1hQYepNwWFn3FVxKt+XBVf7ZFscd0GS/a3KZo4B3baXQmziCQAZKNIQF5IWeaIUw=="; + name = "vuetify___vuetify_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/vuetify/-/vuetify-2.6.3.tgz"; + sha512 = "Zfiz2DZnp1DvxqGaSCGqGjv4mPNAurJJ5Xwy7bzNzIySGLlRdlO8UH6aNWnSgfaAsLP3voxadSGDm6tKM8Ys7w=="; }; } {