Merge branch 'main' into dependabot/bundler/rubocop-127963009e

dodona-edu · Jan 7, 2025 · 63c757a · 63c757a
2 parents 158cec0 + a416660
commit 63c757a
Show file tree

Hide file tree

Showing 4 changed files with 205 additions and 194 deletions.
diff --git a/Gemfile b/Gemfile
@@ -73,7 +73,7 @@ gem 'omniauth_openid_connect', '~> 0.8.0'
 gem 'omniauth-rails_csrf_protection', '~> 1.0.2'
 
 # Json webtokens
-gem 'jwt', '~> 2.9.3'
+gem 'jwt', '~> 2.10.1'
 
 # contact mail form
 gem 'hcaptcha', '~> 7.1.0'
@@ -91,7 +91,7 @@ gem 'annotate', '~> 3.2.0'
 # Use Capistrano for deployment
 gem 'capistrano3-delayed-job', '~> 1.7.6'
 gem 'capistrano-passenger', '~> 0.2.1', group: :development
-gem 'capistrano-rails', '~> 1.6.3', group: :development
+gem 'capistrano-rails', '~> 1.7.0', group: :development
 gem 'capistrano-rvm', '~> 0.1.2', group: :development
 gem 'capistrano-yarn', '~> 2.0.2'
 
@@ -108,15 +108,15 @@ gem 'httparty', '~> 0.22.0'
 gem 'slack-notifier', '~> 2.4.0'
 
 # css styles for emails
-gem 'css_parser', '~> 1.19.1' # dependency for premailer, set to higher version for ruby 3.3 support
-gem 'nokogiri', '~> 1.17.2'
+gem 'css_parser', '~> 1.21.0' # dependency for premailer, set to higher version for ruby 3.3 support
+gem 'nokogiri', '~> 1.18.1'
 gem 'premailer-rails', '~> 1.12.0'
 
 # filtering
 gem 'has_scope', '~> 0.8.2'
 
 # generating zip files
-gem 'rubyzip', '~> 2.3.2'
+gem 'rubyzip', '~> 2.4.1'
 
 # memcache
 gem 'dalli', '~> 3.2.8'
@@ -160,7 +160,7 @@ group :test do
   gem 'minitest-ci', '~> 3.4.0'
   gem 'simplecov', '~> 0.22.0', require: false
   gem 'simplecov-cobertura', '~> 2.1.0', require: false
-  gem 'test-prof', '~> 1.4.3'
+  gem 'test-prof', '~> 1.4.4'
 
   # Mocking HTTP requests to third parties.
   gem 'webmock'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -103,11 +103,11 @@ GEM
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    capistrano-bundler (2.1.0)
+    capistrano-bundler (2.1.1)
       capistrano (~> 3.1)
     capistrano-passenger (0.2.1)
       capistrano (~> 3.0)
-    capistrano-rails (1.6.3)
+    capistrano-rails (1.7.0)
       capistrano (~> 3.1)
       capistrano-bundler (>= 1.1, < 3)
     capistrano-rvm (0.1.2)
@@ -137,7 +137,7 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.19.1)
+    css_parser (1.21.0)
       addressable
     cssbundling-rails (1.4.1)
       railties (>= 6.0.0)
@@ -249,7 +249,7 @@ GEM
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
-    jwt (2.9.3)
+    jwt (2.10.1)
       base64
     kramdown (2.5.1)
       rexml (>= 3.3.9)
@@ -312,7 +312,7 @@ GEM
       net-protocol
     net-ssh (7.1.0)
     nio4r (2.7.4)
