diff --git a/.config/.cypress.js b/.config/.cypress.js index 5d8e10485..da8f635df 100644 --- a/.config/.cypress.js +++ b/.config/.cypress.js @@ -3,5 +3,35 @@ module.exports = { // Base URL is set via Docker environment variable viewportHeight: 1000, viewportWidth: 1400, + + // https://docs.cypress.io/api/plugins/browser-launch-api#Changing-browser-preferences + setupNodeEvents(on, _config) { + on("before:browser:launch", (browser, launchOptions) => { + if (browser.family === "chromium" && browser.name !== "electron") { + // auto open devtools + launchOptions.args.push("--auto-open-devtools-for-tabs"); + + // TODO (clipboard): We use the obsolete clipboard API from browsers, i.e. + // document.execCommand("copy"). There's a new Clipboard API that is supported + // by modern browsers. Once we switch to that API, use the following code + // to allow requesting permission (clipboard permission) in a non-secure + // context (http). Remaining TODO in this case: search for the equivalent + // flag in Firefox & Electron (if we also want to test them). + // launchOptions.args.push("--unsafely-treat-insecure-origin-as-secure=http://mampf:3000"); + } + + if (browser.family === "firefox") { + // auto open devtools + launchOptions.args.push("-devtools"); + } + + if (browser.name === "electron") { + // auto open devtools + launchOptions.preferences.devTools = true; + } + + return launchOptions; + }); + }, }, }; diff --git a/.config/.rubocop.yml b/.config/.rubocop.yml index cc781ea1b..a3a2b6210 100644 --- a/.config/.rubocop.yml +++ b/.config/.rubocop.yml @@ -110,6 +110,9 @@ Style/MethodCallWithArgsParentheses: Style/RedundantReturn: AllowMultipleReturnValues: true +Style/SafeNavigationChainLength: + Max: 4 + Style/StringLiterals: EnforcedStyle: double_quotes diff --git a/.config/commands/deps.justfile b/.config/commands/deps.justfile new file mode 100644 index 000000000..fb7feed15 --- /dev/null +++ b/.config/commands/deps.justfile @@ -0,0 +1,22 @@ +[private] +help: + @just --list --justfile {{source_file()}} + +# Shows the Dependabot alerts on GitHub +alerts: + #!/usr/bin/env bash + xdg-open https://github.com/MaMpf-HD/mampf/security/dependabot + +# Updates the Bundler package manager itself (NOT the Ruby gems) +update-bundler: + bundle update --bundler + +# Updates Ruby gems +update-gems: + bundle update + +# Updates Node.js packages +update-nodejs: + # You may have to run this command beforehand: + # sudo chown your_user_name -R ./node_modules/ + yarn upgrade diff --git a/.config/commands/docker.justfile b/.config/commands/docker.justfile index 15872ed4b..bec8465f9 100644 --- a/.config/commands/docker.justfile +++ b/.config/commands/docker.justfile @@ -1,4 +1,3 @@ -# Prints this help message [private] help: @just --list --justfile {{source_file()}} @@ -9,6 +8,19 @@ help: cd {{justfile_directory()}}/docker/development/ docker compose up {{args}} +# Starts the dev docker containers (detached) & shows MaMpf logs +up-logs *args: + #!/usr/bin/env bash + cd {{justfile_directory()}}/docker/development/ + docker compose up -d {{args}} + docker compose logs -f mampf + +# Shows the log of the specified container +@logs name="mampf": + #!/usr/bin/env bash + cd {{justfile_directory()}}/docker/development/ + docker compose logs -f {{name}} + # Starts the dev docker containers and preseeds the database [confirm("This will reset all your data in the database locally. Continue? (y/n)")] up-reseed *args: @@ -47,3 +59,22 @@ up-reseed *args: #!/usr/bin/env bash cd {{justfile_directory()}}/docker/development/ docker compose exec mampf bundle exec rails c + +# Rebuilds the most essential containers in the dev or test environment +rebuild env="dev": + #!/usr/bin/env bash + environment={{ if env == "test" {"test"} else {"development"} }} + echo "Rebuilding in env: ${environment}" + cd {{justfile_directory()}}/docker/${environment} + + # Remove + docker compose rm -s mampf + if [ "$environment" = "development" ]; then + docker compose rm -s webpacker + fi + + # Rebuild + docker compose build mampf + if [ "$environment" = "development" ]; then + docker compose build webpacker + fi diff --git a/.config/commands/test.justfile b/.config/commands/test.justfile index c2cacf556..dd66584b9 100644 --- a/.config/commands/test.justfile +++ b/.config/commands/test.justfile @@ -1,4 +1,3 @@ -# Prints this help message [private] help: @just --list --justfile {{source_file()}} diff --git a/.config/commands/utils.justfile b/.config/commands/utils.justfile new file mode 100644 index 000000000..01b6fdfa4 --- /dev/null +++ b/.config/commands/utils.justfile @@ -0,0 +1,70 @@ +[private] +help: + @just --list --justfile {{source_file()}} + +# Generates entity-relationship diagrams (ERD) of the database +erd: + #!/usr/bin/env bash + + # Make sure the mampf dev container is running + cd {{justfile_directory()}}/docker/development/ + if [ -z "$(docker compose ps --services --filter 'status=running' | grep mampf)" ]; then + echo "The mampf dev container is not running. Please start it first (use 'just docker')." + exit 1 + fi + + mkdir -p {{justfile_directory()}}/tmp/erd/ + + # ▶ Generate ERDs + # Customize it with options from here: https://voormedia.github.io/rails-erd/customise.html + # Also see the output from: 'bundle exec erd --help' (inside the dev container) + + # Ignore some tables + ignored_thredded="Thredded::Post,Thredded::UserPostNotification,Thredded::PrivateUser,Thredded::UserPrivateTopicReadState,Thredded::PrivateTopic,Thredded::MessageboardUser,Thredded::PrivatePost,Thredded:UserDetail,Thredded::MessageboardGroup,Thredded::Messageboard,Thredded::Category,Thredded::TopicCategory,Thredded::Topic,Thredded::UserTopicReadState,Thredded::UserTopicFollow,Thredded::NotificationsForFollowedTopics,Thredded::MessageboardNotificationsForFollowedTopics,Thredded::UserPreference,Thredded::UserMessageboardPreference,Thredded::NotificationsForPrivateTopics,Thredded::PostModerationRecord,Thredded::UserDetail" + ignored_translation="Mobility::Backends::ActiveRecord::Table::Translation,Subject::Translation,Program::Translation,Division::Translation" + ignored_commontator="Commontable,Votable,Subscriber,Creator" + other_ignored="ActionMailbox::Record,ActionText::Record,ActiveStorage::Record,Sluggable,FriendlyId::Slug,ApplicationRecord,InteractionsRecord" + exclude_default="${ignored_thredded},${ignored_translation},${ignored_commontator},${other_ignored}" + + # 🌟 Overview with attributes (warnings will be printed only here) + docker compose exec -it mampf rake erd \ + title=false filename=/usr/src/app/tmp/erd/mampf-erd-overview-with-attributes \ + inheritance=false polymorphism=true indirect=false attributes=content \ + exclude="${exclude_default}" + + # 🌟 Generic Overview + docker compose exec -it mampf rake erd warn=false \ + title=false filename=/usr/src/app/tmp/erd/mampf-erd-overview \ + inheritance=false polymorphism=true indirect=false attributes=false \ + exclude="${exclude_default}" + + # 🌟 Vouchers + docker compose exec -it mampf rake erd warn=false \ + title="Vouchers" filename=/usr/src/app/tmp/erd/mampf-erd-vouchers \ + inheritance=true polymorphism=true indirect=true attributes=content \ + exclude="${exclude_default},Teachable,Editable" \ + only="User,Claim,Voucher,Redemption,Lecture,Tutorial,Talk" + + # 🌟 Tutorials + docker compose exec -it mampf rake erd warn=false \ + title="Tutorials" filename=/usr/src/app/tmp/erd/mampf-erd-tutorials \ + inheritance=true polymorphism=true indirect=true attributes=content \ + exclude="${exclude_default},Claimable,Editable,Teachable" \ + only="User,Lecture,Tutorial,Submission,Assignment,TutorTutorialJoin,UserSubmissionJoin" + + # 🌟 Courses + docker compose exec -it mampf rake erd warn=false \ + title="Courses" filename=/usr/src/app/tmp/erd/mampf-erd-courses \ + inheritance=true polymorphism=true indirect=true attributes=content \ + exclude="${exclude_default},Claimable,Editable" \ + only="Subject,Program,Division,DivisionCourseJoin,Course,Lecture,CourseSelfJoin,Lesson" + + # 🌟 Lectures + docker compose exec -it mampf rake erd warn=false \ + title="Lectures" filename=/usr/src/app/tmp/erd/mampf-erd-lectures \ + inheritance=true polymorphism=true indirect=true attributes=content \ + exclude="${exclude_default},Claimable,Editable,Teachable" \ + only="Lecture,Lesson,Chapter,Section,Item,LessonSectionJoin,Term" + + echo "📂 Diagrams are ready for you in the folder {{justfile_directory()}}/tmp/erd/" + echo "🔀 For the meanings of the arrows, refer to https://voormedia.github.io/rails-erd/gallery.html#notations" diff --git a/.gitignore b/.gitignore index fa78b9564..fa5ed4bd3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,6 @@ # Ignore bundler config. /.bundle -# Ignore the default SQLite database. -/db/*.sqlite3 -/db/*.sqlite3-journal /db/csv/* /db/backups/* !/backups/.gitkeep diff --git a/.justfile b/.justfile index 5b36d3496..fe8e56d53 100644 --- a/.justfile +++ b/.justfile @@ -1,18 +1,23 @@ # Documentation: https://just.systems/man/en/ -# Prints this help message [private] help: @just --list -# Test-related commands +# Commands to test the MaMpf codebase mod test ".config/commands/test.justfile" # see https://github.com/casey/just/issues/2216 # alias t := test -# Docker-related commands +# Commands to manage the docker containers mod docker ".config/commands/docker.justfile" +# Commands to manage dependencies +mod deps ".config/commands/deps.justfile" + +# Some utils, e.g. ERD-generation etc. +mod utils ".config/commands/utils.justfile" + # Opens the MaMpf wiki in the default browser wiki: #!/usr/bin/env bash diff --git a/.vscode/extensions.json b/.vscode/extensions.json index d98e845e1..1e3544961 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -4,6 +4,7 @@ "dbaeumer.vscode-eslint", "streetsidesoftware.code-spell-checker", "streetsidesoftware.code-spell-checker-german", - "nefrob.vscode-just-syntax" + "nefrob.vscode-just-syntax", + "connorshea.vscode-ruby-test-adapter" ] } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 842ae0e3f..40c9d2aeb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -102,12 +102,33 @@ ////////////////////////////////////// // Spell Checker ////////////////////////////////////// + "cSpell.enabled": true, + "cSpell.ignorePaths": [ + "node_modules", + ".git" + ], + "cSpell.language": "en,de", "cSpell.words": [ + "activerecord", + "ajax", "commontator", + "cospeaker", + "cospeakers", + "datetime", "factorybot", "helpdesk", "katex", + "preselection", + "selectize", + "Timecop", "turbolinks", - "Unsets" - ] + "Unsets", + "uncached", + "whitespaces" + ], + "cSpell.enableFiletypes": [ + "ruby" + // Other filetypes are handled by the default spell checker + ], + "cSpell.maxNumberOfProblems": 10000 } \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dc36806ac..e02c8b8ca 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,41 +1,15 @@ # Contributing -To ensure a smooth experience for contributions, please first open an issue about the change you wish to make or contact -an active developer in some other way before making a change. +We are a small dev team centered around [Denis Vogel](https://www.mathi.uni-heidelberg.de/~vogel/), the creator of MaMpf. He started the project on June 4, 2017 out of frustration with the existing tools and their shortcomings when it comes to teaching mathematics and uploading recorded lectures to the web. He has since been the main developer and maintainer of the project and added tons of functionality throughout the years. MaMpf is now used every day by the mathematics department at Heidelberg University to host their lectures. It is constantly being improved and extended. -## Braches -We have the following branches: -- *production* -- *main* -- *mampf-next* -- feature-branches (names vary) -- *experimental* +Denis Vogel was joined by many students along the way working on the project in the role of a payed HiWis (German abbreviation for "Hilsfwissenschaftler", research assistants) at Heidelberg University. They have contributed to the project in various ways, such as implementing new features, fixing bugs, testing the software and improving the documentation. -### *production* -contains the actual version deployed on [mampf](mampf.mathi.uni-heidelberg.de). +The idea of MaMpf is to provide free material online to the whole world. In that spirit, the source code for MaMpf is open-source and licensed under the very permissive MIT license, so your university can host their own instance of MaMpf if they want to. -### *main* -is usually equal to *production*. Hotfixes are tested here before being merged to *production*. +--- -### *mampf-next* -is the next intended version for mampf. This version is automatically deployed on -[mampf-dev](mampf-dev.mathi.uni-heidelberg.de). Features should be developed in feature branches and merged here. +**While we welcome contributions from everyone, please keep in mind that we are a very small team and currently cannot provide extensive mentoring or guidance to new external contributors.** If you are a HiWi at Heidelberg University, that's of course a different story, but unfortunately, right now we don't have too much time to onboard new developers form the outside. Knowledge transfer is often easier in persona than having to write down everything online. We have done such efforts in our [Wiki](https://github.com/MaMpf-HD/mampf/wiki) and continue to improve it as living document but don't expect it to be fully self-contained. +Also note that due to MaMpf being very specific to our needs at Heidelberg University, we might reject contributions that are not in line with our vision for the project or too general (or too specific to another university) to be useful for us. Therefore, **please open an issue before starting to work on a pull request to discuss your idea with us**. -### feature branches -Collaborators may create a branch for each improvement they would like to integrate in *mampf-next*. If you do not have -collaborator access yet, feel free to instead fork this repository and open a pull request targeted on the *mampf-next* -branch. - -### *experimental* -is used as a playground and for test deployments. Do **not** put important work here. This branch is intended to be -force-pushed by any collaborator. If you ever want to deploy a version in a production-like environment, feel free to -do - -> git checkout experimental -> -> git reset --hard -> -> git push -f - -If you are not a collaborator, feel free to open a pull-request on experimental with a note, that you are aware of this -policy and would just like to try out a change. +> [!tip] +> Check out our [**Wiki**](https://github.com/MaMpf-HD/mampf/wiki) if you are a new MaMpf developer and want to get started with setting up your own local Docker instance and get to know our development workflow and the code structure. diff --git a/Gemfile b/Gemfile index 88a53f4e6..182d74061 100644 --- a/Gemfile +++ b/Gemfile @@ -1,144 +1,103 @@ source "https://rubygems.org" -git_source(:github) { |repo| "https://github.com/#{repo}.git" } +# We only pin versions to specific Git commits when they are "problem childs" +# and we want to review each commit before updating to the latest version. ruby "3.1.4" -# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem "rails", "~> 7.1.3" -# Use dalli for caching to memcached in production -gem "dalli", ">= 2.7" -# Ruby wrapper for UglifyJS JavaScript compressor -gem "terser" -# Use nulldb adapter for assets precompilation in production -gem "activerecord-nulldb-adapter" -# Use sqlite3 as the database for Active Record -gem "sqlite3", "~> 1.4" -# Use Puma as the app server -gem "puma", "< 7" -# Use SCSS for stylesheets -gem "sass-rails", ">= 6" -# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker -# gem 'webpacker', '~> 4.0' -# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks -gem "turbolinks", "~> 5" -# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem "jbuilder" -# Use Redis adapter to run Action Cable in production -# gem 'redis', '~> 4.0' -# Use Active Model has_secure_password -# gem 'bcrypt', '~> 3.1.7' - -# Use Active Storage variant -# gem 'image_processing', '~> 1.2' - -# Reduces boot times through caching; required in config/boot.rb -gem "active_model_serializers" -gem "bootsnap", ">= 1.4.2", require: false -gem "rack", "<3" -# Use CoffeeScript for .coffee assets and views -gem "coffee-rails", "~> 5.0.0" - -# Use Redis adapter to run Action Cable in production -# gem 'redis', '~> 3.0' -gem "fastimage" -gem "image_processing" -gem "mini_magick" -gem "pdf-reader" -gem "shrine" -gem "streamio-ffmpeg" -# Use ActiveModel has_secure_password -# gem 'bcrypt', '~> 3.1.7' -gem "filesize" -# Use Capistrano for deployment -# gem 'capistrano-rails', group: :development -gem "activerecord-import", - git: "https://github.com/zdennis/activerecord-import.git", - branch: "master" -gem "acts_as_list" -gem "acts_as_tree" -gem "acts_as_votable" -gem "barby" -gem "bootstrap", "~>5" -gem "bootstrap_form" -gem "cancancan" -gem "clipboard-rails" -gem "commontator" -gem "coveralls", require: false -gem "devise" -gem "devise-bootstrap-views" -gem "erubis" -gem "exception_handler", "~> 0.8.0.0" -gem "faraday", "~> 1.8" -gem "fuzzy-string-match" -gem "jquery-rails" -gem "jquery-ui-rails" +gem "active_model_serializers", "~> 0.10" +gem "activerecord-import", "~>1.7" +gem "activerecord-nulldb-adapter", "~> 1.0" # for assets precompilation in production +gem "acts_as_list", "~> 1.2" +gem "acts_as_tree", "~> 2.9" +gem "acts_as_votable", "~> 0.14" +gem "barby", "~> 0.6" +gem "bootsnap", "~> 1.18", require: false # reduces boot times through caching +gem "bootstrap", "~>5.3" +gem "bootstrap_form", "~> 5.4" +gem "cancancan", "~> 3.6" +gem "clipboard-rails", "~> 1.7" +gem "coffee-rails", "~> 5.0" # CoffeeScript for .coffee assets and views +gem "commontator", "~> 7.0.1" +gem "coveralls", "~> 0.7", require: false +gem "dalli", "~> 3.2" # caching to memcached in production +gem "devise", "~> 4.9" +gem "devise-bootstrap-views", "~> 1.1" +gem "erubis", "~> 2.7" +gem "exception_handler", "~> 0.8.0.0", "~> 0.8.0" +gem "faraday", "~> 1.8", "~> 1.10" +gem "fastimage", "~> 2.3" +gem "filesize", "~> 0.2" +gem "fuzzy-string-match", "~> 1.0" +gem "image_processing", "~> 1.13" +gem "jbuilder", "~> 2.12" # build JSON APIs easily +gem "jquery-rails", "~> 4.6" +gem "jquery-ui-rails", "~> 7.0" gem "js-routes", "1.4.9" -gem "kaminari" -gem "kaminari-i18n" -gem "kramdown-parser-gfm" -gem "mobility" -gem "net-smtp" -gem "pg" -gem "premailer-rails" -gem "progress_bar" -gem "rails-i18n" -gem "responders" -gem "rgl" -gem "rqrcode" -gem "rubyzip", "~> 2.3.0" -gem "sidekiq" -gem "sidekiq-cron", "~> 1.1" -gem "sprockets-rails", - git: "https://github.com/rails/sprockets-rails", - branch: "master" -gem "sunspot_rails", - github: "sunspot/sunspot", - glob: "sunspot_rails/*.gemspec" -gem "sunspot_solr" +gem "kaminari", "~> 1.2" +gem "kaminari-i18n", "~> 0.5" +gem "kramdown-parser-gfm", "~> 1.1" +gem "mini_magick", "~> 4.13" +gem "mobility", "~> 1.2" +gem "net-smtp", "~> 0.5" +gem "pdf-reader", "~> 2.12" +gem "pg", "~> 1.5" +gem "premailer-rails", "~> 1.12" +gem "progress_bar", "~> 1.3" +gem "prometheus_exporter", "~> 2.1" +gem "puma", "~> 6.4" # app server +gem "rack", "~> 2.2" +gem "rails", "~> 7.1.3" +gem "rails-i18n", "~> 7.0" +gem "responders", "~> 3.1" +gem "rgl", "~> 0.6" +gem "rqrcode", "~> 2.2" +gem "rubyzip", "~> 2.3" +gem "sass-rails", "~> 6.0" # SCSS for stylesheets +gem "shrine", "~> 3.6" +gem "sidekiq", "~> 7.3" +gem "sidekiq-cron", "~> 1.12" +gem "sprockets-rails", "~>3.5" +gem "streamio-ffmpeg", "~> 3.0" +gem "sunspot_rails", "~> 2.7" +gem "sunspot_solr", "~> 2.7" +gem "terser", "~> 1.2" # Ruby wrapper for UglifyJS JavaScript compressor gem "thredded", git: "https://github.com/thredded/thredded.git", ref: "1340e913affd1af5fcc060fbccd271184ece9a6a" gem "thredded-markdown_katex", git: "https://github.com/thredded/thredded-markdown_katex.git", - branch: "main" -gem "trix-rails", require: "trix" -gem "webpacker", "~> 5.x" + ref: "e2830bdb40880018a0e59d2b82c94b0a9f237365" +gem "trix-rails", "~> 2.4", require: "trix" +gem "turbolinks", "~> 5.2" # make navigating the app faster +gem "webpacker", "~> 5.4" group :development, :docker_development do gem "listen", "~> 3.9" - gem "rails-erd" - # Access an interactive console on exception pages or by calling 'console' anywhere in the code. - gem "web-console", ">= 3.3.0" - # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring - gem "marcel" - gem "pgreset" - gem "rubocop", "~> 1.63", require: false + gem "marcel", "~> 1.0" + gem "pgreset", "~> 0.4" + gem "rails-erd", "~> 1.7" + gem "rubocop", "~> 1.65", require: false gem "rubocop-performance", "~> 1.21", require: false gem "rubocop-rails", "~> 2.24", require: false - gem "spring" - gem "spring-watcher-listen", "~> 2.0.0" - # gem 'bullet' + gem "spring", "~> 2.1" # app preloader, keeps app running in background for development + gem "spring-watcher-listen", "~> 2.0" + gem "web-console", "~> 4.2" # interactive console on exception pages end group :test do - # Adds support for Capybara system testing and selenium driver - gem "selenium-webdriver" - # Easy installation and use of web drivers to run system tests with browsers - gem "database_cleaner-active_record" - gem "faker" - gem "launchy" - gem "simplecov", require: false - gem "webdrivers" + gem "database_cleaner-active_record", "~> 2.2" # clean up database between tests + gem "faker", "~> 3.4" + gem "launchy", "~> 3.0" + gem "selenium-webdriver", "~> 4.10.0" # support for Capybara system testing and selenium driver + gem "simplecov", "~> 0.22", require: false + gem "timecop", "~> 0.9.10" + gem "webdrivers", "~> 5.3" end group :test, :development, :docker_development do # Call 'byebug' anywhere in the code to stop execution and get a debugger console - gem "byebug", platforms: [:mri, :mingw, :x64_mingw] - gem "factory_bot_rails" - gem "rspec-rails" - - gem "simplecov-cobertura" - - gem "rspec-github" + gem "byebug", "~> 11.1", platforms: [:mri, :mingw, :x64_mingw] + gem "factory_bot_rails", "~> 6.4" + gem "rspec-github", "~> 2.4" + gem "rspec-rails", "~> 6.1" + gem "simplecov-cobertura", "~> 2.1" end - -gem "prometheus_exporter" diff --git a/Gemfile.lock b/Gemfile.lock index 9cd99b59f..4bd07aa0e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,26 +1,7 @@ -GIT - remote: https://github.com/rails/sprockets-rails - revision: 2c04236faaacd021b7810289cbac93e962ff14da - branch: master - specs: - sprockets-rails (3.5.2) - actionpack (>= 6.1) - activesupport (>= 6.1) - sprockets (>= 3.0.0) - -GIT - remote: https://github.com/sunspot/sunspot.git - revision: 2cb3e49c6e9c8ec23b8d95f9dcf2d28d1248d61b - glob: sunspot_rails/*.gemspec - specs: - sunspot_rails (2.7.1) - rails (>= 5) - sunspot (= 2.7.1) - GIT remote: https://github.com/thredded/thredded-markdown_katex.git revision: e2830bdb40880018a0e59d2b82c94b0a9f237365 - branch: main + ref: e2830bdb40880018a0e59d2b82c94b0a9f237365 specs: thredded-markdown_katex (1.0.0) katex (>= 0.4.3) @@ -53,50 +34,42 @@ GIT sprockets-es6 timeago_js (>= 3.0.2.2) -GIT - remote: https://github.com/zdennis/activerecord-import.git - revision: fca8b823ae695b03714837cc6603f51525c60505 - branch: master - specs: - activerecord-import (1.7.0) - activerecord (>= 4.2) - GEM remote: https://rubygems.org/ specs: - Ascii85 (1.1.1) + Ascii85 (2.0.1) RubyInline (3.14.1) ZenTest (~> 4.3) ZenTest (4.12.2) - actioncable (7.1.3.4) - actionpack (= 7.1.3.4) - activesupport (= 7.1.3.4) + actioncable (7.1.5) + actionpack (= 7.1.5) + activesupport (= 7.1.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.3.4) - actionpack (= 7.1.3.4) - activejob (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) + actionmailbox (7.1.5) + actionpack (= 7.1.5) + activejob (= 7.1.5) + activerecord (= 7.1.5) + activestorage (= 7.1.5) + activesupport (= 7.1.5) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.3.4) - actionpack (= 7.1.3.4) - actionview (= 7.1.3.4) - activejob (= 7.1.3.4) - activesupport (= 7.1.3.4) + actionmailer (7.1.5) + actionpack (= 7.1.5) + actionview (= 7.1.5) + activejob (= 7.1.5) + activesupport (= 7.1.5) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.3.4) - actionview (= 7.1.3.4) - activesupport (= 7.1.3.4) + actionpack (7.1.5) + actionview (= 7.1.5) + activesupport (= 7.1.5) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -104,54 +77,59 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.3.4) - actionpack (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) + actiontext (7.1.5) + actionpack (= 7.1.5) + activerecord (= 7.1.5) + activestorage (= 7.1.5) + activesupport (= 7.1.5) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3.4) - activesupport (= 7.1.3.4) + actionview (7.1.5) + activesupport (= 7.1.5) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - active_model_serializers (0.10.14) + active_model_serializers (0.10.15) actionpack (>= 4.1) activemodel (>= 4.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) active_record_union (1.3.0) activerecord (>= 4.0) - activejob (7.1.3.4) - activesupport (= 7.1.3.4) + activejob (7.1.5) + activesupport (= 7.1.5) globalid (>= 0.3.6) - activemodel (7.1.3.4) - activesupport (= 7.1.3.4) - activerecord (7.1.3.4) - activemodel (= 7.1.3.4) - activesupport (= 7.1.3.4) + activemodel (7.1.5) + activesupport (= 7.1.5) + activerecord (7.1.5) + activemodel (= 7.1.5) + activesupport (= 7.1.5) timeout (>= 0.4.0) - activerecord-nulldb-adapter (1.0.1) - activerecord (>= 5.2.0, < 7.2) - activestorage (7.1.3.4) - actionpack (= 7.1.3.4) - activejob (= 7.1.3.4) - activerecord (= 7.1.3.4) - activesupport (= 7.1.3.4) + activerecord-import (1.8.1) + activerecord (>= 4.2) + activerecord-nulldb-adapter (1.1.1) + activerecord (>= 6.0, < 8.1) + activestorage (7.1.5) + actionpack (= 7.1.5) + activejob (= 7.1.5) + activerecord (= 7.1.5) + activesupport (= 7.1.5) marcel (~> 1.0) - activesupport (7.1.3.4) + activesupport (7.1.5) base64 + benchmark (>= 0.3) bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) mutex_m + securerandom (>= 0.3) tzinfo (~> 2.0) - acts_as_list (1.2.2) + acts_as_list (1.2.4) activerecord (>= 6.1) activesupport (>= 6.1) acts_as_tree (2.9.1) @@ -167,9 +145,10 @@ GEM babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) - barby (0.6.9) + barby (0.7.0) base64 (0.2.0) bcrypt (3.1.20) + benchmark (0.4.0) bigdecimal (3.1.8) bindex (0.8.1) bootsnap (1.18.4) @@ -211,14 +190,14 @@ GEM term-ansicolor thor crass (1.0.6) - css_parser (1.17.1) + css_parser (1.19.1) addressable dalli (3.2.8) database_cleaner-active_record (2.2.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - date (3.3.4) + date (3.4.0) db_text_search (1.0.0) activerecord (>= 4.1.15) devise (4.9.4) @@ -242,15 +221,15 @@ GEM bundler rails (>= 4.2.0) responders - execjs (2.9.1) - factory_bot (6.4.6) + execjs (2.10.0) + factory_bot (6.5.0) activesupport (>= 5.0.0) - factory_bot_rails (6.4.3) - factory_bot (~> 6.4) + factory_bot_rails (6.4.4) + factory_bot (~> 6.5) railties (>= 5.0.0) - faker (3.4.2) + faker (3.5.1) i18n (>= 1.8.11, < 2) - faraday (1.10.3) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -278,7 +257,7 @@ GEM filesize (0.2.0) friendly_id (5.5.1) activerecord (>= 4.0.0) - fugit (1.11.0) + fugit (1.11.1) et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) fuzzy-string-match (1.0.1) @@ -286,28 +265,28 @@ GEM globalid (1.2.1) activesupport (>= 6.1) hashery (2.1.2) - highline (3.1.0) + highline (3.1.1) reline html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) htmlentities (4.3.4) http-accept (1.7.0) - http-cookie (1.0.6) + http-cookie (1.0.7) domain_name (~> 0.5) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) image_processing (1.13.0) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) - inline_svg (1.9.0) + inline_svg (1.10.0) activesupport (>= 3.0) nokogiri (>= 1.6) io-console (0.7.2) - irb (1.14.0) + irb (1.14.1) rdoc (>= 4.0.0) reline (>= 0.4.2) - jbuilder (2.12.0) + jbuilder (2.13.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) jquery-rails (4.6.0) @@ -319,7 +298,7 @@ GEM js-routes (1.4.9) railties (>= 4) sprockets-rails - json (2.7.2) + json (2.8.2) jsonapi-renderer (0.2.2) kaminari (1.2.2) activesupport (>= 4.1.0) @@ -338,8 +317,8 @@ GEM rails katex (0.10.0) execjs (~> 2.8) - kramdown (2.4.0) - rexml + kramdown (2.5.1) + rexml (>= 3.3.9) kramdown-math-katex (1.0.1) katex (~> 0.4) kramdown (~> 2.0) @@ -352,8 +331,8 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.6.0) - loofah (2.22.0) + logger (1.6.1) + loofah (2.23.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -362,21 +341,22 @@ GEM net-pop net-smtp marcel (1.0.4) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0806) + mime-types-data (3.2024.1105) mini_magick (4.13.2) mini_mime (1.1.5) - minitest (5.24.1) - mobility (1.2.9) + minitest (5.25.2) + mobility (1.3.1) i18n (>= 0.6.10, < 2) request_store (~> 1.0) - msgpack (1.7.2) + msgpack (1.7.5) multi_json (1.15.0) multipart-post (2.4.1) mustache (1.1.1) - mutex_m (0.2.0) - net-imap (0.4.14) + mutex_m (0.3.0) + net-imap (0.5.1) date net-protocol net-pop (0.1.2) @@ -386,7 +366,7 @@ GEM net-smtp (0.5.0) net-protocol netrc (0.11.0) - nio4r (2.7.3) + nio4r (2.7.4) nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) onebox (2.2.19) @@ -399,23 +379,23 @@ GEM options (2.3.2) orm_adapter (0.5.0) pairing_heap (3.1.0) - parallel (1.26.2) - parser (3.3.4.2) + parallel (1.26.3) + parser (3.3.6.0) ast (~> 2.4.1) racc - pdf-reader (2.12.0) - Ascii85 (~> 1.0) + pdf-reader (2.13.0) + Ascii85 (>= 1.0, < 3.0, != 2.0.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.5.7) + pg (1.5.9) pgreset (0.4) popper_js (2.11.8) pr_geohash (1.0.0) - premailer (1.23.0) + premailer (1.27.0) addressable - css_parser (>= 1.12.0) + css_parser (>= 1.19.0) htmlentities (>= 4.0.0) premailer-rails (1.12.0) actionmailer (>= 3) @@ -426,39 +406,39 @@ GEM options (~> 2.3.0) prometheus_exporter (2.1.1) webrick - psych (5.1.2) + psych (5.2.0) stringio public_suffix (6.0.1) - puma (6.4.2) + puma (6.5.0) nio4r (~> 2.0) - pundit (2.3.2) + pundit (2.4.0) activesupport (>= 3.0.0) raabro (1.4.0) racc (1.8.1) - rack (2.2.9) + rack (2.2.10) rack-proxy (0.7.7) rack rack-session (1.0.2) rack (< 3) rack-test (2.1.0) rack (>= 1.3) - rackup (1.0.0) + rackup (1.0.1) rack (< 3) webrick - rails (7.1.3.4) - actioncable (= 7.1.3.4) - actionmailbox (= 7.1.3.4) - actionmailer (= 7.1.3.4) - actionpack (= 7.1.3.4) - actiontext (= 7.1.3.4) - actionview (= 7.1.3.4) - activejob (= 7.1.3.4) - activemodel (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) + rails (7.1.5) + actioncable (= 7.1.5) + actionmailbox (= 7.1.5) + actionmailer (= 7.1.5) + actionpack (= 7.1.5) + actiontext (= 7.1.5) + actionview (= 7.1.5) + activejob (= 7.1.5) + activemodel (= 7.1.5) + activerecord (= 7.1.5) + activestorage (= 7.1.5) + activesupport (= 7.1.5) bundler (>= 1.15.0) - railties (= 7.1.3.4) + railties (= 7.1.5) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -471,14 +451,14 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - rails-i18n (7.0.9) + rails-i18n (7.0.10) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) rails_gravatar (1.0.4) actionview - railties (7.1.3.4) - actionpack (= 7.1.3.4) - activesupport (= 7.1.3.4) + railties (7.1.5) + actionpack (= 7.1.5) + activesupport (= 7.1.5) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -489,12 +469,12 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rdoc (6.7.0) + rdoc (6.8.1) psych (>= 4.0.0) redis-client (0.22.2) connection_pool - regexp_parser (2.9.2) - reline (0.5.9) + regexp_parser (2.9.3) + reline (0.5.12) io-console (~> 0.5) request_store (1.7.0) rack (>= 1.4) @@ -506,8 +486,7 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.3.5) - strscan + rexml (3.3.9) rgl (0.6.6) pairing_heap (>= 0.3, < 4.0) rexml (~> 3.2, >= 3.2.4) @@ -520,17 +499,17 @@ GEM rsolr (2.6.0) builder (>= 2.1.2) faraday (>= 0.9, < 3, != 2.0.0) - rspec-core (3.13.0) + rspec-core (3.13.2) rspec-support (~> 3.13.0) - rspec-expectations (3.13.1) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-github (2.4.0) rspec-core (~> 3.0) - rspec-mocks (3.13.1) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (6.1.3) + rspec-rails (6.1.5) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) @@ -539,26 +518,25 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.65.1) + rubocop (1.69.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.4, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.31.1, < 2.0) + rubocop-ast (>= 1.36.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.32.0) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.36.2) parser (>= 3.3.1.0) - rubocop-performance (1.21.1) + rubocop-performance (1.23.0) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.25.1) + rubocop-rails (2.27.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) + rubocop (>= 1.52.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-graphviz (1.2.5) rexml @@ -569,7 +547,7 @@ GEM logger ruby2_keywords (0.0.5) rubyzip (2.3.2) - sanitize (6.1.2) + sanitize (6.1.3) crass (~> 1.0.2) nokogiri (>= 1.12.0) sass-rails (6.0.0) @@ -582,16 +560,16 @@ GEM sprockets (> 3.0) sprockets-rails tilt + securerandom (0.3.2) selenium-webdriver (4.10.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semantic_range (3.0.0) + semantic_range (3.1.0) shrine (3.6.0) content_disposition (~> 1.0) down (~> 5.1) - sidekiq (7.3.0) - concurrent-ruby (< 2) + sidekiq (7.3.6) connection_pool (>= 2.3.0) logger rack (>= 2.2.4) @@ -607,7 +585,7 @@ GEM simplecov-cobertura (2.1.0) rexml simplecov (~> 0.19) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) spring (2.1.1) spring-watcher-listen (2.0.1) @@ -620,27 +598,33 @@ GEM babel-source (>= 5.8.11) babel-transpiler sprockets (>= 3.0.0) - sqlite3 (1.7.3-x86_64-linux) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) + sprockets (>= 3.0.0) stream (0.5.5) streamio-ffmpeg (3.0.2) multi_json (~> 1.8) - stringio (3.1.1) - strscan (3.1.0) + stringio (3.1.2) sunspot (2.7.1) bigdecimal pr_geohash (~> 1.0) rsolr (>= 1.1.1, < 3) + sunspot_rails (2.7.1) + rails (>= 5) + sunspot (= 2.7.1) sunspot_solr (2.7.1) sync (0.5.0) term-ansicolor (1.11.2) tins (~> 1.0) - terser (1.2.3) + terser (1.2.4) execjs (>= 0.3.0, < 3) - thor (1.3.1) + thor (1.3.2) tilt (2.4.0) timeago_js (3.0.2.2) - timeout (0.4.1) - tins (1.33.0) + timecop (0.9.10) + timeout (0.4.2) + tins (1.37.0) bigdecimal sync trix-rails (2.4.0) @@ -652,7 +636,9 @@ GEM turbolinks-source (5.2.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) + unicode-display_width (3.1.2) + unicode-emoji (~> 4.0, >= 4.0.4) + unicode-emoji (4.0.4) warden (1.2.9) rack (>= 2.0.9) web-console (4.2.1) @@ -669,105 +655,105 @@ GEM rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) - webrick (1.8.1) + webrick (1.9.0) websocket (1.2.11) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) will_paginate (4.0.1) - zeitwerk (2.6.17) + zeitwerk (2.6.18) PLATFORMS x86_64-linux DEPENDENCIES - active_model_serializers - activerecord-import! - activerecord-nulldb-adapter - acts_as_list - acts_as_tree - acts_as_votable - barby - bootsnap (>= 1.4.2) - bootstrap (~> 5) - bootstrap_form - byebug - cancancan - clipboard-rails - coffee-rails (~> 5.0.0) - commontator - coveralls - dalli (>= 2.7) - database_cleaner-active_record - devise - devise-bootstrap-views - erubis - exception_handler (~> 0.8.0.0) - factory_bot_rails - faker - faraday (~> 1.8) - fastimage - filesize - fuzzy-string-match - image_processing - jbuilder - jquery-rails - jquery-ui-rails + active_model_serializers (~> 0.10) + activerecord-import (~> 1.7) + activerecord-nulldb-adapter (~> 1.0) + acts_as_list (~> 1.2) + acts_as_tree (~> 2.9) + acts_as_votable (~> 0.14) + barby (~> 0.6) + bootsnap (~> 1.18) + bootstrap (~> 5.3) + bootstrap_form (~> 5.4) + byebug (~> 11.1) + cancancan (~> 3.6) + clipboard-rails (~> 1.7) + coffee-rails (~> 5.0) + commontator (~> 7.0.1) + coveralls (~> 0.7) + dalli (~> 3.2) + database_cleaner-active_record (~> 2.2) + devise (~> 4.9) + devise-bootstrap-views (~> 1.1) + erubis (~> 2.7) + exception_handler (~> 0.8.0.0, ~> 0.8.0) + factory_bot_rails (~> 6.4) + faker (~> 3.4) + faraday (~> 1.8, ~> 1.10) + fastimage (~> 2.3) + filesize (~> 0.2) + fuzzy-string-match (~> 1.0) + image_processing (~> 1.13) + jbuilder (~> 2.12) + jquery-rails (~> 4.6) + jquery-ui-rails (~> 7.0) js-routes (= 1.4.9) - kaminari - kaminari-i18n - kramdown-parser-gfm - launchy + kaminari (~> 1.2) + kaminari-i18n (~> 0.5) + kramdown-parser-gfm (~> 1.1) + launchy (~> 3.0) listen (~> 3.9) - marcel - mini_magick - mobility - net-smtp - pdf-reader - pg - pgreset - premailer-rails - progress_bar - prometheus_exporter - puma (< 7) - rack (< 3) + marcel (~> 1.0) + mini_magick (~> 4.13) + mobility (~> 1.2) + net-smtp (~> 0.5) + pdf-reader (~> 2.12) + pg (~> 1.5) + pgreset (~> 0.4) + premailer-rails (~> 1.12) + progress_bar (~> 1.3) + prometheus_exporter (~> 2.1) + puma (~> 6.4) + rack (~> 2.2) rails (~> 7.1.3) - rails-erd - rails-i18n - responders - rgl - rqrcode - rspec-github - rspec-rails - rubocop (~> 1.63) + rails-erd (~> 1.7) + rails-i18n (~> 7.0) + responders (~> 3.1) + rgl (~> 0.6) + rqrcode (~> 2.2) + rspec-github (~> 2.4) + rspec-rails (~> 6.1) + rubocop (~> 1.65) rubocop-performance (~> 1.21) rubocop-rails (~> 2.24) - rubyzip (~> 2.3.0) - sass-rails (>= 6) - selenium-webdriver - shrine - sidekiq - sidekiq-cron (~> 1.1) - simplecov - simplecov-cobertura - spring - spring-watcher-listen (~> 2.0.0) - sprockets-rails! - sqlite3 (~> 1.4) - streamio-ffmpeg - sunspot_rails! - sunspot_solr - terser + rubyzip (~> 2.3) + sass-rails (~> 6.0) + selenium-webdriver (~> 4.10.0) + shrine (~> 3.6) + sidekiq (~> 7.3) + sidekiq-cron (~> 1.12) + simplecov (~> 0.22) + simplecov-cobertura (~> 2.1) + spring (~> 2.1) + spring-watcher-listen (~> 2.0) + sprockets-rails (~> 3.5) + streamio-ffmpeg (~> 3.0) + sunspot_rails (~> 2.7) + sunspot_solr (~> 2.7) + terser (~> 1.2) thredded! thredded-markdown_katex! - trix-rails - turbolinks (~> 5) - web-console (>= 3.3.0) - webdrivers - webpacker (~> 5.x) + timecop (~> 0.9.10) + trix-rails (~> 2.4) + turbolinks (~> 5.2) + web-console (~> 4.2) + webdrivers (~> 5.3) + webpacker (~> 5.4) RUBY VERSION ruby 3.1.4p223 BUNDLED WITH - 2.5.9 + 2.5.17 diff --git a/LICENSE b/LICENSE index 8e20f5503..5e079cec0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 Denis Vogel +Copyright (c) 2017-2024 Denis Vogel & Contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/SECURITY.md b/SECURITY.md index 7162e6d8c..8db2e865a 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,12 +1,8 @@ # Security Policy -## Supported Versions +> [!warning] +> MaMpf is continuously deployed, so users will always get to work with the newest version.
That's why we will only release patches for the `main` branch. -We only release patches for the production branch. - -## Reporting a Vulnerability - -Please report (suspected) security vulnerabilities to -mampf-security@mathi.uni-heidelberg.de. You will receive a response from us -within 48 hours. If the issue is confirmed, we will release a patch as soon -as possible depending on complexity but usually within a few days. +- We are very grateful for any reports of security vulnerabilities in MaMpf. We take security very seriously and will respond to verified reports as soon as possible. +- Please don't report vulnerabilities in the public GitHub issue tracker. Instead, [**report them here privately on GitHub**](https://github.com/MaMpf-HD/mampf/security) and do NOT disclose them publicly until we have had a chance to address them. +- Note that we don't give out bounties for security vulnerabilities. We are a non-profit project and don't have the resources to pay for security reports. We are grateful for any reports and will acknowledge them in our release notes. diff --git a/app/abilities/user_ability.rb b/app/abilities/user_ability.rb index 3cfabfd8a..725d2d52b 100644 --- a/app/abilities/user_ability.rb +++ b/app/abilities/user_ability.rb @@ -14,11 +14,7 @@ def initialize(user) user.admin? || (!user.generic? && user == given_user) end - can :fill_user_select, User do - user.active_teachable_editor? - end - - can :list_generic_users, User do + can [:fill_user_select, :list_generic_users], User do user.admin? end end diff --git a/app/abilities/voucher_ability.rb b/app/abilities/voucher_ability.rb new file mode 100644 index 000000000..9f491d4d4 --- /dev/null +++ b/app/abilities/voucher_ability.rb @@ -0,0 +1,13 @@ +class VoucherAbility + include CanCan::Ability + + def initialize(user) + clear_aliased_actions + + can [:create, :invalidate], Voucher do |voucher| + user.can_update_personell?(voucher.lecture) + end + + can [:verify, :redeem, :cancel], Voucher + end +end diff --git a/app/assets/images/voronoi_pattern.svg b/app/assets/images/voronoi_pattern.svg new file mode 100644 index 000000000..e2b2e05cf --- /dev/null +++ b/app/assets/images/voronoi_pattern.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/app/assets/javascripts/_selectize_turbolinks_fix.js b/app/assets/javascripts/_selectize_turbolinks_fix.js index dfe418cf2..f8ac4666c 100644 --- a/app/assets/javascripts/_selectize_turbolinks_fix.js +++ b/app/assets/javascripts/_selectize_turbolinks_fix.js @@ -127,9 +127,21 @@ function fillOptionsByAjax($selectizedSelection) { })(); } else { + let renderOptions = {}; + + let noResultsMessage = this.dataset.noResults; + if (noResultsMessage) { + renderOptions = { + no_results: function (_data, _escape) { + return '
' + noResultsMessage + "
"; + }, + }; + } + return new TomSelect("#" + this.id, { plugins: plugins, maxOptions: null, + render: renderOptions, }); } }); diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b6faa2615..55a32e06e 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -27,6 +27,7 @@ //= require bootstrap_popovers //= require chapters //= require clickers +//= require copy_and_paste_button //= require courses //= require erdbeere //= require file_upload @@ -38,7 +39,6 @@ //= require masonry_grid //= require media //= require notifications -//= require profile //= require questions //= require quizzes //= require referrals diff --git a/app/assets/javascripts/copy_and_paste_button.js b/app/assets/javascripts/copy_and_paste_button.js new file mode 100644 index 000000000..fe0e41bc3 --- /dev/null +++ b/app/assets/javascripts/copy_and_paste_button.js @@ -0,0 +1,32 @@ +$(document).on("turbolinks:load", function () { + // TODO: this is using clipboard.js, which makes use of deprecated browser APIs + // see issue #684 + new Clipboard(".clipboard-btn"); + + $(document).on("click", ".clipboard-button", function () { + $(".token-clipboard-popup").removeClass("show"); + + let dataId = $(this).data("id"); + let popup; + if (dataId) { + popup = `.token-clipboard-popup[data-id="${$(this).data("id")}"]`; + } + else { + // This is a workaround for the transition to the new ClipboardAPI + // as intermediate solution that respects that the whole button should + // be clickable, not just the icon itself. + // See app/views/vouchers/_voucher.html.erb as an example. + popup = $(this).find(".token-clipboard-popup"); + } + + $(popup).addClass("show"); + setTimeout(() => { + $(popup).removeClass("show"); + }, 1700); + }); +}); + +// clean up for turbolinks +$(document).on("turbolinks:before-cache", function () { + $(document).off("click", ".clipboard-button"); +}); diff --git a/app/assets/javascripts/profile.coffee b/app/assets/javascripts/profile.coffee deleted file mode 100644 index 922b15b38..000000000 --- a/app/assets/javascripts/profile.coffee +++ /dev/null @@ -1,37 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ - -$(document).on 'turbolinks:load', -> - - $('#profileForm').on 'change', -> - console.log 'Änderung' - $('#profileChange').show() - return - - $('input:checkbox[name^="user[lecture"]').on 'change', -> - courseId = this.dataset.course - lectureId = this.dataset.lecture - checkedCount = $('input:checked[data-course="'+courseId+'"]').length - authRequiredLectureIds = $('#lectures-for-course-' + courseId).data('authorize') - if $(this).prop('checked') and parseInt(lectureId) in authRequiredLectureIds - $('#pass-lecture-' + lectureId).show() - else - $('#pass-lecture-' + lectureId).hide() - if checkedCount == 0 - $('.courseSubInfo[data-course="'+courseId+'"]').removeClass('fas fa-check-circle') - .addClass('far fa-circle') - else - $('.courseSubInfo[data-course="'+courseId+'"]').removeClass('far fa-circle') - .addClass('fas fa-check-circle') - return - - $('.programCollapse').on 'show.bs.collapse', -> - program = $(this).data('program') - $('#program-' + program + '-collapse').find('.coursePlaceholder').each -> - course = $(this).data('course') - $(this).append($('#course-card-' + course)) - $('#course-card-' + course).show() - return - - return \ No newline at end of file diff --git a/app/assets/javascripts/profile.js b/app/assets/javascripts/profile.js new file mode 100644 index 000000000..d02c5d378 --- /dev/null +++ b/app/assets/javascripts/profile.js @@ -0,0 +1,42 @@ +$(document).ready(function () { + $("#profileForm").on("change input", function () { + $("#profileChange").removeClass("d-none"); + $("#profileChangeBottom").removeClass("d-none"); + }); + + $('input:checkbox[name^="user[lecture"]').on("change", function () { + const courseId = this.dataset.course; + const lectureId = this.dataset.lecture; + const checkedCount = $('input:checked[data-course="' + courseId + '"]').length; + const authRequiredLectureIds = $("#lectures-for-course-" + courseId).data("authorize"); + + if ($(this).prop("checked") && authRequiredLectureIds.includes(parseInt(lectureId))) { + $("#pass-lecture-" + lectureId).show(); + } + else { + $("#pass-lecture-" + lectureId).hide(); + if (checkedCount === 0) { + $('.courseSubInfo[data-course="' + courseId + '"]').removeClass("fas fa-check-circle") + .addClass("far fa-circle"); + } + else { + $('.courseSubInfo[data-course="' + courseId + '"]').removeClass("far fa-circle") + .addClass("fas fa-check-circle"); + } + } + }); + + $(".programCollapse").on("show.bs.collapse", function () { + const program = $(this).data("program"); + $("#program-" + program + "-collapse").find(".coursePlaceholder").each(function () { + const course = $(this).data("course"); + $(this).append($("#course-card-" + course)); + $("#course-card-" + course).show(); + }); + }); + + $("#request-data-btn").on("click", function () { + const toast = $("#request-data-toast"); + bootstrap.Toast.getOrCreateInstance(toast).show(); + }); +}); diff --git a/app/assets/javascripts/submissions.coffee b/app/assets/javascripts/submissions.coffee index 3224b5669..cf4d9c990 100644 --- a/app/assets/javascripts/submissions.coffee +++ b/app/assets/javascripts/submissions.coffee @@ -1,5 +1,4 @@ $(document).on 'turbolinks:load', -> - clipboard = new Clipboard('.clipboard-btn') $(document).on 'click', '#removeUserManuscript', -> $('#userManuscriptMetadata').hide() @@ -9,20 +8,9 @@ $(document).on 'turbolinks:load', -> $('#submission_detach_user_manuscript').val('true') return - $(document).on 'click', '.clipboard-button', -> - $('.token-clipboard-popup').removeClass('show') - id = $(this).data('id') - $('.token-clipboard-popup[data-id="'+id+'"]').addClass('show') - restoreClipboardButton = -> - $('.token-clipboard-popup[data-id="'+id+'"]').removeClass('show') - return - setTimeout(restoreClipboardButton, 1500) - return - return # clean up for turbolinks $(document).on 'turbolinks:before-cache', -> $(document).off 'click', '#removeUserManuscript' - $(document).off 'click', '.clipboard-button' return \ No newline at end of file diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 7a69c64f8..eaa73aa06 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -194,10 +194,6 @@ $modal-xxl: 1600px !default; overflow-y: scroll; } -#profileChange { - display: none; -} - .revertCommontator { all: unset; } diff --git a/app/assets/stylesheets/lectures.scss b/app/assets/stylesheets/lectures.scss index be454a4d7..1476a1c4b 100644 --- a/app/assets/stylesheets/lectures.scss +++ b/app/assets/stylesheets/lectures.scss @@ -123,6 +123,16 @@ h3.lecture-pane-header { font-size: 1.3em; } +h4.lecture-pane-subheader { + color: #838383; + font-size: 1.1em; +} + +.voucher-card { + border: gray 1px solid; + border-radius: 0.4em; +} + #announcements-list { max-height: 17em; overflow-x: hidden; diff --git a/app/assets/stylesheets/profile.scss b/app/assets/stylesheets/profile.scss new file mode 100644 index 000000000..f1a4597d5 --- /dev/null +++ b/app/assets/stylesheets/profile.scss @@ -0,0 +1,53 @@ +@import "bootstrap/functions"; +@import "bootstrap/variables"; +@import "bootstrap/mixins"; + +.voucher-redemption-pattern { + background-image: image-url('voronoi_pattern.svg'); + background-position: center; + background-size: 110%; + background-color: #FFFFFF; + height: 3em; + + border-top-left-radius: calc(#{$card-inner-border-radius} - 2px); + border-top-right-radius: calc(#{$card-inner-border-radius} - 2px); +} + +.profile-card { + height: 100%; + border: 2px solid #223e62; + + background: linear-gradient(348deg, #f7faff 0%, #fcfdfd 60%); + box-shadow: rgba(0, 0, 0, 0.25) 0px 1px 3px; + + .card-header { + background-color: #223e62; + color: white; + + // account for our custom border + border-top-left-radius: calc(#{$card-inner-border-radius} - 2px); + border-top-right-radius: calc(#{$card-inner-border-radius} - 2px); + } +} + +@include media-breakpoint-up(sm) { + .voucher-card { + min-width: 30em; + } +} + +// needed because of https://github.com/bootstrap-ruby/bootstrap_form/issues/738 +// and https://github.com/bootstrap-ruby/bootstrap_form/pull/618 +.checkbox-list { + margin-bottom: 0.2em !important; +} + +// Ensure equal height columns +.row.display-flex { + display: flex; + flex-wrap: wrap; +} + +.row.display-flex>[class*='col-'] { + flex-grow: 1; +} \ No newline at end of file diff --git a/app/assets/stylesheets/submissions.scss b/app/assets/stylesheets/submissions.scss index 365213740..4b06d0fd1 100644 --- a/app/assets/stylesheets/submissions.scss +++ b/app/assets/stylesheets/submissions.scss @@ -18,7 +18,7 @@ } /* The actual popup */ -.clipboardpopup .clipboardpopuptext { +.clipboardpopuptext { visibility: hidden; width: 200px; background-color: #555; diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb index 67d579757..6e6ea47b7 100644 --- a/app/controllers/annotations_controller.rb +++ b/app/controllers/annotations_controller.rb @@ -91,17 +91,8 @@ def destroy def update_annotations medium = Medium.find_by(id: params[:mediumId]) - # Get the right annotations - annotations = if medium.annotations_visible?(current_user) - Annotation.where(medium: medium, - visible_for_teacher: true).or( - Annotation.where(medium: medium, - user: current_user) - ) - else - Annotation.where(medium: medium, - user: current_user) - end + annotations = Annotation.where(medium: medium, visible_for_teacher: true) + .or(Annotation.where(medium: medium, user: current_user)) # If annotation is associated to a comment, # the field "comment" is empty -> get it from the commontator comment diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0a5a60683..dfe2dbb0f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -8,6 +8,7 @@ class ApplicationController < ActionController::Base before_action :authenticate_user! before_action :set_locale after_action :store_interaction, if: :user_signed_in? + before_action :set_current_user etag { current_user.try(:id) } @@ -111,6 +112,9 @@ def store_interaction # as of Rack 2.0.8, the session_id is wrapped in a class of its own # it is not a string anymore # see https://github.com/rack/rack/issues/1433 + + return if request.session_options[:id].nil? + InteractionSaver.perform_async(request.session_options[:id].public_id, request.original_fullpath, request.referer, @@ -132,4 +136,9 @@ def cookie_locale_param def available_locales I18n.available_locales.map(&:to_s) end + + # https://stackoverflow.com/a/69313330/ + def set_current_user + Current.user = current_user + end end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/controllers/cypress/factories_controller.rb b/app/controllers/cypress/factories_controller.rb index 157e9e331..f2ced3932 100644 --- a/app/controllers/cypress/factories_controller.rb +++ b/app/controllers/cypress/factories_controller.rb @@ -5,28 +5,57 @@ module Cypress # It is inspired by this blog post by Tom Conroy: # https://tbconroy.com/2018/04/07/creating-data-with-factorybot-for-rails-cypress-tests/ class FactoriesController < CypressController - # Wrapper around FactoryBot.create to create a factory via a POST request. + # Creates an instance of the factory (via FactoryBot) and returns it as JSON. def create - unless params["0"].is_a?(String) - msg = "First argument must be a string indicating the factory name." - msg += " But we got: '#{params["0"]}'" - raise(ArgumentError, msg) - end + factory_name = validate_factory_name(params["0"]) + attributes, should_validate = params_to_attributes( + params.except(:controller, :action, :number) + ) + res = create_class_instance_via_factorybot(attributes, should_validate) + + # The factory name is included in the response such that it can be passed + # to call_instance_method later on in order to determine the class of the instance. + render json: res.as_json.merge({ factory_name: factory_name }), status: :created + end - attributes, should_validate = params_to_attributes(params.except(:controller, :action, - :number)) + # Calls the instance method on the instance created by FactoryBot.create(). + # Expects as arguments the factory name, the id of the instance, + # the method name and the method arguments to be passed to the instance method. + def call_instance_method + factory_name = validate_factory_name(params["factory_name"]).capitalize + id = params["instance_id"].to_i + method_name = params["method_name"] + method_args = params["method_args"] + method_args, _validate = params_to_attributes(method_args) if method_args.present? - res = if should_validate - FactoryBot.create(*attributes) # default case - else - FactoryBot.build(*attributes).tap { |instance| instance.save(validate: false) } + # Find the instance + begin + instance = factory_name.constantize.find(id) + rescue ActiveRecord::RecordNotFound + result = { error: "Instance where you'd like to call '#{method_name}' on was not found" } + return render json: result.to_json, status: :bad_request end - render json: res.to_json, status: :created + # Call the instance method & return the result + begin + result = instance.send(method_name, *method_args) + render json: result.to_json, status: :created + rescue NoMethodError => _e + result = { error: "Method '#{method_name}' not found on instance" } + render json: result.to_json, status: :bad_request + end end private + def validate_factory_name(factory_name) + return factory_name if factory_name.is_a?(String) + + msg = "First argument must be a string indicating the factory name." + msg += " But we got: '#{factory_name}'" + raise(ArgumentError, msg) + end + def params_to_attributes(params) should_validate = true @@ -35,7 +64,7 @@ def params_to_attributes(params) if value.key?("validate") should_validate = (value["validate"] != "false") else - value.transform_keys(&:to_sym) + transform_hash(value) end elsif value.is_a?(String) value.to_sym @@ -46,5 +75,34 @@ def params_to_attributes(params) return attributes, should_validate end + + # Converts the keys of the hash to symbols. Furthermore, if the hash + # contains nested hashes with keys that are all integers, it converts + # the nested hashes to arrays of strings. + # + # The latter is important for calls like the following in Cypress: + # FactoryBot.create("tutorial", + # { lecture_id: this.lecture.id, tutor_ids: [this.tutor1.id, this.tutor2.id] } + # ) + # Without this transformation, the create() method in this controller + # would receive [:tutorial, {"lecture_id"=>"1", "tutor_ids"=>{"0"=>"42", "1"=>"43"}}], + # whereas what we need is: [:tutorial, {"lecture_id"=>"1", "tutor_ids"=>["42", "43"]}]. + def transform_hash(value) + value.transform_keys(&:to_sym).transform_values do |v| + if v.is_a?(Hash) && v.keys.all? { |key| key.to_i.to_s } + v.values.map(&:to_s) + else + v + end + end + end + + def create_class_instance_via_factorybot(attributes, should_validate) + if should_validate + FactoryBot.create(*attributes) # default case + else + FactoryBot.build(*attributes).tap { |instance| instance.save(validate: false) } + end + end end end diff --git a/app/controllers/cypress/i18n_controller.rb b/app/controllers/cypress/i18n_controller.rb index cc3e5ec1a..cd68c4e91 100644 --- a/app/controllers/cypress/i18n_controller.rb +++ b/app/controllers/cypress/i18n_controller.rb @@ -10,16 +10,16 @@ def create substitutions = {} if params[:substitutions].present? - unless params[:substitutions].is_a?(Hash) - msg = "Argument `substitution` must be a hash indicating the substitutions." - msg += " But we got: '#{params[:substitutions]}'" + begin + substitutions = params[:substitutions].to_unsafe_hash.symbolize_keys + rescue NoMethodError + msg = "Argument `substitution` is '#{params[:substitutions]}'." + msg += " We cannot convert that to a hash." raise(ArgumentError, msg) end - substitutions = params[:substitutions].to_unsafe_hash.symbolize_keys end i18n_key = params[:i18n_key] - render json: I18n.t(i18n_key, **substitutions), status: :created end end diff --git a/app/controllers/cypress/timecop_controller.rb b/app/controllers/cypress/timecop_controller.rb new file mode 100644 index 000000000..f8378568d --- /dev/null +++ b/app/controllers/cypress/timecop_controller.rb @@ -0,0 +1,25 @@ +module Cypress + # Allows to travel to a date in the backend via Cypress tests. + + class TimecopController < CypressController + # Travels to a specific date and time. + # + # Time is passed as local time. If you want to pass a UTC time, set the + # parameter `use_utc` to true. + def travel + new_time = if params[:use_utc] == "true" + Time.utc(params[:year], params[:month], params[:day], + params[:hours], params[:minutes], params[:seconds]) + else + Time.zone.local(params[:year], params[:month], params[:day], + params[:hours], params[:minutes], params[:seconds]) + end + + render json: Timecop.travel(new_time), status: :created + end + + def reset + render json: Timecop.return, status: :created + end + end +end diff --git a/app/controllers/cypress/user_creator_controller.rb b/app/controllers/cypress/user_creator_controller.rb index f82b4dd18..29855eb03 100644 --- a/app/controllers/cypress/user_creator_controller.rb +++ b/app/controllers/cypress/user_creator_controller.rb @@ -1,6 +1,8 @@ module Cypress # Creates a user for use in Cypress tests. class UserCreatorController < CypressController + CYPRESS_PASSWORD = "cypress123".freeze + def create unless params[:role].is_a?(String) msg = "First argument must be a string indicating the user role." @@ -10,13 +12,18 @@ def create role = params[:role] is_admin = (role == "admin") + random_hash = SecureRandom.hex(6) - user = User.create(name: "#{role} Cypress", email: "#{role}@mampf.cypress", - password: "cypress123", consents: true, admin: is_admin, + user = User.create(name: "#{role} Cypress #{random_hash}", + email: "#{role}-#{random_hash}@mampf.cypress", + # Note that some Cypress tests rely on the username + # beginning with "cy" (!) + name_in_tutorials: "cy-#{role}-#{random_hash}", + password: CYPRESS_PASSWORD, consents: true, admin: is_admin, locale: I18n.default_locale) user.confirm - render json: user.to_json, status: :created + render json: user.as_json.merge({ password: CYPRESS_PASSWORD }), status: :created end end end diff --git a/app/controllers/lecture_notifier.rb b/app/controllers/lecture_notifier.rb new file mode 100644 index 000000000..a35103641 --- /dev/null +++ b/app/controllers/lecture_notifier.rb @@ -0,0 +1,45 @@ +module LectureNotifier + extend self + + def notify_new_editor_by_mail(editor, lecture) + LectureNotificationMailer.with(recipient: editor, + locale: editor.locale, + lecture: lecture) + .new_editor_email.deliver_later + end + + def notify_about_teacher_change_by_mail(lecture, previous_teacher) + notify_new_teacher_by_mail(lecture) + notify_previous_teacher_by_mail(previous_teacher, lecture) + end + + def notify_cospeakers_by_mail(speaker, talks) + talks.each do |talk| + talk.speakers.each do |cospeaker| + next if cospeaker == speaker + + LectureNotificationMailer.with(recipient: cospeaker, + locale: cospeaker.locale, + talk: talk, + speaker: speaker) + .new_speaker_email.deliver_later + end + end + end + + private + + def notify_new_teacher_by_mail(lecture) + LectureNotificationMailer.with(recipient: lecture.teacher, + locale: lecture.teacher.locale, + lecture: lecture) + .new_teacher_email.deliver_later + end + + def notify_previous_teacher_by_mail(previous_teacher, lecture) + LectureNotificationMailer.with(recipient: previous_teacher, + locale: previous_teacher.locale, + lecture: lecture) + .previous_teacher_email.deliver_later + end +end diff --git a/app/controllers/lectures_controller.rb b/app/controllers/lectures_controller.rb index 12fb42bdd..d0b3b1a48 100644 --- a/app/controllers/lectures_controller.rb +++ b/app/controllers/lectures_controller.rb @@ -66,15 +66,16 @@ def edit def create @lecture = Lecture.new(lecture_params) + @lecture.teacher = current_user unless current_user.admin? authorize! :create, @lecture @lecture.save if @lecture.valid? @lecture.update(sort: "special") if @lecture.course.term_independent # set organizational_concept to default set_organizational_defaults - # set lenguage to default language + # set language to default language set_language - # depending on where the create action was trriggered from, return + # depending on where the create action was triggered from, return # to admin index view or edit course view unless params[:lecture][:from] == "course" redirect_to administration_path, @@ -105,10 +106,7 @@ def update recipients = User.where(id: new_ids) recipients.each do |r| - NotificationMailer.with(recipient: r, - locale: r.locale, - lecture: @lecture) - .new_editor_email.deliver_later + LectureNotifier.notify_new_editor_by_mail(r, @lecture) end end @@ -336,9 +334,10 @@ def lecture_params :submission_max_team_size, :submission_grace_period, :annotations_status] if action_name == "update" && current_user.can_update_personell?(@lecture) - allowed_params.push(:teacher_id, { editor_ids: [] }) + allowed_params.push({ editor_ids: [] }) end - allowed_params.push(:course_id, :teacher_id, { editor_ids: [] }) if action_name == "create" + allowed_params.push(:course_id, { editor_ids: [] }) if action_name == "create" + allowed_params.push(:teacher_id) if current_user.admin? params.require(:lecture).permit(allowed_params) end diff --git a/app/controllers/profile_controller.rb b/app/controllers/profile_controller.rb index da24afab5..9a5722fb4 100644 --- a/app/controllers/profile_controller.rb +++ b/app/controllers/profile_controller.rb @@ -135,7 +135,6 @@ def show_accordion def request_data MathiMailer.data_request_email(current_user).deliver_later MathiMailer.data_provide_email(current_user).deliver_later - redirect_to edit_profile_path, notice: t("profile.data_request_sent") end private diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb new file mode 100644 index 000000000..e73dc38cb --- /dev/null +++ b/app/controllers/vouchers_controller.rb @@ -0,0 +1,129 @@ +class VouchersController < ApplicationController + load_and_authorize_resource + before_action :find_voucher, only: :invalidate + + def current_ability + @current_ability ||= VoucherAbility.new(current_user) + end + + def create + set_related_data + respond_to do |format| + if @voucher.save + handle_successful_save(format) + else + handle_failed_save(format) + end + end + end + + def invalidate + set_related_data + @voucher.update(invalidated_at: Time.zone.now) + respond_to do |format| + format.html { redirect_to edit_lecture_path(@lecture, anchor: "people") } + format.js + end + end + + def verify + @voucher = Voucher.find_voucher_by_hash(params[:secure_hash]) + respond_to do |format| + if @voucher + format.js + format.html { head :no_content } + else + error_message = I18n.t("controllers.voucher_invalid") + format.js { render "error", locals: { error_message: error_message } } + format.html { redirect_to edit_profile_path, alert: error_message } + end + end + end + + def redeem + voucher = Voucher.find_voucher_by_hash(params[:secure_hash]) + if voucher + voucher.redeem(params.permit(tutorial_ids: [], talk_ids: [])) + redirect_to edit_profile_path, notice: success_message(voucher) + else + handle_invalid_voucher + end + end + + def cancel + respond_to do |format| + format.html { redirect_to edit_profile_path } + format.js + end + end + + private + + def voucher_params + params.permit(:lecture_id, :role) + end + + def find_voucher + @voucher = Voucher.find_by(id: params[:id]) + return if @voucher + + handle_voucher_not_found + end + + def set_related_data + @lecture = @voucher.lecture + @role = @voucher.role + I18n.locale = @lecture.locale + end + + def success_message(voucher) + if voucher.tutor? + I18n.t("controllers.become_tutor_success") + elsif voucher.editor? + I18n.t("controllers.become_editor_success") + elsif voucher.teacher? + I18n.t("controllers.become_teacher_success") + elsif voucher.speaker? + I18n.t("controllers.become_speaker_success") + end + end + + def handle_successful_save(format) + format.html { redirect_to edit_lecture_path(@lecture, anchor: "people") } + format.js + end + + def handle_failed_save(format) + error_message = @voucher.errors.full_messages.join(", ") + format.html do + redirect_to edit_lecture_path(@lecture, anchor: "people"), + alert: error_message + end + format.js do + render "error", locals: { error_message: error_message } + end + end + + def handle_voucher_not_found + I18n.locale = current_user.locale + error_message = I18n.t("controllers.no_voucher") + respond_to do |format| + format.html do + redirect_back(alert: error_message, + fallback_location: root_path) + end + format.js do + render "error", + locals: { error_message: error_message } + end + end + end + + def handle_invalid_voucher + error_message = I18n.t("controllers.voucher_invalid") + respond_to do |format| + format.js { render "error", locals: { error_message: error_message } } + format.html { redirect_to edit_profile_path, alert: error_message } + end + end +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f267191e3..495f7a96e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -327,4 +327,10 @@ def get_class_for_any_path(paths) def get_class_for_any_path_startswith(paths) paths.any? { |path| request.path.starts_with?(path) } ? ACTIVE_CSS_CLASS : "" end + + def truncate_result(result, length = 40) + result.first(length).tap do |truncated| + return truncated.length < length ? truncated : "#{truncated}..." + end + end end diff --git a/app/helpers/lectures_helper.rb b/app/helpers/lectures_helper.rb index b7d7f739e..40bdd69b2 100644 --- a/app/helpers/lectures_helper.rb +++ b/app/helpers/lectures_helper.rb @@ -129,4 +129,84 @@ def lecture_view_icon(lecture) tag.i(class: "fas fa-eye") end end + + def editors_preselection(lecture) + options_for_select(lecture.eligible_as_editors.map do |editor| + [editor.info, editor.id] + end, lecture.editor_ids) + end + + def teacher_select(form, is_new_lecture, lecture = nil) + if current_user.admin? + label = form.label(:teacher_id, t("basics.teacher"), class: "form-label") + help_desk = helpdesk(t("admin.lecture.info.teacher"), false) + + preselection = if is_new_lecture + options_for_select([[current_user.info, current_user.id]], current_user.id) + else + options_for_select([[lecture.teacher.info, lecture.teacher.id]], lecture.teacher.id) + end + + # TODO: Rubocop bug when trying to break the last object on a new line + select = form.select(:teacher_id, preselection, {}, { class: "selectize", + multiple: true, + data: { + ajax: true, + filled: false, + model: "user", + placeholder: t("basics.enter_two_letters"), # rubocop:disable Layout/LineLength + no_results: t("basics.no_results"), + modal: true, + cy: "teacher-admin-select" + } }) + + error_div = content_tag(:div, "", class: "invalid-feedback", id: "lecture-teacher-error") + + return label + help_desk + select + error_div + end + + # Non-admin cases + if is_new_lecture + p1 = content_tag(:p) do + concat(t("basics.teacher")) + concat(helpdesk(t("admin.lecture.info.teacher_fixed_new_lecture"), false)) + end + p2 = content_tag(:p, current_user.info) + + else + p1 = content_tag(:p) do + concat(t("basics.teacher")) + concat(helpdesk(t("admin.lecture.info.teacher_fixed"), false)) + end + p2 = content_tag(:p, lecture.teacher.info, "data-cy": "teacher-info") + end + + p1 + p2 + end + + def editors_select(form, lecture) + if current_user.admin? + preselection = options_for_select(lecture.select_editors, lecture.editors.map(&:id)) + form.select(:editor_ids, preselection, {}, { + class: "selectize", + multiple: true, + data: { + ajax: true, + filled: false, + model: "user", + placeholder: t("basics.enter_two_letters"), + no_results: t("basics.no_results"), + modal: true + } + }) + else + form.select(:editor_ids, editors_preselection(lecture), {}, + class: "selectize", + multiple: true, + data: { + cy: "lecture-editors-select", + no_results: t("basics.no_results_editor") + }) + end + end end diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb index be7160ec2..6efe5a44e 100644 --- a/app/helpers/notifications_helper.rb +++ b/app/helpers/notifications_helper.rb @@ -7,6 +7,7 @@ def notification_menu_item_header(notification) return medium_notification_item_header(notifiable) if notification.medium? return course_notification_item_header(notifiable) if notification.course? return lecture_notification_item_header(notifiable) if notification.lecture? + return redemption_notification_item_header(notifiable) if notification.redemption? announcement_notification_item_header(notifiable) end @@ -17,6 +18,7 @@ def notification_menu_item_details(notification) return medium_notification_item_details(notifiable) if notification.medium? return course_notification_item_details(notifiable) if notification.course? return lecture_notification_item_details(notifiable) if notification.lecture? + return redemption_notification_item_details(notifiable) if notification.redemption? "" end @@ -26,6 +28,7 @@ def notification_color(notification) return "bg-post-it-blue" if notification.generic_announcement? return "bg-post-it-red" if notification.announcement? return "bg-post-it-orange" if notification.course? || notification.lecture? + return "bg-post-it-green" if notification.redemption? "bg-post-it-yellow" end @@ -39,6 +42,8 @@ def notification_header(notification) t("notifications.course_selection") elsif notification.lecture_announcement? announcement_notification_card_header(notifiable) + elsif notification.redemption? + redemption_notification_card_header(notifiable) else link_to(t("mampf_news.title"), news_path, class: "text-dark") end @@ -53,6 +58,8 @@ def notification_text(notification) course_notification_card_text(notifiable) elsif notification.lecture? lecture_notification_card_text(notifiable) + elsif notification.redemption? + t("notifications.redemption") else t("notifications.new_announcement") end @@ -69,6 +76,8 @@ def notification_link(notification) course_notification_card_link elsif notification.lecture? lecture_notification_card_link + elsif notification.redemption? + redemption_notification_details(notifiable) else notifiable.details end diff --git a/app/helpers/redemptions_helper.rb b/app/helpers/redemptions_helper.rb new file mode 100644 index 000000000..50cbad850 --- /dev/null +++ b/app/helpers/redemptions_helper.rb @@ -0,0 +1,102 @@ +# Redemptions Helper +module RedemptionsHelper + def redemption_notification_card_header(redemption) + link_to(redemption.voucher.lecture.title_for_viewers, + edit_lecture_path(redemption.voucher.lecture, + anchor: ("people" unless redemption.voucher.speaker?)), + class: "text-dark") + end + + def redemption_notification_item_header(redemption) + t("notifications.redemption_in_lecture", + lecture: redemption.voucher.lecture.title_for_viewers) + end + + def redemption_notification_details(redemption) + if redemption.voucher.tutor? + tutor_notification_details(redemption) + elsif redemption.voucher.editor? + editor_notification_details(redemption) + elsif redemption.voucher.teacher? + teacher_notification_details(redemption) + else + speaker_notification_details(redemption) + end + end + + def redemption_notification_item_details(redemption) + result = if redemption.voucher.tutor? + tutor_notification_item_details(redemption) + elsif redemption.voucher.editor? + editor_notification_item_details(redemption) + elsif redemption.voucher.teacher? + teacher_notification_item_details(redemption) + else + speaker_notification_item_details(redemption) + end + + truncate_result(result) + end + + private + + def tutor_notification_item_details(redemption) + tutorials = redemption.claimed_tutorials + tutorial_details = tutorials.map(&:title).join(", ") + + base_message = "#{t("basics.tutor")} #{redemption.user.tutorial_name}" + tutorials.any? ? "#{base_message}: #{tutorial_details}" : base_message + end + + def editor_notification_item_details(redemption) + "#{t("basics.editor")} #{redemption.user.tutorial_name}" + end + + def teacher_notification_item_details(redemption) + "#{t("basics.teacher")} #{redemption.user.tutorial_name}" + end + + def speaker_notification_item_details(redemption) + talks = redemption.claimed_talks + talk_details = talks.map(&:to_label).join(", ") + + base_message = "#{t("basics.speaker")} #{redemption.user.tutorial_name}" + talks.any? ? "#{base_message}: #{talk_details}" : base_message + end + + def tutor_notification_details(redemption) + user_info = I18n.t("notifications.became_tutor", user: redemption.user.info) + tutorials = redemption.claimed_tutorials + + tutorial_details = if tutorials.present? + I18n.t("notifications.tutorial_details", + tutorials: tutorials.map(&:title).join(", ")) + else + I18n.t("notifications.no_tutorials_taken") + end + + user_info + tutorial_details + end + + def editor_notification_details(redemption) + I18n.t("notifications.became_editor", user: redemption.user.info) + end + + def teacher_notification_details(redemption) + I18n.t("notifications.became_teacher", user: redemption.user.info) + end + + def speaker_notification_details(redemption) + user_info = I18n.t("notifications.became_speaker", user: redemption.user.info) + talks = redemption.claimed_talks + + talk_details = if talks.present? + I18n.t("notifications.talk_details", + talks: talks.map(&:to_label).join(", ")) + else + I18n.t("notifications.no_talks_taken") + end + + user_info + talk_details + end +end diff --git a/app/helpers/submissions_helper.rb b/app/helpers/submissions_helper.rb index 480418fd3..81b232ed1 100644 --- a/app/helpers/submissions_helper.rb +++ b/app/helpers/submissions_helper.rb @@ -39,7 +39,7 @@ def submission_color(submission, assignment) else return "bg-submission-darker-green" if submission&.correction - if submission&.manuscript && submission&.too_late? + if submission&.manuscript && submission.too_late? return "bg-submission-orange" if submission.accepted.nil? return "bg-submission-green" if submission.accepted @@ -58,7 +58,7 @@ def submission_status_icon(submission, assignment) else return "far fa-smile" if submission&.correction - if submission&.manuscript && submission&.too_late? + if submission&.manuscript && submission.too_late? return "fas fa-hourglass-start" if submission.accepted return "fas fa-exclamation-triangle" @@ -76,7 +76,7 @@ def submission_status_text(submission, assignment) else return t("submission.with_correction") if submission&.correction - if submission&.manuscript && submission&.too_late? + if submission&.manuscript && submission.too_late? return t("submission.too_late") if submission.accepted.nil? return t("submission.too_late_accepted") if submission.accepted diff --git a/app/helpers/talks_helper.rb b/app/helpers/talks_helper.rb index 4546dba81..d9337a793 100644 --- a/app/helpers/talks_helper.rb +++ b/app/helpers/talks_helper.rb @@ -42,4 +42,44 @@ def date_list(talk) def cospeaker_list(talk, user) (talk.speakers.to_a - [user]).map(&:tutorial_name).join(", ") end + + def speakers_preselection(talk) + options_for_select(talk.lecture.eligible_as_speakers.map do |s| + [s.tutorial_info, s.id] + end, talk.speaker_ids) + end + + def speaker_select(form, talk, with_preselection) + label = form.label(:speaker_ids, t("admin.talk.speakers"), class: "form-label") + help_desk = helpdesk(t("admin.talk.info.speakers"), false) + + select = if current_user.admin? + preselection = with_preselection ? speakers_preselection(talk) : [[]] + form.select(:speaker_ids, preselection, {}, { + class: "selectize", + multiple: true, + data: { + ajax: true, + filled: false, + model: "user", + placeholder: t("basics.enter_two_letters"), + no_results: t("basics.no_results"), + modal: true, + cy: "speaker-select" + } + }) + else + seminar_edit_people_link = "#{edit_lecture_path(talk.lecture)}#people" + + form.select(:speaker_ids, speakers_preselection(talk), {}, + class: "selectize", + multiple: true, + data: { + cy: "speaker-select", + no_results: t("basics.no_results_speaker", link: seminar_edit_people_link) + }) + end + + label + help_desk + select + end end diff --git a/app/helpers/tutorials_helper.rb b/app/helpers/tutorials_helper.rb index 7cb929bf7..533099896 100644 --- a/app/helpers/tutorials_helper.rb +++ b/app/helpers/tutorials_helper.rb @@ -6,11 +6,10 @@ def cancel_editing_tutorial_path(tutorial) cancel_new_tutorial_path(params: { lecture: tutorial.lecture }) end - def tutorial_preselection(tutorial) - return [[]] unless tutorial.persisted? && tutorial.tutors.any? - - options_for_select(tutorial.tutors.map { |t| [t.tutorial_info, t.id] }, - tutorial.tutor_ids) + def tutors_preselection(tutorial) + options_for_select(tutorial.lecture.eligible_as_tutors.map do |t| + [t.tutorial_info, t.id] + end, tutorial.tutor_ids) end def tutorials_selection(lecture) diff --git a/app/helpers/vouchers_helper.rb b/app/helpers/vouchers_helper.rb new file mode 100644 index 000000000..9bde9da15 --- /dev/null +++ b/app/helpers/vouchers_helper.rb @@ -0,0 +1,50 @@ +module VouchersHelper + def tutorial_options(user, voucher) + voucher.lecture.tutorials_without_tutor(user).map { |t| [t.title, t.id] } + end + + def given_tutorial_ids(user, voucher) + user.given_tutorials.where(lecture: voucher.lecture).pluck(:id) + end + + def tutorials_with_tutor_titles(user, voucher) + voucher.lecture.tutorials_with_tutor(user).map(&:title).join(", ") + end + + def talks_with_titles(user, voucher) + voucher.lecture.talks_with_speaker(user).map(&:to_label).join(", ") + end + + def talk_options(user, voucher) + voucher.lecture.talks_without_speaker(user) + .map { |t| [t.to_label_with_speakers, t.id] } + end + + def redeem_voucher_button(voucher) + link_to(t("profile.redeem_voucher"), + redeem_voucher_path(params: { secure_hash: voucher.secure_hash }), + class: "btn btn-primary", + data: { cy: "redeem-voucher-btn" }, + method: :post, remote: true) + end + + def cancel_voucher_button + link_to(t("buttons.cancel"), cancel_voucher_path, + class: "btn btn-secondary ms-2", data: { cy: "cancel-voucher-btn" }, + remote: true) + end + + def claim_select_field(form, user, voucher) + field_name, options, prompt = if voucher.tutor? + [:tutorial_ids, tutorial_options(user, voucher), t("profile.select_tutorials")] + elsif voucher.speaker? + [:talk_ids, talk_options(user, voucher), t("profile.select_talks")] + end + + form.select(field_name, + options_for_select(options), + { prompt: prompt }, + { multiple: true, class: "selectize me-2", style: "width: 20rem", + data: { cy: "claim-select" } }) + end +end diff --git a/app/mailers/lecture_notification_mailer.rb b/app/mailers/lecture_notification_mailer.rb new file mode 100644 index 000000000..62263765a --- /dev/null +++ b/app/mailers/lecture_notification_mailer.rb @@ -0,0 +1,51 @@ +class LectureNotificationMailer < ApplicationMailer + before_action { I18n.locale = params[:locale] } + before_action { @sender = NotificationMailer.sender(params[:locale]) } + + def new_editor_email + @lecture = params[:lecture] + @recipient = params[:recipient] + @username = @recipient.tutorial_name + + mail(from: @sender, + to: @recipient.email, + subject: t("mailer.new_editor_subject", + title: @lecture.title_for_viewers)) + end + + def new_teacher_email + @lecture = params[:lecture] + @recipient = params[:recipient] + @username = @recipient.tutorial_name + + mail(from: @sender, + to: @recipient.email, + subject: t("mailer.new_teacher_subject", + title: @lecture.title_for_viewers)) + end + + def previous_teacher_email + @lecture = params[:lecture] + @recipient = params[:recipient] + @username = @recipient.tutorial_name + + mail(from: @sender, + to: @recipient.email, + subject: t("mailer.previous_teacher_subject", + title: @lecture.title_for_viewers, + new_teacher: @lecture.teacher.tutorial_name)) + end + + def new_speaker_email + @talk = params[:talk] + @recipient = params[:recipient] + @speaker = params[:speaker].info + @username = @recipient.tutorial_name + + mail(from: @sender, + to: @recipient.email, + subject: t("mailer.new_speaker_subject", + seminar: @talk.lecture.title, + title: @talk.to_label)) + end +end diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb index ae6a281c1..8445cbe7d 100644 --- a/app/mailers/notification_mailer.rb +++ b/app/mailers/notification_mailer.rb @@ -2,7 +2,6 @@ class NotificationMailer < ApplicationMailer before_action :set_sender_and_locale before_action :set_recipients, only: [:medium_email, :announcement_email, :new_lecture_email, - :new_editor_email, :submission_deletion_email, :submission_deletion_lecture_email, :submission_destruction_email, @@ -51,17 +50,6 @@ def new_lecture_email title: @lecture.title_for_viewers)) end - def new_editor_email - @lecture = params[:lecture] - @recipient = params[:recipient] - @username = @recipient.tutorial_name - - mail(from: @sender, - to: @recipient.email, - subject: t("mailer.new_editor_subject", - title: @lecture.title_for_viewers)) - end - def submission_invitation_email @recipient = params[:recipient] @assignment = params[:assignment] @@ -173,8 +161,16 @@ def submission_destruction_lecture_email lecture: @lecture.title)) end + def self.sender(locale) + I18n.t("mailer.notification", locale: locale) \ + +" <#{DefaultSetting::PROJECT_NOTIFICATION_EMAIL}>" + end + private + # This method should be replaced by the one above (self.sender). + # It only stays here during the transition phase where this file is split + # into multiple files regarding concerns like vouchers, submissions, etc. def set_sender_and_locale @sender = "#{t("mailer.notification")} <#{DefaultSetting::PROJECT_NOTIFICATION_EMAIL}>" I18n.locale = params[:locale] diff --git a/app/models/announcement.rb b/app/models/announcement.rb index 4504b0ff7..c1f2f4c28 100644 --- a/app/models/announcement.rb +++ b/app/models/announcement.rb @@ -4,6 +4,8 @@ class Announcement < ApplicationRecord belongs_to :lecture, optional: true, touch: true belongs_to :announcer, class_name: "User" + has_many :notifications, as: :notifiable, dependent: :destroy + validates :details, presence: true paginates_per 10 diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/models/course.rb b/app/models/course.rb index 5edf63bfa..574e1f4e6 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -4,6 +4,8 @@ class Course < ApplicationRecord has_many :lectures, dependent: :destroy + has_many :notifications, as: :notifiable, dependent: :destroy + # tags are notions that treated in the course # e.g.: vector space, linear map are tags for the course 'Linear Algebra 1' has_many :course_tag_joins, dependent: :destroy diff --git a/app/models/current.rb b/app/models/current.rb new file mode 100644 index 000000000..619f480c5 --- /dev/null +++ b/app/models/current.rb @@ -0,0 +1,4 @@ +# https://api.rubyonrails.org/classes/ActiveSupport/CurrentAttributes.html +class Current < ActiveSupport::CurrentAttributes + attribute :user +end diff --git a/app/models/lecture.rb b/app/models/lecture.rb index 7fd197471..c42267298 100644 --- a/app/models/lecture.rb +++ b/app/models/lecture.rb @@ -4,6 +4,8 @@ class Lecture < ApplicationRecord belongs_to :course + has_many :notifications, as: :notifiable, dependent: :destroy + # teacher is the user that gives the lecture belongs_to :teacher, class_name: "User" @@ -63,6 +65,10 @@ class Lecture < ApplicationRecord # a lecture has many assignments (e.g. exercises with deadlines) has_many :assignments + # a lecture has many vouchers that can be redeemed to promote + # users to tutors, editors or teachers + has_many :vouchers, dependent: :destroy + # a lecture has many structure_ids, referring to the ids of structures # in the erdbeere database serialize :structure_ids, type: Array, coder: YAML @@ -830,12 +836,9 @@ def speakers User.where(id: SpeakerTalkJoin.where(talk: talks).select(:speaker_id)) end - def older_than?(timespan) - return true unless term - - term.begin_date <= Term.active.begin_date - timespan - end - + # Determines if the lecture is stale (i.e. older than one year). + # The age of the lecture is determined by the begin date of the term + # in which it was given and the begin date of the current term. def stale? older_than?(1.year) end @@ -844,6 +847,89 @@ def valid_annotations_status? [0, 1].include?(annotations_status) end + def active_voucher_of_role(role) + vouchers.where(role: role).active&.first + end + + def update_tutor_status!(user, selected_tutorials) + tutorials.find_each do |t| + t.add_tutor(user) if selected_tutorials.include?(t) + end + # touch to invalidate the cache + touch + end + + def update_editor_status!(user) + return if editors.include?(user) + + editors << user + # touch to invalidate the cache + touch + end + + def update_teacher_status!(user) + return if teacher == user + + previous_teacher = teacher + update(teacher: user) + editors << previous_teacher + # touch to invalidate the cache + touch + end + + def update_speaker_status!(user, selected_talks) + talks.find_each do |t| + t.add_speaker(user) if selected_talks.include?(t) + end + # touch to invalidate the cache + touch + end + + def eligible_as_tutors + (tutors + Redemption.tutors_by_redemption_in(self) + editors + [teacher]).uniq + # the first one should (in the future) actually be contained in the sum of + # the other ones, but in the transition phase where some tutor statuses were + # still given by the old system, this will not be true + end + + def eligible_as_editors + (editors + Redemption.editors_by_redemption_in(self) + course.editors - [teacher]).uniq + # the first one should (in the future) actually be contained in the sum of + # the other ones, but in the transition phase where some editor statuses were + # still given by the old system, this will not be true + end + + def eligible_as_teachers + (User.teachers + editors + course.editors + [teacher]).uniq + end + + def eligible_as_speakers + (speakers + Redemption.speakers_by_redemption_in(self) + editors + [teacher]).uniq + # the first one should (in the future) actually be contained in the sum of + # the other ones, but in the transition phase where some editor statuses were + # still given by the old system, this will not be true + end + + def editors_and_teacher + ([teacher] + editors).uniq + end + + def tutorials_with_tutor(tutor) + tutorials.where(id: tutorial_ids_for_tutor(tutor)) + end + + def tutorials_without_tutor(tutor) + tutorials.where.not(id: tutorial_ids_for_tutor(tutor)) + end + + def talks_with_speaker(speaker) + talks.where(id: talk_ids_for_speaker(speaker)) + end + + def talks_without_speaker(speaker) + talks.where.not(id: talk_ids_for_speaker(speaker)) + end + private # used for after save callback @@ -947,4 +1033,19 @@ def only_one_lecture errors.add(:course, :already_present) end + + def older_than?(timespan) + return false unless Term.active + return true unless term + + term.begin_date <= Term.active.begin_date - timespan + end + + def tutorial_ids_for_tutor(tutor) + TutorTutorialJoin.where(tutor: tutor).select(:tutorial_id) + end + + def talk_ids_for_speaker(speaker) + SpeakerTalkJoin.where(speaker: speaker).select(:talk_id) + end end diff --git a/app/models/lesson.rb b/app/models/lesson.rb index e2dad90be..13084d0d5 100644 --- a/app/models/lesson.rb +++ b/app/models/lesson.rb @@ -286,7 +286,7 @@ def probable_start_destination end def tags_without_section - tags.includes(:sections).select { |t| (t.sections & sections).empty? } + tags.includes(:sections).select { |t| (t.sections & sections).empty? } # rubocop:disable Style/ArrayIntersect end private diff --git a/app/models/medium.rb b/app/models/medium.rb index ab667c7cb..bd59866d5 100644 --- a/app/models/medium.rb +++ b/app/models/medium.rb @@ -3,6 +3,8 @@ class Medium < ApplicationRecord include ApplicationHelper include ActiveModel::Dirty + has_many :notifications, as: :notifiable, dependent: :destroy + # a teachable is a course/lecture/lesson belongs_to :teachable, polymorphic: true, optional: true acts_as_list scope: [:teachable_id, :teachable_type], top_of_list: 0 diff --git a/app/models/notification.rb b/app/models/notification.rb index ee62b890c..fb0627215 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -9,19 +9,12 @@ class Notification < ApplicationRecord paginates_per 12 - # retrieve notifiable defined by notifiable_type and notifiable_id - # def notifiable - # return unless notifiable_type.in?(Notification.allowed_notifiable_types) && - # notifiable_id.present? - # notifiable_type.constantize.find_by_id(notifiable_id) - # end - # returns the lecture associated to a notification of type announcement, # and teachable for a notification of type medium, nil otherwise def teachable return if notifiable.blank? - return if notifiable_type.in?(["Lecture", "Course"]) - return notifiable.lecture if notifiable_type == "Announcement" + return if lecture_or_course? + return notifiable.lecture if announcement_or_redemption? # notifiable will be a medium, so return its teachable notifiable.teachable @@ -34,46 +27,42 @@ def teachable # all other cases: notifiable path def path(user) return if notifiable.blank? - return edit_profile_path if notifiable_type.in?(["Course", "Lecture"]) - - if notifiable_type == "Announcement" - return notifiable.lecture.path(user) if notifiable.lecture.present? - return news_path + if redemption? + edit_lecture_path(notifiable.voucher.lecture, anchor: "people") + elsif lecture_or_course? + edit_profile_path + elsif lecture_announcement? + notifiable.lecture.path(user) + elsif generic_announcement? + news_path + elsif quiz? + medium_path(notifiable) + else + polymorphic_url(notifiable, only_path: true) end - return medium_path(notifiable) if notifiable_type == "Medium" && notifiable.sort == "Quiz" - - polymorphic_url(notifiable, only_path: true) - end - - def self.allowed_notifiable_types - ["Medium", "Course", "Lecture", "Announcement"] end # the next methods are for the determination which kind of notification it is def medium? - return false if notifiable.blank? - - notifiable_type == "Medium" + notifiable.is_a?(Medium) end def course? - return false if notifiable.blank? - - notifiable.instance_of?(::Course) + notifiable.is_a?(Course) end def lecture? - return false if notifiable.blank? + notifiable.is_a?(Lecture) + end - notifiable.instance_of?(::Lecture) + def redemption? + notifiable.is_a?(Redemption) end def announcement? - return false if notifiable.blank? - - notifiable.instance_of?(::Announcement) + notifiable.is_a?(Announcement) end def generic_announcement? @@ -83,4 +72,18 @@ def generic_announcement? def lecture_announcement? announcement? && notifiable.lecture.present? end + + def quiz? + medium? && notifiable.sort == "Quiz" + end + + private + + def lecture_or_course? + notifiable_type.in?(["Lecture", "Course"]) + end + + def announcement_or_redemption? + notifiable_type.in?(["Announcement", "Redemption"]) + end end diff --git a/app/models/talk.rb b/app/models/talk.rb index 2afef84a1..650eb1f22 100644 --- a/app/models/talk.rb +++ b/app/models/talk.rb @@ -4,6 +4,8 @@ class Talk < ApplicationRecord has_many :speaker_talk_joins, dependent: :destroy has_many :speakers, through: :speaker_talk_joins + has_many :claims, as: :claimable, dependent: :destroy + validates :title, presence: true # being a teachable (course/lecture/lesson), a talk has associated media @@ -35,6 +37,12 @@ def to_label I18n.t("talk", number: position, title: title) end + def to_label_with_speakers + return to_label unless speakers.any? + + "#{to_label} (#{speakers.map(&:tutorial_name).join(", ")})" + end + def long_title title_for_viewers end @@ -100,6 +108,10 @@ def editors_with_inheritance (speakers + lecture.editors_with_inheritance).uniq end + def add_speaker(speaker) + speakers << speaker unless speaker.in?(speakers) + end + private def touch_lecture diff --git a/app/models/tutorial.rb b/app/models/tutorial.rb index 824f390cf..8fd72418a 100644 --- a/app/models/tutorial.rb +++ b/app/models/tutorial.rb @@ -9,6 +9,8 @@ class Tutorial < ApplicationRecord has_many :submissions, dependent: :destroy + has_many :claims, as: :claimable, dependent: :destroy + before_destroy :check_destructibility, prepend: true # rubocop:todo Rails/UniqueValidationWithoutIndex @@ -41,6 +43,10 @@ def teams_to_csv(assignment) end end + def add_tutor(tutor) + tutors << tutor unless tutors.include?(tutor) + end + private def check_destructibility diff --git a/app/models/user.rb b/app/models/user.rb index 4d3337b0a..7c9d9d8b8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -81,6 +81,9 @@ class User < ApplicationRecord has_many :feedbacks, dependent: :destroy + # a user has redemptions of vouchers + has_many :redemptions, dependent: :destroy + include ScreenshotUploader[:image] # if a homepage is given it should at leat be a valid address @@ -130,10 +133,6 @@ class User < ApplicationRecord scope :inactive_for, ->(threshold) { where(current_sign_in_at: ...threshold.ago) } scope :confirmation_sent_before, ->(threshold) { where(confirmation_sent_at: ...threshold.ago) } - searchable do - text :tutorial_name - end - # returns the array of all teachers def self.teachers User.where(id: Lecture.distinct.select(:teacher_id)) diff --git a/app/models/voucher/claim.rb b/app/models/voucher/claim.rb new file mode 100644 index 000000000..e8fe5aa6d --- /dev/null +++ b/app/models/voucher/claim.rb @@ -0,0 +1,6 @@ +# A Claim stores a Claimable that is being taken over by the user when they +# redeem a voucher. Claimables include tutorials and talks. +class Claim < ApplicationRecord + belongs_to :redemption + belongs_to :claimable, polymorphic: true +end diff --git a/app/models/voucher/redeemer.rb b/app/models/voucher/redeemer.rb new file mode 100644 index 000000000..ad9ede97c --- /dev/null +++ b/app/models/voucher/redeemer.rb @@ -0,0 +1,78 @@ +# The Redeemer module is included in the Voucher model to encapsulate the +# redemption logic of a voucher. +# +# Note that this is not the same as "Claimable", which is used for roles +# that can be claimed via a voucher, e.g. becoming a tutor for a lecture etc. +module Redeemer + extend ActiveSupport::Concern + + included do + has_many :redemptions, dependent: :destroy + end + + def redeem(params) + redemption = create_redemption(params) + create_notifications!(redemption) + Current.user.subscribe_lecture!(lecture) + end + + private + + def create_redemption(params) + case role.to_sym + when :tutor + redeem_tutor_voucher(params[:tutorial_ids]) + when :editor + redeem_editor_voucher + when :teacher + redeem_teacher_voucher + when :speaker + redeem_speaker_voucher(params[:talk_ids]) + end + end + + def redeem_tutor_voucher(tutorial_ids) + selected_tutorials = lecture.tutorials.where(id: tutorial_ids) + lecture.update_tutor_status!(Current.user, selected_tutorials) + + Redemption.create(user: Current.user, voucher: self, + claimed_tutorials: selected_tutorials) + end + + def redeem_editor_voucher + lecture.update_editor_status!(Current.user) + LectureNotifier.notify_new_editor_by_mail(Current.user, lecture) + + Redemption.create(user: Current.user, voucher: self) + end + + def redeem_teacher_voucher + previous_teacher = lecture.teacher + lecture.update_teacher_status!(Current.user) + # no need to send out notifications if the teacher stays the same + # because then there is no demotion to editor + # (it is actually not possible to trigger this case via the GUI) + if previous_teacher != Current.user + LectureNotifier.notify_about_teacher_change_by_mail(lecture, + previous_teacher) + end + invalidate! + + Redemption.create(user: Current.user, voucher: self) + end + + def redeem_speaker_voucher(talk_ids) + selected_talks = lecture.talks.where(id: talk_ids) + lecture.update_speaker_status!(Current.user, selected_talks) + LectureNotifier.notify_cospeakers_by_mail(Current.user, selected_talks) + + Redemption.create(user: Current.user, voucher: self, + claimed_talks: selected_talks) + end + + def create_notifications!(redemption) + lecture.editors_and_teacher.each do |editor| + Notification.create(notifiable: redemption, recipient: editor) + end + end +end diff --git a/app/models/voucher/redemption.rb b/app/models/voucher/redemption.rb new file mode 100644 index 000000000..2e6e68176 --- /dev/null +++ b/app/models/voucher/redemption.rb @@ -0,0 +1,44 @@ +# Redemptions store the event of a user redeeming a voucher. +# +# During one redemption of a voucher, a user might claim multiple objects, e.g. +# two tutorial slots. The respective claims are stored in the Claims model. +# +# Also provides class methods to find out about users who have redeemed +# specific vouchers, e.g. tutors by redemption in a given lecture. +class Redemption < ApplicationRecord + belongs_to :voucher + belongs_to :user + has_many :claims, dependent: :destroy + has_many :claimed_tutorials, through: :claims, source: :claimable, + source_type: Tutorial.name + has_many :claimed_talks, through: :claims, source: :claimable, + source_type: Talk.name + + has_many :notifications, as: :notifiable, dependent: :destroy + + class << self + def tutors_by_redemption_in(lecture) + users_that_redeemed_vouchers(lecture.vouchers.for_tutors) + end + + def editors_by_redemption_in(lecture) + users_that_redeemed_vouchers(lecture.vouchers.for_editors) + end + + def speakers_by_redemption_in(lecture) + users_that_redeemed_vouchers(lecture.vouchers.for_speakers) + end + + private + + # Returns the users who have redeemed the given vouchers. + # + # These users could be called "Redeemers", but note that this should not + # be confused with the Redeemer module that is responsible for the redemption + # process of a voucher. + def users_that_redeemed_vouchers(relevant_vouchers) + user_ids = Redemption.where(voucher: relevant_vouchers).pluck(:user_id) + User.where(id: user_ids.uniq) + end + end +end diff --git a/app/models/voucher/voucher.rb b/app/models/voucher/voucher.rb new file mode 100644 index 000000000..ccd1ac2da --- /dev/null +++ b/app/models/voucher/voucher.rb @@ -0,0 +1,94 @@ +# A voucher is a unique (secure) hash that can be used by users to redeem a role, +# such as tutor, teacher etc. That is, the voucher grants the user elevated +# permissions. +# +# Vouchers are created by lecture editors, e.g. teachers. They will then send +# the voucher to the user by means of a different communication channel, +# e.g. email. Users can redeem the voucher by entering the code on their +# profile page. +# +# Before the introduction of vouchers, teachers could select from the whole pool +# of MaMpf users to assign them a role, e.g. to select tutors for their lecture. +# To better align this process with GDPR requirements, the concept of voucher +# was introduced. This way, teachers can only assign roles to users who have +# actively redeemed a voucher. +class Voucher < ApplicationRecord + include Redeemer + + SPEAKER_EXPIRATION_DAYS = 30 + TUTOR_EXPIRATION_DAYS = 14 + DEFAULT_EXPIRATION_DAYS = 3 + + ROLE_HASH = { tutor: 0, editor: 1, teacher: 2, speaker: 3 }.freeze + enum role: ROLE_HASH + validates :role, presence: true + + belongs_to :lecture, touch: true + + before_create :generate_secure_hash + before_create :add_expiration_datetime + before_create :ensure_no_other_active_voucher + before_create :ensure_speaker_vouchers_only_for_seminars + + scope :active, lambda { + where("expires_at > ? AND invalidated_at IS NULL", + Time.zone.now) + } + scope :for_tutors, -> { where(role: :tutor) } + scope :for_editors, -> { where(role: :editor) } + scope :for_speakers, -> { where(role: :speaker) } + + self.implicit_order_column = :created_at + + def self.roles_for_lecture(lecture) + return ROLE_HASH.keys if lecture.seminar? + + ROLE_HASH.keys - [:speaker] + end + + def self.find_voucher_by_hash(secure_hash) + # strip() to avoid issues with leading/trailing whitespaces when copy-pasting + Voucher.active.find_by(secure_hash: secure_hash.strip) + end + + def invalidate! + update(invalidated_at: Time.zone.now) + end + + private + + def generate_secure_hash + self.secure_hash = SecureRandom.hex(16) + end + + def add_expiration_datetime + self.expires_at = created_at + expiration_days.days + end + + def ensure_no_other_active_voucher + return unless lecture + return unless lecture.vouchers.where(role: role).active.any? + + errors.add(:role, + I18n.t("activerecord.errors.models.voucher.attributes.role." \ + "only_one_active")) + throw(:abort) + end + + def ensure_speaker_vouchers_only_for_seminars + return unless speaker? + return if lecture.seminar? + + errors.add(:role, + I18n.t("activerecord.errors.models.voucher.attributes.role." \ + "speaker_vouchers_only_for_seminars")) + throw(:abort) + end + + def expiration_days + return SPEAKER_EXPIRATION_DAYS if speaker? + return TUTOR_EXPIRATION_DAYS if tutor? + + DEFAULT_EXPIRATION_DAYS + end +end diff --git a/app/views/administration/index/_my_courses.html.erb b/app/views/administration/index/_my_courses.html.erb index 93d8112bb..eb74229c8 100644 --- a/app/views/administration/index/_my_courses.html.erb +++ b/app/views/administration/index/_my_courses.html.erb @@ -18,12 +18,14 @@
- + <% if current_user.admin? %> + + <% end %> <% if current_user.edited_courses.any? %> <%= render partial: 'administration/index/courses_card', locals: { courses: diff --git a/app/views/annotations/_annotation_area.html.erb b/app/views/annotations/_annotation_area.html.erb index 2e0327e89..3bea2edd0 100644 --- a/app/views/annotations/_annotation_area.html.erb +++ b/app/views/annotations/_annotation_area.html.erb @@ -1,4 +1,4 @@ -
+
diff --git a/app/views/commontator/comments/_form.html.erb b/app/views/commontator/comments/_form.html.erb index 58ba9c579..c039e61c3 100644 --- a/app/views/commontator/comments/_form.html.erb +++ b/app/views/commontator/comments/_form.html.erb @@ -38,7 +38,9 @@
<%= - form.text_area :body, rows: '7', class: 'form-control commentForm comment-field', id: new_record ? + form.text_area :body, rows: '7', + "data-cy": "comment-textarea", + class: 'form-control commentForm comment-field', id: new_record ? comment.parent.nil? ? "commontator-thread-#{@commontator_thread.id}-new-comment-body" : "commontator-comment-#{comment.parent.id}-reply" : "commontator-comment-#{comment.id}-edit-body" @@ -48,7 +50,8 @@
<%= form.submit t("commontator.comment.actions.#{new_record ? 'create' : 'update'}"), - class: 'btn btn-primary btn-sm' %> + class: 'btn btn-primary btn-sm', + "data-cy": "submit-new-comment" %> <%= form.submit( t('commontator.comment.actions.cancel'), name: 'cancel', diff --git a/app/views/commontator/comments/_list.html.erb b/app/views/commontator/comments/_list.html.erb index 5ae58a0f9..e0ceb0428 100644 --- a/app/views/commontator/comments/_list.html.erb +++ b/app/views/commontator/comments/_list.html.erb @@ -6,7 +6,8 @@ %> <% nested_comments.each do |comment, nested_children| %> -
+
<%= render partial: 'commontator/comments/show', formats: [ :html ], locals: { user: user, comment: comment, nested_children: nested_children diff --git a/app/views/commontator/threads/_reply.html.erb b/app/views/commontator/threads/_reply.html.erb index ee5c77446..3a272969a 100644 --- a/app/views/commontator/threads/_reply.html.erb +++ b/app/views/commontator/threads/_reply.html.erb @@ -14,7 +14,8 @@ <% end %> diff --git a/app/views/layouts/application_no_sidebar.html.erb b/app/views/layouts/application_no_sidebar.html.erb index e23124bb0..24d45f890 100644 --- a/app/views/layouts/application_no_sidebar.html.erb +++ b/app/views/layouts/application_no_sidebar.html.erb @@ -17,7 +17,7 @@
<% end %> <% if notice.present? %> -
-
- <%= f.label :teacher_id, - t('basics.teacher'), - class: "form-label" %> - <%= helpdesk(t('admin.lecture.info.teacher'), false) %> - <%= f.select :teacher_id, - options_for_select([[current_user.info, current_user.id]], - current_user.id), - {}, - { class: 'selectize', - data: { ajax: true, - model: 'user', - filled: false, - placeholder: t('basics.enter_two_letters'), - no_results: t('basics.no_results'), - current: current_user.id, - modal: modal } } %> +
+ <%= teacher_select(f, is_new_lecture=true) %>
diff --git a/app/views/lectures/edit/_comments.html.erb b/app/views/lectures/edit/_comments.html.erb index 60af9b03f..ea9e4ecea 100644 --- a/app/views/lectures/edit/_comments.html.erb +++ b/app/views/lectures/edit/_comments.html.erb @@ -36,7 +36,7 @@
-
+
<%= t('admin.lecture.enable_annotation_button') %> <%= helpdesk(t('admin.lecture.enable_annotation_button_helpdesk'), false) %> diff --git a/app/views/lectures/edit/_form.html.erb b/app/views/lectures/edit/_form.html.erb index 5060e5b82..5aee9c997 100644 --- a/app/views/lectures/edit/_form.html.erb +++ b/app/views/lectures/edit/_form.html.erb @@ -6,7 +6,7 @@ <%= render partial: 'lectures/edit/header', locals: { lecture: lecture } %>
- +
- +
@@ -103,6 +105,8 @@ locals: { lecture: lecture } %> <%= render partial: 'lectures/edit/tutorials', locals: { lecture: lecture } %> + <%= render partial: 'lectures/edit/vouchers', + locals: { lecture: lecture } %>
@@ -117,6 +121,7 @@
<%= render partial: 'lectures/edit/announcements', @@ -145,7 +150,7 @@ <%= t('basics.course_editors') %> <%= helpdesk(t('admin.lecture.info.course_editors'), false) %> - +
<% if lecture.course.editors.present? %>
    @@ -179,7 +184,7 @@ <%= render partial: 'announcements/modal' %> <%= render partial: 'lectures/publish/publish', locals: { lecture: lecture } %> - + <% unless lecture.stale? %> <%= render partial: 'lectures/edit/user_modal', locals: { lecture: lecture } %> diff --git a/app/views/lectures/edit/_people.html.erb b/app/views/lectures/edit/_people.html.erb index e1d047f46..63b432872 100644 --- a/app/views/lectures/edit/_people.html.erb +++ b/app/views/lectures/edit/_people.html.erb @@ -3,28 +3,8 @@

    <%= t('basics.people') %>

    -
    - <%= f.label :teacher_id, - t('basics.teacher'), - class: "form-label" %> - <%= helpdesk(t('admin.lecture.info.teacher'), false) %> -
    - <%= f.select :teacher_id, - options_for_select([[lecture.teacher.info, - lecture.teacher.id]], - lecture.teacher.id), - {}, - { class: 'selectize', - data: { ajax: true, - model: 'user', - filled: false, - placeholder: - t('basics.enter_two_letters'), - no_results: - t('basics.no_results') } } %> -
    -
    -
    +
    + <%= teacher_select(f, is_new_lecture=false, lecture) %>
    @@ -32,21 +12,11 @@ t('basics.lecture_editors'), class: "form-label" %> <%= helpdesk(t('admin.lecture.info.lecture_editors'), false) %> -
    - <%= f.select :editor_ids, - options_for_select([[t('none'), '']] + - lecture.select_editors, - lecture.editors.map(&:id)), - {}, - { multiple: true, - class: 'selectize', - data: { ajax: true, - model: 'user', - filled: false, - placeholder: t('basics.enter_two_letters'), - no_results: t('basics.no_results') } } %> +
    + <%= editors_select(f, lecture) %>
    +
    diff --git a/app/views/lectures/edit/_seminar_content.html.erb b/app/views/lectures/edit/_seminar_content.html.erb index b7b74ead1..64675bcfd 100644 --- a/app/views/lectures/edit/_seminar_content.html.erb +++ b/app/views/lectures/edit/_seminar_content.html.erb @@ -16,6 +16,7 @@ new_talk_path(lecture_id: lecture.id), remote: true, class: 'btn btn-sm btn-secondary new-in-lecture', + data: { cy: 'new-talk-btn' }, id: 'new_talk_button' %>
    @@ -29,7 +30,9 @@ <% end %>
    <% else %> - <%= t('admin.lecture.no_talks') %> + + <%= t('admin.lecture.no_talks') %> + <% end %>
diff --git a/app/views/lectures/edit/_tutorials.html.erb b/app/views/lectures/edit/_tutorials.html.erb index 1dded934e..37ae6b55c 100644 --- a/app/views/lectures/edit/_tutorials.html.erb +++ b/app/views/lectures/edit/_tutorials.html.erb @@ -10,6 +10,7 @@ new_tutorial_path(params: { lecture_id: lecture.id }), class: 'btn btn-sm btn-primary', id: 'newTutorialButton', + data: { cy: 'new-tutorial-btn' }, remote: true %>
@@ -26,6 +27,7 @@
<%= t('basics.tutors') %> + <%= helpdesk(t('tutorial.info.tutors'), true) %>
diff --git a/app/views/lectures/edit/_vouchers.html.erb b/app/views/lectures/edit/_vouchers.html.erb new file mode 100644 index 000000000..8c9b2582e --- /dev/null +++ b/app/views/lectures/edit/_vouchers.html.erb @@ -0,0 +1,20 @@ +
+

+ <%= t('basics.vouchers') %> +

+ +

+ <%= t('admin.voucher.general_explanation') %> +

+ +<% if current_user.can_update_personell?(lecture) %> +
+ <% Voucher.roles_for_lecture(lecture).each do |role| %> +
+
+ <%= render partial: 'vouchers/voucher' , locals: { lecture: lecture, role: role } %> +
+
+ <% end %> +
+<% end %> diff --git a/app/views/lectures/error.js.erb b/app/views/lectures/error.js.erb new file mode 100644 index 000000000..debc3873c --- /dev/null +++ b/app/views/lectures/error.js.erb @@ -0,0 +1 @@ +alert("<%= "#{j(error_message)}" %>"); diff --git a/app/views/lectures/subscribe_page.html.erb b/app/views/lectures/subscribe_page.html.erb index de230afe3..9b50c3155 100644 --- a/app/views/lectures/subscribe_page.html.erb +++ b/app/views/lectures/subscribe_page.html.erb @@ -48,7 +48,8 @@ value: "redirect" %>

<%= f.submit t("profile.subscribe_lecture"), - class: "btn btn-primary"%> + class: "btn btn-primary", + "data-cy": "subscribe-to-lecture" %> <% end %> <% else %> <%= link_to t("profile.subscribe_lecture"), @@ -58,7 +59,8 @@ parent: "redirect" } }), method: :patch, remote: true, - class: "btn btn-primary" %> + class: "btn btn-primary", + "data-cy": "subscribe-to-lecture" %> <% end %>

diff --git a/app/views/main/start.html.erb b/app/views/main/start.html.erb index 8d16e8ab9..ae4cbc1bd 100644 --- a/app/views/main/start.html.erb +++ b/app/views/main/start.html.erb @@ -63,7 +63,8 @@ data-bs-parent="#subscriptionsAccordion" data-link="#inactiveLecturesLink">
+ id="collapseInactiveLecturesContent" + data-cy="subscribed-inactive-lectures-collapse"> <% if @current_stuff.empty? %> <%= render partial: 'main/start/lecture', collection: @inactive_lectures, @@ -117,7 +118,8 @@ data-bs-toggle="collapse" data-bs-target="#collapseTalks" aria-expanded="false" - aria-controls="collapseTalks"> + aria-controls="collapseTalks" + data-cy="my-talks-collapse-btn">

<%= t('profile.my_talks') %> @@ -126,7 +128,8 @@

+ data-link="#talkLink" + data-cy="my-talks-collapse">
<%= render partial: 'main/start/talks', locals: { talks: @talks } %> diff --git a/app/views/media/_basics.html.erb b/app/views/media/_basics.html.erb index 2e6cdd877..773b09975 100644 --- a/app/views/media/_basics.html.erb +++ b/app/views/media/_basics.html.erb @@ -183,11 +183,11 @@
<%= f.radio_button :annotations_status, - '0', + '-1', class: 'form-check-input' %> <%= f.label :annotations_status, t('admin.annotation.inherit_from_lecture'), - value: '0', + value: '-1', class: 'form-check-label' %>
@@ -201,11 +201,11 @@
<%= f.radio_button :annotations_status, - '-1', + '0', class: 'form-check-input' %> <%= f.label :annotations_status, t('basics.no_lc'), - value: '-1', + value: '0', class: 'form-check-label' %>
diff --git a/app/views/media/feedback.html.erb b/app/views/media/feedback.html.erb index eb92333bf..843c83c2c 100644 --- a/app/views/media/feedback.html.erb +++ b/app/views/media/feedback.html.erb @@ -23,7 +23,8 @@ - + -
+
+
@@ -26,7 +26,7 @@
-
+
<%= simple_format(notification_text(notification)) %> <%= simple_format(notification_link(notification)) %>
diff --git a/app/views/profile/_account.html.erb b/app/views/profile/_account.html.erb index 0847f3662..e32eab35e 100644 --- a/app/views/profile/_account.html.erb +++ b/app/views/profile/_account.html.erb @@ -1,8 +1,14 @@ <%= link_to t('profile.change_data'), edit_user_registration_path, - class: "btn btn-outline-secondary mb-2" %> + class: "btn btn-outline-secondary" %> + + + <%= link_to t('profile.delete_account'), delete_account_path, - class: "btn btn-outline-danger mb-2", + class: "btn btn-outline-danger", + "data-cy": "delete-account-btn", remote: true %> - diff --git a/app/views/profile/_data.html.erb b/app/views/profile/_data.html.erb deleted file mode 100644 index e898e74f0..000000000 --- a/app/views/profile/_data.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -
- <%= t('profile.data_explanation') %> -
-
- <%= link_to t('profile.data_request'), - request_data_path, - class: 'btn btn-sm btn-primary', - data: { confirm: t('confirmation.generic') } %> -
\ No newline at end of file diff --git a/app/views/profile/_email_notifications.html.erb b/app/views/profile/_email_notifications.html.erb index 7eb9a35c5..81d2586a1 100644 --- a/app/views/profile/_email_notifications.html.erb +++ b/app/views/profile/_email_notifications.html.erb @@ -9,13 +9,13 @@ <%= f.form_group :email_notifications do %> <%= f.check_box :email_for_announcement, label: t('profile.email_for_announcement'), - custom: true %> + wrapper_class: 'checkbox-list' %> <%= f.check_box :email_for_medium, label: t('profile.email_for_medium'), - custom: true %> + wrapper_class: 'checkbox-list' %> <%= f.check_box :email_for_teachable, label: t('profile.email_for_teachable'), - custom: true %> + wrapper_class: 'checkbox-list' %> <% end %>
@@ -25,22 +25,22 @@ <%= f.form_group :submission_emails do %> <%= f.check_box :email_for_submission_upload, label: t('profile.email_for_submission_upload'), - custom: true %> + wrapper_class: 'checkbox-list' %> <%= f.check_box :email_for_submission_removal, label: t('profile.email_for_submission_removal'), - custom: true %> + wrapper_class: 'checkbox-list' %> <%= f.check_box :email_for_submission_join, label: t('profile.email_for_submission_join'), - custom: true %> + wrapper_class: 'checkbox-list' %> <%= f.check_box :email_for_submission_leave, label: t('profile.email_for_submission_leave'), - custom: true %> + wrapper_class: 'checkbox-list' %> <%= f.check_box :email_for_correction_upload, label: t('profile.email_for_correction_upload'), - custom: true %> + wrapper_class: 'checkbox-list' %> <%= f.check_box :email_for_submission_decision, label: t('profile.email_for_submission_decision'), - custom: true %> + wrapper_class: 'checkbox-list' %> <% end %>
@@ -49,8 +49,7 @@ <%= f.form_group :other_email_notifications do %> <%= f.check_box :email_for_news, - label: t('profile.email_for_news'), - custom: true %> + label: t('profile.email_for_news') %> <% end %>
\ No newline at end of file diff --git a/app/views/profile/_redeem_voucher.html.erb b/app/views/profile/_redeem_voucher.html.erb new file mode 100644 index 000000000..a9278a5f0 --- /dev/null +++ b/app/views/profile/_redeem_voucher.html.erb @@ -0,0 +1,9 @@ +<%= form_with url: redeem_voucher_path, + remote: true, + method: :post, + html: { class: "form-inline" } do |f| %> +
+ <%= f.text_field :voucher_hash, class: "form-control me-2 w-50" %> + <%= f.submit t('profile.redeem_voucher'), class: "btn btn-primary" %> +
+<% end %> diff --git a/app/views/profile/_request_data_modal.html.erb b/app/views/profile/_request_data_modal.html.erb new file mode 100644 index 000000000..c7756f791 --- /dev/null +++ b/app/views/profile/_request_data_modal.html.erb @@ -0,0 +1,50 @@ + + + + +
+ +
diff --git a/app/views/profile/_subscription_type.html.erb b/app/views/profile/_subscription_type.html.erb index a31af2e90..41c9820b9 100644 --- a/app/views/profile/_subscription_type.html.erb +++ b/app/views/profile/_subscription_type.html.erb @@ -1,32 +1,30 @@
<%= f.form_group :locale, - label: { text: t('profile.locale') } do %> + label: { text: t('profile.locale'), class: 'fw-bold' } do %> <% I18n.available_locales.each do |locale| %> + <% cy_label = "locale-#{locale}-checkbox" %> <%= f.radio_button :locale, locale.to_s, label: t('locales.' + locale.to_s, locale: current_user.locale), - custom: true %> + "data-cy": cy_label %> <% end %> <% end %>
<%= f.form_group :subscription_type, label: { text: t('profile.content_info') } do %> - <%= f.radio_button :subscription_type, 1, - label: t('profile.subscription_mixed'), - checked: @user.subscription_type == 1 || - @user.subscription_type.nil?, - custom: true %> <%= f.radio_button :subscription_type, 2, label: t('profile.subscription_all'), - checked: @user.subscription_type == 2, - custom: true %> + checked: @user.subscription_type == 2 %> <%= f.radio_button :subscription_type, 3, label: t('profile.subscription_strict'), - checked: @user.subscription_type == 3, - custom: true %> + checked: @user.subscription_type == 3 %> + <%= f.radio_button :subscription_type, 1, + label: (t('profile.subscription_mixed') + helpdesk(t('profile.subscription_mixed_example'), false)).html_safe, + checked: @user.subscription_type == 1 || + @user.subscription_type.nil? %> <% end %>
diff --git a/app/views/profile/_subscriptions.html.erb b/app/views/profile/_subscriptions.html.erb index 3e6babe8e..989c679ee 100644 --- a/app/views/profile/_subscriptions.html.erb +++ b/app/views/profile/_subscriptions.html.erb @@ -38,8 +38,8 @@ <% Program.includes(divisions: [courses: [lectures: [:term, :teacher]]]) .select { |p| p.courses.any? }.natural_sort_by(&:name_with_subject) .each do |p| %> -
- -
+
<% relevant_notifications.first(5).each do |n| %> + data: { color: 'btn-outline-primary', cy: "create-submission" } %> <%= link_to t('buttons.join'), enter_submission_code_path(submission, params: diff --git a/app/views/submissions/_form.html.erb b/app/views/submissions/_form.html.erb index b765cbddd..f5f81728d 100644 --- a/app/views/submissions/_form.html.erb +++ b/app/views/submissions/_form.html.erb @@ -49,11 +49,13 @@ <%= f.file_field :manuscript, class: 'form-control-file', id: 'upload-userManuscript', + "data-cy": "choose-user-submission-file", multiple: assignment.accepted_file_type == '.pdf', accept: assignment.accepted_for_file_input %> <%= f.hidden_field :detach_user_manuscript, value: false %> @@ -150,12 +152,14 @@
+ id="file-permission-checkbox" + data-cy="file-permission-accept"/> <%= t('submission.assure_third_party') %>
-
- <%= f.label :speaker_ids, - t('admin.talk.speakers'), - class: "form-label" %> - <%= f.select :speaker_ids, - options_for_select(talk.speakers.map { |s| [s.tutorial_info, s.id] }, - talk.speaker_ids), - {}, - { class: 'selectize', - style: 'display: none;', - multiple: true, - data: { ajax: true, - filled: false, - model: 'user', - placeholder: t('basics.enter_two_letters'), - no_results: t('basics.no_results') } } %> +
+ <%= speaker_select(f, talk, with_preselection=true) %>
diff --git a/app/views/talks/_card.html.erb b/app/views/talks/_card.html.erb index 0b440f561..e74dcfad9 100644 --- a/app/views/talks/_card.html.erb +++ b/app/views/talks/_card.html.erb @@ -1,7 +1,8 @@
+ class="card-header <%= talk_card_color(talk, current_user) %>" + data-cy="talk-header" data-id="<%= talk.id %>">
diff --git a/app/views/talks/_new.html.erb b/app/views/talks/_new.html.erb index 5cfa3ae3a..d36f8512e 100644 --- a/app/views/talks/_new.html.erb +++ b/app/views/talks/_new.html.erb @@ -1,4 +1,4 @@ -<%= form_with model: talk do |f| %> +<%= form_with model: talk, html: { data: { cy: 'talk-form' } } do |f| %>
<%= f.label :title, t('basics.title'), @@ -29,22 +29,8 @@
-
- <%= f.label :speaker_ids, - t('admin.talk.speakers'), - class: "form-label" %> - <%= f.select :speaker_ids, - [[]], - {}, - { class: 'selectize', - style: 'display: none;', - multiple: true, - data: { ajax: true, - filled: false, - model: 'user', - placeholder: t('basics.enter_two_letters'), - no_results: t('basics.no_results'), - modal: true } } %> +
+ <%= speaker_select(f, talk, with_preselection=false) %>
<% if lecture.talks.exists? %>
diff --git a/app/views/tutorials/_form.html.erb b/app/views/tutorials/_form.html.erb index 1fe039da7..ba27cff60 100644 --- a/app/views/tutorials/_form.html.erb +++ b/app/views/tutorials/_form.html.erb @@ -1,7 +1,7 @@
- <%= form_with model: tutorial do |f| %> + <%= form_with model: tutorial, data: { cy: 'tutorial-form' } do |f| %>
<%= f.text_field :title, @@ -11,19 +11,29 @@ id="tutorial-title-error">
-
- <%= f.select :tutor_ids, - tutorial_preselection(tutorial), +
+ <% if current_user.admin? %> + <%= f.select :tutor_ids, + tutors_preselection(tutorial), {}, { class: 'selectize', multiple: true, - style: 'display: none;', id: "tutorial_tutor_ids_#{tutorial.id}", data: { ajax: true, filled: false, model: 'user', placeholder: t('basics.enter_two_letters'), no_results: t('basics.no_results') } } %> + <% else %> + <%= f.select :tutor_ids, + tutors_preselection(tutorial), + {}, + { class: 'selectize', + multiple: true, + id: "tutorial_tutor_ids_#{tutorial.id}", + data: { cy: "tutor-select", + no_results: t('basics.no_results_tutor') } } %> + <% end %>
<%= f.submit t('buttons.save'), diff --git a/app/views/tutorials/_row.html.erb b/app/views/tutorials/_row.html.erb index dfda617fe..d1ad8a889 100644 --- a/app/views/tutorials/_row.html.erb +++ b/app/views/tutorials/_row.html.erb @@ -1,5 +1,6 @@
+ data-id="<%= tutorial.id.to_i %>" + data-cy="tutorial-row">
<%= tutorial.title %> diff --git a/app/views/tutorials/_table.html.erb b/app/views/tutorials/_table.html.erb index 761f8e5c9..8d270f540 100644 --- a/app/views/tutorials/_table.html.erb +++ b/app/views/tutorials/_table.html.erb @@ -20,7 +20,7 @@ <% end %>
-
+
<%= render partial: 'tutorials/rows', collection: stack, as: :submission %> diff --git a/app/views/users/_delete_account.html.erb b/app/views/users/_delete_account.html.erb index 6c01e7a44..a384b2118 100644 --- a/app/views/users/_delete_account.html.erb +++ b/app/views/users/_delete_account.html.erb @@ -3,6 +3,7 @@ <%= t('profile.confirm_account_deletion') %> <%= f.password_field :password, class: 'form-control my-2', + "data-cy": "delete-account-pwd-field", required: true %> <% if current_user.contributor? %>
@@ -57,7 +58,8 @@
<%= f.submit t('profile.delete_account'), - class: "btn btn-danger mb-2" %> + class: "btn btn-danger mb-2", + "data-cy": "delete-account-confirm-btn" %>
<% end %> \ No newline at end of file diff --git a/app/views/vouchers/_redeem_editor_voucher.html.erb b/app/views/vouchers/_redeem_editor_voucher.html.erb new file mode 100644 index 000000000..4f964f2be --- /dev/null +++ b/app/views/vouchers/_redeem_editor_voucher.html.erb @@ -0,0 +1,24 @@ +

+ <%= t('profile.become_editor_html', lecture: voucher.lecture.title) %> +

+ +<% if current_user == voucher.lecture.teacher %> + +

+ <%= t('profile.teacher_cant_become_editor') %> + <%= cancel_voucher_button %> +

+ +<% elsif current_user.in?(Redemption.editors_by_redemption_in(voucher.lecture)) %> + +

+ <%= t('profile.already_editor_by_redemption') %> + <%= cancel_voucher_button %> +

+ +<% else %> + + <%= redeem_voucher_button(voucher) %> + <%= cancel_voucher_button %> + +<% end %> diff --git a/app/views/vouchers/_redeem_speaker_voucher.html.erb b/app/views/vouchers/_redeem_speaker_voucher.html.erb new file mode 100644 index 000000000..364a33e8f --- /dev/null +++ b/app/views/vouchers/_redeem_speaker_voucher.html.erb @@ -0,0 +1,44 @@ +

+ <%= t('profile.become_speaker_html', seminar: voucher.lecture.title) %> +

+ +<% if current_user.in?(voucher.lecture.speakers) %> +

+ <%= t('profile.already_speaker_html', + talks: talks_with_titles(current_user, voucher)) %> +

+<% end %> + +<% if voucher.lecture.talks_without_speaker(current_user).any? %> + +

+ <%= t('profile.talks_available') %> +

+ <%= render partial: "vouchers/voucher_redemption_form", locals: { voucher: voucher } %> + +<% elsif voucher.lecture.talks.any? %> + +

+ <%= t('profile.all_talks_taken') %> + <%= cancel_voucher_button %> +

+ +<% else %> + + <% if current_user.in?(Redemption.speakers_by_redemption_in(voucher.lecture)) %> + +

+ <%= t('profile.already_speaker_by_redemption') %> + <%= cancel_voucher_button %> +

+ + <% else %> + +

+ <%= t('profile.no_talks_redemption') %> + <%= redeem_voucher_button(voucher) %> + <%= cancel_voucher_button %> +

+ + <% end %> +<% end %> \ No newline at end of file diff --git a/app/views/vouchers/_redeem_teacher_voucher.html.erb b/app/views/vouchers/_redeem_teacher_voucher.html.erb new file mode 100644 index 000000000..f52d3f515 --- /dev/null +++ b/app/views/vouchers/_redeem_teacher_voucher.html.erb @@ -0,0 +1,16 @@ +<% if current_user == voucher.lecture.teacher %> + +

+ <%= t('profile.already_teacher_html', lecture: voucher.lecture.title) %> + <%= cancel_voucher_button %> +

+ +<% else %> + +

+ <%= t('profile.become_teacher_html', lecture: voucher.lecture.title) %> + <%= redeem_voucher_button(voucher) %> + <%= cancel_voucher_button %> +

+ +<% end %> diff --git a/app/views/vouchers/_redeem_tutor_voucher.html.erb b/app/views/vouchers/_redeem_tutor_voucher.html.erb new file mode 100644 index 000000000..8d036813f --- /dev/null +++ b/app/views/vouchers/_redeem_tutor_voucher.html.erb @@ -0,0 +1,44 @@ +

+ <%= t('profile.become_tutor_html', lecture: voucher.lecture.title) %> +

+ +<% if current_user.in?(voucher.lecture.tutors) %> +

+ <%= t('profile.already_tutor_html', + tutorials: tutorials_with_tutor_titles(current_user, voucher)) %> +

+<% end %> + +<% if voucher.lecture.tutorials_without_tutor(current_user).any? %> + +

+ <%= t('profile.tutorials_available') %> +

+ <%= render partial: "vouchers/voucher_redemption_form", locals: { voucher: voucher } %> + +<% elsif voucher.lecture.tutorials.any? %> + +

+ <%= t('profile.all_tutorials_taken') %> + <%= cancel_voucher_button %> +

+ +<% else %> + + <% if current_user.in?(Redemption.tutors_by_redemption_in(voucher.lecture)) %> + +

+ <%= t('profile.already_tutor_by_redemption') %> + <%= cancel_voucher_button %> +

+ + <% else %> + +

+ <%= t('profile.no_tutorials_redemption') %> + <%= redeem_voucher_button(voucher) %> + <%= cancel_voucher_button %> +

+ + <% end %> +<% end %> diff --git a/app/views/vouchers/_voucher.html.erb b/app/views/vouchers/_voucher.html.erb new file mode 100644 index 000000000..7a5014787 --- /dev/null +++ b/app/views/vouchers/_voucher.html.erb @@ -0,0 +1,71 @@ +<% voucher = lecture.active_voucher_of_role(role) %> + +
+ +

+ <%= t("basics.voucher_for", role: t("basics.#{role}s")) %> + <%= helpdesk(t("admin.lecture.info.voucher_for_#{role}"), html=false) %> +

+ + <% if voucher %> + +
+ + +
+ + <% else %> + +

+ <%= t('admin.lecture.no_active_voucher', + role: t("basics.voucher_for", role: t("basics.#{role}s"))) %> +

+ <% end %> + + + <% if voucher %> + <%= link_to invalidate_voucher_path(voucher), + class: 'btn btn-outline-danger', + data: { toggle: 'tooltip', placement: 'bottom', + confirm: t('admin.voucher.sure_to_delete'), + cy: "invalidate-#{role}-voucher-btn" }, + style: 'text-decoration: none;', + method: :post, remote: true do %> + + <%= t('buttons.invalidate') %> + <% end %> + <% else %> + <%= link_to vouchers_path(params: { lecture_id: lecture.id, role: role }), + class: 'btn btn-outline-primary', + data: {toggle: 'tooltip', placement: 'bottom', cy: "create-#{role}-voucher-btn"}, + method: :post, remote: true do %> + + <%= t('buttons.create_voucher') %> + <% end %> + <% end %> + +
+ + +<% if voucher %> +
+ <%= t('admin.voucher.expires_at') %>: + <%= l(voucher.expires_at, format: :long) %> + + <%= voucher.expires_at %> + +
+<% end %> diff --git a/app/views/vouchers/_voucher_redemption_form.html.erb b/app/views/vouchers/_voucher_redemption_form.html.erb new file mode 100644 index 000000000..befa4b0f2 --- /dev/null +++ b/app/views/vouchers/_voucher_redemption_form.html.erb @@ -0,0 +1,17 @@ +<%= form_with url: redeem_voucher_path, + remote: true, + method: :post, + html: { class: "form-inline" } do |f| %> + + <%= f.hidden_field :secure_hash, value: voucher.secure_hash %> + +
+ + <%= claim_select_field(f, current_user, voucher) %> + + <%= f.submit t('profile.redeem_voucher'), class: "btn btn-primary", + data: { cy: "claim-submit"} %> + <%= cancel_voucher_button %> +
+ +<% end %> \ No newline at end of file diff --git a/app/views/vouchers/cancel.js.erb b/app/views/vouchers/cancel.js.erb new file mode 100644 index 000000000..dbbd25178 --- /dev/null +++ b/app/views/vouchers/cancel.js.erb @@ -0,0 +1,2 @@ +$("#redeem-voucher").empty() + .append("<%= j render partial: 'profile/verify_voucher' %>"); diff --git a/app/views/vouchers/create.js.erb b/app/views/vouchers/create.js.erb new file mode 100644 index 000000000..6d02f9ee5 --- /dev/null +++ b/app/views/vouchers/create.js.erb @@ -0,0 +1,4 @@ +$("#<%= @role %>-voucher").empty() + .append("<%= j render partial: 'vouchers/voucher', locals: { lecture: @lecture, role: @role } %>"); + +initBootstrapPopovers(); diff --git a/app/views/vouchers/error.js.erb b/app/views/vouchers/error.js.erb new file mode 100644 index 000000000..debc3873c --- /dev/null +++ b/app/views/vouchers/error.js.erb @@ -0,0 +1 @@ +alert("<%= "#{j(error_message)}" %>"); diff --git a/app/views/vouchers/invalidate.js.erb b/app/views/vouchers/invalidate.js.erb new file mode 100644 index 000000000..6d02f9ee5 --- /dev/null +++ b/app/views/vouchers/invalidate.js.erb @@ -0,0 +1,4 @@ +$("#<%= @role %>-voucher").empty() + .append("<%= j render partial: 'vouchers/voucher', locals: { lecture: @lecture, role: @role } %>"); + +initBootstrapPopovers(); diff --git a/app/views/vouchers/verify.js.erb b/app/views/vouchers/verify.js.erb new file mode 100644 index 000000000..5a77f0735 --- /dev/null +++ b/app/views/vouchers/verify.js.erb @@ -0,0 +1,7 @@ +$("#redeem-voucher").empty() + .append("<%= j render partial: 'vouchers/redeem_' + @voucher.role + '_voucher', + locals: { voucher: @voucher } %>"); + +$(".selectize").each(function () { + new TomSelect("#" + this.id, { plugins: ["remove_button"] }); +}); diff --git a/config/application.rb b/config/application.rb index a1093b31f..de5fae844 100644 --- a/config/application.rb +++ b/config/application.rb @@ -12,6 +12,12 @@ class Application < Rails::Application config.load_defaults(7.1) config.autoloader = :zeitwerk + # Autoload subfolders of modules (recursively) + # https://stackoverflow.com/a/4794775/ + additional_paths = Rails.root.glob("app/models/**/") + config.autoload_paths += additional_paths + config.eager_load_paths += additional_paths + # Autoload lib extensions path config.autoload_lib(ignore: ["assets", "collectors", "core_ext", "scrapers", "tasks"]) @@ -25,7 +31,6 @@ class Application < Rails::Application # See: https://guides.rubyonrails.org/v7.1/configuring.html#config-active-support-message-serializer Rails.application.config.active_support.message_serializer = :json - # config.eager_load_paths << Rails.root.join("extras") # Make `form_with` generate remote forms by default. config.action_view.form_with_generates_remote_forms = true # Settings in config/environments/* take precedence over those specified here. diff --git a/config/database.yml b/config/database.yml index 747a89c11..964d81a7d 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,9 +1,3 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -# default: &default adapter: postgresql pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> @@ -74,8 +68,6 @@ test: migrations_paths: db/interactions_migrate production: - # <<: *default - # database: db/development.sqlite3 primary: adapter: <%= ENV['PRODUCTION_DATABASE_ADAPTER'] ||= 'postgresql' %> encoding: <%= ENV['PRODUCTION_DATABASE_ENCODING'] %> diff --git a/config/locales/de.yml b/config/locales/de.yml index fa4875bc7..c4a46ad83 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -78,7 +78,7 @@ de: Deiner Profilseite Zugriff erhalten. footer: text_html: > - © MaMpf Team 2023. MaMpf ist auf %{github}. + © MaMpf Team 2024. MaMpf ist auf %{github}. Powered by %{rails}, %{bootstrap}, %{cytoscape}, %{nerdamer}, %{katex}, %{thredded}, %{docker}, %{basecamp}. Bugs meldest Du am besten %{bugs}. @@ -497,6 +497,8 @@ de: import_chapters: Kapitel importieren import_sections: Abschnitte importieren import_tags: Tags importieren + no_active_voucher: > + Es gibt keinen aktiven %{role} für diese Veranstaltung. info: course: > Hier kannst Du das Modul auswählen, zu dem diese @@ -511,6 +513,26 @@ de: sich nicht selbst um das Einstellen von Materialien kümmern, so kann dies durch zusätzliche VeranstaltungseditorInnen geschehen. + teacher_fixed: > + Die DozentIn sollte im Normalfall diejenige Person sein, + die die Veranstaltung hält. Möchte die entsprechende Person + sich nicht selbst um das Einstellen von Materialien + kümmern, so kann dies durch zusätzliche + VeranstaltungseditorInnen geschehen. Soll die DozentIn geändert + werden, so kann dies dadurch geschehen, dass ein Gutschein erstellt + wird, der an die neue DozentIn weitergegeben wird und von dieser + in ihrem Nutzerprofil eingelöst wird. Die bisherige DozentIn wird + dann automatisch VeranstaltungeditorIn. + teacher_fixed_new_lecture: > + Die DozentIn sollte im Normalfall diejenige Person sein, + die die Veranstaltung hält. Solltest Du nicht DozentIn der + Veranstaltung sein, so kannst Du sie erstmal mit Dir als DozentIn + anlegen und danach an die entsprechende Person übertragen. + Dies geschieht dadurch, dass auf der Veranstaltungsbearbeitungsseite + im Tab "Personen/Tutorien" ein Gutschein erstellt wird, + der an die neue DozentIn weitergegeben + wird und von dieser in ihrem Nutzerprofil eingelöst wird. + Du wirst dann automatisch VeranstaltungeditorIn. workflow: > Wir beschreiben im Folgenden sinnvolle Workflows. Hierbei sollte man unterscheiden, ob die Veranstaltung @@ -610,7 +632,13 @@ de: bearbeitungsberechtigte Personen, die verschieden von der DozentIn und von den ModuleditorInnen sind. Das können z.B. VeranstaltungsassistentInnen sein, die Materialien zur - Veranstaltung einpflegen. + Veranstaltung einpflegen. Du kannst nur Personen auswählen, + die von Ihrem Rechtestatus her dafür in Frage kommen. + Um den entsprechenden Rechtestatus an Personen zu vergeben, + die ihn bisher noch nicht haben, musst Du einen Gutschein + erstellen und diesen an die entsprechende Person weitergeben. + Die Person kann dann den Gutschein auf ihrer Profilseite einlösen + und wird dadurch zusätzliche VeranstaltungseditorIn. subscribers_count: > Das ist die Zahl aller NutzerInnen, die diese Veranstaltung in ihrem Profil abonniert haben. @@ -727,6 +755,22 @@ de: Hausaufgaben noch Dateiuploads möglich sind (diese werden aber dann aber als verspätet gekennzeichnet und mit einem Zeitstempel versehen.) section_needed: Bitte erstelle zuerst einen Abschnitt + voucher_for_tutor: > + Gutscheine für TutorInnen können von NutzerInnen eingelöst werden, um + TutorInnenstatus für diese Veranstaltung zu erhalten und direkt + Tutorien zu übernehmen. + voucher_for_editor: > + Gutscheine für EditorInnen können von NutzerInnen eingelöst werden, um + EditorInnenstatus für diese Veranstaltung zu erhalten. + voucher_for_teacher: > + Gutscheine für DozentInnen können von NutzerInnen eingelöst werden, um + DozentInnenstatus für diese Veranstaltung zu erhalten. Die bisherige + DozentIn wird dann EditorIn. Ein solcher Gutschein wird direkt nach + dem Einlösen für ungültig erklärt. + voucher_for_speaker: > + Gutscheine für Vortragende können von NutzerInnen eingelöst werden, um + Vortragendenstatus für das Seminar zu erhalten und direkt Vorträge + zu übernehmen. show_media: 'Medien einblenden' workflow: 'Workflow' content_mode: 'Inhaltsermittlung' @@ -1007,6 +1051,15 @@ de: nicht gesetzt sein, wenn es sich bei dem Text noch um einen Entwurf handelt). Du kannst als DozentIn diesen Text von der Vortragsseite entfernen. + speakers: > + Hier kannst Du die Vortragenden eintragen. Diese können + den Vortrag bearbeiten und Medien hinzufügen. Du kannst nur Personen + auswählen, die den Status "Vortragender" in dem Seminar haben, + dazu EditorInnen und Dich selbst. Um Studierenden des Status + eines Vortragenden zu geben, musst Du unter "Personen/Tutorien" einen + Gutschein erstellen, den die Studierenden einlösen können. + Der Gutschein muss außerhalb von MaMpf an die Studierenden verteilt + werden lesson: edit: 'Sitzung bearbeiten' inspect: 'Sitzung ansehen' @@ -2051,6 +2104,16 @@ de: new: 'Neues Tutorium anlegen' assignment: new: 'Neue Hausaufgabe anlegen' + voucher: + secure_hash: 'Sicherheits-Hash' + expires_at: 'Läuft ab' + sure_to_delete: 'Bist Du sicher, dass Du diesen Gutschein löschen möchtest?' + general_explanation: > + Wenn Du jemandem eine Rolle zuweisen möchtest (z.B. jemanden zum Tutor machen), + kannst Du hier einen Gutschein erstellen. Dies ist ein spezieller Code, + den die Person in ihrem Profil einlösen kann, um die Rolle zu erhalten. + Du solltest den Code über ein anderes Medium an die Person senden, + z.B. per E-Mail. profile: account: 'Account' name: 'Anzeigename' @@ -2067,13 +2130,16 @@ de: secondary_lectures: 'Weitere Veranstaltungen' no_lectures: 'Zu diesem Modul gibt es im Moment noch keine Veranstaltungen.' passphrase: 'Zugangsschlüssel' - preferences: 'Einstellungen' content_info: > - MaMpf liefert eine Vielzahl von verknüpften Inhalten. - Ich möchte verknüpfte Inhalte (wenn diese freigegeben sind) + Mit dem Tag-Graphen kannst du nach Stichwörtern suchen und verknüpfte + Inhalte sehen. Ich möchte verknüpfte Inhalte (wenn diese freigegeben sind) subscription_mixed: > - auch aus allen Modulen sehen, die sich inhaltlich vor den von mir - abonnierten Modulen einsortieren. + aus den von mir abonnierten Modulen sehen sowie aus allen Modulen, die + als Grundlage für das gesuchte Modul dienen. + subscription_mixed_example: > + Z.B. suchst du nach einem Stichwort aus Algebra 1 und siehst auch + verwandte Stichwörter aus Lineare Algebra 1 und 2, wenn du diese + Option auswählst. Denn Algebra 1 baut auf Lineare Algebra auf. subscription_all: 'aus allen Modulen sehen.' subscription_strict: > ausschließlich aus den von mir abonnierten Modulen sehen. @@ -2121,6 +2187,8 @@ de: changes_made: > Es gibt ungespeicherte Änderungen. Bitte denke daran, diese zu speichern, damit die Änderungen wirksam werden. + changes_made_btn: > + Klicke hier, um Deine Änderungen zu übernehmen. email_for_submissions: > Bezüglich der Abgabe von Übungsblättern möchte ich per E-Mail von MaMpf benachrichtigt werden, wenn: @@ -2172,15 +2240,70 @@ de: media_search: Mediensuche my_data: Welchen Daten werden über mich gespeichert? data_explanation: > - Im Rahmen der Services, die Mampf anbietet, werden einige Daten über User - gespeichert. Neben den oben aufgeführten Daten werden essentielle Informationen - wie Deine abonnierten Vorlesungen oder eingereichte Abgaben gespeichert. Mit dem - folgenden Knopf kannst Du alle Daten, die wir über Dich speichern, anfordern. Wir - werden sie an Deine bei MaMpf hinterlegte E-Mail schicken. + Wir speichern bei MaMpf bestimmte Daten über Dich, um Dir die Nutzung + der Plattform zu ermöglichen. Hier kannst Du eine Übersicht dieser Daten + anfordern, die wir Dir dann per E-Mail zusenden. data_request: > Daten anfordern data_request_sent: > - Wir haben Deine Anfrage erhalten und werden Dir Deine Daten zeitnah schicken. + Wir haben Deine Anfrage erhalten und werden Dir Deine Daten in wenigen + Minuten per Mail senden. + redeem_voucher: Gutschein einlösen + redeem_voucher_explainer: > + Hier kannst Du einen Gutscheincode eingeben, um eine Rolle zu übernehmen, + z.B. wenn Du einen Gutschein per Mail erhalten hast (der von Deiner + DozentIn generiert wurde). + become_tutor_html: > + Mit diesem Gutschein erhältst Du TutorInnenstatus für + %{lecture}. + tutorials_available: > + Wenn Du schon weißt, welche Tutorien du übernimmst, kannst Du diese hier + auswählen. Ansonsten lasse das Feld frei, dann kannst Du dennoch den + Gutschein einlösen, damit Dich die DozentIn später den Tutorien zuweisen kann. + already_tutor_html: > + Du bist bereits als TutorIn eingetragen für: %{tutorials}. + no_tutorials_redemption: > + Nachdem Du den Gutschein eingelöst hast, kann Dich die DozentIn den + Tutorien zuweisen. + select_tutorials: Tutorien auswählen + all_tutorials_taken: > + Es sind keine weiteren Tutorien verfügbar, die Du noch übernehmen kannst. + already_tutor_by_redemption: > + Du hast diesen Gutschein bereits eingelöst, um TutorInnenstatus zu erhalten. + become_editor_html: > + Mit diesem Gutschein erhältst Du EditorInnenstatus für + %{lecture}. + already_editor_by_redemption: > + Du hast bereits einen Gutschein eingelöst, um EditorInnenstatus zu + erhalten. Die anderen VeranstaltungseditorInnen und die DozentIn werden + benachrichtigt, wenn Du den Gutschein einlöst. + teacher_cant_become_editor: > + Du bist bereits DozentIn und kannst daher nicht zusätzlich EditorIn werden. + become_teacher_html: > + Mit diesem Gutschein erhältst Du DozentInnenstatus für + %{lecture}. + Die bisherige DozentIn wird zur EditorIn herabgestuft. + already_teacher_html: > + Du bist bereits DozentIn für %{lecture}. + become_speaker_html: > + Mit diesem Gutschein erhältst Du Vortragendenstatus im Seminar + %{seminar}. + already_speaker_html: > + Du bist bereits VortragendeR für: %{talks}. + talks_available: > + Wenn Du schon weißt, welche Vorträge du übernimmst, kannst Du diese hier + auswählen. Ansonsten lasse das Feld frei, dann kannst Du dennoch den + Gutschein einlösen, damit Dich die DozentIn später den Vorträgen zuweisen + kann. + no_talks_redemption: > + Nachdem Du den Gutschein eingelöst hast, kann Dich die DozentIn den + Vorträgen zuweisen. + all_talks_taken: > + Es sind keine weiteren Vorträge verfügbar, die Du noch übernehmen kannst. + already_speaker_by_redemption: > + Du hast diesen Gutschein bereits eingelöst, um Vortragendenstatus + zu erhalten. + select_talks: Vorträge auswählen mampf_news: title: 'MaMpf-News' check_notifications: 'Alle erledigen' @@ -2216,6 +2339,26 @@ de: new_post_html: 'Im %{board} gibt es ein ungelesenes Thema.' new_posts_html: 'Im %{board} gibt es %{count} ungelesene Themen.' no_notifications: 'Es liegen keine neuen Benachrichtigungen für Dich vor.' + became_tutor: > + %{user} hat einen TutorInnen-Gutschein eingelöst und ist jetzt TutorIn in der + Veranstaltung. + became_editor: > + %{user} hat einen EditorInnen-Gutschein eingelöst und ist jetzt EditorIn in der + Veranstaltung. + became_teacher: > + %{user} hat einen DozentInnen-Gutschein eingelöst und ist jetzt DozentIn + der Veranstaltung. + became_speaker: > + %{user} hat einen Vortragenden-Gutschein eingelöst und ist jetzt VortragendeR + im Seminar. + tutorial_details: > + Neu übernommene Tutorien: %{tutorials}. + talk_details: > + Neu übernommene Vorträge: %{talks}. + redemption: 'Gutschein eingelöst:' + redemption_in_lecture: 'Gutschein eingelöst in %{lecture}' + no_tutorials_taken: 'Dabei wurden keine Tutorien übernommen.' + no_talks_taken: 'Dabei wurden keine Vorträge übernommen.' lecture: content: 'Veranstaltungsinhalt' unpublished: 'Diese Veranstaltung ist unveröffentlicht.' @@ -3001,6 +3144,16 @@ de: Der Code ist gültig. Er gehört zu NutzerIn %{user} und zum Quiz %{quiz}. certificate_invalid: Der Code ist ungültig. teams_as_csv: Teams als .csv + info: + tutors: > + Hier kannst Du TutorInnen für dieses Tutorium eintragen. + Diese können Abgaben einsehen und Korrekturen hochladen. + Du kannst nur Personen auswählen, die den Status "TutorIn" in der + Veranstaltung haben, dazu EditorInnen und Dich selbst. + Um Studierenden den Status einer TutorIn zu geben, musst Du + einen Gutschein erstellen, den die Studierenden einlösen können. + Der Gutschein muss außerhalb von MaMpf an die Studierenden verteilt + werden. bulk_upload: report: Bericht zum Paketupload der Korrekturen number_of_submissions: Anzahl der Abgaben @@ -3091,6 +3244,20 @@ de: text: 'Text' new_editor_subject: 'EditorInnenrechte für %{title}' new_editor: 'Hallo %{username}, Du hast soeben Bearbeitungsrechte für %{title} erhalten.' + new_teacher_subject: 'DozentInnenstatus für %{title}' + new_teacher: 'Hallo %{username}, Du hast soeben DozentInnenstatus für %{title} erhalten.' + previous_teacher_subject: 'DozentInnenwechsel in %{title}' + previous_teacher: > + Hallo %{username}, in der Veranstaltung %{title} gab es einen + DozentInnenwechsel. %{new_teacher} hat einen DozentInnengutschein eingelöst + und ist jetzt DozentIn. Du bist nicht mehr DozentIn in %{title}, sondern + stattdessen VeranstaltungseditorIn. + new_speaker_subject: 'WeitereR VortragendeR für %{seminar}, %{title}' + new_speaker: > + Hallo %{username}, im Seminar %{seminar} hat sich %{speaker} + als weitereR VortragendeR für %{title} eingetragen. + Wende Dich bitte an Deine DozentIn, wenn Du denkst, dass hier ein Fehler + passiert ist. new_lecture_subject: 'Neue Veranstaltung %{title}' new_lecture: 'Es wurde eine neue Veranstaltung angelegt: %{title}.' subscribe_lecture: > @@ -3462,6 +3629,27 @@ de: together_with: zusammen mit enter_two_letters: mind. 2 Zeichen eingeben no_results: Keine Resultate gefunden + no_results_tutor: > + Keine Resultate gefunden.

Beachte, dass Du ab sofort nur noch nach + Personen suchen kannst, die bereits als TutorInnen eingetragen sind oder + die den Tutor-Status mithilfe eines Gutscheins erhalten haben. Einen + solchen Gutschein kannst Du im Bereich Gutscheine generieren. + no_results_editor: > + Keine Resultate gefunden.

Beachte, dass Du ab sofort nur noch nach + Personen suchen kannst, die bereits als EditorInnen eingetragen sind oder + die den Editor-Status mithilfe eines Gutscheins erhalten haben. Einen + solchen Gutschein kannst Du im Bereich Gutscheine generieren. + no_results_speaker: > + Keine Resultate gefunden.

Beachte, dass Du ab sofort nur noch nach + Personen suchen kannst, die bereits als Vortragende eingetragen sind oder + die den Vortrags-Status mithilfe eines Gutscheins erhalten haben. Einen + solchen Gutschein kannst Du im Bereich Gutscheine generieren, der + sich hier im Personen-Tab befindet. + editors: EditorInnen + vouchers: Gutscheine + voucher_for: Gutschein für %{role} + speaker: Vortragender + speakers: Vortragende access: unpublished: 'unveröffentlicht' all: 'frei' @@ -3492,6 +3680,7 @@ de: create_program: 'Studiengang anlegen' create_subject: 'Fach anlegen' create_division: 'Teilbereich anlegen' + create_voucher: 'Gutschein anlegen' create: 'Anlegen' edit: 'Bearbeiten' content: 'Inhalt' @@ -3568,6 +3757,10 @@ de: cancel_publication: 'Stornieren' import_lecture_toc: 'Gliederung importieren' import_toc: 'Importieren' + become_editor: 'EditorIn werden' + verify_voucher: 'Gutschein prüfen' + edit_talk: 'Vortrag bearbeiten' + invalidate: 'Für ungültig erklären' warnings: save_before: > Du musst zunächst die anderen Änderungen speichern oder verwerfen. @@ -3685,6 +3878,12 @@ de: abgegeben werden. no_assignments_in_lecture: > In dieser Veranstaltung gibt es bisher keine Hausaufgaben. + no_voucher: 'Ein Gutschein mit der angeforderten id existiert nicht.' + voucher_invalid: 'Der Gutschein ist ungültig.' + become_tutor_success: 'Dein Tutorenstatus wurde geupdatet.' + become_editor_success: 'Dein Editorenstatus wurde geupdatet.' + become_teacher_success: 'Dein DozentInnenstatus wurde geupdatet.' + become_speaker_success: 'Dein Vortragendenstatus wurde geupdatet.' tutorials: destruction_failed: > Das Tutorium konnte nicht gelöscht werden. Das kann z.B. daran liegen, @@ -3927,6 +4126,13 @@ de: out_of_range: > Das abgegebene Votum ist leider außerhalb des zulässingen Bereiches. + voucher: + attributes: + role: + only_one_active: > + Für diese Vorlesung kann es nur einen aktiven Gutschein dieses Typs geben. + speaker_vouchers_only_for_seminars: > + Vortragenden-Gutscheine können nur für Seminare erstellt werden. watchlist_entry: attributes: medium_id: diff --git a/config/locales/en.yml b/config/locales/en.yml index 454915f45..21583753e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -101,7 +101,7 @@ en: You may get access by modifying your account settings. footer: text_html: > - © MaMpf Team 2023. MaMpf is on %{github}. + © MaMpf Team 2024. MaMpf is on %{github}. Powered by %{rails}, %{bootstrap}, %{cytoscape}, %{nerdamer}, %{katex}, %{thredded}, %{docker}, %{basecamp}. Bugs can be reported %{bugs}. @@ -496,6 +496,8 @@ en: import_chapters: import chapters import_sections: import sections import_tags: import tags + no_active_voucher: > + There is no active %{role} for this event series. info: course: > Here you can select the course to which this event series belongs. @@ -507,6 +509,25 @@ en: Normally this should be the person that actually gives the event series. If this person does not want to upload materials himself or herself, additional event series editors can do this instead. + teacher_fixed: > + Normally the teacher should be the person that actually gives the + event series. If this person does not want to upload materials + himself or herself, additional event series editors can do this + instead. If the teacher needs to be changed, proceed as follows: + Create a voucher for teachers and communicate the voucher to the new + teacher outside of MaMpf. This person can then redeem the voucher + in their profile settings and will become the new teacher. + The previous teacher will be demoted to editor. + teacher_fixed_new_lecture: > + Normally the teacher should be the person that actually gives the + event series. If you are not the actual teacher, you can create + the lecture nonetheless with you as teacher and then transfer it + to the new teacher. For that, proceed as follows: + Create a voucher for teachers in the "People/Tutorials" tab on the + lecture's edit page and communicate the voucher to the new teacher + outside of MaMpf. This person can then redeem the voucher + in their profile settings and will become the new teacher. + You will then automatically be demoted to editor. workflow: > These are possible workflows. The workflow depends on whether the event series is @@ -591,7 +612,11 @@ en: lecture_editors: > Additional event series editors can edit event series, but are neither teacher nor course editor, e.g. teaching assistants uploading - materials for an event series. + materials for an event series. You can select only users who are + eligible. In order to grant editing status to users who + are not yet eligible you have to create a voucher and communicate the + voucher to the user outside of MaMpf. The user can then redeem the + voucher in their profile settings and will become a lecture editor. subscribers_count: > This is the number of all users subscribed to this event series in their profile settings. @@ -696,6 +721,20 @@ en: grace period is expired will be accepted by the system, but will be timestamped and marked as "too late". section_needed: Please create a section first + voucher_for_tutor: > + Vouchers for tutors can be redeemed by users to obtain tutor status + for this event series and to directly take over tutorials. + voucher_for_editor: > + Vouchers for editors can be redeemed by users to obtain + editor status for this event series. + voucher_for_teacher: > + Vouchers for teachers can be redeemed by users to obtain teacher + status for this event series. The previous teacher will be demoted + and becomes an editor. Such a voucher will be invalidated directly + after its redemption. + voucher_for_speaker: > + Vouchers for speakers can be redeemed by users to obtain speaker + status for this seminar and to directly take over talks. show_media: 'Show media' workflow: 'Workflow' content_mode: 'Content determination' @@ -955,6 +994,14 @@ en: talk's page (this box will typically be unchecked if the text is still preliminary). You can remove the text from the talk's page as teacher. + speakers: > + Here you can select the speakers of the talk. They can edit the talk + and add media to it. You can only select users who have the status of + speaker in the seminar, or editors or yourself. In order to grant + students the status of speaker, you have to create a voucher in + the "People/Tutorials" tab. You have to communicate the voucher to + the students outside of MaMpf. The voucher can then be redeemed by the + students. lesson: edit: 'Edit Session' inspect: 'Inspect Session' @@ -1929,6 +1976,15 @@ en: new: 'Add tutorial' assignment: new: 'Add assignment' + voucher: + secure_hash: 'Secure Hash' + expires_at: 'Expires at' + sure_to_delete: 'Are you sure you want to delete this voucher?' + general_explanation: > + If you want to assign somebody a role (e.g. make them a tutor), you can + create a voucher. This is a special code that the person can redeem in + their profile to get the role, e.g. to become a tutor for your lecture. + You should send the code to the person via a different medium, e.g. email. profile: account: 'Account' name: 'Display name' @@ -1945,12 +2001,16 @@ en: secondary_lectures: 'Secondary event series' no_lectures: 'There are no event series available for this course yet.' passphrase: 'Passphrase' - preferences: 'Preferences' content_info: > - MaMpf can show you related content. - I want to see related content (if it is released for me) + With the tag graph, you can search for keywords and see related content. + I want to see related content (if it is released) subscription_mixed: > - from courses I have subscribed to and from courses that these build upon. + from the courses I have subscribed to as well as from all courses that + serve as a basis for the searched course. + subscription_mixed_example: > + For example, if you search for a keyword from Algebra 1, you will also see + related keywords from Linear Algebra 1 and 2 if you select this option. + This is because Algebra 1 builds on Linear Algebra 1 and 2. subscription_all: 'from all courses.' subscription_strict: 'only from the courses I have subscribed to.' no_notifications: > @@ -1995,6 +2055,8 @@ en: changes_made: > There are unsaved changes. In order to make them apply you have to save them. + changes_made_btn: > + Click here to save your changes. email_for_submissions: > Regarding the submission of homework assignments I wand to be notified by MaMpf via email if @@ -2043,14 +2105,68 @@ en: unstar_lecture: Remove Lecture from Fast Access my_talks: My talks media_search: Search media - my_data: What data is saved about me? + my_data: What data is stored about me? data_explanation: > - Within the framework of the services offered by Mampf, some data about users will be - stored. All of your data that is not listed above are listed here. + We store some data about you at MaMpf to enable you to use the platform. + Here you can request an overview of this data, which we will then send + to you by email. data_request: > Request data data_request_sent: > - We have received your request and will send you your data as soon as possible. + We have received your request and will send you your data by mail + in a few minutes. + redeem_voucher: Redeem Voucher + redeem_voucher_explainer: > + Here you can enter a voucher code to take on a role, e.g. when you + received a voucher generated by your teacher via email. + become_tutor_html: > + With this voucher, you obtain tutor status for + %{lecture}. + tutorials_available: > + If you already know which tutorials you will be responsible for, you can + select them here. Otherwise, leave the field empty; then you can still + redeem the voucher so that the teacher can assign you tutorials later. + already_tutor_html: > + You are already registered as a tutor for: %{tutorials}. + no_tutorials_redemption: > + After having redeemed the voucher, the teacher can assign you + to the tutorials. + select_tutorials: Select Tutorials + all_tutorials_taken: > + There are no more tutorials available for this lecture that you can take + over. + already_tutor_by_redemption: > + You have already redeemed this voucher to become a tutor. + become_editor_html: > + With this voucher, you obtain editor status for + %{lecture}. + already_editor_by_redemption: > + You have already redeemed an editor voucher for this event series. + teacher_cant_become_editor: > + You are already a teacher and therefore cannot additionally become + an editor. + become_teacher_html: > + With this voucher, you obtain teacher status for + %{lecture}. + The former teacher will be demoted to editor. + already_teacher_html: > + You are already the teacher for %{lecture}. + become_speaker_html: > + With this voucher, you will obtain speaker status for the seminar + %{seminar}. + already_speaker_html: > + You are already registered as speaker for: %{talks}. + talks_available: > + If you already know which talks you will be responsible for, you can + select them here. Otherwise, leave the field empty; then you can still + redeem the voucher so that the teacher can assign you talks later. + no_talks_redemption: > + After having redeemed the voucher, the teacher can assign you to the talks. + all_talks_taken: > + There are no more talks available for this seminar that you can take over. + already_speaker_by_redemption: > + You have already redeemed this voucher to become a speaker. + select_talks: Select Talks mampf_news: title: 'MaMpf News' check_notifications: 'Clear all' @@ -2086,6 +2202,26 @@ en: new_post_html: 'There is an unread topic in the %{board}.' new_posts_html: 'There are %{count} unread topics in the %{board}.' no_notifications: 'There are no new notifications for you.' + became_tutor: > + %{user} has redeemed a tutor voucher and has therefore become tutor + in the event series. + became_editor: > + %{user} has redeemed an editor voucher and has therefore become editor + in the event series. + became_teacher: > + %{user} has redeemed a teacher voucher and has therefore become teacher + in the event series. + became_speaker: > + %{user} has redeemed a speaker voucher and has therefore become speaker + in the seminar. + tutorial_details: > + Tutorials taken over: %{tutorials}. + talk_details: > + Talks taken over: %{talks}. + redemption: 'Voucher redeemed:' + redemption_in_lecture: 'Voucher redeemed in %{lecture}' + no_tutorials_taken: 'No tutorials have been taken over by the redemption.' + no_talks_taken: 'No talks have been taken over by the redemption.' lecture: content: 'Event series contents' unpublished: 'This event series is unpublished.' @@ -2824,6 +2960,15 @@ en: The code is valid. It belongs to user %{user} and quiz %{quiz}. teams_as_csv: Teams as .csv certificate_invalid: This code is invalid. + info: + tutors: + Here you can select the tutors of the tutorial. They can view + the submissions and upload corrections. + You can only select users who have the status of tutor in the + event series, or editors or yourself. In order to grant students the + status of tutor, you have to create a voucher. + You have to communicate the voucher to the students outside + of MaMpf. The students can then redeem the voucher. bulk_upload: report: Report on the bulk upload of the corrections number_of_submissions: Number of submissions @@ -2907,6 +3052,19 @@ en: text: 'Text' new_editor_subject: 'Editing Rights for %{title}' new_editor: 'Dear %{username}, you have been given editing rights for %{title}.' + new_teacher_subject: 'Teacher Status for %{title}' + new_teacher: 'Dear %{username}, you have been given teacher status for %{title}.' + previous_teacher_subject: 'Teacher Change for %{title}' + previous_teacher: > + Dear %{username}, ther has been a teacher change for %{title}. + %{new_teacher} has redeemed a teacher voucher and is now the teacher for + this event series. You are no longer teacher for %{title}, but + editor instead. + new_speaker_subject: 'Additional speaker for %{seminar}, %{title}' + new_speaker: > + Dear %{username}, in the seminar %{seminar}, %{speaker} has + registered as an additional speaker for %{title}. + Please contact your teacher if you think this happened by mistake. new_lecture_subject: 'New event series %{title}' new_lecture: 'A new event series has been made available: %{title}.' subscribe_lecture: 'You can subscribe to it in your profile settings.' @@ -3275,6 +3433,25 @@ en: together_with: together with enter_two_letters: enter at least 2 letters no_results: No results found + no_results_tutor: > + No results found.

Note that from now on you can only search for + people who are already registered as tutors or who have obtained tutor + status using a voucher. You can generate such a voucher in the + Vouchers section. + no_results_editor: > + No results found.

Note that from now on you can only search for + people who are already registered as editors or who have obtained editor + status using a voucher. You can generate such a voucher in the + Vouchers section. + no_results_speaker: > + No results found.

Note that from now on you can only search for + people who are already registered as speakers or who have obtained speaker + status using a voucher. You can generate such a voucher in the + Vouchers section here in the People tab. + vouchers: Vouchers + voucher_for: Voucher for %{role} + speaker: Speaker + speakers: Speakers warnings: save_before: 'Before you continue, you need to save or discard your changes' unsaved_changes: > @@ -3309,6 +3486,7 @@ en: create_program: 'Create Study Path' create_subject: 'Create Subject' create_division: 'Create Division' + create_voucher: 'Create Voucher' create: 'Create' edit: 'Edit' content: 'Content' @@ -3385,6 +3563,10 @@ en: cancel_publication: 'Cancel' import_lecture_toc: 'Import TOC' import_toc: 'Import' + become_editor: 'Become Editor' + verify_voucher: 'Verify Voucher' + edit_talk: 'Edit Talk' + invalidate: 'Invalidate' confirmation: generic: 'Are you sure?' delete_graph: > @@ -3493,6 +3675,16 @@ en: made. no_assignments_in_lecture: > In this event series there are no assigments yet. + no_voucher: 'There is no voucher with this id.' + voucher_invalid: 'This voucher is invalid.' + become_tutor_success: > + Your tutor status has been updated. + become_editor_success: > + Your editor status has been updated. + become_teacher_success: > + Your teacher status has been updated. + become_speaker_success: > + Your speaker status has been updated. tutorials: destruction_failed: > The tutorial could not be deleted. That may be because there are already @@ -3717,6 +3909,13 @@ en: value: out_of_range: > Your vote is outside of the allowed range. + voucher: + attributes: + role: + only_one_active: > + There can be only one active voucher of this type for the lecture. + speaker_vouchers_only_for_seminars: > + Speaker vouchers are only allowed for seminars. watchlist_entry: attributes: medium_id: diff --git a/config/routes.rb b/config/routes.rb index d9925650a..f567579cd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,9 +11,12 @@ if Rails.env.test? namespace :cypress do resources :factories, only: :create + post "factories/call_instance_method", to: "factories#call_instance_method" resources :database_cleaner, only: :create resources :user_creator, only: :create resources :i18n, only: :create + post "timecop/travel", to: "timecop#travel" + post "timecop/reset", to: "timecop#reset" end end @@ -811,6 +814,24 @@ resources :users, only: [:index, :edit, :update, :destroy] + post "vouchers/verify", + to: "vouchers#verify", + as: "verify_voucher" + + post "vouchers/redeem", + to: "vouchers#redeem", + as: "redeem_voucher" + + post "vouchers/:id/invalidate", + to: "vouchers#invalidate", + as: "invalidate_voucher" + + get "vouchers/cancel", + to: "vouchers#cancel", + as: "cancel_voucher" + + resources :vouchers, only: [:create] + # watchlists routes get "watchlists/add_medium/:medium_id", diff --git a/db/migrate/20240906200000_create_vouchers.rb b/db/migrate/20240906200000_create_vouchers.rb new file mode 100644 index 000000000..274145b7c --- /dev/null +++ b/db/migrate/20240906200000_create_vouchers.rb @@ -0,0 +1,13 @@ +class CreateVouchers < ActiveRecord::Migration[7.1] + def change + create_table :vouchers, id: :uuid do |t| + t.integer :role, null: false + t.references :lecture, null: false, foreign_key: true + t.string :secure_hash, null: false + t.datetime :invalidated_at + t.datetime :expires_at + t.timestamps + end + add_index :vouchers, :secure_hash, unique: true + end +end diff --git a/db/migrate/20240921200000_create_redemptions.rb b/db/migrate/20240921200000_create_redemptions.rb new file mode 100644 index 000000000..5529182f6 --- /dev/null +++ b/db/migrate/20240921200000_create_redemptions.rb @@ -0,0 +1,9 @@ +class CreateRedemptions < ActiveRecord::Migration[7.1] + def change + create_table :redemptions do |t| + t.references :voucher, type: :uuid, null: false, foreign_key: true + t.references :user, null: false, foreign_key: true + t.timestamps + end + end +end diff --git a/db/migrate/20240921221000_create_claims.rb b/db/migrate/20240921221000_create_claims.rb new file mode 100644 index 000000000..0c5ded8de --- /dev/null +++ b/db/migrate/20240921221000_create_claims.rb @@ -0,0 +1,9 @@ +class CreateClaims < ActiveRecord::Migration[7.1] + def change + create_table :claims do |t| + t.references :redemption, null: false, foreign_key: true + t.references :claimable, polymorphic: true, null: false + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 9f40b301b..0a6d204ba 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.1].define(version: 2024_06_05_200000) do +ActiveRecord::Schema[7.1].define(version: 2024_09_21_221000) do # These are extensions that must be enabled in order to support this database enable_extension "pgcrypto" enable_extension "plpgsql" @@ -77,6 +77,16 @@ t.index ["lecture_id"], name: "index_chapters_on_lecture_id" end + create_table "claims", force: :cascade do |t| + t.bigint "redemption_id", null: false + t.string "claimable_type", null: false + t.bigint "claimable_id", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["claimable_type", "claimable_id"], name: "index_claims_on_claimable" + t.index ["redemption_id"], name: "index_claims_on_redemption_id" + end + create_table "clicker_votes", force: :cascade do |t| t.integer "value" t.integer "clicker_id" @@ -448,6 +458,15 @@ t.datetime "updated_at", null: false end + create_table "redemptions", force: :cascade do |t| + t.uuid "voucher_id", null: false + t.bigint "user_id", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["user_id"], name: "index_redemptions_on_user_id" + t.index ["voucher_id"], name: "index_redemptions_on_voucher_id" + end + create_table "referrals", force: :cascade do |t| t.text "start_time" t.text "end_time" @@ -902,6 +921,18 @@ t.index ["voter_type", "voter_id"], name: "index_votes_on_voter_type_and_voter_id" end + create_table "vouchers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| + t.integer "role", null: false + t.bigint "lecture_id", null: false + t.string "secure_hash", null: false + t.datetime "invalidated_at" + t.datetime "expires_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["lecture_id"], name: "index_vouchers_on_lecture_id" + t.index ["secure_hash"], name: "index_vouchers_on_secure_hash", unique: true + end + create_table "vtt_containers", force: :cascade do |t| t.text "table_of_contents_data" t.text "references_data" @@ -936,6 +967,7 @@ add_foreign_key "announcements", "lectures" add_foreign_key "announcements", "users", column: "announcer_id" add_foreign_key "assignments", "lectures" + add_foreign_key "claims", "redemptions" add_foreign_key "commontator_comments", "commontator_comments", column: "parent_id", on_update: :restrict, on_delete: :cascade add_foreign_key "commontator_comments", "commontator_threads", column: "thread_id", on_update: :cascade, on_delete: :cascade add_foreign_key "commontator_subscriptions", "commontator_threads", column: "thread_id", on_update: :cascade, on_delete: :cascade @@ -954,6 +986,8 @@ add_foreign_key "programs", "subjects" add_foreign_key "quiz_certificates", "media", column: "quiz_id" add_foreign_key "quiz_certificates", "users" + add_foreign_key "redemptions", "users" + add_foreign_key "redemptions", "vouchers" add_foreign_key "referrals", "items" add_foreign_key "referrals", "media" add_foreign_key "speaker_talk_joins", "talks" @@ -973,6 +1007,7 @@ add_foreign_key "user_favorite_lecture_joins", "lectures" add_foreign_key "user_favorite_lecture_joins", "users" add_foreign_key "user_submission_joins", "users" + add_foreign_key "vouchers", "lectures" add_foreign_key "watchlist_entries", "media" add_foreign_key "watchlist_entries", "watchlists" add_foreign_key "watchlists", "users" diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index 4aa9b05c7..7a3efdf5b 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -53,7 +53,7 @@ RUN yarn set version "${YARN_VERSION}" RUN apt update && \ apt-get install -y --no-install-recommends \ ffmpeg imagemagick pdftk ghostscript shared-mime-info \ - libarchive-tools postgresql-client-13 sqlite3 wget wait-for-it + libarchive-tools postgresql-client-13 wget wait-for-it graphviz # Setup ImageMagick RUN sed -i '/disable ghostscript format types/,+6d' /etc/ImageMagick-6/policy.xml diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile index 470e065f5..32bf1eb51 100644 --- a/docker/test/Dockerfile +++ b/docker/test/Dockerfile @@ -52,7 +52,7 @@ RUN yarn set version "${YARN_VERSION}" RUN apt update && \ apt-get install -y --no-install-recommends \ ffmpeg imagemagick pdftk ghostscript shared-mime-info \ - libarchive-tools postgresql-client-13 sqlite3 wget wait-for-it + libarchive-tools postgresql-client-13 wget wait-for-it # Setup ImageMagick RUN sed -i '/disable ghostscript format types/,+6d' /etc/ImageMagick-6/policy.xml diff --git a/spec/controllers/lectures_controller_spec.rb b/spec/controllers/lectures_controller_spec.rb new file mode 100644 index 000000000..f115a00d2 --- /dev/null +++ b/spec/controllers/lectures_controller_spec.rb @@ -0,0 +1,57 @@ +require "rails_helper" +RSpec.describe(LecturesController, type: :controller) do + let(:teacher) { FactoryBot.create(:confirmed_user) } + let(:generic_user) { FactoryBot.create(:confirmed_user) } + let(:lecture) { FactoryBot.create(:lecture, teacher: teacher) } + let(:admin) { FactoryBot.create(:confirmed_user, admin: true) } + let(:editor) { FactoryBot.create(:confirmed_user, edited_lectures: [lecture]) } + + context "As a teacher" do + before do + sign_in teacher + end + + describe "POST #update" do + it "does not update the teacher" do + new_teacher = FactoryBot.create(:confirmed_user) + post(:update, params: { id: lecture.id, + lecture: { teacher_id: new_teacher.id } }) + lecture.reload + expect(lecture.teacher).to eq(teacher) + end + end + end + + context "As an editor" do + before do + sign_in editor + end + + describe "POST #update" do + it "does not update the teacher" do + edited_lecture = editor.edited_lectures.first + new_teacher = FactoryBot.create(:confirmed_user) + post(:update, params: { id: edited_lecture.id, + lecture: { teacher_id: new_teacher.id } }) + lecture.reload + expect(lecture.teacher).to eq(teacher) + end + end + end + + context "As an admin" do + before do + sign_in admin + end + + describe "POST #update" do + it "updates the teacher" do + new_teacher = FactoryBot.create(:confirmed_user) + post(:update, params: { id: lecture.id, + lecture: { teacher_id: new_teacher.id } }) + lecture.reload + expect(lecture.teacher).to eq(new_teacher) + end + end + end +end diff --git a/spec/controllers/vouchers_controller_spec.rb b/spec/controllers/vouchers_controller_spec.rb new file mode 100644 index 000000000..694b4c668 --- /dev/null +++ b/spec/controllers/vouchers_controller_spec.rb @@ -0,0 +1,91 @@ +require "rails_helper" + +RSpec.describe(VouchersController, type: :controller) do + let(:teacher) { FactoryBot.create(:confirmed_user) } + let(:generic_user) { FactoryBot.create(:confirmed_user) } + let(:lecture) { FactoryBot.create(:lecture, teacher: teacher) } + let(:role) { :tutor } + + context "As an authorized user" do + before do + sign_in teacher + end + + describe "POST #create" do + it "creates a new voucher" do + expect do + post(:create, params: { lecture_id: lecture.id, role: role }) + end.to change(lecture.vouchers, :count).by(1) + end + end + + describe "POST #invalidate" do + it "invalidates the voucher" do + voucher = FactoryBot.create(:voucher, lecture: lecture) + post(:invalidate, params: { id: voucher.id }) + voucher.reload + expect(Voucher.find(voucher.id).invalidated_at).not_to be_nil + end + end + end + + context "As an unauthorized user" do + before do + sign_in generic_user + end + + describe "POST #create" do + it "does not create a new voucher" do + expect do + post(:create, params: { lecture_id: lecture.id, role: role }) + end.not_to change(lecture.vouchers, :count) + end + + it "redirects to root path" do + post(:create, params: { lecture_id: lecture.id, role: role }) + expect(response).to redirect_to(root_path) + end + end + + describe "POST #invalidate" do + it "does not invalidate the voucher" do + voucher = FactoryBot.create(:voucher, lecture: lecture) + post(:invalidate, params: { id: voucher.id }) + voucher.reload + expect(voucher.invalidated_at).to be_nil + end + end + + describe "POST #verify" do + it "shows an error message if the secure hash is incorrect" do + post(:verify, params: { secure_hash: "incorrect_hash" }) + expect(flash[:alert]).to eq(I18n.t("controllers.voucher_invalid")) + end + + it "redirects to edit profile path if the secure hash is incorrect" do + post(:verify, params: { secure_hash: "incorrect_hash" }) + expect(response).to redirect_to(edit_profile_path) + end + end + + describe "POST #redeem" do + it "it does not redeem if the secure hash is incorrect" do + expect do + post(:redeem, params: { secure_hash: "incorrect_hash" }) + end.not_to change(Redemption, :count) + end + + it "shows an error message if the secure hash is incorrect" do + post(:redeem, params: { secure_hash: "incorrect_hash" }) + expect(flash[:alert]).to eq(I18n.t("controllers.voucher_invalid")) + end + + it "redeems if voucher secure hash is correct" do + voucher = FactoryBot.create(:voucher, lecture: lecture) + expect do + post(:redeem, params: { secure_hash: voucher.secure_hash }) + end.to change(Redemption, :count).by(1) + end + end + end +end diff --git a/spec/cypress/e2e/annotations_overview_spec.cy.js b/spec/cypress/e2e/annotations_overview_spec.cy.js index f4c2f9561..2dea3b189 100644 --- a/spec/cypress/e2e/annotations_overview_spec.cy.js +++ b/spec/cypress/e2e/annotations_overview_spec.cy.js @@ -23,9 +23,9 @@ function createAnnotationScenario(context, userRole = "student") { cy.then(() => { // a user is considered a teacher only iff they have given any lecture const teacherUser = userRole === "teacher" ? context.user : context.teacherUser; - FactoryBot.create("lecture_with_sparse_toc", "with_title", "with_teacher_by_id", + FactoryBot.create("lecture_with_sparse_toc", "with_title", { title: LECTURE_TITLE_1, teacher_id: teacherUser.id }).as("lectureSage"); - FactoryBot.create("lecture_with_sparse_toc", "with_title", "with_teacher_by_id", + FactoryBot.create("lecture_with_sparse_toc", "with_title", { title: LECTURE_TITLE_2, teacher_id: teacherUser.id }).as("lectureLean"); }); @@ -80,7 +80,7 @@ describe("Annotation section", () => { cy.createUserAndLogin("teacher").as("teacher"); cy.then(() => { // a user is considered a teacher only iff they have given any lecture - FactoryBot.create("lecture", "with_teacher_by_id", { teacher_id: this.teacher.id }); + FactoryBot.create("lecture", { teacher_id: this.teacher.id }); }); cy.i18n("admin.annotation.your_annotations").as("yourAnnotations"); diff --git a/spec/cypress/e2e/annotations_spec.cy.js b/spec/cypress/e2e/annotations_spec.cy.js new file mode 100644 index 000000000..498f98465 --- /dev/null +++ b/spec/cypress/e2e/annotations_spec.cy.js @@ -0,0 +1,71 @@ +import FactoryBot from "../support/factorybot"; + +function createLectureLessonMedium(context, teacher) { + // Lecture + FactoryBot.create("lecture_with_sparse_toc", "with_title", + { title: "Groundbreaking lecture", teacher_id: teacher.id }).as("lecture"); + + // Lesson + cy.then(() => { + FactoryBot.create("valid_lesson", { lecture_id: context.lecture.id }).as("lesson"); + }); + + // Medium + cy.then(() => { + FactoryBot.create("lesson_medium", "with_video", "released", + "with_lesson_by_id", { lesson_id: context.lesson.id, description: "Soil medium" }) + .as("medium"); + }); +} + +describe("Annotations visibility", () => { + context("when teacher disables annotation sharing with teachers", () => { + it("annotations published before that are still visible to the teacher", function () { + cy.createUser("generic").as("user"); + cy.createUserAndLogin("teacher").then(teacher => createLectureLessonMedium(this, teacher)); + + cy.then(() => { + // Create new annotation + FactoryBot.create("annotation", "with_text", "shared_with_teacher", + { medium_id: this.medium.id, user_id: this.user.id }).as("annotation"); + + // Disable annotation sharing in lecture settings + cy.visit(`/lectures/${this.lecture.id}/edit#communication`); + cy.getBySelector("annotation-lecture-settings") + .should("be.visible") + .find("input[value=0]").should("have.length", 1).click(); + + // Click on submit button to save changes + cy.intercept("POST", `/lectures/${this.lecture.id}`).as("lectureUpdate"); + cy.getBySelector("lecture-pane-communication") + .find("input[type=submit]").should("have.length", 1).click(); + cy.wait("@lectureUpdate"); + + // Make sure that changes were really saved + cy.reload(); + cy.getBySelector("annotation-lecture-settings") + .should("be.visible").then(($form) => { + cy.wrap($form).find("input[value=0]").should("be.checked"); + cy.wrap($form).find("input[value=1]").should("not.be.checked"); + }); + }); + + cy.then(() => { + cy.visit(`/media/${this.medium.id}/feedback`); + + // Annotation is visible + cy.getBySelector("feedback-markers") + .children().should("have.length", 1) + .click({ force: true }); + + // Annotation can be opened in sidebar + cy.getBySelector("annotation-caption").then(($sideBar) => { + cy.i18n(`admin.annotation.${this.annotation.category}`).then((category) => { + cy.wrap($sideBar).children().first().should("contain", category); + }); + cy.wrap($sideBar).children().eq(1).should("contain", this.annotation.comment); + }); + }); + }); + }); +}); diff --git a/spec/cypress/e2e/lectures_people_select_specs.cy.js b/spec/cypress/e2e/lectures_people_select_specs.cy.js new file mode 100644 index 000000000..886b368c5 --- /dev/null +++ b/spec/cypress/e2e/lectures_people_select_specs.cy.js @@ -0,0 +1,211 @@ +import FactoryBot from "../support/factorybot"; + +describe("Lecture edit page", () => { + it("shows content tab button", function () { + cy.createUserAndLogin("teacher").then((teacher) => { + FactoryBot.create("lecture", + { teacher_id: teacher.id }).as("lecture"); + }); + + cy.then(() => { + cy.visit(`/lectures/${this.lecture.id}/edit`); + cy.getBySelector("content-tab-btn").should("be.visible"); + }); + }); +}); + +function typeCyInInput(selector, waitForUserFill = true) { + if (waitForUserFill) { + cy.intercept("GET", "/users/fill_user_select*").as("userFill"); + } + + cy.getBySelector(selector).find("input:not([type='hidden'])") + .should("have.length", 1).first().as("input"); + cy.get("@input").clear(); // without clearing first, tests are flaky (!) + cy.get("@input").click(); + + // eslint-disable-next-line cypress/unsafe-to-chain-command + cy.get("@input").type("cy", { timeout: 5000 }).should("have.value", "cy"); + + if (waitForUserFill) { + cy.wait("@userFill"); + } +} + +function shouldContainUsers(selector, context, shouldContainUser, shouldContainTeacher) { + const containUser = shouldContainUser ? "contain" : "not.contain"; + const containTeacher = shouldContainTeacher ? "contain" : "not.contain"; + + cy.getBySelector(selector) + .should(containUser, context.user.name_in_tutorials) + .and(containUser, context.user.email) + .and("not.contain", context.user.name); + + cy.getBySelector(selector) + .should(containTeacher, context.teacher.name_in_tutorials) + .and(containTeacher, context.teacher.email) + .and("not.contain", context.teacher.name); +} + +describe("Lecture people edit page: teacher & editor", () => { + beforeEach(function () { + cy.createUser("generic").as("user"); + cy.createUserAndLogin("teacher").as("teacher"); + cy.then(() => { + FactoryBot.create("lecture", { teacher_id: this.teacher.id }).as("lecture"); + }); + cy.then(() => { + cy.wrap(`/lectures/${this.lecture.id}/edit#people`).as("lecturePeopleUrl"); + }); + }); + + context("when logged in as teacher", () => { + it("does not show element to select teacher", function () { + cy.visit(this.lecturePeopleUrl); + cy.getBySelector("teacher-admin-select").should("not.exist"); + cy.getBySelector("teacher-info").should("exist"); + }); + + it("prohibits searching for arbitrary users in the editor dropdown", function () { + cy.visit(this.lecturePeopleUrl); + typeCyInInput("editor-select", false); + shouldContainUsers("editor-select", this, false, false); + }); + + it("prohibits searching for arbitrary users in the tutor dropdown", function () { + cy.visit(this.lecturePeopleUrl); + cy.getBySelector("new-tutorial-btn").click(); + typeCyInInput("tutor-select-div", false); + shouldContainUsers("tutor-select-div", this, false, true); + }); + }); + + context("when logged in as admin", () => { + beforeEach(function () { + cy.logout(); + cy.createUserAndLogin("admin").as("admin"); + }); + + it("allows searching for arbitrary users to assign them as teachers", function () { + cy.visit(this.lecturePeopleUrl); + typeCyInInput("teacher-select"); + shouldContainUsers("teacher-select", this, true, true); + }); + + it("allows searching for arbitrary users to assign them as editors", function () { + cy.visit(this.lecturePeopleUrl); + typeCyInInput("editor-select"); + shouldContainUsers("editor-select", this, true, true); + }); + + it("allows to search for arbitrary users to assign them as tutors", function () { + cy.visit(this.lecturePeopleUrl); + cy.getBySelector("new-tutorial-btn").click(); + typeCyInInput("tutor-select-div"); + shouldContainUsers("tutor-select-div", this, true, true); + }); + }); +}); + +function shouldNotContainUserInOptions(selector, user) { + cy.getBySelector(selector).within(() => { + cy.get("option") + .should("not.contain", user.name_in_tutorials) + .and("not.contain", user.email) + .and("not.contain", user.name); + }); +} + +describe("Seminar speakers (new talk)", () => { + function openTalkForm() { + cy.intercept("GET", "/talks/new*").as("newTalk"); + cy.getBySelector("new-talk-btn").click(); + cy.getBySelector("talk-form").should("be.visible"); + cy.wait("@newTalk"); + // I've tried many things to get it to work, but still had a failing test + // here in the CI/CD pipeline. Cypress seems to not be able to type in + // "cy" into the input field, see `typeCyInInput()`. It's probably because + // the /talks/new request sends back JS with `fillOptionsByAjax` after + // populating the modal. This might result in the input being reset after + // cypress has already typed in "cy" (very quickly). So this is a workaround + // to wait a bit before typing in the input field. In general, such waits + // should only be used as a last resort. + // eslint-disable-next-line cypress/no-unnecessary-waiting + cy.wait(1000); + } + + beforeEach(function () { + cy.createUser("generic").as("user"); + cy.createUserAndLogin("teacher").as("teacher"); + cy.then(() => { + FactoryBot.create("seminar", { teacher_id: this.teacher.id }).as("seminar"); + }); + cy.then(() => { + cy.wrap(`/lectures/${this.seminar.id}/edit`).as("seminarUrl"); + }); + }); + + context("when logged in as teacher", () => { + it("prohibits searching for arbitrary users in the speakers dropdown", function () { + cy.visit(this.seminarUrl); + openTalkForm(); + shouldNotContainUserInOptions("speaker-select", this.user); + typeCyInInput("speaker-select-div", false); + shouldContainUsers("speaker-select-div", this, false, true); + }); + }); + + context("when logged in as admin", () => { + beforeEach(function () { + cy.logout(); + cy.createUserAndLogin("admin").as("admin"); + }); + + it("allows searching for arbitrary users to assign them as speakers", function () { + cy.visit(this.seminarUrl); + openTalkForm(); + typeCyInInput("speaker-select-div"); + shouldContainUsers("speaker-select-div", this, true, true); + }); + }); +}); + +describe("Seminar speakers (existing talk)", () => { + beforeEach(function () { + cy.createUser("generic").as("speaker"); + cy.createUser("generic").as("user"); + cy.createUserAndLogin("teacher").as("teacher"); + cy.then(() => { + FactoryBot.create("seminar", { teacher_id: this.teacher.id }).as("seminar"); + }); + cy.then(() => { + FactoryBot.create("talk", + { lecture_id: this.seminar.id, speaker_ids: [this.speaker.id] }).as("talk"); + }); + cy.then(() => { + cy.wrap(`/talks/${this.talk.id}/edit`).as("talkUrl"); + }); + }); + + context("when logged in as teacher", () => { + it("prohibits searching for arbitrary users in the speakers dropdown", function () { + cy.visit(this.talkUrl); + shouldNotContainUserInOptions("speaker-select", this.user); + typeCyInInput("speaker-select-div", false); + shouldContainUsers("speaker-select-div", this, false, true); + }); + }); + + context("when logged in as admin", () => { + beforeEach(function () { + cy.logout(); + cy.createUserAndLogin("admin").as("admin"); + }); + + it("allows searching for arbitrary users to assign them as speakers", function () { + cy.visit(this.talkUrl); + typeCyInInput("speaker-select-div"); + shouldContainUsers("speaker-select-div", this, true, true); + }); + }); +}); diff --git a/spec/cypress/e2e/meta/factory_bot_spec.cy.js b/spec/cypress/e2e/meta/factory_bot_spec.cy.js new file mode 100644 index 000000000..5cd1097e9 --- /dev/null +++ b/spec/cypress/e2e/meta/factory_bot_spec.cy.js @@ -0,0 +1,47 @@ +import FactoryBot from "../../support/factorybot"; + +describe("FactoryBot.create()", () => { + beforeEach(function () { + cy.createUserAndLogin("teacher").as("teacher"); + }); + + it("allows to call create() with array as argument", function () { + cy.createUser("generic").as("tutor1"); + cy.createUser("generic").as("tutor2"); + FactoryBot.create("lecture", { teacher_id: this.teacher.id }).as("lecture"); + + cy.then(() => { + // here we pass in an array as argument to tutor_ids + FactoryBot.create("tutorial", + { lecture_id: this.lecture.id, tutor_ids: [this.tutor1.id, this.tutor2.id] }, + ); + }); + }); +}); + +describe("FactoryBot.create().call", () => { + beforeEach(function () { + cy.createUser("teacher").as("teacher"); + cy.createUserAndLogin("generic"); + }); + + it("allows to call instance methods after assigning them to an alias", function () { + FactoryBot.create("lecture", { teacher_id: this.teacher.id }).as("lecture"); + + cy.then(() => { + // via alias in global this namespace + this.lecture.call.long_title().then((res) => { + cy.log(res); + }); + }); + }); + + it("allows to call instance methods directly (without an alias)", function () { + FactoryBot.create("lecture", { teacher_id: this.teacher.id }).then((lecture) => { + // via return value of FactoryBot.create() directly (no alias intermediate) + lecture.call.long_title().then((res) => { + cy.log(res); + }); + }); + }); +}); diff --git a/spec/cypress/e2e/profile_spec.cy.js b/spec/cypress/e2e/profile_spec.cy.js new file mode 100644 index 000000000..5cc06271e --- /dev/null +++ b/spec/cypress/e2e/profile_spec.cy.js @@ -0,0 +1,165 @@ +import FactoryBot from "../support/factorybot"; + +const PROFILE_PAGE = "/profile/edit"; + +describe("Account settings", () => { + beforeEach(function () { + cy.createUserAndLogin("generic").as("user"); + cy.createUser("teacher").as("teacher"); + FactoryBot.create("lecture_with_sparse_toc", "released_for_all").as("lecture"); + }); + + it("allows changing the user name & reflects it in user comments", function () { + cy.then(() => { + FactoryBot.create("valid_lesson", { lecture_id: this.lecture.id }).as("lesson"); + }); + cy.then(() => { + FactoryBot.create("lesson_medium", "released", + "with_lesson_by_id", { lesson_id: this.lesson.id }).as("medium"); + }); + + cy.then(() => { + cy.visit(PROFILE_PAGE); + cy.getBySelector("display-name").should("have.value", this.user.name); + + cy.visit(`/media/${this.medium.id}/show_comments`); + cy.getBySelector("new-comment").click(); + cy.getBySelector("comment-textarea").type("New comment"); + cy.getBySelector("submit-new-comment").click(); + cy.getBySelector("comment").should("contain", this.user.name); + + const newName = "Jean-Jacques Rousseau"; + cy.visit(PROFILE_PAGE); + + cy.getBySelector("display-name").clear(); + cy.getBySelector("display-name").type(newName); + cy.getBySelector("profile-change-submit").click(); + + cy.visit(`/media/${this.medium.id}/show_comments`); + cy.getBySelector("comment").should("contain", newName); + }); + }); + + it("allows changing the user name in tutorials & reflects it in submissions", function () { + cy.createUser("tutor").as("tutor"); + + const newName = "Voltaire"; + + cy.then(() => { + cy.visit(PROFILE_PAGE); + cy.getBySelector("display-name-tutorials").should("have.value", this.user.name_in_tutorials); + + cy.getBySelector("display-name-tutorials").clear(); + cy.getBySelector("display-name-tutorials").type(newName); + cy.getBySelector("profile-change-submit").click(); + }); + + cy.then(() => { + FactoryBot.create("tutorial", "with_tutor_by_id", + { lecture_id: this.lecture.id, tutor_id: this.tutor.id }).as("tutorial"); + FactoryBot.create("assignment", { lecture_id: this.lecture.id }).as("assignment"); + }); + + cy.then(() => { + cy.visit(`/lectures/${this.lecture.id}`); + + cy.intercept("PATCH", "profile/subscribe_lecture*").as("subscribeToLecture"); + cy.getBySelector("subscribe-to-lecture").click(); + cy.wait("@subscribeToLecture"); + + cy.visit(`/lectures/${this.lecture.id}/submissions`); + + // Upload new submission + cy.getBySelector("create-submission").click(); + cy.getBySelector("choose-user-submission").click(); + cy.getBySelector("choose-user-submission-file") + .selectFile("cypress/fixtures/files/manuscript.pdf", { force: true }); + cy.getBySelector("file-permission-accept").click(); + cy.getBySelector("upload-user-submission").click(); + + cy.intercept("POST", "/submissions*").as("saveSubmissionRequest"); + cy.getBySelector("save-submission").click(); + cy.wait("@saveSubmissionRequest"); + }); + + cy.then(() => { + cy.logout(); + cy.login(this.tutor); + cy.visit(`/lectures/${this.lecture.id}/tutorials`); + + cy.getBySelector("tutorial-submissions-table") + .should("contain", newName); + cy.getBySelector("tutorial-submissions-table") + .should("not.contain", this.user.name_in_tutorials); + cy.getBySelector("tutorial-submissions-table") + .should("not.contain", this.user.name); + }); + }); + + it("allows switching the language", function () { + function checkLanguage(locale, shouldContain, shouldNotContain) { + // click on other locale checkbox first to trigger a change + cy.getBySelector(`locale-${locale === "de" ? "en" : "de"}-checkbox`).click(); + cy.getBySelector(`locale-${locale}-checkbox`).click(); + cy.getBySelector("profile-change-submit").click(); + cy.visit(PROFILE_PAGE); + cy.getBySelector(`locale-${locale}-checkbox`).should("be.checked"); + shouldContain.forEach(text => cy.contains(text)); + shouldNotContain.forEach(text => cy.contains(text).should("not.exist")); + }; + + cy.visit(PROFILE_PAGE); + + // just some very basic checks if language is switched correctly + const wordsGerman = ["Anzeigename", "benachrichtigt", "möchte"]; + const wordsEnglish = ["Display name", "receive", "want to"]; + checkLanguage("de", wordsGerman, wordsEnglish); + checkLanguage("en", wordsEnglish, wordsGerman); + }); +}); + +describe("Module settings", () => { + beforeEach(function () { + cy.wrap("Happy course").as("courseName"); + cy.wrap("Happy division").as("divisionName"); + + cy.then(() => { + FactoryBot.create("division", { name: this.divisionName }).as("division"); + }); + + cy.then(() => { + FactoryBot.create("course", "with_division", + { title: this.courseName, division_id: this.division.id }).as("course"); + }); + + cy.then(() => { + FactoryBot.create("lecture", "released_for_all", + { course_id: this.course.id }).as("lecture"); + }); + }); + + it("allows to subscribe to a lecture", function () { + this.lecture.call.teacher().as("teacher"); + this.lecture.call.term().as("term"); + + cy.createUserAndLogin("admin").as("admin"); + cy.visit(PROFILE_PAGE); + + cy.getBySelector("courses-accordion").find("button:visible").first().click(); + cy.getBySelector("courses-accordion").should("contain", this.divisionName); + cy.contains(this.courseName).click(); + + this.lecture.call.term_teacher_info().as("lectureName"); + cy.then(() => { + cy.contains(this.lectureName).click(); + cy.contains(this.lectureName).parent().find("input").should("be.checked"); + cy.getBySelector("profile-change-submit").click(); + }); + + cy.then(() => { + cy.visit("/main/start"); + cy.getBySelector("subscribed-inactive-lectures-collapse").contains(this.courseName); + cy.getBySelector("subscribed-inactive-lectures-collapse").contains(this.teacher.name); + }); + }); +}); diff --git a/spec/cypress/e2e/vouchers_redemptions_spec.cy.js b/spec/cypress/e2e/vouchers_redemptions_spec.cy.js new file mode 100644 index 000000000..e972b21d6 --- /dev/null +++ b/spec/cypress/e2e/vouchers_redemptions_spec.cy.js @@ -0,0 +1,253 @@ +import * as helpers from "./vouchers_redemptions_spec_helpers"; + +function testVoucherRedemptionWithNothingToClaim(context, role, itemType) { + helpers.submitVoucher(context.voucher); + helpers.verifyVoucherRedemptionText(); + helpers.verifyNoItemsYetMessage(context, itemType); + helpers.redeemVoucherToBecomeRole(context, role); + helpers.verifyLectureIsSubscribed(context); + helpers.logoutAndLoginAsTeacher(context); + + cy.then(() => { + helpers.visitEditPage(context, itemType); + helpers.verifyNoClaimsYetButUserEligibleForRole(context, role); + helpers.verifyRoleNotification(context, role); + helpers.verifyNothingClaimedInNotification(context, itemType); + }); +} + +function testVoucherRedemptionWithSomethingClaimed(context, itemType, role) { + helpers.createTutorialsOrTalks(context, itemType); + + const itemIds = []; + const itemTitles = []; + + cy.then(() => { + itemIds.push(context[`${itemType}1`].id, context[`${itemType}2`].id); + itemTitles.push(context[`${itemType}1`].title, context[`${itemType}2`].title); + }); + + cy.then(() => { + helpers.submitVoucher(context.voucher); + helpers.selectClaimsAndSubmit(itemIds); + }); + + helpers.verifyLectureIsSubscribed(context); + helpers.logoutAndLoginAsTeacher(context); + + cy.then(() => { + helpers.visitEditPage(context, itemType); + helpers.verifyClaimsContainUserName(context, itemType, itemIds); + }); + + cy.then(() => { + helpers.verifyRoleNotification(context, role); + cy.getBySelector("notification-body").should("contain", itemTitles[0]) + .and("contain", itemTitles[1]); + }); +} + +function testAlreadyRedeemedVoucher(context, role) { + helpers.submitVoucher(context.voucher); + helpers.redeemVoucherToBecomeRole(context, role); + helpers.submitVoucher(context.voucher); + helpers.verifyAlreadyRedeemedVoucherMessage(context, role); + helpers.verifyCancelVoucherButton(); + helpers.logoutAndLoginAsTeacher(context); + cy.then(() => { + helpers.verifyNoNewNotification(); + }); +} + +function testAlreadyRoleForAllItems(context, itemType) { + helpers.createTutorialsOrTalks(context, itemType, context.user); + helpers.submitVoucher(context.voucher); + helpers.verifyAllItemsTakenMessage(context, itemType); + helpers.verifyCancelVoucherButton(); + helpers.logoutAndLoginAsTeacher(context); + cy.then(() => { + helpers.verifyNoNotification(); + }); +} + +describe("Verify Voucher Form", () => { + beforeEach(function () { + helpers.createRedemptionScenario(this); + }); + + it("is shown on the profile page", function () { + cy.getBySelector("redeem-voucher-card").should("contain", this.redeem_voucher); + cy.getBySelector("verify-voucher-form").should("be.visible"); + }); + + it("displays an alert if the voucher is invalid", function () { + helpers.verifyVoucherInvalidAlert(this, "incorrect hash"); + }); + + it("is valid even if voucher string contains whitespaces at the beginning/end", function () { + cy.getBySelector("secure-hash-input").type(`\t ${this.voucher.secure_hash} `); + cy.getBySelector("verify-voucher-submit").click(); + helpers.verifyVoucherRedemptionText(); + }); +}); + +describe("Tutor voucher redemption", () => { + beforeEach(function () { + helpers.createRedemptionScenario(this, "tutor"); + }); + + context("when the lecture has no tutorials yet", () => { + it("allows redemption of voucher to successfully become tutor", function () { + testVoucherRedemptionWithNothingToClaim(this, "tutor", "tutorial"); + }); + + context("and the user has already redeemed the voucher", () => { + it("displays a message that the user has already redeemed the voucher", function () { + testAlreadyRedeemedVoucher(this, "tutor"); + }); + }); + }); + + context("when the lecture has tutorials", () => { + it("allows the user to successfully submit tutorials and become their tutor", function () { + testVoucherRedemptionWithSomethingClaimed(this, "tutorial", "tutor"); + }); + + context("and the user is already a tutor for all of them", () => { + it("displays a message that the user is already a tutor for all tutorials", function () { + testAlreadyRoleForAllItems(this, "tutorial"); + }); + }); + }); +}); + +describe("Editor voucher redemption", () => { + beforeEach(function () { + helpers.createRedemptionScenario(this, "editor"); + }); + + it("allows the user to successfully become an editor", function () { + helpers.submitVoucher(this.voucher); + helpers.verifyVoucherRedemptionText(); + helpers.redeemVoucherToBecomeRole(this, "editor"); + helpers.verifyLectureIsSubscribed(this); + helpers.visitEditPage(this, "editor"); + helpers.verifyUserIsEditor(this); + helpers.verifyRoleNotification(this, "editor"); + }); + + context("when the user has already redeemed the voucher", () => { + it("displays a message that the user has already redeemed the voucher", function () { + helpers.submitVoucher(this.voucher); + helpers.redeemVoucherToBecomeRole(this, "editor"); + helpers.submitVoucher(this.voucher); + helpers.verifyAlreadyRedeemedVoucherMessage(this, "editor"); + helpers.verifyCancelVoucherButton(); + helpers.logoutAndLoginAsTeacher(this); + cy.then(() => { + helpers.verifyNoNewNotification(); + }); + }); + }); + + context("when the user is the teacher of the lecture", () => { + it("displays the message that a teacher cannot become an editor", function () { + helpers.logoutAndLoginAsTeacher(this); + + cy.then(() => { + helpers.submitVoucher(this.voucher); + helpers.verifyTeachersCantBecomeEditorsMessage(this); + helpers.verifyCancelVoucherButton(); + }); + }); + }); +}); + +describe("Teacher voucher redemption", () => { + beforeEach(function () { + helpers.createRedemptionScenario(this, "teacher"); + }); + + it("allows the user to successfully become a teacher", function () { + helpers.submitVoucher(this.voucher); + helpers.verifyVoucherRedemptionText(); + helpers.redeemVoucherToBecomeRole(this, "teacher"); + helpers.verifyLectureIsSubscribed(this); + helpers.visitEditPage(this, "teacher"); + helpers.verifyUserIsTeacher(this); + helpers.verifyPreviousTeacherIsEditor(this); + helpers.verifyRoleNotification(this, "teacher"); + cy.visit("/profile/edit"); + helpers.verifyVoucherInvalidAlert(this, this.voucher.secure_hash); + }); + + context("when the user is already the teacher", () => { + it("displays a message that the user is already the teacher", function () { + helpers.logoutAndLoginAsTeacher(this); + + cy.then(() => { + helpers.submitVoucher(this.voucher); + helpers.verifyAlreadyTeacherMessage(this); + helpers.verifyCancelVoucherButton(); + }); + }); + }); +}); + +describe("Speaker voucher redemption", () => { + beforeEach(function () { + helpers.createRedemptionScenario(this, "speaker", "seminar"); + }); + + context("when the seminar has no talks yet", () => { + it("allows the user to successfully become a speaker", function () { + testVoucherRedemptionWithNothingToClaim(this, "speaker", "talk"); + }); + + context("and the user has already redeemed the voucher", () => { + it("displays a message that the user has already redeemed the voucher", function () { + testAlreadyRedeemedVoucher(this, "speaker"); + }); + }); + }); + + context("when the seminar has talks", () => { + it("allows the user to successfully submit talks and become their speaker", function () { + testVoucherRedemptionWithSomethingClaimed(this, "talk", "speaker"); + }); + + context("and the user is already a speaker for all of them", () => { + it("displays a message that the user is already a speaker for all talks ", function () { + testAlreadyRoleForAllItems(this, "talk"); + }); + }); + }); +}); + +describe("User & Redemption deletion", () => { + beforeEach(function () { + helpers.createRedemptionScenario(this, "tutor"); + }); + + it("after deletion of tutor user, it is no longer selectable", function () { + helpers.submitVoucher(this.voucher); + helpers.redeemVoucherToBecomeRole(this, "tutor"); + + cy.visit("/profile/edit"); + cy.getBySelector("delete-account-btn").click(); + cy.getBySelector("delete-account-pwd-field").type(this.user.password); + + cy.intercept("POST", "/users*").as("deleteUserRequest"); + cy.getBySelector("delete-account-confirm-btn").click(); + cy.wait("@deleteUserRequest"); + + cy.then(() => { + helpers.logoutAndLoginAsTeacher(this); + }); + + cy.then(() => { + helpers.visitEditPage(this, "tutorial"); + helpers.verifyNoTutorialsButUserEligibleAsTutor(this, false); + }); + }); +}); diff --git a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js new file mode 100644 index 000000000..be7ef65d9 --- /dev/null +++ b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js @@ -0,0 +1,272 @@ +import FactoryBot from "../support/factorybot"; + +export function createRedemptionScenario(context, role = "tutor", sort = "lecture") { + cy.createUser("teacher").as("teacher"); + cy.createUserAndLogin("generic").as("user"); + + cy.then(() => { + FactoryBot.create("lecture", + { teacher_id: context.teacher.id, sort: sort }).as("lecture"); + }); + + cy.then(() => { + FactoryBot.create("voucher", { lecture_id: context.lecture.id, role: role }) + .as("voucher"); + }); + + cy.then(() => { + cy.visit("/profile/edit"); + }); + + cy.i18n("profile.redeem_voucher").as("redeem_voucher"); +} + +export function submitVoucher(voucher) { + cy.getBySelector("secure-hash-input").type(voucher.secure_hash); + cy.getBySelector("verify-voucher-submit").click(); +} + +export function verifyVoucherInvalidAlert(context, hash) { + expect(hash).to.not.be.empty; + cy.getBySelector("secure-hash-input").type(hash); + cy.i18n("controllers.voucher_invalid").then((voucherInvalidMsg) => { + cy.on("window:alert", (message) => { + expect(message).to.equal(voucherInvalidMsg); + }); + cy.getBySelector("verify-voucher-submit").click(); + }); +} + +export function verifyVoucherRedemptionText() { + cy.getBySelector("redeem-voucher-text").should("be.visible"); +} + +export function verifyNoItemsYetMessage(context, itemType) { + cy.i18n(`profile.no_${itemType}s_redemption`).as("noItemsYet"); + + cy.then(() => { + cy.getBySelector("redeem-voucher-card").should("contain", context.noItemsYet); + cy.getBySelector("redeem-voucher-btn").should("be.visible"); + }); +} + +export function verifyAlreadyRedeemedVoucherMessage(context, role) { + cy.i18n(`profile.already_${role}_by_redemption`).as("alreadyRedeemedVoucher"); + + cy.then(() => { + cy.getBySelector("redeem-voucher-card") + .should("contain", context.alreadyRedeemedVoucher); + }); +} + +export function redeemVoucherToBecomeRole(context, role) { + cy.i18n(`controllers.become_${role}_success`).as("successMessage"); + cy.getBySelector("redeem-voucher-btn").click(); + + cy.then(() => { + cy.getBySelector("flash-notice").should("be.visible") + .and("contain", context.successMessage); + }); +} + +// Creates tutorials or talks, number is specified by count parameter. +// If user is given as parameter, the user is assigned as tutor or speaker. +export function createTutorialsOrTalks(context, entityType, user = null, count = 3) { + const entityData = { lecture_id: context.lecture.id }; + if (user) { + const personKey = entityType === "tutorial" ? "tutor_ids" : "speaker_ids"; + entityData[personKey] = [user.id]; + } + + for (let i = 1; i <= count; i++) { + FactoryBot.create(entityType, entityData).as(`${entityType}${i}`); + } +} + +export function selectClaimsAndSubmit(entityIds) { + const entityIdsAsStrings = entityIds.map(id => id.toString()); + + cy.getBySelector("claim-select").should("be.visible"); + cy.getBySelector("claim-select").select(entityIdsAsStrings, { force: true }); + cy.getBySelector("claim-submit").click(); + cy.getBySelector("flash-notice").should("be.visible"); +} + +// Verifies that the tutorials or talks that were claimed are +// displayed in the lecture edit page and contain the user's name +// (and all the other ones do not) +// If totalCount is specified, it is used to check the total number of +// tutorials or talks in the lecture. +export function verifyClaimsContainUserName(context, claimType, claimIds, totalCount = 3) { + let claimSelector = claimType === "tutorial" ? "tutorial-row" : "talk-header"; + cy.getBySelector(claimSelector).should("have.length", totalCount).each(($el) => { + const dataId = parseInt($el.attr("data-id"), 10); + if (claimIds.includes(dataId)) { + cy.wrap($el).should("contain", context.user.name_in_tutorials); + } + else { + cy.wrap($el).should("not.contain", context.user.name_in_tutorials); + } + }); +} + +export function logoutAndLoginAsTeacher(context) { + cy.logout(); + cy.then(() => { + cy.login(context.teacher); + }); +} + +export function verifyNoTutorialsButUserEligibleAsTutor(context, shouldBeEligible = true) { + cy.getBySelector("tutorial-row").should("not.exist"); + cy.getBySelector("new-tutorial-btn").should("be.visible").click(); + cy.then(() => { + cy.getBySelector("tutorial-form").should("be.visible"); + cy.getBySelector("tutor-select").within(() => { + const containStr = shouldBeEligible ? "contain" : "not.contain"; + cy.get("option").should(containStr, context.user.name_in_tutorials) + .and(containStr, context.user.email) + .and("not.contain", context.user.name); + }); + }); +} + +export function verifyLectureIsSubscribed(context) { + cy.visit("/main/start"); + context.lecture.call.title_no_term().then((title) => { + cy.getBySelector("subscribed-inactive-lectures-collapse").should("contain", title); + }); +} + +export function verifyRoleNotification(context, role) { + cy.i18n(`basics.${role}`).as("roleMessage"); + cy.i18n("notifications.redemption").as("redemptionMessage"); + + cy.then(() => { + cy.visit("/main/start"); + cy.getBySelector("notification-dropdown").should("be.visible"); + cy.getBySelector("notification-dropdown-counter").should("contain", "1"); + cy.getBySelector("notification-dropdown-menu") + .should("contain", context.roleMessage) + .and("contain", context.user.name_in_tutorials); + cy.visit("/notifications"); + cy.getBySelector("notification-card").should("have.length", 1); + context.lecture.call.title_for_viewers().then((title) => { + cy.getBySelector("notification-header").should("contain", title); + }); + cy.getBySelector("notification-body") + .should("contain", context.redemptionMessage) + .and("contain", context.user.name_in_tutorials) + .and("contain", context.user.email); + }); +} + +export function verifyAllItemsTakenMessage(context, itemType) { + cy.i18n(`profile.all_${itemType}s_taken`).as("allItemsTaken"); + + cy.then(() => { + cy.getBySelector("redeem-voucher-card") + .should("contain", context.allItemsTaken); + }); +} + +export function verifyCancelVoucherButton() { + cy.getBySelector("cancel-voucher-btn").should("be.visible"); + cy.getBySelector("cancel-voucher-btn").click(); + cy.then(() => { + cy.getBySelector("verify-voucher-form").should("be.visible"); + }); +} + +export function verifyNoNotification() { + cy.visit("/main/start"); + cy.getBySelector("notification-dropdown").should("not.exist"); +} + +export function verifyNoNewNotification() { + cy.visit("/main/start"); + cy.getBySelector("notification-dropdown").should("be.visible"); + cy.getBySelector("notification-dropdown-counter").should("contain", "1"); +} + +export function verifyTeachersCantBecomeEditorsMessage(context) { + cy.i18n("profile.teacher_cant_become_editor").as("teacherCantBecomeEditor"); + + cy.then(() => { + cy.getBySelector("redeem-voucher-card") + .should("contain", context.teacherCantBecomeEditor); + }); +} + +export function verifyUserIsTeacher(context) { + cy.getBySelector("teacher-info") + .should("contain", context.user.name_in_tutorials) + .and("contain", context.user.email) + .and("not.contain", context.user.name); +}; + +export function verifyPreviousTeacherIsEditor(context) { + cy.getBySelector("lecture-editors-select").within(() => { + cy.get("option").should("contain", context.teacher.name_in_tutorials) + .and("contain", context.teacher.email) + .and("not.contain", context.teacher.name); + }); +} + +export function verifyAlreadyTeacherMessage(context) { + context.lecture.call.title().then((lectureTitle) => { + cy.i18n("profile.already_teacher_html", { lecture: lectureTitle }).as("alreadyTeacher"); + }); + + cy.then(() => { + cy.getBySelector("redeem-voucher-card") + .should("contain.html", context.alreadyTeacher); + }); +} + +export function visitEditPage(context, type) { + let url = `/lectures/${context.lecture.id}/edit`; + if (type !== "talk") { + url += "#people"; + } + cy.visit(url); +} + +export function verifyNoTalksYetButUserEligibleAsSpeaker(context) { + cy.i18n("admin.lecture.no_talks").as("noTalksYet"); + + cy.then(() => { + cy.getBySelector("no-talks-yet").should("contain", context.noTalksYet); + cy.getBySelector("new-talk-btn").click(); + }); + + cy.then(() => { + cy.getBySelector("talk-form").should("be.visible"); + cy.getBySelector("speaker-select").within(() => { + cy.get("option").should("contain", context.user.name_in_tutorials) + .and("contain", context.user.email) + .and("not.contain", context.user.name); + }); + }); +} + +export function verifyNoClaimsYetButUserEligibleForRole(context, role) { + role === "tutor" ? verifyNoTutorialsButUserEligibleAsTutor(context) : verifyNoTalksYetButUserEligibleAsSpeaker(context); +} + +export function verifyUserIsEditor(context) { + cy.getBySelector("lecture-editors-select").within(() => { + cy.get("option").should("contain", context.user.name_in_tutorials) + .and("contain", context.user.email) + .and("not.contain", context.user.name); + }); +} + +export function verifyNothingClaimedInNotification(context, claimType) { + cy.i18n(`notifications.no_${claimType}s_taken`).as("nothingClaimed"); + + cy.then(() => { + cy.getBySelector("notification-body") + .should("contain", context.nothingClaimed); + }); +} diff --git a/spec/cypress/e2e/vouchers_spec.cy.js b/spec/cypress/e2e/vouchers_spec.cy.js new file mode 100644 index 000000000..c667748f2 --- /dev/null +++ b/spec/cypress/e2e/vouchers_spec.cy.js @@ -0,0 +1,167 @@ +import FactoryBot from "../support/factorybot"; +import Timecop from "../support/timecop"; + +const ROLES = ["tutor", "editor", "teacher", "speaker"]; +const ROLES_WITHOUT_SEMINAR = ROLES.filter(role => role !== "speaker"); + +function createLectureScenario(context, type = "lecture") { + cy.createUserAndLogin("teacher").as("teacher"); + + cy.then(() => { + FactoryBot.create(type, { teacher_id: context.teacher.id }).as("lecture"); + }); + + cy.then(() => { + cy.visit(`/lectures/${context.lecture.id}/edit#people`); + cy.getBySelector("vouchers-header").should("be.visible"); + }); + + cy.i18n("basics.vouchers").as("vouchers"); +} + +function assertVoucherShown(role) { + cy.getBySelector(`create-${role}-voucher-btn`).should("not.exist"); + cy.getBySelector(`invalidate-${role}-voucher-btn`).should("be.visible"); + cy.getBySelector(`${role}-voucher-secure-hash`) + .invoke("val").should("match", /^([a-z0-9]){32}$/); +} + +function assertVoucherNotShown(role) { + cy.getBySelector(`invalidate-${role}-voucher-btn`).should("not.exist"); + cy.getBySelector(`create-${role}-voucher-btn`).should("be.visible"); + cy.getBySelector(`${role}-voucher-secure-hash`).should("not.exist"); +} + +function testCreateVoucher(role) { + cy.getBySelector(`create-${role}-voucher-btn`).click(); + assertVoucherShown(role); +} + +function testInvalidateVoucher(role) { + cy.getBySelector(`invalidate-${role}-voucher-btn`).click(); + cy.on("window:confirm", () => true); // Confirm popup + assertVoucherNotShown(role); +} + +context("When the lecture is not a seminar", () => { + beforeEach(function () { + createLectureScenario(this); + }); + + describe("People tab in lecture edit page", () => { + it("shows buttons for creating tutor, editor and teacher vouchers", function () { + cy.contains(this.vouchers).should("be.visible"); + + ROLES_WITHOUT_SEMINAR.forEach((role) => { + cy.getBySelector(`create-${role}-voucher-btn`).should("be.visible"); + }); + + cy.getBySelector("create-speaker-voucher-btn").should("not.exist"); + }); + + it("displays the voucher and invalidate button after the create button is clicked", function () { + ROLES_WITHOUT_SEMINAR.forEach((role) => { + testCreateVoucher(role); + }); + }); + + it("displays that there is no active voucher after the invalidate button is clicked", function () { + ROLES_WITHOUT_SEMINAR.forEach((role) => { + testCreateVoucher(role); + testInvalidateVoucher(role); + }); + }); + + it.skip("copies the voucher hash to the clipboard", function () { + ROLES_WITHOUT_SEMINAR.forEach((role) => { + cy.getBySelector(`create-${role}-voucher-btn`).click(); + cy.getBySelector(`${role}-voucher-secure-hash`).then(($hash) => { + const hashText = $hash.text(); + cy.getBySelector(`copy-${role}-voucher-btn`).click(); + cy.assertCopiedToClipboard(hashText); + }); + }); + }); + }); +}); + +context("When the lecture is a seminar", () => { + beforeEach(function () { + createLectureScenario(this, "seminar"); + }); + + describe("People tab in lecture edit page", () => { + it("shows buttons for creating tutor, editor, teacher, and speaker vouchers", function () { + cy.contains(this.vouchers).should("be.visible"); + ROLES.forEach((role) => { + cy.getBySelector(`create-${role}-voucher-btn`).should("be.visible"); + }); + }); + + it("displays the voucher and invalidate button after the create button is clicked", function () { + ROLES.forEach((role) => { + testCreateVoucher(role); + }); + }); + + it("displays that there is no active voucher after the invalidate button is clicked", function () { + ROLES.forEach((role) => { + testCreateVoucher(role); + testInvalidateVoucher(role); + }); + }); + }); +}); + +context("When traveling into the future", () => { + beforeEach(function () { + createLectureScenario(this, "seminar"); + }); + + afterEach(() => { + Timecop.reset(); + }); + + it("does not show expired vouchers (far in the future)", function () { + ROLES.forEach((role) => { + testCreateVoucher(role); + }); + + // This behavior is more extensively tested via unit tests in the backend. + // This is just a sanity check where we travel *far* into the future. + Timecop.moveAheadDays(1000).then(() => { + cy.reload(); + ROLES.forEach((role) => { + assertVoucherNotShown(role); + }); + }); + }); + + it("does not show expired vouchers (near future)", function () { + ROLES.forEach((role) => { + testCreateVoucher(role); + textExpiresAtWithTimeTravel(role); + }); + + function textExpiresAtWithTimeTravel(role) { + // find date string, read it, then travel to that date (+1 minute) + cy.getBySelector(`${role}-voucher-expires-at`).then(($expiresAt) => { + const date = new Date($expiresAt.text()); + date.setMinutes(date.getMinutes() + 1); + cy.isValidDate(date).then((isValid) => { + expect(isValid).to.be.true; + }); + + cy.log(`Traveling to ${date.toISOString()} (UTC)`); + Timecop.travelToDate(date, true); + }); + + cy.then(() => { + cy.reload(); + assertVoucherNotShown(role); + }); + + Timecop.reset(); + } + }); +}); diff --git a/spec/cypress/support/commands.js b/spec/cypress/support/commands.js index f965e0486..e0de5839c 100644 --- a/spec/cypress/support/commands.js +++ b/spec/cypress/support/commands.js @@ -20,6 +20,62 @@ Cypress.Commands.add("clickExpectNewTab", { prevSubject: true }, ($subject, args return cy.wrap($subject).invoke("removeAttr", "target").click(args); }); +Cypress.Commands.add("assertCopiedToClipboard", (_expectedText) => { + cy.fail("Not implemented yet"); + + // An old method would consist of something like this: + // adapted from https://stackoverflow.com/a/69571115 + // and https://stackoverflow.com/a/33928558 + + ////////////////////////////////////////////////////////////////////////////// + // NEW PROPOSED SOLUTION for the new Clipboard API + ////////////////////////////////////////////////////////////////////////////// + + // TODO (clipboard): We currently use the obsolete clipboard API from browsers, + // i.e. document.execCommand("copy") via the clipboard.js library. + // There's a new Clipboard API that is supported by modern browsers. + // Once we switch to that API, use the following code to test copying to + // the clipboard. Also see this GitHub issue for more information: + // https://github.com/cypress-io/cypress/issues/2752 + // + // Note that another option to test the clipboard content then would be + // https://github.com/cypress-io/cypress/issues/2752#issuecomment-1039285381 + // which wouldn't even require requesting permissions but might have its + // own limitations. + + // Request clipboard permissions + // by https://stackoverflow.com/a/73329952/9655481 + // Note that this won't work by default in a non-secure context (http), so we need to + // pass the flag --unsafely-treat-insecure-origin-as-secure=http://mampf:3000 + // to the browser when starting it (see the cypress config) + // cy.wrap(Cypress.automation("remote:debugger:protocol", { + // command: "Browser.grantPermissions", + // params: { + // permissions: ["clipboardReadWrite", "clipboardSanitizedWrite"], + // }, + // })); + + // Make sure clipboard permissions were granted + // https://stackoverflow.com/questions/61650737/how-to-fetch-copied-to-clipboard-content-in-cypress/73329952#comment137190789_69571115 + // cy.window().its("navigator.permissions") + // .then(api => api.query({ name: "clipboard-read" })) + // .its("state").should("equal", "granted"); + + // https://stackoverflow.com/a/75928308/ + // cy.window().its("navigator.clipboard") + // .then(clip => clip.readText()) + // .should("equal", expectedText); +}); + +Cypress.Commands.add("isValidDate", (date) => { + // https://stackoverflow.com/a/1353711/ + return date instanceof Date && !isNaN(date); +}); + +//////////////////////////////////////////////////////////////////////////////// +// Custom commands for backend interaction +//////////////////////////////////////////////////////////////////////////////// + Cypress.Commands.add("cleanDatabase", () => { return BackendCaller.callCypressRoute("database_cleaner", "cy.cleanDatabase()", {}); }); @@ -29,7 +85,7 @@ beforeEach(() => { }); Cypress.Commands.add("createUser", (role) => { - if (!["admin", "editor", "teacher", "generic"].includes(role)) { + if (!["admin", "editor", "teacher", "generic", "tutor"].includes(role)) { throw new Error(`Invalid role: ${role}`); } return BackendCaller.callCypressRoute("user_creator", "cy.createUser()", { role: role }); @@ -45,12 +101,25 @@ Cypress.Commands.add("login", (user) => { "user[email]": user.email, "user[password]": user.password, }, + }).then((response) => { + expect(response.status).to.eq(200); + }); +}); + +Cypress.Commands.add("logout", () => { + return cy.request({ + method: "DELETE", + url: "/users/sign_out", + form: true, + failOnStatusCode: true, + }).then((response) => { + expect(response.status).to.eq(204); }); }); Cypress.Commands.add("createUserAndLogin", (role) => { - cy.createUser(role).then((user) => { - cy.login({ email: `${role}@mampf.cypress`, password: "cypress123" }).then((_) => { + return cy.createUser(role).then((user) => { + cy.login({ email: user.email, password: user.password }).then((_) => { cy.wrap(user); }); }); diff --git a/spec/cypress/support/factorybot.js b/spec/cypress/support/factorybot.js index 973ffacd0..40c1e5faa 100644 --- a/spec/cypress/support/factorybot.js +++ b/spec/cypress/support/factorybot.js @@ -9,19 +9,91 @@ class FactoryBot { * @param args The arguments to pass to FactoryBot.create(), e.g. * factory name, traits, and attributes. Pass them in as separated * string arguments. Attributes should be passed as an object. - * @returns The FactoryBot.create() response - * - * @example + * You are also able to call instance methods on the created record later. + * @returns The FactoryBot.create() response. + * @examples * FactoryBot.create("factory_name", "with_trait", { another_attribute: ".pdf"}) + * FactoryBot.create("factory_name").then(res => {res.call.any_rails_method(42)}) + * FactoryBot.create("tutorial", + * { lecture_id: this.lecture.id, tutor_ids: [this.tutor1.id, this.tutor2.id] }) */ create(...args) { - return BackendCaller.callCypressRoute("factories", "FactoryBot.create()", args); + const response = BackendCaller.callCypressRoute("factories", "FactoryBot.create()", args); + return this.#createProxy(response); } createNoValidate(...args) { args.push({ validate: false }); return this.create(...args); } + + /** + * Wraps the given Cypress response such that arbitrary methods (dynamic methods) + * can be called on the resulting object. + */ + #createProxy(obj) { + const outerContext = this; + + return new Proxy(obj, { + get: function (target, property, receiver) { + if (property !== "as" && property !== "then") { + return Reflect.get(target, property, receiver); + } + + // Trap the Cypress "as" and "then" methods to allow dynamic method calls + return function (...asOrThenArgs) { + if (property === "then") { + const callback = asOrThenArgs[0]; + asOrThenArgs[0] = function (callbackObj) { + outerContext.#defineCallProperty(callbackObj); + return callback(callbackObj); + }; + return target[property](...asOrThenArgs); + } + + if (property === "as") { + return target.as(...asOrThenArgs).then((asResponse) => { + outerContext.#defineCallProperty(asResponse); + }); + } + + throw new Error(`Unknown property that should not be wrapped: ${property}`); + }; + }, + }); + } + + #defineCallProperty(response) { + const factoryName = response["factory_name"]; + if (!factoryName) { + let msg = "FactoryBot call response does not contain factory_name key."; + msg += " Did you really use FactoryBot.create() (or similar) to create the record?"; + throw new Error(msg); + } + const call = this.#allowDynamicMethods({}, factoryName, response.id); + response.call = call; + } + + #allowDynamicMethods(obj, factoryName, instanceId) { + return new Proxy(obj, { + get: function (target, property, receiver) { + // If the property does not exist, define it as a new function + if (!(property in target)) { + target[property] = function () { + const payload = { + factory_name: factoryName, + instance_id: instanceId, + method_name: property, + method_args: Array.from(arguments), + }; + return BackendCaller.callCypressRoute("factories/call_instance_method", + `FactoryBot.create().call.${property}()`, payload); + }; + } + return Reflect.get(target, property, receiver); + }, + }); + } } export default new FactoryBot(); diff --git a/spec/cypress/support/timecop.js b/spec/cypress/support/timecop.js new file mode 100644 index 000000000..9d6dd5926 --- /dev/null +++ b/spec/cypress/support/timecop.js @@ -0,0 +1,59 @@ +import BackendCaller from "./backend_caller"; + +/** + * Helper to call Timecop from Cypress tests, which is used to freeze or travel + * time in the backend. + * + * This is different from cy.clock() which only affects the frontend. + */ +class Timecop { + /** + * Travels to the given date in the backend. + * + * By default, the date is assumed to be in the local timezone (assuming the + * backend is configured to use local time). + */ + #travelTo(year, month, day, hours = 0, minutes = 0, seconds = 0, useUTC = false) { + return BackendCaller.callCypressRoute("timecop/travel", "Timecop.travel()", + { year: year, month: month, day: day, + hours: hours, minutes: minutes, seconds: seconds, + use_utc: useUTC, + }); + } + + /** + * Travels to the given date in the backend. + * + * By default, the date is assumed to be in the local timezone (assuming the + * backend is configured to use local time). + */ + travelToDate(date, useUTC = false) { + return this.#travelTo( + date.getFullYear(), date.getMonth() + 1, date.getDate(), + date.getHours(), date.getMinutes(), date.getSeconds(), + useUTC, + ); + } + + /** + * Moves the time ahead by the given number of days. + */ + moveAheadDays(days) { + const now = new Date(); + now.setDate(now.getDate() + days); + cy.log(`Moving ahead ${days} days to ${now.toISOString()}`); + return this.#travelTo( + now.getFullYear(), now.getMonth() + 1, now.getDate(), + now.getHours(), now.getMinutes(), now.getSeconds(), + ); + } + + /** + * Resets the time in the backend to the current time. + */ + reset() { + return BackendCaller.callCypressRoute("timecop/reset", "Timecop.reset()"); + } +} + +export default new Timecop(); diff --git a/spec/factories/courses.rb b/spec/factories/courses.rb index 2a645fb12..27291a8ae 100644 --- a/spec/factories/courses.rb +++ b/spec/factories/courses.rb @@ -44,5 +44,21 @@ course.tags = FactoryBot.create_list(:tag, evaluator.tag_count) end end + + trait :with_division do + transient do + division_id { nil } + end + + after(:build) do |course, evaluator| + if evaluator.division_id + FactoryBot.create(:division_course_join, + course: course, division_id: evaluator.division_id) + else + division = FactoryBot.create(:division) + FactoryBot.create(:division_course_join, course: course, division: division) + end + end + end end end diff --git a/spec/factories/lectures.rb b/spec/factories/lectures.rb index ae0274c8c..c47b26b49 100644 --- a/spec/factories/lectures.rb +++ b/spec/factories/lectures.rb @@ -62,13 +62,6 @@ course { association :course, title: title } end - trait :with_teacher_by_id do - transient do - teacher_id { nil } - end - teacher { User.find(teacher_id) } - end - # NOTE: that you can give the chapter_count here as parameter as well factory :lecture_with_toc, traits: [:with_toc] diff --git a/spec/factories/talks.rb b/spec/factories/talks.rb index 9b77103a7..906efdafa 100644 --- a/spec/factories/talks.rb +++ b/spec/factories/talks.rb @@ -2,6 +2,8 @@ FactoryBot.define do factory :talk do + association :lecture, factory: :seminar + # the generic factory for lesson will just produce an empty talk # as it is rather expensive to build a valid lesson from scratch # (and in most tests you will probably start with an empty talk and @@ -13,10 +15,6 @@ "#{Faker::Book.title} #{Faker::Number.between(from: 1, to: 9999)}" end - trait :with_seminar do - association :lecture, factory: :seminar - end - trait :with_date dates do [Faker::Date.in_date_period] @@ -29,8 +27,18 @@ end end - factory :valid_talk, traits: [:with_seminar] + transient do + speaker_ids { [] } + end + + after(:create) do |talk, evaluator| + evaluator.speaker_ids.each do |id| + talk.speakers << User.find(id) + end + end + + factory :valid_talk - factory :valid_talk_with_speaker, traits: [:with_seminar, :with_speaker] + factory :valid_talk_with_speaker, traits: [:with_speaker] end end diff --git a/spec/factories/terms.rb b/spec/factories/terms.rb index 9a1c6e949..3ecd347c3 100644 --- a/spec/factories/terms.rb +++ b/spec/factories/terms.rb @@ -8,5 +8,13 @@ trait :summer do season { "SS" } end + + trait :winter do + season { "WS" } + end + + trait :active do + active { true } + end end end diff --git a/spec/factories/tutorials.rb b/spec/factories/tutorials.rb index 38f3ea97f..6d3f19afb 100644 --- a/spec/factories/tutorials.rb +++ b/spec/factories/tutorials.rb @@ -12,4 +12,13 @@ t.tutors = build_list(:confirmed_user, evaluator.tutors_count) end end + + trait :with_tutor_by_id do + transient do + tutor_id { nil } + end + after :build do |t, eval| + t.tutors = [User.find(eval.tutor_id)] + end + end end diff --git a/spec/factories/vouchers.rb b/spec/factories/vouchers.rb new file mode 100644 index 000000000..9605883bb --- /dev/null +++ b/spec/factories/vouchers.rb @@ -0,0 +1,32 @@ +FactoryBot.define do + factory :voucher do + role { :tutor } + association :lecture + + trait :tutor do + role { :tutor } + end + + trait :editor do + role { :editor } + end + + trait :teacher do + role { :teacher } + end + + trait :speaker do + role { :speaker } + end + + trait :expired do + after(:create) do |voucher| + voucher.update(expires_at: 1.day.ago) + end + end + + trait :invalidated do + invalidated_at { 1.day.ago } + end + end +end diff --git a/spec/models/course_spec.rb b/spec/models/course_spec.rb index 353fe81db..da0911427 100644 --- a/spec/models/course_spec.rb +++ b/spec/models/course_spec.rb @@ -546,6 +546,7 @@ self_item1 = Item.find_by(sort: "self", medium: @course_medium) self_item2 = Item.find_by(sort: "self", medium: @lecture_medium) self_item3 = Item.find_by(sort: "self", medium: @lesson_medium) + I18n.locale = :de expect(@course.media_items_with_inheritance) .to match_array([["Bem. 1.2 ", item1.id], ["SS 20, Satz 3.4 ", item2.id], diff --git a/spec/models/current_spec.rb b/spec/models/current_spec.rb new file mode 100644 index 000000000..be3059a20 --- /dev/null +++ b/spec/models/current_spec.rb @@ -0,0 +1,12 @@ +require "rails_helper" + +RSpec.describe(Current) do + let(:user) { FactoryBot.create(:confirmed_user) } + + describe ".user" do + it "returns the current user" do + Current.user = :user + expect(Current.user).to eq(:user) + end + end +end diff --git a/spec/models/lecture_spec.rb b/spec/models/lecture_spec.rb index d2ba05682..d6c067565 100644 --- a/spec/models/lecture_spec.rb +++ b/spec/models/lecture_spec.rb @@ -86,6 +86,75 @@ end end + describe "#stale?" do + context "when there is no active term" do + it "returns false" do + lecture = FactoryBot.build(:lecture) + expect(lecture.stale?).to be(false) + end + end + + context "when there is an active term" do + let(:year) { 2024 } + + before(:each) do + FactoryBot.create(:term, :summer, :active, year: year) + end + + context "and there is no term associated with the lecture" do + it "returns true" do + lecture = FactoryBot.build(:lecture, :term_independent) + expect(lecture.stale?).to be(true) + end + end + + context "and the lecture term begin date is before the active term" \ + "begin date minus 1 year" do + let(:lecture_term) { FactoryBot.build(:term, :summer, year: year - 1) } + + it "returns true" do + lecture = FactoryBot.build(:lecture, term: lecture_term) + expect(lecture.stale?).to be(true) + end + end + + context "when the lecture term begin date is not older than the" \ + "active term begin date minus 1 year" do + let(:lecture_term) { FactoryBot.build(:term, :winter, year: year - 1) } + + it "returns false" do + lecture = FactoryBot.build(:lecture, term: lecture_term) + expect(lecture.stale?).to be(false) + end + end + end + end + + describe "#active_voucher_of_role" do + let(:lecture) { FactoryBot.create(:lecture) } + let(:role) { :tutor } + + context "when there is an active voucher of the specified role" do + let!(:active_voucher) do + FactoryBot.create(:voucher, role: role, lecture: lecture) + end + + it "returns the voucher" do + expect(lecture.active_voucher_of_role(role)).to eq(active_voucher) + end + end + + context "when there is no active voucher of the specified role" do + let!(:inactive_voucher) do + FactoryBot.create(:voucher, :expired, role: role, lecture: lecture) + end + + it "returns nil" do + expect(lecture.active_voucher_of_role(role)).to be(nil) + end + end + end + # Test methods -- NEEDS TO BE REFACTORED # describe '#tags' do diff --git a/spec/models/redeemer_spec.rb b/spec/models/redeemer_spec.rb new file mode 100644 index 000000000..53f2a39c9 --- /dev/null +++ b/spec/models/redeemer_spec.rb @@ -0,0 +1,242 @@ +require "rails_helper" + +RSpec.describe(Redeemer, type: :model) do + describe "#redeem" do + let(:lecture) { FactoryBot.create(:lecture) } + let(:voucher) { FactoryBot.create(:voucher, lecture: lecture, role: role) } + let(:user) { FactoryBot.create(:confirmed_user) } + let(:params) { {} } + let(:role) { :tutor } + + before :each do + allow(Current).to receive(:user).and_return(user) + end + + shared_examples "common voucher processing" do + it "creates a redemption" do + expect { voucher.redeem(params) }.to change { Redemption.count }.by(1) + end + + it "subscribes the user to the lecture" do + voucher.redeem(params) + expect(user.lectures).to include(lecture) + end + + it "creates notifications about the voucher's redemption" do + count_before = Notification.count + voucher.redeem(params) + lecture.reload + expect(Notification.count).to eq(count_before + lecture.editors_and_teacher.count) + end + end + + context "when the voucher is for a tutor" do + let(:tutorial1) { FactoryBot.create(:tutorial, lecture: lecture) } + let(:tutorial2) { FactoryBot.create(:tutorial, lecture: lecture) } + let(:params) { { tutorial_ids: [tutorial1.id, tutorial2.id] } } + + include_examples "common voucher processing" + + it "adds the tutorials to the user's given tutorials" do + voucher.redeem(params) + expect(user.given_tutorials).to include(tutorial1, tutorial2) + end + + it "does not add a tutorial if its id is not in the params" do + tutorial3 = FactoryBot.create(:tutorial, lecture: lecture) + voucher.redeem(params) + expect(user.given_tutorials).not_to include(tutorial3) + end + + it "creates a redemption with the claimed tutorials" do + voucher.redeem(params) + redemption = Redemption.last + expect(redemption.claimed_tutorials).to include(tutorial1, tutorial2) + end + end + + context "when the voucher is for an editor" do + let(:role) { :editor } + + include_examples "common voucher processing" + + it "adds the user to the lecture's editors" do + voucher.redeem(params) + expect(lecture.editors).to include(user) + end + + it "sends an email to the new editor" do + expect do + voucher.redeem(params) + end.to enqueue_mail_including_params(LectureNotificationMailer, :new_editor_email, + recipient: user, lecture: lecture, locale: user.locale) + + perform_enqueued_jobs do + voucher.redeem(params) + end + + mail = ActionMailer::Base.deliveries.last + I18n.locale = user.locale + assert_from_notification_mailer(mail) + expect(mail.to).to include(user.email) + expect(mail.subject).to include( + I18n.t("mailer.new_editor_subject", title: lecture.title_for_viewers) + ) + expect(mail.html_part.body).to include( + I18n.t("mailer.new_editor", + title: lecture.title_with_teacher, username: user.tutorial_name) + ) + end + end + + context "when the voucher is for a teacher" do + let(:role) { :teacher } + + include_examples "common voucher processing" + + it "sets the user as the lecture's teacher" do + voucher.redeem(params) + expect(lecture.teacher).to eq(user) + end + + it "demotes the previous teacher to an editor" do + previous_teacher = lecture.teacher + voucher.redeem(params) + expect(lecture.editors).to include(previous_teacher) + end + + it "invalidates the voucher" do + voucher.redeem(params) + expect(voucher.invalidated_at).not_to be_nil + end + + it "enqueues an email to previous and new teacher" do + previous_teacher = lecture.teacher + expect do + voucher.redeem(params) + end.to enqueue_mail_including_params(LectureNotificationMailer, :new_teacher_email, + recipient: user, lecture: lecture, locale: user.locale) + .and(enqueue_mail_including_params(LectureNotificationMailer, :previous_teacher_email, + recipient: previous_teacher, lecture: lecture, + locale: previous_teacher.locale)) + end + + it "sends an email to previous and new teacher" do + previous_teacher = lecture.teacher + + perform_enqueued_jobs do + voucher.redeem(params) + end + + # Mail to previous teacher + mail = ActionMailer::Base.deliveries.last + I18n.locale = previous_teacher.locale + assert_from_notification_mailer(mail) + expect(mail[:from].display_names).to include(I18n.t("mailer.notification")) + expect(mail.to).to include(previous_teacher.email) + expect(mail.subject).to include( + I18n.t("mailer.previous_teacher_subject", title: lecture.title_for_viewers, + new_teacher: user.tutorial_name) + ) + expect(mail).to include_in_html_body( + I18n.t("mailer.previous_teacher", + title: lecture.title_with_teacher, + new_teacher: lecture.teacher.info, username: previous_teacher.tutorial_name) + ) + + # Mail to new teacher + mail = ActionMailer::Base.deliveries[-2] + I18n.locale = user.locale + assert_from_notification_mailer(mail) + expect(mail.to).to include(user.email) + expect(mail.subject).to include( + I18n.t("mailer.new_teacher_subject", title: lecture.title_for_viewers) + ) + expect(mail).to include_in_html_body( + I18n.t("mailer.new_teacher", + title: lecture.title_with_teacher, username: user.tutorial_name) + ) + end + end + + context "when the voucher is for a speaker" do + let(:lecture) { FactoryBot.create(:lecture, :is_seminar) } + let(:role) { :speaker } + let(:talk1) { FactoryBot.create(:talk, lecture: lecture) } + let(:talk2) { FactoryBot.create(:talk, lecture: lecture) } + let(:params) { { talk_ids: [talk1.id, talk2.id] } } + let(:cospeaker_talk1) { FactoryBot.create(:confirmed_user) } + let(:cospeaker_talk2) { FactoryBot.create(:confirmed_user) } + let(:cospeaker_talk2_other) { FactoryBot.create(:confirmed_user) } + + before do + talk1.speakers << cospeaker_talk1 + talk2.speakers << cospeaker_talk2 + talk2.speakers << cospeaker_talk2_other + end + + include_examples "common voucher processing" + + it "adds the talks to the user's given talks" do + voucher.redeem(params) + expect(user.talks).to include(talk1, talk2) + end + + it "does not add a talk if its id is not in the params" do + talk3 = FactoryBot.create(:talk, lecture: lecture) + voucher.redeem(params) + expect(user.talks).not_to include(talk3) + end + + it "creates a redemption with the claimed talks" do + voucher.redeem(params) + redemption = Redemption.last + expect(redemption.claimed_talks).to include(talk1, talk2) + end + + it "enqueues emails to every co-speaker" do + expect do + voucher.redeem(params) + end.to enqueue_mail_including_params(LectureNotificationMailer, :new_speaker_email, + recipient: cospeaker_talk1, speaker: user, + locale: cospeaker_talk1.locale, talk: talk1) + .and(enqueue_mail_including_params(LectureNotificationMailer, :new_speaker_email, + recipient: cospeaker_talk2, speaker: user, + locale: cospeaker_talk2.locale, talk: talk2)) + .and(enqueue_mail_including_params(LectureNotificationMailer, :new_speaker_email, + recipient: cospeaker_talk2_other, speaker: user, + locale: cospeaker_talk2_other.locale, talk: talk2)) + end + + it "does not enqueue an email to the user that redeemed the voucher" do + expect do + voucher.redeem(params) + end.not_to have_enqueued_mail(LectureNotificationMailer, :new_speaker_email) + .with(hash_including(params: hash_including(recipient: user))) + end + + it "sends emails to every co-speaker" do + perform_enqueued_jobs do + voucher.redeem(params) + end + + [cospeaker_talk1, cospeaker_talk2, cospeaker_talk2_other].each do |cospeaker| + talk = cospeaker == cospeaker_talk1 ? talk1 : talk2 + I18n.locale = cospeaker.locale + mail = ActionMailer::Base.deliveries.detect do |m| + m.to.include?(cospeaker.email) && + m.subject.include?(I18n.t("mailer.new_speaker_subject", + seminar: talk.lecture.title, title: talk.to_label)) + end + expect(mail).not_to be_nil + assert_from_notification_mailer(mail) + expect(mail).to include_in_html_body( + I18n.t("mailer.new_speaker", + seminar: talk.lecture.title, title: talk.to_label, + username: cospeaker.tutorial_name, speaker: user.info) + ) + end + end + end + end +end diff --git a/spec/models/voucher_spec.rb b/spec/models/voucher_spec.rb new file mode 100644 index 000000000..f64887795 --- /dev/null +++ b/spec/models/voucher_spec.rb @@ -0,0 +1,130 @@ +require "rails_helper" + +RSpec.describe(Voucher, type: :model) do + let(:lecture) { FactoryBot.create(:lecture) } + let(:seminar) { FactoryBot.create(:lecture, :is_seminar) } + + describe "callbacks" do + it "generates a secure hash before creating" do + voucher = FactoryBot.build(:voucher) + expect(voucher.secure_hash).to be_nil + voucher.save + expect(voucher.secure_hash).not_to be_nil + end + + it "adds an expiration datetime before creating" do + voucher = FactoryBot.build(:voucher) + expect(voucher.expires_at).to be_nil + voucher.save + expect(voucher.expires_at).not_to be_nil + end + + describe "#add_expiration_datetime" do + def expiration_days(role) + case role + when :speaker + Voucher::SPEAKER_EXPIRATION_DAYS + when :tutor + Voucher::TUTOR_EXPIRATION_DAYS + else + Voucher::DEFAULT_EXPIRATION_DAYS + end + end + + it "sets the expiration date correctly based on the role" do + Voucher::ROLE_HASH.each_key do |role| + voucher = build(:voucher, lecture: lecture, role: role) + voucher.save + expect(voucher.expires_at).to eq(voucher.created_at + expiration_days(role).days) + end + end + end + + describe "#ensure_no_other_active_voucher" do + it "rolls back if there is another active voucher with the same role for the lecture" do + FactoryBot.create(:voucher, :tutor, lecture: lecture) + new_voucher = build(:voucher, :tutor, lecture: lecture) + + expect(new_voucher.save).to be_falsey + expect(new_voucher.errors[:role]).to( + include(I18n.t("activerecord.errors.models.voucher." \ + "attributes.role.only_one_active")) + ) + end + end + + describe "#ensure_speaker_vouchers_only_for_seminars" do + context "when the lecture is a seminar" do + let(:voucher) { build(:voucher, :speaker, lecture: seminar) } + + it "does not add an error" do + expect(voucher).to be_valid + expect(voucher.save).to be_truthy + expect(voucher.errors[:role]).to be_empty + end + end + + context "when the lecture is not a seminar" do + let(:voucher) { build(:voucher, :speaker, lecture: lecture) } + + it "rolls back and adds an error" do + expect(voucher.save).to be_falsey + expect(voucher.errors[:role]).to( + include(I18n.t("activerecord.errors.models.voucher.attributes." \ + "role.speaker_vouchers_only_for_seminars")) + ) + end + end + end + end + + describe "scopes" do + describe ".active" do + it "includes vouchers that are not expired and not invalidated" do + active_voucher = FactoryBot.create(:voucher) + expect(Voucher.active).to include(active_voucher) + end + + it "excludes vouchers that are expired" do + expired_voucher = FactoryBot.create(:voucher, :expired) + expect(Voucher.active).not_to include(expired_voucher) + end + + it "excludes vouchers that are invalidated" do + invalidated_voucher = FactoryBot.create(:voucher, :invalidated) + expect(Voucher.active).not_to include(invalidated_voucher) + end + + it "excludes vouchers that are both expired and invalidated" do + voucher = FactoryBot.create(:voucher, :expired, :invalidated) + expect(Voucher.active).not_to include(voucher) + end + end + end + + describe "class methods" do + describe ".roles_for_lecture" do + it "returns all roles if the lecture is a seminar" do + expect(Voucher.roles_for_lecture(seminar)).to eq(Voucher::ROLE_HASH.keys) + end + + it "returns all sorts except :speaker if the lecture is not a seminar" do + expect(Voucher.roles_for_lecture(lecture)).to eq(Voucher::ROLE_HASH.keys - [:speaker]) + end + end + end + + describe "instance methods" do + describe "#invalidate!" do + it "sets the invalidated_at attribute to the current time" do + voucher = FactoryBot.create(:voucher) + expect(voucher.invalidated_at).to be_nil + frozen_time = Time.zone.now.change(nsec: 0) + Timecop.freeze(frozen_time) do + voucher.invalidate! + expect(voucher.invalidated_at).to eq(frozen_time) + end + end + end + end +end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 57c66cd8d..15181ff20 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -26,7 +26,7 @@ # If you are not using ActiveRecord, you can remove this line. ActiveRecord::Migration.maintain_test_schema! -Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f } +Rails.root.glob("spec/support/**/*.rb").each { |f| require f } RSpec.configure do |config| # Include Factory Girl syntax to simplify calls to factories diff --git a/spec/support/mail_assertions.rb b/spec/support/mail_assertions.rb new file mode 100644 index 000000000..bd21b135b --- /dev/null +++ b/spec/support/mail_assertions.rb @@ -0,0 +1,6 @@ +# Asserts that the given email is sent from the project notification email +# and that the display name is set to the correct value. +def assert_from_notification_mailer(mail) + expect(mail.from).to eq([DefaultSetting::PROJECT_NOTIFICATION_EMAIL]) + expect(mail[:from].display_names).to eq([I18n.t("mailer.notification")]) +end diff --git a/spec/support/mail_matcher.rb b/spec/support/mail_matcher.rb new file mode 100644 index 000000000..be78e5b4f --- /dev/null +++ b/spec/support/mail_matcher.rb @@ -0,0 +1,29 @@ +RSpec::Matchers.define(:enqueue_mail_including_params) do |mailer, method, params| + supports_block_expectations + + match do |block| + expect do + block.call + end.to have_enqueued_mail(mailer, method) + .with(hash_including(params: hash_including(params))) + end + + failure_message do |_block| + "expected to enqueue #{mailer}.#{method} with #{params}, but instead enqueued: #{enqueued_jobs}" + end +end + +RSpec::Matchers.define(:include_in_html_body) do |expected| + # ignore \r and \n in the comparison + mail_body_stripped = ->(mail) { mail.html_part.body.decoded.gsub(/[\r\n]/, "") } + expected_stripped = expected.gsub(/[\r\n]/, "") + + match do |mail| + mail_body_stripped.call(mail).include?(expected_stripped) + end + + failure_message do |mail| + "Expected that the HTML body would include:\n#{expected_stripped}\n" \ + + "But got:\n#{mail_body_stripped.call(mail)}" + end +end diff --git a/yarn.lock b/yarn.lock index 41cab5418..5399feb94 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,102 +10,104 @@ "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.24" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465" - integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.0": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85" + integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ== dependencies: - "@babel/highlight" "^7.24.7" + "@babel/helper-validator-identifier" "^7.25.9" + js-tokens "^4.0.0" picocolors "^1.0.0" -"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.25.2": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.2.tgz#e41928bd33475305c586f6acbbb7e3ade7a6f7f5" - integrity sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ== +"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.25.9", "@babel/compat-data@^7.26.0": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.2.tgz#278b6b13664557de95b8f35b90d96785850bb56e" + integrity sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg== "@babel/core@^7.15.0": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.25.2.tgz#ed8eec275118d7613e77a352894cd12ded8eba77" - integrity sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA== + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.0.tgz#d78b6023cc8f3114ccf049eb219613f74a747b40" + integrity sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg== dependencies: "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.24.7" - "@babel/generator" "^7.25.0" - "@babel/helper-compilation-targets" "^7.25.2" - "@babel/helper-module-transforms" "^7.25.2" - "@babel/helpers" "^7.25.0" - "@babel/parser" "^7.25.0" - "@babel/template" "^7.25.0" - "@babel/traverse" "^7.25.2" - "@babel/types" "^7.25.2" + "@babel/code-frame" "^7.26.0" + "@babel/generator" "^7.26.0" + "@babel/helper-compilation-targets" "^7.25.9" + "@babel/helper-module-transforms" "^7.26.0" + "@babel/helpers" "^7.26.0" + "@babel/parser" "^7.26.0" + "@babel/template" "^7.25.9" + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.26.0" convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.3" semver "^6.3.1" -"@babel/generator@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.0.tgz#f858ddfa984350bc3d3b7f125073c9af6988f18e" - integrity sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw== +"@babel/generator@^7.25.9", "@babel/generator@^7.26.0": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.2.tgz#87b75813bec87916210e5e01939a4c823d6bb74f" + integrity sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw== dependencies: - "@babel/types" "^7.25.0" + "@babel/parser" "^7.26.2" + "@babel/types" "^7.26.0" "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.25" - jsesc "^2.5.1" + jsesc "^3.0.2" -"@babel/helper-annotate-as-pure@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab" - integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg== +"@babel/helper-annotate-as-pure@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz#d8eac4d2dc0d7b6e11fa6e535332e0d3184f06b4" + integrity sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g== dependencies: - "@babel/types" "^7.24.7" + "@babel/types" "^7.25.9" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz#37d66feb012024f2422b762b9b2a7cfe27c7fba3" - integrity sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA== +"@babel/helper-builder-binary-assignment-operator-visitor@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz#f41752fe772a578e67286e6779a68a5a92de1ee9" + integrity sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g== dependencies: - "@babel/traverse" "^7.24.7" - "@babel/types" "^7.24.7" + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" -"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.7", "@babel/helper-compilation-targets@^7.24.8", "@babel/helper-compilation-targets@^7.25.2": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz#e1d9410a90974a3a5a66e84ff55ef62e3c02d06c" - integrity sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw== +"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz#55af025ce365be3cdc0c1c1e56c6af617ce88875" + integrity sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ== dependencies: - "@babel/compat-data" "^7.25.2" - "@babel/helper-validator-option" "^7.24.8" - browserslist "^4.23.1" + "@babel/compat-data" "^7.25.9" + "@babel/helper-validator-option" "^7.25.9" + browserslist "^4.24.0" lru-cache "^5.1.1" semver "^6.3.1" -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.24.7": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.0.tgz#a109bf9c3d58dfed83aaf42e85633c89f43a6253" - integrity sha512-GYM6BxeQsETc9mnct+nIIpf63SAyzvyYN7UB/IlTyd+MBg06afFGp0mIeUqGyWgS2mxad6vqbMrHVlaL3m70sQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.24.7" - "@babel/helper-member-expression-to-functions" "^7.24.8" - "@babel/helper-optimise-call-expression" "^7.24.7" - "@babel/helper-replace-supers" "^7.25.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" - "@babel/traverse" "^7.25.0" +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz#7644147706bb90ff613297d49ed5266bde729f83" + integrity sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ== + dependencies: + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-member-expression-to-functions" "^7.25.9" + "@babel/helper-optimise-call-expression" "^7.25.9" + "@babel/helper-replace-supers" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" + "@babel/traverse" "^7.25.9" semver "^6.3.1" -"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.24.7", "@babel/helper-create-regexp-features-plugin@^7.25.0": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.2.tgz#24c75974ed74183797ffd5f134169316cd1808d9" - integrity sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g== +"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz#3e8999db94728ad2b2458d7a470e7770b7764e26" + integrity sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw== dependencies: - "@babel/helper-annotate-as-pure" "^7.24.7" - regexpu-core "^5.3.1" + "@babel/helper-annotate-as-pure" "^7.25.9" + regexpu-core "^6.1.1" semver "^6.3.1" -"@babel/helper-define-polyfill-provider@^0.6.2": - version "0.6.2" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d" - integrity sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ== +"@babel/helper-define-polyfill-provider@^0.6.2", "@babel/helper-define-polyfill-provider@^0.6.3": + version "0.6.3" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz#f4f2792fae2ef382074bc2d713522cf24e6ddb21" + integrity sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg== dependencies: "@babel/helper-compilation-targets" "^7.22.6" "@babel/helper-plugin-utils" "^7.22.5" @@ -113,165 +115,154 @@ lodash.debounce "^4.0.8" resolve "^1.14.2" -"@babel/helper-member-expression-to-functions@^7.24.8": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz#6155e079c913357d24a4c20480db7c712a5c3fb6" - integrity sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA== - dependencies: - "@babel/traverse" "^7.24.8" - "@babel/types" "^7.24.8" - -"@babel/helper-module-imports@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b" - integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA== - dependencies: - "@babel/traverse" "^7.24.7" - "@babel/types" "^7.24.7" - -"@babel/helper-module-transforms@^7.24.7", "@babel/helper-module-transforms@^7.24.8", "@babel/helper-module-transforms@^7.25.0", "@babel/helper-module-transforms@^7.25.2": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz#ee713c29768100f2776edf04d4eb23b8d27a66e6" - integrity sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ== - dependencies: - "@babel/helper-module-imports" "^7.24.7" - "@babel/helper-simple-access" "^7.24.7" - "@babel/helper-validator-identifier" "^7.24.7" - "@babel/traverse" "^7.25.2" - -"@babel/helper-optimise-call-expression@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz#8b0a0456c92f6b323d27cfd00d1d664e76692a0f" - integrity sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A== - dependencies: - "@babel/types" "^7.24.7" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.24.8", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878" - integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg== - -"@babel/helper-remap-async-to-generator@^7.24.7", "@babel/helper-remap-async-to-generator@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.0.tgz#d2f0fbba059a42d68e5e378feaf181ef6055365e" - integrity sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.24.7" - "@babel/helper-wrap-function" "^7.25.0" - "@babel/traverse" "^7.25.0" - -"@babel/helper-replace-supers@^7.24.7", "@babel/helper-replace-supers@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.25.0.tgz#ff44deac1c9f619523fe2ca1fd650773792000a9" - integrity sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.24.8" - "@babel/helper-optimise-call-expression" "^7.24.7" - "@babel/traverse" "^7.25.0" - -"@babel/helper-simple-access@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3" - integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg== - dependencies: - "@babel/traverse" "^7.24.7" - "@babel/types" "^7.24.7" - -"@babel/helper-skip-transparent-expression-wrappers@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz#5f8fa83b69ed5c27adc56044f8be2b3ea96669d9" - integrity sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ== - dependencies: - "@babel/traverse" "^7.24.7" - "@babel/types" "^7.24.7" - -"@babel/helper-string-parser@^7.24.8": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d" - integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ== - -"@babel/helper-validator-identifier@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db" - integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w== - -"@babel/helper-validator-option@^7.24.8": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d" - integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q== - -"@babel/helper-wrap-function@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.25.0.tgz#dab12f0f593d6ca48c0062c28bcfb14ebe812f81" - integrity sha512-s6Q1ebqutSiZnEjaofc/UKDyC4SbzV5n5SrA2Gq8UawLycr3i04f1dX4OzoQVnexm6aOCh37SQNYlJ/8Ku+PMQ== - dependencies: - "@babel/template" "^7.25.0" - "@babel/traverse" "^7.25.0" - "@babel/types" "^7.25.0" - -"@babel/helpers@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.25.0.tgz#e69beb7841cb93a6505531ede34f34e6a073650a" - integrity sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw== - dependencies: - "@babel/template" "^7.25.0" - "@babel/types" "^7.25.0" - -"@babel/highlight@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d" - integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw== - dependencies: - "@babel/helper-validator-identifier" "^7.24.7" - chalk "^2.4.2" - js-tokens "^4.0.0" - picocolors "^1.0.0" +"@babel/helper-member-expression-to-functions@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz#9dfffe46f727005a5ea29051ac835fb735e4c1a3" + integrity sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ== + dependencies: + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" + +"@babel/helper-module-imports@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz#e7f8d20602ebdbf9ebbea0a0751fb0f2a4141715" + integrity sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw== + dependencies: + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" + +"@babel/helper-module-transforms@^7.25.9", "@babel/helper-module-transforms@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz#8ce54ec9d592695e58d84cd884b7b5c6a2fdeeae" + integrity sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw== + dependencies: + "@babel/helper-module-imports" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" + "@babel/traverse" "^7.25.9" + +"@babel/helper-optimise-call-expression@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz#3324ae50bae7e2ab3c33f60c9a877b6a0146b54e" + integrity sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ== + dependencies: + "@babel/types" "^7.25.9" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.25.9", "@babel/helper-plugin-utils@^7.8.0": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz#9cbdd63a9443a2c92a725cca7ebca12cc8dd9f46" + integrity sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw== + +"@babel/helper-remap-async-to-generator@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz#e53956ab3d5b9fb88be04b3e2f31b523afd34b92" + integrity sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-wrap-function" "^7.25.9" + "@babel/traverse" "^7.25.9" + +"@babel/helper-replace-supers@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz#ba447224798c3da3f8713fc272b145e33da6a5c5" + integrity sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.25.9" + "@babel/helper-optimise-call-expression" "^7.25.9" + "@babel/traverse" "^7.25.9" -"@babel/parser@^7.25.0", "@babel/parser@^7.25.3": - version "7.25.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.3.tgz#91fb126768d944966263f0657ab222a642b82065" - integrity sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw== +"@babel/helper-simple-access@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz#6d51783299884a2c74618d6ef0f86820ec2e7739" + integrity sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q== dependencies: - "@babel/types" "^7.25.2" + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" -"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.3": - version "7.25.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.3.tgz#dca427b45a6c0f5c095a1c639dfe2476a3daba7f" - integrity sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA== +"@babel/helper-skip-transparent-expression-wrappers@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz#0b2e1b62d560d6b1954893fd2b705dc17c91f0c9" + integrity sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/traverse" "^7.25.3" + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" + +"@babel/helper-string-parser@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c" + integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA== + +"@babel/helper-validator-identifier@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7" + integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ== -"@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz#cd0c583e01369ef51676bdb3d7b603e17d2b3f73" - integrity sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA== +"@babel/helper-validator-option@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72" + integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw== + +"@babel/helper-wrap-function@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz#d99dfd595312e6c894bd7d237470025c85eea9d0" + integrity sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/template" "^7.25.9" + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz#749bde80356b295390954643de7635e0dffabe73" - integrity sha512-lXwdNZtTmeVOOFtwM/WDe7yg1PL8sYhRk/XH0FzbR2HDQ0xC+EnQ/JHeoMYSavtU115tnUk0q9CDyq8si+LMAA== +"@babel/helpers@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.0.tgz#30e621f1eba5aa45fe6f4868d2e9154d884119a4" + integrity sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/template" "^7.25.9" + "@babel/types" "^7.26.0" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz#e4eabdd5109acc399b38d7999b2ef66fc2022f89" - integrity sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ== +"@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.2": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.2.tgz#fd7b6f487cfea09889557ef5d4eeb9ff9a5abd11" + integrity sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ== + dependencies: + "@babel/types" "^7.26.0" + +"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz#cc2e53ebf0a0340777fff5ed521943e253b4d8fe" + integrity sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/traverse" "^7.25.9" + +"@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz#af9e4fb63ccb8abcb92375b2fcfe36b60c774d30" + integrity sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" - "@babel/plugin-transform-optional-chaining" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.0.tgz#3a82a70e7cb7294ad2559465ebcb871dfbf078fb" - integrity sha512-tggFrk1AIShG/RUQbEwt2Tr/E+ObkfwrPjR6BjbRvsx24+PSjK8zrq0GWPNCjo8qpRx4DuJzlcvWJqlm+0h3kw== +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz#e8dc26fcd616e6c5bf2bd0d5a2c151d4f92a9137" + integrity sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/traverse" "^7.25.0" + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz#807a667f9158acac6f6164b4beb85ad9ebc9e1d1" + integrity sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" + "@babel/plugin-transform-optional-chaining" "^7.25.9" + +"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz#de7093f1e7deaf68eadd7cc6b07f2ab82543269e" + integrity sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/traverse" "^7.25.9" "@babel/plugin-proposal-class-properties@^7.14.5": version "7.18.6" @@ -297,27 +288,6 @@ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703" integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w== -"@babel/plugin-syntax-async-generators@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" - integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-class-properties@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" - integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-syntax-class-static-block@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" - integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-syntax-dynamic-import@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" @@ -325,597 +295,509 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-export-namespace-from@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" - integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - -"@babel/plugin-syntax-import-assertions@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz#2a0b406b5871a20a841240586b1300ce2088a778" - integrity sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg== - dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - -"@babel/plugin-syntax-import-attributes@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz#b4f9ea95a79e6912480c4b626739f86a076624ca" - integrity sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A== +"@babel/plugin-syntax-import-assertions@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz#620412405058efa56e4a564903b79355020f445f" + integrity sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-syntax-import-meta@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" - integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== +"@babel/plugin-syntax-import-attributes@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz#3b1412847699eea739b4f2602c74ce36f6b0b0f7" + integrity sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-syntax-json-strings@^7.8.3": +"@babel/plugin-syntax-object-rest-spread@^7.8.3": version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" - integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" + integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-logical-assignment-operators@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" - integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== +"@babel/plugin-syntax-unicode-sets-regex@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357" + integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-create-regexp-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" - integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== +"@babel/plugin-transform-arrow-functions@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz#7821d4410bee5daaadbb4cdd9a6649704e176845" + integrity sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg== dependencies: - "@babel/helper-plugin-utils" "^7.8.0" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-syntax-numeric-separator@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" - integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== +"@babel/plugin-transform-async-generator-functions@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz#1b18530b077d18a407c494eb3d1d72da505283a2" + integrity sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-remap-async-to-generator" "^7.25.9" + "@babel/traverse" "^7.25.9" -"@babel/plugin-syntax-object-rest-spread@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" - integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== +"@babel/plugin-transform-async-to-generator@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz#c80008dacae51482793e5a9c08b39a5be7e12d71" + integrity sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ== dependencies: - "@babel/helper-plugin-utils" "^7.8.0" + "@babel/helper-module-imports" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-remap-async-to-generator" "^7.25.9" -"@babel/plugin-syntax-optional-catch-binding@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" - integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== +"@babel/plugin-transform-block-scoped-functions@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz#5700691dbd7abb93de300ca7be94203764fce458" + integrity sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA== dependencies: - "@babel/helper-plugin-utils" "^7.8.0" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-syntax-optional-chaining@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" - integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== +"@babel/plugin-transform-block-scoping@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz#c33665e46b06759c93687ca0f84395b80c0473a1" + integrity sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg== dependencies: - "@babel/helper-plugin-utils" "^7.8.0" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-syntax-private-property-in-object@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" - integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg== +"@babel/plugin-transform-class-properties@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz#a8ce84fedb9ad512549984101fa84080a9f5f51f" + integrity sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-syntax-top-level-await@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" - integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== +"@babel/plugin-transform-class-static-block@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz#6c8da219f4eb15cae9834ec4348ff8e9e09664a0" + integrity sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-syntax-unicode-sets-regex@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357" - integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg== +"@babel/plugin-transform-classes@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz#7152457f7880b593a63ade8a861e6e26a4469f52" + integrity sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-arrow-functions@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz#4f6886c11e423bd69f3ce51dbf42424a5f275514" - integrity sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ== - dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - -"@babel/plugin-transform-async-generator-functions@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.0.tgz#b785cf35d73437f6276b1e30439a57a50747bddf" - integrity sha512-uaIi2FdqzjpAMvVqvB51S42oC2JEVgh0LDsGfZVDysWE8LrJtQC2jvKmOqEYThKyB7bDEb7BP1GYWDm7tABA0Q== - dependencies: - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/helper-remap-async-to-generator" "^7.25.0" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/traverse" "^7.25.0" - -"@babel/plugin-transform-async-to-generator@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz#72a3af6c451d575842a7e9b5a02863414355bdcc" - integrity sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA== - dependencies: - "@babel/helper-module-imports" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/helper-remap-async-to-generator" "^7.24.7" - -"@babel/plugin-transform-block-scoped-functions@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz#a4251d98ea0c0f399dafe1a35801eaba455bbf1f" - integrity sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ== - dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - -"@babel/plugin-transform-block-scoping@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.0.tgz#23a6ed92e6b006d26b1869b1c91d1b917c2ea2ac" - integrity sha512-yBQjYoOjXlFv9nlXb3f1casSHOZkWr29NX+zChVanLg5Nc157CrbEX9D7hxxtTpuFy7Q0YzmmWfJxzvps4kXrQ== - dependencies: - "@babel/helper-plugin-utils" "^7.24.8" - -"@babel/plugin-transform-class-properties@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz#256879467b57b0b68c7ddfc5b76584f398cd6834" - integrity sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" - -"@babel/plugin-transform-class-static-block@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz#c82027ebb7010bc33c116d4b5044fbbf8c05484d" - integrity sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - -"@babel/plugin-transform-classes@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.0.tgz#63122366527d88e0ef61b612554fe3f8c793991e" - integrity sha512-xyi6qjr/fYU304fiRwFbekzkqVJZ6A7hOjWZd+89FVcBqPV3S9Wuozz82xdpLspckeaafntbzglaW4pqpzvtSw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.24.7" - "@babel/helper-compilation-targets" "^7.24.8" - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/helper-replace-supers" "^7.25.0" - "@babel/traverse" "^7.25.0" + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-compilation-targets" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-replace-supers" "^7.25.9" + "@babel/traverse" "^7.25.9" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz#4cab3214e80bc71fae3853238d13d097b004c707" - integrity sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ== +"@babel/plugin-transform-computed-properties@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz#db36492c78460e534b8852b1d5befe3c923ef10b" + integrity sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/template" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/template" "^7.25.9" -"@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.24.8": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz#c828e814dbe42a2718a838c2a2e16a408e055550" - integrity sha512-36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ== +"@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz#966ea2595c498224340883602d3cfd7a0c79cea1" + integrity sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-dotall-regex@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz#5f8bf8a680f2116a7207e16288a5f974ad47a7a0" - integrity sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw== +"@babel/plugin-transform-dotall-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz#bad7945dd07734ca52fe3ad4e872b40ed09bb09a" + integrity sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-duplicate-keys@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz#dd20102897c9a2324e5adfffb67ff3610359a8ee" - integrity sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw== +"@babel/plugin-transform-duplicate-keys@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz#8850ddf57dce2aebb4394bb434a7598031059e6d" + integrity sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-duplicate-named-capturing-groups-regex@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz#809af7e3339466b49c034c683964ee8afb3e2604" - integrity sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g== +"@babel/plugin-transform-duplicate-named-capturing-groups-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz#6f7259b4de127721a08f1e5165b852fcaa696d31" + integrity sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.25.0" - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-dynamic-import@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz#4d8b95e3bae2b037673091aa09cd33fecd6419f4" - integrity sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg== +"@babel/plugin-transform-dynamic-import@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz#23e917de63ed23c6600c5dd06d94669dce79f7b8" + integrity sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-exponentiation-operator@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz#b629ee22645f412024297d5245bce425c31f9b0d" - integrity sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ== +"@babel/plugin-transform-exponentiation-operator@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz#ece47b70d236c1d99c263a1e22b62dc20a4c8b0f" + integrity sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-export-namespace-from@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz#176d52d8d8ed516aeae7013ee9556d540c53f197" - integrity sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA== +"@babel/plugin-transform-export-namespace-from@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz#90745fe55053394f554e40584cda81f2c8a402a2" + integrity sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-for-of@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz#f25b33f72df1d8be76399e1b8f3f9d366eb5bc70" - integrity sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g== +"@babel/plugin-transform-for-of@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz#4bdc7d42a213397905d89f02350c5267866d5755" + integrity sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" -"@babel/plugin-transform-function-name@^7.25.1": - version "7.25.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.1.tgz#b85e773097526c1a4fc4ba27322748643f26fc37" - integrity sha512-TVVJVdW9RKMNgJJlLtHsKDTydjZAbwIsn6ySBPQaEAUU5+gVvlJt/9nRmqVbsV/IBanRjzWoaAQKLoamWVOUuA== +"@babel/plugin-transform-function-name@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz#939d956e68a606661005bfd550c4fc2ef95f7b97" + integrity sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA== dependencies: - "@babel/helper-compilation-targets" "^7.24.8" - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/traverse" "^7.25.1" + "@babel/helper-compilation-targets" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/traverse" "^7.25.9" -"@babel/plugin-transform-json-strings@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz#f3e9c37c0a373fee86e36880d45b3664cedaf73a" - integrity sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw== +"@babel/plugin-transform-json-strings@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz#c86db407cb827cded902a90c707d2781aaa89660" + integrity sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-literals@^7.25.2": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.2.tgz#deb1ad14fc5490b9a65ed830e025bca849d8b5f3" - integrity sha512-HQI+HcTbm9ur3Z2DkO+jgESMAMcYLuN/A7NRw9juzxAezN9AvqvUTnpKP/9kkYANz6u7dFlAyOu44ejuGySlfw== +"@babel/plugin-transform-literals@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz#1a1c6b4d4aa59bc4cad5b6b3a223a0abd685c9de" + integrity sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-logical-assignment-operators@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz#a58fb6eda16c9dc8f9ff1c7b1ba6deb7f4694cb0" - integrity sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw== +"@babel/plugin-transform-logical-assignment-operators@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz#b19441a8c39a2fda0902900b306ea05ae1055db7" + integrity sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-member-expression-literals@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz#3b4454fb0e302e18ba4945ba3246acb1248315df" - integrity sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw== +"@babel/plugin-transform-member-expression-literals@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz#63dff19763ea64a31f5e6c20957e6a25e41ed5de" + integrity sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-modules-amd@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz#65090ed493c4a834976a3ca1cde776e6ccff32d7" - integrity sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg== +"@babel/plugin-transform-modules-amd@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz#49ba478f2295101544abd794486cd3088dddb6c5" + integrity sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw== dependencies: - "@babel/helper-module-transforms" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-module-transforms" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-modules-commonjs@^7.24.8": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz#ab6421e564b717cb475d6fff70ae7f103536ea3c" - integrity sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA== +"@babel/plugin-transform-modules-commonjs@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz#d165c8c569a080baf5467bda88df6425fc060686" + integrity sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg== dependencies: - "@babel/helper-module-transforms" "^7.24.8" - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/helper-simple-access" "^7.24.7" + "@babel/helper-module-transforms" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-simple-access" "^7.25.9" -"@babel/plugin-transform-modules-systemjs@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.0.tgz#8f46cdc5f9e5af74f3bd019485a6cbe59685ea33" - integrity sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw== +"@babel/plugin-transform-modules-systemjs@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz#8bd1b43836269e3d33307151a114bcf3ba6793f8" + integrity sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA== dependencies: - "@babel/helper-module-transforms" "^7.25.0" - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/helper-validator-identifier" "^7.24.7" - "@babel/traverse" "^7.25.0" + "@babel/helper-module-transforms" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" + "@babel/traverse" "^7.25.9" -"@babel/plugin-transform-modules-umd@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz#edd9f43ec549099620df7df24e7ba13b5c76efc8" - integrity sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A== +"@babel/plugin-transform-modules-umd@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz#6710079cdd7c694db36529a1e8411e49fcbf14c9" + integrity sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw== dependencies: - "@babel/helper-module-transforms" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-module-transforms" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-named-capturing-groups-regex@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz#9042e9b856bc6b3688c0c2e4060e9e10b1460923" - integrity sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g== +"@babel/plugin-transform-named-capturing-groups-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz#454990ae6cc22fd2a0fa60b3a2c6f63a38064e6a" + integrity sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-new-target@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz#31ff54c4e0555cc549d5816e4ab39241dfb6ab00" - integrity sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA== +"@babel/plugin-transform-new-target@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz#42e61711294b105c248336dcb04b77054ea8becd" + integrity sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-nullish-coalescing-operator@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz#1de4534c590af9596f53d67f52a92f12db984120" - integrity sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ== +"@babel/plugin-transform-nullish-coalescing-operator@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz#bcb1b0d9e948168102d5f7104375ca21c3266949" + integrity sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-numeric-separator@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz#bea62b538c80605d8a0fac9b40f48e97efa7de63" - integrity sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA== +"@babel/plugin-transform-numeric-separator@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz#bfed75866261a8b643468b0ccfd275f2033214a1" + integrity sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-object-rest-spread@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz#d13a2b93435aeb8a197e115221cab266ba6e55d6" - integrity sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q== +"@babel/plugin-transform-object-rest-spread@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz#0203725025074164808bcf1a2cfa90c652c99f18" + integrity sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg== dependencies: - "@babel/helper-compilation-targets" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.24.7" + "@babel/helper-compilation-targets" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/plugin-transform-parameters" "^7.25.9" -"@babel/plugin-transform-object-super@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz#66eeaff7830bba945dd8989b632a40c04ed625be" - integrity sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg== +"@babel/plugin-transform-object-super@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz#385d5de135162933beb4a3d227a2b7e52bb4cf03" + integrity sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/helper-replace-supers" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-replace-supers" "^7.25.9" -"@babel/plugin-transform-optional-catch-binding@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz#00eabd883d0dd6a60c1c557548785919b6e717b4" - integrity sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA== +"@babel/plugin-transform-optional-catch-binding@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz#10e70d96d52bb1f10c5caaac59ac545ea2ba7ff3" + integrity sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-optional-chaining@^7.24.7", "@babel/plugin-transform-optional-chaining@^7.24.8": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz#bb02a67b60ff0406085c13d104c99a835cdf365d" - integrity sha512-5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw== +"@babel/plugin-transform-optional-chaining@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz#e142eb899d26ef715435f201ab6e139541eee7dd" + integrity sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" -"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz#5881f0ae21018400e320fc7eb817e529d1254b68" - integrity sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA== +"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz#b856842205b3e77e18b7a7a1b94958069c7ba257" + integrity sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-private-methods@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz#e6318746b2ae70a59d023d5cc1344a2ba7a75f5e" - integrity sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ== +"@babel/plugin-transform-private-methods@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz#847f4139263577526455d7d3223cd8bda51e3b57" + integrity sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw== dependencies: - "@babel/helper-create-class-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-create-class-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-private-property-in-object@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz#4eec6bc701288c1fab5f72e6a4bbc9d67faca061" - integrity sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA== +"@babel/plugin-transform-private-property-in-object@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz#9c8b73e64e6cc3cbb2743633885a7dd2c385fe33" + integrity sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw== dependencies: - "@babel/helper-annotate-as-pure" "^7.24.7" - "@babel/helper-create-class-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-create-class-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-property-literals@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz#f0d2ed8380dfbed949c42d4d790266525d63bbdc" - integrity sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA== +"@babel/plugin-transform-property-literals@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz#d72d588bd88b0dec8b62e36f6fda91cedfe28e3f" + integrity sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-regenerator@^7.14.5", "@babel/plugin-transform-regenerator@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz#021562de4534d8b4b1851759fd7af4e05d2c47f8" - integrity sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA== +"@babel/plugin-transform-regenerator@^7.14.5", "@babel/plugin-transform-regenerator@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz#03a8a4670d6cebae95305ac6defac81ece77740b" + integrity sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" regenerator-transform "^0.15.2" -"@babel/plugin-transform-reserved-words@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz#80037fe4fbf031fc1125022178ff3938bb3743a4" - integrity sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ== +"@babel/plugin-transform-regexp-modifiers@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz#2f5837a5b5cd3842a919d8147e9903cc7455b850" + integrity sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + +"@babel/plugin-transform-reserved-words@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz#0398aed2f1f10ba3f78a93db219b27ef417fb9ce" + integrity sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg== + dependencies: + "@babel/helper-plugin-utils" "^7.25.9" "@babel/plugin-transform-runtime@^7.15.0": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.7.tgz#00a5bfaf8c43cf5c8703a8a6e82b59d9c58f38ca" - integrity sha512-YqXjrk4C+a1kZjewqt+Mmu2UuV1s07y8kqcUf4qYLnoqemhR4gRQikhdAhSVJioMjVTu6Mo6pAbaypEA3jY6fw== + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.9.tgz#62723ea3f5b31ffbe676da9d6dae17138ae580ea" + integrity sha512-nZp7GlEl+yULJrClz0SwHPqir3lc0zsPrDHQUcxGspSL7AKrexNSEfTbfqnDNJUO13bgKyfuOLMF8Xqtu8j3YQ== dependencies: - "@babel/helper-module-imports" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-module-imports" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" babel-plugin-polyfill-corejs2 "^0.4.10" - babel-plugin-polyfill-corejs3 "^0.10.1" + babel-plugin-polyfill-corejs3 "^0.10.6" babel-plugin-polyfill-regenerator "^0.6.1" semver "^6.3.1" -"@babel/plugin-transform-shorthand-properties@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz#85448c6b996e122fa9e289746140aaa99da64e73" - integrity sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA== +"@babel/plugin-transform-shorthand-properties@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz#bb785e6091f99f826a95f9894fc16fde61c163f2" + integrity sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-spread@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz#e8a38c0fde7882e0fb8f160378f74bd885cc7bb3" - integrity sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng== +"@babel/plugin-transform-spread@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz#24a35153931b4ba3d13cec4a7748c21ab5514ef9" + integrity sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" -"@babel/plugin-transform-sticky-regex@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz#96ae80d7a7e5251f657b5cf18f1ea6bf926f5feb" - integrity sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g== +"@babel/plugin-transform-sticky-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz#c7f02b944e986a417817b20ba2c504dfc1453d32" + integrity sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-template-literals@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz#a05debb4a9072ae8f985bcf77f3f215434c8f8c8" - integrity sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw== +"@babel/plugin-transform-template-literals@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz#6dbd4a24e8fad024df76d1fac6a03cf413f60fe1" + integrity sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-typeof-symbol@^7.24.8": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz#383dab37fb073f5bfe6e60c654caac309f92ba1c" - integrity sha512-adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw== +"@babel/plugin-transform-typeof-symbol@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz#224ba48a92869ddbf81f9b4a5f1204bbf5a2bc4b" + integrity sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA== dependencies: - "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-unicode-escapes@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz#2023a82ced1fb4971630a2e079764502c4148e0e" - integrity sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw== +"@babel/plugin-transform-unicode-escapes@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz#a75ef3947ce15363fccaa38e2dd9bc70b2788b82" + integrity sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-unicode-property-regex@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz#9073a4cd13b86ea71c3264659590ac086605bbcd" - integrity sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w== +"@babel/plugin-transform-unicode-property-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz#a901e96f2c1d071b0d1bb5dc0d3c880ce8f53dd3" + integrity sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-unicode-regex@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz#dfc3d4a51127108099b19817c0963be6a2adf19f" - integrity sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg== +"@babel/plugin-transform-unicode-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz#5eae747fe39eacf13a8bd006a4fb0b5d1fa5e9b1" + integrity sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" -"@babel/plugin-transform-unicode-sets-regex@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz#d40705d67523803a576e29c63cef6e516b858ed9" - integrity sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg== +"@babel/plugin-transform-unicode-sets-regex@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz#65114c17b4ffc20fa5b163c63c70c0d25621fabe" + integrity sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-create-regexp-features-plugin" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" "@babel/preset-env@^7.15.0": - version "7.25.3" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.25.3.tgz#0bf4769d84ac51d1073ab4a86f00f30a3a83c67c" - integrity sha512-QsYW7UeAaXvLPX9tdVliMJE7MD7M6MLYVTovRTIwhoYQVFHR1rM4wO8wqAezYi3/BpSD+NzVCZ69R6smWiIi8g== - dependencies: - "@babel/compat-data" "^7.25.2" - "@babel/helper-compilation-targets" "^7.25.2" - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/helper-validator-option" "^7.24.8" - "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.3" - "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.25.0" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.25.0" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.7" - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.25.0" + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.26.0.tgz#30e5c6bc1bcc54865bff0c5a30f6d4ccdc7fa8b1" + integrity sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw== + dependencies: + "@babel/compat-data" "^7.26.0" + "@babel/helper-compilation-targets" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/helper-validator-option" "^7.25.9" + "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.25.9" + "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.25.9" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.25.9" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.25.9" + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.25.9" "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-class-properties" "^7.12.13" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-import-assertions" "^7.24.7" - "@babel/plugin-syntax-import-attributes" "^7.24.7" - "@babel/plugin-syntax-import-meta" "^7.10.4" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - "@babel/plugin-syntax-top-level-await" "^7.14.5" + "@babel/plugin-syntax-import-assertions" "^7.26.0" + "@babel/plugin-syntax-import-attributes" "^7.26.0" "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6" - "@babel/plugin-transform-arrow-functions" "^7.24.7" - "@babel/plugin-transform-async-generator-functions" "^7.25.0" - "@babel/plugin-transform-async-to-generator" "^7.24.7" - "@babel/plugin-transform-block-scoped-functions" "^7.24.7" - "@babel/plugin-transform-block-scoping" "^7.25.0" - "@babel/plugin-transform-class-properties" "^7.24.7" - "@babel/plugin-transform-class-static-block" "^7.24.7" - "@babel/plugin-transform-classes" "^7.25.0" - "@babel/plugin-transform-computed-properties" "^7.24.7" - "@babel/plugin-transform-destructuring" "^7.24.8" - "@babel/plugin-transform-dotall-regex" "^7.24.7" - "@babel/plugin-transform-duplicate-keys" "^7.24.7" - "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.25.0" - "@babel/plugin-transform-dynamic-import" "^7.24.7" - "@babel/plugin-transform-exponentiation-operator" "^7.24.7" - "@babel/plugin-transform-export-namespace-from" "^7.24.7" - "@babel/plugin-transform-for-of" "^7.24.7" - "@babel/plugin-transform-function-name" "^7.25.1" - "@babel/plugin-transform-json-strings" "^7.24.7" - "@babel/plugin-transform-literals" "^7.25.2" - "@babel/plugin-transform-logical-assignment-operators" "^7.24.7" - "@babel/plugin-transform-member-expression-literals" "^7.24.7" - "@babel/plugin-transform-modules-amd" "^7.24.7" - "@babel/plugin-transform-modules-commonjs" "^7.24.8" - "@babel/plugin-transform-modules-systemjs" "^7.25.0" - "@babel/plugin-transform-modules-umd" "^7.24.7" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.24.7" - "@babel/plugin-transform-new-target" "^7.24.7" - "@babel/plugin-transform-nullish-coalescing-operator" "^7.24.7" - "@babel/plugin-transform-numeric-separator" "^7.24.7" - "@babel/plugin-transform-object-rest-spread" "^7.24.7" - "@babel/plugin-transform-object-super" "^7.24.7" - "@babel/plugin-transform-optional-catch-binding" "^7.24.7" - "@babel/plugin-transform-optional-chaining" "^7.24.8" - "@babel/plugin-transform-parameters" "^7.24.7" - "@babel/plugin-transform-private-methods" "^7.24.7" - "@babel/plugin-transform-private-property-in-object" "^7.24.7" - "@babel/plugin-transform-property-literals" "^7.24.7" - "@babel/plugin-transform-regenerator" "^7.24.7" - "@babel/plugin-transform-reserved-words" "^7.24.7" - "@babel/plugin-transform-shorthand-properties" "^7.24.7" - "@babel/plugin-transform-spread" "^7.24.7" - "@babel/plugin-transform-sticky-regex" "^7.24.7" - "@babel/plugin-transform-template-literals" "^7.24.7" - "@babel/plugin-transform-typeof-symbol" "^7.24.8" - "@babel/plugin-transform-unicode-escapes" "^7.24.7" - "@babel/plugin-transform-unicode-property-regex" "^7.24.7" - "@babel/plugin-transform-unicode-regex" "^7.24.7" - "@babel/plugin-transform-unicode-sets-regex" "^7.24.7" + "@babel/plugin-transform-arrow-functions" "^7.25.9" + "@babel/plugin-transform-async-generator-functions" "^7.25.9" + "@babel/plugin-transform-async-to-generator" "^7.25.9" + "@babel/plugin-transform-block-scoped-functions" "^7.25.9" + "@babel/plugin-transform-block-scoping" "^7.25.9" + "@babel/plugin-transform-class-properties" "^7.25.9" + "@babel/plugin-transform-class-static-block" "^7.26.0" + "@babel/plugin-transform-classes" "^7.25.9" + "@babel/plugin-transform-computed-properties" "^7.25.9" + "@babel/plugin-transform-destructuring" "^7.25.9" + "@babel/plugin-transform-dotall-regex" "^7.25.9" + "@babel/plugin-transform-duplicate-keys" "^7.25.9" + "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.25.9" + "@babel/plugin-transform-dynamic-import" "^7.25.9" + "@babel/plugin-transform-exponentiation-operator" "^7.25.9" + "@babel/plugin-transform-export-namespace-from" "^7.25.9" + "@babel/plugin-transform-for-of" "^7.25.9" + "@babel/plugin-transform-function-name" "^7.25.9" + "@babel/plugin-transform-json-strings" "^7.25.9" + "@babel/plugin-transform-literals" "^7.25.9" + "@babel/plugin-transform-logical-assignment-operators" "^7.25.9" + "@babel/plugin-transform-member-expression-literals" "^7.25.9" + "@babel/plugin-transform-modules-amd" "^7.25.9" + "@babel/plugin-transform-modules-commonjs" "^7.25.9" + "@babel/plugin-transform-modules-systemjs" "^7.25.9" + "@babel/plugin-transform-modules-umd" "^7.25.9" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.25.9" + "@babel/plugin-transform-new-target" "^7.25.9" + "@babel/plugin-transform-nullish-coalescing-operator" "^7.25.9" + "@babel/plugin-transform-numeric-separator" "^7.25.9" + "@babel/plugin-transform-object-rest-spread" "^7.25.9" + "@babel/plugin-transform-object-super" "^7.25.9" + "@babel/plugin-transform-optional-catch-binding" "^7.25.9" + "@babel/plugin-transform-optional-chaining" "^7.25.9" + "@babel/plugin-transform-parameters" "^7.25.9" + "@babel/plugin-transform-private-methods" "^7.25.9" + "@babel/plugin-transform-private-property-in-object" "^7.25.9" + "@babel/plugin-transform-property-literals" "^7.25.9" + "@babel/plugin-transform-regenerator" "^7.25.9" + "@babel/plugin-transform-regexp-modifiers" "^7.26.0" + "@babel/plugin-transform-reserved-words" "^7.25.9" + "@babel/plugin-transform-shorthand-properties" "^7.25.9" + "@babel/plugin-transform-spread" "^7.25.9" + "@babel/plugin-transform-sticky-regex" "^7.25.9" + "@babel/plugin-transform-template-literals" "^7.25.9" + "@babel/plugin-transform-typeof-symbol" "^7.25.9" + "@babel/plugin-transform-unicode-escapes" "^7.25.9" + "@babel/plugin-transform-unicode-property-regex" "^7.25.9" + "@babel/plugin-transform-unicode-regex" "^7.25.9" + "@babel/plugin-transform-unicode-sets-regex" "^7.25.9" "@babel/preset-modules" "0.1.6-no-external-plugins" babel-plugin-polyfill-corejs2 "^0.4.10" - babel-plugin-polyfill-corejs3 "^0.10.4" + babel-plugin-polyfill-corejs3 "^0.10.6" babel-plugin-polyfill-regenerator "^0.6.1" - core-js-compat "^3.37.1" + core-js-compat "^3.38.1" semver "^6.3.1" "@babel/preset-modules@0.1.6-no-external-plugins": @@ -927,56 +809,50 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/regjsgen@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" - integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== - "@babel/runtime-corejs3@^7.10.4": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.25.0.tgz#0a318b66dfc765ad10562d829fea372ed7e1eb7d" - integrity sha512-BOehWE7MgQ8W8Qn0CQnMtg2tHPHPulcS/5AVpFvs2KCK1ET+0WqZqPvnpRpFN81gYoFopdIEJX9Sgjw3ZBccPg== + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.26.0.tgz#5af6bed16073eb4a0191233d61e158a5c768c430" + integrity sha512-YXHu5lN8kJCb1LOb9PgV6pvak43X2h4HvRApcN5SdWeaItQOzfn1hgP6jasD6KWQyJDBxrVmA9o9OivlnNJK/w== dependencies: core-js-pure "^3.30.2" regenerator-runtime "^0.14.0" "@babel/runtime@^7.15.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.0.tgz#3af9a91c1b739c569d5d80cc917280919c544ecb" - integrity sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw== + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.0.tgz#8600c2f595f277c60815256418b85356a65173c1" + integrity sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw== dependencies: regenerator-runtime "^0.14.0" -"@babel/template@^7.24.7", "@babel/template@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.0.tgz#e733dc3134b4fede528c15bc95e89cb98c52592a" - integrity sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q== - dependencies: - "@babel/code-frame" "^7.24.7" - "@babel/parser" "^7.25.0" - "@babel/types" "^7.25.0" - -"@babel/traverse@^7.24.7", "@babel/traverse@^7.24.8", "@babel/traverse@^7.25.0", "@babel/traverse@^7.25.1", "@babel/traverse@^7.25.2", "@babel/traverse@^7.25.3": - version "7.25.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.3.tgz#f1b901951c83eda2f3e29450ce92743783373490" - integrity sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ== - dependencies: - "@babel/code-frame" "^7.24.7" - "@babel/generator" "^7.25.0" - "@babel/parser" "^7.25.3" - "@babel/template" "^7.25.0" - "@babel/types" "^7.25.2" +"@babel/template@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016" + integrity sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg== + dependencies: + "@babel/code-frame" "^7.25.9" + "@babel/parser" "^7.25.9" + "@babel/types" "^7.25.9" + +"@babel/traverse@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.9.tgz#a50f8fe49e7f69f53de5bea7e413cd35c5e13c84" + integrity sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw== + dependencies: + "@babel/code-frame" "^7.25.9" + "@babel/generator" "^7.25.9" + "@babel/parser" "^7.25.9" + "@babel/template" "^7.25.9" + "@babel/types" "^7.25.9" debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.4.4": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.2.tgz#55fb231f7dc958cd69ea141a4c2997e819646125" - integrity sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q== +"@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.4.4": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.0.tgz#deabd08d6b753bc8e0f198f8709fb575e31774ff" + integrity sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA== dependencies: - "@babel/helper-string-parser" "^7.24.8" - "@babel/helper-validator-identifier" "^7.24.7" - to-fast-properties "^2.0.0" + "@babel/helper-string-parser" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" "@csstools/convert-colors@^1.4.0": version "1.4.0" @@ -989,30 +865,35 @@ integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" - integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== + version "4.4.1" + resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz#d1145bf2c20132d6400495d6df4bf59362fd9d56" + integrity sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA== dependencies: - eslint-visitor-keys "^3.3.0" + eslint-visitor-keys "^3.4.3" -"@eslint-community/regexpp@^4.11.0": - version "4.11.0" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.11.0.tgz#b0ffd0312b4a3fd2d6f77237e7248a5ad3a680ae" - integrity sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A== +"@eslint-community/regexpp@^4.12.1": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0" + integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ== -"@eslint/config-array@^0.17.1": - version "0.17.1" - resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.17.1.tgz#d9b8b8b6b946f47388f32bedfd3adf29ca8f8910" - integrity sha512-BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA== +"@eslint/config-array@^0.19.0": + version "0.19.0" + resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.19.0.tgz#3251a528998de914d59bb21ba4c11767cf1b3519" + integrity sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ== dependencies: "@eslint/object-schema" "^2.1.4" debug "^4.3.1" minimatch "^3.1.2" -"@eslint/eslintrc@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.1.0.tgz#dbd3482bfd91efa663cbe7aa1f506839868207b6" - integrity sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ== +"@eslint/core@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.9.0.tgz#168ee076f94b152c01ca416c3e5cf82290ab4fcd" + integrity sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg== + +"@eslint/eslintrc@^3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.2.0.tgz#57470ac4e2e283a6bf76044d63281196e370542c" + integrity sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w== dependencies: ajv "^6.12.4" debug "^4.3.2" @@ -1024,30 +905,55 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@9.9.0": - version "9.9.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.9.0.tgz#d8437adda50b3ed4401964517b64b4f59b0e2638" - integrity sha512-hhetes6ZHP3BlXLxmd8K2SNgkhNSi+UcecbnwWKwpP7kyi/uC75DJ1lOOBO3xrC4jyojtGE3YxKZPHfk4yrgug== +"@eslint/js@9.16.0": + version "9.16.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.16.0.tgz#3df2b2dd3b9163056616886c86e4082f45dbf3f4" + integrity sha512-tw2HxzQkrbeuvyj1tG2Yqq+0H9wGoI2IMk4EOsQeX+vmd75FtJAzf+gTA69WF+baUKRYQ3x2kbLE08js5OsTVg== "@eslint/object-schema@^2.1.4": version "2.1.4" resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.4.tgz#9e69f8bb4031e11df79e03db09f9dbbae1740843" integrity sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ== +"@eslint/plugin-kit@^0.2.3": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz#812980a6a41ecf3a8341719f92a6d1e784a2e0e8" + integrity sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA== + dependencies: + levn "^0.4.1" + "@gar/promisify@^1.0.1": version "1.1.3" resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== +"@humanfs/core@^0.19.1": + version "0.19.1" + resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.1.tgz#17c55ca7d426733fe3c561906b8173c336b40a77" + integrity sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA== + +"@humanfs/node@^0.16.6": + version "0.16.6" + resolved "https://registry.yarnpkg.com/@humanfs/node/-/node-0.16.6.tgz#ee2a10eaabd1131987bf0488fd9b820174cd765e" + integrity sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw== + dependencies: + "@humanfs/core" "^0.19.1" + "@humanwhocodes/retry" "^0.3.0" + "@humanwhocodes/module-importer@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== "@humanwhocodes/retry@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.0.tgz#6d86b8cb322660f03d3f0aa94b99bdd8e172d570" - integrity sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew== + version "0.3.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.1.tgz#c72a5c76a9fbaf3488e231b13dc52c0da7bab42a" + integrity sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA== + +"@humanwhocodes/retry@^0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.1.tgz#9a96ce501bc62df46c4031fbd970e3cc6b10f07b" + integrity sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA== "@jridgewell/gen-mapping@^0.3.5": version "0.3.5" @@ -1107,7 +1013,7 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== -"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": +"@nodelib/fs.walk@^1.2.3": version "1.2.8" resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== @@ -1131,6 +1037,95 @@ mkdirp "^1.0.4" rimraf "^3.0.2" +"@parcel/watcher-android-arm64@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz#e32d3dda6647791ee930556aee206fcd5ea0fb7a" + integrity sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ== + +"@parcel/watcher-darwin-arm64@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz#0d9e680b7e9ec1c8f54944f1b945aa8755afb12f" + integrity sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw== + +"@parcel/watcher-darwin-x64@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz#f9f1d5ce9d5878d344f14ef1856b7a830c59d1bb" + integrity sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA== + +"@parcel/watcher-freebsd-x64@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz#2b77f0c82d19e84ff4c21de6da7f7d096b1a7e82" + integrity sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw== + +"@parcel/watcher-linux-arm-glibc@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz#92ed322c56dbafa3d2545dcf2803334aee131e42" + integrity sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA== + +"@parcel/watcher-linux-arm-musl@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz#cd48e9bfde0cdbbd2ecd9accfc52967e22f849a4" + integrity sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA== + +"@parcel/watcher-linux-arm64-glibc@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz#7b81f6d5a442bb89fbabaf6c13573e94a46feb03" + integrity sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA== + +"@parcel/watcher-linux-arm64-musl@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz#dcb8ff01077cdf59a18d9e0a4dff7a0cfe5fd732" + integrity sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q== + +"@parcel/watcher-linux-x64-glibc@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz#2e254600fda4e32d83942384d1106e1eed84494d" + integrity sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw== + +"@parcel/watcher-linux-x64-musl@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz#01fcea60fedbb3225af808d3f0a7b11229792eef" + integrity sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA== + +"@parcel/watcher-win32-arm64@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz#87cdb16e0783e770197e52fb1dc027bb0c847154" + integrity sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig== + +"@parcel/watcher-win32-ia32@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz#778c39b56da33e045ba21c678c31a9f9d7c6b220" + integrity sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA== + +"@parcel/watcher-win32-x64@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz#33873876d0bbc588aacce38e90d1d7480ce81cb7" + integrity sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw== + +"@parcel/watcher@^2.4.1": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.5.0.tgz#5c88818b12b8de4307a9d3e6dc3e28eba0dfbd10" + integrity sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ== + dependencies: + detect-libc "^1.0.3" + is-glob "^4.0.3" + micromatch "^4.0.5" + node-addon-api "^7.0.0" + optionalDependencies: + "@parcel/watcher-android-arm64" "2.5.0" + "@parcel/watcher-darwin-arm64" "2.5.0" + "@parcel/watcher-darwin-x64" "2.5.0" + "@parcel/watcher-freebsd-x64" "2.5.0" + "@parcel/watcher-linux-arm-glibc" "2.5.0" + "@parcel/watcher-linux-arm-musl" "2.5.0" + "@parcel/watcher-linux-arm64-glibc" "2.5.0" + "@parcel/watcher-linux-arm64-musl" "2.5.0" + "@parcel/watcher-linux-x64-glibc" "2.5.0" + "@parcel/watcher-linux-x64-musl" "2.5.0" + "@parcel/watcher-win32-arm64" "2.5.0" + "@parcel/watcher-win32-ia32" "2.5.0" + "@parcel/watcher-win32-x64" "2.5.0" + "@rails/webpacker@5.4.4": version "5.4.4" resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-5.4.4.tgz#971a41b987c096c908ce4088accd57c1a9a7e2f7" @@ -1255,29 +1250,49 @@ "@types/node" "*" "@types/eslint@^8.56.10": - version "8.56.11" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.11.tgz#e2ff61510a3b9454b3329fe7731e3b4c6f780041" - integrity sha512-sVBpJMf7UPo/wGecYOpk2aQya2VUGeHhe38WG7/mN5FufNSubf5VT9Uh9Uyp8/eLJpu1/tuhJ/qTo4mhSB4V4Q== + version "8.56.12" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.12.tgz#1657c814ffeba4d2f84c0d4ba0f44ca7ea1ca53a" + integrity sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g== dependencies: "@types/estree" "*" "@types/json-schema" "*" -"@types/estree@*": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" - integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== +"@types/estree@*", "@types/estree@^1.0.6": + version "1.0.6" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50" + integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw== + +"@types/express-serve-static-core@*", "@types/express-serve-static-core@^5.0.0": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-5.0.2.tgz#812d2871e5eea17fb0bd5214dda7a7b748c0e12a" + integrity sha512-vluaspfvWEtE4vcSDlKRNer52DvOGrB2xv6diXy6UKyKW0lqZiWHGNApSyxOv+8DE5Z27IzVvE7hNkxg7EXIcg== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + "@types/send" "*" -"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33": - version "4.19.5" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz#218064e321126fcf9048d1ca25dd2465da55d9c6" - integrity sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg== +"@types/express-serve-static-core@^4.17.33": + version "4.19.6" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz#e01324c2a024ff367d92c66f48553ced0ab50267" + integrity sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A== dependencies: "@types/node" "*" "@types/qs" "*" "@types/range-parser" "*" "@types/send" "*" -"@types/express@*", "@types/express@^4.17.13": +"@types/express@*": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@types/express/-/express-5.0.0.tgz#13a7d1f75295e90d19ed6e74cab3678488eaa96c" + integrity sha512-DvZriSMehGHL1ZNLzi6MidnsDhUZM/x2pRdDIKdwbUNqqwHxMlRdkxtn6/EPKyqKpHqTl/4nRZsRNLpZxZRpPQ== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^5.0.0" + "@types/qs" "*" + "@types/serve-static" "*" + +"@types/express@^4.17.13": version "4.17.21" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d" integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ== @@ -1299,7 +1314,7 @@ dependencies: "@types/node" "*" -"@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": +"@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.15" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== @@ -1317,11 +1332,11 @@ "@types/node" "*" "@types/node@*": - version "22.2.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.2.0.tgz#7cf046a99f0ba4d628ad3088cb21f790df9b0c5b" - integrity sha512-bm6EG6/pCpkxDf/0gDNDdtDILMOHgaQBVOJGdwsqClnxA3xL6jtMv76rLBc006RVMWbmaf0xbmom4Z/5o2nRkQ== + version "22.10.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.10.1.tgz#41ffeee127b8975a05f8c4f83fb89bcb2987d766" + integrity sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ== dependencies: - undici-types "~6.13.0" + undici-types "~6.20.0" "@types/parse-json@^4.0.0": version "4.0.2" @@ -1334,9 +1349,9 @@ integrity sha512-hroOstUScF6zhIi+5+x0dzqrHA1EJi+Irri6b1fxolMTqqHIV/Cg77EtnQcZqZCu8hR3mX2BzIxN4/GzI68Kfw== "@types/qs@*": - version "6.9.15" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.15.tgz#adde8a060ec9c305a82de1babc1056e73bd64dce" - integrity sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg== + version "6.9.17" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.17.tgz#fc560f60946d0aeff2f914eb41679659d3310e1a" + integrity sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ== "@types/range-parser@*": version "1.2.7" @@ -1385,9 +1400,9 @@ "@types/node" "*" "@types/ws@^8.5.5": - version "8.5.12" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.12.tgz#619475fe98f35ccca2a2f6c137702d85ec247b7e" - integrity sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ== + version "8.5.13" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.13.tgz#6414c280875e2691d0d1e080b05addbf5cb91e20" + integrity sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA== dependencies: "@types/node" "*" @@ -1611,7 +1626,7 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: +accepts@~1.3.4, accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== @@ -1629,10 +1644,10 @@ acorn@^6.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== -acorn@^8.11.3, acorn@^8.12.0, acorn@^8.8.2, acorn@^8.9.0: - version "8.12.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248" - integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg== +acorn@^8.11.3, acorn@^8.14.0, acorn@^8.8.2, acorn@^8.9.0: + version "8.14.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0" + integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA== aggregate-error@^3.0.0: version "3.1.0" @@ -1701,11 +1716,6 @@ ansi-regex@^4.1.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed" integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g== -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -1871,12 +1881,12 @@ available-typed-arrays@^1.0.7: possible-typed-array-names "^1.0.0" babel-loader@^8.2.2: - version "8.3.0" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8" - integrity sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q== + version "8.4.1" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.4.1.tgz#6ccb75c66e62c3b144e1c5f2eaec5b8f6c08c675" + integrity sha512-nXzRChX+Z1GoE6yWavBQg6jDslyFF3SDjl2paADuoQtQW10JqShJt62R6eJQ5m/pjJFDT8xgKIWSP85OY8eXeA== dependencies: find-cache-dir "^3.3.1" - loader-utils "^2.0.0" + loader-utils "^2.0.4" make-dir "^3.1.0" schema-utils "^2.6.5" @@ -1897,15 +1907,15 @@ babel-plugin-macros@^2.8.0: resolve "^1.12.0" babel-plugin-polyfill-corejs2@^0.4.10: - version "0.4.11" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33" - integrity sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q== + version "0.4.12" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz#ca55bbec8ab0edeeef3d7b8ffd75322e210879a9" + integrity sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og== dependencies: "@babel/compat-data" "^7.22.6" - "@babel/helper-define-polyfill-provider" "^0.6.2" + "@babel/helper-define-polyfill-provider" "^0.6.3" semver "^6.3.1" -babel-plugin-polyfill-corejs3@^0.10.1, babel-plugin-polyfill-corejs3@^0.10.4: +babel-plugin-polyfill-corejs3@^0.10.6: version "0.10.6" resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz#2deda57caef50f59c525aeb4964d3b2f867710c7" integrity sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA== @@ -1914,11 +1924,11 @@ babel-plugin-polyfill-corejs3@^0.10.1, babel-plugin-polyfill-corejs3@^0.10.4: core-js-compat "^3.38.0" babel-plugin-polyfill-regenerator@^0.6.1: - version "0.6.2" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz#addc47e240edd1da1058ebda03021f382bba785e" - integrity sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg== + version "0.6.3" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz#abeb1f3f1c762eace37587f42548b08b57789bc8" + integrity sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q== dependencies: - "@babel/helper-define-polyfill-provider" "^0.6.2" + "@babel/helper-define-polyfill-provider" "^0.6.3" balanced-match@^1.0.0: version "1.0.2" @@ -1976,19 +1986,19 @@ bluebird@^3.5.5: integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: - version "4.12.0" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" - integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== + version "4.12.1" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.1.tgz#215741fe3c9dba2d7e12c001d0cfdbae43975ba7" + integrity sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg== -bn.js@^5.0.0, bn.js@^5.2.1: +bn.js@^5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70" integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== -body-parser@1.20.2: - version "1.20.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" - integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== +body-parser@1.20.3: + version "1.20.3" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6" + integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g== dependencies: bytes "3.1.2" content-type "~1.0.5" @@ -1998,15 +2008,15 @@ body-parser@1.20.2: http-errors "2.0.0" iconv-lite "0.4.24" on-finished "2.4.1" - qs "6.11.0" + qs "6.13.0" raw-body "2.5.2" type-is "~1.6.18" unpipe "1.0.0" bonjour-service@^1.0.11: - version "1.2.1" - resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.2.1.tgz#eb41b3085183df3321da1264719fbada12478d02" - integrity sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw== + version "1.3.0" + resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.3.0.tgz#80d867430b5a0da64e82a8047fc1e355bdb71722" + integrity sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA== dependencies: fast-deep-equal "^3.1.3" multicast-dns "^7.2.5" @@ -2071,7 +2081,7 @@ browserify-aes@^1.0.4, browserify-aes@^1.2.0: inherits "^2.0.1" safe-buffer "^5.0.1" -browserify-cipher@^1.0.0: +browserify-cipher@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0" integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w== @@ -2091,14 +2101,15 @@ browserify-des@^1.0.0: safe-buffer "^5.1.2" browserify-rsa@^4.0.0, browserify-rsa@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" - integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog== + version "4.1.1" + resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.1.tgz#06e530907fe2949dc21fc3c2e2302e10b1437238" + integrity sha512-YBjSAiTqM04ZVei6sXighu679a3SqWORA3qZTEqZImnlkDIFtKc6pNutpjyZ8RJTjQtuYfeetkxM11GwoYXMIQ== dependencies: - bn.js "^5.0.0" - randombytes "^2.0.1" + bn.js "^5.2.1" + randombytes "^2.1.0" + safe-buffer "^5.2.1" -browserify-sign@^4.0.0: +browserify-sign@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.3.tgz#7afe4c01ec7ee59a89a558a4b75bd85ae62d4208" integrity sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw== @@ -2121,15 +2132,15 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.23.1, browserslist@^4.23.3, browserslist@^4.6.4: - version "4.23.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800" - integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA== +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.24.0, browserslist@^4.24.2, browserslist@^4.6.4: + version "4.24.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580" + integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg== dependencies: - caniuse-lite "^1.0.30001646" - electron-to-chromium "^1.5.4" + caniuse-lite "^1.0.30001669" + electron-to-chromium "^1.5.41" node-releases "^2.0.18" - update-browserslist-db "^1.1.0" + update-browserslist-db "^1.1.1" buffer-from@^1.0.0: version "1.1.2" @@ -2155,11 +2166,6 @@ builtin-status-codes@^3.0.0: resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ== -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw== - bytes@3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" @@ -2275,10 +2281,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001646: - version "1.0.30001651" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz#52de59529e8b02b1aedcaaf5c05d9e23c0c28138" - integrity sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001669: + version "1.0.30001684" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz#0eca437bab7d5f03452ff0ef9de8299be6b08e16" + integrity sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ== case-sensitive-paths-webpack-plugin@^2.4.0: version "2.4.0" @@ -2302,21 +2308,6 @@ chalk@^4.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1, chokidar@^3.5.3: - version "3.6.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" - integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== - dependencies: - anymatch "~3.1.2" - braces "~3.0.2" - glob-parent "~5.1.2" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.6.0" - optionalDependencies: - fsevents "~2.3.2" - chokidar@^2.1.8: version "2.1.8" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" @@ -2336,6 +2327,28 @@ chokidar@^2.1.8: optionalDependencies: fsevents "^1.2.7" +chokidar@^3.4.1, chokidar@^3.5.3: + version "3.6.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" + integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + +chokidar@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.1.tgz#4a6dff66798fb0f72a94f616abbd7e1a19f31d41" + integrity sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA== + dependencies: + readdirp "^4.0.1" + chownr@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" @@ -2352,12 +2365,12 @@ chrome-trace-event@^1.0.2: integrity sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ== cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" - integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q== + version "1.0.6" + resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.6.tgz#8fe672437d01cd6c4561af5334e0cc50ff1955f7" + integrity sha512-3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw== dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" + inherits "^2.0.4" + safe-buffer "^5.2.1" class-utils@^0.3.5: version "0.3.6" @@ -2487,7 +2500,7 @@ component-emitter@^1.2.1: resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.1.tgz#ef1d5796f7d93f135ee6fb684340b26403c97d17" integrity sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ== -compressible@~2.0.16: +compressible@~2.0.18: version "2.0.18" resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== @@ -2506,16 +2519,16 @@ compression-webpack-plugin@^4.0.1: webpack-sources "^1.4.3" compression@^1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" - integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== + version "1.7.5" + resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.5.tgz#fdd256c0a642e39e314c478f6c2cd654edd74c93" + integrity sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q== dependencies: - accepts "~1.3.5" - bytes "3.0.0" - compressible "~2.0.16" + bytes "3.1.2" + compressible "~2.0.18" debug "2.6.9" + negotiator "~0.6.4" on-headers "~1.0.2" - safe-buffer "5.1.2" + safe-buffer "5.2.1" vary "~1.1.2" concat-map@0.0.1: @@ -2570,10 +2583,10 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== -cookie@0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" - integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== +cookie@0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9" + integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w== copy-concurrently@^1.0.0: version "1.0.5" @@ -2592,22 +2605,22 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== -core-js-compat@^3.37.1, core-js-compat@^3.38.0: - version "3.38.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.38.0.tgz#d93393b1aa346b6ee683377b0c31172ccfe607aa" - integrity sha512-75LAicdLa4OJVwFxFbQR3NdnZjNgX6ILpVcVzcC4T2smerB5lELMrJQQQoWV6TiuC/vlaFqgU2tKQx9w5s0e0A== +core-js-compat@^3.38.0, core-js-compat@^3.38.1: + version "3.39.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.39.0.tgz#b12dccb495f2601dc860bdbe7b4e3ffa8ba63f61" + integrity sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw== dependencies: - browserslist "^4.23.3" + browserslist "^4.24.2" core-js-pure@^3.30.2: - version "3.38.0" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.38.0.tgz#bc802cd152e33d5b0ec733b656c71cb847cac701" - integrity sha512-8balb/HAXo06aHP58mZMtXgD8vcnXz9tUDePgqBgJgKdmTlMt+jw3ujqniuBDQXMvTzxnMpxHFeuSM3g1jWQuQ== + version "3.39.0" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.39.0.tgz#aa0d54d70a15bdc13e7c853db87c10abc30d68f3" + integrity sha512-7fEcWwKI4rJinnK+wLTezeg2smbFFdSBP6E2kQZNbnzM2s1rpKQ6aaRteZSSg7FLU3P0HGGVo/gbpfanU36urg== core-js@^3.16.2, core-js@^3.31.0, core-js@^3.6.5: - version "3.38.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.38.0.tgz#8acb7c050bf2ccbb35f938c0d040132f6110f636" - integrity sha512-XPpwqEodRljce9KswjZShh95qJ1URisBeKCjUdq27YdenkslVe7OO0ZJhlYXAChW7OhXaRLl8AAba7IBfoIHug== + version "3.39.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.39.0.tgz#57f7647f4d2d030c32a72ea23a0555b2eaa30f83" + integrity sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g== core-util-is@~1.0.0: version "1.0.3" @@ -2635,7 +2648,7 @@ cosmiconfig@^6.0.0: path-type "^4.0.0" yaml "^1.7.2" -create-ecdh@^4.0.0: +create-ecdh@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A== @@ -2654,7 +2667,7 @@ create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0: ripemd160 "^2.0.1" sha.js "^2.4.0" -create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: +create-hmac@^1.1.4, create-hmac@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg== @@ -2667,9 +2680,9 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: sha.js "^2.4.8" cross-spawn@^6.0.5: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + version "6.0.6" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.6.tgz#30d0efa0712ddb7eb5a76e1e8721bffafa6b5d57" + integrity sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw== dependencies: nice-try "^1.0.4" path-key "^2.0.1" @@ -2677,31 +2690,32 @@ cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.2, cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== +cross-spawn@^7.0.3, cross-spawn@^7.0.5: + version "7.0.6" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f" + integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA== dependencies: path-key "^3.1.0" shebang-command "^2.0.0" which "^2.0.1" crypto-browserify@^3.11.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" - integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg== + version "3.12.1" + resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.1.tgz#bb8921bec9acc81633379aa8f52d69b0b69e0dac" + integrity sha512-r4ESw/IlusD17lgQi1O20Fa3qNnsckR126TdUuBgAu7GBYSIPvdNyONd3Zrxh0xCwA4+6w/TDArBPsMvhur+KQ== dependencies: - browserify-cipher "^1.0.0" - browserify-sign "^4.0.0" - create-ecdh "^4.0.0" - create-hash "^1.1.0" - create-hmac "^1.1.0" - diffie-hellman "^5.0.0" - inherits "^2.0.1" - pbkdf2 "^3.0.3" - public-encrypt "^4.0.0" - randombytes "^2.0.0" - randomfill "^1.0.3" + browserify-cipher "^1.0.1" + browserify-sign "^4.2.3" + create-ecdh "^4.0.4" + create-hash "^1.2.0" + create-hmac "^1.1.7" + diffie-hellman "^5.0.3" + hash-base "~3.0.4" + inherits "^2.0.4" + pbkdf2 "^3.1.2" + public-encrypt "^4.0.3" + randombytes "^2.1.0" + randomfill "^1.0.4" css-blank-pseudo@^0.1.4: version "0.1.4" @@ -2939,11 +2953,11 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3: ms "2.0.0" debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: - version "4.3.6" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b" - integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg== + version "4.3.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" + integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== dependencies: - ms "2.1.2" + ms "^2.1.3" decamelize@^1.2.0: version "1.2.0" @@ -3040,12 +3054,17 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q== +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg== + detect-node@^2.0.4: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -diffie-hellman@^5.0.0: +diffie-hellman@^5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg== @@ -3121,15 +3140,15 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.5.4: - version "1.5.6" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.6.tgz#c81d9938b5a877314ad370feb73b4e5409b36abd" - integrity sha512-jwXWsM5RPf6j9dPYzaorcBSUg6AiqocPEyMpkchkvntaH9HGfOOMZwxMJjDY/XEs3T5dM7uyH1VhRMkqUU9qVw== +electron-to-chromium@^1.5.41: + version "1.5.67" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.67.tgz#66ebd2be4a77469ac2760ef5e9e460ba9a43a845" + integrity sha512-nz88NNBsD7kQSAGGJyp8hS6xSPtWwqNogA0mjtc2nUYeEf3nURK9qpV18TuBdDmEDgVWotS8Wkzf+V52dSQ/LQ== elliptic@^6.5.3, elliptic@^6.5.5: - version "6.5.6" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.6.tgz#ee5f7c3a00b98a2144ac84d67d01f04d438fa53e" - integrity sha512-mpzdtpeCLuS3BmE3pO3Cpp5bbjlOPY2Q0PgoF+Od1XZrHLYI28Xe3ossCmYCQt11FQKEYd9+PF8jymTvtWJSHQ== + version "6.6.1" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.6.1.tgz#3b8ffb02670bf69e382c7f65bf524c97c5405c06" + integrity sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g== dependencies: bn.js "^4.11.9" brorand "^1.1.0" @@ -3154,6 +3173,11 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== +encodeurl@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58" + integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg== + end-of-stream@^1.0.0, end-of-stream@^1.1.0: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" @@ -3176,9 +3200,9 @@ entities@^2.0.0: integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== envinfo@^7.7.3: - version "7.13.0" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.13.0.tgz#81fbb81e5da35d74e814941aeab7c325a606fb31" - integrity sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q== + version "7.14.0" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.14.0.tgz#26dac5db54418f2a4c1159153a0b2ae980838aae" + integrity sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg== errno@^0.1.3, errno@~0.1.7: version "0.1.8" @@ -3194,10 +3218,10 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.2, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.2: - version "1.23.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0" - integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A== +es-abstract@^1.17.2, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.2, es-abstract@^1.23.5: + version "1.23.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.5.tgz#f4599a4946d57ed467515ed10e4f157289cd52fb" + integrity sha512-vlmniQ0WNPwXqA0BnmwV3Ng7HxiGlh6r5U6JcTMNx8OilcAGqVJBHJcPjqOMaczU9fRuRK5Px2BdVyPRnKMMVQ== dependencies: array-buffer-byte-length "^1.0.1" arraybuffer.prototype.slice "^1.0.3" @@ -3214,7 +3238,7 @@ es-abstract@^1.17.2, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23 function.prototype.name "^1.1.6" get-intrinsic "^1.2.4" get-symbol-description "^1.0.2" - globalthis "^1.0.3" + globalthis "^1.0.4" gopd "^1.0.1" has-property-descriptors "^1.0.2" has-proto "^1.0.3" @@ -3230,10 +3254,10 @@ es-abstract@^1.17.2, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23 is-string "^1.0.7" is-typed-array "^1.1.13" is-weakref "^1.0.2" - object-inspect "^1.13.1" + object-inspect "^1.13.3" object-keys "^1.1.1" object.assign "^4.1.5" - regexp.prototype.flags "^1.5.2" + regexp.prototype.flags "^1.5.3" safe-array-concat "^1.1.2" safe-regex-test "^1.0.3" string.prototype.trim "^1.2.9" @@ -3280,18 +3304,18 @@ es-set-tostringtag@^2.0.3: hasown "^2.0.1" es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" - integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz#96c89c82cc49fd8794a24835ba3e1ff87f214e18" + integrity sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g== dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" + is-callable "^1.2.7" + is-date-object "^1.0.5" + is-symbol "^1.0.4" -escalade@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" - integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== +escalade@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5" + integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== escape-html@~1.0.3: version "1.0.3" @@ -3309,9 +3333,9 @@ escape-string-regexp@^4.0.0: integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== eslint-plugin-cypress@^3.3.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-3.5.0.tgz#380ef5049ad80ebeca923db69e4aa96e72fcd893" - integrity sha512-JZQ6XnBTNI8h1B9M7wJSFzc48SYbh7VMMKaNTQOFa3BQlnmXPrVc4PKen8R+fpv6VleiPeej6VxloGb42zdRvw== + version "3.6.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-3.6.0.tgz#d0e2f68f27b9a34ecf565bef58ed82c8f10d39a8" + integrity sha512-7IAMcBbTVu5LpWeZRn5a9mQ30y4hKp3AfTz+6nSD/x/7YyLMoBI6X7XjDLYI6zFvuy4Q4QVGl563AGEXGW/aSA== dependencies: globals "^13.20.0" @@ -3328,45 +3352,49 @@ eslint-scope@^4.0.3: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-scope@^8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.0.2.tgz#5cbb33d4384c9136083a71190d548158fe128f94" - integrity sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA== +eslint-scope@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.2.0.tgz#377aa6f1cb5dc7592cfd0b7f892fd0cf352ce442" + integrity sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A== dependencies: esrecurse "^4.3.0" estraverse "^5.2.0" -eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3: +eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3: version "3.4.3" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== -eslint-visitor-keys@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb" - integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw== +eslint-visitor-keys@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45" + integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw== eslint@^9.1.1: - version "9.9.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.9.0.tgz#8d214e69ae4debeca7ae97daebbefe462072d975" - integrity sha512-JfiKJrbx0506OEerjK2Y1QlldtBxkAlLxT5OEcRF8uaQ86noDe2k31Vw9rnSWv+MXZHj7OOUV/dA0AhdLFcyvA== + version "9.16.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.16.0.tgz#66832e66258922ac0a626f803a9273e37747f2a6" + integrity sha512-whp8mSQI4C8VXd+fLgSM0lh3UlmcFtVwUQjyKCFfsp+2ItAIYhlq/hqGahGqHE6cv9unM41VlqKk2VtKYR2TaA== dependencies: "@eslint-community/eslint-utils" "^4.2.0" - "@eslint-community/regexpp" "^4.11.0" - "@eslint/config-array" "^0.17.1" - "@eslint/eslintrc" "^3.1.0" - "@eslint/js" "9.9.0" + "@eslint-community/regexpp" "^4.12.1" + "@eslint/config-array" "^0.19.0" + "@eslint/core" "^0.9.0" + "@eslint/eslintrc" "^3.2.0" + "@eslint/js" "9.16.0" + "@eslint/plugin-kit" "^0.2.3" + "@humanfs/node" "^0.16.6" "@humanwhocodes/module-importer" "^1.0.1" - "@humanwhocodes/retry" "^0.3.0" - "@nodelib/fs.walk" "^1.2.8" + "@humanwhocodes/retry" "^0.4.1" + "@types/estree" "^1.0.6" + "@types/json-schema" "^7.0.15" ajv "^6.12.4" chalk "^4.0.0" - cross-spawn "^7.0.2" + cross-spawn "^7.0.5" debug "^4.3.2" escape-string-regexp "^4.0.0" - eslint-scope "^8.0.2" - eslint-visitor-keys "^4.0.0" - espree "^10.1.0" + eslint-scope "^8.2.0" + eslint-visitor-keys "^4.2.0" + espree "^10.3.0" esquery "^1.5.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" @@ -3376,24 +3404,20 @@ eslint@^9.1.1: ignore "^5.2.0" imurmurhash "^0.1.4" is-glob "^4.0.0" - is-path-inside "^3.0.3" json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" lodash.merge "^4.6.2" minimatch "^3.1.2" natural-compare "^1.4.0" optionator "^0.9.3" - strip-ansi "^6.0.1" - text-table "^0.2.0" -espree@^10.0.1, espree@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-10.1.0.tgz#8788dae611574c0f070691f522e4116c5a11fc56" - integrity sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA== +espree@^10.0.1, espree@^10.3.0: + version "10.3.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-10.3.0.tgz#29267cf5b0cb98735b65e64ba07e0ed49d1eed8a" + integrity sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg== dependencies: - acorn "^8.12.0" + acorn "^8.14.0" acorn-jsx "^5.3.2" - eslint-visitor-keys "^4.0.0" + eslint-visitor-keys "^4.2.0" espree@^9.6.1: version "9.6.1" @@ -3497,36 +3521,36 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: homedir-polyfill "^1.0.1" express@^4.17.3: - version "4.19.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465" - integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== + version "4.21.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.21.1.tgz#9dae5dda832f16b4eec941a4e44aa89ec481b281" + integrity sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.20.2" + body-parser "1.20.3" content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.6.0" + cookie "0.7.1" cookie-signature "1.0.6" debug "2.6.9" depd "2.0.0" - encodeurl "~1.0.2" + encodeurl "~2.0.0" escape-html "~1.0.3" etag "~1.8.1" - finalhandler "1.2.0" + finalhandler "1.3.1" fresh "0.5.2" http-errors "2.0.0" - merge-descriptors "1.0.1" + merge-descriptors "1.0.3" methods "~1.1.2" on-finished "2.4.1" parseurl "~1.3.3" - path-to-regexp "0.1.7" + path-to-regexp "0.1.10" proxy-addr "~2.0.7" - qs "6.11.0" + qs "6.13.0" range-parser "~1.2.1" safe-buffer "5.2.1" - send "0.18.0" - serve-static "1.15.0" + send "0.19.0" + serve-static "1.16.2" setprototypeof "1.2.0" statuses "2.0.1" type-is "~1.6.18" @@ -3589,9 +3613,9 @@ fast-levenshtein@^2.0.6: integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== fast-uri@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.1.tgz#cddd2eecfc83a71c1be2cc2ef2061331be8a7134" - integrity sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw== + version "3.0.3" + resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.3.tgz#892a1c91802d5d7860de728f18608a0573142241" + integrity sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw== fastest-levenshtein@^1.0.12: version "1.0.16" @@ -3654,13 +3678,13 @@ fill-range@^7.1.1: dependencies: to-regex-range "^5.0.1" -finalhandler@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" - integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== +finalhandler@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019" + integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ== dependencies: debug "2.6.9" - encodeurl "~1.0.2" + encodeurl "~2.0.0" escape-html "~1.0.3" on-finished "2.4.1" parseurl "~1.3.3" @@ -3732,9 +3756,9 @@ flat@^5.0.2: integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== flatted@^3.2.2, flatted@^3.2.9: - version "3.3.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a" - integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw== + version "3.3.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.2.tgz#adba1448a9841bec72b42c532ea23dbbedef1a27" + integrity sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA== flatten@^1.0.2: version "1.0.3" @@ -3750,9 +3774,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0: - version "1.15.6" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" - integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== + version "1.15.9" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1" + integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ== for-each@^0.3.3: version "0.3.3" @@ -3784,9 +3808,9 @@ fresh@0.5.2: integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== friendly-challenge@^0.9.1: - version "0.9.16" - resolved "https://registry.yarnpkg.com/friendly-challenge/-/friendly-challenge-0.9.16.tgz#7bf5d286da9bc25428ee476c012c96588c45ca66" - integrity sha512-f5af4Mqz+JN0/I+QOKtY5pSSwdJ390KDBbFCAfrA45ufQ2z9bUIP8bsq6PGGlOmdOIPYN3ahFAVoOBDEgavc2A== + version "0.9.18" + resolved "https://registry.yarnpkg.com/friendly-challenge/-/friendly-challenge-0.9.18.tgz#c07a8001879b6500abd6c87dc51e6fd43ed0708e" + integrity sha512-OCNe3UvSdyy53vOSTYaa98q+yfhAoD74w8uF3lIwPm2vQiZQipwo5HRDbx/dz3LcUg5k3sRd+7iOhMJmi7cD9Q== dependencies: "@babel/runtime-corejs3" "^7.10.4" core-js "^3.6.5" @@ -3879,7 +3903,7 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: +get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== @@ -3997,11 +4021,11 @@ globals@^14.0.0: integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ== globals@^15.1.0: - version "15.9.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-15.9.0.tgz#e9de01771091ffbc37db5714dab484f9f69ff399" - integrity sha512-SmSKyLLKFbSr6rptvP8izbyxJL4ILwqO9Jg23UA0sDlGlu58V59D1//I3vlc0KJphVdUR7vMjHIplYnzBxorQA== + version "15.13.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-15.13.0.tgz#bbec719d69aafef188ecd67954aae76a696010fc" + integrity sha512-49TewVEz0UxZjr1WYYsWpPrhyC/B/pA8Bq0fUmet2n+eR7yn0IvNzNaoBwnK6mdkzcN+se7Ez9zUgULTz2QH4g== -globalthis@^1.0.3: +globalthis@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236" integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ== @@ -4021,12 +4045,12 @@ globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" -gopd@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" - integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== +gopd@^1.0.1, gopd@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.1.0.tgz#df8f0839c2d48caefc32a025a49294d39606c912" + integrity sha512-FQoVQnqcdk4hVM4JN1eromaun4iuS34oStkdlLENLdpULsuQcTyXj8w7ayhuUfPwEYZ1ZOooOTT6fdA9Vmx/RA== dependencies: - get-intrinsic "^1.1.3" + get-intrinsic "^1.2.4" graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.2.6: version "4.2.11" @@ -4061,9 +4085,11 @@ has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2: es-define-property "^1.0.0" has-proto@^1.0.1, has-proto@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" - integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== + version "1.1.0" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.1.0.tgz#deb10494cbbe8809bce168a3b961f42969f5ed43" + integrity sha512-QLdzI9IIO1Jg7f9GT1gXpPpXArAn6cS31R1eEZqz08Gc+uQ8/XiqHWt17Fiw+2p6oTTIq5GXEpQkAlA88YRl/Q== + dependencies: + call-bind "^1.0.7" has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" @@ -4122,13 +4148,13 @@ hash-base@^3.0.0: readable-stream "^3.6.0" safe-buffer "^5.2.0" -hash-base@~3.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918" - integrity sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow== +hash-base@~3.0, hash-base@~3.0.4: + version "3.0.5" + resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.5.tgz#52480e285395cf7fba17dc4c9e47acdc7f248a8a" + integrity sha512-vXm0l45VbcHEVlTCzs8M+s0VeYsB2lnlAaThoLKGXr3bE/VWDOelNUnycUPEhKEaXARL2TEFjBOyUiM6+55KBg== dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" + inherits "^2.0.4" + safe-buffer "^5.2.1" hash.js@^1.0.0, hash.js@^1.0.3: version "1.1.7" @@ -4223,9 +4249,9 @@ http-parser-js@>=0.5.1: integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q== http-proxy-middleware@^2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f" - integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw== + version "2.0.7" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6" + integrity sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA== dependencies: "@types/http-proxy" "^1.17.8" http-proxy "^1.18.1" @@ -4286,10 +4312,10 @@ ignore@^5.2.0: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5" integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g== -immutable@^4.0.0: - version "4.3.7" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.7.tgz#c70145fc90d89fb02021e65c84eb0226e4e5a381" - integrity sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw== +immutable@^5.0.2: + version "5.0.3" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.0.3.tgz#aa037e2313ea7b5d400cd9298fa14e404c933db1" + integrity sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw== import-cwd@^2.0.0: version "2.1.0" @@ -4449,6 +4475,13 @@ is-arrayish@^0.3.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== +is-async-function@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646" + integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA== + dependencies: + has-tostringtag "^1.0.0" + is-bigint@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" @@ -4483,7 +4516,7 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: +is-callable@^1.1.3, is-callable@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== @@ -4501,9 +4534,9 @@ is-color-stop@^1.0.0: rgba-regex "^1.0.0" is-core-module@^2.13.0: - version "2.15.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea" - integrity sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA== + version "2.15.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37" + integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ== dependencies: hasown "^2.0.2" @@ -4521,7 +4554,7 @@ is-data-view@^1.0.1: dependencies: is-typed-array "^1.1.13" -is-date-object@^1.0.1: +is-date-object@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== @@ -4571,11 +4604,25 @@ is-extglob@^2.1.0, is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== +is-finalizationregistry@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.1.0.tgz#d74a7d0c5f3578e34a20729e69202e578d495dc2" + integrity sha512-qfMdqbAQEwBw78ZyReKnlA8ezmPdb9BemzIIip/JkjaZUhitfXDkkr+3QTboW0JrSXT1QWyYShpvnNHGZ4c4yA== + dependencies: + call-bind "^1.0.7" + is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w== +is-generator-function@^1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" + integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== + dependencies: + has-tostringtag "^1.0.0" + is-glob@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" @@ -4590,6 +4637,11 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" +is-map@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e" + integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw== + is-negative-zero@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747" @@ -4619,11 +4671,6 @@ is-obj@^2.0.0: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== -is-path-inside@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - is-plain-obj@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" @@ -4642,18 +4689,25 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: isobject "^3.0.1" is-regex@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" - integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== + version "1.2.0" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.0.tgz#41b9d266e7eb7451312c64efc37e8a7d453077cf" + integrity sha512-B6ohK4ZmoftlUe+uvenXSbPJFo6U37BH7oO1B3nQH8f/7h27N56s85MhUtbFJAziz5dcmuR3i8ovUl35zp8pFA== dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" + call-bind "^1.0.7" + gopd "^1.1.0" + has-tostringtag "^1.0.2" + hasown "^2.0.2" is-resolvable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== +is-set@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d" + integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg== + is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688" @@ -4673,7 +4727,7 @@ is-string@^1.0.5, is-string@^1.0.7: dependencies: has-tostringtag "^1.0.0" -is-symbol@^1.0.2, is-symbol@^1.0.3: +is-symbol@^1.0.3, is-symbol@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== @@ -4687,6 +4741,11 @@ is-typed-array@^1.1.13: dependencies: which-typed-array "^1.1.14" +is-weakmap@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd" + integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w== + is-weakref@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" @@ -4694,6 +4753,14 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" +is-weakset@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.3.tgz#e801519df8c0c43e12ff2834eead84ec9e624007" + integrity sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ== + dependencies: + call-bind "^1.0.7" + get-intrinsic "^1.2.4" + is-windows@^1.0.1, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -4767,15 +4834,10 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== - -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA== +jsesc@^3.0.2, jsesc@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e" + integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g== json-buffer@3.0.1: version "3.0.1" @@ -4859,9 +4921,9 @@ last-call-webpack-plugin@^3.0.0: webpack-sources "^1.1.0" launch-editor@^2.6.0: - version "2.8.1" - resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.8.1.tgz#3bda72af213ec9b46b170e39661916ec66c2f463" - integrity sha512-elBx2l/tp9z99X5H/qev8uyDywVh0VXAwEbjk8kJhnc5grOFkGh7aW6q55me9xnYbss261XtnUrysZ+XvGbhQA== + version "2.9.1" + resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.9.1.tgz#253f173bd441e342d4344b4dae58291abb425047" + integrity sha512-Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w== dependencies: picocolors "^1.0.0" shell-quote "^1.8.1" @@ -4893,7 +4955,7 @@ loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0: emojis-list "^3.0.0" json5 "^1.0.1" -loader-utils@^2.0.0: +loader-utils@^2.0.0, loader-utils@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c" integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw== @@ -5047,10 +5109,10 @@ memory-fs@^0.5.0: errno "^0.1.3" readable-stream "^2.0.1" -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== +merge-descriptors@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5" + integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ== merge-stream@^2.0.0: version "2.0.0" @@ -5086,10 +5148,10 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -micromatch@^4.0.2, micromatch@^4.0.4: - version "4.0.7" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5" - integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q== +micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5: + version "4.0.8" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" + integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA== dependencies: braces "^3.0.3" picomatch "^2.3.1" @@ -5262,12 +5324,7 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@2.1.3: +ms@2.1.3, ms@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -5281,14 +5338,14 @@ multicast-dns@^7.2.5: thunky "^1.0.2" nan@^2.12.1: - version "2.20.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.20.0.tgz#08c5ea813dd54ed16e5bd6505bf42af4f7838ca3" - integrity sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw== + version "2.22.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.22.0.tgz#31bc433fc33213c97bad36404bb68063de604de3" + integrity sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw== nanoid@^3.3.7: - version "3.3.7" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" - integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== + version "3.3.8" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf" + integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w== nanomatch@^1.2.9: version "1.2.13" @@ -5317,6 +5374,11 @@ negotiator@0.6.3: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== +negotiator@~0.6.4: + version "0.6.4" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7" + integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w== + neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" @@ -5327,6 +5389,11 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +node-addon-api@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558" + integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ== + node-forge@^1: version "1.3.1" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" @@ -5436,10 +5503,10 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.13.1: - version "1.13.2" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff" - integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g== +object-inspect@^1.13.1, object-inspect@^1.13.3: + version "1.13.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.3.tgz#f14c183de51130243d6d18ae149375ff50ea488a" + integrity sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA== object-keys@^1.1.1: version "1.1.1" @@ -5723,17 +5790,17 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== +path-to-regexp@0.1.10: + version "0.1.10" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b" + integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w== path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== -pbkdf2@^3.0.3, pbkdf2@^3.1.2: +pbkdf2@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA== @@ -5749,10 +5816,10 @@ picocolors@^0.2.1: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA== -picocolors@^1.0.0, picocolors@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1" - integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew== +picocolors@^1.0.0, picocolors@^1.1.0, picocolors@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" + integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: version "2.3.1" @@ -6144,12 +6211,12 @@ postcss-modules-local-by-default@^3.0.2: postcss-value-parser "^4.1.0" postcss-modules-local-by-default@^4.0.0: - version "4.0.5" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz#f1b9bd757a8edf4d8556e8d0f4f894260e3df78f" - integrity sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw== + version "4.1.0" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.1.0.tgz#b0db6bc81ffc7bdc52eb0f84d6ca0bedf0e36d21" + integrity sha512-rm0bdSv4jC3BDma3s9H19ZddW0aHX6EoqwDYU2IfZhRN+53QrufTRo2IdkAbRqLx4R2IYbZnbjKKxg4VN5oU9Q== dependencies: icss-utils "^5.0.0" - postcss-selector-parser "^6.0.2" + postcss-selector-parser "^7.0.0" postcss-value-parser "^4.1.0" postcss-modules-scope@^2.2.0: @@ -6161,11 +6228,11 @@ postcss-modules-scope@^2.2.0: postcss-selector-parser "^6.0.0" postcss-modules-scope@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz#a43d28289a169ce2c15c00c4e64c0858e43457d5" - integrity sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ== + version "3.2.1" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz#1bbccddcb398f1d7a511e0a2d1d047718af4078c" + integrity sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA== dependencies: - postcss-selector-parser "^6.0.4" + postcss-selector-parser "^7.0.0" postcss-modules-values@^3.0.0: version "3.0.0" @@ -6420,7 +6487,7 @@ postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4: indexes-of "^1.0.1" uniq "^1.0.1" -postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: +postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: version "6.1.2" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de" integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg== @@ -6428,6 +6495,14 @@ postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector cssesc "^3.0.0" util-deprecate "^1.0.2" +postcss-selector-parser@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz#41bd8b56f177c093ca49435f65731befe25d6b9c" + integrity sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + postcss-svgo@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz#343a2cdbac9505d416243d496f724f38894c941e" @@ -6474,13 +6549,13 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2 source-map "^0.6.1" postcss@^8.2.15: - version "8.4.41" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681" - integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ== + version "8.4.49" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19" + integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA== dependencies: nanoid "^3.3.7" - picocolors "^1.0.1" - source-map-js "^1.2.0" + picocolors "^1.1.1" + source-map-js "^1.2.1" prelude-ls@^1.2.1: version "1.2.1" @@ -6525,7 +6600,7 @@ prr@~1.0.1: resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw== -public-encrypt@^4.0.0: +public-encrypt@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q== @@ -6546,9 +6621,9 @@ pump@^2.0.0: once "^1.3.1" pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + version "3.0.2" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.2.tgz#836f3edd6bc2ee599256c924ffe0d88573ddcbf8" + integrity sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw== dependencies: end-of-stream "^1.1.0" once "^1.3.1" @@ -6577,20 +6652,20 @@ q@^1.1.2: resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== -qs@6.11.0: - version "6.11.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== - dependencies: - side-channel "^1.0.4" - -qs@^6.12.3: +qs@6.13.0: version "6.13.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg== dependencies: side-channel "^1.0.6" +qs@^6.12.3: + version "6.13.1" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.1.tgz#3ce5fc72bd3a8171b85c99b93c65dd20b7d1b16e" + integrity sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg== + dependencies: + side-channel "^1.0.6" + query-string@^4.1.0: version "4.3.4" resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" @@ -6616,7 +6691,7 @@ randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0: dependencies: safe-buffer "^5.1.0" -randomfill@^1.0.3: +randomfill@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458" integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw== @@ -6677,6 +6752,11 @@ readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" +readdirp@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.2.tgz#388fccb8b75665da3abffe2d8f8ed59fe74c230a" + integrity sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA== + readdirp@~3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" @@ -6691,10 +6771,23 @@ rechoir@^0.7.0: dependencies: resolve "^1.9.0" -regenerate-unicode-properties@^10.1.0: - version "10.1.1" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz#6b0e05489d9076b04c436f318d9b067bba459480" - integrity sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q== +reflect.getprototypeof@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.7.tgz#04311b33a1b713ca5eb7b5aed9950a86481858e5" + integrity sha512-bMvFGIUKlc/eSfXNX+aZ+EL95/EgZzuwA0OBPTbZZDEJw/0AkentjMuM1oiRfwHrshqk4RzdgiTg5CcDalXN5g== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.5" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + gopd "^1.0.1" + which-builtin-type "^1.1.4" + +regenerate-unicode-properties@^10.2.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz#626e39df8c372338ea9b8028d1f99dc3fd9c3db0" + integrity sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA== dependencies: regenerate "^1.4.2" @@ -6728,34 +6821,39 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexp.prototype.flags@^1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334" - integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw== +regexp.prototype.flags@^1.5.3: + version "1.5.3" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz#b3ae40b1d2499b8350ab2c3fe6ef3845d3a96f42" + integrity sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ== dependencies: - call-bind "^1.0.6" + call-bind "^1.0.7" define-properties "^1.2.1" es-errors "^1.3.0" - set-function-name "^2.0.1" + set-function-name "^2.0.2" -regexpu-core@^5.3.1: - version "5.3.2" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b" - integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ== +regexpu-core@^6.1.1: + version "6.2.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.2.0.tgz#0e5190d79e542bf294955dccabae04d3c7d53826" + integrity sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA== dependencies: - "@babel/regjsgen" "^0.8.0" regenerate "^1.4.2" - regenerate-unicode-properties "^10.1.0" - regjsparser "^0.9.1" + regenerate-unicode-properties "^10.2.0" + regjsgen "^0.8.0" + regjsparser "^0.12.0" unicode-match-property-ecmascript "^2.0.0" unicode-match-property-value-ecmascript "^2.1.0" -regjsparser@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709" - integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ== +regjsgen@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.8.0.tgz#df23ff26e0c5b300a6470cad160a9d090c3a37ab" + integrity sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q== + +regjsparser@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.12.0.tgz#0e846df6c6530586429377de56e0475583b088dc" + integrity sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ== dependencies: - jsesc "~0.5.0" + jsesc "~3.0.2" remove-trailing-separator@^1.0.1: version "1.1.0" @@ -6914,16 +7012,16 @@ safe-array-concat@^1.1.2: has-symbols "^1.0.3" isarray "^2.0.5" -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + safe-regex-test@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377" @@ -6968,13 +7066,15 @@ sass-loader@^10.1.1: semver "^7.3.2" sass@^1.38.0, sass@^1.63.4: - version "1.77.8" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.8.tgz#9f18b449ea401759ef7ec1752a16373e296b52bd" - integrity sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ== + version "1.81.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.81.0.tgz#a9010c0599867909dfdbad057e4a6fbdd5eec941" + integrity sha512-Q4fOxRfhmv3sqCLoGfvrC9pRV8btc0UtqL9mN6Yrv6Qi9ScL55CVH1vlPP863ISLEEMNLLuu9P+enCeGHlnzhA== dependencies: - chokidar ">=3.0.0 <4.0.0" - immutable "^4.0.0" + chokidar "^4.0.0" + immutable "^5.0.2" source-map-js ">=0.6.2 <2.0.0" + optionalDependencies: + "@parcel/watcher" "^2.4.1" sax@~1.2.4: version "1.2.4" @@ -7046,10 +7146,10 @@ semver@^7.3.2, semver@^7.3.5, semver@^7.5.4: resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== -send@0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" - integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== +send@0.19.0: + version "0.19.0" + resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8" + integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw== dependencies: debug "2.6.9" depd "2.0.0" @@ -7092,15 +7192,15 @@ serve-index@^1.9.1: mime-types "~2.1.17" parseurl "~1.3.2" -serve-static@1.15.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" - integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== +serve-static@1.16.2: + version "1.16.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296" + integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw== dependencies: - encodeurl "~1.0.2" + encodeurl "~2.0.0" escape-html "~1.0.3" parseurl "~1.3.3" - send "0.18.0" + send "0.19.0" set-blocking@^2.0.0: version "2.0.0" @@ -7119,7 +7219,7 @@ set-function-length@^1.2.1: gopd "^1.0.1" has-property-descriptors "^1.0.2" -set-function-name@^2.0.1: +set-function-name@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985" integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ== @@ -7194,9 +7294,9 @@ shebang-regex@^3.0.0: integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== shell-quote@^1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" - integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== + version "1.8.2" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.2.tgz#d2d83e057959d53ec261311e9e9b8f51dcb2934a" + integrity sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA== side-channel@^1.0.4, side-channel@^1.0.6: version "1.0.6" @@ -7276,10 +7376,10 @@ source-list-map@^2.0.0: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" - integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" + integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== source-map-resolve@^0.5.0: version "0.5.3" @@ -7482,13 +7582,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-comments@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b" @@ -7623,20 +7716,15 @@ terser@^4.1.2: source-map-support "~0.5.12" terser@^5.3.4: - version "5.31.6" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.31.6.tgz#c63858a0f0703988d0266a82fcbf2d7ba76422b1" - integrity sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg== + version "5.36.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.36.0.tgz#8b0dbed459ac40ff7b4c9fd5a3a2029de105180e" + integrity sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" commander "^2.20.0" source-map-support "~0.5.20" -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== - through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -7667,11 +7755,6 @@ to-arraybuffer@^1.0.0: resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" integrity sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA== -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== - to-object-path@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" @@ -7710,9 +7793,9 @@ toidentifier@1.0.1: integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== ts-api-utils@^1.0.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1" - integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ== + version "1.4.3" + resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.4.3.tgz#bfc2215fe6528fecab2b0fba570a2e8a4263b064" + integrity sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw== ts-pnp@^1.1.6: version "1.2.0" @@ -7765,9 +7848,9 @@ typed-array-byte-length@^1.0.1: is-typed-array "^1.1.13" typed-array-byte-offset@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063" - integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA== + version "1.0.3" + resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.3.tgz#3fa9f22567700cc86aaf86a1e7176f74b59600f2" + integrity sha512-GsvTyUHTriq6o/bHcTd0vM7OQ9JEdlvluu9YISaA7+KzDzPaIzEeDFNkTfhdE3MYcNhNi0vq/LlegYgIs5yPAw== dependencies: available-typed-arrays "^1.0.7" call-bind "^1.0.7" @@ -7775,18 +7858,19 @@ typed-array-byte-offset@^1.0.2: gopd "^1.0.1" has-proto "^1.0.3" is-typed-array "^1.1.13" + reflect.getprototypeof "^1.0.6" typed-array-length@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.6.tgz#57155207c76e64a3457482dfdc1c9d1d3c4c73a3" - integrity sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g== + version "1.0.7" + resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.7.tgz#ee4deff984b64be1e118b0de8c9c877d5ce73d3d" + integrity sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg== dependencies: call-bind "^1.0.7" for-each "^0.3.3" gopd "^1.0.1" - has-proto "^1.0.3" is-typed-array "^1.1.13" possible-typed-array-names "^1.0.0" + reflect.getprototypeof "^1.0.6" typedarray@^0.0.6: version "0.0.6" @@ -7803,15 +7887,15 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" -undici-types@~6.13.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.13.0.tgz#e3e79220ab8c81ed1496b5812471afd7cf075ea5" - integrity sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg== +undici-types@~6.20.0: + version "6.20.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433" + integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg== unicode-canonical-property-names-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" - integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ== + version "2.0.1" + resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz#cb3173fe47ca743e228216e4a3ddc4c84d628cc2" + integrity sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg== unicode-match-property-ecmascript@^2.0.0: version "2.0.0" @@ -7822,9 +7906,9 @@ unicode-match-property-ecmascript@^2.0.0: unicode-property-aliases-ecmascript "^2.0.0" unicode-match-property-value-ecmascript@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0" - integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz#a0401aee72714598f739b68b104e4fe3a0cb3c71" + integrity sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg== unicode-property-aliases-ecmascript@^2.0.0: version "2.1.0" @@ -7888,13 +7972,13 @@ upath@^1.1.1: resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== -update-browserslist-db@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e" - integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ== +update-browserslist-db@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5" + integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A== dependencies: - escalade "^3.1.2" - picocolors "^1.0.1" + escalade "^3.2.0" + picocolors "^1.1.0" uri-js@^4.2.2: version "4.4.1" @@ -8181,15 +8265,44 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" +which-builtin-type@^1.1.4: + version "1.2.0" + resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.2.0.tgz#58042ac9602d78a6d117c7e811349df1268ba63c" + integrity sha512-I+qLGQ/vucCby4tf5HsLmGueEla4ZhwTBSqaooS+Y0BuxN4Cp+okmGuV+8mXZ84KDI9BA+oklo+RzKg0ONdSUA== + dependencies: + call-bind "^1.0.7" + function.prototype.name "^1.1.6" + has-tostringtag "^1.0.2" + is-async-function "^2.0.0" + is-date-object "^1.0.5" + is-finalizationregistry "^1.1.0" + is-generator-function "^1.0.10" + is-regex "^1.1.4" + is-weakref "^1.0.2" + isarray "^2.0.5" + which-boxed-primitive "^1.0.2" + which-collection "^1.0.2" + which-typed-array "^1.1.15" + +which-collection@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0" + integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw== + dependencies: + is-map "^2.0.3" + is-set "^2.0.3" + is-weakmap "^2.0.2" + is-weakset "^2.0.3" + which-module@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409" integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ== which-typed-array@^1.1.14, which-typed-array@^1.1.15: - version "1.1.15" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d" - integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA== + version "1.1.16" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.16.tgz#db4db429c4706feca2f01677a144278e4a8c216b" + integrity sha512-g+N+GAWiRj66DngFwHvISJd+ITsyphZvD1vChfVg6cEdnzy53GzB3oy0fUNlvhz7H7+MiqhYr26qxQShCpKTTQ== dependencies: available-typed-arrays "^1.0.7" call-bind "^1.0.7"