diff --git a/modules/services/accentor/Gemfile b/modules/services/accentor/Gemfile index fc70de09..c6748c8c 100644 --- a/modules/services/accentor/Gemfile +++ b/modules/services/accentor/Gemfile @@ -52,7 +52,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.15.0' - gem 'rubocop-rails', '~> 2.11' + gem 'rubocop-rails', '~> 2.12' 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 diff --git a/modules/services/accentor/Gemfile.lock b/modules/services/accentor/Gemfile.lock index a08fc103..1407eecf 100644 --- a/modules/services/accentor/Gemfile.lock +++ b/modules/services/accentor/Gemfile.lock @@ -175,7 +175,7 @@ GEM ffi (~> 1.0) regexp_parser (2.1.1) rexml (3.2.5) - rubocop (1.19.0) + rubocop (1.20.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -184,11 +184,11 @@ GEM rubocop-ast (>= 1.9.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.10.0) + rubocop-ast (1.11.0) parser (>= 3.0.1.1) rubocop-minitest (0.15.0) rubocop (>= 0.90, < 2.0) - rubocop-rails (2.11.3) + rubocop-rails (2.12.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) @@ -247,7 +247,7 @@ DEPENDENCIES rack-cors (~> 1.1) rails (~> 6.1) rubocop-minitest (~> 0.15.0) - rubocop-rails (~> 2.11) + rubocop-rails (~> 2.12) simplecov (~> 0.21) spring (~> 2.1) spring-watcher-listen (~> 2.0) diff --git a/modules/services/accentor/default.nix b/modules/services/accentor/default.nix index e45a301d..665751a5 100644 --- a/modules/services/accentor/default.nix +++ b/modules/services/accentor/default.nix @@ -31,7 +31,7 @@ owner = "accentor"; repo = "api"; rev = "main"; - sha256 = "j2dvkff7mIQZaQAepKL12Z3yTr3HmWXRujhj/Aa23Y0="; + sha256 = "BM2B9knQ6xGqKwHSh0nhZHkwoiizloC+0c4v6BP2nHA="; }; }); webPackage = (pkgs.accentor-web.override { @@ -43,7 +43,7 @@ owner = "accentor"; repo = "web"; rev = "main"; - sha256 = "92jZuYp9osuSNgkPHeGgB+bhTETUpPbkwsi4adkrnkQ="; + sha256 = "XGVJUyNKZzPzmlBc7aMskTE8QN+t4QGV96p13ak9YQU="; }; }); }; diff --git a/modules/services/accentor/gemset.nix b/modules/services/accentor/gemset.nix index 7a236f7d..cfa934e9 100644 --- a/modules/services/accentor/gemset.nix +++ b/modules/services/accentor/gemset.nix @@ -736,10 +736,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05m76rnphvdba382rm3q5fljl7fi8swwsn6brx03wql10lz7p9jf"; + sha256 = "0zyij3w6zwvrv69bnvh5yv3xm0463vllj8f9z1fcgwi5bbacbxj6"; type = "gem"; }; - version = "1.19.0"; + version = "1.20.0"; }; rubocop-ast = { dependencies = [ "parser" ]; @@ -747,10 +747,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0x6za0j9wwxr14rkkkmpbnwj04lak4yjmkyrdl8c31m9acba80zw"; + sha256 = "06fkn66wrsfprvd7bh0bkjvdcr17b9jy3j0cs7lbd3f2yscvwr63"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; rubocop-minitest = { dependencies = [ "rubocop" ]; @@ -769,10 +769,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0f2a1mmca9g1bi8qc9b2vj33z0j8fmwxqk18qjzxfxlppxf1ipmk"; + sha256 = "0sc2hbz434j6h3y1s6pzqrmdbbj6y0csfqdyjm23scwfdg7g3n07"; type = "gem"; }; - version = "2.11.3"; + version = "2.12.2"; }; ruby-progressbar = { groups = [ "default" "development" ]; diff --git a/modules/services/accentor/package.json b/modules/services/accentor/package.json index 96781d45..9e1e5aec 100644 --- a/modules/services/accentor/package.json +++ b/modules/services/accentor/package.json @@ -10,8 +10,8 @@ }, "dependencies": { "@accentor/api-client-js": "^0.13.0", - "@mdi/font": "^5.9.55", - "@mdi/svg": "^5.9.55", + "@mdi/font": "^6.1.95", + "@mdi/svg": "^6.1.95", "fetch-retry": "^4.1.1", "localforage": "^1.10.0", "lodash.debounce": "^4.0.8", @@ -36,8 +36,8 @@ "eslint-plugin-prettier": "^3.4.1", "eslint-plugin-vue": "^7.17.0", "eslint-plugin-vuetify": "^1.0.1", - "prettier": "^2.3.2", - "sass": "^1.39.0", + "prettier": "^2.4.0", + "sass": "^1.39.2", "sass-loader": "^10.1.1", "vue-cli-plugin-i18n": "^2.1.3", "vue-cli-plugin-vuetify": "^2.4.2", diff --git a/modules/services/accentor/yarn.lock b/modules/services/accentor/yarn.lock index 4691dcd9..86fa13ad 100644 --- a/modules/services/accentor/yarn.lock +++ b/modules/services/accentor/yarn.lock @@ -965,15 +965,15 @@ js-yaml "^3.13.1" json5 "^2.1.1" -"@mdi/font@^5.9.55": - version "5.9.55" - resolved "https://registry.yarnpkg.com/@mdi/font/-/font-5.9.55.tgz#41acd50b88073ded7095fc3029d8712b6e12f38e" - integrity sha512-jswRF6q3eq8NWpWiqct6q+6Fg/I7nUhrxYJfiEM8JJpap0wVJLQdbKtyS65GdlK7S7Ytnx3TTi/bmw+tBhkGmg== +"@mdi/font@^6.1.95": + version "6.1.95" + resolved "https://registry.yarnpkg.com/@mdi/font/-/font-6.1.95.tgz#665b7dc13b2d1d1ebefcfac5a68c1013581aaa96" + integrity sha512-L3cg9qoUEp5MZHvu6rtuobTtPBmq0ATau5ZrHmsaE6gCRs90T4JBWyzV8WCMEjZoy5+zA+/cvtCUtD/+WVaQ9Q== -"@mdi/svg@^5.9.55": - version "5.9.55" - resolved "https://registry.yarnpkg.com/@mdi/svg/-/svg-5.9.55.tgz#7cba058135afd5d8a3da977f51b71ffc6a3a3699" - integrity sha512-gO0ZpKIeCn9vFg46QduK9MM+n1fuCNwSdcdlBTtbafnnuvwLveK2uj+byhdLtg/8VJGXDhp+DJ35QUMbeWeULA== +"@mdi/svg@^6.1.95": + version "6.1.95" + resolved "https://registry.yarnpkg.com/@mdi/svg/-/svg-6.1.95.tgz#86837e6335579236673ce2bd82727d2398c7b21f" + integrity sha512-X3qD1LWJotRUMnkjuAdAJxb1fqRsa+uWh3UugEM2b66mj7NSC6jhn97W8b/UW/ukhDvdP/jRPrqz+2mJf2jN9w== "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" @@ -6672,10 +6672,10 @@ prettier@^1.18.2: resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== -prettier@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d" - integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ== +prettier@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.0.tgz#85bdfe0f70c3e777cf13a4ffff39713ca6f64cba" + integrity sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ== pretty-error@^2.0.2: version "2.1.2" @@ -7201,10 +7201,10 @@ sass-loader@^10.1.1: schema-utils "^3.0.0" semver "^7.3.2" -sass@^1.39.0: - version "1.39.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.39.0.tgz#6c64695d1c437767c8f1a4e471288e831f81d035" - integrity sha512-F4o+RhJkNOIG0b6QudYU8c78ZADKZjKDk5cyrf8XTKWfrgbtyVVXImFstJrc+1pkQDCggyidIOytq6gS4gCCZg== +sass@^1.39.2: + version "1.39.2" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.39.2.tgz#1681964378f58d76fc64a6a502619bd5ac99f660" + integrity sha512-4/6Vn2RPc+qNwSclUSKvssh7dqK1Ih3FfHBW16I/GfH47b3scbYeOw65UIrYG7PkweFiKbpJjgkf5CV8EMmvzw== dependencies: chokidar ">=3.0.0 <4.0.0" diff --git a/modules/services/accentor/yarn.nix b/modules/services/accentor/yarn.nix index 5f4d69a6..c4933287 100644 --- a/modules/services/accentor/yarn.nix +++ b/modules/services/accentor/yarn.nix @@ -890,19 +890,19 @@ }; } { - name = "_mdi_font___font_5.9.55.tgz"; + name = "_mdi_font___font_6.1.95.tgz"; path = fetchurl { - name = "_mdi_font___font_5.9.55.tgz"; - url = "https://registry.yarnpkg.com/@mdi/font/-/font-5.9.55.tgz"; - sha1 = "41acd50b88073ded7095fc3029d8712b6e12f38e"; + name = "_mdi_font___font_6.1.95.tgz"; + url = "https://registry.yarnpkg.com/@mdi/font/-/font-6.1.95.tgz"; + sha1 = "665b7dc13b2d1d1ebefcfac5a68c1013581aaa96"; }; } { - name = "_mdi_svg___svg_5.9.55.tgz"; + name = "_mdi_svg___svg_6.1.95.tgz"; path = fetchurl { - name = "_mdi_svg___svg_5.9.55.tgz"; - url = "https://registry.yarnpkg.com/@mdi/svg/-/svg-5.9.55.tgz"; - sha1 = "7cba058135afd5d8a3da977f51b71ffc6a3a3699"; + name = "_mdi_svg___svg_6.1.95.tgz"; + url = "https://registry.yarnpkg.com/@mdi/svg/-/svg-6.1.95.tgz"; + sha1 = "86837e6335579236673ce2bd82727d2398c7b21f"; }; } { @@ -7162,11 +7162,11 @@ }; } { - name = "prettier___prettier_2.3.2.tgz"; + name = "prettier___prettier_2.4.0.tgz"; path = fetchurl { - name = "prettier___prettier_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz"; - sha1 = "ef280a05ec253712e486233db5c6f23441e7342d"; + name = "prettier___prettier_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-2.4.0.tgz"; + sha1 = "85bdfe0f70c3e777cf13a4ffff39713ca6f64cba"; }; } { @@ -7786,11 +7786,11 @@ }; } { - name = "sass___sass_1.39.0.tgz"; + name = "sass___sass_1.39.2.tgz"; path = fetchurl { - name = "sass___sass_1.39.0.tgz"; - url = "https://registry.yarnpkg.com/sass/-/sass-1.39.0.tgz"; - sha1 = "6c64695d1c437767c8f1a4e471288e831f81d035"; + name = "sass___sass_1.39.2.tgz"; + url = "https://registry.yarnpkg.com/sass/-/sass-1.39.2.tgz"; + sha1 = "1681964378f58d76fc64a6a502619bd5ac99f660"; }; } {