-    nokogiri (1.17.2-x86_64-linux)
+    nokogiri (1.18.1-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
@@ -480,7 +480,7 @@ GEM
       ffi (~> 1.12)
       logger
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
     securerandom (0.4.1)
     selenium-webdriver (4.27.0)
       base64 (~> 0.2)
@@ -526,7 +526,7 @@ GEM
       attr_required (>= 0.0.5)
       faraday (~> 2.0)
       faraday-follow_redirects
-    test-prof (1.4.3)
+    test-prof (1.4.4)
     thor (1.3.2)
     tilt (2.4.0)
     timeout (0.4.3)
@@ -578,13 +578,13 @@ DEPENDENCIES
   builder (~> 3.3.0)
   byebug (~> 11.1.3)
   capistrano-passenger (~> 0.2.1)
-  capistrano-rails (~> 1.6.3)
+  capistrano-rails (~> 1.7.0)
   capistrano-rvm (~> 0.1.2)
   capistrano-yarn (~> 2.0.2)
   capistrano3-delayed-job (~> 1.7.6)
   capybara (~> 3.40.0)
   counter_culture (~> 3.8)
-  css_parser (~> 1.19.1)
+  css_parser (~> 1.21.0)
   cssbundling-rails (~> 1.4.1)
   dalli (~> 3.2.8)
   datadog (~> 2.8.0)
@@ -607,7 +607,7 @@ DEPENDENCIES
   jbuilder (~> 2.13.0)
   jsbundling-rails (~> 1.3.1)
   json_schemer (~> 2.3.0)
-  jwt (~> 2.9.3)
+  jwt (~> 2.10.1)
   kramdown (~> 2.5.1)
   kramdown-parser-gfm (~> 1.1.0)
   letter_opener (~> 1.10.0)
@@ -617,7 +617,7 @@ DEPENDENCIES
   minitest-ci (~> 3.4.0)
   minitest-utils (~> 0.4.8)
   mocha (~> 2.7.1)
-  nokogiri (~> 1.17.2)
+  nokogiri (~> 1.18.1)
   omniauth-google-oauth2 (~> 1.2.0)
   omniauth-oauth2 (~> 1.8.0)
   omniauth-rails_csrf_protection (~> 1.0.2)
@@ -637,14 +637,14 @@ DEPENDENCIES
   rubocop-minitest (~> 0.36.0)
   rubocop-rails (~> 2.28.0)
   ruby-saml (~> 1.17.0)
-  rubyzip (~> 2.3.2)
+  rubyzip (~> 2.4.1)
   selenium-webdriver (~> 4.27.0)
   simplecov (~> 0.22.0)
   simplecov-cobertura (~> 2.1.0)
   slack-notifier (~> 2.4.0)
   sprockets-rails (~> 3.5.2)
   stackprof (~> 0.2.26)
-  test-prof (~> 1.4.3)
+  test-prof (~> 1.4.4)
   trilogy (~> 2.9.0)
   tzinfo-data
   web-console (~> 4.2.1)

diff --git a/package.json b/package.json
@@ -15,12 +15,12 @@
     "@babel/core": "^7.26.0",
     "@babel/plugin-transform-runtime": "^7.25.9",
     "@babel/preset-env": "^7.26.0",
-    "@codemirror/autocomplete": "^6.18.3",
+    "@codemirror/autocomplete": "^6.18.4",
     "@codemirror/commands": "^6.7.1",
-    "@codemirror/language": "^6.10.6",
+    "@codemirror/language": "^6.10.8",
     "@codemirror/language-data": "^6.5.1",
     "@codemirror/state": "^6.5.0",
-    "@codemirror/view": "^6.35.3",
+    "@codemirror/view": "^6.36.1",
     "@dodona/papyros": "2.3.7",
     "@iframe-resizer/child": "^5.3.2",
     "@iframe-resizer/parent": "^5.3.2",
@@ -31,15 +31,15 @@
     "@rails/activestorage": "^7.2.102",
     "@rails/ujs": "^7.1.402",
     "@replit/codemirror-lang-csharp": "^6.2.0",
-    "@sentry/browser": "^8.45.0",
+    "@sentry/browser": "^8.47.0",
     "@sentry/webpack-plugin": "^2.22.7",
     "@types/bootstrap": "^5.2.10",
     "@types/d3": "^7.4.3",
     "@types/dragula": "^3.7.5",
     "@types/iframe-resizer": "^3.5.13",
     "@types/jest": "^27.5.0",
     "@types/node-polyglot": "^2.5.0",
-    "@types/serviceworker": "^0.0.107",
+    "@types/serviceworker": "^0.0.108",
     "babel-loader": "^9.2.1",
     "babel-plugin-macros": "^3.1.0",
     "bootstrap": "5.3.3",
@@ -55,12 +55,12 @@
     "jspreadsheet-ce": "^4.15.0",
     "lit": "^3.2.1",
     "node-polyglot": "^2.6.0",
-    "sass": "^1.83.0",
+    "sass": "^1.83.1",
     "tippy.js": "^6.3.7",
     "ts-loader": "^9.5.1",
     "typescript": "^5.7.2",
     "webpack": "^5.97.1",
-    "webpack-cli": "^5.1.4"
+    "webpack-cli": "^6.0.1"
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.0.2",
@@ -75,19 +75,19 @@
     "babel-plugin-istanbul": "^7.0.0",
     "eslint": "^9.17.0",
     "eslint-config-google": "^0.14.0",
-    "eslint-plugin-jest": "^28.9.0",
+    "eslint-plugin-jest": "^28.10.0",
     "eslint-plugin-lit": "^1.15.0",
     "eslint-plugin-no-jquery": "^3.1.0",
     "eslint-plugin-wc": "^2.2.0",
-    "globals": "^15.13.0",
+    "globals": "^15.14.0",
     "jest": "^26.6.3",
     "jest-junit": "^16.0.0",
     "nyc": "^17.1.0",
     "stylelint": "^15.11.0",
     "stylelint-config-standard": "^34.0.0",
     "stylelint-config-standard-scss": "^11.1.0",
     "ts-jest": "^26.5.6",
-    "typescript-eslint": "^8.18.1",
+    "typescript-eslint": "^8.19.1",
     "webpack-bundle-analyzer": "^4.10.2"
   },
   "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"