From 35db3834c12fa1379d6d313b9944f4b78f0439ce Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 8 Mar 2022 11:43:39 +0100 Subject: [PATCH] Update accentor --- modules/services/accentor/Gemfile | 2 +- modules/services/accentor/Gemfile.lock | 4 ++-- modules/services/accentor/default.nix | 4 ++-- modules/services/accentor/gemset.nix | 4 ++-- modules/services/accentor/package.json | 8 +++---- modules/services/accentor/yarn.lock | 31 ++++++++++--------------- modules/services/accentor/yarn.nix | 32 ++++++++++---------------- 7 files changed, 35 insertions(+), 50 deletions(-) diff --git a/modules/services/accentor/Gemfile b/modules/services/accentor/Gemfile index 6529a454..8b1cd2ea 100644 --- a/modules/services/accentor/Gemfile +++ b/modules/services/accentor/Gemfile @@ -25,7 +25,7 @@ gem 'pundit', '~> 2.2' gem 'will_paginate', '~> 3.3' # Use ActiveStorage variant -gem 'image_processing', '~> 1.12.1' +gem 'image_processing', '~> 1.12.2' # Reduces boot times through caching; required in config/boot.rb gem 'bootsnap', '~> 1.10.3', require: false diff --git a/modules/services/accentor/Gemfile.lock b/modules/services/accentor/Gemfile.lock index 68722752..efd0651b 100644 --- a/modules/services/accentor/Gemfile.lock +++ b/modules/services/accentor/Gemfile.lock @@ -116,7 +116,7 @@ GEM activesupport (>= 5.2) i18n (1.10.0) concurrent-ruby (~> 1.0) - image_processing (1.12.1) + image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) io-wait (0.2.1) @@ -252,7 +252,7 @@ DEPENDENCIES factory_bot_rails (~> 6.2) faker (~> 2.19) has_scope (~> 0.8) - image_processing (~> 1.12.1) + image_processing (~> 1.12.2) mocha (~> 1.13.0) pg (>= 1.2.3, < 2.0) puma (~> 5.6) diff --git a/modules/services/accentor/default.nix b/modules/services/accentor/default.nix index 8b3cdcfc..9ff26c0b 100644 --- a/modules/services/accentor/default.nix +++ b/modules/services/accentor/default.nix @@ -35,7 +35,7 @@ owner = "accentor"; repo = "api"; rev = "main"; - sha256 = "sOZeIo/bg8rnWGiIJtcPL/4otXjROJMdKyHa0jTdEDU="; + sha256 = "AwMvaLUkd4oLxy+vUUoDdcvAKg7zGtZYKyJSSs3mTOg="; }; }); webPackage = (pkgs.accentor-web.override { @@ -48,7 +48,7 @@ owner = "accentor"; repo = "web"; rev = "main"; - sha256 = "34HD86HUw+oq2KL521JUD0Dd4y290KfxW7TA1biuOwk="; + sha256 = "a+2FBZfPyiQ+Si3wn286yNpM7opbRheBIeGkrYHcZ2U="; }; }); }; diff --git a/modules/services/accentor/gemset.nix b/modules/services/accentor/gemset.nix index 4ca37bba..708ca519 100644 --- a/modules/services/accentor/gemset.nix +++ b/modules/services/accentor/gemset.nix @@ -413,10 +413,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1778lv4lpwk9ffm0zy7w59gzchq19f22a5gfrdk6qa7l9vx89h11"; + sha256 = "1f32dzj77p9mfp4q95930vfkp80psf88phjc46jhf9ncl72ykffk"; type = "gem"; }; - version = "1.12.1"; + version = "1.12.2"; }; io-wait = { groups = [ "default" ]; diff --git a/modules/services/accentor/package.json b/modules/services/accentor/package.json index 9661f664..d3d29735 100644 --- a/modules/services/accentor/package.json +++ b/modules/services/accentor/package.json @@ -12,7 +12,7 @@ "@accentor/api-client-js": "^0.17.0", "@mdi/font": "^6.5.95", "@mdi/svg": "^6.5.95", - "fetch-retry": "^5.0.1", + "fetch-retry": "^5.0.2", "gsap": "^3.9.1", "localforage": "^1.10.0", "lodash.debounce": "^4.0.8", @@ -36,15 +36,15 @@ "@vue/cli-service": "~5.0.1", "@vue/eslint-config-prettier": "^7.0.0", "eslint": "^8.10.0", - "eslint-config-prettier": "^8.3.0", - "eslint-plugin-prettier": "^3.1.0", + "eslint-config-prettier": "^8.5.0", + "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-vue": "^8.5.0", "eslint-plugin-vuetify": "^1.1.0", "prettier": "^2.5.1", "sass": "^1.49.9", "sass-loader": "^12.6.0", "vue-cli-plugin-i18n": "^2.3.1", - "vue-cli-plugin-vuetify": "^2.4.6", + "vue-cli-plugin-vuetify": "^2.4.7", "vue-template-compiler": "^2.6.14", "vuetify-loader": "^1.7.3", "webpack": "^5.0.0" diff --git a/modules/services/accentor/yarn.lock b/modules/services/accentor/yarn.lock index 0658f0be..39f00df3 100644 --- a/modules/services/accentor/yarn.lock +++ b/modules/services/accentor/yarn.lock @@ -2888,17 +2888,10 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -eslint-config-prettier@^8.3.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.4.0.tgz#8e6d17c7436649e98c4c2189868562921ef563de" - integrity sha512-CFotdUcMY18nGRo5KGsnNxpznzhkopOcOo0InID+sgQssPrzjvsyKZPvOgymTFeHrFuC3Tzdf2YndhXtULK9Iw== - -eslint-plugin-prettier@^3.1.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5" - integrity sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g== - dependencies: - prettier-linter-helpers "^1.0.0" +eslint-config-prettier@^8.3.0, eslint-config-prettier@^8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" + integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q== eslint-plugin-prettier@^4.0.0: version "4.0.0" @@ -3231,10 +3224,10 @@ fetch-retry@^4.1.1: resolved "https://registry.yarnpkg.com/fetch-retry/-/fetch-retry-4.1.1.tgz#fafe0bb22b54f4d0a9c788dff6dd7f8673ca63f3" integrity sha512-e6eB7zN6UBSwGVwrbWVH+gdLnkW9WwHhmq2YDK1Sh30pzx1onRVGBvogTlUeWxwTa+L86NYdo4hFkh7O8ZjSnA== -fetch-retry@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/fetch-retry/-/fetch-retry-5.0.1.tgz#d46d6d9607b075383693b104383e30e430db59bf" - integrity sha512-ENMet8exSRjJO8I5PoKChm0psngw0VrBOD9fUH4YO7sE7Dpqnb0/iFEGHZn633z6MPNVJv4zZNrGgQ4lmQt1nw== +fetch-retry@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/fetch-retry/-/fetch-retry-5.0.2.tgz#4c55663a7c056cb45f182394e479464f0ff8f3e3" + integrity sha512-57Hmu+1kc6pKFUGVIobT7qw3NeAzY/uNN26bSevERLVvf6VGFR/ooDCOFBHMNDgAxBiU2YJq1D0vFzc6U1DcPw== figures@^2.0.0: version "2.0.0" @@ -6037,10 +6030,10 @@ vue-cli-plugin-i18n@^2.3.1: vue-i18n "^8.17.0" vue-i18n-extract "1.0.2" -vue-cli-plugin-vuetify@^2.4.6: - version "2.4.6" - resolved "https://registry.yarnpkg.com/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.4.6.tgz#a4d24ead149eb6d69be05464d993088de199160e" - integrity sha512-rM4ORStIIHlivDVJ5o0e/YQzkShHyKnituq6OLhnGGZdRRWF5USxlUPtAHZOrhw3o6dUnoj74LlL4kOuR5D+fg== +vue-cli-plugin-vuetify@^2.4.7: + version "2.4.7" + resolved "https://registry.yarnpkg.com/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.4.7.tgz#6cefc0777ff03d0245b8ce6fce24d1fb03620b4c" + integrity sha512-SvxZysXyEnm7B0e3tHLvDVPFaNMewYolIMqQWm+E9y7Fki0Dapn7LfY/Js+UdFzRq0hpHjDBk+bv1WR9Z7ECgQ== dependencies: null-loader "^4.0.1" semver "^7.1.2" diff --git a/modules/services/accentor/yarn.nix b/modules/services/accentor/yarn.nix index ed98b5ff..f6a53b93 100644 --- a/modules/services/accentor/yarn.nix +++ b/modules/services/accentor/yarn.nix @@ -2954,19 +2954,11 @@ }; } { - name = "eslint_config_prettier___eslint_config_prettier_8.4.0.tgz"; + name = "eslint_config_prettier___eslint_config_prettier_8.5.0.tgz"; path = fetchurl { - name = "eslint_config_prettier___eslint_config_prettier_8.4.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.4.0.tgz"; - sha512 = "CFotdUcMY18nGRo5KGsnNxpznzhkopOcOo0InID+sgQssPrzjvsyKZPvOgymTFeHrFuC3Tzdf2YndhXtULK9Iw=="; - }; - } - { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.4.1.tgz"; - path = fetchurl { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz"; - sha512 = "htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g=="; + name = "eslint_config_prettier___eslint_config_prettier_8.5.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz"; + sha512 = "obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q=="; }; } { @@ -3266,11 +3258,11 @@ }; } { - name = "fetch_retry___fetch_retry_5.0.1.tgz"; + name = "fetch_retry___fetch_retry_5.0.2.tgz"; path = fetchurl { - name = "fetch_retry___fetch_retry_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/fetch-retry/-/fetch-retry-5.0.1.tgz"; - sha512 = "ENMet8exSRjJO8I5PoKChm0psngw0VrBOD9fUH4YO7sE7Dpqnb0/iFEGHZn633z6MPNVJv4zZNrGgQ4lmQt1nw=="; + name = "fetch_retry___fetch_retry_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/fetch-retry/-/fetch-retry-5.0.2.tgz"; + sha512 = "57Hmu+1kc6pKFUGVIobT7qw3NeAzY/uNN26bSevERLVvf6VGFR/ooDCOFBHMNDgAxBiU2YJq1D0vFzc6U1DcPw=="; }; } { @@ -6682,11 +6674,11 @@ }; } { - name = "vue_cli_plugin_vuetify___vue_cli_plugin_vuetify_2.4.6.tgz"; + name = "vue_cli_plugin_vuetify___vue_cli_plugin_vuetify_2.4.7.tgz"; path = fetchurl { - name = "vue_cli_plugin_vuetify___vue_cli_plugin_vuetify_2.4.6.tgz"; - url = "https://registry.yarnpkg.com/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.4.6.tgz"; - sha512 = "rM4ORStIIHlivDVJ5o0e/YQzkShHyKnituq6OLhnGGZdRRWF5USxlUPtAHZOrhw3o6dUnoj74LlL4kOuR5D+fg=="; + name = "vue_cli_plugin_vuetify___vue_cli_plugin_vuetify_2.4.7.tgz"; + url = "https://registry.yarnpkg.com/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.4.7.tgz"; + sha512 = "SvxZysXyEnm7B0e3tHLvDVPFaNMewYolIMqQWm+E9y7Fki0Dapn7LfY/Js+UdFzRq0hpHjDBk+bv1WR9Z7ECgQ=="; }; } {