From b1101984b4155d7db0322d9907c5f6ecfde132de Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 31 Jul 2021 17:02:19 +0200 Subject: [PATCH] Update accentor --- modules/services/accentor/Gemfile | 2 +- modules/services/accentor/Gemfile.lock | 6 ++-- modules/services/accentor/default.nix | 4 +-- modules/services/accentor/gemset.nix | 8 ++--- modules/services/accentor/package.json | 10 +++--- modules/services/accentor/yarn.lock | 42 +++++++++++++------------- modules/services/accentor/yarn.nix | 40 ++++++++++++------------ 7 files changed, 56 insertions(+), 56 deletions(-) diff --git a/modules/services/accentor/Gemfile b/modules/services/accentor/Gemfile index 1a1ea94b..3eb62ad4 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.3' +gem 'puma', '~> 5.4' # Use ActiveModelSerializer for serializing to JSON gem 'active_model_serializers', '~> 0.10' # Use Redis adapter to run Action Cable in production diff --git a/modules/services/accentor/Gemfile.lock b/modules/services/accentor/Gemfile.lock index 7dbfa370..f8e8fd35 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.7.5) + bootsnap (1.7.6) msgpack (~> 1.0) builder (3.2.4) byebug (11.1.3) @@ -132,7 +132,7 @@ GEM parser (3.0.2.0) ast (~> 2.4.1) pg (1.2.3) - puma (5.3.2) + puma (5.4.0) nio4r (~> 2.0) pundit (2.1.0) activesupport (>= 3.0.0) @@ -242,7 +242,7 @@ DEPENDENCIES listen (>= 3.1.5, < 3.7) mocha (~> 1.13.0) pg (>= 1.2.3, < 2.0) - puma (~> 5.3) + puma (~> 5.4) pundit (~> 2.1) rack-cors (~> 1.1) rails (~> 6.1) diff --git a/modules/services/accentor/default.nix b/modules/services/accentor/default.nix index 220cf008..82a20cec 100644 --- a/modules/services/accentor/default.nix +++ b/modules/services/accentor/default.nix @@ -31,7 +31,7 @@ owner = "accentor"; repo = "api"; rev = "main"; - sha256 = "187fyb7kbv99nszhcgad63xr8sn6xzzggbpzyfxh27v8wsncaadg"; + sha256 = "RN3SZiUamyCRrlvF3pF1JT16hyIORuhD3U+SqR2uqYw="; }; }); webPackage = (pkgs.accentor-web.override { @@ -43,7 +43,7 @@ owner = "accentor"; repo = "web"; rev = "main"; - sha256 = "1nqjna0qvpa2r3ks5ks1p5daa692ilg5q5m2y2ypn9yfkdcysaip"; + sha256 = "jDC3CwuVH8S2uibP58kH1iQcpC/MGr47y+MeDBOSCqc="; }; }); }; diff --git a/modules/services/accentor/gemset.nix b/modules/services/accentor/gemset.nix index 66772f92..b5dad9de 100644 --- a/modules/services/accentor/gemset.nix +++ b/modules/services/accentor/gemset.nix @@ -168,10 +168,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12n09iwpssnsfw9s140ynfxr9psd0xcfx42yqdsk0hq60zhq2nlx"; + sha256 = "1ps0cd34c6cp640wz10597baz7xjdbqcb3wbd8qjyw08cp1ggy72"; type = "gem"; }; - version = "1.7.5"; + version = "1.7.6"; }; builder = { groups = [ "default" "development" "test" ]; @@ -567,10 +567,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lmaq05a257m9588a81wql3a5p039f221f0dmq57bm2qjwxydjmj"; + sha256 = "0bz9y1hxfyv73yb26nvs2kcw08gxi7nxkfc94j82hgx2sifcnv3x"; type = "gem"; }; - version = "5.3.2"; + version = "5.4.0"; }; pundit = { dependencies = [ "activesupport" ]; diff --git a/modules/services/accentor/package.json b/modules/services/accentor/package.json index 85a4bf53..aaf312bb 100644 --- a/modules/services/accentor/package.json +++ b/modules/services/accentor/package.json @@ -1,6 +1,6 @@ { "name": "accentor", - "version": "0.1.0", + "version": "0.24.1", "private": true, "scripts": { "serve": "vue-cli-service serve", @@ -21,7 +21,7 @@ "vue-meta": "^2.4.0", "vue-router": "^3.5.2", "vuedraggable": "^2.24.3", - "vuetify": "^2.5.7", + "vuetify": "^2.5.8", "vuex": "^3.6.2", "vuex-persist": "^3.1.3" }, @@ -34,12 +34,12 @@ "babel-eslint": "^10.1.0", "eslint": "^6.8.0", "eslint-plugin-prettier": "^3.4.0", - "eslint-plugin-vue": "^7.14.0", + "eslint-plugin-vue": "^7.15.0", "eslint-plugin-vuetify": "^1.0.1", "prettier": "^2.3.2", - "sass": "^1.36.0", + "sass": "^1.37.0", "sass-loader": "^10.1.1", - "vue-cli-plugin-i18n": "^2.1.0", + "vue-cli-plugin-i18n": "^2.1.2", "vue-cli-plugin-vuetify": "^2.4.1", "vue-template-compiler": "^2.6.14", "vuetify-loader": "^1.7.2", diff --git a/modules/services/accentor/yarn.lock b/modules/services/accentor/yarn.lock index 29e896a1..30bc844f 100644 --- a/modules/services/accentor/yarn.lock +++ b/modules/services/accentor/yarn.lock @@ -3479,15 +3479,15 @@ eslint-plugin-prettier@^3.4.0: dependencies: prettier-linter-helpers "^1.0.0" -eslint-plugin-vue@^7.0.0, eslint-plugin-vue@^7.14.0: - version "7.14.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.14.0.tgz#8c00f211064bd2708fc1aa4abd0592538fbb2cb1" - integrity sha512-IW5A2Td0wEWjFGaGVEO24JNXa8cVFzAQTXrYv/Vu3zyDVS9sjwOpZY0iqub7FOkT2AK3Imtw4U4wg48pP9oWww== +eslint-plugin-vue@^7.0.0, eslint-plugin-vue@^7.15.0: + version "7.15.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.15.0.tgz#272318b4aac789ea92e6cd28ef14698e9715ceab" + integrity sha512-br58VTAT8JB4Qe7XJVN7fNBqQgclE+hcsievoyQyGtCZsYprFMQYu+c9yHX9XkP55cMnSVZpW5fRgy3n/wZskA== dependencies: eslint-utils "^2.1.0" natural-compare "^1.4.0" semver "^6.3.0" - vue-eslint-parser "^7.9.0" + vue-eslint-parser "^7.10.0" eslint-plugin-vuetify@^1.0.1: version "1.0.1" @@ -7201,10 +7201,10 @@ sass-loader@^10.1.1: schema-utils "^3.0.0" semver "^7.3.2" -sass@^1.36.0: - version "1.36.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.36.0.tgz#5912ef9d5d16714171ba11cb17edb274c4bbc07e" - integrity sha512-fQzEjipfOv5kh930nu3Imzq3ie/sGDc/4KtQMJlt7RRdrkQSfe37Bwi/Rf/gfuYHsIuE1fIlDMvpyMcEwjnPvg== +sass@^1.37.0: + version "1.37.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.37.0.tgz#f1b03a9d072ee9053a29d125c8130c78e92827c2" + integrity sha512-B+Tu6cSAG8ffs/cqsZl/bgSH2pCmavDaPTYAoW8QA1qNHh/RqndNfVKuABKYkLjUQ5aq/BnCENVpE80cqdSM1w== dependencies: chokidar ">=3.0.0 <4.0.0" @@ -8315,10 +8315,10 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -vue-cli-plugin-i18n@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/vue-cli-plugin-i18n/-/vue-cli-plugin-i18n-2.1.1.tgz#aa2579cae810ca641662aee33c13b28f11f12d31" - integrity sha512-78m6lpAJKygkrgP+Ubp7eU59ib62uy6i3seJ4VNXG5txraq21saGhfl3oacXMiFE9K4TbVQl0qCw3vAh8gSe9A== +vue-cli-plugin-i18n@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/vue-cli-plugin-i18n/-/vue-cli-plugin-i18n-2.1.2.tgz#9b24dd0687a36bbf3dd68f1925495ff9eb2cc0e3" + integrity sha512-g4utJuhXL8SA1bgcaPSUxlaYHCJsD/n5Z7qN57Bfv1hyZSuHjCnUAhLCGxdGUN7HrX0XmkUd8gx31uX3c1s6KA== dependencies: debug "^4.3.0" deepmerge "^4.2.0" @@ -8338,10 +8338,10 @@ vue-cli-plugin-vuetify@^2.4.1: semver "^7.1.2" shelljs "^0.8.3" -vue-eslint-parser@^7.9.0: - version "7.9.0" - resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.9.0.tgz#5eeedc71f22ebc7b18b957d1ab171acf29a41e64" - integrity sha512-QBlhZ5LteDRVy2dISfQhNEmmcqph+GTaD4SH41bYzXcVHFPJ9p34zCG6QAqOZVa8PKaVgbomFnoZpGJRZi14vg== +vue-eslint-parser@^7.10.0: + version "7.10.0" + resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.10.0.tgz#ea4e4b10fd10aa35c8a79ac783488d8abcd29be8" + integrity sha512-7tc/ewS9Vq9Bn741pvpg8op2fWJPH3k32aL+jcIcWGCTzh/zXSdh7pZ5FV3W2aJancP9+ftPAv292zY5T5IPCg== dependencies: debug "^4.1.1" eslint-scope "^5.1.1" @@ -8447,10 +8447,10 @@ vuetify-loader@^1.7.2: file-loader "^6.2.0" loader-utils "^2.0.0" -vuetify@^2.5.7: - version "2.5.7" - resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.5.7.tgz#0c7cfa143bffa6a14ef3ca5cfd8f2135713f4360" - integrity sha512-3Hn7X6FFtQetc6qy8GcMDKbZRKbiBMDBsYuUjDS4EdpDvHBDTMySpzBWqBNuPjPHRaT3XSrQfoYN84vGDg87Ug== +vuetify@^2.5.8: + version "2.5.8" + resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.5.8.tgz#a23e6a7e77b77de0744b53cf1e7c9d40efac0635" + integrity sha512-paLmNhKTYFD41+14rIHnCo+P1jHbUzwBiMowxs5qXVq8RdRMqRmcy05Sfse1WUu90amPGK2fIFQq5rL2N8zqZg== vuex-persist@^3.1.3: version "3.1.3" diff --git a/modules/services/accentor/yarn.nix b/modules/services/accentor/yarn.nix index 70948663..5feb79ee 100644 --- a/modules/services/accentor/yarn.nix +++ b/modules/services/accentor/yarn.nix @@ -3538,11 +3538,11 @@ }; } { - name = "eslint_plugin_vue___eslint_plugin_vue_7.14.0.tgz"; + name = "eslint_plugin_vue___eslint_plugin_vue_7.15.0.tgz"; path = fetchurl { - name = "eslint_plugin_vue___eslint_plugin_vue_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.14.0.tgz"; - sha1 = "8c00f211064bd2708fc1aa4abd0592538fbb2cb1"; + name = "eslint_plugin_vue___eslint_plugin_vue_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.15.0.tgz"; + sha1 = "272318b4aac789ea92e6cd28ef14698e9715ceab"; }; } { @@ -7786,11 +7786,11 @@ }; } { - name = "sass___sass_1.36.0.tgz"; + name = "sass___sass_1.37.0.tgz"; path = fetchurl { - name = "sass___sass_1.36.0.tgz"; - url = "https://registry.yarnpkg.com/sass/-/sass-1.36.0.tgz"; - sha1 = "5912ef9d5d16714171ba11cb17edb274c4bbc07e"; + name = "sass___sass_1.37.0.tgz"; + url = "https://registry.yarnpkg.com/sass/-/sass-1.37.0.tgz"; + sha1 = "f1b03a9d072ee9053a29d125c8130c78e92827c2"; }; } { @@ -9058,11 +9058,11 @@ }; } { - name = "vue_cli_plugin_i18n___vue_cli_plugin_i18n_2.1.1.tgz"; + name = "vue_cli_plugin_i18n___vue_cli_plugin_i18n_2.1.2.tgz"; path = fetchurl { - name = "vue_cli_plugin_i18n___vue_cli_plugin_i18n_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/vue-cli-plugin-i18n/-/vue-cli-plugin-i18n-2.1.1.tgz"; - sha1 = "aa2579cae810ca641662aee33c13b28f11f12d31"; + name = "vue_cli_plugin_i18n___vue_cli_plugin_i18n_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/vue-cli-plugin-i18n/-/vue-cli-plugin-i18n-2.1.2.tgz"; + sha1 = "9b24dd0687a36bbf3dd68f1925495ff9eb2cc0e3"; }; } { @@ -9074,11 +9074,11 @@ }; } { - name = "vue_eslint_parser___vue_eslint_parser_7.9.0.tgz"; + name = "vue_eslint_parser___vue_eslint_parser_7.10.0.tgz"; path = fetchurl { - name = "vue_eslint_parser___vue_eslint_parser_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.9.0.tgz"; - sha1 = "5eeedc71f22ebc7b18b957d1ab171acf29a41e64"; + name = "vue_eslint_parser___vue_eslint_parser_7.10.0.tgz"; + url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.10.0.tgz"; + sha1 = "ea4e4b10fd10aa35c8a79ac783488d8abcd29be8"; }; } { @@ -9186,11 +9186,11 @@ }; } { - name = "vuetify___vuetify_2.5.7.tgz"; + name = "vuetify___vuetify_2.5.8.tgz"; path = fetchurl { - name = "vuetify___vuetify_2.5.7.tgz"; - url = "https://registry.yarnpkg.com/vuetify/-/vuetify-2.5.7.tgz"; - sha1 = "0c7cfa143bffa6a14ef3ca5cfd8f2135713f4360"; + name = "vuetify___vuetify_2.5.8.tgz"; + url = "https://registry.yarnpkg.com/vuetify/-/vuetify-2.5.8.tgz"; + sha1 = "a23e6a7e77b77de0744b53cf1e7c9d40efac0635"; }; } {