fix specs

Bumps the npm_and_yarn group with 1 update in the / directory: [webpack](https://github.com/webpack/webpack).


Updates `webpack` from 5.82.1 to 5.94.0
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.82.1...v5.94.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:production
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.3.3
+          ruby-version: 3.3.4
       - name: Cache gems
         uses: actions/cache@v1
         with:
@@ -35,7 +35,7 @@ jobs:
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.3.3
+          ruby-version: 3.3.4
       - name: Cache gems
         uses: actions/cache@v1
         with:
@@ -100,7 +100,7 @@ jobs:
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.3.3
+          ruby-version: 3.3.4
       - name: Set up Node
         uses: actions/setup-node@v1
         with:

.rubocop.yml

@@ -34,6 +34,7 @@ Metrics/MethodLength:
   Max: 30
   Exclude:
     - 'db/migrate/**'
+    - 'spec/**/*'
 
 Metrics/CyclomaticComplexity:
   Max: 15
@@ -46,6 +47,8 @@ Layout/LineLength:
 
 Metrics/AbcSize:
   Max: 45
+  Exclude:
+    - spec/**/*
 
 Metrics/ModuleLength:
   Max: 500

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.3.3-alpine as fonts
+FROM ruby:3.3.4-alpine as fonts
 
 WORKDIR /fonts
 
@@ -6,7 +6,7 @@ RUN apk --no-cache add fontforge wget && wget https://github.com/satbyy/go-noto-
 
 RUN fontforge -lang=py -c 'font1 = fontforge.open("FreeSans.ttf"); font2 = fontforge.open("NotoSansSymbols2-Regular.ttf"); font1.mergeFonts(font2); font1.generate("FreeSans.ttf")'
 
-FROM ruby:3.3.3-alpine as webpack
+FROM ruby:3.3.4-alpine as webpack
 
 ENV RAILS_ENV=production
 ENV NODE_ENV=production
@@ -32,7 +32,7 @@ COPY ./app/views ./app/views
 
 RUN echo "gem 'shakapacker'" > Gemfile && ./bin/shakapacker
 
-FROM ruby:3.3.3-alpine as app
+FROM ruby:3.3.4-alpine as app
 
 ENV RAILS_ENV=production
 ENV BUNDLE_WITHOUT="development:test"

Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-ruby '3.3.3'
+ruby '3.3.4'
 
 gem 'arabic-letter-connector', require: 'arabic-letter-connector/logic'
 gem 'aws-sdk-s3', require: false

Gemfile.lock

@@ -324,6 +324,7 @@ GEM
       date
       net-protocol
     net-pop (0.1.2)
+      net-protocol
     net-protocol (0.2.2)
       timeout
     net-smtp (0.4.0)
@@ -624,7 +625,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 3.3.3p89
+   ruby 3.3.4p94
 
 BUNDLED WITH
    2.5.3

app/controllers/api/submissions_controller.rb

@@ -23,7 +23,10 @@ module Api
                                                  audit_trail_attachment: :blob))
 
       render json: {
-        data: submissions.as_json(Submissions::SerializeForApi::SERIALIZE_PARAMS),
+        data: submissions.map do |s|
+          Submissions::SerializeForApi.call(s, s.submitters, params,
+                                            with_events: false, with_documents: false, with_values: false)
+        end,
         pagination: {
           count: submissions.size,
           next: submissions.last&.id,

app/controllers/start_form_controller.rb

@@ -22,7 +22,7 @@ class StartFormController < ApplicationController
     if @submitter.completed_at?
       redirect_to start_form_completed_path(@template.slug, email: submitter_params[:email])
     else
-      if @template.submitters.to_a.size > 1 && @submitter.new_record?
+      if @template.submitters.to_a.size > 2 && @submitter.new_record?
         @error_message = 'Not found'
 
         return render :show
@@ -63,9 +63,7 @@ class StartFormController < ApplicationController
 
   def assign_submission_attributes(submitter, template)
     resubmit_submitter =
-      if params[:resubmit].present?
+      (Submitter.where(submission: template.submissions).find_by(slug: params[:resubmit]) if params[:resubmit].present?)
-        Submitter.where(submission: @template.submissions).find_by(slug: params[:resubmit])
-      end
 
     submitter.assign_attributes(
       uuid: template.submitters.first['uuid'],
@@ -87,11 +85,25 @@ class StartFormController < ApplicationController
                                             template_submitters: template.submitters,
                                             source: :link)
 
+    maybe_assign_default_second_submitter(submitter.submission)
+
     submitter.account_id = submitter.submission.account_id
 
     submitter
   end
 
+  def maybe_assign_default_second_submitter(submission)
+    return unless submission.new_record?
+    return if submission.template.submitters.to_a.size != 2
+
+    submission.submitters_order = 'preserved'
+    submission.submitters.new(
+      account_id: submission.account_id,
+      uuid: submission.template.submitters.second['uuid'],
+      email: submission.template.author.email
+    )
+  end
+
   def submitter_params
     params.require(:submitter).permit(:email, :phone, :name).tap do |attrs|
       attrs[:email] = Submissions.normalize_email(attrs[:email])

app/controllers/submit_form_values_controller.rb

@@ -7,8 +7,10 @@ class SubmitFormValuesController < ApplicationController
   def index
     submitter = Submitter.find_by!(slug: params[:submit_form_slug])
 
-    return render json: {} if submitter.completed_at?
+    return render json: {} if submitter.completed_at? || submitter.declined_at?
-    return render json: {} if submitter.submission.template.archived_at? || submitter.submission.archived_at?
+    return render json: {} if submitter.submission.template.archived_at? ||
+                              submitter.submission.archived_at? ||
+                              submitter.submission.expired?
 
     value = submitter.values[params['field_uuid']]
     attachment = submitter.attachments.where(created_at: params[:after]..).find_by(uuid: value) if value.present?

app/controllers/templates_controller.rb

@@ -123,7 +123,7 @@ class TemplatesController < ApplicationController
     if template.account == current_account
       redirect_to(edit_template_path(@template))
     else
-      redirect_back(fallback_location: root_path, notice: 'Template has been clonned')
+      redirect_back(fallback_location: root_path, notice: 'Template has been cloned')
     end
   end
 

app/javascript/application.js

@@ -107,6 +107,8 @@ safeRegisterElement('template-builder', class extends HTMLElement {
       withPayment: this.dataset.withPayment === 'true',
       isPaymentConnected: this.dataset.isPaymentConnected === 'true',
       withFormula: this.dataset.withFormula === 'true',
+      withSendButton: this.dataset.withSendButton !== 'false',
+      withSignYourselfButton: this.dataset.withSignYourselfButton !== 'false',
       withConditions: this.dataset.withConditions === 'true',
       currencies: (this.dataset.currencies || '').split(',').filter(Boolean),
       acceptFileTypes: this.dataset.acceptFileTypes

app/javascript/rollbar.js

@@ -18,9 +18,15 @@ if (token) {
     transform (payload) {
       payload.body.telemetry = []
 
-      const string = JSON.stringify(payload)
+      if (payload.request.query_string) {
+        payload.request.query_string = ''
+      }
 
-      return JSON.parse(string.replace(/(\/[des]\/)\w{6}/g, (_, m) => m))
+      if (payload.request.url) {
+        payload.request.url = payload.request.url.replace(/(\/[sdep]\/)(\w{5})[^/]+/, '$1$2')
+      }
+
+      return payload
     },
     payload: {
       client: {

app/javascript/submission_form/areas.vue

@@ -28,7 +28,7 @@
             :with-field-placeholder="withFieldPlaceholder"
             :with-signature-id="withSignatureId"
             :is-active="currentStep === step"
-            :with-label="withLabel && !withFieldPlaceholder"
+            :with-label="withLabel && !withFieldPlaceholder && step.length < 2"
             :is-value-set="step.some((f) => f.uuid in values)"
             :attachments-index="attachmentsIndex"
             @click="$emit('focus-step', stepIndex)"

app/javascript/template_builder/builder.vue

@@ -58,6 +58,7 @@
         />
         <template v-else>
           <a
+            v-if="withSignYourselfButton"
             :href="template.submitters.length > 1 ? `/templates/${template.id}/submissions/new?selfsign=true` : `/d/${template.slug}`"
             class="btn btn-primary btn-ghost text-base hidden md:flex"
             :target="template.submitters.length > 1 ? '' : '_blank'"
@@ -73,6 +74,7 @@
             </span>
           </a>
           <a
+            v-if="withSendButton"
             :href="`/templates/${template.id}/submissions/new?with_link=true`"
             data-turbo-frame="modal"
             class="white-button md:!px-6"
@@ -479,6 +481,16 @@ export default {
       required: false,
       default: true
     },
+    withSendButton: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    withSignYourselfButton: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
     inputMode: {
       type: Boolean,
       required: false,

app/models/submitter.rb

@@ -85,6 +85,14 @@ class Submitter < ApplicationRecord
     end
   end
 
+  def first_name
+    name.split(/\s+/, 2).first
+  end
+
+  def last_name
+    name.split(/\s+/, 2).last
+  end
+
   def status_event_at
     declined_at || completed_at || opened_at || sent_at || created_at
   end

app/views/accounts/show.html.erb

@@ -22,7 +22,7 @@
         </div>
       <% end %>
       <% encrypted_config = @encrypted_config || EncryptedConfig.find_or_initialize_by(account: current_account, key: EncryptedConfig::APP_URL_KEY) %>
-      <% if !Docuseal.multitenant? && can?(:manage, encrypted_config) && !current_account.testing? %>
+      <% if !Docuseal.multitenant? && can?(:manage, encrypted_config) && !current_account.testing? && ENV['APP_URL'].blank? %>
         <%= fields_for encrypted_config do |ff| %>
           <div class="form-control">
             <%= ff.label :value, 'App URL', class: 'label' %>

app/views/submit_form/show.html.erb

@@ -65,7 +65,7 @@
 <div class="fixed bottom-0 w-full h-0 z-20">
   <div class="mx-auto" style="max-width: 1000px">
     <div class="relative md:mx-32">
-      <%= render 'submit_form/submission_form', attachments_index: @attachments_index, submitter: @submitter, signature_attachment: @signature_attachment, configs: @form_configs, dry_run: local_assigns[:dry_run], expand: local_assigns[:expand], scroll_padding: local_assigns[:scroll_padding] %>
+      <%= render 'submit_form/submission_form', attachments_index: @attachments_index, submitter: @submitter, signature_attachment: @signature_attachment, configs: @form_configs, dry_run: local_assigns[:dry_run], expand: local_assigns[:expand], scroll_padding: local_assigns.fetch(:scroll_padding, '-110px') %>
     </div>
   </div>
 </div>

app/views/templates/_title.html.erb

@@ -70,7 +70,7 @@
             <span>Edit</span>
           </span>
         <% end %>
-      <% elsif can?(:read, template) %>
+      <% elsif can?(:read, template) && !template.archived_at? %>
         <%= link_to template_preview_path(template), class: 'btn btn-outline btn-sm flex-1' do %>
           <span class="flex items-center justify-center space-x-2">
             <%= svg_icon('file_text', class: 'w-6 h-6') %>
@@ -79,8 +79,16 @@
         <% end %>
       <% end %>
     <% end %>
-    <% if template.archived_at? && can?(:create, template) %>
+    <% if template.archived_at? %>
-      <%= button_to button_title(title: 'Restore', disabled_with: 'Restoring', icon: svg_icon('rotate', class: 'w-6 h-6')), template_restore_index_path(template), class: 'btn btn-outline btn-sm flex-1' %>
+      <% if can?(:create, template) %>
+        <%= button_to button_title(title: 'Restore', disabled_with: 'Restoring', icon: svg_icon('rotate', class: 'w-6 h-6')), template_restore_index_path(template), class: 'btn btn-outline btn-sm flex-1' %>
+      <% end %>
+      <%= link_to template_preview_path(template), class: 'btn btn-outline btn-sm flex-1' do %>
+        <span class="flex items-center justify-center space-x-2">
+          <%= svg_icon('file_text', class: 'w-6 h-6') %>
+          <span>Preview</span>
+        </span>
+      <% end %>
     <% end %>
   </div>
 </div>

app/views/templates/edit.html.erb

@@ -1 +1 @@
-<template-builder class="grid" data-template="<%= @template_data %>" data-locale="<%= current_account.locale %>"></template-builder>
+<template-builder class="grid" data-template="<%= @template_data %>" data-with-sign-yourself-button="<%= !@template.archived_at? %>" data-with-send-button="<%= !@template.archived_at? && can?(:create, @template.submissions.new(account: current_account)) %>" data-locale="<%= current_account.locale %>"></template-builder>

app/views/templates_preview/show.html.erb

@@ -1 +1 @@
-<template-builder class="grid" data-editable="false" data-template="<%= @template_data %>"></template-builder>
+<template-builder class="grid" data-editable="false" data-with-sign-yourself-button="<%= !@template.archived_at? %>" data-with-send-button="<%= !@template.archived_at? && can?(:create, @template.submissions.new(account: current_account)) %>" data-template="<%= @template_data %>"></template-builder>

lib/replace_email_variables.rb

@@ -6,9 +6,11 @@ module ReplaceEmailVariables
   SUBMITTER_LINK = /\{+submitter\.link\}+/i
   ACCOUNT_NAME = /\{+account\.name\}+/i
   SENDER_NAME = /\{+sender\.name\}+/i
+  SENDER_FIRST_NAME = /\{+sender\.first_name\}+/i
   SENDER_EMAIL = /\{+sender\.email\}+/i
   SUBMITTER_EMAIL = /\{+submitter\.email\}+/i
   SUBMITTER_NAME = /\{+submitter\.name\}+/i
+  SUBMITTER_FIRST_NAME = /\{+submitter\.first_name\}+/i
   SUBMITTER_ID = /\{+submitter\.id\}+/i
   SUBMITTER_SLUG = /\{+submitter\.slug\}+/i
   SUBMISSION_LINK = /\{+submission\.link\}+/i
@@ -28,6 +30,7 @@ module ReplaceEmailVariables
     text = replace(text, SUBMISSION_ID, html_escape:) { submitter.submission.id }
     text = replace(text, SUBMITTER_EMAIL, html_escape:) { submitter.email }
     text = replace(text, SUBMITTER_NAME, html_escape:) { submitter.name || submitter.email || submitter.phone }
+    text = replace(text, SUBMITTER_FIRST_NAME, html_escape:) { submitter.first_name }
     text = replace(text, SUBMITTER_LINK, html_escape:) { build_submitter_link(submitter, tracking_event_type) }
     text = replace(text, SUBMISSION_LINK, html_escape:) do
       submitter.submission ? build_submission_link(submitter.submission) : ''
@@ -37,6 +40,7 @@ module ReplaceEmailVariables
     text = replace(text, DOCUMENTS_LINK, html_escape:) { build_documents_links_text(submitter, sig) }
     text = replace(text, ACCOUNT_NAME, html_escape:) { submitter.submission.account.name }
     text = replace(text, SENDER_NAME, html_escape:) { submitter.submission.created_by_user&.full_name }
+    text = replace(text, SENDER_FIRST_NAME, html_escape:) { submitter.submission.created_by_user&.first_name }
 
     replace(text, SENDER_EMAIL, html_escape:) { submitter.submission.created_by_user&.email.to_s.sub(/\+\w+@/, '@') }
   end

lib/submissions.rb

@@ -114,9 +114,7 @@ module Submissions
 
     fixed_email = EmailTypo.call(email.delete_prefix('<'))
 
-    if defined?(Rollbar) && fixed_email != email.downcase.delete_prefix('<').strip
+    Rails.logger.info("Fixed email #{email.split('@').last}") if fixed_email != email.downcase.delete_prefix('<').strip
-      Rollbar.warning("Fixed email #{email}")
-    end
 
     fixed_email
   end

lib/submissions/generate_audit_trail.rb

@@ -115,7 +115,7 @@ module Submissions
           canvas.save_graphics_state do
             document_id = Digest::MD5.hexdigest(submission.slug).upcase
 
-            canvas.font(FONT_NAME, size: FONT_SIZE)
+            font = composer.document.fonts.add(FONT_NAME)
 
             text =
               if submission.account.testing?
@@ -128,7 +128,17 @@ module Submissions
                 "Document ID: #{document_id}"
               end
 
-            canvas.text(text, at: [2, 4])
+            text = HexaPDF::Layout::TextFragment.create(
+              text, font:, font_size: FONT_SIZE, underlays: [
+                lambda do |canv, box|
+                  canv.fill_color('white').rectangle(-1, 0, box.width + 2, box.height).fill
+                end
+              ]
+            )
+
+            HexaPDF::Layout::TextLayouter.new(font:, font_size: FONT_SIZE)
+                                         .fit([text], 1000, 1000)
+                                         .draw(canvas, 1, FONT_SIZE * 1.37)
           end
         end
 

lib/submissions/generate_result_attachments.rb

@@ -110,6 +110,8 @@ module Submissions
         pdfs_index.each_value do |pdf|
           next if pdf.trailer.info[:DocumentID].present?
 
+          font = pdf.fonts.add(FONT_NAME)
+
           document_id = Digest::MD5.hexdigest(submitter.submission.slug).upcase
 
           pdf.trailer.info[:DocumentID] = document_id
@@ -117,8 +119,6 @@ module Submissions
             font_size = (([page.box.width, page.box.height].min / A4_SIZE[0].to_f) * 9).to_i
             cnv = page.canvas(type: :overlay)
 
-            cnv.font(FONT_NAME, size: font_size)
-
             text =
               if submitter.account.testing?
                 if with_signature_id
@@ -130,7 +130,17 @@ module Submissions
                 "Document ID: #{document_id}"
               end
 
-            cnv.text(text, at: [2, 4])
+            text = HexaPDF::Layout::TextFragment.create(
+              text, font:, font_size:, underlays: [
+                lambda do |canv, box|
+                  canv.fill_color('white').rectangle(-1, 0, box.width + 2, box.height).fill
+                end
+              ]
+            )
+
+            HexaPDF::Layout::TextLayouter.new(font:, font_size:)
+                                         .fit([text], page.box.width, page.box.height)
+                                         .draw(cnv, 1, font_size * 1.37)
           end
         end
       end

lib/submissions/serialize_for_api.rb

@@ -6,10 +6,7 @@ module Submissions
       only: %i[id slug source submitters_order expire_at created_at updated_at archived_at],
       methods: %i[audit_log_url combined_document_url],
       include: {
-        submitters: { only: %i[id slug uuid name email phone
+        submitters: { only: %i[id] },
-                               completed_at opened_at sent_at declined_at
-                               created_at updated_at external_id metadata],
-                      methods: %i[status application_key] },
         template: { only: %i[id name external_id created_at updated_at],
                     methods: %i[folder_name] },
         created_by_user: { only: %i[id email first_name last_name] }
@@ -18,29 +15,35 @@ module Submissions
 
     module_function
 
-    def call(submission, submitters = nil, params = {})
+    def call(submission, submitters = nil, params = {}, with_events: true, with_documents: true, with_values: true)
       submitters ||= submission.submitters.preload(documents_attachments: :blob, attachments_attachments: :blob)
 
-      serialized_submitters = submitters.map { |submitter| Submitters::SerializeForApi.call(submitter, params:) }
+      serialized_submitters = submitters.map do |submitter|
+        Submitters::SerializeForApi.call(submitter, with_documents:, with_events: false, with_values:, params:)
+      end
 
       json = submission.as_json(SERIALIZE_PARAMS)
 
-      json['submission_events'] = Submitters::SerializeForApi.serialize_events(submission.submission_events)
+      json['created_by_user'] ||= nil
+
+      if with_events
+        json['submission_events'] = Submitters::SerializeForApi.serialize_events(submission.submission_events)
+      end
+
       json['combined_document_url'] ||= maybe_build_combined_url(submitters, submission, params)
 
       if submitters.all?(&:completed_at?)
         last_submitter = submitters.max_by(&:completed_at)
 
-        json[:documents] = serialized_submitters.find { |e| e['id'] == last_submitter.id }['documents']
+        if with_documents
+          json[:documents] = serialized_submitters.find { |e| e['id'] == last_submitter.id }['documents']
+        end
+
         json[:status] = 'completed'
         json[:completed_at] = last_submitter.completed_at
       else
-        json[:documents] = []
+        json[:documents] = [] if with_documents
-        json[:status] = if submitters.any?(&:declined_at?)
+        json[:status] = build_status(submission, submitters)
-                          'declined'
-                        else
-                          submission.expired? ? 'expired' : 'pending'
-                        end
         json[:completed_at] = nil
       end
 
@@ -49,6 +52,14 @@ module Submissions
       json
     end
 
+    def build_status(submission, submitters)
+      if submitters.any?(&:declined_at?)
+        'declined'
+      else
+        submission.expired? ? 'expired' : 'pending'
+      end
+    end
+
     def maybe_build_combined_url(submitters, submission, params)
       return unless submitters.all?(&:completed_at?)
 

lib/submitters/normalize_values.rb

@@ -4,6 +4,8 @@ module Submitters
   module NormalizeValues
     CHECKSUM_CACHE_STORE = ActiveSupport::Cache::MemoryStore.new
 
+    BASE64_PREFIX_REGEXP = %r{\Adata:image/\w+;base64,}
+
     BaseError = Class.new(StandardError)
 
     UnknownFieldName = Class.new(BaseError)
@@ -134,7 +136,8 @@ module Submitters
           find_or_create_blob_from_url(account, value)
         elsif type.in?(%w[signature initials]) && value.length < 60
           find_or_create_blob_from_text(account, value, type)
-        elsif (data = Base64.decode64(value)) && Marcel::MimeType.for(data).include?('image')
+        elsif (data = Base64.decode64(value.sub(BASE64_PREFIX_REGEXP, ''))) &&
+              Marcel::MimeType.for(data).include?('image')
           find_or_create_blob_from_base64(account, data, type)
         else
           raise InvalidDefaultValue, "Invalid value, url, base64 or text < 60 chars is expected: #{value.first(200)}..."

lib/submitters/serialize_for_api.rb

@@ -10,12 +10,13 @@ module Submitters
 
     module_function
 
-    def call(submitter, with_template: false, with_events: false, with_documents: true, with_urls: false, params: {})
+    def call(submitter, with_template: false, with_events: false, with_documents: true, with_urls: false,
+             with_values: true, params: {})
       ActiveRecord::Associations::Preloader.new(
         records: [submitter],
         associations: if with_documents
                         [documents_attachments: :blob, attachments_attachments: :blob]
-                      else
+                      elsif with_values
                         [attachments_attachments: :blob]
                       end
       ).call
@@ -26,7 +27,7 @@ module Submitters
         additional_attrs['fields'] = SerializeForWebhook.build_fields_array(submitter)
       end
 
-      additional_attrs['values'] = SerializeForWebhook.build_values_array(submitter)
+      additional_attrs['values'] = SerializeForWebhook.build_values_array(submitter) if with_values
       additional_attrs['documents'] = SerializeForWebhook.build_documents_array(submitter) if with_documents
       additional_attrs['preferences'] = submitter.preferences.except('default_values')
       additional_attrs['submission_events'] = serialize_events(submitter.submission_events) if with_events

package.json

@@ -37,7 +37,7 @@
     "uuid": "^9.0.0",
     "vue": "^3.3.2",
     "vue-loader": "^17.1.1",
-    "webpack": "5.82.1",
+    "webpack": "5.94.0",
     "webpack-assets-manifest": "5",
     "webpack-bundle-analyzer": "^4.7.0",
     "webpack-cli": "5.1.1",

spec/factories/submission_events.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :submission_event do
+    submission
+    submitter
+    event_type { 'view_form' }
+    event_timestamp { Time.zone.now }
+    data do
+      {
+        ip: Faker::Internet.ip_v4_address,
+        ua: Faker::Internet.user_agent,
+        sid: SecureRandom.base58(10),
+        uid: Faker::Number.number(digits: 4)
+      }
+    end
+  end
+end

spec/factories/submissions.rb

@@ -11,5 +11,23 @@ FactoryBot.define do
       submission.template_schema = submission.template.schema
       submission.template_submitters = submission.template.submitters
     end
+
+    trait :with_submitters do
+      after(:create) do |submission, _|
+        submission.template_submitters.each do |template_submitter|
+          create(:submitter, submission:,
+                             account_id: submission.account_id,
+                             uuid: template_submitter['uuid'])
+        end
+      end
+    end
+
+    trait :with_events do
+      after(:create) do |submission, _|
+        submission.submitters.each do |submitter|
+          create(:submission_event, submission:, submitter:)
+        end
+      end
+    end
   end
 end

spec/factories/submitters.rb

@@ -4,6 +4,8 @@ FactoryBot.define do
   factory :submitter do
     submission
     email { Faker::Internet.email }
+    name { Faker::Name.name }
+    phone { Faker::PhoneNumber.phone_number }
 
     before(:create) do |submitter, _|
       submitter.account_id = submitter.submission.account_id

spec/requests/submissions_spec.rb

@@ -0,0 +1,247 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Submission API', type: :request do
+  let!(:account) { create(:account) }
+  let!(:author) { create(:user, account:) }
+  let!(:folder) { create(:template_folder, account:) }
+  let!(:templates) { create_list(:template, 2, account:, author:, folder:) }
+
+  describe 'GET /api/submissions' do
+    it 'returns a list of submissions' do
+      submissions = [
+        create(:submission, :with_submitters,
+               template: templates[0],
+               created_by_user: author),
+        create(:submission, :with_submitters,
+               template: templates[1],
+               created_by_user: author)
+      ].reverse
+
+      get '/api/submissions', headers: { 'x-auth-token': author.access_token.token }
+
+      expect(response).to have_http_status(:ok)
+      expect(response.parsed_body['pagination']).to eq(JSON.parse({
+        count: submissions.size,
+        next: submissions.last.id,
+        prev: submissions.first.id
+      }.to_json))
+      expect(response.parsed_body['data']).to eq(JSON.parse(submissions.map { |t| index_submission_body(t) }.to_json))
+    end
+  end
+
+  describe 'GET /api/submissions/:id' do
+    it 'returns a submission' do
+      submission = create(:submission, :with_submitters, :with_events, template: templates[0], created_by_user: author)
+
+      get "/api/submissions/#{submission.id}", headers: { 'x-auth-token': author.access_token.token }
+
+      expect(response).to have_http_status(:ok)
+      expect(response.parsed_body).to eq(JSON.parse(show_submission_body(submission).to_json))
+    end
+  end
+
+  describe 'POST /api/submissions' do
+    it 'creates a submission' do
+      post '/api/submissions', headers: { 'x-auth-token': author.access_token.token }, params: {
+        template_id: templates[0].id,
+        send_email: true,
+        submitters: [{ role: 'First Role', email: 'john.doe@example.com' }]
+      }.to_json
+
+      expect(response).to have_http_status(:ok)
+
+      submission = Submission.last
+
+      expect(response.parsed_body).to eq(JSON.parse(create_submission_body(submission).to_json))
+    end
+  end
+
+  describe 'POST /api/submissions/emails' do
+    it 'creates a submission using email' do
+      post '/api/submissions', headers: { 'x-auth-token': author.access_token.token }, params: {
+        template_id: templates[0].id,
+        emails: 'john.doe@example.com'
+      }.to_json
+
+      expect(response).to have_http_status(:ok)
+
+      submission = Submission.last
+
+      expect(response.parsed_body).to eq(JSON.parse(create_submission_body(submission).to_json))
+    end
+  end
+
+  describe 'DELETE /api/submissions/:id' do
+    it 'archives a submission' do
+      submission = create(:submission, :with_submitters, template: templates[0], created_by_user: author)
+
+      delete "/api/submissions/#{submission.id}", headers: { 'x-auth-token': author.access_token.token }
+
+      expect(response).to have_http_status(:ok)
+
+      submission.reload
+
+      expect(submission.archived_at).not_to be_nil
+      expect(response.parsed_body).to eq(JSON.parse({
+        id: submission.id,
+        archived_at: submission.archived_at
+      }.to_json))
+    end
+  end
+
+  private
+
+  def index_submission_body(submission)
+    submitters = submission.submitters.map do |submitter|
+      {
+        id: submitter.id,
+        submission_id: submission.id,
+        uuid: submitter.uuid,
+        email: submitter.email,
+        slug: submitter.slug,
+        sent_at: submitter.sent_at,
+        opened_at: submitter.opened_at,
+        completed_at: submitter.completed_at,
+        declined_at: nil,
+        created_at: submitter.created_at,
+        updated_at: submitter.updated_at,
+        name: submitter.name,
+        phone: submitter.phone,
+        status: submitter.status,
+        role: submitter.template.submitters.find { |s| s['uuid'] == submitter.uuid }['name'],
+        external_id: nil,
+        application_key: nil, # Backward compatibility
+        metadata: {},
+        preferences: {}
+      }
+    end
+
+    {
+      id: submission.id,
+      source: 'link',
+      submitters_order: 'random',
+      slug: submission.slug,
+      audit_log_url: nil,
+      combined_document_url: nil,
+      expire_at: nil,
+      completed_at: nil,
+      created_at: submission.created_at,
+      updated_at: submission.updated_at,
+      archived_at: nil,
+      status: 'pending',
+      submitters:,
+      template: {
+        id: submission.template.id,
+        name: submission.template.name,
+        external_id: nil,
+        folder_name: folder.name,
+        created_at: submission.template.created_at,
+        updated_at: submission.template.updated_at
+      },
+      created_by_user: {
+        id: author.id,
+        first_name: author.first_name,
+        last_name: author.last_name,
+        email: author.email
+      }
+    }
+  end
+
+  def show_submission_body(submission)
+    submitters = submission.submitters.map do |submitter|
+      {
+        id: submitter.id,
+        submission_id: submission.id,
+        uuid: submitter.uuid,
+        email: submitter.email,
+        slug: submitter.slug,
+        sent_at: submitter.sent_at,
+        opened_at: submitter.opened_at,
+        completed_at: submitter.completed_at,
+        declined_at: nil,
+        created_at: submitter.created_at,
+        updated_at: submitter.updated_at,
+        name: submitter.name,
+        phone: submitter.phone,
+        status: submitter.status,
+        external_id: nil,
+        application_key: nil, # Backward compatibility
+        metadata: {},
+        preferences: {},
+        role: submitter.template.submitters.find { |s| s['uuid'] == submitter.uuid }['name'],
+        documents: [],
+        values: []
+      }
+    end
+
+    {
+      id: submission.id,
+      source: 'link',
+      status: 'pending',
+      submitters_order: 'random',
+      slug: submission.slug,
+      audit_log_url: nil,
+      combined_document_url: nil,
+      expire_at: nil,
+      completed_at: nil,
+      created_at: submission.created_at,
+      updated_at: submission.updated_at,
+      archived_at: nil,
+      submitters:,
+      template: {
+        id: submission.template.id,
+        name: submission.template.name,
+        external_id: nil,
+        folder_name: folder.name,
+        created_at: submission.template.created_at,
+        updated_at: submission.template.updated_at
+      },
+      created_by_user: {
+        id: author.id,
+        first_name: author.first_name,
+        last_name: author.last_name,
+        email: author.email
+      },
+      documents: [],
+      submission_events: submission.submission_events.map do |event|
+        {
+          id: event.id,
+          submitter_id: event.submitter_id,
+          event_type: event.event_type,
+          event_timestamp: event.event_timestamp,
+          data: event.data.slice(:reason)
+        }
+      end
+    }
+  end
+
+  def create_submission_body(submission)
+    submission.submitters.map do |submitter|
+      {
+        id: submitter.id,
+        submission_id: submission.id,
+        uuid: submitter.uuid,
+        email: submitter.email,
+        slug: submitter.slug,
+        sent_at: submitter.sent_at,
+        opened_at: submitter.opened_at,
+        completed_at: submitter.completed_at,
+        declined_at: nil,
+        created_at: submitter.created_at,
+        updated_at: submitter.updated_at,
+        name: submitter.name,
+        phone: submitter.phone,
+        status: submitter.status,
+        external_id: nil,
+        application_key: nil, # Backward compatibility
+        metadata: {},
+        preferences: { send_email: true, send_sms: false },
+        role: submitter.template.submitters.find { |s| s['uuid'] == submitter.uuid }['name'],
+        embed_src: "#{Docuseal::DEFAULT_APP_URL}/s/#{submitter.slug}",
+        values: []
+      }
+    end
+  end
+end

spec/requests/submitters_spec.rb

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Submitter API', type: :request do
+  let!(:account) { create(:account) }
+  let!(:author) { create(:user, account:) }
+  let!(:folder) { create(:template_folder, account:) }
+  let!(:templates) { create_list(:template, 2, account:, author:, folder:) }
+
+  describe 'GET /api/submitters' do
+    it 'returns a list of submitters' do
+      submitters = [
+        create(:submission, :with_submitters, :with_events,
+               template: templates[0],
+               created_by_user: author),
+        create(:submission, :with_submitters,
+               template: templates[1],
+               created_by_user: author)
+      ].map(&:submitters).flatten.reverse
+
+      get '/api/submitters', headers: { 'x-auth-token': author.access_token.token }
+
+      expect(response).to have_http_status(:ok)
+      expect(response.parsed_body['pagination']).to eq(JSON.parse({
+        count: submitters.size,
+        next: submitters.last.id,
+        prev: submitters.first.id
+      }.to_json))
+      expect(response.parsed_body['data']).to eq(JSON.parse(submitters.map { |t| submitter_body(t) }.to_json))
+    end
+  end
+
+  describe 'GET /api/submitters/:id' do
+    it 'returns a submitter' do
+      submitter = create(:submission, :with_submitters, :with_events,
+                         template: templates[0],
+                         created_by_user: author).submitters.first
+
+      get "/api/submitters/#{submitter.id}", headers: { 'x-auth-token': author.access_token.token }
+
+      expect(response).to have_http_status(:ok)
+      expect(response.parsed_body).to eq(JSON.parse(submitter_body(submitter).to_json))
+    end
+  end
+
+  describe 'PUT /api/submitters' do
+    it 'update a submitter' do
+      submitter = create(:submission, :with_submitters, :with_events,
+                         template: templates[0],
+                         created_by_user: author).submitters.first
+
+      put "/api/submitters/#{submitter.id}", headers: { 'x-auth-token': author.access_token.token }, params: {
+        email: 'john.doe+updated@example.com'
+      }.to_json
+
+      expect(response).to have_http_status(:ok)
+
+      submitter.reload
+
+      expect(submitter.email).to eq('john.doe+updated@example.com')
+      expect(response.parsed_body).to eq(JSON.parse(update_submitter_body(submitter).to_json))
+    end
+  end
+
+  private
+
+  def submitter_body(submitter)
+    {
+      id: submitter.id,
+      submission_id: submitter.submission_id,
+      uuid: submitter.uuid,
+      email: submitter.email,
+      status: submitter.status,
+      slug: submitter.slug,
+      sent_at: submitter.sent_at,
+      opened_at: submitter.opened_at,
+      completed_at: submitter.completed_at,
+      declined_at: submitter.declined_at,
+      created_at: submitter.created_at,
+      updated_at: submitter.updated_at,
+      name: submitter.name,
+      phone: submitter.phone,
+      external_id: nil,
+      application_key: nil, # Backward compatibility
+      template: {
+        id: submitter.template.id,
+        name: submitter.template.name,
+        created_at: submitter.template.created_at,
+        updated_at: submitter.template.updated_at
+      },
+      metadata: {},
+      preferences: {},
+      submission_events: submitter.submission_events.map do |event|
+        {
+          id: event.id,
+          submitter_id: event.submitter_id,
+          event_type: event.event_type,
+          event_timestamp: event.event_timestamp,
+          data: event.data.slice(:reason)
+        }
+      end,
+      values: [],
+      documents: [],
+      role: submitter.template.submitters.find { |s| s['uuid'] == submitter.uuid }['name']
+    }
+  end
+
+  def update_submitter_body(submitter)
+    submitter_body(submitter).except(:template, :submission_events)
+                             .merge(embed_src: "#{Docuseal::DEFAULT_APP_URL}/s/#{submitter.slug}")
+  end
+end

spec/requests/templates_spec.rb

@@ -0,0 +1,226 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Templates API', type: :request do
+  let!(:account) { create(:account) }
+  let!(:author) { create(:user, account:) }
+  let!(:folder) { create(:template_folder, account:) }
+  let!(:template_preferences) { { 'request_email_subject' => 'Subject text', 'request_email_body' => 'Body Text' } }
+
+  describe 'GET /api/templates' do
+    it 'returns a list of templates' do
+      templates = [
+        create(:template, account:,
+                          author:,
+                          folder:,
+                          external_id: SecureRandom.base58(10),
+                          preferences: template_preferences),
+        create(:template, account:,
+                          author:,
+                          folder:,
+                          external_id: SecureRandom.base58(10),
+                          preferences: template_preferences)
+      ].reverse
+
+      get '/api/templates', headers: { 'x-auth-token': author.access_token.token }
+
+      expect(response).to have_http_status(:ok)
+      expect(response.parsed_body['pagination']).to eq(JSON.parse({
+        count: templates.size,
+        next: templates.last.id,
+        prev: templates.first.id
+      }.to_json))
+      expect(response.parsed_body['data']).to eq(JSON.parse(templates.map { |t| template_body(t) }.to_json))
+    end
+  end
+
+  describe 'GET /api/templates/:id' do
+    it 'returns a template' do
+      template = create(:template, account:,
+                                   author:,
+                                   folder:,
+                                   external_id: SecureRandom.base58(10),
+                                   preferences: template_preferences)
+
+      get "/api/templates/#{template.id}", headers: { 'x-auth-token': author.access_token.token }
+
+      expect(response).to have_http_status(:ok)
+      expect(response.parsed_body).to eq(JSON.parse(template_body(template).to_json))
+    end
+  end
+
+  describe 'PUT /api/templates' do
+    it 'update a template' do
+      template = create(:template, account:,
+                                   author:,
+                                   folder:,
+                                   external_id: SecureRandom.base58(10),
+                                   preferences: template_preferences)
+
+      put "/api/templates/#{template.id}", headers: { 'x-auth-token': author.access_token.token }, params: {
+        name: 'Updated Template Name',
+        external_id: '123456'
+      }.to_json
+
+      expect(response).to have_http_status(:ok)
+
+      template.reload
+
+      expect(template.name).to eq('Updated Template Name')
+      expect(template.external_id).to eq('123456')
+      expect(response.parsed_body).to eq(JSON.parse({
+        id: template.id,
+        updated_at: template.updated_at
+      }.to_json))
+    end
+  end
+
+  describe 'DELETE /api/templates/:id' do
+    it 'archives a template' do
+      template = create(:template, account:,
+                                   author:,
+                                   folder:,
+                                   external_id: SecureRandom.base58(10),
+                                   preferences: template_preferences)
+
+      delete "/api/templates/#{template.id}", headers: { 'x-auth-token': author.access_token.token }
+
+      expect(response).to have_http_status(:ok)
+
+      template.reload
+
+      expect(template.archived_at).not_to be_nil
+      expect(response.parsed_body).to eq(JSON.parse({
+        id: template.id,
+        archived_at: template.archived_at
+      }.to_json))
+    end
+  end
+
+  describe 'POST /api/templates/:id/clone' do
+    it 'clones a template' do
+      template = create(:template, account:,
+                                   author:,
+                                   folder:,
+                                   external_id: SecureRandom.base58(10),
+                                   preferences: template_preferences)
+
+      expect do
+        post "/api/templates/#{template.id}/clone", headers: { 'x-auth-token': author.access_token.token }, params: {
+          name: 'Cloned Template Name',
+          external_id: '123456'
+        }.to_json
+      end.to change(Template, :count)
+
+      expect(response).to have_http_status(:ok)
+
+      cloned_template = Template.last
+
+      expect(cloned_template.name).to eq('Cloned Template Name')
+      expect(cloned_template.external_id).to eq('123456')
+      expect(response.parsed_body).to eq(JSON.parse(clone_template_body(cloned_template).to_json))
+    end
+  end
+
+  private
+
+  def template_body(template)
+    template_attachment_uuid = template.schema.first['attachment_uuid']
+    attachment = template.schema_documents.preload(:blob).find { |e| e.uuid == template_attachment_uuid }
+    first_page_blob =
+      ActiveStorage::Attachment.joins(:blob)
+                               .where(blob: { filename: '0.jpg' })
+                               .where(record_id: template.schema_documents.map(&:id),
+                                      record_type: 'ActiveStorage::Attachment',
+                                      name: :preview_images)
+                               .preload(:blob)
+                               .first
+                               .blob
+
+    {
+      id: template.id,
+      slug: template.slug,
+      name: template.name,
+      fields: [
+        {
+          'uuid' => '21637fc9-0655-45df-8952-04ec64949e85',
+          'submitter_uuid' => '513848eb-1096-4abc-a743-68596b5aaa4c',
+          'name' => 'First Name',
+          'type' => 'text',
+          'required' => true,
+          'areas' => [
+            {
+              'x' => 0.09027777777777778,
+              'y' => 0.1197252208047105,
+              'w' => 0.3069444444444444,
+              'h' => 0.03336604514229637,
+              'attachment_uuid' => template_attachment_uuid,
+              'page' => 0
+            }
+          ]
+        },
+        {
+          'uuid' => '1f97f8e3-dc82-4586-aeea-6ebed6204e46',
+          'submitter_uuid' => '513848eb-1096-4abc-a743-68596b5aaa4c',
+          'name' => '',
+          'type' => 'signature',
+          'required' => true,
+          'areas' => []
+        }
+      ],
+      submitters: [
+        {
+          name: 'First Party',
+          uuid: template.submitters.first['uuid']
+        }
+      ],
+      author: {
+        id: author.id,
+        first_name: author.first_name,
+        last_name: author.last_name,
+        email: author.email
+      },
+      documents: [
+        {
+          id: template.documents.first.id,
+          uuid: template.documents.first.uuid,
+          url: ActiveStorage::Blob.proxy_url(attachment.blob),
+          preview_image_url: ActiveStorage::Blob.proxy_url(first_page_blob),
+          filename: 'sample-document.pdf'
+        }
+      ],
+      preferences: {
+        'request_email_subject' => 'Subject text',
+        'request_email_body' => 'Body Text'
+      },
+      schema: [
+        {
+          attachment_uuid: template_attachment_uuid,
+          name: 'sample-document'
+        }
+      ],
+      author_id: author.id,
+      archived_at: nil,
+      created_at: template.created_at,
+      updated_at: template.updated_at,
+      folder_id: folder.id,
+      folder_name: folder.name,
+      source: 'native',
+      external_id: template.external_id,
+      application_key: template.external_id # Backward compatibility
+    }
+  end
+
+  def clone_template_body(cloned_template)
+    body = template_body(cloned_template).merge(source: 'api')
+    body[:fields].each_with_index do |field, index|
+      field.merge!(
+        'submitter_uuid' => cloned_template.fields[index]['submitter_uuid'],
+        'uuid' => cloned_template.fields[index]['uuid']
+      )
+    end
+
+    body
+  end
+end

spec/system/template_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe 'Template' do
       visit template_path(template)
 
       submitters.each do |submitter|
-        expect(page).to have_content(submitter.email)
+        expect(page).to have_content(submitter.name)
       end
 
       expect(page).to have_content(template.name)

yarn.lock

@@ -1143,6 +1143,14 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
+"@jridgewell/source-map@^0.3.3":
+  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.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+
 "@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"
@@ -1166,7 +1174,7 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
-"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+"@jridgewell/trace-mapping@^0.3.20", "@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==
@@ -1269,26 +1277,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/eslint-scope@^3.7.3":
+"@types/estree@^1.0.5":
-  version "3.7.4"
+  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
-  integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/estree" "*"
-
-"@types/eslint@*":
-  version "8.37.0"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.37.0.tgz#29cebc6c2a3ac7fea7113207bf5a828fdf4d7ef1"
-  integrity sha512-Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
-"@types/estree@*", "@types/estree@^1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
-  integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
 
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33":
   version "4.17.35"
@@ -1336,7 +1328,7 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
@@ -1520,10 +1512,10 @@
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.3.4.tgz#06e83c5027f464eef861c329be81454bc8b70780"
   integrity sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==
 
-"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
+"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1":
-  version "1.11.6"
+  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
-  integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==
+  integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==
   dependencies:
     "@webassemblyjs/helper-numbers" "1.11.6"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
@@ -1538,10 +1530,10 @@
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
   integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
 
-"@webassemblyjs/helper-buffer@1.11.6":
+"@webassemblyjs/helper-buffer@1.12.1":
-  version "1.11.6"
+  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6"
-  integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==
+  integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==
 
 "@webassemblyjs/helper-numbers@1.11.6":
   version "1.11.6"
@@ -1557,15 +1549,15 @@
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
   integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
 
-"@webassemblyjs/helper-wasm-section@1.11.6":
+"@webassemblyjs/helper-wasm-section@1.12.1":
-  version "1.11.6"
+  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf"
-  integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==
+  integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.12.1"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.12.1"
 
 "@webassemblyjs/ieee754@1.11.6":
   version "1.11.6"
@@ -1586,59 +1578,59 @@
   resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
   integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
 
-"@webassemblyjs/wasm-edit@^1.11.5":
+"@webassemblyjs/wasm-edit@^1.12.1":
-  version "1.11.6"
+  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b"
-  integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==
+  integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.12.1"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/helper-wasm-section" "1.11.6"
+    "@webassemblyjs/helper-wasm-section" "1.12.1"
-    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.12.1"
-    "@webassemblyjs/wasm-opt" "1.11.6"
+    "@webassemblyjs/wasm-opt" "1.12.1"
-    "@webassemblyjs/wasm-parser" "1.11.6"
+    "@webassemblyjs/wasm-parser" "1.12.1"
-    "@webassemblyjs/wast-printer" "1.11.6"
+    "@webassemblyjs/wast-printer" "1.12.1"
 
-"@webassemblyjs/wasm-gen@1.11.6":
+"@webassemblyjs/wasm-gen@1.12.1":
-  version "1.11.6"
+  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547"
-  integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==
+  integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/ast" "1.12.1"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
     "@webassemblyjs/ieee754" "1.11.6"
     "@webassemblyjs/leb128" "1.11.6"
     "@webassemblyjs/utf8" "1.11.6"
 
-"@webassemblyjs/wasm-opt@1.11.6":
+"@webassemblyjs/wasm-opt@1.12.1":
-  version "1.11.6"
+  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5"
-  integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==
+  integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/ast" "1.12.1"
-    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.12.1"
-    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.12.1"
-    "@webassemblyjs/wasm-parser" "1.11.6"
+    "@webassemblyjs/wasm-parser" "1.12.1"
 
-"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5":
+"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1":
-  version "1.11.6"
+  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937"
-  integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==
+  integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/ast" "1.12.1"
     "@webassemblyjs/helper-api-error" "1.11.6"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
     "@webassemblyjs/ieee754" "1.11.6"
     "@webassemblyjs/leb128" "1.11.6"
     "@webassemblyjs/utf8" "1.11.6"
 
-"@webassemblyjs/wast-printer@1.11.6":
+"@webassemblyjs/wast-printer@1.12.1":
-  version "1.11.6"
+  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac"
-  integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==
+  integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/ast" "1.12.1"
     "@xtuc/long" "4.2.2"
 
 "@webpack-cli/configtest@^2.1.0":
@@ -1674,10 +1666,10 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-acorn-import-assertions@^1.7.6:
+acorn-import-attributes@^1.9.5:
-  version "1.9.0"
+  version "1.9.5"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
+  resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
-  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
+  integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
@@ -1689,10 +1681,10 @@ acorn-walk@^8.0.0:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
-acorn@^8.0.4, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0:
+acorn@^8.0.4, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.2:
-  version "8.8.2"
+  version "8.12.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
-  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
+  integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
 
 ajv-formats@^2.1.1:
   version "2.1.1"
@@ -1979,15 +1971,15 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5:
+browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5:
-  version "4.21.5"
+  version "4.23.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800"
-  integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==
+  integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==
   dependencies:
-    caniuse-lite "^1.0.30001449"
+    caniuse-lite "^1.0.30001646"
-    electron-to-chromium "^1.4.284"
+    electron-to-chromium "^1.5.4"
-    node-releases "^2.0.8"
+    node-releases "^2.0.18"
-    update-browserslist-db "^1.0.10"
+    update-browserslist-db "^1.1.0"
 
 buffer-from@^1.0.0:
   version "1.1.2"
@@ -2039,11 +2031,16 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001464:
   version "1.0.30001488"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001488.tgz#d19d7b6e913afae3e98f023db97c19e9ddc5e91f"
   integrity sha512-NORIQuuL4xGpIy6iCCQGN4iFjlBXtfKWIenlUuyZJumLRIindLb7wXM+GO8erEhb7vXfcnf4BAg2PrSDN5TNLQ==
 
+caniuse-lite@^1.0.30001646:
+  version "1.0.30001655"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz#0ce881f5a19a2dcfda2ecd927df4d5c1684b982f"
+  integrity sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==
+
 canvas-confetti@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/canvas-confetti/-/canvas-confetti-1.6.0.tgz#193f71aa8f38fc850a5ba94f59091a7afdb43ead"
@@ -2589,20 +2586,20 @@ 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.284:
+electron-to-chromium@^1.5.4:
-  version "1.4.402"
+  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.402.tgz#9aa7bbb63081513127870af6d22f829344c5ba57"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz#1abf0410c5344b2b829b7247e031f02810d442e6"
-  integrity sha512-gWYvJSkohOiBE6ecVYXkrDgNaUjo47QEKK0kQzmWyhkH+yoYiG44bwuicTGNSIQRG3WDMsWVZJLRnJnLNkbWvA==
+  integrity sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==
 
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
-enhanced-resolve@^5.14.0:
+enhanced-resolve@^5.17.1:
-  version "5.14.0"
+  version "5.17.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.14.0.tgz#0b6c676c8a3266c99fa281e4433a706f5c0c61c4"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
-  integrity sha512-+DCows0XNwLDcUhbFJPdlQEVnT2zXlCv7hPxemTz86/O+B/hCQ+mb7ydkPKiflpVraqLPCAfu7lDy+hBXueojw==
+  integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -2701,10 +2698,10 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-escalade@^3.1.1:
+escalade@^3.1.2:
-  version "3.1.1"
+  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
 
 escape-html@~1.0.3:
   version "1.0.3"
@@ -3305,7 +3302,7 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.2, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -4122,10 +4119,10 @@ node-forge@^1:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
-node-releases@^2.0.8:
+node-releases@^2.0.18:
-  version "2.0.11"
+  version "2.0.18"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.11.tgz#59d7cef999d13f908e43b5a70001cf3129542f0f"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
-  integrity sha512-+M0PwXeU80kRohZ3aT4J/OnR+l9/KD2nVLNNoRgFtnf+umQVFdGBAO2N8+nCnEi0xlh/Wk3zOGC+vNNx+uM79Q==
+  integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
@@ -4350,6 +4347,11 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
+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.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
@@ -4947,10 +4949,10 @@ sass@^1.62.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-schema-utils@^3.0, schema-utils@^3.1.1, schema-utils@^3.1.2:
+schema-utils@^3.0, schema-utils@^3.1.1, schema-utils@^3.2.0:
-  version "3.1.2"
+  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.2.tgz#36c10abca6f7577aeae136c804b0c741edeadc99"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
-  integrity sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==
+  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
   dependencies:
     "@types/json-schema" "^7.0.8"
     ajv "^6.12.5"
@@ -5384,16 +5386,16 @@ terser-webpack-plugin@5.3.8:
     serialize-javascript "^6.0.1"
     terser "^5.16.8"
 
-terser-webpack-plugin@^5.3.7:
+terser-webpack-plugin@^5.3.10:
-  version "5.3.9"
+  version "5.3.10"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199"
-  integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==
+  integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.17"
+    "@jridgewell/trace-mapping" "^0.3.20"
     jest-worker "^27.4.5"
     schema-utils "^3.1.1"
     serialize-javascript "^6.0.1"
-    terser "^5.16.8"
+    terser "^5.26.0"
 
 terser@^5.16.8:
   version "5.17.4"
@@ -5405,6 +5407,16 @@ terser@^5.16.8:
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
+terser@^5.26.0:
+  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"
+    commander "^2.20.0"
+    source-map-support "~0.5.20"
+
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -5548,13 +5560,13 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
-update-browserslist-db@^1.0.10:
+update-browserslist-db@^1.1.0:
-  version "1.0.11"
+  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e"
-  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
+  integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==
   dependencies:
-    escalade "^3.1.1"
+    escalade "^3.1.2"
-    picocolors "^1.0.0"
+    picocolors "^1.0.1"
 
 uri-js@^4.2.2:
   version "4.4.1"
@@ -5621,10 +5633,10 @@ vue@^3.3.2:
     "@vue/server-renderer" "3.3.4"
     "@vue/shared" "3.3.4"
 
-watchpack@^2.4.0:
+watchpack@^2.4.0, watchpack@^2.4.1:
-  version "2.4.0"
+  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da"
-  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
+  integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -5744,34 +5756,33 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@5.82.1:
+webpack@5.94.0:
-  version "5.82.1"
+  version "5.94.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.82.1.tgz#8f38c78e53467556e8a89054ebd3ef6e9f67dbab"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
-  integrity sha512-C6uiGQJ+Gt4RyHXXYt+v9f+SN1v83x68URwgxNQ98cvH8kxiuywWGP4XeNZ1paOzZ63aY3cTciCEQJNFUljlLw==
+  integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
   dependencies:
-    "@types/eslint-scope" "^3.7.3"
+    "@types/estree" "^1.0.5"
-    "@types/estree" "^1.0.0"
+    "@webassemblyjs/ast" "^1.12.1"
-    "@webassemblyjs/ast" "^1.11.5"
+    "@webassemblyjs/wasm-edit" "^1.12.1"
-    "@webassemblyjs/wasm-edit" "^1.11.5"
+    "@webassemblyjs/wasm-parser" "^1.12.1"
-    "@webassemblyjs/wasm-parser" "^1.11.5"
     acorn "^8.7.1"
-    acorn-import-assertions "^1.7.6"
+    acorn-import-attributes "^1.9.5"
-    browserslist "^4.14.5"
+    browserslist "^4.21.10"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.14.0"
+    enhanced-resolve "^5.17.1"
     es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.9"
+    graceful-fs "^4.2.11"
     json-parse-even-better-errors "^2.3.1"
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^3.1.2"
+    schema-utils "^3.2.0"
     tapable "^2.1.1"
-    terser-webpack-plugin "^5.3.7"
+    terser-webpack-plugin "^5.3.10"
-    watchpack "^2.4.0"
+    watchpack "^2.4.1"
     webpack-sources "^3.2.3"
 
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4: