From 0c841de5b5500eec8938075366c4f9240a666961 Mon Sep 17 00:00:00 2001 From: Splines <37160523+Splines@users.noreply.github.com> Date: Sat, 1 Jun 2024 15:20:35 +0200 Subject: [PATCH 01/17] Don't just mount `spec` folder, but complete `app` folder for tests (#648) * Don't just mount `spec` folder, but complete `app` folder for tests This is to ensure that local changes in the `app` folder are reflected in the Docker container such that newly written tests can be run through without having to rebuild the whole Docker image. * Exclude `public/` folder from mount Also see: https://stackoverflow.com/a/56361190/ * Copy everything to `usr/src/app` for precompiling to work & fix `public/` folder mount Also see https://stackoverflow.com/a/37898591/ --- docker/test/Dockerfile | 3 ++- docker/test/docker-compose.yml | 10 +++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile index 74cdc9b38..470e065f5 100644 --- a/docker/test/Dockerfile +++ b/docker/test/Dockerfile @@ -58,6 +58,7 @@ RUN apt update && \ RUN sed -i '/disable ghostscript format types/,+6d' /etc/ImageMagick-6/policy.xml WORKDIR /usr/src/app +ENTRYPOINT ["./entrypoint.sh"] COPY ./Gemfile ./Gemfile.lock ./yarn.lock ./package.json /usr/src/app/ RUN bundle install @@ -66,7 +67,7 @@ RUN yarn install --production=false COPY --from=build-pdfcomprezzor /go/src/pdfcomprezzor.wasm /go/src/wasm_exec.js /usr/src/app/public/pdfcomprezzor/ COPY --from=build-pdfcomprezzor /go/src/pdfcomprezzor.wasm /go/src/wasm_exec.js / -COPY . /usr/src/app/ +COPY . /usr/src/app COPY ./docker/production/docker.env ./docker-dummy.env RUN set -o allexport && . ./docker-dummy.env && set +o allexport && \ diff --git a/docker/test/docker-compose.yml b/docker/test/docker-compose.yml index f8b21e7eb..eac665df1 100644 --- a/docker/test/docker-compose.yml +++ b/docker/test/docker-compose.yml @@ -37,9 +37,6 @@ services: context: ./../.. dockerfile: docker/test/Dockerfile image: mampf:tests - # TODO: Use this - # entrypoint: /usr/src/app/docker/test/run_tests.sh - entrypoint: /usr/src/app/entrypoint.sh environment: RAILS_ENV: test TEST_DATABASE_ADAPTER: postgresql @@ -68,10 +65,9 @@ services: SPROCKETS_CACHE: /cache BLOG: https://mampf.blog volumes: - - type: bind - source: ../../spec/ - target: /usr/src/app/spec/ - - ../../coverage:/usr/src/app/coverage + - ../../:/usr/src/app/ + - ../../coverage:/usr/src/app/coverage/ + - "/usr/src/app/public/" depends_on: - db - solr From ed867fb2c084de24ce50e2b06373b5296b269359 Mon Sep 17 00:00:00 2001 From: Splines <37160523+Splines@users.noreply.github.com> Date: Wed, 5 Jun 2024 20:09:18 +0200 Subject: [PATCH 02/17] Make watchlist test cases a bit more robust (#650) --- spec/models/watchlist_entry_spec.rb | 10 ++++++---- spec/models/watchlist_spec.rb | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/spec/models/watchlist_entry_spec.rb b/spec/models/watchlist_entry_spec.rb index 4e938f777..f76eacda4 100644 --- a/spec/models/watchlist_entry_spec.rb +++ b/spec/models/watchlist_entry_spec.rb @@ -7,14 +7,16 @@ it "must have a medium" do entry = FactoryBot.build(:watchlist_entry, :with_watchlist) - entry.valid? - expect(entry.errors[:medium]).to include("muss ausgefüllt werden") + expect(entry).not_to be_valid + expect(entry.errors).to have_key(:medium) + expect(entry.errors).not_to have_key(:watchlist) end it "must have a watchlist" do entry = FactoryBot.build(:watchlist_entry, :with_medium) - entry.valid? - expect(entry.errors[:watchlist]).to include("muss ausgefüllt werden") + expect(entry).not_to be_valid + expect(entry.errors).to have_key(:watchlist) + expect(entry.errors).not_to have_key(:medium) end it "can only be once inside a watchlist" do diff --git a/spec/models/watchlist_spec.rb b/spec/models/watchlist_spec.rb index 5c511bf37..1432eccc2 100644 --- a/spec/models/watchlist_spec.rb +++ b/spec/models/watchlist_spec.rb @@ -7,8 +7,8 @@ it "must have a name" do watchlist = Watchlist.new(name: nil) - watchlist.valid? - expect(watchlist.errors[:name]).to include("muss ausgefüllt werden") + expect(watchlist).not_to be_valid + expect(watchlist.errors).to have_key(:name) end it "must have a unique name" do From 6bde35d606cf982fd72d4934db2d222c50915de2 Mon Sep 17 00:00:00 2001 From: Splines <37160523+Splines@users.noreply.github.com> Date: Tue, 2 Jul 2024 23:50:24 +0200 Subject: [PATCH 03/17] Get Cypress up and running again (with docker and interactive testing) (#652) * Setup X11 Cypress GUI forwarding Also see my StackOverflow question: https://stackoverflow.com/q/78639075 * Delete unnecessary Cypress sample files * Simplify Cypress config setup * Use internal docker host port * Delete old cypress helper * Remove e2e configuration * Fix wrong network assignment in Docker * Add cypress ESLint plugin back * Copy up-to-date on-rails commands from GitHub See this file: https://github.com/shakacode/cypress-on-rails/blob/master/lib/generators/cypress_on_rails/templates/spec/cypress/support/on-rails.js * Init dummy submission cypress test * Clean up comments in cypress-interactive Dockerfile * Outsource cypress docker setup in separate file * Remove `run_tests.sh` file * Add `createUserAndLogin` cypress command Also updated the cypress user emails and passwords. * Name cypress users more creatively * Add own Cypress FactoryBot implementation * Move cypress controller to subfolder * Remove cypress-on-rails dependency Note that at this point, some cypress commands don't work yet. * Outsource js error parsing logic to its own file * Add database cleaner and user creator for cypress * Fix RuboCop errors and improve documentation * Remove unnecessary `Cypress::` specifier * Remove unnecessary `index.js` file * Improve documentation for FactoryBot * Start Cypress UI automatically with open browser * Add Cypress tests to GitHub Actions CI/CD * Pass ./cypress.yml file to docker & split lines * Disable existing cypress tests for now will bring them back in a subsequent PR * Rename submissions spec * Rename cypress route subjects * Don't clear entrypoint for cypress tests * Execute "cypress run" in entrypoint * Rename archived tests and exclude them from ESLint * Temporarily disable docker compose cache * Disable old migrations stemming from globalize gem Along side this, the schema was automatically updated and got rid of old translation tables originally created by the globalize gem. They were still in here as remnant of #609. * Add back docker compose cache to cypress workflow * Revert "Disable old migrations stemming from globalize gem" This reverts commit 88f369e7194ba07cc7c1c0a6d44b3b73bec28834. * Use `db:schema:load` instead of `db:migrate` See https://github.com/rails/rails/blob/d43ee2088118425e493766aeb20575e9ce7159d1/actionmailbox/test/dummy/db/schema.rb#L5-L9 We also abort the script if it is called from the production environment. It's only intended for usage in the dev/test environment. For production, we have the respective master and worker entrypoints. * Wait for MaMpf before opening cypress UI --- .config/.cypress.js | 6 + .config/eslint.mjs | 19 +- .github/workflows/tests.yml | 36 ++++ Gemfile | 1 - Gemfile.lock | 3 - TESTING.md | 2 +- app/controllers/cypress/cypress_controller.rb | 24 +++ .../cypress/database_cleaner_controller.rb | 10 ++ .../cypress/factories_controller.rb | 36 ++++ .../cypress/user_creator_controller.rb | 22 +++ config/initializers/cypress_on_rails.rb | 11 -- config/routes.rb | 8 + docker/test/Dockerfile_cypress | 5 +- docker/test/cypress-interactive.yml | 17 ++ docker/test/cypress.yml | 25 +++ docker/test/docker-compose.local.yml | 90 ---------- docker/test/docker-compose.yml | 3 + docker/test/run_tests.sh | 11 -- initialize.sh | 17 +- package.json | 1 + spec/cypress.config.js | 13 -- .../app_commands/activerecord_fixtures.rb | 25 --- spec/cypress/app_commands/clean.rb | 10 -- spec/cypress/app_commands/eval.rb | 1 - spec/cypress/app_commands/factory_bot.rb | 14 -- spec/cypress/app_commands/log_fail.rb | 29 ---- spec/cypress/app_commands/scenarios/admin.rb | 2 - spec/cypress/app_commands/scenarios/editor.rb | 3 - .../app_commands/scenarios/non_admin.rb | 3 - .../cypress/app_commands/scenarios/teacher.rb | 3 - spec/cypress/cypress_helper.rb | 32 ---- ...in_spec.cy.js => admin_spec.cy.archive.js} | 0 ..._spec.cy.js => courses_spec.cy.archive.js} | 0 ...ia_spec.cy.js => media_spec.cy.archive.js} | 0 ...h_spec.cy.js => search_spec.cy.archive.js} | 0 .../e2e/submissions_spec.cy.archive.js | 153 +++++++++++++++++ spec/cypress/e2e/submissions_spec.cy.js | 162 ++---------------- ...spec.cy.js => thredded_spec.cy.archive.js} | 0 ...pec.cy.js => tutorials_spec.cy.archive.js} | 0 ...ec.cy.js => watchlists_spec.cy.archive.js} | 0 spec/cypress/fixtures/example.json | 5 - spec/cypress/plugins/index.js | 21 --- spec/cypress/support/backend_caller.js | 31 ++++ spec/cypress/support/commands.js | 58 ++++--- spec/cypress/support/e2e.js | 1 - spec/cypress/support/factorybot.js | 22 +++ spec/cypress/support/index.js | 21 --- spec/cypress/support/on-rails.js | 59 ------- yarn.lock | 19 ++ 49 files changed, 491 insertions(+), 543 deletions(-) create mode 100644 .config/.cypress.js create mode 100644 app/controllers/cypress/cypress_controller.rb create mode 100644 app/controllers/cypress/database_cleaner_controller.rb create mode 100644 app/controllers/cypress/factories_controller.rb create mode 100644 app/controllers/cypress/user_creator_controller.rb delete mode 100644 config/initializers/cypress_on_rails.rb create mode 100644 docker/test/cypress-interactive.yml create mode 100644 docker/test/cypress.yml delete mode 100644 docker/test/docker-compose.local.yml delete mode 100755 docker/test/run_tests.sh delete mode 100644 spec/cypress.config.js delete mode 100644 spec/cypress/app_commands/activerecord_fixtures.rb delete mode 100644 spec/cypress/app_commands/clean.rb delete mode 100644 spec/cypress/app_commands/eval.rb delete mode 100644 spec/cypress/app_commands/factory_bot.rb delete mode 100644 spec/cypress/app_commands/log_fail.rb delete mode 100644 spec/cypress/app_commands/scenarios/admin.rb delete mode 100644 spec/cypress/app_commands/scenarios/editor.rb delete mode 100644 spec/cypress/app_commands/scenarios/non_admin.rb delete mode 100644 spec/cypress/app_commands/scenarios/teacher.rb delete mode 100644 spec/cypress/cypress_helper.rb rename spec/cypress/e2e/{admin_spec.cy.js => admin_spec.cy.archive.js} (100%) rename spec/cypress/e2e/{courses_spec.cy.js => courses_spec.cy.archive.js} (100%) rename spec/cypress/e2e/{media_spec.cy.js => media_spec.cy.archive.js} (100%) rename spec/cypress/e2e/{search_spec.cy.js => search_spec.cy.archive.js} (100%) create mode 100644 spec/cypress/e2e/submissions_spec.cy.archive.js rename spec/cypress/e2e/{thredded_spec.cy.js => thredded_spec.cy.archive.js} (100%) rename spec/cypress/e2e/{tutorials_spec.cy.js => tutorials_spec.cy.archive.js} (100%) rename spec/cypress/e2e/{watchlists_spec.cy.js => watchlists_spec.cy.archive.js} (100%) delete mode 100644 spec/cypress/fixtures/example.json delete mode 100644 spec/cypress/plugins/index.js create mode 100644 spec/cypress/support/backend_caller.js create mode 100644 spec/cypress/support/factorybot.js delete mode 100644 spec/cypress/support/index.js delete mode 100644 spec/cypress/support/on-rails.js diff --git a/.config/.cypress.js b/.config/.cypress.js new file mode 100644 index 000000000..cfc19cc0d --- /dev/null +++ b/.config/.cypress.js @@ -0,0 +1,6 @@ +module.exports = { + e2e: { + // Add configuration here + // Base URL is set via Docker environment variable + }, +}; diff --git a/.config/eslint.mjs b/.config/eslint.mjs index 008e58374..6c611016c 100644 --- a/.config/eslint.mjs +++ b/.config/eslint.mjs @@ -11,6 +11,7 @@ import js from "@eslint/js"; import stylistic from "@stylistic/eslint-plugin"; import erb from "eslint-plugin-erb"; +import pluginCypress from "eslint-plugin-cypress/flat"; import globals from "globals"; const ignoreFilesWithSprocketRequireSyntax = [ @@ -22,6 +23,17 @@ const ignoreFilesWithSprocketRequireSyntax = [ "vendor/assets/javascripts/thredded_timeago.js", ]; +const ignoreCypressArchivedTests = [ + "spec/cypress/e2e/admin_spec.cy.archive.js", + "spec/cypress/e2e/courses_spec.cy.archive.js", + "spec/cypress/e2e/media_spec.cy.archive.js", + "spec/cypress/e2e/search_spec.cy.archive.js", + "spec/cypress/e2e/submissions_spec.cy.archive.js", + "spec/cypress/e2e/thredded_spec.cy.archive.js", + "spec/cypress/e2e/tutorials_spec.cy.archive.js", + "spec/cypress/e2e/watchlists_spec.cy.archive.js", +]; + const customGlobals = { TomSelect: "readable", bootstrap: "readable", @@ -89,14 +101,11 @@ const customGlobals = { renderMathInElement: "readable", }; -// We don't have cypress linting yet, as the Cypress ESLint plugin -// doesn't support the new flat config yet -// https://github.com/cypress-io/eslint-plugin-cypress/issues/146 - export default [ js.configs.recommended, // Allow linting of ERB files, see https://github.com/Splines/eslint-plugin-erb erb.configs.recommended, + pluginCypress.configs.recommended, // Globally ignore the following paths { ignores: [ @@ -107,8 +116,8 @@ export default [ "public/packs-test/", "public/uploads/", "public/pdfcomprezzor/", - "spec/cypress/", ...ignoreFilesWithSprocketRequireSyntax, + ...ignoreCypressArchivedTests, ], }, { diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index db47d5027..87bb2ec24 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -60,3 +60,39 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} verbose: true codecov_yml_path: ./config/codecov.yml + + # Cypress end-to-end tests + e2e-tests: + name: e2e (Cypress) + environment: testing + runs-on: ubuntu-latest + permissions: write-all + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Setup Docker Buildx + uses: docker/setup-buildx-action@v3 + + # see https://github.com/orgs/MaMpf-HD/packages?repo_name=mampf + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build docker images + # As the docker-compose.yml file uses contexts like "./../..", we have + # to change the working directory here. + working-directory: docker/test + run: > + docker buildx bake -f ./docker-compose.yml -f ./cypress.yml + -f ./../../.github/workflows/docker-compose-cache.json + + - name: Run Cypress tests + working-directory: docker/test + # "cypress run" is defined in the cypress.yml entrypoint + run: docker compose -f ./docker-compose.yml -f ./cypress.yml run cypress diff --git a/Gemfile b/Gemfile index 81419a97c..88a53f4e6 100644 --- a/Gemfile +++ b/Gemfile @@ -136,7 +136,6 @@ group :test, :development, :docker_development do gem "factory_bot_rails" gem "rspec-rails" - gem "cypress-on-rails", "~> 1.0" gem "simplecov-cobertura" gem "rspec-github" diff --git a/Gemfile.lock b/Gemfile.lock index 87e30b105..2c50d5a08 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -211,8 +211,6 @@ GEM crass (1.0.6) css_parser (1.17.1) addressable - cypress-on-rails (1.17.0) - rack dalli (3.2.8) database_cleaner-active_record (2.1.0) activerecord (>= 5.a) @@ -690,7 +688,6 @@ DEPENDENCIES coffee-rails (~> 5.0.0) commontator coveralls - cypress-on-rails (~> 1.0) dalli (>= 2.7) database_cleaner-active_record devise diff --git a/TESTING.md b/TESTING.md index e45526234..4179a8019 100644 --- a/TESTING.md +++ b/TESTING.md @@ -18,7 +18,7 @@ Furthermore, you can setup special scenarios by providing a file in `spec/cypres that can be called by `cy.appScenario("setup")` for example. Always try to create as much as you can in the scenario and then test the interaction! -For more information visit [cypress-documentation](https://docs.cypress.io) and the used gem [cypress-on-rails](https://github.com/shakacode/cypress-on-rails) +For more information visit [cypress-documentation](https://docs.cypress.io). # Testing rspec diff --git a/app/controllers/cypress/cypress_controller.rb b/app/controllers/cypress/cypress_controller.rb new file mode 100644 index 000000000..3e043ba15 --- /dev/null +++ b/app/controllers/cypress/cypress_controller.rb @@ -0,0 +1,24 @@ +module Cypress + # Handles Cypress requests for interactive UI testing. + # + # The main purpose of this class is to send back errors as JSON object + # to parse them in the Cypress test UI. This way, we can display the error + # message and the stacktrace in the Cypress test. + class CypressController < ApplicationController + respond_to :json + rescue_from Exception, with: :show_errors + skip_before_action :authenticate_user! + + private + + # Returns the error as JSON such that it can be displayed in the Cypress test. + def show_errors(exception) + error = { + error: "#{exception.class}: #{exception}", + stacktrace: exception.backtrace.join("\n") + } + + render json: error, status: :bad_request + end + end +end diff --git a/app/controllers/cypress/database_cleaner_controller.rb b/app/controllers/cypress/database_cleaner_controller.rb new file mode 100644 index 000000000..21748c015 --- /dev/null +++ b/app/controllers/cypress/database_cleaner_controller.rb @@ -0,0 +1,10 @@ +module Cypress + # Cleans the database for use in Cypress tests. + class DatabaseCleanerController < CypressController + def create + res = DatabaseCleaner.clean_with(:truncation) + + render json: res.to_json, status: :created + end + end +end diff --git a/app/controllers/cypress/factories_controller.rb b/app/controllers/cypress/factories_controller.rb new file mode 100644 index 000000000..db0677755 --- /dev/null +++ b/app/controllers/cypress/factories_controller.rb @@ -0,0 +1,36 @@ +module Cypress + # Handles Cypress requests to create factories via FactoryBot. + # See the factorybot.js file in the Cypress support folder. + # + # 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. + 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 + + attributes = params_to_attributes(params.except(:controller, :action, :number)) + res = FactoryBot.create(*attributes) + + render json: res.to_json, status: :created + end + + private + + def params_to_attributes(params) + params.to_unsafe_hash.map do |_key, value| + if value.is_a?(Hash) + value.transform_keys(&:to_sym) + elsif value.is_a?(String) + value.to_sym + else + throw("Value is neither a hash nor a string: #{value}") + end + end + end + end +end diff --git a/app/controllers/cypress/user_creator_controller.rb b/app/controllers/cypress/user_creator_controller.rb new file mode 100644 index 000000000..f82b4dd18 --- /dev/null +++ b/app/controllers/cypress/user_creator_controller.rb @@ -0,0 +1,22 @@ +module Cypress + # Creates a user for use in Cypress tests. + class UserCreatorController < CypressController + def create + unless params[:role].is_a?(String) + msg = "First argument must be a string indicating the user role." + msg += " But we got: '#{params["0"]}'" + raise(ArgumentError, msg) + end + + role = params[:role] + is_admin = (role == "admin") + + user = User.create(name: "#{role} Cypress", email: "#{role}@mampf.cypress", + password: "cypress123", consents: true, admin: is_admin, + locale: I18n.default_locale) + user.confirm + + render json: user.to_json, status: :created + end + end +end diff --git a/config/initializers/cypress_on_rails.rb b/config/initializers/cypress_on_rails.rb deleted file mode 100644 index a9839d66b..000000000 --- a/config/initializers/cypress_on_rails.rb +++ /dev/null @@ -1,11 +0,0 @@ -if defined?(CypressOnRails) - CypressOnRails.configure do |c| - c.install_folder = File.expand_path("#{__dir__}/../../spec/cypress") - - # WARNING!! CypressOnRails can execute arbitrary ruby code - # please use with extra caution if enabling on hosted servers - # or starting your local server on 0.0.0.0 - c.use_middleware = Rails.env.test? - c.logger = Rails.logger - end -end diff --git a/config/routes.rb b/config/routes.rb index cb0b1c763..33f2dac29 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,6 +8,14 @@ mount Sidekiq::Web => "/sidekiq" end + if Rails.env.test? + namespace :cypress do + resources :factories, only: :create + resources :database_cleaner, only: :create + resources :user_creator, only: :create + end + end + # mount commontator engine mount Commontator::Engine => "/commontator" diff --git a/docker/test/Dockerfile_cypress b/docker/test/Dockerfile_cypress index 684b8e9d3..62ac8cefe 100644 --- a/docker/test/Dockerfile_cypress +++ b/docker/test/Dockerfile_cypress @@ -1,5 +1,4 @@ -FROM cypress/included:12.9.0 +FROM cypress/included:13.11.0 -COPY ./spec/cypress/support /cypress/support -# install the needed support stuff +# Install curl RUN apt-get update && apt-get install curl -y diff --git a/docker/test/cypress-interactive.yml b/docker/test/cypress-interactive.yml new file mode 100644 index 000000000..b4ce01f59 --- /dev/null +++ b/docker/test/cypress-interactive.yml @@ -0,0 +1,17 @@ +# Instructions for interactive mode +# https://www.cypress.io/blog/2019/05/02/run-cypress-with-a-single-docker-command#Interactive-mode +services: + cypress: + # https://on.cypress.io/command-line#cypress-open + entrypoint: > + bash -c "while ! curl -s $$CYPRESS_baseUrl > /dev/null; + do echo waiting for MaMpf to come online at $$CYPRESS_baseUrl; + sleep 1; done; + cypress open --project /mampf-tests/ --e2e --browser chrome" + environment: + # for X11/Wayland in WSLg + - DISPLAY + volumes: + # for Cypress to communicate with the X11 server pass this socket file + # in addition to any other mapped volumes + - /tmp/.X11-unix:/tmp/.X11-unix diff --git a/docker/test/cypress.yml b/docker/test/cypress.yml new file mode 100644 index 000000000..6e25fca67 --- /dev/null +++ b/docker/test/cypress.yml @@ -0,0 +1,25 @@ +services: + cypress: + depends_on: + - mampf + build: + context: ./../.. + dockerfile: docker/test/Dockerfile_cypress + environment: + CYPRESS_baseUrl: http://mampf:3000 + entrypoint: > + bash -c "while ! curl -s $$CYPRESS_baseUrl > /dev/null; + do echo waiting for MaMpf to come online at $$CYPRESS_baseUrl; + sleep 1; done; + RAILS_ENV=test cypress run --project /mampf-tests/ --e2e --browser chrome" + volumes: + - ../../.config/.cypress.js:/mampf-tests/cypress.config.js:ro + - ../../spec/cypress/e2e/:/mampf-tests/cypress/e2e/:ro + - ../../spec/cypress/support/:/mampf-tests/cypress/support/:ro + - ../../spec/cypress/fixtures/:/mampf-tests/cypress/fixtures/:ro + # Cypress video/screenshot output (only necessary locally) + - ../../cypress/videos/:/mampf-tests/cypress/videos/ + - ../../cypress/screenshots/:/mampf-tests/cypress/screenshots/ + networks: + - frontend + - backend diff --git a/docker/test/docker-compose.local.yml b/docker/test/docker-compose.local.yml deleted file mode 100644 index a4affb2be..000000000 --- a/docker/test/docker-compose.local.yml +++ /dev/null @@ -1,90 +0,0 @@ -services: - redis: - image: "redis:alpine" - - solr: - image: "solr:8.11.1" - ports: - - "127.0.0.1:8983:8983" - volumes: - - type: bind - source: ../../solr/development/conf/ - target: /solrconfig/ - read_only: true - command: ["solr-precreate", "test", "/solrconfig"] - - db: - image: postgres - environment: - - POSTGRES_USER=mampf - - POSTGRES_HOST_AUTH_METHOD=trust - - mailcatcher: - restart: on-failure:10 - image: dockage/mailcatcher:latest - ports: - - "127.0.0.1:1080:1080" - - mampf: - build: - context: ./../.. - dockerfile: docker/test/Dockerfile - image: mampf:tests - ports: - - "127.0.0.1:3000:3000" - # TODO: Use this - # entrypoint: /usr/src/app/docker/test/run_tests.sh - entrypoint: ./entrypoint.sh - environment: - RAILS_ENV: test - TEST_DATABASE_ADAPTER: postgresql - TEST_DATABASE_DATABASE: mampf - TEST_DATABASE_INTERACTIONS: interactions - TEST_DATABASE_USERNAME: mampf - TEST_DATABASE_HOST: db - TEST_DATABASE_PORT: 5432 - MAILSERVER: mailcatcher - FROM_ADDRESS: development@localhost - URL_HOST: mampf - URL_HOST_SHORT: mampf - SECRET_KEY_BASE: testenvironment - ERDBEERE_SERVER: https://erdbeere.mathi.uni-heidelberg.de - ERDBEERE_API: https://erdbeere.mathi.uni-heidelberg.de/api/v1 - MUESLI_SERVER: https://muesli.mathi.uni-heidelberg.de - PROJECT_EMAIL: project@localhost - FEEDBACK_EMAIL: feedback@localhost - PROJECT_NOTIFICATION_EMAIL: project+notification@localhost - MEDIA_FOLDER: mampf - REDIS_URL: redis://redis:6379/1 - SOLR_HOST: solr - SOLR_PORT: 8983 - SOLR_PATH: /solr/test - SPROCKETS_CACHE: /cache - volumes: - - type: bind - source: ../../spec/ - target: /usr/src/app/spec/ - depends_on: - - db - - solr - - redis - - mailcatcher - - cypress_runner: - image: mampf-cypress - build: - context: ./../.. - dockerfile: docker/test/Dockerfile_cypress - environment: - CYPRESS_baseUrl: http://mampf:3000 - entrypoint: bash -c "while ! curl -s $$CYPRESS_baseUrl > /dev/null; do echo waiting for MaMpf to come online at $$CYPRESS_baseUrl; sleep 1; done; npx cypress run $$@" - volumes: - - ../../spec/cypress/e2e:/cypress/e2e:ro - - ../../spec/cypress/fixtures:/cypress/fixtures:ro - - ../../spec/cypress.config.js:/cypress.config.js:ro - - ../../.git:/.git:ro - # cypress outputs are saved here (needed only locally) - - ../../cypress/videos:/cypress/videos - - ../../cypress/screenshots:/cypress/screenshots - depends_on: - - mampf diff --git a/docker/test/docker-compose.yml b/docker/test/docker-compose.yml index eac665df1..34916abd1 100644 --- a/docker/test/docker-compose.yml +++ b/docker/test/docker-compose.yml @@ -37,6 +37,8 @@ services: context: ./../.. dockerfile: docker/test/Dockerfile image: mampf:tests + ports: + - "3000:3000" environment: RAILS_ENV: test TEST_DATABASE_ADAPTER: postgresql @@ -76,3 +78,4 @@ services: networks: - backend - frontend + \ No newline at end of file diff --git a/docker/test/run_tests.sh b/docker/test/run_tests.sh deleted file mode 100755 index 8edb321e7..000000000 --- a/docker/test/run_tests.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -cd /usr/src/app - -./initialize.sh &> >(tee -a /usr/src/app/log/initialisation.log) - -rm -f tmp/pids/server.pid -bin/rails server -e test -p 3000 - -# in separate window start cypress -yarn cypress open --project ./specs diff --git a/initialize.sh b/initialize.sh index e47cdab0b..75e8588f2 100755 --- a/initialize.sh +++ b/initialize.sh @@ -10,7 +10,7 @@ check_for_preseeds() { done rails db:restore pattern=$(echo $latest | rev | cut -d "/" -f1 | rev | cut -d "_" -f1) rails db:create:interactions - rails db:migrate + rails db:schema:load fi if [[ "${UPLOADS_PRESEED_URL}" ]]; then echo "Found Upload Preseed with URL: $UPLOAD_PRESEED_URL" @@ -20,6 +20,12 @@ check_for_preseeds() { fi } +if [ "$RAILS_ENV" = "production" ] +then + echo "This script is not intended for usage with RAILs_ENV=production. Aborting." + exit 1 +fi + echo Waiting for redis to come online wait-for-it redis:6379 -t 30 || exit 1 if ! [ -f /completed_initial_run ] @@ -41,13 +47,8 @@ then bundle exec rails db:create:interactions bundle exec rails db:create fi - echo running: bundle exec rails db:migrate - bundle exec rails db:migrate - if [ "$RAILS_ENV" = "production" ] - then - echo running: bundle exec rails assets:precompile - bundle exec rails assets:precompile - fi + echo running: bundle exec rails db:schema:load + bundle exec rails db:schema:load echo Waiting for SOLR to come online wait-for-it ${SOLR_HOST}:${SOLR_PORT} -t 30 || exit 1 bundle exec rake sunspot:solr:reindex & diff --git a/package.json b/package.json index 9110e2ed6..e426ab660 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "devDependencies": { "@stylistic/eslint-plugin": "^1.8.0", "eslint": "^9.1.1", + "eslint-plugin-cypress": "^3.3.0", "eslint-plugin-erb": "^2.0.0", "globals": "^15.1.0" } diff --git a/spec/cypress.config.js b/spec/cypress.config.js deleted file mode 100644 index e289330b7..000000000 --- a/spec/cypress.config.js +++ /dev/null @@ -1,13 +0,0 @@ -const { defineConfig } = require("cypress"); - -module.exports = defineConfig({ - e2e: { - baseUrl: "http://localhost:3000", - defaultCommandTimeout: 10000, - projectId: "v45wg9", - retries: { - runMode: 2, - openMode: 0, - }, - }, -}); diff --git a/spec/cypress/app_commands/activerecord_fixtures.rb b/spec/cypress/app_commands/activerecord_fixtures.rb deleted file mode 100644 index 881319b7a..000000000 --- a/spec/cypress/app_commands/activerecord_fixtures.rb +++ /dev/null @@ -1,25 +0,0 @@ -# you can delete this file if you don't use Rails Test Fixtures - -fixtures_dir = command_options.try(:[], "fixtures_dir") -fixture_files = command_options.try(:[], "fixtures") - -if defined?(ActiveRecord) - require "active_record/fixtures" - - fixtures_dir ||= ActiveRecord::Tasks::DatabaseTasks.fixtures_path - fixture_files ||= Dir["#{fixtures_dir}/**/*.yml"] - .pluck((fixtures_dir.size + 1)..-5) - - logger.debug("loading fixtures: { dir: #{fixtures_dir}, " \ - "files: #{fixture_files} }") - ActiveRecord::FixtureSet.reset_cache - ActiveRecord::FixtureSet.create_fixtures(fixtures_dir, fixture_files) - "Fixtures Done" # this gets returned -else # this else part can be removed - logger.error("Looks like activerecord_fixtures has to be modified to suite " \ - "your need") - Post.create(title: "MyCypressFixtures") - Post.create(title: "MyCypressFixtures2") - Post.create(title: "MyRailsFixtures") - Post.create(title: "MyRailsFixtures2") -end diff --git a/spec/cypress/app_commands/clean.rb b/spec/cypress/app_commands/clean.rb deleted file mode 100644 index 798ca3338..000000000 --- a/spec/cypress/app_commands/clean.rb +++ /dev/null @@ -1,10 +0,0 @@ -if defined?(DatabaseCleaner) - # cleaning the database using database_cleaner - DatabaseCleaner.strategy = :truncation - DatabaseCleaner.clean -else - logger.warn("add database_cleaner or update cypress/app_commands/clean.rb") - Post.delete_all if defined?(Post) -end - -Rails.logger.info("APPCLEANED") # used by log_fail.rb diff --git a/spec/cypress/app_commands/eval.rb b/spec/cypress/app_commands/eval.rb deleted file mode 100644 index 3a39bf3e2..000000000 --- a/spec/cypress/app_commands/eval.rb +++ /dev/null @@ -1 +0,0 @@ -Kernel.eval(command_options) unless command_options.nil? diff --git a/spec/cypress/app_commands/factory_bot.rb b/spec/cypress/app_commands/factory_bot.rb deleted file mode 100644 index 135d955b4..000000000 --- a/spec/cypress/app_commands/factory_bot.rb +++ /dev/null @@ -1,14 +0,0 @@ -require "cypress_on_rails/smart_factory_wrapper" -Array.wrap(command_options).map do |factory_options| - factory_method = factory_options.shift - begin - logger.debug("running #{factory_method}, #{factory_options}") - CypressOnRails::SmartFactoryWrapper.public_send(factory_method, - *factory_options) - rescue StandardError => e - logger.error("#{e.class}: #{e.message}") - logger.error(e.backtrace.join("\n")) - logger.error(e.record.inspect.to_s) if e.is_a?(ActiveRecord::RecordInvalid) - raise(e) - end -end diff --git a/spec/cypress/app_commands/log_fail.rb b/spec/cypress/app_commands/log_fail.rb deleted file mode 100644 index ed25a5927..000000000 --- a/spec/cypress/app_commands/log_fail.rb +++ /dev/null @@ -1,29 +0,0 @@ -# This file is called when a cypress spec fails and allows for extra logging -# to be captured -filename = command_options.fetch("runnable_full_title", "no title") - .gsub(/[^[:print:]]/, "") - -# grab last lines until "APPCLEANED" -# (Make sure in clean.rb to log the text "APPCLEANED") -system "tail -n 10000 -r log/#{Rails.env}.log | " \ - "sed \"/APPCLEANED/ q\" | sed 'x;1!H;$!d;x' > 'log/#{filename}.log'" - -# create a json debug file for server debugging -json_result = {} -json_result["error"] = command_options.fetch("error_message", - "no error message") - -if defined?(ActiveRecord::Base) - json_result["records"] = - ActiveRecord::Base.descendants - .each_with_object({}) do |record_class, records| - records[record_class.to_s] = record_class.limit(100).map(&:attributes) - rescue StandardError # rubocop:todo Lint/SuppressedException - end -end - -filename = command_options.fetch("runnable_full_title", "no title") - .gsub(/[^[:print:]]/, "") -File.open(Rails.root.join("log/#{filename}.json").to_s, "w+") do |file| - file << JSON.pretty_generate(json_result) -end diff --git a/spec/cypress/app_commands/scenarios/admin.rb b/spec/cypress/app_commands/scenarios/admin.rb deleted file mode 100644 index 9505d4dcf..000000000 --- a/spec/cypress/app_commands/scenarios/admin.rb +++ /dev/null @@ -1,2 +0,0 @@ -User.create(name: "Admin", email: "administrator@mampf.edu", - password: "test123456", admin: true, consents: true).confirm diff --git a/spec/cypress/app_commands/scenarios/editor.rb b/spec/cypress/app_commands/scenarios/editor.rb deleted file mode 100644 index f1dbbc3b5..000000000 --- a/spec/cypress/app_commands/scenarios/editor.rb +++ /dev/null @@ -1,3 +0,0 @@ -User.create(name: "Max Mustermann", email: "editor@mampf.edu", - password: "test123456", consents: true, - locale: I18n.default_locale).confirm diff --git a/spec/cypress/app_commands/scenarios/non_admin.rb b/spec/cypress/app_commands/scenarios/non_admin.rb deleted file mode 100644 index 9d76635d4..000000000 --- a/spec/cypress/app_commands/scenarios/non_admin.rb +++ /dev/null @@ -1,3 +0,0 @@ -User.create(name: "Max Mustermann", email: "max@mampf.edu", - password: "test123456", consents: true, - locale: I18n.default_locale).confirm diff --git a/spec/cypress/app_commands/scenarios/teacher.rb b/spec/cypress/app_commands/scenarios/teacher.rb deleted file mode 100644 index d9eb4fd9f..000000000 --- a/spec/cypress/app_commands/scenarios/teacher.rb +++ /dev/null @@ -1,3 +0,0 @@ -User.create(name: "Max Mustermann", email: "teacher@mampf.edu", - password: "test123456", consents: true, - locale: I18n.default_locale).confirm diff --git a/spec/cypress/cypress_helper.rb b/spec/cypress/cypress_helper.rb deleted file mode 100644 index 6e5fc804e..000000000 --- a/spec/cypress/cypress_helper.rb +++ /dev/null @@ -1,32 +0,0 @@ -# This is loaded once before the first command is executed - -begin - require "database_cleaner" -rescue LoadError => e - puts e.message -end - -begin - require "factory_bot_rails" -rescue LoadError => e - puts e.message - begin - require "factory_girl_rails" - rescue LoadError => e - puts e.message - end -end - -require "cypress_on_rails/smart_factory_wrapper" - -factory = CypressOnRails::SimpleRailsFactory -factory = FactoryBot if defined?(FactoryBot) -factory = FactoryGirl if defined?(FactoryGirl) - -CypressOnRails::SmartFactoryWrapper.configure( - always_reload: !Rails.configuration.cache_classes, - factory: factory, - files: [ - Rails.root.join("spec/factories/**/*.rb") - ] -) diff --git a/spec/cypress/e2e/admin_spec.cy.js b/spec/cypress/e2e/admin_spec.cy.archive.js similarity index 100% rename from spec/cypress/e2e/admin_spec.cy.js rename to spec/cypress/e2e/admin_spec.cy.archive.js diff --git a/spec/cypress/e2e/courses_spec.cy.js b/spec/cypress/e2e/courses_spec.cy.archive.js similarity index 100% rename from spec/cypress/e2e/courses_spec.cy.js rename to spec/cypress/e2e/courses_spec.cy.archive.js diff --git a/spec/cypress/e2e/media_spec.cy.js b/spec/cypress/e2e/media_spec.cy.archive.js similarity index 100% rename from spec/cypress/e2e/media_spec.cy.js rename to spec/cypress/e2e/media_spec.cy.archive.js diff --git a/spec/cypress/e2e/search_spec.cy.js b/spec/cypress/e2e/search_spec.cy.archive.js similarity index 100% rename from spec/cypress/e2e/search_spec.cy.js rename to spec/cypress/e2e/search_spec.cy.archive.js diff --git a/spec/cypress/e2e/submissions_spec.cy.archive.js b/spec/cypress/e2e/submissions_spec.cy.archive.js new file mode 100644 index 000000000..adcd0b5f6 --- /dev/null +++ b/spec/cypress/e2e/submissions_spec.cy.archive.js @@ -0,0 +1,153 @@ +describe("Submissions", () => { + beforeEach(() => { + cy.app("clean"); + }); + describe("Administration", () => { + beforeEach(() => { + cy.app("clean"); + cy.appScenario("admin"); + cy.visit("/users/sign_in"); + cy.get('input[type="email"]').type("administrator@mampf.edu"); + cy.get('input[type="password"]').type("test123456"); + cy.get('input[type="submit"]').click(); + }); + it("can create tutorial", () => { + cy.appFactories([ + ["create", + "lecture", { + teacher_id: 1, + }, + ], + ["create", "user", "auto_confirmed"], + ]).then((lectures) => { + cy.visit(`lectures/${lectures[0].id}/edit`); + cy.contains("Tutorien").should("exist"); + cy.contains("Tutorien").click(); + cy.contains("Neues Tutorium anlegen").click(); + cy.get('input[name="tutorial[title]"]').type("Tutorium A"); + cy.get("#tutorial_tutor_ids_-ts-control").type(lectures[1].name); + cy.contains(lectures[1].name).click(); + cy.get("#exercises_collapse").contains("Speichern").click(); + }); + }); + it("can create assignment", () => { + cy.appFactories([ + ["create", + "lecture", { + teacher_id: 1, + }, + ], + [ + "create", "tutorial", { + lecture_id: 1, + }, + ], + ]).then((tutorials) => { + console.log(tutorials[1]); + cy.visit(`/lectures/${tutorials[1].lecture_id}/edit`); + cy.contains("Hausaufgaben").should("exist"); + cy.contains("Hausaufgaben").click(); + cy.contains("Neue Hausaufgabe anlegen").click(); + cy.get('input[name="assignment[title]"]').type("Assignment A"); + cy.get('input[name="assignment[deadline]"]').type((new Date()).toLocaleTimeString("de")); + cy.get("#assignments_collapse").contains("Speichern").click(); + cy.contains("Assignment A").should("exist"); + }); + }); + }); + describe("User", () => { + beforeEach(() => { + cy.app("clean"); + cy.appScenario("non_admin"); + cy.visit("/users/sign_in"); + cy.get('input[type="email"]').type("max@mampf.edu"); + cy.get('input[type="password"]').type("test123456"); + cy.get('input[type="submit"]').click(); + + cy.appFactories([ + ["create", "lecture", "released_for_all"], + ["create", "lecture_user_join", { + user_id: 1, + lecture_id: 1, + }], + ]).then((_lectures) => {}); + }); + it("can create submission", () => { + cy.appFactories([ + [ + "create", + "tutorial", "with_tutors", { + lecture_id: 1, + }, + ], + [ + "create", "assignment", { + lecture_id: 1, + }, + ], + ]).then((assignments) => { + cy.visit(`lectures/${assignments[0].lecture_id}/submissions`); + cy.contains("Anlegen").click(); + const yourFixturePath = "cypress/fixtures/files/manuscript.pdf"; + cy.get("#upload-userManuscript").selectFile(yourFixturePath, { force: true }); + cy.get('input[type="checkbox"]').check(); + cy.contains("Hochladen").click(); + cy.get(".submissionFooter").contains("Speichern").click(); + cy.contains("Du").should("exist"); + }); + }); + it("can process multiple files", () => { + cy.appFactories([ + [ + "create", + "tutorial", "with_tutors", { + lecture_id: 1, + }, + ], + [ + "create", "assignment", { + lecture_id: 1, + }, + ], + ]).then((assignments) => { + cy.visit(`lectures/${assignments[0].lecture_id}/submissions`); + cy.contains("Anlegen").click(); + const yourFixturePath = "cypress/fixtures/files/manuscript.pdf"; + cy.get("#upload-userManuscript").selectFile([yourFixturePath, yourFixturePath, yourFixturePath], { force: true }); + cy.get("#userManuscript-merge-btn").should("exist"); + cy.get("#userManuscript-merge-btn").click(); + cy.get("#multiple-files-selected").should("have.attr", "style", "display: none;"); + cy.get('input[type="checkbox"]').check(); + cy.get("#userManuscript-uploadButton-call").click(); + cy.get("#userManuscript-uploadButton-call").contains("Erfolgreich hochgeladen"); + }); + }); + it("can join submission", () => { + cy.appFactories([ + [ + "create", + "tutorial", "with_tutors", { + lecture_id: 1, + }, + ], + [ + "create", "assignment", { + lecture_id: 1, + }, + ], + ["create", "submission", "with_users", "with_manuscript", { + assignment_id: 1, + tutorial_id: 1, + }], + ]).then((assignments) => { + cy.visit(`lectures/${assignments[0].lecture_id}/submissions`); + cy.contains("Beitreten").click(); + cy.contains("Code").should("exist"); + console.log(assignments[2]); + cy.get('input[name="join[code]"]').type(assignments[2].token); + cy.contains("Beitreten").click(); + cy.contains("Du").should("exist"); + }); + }); + }); +}); diff --git a/spec/cypress/e2e/submissions_spec.cy.js b/spec/cypress/e2e/submissions_spec.cy.js index adcd0b5f6..5cc454703 100644 --- a/spec/cypress/e2e/submissions_spec.cy.js +++ b/spec/cypress/e2e/submissions_spec.cy.js @@ -1,152 +1,26 @@ +import FactoryBot from "../support/factorybot"; + describe("Submissions", () => { - beforeEach(() => { - cy.app("clean"); - }); - describe("Administration", () => { - beforeEach(() => { - cy.app("clean"); - cy.appScenario("admin"); - cy.visit("/users/sign_in"); - cy.get('input[type="email"]').type("administrator@mampf.edu"); - cy.get('input[type="password"]').type("test123456"); - cy.get('input[type="submit"]').click(); - }); - it("can create tutorial", () => { - cy.appFactories([ - ["create", - "lecture", { - teacher_id: 1, - }, - ], - ["create", "user", "auto_confirmed"], - ]).then((lectures) => { - cy.visit(`lectures/${lectures[0].id}/edit`); - cy.contains("Tutorien").should("exist"); - cy.contains("Tutorien").click(); - cy.contains("Neues Tutorium anlegen").click(); - cy.get('input[name="tutorial[title]"]').type("Tutorium A"); - cy.get("#tutorial_tutor_ids_-ts-control").type(lectures[1].name); - cy.contains(lectures[1].name).click(); - cy.get("#exercises_collapse").contains("Speichern").click(); - }); - }); - it("can create assignment", () => { - cy.appFactories([ - ["create", - "lecture", { - teacher_id: 1, - }, - ], - [ - "create", "tutorial", { - lecture_id: 1, - }, - ], - ]).then((tutorials) => { - console.log(tutorials[1]); - cy.visit(`/lectures/${tutorials[1].lecture_id}/edit`); - cy.contains("Hausaufgaben").should("exist"); - cy.contains("Hausaufgaben").click(); - cy.contains("Neue Hausaufgabe anlegen").click(); - cy.get('input[name="assignment[title]"]').type("Assignment A"); - cy.get('input[name="assignment[deadline]"]').type((new Date()).toLocaleTimeString("de")); - cy.get("#assignments_collapse").contains("Speichern").click(); - cy.contains("Assignment A").should("exist"); - }); - }); - }); describe("User", () => { beforeEach(() => { - cy.app("clean"); - cy.appScenario("non_admin"); - cy.visit("/users/sign_in"); - cy.get('input[type="email"]').type("max@mampf.edu"); - cy.get('input[type="password"]').type("test123456"); - cy.get('input[type="submit"]').click(); - - cy.appFactories([ - ["create", "lecture", "released_for_all"], - ["create", "lecture_user_join", { - user_id: 1, - lecture_id: 1, - }], - ]).then((_lectures) => {}); - }); - it("can create submission", () => { - cy.appFactories([ - [ - "create", - "tutorial", "with_tutors", { - lecture_id: 1, - }, - ], - [ - "create", "assignment", { - lecture_id: 1, - }, - ], - ]).then((assignments) => { - cy.visit(`lectures/${assignments[0].lecture_id}/submissions`); - cy.contains("Anlegen").click(); - const yourFixturePath = "cypress/fixtures/files/manuscript.pdf"; - cy.get("#upload-userManuscript").selectFile(yourFixturePath, { force: true }); - cy.get('input[type="checkbox"]').check(); - cy.contains("Hochladen").click(); - cy.get(".submissionFooter").contains("Speichern").click(); - cy.contains("Du").should("exist"); - }); + cy.createUserAndLogin("generic"); + FactoryBot.create("lecture", "released_for_all"); }); - it("can process multiple files", () => { - cy.appFactories([ - [ - "create", - "tutorial", "with_tutors", { - lecture_id: 1, - }, - ], - [ - "create", "assignment", { - lecture_id: 1, - }, - ], - ]).then((assignments) => { - cy.visit(`lectures/${assignments[0].lecture_id}/submissions`); - cy.contains("Anlegen").click(); - const yourFixturePath = "cypress/fixtures/files/manuscript.pdf"; - cy.get("#upload-userManuscript").selectFile([yourFixturePath, yourFixturePath, yourFixturePath], { force: true }); - cy.get("#userManuscript-merge-btn").should("exist"); - cy.get("#userManuscript-merge-btn").click(); - cy.get("#multiple-files-selected").should("have.attr", "style", "display: none;"); - cy.get('input[type="checkbox"]').check(); - cy.get("#userManuscript-uploadButton-call").click(); - cy.get("#userManuscript-uploadButton-call").contains("Erfolgreich hochgeladen"); + + // TODO: this is just a dummy test right now + it("can create a submission", function () { + FactoryBot.create("tutorial", "with_tutors", { lecture_id: 1 }).as("tutorial"); + FactoryBot.create("assignment", { lecture_id: 1 }).as("assignment"); + cy.createUser("admin").as("user"); + + cy.then(() => { + console.log(this.tutorial); + console.log(this.assignment); + console.log(this.user); }); - }); - it("can join submission", () => { - cy.appFactories([ - [ - "create", - "tutorial", "with_tutors", { - lecture_id: 1, - }, - ], - [ - "create", "assignment", { - lecture_id: 1, - }, - ], - ["create", "submission", "with_users", "with_manuscript", { - assignment_id: 1, - tutorial_id: 1, - }], - ]).then((assignments) => { - cy.visit(`lectures/${assignments[0].lecture_id}/submissions`); - cy.contains("Beitreten").click(); - cy.contains("Code").should("exist"); - console.log(assignments[2]); - cy.get('input[name="join[code]"]').type(assignments[2].token); - cy.contains("Beitreten").click(); - cy.contains("Du").should("exist"); + + cy.then(() => { + cy.visit("/lectures/1/"); }); }); }); diff --git a/spec/cypress/e2e/thredded_spec.cy.js b/spec/cypress/e2e/thredded_spec.cy.archive.js similarity index 100% rename from spec/cypress/e2e/thredded_spec.cy.js rename to spec/cypress/e2e/thredded_spec.cy.archive.js diff --git a/spec/cypress/e2e/tutorials_spec.cy.js b/spec/cypress/e2e/tutorials_spec.cy.archive.js similarity index 100% rename from spec/cypress/e2e/tutorials_spec.cy.js rename to spec/cypress/e2e/tutorials_spec.cy.archive.js diff --git a/spec/cypress/e2e/watchlists_spec.cy.js b/spec/cypress/e2e/watchlists_spec.cy.archive.js similarity index 100% rename from spec/cypress/e2e/watchlists_spec.cy.js rename to spec/cypress/e2e/watchlists_spec.cy.archive.js diff --git a/spec/cypress/fixtures/example.json b/spec/cypress/fixtures/example.json deleted file mode 100644 index da18d9352..000000000 --- a/spec/cypress/fixtures/example.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "Using fixtures to represent data", - "email": "hello@cypress.io", - "body": "Fixtures are a great way to mock data for responses to routes" -} \ No newline at end of file diff --git a/spec/cypress/plugins/index.js b/spec/cypress/plugins/index.js deleted file mode 100644 index 3596c1897..000000000 --- a/spec/cypress/plugins/index.js +++ /dev/null @@ -1,21 +0,0 @@ -/// -// *********************************************************** -// This example plugins/index.js can be used to load plugins -// -// You can change the location of this file or turn off loading -// the plugins file with the 'pluginsFile' configuration option. -// -// You can read more here: -// https://on.cypress.io/plugins-guide -// *********************************************************** - -// This function is called when a project is opened or re-opened (e.g. due to -// the project's config changing) - -/** - * @type {Cypress.PluginConfig} - */ -module.exports = (_on, _config) => { - // `on` is used to hook into various events Cypress emits - // `config` is the resolved Cypress config -}; diff --git a/spec/cypress/support/backend_caller.js b/spec/cypress/support/backend_caller.js new file mode 100644 index 000000000..561a81569 --- /dev/null +++ b/spec/cypress/support/backend_caller.js @@ -0,0 +1,31 @@ +/** + * Class to call special Cypress backend routes from Cypress frontend tests. + */ +class BackendCaller { + /** + * Calls the given route as POST request to the backend. + * + * @param routeName name of the route to call + * @param errorSubject subject in the error message + * @param args arguments to pass as body to the POST route + * @returns the response body of the route as Cypress promise (not native promise!) + */ + static callCypressRoute(routeName, errorSubject, args) { + return cy.request({ + url: `cypress/${routeName}`, + method: "post", + form: true, + failOnStatusCode: false, + body: args, + }).then((res) => { + if (res.status === 201) + return res.body; + + let errorMsg = `${errorSubject} failed: ${res.body.error}`; + errorMsg += `\n\nStacktrace:\n${res.body.stacktrace}`; + throw new Error(errorMsg); + }); + } +} + +export default BackendCaller; diff --git a/spec/cypress/support/commands.js b/spec/cypress/support/commands.js index c1f5a772e..82d3e5ef0 100644 --- a/spec/cypress/support/commands.js +++ b/spec/cypress/support/commands.js @@ -1,25 +1,35 @@ -// *********************************************** -// This example commands.js shows you how to -// create various custom commands and overwrite -// existing commands. -// -// For more comprehensive examples of custom -// commands please read more here: // https://on.cypress.io/custom-commands -// *********************************************** -// -// -// -- This is a parent command -- -// Cypress.Commands.add("login", (email, password) => { ... }) -// -// -// -- This is a child command -- -// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... }) -// -// -// -- This is a dual command -- -// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... }) -// -// -// -- This is will overwrite an existing command -- -// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... }) +import BackendCaller from "./backend_caller"; + +Cypress.Commands.add("cleanDatabase", () => { + return BackendCaller.callCypressRoute("database_cleaner", "cy.cleanDatabase()", {}); +}); + +beforeEach(() => { + cy.cleanDatabase(); +}); + +Cypress.Commands.add("createUser", (role) => { + if (!["admin", "editor", "teacher", "generic"].includes(role)) { + throw new Error(`Invalid role: ${role}`); + } + return BackendCaller.callCypressRoute("user_creator", "cy.createUser()", { role: role }); +}); + +Cypress.Commands.add("login", (user) => { + return cy.request({ + method: "POST", + url: "/users/sign_in", + form: true, + failOnStatusCode: true, + body: { + "user[email]": user.email, + "user[password]": user.password, + }, + }); +}); + +Cypress.Commands.add("createUserAndLogin", (role) => { + cy.createUser(role); + cy.login({ email: `${role}@mampf.cypress`, password: "cypress123" }); +}); diff --git a/spec/cypress/support/e2e.js b/spec/cypress/support/e2e.js index 06682f943..f887c29ae 100644 --- a/spec/cypress/support/e2e.js +++ b/spec/cypress/support/e2e.js @@ -1,2 +1 @@ import "./commands"; -import "./on-rails"; diff --git a/spec/cypress/support/factorybot.js b/spec/cypress/support/factorybot.js new file mode 100644 index 000000000..fc1d4b05e --- /dev/null +++ b/spec/cypress/support/factorybot.js @@ -0,0 +1,22 @@ +import BackendCaller from "./backend_caller"; + +/** + * Helper to access FactoryBot factories from Cypress tests. + */ +class FactoryBot { + /** + * Creates (builds and saves) a record/mock using 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 + * FactoryBot.create("factory_name", "with_trait", { another_attribute: ".pdf"}) + */ + create(...args) { + return BackendCaller.callCypressRoute("factories", "FactoryBot.create()", args); + } +} + +export default new FactoryBot(); diff --git a/spec/cypress/support/index.js b/spec/cypress/support/index.js deleted file mode 100644 index 4253b2efb..000000000 --- a/spec/cypress/support/index.js +++ /dev/null @@ -1,21 +0,0 @@ -// *********************************************************** -// This example support/index.js is processed and -// loaded automatically before your test files. -// -// This is a great place to put global configuration and -// behavior that modifies Cypress. -// -// You can change the location of this file or turn off -// automatically serving support files with the -// 'supportFile' configuration option. -// -// You can read more here: -// https://on.cypress.io/configuration -// *********************************************************** - -// Import commands.js using ES2015 syntax: -import "./commands"; -import "./on-rails"; - -// Alternatively you can use CommonJS syntax: -// require('./commands') diff --git a/spec/cypress/support/on-rails.js b/spec/cypress/support/on-rails.js deleted file mode 100644 index cda668f24..000000000 --- a/spec/cypress/support/on-rails.js +++ /dev/null @@ -1,59 +0,0 @@ -// CypressOnRails: dont remove these command -Cypress.Commands.add("appCommands", function (body) { - cy.log("APP: " + JSON.stringify(body)); - return cy.request({ - method: "POST", - url: "/__cypress__/command", - body: JSON.stringify(body), - log: true, - failOnStatusCode: true, - }).then((response) => { - return response.body; - }); -}); - -Cypress.Commands.add("app", function (name, command_options) { - return cy.appCommands({ name: name, options: command_options }).then((body) => { - return body[0]; - }); -}); - -Cypress.Commands.add("appScenario", function (name, options = {}) { - return cy.app("scenarios/" + name, options); -}); - -Cypress.Commands.add("appEval", function (code) { - return cy.app("eval", code); -}); - -Cypress.Commands.add("appFactories", function (options) { - return cy.app("factory_bot", options); -}); - -Cypress.Commands.add("appFixtures", function (options) { - cy.app("activerecord_fixtures", options); -}); - -Cypress.Commands.add("dragTo", { prevSubject: "element" }, (subject, targetEl) => { - cy.wrap(subject).trigger("dragstart"); - cy.get(targetEl).trigger("drop"); -}); -// CypressOnRails: end - -// The next is optional -// beforeEach(() => { -// cy.app('clean') // have a look at cypress/app_commands/clean.rb -// }); - -// comment this out if you do not want to attempt to log additional info on test fail -Cypress.on("fail", (err, runnable) => { - // allow app to generate additional logging data - Cypress.$.ajax({ - url: "/__cypress__/command", - data: JSON.stringify({ name: "log_fail", options: { error_message: err.message, runnable_full_title: runnable.fullTitle() } }), - async: false, - method: "POST", - }); - - throw err; -}); diff --git a/yarn.lock b/yarn.lock index eac38f7a8..be87168f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3260,6 +3260,13 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== +eslint-plugin-cypress@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-3.3.0.tgz#4ab963193d21ad22aca8379e1d15ba02619ae8db" + integrity sha512-HPHMPzYBIshzJM8wqgKSKHG2p/8R0Gbg4Pb3tcdC9WrmkuqxiKxSKbjunUrajhV5l7gCIFrh1P7C7GuBqH6YuQ== + dependencies: + globals "^13.20.0" + eslint-plugin-erb@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/eslint-plugin-erb/-/eslint-plugin-erb-2.0.1.tgz#ed4b98e2c06221510ff46e43743236a11c0d2a71" @@ -3922,6 +3929,13 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== +globals@^13.20.0: + version "13.24.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171" + integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ== + dependencies: + type-fest "^0.20.2" + globals@^14.0.0: version "14.0.0" resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e" @@ -7637,6 +7651,11 @@ type-check@^0.4.0, type-check@~0.4.0: dependencies: prelude-ls "^1.2.1" +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" From e7d6053915e408f06d290711c4d56e95f6e029c2 Mon Sep 17 00:00:00 2001 From: Splines <37160523+Splines@users.noreply.github.com> Date: Tue, 9 Jul 2024 16:20:54 +0200 Subject: [PATCH 04/17] Don't use VSCode ESLint experimental flag anymore (#662) * Improve some VSCode settings * Remove custom Ruby LSP command --- .vscode/settings.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 9dcca743d..751c25906 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -13,7 +13,6 @@ "source.fixAll.eslint": "explicit" }, "eslint.format.enable": true, // use ESLint as formatter - "eslint.experimental.useFlatConfig": true, // this disables VSCode built-in formatter (instead we want to use ESLint) "javascript.validate.enable": false, "eslint.options": { @@ -71,7 +70,8 @@ "node_modules/": true, "pdfcomprezzor/": true, "coverage/": true, - "solr/": true + "solr/": true, + ".docker/": true }, "files.associations": { "*.js.erb": "javascript", @@ -106,6 +106,5 @@ "commontator", "helpdesk", "turbolinks" - ], - "rubyLsp.customRubyCommand": "set -o allexport && . ./docker-dummy.env && set +o allexport" + ] } \ No newline at end of file From bf7c6dcff49a67bf532af055926aab2d79c37fa4 Mon Sep 17 00:00:00 2001 From: Splines <37160523+Splines@users.noreply.github.com> Date: Wed, 10 Jul 2024 15:04:43 +0200 Subject: [PATCH 05/17] Disable Codecov patch/project checks in CI/CD (#664) * Update codecov status check settings * Modify random ruby lines for testing purposes * Disable project and patch Codecov reports * Fix path to codecov config file * Add "**/*" to codecov paths * Try out different syntax to disable project/patch * Revert to new codecov syntax * Try not to use relative path for codecov.yml * Try to put codecov config back to root folder * Add comment explaining situation * Revert "Modify random ruby lines for testing purposes" This reverts commit 23fffef91ba88d1026e9cecd417390f3d553f833. --- .codecov.yml | 15 +++++++++++++++ .config/.codecov.yml | 5 ----- .github/workflows/tests.yml | 1 - 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 .codecov.yml delete mode 100644 .config/.codecov.yml diff --git a/.codecov.yml b/.codecov.yml new file mode 100644 index 000000000..62f1dbaa3 --- /dev/null +++ b/.codecov.yml @@ -0,0 +1,15 @@ +# We'd like to place this file to the .config/ folder as well, +# however Codecov doesn't support it yet (or is buggy, see +# https://github.com/codecov/codecov-action/issues/1465) + +# Ignore test files themselves in the Codecov report +# see: https://about.codecov.io/blog/should-i-include-test-files-in-code-coverage-calculations/ +ignore: + - "spec/**/*" + - "**/*_spec.rb" + +# https://docs.codecov.com/docs/commit-status +coverage: + status: + project: off + patch: off diff --git a/.config/.codecov.yml b/.config/.codecov.yml deleted file mode 100644 index 9e14ade12..000000000 --- a/.config/.codecov.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Ignore test files themselves in the Codecov report -# see: https://about.codecov.io/blog/should-i-include-test-files-in-code-coverage-calculations/ -ignore: - - "spec/" - - "*_spec.rb" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 87bb2ec24..f6ad48da5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -59,7 +59,6 @@ jobs: files: ./coverage/coverage.xml token: ${{ secrets.CODECOV_TOKEN }} verbose: true - codecov_yml_path: ./config/codecov.yml # Cypress end-to-end tests e2e-tests: From db3e5af6aaeca5175ca4b6ca80ad9bd54e379006 Mon Sep 17 00:00:00 2001 From: Splines <37160523+Splines@users.noreply.github.com> Date: Thu, 1 Aug 2024 13:00:47 +0200 Subject: [PATCH 06/17] Init `just` as command-line runner (#660) * Init basic justfiles * Improve docker and test commands * Add Just VSCode extension to workspace recommendations * Add npm script to install latest version of `just` * Don't print help message in list * Add more docker `just` commands * Add more "open in browser" commands * Improve just installation via yarn commands * Add newline at end of `.justfile` --- .config/commands/docker.justfile | 49 +++++++++++++++++++++++++++ .config/commands/test.justfile | 14 ++++++++ .justfile | 36 ++++++++++++++++++++ .vscode/extensions.json | 3 +- docker/development/docker-compose.yml | 8 +++-- package.json | 5 +++ 6 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 .config/commands/docker.justfile create mode 100644 .config/commands/test.justfile create mode 100644 .justfile diff --git a/.config/commands/docker.justfile b/.config/commands/docker.justfile new file mode 100644 index 000000000..ec5492394 --- /dev/null +++ b/.config/commands/docker.justfile @@ -0,0 +1,49 @@ +# Prints this help message +[private] +help: + @just --list --justfile {{source_file()}} + +# Starts the dev docker containers +@up *args: + #!/usr/bin/env bash + cd {{justfile_directory()}}/docker/development/ + docker compose up {{args}} + +# 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: + #!/usr/bin/env bash + cd {{justfile_directory()}}/docker/development/ + export DB_SQL_PRESEED_URL="https://github.com/MaMpf-HD/mampf-init-data/raw/main/data/20220923120841_mampf.sql" + export UPLOADS_PRESEED_URL="https://github.com/MaMpf-HD/mampf-init-data/raw/main/data/uploads.zip" + docker compose up {{args}} + +# Removes the development docker containers +@down: + #!/usr/bin/env bash + cd {{justfile_directory()}}/docker/development/ + docker compose down + +# Stops the development docker containers (without removing them) +@stop: + #!/usr/bin/env bash + cd {{justfile_directory()}}/docker/development/ + docker compose stop + +# Puts you into a shell of your desired *development* docker container +@shell name="mampf" shell="bash": + #!/usr/bin/env bash + cd {{justfile_directory()}}/docker/development/ + docker compose exec -it {{name}} bash + +# Puts you into a shell of your desired *test* docker container +@shell-test name="mampf" shell="bash": + #!/usr/bin/env bash + cd {{justfile_directory()}}/docker/test/ + docker compose exec -it {{name}} {{shell}} + +# Puts you into the rails console of the dev docker mampf container +@rails-c: + #!/usr/bin/env bash + cd {{justfile_directory()}}/docker/development/ + docker compose exec mampf bundle exec rails c diff --git a/.config/commands/test.justfile b/.config/commands/test.justfile new file mode 100644 index 000000000..c2cacf556 --- /dev/null +++ b/.config/commands/test.justfile @@ -0,0 +1,14 @@ +# Prints this help message +[private] +help: + @just --list --justfile {{source_file()}} + +# Starts the interactive Cypress test runner UI +cypress: + #!/usr/bin/env bash + cd {{justfile_directory()}}/docker/test + docker compose -f docker-compose.yml -f cypress.yml -f cypress-interactive.yml up --exit-code-from cypress + +# Opens Codecov in the default browser +codecov: + xdg-open https://app.codecov.io/gh/MaMpf-HD/mampf diff --git a/.justfile b/.justfile new file mode 100644 index 000000000..5b36d3496 --- /dev/null +++ b/.justfile @@ -0,0 +1,36 @@ +# Documentation: https://just.systems/man/en/ + +# Prints this help message +[private] +help: + @just --list + +# Test-related commands +mod test ".config/commands/test.justfile" +# see https://github.com/casey/just/issues/2216 +# alias t := test + +# Docker-related commands +mod docker ".config/commands/docker.justfile" + +# Opens the MaMpf wiki in the default browser +wiki: + #!/usr/bin/env bash + xdg-open https://github.com/MaMpf-HD/mampf/wiki + +# Opens the MaMpf pull requests (PRs) in the default browser +prs: + #!/usr/bin/env bash + xdg-open https://github.com/MaMpf-HD/mampf/pulls + +# Opens the PR for the current branch in the default browser +pr: + #!/usr/bin/env bash + branchname=$(git branch --show-current) + xdg-open "https://github.com/MaMpf-HD/mampf/pulls?q=is%3Apr+is%3Aopen+head%3A$branchname" + +# Opens the MaMpf GitHub code tree at the current branch in the default browser +code branch="": + #!/usr/bin/env bash + branchname={{ if branch == "" {"$(git branch --show-current)"} else {branch} }} + xdg-open https://github.com/MaMpf-HD/mampf/tree/$branchname diff --git a/.vscode/extensions.json b/.vscode/extensions.json index baa13b8bb..d98e845e1 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -3,6 +3,7 @@ "shopify.ruby-lsp", "dbaeumer.vscode-eslint", "streetsidesoftware.code-spell-checker", - "streetsidesoftware.code-spell-checker-german" + "streetsidesoftware.code-spell-checker-german", + "nefrob.vscode-just-syntax" ] } \ No newline at end of file diff --git a/docker/development/docker-compose.yml b/docker/development/docker-compose.yml index e7c1d5dd0..94e3b7591 100644 --- a/docker/development/docker-compose.yml +++ b/docker/development/docker-compose.yml @@ -112,9 +112,11 @@ services: PROJECT_EMAIL_PASSWORD: mampf PROJECT_EMAIL_MAILBOX: INBOX BLOG: https://mampf.blog - # uncomment DB_SQL_PRESEED_URL and UPLOADS_PRESEED_URL to enable db preseeding - # DB_SQL_PRESEED_URL: "https://github.com/MaMpf-HD/mampf-init-data/raw/main/data/20220923120841_mampf.sql" - # UPLOADS_PRESEED_URL: "https://github.com/MaMpf-HD/mampf-init-data/raw/main/data/uploads.zip" + # DB Preseeding with initial data. + # We don't specify a value here to let docker compose look up the values + # in the current environment/shell. This is used in the docker.justfile. + DB_SQL_PRESEED_URL: + UPLOADS_PRESEED_URL: volumes: - type: bind source: ../../ diff --git a/package.json b/package.json index e426ab660..92b90cc56 100644 --- a/package.json +++ b/package.json @@ -23,5 +23,10 @@ "eslint-plugin-cypress": "^3.3.0", "eslint-plugin-erb": "^2.0.0", "globals": "^15.1.0" + }, + "scripts": { + "just-install": "curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to ~/bin && echo 'export PATH=\"$PATH:$HOME/bin\" # for \"just\" binary' >> ~/.bashrc && echo '(!) Make sure to restart your current shell'", + "just-remove": "rm -r ~/bin/just --interactive", + "just-update": "echo 'We remove just from ~/bin/just, then install it again.' && rm -r ~/bin/just && yarn just-install" } } From f5522eebdc038e3e3ad5abc6ffc6940d43836504 Mon Sep 17 00:00:00 2001 From: Splines <37160523+Splines@users.noreply.github.com> Date: Fri, 2 Aug 2024 16:14:00 +0200 Subject: [PATCH 07/17] Fix DB preseeding (#665) * Refactor db initialization file * Use `bundle exec` * Try db:migrate instead of db:schema:load * Run db:schema:load in tests * Perform SOLR indexing as last step and not in background * Allow up-reseed to also work when container is not stopped * Improve echo messages in initialize script * Fix spelling --- .config/commands/docker.justfile | 2 +- initialize.sh | 86 +++++++++++++++++--------------- 2 files changed, 46 insertions(+), 42 deletions(-) diff --git a/.config/commands/docker.justfile b/.config/commands/docker.justfile index ec5492394..15872ed4b 100644 --- a/.config/commands/docker.justfile +++ b/.config/commands/docker.justfile @@ -16,7 +16,7 @@ up-reseed *args: cd {{justfile_directory()}}/docker/development/ export DB_SQL_PRESEED_URL="https://github.com/MaMpf-HD/mampf-init-data/raw/main/data/20220923120841_mampf.sql" export UPLOADS_PRESEED_URL="https://github.com/MaMpf-HD/mampf-init-data/raw/main/data/uploads.zip" - docker compose up {{args}} + docker compose rm --stop --force mampf && docker compose up {{args}} # Removes the development docker containers @down: diff --git a/initialize.sh b/initialize.sh index 75e8588f2..567901a29 100755 --- a/initialize.sh +++ b/initialize.sh @@ -1,62 +1,66 @@ #!/usr/bin/env bash check_for_preseeds() { + echo "💾 Checking for preseeds (in development env)" + + # Database preseed if [[ "${DB_SQL_PRESEED_URL}" ]]; then - echo "Found DB Preseed with URL: $DB_SQL_PRESEED_URL" + echo "💾 Found DB preseed at URL: $DB_SQL_PRESEED_URL" mkdir -pv db/backups/docker_development wget --content-disposition --directory-prefix=db/backups/docker_development/ --timestamping $DB_SQL_PRESEED_URL for file in db/backups/docker_development/*.sql; do [[ $file -nt $latest ]] && latest=$file done - rails db:restore pattern=$(echo $latest | rev | cut -d "/" -f1 | rev | cut -d "_" -f1) - rails db:create:interactions - rails db:schema:load + + bundle exec rails db:restore pattern=$(echo $latest | rev | cut -d "/" -f1 | rev | cut -d "_" -f1) + bundle exec rails db:migrate fi + + # Files (uploads) preseed if [[ "${UPLOADS_PRESEED_URL}" ]]; then - echo "Found Upload Preseed with URL: $UPLOAD_PRESEED_URL" + echo "💾 Found upload preseed at URL: $UPLOAD_PRESEED_URL" wget --content-disposition --directory-prefix=public/ --timestamping --progress=dot:mega $UPLOADS_PRESEED_URL mkdir -p public/uploads bsdtar -xvf public/uploads.zip -s'|[^/]*/||' -C public/uploads fi } -if [ "$RAILS_ENV" = "production" ] -then - echo "This script is not intended for usage with RAILs_ENV=production. Aborting." +if [ "$RAILS_ENV" = "production" ]; then + echo "❌ This script is not intended for usage with RAILS_ENV=production. Aborting." exit 1 fi -echo Waiting for redis to come online -wait-for-it redis:6379 -t 30 || exit 1 -if ! [ -f /completed_initial_run ] -then - echo 'Initialising mampf' - echo Waiting for the DB to come online - echo RAILS ENV $RAILS_ENV - if [ "$RAILS_ENV" = "docker_development" ] - then - wait-for-it ${DEVELOPMENT_DATABASE_HOST}:${DEVELOPMENT_DATABASE_PORT} -t 30 || exit 1 - echo running: bundle exec rails db:create - bundle exec rails db:create:interactions - bundle exec rails db:create - fi - if [ "$RAILS_ENV" = "test" ] - then - wait-for-it ${TEST_DATABASE_HOST}:${TEST_DATABASE_PORT} -t 30 || exit 1 - echo running: bundle exec rails db:create - bundle exec rails db:create:interactions - bundle exec rails db:create - fi - echo running: bundle exec rails db:schema:load - bundle exec rails db:schema:load - echo Waiting for SOLR to come online - wait-for-it ${SOLR_HOST}:${SOLR_PORT} -t 30 || exit 1 - bundle exec rake sunspot:solr:reindex & - if [ "$RAILS_ENV" = "docker_development" ] - then - echo 'checking for preseeds' - check_for_preseeds - fi - echo 'finished initialisation' - touch /completed_initial_run +if ! [ -f /completed_initial_run ]; then + echo "▶ Initializing MaMpf in environment: $RAILS_ENV" + + echo "🕖 Waiting for Redis to come online" + wait-for-it redis:6379 -t 30 || exit 1 + + # Wait for database to come online + echo "🕖 Waiting for database to come online" + if [ "$RAILS_ENV" = "docker_development" ]; then + wait-for-it ${DEVELOPMENT_DATABASE_HOST}:${DEVELOPMENT_DATABASE_PORT} -t 30 || exit 1 + fi + if [ "$RAILS_ENV" = "test" ]; then + wait-for-it ${TEST_DATABASE_HOST}:${TEST_DATABASE_PORT} -t 30 || exit 1 + fi + + echo "➕ Creating database (db:create)" + bundle exec rails db:create:interactions + bundle exec rails db:create + + if [ "$RAILS_ENV" = "docker_development" ]; then + check_for_preseeds + fi + if [ "$RAILS_ENV" = "test" ]; then + echo "💾 Loading DB schema (in test env)" + bundle exec rails db:schema:load + fi + + echo "🕖 Waiting for SOLR to come online" + wait-for-it ${SOLR_HOST}:${SOLR_PORT} -t 30 || exit 1 + bundle exec rake sunspot:solr:reindex + + echo "✅ Finished initialization of MaMpf in environment: $RAILS_ENV" + touch /completed_initial_run fi From 742ee155ca6a82ccd748b0312724c1e1b3435280 Mon Sep 17 00:00:00 2001 From: Splines <37160523+Splines@users.noreply.github.com> Date: Fri, 2 Aug 2024 16:14:10 +0200 Subject: [PATCH 08/17] Redesign media cards (#656) * Make lecture cards more reactive * Fix card header border radius & use blue border color * Add "hover to play" feature * Use bootstrap icons for buttons * Explicitly set footer background color * Clean up card footer * Use buttons for media card actions * Add interactive hover to other sections as well Also added a default empty screenshot * Improve media grid breakpoints * Add another horizontal line above card body * Import necessary bootstrap files in `media.scss` * Outline the buttons instead of filling them * Use auto phrasing for card word break * Let only lecture tags change color on hover * Improve styling of header end icons * Fix download button alignment * Revert locale logic change * Make default screenshot more subdued * Reflect media card changes for watchlist cards * Reuse medium card for watchlists * Adjust card header talk people icon * Wait for turbolinks:load (shining pointer) --- app/assets/javascripts/cards.js | 7 + app/assets/stylesheets/application.scss | 13 +- app/assets/stylesheets/lectures.scss | 7 +- app/assets/stylesheets/media.scss | 152 ++++++++++++++++++- app/helpers/talks_helper.rb | 4 +- app/views/media/_media.html.erb | 2 +- app/views/media/_medium.html.erb | 155 +++++++++++++------- app/views/media/medium/_buttons.html.erb | 127 ++++++---------- app/views/watchlist_entries/_entry.html.erb | 138 ----------------- app/views/watchlists/show.html.erb | 7 +- 10 files changed, 314 insertions(+), 298 deletions(-) create mode 100644 app/assets/javascripts/cards.js delete mode 100644 app/views/watchlist_entries/_entry.html.erb diff --git a/app/assets/javascripts/cards.js b/app/assets/javascripts/cards.js new file mode 100644 index 000000000..7c2cb6a9b --- /dev/null +++ b/app/assets/javascripts/cards.js @@ -0,0 +1,7 @@ +$(document).on("turbolinks:load", function () { + $(".mampf-card").on("mousemove", function (event) { + const { x, y } = this.getBoundingClientRect(); + this.style.setProperty("--x", event.clientX - x); + this.style.setProperty("--y", event.clientY - y); + }); +}); diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index e8b97ca3e..7a69c64f8 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -64,8 +64,6 @@ $container-max-widths: ( @import "vertices"; @import "trix"; -$badge-color: #545b62; - trix-toolbar .trix-button-row { flex-wrap: wrap; } @@ -267,15 +265,8 @@ a { } } -.badge { - transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; - - &:hover, - &:focus { - text-decoration: none; - background-color: $badge-color !important; - color: white; - } +.badge:hover { + cursor: default; } .btn { diff --git a/app/assets/stylesheets/lectures.scss b/app/assets/stylesheets/lectures.scss index 2ee04b58b..be454a4d7 100644 --- a/app/assets/stylesheets/lectures.scss +++ b/app/assets/stylesheets/lectures.scss @@ -69,9 +69,14 @@ .lecture-tag { background-color: #dae0e5; + transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; - &:hover { + &:hover, + &:focus { + text-decoration: none; + background-color: #545b62 !important; color: white !important; + cursor: pointer !important; } } diff --git a/app/assets/stylesheets/media.scss b/app/assets/stylesheets/media.scss index 3d06e221f..06779bf24 100644 --- a/app/assets/stylesheets/media.scss +++ b/app/assets/stylesheets/media.scss @@ -1,6 +1,30 @@ -// Place all the styles related to the media controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ +@import "bootstrap/functions"; +@import "bootstrap/variables"; +@import "bootstrap/mixins"; + +.media-grid { + @include make-col-ready(); + + @include media-breakpoint-up(sm) { + @include make-col(12); + } + + @include media-breakpoint-up(md) { + @include make-col(6); + } + + @media (min-width: 1100px) { + @include make-col(4); + } + + @media (min-width: 1300px) { + @include make-col(3); + } + + @media (min-width: 1700px) { + @include make-col(2.4); // 5 columns + } +} .hidden { display: none; @@ -28,6 +52,7 @@ display: flex; justify-content: flex-start; flex-wrap: wrap; + padding: 0.5rem var(--bs-card-cap-padding-x); } .media-card-header { @@ -35,18 +60,133 @@ justify-content: flex-end; } -.card-header { +.mampf-card-header { padding: 0.75rem 1.25rem; + background-color: #223e62; +} + +.mampf-header-end { + color: $gray-300; + + & a { + color: $gray-300; + } } .card-footer { - padding: 0.75rem 1.25rem; + padding: 0; + background-color: #21252908; +} + +.media-hr { + margin: 0; +} + +.card-text-end { + padding: 0.75rem var(--bs-card-cap-padding-x); +} + +.media-download-buttons { + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: space-around; + margin: 0.25rem; +} + +.download-button { + padding: 0 0.5em; + font-size: 0.8em; + height: 1.4em; + border: none; + text-align: left; + line-height: normal; +} + +.mampf-card { + border: 2px solid #223e62; + position: relative; + overflow: hidden; + background: linear-gradient(0deg, #ecf1f8 0%, #fcfdfd 60%); + box-shadow: rgba(0, 0, 0, 0.05) 0px 1px 3px; + transition: box-shadow 120ms ease-in-out; + + &:hover { + box-shadow: rgba(50, 50, 93, 0.02) 0px 50px 50px -20px, + rgba(0, 0, 0, 0.15) 0px 25px 50px -25px; + } +} + +.mampf-card:hover::after { + opacity: 0.12; +} + +.mampf-card::after { + content: ''; + position: absolute; + width: 160px; + height: 160px; + top: calc(var(--y, 0) * 1px - 80px); + left: calc(var(--x, 0) * 1px - 80px); + opacity: 0; + background: radial-gradient(white, #00000000 80%); + transition: opacity 200ms; + pointer-events: none; +} + +.mampf-card-image-wrapper { + overflow: hidden; + display: flex; + justify-content: center; + position: relative; + + &:hover .interactive-hover { + visibility: visible; + opacity: 1; + } +} + +.mampf-card-image { + margin: -5px; // crop image to not display scroll bars present in some images + width: 100%; +} + +.interactive-hover { + width: 100%; + height: 100%; + position: absolute; + display: flex; + justify-content: center; + align-items: center; + background-color: rgba(0, 0, 0, 0.75); + visibility: hidden; + opacity: 0; + transition: visibility 150ms ease-in-out, opacity 150ms ease-in-out; +} + +.interactive-hover-icon { + font-size: 2.3em; + color: white; +} + +.empty-default-screenshot { + width: 100%; + height: 8em; + background-color: #ffffff; + background-image: linear-gradient(#BCC5CF 2px, transparent 2px), linear-gradient(90deg, #BCC5CF 2px, transparent 2px), linear-gradient(#BCC5CF 1px, transparent 1px), linear-gradient(90deg, #BCC5CF 1px, #ffffff 1px); + background-size: 50px 50px, 50px 50px, 10px 10px, 10px 10px; + background-position: -2px -2px, -2px -2px, -1px -1px, -1px -1px; +} + +.card-body { + // same as card-footer border + border-top: var(--bs-card-border-width) solid var(--bs-card-border-color); } #media-card-subheader { display: flex; justify-content: space-between; - word-break: break-all; + word-break: auto-phrase; } #video-wait { diff --git a/app/helpers/talks_helper.rb b/app/helpers/talks_helper.rb index 8f17c847b..4546dba81 100644 --- a/app/helpers/talks_helper.rb +++ b/app/helpers/talks_helper.rb @@ -18,9 +18,9 @@ def speaker_list(talk) end def speaker_icon_class(talk) - return "fas fa-user" unless talk.speakers.count > 1 + return "bi bi-person-fill" unless talk.speakers.count > 1 - "fas fa-users" + "bi bi-people-fill" end def speaker_icon(talk) diff --git a/app/views/media/_media.html.erb b/app/views/media/_media.html.erb index c70bf99c9..2a5b1e3f6 100644 --- a/app/views/media/_media.html.erb +++ b/app/views/media/_media.html.erb @@ -1,7 +1,7 @@ <% if media.present? %>
<% media.each do |medium| %> -
+
<%= render partial: 'media/medium', locals: { medium: medium, tags: tags, diff --git a/app/views/media/_medium.html.erb b/app/views/media/_medium.html.erb index d25bd05c1..a23a6cca3 100644 --- a/app/views/media/_medium.html.erb +++ b/app/views/media/_medium.html.erb @@ -1,7 +1,10 @@ +<%= javascript_include_tag 'cards' %> + <% I18n.with_locale(medium.locale_with_inheritance) do %> -
-
-
+
+
+
<% if lecture&.imported_media&.include?(medium) %> <% end %>
-
+ +
+ <% if current_user.locale.to_s != medium.locale_with_inheritance %> - "> <%= medium.locale_with_inheritance.to_s %> <% end %> + + <% if !medium.published? && !medium.publisher %> - <% elsif !medium.published? && medium.publisher.present? %> - <% elsif medium.locked? %> - @@ -56,57 +62,99 @@ <% elsif lecture && medium.teachable_type == 'Course' && !lecture.imported_media&.include?(medium) && (current_user.admin || lecture.edited_by?(current_user)) && (medium.tags & lecture.tags_including_media_tags).blank? %> - <% end %> - <% if !medium.containing_watchlists(current_user).empty? %> + + + <% if from == "watchlist" %> + <% if @watchlist.owned_by?(current_user) %> + <%= link_to '', + watchlist_entry_path(entry, + watchlist: @watchlist.id, + reverse: params[:reverse], + all: params[:all], + page: params[:page], + per: params[:per]), + class: 'btn bi bi-x-circle-fill', + style: 'text-decoration: none;', + data: { toggle: 'tooltip', + placement: 'bottom', + confirm: t('watchlist_entry.remove_confirm') }, + title: t('watchlist_entry.remove'), + method: :delete %> + <% end %> + <% else %> + <% if !medium.containing_watchlists(current_user).empty? %> + <%= link_to '', + watchlist_path(medium.containing_watchlists(current_user).first), + class: 'btn p-2 bi bi-bookmark-fill', + data: { toggle: 'tooltip', + placement: 'bottom' }, + title: t('watchlist_entry.list', + count: medium.containing_watchlists(current_user).size, + watchlists: medium.containing_watchlists_names(current_user).join(", ")) %> + <% end %> <%= link_to '', - watchlist_path(medium.containing_watchlists(current_user).first), - class: 'fas fa-bookmark text-light me-2', - style: 'text-decoration: none;', + add_medium_to_watchlist_path(medium), + class: 'btn p-2 bi bi-tv-fill', data: { toggle: 'tooltip', placement: 'bottom' }, - title: t('watchlist_entry.list', - count: medium.containing_watchlists(current_user).size, - watchlists: medium.containing_watchlists_names(current_user).join(", ")) %> + title: t('watchlist.add'), + remote: true %> <% end %> - <%= link_to '', - add_medium_to_watchlist_path(medium), - class: 'fas fa-list text-light me-2', - style: 'text-decoration: none;', - data: { toggle: 'tooltip', - placement: 'bottom' }, - title: t('watchlist.add'), - remote: true %>
-
<% if medium.teachable.is_a?(Talk) %>
<%= speaker_list_with_icon(medium.teachable) %>
<% end %> -
- <% cache [medium, from == 'tag', ref_link] do %> - <% unless from == 'tag' %> + + <% cache [medium, ref_link] do %> +
+ + <% if medium.video.present? %> + + + + <% elsif medium.manuscript.present? %> + + + + <% elsif medium.sort == 'Quiz' && medium.quiz_graph %> + + + + <% end %> + + <% if medium.screenshot.present? %> <%= image_tag(medium.screenshot_url_with_host, alt: "Card image cap", - class: "card-img-top") %> + class: "mampf-card-image") %> <% elsif medium.manuscript.present? %> <%= image_tag(medium.manuscript_screenshot_url || '', alt: "Card image cap", - class: "card-img-top manuscript-thumbnail") %> + class: "mampf-card-image manuscript-thumbnail") %> <% elsif medium.geogebra_screenshot_url.present? %> <%= image_tag(medium.geogebra_screenshot_url, alt: 'Card image cap', - class: 'card-img-top') %> + class: 'mampf-card-image') %> + <% else %> +
<% end %> - <% end %> +
+
<% unless medium.caption.nil? %>
-
+ +
- <% end %> - <% if medium.commontator_thread.comments.present? %> -
- <%= link_to "#{medium.commontator_thread.comments.size} " \ - "#{medium.commontator_thread.comments.size == 1 ? t('basics.comment') : t('basics.comments')}", - show_media_comments_path(medium), - class: 'text-dark' %> - <% elsif !medium.commontator_thread.is_closed? %> -
- <%= link_to t('comments.comment_verb'), - show_media_comments_path(medium), - class: 'text-dark' %> - <% end %> + <% end %> + + <% if medium.commontator_thread.comments.present? %> +
+
+ <%= link_to "#{medium.commontator_thread.comments.size} " \ + "#{medium.commontator_thread.comments.size == 1 ? t('basics.comment') : t('basics.comments')}", + show_media_comments_path(medium), + class: 'text-dark' %> +
+ <% elsif !medium.commontator_thread.is_closed? %> +
+
+ <%= link_to t('comments.comment_verb'), + show_media_comments_path(medium), + class: 'text-dark' %> +
+ <% end %>
+
<% end %> \ No newline at end of file diff --git a/app/views/media/medium/_buttons.html.erb b/app/views/media/medium/_buttons.html.erb index c1c4317fd..b5d4aa09c 100644 --- a/app/views/media/medium/_buttons.html.erb +++ b/app/views/media/medium/_buttons.html.erb @@ -1,124 +1,81 @@ <% if medium.video.present? %> -
+
- - play_arrow - + class="btn btn-outline-secondary" role="button" + target="_blank" title="<%= t('video.play') %>"> +
<% end %> <% if medium.manuscript.present? %> -
+
- - library_books - + class="btn btn-outline-secondary" role="button" + target="_blank" title="<%= t('manuscript.view') %>"> +
<% end %> <% if medium.geogebra.present? %> -
+
- - leak_add - + class="btn btn-outline-secondary" role="button" + target="_blank" title="<%= t('geogebra.view') %>"> +
<% end %> <% if medium.external_reference_link.present? %> -
+
- - link - + class="btn btn-outline-secondary" role="button" + target="_blank" title="<%= external_link_description_not_empty(medium) %>"> +
<% end %> <% if medium.sort == 'Quiz' && medium.quiz_graph %> -
+
- - videogame_asset - + class="btn btn-outline-secondary" role="button" + target="_blank" title="<%= t('quiz.start') %>"> +
<% end %> -
+
- - info - + class="btn btn-outline-secondary" role="button" + title="<%= t('medium.details') %>"> +
-<% if medium.video.present? %> -
+
+ <% if medium.video.present? %> - - - ↓mp4 - - + download="<%= video_download_file(medium) %>" + class="triggerDownload download-button btn btn-outline-secondary" role="button" + data-medium="<%= medium.id %>" + data-sort="video" + title="<%= t('video.download') %>"> + ↓mp4 -
-<% end %> + <% end %> -<% if medium.manuscript.present? %> -
+ <% if medium.manuscript.present? %> - - - ↓pdf - - + download="<%= manuscript_download_file(medium) %>" + class="triggerDownload download-button btn btn-outline-secondary" role="button" + data-medium="<%= medium.id %>" + data-sort="manuscript" + title="<%= t('manuscript.download') %>"> + ↓pdf -
-<% end %> \ No newline at end of file + <% end %> +
diff --git a/app/views/watchlist_entries/_entry.html.erb b/app/views/watchlist_entries/_entry.html.erb deleted file mode 100644 index d42ec761a..000000000 --- a/app/views/watchlist_entries/_entry.html.erb +++ /dev/null @@ -1,138 +0,0 @@ -<% I18n.with_locale(medium.locale_with_inheritance) do %> -
-
-
- <% if lecture&.imported_media&.include?(medium) %> - - - <% end %> - <% ref = medium.card_header_teachable_path(current_user) %> - <% if ref.present? %> - <%= link_to medium.card_header, - ref, - class: 'text-light', - id: 'card-title', - data: { id: entry.id } %> - <% else %> - > - <%= medium.card_header %> - - <% end %> -
-
- <% if current_user.locale.to_s != medium.locale_with_inheritance %> - - <%= medium.locale_with_inheritance.to_s %> - - <% end %> - <% if !medium.published? && !medium.publisher %> - - - <% elsif !medium.published? && medium.publisher.present? %> - - - <% elsif medium.locked? %> - - - <% elsif lecture && medium.teachable_type == 'Course' && !lecture.imported_media&.include?(medium) && - (current_user.admin || lecture.edited_by?(current_user)) && - (medium.tags & lecture.tags_including_media_tags).blank? %> - - - <% end %> - <% if @watchlist.owned_by?(current_user) %> - <%= link_to '', - watchlist_entry_path(entry, - watchlist: @watchlist.id, - reverse: params[:reverse], - all: params[:all], - page: params[:page], - per: params[:per]), - class: 'fas fa-minus text-light me-2', - style: 'text-decoration: none;', - data: { toggle: 'tooltip', - placement: 'bottom', - confirm: t('watchlist_entry.remove_confirm') }, - title: t('watchlist_entry.remove'), - method: :delete %> - <% end %> -
-
- <% cache [medium, from == 'tag', ref_link] do %> - <% unless from == 'tag' %> - <% if medium.screenshot.present? %> - <%= image_tag(medium.screenshot_url_with_host, - alt: "Card image cap", - class: "card-img-top") %> - <% elsif medium.manuscript.present? %> - <%= image_tag(medium.manuscript_screenshot_url || '', - alt: "Card image cap", - class: "card-img-top manuscript-thumbnail") %> - <% elsif medium.geogebra_screenshot_url.present? %> - <%= image_tag(medium.geogebra_screenshot_url, - alt: 'Card image cap', - class: 'card-img-top') %> - <% end %> - <% end %> -
- <% unless medium.caption.nil? %> -
-
-
- <%= medium.caption %> -
-
-
- - <%= medium.card_subheader %> - -
-
- <% end %> -
- <% medium.tags.each do |t| %> - <%= link_to t.short_title(30), - t, - class: "badge text-dark lecture-tag tagbadge", - title: t.title, - data: { toggle: 'tooltip', placement: 'bottom'} %> - <% end %> -
-
-
- -
- <% end %> -
-<% end %> \ No newline at end of file diff --git a/app/views/watchlists/show.html.erb b/app/views/watchlists/show.html.erb index b9c2f81e3..3d553d4a7 100644 --- a/app/views/watchlists/show.html.erb +++ b/app/views/watchlists/show.html.erb @@ -33,14 +33,13 @@ <% if @watchlist_entries.present? %>
<% @watchlist_entries.each do |entry| %> -
- <%= render partial: 'watchlist_entries/entry', +
+ <%= render partial: 'media/medium', locals: { medium: entry.medium, entry: entry, tags: entry.medium.tags, - from: 'media', + from: 'watchlist', ref_link: nil, - data: { id: entry.id }, lecture: entry.medium.lecture } %>
<% end %> From 4a0e10302a99c8a8e67b38101b29b0069057ae7e Mon Sep 17 00:00:00 2001 From: Splines <37160523+Splines@users.noreply.github.com> Date: Mon, 12 Aug 2024 09:38:46 +0200 Subject: [PATCH 09/17] Add endpoint to skip validation in Cypress tests (#669) * Expose MaMpf to another port to avoid clashing with dev * Add an endpoint to skip validation when creating factory --- .../cypress/factories_controller.rb | 22 +++++++++++++++---- docker/test/docker-compose.yml | 2 +- spec/cypress/support/factorybot.js | 5 +++++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/app/controllers/cypress/factories_controller.rb b/app/controllers/cypress/factories_controller.rb index db0677755..157e9e331 100644 --- a/app/controllers/cypress/factories_controller.rb +++ b/app/controllers/cypress/factories_controller.rb @@ -13,8 +13,14 @@ def create raise(ArgumentError, msg) end - attributes = params_to_attributes(params.except(:controller, :action, :number)) - res = FactoryBot.create(*attributes) + attributes, should_validate = params_to_attributes(params.except(:controller, :action, + :number)) + + res = if should_validate + FactoryBot.create(*attributes) # default case + else + FactoryBot.build(*attributes).tap { |instance| instance.save(validate: false) } + end render json: res.to_json, status: :created end @@ -22,15 +28,23 @@ def create private def params_to_attributes(params) - params.to_unsafe_hash.map do |_key, value| + should_validate = true + + attributes = params.to_unsafe_hash.filter_map do |_key, value| if value.is_a?(Hash) - value.transform_keys(&:to_sym) + if value.key?("validate") + should_validate = (value["validate"] != "false") + else + value.transform_keys(&:to_sym) + end elsif value.is_a?(String) value.to_sym else throw("Value is neither a hash nor a string: #{value}") end end + + return attributes, should_validate end end end diff --git a/docker/test/docker-compose.yml b/docker/test/docker-compose.yml index 34916abd1..d795b4ad3 100644 --- a/docker/test/docker-compose.yml +++ b/docker/test/docker-compose.yml @@ -38,7 +38,7 @@ services: dockerfile: docker/test/Dockerfile image: mampf:tests ports: - - "3000:3000" + - "3100:3000" environment: RAILS_ENV: test TEST_DATABASE_ADAPTER: postgresql diff --git a/spec/cypress/support/factorybot.js b/spec/cypress/support/factorybot.js index fc1d4b05e..973ffacd0 100644 --- a/spec/cypress/support/factorybot.js +++ b/spec/cypress/support/factorybot.js @@ -17,6 +17,11 @@ class FactoryBot { create(...args) { return BackendCaller.callCypressRoute("factories", "FactoryBot.create()", args); } + + createNoValidate(...args) { + args.push({ validate: false }); + return this.create(...args); + } } export default new FactoryBot(); From 232b2075050ce28ae591979f9795a7f043ccaf6d Mon Sep 17 00:00:00 2001 From: Splines <37160523+Splines@users.noreply.github.com> Date: Tue, 13 Aug 2024 19:39:55 +0200 Subject: [PATCH 10/17] Update Gemfile dependencies (#672) --- Gemfile.lock | 273 ++++++++++++++++++++++++++------------------------- 1 file changed, 141 insertions(+), 132 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2c50d5a08..9cd99b59f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,21 +1,21 @@ GIT remote: https://github.com/rails/sprockets-rails - revision: 065cbe83989c44019eca7161782ed4fdb6473517 + revision: 2c04236faaacd021b7810289cbac93e962ff14da branch: master specs: - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) GIT remote: https://github.com/sunspot/sunspot.git - revision: 41a311e9eff34df5ae7c51905574677dd474e91e + revision: 2cb3e49c6e9c8ec23b8d95f9dcf2d28d1248d61b glob: sunspot_rails/*.gemspec specs: - sunspot_rails (2.6.0) + sunspot_rails (2.7.1) rails (>= 5) - sunspot (= 2.6.0) + sunspot (= 2.7.1) GIT remote: https://github.com/thredded/thredded-markdown_katex.git @@ -55,48 +55,48 @@ GIT GIT remote: https://github.com/zdennis/activerecord-import.git - revision: f41a5782b0a3f19cf42e88063aa4adbefafe4092 + revision: fca8b823ae695b03714837cc6603f51525c60505 branch: master specs: - activerecord-import (1.6.0) + activerecord-import (1.7.0) activerecord (>= 4.2) GEM remote: https://rubygems.org/ specs: - Ascii85 (1.1.0) - RubyInline (3.14.0) + Ascii85 (1.1.1) + RubyInline (3.14.1) ZenTest (~> 4.3) - ZenTest (4.12.1) - actioncable (7.1.3.2) - actionpack (= 7.1.3.2) - activesupport (= 7.1.3.2) + ZenTest (4.12.2) + actioncable (7.1.3.4) + actionpack (= 7.1.3.4) + activesupport (= 7.1.3.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.3.2) - actionpack (= 7.1.3.2) - activejob (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + 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) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.3.2) - actionpack (= 7.1.3.2) - actionview (= 7.1.3.2) - activejob (= 7.1.3.2) - activesupport (= 7.1.3.2) + 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) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.3.2) - actionview (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionpack (7.1.3.4) + actionview (= 7.1.3.4) + activesupport (= 7.1.3.4) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -104,15 +104,15 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.3.2) - actionpack (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + 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) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3.2) - activesupport (= 7.1.3.2) + actionview (7.1.3.4) + activesupport (= 7.1.3.4) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) @@ -124,24 +124,24 @@ GEM jsonapi-renderer (>= 0.1.1.beta1, < 0.3) active_record_union (1.3.0) activerecord (>= 4.0) - activejob (7.1.3.2) - activesupport (= 7.1.3.2) + activejob (7.1.3.4) + activesupport (= 7.1.3.4) globalid (>= 0.3.6) - activemodel (7.1.3.2) - activesupport (= 7.1.3.2) - activerecord (7.1.3.2) - activemodel (= 7.1.3.2) - activesupport (= 7.1.3.2) + 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) timeout (>= 0.4.0) activerecord-nulldb-adapter (1.0.1) activerecord (>= 5.2.0, < 7.2) - activestorage (7.1.3.2) - actionpack (= 7.1.3.2) - activejob (= 7.1.3.2) - activerecord (= 7.1.3.2) - activesupport (= 7.1.3.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) marcel (~> 1.0) - activesupport (7.1.3.2) + activesupport (7.1.3.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -151,16 +151,17 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - acts_as_list (1.1.0) - activerecord (>= 4.2) + acts_as_list (1.2.2) + activerecord (>= 6.1) + activesupport (>= 6.1) acts_as_tree (2.9.1) activerecord (>= 3.0.0) acts_as_votable (0.14.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) afm (0.2.2) ast (2.4.2) - autoprefixer-rails (10.4.16.0) + autoprefixer-rails (10.4.19.0) execjs (~> 2) babel-source (5.8.35) babel-transpiler (0.7.0) @@ -169,9 +170,9 @@ GEM barby (0.6.9) base64 (0.2.0) bcrypt (3.1.20) - bigdecimal (3.1.7) + bigdecimal (3.1.8) bindex (0.8.1) - bootsnap (1.18.3) + bootsnap (1.18.4) msgpack (~> 1.2) bootstrap (5.3.3) autoprefixer-rails (>= 9.1.0) @@ -179,12 +180,13 @@ GEM bootstrap_form (5.4.0) actionpack (>= 6.1) activemodel (>= 6.1) - builder (3.2.4) + builder (3.3.0) byebug (11.1.3) - cancancan (3.5.0) + cancancan (3.6.1) case_transform (0.2) activesupport - childprocess (5.0.0) + childprocess (5.1.0) + logger (~> 1.5) choice (0.2.0) chunky_png (1.4.0) clipboard-rails (1.7.1) @@ -199,7 +201,7 @@ GEM rails (>= 6.0) sprockets-rails will_paginate - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) content_disposition (1.0.0) coveralls (0.7.1) @@ -212,7 +214,7 @@ GEM css_parser (1.17.1) addressable dalli (3.2.8) - database_cleaner-active_record (2.1.0) + database_cleaner-active_record (2.2.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) @@ -227,12 +229,12 @@ GEM warden (~> 1.2.3) devise-bootstrap-views (1.1.0) diff-lcs (1.5.1) - docile (1.4.0) + docile (1.4.1) domain_name (0.6.20240107) down (5.4.2) addressable (~> 2.8) drb (2.2.1) - erubi (1.12.0) + erubi (1.13.0) erubis (2.7.0) et-orbi (1.2.11) tzinfo @@ -246,7 +248,7 @@ GEM factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) - faker (3.3.1) + faker (3.4.2) i18n (>= 1.8.11, < 2) faraday (1.10.3) faraday-em_http (~> 1.0) @@ -266,13 +268,13 @@ GEM faraday-httpclient (1.0.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) fastimage (2.3.1) - ffi (1.16.3) + ffi (1.17.0-x86_64-linux-gnu) filesize (0.2.0) friendly_id (5.5.1) activerecord (>= 4.0.0) @@ -284,25 +286,26 @@ GEM globalid (1.2.1) activesupport (>= 6.1) hashery (2.1.2) - highline (2.1.0) + highline (3.1.0) + reline html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) htmlentities (4.3.4) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) - image_processing (1.12.2) + image_processing (1.13.0) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) inline_svg (1.9.0) activesupport (>= 3.0) nokogiri (>= 1.6) io-console (0.7.2) - irb (1.12.0) - rdoc + irb (1.14.0) + rdoc (>= 4.0.0) reline (>= 0.4.2) jbuilder (2.12.0) actionview (>= 5.0.0) @@ -343,12 +346,13 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) language_server-protocol (3.17.0.3) - launchy (3.0.0) + launchy (3.0.1) addressable (~> 2.8) childprocess (~> 5.0) 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) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -360,19 +364,19 @@ GEM marcel (1.0.4) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) - mini_magick (4.12.0) + mime-types-data (3.2024.0806) + mini_magick (4.13.2) mini_mime (1.1.5) - minitest (5.22.3) + minitest (5.24.1) mobility (1.2.9) i18n (>= 0.6.10, < 2) request_store (~> 1.0) msgpack (1.7.2) multi_json (1.15.0) - multipart-post (2.4.0) + multipart-post (2.4.1) mustache (1.1.1) mutex_m (0.2.0) - net-imap (0.4.10) + net-imap (0.4.14) date net-protocol net-pop (0.1.2) @@ -382,8 +386,8 @@ GEM net-smtp (0.5.0) net-protocol netrc (0.11.0) - nio4r (2.7.1) - nokogiri (1.16.4-x86_64-linux) + nio4r (2.7.3) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) onebox (2.2.19) addressable (~> 2.8.0) @@ -395,8 +399,8 @@ GEM options (2.3.2) orm_adapter (0.5.0) pairing_heap (3.1.0) - parallel (1.24.0) - parser (3.3.1.0) + parallel (1.26.2) + parser (3.3.4.2) ast (~> 2.4.1) racc pdf-reader (2.12.0) @@ -405,7 +409,7 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.5.6) + pg (1.5.7) pgreset (0.4) popper_js (2.11.8) pr_geohash (1.0.0) @@ -417,20 +421,20 @@ GEM actionmailer (>= 3) net-smtp premailer (~> 1.7, >= 1.7.9) - progress_bar (1.3.3) - highline (>= 1.6, < 3) + progress_bar (1.3.4) + highline (>= 1.6) options (~> 2.3.0) - prometheus_exporter (2.1.0) + prometheus_exporter (2.1.1) webrick psych (5.1.2) stringio - public_suffix (5.0.5) + public_suffix (6.0.1) puma (6.4.2) nio4r (~> 2.0) pundit (2.3.2) activesupport (>= 3.0.0) raabro (1.4.0) - racc (1.7.3) + racc (1.8.1) rack (2.2.9) rack-proxy (0.7.7) rack @@ -441,20 +445,20 @@ GEM rackup (1.0.0) rack (< 3) webrick - rails (7.1.3.2) - actioncable (= 7.1.3.2) - actionmailbox (= 7.1.3.2) - actionmailer (= 7.1.3.2) - actionpack (= 7.1.3.2) - actiontext (= 7.1.3.2) - actionview (= 7.1.3.2) - activejob (= 7.1.3.2) - activemodel (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + 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) bundler (>= 1.15.0) - railties (= 7.1.3.2) + railties (= 7.1.3.4) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -472,9 +476,9 @@ GEM railties (>= 6.0.0, < 8) rails_gravatar (1.0.4) actionview - railties (7.1.3.2) - actionpack (= 7.1.3.2) - activesupport (= 7.1.3.2) + railties (7.1.3.4) + actionpack (= 7.1.3.4) + activesupport (= 7.1.3.4) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -483,16 +487,16 @@ GEM rainbow (3.1.1) rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - rdoc (6.6.3.1) + rdoc (6.7.0) psych (>= 4.0.0) - redis-client (0.22.1) + redis-client (0.22.2) connection_pool - regexp_parser (2.9.0) - reline (0.5.4) + regexp_parser (2.9.2) + reline (0.5.9) io-console (~> 0.5) - request_store (1.6.0) + request_store (1.7.0) rack (>= 1.4) responders (3.1.1) actionpack (>= 5.2) @@ -502,7 +506,8 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.6) + rexml (3.3.5) + strscan rgl (0.6.6) pairing_heap (>= 0.3, < 4.0) rexml (~> 3.2, >= 3.2.4) @@ -517,15 +522,15 @@ GEM faraday (>= 0.9, < 3, != 2.0.0) rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.1) 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.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (6.1.2) + rspec-rails (6.1.3) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) @@ -534,23 +539,23 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.63.4) + rubocop (1.65.1) 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 (>= 1.8, < 3.0) + regexp_parser (>= 2.4, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) + rubocop-ast (1.32.0) parser (>= 3.3.1.0) - rubocop-performance (1.21.0) + rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.24.1) + rubocop-rails (2.25.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -559,11 +564,12 @@ GEM rexml ruby-progressbar (1.13.0) ruby-rc4 (0.1.5) - ruby-vips (2.2.1) + ruby-vips (2.2.2) ffi (~> 1.12) + logger ruby2_keywords (0.0.5) rubyzip (2.3.2) - sanitize (6.1.0) + sanitize (6.1.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) sass-rails (6.0.0) @@ -584,11 +590,12 @@ GEM shrine (3.6.0) content_disposition (~> 1.0) down (~> 5.1) - sidekiq (7.2.4) + sidekiq (7.3.0) concurrent-ruby (< 2) connection_pool (>= 2.3.0) + logger rack (>= 2.2.4) - redis-client (>= 0.19.0) + redis-client (>= 0.22.2) sidekiq-cron (1.12.0) fugit (~> 1.8) globalid (>= 1.0.1) @@ -617,18 +624,20 @@ GEM stream (0.5.5) streamio-ffmpeg (3.0.2) multi_json (~> 1.8) - stringio (3.1.0) - sunspot (2.6.0) + stringio (3.1.1) + strscan (3.1.0) + sunspot (2.7.1) + bigdecimal pr_geohash (~> 1.0) rsolr (>= 1.1.1, < 3) - sunspot_solr (2.6.0) + sunspot_solr (2.7.1) sync (0.5.0) - term-ansicolor (1.8.0) + term-ansicolor (1.11.2) tins (~> 1.0) - terser (1.2.2) + terser (1.2.3) execjs (>= 0.3.0, < 3) thor (1.3.1) - tilt (2.3.0) + tilt (2.4.0) timeago_js (3.0.2.2) timeout (0.4.1) tins (1.33.0) @@ -661,12 +670,12 @@ GEM railties (>= 5.2) semantic_range (>= 2.3.0) webrick (1.8.1) - websocket (1.2.10) + websocket (1.2.11) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - will_paginate (4.0.0) - zeitwerk (2.6.13) + will_paginate (4.0.1) + zeitwerk (2.6.17) PLATFORMS x86_64-linux From 6012d2d0a2ea68fd583f1f9810f9d3f07f23050d Mon Sep 17 00:00:00 2001 From: Splines <37160523+Splines@users.noreply.github.com> Date: Tue, 13 Aug 2024 19:40:21 +0200 Subject: [PATCH 11/17] Update yarn dependencies (#673) --- yarn.lock | 3155 ++++++++++++++++++++++++++++------------------------- 1 file changed, 1640 insertions(+), 1515 deletions(-) diff --git a/yarn.lock b/yarn.lock index be87168f9..41cab5418 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,289 +2,276 @@ # yarn lockfile v1 -"@aashutoshrathi/word-wrap@^1.2.3": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" - integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== - "@ampproject/remapping@^2.2.0": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" - integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg== + version "2.3.0" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4" + integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw== dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.24" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658" - integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ== +"@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== dependencies: - "@babel/highlight" "^7.22.5" + "@babel/highlight" "^7.24.7" + picocolors "^1.0.0" -"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255" - integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA== +"@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/core@^7.15.0": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.5.tgz#d67d9747ecf26ee7ecd3ebae1ee22225fe902a89" - integrity sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg== + 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== dependencies: "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.22.5" - "@babel/generator" "^7.22.5" - "@babel/helper-compilation-targets" "^7.22.5" - "@babel/helper-module-transforms" "^7.22.5" - "@babel/helpers" "^7.22.5" - "@babel/parser" "^7.22.5" - "@babel/template" "^7.22.5" - "@babel/traverse" "^7.22.5" - "@babel/types" "^7.22.5" - convert-source-map "^1.7.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" + convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.2.2" - semver "^6.3.0" + json5 "^2.2.3" + semver "^6.3.1" -"@babel/generator@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.5.tgz#1e7bf768688acfb05cf30b2369ef855e82d984f7" - integrity sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA== +"@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== dependencies: - "@babel/types" "^7.22.5" - "@jridgewell/gen-mapping" "^0.3.2" - "@jridgewell/trace-mapping" "^0.3.17" + "@babel/types" "^7.25.0" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" -"@babel/helper-annotate-as-pure@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882" - integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg== +"@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== dependencies: - "@babel/types" "^7.22.5" + "@babel/types" "^7.24.7" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz#a3f4758efdd0190d8927fcffd261755937c71878" - integrity sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw== +"@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== dependencies: - "@babel/types" "^7.22.5" + "@babel/traverse" "^7.24.7" + "@babel/types" "^7.24.7" -"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz#fc7319fc54c5e2fa14b2909cf3c5fd3046813e02" - integrity sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw== +"@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== dependencies: - "@babel/compat-data" "^7.22.5" - "@babel/helper-validator-option" "^7.22.5" - browserslist "^4.21.3" + "@babel/compat-data" "^7.25.2" + "@babel/helper-validator-option" "^7.24.8" + browserslist "^4.23.1" lru-cache "^5.1.1" - semver "^6.3.0" - -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz#2192a1970ece4685fbff85b48da2c32fcb130b7c" - integrity sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-function-name" "^7.22.5" - "@babel/helper-member-expression-to-functions" "^7.22.5" - "@babel/helper-optimise-call-expression" "^7.22.5" - "@babel/helper-replace-supers" "^7.22.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.5" - semver "^6.3.0" - -"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz#bb2bf0debfe39b831986a4efbf4066586819c6e4" - integrity sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" + 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" + 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== + dependencies: + "@babel/helper-annotate-as-pure" "^7.24.7" regexpu-core "^5.3.1" - semver "^6.3.0" + semver "^6.3.1" -"@babel/helper-define-polyfill-provider@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz#487053f103110f25b9755c5980e031e93ced24d8" - integrity sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg== +"@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== dependencies: - "@babel/helper-compilation-targets" "^7.17.7" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-compilation-targets" "^7.22.6" + "@babel/helper-plugin-utils" "^7.22.5" debug "^4.1.1" lodash.debounce "^4.0.8" resolve "^1.14.2" - semver "^6.1.2" - -"@babel/helper-environment-visitor@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98" - integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q== - -"@babel/helper-function-name@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be" - integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ== - dependencies: - "@babel/template" "^7.22.5" - "@babel/types" "^7.22.5" - -"@babel/helper-hoist-variables@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" - integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-member-expression-to-functions@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2" - integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-module-imports@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c" - integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-module-transforms@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz#0f65daa0716961b6e96b164034e737f60a80d2ef" - integrity sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw== - dependencies: - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-module-imports" "^7.22.5" - "@babel/helper-simple-access" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.5" - "@babel/helper-validator-identifier" "^7.22.5" - "@babel/template" "^7.22.5" - "@babel/traverse" "^7.22.5" - "@babel/types" "^7.22.5" - -"@babel/helper-optimise-call-expression@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e" - integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw== - dependencies: - "@babel/types" "^7.22.5" - -"@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.16.7", "@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.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" - integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== - -"@babel/helper-remap-async-to-generator@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz#14a38141a7bf2165ad38da61d61cf27b43015da2" - integrity sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-wrap-function" "^7.22.5" - "@babel/types" "^7.22.5" - -"@babel/helper-replace-supers@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz#71bc5fb348856dea9fdc4eafd7e2e49f585145dc" - integrity sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg== - dependencies: - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-member-expression-to-functions" "^7.22.5" - "@babel/helper-optimise-call-expression" "^7.22.5" - "@babel/template" "^7.22.5" - "@babel/traverse" "^7.22.5" - "@babel/types" "^7.22.5" - -"@babel/helper-simple-access@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" - integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-skip-transparent-expression-wrappers@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847" - integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-split-export-declaration@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz#88cf11050edb95ed08d596f7a044462189127a08" - integrity sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-string-parser@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" - integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== - -"@babel/helper-validator-identifier@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" - integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== - -"@babel/helper-validator-option@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac" - integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw== - -"@babel/helper-wrap-function@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz#44d205af19ed8d872b4eefb0d2fa65f45eb34f06" - integrity sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw== - dependencies: - "@babel/helper-function-name" "^7.22.5" - "@babel/template" "^7.22.5" - "@babel/traverse" "^7.22.5" - "@babel/types" "^7.22.5" - -"@babel/helpers@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.5.tgz#74bb4373eb390d1ceed74a15ef97767e63120820" - integrity sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q== - dependencies: - "@babel/template" "^7.22.5" - "@babel/traverse" "^7.22.5" - "@babel/types" "^7.22.5" - -"@babel/highlight@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031" - integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw== - dependencies: - "@babel/helper-validator-identifier" "^7.22.5" - chalk "^2.0.0" + +"@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/parser@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea" - integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q== +"@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== + dependencies: + "@babel/types" "^7.25.2" -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5": - version "7.22.5" - 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.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e" - integrity sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.8" + "@babel/traverse" "^7.25.3" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz#fef09f9499b1f1c930da8a0c419db42167d792ca" - integrity sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" - "@babel/plugin-transform-optional-chaining" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.8" + +"@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== + dependencies: + "@babel/helper-plugin-utils" "^7.24.8" + +"@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== + 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/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== + dependencies: + "@babel/helper-plugin-utils" "^7.24.8" + "@babel/traverse" "^7.25.0" "@babel/plugin-proposal-class-properties@^7.14.5": version "7.18.6" @@ -310,14 +297,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-proposal-unicode-property-regex@^7.4.4": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e" - integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - "@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" @@ -353,19 +332,19 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-import-assertions@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz#07d252e2aa0bc6125567f742cd58619cb14dce98" - integrity sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg== +"@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.22.5" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-syntax-import-attributes@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz#ab840248d834410b829f569f5262b9e517555ecb" - integrity sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-import-meta@^7.10.4": version "7.10.4" @@ -445,425 +424,433 @@ "@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-arrow-functions@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz#e5ba566d0c58a5b2ba2a8b795450641950b71958" - integrity sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw== +"@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.22.5" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-async-generator-functions@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz#7336356d23380eda9a56314974f053a020dab0c3" - integrity sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg== +"@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-environment-visitor" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-remap-async-to-generator" "^7.22.5" + "@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.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775" - integrity sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ== +"@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.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-remap-async-to-generator" "^7.22.5" + "@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.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz#27978075bfaeb9fa586d3cb63a3d30c1de580024" - integrity sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA== +"@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.22.5" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-block-scoping@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz#8bfc793b3a4b2742c0983fadc1480d843ecea31b" - integrity sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg== +"@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.22.5" + "@babel/helper-plugin-utils" "^7.24.8" -"@babel/plugin-transform-class-properties@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz#97a56e31ad8c9dc06a0b3710ce7803d5a48cca77" - integrity sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ== +"@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.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-create-class-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-class-static-block@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz#3e40c46f048403472d6f4183116d5e46b1bff5ba" - integrity sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA== +"@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.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@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.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz#635d4e98da741fad814984639f4c0149eb0135e1" - integrity sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ== +"@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.22.5" - "@babel/helper-compilation-targets" "^7.22.5" - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-function-name" "^7.22.5" - "@babel/helper-optimise-call-expression" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-replace-supers" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.5" + "@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" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869" - integrity sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/template" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/template" "^7.24.7" -"@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz#d3aca7438f6c26c78cdd0b0ba920a336001b27cc" - integrity sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.8" -"@babel/plugin-transform-dotall-regex@^7.22.5", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165" - integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw== +"@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== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-create-regexp-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-duplicate-keys@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285" - integrity sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-dynamic-import@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz#d6908a8916a810468c4edff73b5b75bda6ad393e" - integrity sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-create-regexp-features-plugin" "^7.25.0" + "@babel/helper-plugin-utils" "^7.24.8" + +"@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== + dependencies: + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-transform-exponentiation-operator@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz#402432ad544a1f9a480da865fda26be653e48f6a" - integrity sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g== +"@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== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-export-namespace-from@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz#57c41cb1d0613d22f548fddd8b288eedb9973a5b" - integrity sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-transform-for-of@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz#ab1b8a200a8f990137aff9a084f8de4099ab173f" - integrity sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" -"@babel/plugin-transform-function-name@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz#935189af68b01898e0d6d99658db6b164205c143" - integrity sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg== +"@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== dependencies: - "@babel/helper-compilation-targets" "^7.22.5" - "@babel/helper-function-name" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-compilation-targets" "^7.24.8" + "@babel/helper-plugin-utils" "^7.24.8" + "@babel/traverse" "^7.25.1" -"@babel/plugin-transform-json-strings@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz#14b64352fdf7e1f737eed68de1a1468bd2a77ec0" - integrity sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-transform-literals@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz#e9341f4b5a167952576e23db8d435849b1dd7920" - integrity sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.8" -"@babel/plugin-transform-logical-assignment-operators@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz#66ae5f068fd5a9a5dc570df16f56c2a8462a9d6c" - integrity sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-transform-member-expression-literals@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz#4fcc9050eded981a468347dd374539ed3e058def" - integrity sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-modules-amd@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz#4e045f55dcf98afd00f85691a68fc0780704f526" - integrity sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ== +"@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== dependencies: - "@babel/helper-module-transforms" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-module-transforms" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-modules-commonjs@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa" - integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA== +"@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== dependencies: - "@babel/helper-module-transforms" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-simple-access" "^7.22.5" + "@babel/helper-module-transforms" "^7.24.8" + "@babel/helper-plugin-utils" "^7.24.8" + "@babel/helper-simple-access" "^7.24.7" -"@babel/plugin-transform-modules-systemjs@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz#18c31410b5e579a0092638f95c896c2a98a5d496" - integrity sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ== +"@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== dependencies: - "@babel/helper-hoist-variables" "^7.22.5" - "@babel/helper-module-transforms" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-validator-identifier" "^7.22.5" + "@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/plugin-transform-modules-umd@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98" - integrity sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ== +"@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== dependencies: - "@babel/helper-module-transforms" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-module-transforms" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f" - integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ== +"@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== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-create-regexp-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-new-target@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz#1b248acea54ce44ea06dfd37247ba089fcf9758d" - integrity sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-nullish-coalescing-operator@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz#f8872c65776e0b552e0849d7596cddd416c3e381" - integrity sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" -"@babel/plugin-transform-numeric-separator@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz#57226a2ed9e512b9b446517ab6fa2d17abb83f58" - integrity sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-transform-object-rest-spread@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz#9686dc3447df4753b0b2a2fae7e8bc33cdc1f2e1" - integrity sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ== +"@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== dependencies: - "@babel/compat-data" "^7.22.5" - "@babel/helper-compilation-targets" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@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.22.5" + "@babel/plugin-transform-parameters" "^7.24.7" -"@babel/plugin-transform-object-super@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz#794a8d2fcb5d0835af722173c1a9d704f44e218c" - integrity sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-replace-supers" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-replace-supers" "^7.24.7" -"@babel/plugin-transform-optional-catch-binding@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz#842080be3076703be0eaf32ead6ac8174edee333" - integrity sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-transform-optional-chaining@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz#1003762b9c14295501beb41be72426736bedd1e0" - integrity sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@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/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz#c3542dd3c39b42c8069936e48717a8d179d63a18" - integrity sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-private-methods@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz#21c8af791f76674420a147ae62e9935d790f8722" - integrity sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA== +"@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== dependencies: - "@babel/helper-create-class-features-plugin" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-create-class-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-private-property-in-object@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz#07a77f28cbb251546a43d175a1dda4cf3ef83e32" - integrity sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ== +"@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== dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-create-class-features-plugin" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@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/plugin-transform-property-literals@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz#b5ddabd73a4f7f26cd0e20f5db48290b88732766" - integrity sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-regenerator@^7.14.5", "@babel/plugin-transform-regenerator@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz#cd8a68b228a5f75fa01420e8cc2fc400f0fc32aa" - integrity sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - regenerator-transform "^0.15.1" + "@babel/helper-plugin-utils" "^7.24.7" + regenerator-transform "^0.15.2" -"@babel/plugin-transform-reserved-words@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz#832cd35b81c287c4bcd09ce03e22199641f964fb" - integrity sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-transform-runtime@^7.15.0": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.5.tgz#ca975fb5e260044473c8142e1b18b567d33c2a3b" - integrity sha512-bg4Wxd1FWeFx3daHFTWk1pkSWK/AyQuiyAoeZAOkAOUBjnZPH6KT7eMxouV47tQ6hl6ax2zyAWBdWZXbrvXlaw== + 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== dependencies: - "@babel/helper-module-imports" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - babel-plugin-polyfill-corejs2 "^0.4.3" - babel-plugin-polyfill-corejs3 "^0.8.1" - babel-plugin-polyfill-regenerator "^0.5.0" - semver "^6.3.0" + "@babel/helper-module-imports" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" + babel-plugin-polyfill-corejs2 "^0.4.10" + babel-plugin-polyfill-corejs3 "^0.10.1" + babel-plugin-polyfill-regenerator "^0.6.1" + semver "^6.3.1" -"@babel/plugin-transform-shorthand-properties@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624" - integrity sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-spread@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz#6487fd29f229c95e284ba6c98d65eafb893fea6b" - integrity sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" -"@babel/plugin-transform-sticky-regex@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz#295aba1595bfc8197abd02eae5fc288c0deb26aa" - integrity sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-template-literals@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz#8f38cf291e5f7a8e60e9f733193f0bcc10909bff" - integrity sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-typeof-symbol@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz#5e2ba478da4b603af8673ff7c54f75a97b716b34" - integrity sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.8" -"@babel/plugin-transform-unicode-escapes@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz#ce0c248522b1cb22c7c992d88301a5ead70e806c" - integrity sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg== +"@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== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-unicode-property-regex@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz#098898f74d5c1e86660dc112057b2d11227f1c81" - integrity sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A== +"@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== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-create-regexp-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-unicode-regex@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz#ce7e7bb3ef208c4ff67e02a22816656256d7a183" - integrity sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg== +"@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== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-create-regexp-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-unicode-sets-regex@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz#77788060e511b708ffc7d42fdfbc5b37c3004e91" - integrity sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg== +"@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== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-create-regexp-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/preset-env@^7.15.0": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.5.tgz#3da66078b181f3d62512c51cf7014392c511504e" - integrity sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A== - dependencies: - "@babel/compat-data" "^7.22.5" - "@babel/helper-compilation-targets" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-validator-option" "^7.22.5" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.5" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.5" + 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" "@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.22.5" - "@babel/plugin-syntax-import-attributes" "^7.22.5" + "@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" @@ -875,70 +862,68 @@ "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-syntax-top-level-await" "^7.14.5" "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6" - "@babel/plugin-transform-arrow-functions" "^7.22.5" - "@babel/plugin-transform-async-generator-functions" "^7.22.5" - "@babel/plugin-transform-async-to-generator" "^7.22.5" - "@babel/plugin-transform-block-scoped-functions" "^7.22.5" - "@babel/plugin-transform-block-scoping" "^7.22.5" - "@babel/plugin-transform-class-properties" "^7.22.5" - "@babel/plugin-transform-class-static-block" "^7.22.5" - "@babel/plugin-transform-classes" "^7.22.5" - "@babel/plugin-transform-computed-properties" "^7.22.5" - "@babel/plugin-transform-destructuring" "^7.22.5" - "@babel/plugin-transform-dotall-regex" "^7.22.5" - "@babel/plugin-transform-duplicate-keys" "^7.22.5" - "@babel/plugin-transform-dynamic-import" "^7.22.5" - "@babel/plugin-transform-exponentiation-operator" "^7.22.5" - "@babel/plugin-transform-export-namespace-from" "^7.22.5" - "@babel/plugin-transform-for-of" "^7.22.5" - "@babel/plugin-transform-function-name" "^7.22.5" - "@babel/plugin-transform-json-strings" "^7.22.5" - "@babel/plugin-transform-literals" "^7.22.5" - "@babel/plugin-transform-logical-assignment-operators" "^7.22.5" - "@babel/plugin-transform-member-expression-literals" "^7.22.5" - "@babel/plugin-transform-modules-amd" "^7.22.5" - "@babel/plugin-transform-modules-commonjs" "^7.22.5" - "@babel/plugin-transform-modules-systemjs" "^7.22.5" - "@babel/plugin-transform-modules-umd" "^7.22.5" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5" - "@babel/plugin-transform-new-target" "^7.22.5" - "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.5" - "@babel/plugin-transform-numeric-separator" "^7.22.5" - "@babel/plugin-transform-object-rest-spread" "^7.22.5" - "@babel/plugin-transform-object-super" "^7.22.5" - "@babel/plugin-transform-optional-catch-binding" "^7.22.5" - "@babel/plugin-transform-optional-chaining" "^7.22.5" - "@babel/plugin-transform-parameters" "^7.22.5" - "@babel/plugin-transform-private-methods" "^7.22.5" - "@babel/plugin-transform-private-property-in-object" "^7.22.5" - "@babel/plugin-transform-property-literals" "^7.22.5" - "@babel/plugin-transform-regenerator" "^7.22.5" - "@babel/plugin-transform-reserved-words" "^7.22.5" - "@babel/plugin-transform-shorthand-properties" "^7.22.5" - "@babel/plugin-transform-spread" "^7.22.5" - "@babel/plugin-transform-sticky-regex" "^7.22.5" - "@babel/plugin-transform-template-literals" "^7.22.5" - "@babel/plugin-transform-typeof-symbol" "^7.22.5" - "@babel/plugin-transform-unicode-escapes" "^7.22.5" - "@babel/plugin-transform-unicode-property-regex" "^7.22.5" - "@babel/plugin-transform-unicode-regex" "^7.22.5" - "@babel/plugin-transform-unicode-sets-regex" "^7.22.5" - "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.22.5" - babel-plugin-polyfill-corejs2 "^0.4.3" - babel-plugin-polyfill-corejs3 "^0.8.1" - babel-plugin-polyfill-regenerator "^0.5.0" - core-js-compat "^3.30.2" - semver "^6.3.0" - -"@babel/preset-modules@^0.1.5": - version "0.1.5" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" - integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA== + "@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/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-regenerator "^0.6.1" + core-js-compat "^3.37.1" + semver "^6.3.1" + +"@babel/preset-modules@0.1.6-no-external-plugins": + version "0.1.6-no-external-plugins" + resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz#ccb88a2c49c817236861fee7826080573b8a923a" + integrity sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" - "@babel/plugin-transform-dotall-regex" "^7.4.4" "@babel/types" "^7.4.4" esutils "^2.0.2" @@ -948,52 +933,49 @@ integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== "@babel/runtime-corejs3@^7.10.4": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.22.5.tgz#bbc769b48edb2bdfd404b65ad1fc3952bf33e3c2" - integrity sha512-TNPDN6aBFaUox2Lu+H/Y1dKKQgr4ucz/FGyCz67RVYLsBpVpUFf1dDngzg+Od8aqbrqwyztkaZjtWCZEUOT8zA== + version "7.25.0" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.25.0.tgz#0a318b66dfc765ad10562d829fea372ed7e1eb7d" + integrity sha512-BOehWE7MgQ8W8Qn0CQnMtg2tHPHPulcS/5AVpFvs2KCK1ET+0WqZqPvnpRpFN81gYoFopdIEJX9Sgjw3ZBccPg== dependencies: core-js-pure "^3.30.2" - regenerator-runtime "^0.13.11" + regenerator-runtime "^0.14.0" "@babel/runtime@^7.15.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec" - integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA== - dependencies: - regenerator-runtime "^0.13.11" - -"@babel/template@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec" - integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw== - dependencies: - "@babel/code-frame" "^7.22.5" - "@babel/parser" "^7.22.5" - "@babel/types" "^7.22.5" - -"@babel/traverse@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1" - integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ== - dependencies: - "@babel/code-frame" "^7.22.5" - "@babel/generator" "^7.22.5" - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-function-name" "^7.22.5" - "@babel/helper-hoist-variables" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.5" - "@babel/parser" "^7.22.5" - "@babel/types" "^7.22.5" - debug "^4.1.0" + version "7.25.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.0.tgz#3af9a91c1b739c569d5d80cc917280919c544ecb" + integrity sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw== + 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" + debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.22.5", "@babel/types@^7.4.4": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe" - integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA== +"@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== dependencies: - "@babel/helper-string-parser" "^7.22.5" - "@babel/helper-validator-identifier" "^7.22.5" + "@babel/helper-string-parser" "^7.24.8" + "@babel/helper-validator-identifier" "^7.24.7" to-fast-properties "^2.0.0" "@csstools/convert-colors@^1.4.0": @@ -1013,15 +995,24 @@ dependencies: eslint-visitor-keys "^3.3.0" -"@eslint-community/regexpp@^4.6.1": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63" - integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA== +"@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/eslintrc@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.0.2.tgz#36180f8e85bf34d2fe3ccc2261e8e204a411ab4e" - integrity sha512-wV19ZEGEMAC1eHgrS7UQPqsdEiCIbTKTasEfcXAigzoXICcqZSjBZEHlZwNVvKg6UBCjSlos84XiLqsRJnIcIg== +"@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== + 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== dependencies: ajv "^6.12.4" debug "^4.3.2" @@ -1033,89 +1024,75 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@9.1.1": - version "9.1.1" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.1.1.tgz#eb0f82461d12779bbafc1b5045cde3143d350a8a" - integrity sha512-5WoDz3Y19Bg2BnErkZTp0en+c/i9PvgFS7MBe1+m60HjFr0hrphlAGp4yzI7pxpt4xShln4ZyYp4neJm8hmOkQ== +"@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/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== "@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== -"@humanwhocodes/config-array@^0.13.0": - version "0.13.0" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748" - integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw== - dependencies: - "@humanwhocodes/object-schema" "^2.0.3" - debug "^4.3.1" - minimatch "^3.0.5" - "@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/object-schema@^2.0.3": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3" - integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA== - -"@humanwhocodes/retry@^0.2.3": - version "0.2.3" - resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.2.3.tgz#c9aa036d1afa643f1250e83150f39efb3a15a631" - integrity sha512-X38nUbachlb01YMlvPFojKoiXq+LzZvuSce70KPMPdeM1Rj03k4dR7lDslhbqXn3Ang4EU3+EAmwEAsbrjHW3g== +"@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== -"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" - integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== +"@jridgewell/gen-mapping@^0.3.5": + version "0.3.5" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36" + integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg== dependencies: - "@jridgewell/set-array" "^1.0.1" + "@jridgewell/set-array" "^1.2.1" "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/trace-mapping" "^0.3.24" -"@jridgewell/resolve-uri@3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" - integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== +"@jridgewell/resolve-uri@^3.1.0": + version "3.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" + integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== -"@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== +"@jridgewell/set-array@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280" + integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A== "@jridgewell/source-map@^0.3.3": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.3.tgz#8108265659d4c33e72ffe14e33d6cc5eb59f2fda" - integrity sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg== + version "0.3.6" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.6.tgz#9d71ca886e32502eb9362c9a74a46787c36df81a" + integrity sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ== dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/sourcemap-codec@1.4.14": - version "1.4.14" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" - integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" -"@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.15" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" - integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== +"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a" + integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ== -"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6" - integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA== +"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": + version "0.3.25" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" + integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== dependencies: - "@jridgewell/resolve-uri" "3.1.0" - "@jridgewell/sourcemap-codec" "1.4.14" + "@jridgewell/resolve-uri" "^3.1.0" + "@jridgewell/sourcemap-codec" "^1.4.14" "@leichtgewicht/ip-codec@^2.0.1": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" - integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== + version "2.0.5" + resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz#4fc56c15c580b9adb7dc3c333a134e540b44bfb1" + integrity sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw== "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -1198,10 +1175,10 @@ webpack-cli "^3.3.12" webpack-sources "^1.4.3" -"@stylistic/eslint-plugin-js@1.8.0", "@stylistic/eslint-plugin-js@^1.8.0": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-js/-/eslint-plugin-js-1.8.0.tgz#28085f5e8e94efb587981ff0eefe589006f9bd9d" - integrity sha512-jdvnzt+pZPg8TfclZlTZPiUbbima93ylvQ+wNgHLNmup3obY6heQvgewSu9i2CfS61BnRByv+F9fxQLPoNeHag== +"@stylistic/eslint-plugin-js@1.8.1", "@stylistic/eslint-plugin-js@^1.8.1": + version "1.8.1" + resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-js/-/eslint-plugin-js-1.8.1.tgz#e99ebee73558932e57eb135698153c2e4c0f44a2" + integrity sha512-c5c2C8Mos5tTQd+NWpqwEu7VT6SSRooAguFPMj1cp2RkTYl1ynKoXo8MWy3k4rkbzoeYHrqC2UlUzsroAN7wtQ== dependencies: "@types/eslint" "^8.56.10" acorn "^8.11.3" @@ -1209,78 +1186,78 @@ eslint-visitor-keys "^3.4.3" espree "^9.6.1" -"@stylistic/eslint-plugin-jsx@1.8.0": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-jsx/-/eslint-plugin-jsx-1.8.0.tgz#b3824baa4c34b40983ff57514768ead11e214e6b" - integrity sha512-PC7tYXipF03TTilGJva1amAham7qOAFXT5r5jLTY6iIxkFqyb6H7Ljx5pv8d7n98VyIVidOEKY/AP8vNzAFNKg== +"@stylistic/eslint-plugin-jsx@1.8.1": + version "1.8.1" + resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-jsx/-/eslint-plugin-jsx-1.8.1.tgz#853acc3fb41b88db12c6f1dd4c0219c87f987e5c" + integrity sha512-k1Eb6rcjMP+mmjvj+vd9y5KUdWn1OBkkPLHXhsrHt5lCDFZxJEs0aVQzE5lpYrtVZVkpc5esTtss/cPJux0lfA== dependencies: - "@stylistic/eslint-plugin-js" "^1.8.0" + "@stylistic/eslint-plugin-js" "^1.8.1" "@types/eslint" "^8.56.10" estraverse "^5.3.0" picomatch "^4.0.2" -"@stylistic/eslint-plugin-plus@1.8.0": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-plus/-/eslint-plugin-plus-1.8.0.tgz#871de1a71c990bc093105699d7e36b71f6cf2899" - integrity sha512-TkrjzzYmTuAaLvFwtxomsgMUD8g8PREOQOQzTfKmiJ6oc4XOyFW4q/L9ES1J3UFSLybNCwbhu36lhXJut1w2Sg== +"@stylistic/eslint-plugin-plus@1.8.1": + version "1.8.1" + resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-plus/-/eslint-plugin-plus-1.8.1.tgz#b502f0029de048964e9b561d002c7cd043fa7861" + integrity sha512-4+40H3lHYTN8OWz+US8CamVkO+2hxNLp9+CAjorI7top/lHqemhpJvKA1LD9Uh+WMY9DYWiWpL2+SZ2wAXY9fQ== dependencies: "@types/eslint" "^8.56.10" "@typescript-eslint/utils" "^6.21.0" -"@stylistic/eslint-plugin-ts@1.8.0": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-ts/-/eslint-plugin-ts-1.8.0.tgz#d83033c30908a38dbacc3f50f32cc9b70f9579d3" - integrity sha512-WuCIhz4JEHxzhAWjrBASMGj6Or1wAjDqTsRIck3DRRrw/FJ8C/8AAuHPk8ECHNSDI5PZ0OT72nF2uSUn0aQq1w== +"@stylistic/eslint-plugin-ts@1.8.1": + version "1.8.1" + resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-ts/-/eslint-plugin-ts-1.8.1.tgz#9e6cce06530d3e579bafde0cf3bbb89453b3233f" + integrity sha512-/q1m+ZuO1JHfiSF16EATFzv7XSJkc5W6DocfvH5o9oB6WWYFMF77fVoBWnKT3wGptPOc2hkRupRKhmeFROdfWA== dependencies: - "@stylistic/eslint-plugin-js" "1.8.0" + "@stylistic/eslint-plugin-js" "1.8.1" "@types/eslint" "^8.56.10" "@typescript-eslint/utils" "^6.21.0" "@stylistic/eslint-plugin@^1.8.0": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin/-/eslint-plugin-1.8.0.tgz#b54bbae007dec7ca5629260fcd52e8580b26b026" - integrity sha512-JRR0lCDU97AiE0X6qTc/uf8Hv0yETUdyJgoNzTLUIWdhVJVe/KGPnFmEsO1iXfNUIS6vhv3JJ5vaZ2qtXhZe1g== - dependencies: - "@stylistic/eslint-plugin-js" "1.8.0" - "@stylistic/eslint-plugin-jsx" "1.8.0" - "@stylistic/eslint-plugin-plus" "1.8.0" - "@stylistic/eslint-plugin-ts" "1.8.0" + version "1.8.1" + resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin/-/eslint-plugin-1.8.1.tgz#bcf97052b87bcfb3de003b7f0fae50e9d6f21403" + integrity sha512-64My6I7uCcmSQ//427Pfg2vjSf9SDzfsGIWohNFgISMLYdC5BzJqDo647iDDJzSxINh3WTC0Ql46ifiKuOoTyA== + dependencies: + "@stylistic/eslint-plugin-js" "1.8.1" + "@stylistic/eslint-plugin-jsx" "1.8.1" + "@stylistic/eslint-plugin-plus" "1.8.1" + "@stylistic/eslint-plugin-ts" "1.8.1" "@types/eslint" "^8.56.10" "@types/body-parser@*": - version "1.19.2" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" - integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== + version "1.19.5" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.5.tgz#04ce9a3b677dc8bd681a17da1ab9835dc9d3ede4" + integrity sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg== dependencies: "@types/connect" "*" "@types/node" "*" "@types/bonjour@^3.5.9": - version "3.5.10" - resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275" - integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw== + version "3.5.13" + resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.13.tgz#adf90ce1a105e81dd1f9c61fdc5afda1bfb92956" + integrity sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ== dependencies: "@types/node" "*" "@types/connect-history-api-fallback@^1.3.5": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#9fd20b3974bdc2bcd4ac6567e2e0f6885cb2cf41" - integrity sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig== + version "1.5.4" + resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz#7de71645a103056b48ac3ce07b3520b819c1d5b3" + integrity sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw== dependencies: "@types/express-serve-static-core" "*" "@types/node" "*" "@types/connect@*": - version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" - integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== + version "3.4.38" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.38.tgz#5ba7f3bc4fbbdeaff8dded952e5ff2cc53f8d858" + integrity sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug== dependencies: "@types/node" "*" "@types/eslint@^8.56.10": - version "8.56.10" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.10.tgz#eb2370a73bf04a901eeba8f22595c7ee0f7eb58d" - integrity sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ== + 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== dependencies: "@types/estree" "*" "@types/json-schema" "*" @@ -1291,9 +1268,9 @@ integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33": - version "4.17.35" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz#c95dd4424f0d32e525d23812aa8ab8e4d3906c4f" - integrity sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg== + 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== dependencies: "@types/node" "*" "@types/qs" "*" @@ -1301,9 +1278,9 @@ "@types/send" "*" "@types/express@*", "@types/express@^4.17.13": - version "4.17.17" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4" - integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q== + version "4.17.21" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d" + integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ== dependencies: "@types/body-parser" "*" "@types/express-serve-static-core" "^4.17.33" @@ -1311,61 +1288,60 @@ "@types/serve-static" "*" "@types/http-errors@*": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.1.tgz#20172f9578b225f6c7da63446f56d4ce108d5a65" - integrity sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ== + version "2.0.4" + resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.4.tgz#7eb47726c391b7345a6ec35ad7f4de469cf5ba4f" + integrity sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA== "@types/http-proxy@^1.17.8": - version "1.17.11" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.11.tgz#0ca21949a5588d55ac2b659b69035c84bd5da293" - integrity sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA== + version "1.17.15" + resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.15.tgz#12118141ce9775a6499ecb4c01d02f90fc839d36" + integrity sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ== dependencies: "@types/node" "*" -"@types/json-schema@*", "@types/json-schema@^7.0.12": +"@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": version "7.0.15" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== -"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": - version "7.0.12" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb" - integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA== - -"@types/mime@*": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" - integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== - "@types/mime@^1": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" - integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== + version "1.3.5" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.5.tgz#1ef302e01cf7d2b5a0fa526790c9123bf1d06690" + integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w== + +"@types/node-forge@^1.3.0": + version "1.3.11" + resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.11.tgz#0972ea538ddb0f4d9c2fa0ec5db5724773a604da" + integrity sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ== + dependencies: + "@types/node" "*" "@types/node@*": - version "20.3.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.3.1.tgz#e8a83f1aa8b649377bb1fb5d7bac5cb90e784dfe" - integrity sha512-EhcH/wvidPy1WeML3TtYFGR83UzjxeWRen9V402T8aUGYsCHOmfoisV3ZSg03gAFIbLq8TnWOJ0f4cALtnSEUg== + version "22.2.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.2.0.tgz#7cf046a99f0ba4d628ad3088cb21f790df9b0c5b" + integrity sha512-bm6EG6/pCpkxDf/0gDNDdtDILMOHgaQBVOJGdwsqClnxA3xL6jtMv76rLBc006RVMWbmaf0xbmom4Z/5o2nRkQ== + dependencies: + undici-types "~6.13.0" "@types/parse-json@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" - integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239" + integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw== "@types/q@^1.5.1": - version "1.5.5" - resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" - integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ== + version "1.5.8" + resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.8.tgz#95f6c6a08f2ad868ba230ead1d2d7f7be3db3837" + integrity sha512-hroOstUScF6zhIi+5+x0dzqrHA1EJi+Irri6b1fxolMTqqHIV/Cg77EtnQcZqZCu8hR3mX2BzIxN4/GzI68Kfw== "@types/qs@*": - version "6.9.7" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" - integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== + version "6.9.15" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.15.tgz#adde8a060ec9c305a82de1babc1056e73bd64dce" + integrity sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg== "@types/range-parser@*": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" - integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== + version "1.2.7" + resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb" + integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ== "@types/retry@0.12.0": version "0.12.0" @@ -1373,45 +1349,45 @@ integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== "@types/semver@^7.5.0": - version "7.5.6" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339" - integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A== + version "7.5.8" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e" + integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ== "@types/send@*": - version "0.17.1" - resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.1.tgz#ed4932b8a2a805f1fe362a70f4e62d0ac994e301" - integrity sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q== + version "0.17.4" + resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a" + integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA== dependencies: "@types/mime" "^1" "@types/node" "*" "@types/serve-index@^1.9.1": - version "1.9.1" - resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" - integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg== + version "1.9.4" + resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.4.tgz#e6ae13d5053cb06ed36392110b4f9a49ac4ec898" + integrity sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug== dependencies: "@types/express" "*" "@types/serve-static@*", "@types/serve-static@^1.13.10": - version "1.15.2" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.2.tgz#3e5419ecd1e40e7405d34093f10befb43f63381a" - integrity sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw== + version "1.15.7" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.7.tgz#22174bbd74fb97fe303109738e9b5c2f3064f714" + integrity sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw== dependencies: "@types/http-errors" "*" - "@types/mime" "*" "@types/node" "*" + "@types/send" "*" "@types/sockjs@^0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f" - integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw== + version "0.3.36" + resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.36.tgz#ce322cf07bcc119d4cbf7f88954f3a3bd0f67535" + integrity sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q== dependencies: "@types/node" "*" "@types/ws@^8.5.5": - version "8.5.5" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb" - integrity sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg== + version "8.5.12" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.12.tgz#619475fe98f35ccca2a2f6c137702d85ec247b7e" + integrity sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ== dependencies: "@types/node" "*" @@ -1653,15 +1629,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.9.0: - version "8.11.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" - integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== - -acorn@^8.8.2: - version "8.9.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59" - integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ== +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== aggregate-error@^3.0.0: version "3.1.0" @@ -1706,14 +1677,14 @@ ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ajv@^8.0.0, ajv@^8.9.0: - version "8.12.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" - integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== + version "8.17.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6" + integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g== dependencies: - fast-deep-equal "^3.1.1" + fast-deep-equal "^3.1.3" + fast-uri "^3.0.1" json-schema-traverse "^1.0.0" require-from-string "^2.0.2" - uri-js "^4.2.2" alphanum-sort@^1.0.0: version "1.0.2" @@ -1797,24 +1768,19 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== -array-buffer-byte-length@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead" - integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A== +array-buffer-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f" + integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg== dependencies: - call-bind "^1.0.2" - is-array-buffer "^3.0.1" + call-bind "^1.0.5" + is-array-buffer "^3.0.4" array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== -array-flatten@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" - integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== - array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" @@ -1825,34 +1791,49 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== -array.prototype.reduce@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz#6b20b0daa9d9734dd6bc7ea66b5bbce395471eac" - integrity sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q== +array.prototype.reduce@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.7.tgz#6aadc2f995af29cb887eb866d981dc85ab6f7dc7" + integrity sha512-mzmiUCVwtiD4lgxYP8g7IYy8El8p2CSMePvIbTS7gchKir/L1fgJrk0yDKmAX6mnRQFKNADYIk8nNlTris5H1Q== dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" es-array-method-boxes-properly "^1.0.0" + es-errors "^1.3.0" + es-object-atoms "^1.0.0" is-string "^1.0.7" -asn1.js@^5.2.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" - integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA== +arraybuffer.prototype.slice@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6" + integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A== + dependencies: + array-buffer-byte-length "^1.0.1" + call-bind "^1.0.5" + define-properties "^1.2.1" + es-abstract "^1.22.3" + es-errors "^1.2.1" + get-intrinsic "^1.2.3" + is-array-buffer "^3.0.4" + is-shared-array-buffer "^1.0.2" + +asn1.js@^4.10.1: + version "4.10.1" + resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0" + integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw== dependencies: bn.js "^4.0.0" inherits "^2.0.1" minimalistic-assert "^1.0.0" - safer-buffer "^2.1.0" assert@^1.1.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" - integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA== + version "1.5.1" + resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.1.tgz#038ab248e4ff078e7bc2485ba6e6388466c78f76" + integrity sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A== dependencies: - object-assign "^4.1.1" - util "0.10.3" + object.assign "^4.1.4" + util "^0.10.4" assign-symbols@^1.0.0: version "1.0.0" @@ -1882,10 +1863,12 @@ autoprefixer@^9.6.1: postcss "^7.0.32" postcss-value-parser "^4.1.0" -available-typed-arrays@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" - integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== +available-typed-arrays@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846" + integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ== + dependencies: + possible-typed-array-names "^1.0.0" babel-loader@^8.2.2: version "8.3.0" @@ -1913,29 +1896,29 @@ babel-plugin-macros@^2.8.0: cosmiconfig "^6.0.0" resolve "^1.12.0" -babel-plugin-polyfill-corejs2@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz#75044d90ba5043a5fb559ac98496f62f3eb668fd" - integrity sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw== +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== dependencies: - "@babel/compat-data" "^7.17.7" - "@babel/helper-define-polyfill-provider" "^0.4.0" - semver "^6.1.1" + "@babel/compat-data" "^7.22.6" + "@babel/helper-define-polyfill-provider" "^0.6.2" + semver "^6.3.1" -babel-plugin-polyfill-corejs3@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz#39248263c38191f0d226f928d666e6db1b4b3a8a" - integrity sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q== +babel-plugin-polyfill-corejs3@^0.10.1, babel-plugin-polyfill-corejs3@^0.10.4: + 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== dependencies: - "@babel/helper-define-polyfill-provider" "^0.4.0" - core-js-compat "^3.30.1" + "@babel/helper-define-polyfill-provider" "^0.6.2" + core-js-compat "^3.38.0" -babel-plugin-polyfill-regenerator@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz#e7344d88d9ef18a3c47ded99362ae4a757609380" - integrity sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g== +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== dependencies: - "@babel/helper-define-polyfill-provider" "^0.4.0" + "@babel/helper-define-polyfill-provider" "^0.6.2" balanced-match@^1.0.0: version "1.0.2" @@ -1976,9 +1959,9 @@ binary-extensions@^1.0.0: integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + version "2.3.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522" + integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw== bindings@^1.5.0: version "1.5.0" @@ -1997,18 +1980,18 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -bn.js@^5.0.0, bn.js@^5.1.1: +bn.js@^5.0.0, 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.1: - version "1.20.1" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" - integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== +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== dependencies: bytes "3.1.2" - content-type "~1.0.4" + content-type "~1.0.5" debug "2.6.9" depd "2.0.0" destroy "1.2.0" @@ -2016,17 +1999,15 @@ body-parser@1.20.1: iconv-lite "0.4.24" on-finished "2.4.1" qs "6.11.0" - raw-body "2.5.1" + raw-body "2.5.2" type-is "~1.6.18" unpipe "1.0.0" bonjour-service@^1.0.11: - version "1.1.1" - resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.1.tgz#960948fa0e0153f5d26743ab15baf8e33752c135" - integrity sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg== + version "1.2.1" + resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.2.1.tgz#eb41b3085183df3321da1264719fbada12478d02" + integrity sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw== dependencies: - array-flatten "^2.1.2" - dns-equal "^1.0.0" fast-deep-equal "^3.1.3" multicast-dns "^7.2.5" @@ -2066,19 +2047,19 @@ braces@^2.3.1, braces@^2.3.2: split-string "^3.0.2" to-regex "^3.0.1" -braces@^3.0.2, braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== +braces@^3.0.3, braces@~3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== dependencies: - fill-range "^7.0.1" + fill-range "^7.1.1" brorand@^1.0.1, brorand@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w== -browserify-aes@^1.0.0, browserify-aes@^1.0.4: +browserify-aes@^1.0.4, browserify-aes@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA== @@ -2109,7 +2090,7 @@ browserify-des@^1.0.0: inherits "^2.0.1" safe-buffer "^5.1.2" -browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: +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== @@ -2118,19 +2099,20 @@ browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: randombytes "^2.0.1" browserify-sign@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" - integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg== + 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== dependencies: - bn.js "^5.1.1" - browserify-rsa "^4.0.1" + bn.js "^5.2.1" + browserify-rsa "^4.1.0" create-hash "^1.2.0" create-hmac "^1.1.7" - elliptic "^6.5.3" + elliptic "^6.5.5" + hash-base "~3.0" inherits "^2.0.4" - parse-asn1 "^5.1.5" - readable-stream "^3.6.0" - safe-buffer "^5.2.0" + parse-asn1 "^5.1.7" + readable-stream "^2.3.8" + safe-buffer "^5.2.1" browserify-zlib@^0.2.0: version "0.2.0" @@ -2139,15 +2121,15 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.21.3, browserslist@^4.21.5, browserslist@^4.6.4: - version "4.21.9" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.9.tgz#e11bdd3c313d7e2a9e87e8b4b0c7872b13897635" - integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg== +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== dependencies: - caniuse-lite "^1.0.30001503" - electron-to-chromium "^1.4.431" - node-releases "^2.0.12" - update-browserslist-db "^1.0.11" + caniuse-lite "^1.0.30001646" + electron-to-chromium "^1.5.4" + node-releases "^2.0.18" + update-browserslist-db "^1.1.0" buffer-from@^1.0.0: version "1.1.2" @@ -2243,13 +2225,16 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" -call-bind@^1.0.0, call-bind@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== +call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" + integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" + es-define-property "^1.0.0" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + set-function-length "^1.2.1" caller-callsite@^2.0.0: version "2.0.0" @@ -2290,17 +2275,17 @@ 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.30001503: - version "1.0.30001507" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001507.tgz#fae53f6286e7564783eadea9b447819410a59534" - integrity sha512-SFpUDoSLCaE5XYL2jfqe9ova/pbQHEmbheDf5r4diNwbAgR3qxM9NQtfsiSscjqoya5K7kFcHPUQ+VsUkIJR4A== +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== case-sensitive-paths-webpack-plugin@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4" integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw== -chalk@^2.0, chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -2318,9 +2303,9 @@ chalk@^4.0.0: supports-color "^7.1.0" "chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1, chokidar@^3.5.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" - integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== + 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" @@ -2362,9 +2347,9 @@ chownr@^2.0.0: integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== + version "1.0.4" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz#05bffd7ff928465093314708c93bdfa9bd1f0f5b" + integrity sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ== cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" @@ -2498,9 +2483,9 @@ commondir@^1.0.1: integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== component-emitter@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" - integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== + version "1.3.1" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.1.tgz#ef1d5796f7d93f135ee6fb684340b26403c97d17" + integrity sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ== compressible@~2.0.16: version "2.0.18" @@ -2570,25 +2555,25 @@ content-disposition@0.5.4: dependencies: safe-buffer "5.2.1" -content-type@~1.0.4: +content-type@~1.0.4, content-type@~1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== -convert-source-map@^1.7.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" - integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== +convert-source-map@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" + integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== -cookie@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" - integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== +cookie@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" + integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== copy-concurrently@^1.0.0: version "1.0.5" @@ -2607,22 +2592,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.30.1, core-js-compat@^3.30.2: - version "3.31.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.31.0.tgz#4030847c0766cc0e803dcdfb30055d7ef2064bf1" - integrity sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw== +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== dependencies: - browserslist "^4.21.5" + browserslist "^4.23.3" core-js-pure@^3.30.2: - version "3.31.0" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.31.0.tgz#052fd9e82fbaaf86457f5db1fadcd06f15966ff2" - integrity sha512-/AnE9Y4OsJZicCzIe97JP5XoPKQJfTuEG43aEVLFJGOJpyqELod+pE6LEl63DfG1Mp8wX97LDaDpy1GmLEUxlg== + 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== core-js@^3.16.2, core-js@^3.31.0, core-js@^3.6.5: - version "3.31.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.31.0.tgz#4471dd33e366c79d8c0977ed2d940821719db344" - integrity sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ== + version "3.38.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.38.0.tgz#8acb7c050bf2ccbb35f938c0d040132f6110f636" + integrity sha512-XPpwqEodRljce9KswjZShh95qJ1URisBeKCjUdq27YdenkslVe7OO0ZJhlYXAChW7OhXaRLl8AAba7IBfoIHug== core-util-is@~1.0.0: version "1.0.3" @@ -2919,6 +2904,33 @@ cyclist@^1.0.1: resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.2.tgz#673b5f233bf34d8e602b949429f8171d9121bea3" integrity sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA== +data-view-buffer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2" + integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA== + dependencies: + call-bind "^1.0.6" + es-errors "^1.3.0" + is-data-view "^1.0.1" + +data-view-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2" + integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + is-data-view "^1.0.1" + +data-view-byte-offset@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a" + integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA== + dependencies: + call-bind "^1.0.6" + es-errors "^1.3.0" + is-data-view "^1.0.1" + debug@2.6.9, debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -2927,9 +2939,9 @@ 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.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + version "4.3.6" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b" + integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg== dependencies: ms "2.1.2" @@ -2955,16 +2967,26 @@ default-gateway@^6.0.3: dependencies: execa "^5.0.0" +define-data-property@^1.0.1, define-data-property@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + gopd "^1.0.1" + define-lazy-prop@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== -define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" - integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== +define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" + integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== dependencies: + define-data-property "^1.0.1" has-property-descriptors "^1.0.0" object-keys "^1.1.1" @@ -3039,15 +3061,10 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -dns-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg== - dns-packet@^5.2.2: - version "5.6.0" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.0.tgz#2202c947845c7a63c23ece58f2f70ff6ab4c2f7d" - integrity sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ== + version "5.6.1" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.1.tgz#ae888ad425a9d1478a0674256ab866de1012cf2f" + integrity sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw== dependencies: "@leichtgewicht/ip-codec" "^2.0.1" @@ -3104,15 +3121,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.4.431: - version "1.4.440" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.440.tgz#d3b1eeb36b717eb479a240c0406ac1fa67901762" - integrity sha512-r6dCgNpRhPwiWlxbHzZQ/d9swfPaEJGi8ekqRBwQYaR3WmA5VkqQfBWSDDjuJU1ntO+W9tHx8OHV/96Q8e0dVw== +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== -elliptic@^6.5.3: - version "6.5.4" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" - integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== +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== dependencies: bn.js "^4.11.9" brorand "^1.1.0" @@ -3159,9 +3176,9 @@ entities@^2.0.0: integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== envinfo@^7.7.3: - version "7.9.0" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.9.0.tgz#47594a13081be0d9be6e513534e8c58dbb26c7a1" - integrity sha512-RODB4txU+xImYDemN5DqaKC0CHk05XSVkOX4pq0hK26Qx+1LChkuOyUDlGEjYb3ACr0n9qBhFjg37hQuJvpkRQ== + 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== errno@^0.1.3, errno@~0.1.7: version "0.1.8" @@ -3177,59 +3194,90 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2: - version "1.21.2" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff" - integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg== - dependencies: - array-buffer-byte-length "^1.0.0" - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - es-set-tostringtag "^2.0.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== + dependencies: + array-buffer-byte-length "^1.0.1" + arraybuffer.prototype.slice "^1.0.3" + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" + data-view-buffer "^1.0.1" + data-view-byte-length "^1.0.1" + data-view-byte-offset "^1.0.0" + es-define-property "^1.0.0" + es-errors "^1.3.0" + es-object-atoms "^1.0.0" + es-set-tostringtag "^2.0.3" es-to-primitive "^1.2.1" - function.prototype.name "^1.1.5" - get-intrinsic "^1.2.0" - get-symbol-description "^1.0.0" + function.prototype.name "^1.1.6" + get-intrinsic "^1.2.4" + get-symbol-description "^1.0.2" globalthis "^1.0.3" gopd "^1.0.1" - has "^1.0.3" - has-property-descriptors "^1.0.0" - has-proto "^1.0.1" + has-property-descriptors "^1.0.2" + has-proto "^1.0.3" has-symbols "^1.0.3" - internal-slot "^1.0.5" - is-array-buffer "^3.0.2" + hasown "^2.0.2" + internal-slot "^1.0.7" + is-array-buffer "^3.0.4" is-callable "^1.2.7" - is-negative-zero "^2.0.2" + is-data-view "^1.0.1" + is-negative-zero "^2.0.3" is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" + is-shared-array-buffer "^1.0.3" is-string "^1.0.7" - is-typed-array "^1.1.10" + is-typed-array "^1.1.13" is-weakref "^1.0.2" - object-inspect "^1.12.3" + object-inspect "^1.13.1" object-keys "^1.1.1" - object.assign "^4.1.4" - regexp.prototype.flags "^1.4.3" - safe-regex-test "^1.0.0" - string.prototype.trim "^1.2.7" - string.prototype.trimend "^1.0.6" - string.prototype.trimstart "^1.0.6" - typed-array-length "^1.0.4" + object.assign "^4.1.5" + regexp.prototype.flags "^1.5.2" + safe-array-concat "^1.1.2" + safe-regex-test "^1.0.3" + string.prototype.trim "^1.2.9" + string.prototype.trimend "^1.0.8" + string.prototype.trimstart "^1.0.8" + typed-array-buffer "^1.0.2" + typed-array-byte-length "^1.0.1" + typed-array-byte-offset "^1.0.2" + typed-array-length "^1.0.6" unbox-primitive "^1.0.2" - which-typed-array "^1.1.9" + which-typed-array "^1.1.15" es-array-method-boxes-properly@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== -es-set-tostringtag@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8" - integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg== +es-define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" + integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== dependencies: - get-intrinsic "^1.1.3" - has "^1.0.3" - has-tostringtag "^1.0.0" + get-intrinsic "^1.2.4" + +es-errors@^1.2.1, es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + +es-object-atoms@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941" + integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw== + dependencies: + es-errors "^1.3.0" + +es-set-tostringtag@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777" + integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ== + dependencies: + get-intrinsic "^1.2.4" + has-tostringtag "^1.0.2" + hasown "^2.0.1" es-to-primitive@^1.2.1: version "1.2.1" @@ -3240,10 +3288,10 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== +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== escape-html@~1.0.3: version "1.0.3" @@ -3261,9 +3309,9 @@ escape-string-regexp@^4.0.0: integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== eslint-plugin-cypress@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-3.3.0.tgz#4ab963193d21ad22aca8379e1d15ba02619ae8db" - integrity sha512-HPHMPzYBIshzJM8wqgKSKHG2p/8R0Gbg4Pb3tcdC9WrmkuqxiKxSKbjunUrajhV5l7gCIFrh1P7C7GuBqH6YuQ== + version "3.5.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-3.5.0.tgz#380ef5049ad80ebeca923db69e4aa96e72fcd893" + integrity sha512-JZQ6XnBTNI8h1B9M7wJSFzc48SYbh7VMMKaNTQOFa3BQlnmXPrVc4PKen8R+fpv6VleiPeej6VxloGb42zdRvw== dependencies: globals "^13.20.0" @@ -3280,10 +3328,10 @@ eslint-scope@^4.0.3: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-scope@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.0.1.tgz#a9601e4b81a0b9171657c343fb13111688963cfc" - integrity sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og== +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== dependencies: esrecurse "^4.3.0" estraverse "^5.2.0" @@ -3299,27 +3347,27 @@ eslint-visitor-keys@^4.0.0: integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw== eslint@^9.1.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.1.1.tgz#39ec657ccd12813cb4a1dab2f9229dcc6e468271" - integrity sha512-b4cRQ0BeZcSEzPpY2PjFY70VbO32K7BStTGtBsnIGdTSEEQzBi8hPBcGQmTG2zUvFr9uLe0TK42bw8YszuHEqg== + version "9.9.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.9.0.tgz#8d214e69ae4debeca7ae97daebbefe462072d975" + integrity sha512-JfiKJrbx0506OEerjK2Y1QlldtBxkAlLxT5OEcRF8uaQ86noDe2k31Vw9rnSWv+MXZHj7OOUV/dA0AhdLFcyvA== dependencies: "@eslint-community/eslint-utils" "^4.2.0" - "@eslint-community/regexpp" "^4.6.1" - "@eslint/eslintrc" "^3.0.2" - "@eslint/js" "9.1.1" - "@humanwhocodes/config-array" "^0.13.0" + "@eslint-community/regexpp" "^4.11.0" + "@eslint/config-array" "^0.17.1" + "@eslint/eslintrc" "^3.1.0" + "@eslint/js" "9.9.0" "@humanwhocodes/module-importer" "^1.0.1" - "@humanwhocodes/retry" "^0.2.3" + "@humanwhocodes/retry" "^0.3.0" "@nodelib/fs.walk" "^1.2.8" ajv "^6.12.4" chalk "^4.0.0" cross-spawn "^7.0.2" debug "^4.3.2" escape-string-regexp "^4.0.0" - eslint-scope "^8.0.1" + eslint-scope "^8.0.2" eslint-visitor-keys "^4.0.0" - espree "^10.0.1" - esquery "^1.4.2" + espree "^10.1.0" + esquery "^1.5.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" file-entry-cache "^8.0.0" @@ -3338,12 +3386,12 @@ eslint@^9.1.1: strip-ansi "^6.0.1" text-table "^0.2.0" -espree@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-10.0.1.tgz#600e60404157412751ba4a6f3a2ee1a42433139f" - integrity sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww== +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== dependencies: - acorn "^8.11.3" + acorn "^8.12.0" acorn-jsx "^5.3.2" eslint-visitor-keys "^4.0.0" @@ -3361,10 +3409,10 @@ esprima@^4.0.0: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.4.2: - version "1.5.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" - integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== +esquery@^1.5.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7" + integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg== dependencies: estraverse "^5.1.0" @@ -3449,16 +3497,16 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: homedir-polyfill "^1.0.1" express@^4.17.3: - version "4.18.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" - integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== + version "4.19.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465" + integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.20.1" + body-parser "1.20.2" content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.5.0" + cookie "0.6.0" cookie-signature "1.0.6" debug "2.6.9" depd "2.0.0" @@ -3540,15 +3588,20 @@ fast-levenshtein@^2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" 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== + fastest-levenshtein@^1.0.12: version "1.0.16" resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== fastq@^1.6.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.16.0.tgz#83b9a9375692db77a822df081edb6a9cf6839320" - integrity sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA== + version "1.17.1" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47" + integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w== dependencies: reusify "^1.0.4" @@ -3594,10 +3647,10 @@ fill-range@^4.0.0: repeat-string "^1.6.1" to-regex-range "^2.1.0" -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== dependencies: to-regex-range "^5.0.1" @@ -3673,15 +3726,15 @@ flat-cache@^4.0.0: flatted "^3.2.9" keyv "^4.5.4" -flatted@^3.2.2: - version "3.2.7" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" - integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== +flat@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" + integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== -flatted@^3.2.9: - version "3.2.9" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf" - integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ== +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== flatten@^1.0.2: version "1.0.3" @@ -3697,9 +3750,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0: - version "1.15.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" - integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== + version "1.15.6" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" + integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== for-each@^0.3.3: version "0.3.3" @@ -3731,9 +3784,9 @@ fresh@0.5.2: integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== friendly-challenge@^0.9.1: - version "0.9.13" - resolved "https://registry.yarnpkg.com/friendly-challenge/-/friendly-challenge-0.9.13.tgz#a6767e7e15febb3f774aa4696f4284746ede97f9" - integrity sha512-R9ZBA15SSrp6ctr6J5Z6dgEyKTtaMH6tOuQ2HPqpm9jUo8a6q2mI0+85yJoC5RY+tujRFygGwI0LsPFDUTc0RQ== + version "0.9.16" + resolved "https://registry.yarnpkg.com/friendly-challenge/-/friendly-challenge-0.9.16.tgz#7bf5d286da9bc25428ee476c012c96588c45ca66" + integrity sha512-f5af4Mqz+JN0/I+QOKtY5pSSwdJ390KDBbFCAfrA45ufQ2z9bUIP8bsq6PGGlOmdOIPYN3ahFAVoOBDEgavc2A== dependencies: "@babel/runtime-corejs3" "^7.10.4" core-js "^3.6.5" @@ -3764,9 +3817,9 @@ fs-minipass@^2.0.0: minipass "^3.0.0" fs-monkey@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.4.tgz#ee8c1b53d3fe8bb7e5d2c5c5dfc0168afdd2f747" - integrity sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ== + version "1.0.6" + resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.6.tgz#8ead082953e88d992cf3ff844faa907b26756da2" + integrity sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg== fs-write-stream-atomic@^1.0.8: version "1.0.10" @@ -3792,26 +3845,26 @@ fsevents@^1.2.7: nan "^2.12.1" fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +function-bind@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" + integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== -function.prototype.name@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621" - integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA== +function.prototype.name@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd" + integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.0" - functions-have-names "^1.2.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + functions-have-names "^1.2.3" -functions-have-names@^1.2.2, functions-have-names@^1.2.3: +functions-have-names@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== @@ -3826,28 +3879,30 @@ 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.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" - integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== +get-intrinsic@^1.1.3, 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== dependencies: - function-bind "^1.1.1" - has "^1.0.3" + es-errors "^1.3.0" + function-bind "^1.1.2" has-proto "^1.0.1" has-symbols "^1.0.3" + hasown "^2.0.0" get-stream@^6.0.0: version "6.0.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== -get-symbol-description@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" - integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== +get-symbol-description@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5" + integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg== dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" + call-bind "^1.0.5" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" @@ -3942,16 +3997,17 @@ globals@^14.0.0: integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ== globals@^15.1.0: - version "15.1.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-15.1.0.tgz#4e03d200c8362201636b8cdfaa316d6cef67ff1e" - integrity sha512-926gJqg+4mkxwYKiFvoomM4J0kWESfk3qfTvRL2/oc/tK/eTDBbrfcKnSa2KtfdxB5onoL7D3A3qIHQFpd4+UA== + version "15.9.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-15.9.0.tgz#e9de01771091ffbc37db5714dab484f9f69ff399" + integrity sha512-SmSKyLLKFbSr6rptvP8izbyxJL4ILwqO9Jg23UA0sDlGlu58V59D1//I3vlc0KJphVdUR7vMjHIplYnzBxorQA== globalthis@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" - integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== + version "1.0.4" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236" + integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ== dependencies: - define-properties "^1.1.3" + define-properties "^1.2.1" + gopd "^1.0.1" globby@^11.1.0: version "11.1.0" @@ -3997,29 +4053,29 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-property-descriptors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" - integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== +has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== dependencies: - get-intrinsic "^1.1.1" + es-define-property "^1.0.0" -has-proto@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" - integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== +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== has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== -has-tostringtag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" - integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== +has-tostringtag@^1.0.0, has-tostringtag@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc" + integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw== dependencies: - has-symbols "^1.0.2" + has-symbols "^1.0.3" has-value@^0.3.1: version "0.3.1" @@ -4052,12 +4108,10 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has@^1.0.0, has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" +has@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6" + integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ== hash-base@^3.0.0: version "3.1.0" @@ -4068,6 +4122,14 @@ 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== + dependencies: + inherits "^2.0.1" + safe-buffer "^5.0.1" + hash.js@^1.0.0, hash.js@^1.0.3: version "1.1.7" resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" @@ -4076,6 +4138,13 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.1" +hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== + dependencies: + function-bind "^1.1.2" + hex-color-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" @@ -4118,9 +4187,9 @@ hsla-regex@^1.0.0: integrity sha512-7Wn5GMLuHBjZCb2bTmnDOycho0p/7UVaAeqXZGbHrBCl6Yd/xDhQJAXe6Ga9AXJH2I5zY1dEdYw2u1UptnSBJA== html-entities@^2.3.2: - version "2.4.0" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.4.0.tgz#edd0cee70402584c8c76cc2c0556db09d1f45061" - integrity sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ== + version "2.5.2" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f" + integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA== http-deceiver@^1.2.7: version "1.2.7" @@ -4213,14 +4282,14 @@ iferr@^0.1.5: integrity sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA== ignore@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78" - integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg== + version "5.3.2" + 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.0" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.0.tgz#eb1738f14ffb39fd068b1dbe1296117484dd34be" - integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg== + version "4.3.7" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.7.tgz#c70145fc90d89fb02021e65c84eb0226e4e5a381" + integrity sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw== import-cwd@^2.0.0: version "2.1.0" @@ -4261,9 +4330,9 @@ import-local@^2.0.0: resolve-cwd "^2.0.0" import-local@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" - integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== + version "3.2.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.2.0.tgz#c3d5c745798c02a6f8b897726aba5100186ee260" + integrity sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA== dependencies: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" @@ -4311,11 +4380,6 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, i resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -inherits@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" - integrity sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA== - inherits@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -4326,13 +4390,13 @@ ini@^1.3.4, ini@^1.3.5: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -internal-slot@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" - integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ== +internal-slot@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802" + integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g== dependencies: - get-intrinsic "^1.2.0" - has "^1.0.3" + es-errors "^1.3.0" + hasown "^2.0.0" side-channel "^1.0.4" interpret@^1.4.0: @@ -4351,37 +4415,29 @@ ipaddr.js@1.9.1: integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== ipaddr.js@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f" - integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz#d33fa7bac284f4de7af949638c9d68157c6b92e8" + integrity sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA== is-absolute-url@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" integrity sha512-vOx7VprsKyllwjSkLV79NIhpyLfr3jAp7VaTCMXOJHu4m0Ew1CZ2fcjASwmV1jI3BWuWHB013M48eyeldk9gYg== -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A== - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== +is-accessor-descriptor@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz#3223b10628354644b86260db29b3e693f5ceedd4" + integrity sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA== dependencies: - kind-of "^6.0.0" + hasown "^2.0.0" -is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" - integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w== +is-array-buffer@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98" + integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw== dependencies: call-bind "^1.0.2" - get-intrinsic "^1.2.0" - is-typed-array "^1.1.10" + get-intrinsic "^1.2.1" is-arrayish@^0.2.1: version "0.2.1" @@ -4444,26 +4500,26 @@ is-color-stop@^1.0.0: rgb-regex "^1.0.1" rgba-regex "^1.0.0" -is-core-module@^2.11.0: - version "2.12.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd" - integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg== +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== dependencies: - has "^1.0.3" + hasown "^2.0.2" -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg== +is-data-descriptor@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz#2109164426166d32ea38c405c1e0945d9e6a4eeb" + integrity sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw== dependencies: - kind-of "^3.0.2" + hasown "^2.0.0" -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== +is-data-view@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f" + integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w== dependencies: - kind-of "^6.0.0" + is-typed-array "^1.1.13" is-date-object@^1.0.1: version "1.0.5" @@ -4473,22 +4529,20 @@ is-date-object@^1.0.1: has-tostringtag "^1.0.0" is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== + version "0.1.7" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.7.tgz#2727eb61fd789dcd5bdf0ed4569f551d2fe3be33" + integrity sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg== dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" + is-accessor-descriptor "^1.0.1" + is-data-descriptor "^1.0.1" is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.3.tgz#92d27cb3cd311c4977a4db47df457234a13cb306" + integrity sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw== dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" + is-accessor-descriptor "^1.0.1" + is-data-descriptor "^1.0.1" is-directory@^0.3.1: version "0.3.1" @@ -4536,10 +4590,10 @@ 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-negative-zero@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" - integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== +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" + integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw== is-number-object@^1.0.4: version "1.0.7" @@ -4600,12 +4654,12 @@ is-resolvable@^1.0.0: resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== -is-shared-array-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" - integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== +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" + integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg== dependencies: - call-bind "^1.0.2" + call-bind "^1.0.7" is-stream@^2.0.0: version "2.0.1" @@ -4626,16 +4680,12 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-typed-array@^1.1.10, is-typed-array@^1.1.9: - version "1.1.10" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f" - integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A== +is-typed-array@^1.1.13: + version "1.1.13" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" + integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw== dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - for-each "^0.3.3" - gopd "^1.0.1" - has-tostringtag "^1.0.0" + which-typed-array "^1.1.14" is-weakref@^1.0.2: version "1.0.2" @@ -4764,7 +4814,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2, json5@^2.2.2: +json5@^2.1.2, json5@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -4790,12 +4840,7 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" -kind-of@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== - -kind-of@^6.0.0, kind-of@^6.0.2: +kind-of@^6.0.2: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== @@ -4814,12 +4859,12 @@ last-call-webpack-plugin@^3.0.0: webpack-sources "^1.1.0" launch-editor@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.0.tgz#4c0c1a6ac126c572bd9ff9a30da1d2cae66defd7" - integrity sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ== + version "2.8.1" + resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.8.1.tgz#3bda72af213ec9b46b170e39661916ec66c2f463" + integrity sha512-elBx2l/tp9z99X5H/qev8uyDywVh0VXAwEbjk8kJhnc5grOFkGh7aW6q55me9xnYbss261XtnUrysZ+XvGbhQA== dependencies: picocolors "^1.0.0" - shell-quote "^1.7.3" + shell-quote "^1.8.1" levn@^0.4.1: version "0.4.1" @@ -4980,9 +5025,9 @@ media-typer@0.3.0: integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== memfs@^3.4.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.5.3.tgz#d9b40fe4f8d5788c5f895bda804cd0d9eeee9f3b" - integrity sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw== + version "3.6.0" + resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6" + integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ== dependencies: fs-monkey "^1.0.4" @@ -5042,11 +5087,11 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: to-regex "^3.0.2" micromatch@^4.0.2, micromatch@^4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== + version "4.0.7" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5" + integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q== dependencies: - braces "^3.0.2" + braces "^3.0.3" picomatch "^2.3.1" miller-rabin@^4.0.0: @@ -5057,11 +5102,16 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": +mime-db@1.52.0: version "1.52.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== +"mime-db@>= 1.43.0 < 2": + version "1.53.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.53.0.tgz#3cb63cd820fc29896d9d4e8c32ab4fcd74ccb447" + integrity sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg== + mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" @@ -5106,7 +5156,7 @@ minimatch@9.0.3: dependencies: brace-expansion "^2.0.1" -minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: +minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== @@ -5231,14 +5281,14 @@ multicast-dns@^7.2.5: thunky "^1.0.2" nan@^2.12.1: - version "2.17.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" - integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== + version "2.20.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.20.0.tgz#08c5ea813dd54ed16e5bd6505bf42af4f7838ca3" + integrity sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw== -nanoid@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" - integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== +nanoid@^3.3.7: + version "3.3.7" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" + integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== nanomatch@^1.2.9: version "1.2.13" @@ -5311,10 +5361,10 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-releases@^2.0.12: - version "2.0.12" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039" - integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ== +node-releases@^2.0.18: + version "2.0.18" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f" + integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g== normalize-path@^2.1.1: version "2.1.1" @@ -5372,7 +5422,7 @@ object-assign-polyfill@^0.1.0: resolved "https://registry.yarnpkg.com/object-assign-polyfill/-/object-assign-polyfill-0.1.0.tgz#2b72338ff68b770cdcda781860484bb8b2f40920" integrity sha512-VUMV/J6DvEw4+CVrAezk2Ky6E2ARmCFViD3khtywRc7c/9AAH03L9jkQaji3spp/Tq4hHRb1zoUTDyboScXGUg== -object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4.0.1, object-assign@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== @@ -5386,10 +5436,10 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.12.3, object-inspect@^1.9.0: - version "1.12.3" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" - integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== +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-keys@^1.1.1: version "1.1.1" @@ -5403,26 +5453,28 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.0, object.assign@^4.1.4: - version "4.1.4" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" - integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== +object.assign@^4.1.0, object.assign@^4.1.4, object.assign@^4.1.5: + version "4.1.5" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" + integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" + call-bind "^1.0.5" + define-properties "^1.2.1" has-symbols "^1.0.3" object-keys "^1.1.1" object.getownpropertydescriptors@^2.1.0: - version "2.1.6" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz#5e5c384dd209fa4efffead39e3a0512770ccc312" - integrity sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ== - dependencies: - array.prototype.reduce "^1.0.5" - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.21.2" - safe-array-concat "^1.0.0" + version "2.1.8" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz#2f1fe0606ec1a7658154ccd4f728504f69667923" + integrity sha512-qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A== + dependencies: + array.prototype.reduce "^1.0.6" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-object-atoms "^1.0.0" + gopd "^1.0.1" + safe-array-concat "^1.1.2" object.pick@^1.3.0: version "1.3.0" @@ -5432,13 +5484,13 @@ object.pick@^1.3.0: isobject "^3.0.1" object.values@^1.1.0: - version "1.1.6" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d" - integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw== + version "1.2.0" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b" + integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ== dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" @@ -5489,16 +5541,16 @@ optimize-css-assets-webpack-plugin@^5.0.8: last-call-webpack-plugin "^3.0.0" optionator@^0.9.3: - version "0.9.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" - integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg== + version "0.9.4" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734" + integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g== dependencies: - "@aashutoshrathi/word-wrap" "^1.2.3" deep-is "^0.1.3" fast-levenshtein "^2.0.6" levn "^0.4.1" prelude-ls "^1.2.1" type-check "^0.4.0" + word-wrap "^1.2.5" os-browserify@^0.3.0: version "0.3.0" @@ -5581,16 +5633,17 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" -parse-asn1@^5.0.0, parse-asn1@^5.1.5: - version "5.1.6" - resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" - integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw== +parse-asn1@^5.0.0, parse-asn1@^5.1.7: + version "5.1.7" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.7.tgz#73cdaaa822125f9647165625eb45f8a051d2df06" + integrity sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg== dependencies: - asn1.js "^5.2.0" - browserify-aes "^1.0.0" - evp_bytestokey "^1.0.0" - pbkdf2 "^3.0.3" - safe-buffer "^5.1.1" + asn1.js "^4.10.1" + browserify-aes "^1.2.0" + evp_bytestokey "^1.0.3" + hash-base "~3.0" + pbkdf2 "^3.1.2" + safe-buffer "^5.2.1" parse-json@^4.0.0: version "4.0.0" @@ -5680,7 +5733,7 @@ path-type@^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.0.3, pbkdf2@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA== @@ -5696,10 +5749,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: - version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +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== picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: version "2.3.1" @@ -5747,6 +5800,11 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== +possible-typed-array-names@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" + integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== + postcss-attribute-case-insensitive@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz#d93e46b504589e94ac7277b0463226c68041a880" @@ -6071,9 +6129,9 @@ postcss-modules-extract-imports@^2.0.0: postcss "^7.0.5" postcss-modules-extract-imports@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" - integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== + version "3.1.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz#b4497cb85a9c0c4b5aabeb759bb25e8d89f15002" + integrity sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q== postcss-modules-local-by-default@^3.0.2: version "3.0.3" @@ -6086,9 +6144,9 @@ 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.3" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz#b08eb4f083050708998ba2c6061b50c2870ca524" - integrity sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA== + 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== dependencies: icss-utils "^5.0.0" postcss-selector-parser "^6.0.2" @@ -6103,9 +6161,9 @@ postcss-modules-scope@^2.2.0: postcss-selector-parser "^6.0.0" postcss-modules-scope@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" - integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== + 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== dependencies: postcss-selector-parser "^6.0.4" @@ -6244,9 +6302,9 @@ postcss-place@^4.0.1: postcss-values-parser "^2.0.0" postcss-preset-env@^6.7.0: - version "6.7.1" - resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-6.7.1.tgz#26563d2e9395d626a45a836450844540694bfcef" - integrity sha512-rlRkgX9t0v2On33n7TK8pnkcYOATGQSv48J2RS8GsXhqtg+xk6AummHP88Y5mJo0TLJelBjePvSjScTNkj3+qw== + version "6.7.2" + resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-6.7.2.tgz#58792ed25cff5b997b7274b5401a8868dafa1c52" + integrity sha512-nz+VyUUEB9uAxo5VxI0Gq4E31UjHCG3cUiZW3PzRn7KqkGlAEWuYgb/VLbAitEq7Ooubfix+H2JCm9v+C6hJuw== dependencies: autoprefixer "^9.6.1" browserslist "^4.6.4" @@ -6363,9 +6421,9 @@ postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4: uniq "^1.0.1" postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: - version "6.0.13" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b" - integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ== + 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== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -6416,13 +6474,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.24" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.24.tgz#f714dba9b2284be3cc07dbd2fc57ee4dc972d2df" - integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg== + version "8.4.41" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681" + integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ== dependencies: - nanoid "^3.3.6" - picocolors "^1.0.0" - source-map-js "^1.0.2" + nanoid "^3.3.7" + picocolors "^1.0.1" + source-map-js "^1.2.0" prelude-ls@^1.2.1: version "1.2.1" @@ -6510,9 +6568,9 @@ punycode@^1.2.4, punycode@^1.4.1: integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ== punycode@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" - integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== + version "2.3.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" + integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== q@^1.1.2: version "1.5.1" @@ -6526,12 +6584,12 @@ qs@6.11.0: dependencies: side-channel "^1.0.4" -qs@^6.11.0: - version "6.11.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9" - integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA== +qs@^6.12.3: + 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.4" + side-channel "^1.0.6" query-string@^4.1.0: version "4.3.4" @@ -6571,10 +6629,10 @@ range-parser@^1.2.1, range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" - integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== +raw-body@2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" + integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== dependencies: bytes "3.1.2" http-errors "2.0.0" @@ -6588,7 +6646,7 @@ read-cache@^1.0.0: dependencies: pify "^2.3.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@^2.3.8, readable-stream@~2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== @@ -6634,9 +6692,9 @@ rechoir@^0.7.0: resolve "^1.9.0" regenerate-unicode-properties@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c" - integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ== + 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== dependencies: regenerate "^1.4.2" @@ -6650,10 +6708,15 @@ regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.9: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== -regenerator-transform@^0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56" - integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg== +regenerator-runtime@^0.14.0: + version "0.14.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" + integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== + +regenerator-transform@^0.15.2: + version "0.15.2" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4" + integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg== dependencies: "@babel/runtime" "^7.8.4" @@ -6665,14 +6728,15 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexp.prototype.flags@^1.4.3: - version "1.5.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb" - integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA== +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== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - functions-have-names "^1.2.3" + call-bind "^1.0.6" + define-properties "^1.2.1" + es-errors "^1.3.0" + set-function-name "^2.0.1" regexpu-core@^5.3.1: version "5.3.2" @@ -6771,11 +6835,11 @@ resolve-url@^0.2.1: integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg== resolve@^1.1.7, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.9.0: - version "1.22.2" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" - integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== + version "1.22.8" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" + integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== dependencies: - is-core-module "^2.11.0" + is-core-module "^2.13.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -6840,13 +6904,13 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -safe-array-concat@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060" - integrity sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ== +safe-array-concat@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb" + integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q== dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.2.0" + call-bind "^1.0.7" + get-intrinsic "^1.2.4" has-symbols "^1.0.3" isarray "^2.0.5" @@ -6855,18 +6919,18 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: 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.0: +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-regex-test@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295" - integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA== +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" + integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw== dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.3" + call-bind "^1.0.6" + es-errors "^1.3.0" is-regex "^1.1.4" safe-regex@^1.1.0: @@ -6876,7 +6940,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.0: +"safer-buffer@>= 2.1.2 < 3": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -6893,9 +6957,9 @@ sass-loader@10.1.1: semver "^7.3.2" sass-loader@^10.1.1: - version "10.4.1" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.4.1.tgz#bea4e173ddf512c9d7f53e9ec686186146807cbf" - integrity sha512-aX/iJZTTpNUNx/OSYzo2KsjIUQHqvWsAhhUijFjAPdZTEhstjZI9zTNvkTTwsx+uNUJqUwOw5gacxQMx4hJxGQ== + version "10.5.2" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.5.2.tgz#1ca30534fff296417b853c7597ca3b0bbe8c37d0" + integrity sha512-vMUoSNOUKJILHpcNCCyD23X34gve1TS7Rjd9uXHeKqhvBG39x6XbswFDtpbTElj6XdMFezoWhkh5vtKudf2cgQ== dependencies: klona "^2.0.4" loader-utils "^2.0.0" @@ -6904,9 +6968,9 @@ sass-loader@^10.1.1: semver "^7.3.2" sass@^1.38.0, sass@^1.63.4: - version "1.63.6" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.6.tgz#481610e612902e0c31c46b46cf2dad66943283ea" - integrity sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw== + version "1.77.8" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.8.tgz#9f18b449ea401759ef7ec1752a16373e296b52bd" + integrity sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -6960,35 +7024,27 @@ select-hose@^2.0.0: integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg== selfsigned@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61" - integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ== + version "2.4.1" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0" + integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q== dependencies: + "@types/node-forge" "^1.3.0" node-forge "^1" semver@^5.5.0, semver@^5.6.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== -semver@^7.3.2, semver@^7.3.5: - version "7.5.3" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e" - integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ== - dependencies: - lru-cache "^6.0.0" +semver@^6.0.0, semver@^6.3.0, semver@^6.3.1: + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.5.4: - version "7.5.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" - integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== - dependencies: - lru-cache "^6.0.0" +semver@^7.3.2, semver@^7.3.5, semver@^7.5.4: + version "7.6.3" + 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" @@ -7051,6 +7107,28 @@ set-blocking@^2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== +set-function-length@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" + integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg== + dependencies: + define-data-property "^1.1.4" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + gopd "^1.0.1" + has-property-descriptors "^1.0.2" + +set-function-name@^2.0.1: + 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== + dependencies: + define-data-property "^1.1.4" + es-errors "^1.3.0" + functions-have-names "^1.2.3" + has-property-descriptors "^1.0.2" + set-value@^2.0.0, set-value@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" @@ -7115,19 +7193,20 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shell-quote@^1.7.3: +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== -side-channel@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" - integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== +side-channel@^1.0.4, side-channel@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" + integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.2" - object-inspect "^1.9.0" + call-bind "^1.0.7" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + object-inspect "^1.13.1" signal-exit@^3.0.3: version "3.0.7" @@ -7197,10 +7276,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.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== +"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-resolve@^0.5.0: version "0.5.3" @@ -7336,9 +7415,9 @@ stream-http@^2.7.2: xtend "^4.0.0" stream-shift@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" - integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== + version "1.0.3" + resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.3.tgz#85b8fab4d71010fc3ba8772e8046cc49b8a3864b" + integrity sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ== strict-uri-encode@^1.0.0: version "1.1.0" @@ -7354,32 +7433,33 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string.prototype.trim@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533" - integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg== +string.prototype.trim@^1.2.9: + version "1.2.9" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4" + integrity sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw== dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.0" + es-object-atoms "^1.0.0" -string.prototype.trimend@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" - integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== +string.prototype.trimend@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229" + integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ== dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" -string.prototype.trimstart@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4" - integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA== +string.prototype.trimstart@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde" + integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg== dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" @@ -7492,9 +7572,9 @@ tapable@^1.0.0, tapable@^1.1.3: integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== tar@^6.0.2: - version "6.1.15" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69" - integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A== + version "6.2.1" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" + integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" @@ -7504,9 +7584,9 @@ tar@^6.0.2: yallist "^4.0.0" terser-webpack-plugin@^1.4.3: - version "1.4.5" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b" - integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw== + version "1.4.6" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.6.tgz#87fcb6593fd1c977cd09e56143ecd31404600755" + integrity sha512-2lBVf/VMVIddjSn3GqbT90GvIJ/eYXJkt8cTzU7NbjKqK8fwv18Ftr4PlbF46b/e88743iZFL5Dtr/rC4hjIeA== dependencies: cacache "^12.0.2" find-cache-dir "^2.1.0" @@ -7543,9 +7623,9 @@ terser@^4.1.2: source-map-support "~0.5.12" terser@^5.3.4: - version "5.18.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.18.1.tgz#6d8642508ae9fb7b48768e48f16d675c89a78460" - integrity sha512-j1n0Ao919h/Ai5r43VAnfV/7azUYW43GPxK7qSATzrsERfW7+y2QW9Cp9ufnRF5CQUWbnLSo7UJokSWCqg4tsQ== + version "5.31.6" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.31.6.tgz#c63858a0f0703988d0266a82fcbf2d7ba76422b1" + integrity sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -7630,9 +7710,9 @@ toidentifier@1.0.1: integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== ts-api-utils@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331" - integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg== + 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== ts-pnp@^1.1.6: version "1.2.0" @@ -7664,14 +7744,49 @@ type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -typed-array-length@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" - integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng== +typed-array-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3" + integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ== dependencies: - call-bind "^1.0.2" + call-bind "^1.0.7" + es-errors "^1.3.0" + is-typed-array "^1.1.13" + +typed-array-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67" + integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw== + 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" + +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== + dependencies: + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" for-each "^0.3.3" - is-typed-array "^1.1.9" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" + +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== + 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" typedarray@^0.0.6: version "0.0.6" @@ -7688,6 +7803,11 @@ 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== + 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" @@ -7768,13 +7888,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.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940" - integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA== +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== dependencies: - escalade "^3.1.1" - picocolors "^1.0.0" + escalade "^3.1.2" + picocolors "^1.0.1" uri-js@^4.2.2: version "4.4.1" @@ -7794,12 +7914,12 @@ url-polyfill@^1.1.10: integrity sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A== url@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.1.tgz#26f90f615427eca1b9f4d6a28288c147e2302a32" - integrity sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA== + version "0.11.4" + resolved "https://registry.yarnpkg.com/url/-/url-0.11.4.tgz#adca77b3562d56b72746e76b330b7f27b6721f3c" + integrity sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg== dependencies: punycode "^1.4.1" - qs "^6.11.0" + qs "^6.12.3" use@^3.1.0: version "3.1.1" @@ -7821,12 +7941,12 @@ util.promisify@~1.0.0: has-symbols "^1.0.1" object.getownpropertydescriptors "^2.1.0" -util@0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - integrity sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ== +util@^0.10.4: + version "0.10.4" + resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901" + integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A== dependencies: - inherits "2.0.1" + inherits "2.0.3" util@^0.11.0: version "0.11.1" @@ -7846,9 +7966,9 @@ uuid@^8.3.2: integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== v8-compile-cache@^2.1.1: - version "2.3.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" - integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== + version "2.4.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz#cdada8bec61e15865f05d097c5f4fd30e94dc128" + integrity sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw== vary@~1.1.2: version "1.1.2" @@ -7938,10 +8058,10 @@ webpack-cli@^4.10.0: rechoir "^0.7.0" webpack-merge "^5.7.3" -webpack-dev-middleware@^5.3.1: - version "5.3.3" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f" - integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA== +webpack-dev-middleware@^5.3.4: + version "5.3.4" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517" + integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q== dependencies: colorette "^2.0.10" memfs "^3.4.3" @@ -7950,9 +8070,9 @@ webpack-dev-middleware@^5.3.1: schema-utils "^4.0.0" webpack-dev-server@^4.15.1: - version "4.15.1" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz#8944b29c12760b3a45bdaa70799b17cb91b03df7" - integrity sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA== + version "4.15.2" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz#9e0c70a42a012560860adb186986da1248333173" + integrity sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g== dependencies: "@types/bonjour" "^3.5.9" "@types/connect-history-api-fallback" "^1.3.5" @@ -7982,15 +8102,16 @@ webpack-dev-server@^4.15.1: serve-index "^1.9.1" sockjs "^0.3.24" spdy "^4.0.2" - webpack-dev-middleware "^5.3.1" + webpack-dev-middleware "^5.3.4" ws "^8.13.0" webpack-merge@^5.7.3: - version "5.9.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.9.0.tgz#dc160a1c4cf512ceca515cc231669e9ddb133826" - integrity sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg== + version "5.10.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177" + integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA== dependencies: clone-deep "^4.0.1" + flat "^5.0.2" wildcard "^2.0.0" webpack-sources@^1.0.0, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: @@ -8002,9 +8123,9 @@ webpack-sources@^1.0.0, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack- source-map "~0.6.1" webpack@^4.46.0: - version "4.46.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542" - integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q== + version "4.47.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.47.0.tgz#8b8a02152d7076aeb03b61b47dad2eeed9810ebc" + integrity sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ== dependencies: "@webassemblyjs/ast" "1.9.0" "@webassemblyjs/helper-module-context" "1.9.0" @@ -8045,9 +8166,9 @@ websocket-extensions@>=0.1.1: integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== whatwg-fetch@^3.4.1: - version "3.6.2" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" - integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== + version "3.6.20" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz#580ce6d791facec91d37c72890995a0b48d31c70" + integrity sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg== which-boxed-primitive@^1.0.2: version "1.0.2" @@ -8065,17 +8186,16 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409" integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ== -which-typed-array@^1.1.9: - version "1.1.9" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6" - integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA== +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== dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" for-each "^0.3.3" gopd "^1.0.1" - has-tostringtag "^1.0.0" - is-typed-array "^1.1.10" + has-tostringtag "^1.0.2" which@^1.2.14, which@^1.2.9, which@^1.3.1: version "1.3.1" @@ -8096,6 +8216,11 @@ wildcard@^2.0.0: resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== +word-wrap@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" + integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== + worker-farm@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" @@ -8118,9 +8243,9 @@ wrappy@1: integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== ws@^8.13.0: - version "8.13.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" - integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== + version "8.18.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc" + integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw== xtend@^4.0.0, xtend@~4.0.1: version "4.0.2" From 948e7cab9db4bb5660ccbdd6e0198ea0d25ee16a Mon Sep 17 00:00:00 2001 From: Splines <37160523+Splines@users.noreply.github.com> Date: Tue, 13 Aug 2024 19:40:44 +0200 Subject: [PATCH 12/17] Add better UI feedback when closing/opening discussions (#674) --- app/controllers/lectures_controller.rb | 2 ++ app/views/lectures/edit/_comments.html.erb | 19 +++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/controllers/lectures_controller.rb b/app/controllers/lectures_controller.rb index 719f59540..12fb42bdd 100644 --- a/app/controllers/lectures_controller.rb +++ b/app/controllers/lectures_controller.rb @@ -250,11 +250,13 @@ def close_comments @lecture.lessons.each do |lesson| lesson.media.update(annotations_status: -1) end + @lecture.touch redirect_to "#{edit_lecture_path(@lecture)}#communication" end def open_comments @lecture.open_comments!(current_user) + @lecture.touch redirect_to "#{edit_lecture_path(@lecture)}#communication" end diff --git a/app/views/lectures/edit/_comments.html.erb b/app/views/lectures/edit/_comments.html.erb index 1018f65e1..60af9b03f 100644 --- a/app/views/lectures/edit/_comments.html.erb +++ b/app/views/lectures/edit/_comments.html.erb @@ -5,12 +5,19 @@
- <%= link_to t('buttons.close_comments'), - lecture_close_comments_path(lecture), - class: 'btn btn-sm btn-outline-secondary' %> - <%= link_to t('buttons.open_comments'), - lecture_open_comments_path(lecture), - class: 'btn btn-sm btn-outline-secondary' %> + <% if lecture.comments_closed? %> + <%= link_to lecture_open_comments_path(lecture), + class: "btn btn-sm btn-outline-secondary", role: :button do %> + + <%= t('buttons.open_comments') %> + <% end %> + <% else %> + <%= link_to lecture_close_comments_path(lecture), + class: "btn btn-sm btn-outline-secondary", role: :button do %> + + <%= t('buttons.close_comments') %> + <% end %> + <% end %>
From b2d587fb2be60dee1dff5b592b197ef25600cea5 Mon Sep 17 00:00:00 2001 From: Splines <37160523+Splines@users.noreply.github.com> Date: Tue, 13 Aug 2024 20:02:04 +0200 Subject: [PATCH 13/17] Autocorrect rubocop "where range" (#675) --- app/models/assignment.rb | 4 ++-- app/models/medium.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/assignment.rb b/app/models/assignment.rb index 40f143d54..2b2792828 100644 --- a/app/models/assignment.rb +++ b/app/models/assignment.rb @@ -20,9 +20,9 @@ def deletion_date_cannot_be_in_the_past "in_past")) end - scope :active, -> { where("deadline >= ?", Time.zone.now) } + scope :active, -> { where(deadline: Time.zone.now..) } - scope :expired, -> { where("deadline < ?", Time.zone.now) } + scope :expired, -> { where(deadline: ...Time.zone.now) } def self.accepted_file_types [".pdf", ".tar.gz", ".cc", ".hh", ".m", ".mlx", ".zip"] diff --git a/app/models/medium.rb b/app/models/medium.rb index a2e9e2b5e..ab667c7cb 100644 --- a/app/models/medium.rb +++ b/app/models/medium.rb @@ -121,7 +121,7 @@ class Medium < ApplicationRecord } scope :proper, -> { where.not(sort: "RandomQuiz") } scope :expired, lambda { - where(sort: "RandomQuiz").where("created_at < ?", 1.day.ago) + where(sort: "RandomQuiz").where(created_at: ...1.day.ago) } searchable do From 8e44e6f0ba191a51ec791accd444c74cfb815cf9 Mon Sep 17 00:00:00 2001 From: Splines <37160523+Splines@users.noreply.github.com> Date: Tue, 13 Aug 2024 20:08:15 +0200 Subject: [PATCH 14/17] Add annotations overview page & improve Cypress commands (#668) * Scaffold annotation overview page * Show all annotations in card list * Only show annotations of current user * Add links to annotations and fix empty comments * Fix annotation caching issue by fixing initialization This might fix #637 * Open annotation automatically on link click * Group annotations by lecture * Fix accordion header class naming * Link to blog when no annotation is created yet * Delete unnecessary whitespace * Localize text in annotation overview * Refactor annotations overview controller * Init view to see students annotations as teacher/editor * Use existing methods to grab media * Improve description of student annotations * Use links to feedback player for shared annotations * Use same bootstrap button for "Create annotation" * Only show students annotations if current user is teacher or editor * Fix grammar mistake * Refactor annotations overview controller * Refactor accordion label assignment * Color cards shared by students according to category * Rename js file to "url_annotation_opener" * Clarify color choices in user-facing text * Get rid of turbolinks:load and apply directly This is to avoid caching issues. * Fix initial state of accordion buttons * Show medium title and date * Expose MaMpf to another port to avoid clashing with dev * Add an endpoint to skip validation when creating factory * Use local file system also in test environment * Enable reloading in cypress tests * Wrap value in `createUserAndLogin` (cypress) * Init annotations factory for usage in cypress tests * Customize title of lectures/lessons * Test appearance of annotation overview cards * Use parameterized tests and test timestamp * Add back missing index variable in test * Test annotation border color * Add factorybot to known words * Add i18n retrieval in Cypress tests * Test annotation sections & improve i18n controller * Test student annotation cards & more properties of cards * Move annotation section test to the top * Move "grouped by lecture" test up * Test rendering of math content * Move overview controller to existing annotation controller (it is now called "index") * Move annotation-retrieval to user model * Move annotation_open_link to helper * Make extraction method private in controller Also removed the TODO note regarding nil values * Remove TODO note as "Won't be done" * Remove unnecessary long url helper calling * Pass in medium instead of medium id * Fix spelling mistake in media helper * Use link_to Rails helper * Don't use custom route name for annotations overview It is now just the "index" and the route is called "/annotations" * Sort according to lecture.updated_at * Extract "annotations by lecture" retrieval to own method This is to avoid duplicated code. * Add comment explaining transform keys * Rename partial view to index_accordion * Extract border color to helper method * Open annotations with video in new tab * Add number of annotations in accordion header * Add default title to lecture factory with_title * Fix ordering in cypress tests & sort according to creation date * Fix cypress tests when anchor link opens new tab * Fix ordering in math content test * Fix ordering and new tab in feedback video test * Fix border color test order * Change default cypress viewport dimensions * Place :index ability in other code block * Use params instead of manually constructing url * Use URI helper to construct annotation id link * Use flat_map instead of map(...).flatten --- .config/.cypress.js | 3 +- .config/eslint.mjs | 2 + .vscode/settings.json | 2 + app/abilities/annotation_ability.rb | 3 +- .../javascripts/annotations_overview.js | 13 + app/assets/javascripts/application.js | 1 + .../thyme/annotations/annotation_manager.js | 4 +- .../annotations/url_annotation_opener.js | 9 + app/assets/javascripts/thyme/attributes.js | 2 +- .../javascripts/thyme/thyme_feedback.js | 8 +- app/assets/javascripts/thyme/thyme_player.js | 5 + app/assets/stylesheets/annotations.scss | 8 - .../stylesheets/annotations_overview.scss | 15 ++ app/controllers/annotations_controller.rb | 37 +++ app/controllers/cypress/cypress_controller.rb | 3 + app/controllers/cypress/i18n_controller.rb | 26 ++ app/controllers/media_controller.rb | 1 + app/helpers/annotations_helper.rb | 22 ++ app/helpers/media_helper.rb | 8 + app/models/user.rb | 18 ++ .../annotations/_annotation_area.html.erb | 2 +- .../annotations/_index_accordion.html.erb | 73 ++++++ app/views/annotations/index.html.erb | 67 +++++ app/views/commontator/comments/_body.html.erb | 3 +- app/views/media/feedback.html.erb | 2 +- app/views/media/play.html.erb | 4 +- app/views/shared/_navbar.html.erb | 8 + config/environments/test.rb | 2 +- config/initializers/shrine.rb | 9 +- config/locales/de.yml | 18 ++ config/locales/en.yml | 18 ++ config/routes.rb | 4 +- .../e2e/annotations_overview_spec.cy.js | 242 ++++++++++++++++++ spec/cypress/support/commands.js | 31 ++- spec/cypress/support/utility.js | 21 ++ spec/factories/annotations.rb | 33 +++ spec/factories/lectures.rb | 15 ++ spec/factories/media.rb | 7 + 38 files changed, 715 insertions(+), 34 deletions(-) create mode 100644 app/assets/javascripts/annotations_overview.js create mode 100644 app/assets/javascripts/thyme/annotations/url_annotation_opener.js create mode 100644 app/assets/stylesheets/annotations_overview.scss create mode 100644 app/controllers/cypress/i18n_controller.rb create mode 100644 app/helpers/annotations_helper.rb create mode 100644 app/views/annotations/_index_accordion.html.erb create mode 100644 app/views/annotations/index.html.erb create mode 100644 spec/cypress/e2e/annotations_overview_spec.cy.js create mode 100644 spec/cypress/support/utility.js create mode 100644 spec/factories/annotations.rb diff --git a/.config/.cypress.js b/.config/.cypress.js index cfc19cc0d..5d8e10485 100644 --- a/.config/.cypress.js +++ b/.config/.cypress.js @@ -1,6 +1,7 @@ module.exports = { e2e: { - // Add configuration here // Base URL is set via Docker environment variable + viewportHeight: 1000, + viewportWidth: 1400, }, }; diff --git a/.config/eslint.mjs b/.config/eslint.mjs index 6c611016c..0cf5ab6de 100644 --- a/.config/eslint.mjs +++ b/.config/eslint.mjs @@ -99,6 +99,8 @@ const customGlobals = { // KaTeX renderMathInElement: "readable", + + openAnnotationIfSpecifiedInUrl: "readable", }; export default [ diff --git a/.vscode/settings.json b/.vscode/settings.json index 751c25906..bb386a29a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -104,7 +104,9 @@ ////////////////////////////////////// "cSpell.words": [ "commontator", + "factorybot", "helpdesk", + "katex", "turbolinks" ] } \ No newline at end of file diff --git a/app/abilities/annotation_ability.rb b/app/abilities/annotation_ability.rb index 1d95ba944..00d6e2b6c 100644 --- a/app/abilities/annotation_ability.rb +++ b/app/abilities/annotation_ability.rb @@ -6,6 +6,7 @@ def initialize(user) annotation.user == user end - can [:new, :create, :update_annotations, :num_nearby_posted_mistake_annotations], Annotation + can [:index, :new, :create, :update_annotations, :num_nearby_posted_mistake_annotations], + Annotation end end diff --git a/app/assets/javascripts/annotations_overview.js b/app/assets/javascripts/annotations_overview.js new file mode 100644 index 000000000..6d46a7617 --- /dev/null +++ b/app/assets/javascripts/annotations_overview.js @@ -0,0 +1,13 @@ +function colorAnnotationCardsSharedByStudents() { + const annotationCards = $("[data-annotation-card-category]"); + for (let card of annotationCards) { + const category = card.dataset.annotationCardCategory; + if (!category) { + continue; + } + const color = Category.getByName(category).color; + card.style.borderColor = color; + } +} + +colorAnnotationCardsSharedByStudents(); diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 88e205048..b6faa2615 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -98,6 +98,7 @@ //= require thyme/metadata_manager //= require thyme/resizer //= require thyme/utility +//= require thyme/annotations/url_annotation_opener //= require thyme/thyme_player //= require thyme/thyme_editor //= require thyme/thyme_feedback diff --git a/app/assets/javascripts/thyme/annotations/annotation_manager.js b/app/assets/javascripts/thyme/annotations/annotation_manager.js index aed7d7c3e..163d19836 100644 --- a/app/assets/javascripts/thyme/annotations/annotation_manager.js +++ b/app/assets/javascripts/thyme/annotations/annotation_manager.js @@ -41,7 +41,7 @@ class AnnotationManager { } /* - Updates the markers on the timeline, i.e. the visual represention of the annotations. + Updates the markers on the timeline, i.e. the visual representation of the annotations. This method is e.g. used for rearranging the markers when the window is being resized. Don't mix up with updateAnnotatons() which sends an AJAX request and checks for changes in the database. @@ -82,7 +82,7 @@ class AnnotationManager { This method is e.g. used when a new annotation is being created. Don't mix up with updateMarkers() which just updates the position of the markers! - onSucess = A function that is triggered when the annotations have been + onSuccess = A function that is triggered when the annotations have been successfully updated. onSuccess = A function that is triggered when the annotations have been successfully updated. diff --git a/app/assets/javascripts/thyme/annotations/url_annotation_opener.js b/app/assets/javascripts/thyme/annotations/url_annotation_opener.js new file mode 100644 index 000000000..fbc60f003 --- /dev/null +++ b/app/assets/javascripts/thyme/annotations/url_annotation_opener.js @@ -0,0 +1,9 @@ +// eslint-disable-next-line no-unused-vars +function openAnnotationIfSpecifiedInUrl() { + const annotationValue = new URLSearchParams(window.location.search).get("ann"); + if (!annotationValue) { + return; + } + const annotationId = Number(annotationValue); + thymeAttributes.annotationArea.showAnnotationWithId(annotationId); +} diff --git a/app/assets/javascripts/thyme/attributes.js b/app/assets/javascripts/thyme/attributes.js index 5fc1415c9..4fb89656a 100644 --- a/app/assets/javascripts/thyme/attributes.js +++ b/app/assets/javascripts/thyme/attributes.js @@ -15,7 +15,7 @@ const thymeAttributes = { (which it is not for users who aren't signed in). */ annotationFeatureActive: false, - /* When callig the updateMarkers() method this will be used to save an + /* When calling the updateMarkers() method this will be used to save an array containing all annotations. */ annotations: null, diff --git a/app/assets/javascripts/thyme/thyme_feedback.js b/app/assets/javascripts/thyme/thyme_feedback.js index 1749b3be0..09aee2485 100644 --- a/app/assets/javascripts/thyme/thyme_feedback.js +++ b/app/assets/javascripts/thyme/thyme_feedback.js @@ -27,8 +27,7 @@ $(document).on("turbolinks:load", function () { (new TimeButton("minus-ten", -10)).add(); // Sliders (new VolumeBar("volume-bar")).add(); - seekBar = new SeekBar("seek-bar"); - seekBar.add(); + (new SeekBar("seek-bar")).add(); // heatmap const heatmap = new Heatmap("heatmap"); @@ -84,6 +83,11 @@ $(document).on("turbolinks:load", function () { thymeAttributes.annotationManager = annotationManager; thymeAttributes.annotationFeatureActive = true; + // update annotations manually once as initialization + annotationManager.updateAnnotations(() => { + openAnnotationIfSpecifiedInUrl(); + }); + /* KEYBOARD SHORTCUTS */ diff --git a/app/assets/javascripts/thyme/thyme_player.js b/app/assets/javascripts/thyme/thyme_player.js index a428023c9..7fc38d35c 100644 --- a/app/assets/javascripts/thyme/thyme_player.js +++ b/app/assets/javascripts/thyme/thyme_player.js @@ -95,6 +95,11 @@ $(document).on("turbolinks:load", function () { onClick, onUpdate, isValid); thymeAttributes.annotationManager = annotationManager; + // update annotations manually once as initialization + annotationManager.updateAnnotations(() => { + openAnnotationIfSpecifiedInUrl(); + }); + // Update annotations after deleting an annotation const ANNOTATION_DELETE_SELECTOR = "#annotation-delete-button"; $(document).on("click", ANNOTATION_DELETE_SELECTOR, function () { diff --git a/app/assets/stylesheets/annotations.scss b/app/assets/stylesheets/annotations.scss index 946dd05aa..aafe12d86 100644 --- a/app/assets/stylesheets/annotations.scss +++ b/app/assets/stylesheets/annotations.scss @@ -5,14 +5,6 @@ font-size: 1.3rem; padding: 2px 8px; - i { - &::before { - color: transparent; - background-clip: text; - background-image: radial-gradient(at bottom right, rgb(30, 82, 141) 0%, rgb(237, 152, 189) 100%); - } - } - transition: filter 60ms ease-in-out; &:hover { diff --git a/app/assets/stylesheets/annotations_overview.scss b/app/assets/stylesheets/annotations_overview.scss new file mode 100644 index 000000000..7ff1fe21c --- /dev/null +++ b/app/assets/stylesheets/annotations_overview.scss @@ -0,0 +1,15 @@ +.subtle-background { + background-image: linear-gradient(30deg, #fafdff 12%, transparent 12.5%, transparent 87%, #fafdff 87.5%, #fafdff), linear-gradient(150deg, #fafdff 12%, transparent 12.5%, transparent 87%, #fafdff 87.5%, #fafdff), linear-gradient(30deg, #fafdff 12%, transparent 12.5%, transparent 87%, #fafdff 87.5%, #fafdff), linear-gradient(150deg, #fafdff 12%, transparent 12.5%, transparent 87%, #fafdff 87.5%, #fafdff), linear-gradient(60deg, #fafdff77 25%, transparent 25.5%, transparent 75%, #fafdff77 75%, #fafdff77), linear-gradient(60deg, #fafdff77 25%, transparent 25.5%, transparent 75%, #fafdff77 75%, #fafdff77); + background-size: 42px 74px; + background-position: 0 0, 0 0, 21px 37px, 21px 37px, 0 0, 21px 37px; +} + +.annotation-overview-item { + border-width: 1.5px; + cursor: pointer; + transition: box-shadow 120ms cubic-bezier(0.33, 1, 0.68, 1); + + &:hover { + box-shadow: rgba(0, 0, 0, 0.23) 1px 2px 8px -2px; + } +} \ No newline at end of file diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb index 3b65c3a02..67d579757 100644 --- a/app/controllers/annotations_controller.rb +++ b/app/controllers/annotations_controller.rb @@ -1,6 +1,18 @@ class AnnotationsController < ApplicationController authorize_resource + def index + @annotations_by_lecture = annotations_by_lecture(current_user.own_annotations) + + @show_students_annotations = current_user.teachable_editor_or_teacher? + if @show_students_annotations + @student_annotations_by_lecture = + annotations_by_lecture(current_user.students_annotations, is_shared: true) + end + + render layout: "application_no_sidebar_with_background" + end + def show @annotation = Annotation.find(params[:id]) end @@ -208,4 +220,29 @@ def commontator_comment(annotation) annotation.public_comment_id = comment.id end + + def annotations_by_lecture(annotations, is_shared: false) + annotations + .map { |a| extract_annotation_overview_information(a, is_shared) } + .group_by { |annotation| annotation[:lecture] } + .sort_by { |lecture, _annotations| lecture.updated_at }.reverse.to_h + # Instead of the full lecture object, we only need its title, + # and also not as value anymore for individual annotations. + .transform_keys(&:title) + .transform_values { |annos| annos.map { |a| a.except(:lecture) } } + .transform_values { |annos| annos.sort_by { |a| a[:created_at] }.reverse } + end + + def extract_annotation_overview_information(annotation, is_shared) + { + category: annotation.category, + text: annotation.comment_optional, + color: annotation.color, + updated_at: annotation.updated_at, + lecture: annotation.medium.teachable.lecture, + link: helpers.annotation_open_link(annotation, is_shared), + medium_title: annotation.medium.caption, + medium_date: annotation.medium.lesson&.date_localized + } + end end diff --git a/app/controllers/cypress/cypress_controller.rb b/app/controllers/cypress/cypress_controller.rb index 3e043ba15..c108c4868 100644 --- a/app/controllers/cypress/cypress_controller.rb +++ b/app/controllers/cypress/cypress_controller.rb @@ -4,6 +4,9 @@ module Cypress # The main purpose of this class is to send back errors as JSON object # to parse them in the Cypress test UI. This way, we can display the error # message and the stacktrace in the Cypress test. + # + # The convention with the frontend is to return the status `created` + # for successful requests and `bad_request` (or anything else) for failed requests. class CypressController < ApplicationController respond_to :json rescue_from Exception, with: :show_errors diff --git a/app/controllers/cypress/i18n_controller.rb b/app/controllers/cypress/i18n_controller.rb new file mode 100644 index 000000000..cc3e5ec1a --- /dev/null +++ b/app/controllers/cypress/i18n_controller.rb @@ -0,0 +1,26 @@ +module Cypress + # Allows to access i18n keys in Cypress tests. + class I18nController < CypressController + def create + unless params[:i18n_key].is_a?(String) + msg = "Argument `i18n_key` must be a string indicating the i18n key." + msg += " But we got: '#{params[:i18n_key]}'" + raise(ArgumentError, msg) + end + + 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]}'" + 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 +end diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb index 2e8bf90fd..97d9950ab 100644 --- a/app/controllers/media_controller.rb +++ b/app/controllers/media_controller.rb @@ -524,6 +524,7 @@ def check_annotation_visibility # which has nothing to do with the thyme player(s). def feedback I18n.locale = @medium.locale_with_inheritance + @time = params[:time] render layout: "feedback" end diff --git a/app/helpers/annotations_helper.rb b/app/helpers/annotations_helper.rb new file mode 100644 index 000000000..2d7646467 --- /dev/null +++ b/app/helpers/annotations_helper.rb @@ -0,0 +1,22 @@ +require "uri" + +module AnnotationsHelper + def annotation_open_link(annotation, is_shared) + link = if is_shared + feedback_video_link_timed(annotation.medium_id, annotation.timestamp) + else + video_link_timed(annotation.medium_id, annotation.timestamp) + end + link = URI.parse(link) + link.query = link.query.present? ? "#{link.query}&ann=#{annotation.id}" : "ann=#{annotation.id}" + link.to_s + end + + def annotation_index_border_color(annotation, is_student_annotation) + # The border color of annotation cards shared by students, will be set + # via JS according to the color of the annotation CATEGORY. + return "" if is_student_annotation + + "border-color: #{annotation[:color]}" + end +end diff --git a/app/helpers/media_helper.rb b/app/helpers/media_helper.rb index fe432a51f..8bb3a8924 100644 --- a/app/helpers/media_helper.rb +++ b/app/helpers/media_helper.rb @@ -149,4 +149,12 @@ def external_link_description_not_empty(medium) # link url itself. medium.external_link_description.presence || medium.external_reference_link end + + def video_link_timed(medium, timestamp) + play_medium_path(medium, params: { time: timestamp.total_seconds }) + end + + def feedback_video_link_timed(medium, timestamp) + feedback_medium_path(medium, params: { time: timestamp.total_seconds }) + end end diff --git a/app/models/user.rb b/app/models/user.rb index 4b612f20e..6dc449057 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -801,6 +801,19 @@ def last_sign_in_ip=(_ip) def current_sign_in_ip=(_ip) end + ############################################################################## + # Annotations + ############################################################################## + + def own_annotations + Annotation.where(user: self) + end + + def students_annotations + Annotation.where(medium_id: medium_ids_of_lectures_or_edited_lectures, + visible_for_teacher: true) + end + private def set_defaults @@ -848,4 +861,9 @@ def archive_user(archive_name) confirmed_at: Time.zone.now, archived: true) end + + def medium_ids_of_lectures_or_edited_lectures + lectures = given_lectures + edited_lectures + lectures.flat_map(&:media_with_inheritance).pluck(:id) + end end diff --git a/app/views/annotations/_annotation_area.html.erb b/app/views/annotations/_annotation_area.html.erb index ab0cfa8e8..2e0327e89 100644 --- a/app/views/annotations/_annotation_area.html.erb +++ b/app/views/annotations/_annotation_area.html.erb @@ -2,7 +2,7 @@
-
+
diff --git a/app/views/annotations/_index_accordion.html.erb b/app/views/annotations/_index_accordion.html.erb new file mode 100644 index 000000000..a8f4da4ae --- /dev/null +++ b/app/views/annotations/_index_accordion.html.erb @@ -0,0 +1,73 @@ +<% accordionLabel = "annotations-overview-accordion" %> +<% accordionLabel = "student-#{accordionLabel}" if is_students_annotations %> + diff --git a/app/views/annotations/index.html.erb b/app/views/annotations/index.html.erb new file mode 100644 index 000000000..471820030 --- /dev/null +++ b/app/views/annotations/index.html.erb @@ -0,0 +1,67 @@ +<%= stylesheet_link_tag 'annotations_overview' %> + +
+ + + + + + <% if @show_students_annotations %> + +

<%= t('admin.annotation.students_annotations') %>

+ + <% if @student_annotations_by_lecture.empty? %> + +
+ +

+ <%= t('admin.annotation.none_yet_students') %> +

+
+ + <% else %> + +

+ <%= t('admin.annotation.overview_description_students_annotations') %> +

+ + <%= render 'annotations/index_accordion', + annotations_by_lecture: @student_annotations_by_lecture, + is_students_annotations: true %> + + <% end %> + +
+ <% end %> + + + + + +

<%= t('admin.annotation.your_annotations') %>

+ + <% if @annotations_by_lecture.empty? %> + +
+ +

+ <%= t('admin.annotation.none_yet_html') %> +

+
+ + <% else %> + +

+ <%= t('admin.annotation.overview_description') %> +

+ + <%= render 'annotations/index_accordion', + annotations_by_lecture: @annotations_by_lecture, + is_students_annotations: false %> + + <% end %> + + +
+ +<%= javascript_include_tag :annotations_overview %> diff --git a/app/views/commontator/comments/_body.html.erb b/app/views/commontator/comments/_body.html.erb index f6e3df238..76235cb74 100644 --- a/app/views/commontator/comments/_body.html.erb +++ b/app/views/commontator/comments/_body.html.erb @@ -12,6 +12,5 @@ <% timestamp = annotation.timestamp %>
Timestamp: - - <%= timestamp.hms_colon_string %> + <%= link_to timestamp.hms_colon_string, video_link_timed(medium, timestamp) %> <% end %> diff --git a/app/views/media/feedback.html.erb b/app/views/media/feedback.html.erb index 5bc8367df..eb92333bf 100644 --- a/app/views/media/feedback.html.erb +++ b/app/views/media/feedback.html.erb @@ -17,7 +17,7 @@ play_arrow - + 0:00:00 diff --git a/app/views/media/play.html.erb b/app/views/media/play.html.erb index 52b838860..8caf53605 100644 --- a/app/views/media/play.html.erb +++ b/app/views/media/play.html.erb @@ -18,7 +18,7 @@ play_arrow - + 0:00:00 @@ -66,7 +66,7 @@ <% if user_signed_in? %> - + <% end %> diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb index 73e98ebf1..34b89358f 100644 --- a/app/views/shared/_navbar.html.erb +++ b/app/views/shared/_navbar.html.erb @@ -43,6 +43,14 @@ <% end %> +
  • + + +
    • +
  • + Du hast noch keine Annotationen erstellt. Erfahre mehr in unserem + Blog post. + none_yet_students: > + Noch keiner Deiner Studierenden hat eine Annotation erstellt und sie + mit Dir geteilt. annotations: 'Annotationen' + overview_description: > + Hier findest Du eine Liste aller Annotationen, die Du zu verschiedenen + Vorlesungen erstellt hast. Klicke auf eine Annotation, um zu ihr zu springen. + Annotationen werden entsprechend der von Dir gewählten Farbe eingefärbt. + overview_description_students_annotations: > + Hier sind alle Annotationen von Studierenden aufgeführt, die sie mit Dir + in Vorlesungen geteilt haben, welche Du verwaltest (als Editor/Lehrkraft). + Klicke auf eine Annotation, um zu ihr im Feedback-Player zu springen. + Annotationen werden entsprechend ihrer Kategorie eingefärbt. annotation_modal_head_create_annotation: 'Annotation anlegen' annotation_modal_head_edit_annotation: 'Annotation bearbeiten' inherit_from_lecture: 'von Vorlesung erben' @@ -2548,6 +2565,7 @@ de: formats: concise: '%d.%m.%Y' publication_time: '%A, den %d.%m.%Y um %H.%M Uhr' + last_updated: 'Zuletzt aktualisiert vor %{time_ago}' thyme: back: 'zurück' back_to: 'zurück zu ' diff --git a/config/locales/en.yml b/config/locales/en.yml index 6eb83a3c3..6fae4ba62 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -324,7 +324,24 @@ en: teacher: 'Teacher' editors: 'Editors' annotation: + your_annotations: 'Your annotations' + students_annotations: 'Students annotations' + none_yet_html: > + You have not created any annotations yet. Learn how to do so in our + blog post. + none_yet_students: > + None of your students has created an annotation yet and shared it + with you. annotations: 'Annotations' + overview_description: > + This list comprises all annotations you have created across various + lectures. Click on an annotation to view it. + Annotations are colored according to the color you have chosen. + overview_description_students_annotations: > + Here you find all annotations from students that they have shared with you + in lectures that you manage (as an editor/teacher). + Click on an annotation to jump to it in the feedback player. + Annotations are colored according to their category. annotation_modal_head_create_annotation: 'Create annotation' annotation_modal_head_edit_annotation: 'Edit annotation' inherit_from_lecture: 'inherit from lecture' @@ -2404,6 +2421,7 @@ en: formats: concise: '%Y-%m-%d' publication_time: '%A, %B %d, %Y at %I:%M %p' + last_updated: 'Last updated %{time_ago} ago' thyme: back: 'back' back_to: 'back to ' diff --git a/config/routes.rb b/config/routes.rb index 33f2dac29..d9925650a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -13,6 +13,7 @@ resources :factories, only: :create resources :database_cleaner, only: :create resources :user_creator, only: :create + resources :i18n, only: :create end end @@ -47,7 +48,6 @@ as: "classification" # annotation routes - get "annotations/update_annotations", to: "annotations#update_annotations", as: "update_annotations" @@ -56,7 +56,7 @@ to: "annotations#num_nearby_posted_mistake_annotations", as: "num_nearby_posted_mistake_annotations" - resources :annotations, only: [:new, :create, :edit, :update, :destroy] + resources :annotations # announcements routes diff --git a/spec/cypress/e2e/annotations_overview_spec.cy.js b/spec/cypress/e2e/annotations_overview_spec.cy.js new file mode 100644 index 000000000..f4c2f9561 --- /dev/null +++ b/spec/cypress/e2e/annotations_overview_spec.cy.js @@ -0,0 +1,242 @@ +import FactoryBot from "../support/factorybot"; +import { hexToRgb } from "../support/utility"; + +const CARD_SELECTOR = "annotation-overview-card"; + +const LECTURE_TITLE_1 = "SageMath"; +const MEDIUM_TITLE_1 = "Intro modules"; +const LECTURE_TITLE_2 = "Lean4"; +const MEDIUM_TITLE_2 = "Intro operators"; +const MEDIUM_TITLE_3 = "Continuous functions"; + +function createAnnotationScenario(context, userRole = "student") { + if (userRole === "teacher") { + cy.createUser("generic").as("genericUser"); + cy.createUserAndLogin("teacher").as("user"); + } + else { + cy.createUser("teacher").as("teacherUser"); + cy.createUserAndLogin("generic").as("user"); + } + + // Lectures + 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", + { title: LECTURE_TITLE_1, teacher_id: teacherUser.id }).as("lectureSage"); + FactoryBot.create("lecture_with_sparse_toc", "with_title", "with_teacher_by_id", + { title: LECTURE_TITLE_2, teacher_id: teacherUser.id }).as("lectureLean"); + }); + + // Lessons + cy.then(() => { + FactoryBot.create("valid_lesson", { lecture_id: context.lectureSage.id }).as("lesson1"); + FactoryBot.create("valid_lesson", { lecture_id: context.lectureLean.id }).as("lesson2"); + FactoryBot.create("valid_lesson", { lecture_id: context.lectureLean.id }).as("lesson3"); + }); + + // Media + cy.then(() => { + FactoryBot.create("lesson_medium", "with_video", "released", + "with_lesson_by_id", { lesson_id: context.lesson1.id, description: MEDIUM_TITLE_1 }) + .as("medium1"); + FactoryBot.create("lesson_medium", "with_video", "released", + "with_lesson_by_id", { lesson_id: context.lesson2.id, description: MEDIUM_TITLE_2 }) + .as("medium2"); + FactoryBot.create("lesson_medium", "with_video", "released", + "with_lesson_by_id", { lesson_id: context.lesson3.id, description: MEDIUM_TITLE_3 }) + .as("medium3"); + }); + + // Annotations + cy.then(() => { + FactoryBot.create("annotation", "with_text", + { medium_id: context.medium1.id, user_id: context.user.id }).as("annotation1"); + FactoryBot.create("annotation", "with_text", + { medium_id: context.medium2.id, user_id: context.user.id }).as("annotation2"); + FactoryBot.create("annotation", "with_text", + { medium_id: context.medium3.id, user_id: context.user.id }).as("annotation3"); + FactoryBot.create("annotation", "with_text", + { medium_id: context.medium3.id, user_id: context.user.id }).as("annotation4"); + }); +} + +describe("Annotation section", () => { + it("shows only *own* annotations for generic user", function () { + cy.createUserAndLogin("generic"); + + cy.i18n("admin.annotation.your_annotations").as("yourAnnotations"); + cy.i18n("admin.annotation.students_annotations").as("studentsAnnotations"); + + cy.then(() => { + cy.visit("/annotations"); + cy.getBySelector("annotations-container").should("contain", this.yourAnnotations); + cy.getBySelector("annotations-container").should("not.contain", this.studentsAnnotations); + }); + }); + + it("shows both *own* and *students'* annotations for teacher", function () { + 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 }); + }); + + cy.i18n("admin.annotation.your_annotations").as("yourAnnotations"); + cy.i18n("admin.annotation.students_annotations").as("studentsAnnotations"); + + cy.then(() => { + cy.visit("/annotations"); + cy.getBySelector("annotations-container").should("contain", this.yourAnnotations); + cy.getBySelector("annotations-container").should("contain", this.studentsAnnotations); + }); + }); +}); + +describe("User annotation card", () => { + beforeEach(function () { + createAnnotationScenario(this); + }); + + it("is grouped by lecture", function () { + cy.visit("/annotations"); + // lecture title 1 comes last because we sort according to lecture.updated_at + // and lecture 2 is created after lecture 1 + [LECTURE_TITLE_2, LECTURE_TITLE_2, LECTURE_TITLE_2, LECTURE_TITLE_1] + .forEach((title, i) => { + cy.getBySelector(CARD_SELECTOR).eq(i) + .parents(".accordion-collapse").siblings(".accordion-header") + .should("contain", title); + }); + }); + + it("renders math content", function () { + cy.visit("/annotations"); + cy.getBySelector(CARD_SELECTOR).first().then(($card) => { + cy.wrap($card).find(".katex").should("not.exist"); + }); + + // Create annotation with math content + FactoryBot.create("annotation", "with_text", + { medium_id: this.medium3.id, user_id: this.user.id, + comment: "This is a math annotation: $\\frac{1}{2}$", + }); + + cy.then(() => { + cy.visit("/annotations"); + cy.getBySelector(CARD_SELECTOR).first().then(($card) => { + cy.wrap($card).find(".katex").should("exist"); + }); + }); + }); + + it("contains medium and annotation information", function () { + cy.visit("/annotations"); + [ + { title: MEDIUM_TITLE_3, annotation: this.annotation4, lesson: this.lesson3 }, + { title: MEDIUM_TITLE_3, annotation: this.annotation3, lesson: this.lesson3 }, + { title: MEDIUM_TITLE_2, annotation: this.annotation2, lesson: this.lesson2 }, + { title: MEDIUM_TITLE_1, annotation: this.annotation1, lesson: this.lesson1 }, + ].forEach((test, i) => { + cy.getBySelector(CARD_SELECTOR).eq(i).as("card"); + + // Lesson date + const expectedDate = this.user.locale === "de" + ? new Date(test.lesson.date).toLocaleDateString("de-DE", { + year: "numeric", + month: "2-digit", + day: "2-digit", + }) + : test.lesson.date; + cy.get("@card").children().first().should("contain", expectedDate); + + // Medium title + cy.get("@card").children().first().should("contain", test.title); + + // Annotation category & comment + cy.get("@card").children().first().invoke("text").then((categoryText) => { + expect(categoryText.toLowerCase()).to.contain(test.annotation.category); + }); + cy.get("@card").children().eq(1).should("contain", test.annotation.comment); + }); + }); + + it("has border according to annotation color", function () { + cy.visit("/annotations"); + [this.annotation4, this.annotation3, this.annotation2, this.annotation1] + .forEach((annotation, i) => { + cy.getBySelector(CARD_SELECTOR).eq(i).as("card"); + const colorExpected = hexToRgb(annotation.color); + cy.get("@card").should("have.css", "border-color", colorExpected); + }); + }); + + it("redirects to medium video when clicked", function () { + [ + { medium: this.medium3, annotation: this.annotation4 }, + { medium: this.medium3, annotation: this.annotation3 }, + { medium: this.medium2, annotation: this.annotation2 }, + { medium: this.medium1, annotation: this.annotation1 }, + ].forEach((test, i) => { + cy.visit("/annotations"); + cy.getBySelector("annotation-overview-card-link").eq(i).as("card"); + cy.get("@card").parents(".accordion-collapse").siblings(".accordion-header").click(); + cy.get("@card").clickExpectNewTab(); + + cy.url().should("contain", `/media/${test.medium.id}`); + let timestamp = `0:00:${test.annotation.timestamp.seconds}`; + cy.getBySelector("current-time").should("contain", timestamp); + cy.getBySelector("annotation-comment").should("contain", test.annotation.comment); + }); + }); +}); + +describe("Student annotation card (shared with teacher)", () => { + beforeEach(function () { + createAnnotationScenario(this, "teacher"); + + cy.then(() => { + FactoryBot.create("annotation", "with_text", "shared_with_teacher", + { medium_id: this.medium1.id, user_id: this.genericUser.id }).as("annotation1FromStudent"); + FactoryBot.create("annotation", "with_text", "shared_with_teacher", + { medium_id: this.medium1.id, user_id: this.genericUser.id }).as("annotation2FromStudent"); + FactoryBot.create("annotation", "with_text", "shared_with_teacher", + { medium_id: this.medium3.id, user_id: this.genericUser.id }).as("annotation3FromStudent"); + }); + }); + + it("has border according to annotation *category*, not its color", function () { + const colorMap = { + note: "#f78f19", + content: "#A333C8", + presentation: "#2185D0", + mistake: "#fc1461", + }; + cy.visit("/annotations"); + [this.annotation3FromStudent, this.annotation2FromStudent, this.annotation1FromStudent] + .forEach((annotation, i) => { + cy.getBySelector(CARD_SELECTOR).eq(i).as("card"); + const colorExpected = hexToRgb(colorMap[annotation.category]); + cy.get("@card").should("have.css", "border-color", colorExpected); + }); + }); + + it("redirects to medium *feedback* video when clicked", function () { + [ + { medium: this.medium3, annotation: this.annotation3FromStudent }, + { medium: this.medium1, annotation: this.annotation2FromStudent }, + { medium: this.medium1, annotation: this.annotation1FromStudent }, + ].forEach((test, i) => { + cy.visit("/annotations"); + cy.getBySelector("annotation-overview-card-link").eq(i).as("card"); + cy.get("@card").parents(".accordion-collapse").siblings(".accordion-header").click(); + cy.get("@card").clickExpectNewTab(); + + cy.url().should("contain", `/media/${test.medium.id}/feedback`); + let timestamp = `0:00:${test.annotation.timestamp.seconds}`; + cy.getBySelector("current-time").should("contain", timestamp); + cy.getBySelector("annotation-comment").should("contain", test.annotation.comment); + }); + }); +}); diff --git a/spec/cypress/support/commands.js b/spec/cypress/support/commands.js index 82d3e5ef0..f965e0486 100644 --- a/spec/cypress/support/commands.js +++ b/spec/cypress/support/commands.js @@ -1,6 +1,25 @@ // https://on.cypress.io/custom-commands import BackendCaller from "./backend_caller"; +Cypress.Commands.add("getBySelector", (selector, ...args) => { + return cy.get(`[data-cy=${selector}]`, ...args); +}); + +/** + * Expects the subject to be an anchor element `` with a target attribute set + * to "_blank", such that the link opens in a new tab. + * Since we cannot access the new tab in Cypress tests, we remove the target + * attribute from the link and instead just follow the link in the same tab + * to continue testing. + */ +Cypress.Commands.add("clickExpectNewTab", { prevSubject: true }, ($subject, args) => { + const errMsg = "Expected subject to be an anchor element"; + expect($subject.is("a"), errMsg).to.be.true; + + cy.wrap($subject).should("have.attr", "target", "_blank"); + return cy.wrap($subject).invoke("removeAttr", "target").click(args); +}); + Cypress.Commands.add("cleanDatabase", () => { return BackendCaller.callCypressRoute("database_cleaner", "cy.cleanDatabase()", {}); }); @@ -30,6 +49,14 @@ Cypress.Commands.add("login", (user) => { }); Cypress.Commands.add("createUserAndLogin", (role) => { - cy.createUser(role); - cy.login({ email: `${role}@mampf.cypress`, password: "cypress123" }); + cy.createUser(role).then((user) => { + cy.login({ email: `${role}@mampf.cypress`, password: "cypress123" }).then((_) => { + cy.wrap(user); + }); + }); +}); + +Cypress.Commands.add("i18n", (key, substitutions) => { + return BackendCaller.callCypressRoute("i18n", "cy.i18n()", + { i18n_key: key, substitutions: substitutions }); }); diff --git a/spec/cypress/support/utility.js b/spec/cypress/support/utility.js new file mode 100644 index 000000000..0898e6a3f --- /dev/null +++ b/spec/cypress/support/utility.js @@ -0,0 +1,21 @@ +export function hexToRgb(hex) { + let r = 0; + let g = 0; + let b = 0; + + // 3 digits + if (hex.length === 4) { + r = parseInt(`${hex[1]}${hex[1]}`, 16); + g = parseInt(`${hex[2]}${hex[2]}`, 16); + b = parseInt(`${hex[3]}${hex[3]}`, 16); + } + + // 6 digits + else if (hex.length === 7) { + r = parseInt(hex.slice(1, 3), 16); + g = parseInt(hex.slice(3, 5), 16); + b = parseInt(hex.slice(5, 7), 16); + } + + return `rgb(${r}, ${g}, ${b})`; +}; diff --git a/spec/factories/annotations.rb b/spec/factories/annotations.rb new file mode 100644 index 000000000..dc677ef73 --- /dev/null +++ b/spec/factories/annotations.rb @@ -0,0 +1,33 @@ +FactoryBot.define do + factory :annotation do + medium_id { |id| id } + user_id { |id| id } + + transient do + annotation_time do + # Pick a random number such that the annotation is still within the length + # of the sample video (which is around 42s seconds long) + seconds = nil + while seconds.nil? || seconds.to_f > 40.00 + seconds = Faker::Number.decimal(l_digits: 2, r_digits: 2) + end + seconds + end + end + + timestamp do + build(:time_stamp, total_seconds: annotation_time) + end + + color { Annotation.colors.values.sample } + category { Annotation.categories.keys.sample } + + trait :with_text do + comment { Faker::Lorem.sentence } + end + + trait :shared_with_teacher do + visible_for_teacher { true } + end + end +end diff --git a/spec/factories/lectures.rb b/spec/factories/lectures.rb index cadd60178..ae0274c8c 100644 --- a/spec/factories/lectures.rb +++ b/spec/factories/lectures.rb @@ -54,6 +54,21 @@ end end + trait :with_title do + transient do + title { Faker::Book.title } + end + # also see https://github.com/thoughtbot/factory_bot/issues/1391 + 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/media.rb b/spec/factories/media.rb index 1d43ec5a4..f270e2531 100644 --- a/spec/factories/media.rb +++ b/spec/factories/media.rb @@ -72,6 +72,13 @@ sort { "Kaviar" } teachable_sort { :valid_lesson } after(:build) { |m| m.editors << m.teachable.lecture.teacher } + + trait :with_lesson_by_id do + transient do + lesson_id { nil } + end + teachable { Lesson.find(lesson_id) } + end end factory :lecture_medium, From 013cca25b34b1a60d62515e0f61895b235a1bdee Mon Sep 17 00:00:00 2001 From: Splines <37160523+Splines@users.noreply.github.com> Date: Tue, 13 Aug 2024 20:17:22 +0200 Subject: [PATCH 15/17] Destroy talk media upon user deletion (#651) --- app/models/user.rb | 17 +++++++++++ spec/models/user_spec.rb | 65 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index 6dc449057..3952d0d1d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -99,6 +99,11 @@ class User < ApplicationRecord after_create :set_consented_at before_destroy :destroy_single_submissions, prepend: true + attr_accessor :skip_destroy_talk_media + + before_destroy :destroy_talk_media_upon_user_deletion, prepend: true, + unless: :skip_destroy_talk_media + # users can comment stuff acts_as_commontator @@ -704,6 +709,7 @@ def archive_and_destroy(archive_name) success = transfer_contributions_to(archive_user(archive_name)) return false unless success end + self.skip_destroy_talk_media = true destroy end @@ -839,6 +845,17 @@ def destroy_single_submissions .map(&:id)).destroy_all end + # Destroys all talk media of the user. + # If the user is an editor of media other than talk-related media, + # nothing will happen. + def destroy_talk_media_upon_user_deletion + return if edited_media.where.not(teachable_type: "Talk").any? + + # Only delete media where the user is the sole editor. + sole_editor_media = edited_media.select { |m| m.editors.count == 1 } + Medium.where(id: sole_editor_media.pluck(:id)).destroy_all + end + def archive_email splitting = DefaultSetting::PROJECT_EMAIL.split("@") "#{splitting.first}-archive-#{id}@#{splitting.second}" diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 6675cbb53..27dc503a4 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -99,4 +99,69 @@ # end # end # end + + describe("#destroy_talk_media") do + let(:medium) do + medium = FactoryBot.build(:medium) + medium.teachable_type = "Lecture" + medium.save(validate: false) + medium + end + + let(:medium_talk) do + medium = FactoryBot.build(:medium) + medium.teachable_type = "Talk" + medium.save(validate: false) + medium + end + + context("when user is destroyed") do + it("method is called") do + user = FactoryBot.create(:confirmed_user) + expect(user).to receive(:destroy_talk_media_upon_user_deletion) + user.destroy + end + + context("when user self-deletes (archive & destroy)") do + it("method is not called") do + user = FactoryBot.create(:confirmed_user) + expect(user).not_to receive(:destroy_talk_media_upon_user_deletion) + user.archive_and_destroy("dummy archive user name") + end + end + end + + context("when user has media other than talk media") do + it("does not destroy any media") do + user = FactoryBot.create(:confirmed_user) + medium + medium_talk + + # use .send(:...) to access private method + expect { user.send(:destroy_talk_media_upon_user_deletion) } + .not_to(change { Medium.count }) + end + end + + context("when user has only talk media") do + it("does not destroy talk media that has multiple editors") do + user = FactoryBot.create(:confirmed_user) + user2 = FactoryBot.create(:confirmed_user) + medium_talk.editors << user + medium_talk.editors << user2 + + expect { user.send(:destroy_talk_media_upon_user_deletion) } + .not_to(change { Medium.count }) + end + + it("destroys talk media that has only one editor") do + user = FactoryBot.create(:confirmed_user) + medium_talk.editors << user + + expect { user.send(:destroy_talk_media_upon_user_deletion) } + .to(change { Medium.count }.by(-1) + .and(change { Medium.exists?(medium_talk.id) }.from(true).to(false))) + end + end + end end From 6557bf47e5b25e82f4987227b7f56569dc1afe4a Mon Sep 17 00:00:00 2001 From: Splines <37160523+Splines@users.noreply.github.com> Date: Tue, 13 Aug 2024 23:18:44 +0200 Subject: [PATCH 16/17] Use deletion strategy instead of transaction (#676) --- spec/support/database_cleaner.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/support/database_cleaner.rb b/spec/support/database_cleaner.rb index a8949daa8..142eaa42a 100644 --- a/spec/support/database_cleaner.rb +++ b/spec/support/database_cleaner.rb @@ -1,11 +1,11 @@ # See the docs here: https://www.rubydoc.info/github/DatabaseCleaner/database_cleaner RSpec.configure do |config| config.before(:suite) do - DatabaseCleaner.strategy = :transaction - DatabaseCleaner.clean_with(:truncation) + DatabaseCleaner.clean_with(:deletion) end config.before(:each) do + DatabaseCleaner.strategy = :deletion DatabaseCleaner.start end From d0f8f44f897a222fe88c57386daba5faa4db61ed Mon Sep 17 00:00:00 2001 From: Splines <37160523+Splines@users.noreply.github.com> Date: Tue, 13 Aug 2024 23:28:08 +0200 Subject: [PATCH 17/17] Delete users that haven't logged in for too long (#647) * Add deletion_date to users in DB * Set deletion date in user cleaner * Remove old user cleaner code & add first unit test * Don't just mount `spec` folder, but complete `app` folder for tests This is to ensure that local changes in the `app` folder are reflected in the Docker container such that newly written tests can be run through without having to rebuild the whole Docker image. * Revert "Don't just mount `spec` folder, but complete `app` folder for tests" This reverts commit b3f3ec800c8d23b6ce87e9c93da0111b046b1bde. * Add more unit tests for UserCleaner * Improve tests for deletion of generic users only * Split test for deletion of users * Unset deletion date after successful user login * Implement un-setting the deletion date & add tests * Rewrite deletion unsetting to reuse existing method * Send initial warning mail about deletion in 40 days * Send additional warning mails when deletion date is near * Add schema comment pointing to UserCleaner * Test mail delivery * Add "!" to unsafe method * Use Rails logger to log info about deleted users * Move UserCleaner from models to workers * Setup user cleaner cron job to run daily * Improve user cleaner doc strings & refactor * Remove user ghost hash remnants * Avoid unnecessary `to_date` conversion * Improve comment for `after_authentication` hook * Fix wording in comment * Make better use of `let` RSpec keyword * Limit the number of users deleted in one run * Simplify unsetting deletion date logic * Define `active_users` to reduce SQL operations * Use `7.1` as Rails version specifier in migrations * Explicitly set `INACTIVE_USER_THRESHOLD` in tests * Make `MAX_DELETIONS_PER_RUN` an env variable * Don't send deletion warning mails to non-generic users * Send a final deletion mail once the user is deleted * Move user cleaner file back to models folder * Rename user cleaner files * Count users without last_sign_in_at date as inactive * Improve docstring for `inactive_users` * Shorten user cleaner comment in docker.env * Introduce `PRODUCTION_NAME` env variable * Don't run user cleaner for mampf-experimental/dev * Rewrite logic for when user cleaner is started * Fix rubocop "where range" * Try to use after instead of append_after * Revert "Try to use after instead of append_after" This reverts commit 90aa6621be350c09c32ad3b903122500b1d37da4. * Try to not use cached docker in CI/CD unit tests * Revert "Try to not use cached docker in CI/CD unit tests" This reverts commit 069032b2e4cd5150d90806c0ca1e752e47d6a11e. * Move transaction strategy to before each block * Use around each in database cleaner config * Use version 2.1.0 of database cleaner * Revert "Use version 2.1.0 of database cleaner" This reverts commit 6dfcd9694d6a4c2d29a38a0394aaa3823a591b4d. * Add missing require "rails_helper" * Try deletion strategy of database cleaner --- app/mailers/mathi_mailer.rb | 8 - app/mailers/user_cleaner_mailer.rb | 28 ++ app/models/user_cleaner.rb | 219 +++++++------ .../layouts/warning_mail_layout.html.erb | 18 ++ app/views/mathi_mailer/ghost_email.html.erb | 1 - .../deletion_email.html.erb | 10 + .../pending_deletion_email.html.erb | 12 + app/workers/user_cleaner.rb | 13 + app/workers/user_cleaner_job.rb | 8 - config/environments/production.rb | 5 + config/initializers/after_sign_in.rb | 10 + config/locales/de.yml | 16 + config/locales/en.yml | 15 + config/schedule.yml | 7 +- ...0240530200000_add_deletion_date_to_user.rb | 5 + ...40605200000_remove_ghost_hash_from_user.rb | 5 + db/schema.rb | 4 +- docker/development/docker-compose.yml | 1 + .../production/docker-compose.production.yml | 2 + docker/production/docker.env | 3 + docker/test/docker-compose.yml | 1 + spec/factories/user_cleaners.rb | 12 - spec/models/teachable_parser_spec.rb | 2 + spec/models/user_cleaner_spec.rb | 293 +++++++++++++++++- spec/rails_helper.rb | 4 + 25 files changed, 552 insertions(+), 150 deletions(-) create mode 100644 app/mailers/user_cleaner_mailer.rb create mode 100644 app/views/layouts/warning_mail_layout.html.erb delete mode 100644 app/views/mathi_mailer/ghost_email.html.erb create mode 100644 app/views/user_cleaner_mailer/deletion_email.html.erb create mode 100644 app/views/user_cleaner_mailer/pending_deletion_email.html.erb create mode 100644 app/workers/user_cleaner.rb delete mode 100644 app/workers/user_cleaner_job.rb create mode 100644 config/initializers/after_sign_in.rb create mode 100644 db/migrate/20240530200000_add_deletion_date_to_user.rb create mode 100644 db/migrate/20240605200000_remove_ghost_hash_from_user.rb delete mode 100644 spec/factories/user_cleaners.rb diff --git a/app/mailers/mathi_mailer.rb b/app/mailers/mathi_mailer.rb index de9a71172..f53efa572 100644 --- a/app/mailers/mathi_mailer.rb +++ b/app/mailers/mathi_mailer.rb @@ -2,14 +2,6 @@ class MathiMailer < ApplicationMailer default from: DefaultSetting::PROJECT_EMAIL layout false - def ghost_email(user) - return if user.ghost_hash.nil? - - @name = user.name - @hash = user.ghost_hash - mail(to: user.email, subject: t("mailer.hash_mail_subject")) - end - def data_request_email(user) @mail = user.email @id = user.id diff --git a/app/mailers/user_cleaner_mailer.rb b/app/mailers/user_cleaner_mailer.rb new file mode 100644 index 000000000..f8535ccc2 --- /dev/null +++ b/app/mailers/user_cleaner_mailer.rb @@ -0,0 +1,28 @@ +class UserCleanerMailer < ApplicationMailer + layout "warning_mail_layout" + + # Creates an email to inform a user that their account will be deleted. + # + # @param [Integer] num_days_until_deletion: + # The number of days until the account will be deleted. + def pending_deletion_email(num_days_until_deletion) + user = params[:user] + sender = "#{t("mailer.warning")} <#{DefaultSetting::PROJECT_EMAIL}>" + I18n.locale = user.locale + + @num_days_until_deletion = num_days_until_deletion + subject = t("mailer.pending_deletion_subject", + num_days_until_deletion: @num_days_until_deletion) + mail(from: sender, to: user.email, subject: subject, priority: "high") + end + + # Creates an email to inform a user that their account has been deleted. + def deletion_email + user = params[:user] + sender = "#{t("mailer.warning")} <#{DefaultSetting::PROJECT_EMAIL}>" + I18n.locale = user.locale + + subject = t("mailer.deletion_subject") + mail(from: sender, to: user.email, subject: subject, priority: "high") + end +end diff --git a/app/models/user_cleaner.rb b/app/models/user_cleaner.rb index 8a5763e53..a70bb8f7f 100644 --- a/app/models/user_cleaner.rb +++ b/app/models/user_cleaner.rb @@ -1,125 +1,140 @@ -# PORO class that removes users with inactive emails +# Deletes inactive users from the database. +# See [1] for a description of how the flow works on a high level. +# +# Users have a deletion_date field that is nil by default. It is set to a future +# date if the user has been inactive for too long (i.e. hasn't logged in). +# Before the deletion date is reached, we send warning mails. If users log in +# before the deletion date, that date is reset to nil such that the user is not +# deleted. If the user is still inactive on the deletion date, the user is +# ultimately deleted. +# +# [1] https://github.com/MaMpf-HD/mampf/issues/410#issuecomment-2136875776 class UserCleaner - attr_accessor :imap, :email_dict, :hash_dict - - def login - @imap = Net::IMAP.new(ENV.fetch("IMAPSERVER"), port: 993, ssl: true) - @imap.authenticate("LOGIN", ENV.fetch("PROJECT_EMAIL_USERNAME"), - ENV.fetch("PROJECT_EMAIL_PASSWORD")) + # The maximum number of users that can be deleted in one run. + # This is equivalent to the maximum of number of deletion dates set in one run. + # + # This flag can be used to prevent too many mails from being sent at once. + # Keep in mind that the mail server also handles other mails, e.g. notification + # mails etc., so we might want to set the limit very low here such that our + # mail server is not marked as "spam server". + # + # Note that this is just a soft limit, i.e. the actual number of deletion + # warning mails sent on a given day might be higher than this number: + # - If on a given day the cronjob is not run (for whatever reason), + # we have more users with a deletion date lying in the past than + # MAX_DELETIONS_PER_RUN. However, we don't send an additional mail once + # the user is deleted, so this shouldn't be a problem. + # - Despite that there cannot be more than MAX_DELETIONS_PER_RUN users with the + # same deletion date, warning mails might be sent on the same date to users + # with varying deletion dates, since the 40-, 14-, 7- and 2-day warning mails + # can overlap temporally. + MAX_DELETIONS_PER_RUN = ENV.fetch("MAX_DELETIONS_PER_RUN").to_i + + # The threshold for inactive users. Users who have not logged in for this time + # are considered inactive. + INACTIVE_USER_THRESHOLD = 6.months + + # Returns all users who have been inactive for INACTIVE_USER_THRESHOLD months, + # i.e. their last sign-in date is more than INACTIVE_USER_THRESHOLD months ago. + # + # Users without a last_sign_in_at date are also considered inactive. This is + # the case for users who have never logged in since PR #553 was merged. + def inactive_users + User.where(last_sign_in_at: ...INACTIVE_USER_THRESHOLD.ago) + .or(User.where(last_sign_in_at: nil)) end - def logout - @imap.logout + # Returns all users who have been active in the last INACTIVE_USER_THRESHOLD months, + # i.e. their last sign-in date is less than INACTIVE_USER_THRESHOLD months ago. + def active_users + User.where(last_sign_in_at: INACTIVE_USER_THRESHOLD.ago..) end - def search_emails_and_hashes - @email_dict = {} - @hash_dict = {} - @imap.examine(ENV.fetch("PROJECT_EMAIL_MAILBOX")) - # Mails containing multiple email addresses (Subject: "Undelivered Mail Returned to Sender") - @imap.search(["SUBJECT", - "Undelivered Mail Returned to Sender"]).each do |message_id| - body = @imap.fetch(message_id, - "BODY[TEXT]")[0].attr["BODY[TEXT]"].squeeze(" ") - # rubocop:disable Layout/LineLength - next unless (match = body.scan(/([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})[\s\S]*?([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})[\s\S]*?User has moved to ERROR: Account expired/)) - # rubocop:enable Layout/LineLength - - match = match.flatten.uniq - match.each do |email| - add_mail(email, message_id) - - try_get_hash(body, email) - end - end - # Mails containing single email addresses (Subject: "Delivery Status Notification (Failure)") - # define array containing all used regex patterns - patterns = [ - '([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})>[\s\S]*?Unknown recipient', - # rubocop:disable Layout/LineLength - '([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4})>[\s\S]*?User unknown in virtual mailbox table' - # rubocop:enable Layout/LineLength - ] - - @imap.search(["SUBJECT", - "Delivery Status Notification (Failure)"]).each do |message_id| - body = @imap.fetch(message_id, - "BODY[TEXT]")[0].attr["BODY[TEXT]"].squeeze(" ") - patterns.each do |pattern| - next unless (match = body.scan(/#{pattern}/)) - - match = match.flatten.uniq - match.each do |email| - add_mail(email, message_id) - - try_get_hash(body, email) - end + # Sets the deletion date for inactive users and sends an initial warning mail. + # + # This method finds all inactive users whose deletion date is nil (not set yet) + # and updates their deletion date to be 40 days from the current date. + # + # The maximum number of deletion dates set in one run is limited by + # MAX_DELETIONS_PER_RUN. + def set_deletion_date_for_inactive_users + inactive_users.where(deletion_date: nil) + .limit(MAX_DELETIONS_PER_RUN) + .find_each do |user| + user.update(deletion_date: Date.current + 40.days) + + if user.generic? # rubocop:disable Style/IfUnlessModifier + UserCleanerMailer.with(user: user).pending_deletion_email(40).deliver_later end end end - def add_mail(email, message_id) - @email_dict = {} if @email_dict.blank? - if @email_dict.key?(email) - @email_dict[email] << message_id - else - @email_dict[email] = [message_id] - end + # Unsets the deletion date for users who have been active recently. + # + # This method finds all users whose deletion date is set and unsets it if the + # user has been active recently. + # + # Note that this method just serves as a safety measure. The deletion date + # should be unset after every successful user sign-in, see the Warden callback + # in `config/initializers/after_sign_in.rb`. If for some reason, the callback + # does not work, this method will prevent active users from being deleted + # as a last resort. + def unset_deletion_date_for_recently_active_users + active_users.where.not(deletion_date: nil).update(deletion_date: nil) end - def try_get_hash(body, email) - @hash_dict = {} if @hash_dict.blank? - begin - hash = body.match(/Hash:([a-zA-Z0-9]*)/).captures - @hash_dict[email] = hash - rescue StandardError - nil + # Deletes all users whose deletion date is in the past or present. + # + # Technically, there should never be users with a deletion date in the past + # since the cron job is run daily and should delete users on the day of their + # deletion date. Should the cron job not run for some reason, we also delete + # users with a deletion date in the past via this method. + # + # The deletion date for the users must have been set beforehand by calling + # `set_deletion_date_for_inactive_users`. + # + # Even after having called this method, there might still exist users with a + # deletion date in the future, as we only delete generic users. + def delete_users_according_to_deletion_date! + num_deleted_users = 0 + + User.where(deletion_date: ..Date.current).find_each do |user| + next unless user.generic? + + UserCleanerMailer.with(user: user).deletion_email.deliver_later + user.destroy + num_deleted_users += 1 end - end - def send_hashes - @emails = @email_dict.keys - @users = User.where(email: @emails) - - @users.each do |user| - user.update(ghost_hash: Digest::SHA256.hexdigest(Time.now.to_i.to_s)) - MathiMailer.ghost_email(user).deliver_now - move_mail(@email_dict[user]) - end + Rails.logger.info("UserCleaner deleted #{num_deleted_users} stale users") end - def delete_ghosts - # @hash_dict.each do |mail, hash| - # u = User.find_by(email: mail, ghost_hash: hash) - # move_mail(@email_dict[mail]) if u.present? && @email_dict.present? - # u.destroy! if u&.generic? - # end - end - - def move_mail(message_ids, attempt = 0) - return if message_ids.blank? + # Sends additional warning mails to users whose deletion date is near. + # + # In addition to the initial warning mail 40 days before deletion, this method + # sends warning mails 14, 7 and 2 days before the account is deleted. + def send_additional_warning_mails + User.where.not(deletion_date: nil).find_each do |user| + next unless user.generic? - message_ids = Array(message_ids) - return if attempt > 3 + num_days_until_deletion = (user.deletion_date - Date.current).to_i - begin - @imap.examine(ENV.fetch("PROJECT_EMAIL_MAILBOX")) - @imap.move(message_ids, "Other Users/mampf/handled_bounces") - rescue Net::IMAP::BadResponseError - move_mail(message_ids, attempt + 1) + if [14, 7, 2].include?(num_days_until_deletion) + UserCleanerMailer.with(user: user) + .pending_deletion_email(num_days_until_deletion) + .deliver_later + end end end - def clean! - # TODO: Implement new user cleaner logic - # login - # search_emails_and_hashes - # return if @email_dict.blank? + # Handles inactive users according to the deletion policy documented + # in the UserCleaner class description. Brief: users that haven't logged in + # to MaMpf for too long will be deleted. + def handle_inactive_users! + set_deletion_date_for_inactive_users + unset_deletion_date_for_recently_active_users + delete_users_according_to_deletion_date! - # send_hashes - # sleep(10) - # search_emails_and_hashes - # delete_ghosts - # logout + send_additional_warning_mails end end diff --git a/app/views/layouts/warning_mail_layout.html.erb b/app/views/layouts/warning_mail_layout.html.erb new file mode 100644 index 000000000..9ae0d3135 --- /dev/null +++ b/app/views/layouts/warning_mail_layout.html.erb @@ -0,0 +1,18 @@ + + + + + + <%= stylesheet_link_tag :email %> + + + +
    + <%= email_image_tag('/MaMpf-Logo_96x96.png', class: 'img-fluid mb-2 pt-4 pb-3' ) %> +
    + <%= yield %> +
    +
    + + + diff --git a/app/views/mathi_mailer/ghost_email.html.erb b/app/views/mathi_mailer/ghost_email.html.erb deleted file mode 100644 index ac7358de3..000000000 --- a/app/views/mathi_mailer/ghost_email.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= t('mailer.hash_mail_body', name: @name, hash: @hash) %> \ No newline at end of file diff --git a/app/views/user_cleaner_mailer/deletion_email.html.erb b/app/views/user_cleaner_mailer/deletion_email.html.erb new file mode 100644 index 000000000..ead872baf --- /dev/null +++ b/app/views/user_cleaner_mailer/deletion_email.html.erb @@ -0,0 +1,10 @@ +
    +
    +

    + <%= t('mailer.deletion_subject') %> +

    +

    + <%= t('mailer.deletion_body_html') %> +

    +
    +
    diff --git a/app/views/user_cleaner_mailer/pending_deletion_email.html.erb b/app/views/user_cleaner_mailer/pending_deletion_email.html.erb new file mode 100644 index 000000000..ad98f7ee5 --- /dev/null +++ b/app/views/user_cleaner_mailer/pending_deletion_email.html.erb @@ -0,0 +1,12 @@ +
    +
    +

    + <%= t('mailer.pending_deletion_subject', + num_days_until_deletion: @num_days_until_deletion) %> +

    +

    + <%= t('mailer.pending_deletion_body_html', + num_days_until_deletion: @num_days_until_deletion) %> +

    +
    +
    diff --git a/app/workers/user_cleaner.rb b/app/workers/user_cleaner.rb new file mode 100644 index 000000000..184a21f5d --- /dev/null +++ b/app/workers/user_cleaner.rb @@ -0,0 +1,13 @@ +class UserCleanerJob + include Sidekiq::Worker + + def perform + # Only run this job in production, not for mampf-experimental or mampf-dev. + # Note that Rails.env.production? is not sufficient in this context + # as both mampf-experimental and mampf-dev also run in production mode. + production_name = ENV.fetch("PRODUCTION_NAME", nil) + return unless production_name == "mampf" + + UserCleaner.new.handle_inactive_users! + end +end diff --git a/app/workers/user_cleaner_job.rb b/app/workers/user_cleaner_job.rb deleted file mode 100644 index 4c20eb572..000000000 --- a/app/workers/user_cleaner_job.rb +++ /dev/null @@ -1,8 +0,0 @@ -class UserCleanerJob - include Sidekiq::Worker - - def perform - user_cleaner = UserCleaner.new - user_cleaner.clean! - end -end diff --git a/config/environments/production.rb b/config/environments/production.rb index 18e070a38..7f0f4cec4 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -78,4 +78,9 @@ # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false + + config.after_initialize do + production_name = ENV.fetch("PRODUCTION_NAME", nil) + Rails.logger.info("PRODUCTION_NAME: #{production_name}") + end end diff --git a/config/initializers/after_sign_in.rb b/config/initializers/after_sign_in.rb new file mode 100644 index 000000000..8d6a8c694 --- /dev/null +++ b/config/initializers/after_sign_in.rb @@ -0,0 +1,10 @@ +# Callback documentation for Warden (used by Devise): +# https://github.com/wardencommunity/warden/wiki/Callbacks#after_authentication +Warden::Manager.after_authentication do |user, _auth, _opts| + # User might have not logged in for a long time, which is why they have a + # deletion date set. If the user logs in, we unset this date to prevent the + # user from being deleted. See the UserCleaner class for more information. + # In case this callback does not work, a safety net is provided by the method + # `unset_deletion_date_for_recently_active_users` in the UserCleaner class. + user.deletion_date = nil +end diff --git a/config/locales/de.yml b/config/locales/de.yml index 7bf8811e8..fa4875bc7 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -3053,6 +3053,22 @@ de: en: 'Englisch' de: 'Deutsch' mailer: + warning: "MaMpf Warning" + pending_deletion_subject: "%{num_days_until_deletion} Tage bis zur + Löschung Deines MaMpf-Accounts" + deletion_subject: "Account gelöscht" + pending_deletion_body_html: > + Wir haben festgestellt, dass Du Dich in den letzten 6 Monaten nicht in + MaMpf eingeloggt hast. Dein Account wird in %{num_days_until_deletion} + Tagen gelöscht, sofern Du Dich nicht vorher einloggst. + Bitte beachte, dass nach der Löschung Deines Accounts alle bei MaMpf + gespeicherten Daten von Dir unwiderruflich verloren gehen. + deletion_body_html: > + Dein MaMpf-Account wurde vollständig gelöscht, da Du Dich seit + mehr als 6 Monaten nicht eingeloggt hast. Beachte, dass wir zuvor + mehrere Erinnerungen gesendet haben. Alle Deine bei MaMpf gespeicherten + Daten sind unwiderruflich verloren gegangen. Vielen Dank, dass Du MaMpf + genutzt hast. notification: 'MaMpf-Benachrichtigung' notification_header: 'Benachrichtigung von MaMpf' medium_subject: 'Neues Medium' diff --git a/config/locales/en.yml b/config/locales/en.yml index 6fae4ba62..454915f45 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2871,6 +2871,21 @@ en: no_zip: This file is not a .zip archive. to_big: This file is too big. mailer: + warning: "MaMpf Warning" + pending_deletion_subject: "%{num_days_until_deletion} days before your + account will be deleted" + deletion_subject: "Account deleted" + pending_deletion_body_html: > + We've noticed that you haven't logged in to your MaMpf account in the last + 6 months. Your account will be deleted in %{num_days_until_deletion} days + unless you log in to your MaMpf account before then. + Please note that once your account is deleted, all of your data stored + at MaMpf will be permanently lost. + deletion_body_html: > + Your MaMpf account has been deleted entirely as you have not + logged in for more than 6 months. Note that we've sent several + reminders beforehand. All of your data stored at MaMpf has been + permanently lost. Thanks for using MaMpf. notification: 'MaMpf notification' notification_header: 'MaMpf notification' medium_subject: 'New Medium' diff --git a/config/schedule.yml b/config/schedule.yml index f2018526a..5421af058 100644 --- a/config/schedule.yml +++ b/config/schedule.yml @@ -14,6 +14,9 @@ cache_cleaner_job: queue: critical user_cleaner_job: - cron: "0 4 * * 1,4" + # at 4:00 AM, every day + # This job has to run every day such that users will receive + # respective warning emails (about their accounts being deleted) on time. + cron: "0 4 * * *" class: "UserCleanerJob" - queue: critical \ No newline at end of file + queue: critical diff --git a/db/migrate/20240530200000_add_deletion_date_to_user.rb b/db/migrate/20240530200000_add_deletion_date_to_user.rb new file mode 100644 index 000000000..cf95a22d8 --- /dev/null +++ b/db/migrate/20240530200000_add_deletion_date_to_user.rb @@ -0,0 +1,5 @@ +class AddDeletionDateToUser < ActiveRecord::Migration[7.1] + def change + add_column :users, :deletion_date, :date, null: true, default: nil + end +end diff --git a/db/migrate/20240605200000_remove_ghost_hash_from_user.rb b/db/migrate/20240605200000_remove_ghost_hash_from_user.rb new file mode 100644 index 000000000..609d74045 --- /dev/null +++ b/db/migrate/20240605200000_remove_ghost_hash_from_user.rb @@ -0,0 +1,5 @@ +class RemoveGhostHashFromUser < ActiveRecord::Migration[7.1] + def change + remove_column :users, :ghost_hash, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 6cd1b3f61..9f40b301b 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_04_22_200000) do +ActiveRecord::Schema[7.1].define(version: 2024_06_05_200000) do # These are extensions that must be enabled in order to support this database enable_extension "pgcrypto" enable_extension "plpgsql" @@ -875,12 +875,12 @@ t.boolean "archived" t.datetime "locked_at", precision: nil t.text "image_data" - t.string "ghost_hash" t.integer "sign_in_count", default: 0, null: false t.datetime "current_sign_in_at" t.datetime "last_sign_in_at" t.string "current_sign_in_ip" t.string "last_sign_in_ip" + t.date "deletion_date" t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true t.index ["email"], name: "index_users_on_email", unique: true t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true diff --git a/docker/development/docker-compose.yml b/docker/development/docker-compose.yml index 94e3b7591..103ffb436 100644 --- a/docker/development/docker-compose.yml +++ b/docker/development/docker-compose.yml @@ -85,6 +85,7 @@ services: TEST_DATABASE_USERNAME: mampf TEST_DATABASE_HOST: db TEST_DATABASE_PORT: 5432 + MAX_DELETIONS_PER_RUN: 50 MAILSERVER: mailcatcher FROM_ADDRESS: development@localhost URL_HOST: localhost diff --git a/docker/production/docker-compose.production.yml b/docker/production/docker-compose.production.yml index 8b4a8e55b..3a3ed0b36 100644 --- a/docker/production/docker-compose.production.yml +++ b/docker/production/docker-compose.production.yml @@ -4,6 +4,8 @@ x-mampf: context: https://github.com/MaMpf-HD/mampf.git#main dockerfile: docker/production/Dockerfile env_file: docker.env + environment: + PRODUCTION_NAME: networks: - solr - mampf diff --git a/docker/production/docker.env b/docker/production/docker.env index 886040d36..c24b29c93 100644 --- a/docker/production/docker.env +++ b/docker/production/docker.env @@ -11,6 +11,9 @@ MUESLI_SERVER=https://muesli.mathi.uni-heidelberg.de ERDBEERE_API=https://erdbeere.mathi.uni-heidelberg.de/api/v1 MEMCACHED_SERVER=cache +# User Cleaner +MAX_DELETIONS_PER_RUN=50 + # Email FROM_ADDRESS=mampf@mathi.uni-heidelberg.de MAILSERVER=mail.mathi.uni-heidelberg.de diff --git a/docker/test/docker-compose.yml b/docker/test/docker-compose.yml index d795b4ad3..204712069 100644 --- a/docker/test/docker-compose.yml +++ b/docker/test/docker-compose.yml @@ -47,6 +47,7 @@ services: TEST_DATABASE_USERNAME: mampf TEST_DATABASE_HOST: db TEST_DATABASE_PORT: 5432 + MAX_DELETIONS_PER_RUN: 50 MAILSERVER: mailcatcher FROM_ADDRESS: development@localhost URL_HOST: mampf diff --git a/spec/factories/user_cleaners.rb b/spec/factories/user_cleaners.rb deleted file mode 100644 index 8180e5f24..000000000 --- a/spec/factories/user_cleaners.rb +++ /dev/null @@ -1,12 +0,0 @@ -FactoryBot.define do - factory :user_cleaner do - # trait with user - trait :with_hashed_user do - after(:build) do |c| - user = FactoryBot.create(:confirmed_user, email: Faker::Internet.email) - user.update(ghost_hash: Digest::SHA256.hexdigest(Time.now.to_i.to_s)) - c.hash_dict = { user.email => user.ghost_hash } - end - end - end -end diff --git a/spec/models/teachable_parser_spec.rb b/spec/models/teachable_parser_spec.rb index d021b5c17..9c3031464 100644 --- a/spec/models/teachable_parser_spec.rb +++ b/spec/models/teachable_parser_spec.rb @@ -1,3 +1,5 @@ +require "rails_helper" + RSpec.describe(TeachableParser, type: :model) do it "has a valid factory" do expect(FactoryBot.build(:teachable_parser)).to be_kind_of(TeachableParser) diff --git a/spec/models/user_cleaner_spec.rb b/spec/models/user_cleaner_spec.rb index d33724a05..689962e3e 100644 --- a/spec/models/user_cleaner_spec.rb +++ b/spec/models/user_cleaner_spec.rb @@ -1,19 +1,282 @@ require "rails_helper" RSpec.describe(UserCleaner, type: :model) do - it "has a factory" do - expect(FactoryBot.build(:user_cleaner)) - .to be_kind_of(UserCleaner) - end - # Right now, delete_ghosts is commented out in user_cleaner.rb - # as we want to avoid accidental deletion of users in production. - # We will come up with a new strategy for cleaning up old users. - # - # it "can destroy users" do - # n_users = User.all.size - # u = FactoryBot.build(:user_cleaner, :with_hashed_user) - # expect(User.all.size).to eq(n_users + 1) - # u.delete_ghosts - # expect(User.all.size).to eq(n_users) - # end + # Non-generic users are either admins, teachers or editors + let(:user_admin) do + return FactoryBot.create(:user, deletion_date: Date.current - 1.day, admin: true) + end + + let(:user_teacher) do + user_teacher = FactoryBot.create(:user, deletion_date: Date.current - 1.day) + FactoryBot.create(:lecture, teacher: user_teacher) + return user_teacher + end + + let(:user_editor) do + user_editor = FactoryBot.create(:user, deletion_date: Date.current - 1.day) + FactoryBot.create(:lecture, editors: [user_editor]) + return user_editor + end + + before(:each) do + UserCleaner::INACTIVE_USER_THRESHOLD = 6.months + end + + describe("#inactive_users") do + it "counts users without last_sign_in_at date as inactive" do + FactoryBot.create(:user, last_sign_in_at: nil) + expect(UserCleaner.new.inactive_users.count).to eq(1) + end + + it("counts users with last_sign_in_at date older than threshold as inactive") do + FactoryBot.create(:user, last_sign_in_at: 7.months.ago) + expect(UserCleaner.new.inactive_users.count).to eq(1) + end + + it "does not count users with last_sign_in_at date younger than threshold as inactive" do + FactoryBot.create(:user, last_sign_in_at: 5.months.ago) + expect(UserCleaner.new.inactive_users.count).to eq(0) + end + end + + describe("#set/unset_deletion_date") do + context "when deletion date is nil" do + it "assigns a deletion date to inactive users" do + inactive_user = FactoryBot.create(:user, last_sign_in_at: 7.months.ago) + active_user = FactoryBot.create(:user, last_sign_in_at: 5.months.ago) + + UserCleaner.new.set_deletion_date_for_inactive_users + inactive_user.reload + active_user.reload + + expect(inactive_user.deletion_date).to eq(Date.current + 40.days) + expect(active_user.deletion_date).to be_nil + end + + it "only assigns a deletion date to a limited number of users" do + max_deletions = 3 + UserCleaner::MAX_DELETIONS_PER_RUN = max_deletions + + FactoryBot.create_list(:user, max_deletions + 2, last_sign_in_at: 7.months.ago) + + UserCleaner.new.set_deletion_date_for_inactive_users + + users_flagged = User.where(deletion_date: Date.current + 40.days) + expect(users_flagged.count).to eq(max_deletions) + end + end + + context "when a deletion date is assigned" do + it "does not overwrite the deletion date" do + user = FactoryBot.create(:user, last_sign_in_at: 7.months.ago, + deletion_date: Date.current + 42.days) + + UserCleaner.new.set_deletion_date_for_inactive_users + user.reload + + expect(user.deletion_date).to eq(Date.current + 42.days) + end + end + + it "unassigns a deletion date from recently active users" do + deletion_date = Date.current + 5.days + user_inactive = FactoryBot.create(:user, deletion_date: deletion_date, + last_sign_in_at: 7.months.ago) + user_inactive2 = FactoryBot.create(:user, deletion_date: deletion_date, + last_sign_in_at: 6.months.ago - 1.day) + user_active = FactoryBot.create(:user, deletion_date: deletion_date, + last_sign_in_at: 2.days.ago) + + UserCleaner.new.unset_deletion_date_for_recently_active_users + user_inactive.reload + user_inactive2.reload + user_active.reload + + expect(user_inactive.deletion_date).to eq(deletion_date) + expect(user_inactive2.deletion_date).to eq(deletion_date) + expect(user_active.deletion_date).to be_nil + end + end + + describe("#delete_users") do + it "deletes users with a deletion date in the past or present" do + user_past1 = FactoryBot.create(:user, deletion_date: Date.current - 1.day) + user_past2 = FactoryBot.create(:user, deletion_date: Date.current - 1.year) + user_present = FactoryBot.create(:user, deletion_date: Date.current) + + UserCleaner.new.delete_users_according_to_deletion_date! + + expect(User.where(id: user_past1.id)).not_to exist + expect(User.where(id: user_past2.id)).not_to exist + expect(User.where(id: user_present.id)).not_to exist + end + + it "does not delete users with a deletion date in the future" do + user_future1 = FactoryBot.create(:user, deletion_date: Date.current + 1.day) + user_future2 = FactoryBot.create(:user, deletion_date: Date.current + 1.year) + + UserCleaner.new.delete_users_according_to_deletion_date! + + expect(User.where(id: user_future1.id)).to exist + expect(User.where(id: user_future2.id)).to exist + end + + it "does not delete users without a deletion date" do + user = FactoryBot.create(:user, deletion_date: nil) + UserCleaner.new.delete_users_according_to_deletion_date! + expect(User.where(id: user.id)).to exist + end + + it "deletes only generic users" do + user_generic = FactoryBot.create(:user, deletion_date: Date.current - 1.day) + user_admin + user_teacher + user_editor + + UserCleaner.new.delete_users_according_to_deletion_date! + + expect(User.where(id: user_generic.id)).not_to exist + expect(User.where(id: user_admin.id)).to exist + expect(User.where(id: user_teacher.id)).to exist + expect(User.where(id: user_editor.id)).to exist + end + end + + describe("mails") do + context "when setting a deletion date" do + it "enqueues a deletion warning mail (40 days)" do + FactoryBot.create(:user, last_sign_in_at: 7.months.ago) + + expect do + UserCleaner.new.set_deletion_date_for_inactive_users + end.to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email) + .with(a_hash_including(args: [40])) + end + + it "does not enqueue a deletion warning mail (40 days) for non-generic users" do + user_admin + user_teacher + user_editor + + expect do + UserCleaner.new.set_deletion_date_for_inactive_users + end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email) + end + end + + context "when a deletion date is assigned" do + def test_enqueues_additional_deletion_warning_mails(num_days) + FactoryBot.create(:user, deletion_date: Date.current + num_days.days) + + expect do + UserCleaner.new.send_additional_warning_mails + end.to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email) + .with(a_hash_including(args: [num_days])) + end + + it "enqueues additional deletion warning mails" do + test_enqueues_additional_deletion_warning_mails(14) + test_enqueues_additional_deletion_warning_mails(7) + test_enqueues_additional_deletion_warning_mails(2) + end + + it "does not enqueue an additional deletion warning mail for 40 days" do + FactoryBot.create(:user, deletion_date: Date.current + 40.days) + + expect do + UserCleaner.new.send_additional_warning_mails + end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email) + end + + it "does not enqueue additional deletion warning mails for non-generic users" do + user_admin.update(deletion_date: Date.current + 14.days) + user_teacher.update(deletion_date: Date.current + 7.days) + user_editor.update(deletion_date: Date.current + 2.days) + + expect do + UserCleaner.new.send_additional_warning_mails + end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email) + end + end + + context "when a user is finally deleted" do + it "enqueues a deletion mail" do + FactoryBot.create(:user, deletion_date: Date.current - 1.day) + + expect do + UserCleaner.new.delete_users_according_to_deletion_date! + end.to have_enqueued_mail(UserCleanerMailer, :deletion_email) + end + end + end + + describe("#pending_deletion_mail") do + let(:user_de) { FactoryBot.create(:user, locale: "de") } + let(:user_en) { FactoryBot.create(:user, locale: "en") } + + def test_subject_line(num_days) + user = FactoryBot.create(:user) + mailer = UserCleanerMailer.with(user: user).pending_deletion_email(num_days) + expect(mailer.subject).to include(num_days.to_s) + end + + it "has mail subject containing the number of days until deletion" do + test_subject_line(40) + test_subject_line(14) + test_subject_line(7) + test_subject_line(2) + end + + it "has mail subject localized to the user's locale" do + mailer = UserCleanerMailer.with(user: user_de).pending_deletion_email(40) + expect(mailer.subject).to include("Tage") + expect(mailer.subject).not_to include("days") + + mailer = UserCleanerMailer.with(user: user_en).pending_deletion_email(40) + expect(mailer.subject).to include("days") + expect(mailer.subject).not_to include("Tage") + end + + it "has mail body localized to the user's locale" do + expected_de = "verloren" + expected_en = "lost" + + mailer = UserCleanerMailer.with(user: user_de).pending_deletion_email(40) + expect(mailer.html_part.body).to include(expected_de) + expect(mailer.html_part.body).not_to include(expected_en) + + mailer = UserCleanerMailer.with(user: user_en).pending_deletion_email(40) + expect(mailer.html_part.body).to include(expected_en) + expect(mailer.html_part.body).not_to include(expected_de) + end + end + + describe("#deletion_mail") do + let(:user_de) { FactoryBot.create(:user, locale: "de") } + let(:user_en) { FactoryBot.create(:user, locale: "en") } + + it "has mail subject localized to the user's locale" do + mailer = UserCleanerMailer.with(user: user_de).deletion_email + expect(mailer.subject).to include("gelöscht") + expect(mailer.subject).not_to include("deleted") + + mailer = UserCleanerMailer.with(user: user_en).deletion_email + expect(mailer.subject).to include("deleted") + expect(mailer.subject).not_to include("gelöscht") + end + + it "has mail body localized to the user's locale" do + expected_de = "vollständig gelöscht" + expected_en = "deleted entirely" + + mailer = UserCleanerMailer.with(user: user_de).deletion_email + + expect(mailer.html_part.body).to include(expected_de) + expect(mailer.html_part.body).not_to include(expected_en) + + mailer = UserCleanerMailer.with(user: user_en).deletion_email + expect(mailer.html_part.body).to include(expected_en) + expect(mailer.html_part.body).not_to include(expected_de) + end + end end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 202207bd1..57c66cd8d 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -35,6 +35,10 @@ # For Devise >= 4.1.0 config.include Devise::Test::ControllerHelpers, type: :controller + # e.g. make have_enqueued_mail matchers available + # see https://stackoverflow.com/a/57077395/ + config.include ActiveJob::TestHelper + # If you're not using ActiveRecord, or you'd prefer not to run each of your # examples within a transaction, remove the following line or assign false # instead of true.