-
+<% end %>
diff --git a/app/cells/decidim/vocdoni/census_authorization_modal_cell.rb b/app/cells/decidim/vocdoni/census_authorization_modal_cell.rb
index 039e6f65..fb899b12 100644
--- a/app/cells/decidim/vocdoni/census_authorization_modal_cell.rb
+++ b/app/cells/decidim/vocdoni/census_authorization_modal_cell.rb
@@ -20,7 +20,7 @@ def election
def modal_id
return "loginModal" unless current_user
- options[:modal_id] || "internalCensusModal"
+ options[:modal_id] || "census-authorization-modal"
end
def redirect_url
@@ -30,7 +30,7 @@ def redirect_url
def render_internal_census(authorized_method, granted_authorizations)
unless granted_authorizations.include?(authorized_method)
render view: "internal_census", locals: {
- authorized_method: authorized_method,
+ authorized_method:,
granted: granted_authorizations.include?(authorized_method)
}
end
diff --git a/app/cells/decidim/vocdoni/election_cell.rb b/app/cells/decidim/vocdoni/election_cell.rb
index 104de13a..e69213c6 100644
--- a/app/cells/decidim/vocdoni/election_cell.rb
+++ b/app/cells/decidim/vocdoni/election_cell.rb
@@ -3,7 +3,7 @@
module Decidim
module Vocdoni
# This cell renders the election card for an instance of an election
- # the default size is the Medium Card (:m)
+ # the default size is the Grid (:g) election card
class ElectionCell < Decidim::ViewModel
include ElectionCellsHelper
include Cell::ViewModel::Partial
@@ -15,7 +15,7 @@ def show
private
def card_size
- "decidim/vocdoni/election_m"
+ "decidim/vocdoni/election_g"
end
end
end
diff --git a/app/cells/decidim/vocdoni/election_m/data.erb b/app/cells/decidim/vocdoni/election_g/data.erb
similarity index 100%
rename from app/cells/decidim/vocdoni/election_m/data.erb
rename to app/cells/decidim/vocdoni/election_g/data.erb
diff --git a/app/cells/decidim/vocdoni/election_g/footer.erb b/app/cells/decidim/vocdoni/election_g/footer.erb
new file mode 100644
index 00000000..329cf38e
--- /dev/null
+++ b/app/cells/decidim/vocdoni/election_g/footer.erb
@@ -0,0 +1,5 @@
+<%= t("decidim.vocdoni.census_authorization_modal.not_authorized.title") %>
- +<%= decidim_modal id: "census-authorization-modal" do %> +
+ <%= icon "information-line" %>
+
- <% census_authorize_methods.each do |authorized_method| %>
- <%= render_internal_census(authorized_method, granted_authorizations) %>
- <% end %>
-+ <%= t("decidim.vocdoni.census_authorization_modal.not_authorized.title") %> +
++ <% census_authorize_methods.each do |authorized_method| %> + <%= render_internal_census(authorized_method, granted_authorizations) %> + <% end %> +
+
diff --git a/app/cells/decidim/vocdoni/election_g/show.erb b/app/cells/decidim/vocdoni/election_g/show.erb
new file mode 100644
index 00000000..00d1923d
--- /dev/null
+++ b/app/cells/decidim/vocdoni/election_g/show.erb
@@ -0,0 +1,20 @@
+<%= link_to resource_path, class: classes[:default], id: resource_id do %>
+
+
+<%= footer_button_text %>
+
+ <% if has_image? %>
+ <%= image_tag resource_image_path, alt: alt_title %>
+ <% else %>
+ <%= external_icon "media/images/placeholder-card-g.svg", class: "card__placeholder-g" %>
+ <% end %>
+
+
+ <%= content_tag title_tag, title, class: title_class %>
+ <%= description if show_description? %>
+ <%= cell "decidim/vocdoni/remaining_time_callout", model %>
+ <% if metadata_cell.present? %>
+
+<% end %>
diff --git a/app/cells/decidim/vocdoni/election_m/tags.erb b/app/cells/decidim/vocdoni/election_g/tags.erb
similarity index 100%
rename from app/cells/decidim/vocdoni/election_m/tags.erb
rename to app/cells/decidim/vocdoni/election_g/tags.erb
diff --git a/app/cells/decidim/vocdoni/election_m_cell.rb b/app/cells/decidim/vocdoni/election_g_cell.rb
similarity index 84%
rename from app/cells/decidim/vocdoni/election_m_cell.rb
rename to app/cells/decidim/vocdoni/election_g_cell.rb
index baf5fd52..04ad8bf1 100644
--- a/app/cells/decidim/vocdoni/election_m_cell.rb
+++ b/app/cells/decidim/vocdoni/election_g_cell.rb
@@ -4,11 +4,15 @@ module Decidim
module Vocdoni
# This cell renders the Medium (:m) election card
# for a given instance of an Election
- class ElectionMCell < Decidim::CardMCell
+ class ElectionGCell < Decidim::CardGCell
include ElectionCellsHelper
- def date
- render
+ def metadata_cell
+ "decidim/vocdoni/election_metadata"
+ end
+
+ def show_description?
+ true
end
private
@@ -52,9 +56,10 @@ def resource_image_path
end
def description
- text = super
- text.sub!(/
+ <%= cell metadata_cell, resource, links: false, **options %>
+
+ <% end %>
+ <%= render :footer %>
+ /, "
#{render :badge}") - html_truncate(text, length: 100) + attribute = resource.try(:short_description) || resource.try(:body) || resource.description + text = translated_attribute(attribute) + + strip_tags(html_truncate(text, length: 300)) end def state_classes diff --git a/app/cells/decidim/vocdoni/election_m/footer.erb b/app/cells/decidim/vocdoni/election_m/footer.erb deleted file mode 100644 index b491e6d9..00000000 --- a/app/cells/decidim/vocdoni/election_m/footer.erb +++ /dev/null @@ -1,5 +0,0 @@ -
-
diff --git a/app/cells/decidim/vocdoni/election_metadata_cell.rb b/app/cells/decidim/vocdoni/election_metadata_cell.rb
new file mode 100644
index 00000000..6b8ef308
--- /dev/null
+++ b/app/cells/decidim/vocdoni/election_metadata_cell.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Decidim
+ module Vocdoni
+ # This cell renders metadata for an instance of an Election
+ class ElectionMetadataCell < Decidim::CardMetadataCell
+ def initialize(*)
+ super
+
+ @items.prepend(*election_items)
+ end
+
+ private
+
+ def election_items
+ [dates_metadata_item, state_item]
+ end
+
+ def state_item
+ return if model.voting_period_status.blank?
+
+ { text: content_tag(:span, I18n.t(model.voting_period_status, scope: "decidim.vocdoni.election_m.badge_name"),
+ class: "label #{state_class}") }
+ end
+
+ def state_class
+ case model.voting_period_status
+ when :ongoing
+ "success"
+ when :upcoming
+ "warning"
+ end
+ end
+
+ def start_date
+ return unless model.start_time
+
+ model.start_time.to_date
+ end
+
+ def end_date
+ return unless model.end_time
+
+ model.end_time.to_date
+ end
+
+ def dates_metadata_item
+ {
+ icon: "calendar-todo-line",
+ text: [
+ start_date.present? ? l(start_date, format: :decidim_short_with_month_name_short) : "?",
+ end_date.present? ? l(end_date, format: :decidim_short_with_month_name_short) : "?"
+ ].join(" → ")
+ }
+ end
+ end
+ end
+end
diff --git a/app/cells/decidim/vocdoni/election_preview/show.erb b/app/cells/decidim/vocdoni/election_preview/show.erb
index f7e7c4b8..0e390c99 100644
--- a/app/cells/decidim/vocdoni/election_preview/show.erb
+++ b/app/cells/decidim/vocdoni/election_preview/show.erb
@@ -1,28 +1,31 @@
-
- <%= link_to footer_button_text, resource_path, class: "card__button button button--sc light small" %>
-
-
-
+
+ <% end %>
+
diff --git a/app/cells/decidim/vocdoni/election_results/progress_bar.erb b/app/cells/decidim/vocdoni/election_results/progress_bar.erb
index b5907fbe..cdfc814d 100644
--- a/app/cells/decidim/vocdoni/election_results/progress_bar.erb
+++ b/app/cells/decidim/vocdoni/election_results/progress_bar.erb
@@ -1,16 +1,22 @@
-
-
+ <%= t("decidim.vocdoni.elections.preview.title") %>
+
+ <%= icon "question-mark" %>
+
- <%= t("decidim.vocdoni.elections.preview.title") %>
+<%= t("decidim.vocdoni.elections.preview.description") %>
+<%= t("decidim.vocdoni.elections.preview.description") %>
--
- <% model.questions.each do |question| %>
-
- " data-accordion-item>
- <%= translated_attribute(question.title) %>
+
-
+ <% model.questions.each_with_index do |question, ix| %>
+
-
+
- - <%= t("decidim.vocdoni.elections.preview.available_answers") %> +-+ <%= t("decidim.vocdoni.elections.preview.available_answers") %> -- - <% end %> - -
-
- <% question.answers.each do |answer| %>
-
- <%= translated_attribute(answer.title) %> - <% end %> -
-
+
-
-
+ <% question.answers.each do |answer| %>
+
- <%= translated_attribute(answer.title) %> + <% end %> +
-
-
-
-
+
+
+
+
-
+
-
<%= t("decidim.vocdoni.elections.results.percentage", count: votes_percentage) %>
+
diff --git a/app/cells/decidim/vocdoni/election_results/show.erb b/app/cells/decidim/vocdoni/election_results/show.erb
index 1692ae8d..f12e23c3 100644
--- a/app/cells/decidim/vocdoni/election_results/show.erb
+++ b/app/cells/decidim/vocdoni/election_results/show.erb
@@ -1,30 +1,30 @@
-
<%= t("decidim.vocdoni.elections.results.votes", count: votes) %>
-
-
+
+ <% end %>
+
diff --git a/app/cells/decidim/vocdoni/election_results_realtime/show.erb b/app/cells/decidim/vocdoni/election_results_realtime/show.erb
index ab41f3ef..74a89916 100644
--- a/app/cells/decidim/vocdoni/election_results_realtime/show.erb
+++ b/app/cells/decidim/vocdoni/election_results_realtime/show.erb
@@ -1,20 +1,29 @@
<% vote_stats_scope = "decidim.vocdoni.admin.steps" %>
+<%= t("decidim.vocdoni.elections.results.title") %>
+
+ <%= icon "bar-chart-box-line" %>
+
- <%= t("decidim.vocdoni.elections.results.title") %>
+<%= t("decidim.vocdoni.elections.results.description") %>
+<%= t("decidim.vocdoni.elections.results.description") %>
--
- <% model.questions.each_with_index do |question, i| %>
-
- " data-accordion-item>
- <%= translated_attribute(question.title) %>
+
-
+ <% model.questions.each_with_index do |question, ix| %>
+
-
+
- - <% question.answers.each do |answer| %> -+ <% end %> +--
- <%= translated_attribute(answer.title) %> -
++ <% question.answers.each do |answer| %> +- - <% end %> - -+- <% end %> + <%= render view: :progress_bar, locals: { id: answer.id, votes_percentage: answer.votes_percentage, votes: answer.votes } %>+ <%= translated_attribute(answer.title) %> +
- <%= render view: :progress_bar, locals: { votes_percentage: answer.votes_percentage, votes: answer.votes } %> -
-
+
-
+ <%= icon "bar-chart-box-line" %>
+
+
+<%= t("vote_stats.title", scope: vote_stats_scope) %>
+<%= t("description", scope: "decidim.vocdoni.elections.show") %>
+
-
<%= t("vote_stats.title", scope: vote_stats_scope) %>
-<%= t("description", scope: "decidim.vocdoni.elections.show") %>
-
-
+
- " data-accordion-item>
- <%= t("vote_stats.question", scope: vote_stats_scope) %>: <%= translated_attribute(question.title) %>
- -+
- + +
+@@ -45,4 +54,4 @@ -<%= javascript_pack_tag "decidim_vocdoni_update_results" %> +<%= append_javascript_pack_tag "decidim_vocdoni_update_results" %> diff --git a/app/cells/decidim/vocdoni/election_vote_cta/show.erb b/app/cells/decidim/vocdoni/election_vote_cta/show.erb index 8359568d..e5fb88ce 100644 --- a/app/cells/decidim/vocdoni/election_vote_cta/show.erb +++ b/app/cells/decidim/vocdoni/election_vote_cta/show.erb @@ -2,42 +2,53 @@ <%= cell("decidim/announcement", callout_text) %> <% end %> - - <% if model.canceled? %> -+- <%= t("canceled", scope: "decidim.vocdoni.elections.show") %> -- <% elsif model.paused? %> -- <%= t("paused", scope: "decidim.vocdoni.elections.show") %> -- <%= t("action_button.vote", scope: "decidim.vocdoni.elections.show") %> - <% elsif model.ongoing? %> - <%= link_to new_election_vote_path, - class: "button button--sc vote-button", - **link_attributes_for_voting(election, voter_verified?, modal_id) do %> - <%= vote_action_button_text %> ++ + <% if model.canceled? %> +<% if preview_mode? && can_preview? %> - <%= link_to new_election_vote_path, class: "button button--sc" do %> - <%= t("preview", scope: "decidim.vocdoni.elections.show") %> - <% end %> ++ <%= t("canceled", scope: "decidim.vocdoni.elections.show") %> ++ <% elsif model.paused? %> ++ <%= t("paused", scope: "decidim.vocdoni.elections.show") %> ++ + <% elsif model.ongoing? && current_user %> + <%= link_to new_election_vote_path, + class: "button button__lg button__secondary w-full vote-button", + **link_attributes_for_voting(election, voter_verified?, modal_id) do %> + <%= vote_action_button_text %> + <% end %> + <%= cell "decidim/vocdoni/census_authorization_modal", model %> + <% elsif model.ongoing? && !current_user %> + <%= button_tag( + vote_action_button_text, + type: "button", + class: "button button__lg button__secondary w-full vote-button", + **link_attributes_for_voting(election, voter_verified?, modal_id) + ) %> + <% elsif !model.finished? %> + <% end %> - <%= cell "decidim/vocdoni/census_authorization_modal", model %> - <% elsif !model.finished? %> - <%= t("action_button.vote", scope: "decidim.vocdoni.elections.show") %> - <% end %> - ++ <%= link_to new_election_vote_path, class: "button button__lg button__secondary w-full mt-4" do %> + <%= t("preview", scope: "decidim.vocdoni.elections.show") %> + <% end %> +<% end %> -<%= t("verify.already_voted", scope: "decidim.vocdoni.elections.show") %>
--<% if model.started? %> - <%= t("verify.already_voted", scope: "decidim.vocdoni.elections.show") %> ++ -<%= javascript_pack_tag "decidim_vocdoni_voter_new_vote" %> +<%= append_javascript_pack_tag "decidim_vocdoni_voter_new_vote" %> diff --git a/app/cells/decidim/vocdoni/election_vote_cta_cell.rb b/app/cells/decidim/vocdoni/election_vote_cta_cell.rb index 79fdf6d3..c7362839 100644 --- a/app/cells/decidim/vocdoni/election_vote_cta_cell.rb +++ b/app/cells/decidim/vocdoni/election_vote_cta_cell.rb @@ -25,7 +25,7 @@ def election def modal_id return "loginModal" unless current_user - options[:modal_id] || "internalCensusModal" + options[:modal_id] || "census-authorization-modal" end def new_election_vote_path @@ -57,10 +57,10 @@ def key_participatory_space_slug end def link_attributes_for_voting(election, voter_verified, modal_id) - if election.verification_types.empty? + if election.verification_types.empty? && current_user {} elsif (election.internal_census? && !voter_verified) || !current_user - { data: { open: modal_id }, "aria-controls" => modal_id, "aria-haspopup" => "dialog", tabindex: "0" } + { data: { "dialog-open": modal_id }, "aria-controls" => modal_id, "aria-haspopup" => "dialog", tabindex: "0" } else { is_verified: voter_verified } end diff --git a/app/cells/decidim/vocdoni/remaining_time_callout/show.erb b/app/cells/decidim/vocdoni/remaining_time_callout/show.erb index a34250d0..c99d3cb7 100644 --- a/app/cells/decidim/vocdoni/remaining_time_callout/show.erb +++ b/app/cells/decidim/vocdoni/remaining_time_callout/show.erb @@ -1,5 +1,3 @@ <% if needs_to_show_remaining_time? %> -+ <%= icon "checkbox-multiple-line" %> - <%= link_to t("verify.verify_here", scope: "decidim.vocdoni.elections.show"), election_vote_verify_path, target: "_blank", rel: "noopener noreferrer" %> -<% else %> - <%= t("verify.will_verify", scope: "decidim.vocdoni.elections.show") %> -<% end %> -+ <% if election.started? %> + <%= link_to t("verify.verify_here", scope: "decidim.vocdoni.elections.show"), election_vote_verify_path, target: "_blank", rel: "noopener noreferrer" %> + <% else %> + <%= t("verify.will_verify", scope: "decidim.vocdoni.elections.show") %> + <% end %> +- <%= remaining_time %> -+ <%= cell("decidim/announcement", remaining_time) %> <% end %> diff --git a/app/cells/decidim/vocdoni/voting_step_navigation/show.erb b/app/cells/decidim/vocdoni/voting_step_navigation/show.erb index d98c186d..49932e54 100644 --- a/app/cells/decidim/vocdoni/voting_step_navigation/show.erb +++ b/app/cells/decidim/vocdoni/voting_step_navigation/show.erb @@ -1,29 +1,26 @@ --- <% if first_step? %> - - <% else %> - <%= link_to( - icon("chevron-left", class: "icon", role: "img", "aria-hidden": true) + " " + t("decidim.vocdoni.votes.voting_step.back"), - "#", - class: "focus__back", - data: { - toggle: [previous_step_dom_id, current_step_dom_id].join(" ") - } - ) %> - <% end %> - - - <%= button_continue_text %> - - +<%= append_javascript_pack_tag "decidim_vocdoni_voter_new_vote" %> +diff --git a/app/cells/decidim/vocdoni/voting_step_navigation_cell.rb b/app/cells/decidim/vocdoni/voting_step_navigation_cell.rb index 7aa513af..9c6dbcc1 100644 --- a/app/cells/decidim/vocdoni/voting_step_navigation_cell.rb +++ b/app/cells/decidim/vocdoni/voting_step_navigation_cell.rb @@ -23,7 +23,7 @@ def total_steps end def button_continue_text - "#{t("decidim.vocdoni.votes.voting_step.continue")} #{icon("chevron-right", class: "icon", role: "img", "aria-hidden": true)}" + "#{t("decidim.vocdoni.votes.voting_step.continue")} #{icon("arrow-right-line", class: "icon", role: "img", "aria-hidden": true)}" end def previous_step_dom_id diff --git a/app/commands/decidim/vocdoni/admin/create_wallet.rb b/app/commands/decidim/vocdoni/admin/create_wallet.rb index c109a94d..10d4d39f 100644 --- a/app/commands/decidim/vocdoni/admin/create_wallet.rb +++ b/app/commands/decidim/vocdoni/admin/create_wallet.rb @@ -36,8 +36,8 @@ def private_key def create_wallet! attributes = { - organization: organization, - private_key: private_key + organization:, + private_key: } @wallet = Decidim.traceability.create!( diff --git a/app/commands/decidim/vocdoni/admin/update_election_calendar.rb b/app/commands/decidim/vocdoni/admin/update_election_calendar.rb index 6a8e51f9..521d324f 100644 --- a/app/commands/decidim/vocdoni/admin/update_election_calendar.rb +++ b/app/commands/decidim/vocdoni/admin/update_election_calendar.rb @@ -33,7 +33,7 @@ def call def update_election! attributes = { - start_time: start_time, + start_time:, end_time: form.end_time }.merge(election_type_attributes) diff --git a/app/controllers/concerns/decidim/vocdoni/content_security_policy.rb b/app/controllers/concerns/decidim/vocdoni/content_security_policy.rb new file mode 100644 index 00000000..2c97f759 --- /dev/null +++ b/app/controllers/concerns/decidim/vocdoni/content_security_policy.rb @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +module Decidim + module Vocdoni + module ContentSecurityPolicy + extend ActiveSupport::Concern + + included do + after_action :append_vocdoni_csp_directives_for_env + end + + def append_vocdoni_csp_directives_for_env + vocdoni_api_url = Decidim::Vocdoni.api_endpoint_url + vocdoni_api_domain = extract_domain(vocdoni_api_url) + + content_security_policy.append_csp_directive("connect-src", vocdoni_api_domain) + end + + private + + def extract_domain(url) + uri = URI.parse(url) + "#{uri.scheme}://#{uri.host}" + end + end + end +end diff --git a/app/controllers/concerns/decidim/vocdoni/has_vote_flow.rb b/app/controllers/concerns/decidim/vocdoni/has_vote_flow.rb index e3f8e069..67cfd125 100644 --- a/app/controllers/concerns/decidim/vocdoni/has_vote_flow.rb +++ b/app/controllers/concerns/decidim/vocdoni/has_vote_flow.rb @@ -17,11 +17,11 @@ def preview_mode? end def can_preview? - @can_preview ||= allowed_to?(:preview, :election, election: election) + @can_preview ||= allowed_to?(:preview, :election, election:) end def can_vote? - @can_vote ||= allowed_to?(:vote, :election, election: election) + @can_vote ||= allowed_to?(:vote, :election, election:) end def ballot_questions diff --git a/app/controllers/concerns/decidim/vocdoni/orderable.rb b/app/controllers/concerns/decidim/vocdoni/orderable.rb new file mode 100644 index 00000000..35713c0c --- /dev/null +++ b/app/controllers/concerns/decidim/vocdoni/orderable.rb @@ -0,0 +1,36 @@ +# frozen_string_literal: true + +require "active_support/concern" + +module Decidim + module Vocdoni + # Common logic to sorting resources + module Orderable + extend ActiveSupport::Concern + + included do + include Decidim::Orderable + + private + + # Available orders based on enabled settings + def available_orders + @available_orders ||= %w(recent older) + end + + def default_order + "recent" + end + + def reorder(elections) + case order + when "recent" + elections.order(start_time: :desc) + else + elections.order(start_time: :asc) + end + end + end + end + end +end diff --git a/app/controllers/decidim/vocdoni/admin/answers_controller.rb b/app/controllers/decidim/vocdoni/admin/answers_controller.rb index 863bbc88..248169f1 100644 --- a/app/controllers/decidim/vocdoni/admin/answers_controller.rb +++ b/app/controllers/decidim/vocdoni/admin/answers_controller.rb @@ -5,20 +5,24 @@ module Vocdoni module Admin # This controller allows the create or update answers for a question. class AnswersController < Admin::ApplicationController - include Decidim::Proposals::Admin::Picker helper Decidim::ApplicationHelper helper_method :election, :question, :answers, :answer def index; end def new - enforce_permission_to :update, :answer, election: election, question: question + enforce_permission_to(:update, :answer, election:, question:) @form = form(AnswerForm).instance end + def edit + enforce_permission_to(:update, :answer, election:, question:) + @form = form(AnswerForm).from_model(answer) + end + def create - enforce_permission_to :update, :answer, election: election, question: question - @form = form(AnswerForm).from_params(params, election: election, question: question) + enforce_permission_to(:update, :answer, election:, question:) + @form = form(AnswerForm).from_params(params, election:, question:) CreateAnswer.call(@form) do on(:ok) do @@ -33,14 +37,9 @@ def create end end - def edit - enforce_permission_to :update, :answer, election: election, question: question - @form = form(AnswerForm).from_model(answer) - end - def update - enforce_permission_to :update, :answer, election: election, question: question - @form = form(AnswerForm).from_params(params, election: election, question: question) + enforce_permission_to(:update, :answer, election:, question:) + @form = form(AnswerForm).from_params(params, election:, question:) UpdateAnswer.call(@form, answer) do on(:ok) do @@ -56,7 +55,7 @@ def update end def destroy - enforce_permission_to :update, :answer, election: election, question: question + enforce_permission_to(:update, :answer, election:, question:) DestroyAnswer.call(answer, current_user) do on(:ok) do diff --git a/app/controllers/decidim/vocdoni/admin/application_controller.rb b/app/controllers/decidim/vocdoni/admin/application_controller.rb index f1b2e76f..f53ad23b 100644 --- a/app/controllers/decidim/vocdoni/admin/application_controller.rb +++ b/app/controllers/decidim/vocdoni/admin/application_controller.rb @@ -9,6 +9,8 @@ module Admin # Note that it inherits from `Decidim::Admin::Components::BaseController`, which # override its layout and provide all kinds of useful methods. class ApplicationController < Decidim::Admin::Components::BaseController + include Decidim::Vocdoni::ContentSecurityPolicy + helper Decidim::Vocdoni::Admin::StepsWizardHelper def permission_class_chain diff --git a/app/controllers/decidim/vocdoni/admin/census_controller.rb b/app/controllers/decidim/vocdoni/admin/census_controller.rb index c9b35760..87b2f5f9 100644 --- a/app/controllers/decidim/vocdoni/admin/census_controller.rb +++ b/app/controllers/decidim/vocdoni/admin/census_controller.rb @@ -4,10 +4,10 @@ module Decidim module Vocdoni module Admin class CensusController < Admin::ApplicationController - helper_method :elections, :election, :status + helper_method :elections, :election, :census_path, :status, :census_type def index - enforce_permission_to :index, :census, election: election + enforce_permission_to(:index, :census, election:) return render json: status.to_json if request.xhr? @@ -16,7 +16,7 @@ def index end def create - enforce_permission_to :create, :census, election: election + enforce_permission_to(:create, :census, election:) if params[:census_permissions] handle_census_permissions @@ -26,7 +26,7 @@ def create end def destroy_all - enforce_permission_to :destroy, :census, election: election + enforce_permission_to(:destroy, :census, election:) Voter.clear(election) redirect_to election_census_path(election), notice: t(".success") @@ -88,7 +88,7 @@ def success_message_for(form, error_method: nil) 0 end error_count = error_method && data.respond_to?(error_method) ? data.send(error_method).size : 0 - t(".success.import", count: count, errors: error_count) + t(".success.import", count:, errors: error_count) else t(".success.generate") end diff --git a/app/controllers/decidim/vocdoni/admin/election_calendar_controller.rb b/app/controllers/decidim/vocdoni/admin/election_calendar_controller.rb index afe826aa..ac2b0c5a 100644 --- a/app/controllers/decidim/vocdoni/admin/election_calendar_controller.rb +++ b/app/controllers/decidim/vocdoni/admin/election_calendar_controller.rb @@ -7,13 +7,13 @@ class ElectionCalendarController < Admin::ApplicationController helper_method :election def edit - enforce_permission_to :update, :election_calendar, election: election + enforce_permission_to(:update, :election_calendar, election:) @election_calendar_form = ElectionCalendarForm.from_model(election) end def update - enforce_permission_to :update, :election_calendar, election: election + enforce_permission_to(:update, :election_calendar, election:) @election_calendar_form = ElectionCalendarForm.from_params(params) @election_calendar_form.secret_until_the_end = params[:result_type] == "after_voting" diff --git a/app/controllers/decidim/vocdoni/admin/elections_controller.rb b/app/controllers/decidim/vocdoni/admin/elections_controller.rb index d2ab5e86..cb1b57c1 100644 --- a/app/controllers/decidim/vocdoni/admin/elections_controller.rb +++ b/app/controllers/decidim/vocdoni/admin/elections_controller.rb @@ -11,14 +11,29 @@ def index # flash.now[:alert] ||= I18n.t("elections.index.no_bulletin_board", scope: "decidim.vocdoni.admin").html_safe unless Decidim::Elections.bulletin_board.configured? end + # returns useful information about the election in JSON format + # this makes a call to the Vocdoni API so best to use it asynchronically + def show + enforce_permission_to(:read, :election, election:) + + info = Sdk.new(current_organization).info + info.merge!(vocdoniElectionId: election.vocdoni_election_id) + render json: info + end + def new enforce_permission_to :create, :election @form = form(ElectionForm).instance end + def edit + enforce_permission_to(:update, :election, election:) + @form = form(ElectionForm).from_model(election) + end + def create enforce_permission_to :create, :election - @form = form(ElectionForm).from_params(params, current_component: current_component) + @form = form(ElectionForm).from_params(params, current_component:) CreateElection.call(@form) do on(:ok) do @@ -33,24 +48,9 @@ def create end end - # returns useful information about the election in JSON format - # this makes a call to the Vocdoni API so best to use it asynchronically - def show - enforce_permission_to :read, :election, election: election - - info = Sdk.new(current_organization).info - info.merge!(vocdoniElectionId: election.vocdoni_election_id) - render json: info - end - - def edit - enforce_permission_to :update, :election, election: election - @form = form(ElectionForm).from_model(election) - end - def update - enforce_permission_to :update, :election, election: election - @form = form(ElectionForm).from_params(params, current_component: current_component) + enforce_permission_to(:update, :election, election:) + @form = form(ElectionForm).from_params(params, current_component:) UpdateElection.call(@form, election) do on(:ok) do @@ -66,7 +66,7 @@ def update end def destroy - enforce_permission_to :delete, :election, election: election + enforce_permission_to(:delete, :election, election:) DestroyElection.call(election, current_user) do on(:ok) do @@ -82,11 +82,11 @@ def destroy end def publish_page - enforce_permission_to :publish, :election, election: election + enforce_permission_to :publish, :election, election: end def publish - enforce_permission_to :publish, :election, election: election + enforce_permission_to(:publish, :election, election:) PublishElection.call(election, current_user) do on(:ok) do @@ -97,7 +97,7 @@ def publish end def unpublish - enforce_permission_to :unpublish, :election, election: election + enforce_permission_to(:unpublish, :election, election:) UnpublishElection.call(election, current_user) do on(:ok) do @@ -108,7 +108,7 @@ def unpublish end def credits - enforce_permission_to :read, :election, election: election + enforce_permission_to(:read, :election, election:) SdkRunnerJob.perform_later(organization_id: current_organization.id, command: :collectFaucetTokens) flash[:notice] = I18n.t("admin.elections.credits.success", scope: "decidim.vocdoni") diff --git a/app/controllers/decidim/vocdoni/admin/questions_controller.rb b/app/controllers/decidim/vocdoni/admin/questions_controller.rb index b3740523..b3dc1d01 100644 --- a/app/controllers/decidim/vocdoni/admin/questions_controller.rb +++ b/app/controllers/decidim/vocdoni/admin/questions_controller.rb @@ -8,13 +8,18 @@ class QuestionsController < Admin::ApplicationController helper_method :election, :questions, :question def new - enforce_permission_to :create, :question, election: election + enforce_permission_to(:create, :question, election:) @form = form(QuestionForm).instance end + def edit + enforce_permission_to(:update, :question, election:, question:) + @form = form(QuestionForm).from_model(question) + end + def create - enforce_permission_to :create, :question, election: election - @form = form(QuestionForm).from_params(params, election: election) + enforce_permission_to(:create, :question, election:) + @form = form(QuestionForm).from_params(params, election:) CreateQuestion.call(@form) do on(:ok) do @@ -34,14 +39,9 @@ def create end end - def edit - enforce_permission_to :update, :question, election: election, question: question - @form = form(QuestionForm).from_model(question) - end - def update - enforce_permission_to :update, :question, election: election, question: question - @form = form(QuestionForm).from_params(params, election: election) + enforce_permission_to(:update, :question, election:, question:) + @form = form(QuestionForm).from_params(params, election:) UpdateQuestion.call(@form, question) do on(:ok) do @@ -57,7 +57,7 @@ def update end def destroy - enforce_permission_to :update, :question, election: election, question: question + enforce_permission_to(:update, :question, election:, question:) DestroyQuestion.call(question, current_user) do on(:ok) do diff --git a/app/controllers/decidim/vocdoni/admin/steps_controller.rb b/app/controllers/decidim/vocdoni/admin/steps_controller.rb index 8100b192..8b47ff41 100644 --- a/app/controllers/decidim/vocdoni/admin/steps_controller.rb +++ b/app/controllers/decidim/vocdoni/admin/steps_controller.rb @@ -12,15 +12,15 @@ class StepsController < Admin::ApplicationController before_action :ensure_wallet_created def index - enforce_permission_to :read, :steps, election: election + enforce_permission_to(:read, :steps, election:) if current_step_form_class - @form = form(current_step_form_class).from_params({ status: election.status }, election: election) + @form = form(current_step_form_class).from_params({ status: election.status }, election:) @form.valid? end end def show - enforce_permission_to :read, :steps, election: election + enforce_permission_to(:read, :steps, election:) respond_to do |format| format.html { render partial: "decidim/vocdoni/admin/steps/results_stats" } @@ -32,8 +32,8 @@ def show end def update - enforce_permission_to :update, :steps, election: election - @form = form(current_step_form_class).from_params(params, election: election) + enforce_permission_to(:update, :steps, election:) + @form = form(current_step_form_class).from_params(params, election:) current_step_command_class.call(@form) do on(:ok) do @@ -44,7 +44,7 @@ def update flash.now[:alert] = message || I18n.t("steps.#{current_step}.invalid", scope: "decidim.vocdoni.admin") end on(:status) do |status| - flash[:alert] = I18n.t("steps.invalid_status", scope: "decidim.vocdoni.admin", status: status) + flash[:alert] = I18n.t("steps.invalid_status", scope: "decidim.vocdoni.admin", status:) return redirect_to election_steps_path(election) end end @@ -52,7 +52,7 @@ def update end def update_census - enforce_permission_to :update, :steps, election: election + enforce_permission_to(:update, :steps, election:) return unless election.internal_census? @@ -73,7 +73,7 @@ def census_data update_message: success_message } - render json: { info: info }, status: info ? :ok : :unprocessable_entity + render json: { info: }, status: info ? :ok : :unprocessable_entity end private diff --git a/app/controllers/decidim/vocdoni/application_controller.rb b/app/controllers/decidim/vocdoni/application_controller.rb index 1bea62ba..d97ec26c 100644 --- a/app/controllers/decidim/vocdoni/application_controller.rb +++ b/app/controllers/decidim/vocdoni/application_controller.rb @@ -8,6 +8,7 @@ module Vocdoni # Note that it inherits from `Decidim::Components::BaseController`, which # override its layout and provide all kinds of useful methods. class ApplicationController < Decidim::Components::BaseController + include Decidim::Vocdoni::ContentSecurityPolicy end end end diff --git a/app/controllers/decidim/vocdoni/elections_controller.rb b/app/controllers/decidim/vocdoni/elections_controller.rb index 1733d63a..7d4ce3b0 100644 --- a/app/controllers/decidim/vocdoni/elections_controller.rb +++ b/app/controllers/decidim/vocdoni/elections_controller.rb @@ -5,15 +5,18 @@ module Vocdoni # Exposes the elections resources so users can participate on them class ElectionsController < Decidim::Vocdoni::ApplicationController include Decidim::Vocdoni::HasVoteFlow + include Decidim::Vocdoni::Orderable + include FilterResource + include Paginable - helper_method :elections, :election, :single? + helper_method :elections, :election, :single?, :paginated_elections, :scheduled_elections def index redirect_to election_path(single, single: true) if single? end def show - enforce_permission_to :view, :election, election: election + enforce_permission_to(:view, :election, election:) @election_data = election_metadata @@ -28,7 +31,7 @@ def show private def elections - @elections ||= Decidim::Vocdoni::Election.where(component: current_component).published + @elections ||= search_collection end def election @@ -57,6 +60,36 @@ def single? def single elections.first if single? end + + def paginated_elections + @paginated_elections ||= reorder(search.result.published) + @paginated_elections = paginate(@paginated_elections) + end + + def scheduled_elections + @scheduled_elections ||= search_with(filter_params.merge(with_any_date: %w(active upcoming))).result + end + + def search_collection + Election.where(component: current_component).published + end + + def default_filter_params + { + search_text_cont: "", + with_any_date: default_filter_date_params + } + end + + def default_filter_date_params + if elections.active.any? + %w(active) + elsif elections.upcoming.any? + %w(upcoming) + else + %w() + end + end end end end diff --git a/app/controllers/decidim/vocdoni/votes_controller.rb b/app/controllers/decidim/vocdoni/votes_controller.rb index f4617b62..ffc64595 100644 --- a/app/controllers/decidim/vocdoni/votes_controller.rb +++ b/app/controllers/decidim/vocdoni/votes_controller.rb @@ -15,20 +15,22 @@ class VotesController < Decidim::Vocdoni::ApplicationController delegate :count, to: :questions, prefix: true + def show + enforce_permission_to :view, :election, election: + end + def new return unless vote_allowed? - @form = form(LoginForm).instance - end + session[:current_step] = params[:step_index].to_i - def show - enforce_permission_to :view, :election, election: election + @form = form(LoginForm).instance end def votes_left votes_left = params[:votesLeft] message = helpers.votes_left_message(votes_left.to_i) - render json: { message: message } + render json: { message: } end def check_verification @@ -42,7 +44,7 @@ def election_unique_id end def exit_path - @exit_path ||= if allowed_to? :view, :election, election: election + @exit_path ||= if allowed_to?(:view, :election, election:) election_path(election) else elections_path @@ -74,7 +76,7 @@ def vote_allowed? return false end - enforce_permission_to :vote, :election, election: election + enforce_permission_to(:vote, :election, election:) true end diff --git a/app/helpers/decidim/vocdoni/admin/steps_helper.rb b/app/helpers/decidim/vocdoni/admin/steps_helper.rb index c94f042f..2a9ede8f 100644 --- a/app/helpers/decidim/vocdoni/admin/steps_helper.rb +++ b/app/helpers/decidim/vocdoni/admin/steps_helper.rb @@ -20,7 +20,7 @@ def steps(current_step) end def fix_it_button_with_icon(link, icon) - link_to link, class: "button tiny" do + link_to link, class: "button button__xs button__secondary" do "#{icon(icon)} #{I18n.t("decidim.vocdoni.admin.steps.create_election.errors.fix_it_text")}".html_safe end end @@ -28,16 +28,16 @@ def fix_it_button_with_icon(link, icon) def danger_zone_submit(form, action) ico, button_class = case action when "created" - ["media-play", "primary"] + %w(play-circle-line button__secondary) when "vote" - ["media-play", "success"] + %w(play-circle-line button__success) when "paused" - ["media-pause", "warning"] + %w(pause-circle-line button__warning) end text = t(action, scope: "decidim.vocdoni.admin.steps.danger_zone.action") text = "#{icon(ico, class: "icon--before")} #{text}".html_safe - form.submit text, class: "button #{button_class}", + form.submit text, class: "button button__sm #{button_class}", data: { confirm: t("confirm", scope: "decidim.vocdoni.admin.steps.danger_zone") } end diff --git a/app/helpers/decidim/vocdoni/admin/steps_wizard_helper.rb b/app/helpers/decidim/vocdoni/admin/steps_wizard_helper.rb index c5e3affb..e307543a 100644 --- a/app/helpers/decidim/vocdoni/admin/steps_wizard_helper.rb +++ b/app/helpers/decidim/vocdoni/admin/steps_wizard_helper.rb @@ -24,7 +24,7 @@ def tab_link_class(tab_name, election) end def question_with_link(question, election) - link = link_to("\"#{translated_attribute(question&.title)}\"", edit_election_question_path(election, question)) + link = link_to("\"#{translated_attribute(question&.title)}\"", edit_election_question_path(election, question), class: "contents") t("for_question_html", question: link, scope: "decidim.vocdoni.admin.answers.index") end diff --git a/app/helpers/decidim/vocdoni/application_helper.rb b/app/helpers/decidim/vocdoni/application_helper.rb index c049cb3a..6c06cc60 100644 --- a/app/helpers/decidim/vocdoni/application_helper.rb +++ b/app/helpers/decidim/vocdoni/application_helper.rb @@ -5,6 +5,29 @@ module Vocdoni # Custom helpers, scoped to the vocdoni engine. # module ApplicationHelper + include Decidim::CheckBoxesTreeHelper + + def date_filter_values + TreeNode.new( + TreePoint.new("", t("elections.elections.filters.all", scope: "decidim.vocdoni")), + [ + TreePoint.new("active", t("elections.elections.filters.active", scope: "decidim.vocdoni")), + TreePoint.new("upcoming", t("elections.elections.filters.upcoming", scope: "decidim.vocdoni")), + TreePoint.new("finished", t("elections.elections.filters.finished", scope: "decidim.vocdoni")) + ] + ) + end + + def filter_sections + @filter_sections ||= [{ method: :with_any_date, + collection: date_filter_values, + label_scope: "decidim.vocdoni.elections.elections.filters", + id: "date" }] + end + + def component_name + (defined?(current_component) && translated_attribute(current_component&.name).presence) || t("decidim.components.vocdoni.name") + end end end end diff --git a/app/helpers/decidim/vocdoni/votes_helper.rb b/app/helpers/decidim/vocdoni/votes_helper.rb index a4ab251b..da8be917 100644 --- a/app/helpers/decidim/vocdoni/votes_helper.rb +++ b/app/helpers/decidim/vocdoni/votes_helper.rb @@ -28,12 +28,12 @@ def votes_left_message(votes_left) %w(no_more_votes_left alert) end - content_tag :div, t(message_key, scope: scope, votes_left: votes_left), class: "callout #{css_class} js-already_voted" + content_tag :div, t(message_key, scope:, votes_left:), class: "callout #{css_class} js-already_voted" end def identification_title(election) title = election.internal_census? ? "title" : "login_title" - content_tag(:h1, t("decidim.vocdoni.votes.check_census.#{title}"), class: "heading2").html_safe + content_tag(:h2, t("decidim.vocdoni.votes.check_census.#{title}"), class: "h2").html_safe end def identification_description(election) diff --git a/app/models/concerns/decidim/vocdoni/vocdoni_api_utils.rb b/app/models/concerns/decidim/vocdoni/vocdoni_api_utils.rb index a568f496..10200428 100644 --- a/app/models/concerns/decidim/vocdoni/vocdoni_api_utils.rb +++ b/app/models/concerns/decidim/vocdoni/vocdoni_api_utils.rb @@ -15,7 +15,7 @@ def transform_locales(translations) values = {} organization.available_locales.each do |locale| locale = locale.to_s - values[locale] = translated(translations, locale: locale).to_s + values[locale] = translated(translations, locale:).to_s values["default"] = values[locale] if organization.default_locale.to_s == locale end values diff --git a/app/models/decidim/vocdoni/answer.rb b/app/models/decidim/vocdoni/answer.rb index d304bd8a..cfedab17 100644 --- a/app/models/decidim/vocdoni/answer.rb +++ b/app/models/decidim/vocdoni/answer.rb @@ -12,7 +12,7 @@ class Answer < ApplicationRecord delegate :organization, :participatory_space, to: :component - belongs_to :question, foreign_key: "decidim_vocdoni_question_id", class_name: "Decidim::Vocdoni::Question", inverse_of: :answers + belongs_to :question, foreign_key: "decidim_vocdoni_question_id", class_name: "Decidim::Vocdoni::Question", inverse_of: :answers, counter_cache: true has_one :election, through: :question, foreign_key: "decidim_vocdoni_election_id", class_name: "Decidim::Vocdoni::Election" has_one :component, through: :election, foreign_key: "decidim_component_id", class_name: "Decidim::Component" diff --git a/app/models/decidim/vocdoni/csv_census/status.rb b/app/models/decidim/vocdoni/csv_census/status.rb index 2663bf05..84880e98 100644 --- a/app/models/decidim/vocdoni/csv_census/status.rb +++ b/app/models/decidim/vocdoni/csv_census/status.rb @@ -29,11 +29,11 @@ def percentage_complete def to_json(*_args) { - name: name, + name:, electionId: @election.id, - count: count, + count:, percentageComplete: percentage_complete, - percentageText: I18n.t("status.percentage_complete", scope: "decidim.vocdoni.admin.census", count: count, percentage: percentage_complete), + percentageText: I18n.t("status.percentage_complete", scope: "decidim.vocdoni.admin.census", count:, percentage: percentage_complete), lastImportAt: last_import_at, pendingUpload: pending_upload?, pendingGeneration: pending_generation?, diff --git a/app/models/decidim/vocdoni/election.rb b/app/models/decidim/vocdoni/election.rb index 893f5bc8..d3bdfb4b 100644 --- a/app/models/decidim/vocdoni/election.rb +++ b/app/models/decidim/vocdoni/election.rb @@ -2,6 +2,7 @@ module Decidim::Vocdoni class Election < ApplicationRecord + include Decidim::FilterableResource include Decidim::HasAttachments include Decidim::HasAttachmentCollections include Decidim::Resourceable @@ -18,6 +19,23 @@ class Election < ApplicationRecord has_many :questions, foreign_key: "decidim_vocdoni_election_id", class_name: "Decidim::Vocdoni::Question", inverse_of: :election, dependent: :destroy has_many :voters, foreign_key: "decidim_vocdoni_election_id", class_name: "Decidim::Vocdoni::Voter", inverse_of: :election, dependent: :destroy + scope :active, lambda { + where("start_time <= ?", Time.current) + .where("end_time >= ?", Time.current) + } + + scope :upcoming, lambda { + where("start_time > ?", Time.current) + .where("end_time > ?", Time.current) + } + + scope :finished, lambda { + where("start_time < ?", Time.current) + .where("end_time < ?", Time.current) + } + + scope_search_multi :with_any_date, [:active, :upcoming, :finished] + translatable_fields :title, :description def self.log_presenter_class_for(_log) @@ -227,5 +245,13 @@ def questions_to_vocdoni def technical_voter_email "technical_voter_election_#{id}@techvoters.example.com" end + + # Create i18n ransackers for :title and :description. + # Create the :search_text ransacker alias for searching from both of these. + ransacker_i18n_multi :search_text, [:title, :description] + + def self.ransackable_scopes(_auth_object = nil) + [:with_any_date] + end end end diff --git a/app/models/decidim/vocdoni/voter.rb b/app/models/decidim/vocdoni/voter.rb index 247d028a..5aa32366 100644 --- a/app/models/decidim/vocdoni/voter.rb +++ b/app/models/decidim/vocdoni/voter.rb @@ -13,18 +13,18 @@ class Voter < ApplicationRecord after_save :update_in_vocdoni_census!, if: :saved_change_to_wallet_address? def self.inside(election) - where(election: election) + where(election:) end def self.search_user_email(election, email) inside(election) - .where(email: email) + .where(email:) .order(created_at: :desc, id: :desc) .first end def self.insert_all(election, values) - values.each { |value| create(email: value.first.downcase, election: election, token: value.second.downcase) } + values.each { |value| create(email: value.first.downcase, election:, token: value.second.downcase) } end def self.clear(election) diff --git a/app/packs/entrypoints/admin/decidim_vocdoni_admin.js b/app/packs/entrypoints/admin/decidim_vocdoni_admin.js index 40381013..3a0da038 100644 --- a/app/packs/entrypoints/admin/decidim_vocdoni_admin.js +++ b/app/packs/entrypoints/admin/decidim_vocdoni_admin.js @@ -1,12 +1,8 @@ -import "src/decidim/vocdoni/admin/generate_credentials" -import "src/decidim/vocdoni/admin/election_calendar" -import "src/decidim/vocdoni/admin/census" +// DO NOT include any javascript file here, but inside the following file instead +import "src/decidim/vocdoni/vocdoni_admin"; -import "src/decidim/vocdoni/admin/steps/election_status" -import "src/decidim/vocdoni/admin/steps/vote" -import "src/decidim/vocdoni/admin/steps/results" -import "src/decidim/vocdoni/admin/steps/update_census" -import "src/decidim/clipboard" +// CSS +import "entrypoints/admin/decidim_vocdoni_admin.scss"; // Images require.context("../../images", true) diff --git a/app/packs/entrypoints/admin/decidim_vocdoni_admin.scss b/app/packs/entrypoints/admin/decidim_vocdoni_admin.scss new file mode 100644 index 00000000..3847be23 --- /dev/null +++ b/app/packs/entrypoints/admin/decidim_vocdoni_admin.scss @@ -0,0 +1 @@ +@import "stylesheets/decidim/vocdoni/vocdoni_admin"; diff --git a/app/packs/entrypoints/admin/decidim_vocdoni_admin_stylesheet.js b/app/packs/entrypoints/admin/decidim_vocdoni_admin_stylesheet.js deleted file mode 100644 index 20e0300e..00000000 --- a/app/packs/entrypoints/admin/decidim_vocdoni_admin_stylesheet.js +++ /dev/null @@ -1,2 +0,0 @@ -import "stylesheets/decidim/vocdoni/admin/vocdoni.scss"; -import "stylesheets/decidim/vocdoni/admin/elections_tabs.scss"; diff --git a/app/packs/entrypoints/decidim_vocdoni.scss b/app/packs/entrypoints/decidim_vocdoni.scss new file mode 100644 index 00000000..b1fe8bca --- /dev/null +++ b/app/packs/entrypoints/decidim_vocdoni.scss @@ -0,0 +1 @@ +@import "stylesheets/decidim/vocdoni/vocdoni_application"; diff --git a/app/packs/entrypoints/decidim_vocdoni_elections.js b/app/packs/entrypoints/decidim_vocdoni_elections.js new file mode 100644 index 00000000..dd6747d5 --- /dev/null +++ b/app/packs/entrypoints/decidim_vocdoni_elections.js @@ -0,0 +1,2 @@ +// CSS +import "entrypoints/decidim_vocdoni_elections.scss"; diff --git a/app/packs/entrypoints/decidim_vocdoni_elections.scss b/app/packs/entrypoints/decidim_vocdoni_elections.scss new file mode 100644 index 00000000..e9bae1bd --- /dev/null +++ b/app/packs/entrypoints/decidim_vocdoni_elections.scss @@ -0,0 +1 @@ +@import "stylesheets/decidim/vocdoni/elections/elections"; diff --git a/app/packs/src/decidim/vocdoni/admin/steps/results.js b/app/packs/src/decidim/vocdoni/admin/steps/results.js index 6fb46ee9..fb50aab2 100644 --- a/app/packs/src/decidim/vocdoni/admin/steps/results.js +++ b/app/packs/src/decidim/vocdoni/admin/steps/results.js @@ -1,4 +1,3 @@ - const RESULTS_SPAN_SELECTOR = ".js-votes-results"; export const getElectionResults = async () => { @@ -16,8 +15,7 @@ const checkResultsElection = async (resultsSpan) => { // Activates accordion again $(resultsSpan).foundation(); resultsSpan.classList.remove("spinner-container") - } - else { + } else { // Try again in a few seconds setTimeout(() => { checkResultsElection(resultsSpan); @@ -26,6 +24,37 @@ const checkResultsElection = async (resultsSpan) => { }; document.addEventListener("DOMContentLoaded", () => { + document.querySelectorAll(".vocdoni__accordion-trigger").forEach((trigger) => { + const isOpen = trigger.getAttribute("data-open") === "true"; + trigger.querySelector(".arrow-down").style.display = isOpen + ? "none" + : "inline"; + trigger.querySelector(".arrow-up").style.display = isOpen + ? "inline" + : "none"; + }); + + document.querySelectorAll(".vocdoni__accordion-trigger").forEach((trigger) => { + trigger.addEventListener("click", function() { + const panelId = trigger.getAttribute("data-controls"); + const panel = document.getElementById(panelId); + const isOpen = trigger.getAttribute("data-open") === "true"; + + trigger.setAttribute("data-open", !isOpen); + panel.setAttribute("aria-hidden", isOpen); + + trigger.querySelector(".arrow-down").style.display = isOpen + ? "inline" + : "none"; + trigger.querySelector(".arrow-up").style.display = isOpen + ? "none" + : "inline"; + + trigger.classList.toggle("is-open", !isOpen); + panel.classList.toggle("is-hidden", isOpen); + }); + }); + const resultsSpan = document.querySelector(RESULTS_SPAN_SELECTOR); if (resultsSpan) { diff --git a/app/packs/src/decidim/vocdoni/admin/steps/update_census.js b/app/packs/src/decidim/vocdoni/admin/steps/update_census.js index 397f93f1..a977eb26 100644 --- a/app/packs/src/decidim/vocdoni/admin/steps/update_census.js +++ b/app/packs/src/decidim/vocdoni/admin/steps/update_census.js @@ -31,7 +31,7 @@ document.addEventListener("DOMContentLoaded", () => { updateLink = document.createElement("a"); updateLink.href = updateContainer.getAttribute("data-update-url"); updateLink.textContent = window.translations.updateCensusNow; - updateLink.className = "button primary"; + updateLink.className = "button button__sm button__secondary my-2"; updateLink.id = "update-census-link"; updateLink.setAttribute("data-method", "put"); updateLink.setAttribute("rel", "nofollow"); diff --git a/app/packs/src/decidim/vocdoni/vocdoni_admin.js b/app/packs/src/decidim/vocdoni/vocdoni_admin.js new file mode 100644 index 00000000..a46d1b63 --- /dev/null +++ b/app/packs/src/decidim/vocdoni/vocdoni_admin.js @@ -0,0 +1,9 @@ +import "src/decidim/vocdoni/admin/generate_credentials" +import "src/decidim/vocdoni/admin/election_calendar" +import "src/decidim/vocdoni/admin/census" + +import "src/decidim/vocdoni/admin/steps/election_status" +import "src/decidim/vocdoni/admin/steps/vote" +import "src/decidim/vocdoni/admin/steps/results" +import "src/decidim/vocdoni/admin/steps/update_census" +import "src/decidim/clipboard" diff --git a/app/packs/src/decidim/vocdoni/voter/new-vote.js b/app/packs/src/decidim/vocdoni/voter/new-vote.js index e818ed70..bf7fd4a6 100644 --- a/app/packs/src/decidim/vocdoni/voter/new-vote.js +++ b/app/packs/src/decidim/vocdoni/voter/new-vote.js @@ -44,8 +44,8 @@ const mountVoteComponent = async (voteComponent, $voteWrapper, questionsComponen onFinish(voteId, env) { console.log("Vote finished"); console.log("VOTE ID => ", voteId); - $voteWrapper.find("#submitting").addClass("hide"); - $voteWrapper.find("#vote_cast").removeClass("hide"); + $voteWrapper.find("#submitting").addClass("hidden"); + $voteWrapper.find("#vote_cast").removeClass("hidden"); $voteWrapper.find("#vote-receipt").val(voteId); $voteWrapper.find(".verify_ballot").attr("href", `https://${env}.explorer.vote/verify/#/${voteId}`); }, @@ -60,15 +60,15 @@ const mountVoteComponent = async (voteComponent, $voteWrapper, questionsComponen }, onInvalid(message = "Invalid vote") { console.log("Invalid vote"); - $voteWrapper.find("#submitting").addClass("hide"); - $voteWrapper.find("#vote_failed").removeClass("hide"); + $voteWrapper.find("#submitting").addClass("hidden"); + $voteWrapper.find("#vote_failed").removeClass("hidden"); switch (message) { case "No votes left": - $voteWrapper.find("#vote_failed").find("#error-no_votes_left").removeClass("hide"); + $voteWrapper.find("#vote_failed").find("#error-no_votes_left").removeClass("hidden"); break; default: - $voteWrapper.find("#vote_failed").find("#error-unknown").removeClass("hide"); + $voteWrapper.find("#vote_failed").find("#error-unknown").removeClass("hidden"); } } }); @@ -100,12 +100,12 @@ const checkIfElectionIsOpen = async (env, wallet, electionUniqueId) => { // Display error messages const showLoginErrorMessage = () => { console.log("KO -> Wallet is not in census"); - $(".js-login_error").removeClass("hide"); + $(".js-login_error").removeClass("hidden"); }; const showElectionClosedErrorMessage = () => { console.log("Election is not open"); - $(".vote-wrapper").find(".js-election_not_open").removeClass("hide"); + $(".vote-wrapper").find(".js-election_not_open").removeClass("hidden"); }; // Document ready function @@ -174,7 +174,7 @@ $(() => { const hasAlreadyVoted = await client.hasAlreadyVoted(); if (hasAlreadyVoted) { console.log("ALREADY VOTED"); - $("#step-0").find(".js-already_voted").removeClass("hide"); + $("#step-0").find(".js-already_voted").removeClass("hidden"); } console.log("OK!! Wallet is in census"); diff --git a/app/packs/src/decidim/vocdoni/voter/vote_questions.component.js b/app/packs/src/decidim/vocdoni/voter/vote_questions.component.js index fbfc84c6..c7913560 100644 --- a/app/packs/src/decidim/vocdoni/voter/vote_questions.component.js +++ b/app/packs/src/decidim/vocdoni/voter/vote_questions.component.js @@ -24,7 +24,7 @@ export default class VoteQuestionsComponent { init() { this.setCurrentStep(); this.toggleContinueButton(); - this.$confirmButton.addClass("show").removeClass("hide"); + this.$confirmButton.addClass("show").removeClass("hidden"); $(".evote__counter-min").text(this.$answerCounter); this.answerCounter(); this.disableCheckbox(); @@ -39,12 +39,12 @@ export default class VoteQuestionsComponent { toggleContinueButton() { if (this.checkAnswers()) { // next step enabled - this.$continueButton.addClass("show").removeClass("hide") - this.$continueSpan.addClass("hide").removeClass("show") + this.$continueButton.addClass("show").removeClass("hidden") + this.$continueSpan.addClass("hidden").removeClass("show") } else { // next step disabled - this.$continueButton.addClass("hide").removeClass("show") - this.$continueSpan.addClass("show").removeClass("hide") + this.$continueButton.addClass("hidden").removeClass("show") + this.$continueSpan.addClass("show").removeClass("hidden") } } @@ -104,22 +104,22 @@ export default class VoteQuestionsComponent { toggleConfirmAnswers() { $(".answer_input:checked").each((_index, element) => { const confirmedAnswer = $(".evote__confirm").find(`#${element.dataset.answer}`); - $(confirmedAnswer).removeClass("hide") + $(confirmedAnswer).removeClass("hidden") }) $(".answer_input").not(":checked").each((_index, element) => { const confirmedAnswer = $(".evote__confirm").find(`#${element.dataset.answer}`); - $(confirmedAnswer).addClass("hide") + $(confirmedAnswer).addClass("hidden") }) $(".nota_input:checked").each((_index, element) => { const confirmedAnswer = $(".evote__confirm").find(`.${element.dataset.answer}`); - $(confirmedAnswer).removeClass("hide") + $(confirmedAnswer).removeClass("hidden") }) $(".nota_input").not(":checked").each((_index, element) => { const confirmedAnswer = $(".evote__confirm").find(`.${element.dataset.answer}`); - $(confirmedAnswer).addClass("hide") + $(confirmedAnswer).addClass("hidden") }) } } diff --git a/app/packs/stylesheets/decidim/vocdoni/admin/vocdoni.scss b/app/packs/stylesheets/decidim/vocdoni/admin/vocdoni.scss index 922eecce..c2b55522 100644 --- a/app/packs/stylesheets/decidim/vocdoni/admin/vocdoni.scss +++ b/app/packs/stylesheets/decidim/vocdoni/admin/vocdoni.scss @@ -9,12 +9,6 @@ $white: #fff; } } -// Fix for button primary colors with black links in the admin panel -// We should fix this upstream -.button.primary { - color: white; -} - .spinner-container { position: relative; cursor: wait; @@ -26,7 +20,7 @@ $white: #fff; left: 0; width: 100%; height: 100%; - background-color: rgba($white, .8); + @apply bg-white bg-opacity-80; z-index: 1; } @@ -48,3 +42,82 @@ $white: #fff; left: 47%; } } + +.button__alert:not([disabled]) { + @apply bg-alert mx-0.5; + + &:hover { + @apply text-white #{!important}; + + background: linear-gradient(0deg, rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0.3)), rgb(var(--alert-rgb) / var(--tw-bg-opacity)) !important; + } +} + +.button__warning:not([disabled]) { + @apply bg-warning mx-0.5; + + &:hover { + @apply text-white #{!important}; + + background: linear-gradient(0deg, rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0.3)), rgb(var(--warning-rgb) / var(--tw-bg-opacity)) !important; + } +} + +.button__success:not([disabled]) { + @apply bg-success mx-0.5; + + &:hover { + @apply text-white #{!important}; + + background: linear-gradient(0deg, rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0.3)), rgb(var(--success-rgb) / var(--tw-bg-opacity)) !important; + } +} + +a.button__warning, +a.button__success, +button.button__success, +button.button__warning, +a.button__alert { + @apply text-white lg:text-md; + + svg { + @apply lg:w-8 lg:h-8 md:w-6 md:h-6 sm:w-6 sm:h-6; + } +} + +.start-time-field-container input, +.end-time-field-container input { + display: block !important; +} + +.item__edit-form.vocdoni-elections label { + @apply text-md; +} + +.publish-text p { + @apply mb-2 +} + +.wallet-container { + @apply w-full mx-auto py-2; +} +.wallet-input { + @apply rounded-none rounded-s-md block flex-1 min-w-0 w-full text-sm p-2 border-2 text-gray-2 cursor-not-allowed; +} + +button.copy-button { + @apply rounded-none rounded-r-md; +} + +.vocdoni__accordion-trigger { + @apply flex w-full items-center justify-between font-semibold text-secondary ; + + &:hover { + @apply underline; + } + + svg { + @apply w-8 h-8; + fill: currentColor; + } +} diff --git a/app/packs/stylesheets/decidim/vocdoni/elections/elections.scss b/app/packs/stylesheets/decidim/vocdoni/elections/elections.scss new file mode 100644 index 00000000..7ba30504 --- /dev/null +++ b/app/packs/stylesheets/decidim/vocdoni/elections/elections.scss @@ -0,0 +1,168 @@ +.election { + &__section { + &-title { + @apply flex gap-1 items-center; + + svg { + @apply w-6 h-6 text-tertiary fill-current; + } + } + + &-desc { + @apply text-gray-2 my-6; + } + } + + &__accordion { + @apply border-4 border-background rounded px-3 py-2; + + &-trigger { + @apply flex justify-between items-center w-full font-bold text-secondary hover:underline focus:outline-none focus:underline; + + > :last-child { + @apply flex-none; + } + + svg { + @apply w-8 h-8 text-secondary fill-current first:block last:hidden; + } + + &[role="button"][aria-expanded="true"] svg { + @apply first:hidden last:block; + } + } + + &-panel { + @apply border-t border-gray-3 mt-4 pt-4 space-y-4; + + ul { + @apply list-decimal px-4; + } + } + } +} + +.election-question { + @apply block rounded p-4 border-4 border-background flex items-center text-lg text-gray-2 hover:border-tertiary focus:border-tertiary cursor-pointer; + + &[aria-disabled="true"] { + @apply text-gray cursor-not-allowed hover:border-background focus:border-background; + } + + &__counter { + @apply font-semibold text-black text-lg bg-tertiary inline-block; + } + + /* overwrite default accordion styles */ + [id^="step"][aria-hidden="true"] { + @apply hidden; + } + + &__container { + @apply space-y-4 mb-8; + } + + &__intro { + @apply py-8 border-t-2 border-background space-y-4; + } + + &__description { + @apply text-gray-2 text-lg; + } + + &__maxselections { + @apply flex items-center justify-between gap-2 text-gray-2; + } + + &__answer { + @apply flex flex-col items-start gap-4 py-8 text-gray-2 border-t-2 border-background; + + &-option { + @apply flex items-center justify-between w-full text-lg; + } + } + + &__ballot { + @apply flex flex-col items-start gap-2 py-8 border-t-2 border-background text-lg text-gray-2; + } + + &__modal { + &-explanation { + @apply space-y-4; + } + + &-grid { + @apply grid grid-cols-2 gap-4; + } + + img { + @apply aspect-video object-cover h-full w-full; + } + + ul { + @apply list-disc; + } + + li { + @apply ml-4; + } + + a { + @apply text-secondary; + } + } +} + +.results__realtime-label { + table { + @apply min-w-full; + } + + th { + @apply bg-gray-3 px-6 py-3 text-left text-xs font-medium uppercase tracking-wider; + &.w-3\/4 { + width: 75%; + } + &.w-1\/4 { + width: 25%; + } + } + + tbody { + @apply bg-white; + } + + tr { + &:nth-child(odd) { + @apply bg-white; + } + &:nth-child(even) { + @apply bg-gray-5; + } + } + + td { + @apply px-6 py-4 whitespace-nowrap text-sm font-medium; + } +} + +.election__aside-link { + @apply flex items-center gap-2 text-sm; +} + +.election__aside-heading { + font-size: 14px; + line-height: 18px; + font-weight: 600; + text-transform: uppercase; + --tw-text-opacity: 1; + color: rgb(62 76 92 / 1); +} + +.election__aside-link svg { + height: 1rem; + width: 1rem; + flex: none; + fill: currentColor; + color: #6B7280CC; +} diff --git a/app/packs/stylesheets/decidim/vocdoni/focus/_accordion.scss b/app/packs/stylesheets/decidim/vocdoni/focus/_accordion.scss index ef429934..14287f6c 100644 --- a/app/packs/stylesheets/decidim/vocdoni/focus/_accordion.scss +++ b/app/packs/stylesheets/decidim/vocdoni/focus/_accordion.scss @@ -1,18 +1,15 @@ .voc-accordion{ - background: transparent; + @apply bg-transparent; .accordion-title{ - font-size: $global-font-size; - color: inherit; - border: 0; - border-radius: 0; + @apply text-inherit border-0 rounded-none pl-4 flex items-center justify-start; span{ - cursor: move; + @apply cursor-move; } &:focus{ - background: transparent; + @apply bg-transparent; } } @@ -20,17 +17,16 @@ // Override Foundation &:first-child > :first-child, &:last-child:not(.is-active) > .accordion-title{ - border: 0; - border-radius: 0; + @apply border-0 rounded-none; } } .accordion-content{ - border: 0; + @apply border-0 mt-4; .tabs-title > a[aria-selected="true"], .tabs-content{ - background: transparent; + @apply bg-transparent; } } } diff --git a/app/packs/stylesheets/decidim/vocdoni/focus/_evote.scss b/app/packs/stylesheets/decidim/vocdoni/focus/_evote.scss index 92843582..a4146895 100644 --- a/app/packs/stylesheets/decidim/vocdoni/focus/_evote.scss +++ b/app/packs/stylesheets/decidim/vocdoni/focus/_evote.scss @@ -1,6 +1,5 @@ -.vote-wrapper{ - display: flex; - flex-grow: 1; +.vote-wrapper { + @apply flex grow; } .evote{ @@ -9,248 +8,168 @@ padding: 1rem; margin-top: 1rem; + @apply md:p-8 md:mt-8; - @include breakpoint(medium){ - padding: 2rem; - margin-top: 2rem; - } - - .row{ - display: flex; - flex-direction: column; - align-items: center; - text-align: center; + .row { + @apply flex flex-col items-center text-center; } &__grid .row{ - display: block; - text-align: left; + @apply block text-left; } &__content{ margin: 1rem auto; - - @include breakpoint(medium){ - margin: 2rem auto; - } + @apply md:my-8 md:mx-auto w-full; } &__options{ - text-align: left; - margin: 1rem auto; - flex-grow: 1; - - @include breakpoint(medium){ - margin: 2rem auto; - } + @apply text-left my-4 mx-auto grow md:my-8 md:mx-auto; &--boolean{ - @include breakpoint(medium){ - display: flex; - width: 100%; - justify-content: center; - } + @apply md:flex md:w-full md:justify-center; > *{ flex-basis: 200px; - margin-left: 1rem; - margin-right: 1rem; + @apply mx-4; } } } &__card{ - box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .1), 0 1px 2px 0 rgba(0, 0, 0, .06); - padding: 1rem 2rem; - border-radius: .5rem; - background-color: $white; - margin-bottom: 1rem; + @apply shadow-lg p-4 py-8 rounded-lg bg-white mb-4; &.is-disabled{ - background-color: $medium-gray; - cursor: not-allowed; + @apply bg-gray-4 cursor-not-allowed; > *{ - opacity: .5; + @apply opacity-50; } } } &__login{ - width: 20rem; + @apply p-8 bg-white; - @include breakpoint(large){ - width: 30rem; + input[type="text"],{ + @apply mt-0 mb-2; } } &__check{ - cursor: pointer; - display: flex; - align-items: center; - - @include breakpoint(medium){ - font-size: 1.2rem; - } + @apply cursor-pointer flex items-center md:text-lg; input[type="checkbox"], input[type="radio"]{ - position: absolute; - width: 1px; - height: 1px; - padding: 0; + @apply absolute w-px h-px p-0 m-px overflow-hidden border-0; margin: -1px; - overflow: hidden; clip: rect(0, 0, 0, 0); - border: 0; } [aria-disabled="true"]{ - pointer-events: none; + @apply pointer-events-none; } } &__check-label{ - position: relative; - padding-left: 1em; - line-height: 1.4; + @apply relative pl-4 leading-7; input[type="radio"] + &::before{ content: ""; - width: 1em; - height: 1em; - border-radius: 50%; - border: 1px solid; - position: absolute; + @apply absolute w-4 h-4 border border-solid rounded-full; left: -.7em; top: .2em; - color: $secondary; + border-color: rgb(var(--secondary-rgb)); } input[type="radio"]:focus + &::before{ - outline: $checkfocus; - outline-offset: $checkfocus-offset; + outline: 1px dotted rgba(var(--secondary-rgb), 0.5); + outline-offset: .1em; } input[type="radio"]:checked + &::after{ content: ""; - width: .7em; - height: .7em; - border-radius: 50%; - background-color: $secondary; - position: absolute; + @apply absolute w-3 h-3 bg-secondary rounded-full; left: -.55em; top: .35em; } input[type="checkbox"] + &::before{ content: ""; - width: 1em; - height: 1em; - border: 1px solid; - position: absolute; + @apply absolute w-4 h-4 border border-solid; + border-radius: 4px; left: -.7em; top: .2em; - color: $secondary; - border-radius: 3px; + border-color: rgba(var(--secondary-rgb), 1); } input[type="checkbox"]:focus + &::before{ - outline: $checkfocus; - outline-offset: $checkfocus-offset; + outline: 1px dotted rgba(var(--secondary-rgb), 0.5); + outline-offset: .1em; } input[type="checkbox"]:checked + &::before{ - background-color: $secondary; + @apply bg-secondary; } input[type="checkbox"]:checked + &::after{ content: ""; - width: .3em; - height: .6em; - position: absolute; + @apply absolute w-2 h-3; + border-color: theme('colors.white'); + border-style: solid; + border-width: 0 2px 2px 0; left: -.5em; top: .15em; - border-width: 0 2px 2px 0; - border-style: solid; - border-color: $white; - transform-origin: bottom left; - transform: rotate(45deg); + @apply transform rotate-45 origin-bottom-left; } } &__check-extra{ - display: block; - font-size: 60%; - text-transform: uppercase; - letter-spacing: .01em; - font-weight: 600; + @apply block text-sm uppercase tracking-tighter font-semibold; button{ font-size: inherit; text-transform: inherit; - font-family: inherit; + @apply uppercase; } } &__counter{ - position: sticky; - bottom: 2rem; - right: 0; - margin-left: auto; - text-align: right; - line-height: 1.2; - background-color: $medium-gray; - padding: .3rem 1rem; - border-radius: $global-radius; + @apply sticky bottom-8 right-0 ml-auto text-right leading-5 bg-[#adadad] p-1 px-4 rounded-[4px]; } &__counter-num{ - font-size: 1.2em; + @apply text-lg; } &__confirm{ - margin-top: 2rem; - max-width: 40em; - text-align: left; - line-height: 1.2; + @apply mt-8 max-w-5xl text-left leading-5; dt{ - font-weight: 600; + @apply font-semibold; } dd:not(:last-child){ - margin-bottom: 2rem; + @apply mb-8; } } &__confirm-label{ - font-size: 80%; - text-transform: uppercase; - letter-spacing: .01em; - color: var(--primary); + @apply text-xs uppercase tracking-tighter text-[var(--primary)]; } &__edit-answer{ - text-transform: none; - letter-spacing: normal; + @apply normal-case tracking-normal; } &__submitting, &__casting, &__confirming{ - width: 200px; - height: 40px; - display: flex; - margin: 2rem auto; + @apply w-48 h-10 flex mx-auto my-8; } &__dot{ - width: 10px; - height: 10px; - margin: 10px auto; - border-radius: 50px; - background: var(--primary); + @apply w-2.5 h-2.5 mx-auto my-2.5 rounded-full bg-[var(--primary)]; &:nth-child(odd){ animation: dotTop 1s infinite ease-in-out; @@ -294,65 +213,55 @@ } &__poll-id{ - overflow-wrap: anywhere; + @apply break-words; } &__preview{ .accordion-title::before{ - font-size: 1.5rem; - margin-top: -.75rem; - color: $anchor-color; - font-weight: normal; + content: ""; + @apply text-xl mt-[-.75rem] text-[var(--anchor-color)] font-normal; } } &__preview-question{ - border: $border; - font-weight: 600; - - &:not(:first-child){ - border-top: 0; - } + @apply font-semibold border-4 border-background rounded p-4; .label{ - margin-left: .5rem; + @apply ml-2; } } &__preview-result{ - line-height: 1.2; - margin-bottom: 1rem; + @apply leading-5 mb-4; } &__preview-option{ - margin-bottom: -.2rem; - font-size: 1rem; + @apply mb-[-1]; } &__preview-bar{ - display: flex; - align-items: center; + @apply flex items-center; .progress{ - flex-grow: 1; - margin-right: 1rem; + @apply flex-grow mr-4; } } &__preview-label{ - font-size: .8rem; - margin-top: -.2rem; + @apply text-sm mt-[-1]; } &__preview-perc{ - width: 3rem; - text-align: right; - font-weight: bold; + @apply w-12 text-right font-bold; } &__vocdoni-logo { &__wrapper { - margin-top: 4rem; + @apply mt-16; } } + + .census__login-button { + @apply w-full; + } } diff --git a/app/packs/stylesheets/decidim/vocdoni/focus/_focus.scss b/app/packs/stylesheets/decidim/vocdoni/focus/_focus.scss index 7d6005f5..f1aaac97 100644 --- a/app/packs/stylesheets/decidim/vocdoni/focus/_focus.scss +++ b/app/packs/stylesheets/decidim/vocdoni/focus/_focus.scss @@ -1,31 +1,28 @@ .focus{ $top-padding: .5rem; - display: flex; - flex-direction: column; - min-height: 100vh; - background-color: $light-gray; + @apply flex flex-col min-h-screen text-gray-2 bg-gray-5; &__top{ padding: $top-padding 1rem; - background-color: $white; - position: sticky; - top: 0; - z-index: 1; - display: flex; + @apply bg-white sticky top-0 z-10 flex; + + a{ + @apply flex items-center text-md text-secondary; + } } &__top_warning{ - background: $alert; - color: white; - text-align: center; - display: block; - padding: 2px 0; + background: rgb(var(--alert-rgb)); + @apply text-white flex items-center justify-center py-2; + + svg{ + @apply text-xl mr-2 fill-white; + } } &__brand{ - display: flex; - align-items: center; + @apply flex items-center; img{ max-height: 20px; @@ -33,102 +30,80 @@ } &__user{ - margin: 0 15px 0 auto; - padding-right: 0; - display: flex; - align-items: center; + @apply ml-auto mr-4 pr-0 flex items-center; } &__exit{ - display: flex; - align-items: center; - line-height: 1; - margin: -$top-padding 0; - padding: .5rem .25rem .5rem 1rem; - border-left: 1px solid rgba(black, .2); + @apply flex items-center leading-none my-[-var(--top-padding)] py-2 pl-4 pr-1 border-l border-gray-2; } &__x-icon{ - font-size: 2rem; - margin-right: .5rem; - color: $muted; + @apply text-2xl mr-2; a:hover &{ - color: inherit; + @apply text-inherit; } } &__header{ - background-color: $dark-gray; - color: $white; - padding: 1rem; + @apply bg-gray-4 text-white p-4; + &-title{ - margin-bottom: 0; + @apply mb-0; } } &__step{ - display: flex; - flex-direction: column; - flex-grow: 1; + @apply flex flex-col flex-grow; + } + + .focus__step.hidden { + display: none !important; } &__steps{ - text-transform: uppercase; - font-size: 80%; - letter-spacing: .05em; - color: $light-gray; + @apply uppercase text-xs tracking-wider text-gray; } &__content{ - flex-grow: 1; - display: flex; + @apply flex-grow flex; .row{ - flex-grow: 1; + @apply flex-grow; } } &__footer{ - margin-top: auto; - padding: 1rem; - background-color: $white; + @apply mt-auto p-4 bg-white; .row{ - display: flex; - align-items: baseline; - width: 100%; + @apply flex items-baseline w-full; } .button{ - margin-bottom: 0; + @apply mb-0; } } &__back{ - font-weight: 600; + @apply font-semibold; svg{ - font-size: .7em; - margin-right: .3em; - vertical-align: 0; + @apply text-xs mr-1 align-middle; } } - &__next{ - margin-left: auto; + &__next { + @apply ml-auto; - svg{ - font-size: .7em; - margin-left: .3em; - vertical-align: 0; + svg { + @apply text-xs ml-1 align-middle; } } } // Fix for external link indicator a img + .external-link-indicator { - top: -10px; - right: -15px; + @apply top-[-10px] right-[-15px]; } diff --git a/app/packs/stylesheets/decidim/vocdoni/vocdoni_admin.scss b/app/packs/stylesheets/decidim/vocdoni/vocdoni_admin.scss new file mode 100644 index 00000000..ab5dc299 --- /dev/null +++ b/app/packs/stylesheets/decidim/vocdoni/vocdoni_admin.scss @@ -0,0 +1,2 @@ +@import "stylesheets/decidim/vocdoni/admin/elections_tabs"; +@import "stylesheets/decidim/vocdoni/admin/vocdoni"; diff --git a/app/packs/stylesheets/decidim/vocdoni/vocdoni.scss b/app/packs/stylesheets/decidim/vocdoni/vocdoni_application.scss similarity index 78% rename from app/packs/stylesheets/decidim/vocdoni/vocdoni.scss rename to app/packs/stylesheets/decidim/vocdoni/vocdoni_application.scss index 68cb18e9..6be2072a 100644 --- a/app/packs/stylesheets/decidim/vocdoni/vocdoni.scss +++ b/app/packs/stylesheets/decidim/vocdoni/vocdoni_application.scss @@ -3,7 +3,7 @@ @import "stylesheets/decidim/vocdoni/focus/focus"; .card__icondata ul li:not(:first-child) strong, -.card__block ul li:not(:first-child) strong{ +.card__block ul li:not(:first-child) strong { font-size: 100%; } @@ -12,6 +12,3 @@ // We can remove this rule // // @see https://github.com/decidim/decidim/pull/10526 -.button.primary, .button.primary:hover { - background-color: var(--primary); -} diff --git a/app/services/decidim/vocdoni/sdk.rb b/app/services/decidim/vocdoni/sdk.rb index 02cdb6da..6052ea99 100644 --- a/app/services/decidim/vocdoni/sdk.rb +++ b/app/services/decidim/vocdoni/sdk.rb @@ -38,7 +38,7 @@ def self.runner(file = "index.js") def initialize(organization, election = nil) @organization = organization @secrets_env = { - "VOCDONI_WALLET_PRIVATE_KEY" => Wallet.find_by(organization: organization)&.private_key.to_s, + "VOCDONI_WALLET_PRIVATE_KEY" => Wallet.find_by(organization:)&.private_key.to_s, "VOCDONI_SALT" => Rails.application.secret_key_base, "VOCDONI_API_ENV" => Vocdoni.api_endpoint_env, "VOCDONI_ELECTION_ID" => election&.vocdoni_election_id.to_s, diff --git a/app/views/decidim/vocdoni/admin/answers/_form.html.erb b/app/views/decidim/vocdoni/admin/answers/_form.html.erb index 4fe5da94..203b58ef 100644 --- a/app/views/decidim/vocdoni/admin/answers/_form.html.erb +++ b/app/views/decidim/vocdoni/admin/answers/_form.html.erb @@ -1,22 +1,26 @@ -+ <% unless first_step? %> <%= link_to( - button_continue_text, + icon("arrow-left-line", class: "icon", role: "img", "aria-hidden": true) + " " + t("decidim.vocdoni.votes.voting_step.back"), "#", - class: "button focus__next enabled-continue", + class: "button button__sm md:button__lg button__transparent-secondary focus__back", data: { - toggle: [next_step_dom_id, current_step_dom_id].join(" ") + toggle: [previous_step_dom_id, current_step_dom_id].join(" ") } ) %> -+ <% end %> + + + <%= button_continue_text %> + + + <%= link_to( + button_continue_text, + "#", + class: "button button__sm md:button__lg button__secondary focus__next enabled-continue", + data: { + toggle: [next_step_dom_id, current_step_dom_id].join(" ") + } + ) %>--+- <%= title %> - <%= question_with_link(question, election) %> -
-+++diff --git a/app/views/decidim/vocdoni/admin/answers/edit.html.erb b/app/views/decidim/vocdoni/admin/answers/edit.html.erb index af61ea8d..f27e328c 100644 --- a/app/views/decidim/vocdoni/admin/answers/edit.html.erb +++ b/app/views/decidim/vocdoni/admin/answers/edit.html.erb @@ -3,13 +3,17 @@ <%= render partial: "decidim/vocdoni/admin/shared/election_title" %> <%= render partial: "decidim/vocdoni/admin/shared/tab_links", locals: { active_class: "questions", election: election } %> -+-+ <%= title %> + <%= question_with_link(question, election) %> +
+-- <%= form.translated :text_field, :title, autofocus: true %> -+++ <%= form.translated :text_field, :title, autofocus: true %> +-- <%= form.translated :editor, :description %> -++ <%= form.translated :editor, :description %> +-- <%= form.number_field :weight %> ++ <%= form.number_field :weight %> ++- <%= decidim_form_for([election, question, @form], html: { class: "form edit_answer" }) do |f| %> - <%= render partial: "form", object: f, locals: { title: t(".title") } %> ++-<%= stylesheet_pack_tag "decidim_vocdoni_admin_stylesheet" %> +<%= append_javascript_pack_tag "decidim_vocdoni_admin" %> diff --git a/app/views/decidim/vocdoni/admin/answers/index.html.erb b/app/views/decidim/vocdoni/admin/answers/index.html.erb index 53206964..75b095ab 100644 --- a/app/views/decidim/vocdoni/admin/answers/index.html.erb +++ b/app/views/decidim/vocdoni/admin/answers/index.html.erb @@ -3,11 +3,11 @@ <%= render partial: "decidim/vocdoni/admin/shared/election_title" %> <%= render partial: "decidim/vocdoni/admin/shared/tab_links", locals: { active_class: "questions", election: election } %>+ <%= decidim_form_for([election, question, @form], html: { class: "form edit_answer form-defaults" }) do |f| %> + <%= render partial: "form", object: f, locals: { title: t(".title") } %> -- <%= f.submit t(".update") %> -- <% end %> +++ <% end %> ++ <%= f.submit t(".update"), class: "button button__sm button__secondary" %> ++--+
+@@ -16,8 +16,8 @@<%= t(".title") %> <%= question_with_link(question, election) %> - <%= link_to t("actions.new", scope: "decidim.vocdoni", name: t("models.answer.name", scope: "decidim.vocdoni.admin")), new_election_question_answer_path(election, question), class: "button tiny button--title" if allowed_to? :create, :answer, election: election, question: question %> + <%= link_to t("actions.new", scope: "decidim.vocdoni", name: t("models.answer.name", scope: "decidim.vocdoni.admin")), new_election_question_answer_path(election, question), class: "button button__sm button__secondary" if allowed_to? :create, :answer, election: election, question: question %>
- @@ -26,17 +26,17 @@<%= t("models.answer.fields.title", scope: "decidim.vocdoni") %> -<%= t("actions.title", scope: "decidim.vocdoni") %> +<%= t("models.answer.fields.title", scope: "decidim.vocdoni") %> +<%= t("actions.title", scope: "decidim.vocdoni") %> <%= translated_attribute(answer.title) %> -+ <% if allowed_to? :update, :answer, election: election, question: question, answer: answer %> - <%= icon_link_to "pencil", edit_election_question_answer_path(election, question, answer), t("actions.edit", scope: "decidim.vocdoni"), class: "action-icon--edit" %> + <%= icon_link_to "pencil-line", edit_election_question_answer_path(election, question, answer), t("actions.edit", scope: "decidim.vocdoni"), class: "action-icon--edit" %> <% else %> - <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.edit", scope: "decidim.vocdoni") %> + <%= icon "pencil-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.edit", scope: "decidim.vocdoni") %> <% end %> <% if allowed_to? :delete, :answer, election: election, question: question, answer: answer %> - <%= icon_link_to "circle-x", election_question_answer_path(election, question, answer), t("actions.destroy", scope: "decidim.vocdoni"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.vocdoni") } %> + <%= icon_link_to "close-circle-line", election_question_answer_path(election, question, answer), t("actions.destroy", scope: "decidim.vocdoni"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.vocdoni") } %> <% else %> - <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.vocdoni") %> + <%= icon "close-circle-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.vocdoni") %> <% end %> @@ -47,8 +47,8 @@ -- <%= link_to t(".back"), election_questions_path(election), class: "button" %> ++ <%= link_to t(".back"), election_questions_path(election), class: "button button__sm button__secondary" %>-<%= stylesheet_pack_tag "decidim_vocdoni_admin_stylesheet" %> +<%= append_javascript_pack_tag "decidim_vocdoni_admin" %> diff --git a/app/views/decidim/vocdoni/admin/answers/new.html.erb b/app/views/decidim/vocdoni/admin/answers/new.html.erb index 998f0436..d59b6110 100644 --- a/app/views/decidim/vocdoni/admin/answers/new.html.erb +++ b/app/views/decidim/vocdoni/admin/answers/new.html.erb @@ -2,12 +2,18 @@ <%= render partial: "decidim/vocdoni/admin/shared/election_title" %> <%= render partial: "decidim/vocdoni/admin/shared/tab_links", locals: { active_class: "questions" } %> -<%= decidim_form_for([election, question, @form], html: { class: "form new_answer" }) do |f| %> - <%= render partial: "form", object: f, locals: { title: t(".title") } %> +++<%= append_javascript_pack_tag "decidim_vocdoni_admin" %> diff --git a/app/views/decidim/vocdoni/admin/census/_decidim_permissions_form.html.erb b/app/views/decidim/vocdoni/admin/census/_decidim_permissions_form.html.erb index 2dd48e5d..e70a8c94 100644 --- a/app/views/decidim/vocdoni/admin/census/_decidim_permissions_form.html.erb +++ b/app/views/decidim/vocdoni/admin/census/_decidim_permissions_form.html.erb @@ -1,20 +1,13 @@ -<%= decidim_form_for form, url: election_census_path(election), method: :post do |form| %> - <%= form.hidden_field :census_permissions_form, value: true %> - <% current_organization.available_authorizations.each_with_index do |authorization, index| %> - <% checkbox_id = "verification_type_#{authorization}_#{index}" %> -+ <%= decidim_form_for([election, question, @form], html: { class: "form new_answer form-defaults" }) do |f| %> + <%= render partial: "form", object: f, locals: { title: t(".title") } %> --<%= stylesheet_pack_tag "decidim_vocdoni_admin_stylesheet" %> +- <%= f.submit t(".create") %> +-<% end %>++ <% end %>+ <%= f.submit t(".create"), class: "button button__sm button__secondary" %> ++- <%= form.check_box :verification_types, - { id: checkbox_id, - multiple: true, - include_hidden: false, - checked: election.verification_types.include?(authorization), - label: false - }, - authorization, - false %> - <%= form.label :verification_types, t("decidim.authorization_handlers.#{authorization}.name"), for: checkbox_id %> +<%= decidim_form_for form, url: election_census_path(election), method: :post, html: { class: "form edit_election form-defaults" } do |f| %> + <%= f.hidden_field :census_permissions_form, value: true %> + <% current_organization.available_authorizations.each do |authorization| %> +- <%= form.submit t("create.submit_permissions", scope: "decidim.vocdoni.admin.census") %> ++ <%= f.check_box :verification_types, { label: t("decidim.authorization_handlers.#{authorization}.name"), multiple: true, include_hidden: false, checked: election.verification_types.include?(authorization) }, authorization, nil %><% end %> -+<% end %> diff --git a/app/views/decidim/vocdoni/admin/census/_upload_form.html.erb b/app/views/decidim/vocdoni/admin/census/_upload_form.html.erb index 555dd4f9..30a6fbc0 100644 --- a/app/views/decidim/vocdoni/admin/census/_upload_form.html.erb +++ b/app/views/decidim/vocdoni/admin/census/_upload_form.html.erb @@ -1,10 +1,14 @@ -+ <%= f.submit t("create.submit_permissions", scope: "decidim.vocdoni.admin.census"), class: "button button__sm button__secondary" %> ++<%= t("decidim.vocdoni.admin.census.new.info") %>
+<%= t("decidim.vocdoni.admin.census.new.info") %>
email;token user@example.org;123456 user2@example.org;ABCXYZ
-<%= decidim_form_for form, url: election_census_path(election), multipart: true do |form| %> - <%= label_tag :file, t("new.file", scope: "decidim.vocdoni.admin.census") %> - <%= form.file_field :file, required: true %> - <%= submit_tag t("new.submit", scope: "decidim.vocdoni.admin.census"), class: "button" %> +<%= decidim_form_for form, url: election_census_path(election), multipart: true, html: { class: "form edit_election form-defaults" } do |form| %> ++ <%= label_tag :file, t("new.file", scope: "decidim.vocdoni.admin.census") %> + <%= form.file_field :file, required: true %> +++ <%= submit_tag t("new.submit", scope: "decidim.vocdoni.admin.census"), class: "button button__sm button__secondary" %> +<% end %> diff --git a/app/views/decidim/vocdoni/admin/census/index.html.erb b/app/views/decidim/vocdoni/admin/census/index.html.erb index f19a8301..be8632a8 100644 --- a/app/views/decidim/vocdoni/admin/census/index.html.erb +++ b/app/views/decidim/vocdoni/admin/census/index.html.erb @@ -7,8 +7,8 @@<% if status.pending_upload? %><% end %> <% if status.pending_upload? %> ----+
+@@ -17,12 +17,20 @@ <%= t("index.info", scope: "decidim.vocdoni.admin.census") %><%= t("index.title", scope: "decidim.vocdoni.admin.census") %>
- <%= radio_button_tag "census_type", "csv", !election.internal_census?, id: "csv_radio_button", data: { csv_radio_button: true } %> - <%= label_tag "csv_radio_button", t("census_type.external", scope: "decidim.vocdoni.admin.census") %> +<% end %> @@ -30,7 +38,7 @@ <% if status.count > 0 %>++ <%= label_tag nil, class: "mr-2" do %> + <%= radio_button_tag "census_type", "csv", !election.internal_census?, id: "csv_radio_button", data: { csv_radio_button: true } %> + <%= t("census_type.external", scope: "decidim.vocdoni.admin.census") %> + <% end %> +- <%= radio_button_tag "census_type", "permissions", election.internal_census?, id: "permissions_radio_button", data: { permissions_radio_button: true } %> - <%= label_tag "permissions_radio_button", t("census_type.internal", scope: "decidim.vocdoni.admin.census") %> ++ <%= label_tag nil, class: "mr-2" do %> + <%= radio_button_tag "census_type", "permissions", election.internal_census?, id: "permissions_radio_button",data: { permissions_radio_button: true } %> + <%= t("census_type.internal", scope: "decidim.vocdoni.admin.census") %> + <% end %> +<% end %> --@@ -54,21 +62,21 @@+
<%= t("status.title", scope: "decidim.vocdoni.admin.census") %>
<%= t("status.percentage_complete", scope: "decidim.vocdoni.admin.census", count: status.count, percentage: status.percentage_complete) %>
<%= t("decidim.vocdoni.admin.census.status.data", count: status.count, due_date: l(status.last_import_at, format: :long)) %>
+<%= t("decidim.vocdoni.admin.census.status.data", count: status.count, due_date: l(status.last_import_at, format: :long)) %>
<%= link_to t("decidim.vocdoni.admin.census.destroy.title"), destroy_all_election_census_path(election), method: :delete, - class: "button alert", + class: "button button__sm button__primary", data: { confirm: t("decidim.vocdoni.admin.census.destroy.confirm") } %>+--@@ -78,27 +86,37 @@+
<%= t("new.title.external", scope: "decidim.vocdoni.admin.census") %>
+-+
<%= t("new.title.internal", scope: "decidim.vocdoni.admin.census") %>
<% else %> -<%= t("permissions_warning_html", scope: "decidim.vocdoni.admin.census") %>
- <%= render partial: "decidim_permissions_form", locals: { form: @census_permissions_form, election: election, current_organization: current_organization } %> +++ <%= render partial: "decidim_permissions_form", locals: { form: @census_permissions_form, election: election, current_organization: current_organization } %> +++<% if allowed_to?(:edit, :election_calendar, election: election) && election.ready_for_calendar_form? %> - <%= link_to t("next_button", scope: "decidim.vocdoni.admin.elections.new"), edit_election_calendar_path(election), class: "button form-general-submit" %> +<% end %> - <% unless election.census_ready? %> + <% unless status.name == "ready" || + (election.internal_census? && election.verification_types.empty?) || + election.internal_census? && election.voters.empty? %>+<% end %>+ <%= link_to t("next_button", scope: "decidim.vocdoni.admin.elections.new"), edit_election_calendar_path(election), class: "button button__sm button__secondary" %> ++- +<% end %> <% if election.internal_census? && election.verification_types.any? && election.voters.empty? %> -+-<%= javascript_pack_tag "decidim_vocdoni_admin" %> -<%= stylesheet_pack_tag "decidim_vocdoni_admin_stylesheet" %> +<%= append_javascript_pack_tag "decidim_vocdoni_admin" %> diff --git a/app/views/decidim/vocdoni/admin/election_calendar/edit.html.erb b/app/views/decidim/vocdoni/admin/election_calendar/edit.html.erb index 0df3fcb2..2c3f4082 100644 --- a/app/views/decidim/vocdoni/admin/election_calendar/edit.html.erb +++ b/app/views/decidim/vocdoni/admin/election_calendar/edit.html.erb @@ -6,41 +6,50 @@<%= t("census_empty", scope: "decidim.vocdoni.admin.census.index") %>-+@@ -122,5 +140,4 @@<% if allowed_to?(:edit, :election_calendar, election: election) && election.ready_for_calendar_form? %> - <%= link_to t("next_button", scope: "decidim.vocdoni.admin.elections.new"), edit_election_calendar_path(election), class: "button form-general-submit" %> + <%= link_to t("next_button", scope: "decidim.vocdoni.admin.elections.new"), edit_election_calendar_path(election), class: "button button__sm button__secondary" %> <% end %>-<%= stylesheet_pack_tag "decidim_vocdoni_admin_stylesheet" %> -<%= javascript_pack_tag "decidim_vocdoni_admin" %> +<%= append_javascript_pack_tag "decidim_vocdoni_admin" %> diff --git a/app/views/decidim/vocdoni/admin/elections/_form.html.erb b/app/views/decidim/vocdoni/admin/elections/_form.html.erb index e34f1088..90514b6a 100644 --- a/app/views/decidim/vocdoni/admin/elections/_form.html.erb +++ b/app/views/decidim/vocdoni/admin/elections/_form.html.erb @@ -1,17 +1,19 @@ -++<% if election.present? %> - <%= decidim_form_for(@election_calendar_form, url: election_calendar_path(election), html: { class: "form new_election" }, method: :patch) do |f| %> - <%= f.hidden_field :interruptible, value: Decidim::Vocdoni.interruptible_elections %> -<%= t(".calendar_title") %>
+--<%= t(".calendar_title") %>
---<%= t(".organization_time_zone", - time_zone: current_organization.time_zone, - time: Time.zone.now) %>
-- <%= f.check_box :manual_start, { checked: election.manual_start? } %> --- <%= f.datetime_field :start_time %> --- <%= f.datetime_field :end_time %> ----<%= t(".results_title") %>
-- <%= f.radio_button :result_type, "real_time", checked: !election.election_type&.fetch("secret_until_the_end", false) %> --<%= t(".real_time_note") %>
-- <%= f.radio_button :result_type, "after_voting", checked: election.election_type&.fetch("secret_until_the_end", false) %> -- <%= f.submit t("save_button", scope: "decidim.vocdoni.admin.elections.new") %> - <% end %> +<%= t(".after_voting_note") %>
-+<% end %>+ <%= decidim_form_for(@election_calendar_form, url: election_calendar_path(election), html: { class: "form-defaults form new_election" }, method: :patch) do |f| %> + <%= f.hidden_field :interruptible, value: Decidim::Vocdoni.interruptible_elections %> ++++<%= t(".organization_time_zone", + time_zone: current_organization.time_zone, + time: Time.zone.now) %>
++ <%= f.check_box :manual_start, { checked: election.manual_start? } %> +++ <%= f.datetime_field :start_time %> +++ <%= f.datetime_field :end_time %> ++++<%= t(".results_title") %>
++++ <%= f.radio_button :result_type, "real_time", checked: !election.election_type&.fetch("secret_until_the_end", false), class: "mr-2" %> ++<%= t(".real_time_note") %>
++ <%= f.radio_button :result_type, "after_voting", checked: election.election_type&.fetch("secret_until_the_end", false), class: "mr-2" %> ++<%= t(".after_voting_note") %>
+++ <% end %> ++ <%= f.submit t("save_button", scope: "decidim.vocdoni.admin.elections.new"), class: "button button__sm button__secondary" %> ++--- <%= form.translated :text_field, :title, autofocus: true %> -+++diff --git a/app/views/decidim/vocdoni/admin/elections/edit.html.erb b/app/views/decidim/vocdoni/admin/elections/edit.html.erb index 4386030d..3474a5bb 100644 --- a/app/views/decidim/vocdoni/admin/elections/edit.html.erb +++ b/app/views/decidim/vocdoni/admin/elections/edit.html.erb @@ -3,11 +3,16 @@ <%= render partial: "decidim/vocdoni/admin/shared/election_title" %> <%= render partial: "decidim/vocdoni/admin/shared/tab_links", locals: { active_class: "basic_info", election: election } %> -<%= decidim_form_for(@form, html: { class: "form edit_election" }) do |f| %> - <%= render partial: "form", object: f, locals: { title: t(".title") } %> - -++ <%= form.translated :text_field, :title, autofocus: true %> +-- <%= form.translated :editor, :description %> -++ <%= form.translated :editor, :description %> +- <%= render partial: "decidim/admin/shared/gallery", locals: { form: form } %> + <%= render partial: "decidim/admin/shared/gallery", locals: { form: form } %> -- <%= form.text_field :stream_uri %> ++ <%= form.text_field :stream_uri %> +- <%= f.submit t("save_button", scope: "decidim.vocdoni.admin.elections.new") %> +++<%= append_javascript_pack_tag "decidim_vocdoni_admin" %> diff --git a/app/views/decidim/vocdoni/admin/elections/index.html.erb b/app/views/decidim/vocdoni/admin/elections/index.html.erb index a7984690..92d2f8df 100644 --- a/app/views/decidim/vocdoni/admin/elections/index.html.erb +++ b/app/views/decidim/vocdoni/admin/elections/index.html.erb @@ -1,11 +1,11 @@ <% add_decidim_page_title(t(".title")) %>+ <%= decidim_form_for(@form, html: { class: "form edit_election form-defaults" }) do |f| %> + <%= render partial: "form", object: f, locals: { title: t(".title") } %> +-<% end %> -<%= stylesheet_pack_tag "decidim_vocdoni_admin_stylesheet" %> +++ <% end %>+ <%= f.submit t("save_button", scope: "decidim.vocdoni.admin.elections.new"), class: "button button__sm button__secondary" %> ++---+
+@@ -14,7 +14,7 @@<%= t(".title") %> - <%= link_to t("actions.new", scope: "decidim.vocdoni", name: t("models.election.name", scope: "decidim.vocdoni.admin")), new_election_path, class: "button tiny button--title" if allowed_to? :create, :election %> + <%= link_to t("actions.new", scope: "decidim.vocdoni", name: t("models.election.name", scope: "decidim.vocdoni.admin")), new_election_path, class: "button button__sm button__secondary" if allowed_to? :create, :election %>
<%= t(".description_html") %>
+@@ -31,12 +31,12 @@ diff --git a/app/views/decidim/vocdoni/admin/elections/new.html.erb b/app/views/decidim/vocdoni/admin/elections/new.html.erb index 66770b0f..758595c2 100644 --- a/app/views/decidim/vocdoni/admin/elections/new.html.erb +++ b/app/views/decidim/vocdoni/admin/elections/new.html.erb @@ -1,22 +1,28 @@ <% add_decidim_page_title(t(".title")) %> -<%= link_to translated_attribute(election.title), resource_locator(election).path %> -+ <% if election.start_time %> <%= l election.start_time, format: :long %> <% end %> -+ <% if election.end_time %> <%= l election.end_time, format: :long %> <% end %> @@ -44,37 +44,37 @@ <%= t("steps.#{election.status || "create_election"}.title", scope: "decidim.vocdoni.admin") %> <% if allowed_to? :update, :election, election: election %> - <%= icon_link_to "pencil", edit_election_path(election), t("actions.edit", scope: "decidim.vocdoni"), class: "action-icon--edit" %> + <%= icon_link_to "pencil-line", edit_election_path(election), t("actions.edit", scope: "decidim.vocdoni"), class: "action-icon--edit" %> <% else %> - <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.edit", scope: "decidim.vocdoni") %> + <%= icon "pencil-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.edit", scope: "decidim.vocdoni") %> <% end %> <% if allowed_to? :read, :steps, election: election %> - <%= icon_link_to "project", election_steps_path(election), t("actions.manage_steps", scope: "decidim.vocdoni"), class: "action-icon--manage-steps" %> + <%= icon_link_to "list-check", election_steps_path(election), t("actions.manage_steps", scope: "decidim.vocdoni"), class: "action-icon--manage-steps" %> <% end %> <% if election.published? %> <% if allowed_to?(:unpublish, :election, election: election) %> - <%= icon_link_to "x", url_for(action: :unpublish, id: election, controller: "elections"), t("actions.unpublish", scope: "decidim.vocdoni"), class: "action-icon--unpublish", method: :put %> + <%= icon_link_to "close-line", url_for(action: :unpublish, id: election, controller: "elections"), t("actions.unpublish", scope: "decidim.vocdoni"), class: "action-icon--unpublish", method: :put %> <% else %> - <%= icon "x", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.unpublish", scope: "decidim.vocdoni") %> + <%= icon "close-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.unpublish", scope: "decidim.vocdoni") %> <% end %> <% else %> <% if allowed_to?(:publish, :election, election: election) %> - <%= icon_link_to "check", url_for(action: :publish, id: election, controller: "elections"), t("actions.publish", scope: "decidim.vocdoni"), class: "action-icon--publish", method: :put %> + <%= icon_link_to "check-line", url_for(action: :publish, id: election, controller: "elections"), t("actions.publish", scope: "decidim.vocdoni"), class: "action-icon--publish", method: :put %> <% else %> - <%= icon "check", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.publish", scope: "decidim.vocdoni") %> + <%= icon "check-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.publish", scope: "decidim.vocdoni") %> <% end %> <% end %> - <%= icon_link_to "eye", resource_locator(election).path, t("actions.preview", scope: "decidim.vocdoni"), class: "action-icon--preview", target: :blank %> + <%= icon_link_to "eye-line", resource_locator(election).path, t("actions.preview", scope: "decidim.vocdoni"), class: "action-icon--preview", target: :blank %> <%= resource_permissions_link(election) %> <% if allowed_to? :delete, :election, election: election %> - <%= icon_link_to "circle-x", election_path(election), t("actions.destroy", scope: "decidim.vocdoni"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.vocdoni") } %> + <%= icon_link_to "close-circle-line", election_path(election), t("actions.destroy", scope: "decidim.vocdoni"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.vocdoni") } %> <% else %> - <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.vocdoni") %> + <%= icon "close-circle-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.vocdoni") %> <% end %> -<%= t(".title") %>
++<% scope = "decidim.vocdoni.admin.elections.new" %> -<%= t(".title") %>
-
-
- <%= link_to t("basic_info", scope: scope), new_election_path %> -
- <%= t("questions", scope: scope) %> -
- <%= t("census", scope: scope) %> -
- <%= t("results", scope: scope) %> -
- <%= t("publish", scope: scope) %> - -
- <%= f.submit t(".save_button") %> +++-
+
- <%= link_to t("basic_info", scope: scope), new_election_path %> +
- <%= t("questions", scope: scope) %> +
- <%= t("census", scope: scope) %> +
- <%= t("results", scope: scope) %> +
- <%= t("publish", scope: scope) %> +
++<%= append_javascript_pack_tag "decidim_vocdoni_admin" %> diff --git a/app/views/decidim/vocdoni/admin/elections/publish_page.html.erb b/app/views/decidim/vocdoni/admin/elections/publish_page.html.erb index ec3514ea..c17d9d23 100644 --- a/app/views/decidim/vocdoni/admin/elections/publish_page.html.erb +++ b/app/views/decidim/vocdoni/admin/elections/publish_page.html.erb @@ -1,7 +1,7 @@ <% add_decidim_page_title(t(".title")) %> -+ <%= decidim_form_for(@form, html: { class: "form new_election form-defaults" }) do |f| %> + <%= render partial: "form", object: f, locals: { title: t(".title") } %> +-<% end %> -<%= stylesheet_pack_tag "decidim_vocdoni_admin_stylesheet" %> +++ <% end %>+ <%= f.submit t(".save_button"), class: "button button__sm button__secondary" %> ++-+
+<%= t("title", scope: "decidim.vocdoni.admin.elections.publish") %> "<%= translated_attribute(election.title) %>"
@@ -10,35 +10,39 @@<% if election.published? %> --<% if allowed_to?(:publish, :election, election: election) %> -<%= t("publish_title", scope: "decidim.vocdoni.admin.elections.new") %>
++<%= t("publish_title", scope: "decidim.vocdoni.admin.elections.new") %>
<%= t("publish_text_all_done_html", scope: "decidim.vocdoni.admin.elections.new") %>-- <%= link_to t("next_button", scope: "decidim.vocdoni.admin.elections.new"), election_steps_path(election), class: "button form-general-submit" %> +<% else %> - <%= t("publish_text_html", scope: "decidim.vocdoni.admin.elections.new") %> ++ <%= link_to t("next_button", scope: "decidim.vocdoni.admin.elections.new"), election_steps_path(election), class: "button button__sm button__secondary" %>+ <%= t("publish_text_html", scope: "decidim.vocdoni.admin.elections.new") %> +<% end %>- <% if election.published? %> - <% if allowed_to?(:unpublish, :election, election: election) %> - <%= link_to t("actions.unpublish", scope: "decidim.vocdoni"), url_for(action: :unpublish, id: election, controller: "elections"), class: "button muted", method: :put %> ++<% end %> -<%= stylesheet_pack_tag "decidim_vocdoni_admin_stylesheet" %> +<%= append_javascript_pack_tag "decidim_vocdoni_admin" %> diff --git a/app/views/decidim/vocdoni/admin/questions/_form.html.erb b/app/views/decidim/vocdoni/admin/questions/_form.html.erb index 4941bffc..0d8f6b0f 100644 --- a/app/views/decidim/vocdoni/admin/questions/_form.html.erb +++ b/app/views/decidim/vocdoni/admin/questions/_form.html.erb @@ -1,19 +1,23 @@ -+ <% if election.published? %> + <% if allowed_to?(:unpublish, :election, election: election) %> + <%= link_to t("actions.unpublish", scope: "decidim.vocdoni"), url_for(action: :unpublish, id: election, controller: "elections"), class: "button button__sm button__secondary muted", method: :put %> + <% else %> + <%= link_to t("actions.unpublish", scope: "decidim.vocdoni"), "#", class: "button button__sm button__secondary muted disabled" %> + <% end %> <% else %> - <%= link_to t("actions.unpublish", scope: "decidim.vocdoni"), "#", class: "button muted disabled" %> + <% if allowed_to?(:publish, :election, election: election) %> + <%= link_to t("actions.publish", scope: "decidim.vocdoni"), url_for(action: :publish, id: election, controller: "elections"), class: "button button__sm button__secondary hollow", method: :put %> + <% else %> + <%= link_to t("actions.publish", scope: "decidim.vocdoni"), "#", class: "button button__sm button__secondary disabled" %> + <% end %> <% end %> - <% else %> - <% if allowed_to?(:publish, :election, election: election) %> - <%= link_to t("actions.publish", scope: "decidim.vocdoni"), url_for(action: :publish, id: election, controller: "elections"), class: "button hollow", method: :put %> - <% else %> - <%= link_to t("actions.publish", scope: "decidim.vocdoni"), "#", class: "button hollow disabled" %> - <% end %> - <% end %> +--+<%= title %>
-+++diff --git a/app/views/decidim/vocdoni/admin/questions/edit.html.erb b/app/views/decidim/vocdoni/admin/questions/edit.html.erb index 09cb4acd..0de11f59 100644 --- a/app/views/decidim/vocdoni/admin/questions/edit.html.erb +++ b/app/views/decidim/vocdoni/admin/questions/edit.html.erb @@ -3,11 +3,16 @@ <%= render partial: "decidim/vocdoni/admin/shared/election_title" %> <%= render partial: "decidim/vocdoni/admin/shared/tab_links", locals: { active_class: "questions", election: election } %> -<%= decidim_form_for([election, @form], html: { class: "form edit_question" }) do |f| %> - <%= render partial: "form", object: f, locals: { title: t(".title") } %> - -+-<%= title %>
+-- <%= form.translated :text_field, :title, autofocus: true %> -+++ <%= form.translated :text_field, :title, autofocus: true %> +-- <%= form.translated :text_field, :description %> -++ <%= form.translated :text_field, :description %> +-- <%= form.number_field :weight %> ++ <%= form.number_field :weight %> ++- <%= f.submit t(".update") %> +++<%= append_javascript_pack_tag "decidim_vocdoni_admin" %> diff --git a/app/views/decidim/vocdoni/admin/questions/index.html.erb b/app/views/decidim/vocdoni/admin/questions/index.html.erb index 28f62648..a2356c5e 100644 --- a/app/views/decidim/vocdoni/admin/questions/index.html.erb +++ b/app/views/decidim/vocdoni/admin/questions/index.html.erb @@ -5,64 +5,62 @@ <%= render partial: "decidim/vocdoni/admin/shared/tab_links", locals: { active_class: "questions", election: election } %>+ <%= decidim_form_for([election, @form], html: { class: "form edit_question form-defaults" }) do |f| %> + <%= render partial: "form", object: f, locals: { title: t(".title") } %> +-<% end %> -<%= stylesheet_pack_tag "decidim_vocdoni_admin_stylesheet" %> +++ <% end %>+ <%= f.submit t(".update"), class: "button button__sm button__secondary" %> ++---- <%= t(".title") %> +
+-+ <%= t(".title") %> - <%= link_to t("actions.new", scope: "decidim.vocdoni", name: t("models.question.name", scope: "decidim.vocdoni.admin")), new_election_question_path(election), class: "button tiny button--title" if allowed_to? :create, :question, election: election %> -
--+-+ <% unless election.minimum_answers? %> +- -
+- - - - <% questions.each do |question| %> -<%= t("models.question.fields.title", scope: "decidim.vocdoni") %> -<%= t("models.question.fields.answers", scope: "decidim.vocdoni") %> -<%= t("actions.title", scope: "decidim.vocdoni") %> -- + <% end %> + +- <%= translated_attribute(question.title) %> - -- <%= question.answers.count %> - -- <%= icon_link_to "list", election_question_answers_path(election, question), t("actions.manage_answers", scope: "decidim.vocdoni"), class: "action-icon--manage-answers" %> + <%= link_to t("actions.new", scope: "decidim.vocdoni", name: t("models.question.name", scope: "decidim.vocdoni.admin")), new_election_question_path(election), class: "button button__sm button__secondary" if allowed_to? :create, :question, election: election %> + + + +++ <% if allowed_to? :delete, :question, election: election, question: question %> + <%= icon_link_to "close-circle-line", election_question_path(election, question), t("actions.destroy", scope: "decidim.vocdoni"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.vocdoni") } %> + <% else %> + <%= icon "close-circle-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.vocdoni") %> + <% end %> ++ +
-+ + + + <% questions.each do |question| %> +<%= t("models.question.fields.title", scope: "decidim.vocdoni") %> +<%= t("models.question.fields.answers", scope: "decidim.vocdoni") %> +<%= t("actions.title", scope: "decidim.vocdoni") %> ++ - <% end %> - -+ <%= translated_attribute(question.title) %> + ++ <%= question.answers.count %> + ++ <%= icon_link_to "list-check", election_question_answers_path(election, question), t("actions.manage_answers", scope: "decidim.vocdoni"), class: "action-icon--manage-answers" %> - <% if allowed_to? :update, :question, election: election, question: question %> - <%= icon_link_to "pencil", edit_election_question_path(election, question), t("actions.edit", scope: "decidim.vocdoni"), class: "action-icon--edit" %> - <% else %> - <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.edit", scope: "decidim.vocdoni") %> - <% end %> + <% if allowed_to? :update, :question, election: election, question: question %> + <%= icon_link_to "pencil-line", edit_election_question_path(election, question), t("actions.edit", scope: "decidim.vocdoni"), class: "action-icon--edit" %> + <% else %> + <%= icon "pencil-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.edit", scope: "decidim.vocdoni") %> + <% end %> - <% if allowed_to? :delete, :question, election: election, question: question %> - <%= icon_link_to "circle-x", election_question_path(election, question), t("actions.destroy", scope: "decidim.vocdoni"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.vocdoni") } %> - <% else %> - <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.vocdoni") %> - <% end %> - -+ <%= t("minimum_answers_warning", scope: "decidim.vocdoni.admin.questions.index").html_safe %>- <% unless election.minimum_answers? %> -- <%= t("minimum_answers_warning", scope: "decidim.vocdoni.admin.questions.index").html_safe %> -+ <% end %> ++-+ <% if allowed_to?(:index, :census, election: election) && election.ready_for_census_form? %> + <%= link_to t("next_button", scope: "decidim.vocdoni.admin.elections.new"), election_census_path(election), class: "button button__sm button__secondary" %> <% end %>- <% if allowed_to?(:index, :census, election: election) && election.ready_for_census_form? %> - <%= link_to t("next_button", scope: "decidim.vocdoni.admin.elections.new"), election_census_path(election), class: "button form-general-submit" %> - <% end %> --<%= stylesheet_pack_tag "decidim_vocdoni_admin_stylesheet" %> +<%= append_javascript_pack_tag "decidim_vocdoni_admin" %> diff --git a/app/views/decidim/vocdoni/admin/questions/new.html.erb b/app/views/decidim/vocdoni/admin/questions/new.html.erb index 2f5a8c2c..88e2e0c4 100644 --- a/app/views/decidim/vocdoni/admin/questions/new.html.erb +++ b/app/views/decidim/vocdoni/admin/questions/new.html.erb @@ -2,11 +2,17 @@ <%= render partial: "decidim/vocdoni/admin/shared/election_title" %> <%= render partial: "decidim/vocdoni/admin/shared/tab_links", locals: { active_class: "questions", election: election } %> -<%= decidim_form_for([election, @form], html: { class: "form new_question" }) do |f| %> - <%= render partial: "form", object: f, locals: { title: t(".title") } %> +++ <%= decidim_form_for([election, @form], html: { class: "form new_question form-defaults" }) do |f| %> + <%= render partial: "form", object: f, locals: { title: t(".title") } %> -+<%= append_javascript_pack_tag "decidim_vocdoni_admin" %> diff --git a/app/views/decidim/vocdoni/admin/shared/_election_title.html.erb b/app/views/decidim/vocdoni/admin/shared/_election_title.html.erb index bf668ad2..a247f8f1 100644 --- a/app/views/decidim/vocdoni/admin/shared/_election_title.html.erb +++ b/app/views/decidim/vocdoni/admin/shared/_election_title.html.erb @@ -1,7 +1,7 @@ <%# add_decidim_page_title(translated_attribute(election.title)) %> -- <%= f.submit t(".create") %> +-<% end %> -<%= stylesheet_pack_tag "decidim_vocdoni_admin_stylesheet" %> +++ <% end %>+ <%= f.submit t(".create"), class: "button button__sm button__secondary" %> ++-+
+<%= t("title", scope: "decidim.vocdoni.admin.elections.edit") %> "<%= translated_attribute(election&.title) %>"
diff --git a/app/views/decidim/vocdoni/admin/shared/_tab_links.html.erb b/app/views/decidim/vocdoni/admin/shared/_tab_links.html.erb index 50c48a97..b6c292ca 100644 --- a/app/views/decidim/vocdoni/admin/shared/_tab_links.html.erb +++ b/app/views/decidim/vocdoni/admin/shared/_tab_links.html.erb @@ -1,8 +1,13 @@ ---
+<%= append_stylesheet_pack_tag "decidim_vocdoni_admin" %>
+
- - <%= link_to t(info[:translation], scope: "decidim.vocdoni.admin.elections.new"), info[:path], class: tab_link_class(tab_name, election) %> +
- "> + <% + link_classes = tab_link_class(tab_name, election) + tab_name == active_class ? link_classes += " text-gray-8" : link_classes += " hover:bg-blue-7 hover:text-white" unless link_classes.include?("disabled") + %> + <%= link_to t(info[:translation], scope: "decidim.vocdoni.admin.elections.new"), info[:path], class: link_classes %> <% end %>
- " data-accordion-item>
- <%= t(".question") %>: <%= translated_attribute(question.title) %>
+ <%= t(".question") %>: <%= translated_attribute(question.title) %>
-
+
<%= t(".answer") %> diff --git a/app/views/decidim/vocdoni/admin/steps/_update_census.html.erb b/app/views/decidim/vocdoni/admin/steps/_update_census.html.erb index 565d9d77..ce8cddf4 100644 --- a/app/views/decidim/vocdoni/admin/steps/_update_census.html.erb +++ b/app/views/decidim/vocdoni/admin/steps/_update_census.html.erb @@ -1,7 +1,7 @@- +<%= append_javascript_pack_tag "decidim_vocdoni_admin" %> diff --git a/app/views/decidim/vocdoni/admin/steps/_vocdoni_logo.html.erb b/app/views/decidim/vocdoni/admin/steps/_vocdoni_logo.html.erb index 218acd74..891ff582 100644 --- a/app/views/decidim/vocdoni/admin/steps/_vocdoni_logo.html.erb +++ b/app/views/decidim/vocdoni/admin/steps/_vocdoni_logo.html.erb @@ -1,8 +1,7 @@ --<%= t("title", scope: "decidim.vocdoni.admin.steps.census") %>
+<%= t("title", scope: "decidim.vocdoni.admin.steps.census") %>
@@ -20,8 +20,8 @@-<%= t("description", scope: "decidim.vocdoni.admin.steps.census") %>
- ++<%= t("last_update", scope: "decidim.vocdoni.admin.steps.census") %>: @@ -37,9 +37,9 @@
- <%= link_to "https://vocdoni.io", target: "_blank", rel: "noopener noreferrer" do %> - <%= image_pack_tag "media/images/vocdoni_logo.png", alt: "Vocdoni logo", class: "vocdoni-logo" %> +<%= append_javascript_pack_tag "decidim_vocdoni_admin" %> ++ <%= link_to "https://vocdoni.io", target: "_blank", rel: "noopener noreferrer", data: { external_link: false } do %> + <%= image_pack_tag "media/images/vocdoni_logo.png", alt: "Vocdoni logo", class: "vocdoni-logo mx-auto mt-8 mb-8" %> <% end %> -- -<%= stylesheet_pack_tag "decidim_vocdoni_admin_stylesheet", media: "all" %> diff --git a/app/views/decidim/vocdoni/admin/steps/_vote.html.erb b/app/views/decidim/vocdoni/admin/steps/_vote.html.erb index 222e1dfb..fe43f902 100644 --- a/app/views/decidim/vocdoni/admin/steps/_vote.html.erb +++ b/app/views/decidim/vocdoni/admin/steps/_vote.html.erb @@ -1,6 +1,6 @@<%= t("steps.powered_by_html", scope: "decidim.vocdoni.admin") %>
+<%= t("steps.powered_by_html", scope: "decidim.vocdoni.admin") %>
-<%= t("title", scope: "decidim.vocdoni.admin.steps.vote") %>
+<%= t("title", scope: "decidim.vocdoni.admin.steps.vote") %>
diff --git a/app/views/decidim/vocdoni/admin/steps/_vote_ended.html.erb b/app/views/decidim/vocdoni/admin/steps/_vote_ended.html.erb index a7efebdd..4ba0294f 100644 --- a/app/views/decidim/vocdoni/admin/steps/_vote_ended.html.erb +++ b/app/views/decidim/vocdoni/admin/steps/_vote_ended.html.erb @@ -1,6 +1,6 @@-<%= t(".title") %>
+<%= t(".title") %>
diff --git a/app/views/decidim/vocdoni/admin/steps/_vote_stats.html.erb b/app/views/decidim/vocdoni/admin/steps/_vote_stats.html.erb index 78891520..8a636b8a 100644 --- a/app/views/decidim/vocdoni/admin/steps/_vote_stats.html.erb +++ b/app/views/decidim/vocdoni/admin/steps/_vote_stats.html.erb @@ -1,39 +1,50 @@-+
<%= t(".title") %>
-diff --git a/app/views/decidim/vocdoni/admin/steps/_wallet_address.html.erb b/app/views/decidim/vocdoni/admin/steps/_wallet_address.html.erb new file mode 100644 index 00000000..e0de8a5f --- /dev/null +++ b/app/views/decidim/vocdoni/admin/steps/_wallet_address.html.erb @@ -0,0 +1,19 @@ +-
- <% election.questions.each_with_index do |question, idx| %>
-
- " data-accordion-item>
- <%= t(".question") %>: <%= translated_attribute(question.title) %>
- --+
- -
-- - - - <% question.answers.each do |answer| %> -<%= t(".answer") %> -<%= t(".result") %> -- - <% end %> - -<%= translated_attribute(answer.title) %> -- -
+ <% election.questions.each_with_index do |question, idx| %>
+
-
+
+ "> +++- - <% end %> +
+ +
+ + + + <% question.answers.each do |answer| %> +<%= t(".answer") %> +<%= t(".result") %> ++ + <% end %> + +<%= translated_attribute(answer.title) %> ++ + +
+ <% end %>
-
+
+
+diff --git a/app/views/decidim/vocdoni/admin/steps/index.html.erb b/app/views/decidim/vocdoni/admin/steps/index.html.erb index ab4b469c..50412103 100644 --- a/app/views/decidim/vocdoni/admin/steps/index.html.erb +++ b/app/views/decidim/vocdoni/admin/steps/index.html.erb @@ -1,5 +1,7 @@ <% add_decidim_page_title(translated_attribute(election.title)) %> <% add_decidim_page_title(t(".title")) %> +<%= append_javascript_pack_tag "decidim_vocdoni_admin" %> +<%= append_stylesheet_pack_tag "decidim_vocdoni_admin" %>+ + ++--- <%= link_to translated_attribute(election.title), elections_path %> > +
+-+ <%= link_to translated_attribute(election.title), elections_path, class: "contents" %> > <%= t("index.title", scope: "decidim.vocdoni.admin.steps") %>
+-
<% steps(current_step).each_with_index do |step, i| %>
- - <%= t("steps.#{step.first}.title", scope: "decidim.vocdoni.admin") %> + <%= t("steps.#{step.first}.title", scope: "decidim.vocdoni.admin") %> <% end %>
"> - <%= f.button type: :submit, class: "button", disabled: @form.invalid? do %> +<% end %> -<%= javascript_pack_tag "decidim_vocdoni_admin" %> - <%= render partial: "vocdoni_logo" %> diff --git a/app/views/decidim/vocdoni/admin/wallets/new.html.erb b/app/views/decidim/vocdoni/admin/wallets/new.html.erb index a8e702ad..1e53a68a 100644 --- a/app/views/decidim/vocdoni/admin/wallets/new.html.erb +++ b/app/views/decidim/vocdoni/admin/wallets/new.html.erb @@ -1,8 +1,9 @@ <% add_decidim_page_title(t(".title")) %> +<%= append_javascript_pack_tag "decidim_vocdoni_admin" %>"> + <%= f.button type: :submit, class: "button button__lg button__secondary", disabled: @form.invalid? do %> <%= t("steps.#{current_step}.submit", scope: "decidim.vocdoni.admin") %> <% end %>@@ -55,6 +57,4 @@--diff --git a/app/views/decidim/vocdoni/elections/_elections.html.erb b/app/views/decidim/vocdoni/elections/_elections.html.erb index 5d1c8a3e..58461f52 100644 --- a/app/views/decidim/vocdoni/elections/_elections.html.erb +++ b/app/views/decidim/vocdoni/elections/_elections.html.erb @@ -1,9 +1,17 @@ <% if elections.none? %> -<%= t(".title") %>
++<%= t(".title") %>
@@ -12,8 +13,8 @@-<%= t("help.p2", scope: "decidim.vocdoni.admin.wallets.form") %>
- <%= link_to t(".create"), wallets_path, method: :remote, class: "button primary" %> ++ <%= link_to t(".create"), wallets_path, method: :remote, class: "button button__lg button__tertiary" %>- <%= t("decidim.vocdoni.warnings.no_elections_warning") %> -+ <%= cell("decidim/announcement", t("decidim.vocdoni.warnings.no_elections_warning"), callout_class: "warning") %> +<% elsif scheduled_elections.none? %> + <%= cell("decidim/announcement", t("decidim.vocdoni.warnings.no_scheduled_elections_warning"), callout_class: "warning") %> <% end %> -- <%= render elections %> +<%= t("elections_count", scope: "decidim.vocdoni.elections.count", count: paginated_elections.total_count) %>
+ +<%= order_selector available_orders, i18n_scope: "decidim.vocdoni.elections.orders" %> + ++ <% paginated_elections.each do |election| %> + <%= card_for election, from: election %> + <% end %>+ +<%= decidim_paginate paginated_elections %> diff --git a/app/views/decidim/vocdoni/elections/index.html.erb b/app/views/decidim/vocdoni/elections/index.html.erb index 9667f6ee..c21adf92 100644 --- a/app/views/decidim/vocdoni/elections/index.html.erb +++ b/app/views/decidim/vocdoni/elections/index.html.erb @@ -1,17 +1,14 @@ -<%= render partial: "decidim/shared/component_announcement" %> +<% content_for :aside do %> +<%= component_name %>
+ <%= render layout: "decidim/shared/filters", locals: { filter_sections: , search_variable: :search_text_cont, skip_to_id: "elections" } do %> + <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %> + <% end %> +<% end %> -- +---+<%= render layout: "layouts/decidim/shared/layout_two_col" do %> + <%= render partial: "decidim/shared/component_announcement" %> -- <%= render partial: "count" %> -
---- <%= render partial: "elections" %> --+ <%= render partial: "elections" %> + +<% end %> diff --git a/app/views/decidim/vocdoni/elections/index.js.erb b/app/views/decidim/vocdoni/elections/index.js.erb new file mode 100644 index 00000000..08365217 --- /dev/null +++ b/app/views/decidim/vocdoni/elections/index.js.erb @@ -0,0 +1,5 @@ +var $elections = $('#elections'); +var $orderFilterInput = $('.order_filter'); + +$elections.html('<%= j(render partial: "elections").strip.html_safe %>'); +$orderFilterInput.val('<%= order %>'); diff --git a/app/views/decidim/vocdoni/elections/show.html.erb b/app/views/decidim/vocdoni/elections/show.html.erb index 50b924c2..d1b8ab34 100644 --- a/app/views/decidim/vocdoni/elections/show.html.erb +++ b/app/views/decidim/vocdoni/elections/show.html.erb @@ -12,50 +12,57 @@ edit_link( ) %> -<%= render partial: "decidim/shared/component_announcement" %> +<%= append_javascript_pack_tag "decidim_vocdoni_elections" %> +<%= append_stylesheet_pack_tag "decidim_vocdoni_elections" %> ---+<% content_for :aside do %> + <%= cell("decidim/vocdoni/election_vote_cta", election) %> +<% end %> +<%= render layout: "layouts/decidim/shared/layout_item" do %> +-<% unless single? %> - <%= link_to :elections, class: "small hollow" do %> - <%= icon "caret-left", class: "icon--small" %> - <%= t(".back") %> - <% end %> + + <%= icon "arrow-left-s-fill", class: "icon--small" %> + <%= link_to t("decidim.vocdoni.elections.show.back"), elections_path %> +<% end %> + <%= render partial: "decidim/shared/component_announcement" %> -- <%== present(election).title %> -
-- <%= cell "decidim/vocdoni/remaining_time_callout", election %> --- <% unless election.manual_start? %> - <%= t(".voting_period_status.#{election.voting_period_status}", - start_time: "#{l(election.start_time, format: :long)}", - end_time: "#{l election.end_time, format: :long}").html_safe %> - <% end %> -
-- <% if election.attachments.first.present? && election.attachments.first.image? %> --- <% end %> --
-+ -<%= cell("decidim/vocdoni/election_preview", election) %> + <%= attachments_for election %> -<%= cell("decidim/vocdoni/election_results_realtime", election, election_data: @election_data) if @election_data %> + <% unless election.finished? %> +--<%= decidim_sanitize_editor(simple_format(translated_attribute(election.description))) %>
+ <%= cell "decidim/vocdoni/remaining_time_callout", election %> + <% unless election.manual_start? %> + <%= cell("decidim/announcement", t("voting_period_status.#{election.voting_period_status}", + scope: "decidim.vocdoni.elections.show", + start_time: "#{l election.start_time, format: :long}", + end_time: "#{l election.end_time, format: :long}").html_safe) %> + <% end %> + +<%== present(election).title %>
+ - <%= cell("decidim/vocdoni/election_vote_cta", election) %> ++ + <%= decidim_sanitize_editor_admin(translated_attribute(election.description)) %>-+ <%= cell("decidim/vocdoni/election_preview", election) %> + + <% end %> + + <% if @election_data %> ++ <%= cell("decidim/vocdoni/election_results_realtime", election, election_data: @election_data) %> + + <% end %> -<%= cell("decidim/vocdoni/election_results", election) %> + <% if election.results_published? %> ++ <%= cell("decidim/vocdoni/election_results", election) %> + + <% end %> +<% end %> diff --git a/app/views/decidim/vocdoni/votes/_check_census.html.erb b/app/views/decidim/vocdoni/votes/_check_census.html.erb index 10cb493d..892c50bf 100644 --- a/app/views/decidim/vocdoni/votes/_check_census.html.erb +++ b/app/views/decidim/vocdoni/votes/_check_census.html.erb @@ -1,5 +1,3 @@ -<%= render("focus_header", header_title: t("decidim.vocdoni.votes.header.login")) %> -<%= identification_title(election) %> diff --git a/app/views/decidim/vocdoni/votes/_focus_header.html.erb b/app/views/decidim/vocdoni/votes/_focus_header.html.erb index 3069598b..7a79d5bb 100644 --- a/app/views/decidim/vocdoni/votes/_focus_header.html.erb +++ b/app/views/decidim/vocdoni/votes/_focus_header.html.erb @@ -1,8 +1,8 @@diff --git a/app/views/decidim/vocdoni/votes/_login.html.erb b/app/views/decidim/vocdoni/votes/_login.html.erb index c26a1953..8d598405 100644 --- a/app/views/decidim/vocdoni/votes/_login.html.erb +++ b/app/views/decidim/vocdoni/votes/_login.html.erb @@ -1,20 +1,18 @@ -<%= decidim_form_for(@form, url: "#", html: { class: "form", autocomplete: "off" }) do |f| %> +<%= decidim_form_for(@form, url: "#", html: { class: "form form-defaults", autocomplete: "off" }) do |f| %> <% scope = "decidim.vocdoni.votes.check_census" %> -<%= header_title %>-++<%= translated_attribute(election.title) %> -
--<%= t("form_title", scope: scope) %>
--- +++diff --git a/app/views/decidim/vocdoni/votes/_login_fields.html.erb b/app/views/decidim/vocdoni/votes/_login_fields.html.erb index 1b8f228b..76b6c812 100644 --- a/app/views/decidim/vocdoni/votes/_login_fields.html.erb +++ b/app/views/decidim/vocdoni/votes/_login_fields.html.erb @@ -1,6 +1,6 @@ -++<%= t("form_title", scope: scope) %>
++++ <%= render partial: "login_fields", locals: { f: f } %> +<%= t("failed", scope: scope) %>+<%= t("election_not_open", scope: scope) %>++ <%= f.submit t("access", scope: scope), class: "button button__lg button__secondary census__login-button mt-2 mb-0" %>+<%= f.text_field :email, label: t(".email"), placeholder: t(".email_placeholder"), autofocus: true %>-+<%= f.text_field :token, label: t(".token"), placeholder: t(".token_placeholder") %>diff --git a/app/views/decidim/vocdoni/votes/_new_confirm_step.html.erb b/app/views/decidim/vocdoni/votes/_new_confirm_step.html.erb index 9d54cabd..73621101 100644 --- a/app/views/decidim/vocdoni/votes/_new_confirm_step.html.erb +++ b/app/views/decidim/vocdoni/votes/_new_confirm_step.html.erb @@ -1,49 +1,44 @@ -<%= render("focus_header", header_title: t("decidim.vocdoni.votes.header.confirm")) %> +++ <%= t("decidim.vocdoni.votes.confirm.header") %> +
---+- <%= t("decidim.vocdoni.votes.confirm.header") %> -
-- <%= t("decidim.vocdoni.votes.confirm.intro").html_safe %> -
++ <%= t("decidim.vocdoni.votes.confirm.intro").html_safe %> +
+-
+ <% questions.each_with_index do |question, question_index| %>
+
- - <% questions.each_with_index do |question, question_index| %> - - <%= t("decidim.vocdoni.votes.confirm.question", count: question_index + 1) %>: - - - <%= translated_attribute(question.title) %> - -
-
-
- <%= t("decidim.vocdoni.votes.confirm.answer") %>
- (<%= link_to(
- "#{t("decidim.vocdoni.votes.confirm.edit")}
- #{t("decidim.vocdoni.votes.confirm.answer_number", number: question_index + 1)}".html_safe,
- "#",
- class: "evote__edit-answer",
- data: {
- toggle: ["step-#{question_index}", "step-#{questions_count}"].join(" ")
- }
- ) %>):
-
-
-
- <% question.answers.each do |answer| %>
-
- - <%= translated_attribute(answer.title) %> - - <% end %> -
+
++ <% end %> ++ <%= t("decidim.vocdoni.votes.confirm.question", count: question_index + 1) %>: +
+ ++ <%= translated_attribute(question.title) %> +
--
-
+ + <% question.answers.each do |answer| %> + + <%= translated_attribute(answer.title) %> + <% end %> - - + + + +++- <%= render("new_confirm_step_footer") %> diff --git a/app/views/decidim/vocdoni/votes/_new_confirm_step_footer.html.erb b/app/views/decidim/vocdoni/votes/_new_confirm_step_footer.html.erb index 0ac5563a..bd3e3f57 100644 --- a/app/views/decidim/vocdoni/votes/_new_confirm_step_footer.html.erb +++ b/app/views/decidim/vocdoni/votes/_new_confirm_step_footer.html.erb @@ -1,23 +1,21 @@ -<%= render partial: "vocdoni_logo" %>-- <%= link_to( - icon("chevron-left", class: "icon", role: "img", "aria-hidden": true) + " " + t("decidim.vocdoni.votes.voting_step.back"), - "#", - class: "focus__back", - data: { - toggle: ["step-#{questions_count - 1}", "step-#{questions_count}"].join(" ") - } - ) %> +diff --git a/app/views/decidim/vocdoni/votes/_new_question.html.erb b/app/views/decidim/vocdoni/votes/_new_question.html.erb index 87fcf927..78d37479 100644 --- a/app/views/decidim/vocdoni/votes/_new_question.html.erb +++ b/app/views/decidim/vocdoni/votes/_new_question.html.erb @@ -1,25 +1,21 @@ -+ <%= link_to( + icon("arrow-left-line", class: "icon", role: "img", "aria-hidden": true) + " " + t("decidim.vocdoni.votes.voting_step.back"), + "#", + class: "button button__sm md:button__lg button__transparent-secondary", + data: { + toggle: ["step-#{questions_count - 1}", "step-#{questions_count}"].join(" ") + } + ) %> - <%= link_to( - "#", - class: "button focus__next confirm", - data: { - toggle: ["submitting", "step-#{questions_count}"].join(" ") - } - ) do %> - <%= t("decidim.vocdoni.votes.confirm.confirm") %> - <%= icon("chevron-right", class: "icon", role: "img", "aria-hidden": true) %> - <% end %> -+ <%= link_to( + "#", + class: "button button__sm md:button__lg button__secondary focus__next confirm", + data: { + toggle: ["submitting", "step-#{questions_count}"].join(" ") + } + ) do %> + <%= t("decidim.vocdoni.votes.confirm.confirm") %> + <%= icon("arrow-right-line", class: "icon", role: "img", "aria-hidden": true) %> + <% end %>+
+ -<%= translated_attribute(question.title) %> -
+<% ordered_answers(question).each do |answer| %> - <%= label_tag nil, data: { "disabled-by": "#check-nota" }, class: "evote__check evote__card" do %> - <%= radio_button_tag question.slug, answer.slug, false, class: "answer_input", value: answer.value, data: { answer: "answer-#{answer.id}" } %> + <%= label_tag nil, data: { "disabled-by": "check-nota" }, class: "election-question" do %> + <%= radio_button_tag question.slug, answer.slug, false, class: "answer_input mr-2", value: answer.value, data: { answer: "answer-#{answer.id}" } %> - - <%= translated_attribute(answer.title) %> - <% if more_information?(answer) %> - - - - <% end %> - + <%= translated_attribute(answer.title) %> + + <% if more_information?(answer) %> + + <% end %> <% end %> - <%= render("new_question_modal", answer: answer) if more_information?(answer) %> + <%= render("new_question_modal", answer:) if more_information?(answer) %> <% end %> - <%= render partial: "vocdoni_logo" %>diff --git a/app/views/decidim/vocdoni/votes/_new_question_modal.html.erb b/app/views/decidim/vocdoni/votes/_new_question_modal.html.erb index 6fc36cc5..d2c510ae 100644 --- a/app/views/decidim/vocdoni/votes/_new_question_modal.html.erb +++ b/app/views/decidim/vocdoni/votes/_new_question_modal.html.erb @@ -1,32 +1,31 @@ ----<%= translated_attribute(answer.title) %>
- --+<%= decidim_modal id: "show-focus-modal-#{answer.slug}", class: "election-question__modal" do %> ++ <%= icon "arrow-right-line" %> + ++ <%= translated_attribute(answer.title) %> +
+ +<% if answer.photos.any? %> -+-<% answer.photos.each do |photo| %> - <%= image_tag photo.thumbnail_url, class:"thumbnail", alt: strip_tags(translated_attribute(photo.title)) %> + <%= image_tag photo.thumbnail_url, alt: strip_tags(translated_attribute(photo.title)) %> <% end %><% end %> + <% if answer.description %> -+<%== translated_attribute(answer.description) %><% end %>-+<% end %> diff --git a/app/views/decidim/vocdoni/votes/_new_submitting_step.html.erb b/app/views/decidim/vocdoni/votes/_new_submitting_step.html.erb index c6260480..31d04967 100644 --- a/app/views/decidim/vocdoni/votes/_new_submitting_step.html.erb +++ b/app/views/decidim/vocdoni/votes/_new_submitting_step.html.erb @@ -1,4 +1,3 @@ -<%= render("focus_header", header_title: t("decidim.vocdoni.votes.header.submitting")) %>- -+ ++-diff --git a/app/views/decidim/vocdoni/votes/_show_failed.html.erb b/app/views/decidim/vocdoni/votes/_show_failed.html.erb index bb2f28d3..75e6b264 100644 --- a/app/views/decidim/vocdoni/votes/_show_failed.html.erb +++ b/app/views/decidim/vocdoni/votes/_show_failed.html.erb @@ -1,10 +1,11 @@ -<%= render("focus_header", header_title: t("decidim.vocdoni.votes.header.failed")) %> +
+-+ <%= t("decidim.vocdoni.votes.failed.header") %> +
++diff --git a/app/views/decidim/vocdoni/votes/_show_vote_cast_step.html.erb b/app/views/decidim/vocdoni/votes/_show_vote_cast_step.html.erb index 39aadca0..d802961b 100644 --- a/app/views/decidim/vocdoni/votes/_show_vote_cast_step.html.erb +++ b/app/views/decidim/vocdoni/votes/_show_vote_cast_step.html.erb @@ -1,44 +1,45 @@ -<%= render("focus_header", header_title: t("decidim.vocdoni.votes.header.vote_cast")) %> --- <%= link_to new_election_vote_path(election), class: "button" do %> + <%= link_to new_election_vote_path(election), class: "button button__lg button__secondary" do %> <%= t("decidim.vocdoni.votes.failed.try_again") %> <% end %>- <%= t("decidim.vocdoni.votes.failed.header") %> -
<%= t("decidim.vocdoni.votes.failed.lead") %>
@@ -18,7 +19,7 @@--- <%= t("header", scope: "decidim.vocdoni.votes.vote_cast") %> -
++-+ <%= t("header", scope: "decidim.vocdoni.votes.vote_cast") %> +
+-<%= t("description", scope: "decidim.vocdoni.votes.vote_cast") %>
-- <%= t("vote_receipt", scope: "decidim.vocdoni.votes.vote_cast") %> +
+diff --git a/app/views/decidim/vocdoni/votes/new.html.erb b/app/views/decidim/vocdoni/votes/new.html.erb index 402dc6bb..2b066085 100644 --- a/app/views/decidim/vocdoni/votes/new.html.erb +++ b/app/views/decidim/vocdoni/votes/new.html.erb @@ -1,82 +1,70 @@ -+- <%= link_to election_path(election), class: "button" do %> - <%= t("exit", scope: "decidim.vocdoni.votes.vote_cast") %> - <% end %> - +<%= t("description", scope: "decidim.vocdoni.votes.vote_cast") %>
+<%= t("vote_receipt", scope: "decidim.vocdoni.votes.vote_cast") %>
-- " readonly> -+- --+ " + readonly> + +-- <%= link_to t("verify", scope: "decidim.vocdoni.votes.vote_cast"), "#", class: "verify_ballot", target: "_blank", rel: "noopener noreferrer" %> -
+<%= link_to t("verify", scope: "decidim.vocdoni.votes.vote_cast"), "#", class: "verify_ballot", target: "_blank", rel: "noopener noreferrer" %>
+<%= t("or", scope: "decidim.vocdoni.votes.vote_cast") %>
-- <%= t("or", scope: "decidim.vocdoni.votes.vote_cast") %> -
+ <%= link_to election_path(election), class: "button button__secondary button__lg" do %> + <%= t("exit", scope: "decidim.vocdoni.votes.vote_cast") %> + <% end %> + +++ <%= render partial: "vocdoni_logo" %>- - <%= render partial: "vocdoni_logo" %>+<%= append_stylesheet_pack_tag "decidim_vocdoni_elections" %> +<%= append_javascript_pack_tag "decidim_vocdoni_elections" %> +<%= render("focus_header", header_title: t("decidim.vocdoni.votes.new.question_steps", current_step: session[:current_step] + 1, total_steps: questions_count)) %> +<%= render layout: "layouts/decidim/shared/layout_center" do %> +-- <%= render("check_census") %> -++ <%= render("check_census") %> +- <% questions.each_with_index do |step_question, step_index| %> ----- - <%= t("decidim.vocdoni.votes.new.question_steps", current_step: step_index + 1, total_steps: questions_count) %> - + <% questions.each_with_index do |step_question, step_index| %> ++ <% session[:current_step] = step_index + 1 %> + <% if step_index == 0 %> +- -<% content_for :js_content do %> - <%= javascript_pack_tag "decidim_vocdoni_voter_new_vote" %> <% end %> diff --git a/app/views/layouts/decidim/_vocdoni_votes_header.html.erb b/app/views/layouts/decidim/_vocdoni_votes_header.html.erb index abfe4225..49d04b2e 100644 --- a/app/views/layouts/decidim/_vocdoni_votes_header.html.erb +++ b/app/views/layouts/decidim/_vocdoni_votes_header.html.erb @@ -1,12 +1,12 @@ <% if preview_mode? %> -+-- <%= translated_attribute(election.title) %> + <% end %> + +- <% if step_index == 0 %> -+-+ <%= render( + "new_question", + question: step_question + ) %>- -- <% end %> + <%= cell( + "decidim/vocdoni/voting_step_navigation", + step_index, + total_steps: questions_count + ) %> --+ <% end %> - <%= cell( - "decidim/vocdoni/voting_step_navigation", - step_index, - total_steps: questions_count +- <%= render( - "new_question", - question: step_question - ) %> -+ <%= render( + "new_confirm_step", + questions: questions ) %> -- <% end %> -- <%= render( - "new_confirm_step", - questions: questions - ) %> -- -- <%= render("new_submitting_step") %> -++ <%= render("new_submitting_step") %> +-- <%= render("show_vote_cast_step") %> -++ <%= render("show_vote_cast_step") %> +-- <%= render("show_failed") %> +-+ <%= render("show_failed") %> +<%= icon :warning %> <%= t("decidim.vocdoni.votes.new.preview_alert") %>+<%= icon "error-warning-line" %> <%= t("decidim.vocdoni.votes.new.preview_alert") %><% end %><%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %> <%= link_to exit_path, class: "focus__exit" do %> - × + × <%= t(".exit") %> <% end %>diff --git a/babel.config.json b/babel.config.json index 551d4bec..8c976bbb 100644 --- a/babel.config.json +++ b/babel.config.json @@ -2,15 +2,16 @@ "presets": [ [ "@babel/preset-env", { - "forceAllTransforms": true, - "useBuiltIns": "entry", - "corejs": 3, - "modules": false - } + "forceAllTransforms": true, + "useBuiltIns": "entry", + "corejs": 3, + "modules": false + } ], ["@babel/preset-react"] ], "plugins": [ + "@babel/plugin-transform-class-properties", "@babel/plugin-transform-classes", [ "@babel/plugin-transform-runtime", @@ -20,9 +21,6 @@ "corejs": false } ], - [ "@babel/plugin-transform-regenerator", { "async": false }], - [ "@babel/plugin-proposal-private-property-in-object", { "loose": true }], - ["@babel/plugin-proposal-private-methods", { "loose": true }], - ["@babel/plugin-proposal-class-properties", { "loose": true }] + ["@babel/plugin-transform-regenerator", { "async": false }] ] } diff --git a/bin/dev b/bin/dev new file mode 100755 index 00000000..65279bce --- /dev/null +++ b/bin/dev @@ -0,0 +1,6 @@ +#!/usr/bin/env sh +# frozen_string_literal: true + +cd development_app + +./bin/dev diff --git a/bin/webpack b/bin/shakapacker similarity index 77% rename from bin/webpack rename to bin/shakapacker index c2297e5f..86aefe83 100755 --- a/bin/webpack +++ b/bin/shakapacker @@ -3,4 +3,4 @@ Dir.chdir("development_app") -load "bin/webpack" +load "bin/shakapacker" diff --git a/bin/webpack-dev-server b/bin/shakapacker-dev-server similarity index 70% rename from bin/webpack-dev-server rename to bin/shakapacker-dev-server index 471298aa..0226ffec 100755 --- a/bin/webpack-dev-server +++ b/bin/shakapacker-dev-server @@ -3,4 +3,4 @@ Dir.chdir("development_app") -load "bin/webpack-dev-server" +load "bin/shakapacker-dev-server" diff --git a/config/assets.rb b/config/assets.rb index 72c0555f..2675f0d5 100644 --- a/config/assets.rb +++ b/config/assets.rb @@ -19,15 +19,17 @@ # SCSS files within the entrypoints, they become available for inclusion using # `stylesheet_pack_tag`. Decidim::Webpacker.register_entrypoints( + decidim_vocdoni: "#{base_path}/app/packs/entrypoints/decidim_vocdoni.js", decidim_vocdoni_admin: "#{base_path}/app/packs/entrypoints/admin/decidim_vocdoni_admin.js", + decidim_vocdoni_elections: "#{base_path}/app/packs/entrypoints/decidim_vocdoni_elections.js", decidim_vocdoni_update_results: "#{base_path}/app/packs/entrypoints/decidim_vocdoni_update-results.js", - decidim_vocdoni_admin_stylesheet: "#{base_path}/app/packs/entrypoints/admin/decidim_vocdoni_admin_stylesheet.js", + decidim_vocdoni_admin_stylesheet: "#{base_path}/app/packs/entrypoints/admin/decidim_vocdoni_admin.js", decidim_vocdoni_voter_new_vote: "#{base_path}/app/packs/entrypoints/decidim_vocdoni_voter_new-vote.js", decidim_vocdoni_voter_setup_preview: "#{base_path}/app/packs/entrypoints/decidim_vocdoni_voter_setup-preview.js", decidim_vocdoni_voter_setup_vote: "#{base_path}/app/packs/entrypoints/decidim_vocdoni_voter_setup-vote.js" ) -Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/vocdoni/vocdoni") +Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/vocdoni/vocdoni_application") # If you want to import some extra SCSS files in the Decidim main SCSS file # without adding any extra stylesheet inclusion tags, you can use the following diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index 97765cd2..01dfd91a 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -1,7 +1,7 @@ --- base_locale: en -locales: [en] +locales: [ en ] ignore_unused: - "activemodel.attributes.election.{description,end_time,secret_until_the_end,start_time,stream_uri,title}" @@ -30,6 +30,26 @@ ignore_unused: - "decidim.vocdoni.admin.elections.new.questions" - "decidim.vocdoni.admin.elections.new.results" - "decidim.vocdoni.admin.steps.danger_zone.action.{paused,start,created,vote}" + - "decidim.vocdoni.admin.steps.danger_zone.messages.created" + - "decidim.vocdoni.admin.steps.danger_zone.messages.paused" + - "decidim.vocdoni.admin.steps.danger_zone.messages.vote" + - "decidim.vocdoni.elections.election_m.badge_name.canceled" + - "decidim.vocdoni.elections.election_m.badge_name.finished" + - "decidim.vocdoni.elections.election_m.badge_name.ongoing" + - "decidim.vocdoni.elections.election_m.badge_name.paused" + - "decidim.vocdoni.elections.election_m.badge_name.upcoming" + - "decidim.vocdoni.elections.elections.filters.canceled" + - "decidim.vocdoni.elections.elections.filters.date" + - "decidim.vocdoni.elections.elections.filters.paused" + - "decidim.vocdoni.elections.orders.label" + - "decidim.vocdoni.elections.orders.older" + - "decidim.vocdoni.elections.orders.recent" + - "decidim.vocdoni.votes.confirm.answer" + - "decidim.vocdoni.votes.header.confirm" + - "decidim.vocdoni.votes.header.failed" + - "decidim.vocdoni.votes.header.login" + - "decidim.vocdoni.votes.header.submitting" + - "decidim.vocdoni.votes.header.vote_cast" # To be removed once the header image is no longer necessary by the Vocdoni SDK - "decidim.admin.shared.gallery.gallery_legend" diff --git a/config/locales/en.yml b/config/locales/en.yml index 962d461e..d938144f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -438,6 +438,26 @@ en: elections_count: one: "%{count} election" other: "%{count} elections" + election_m: + badge_name: + canceled: Canceled + finished: Finished + ongoing: Active + paused: Paused + upcoming: Upcoming + elections: + filters: + active: Active + all: All + canceled: Canceled + date: Date + finished: Finished + paused: Paused + upcoming: Upcoming + orders: + label: Orders + older: Older + recent: Recent preview: available_answers: 'Available answers:' description: 'These are the questions for this voting process:' @@ -567,6 +587,8 @@ en: continue: Next warnings: no_elections_warning: There isn't any election scheduled. + no_scheduled_elections_warning: Currently, there are no scheduled elections, + but here you can find all the past elections listed. layouts: decidim: vocdoni_votes_header: diff --git a/db/migrate/20231107142971_add_census_data_to_decidim_vocdoni_elections.rb b/db/migrate/20231107142971_add_census_data_to_decidim_vocdoni_elections.rb index 274e9b07..f151b89b 100644 --- a/db/migrate/20231107142971_add_census_data_to_decidim_vocdoni_elections.rb +++ b/db/migrate/20231107142971_add_census_data_to_decidim_vocdoni_elections.rb @@ -2,11 +2,11 @@ class AddCensusDataToDecidimVocdoniElections < ActiveRecord::Migration[6.1] def change - add_column :decidim_vocdoni_elections, :internal_census, :boolean, default: false + add_column :decidim_vocdoni_elections, :internal_census, :boolean, default: false, null: false add_column :decidim_vocdoni_elections, :verification_types, :string, array: true, default: [] add_column :decidim_vocdoni_elections, :census_attributes, :jsonb, default: {} add_column :decidim_vocdoni_elections, :last_census_update_records_added, :integer add_column :decidim_vocdoni_elections, :census_last_updated_at, :datetime - add_column :decidim_vocdoni_voters, :in_vocdoni_census, :boolean, default: false + add_column :decidim_vocdoni_voters, :in_vocdoni_census, :boolean, default: false, null: false end end diff --git a/db/migrate/20240516163557_add_answers_count_to_decidim_vocdoni_questions.rb b/db/migrate/20240516163557_add_answers_count_to_decidim_vocdoni_questions.rb new file mode 100644 index 00000000..c8c90544 --- /dev/null +++ b/db/migrate/20240516163557_add_answers_count_to_decidim_vocdoni_questions.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddAnswersCountToDecidimVocdoniQuestions < ActiveRecord::Migration[6.1] + def change + add_column :decidim_vocdoni_questions, :answers_count, :integer, default: 0, null: false + end +end diff --git a/decidim-vocdoni.gemspec b/decidim-vocdoni.gemspec index 44e299aa..0bcbe390 100644 --- a/decidim-vocdoni.gemspec +++ b/decidim-vocdoni.gemspec @@ -10,14 +10,15 @@ Gem::Specification.new do |s| s.email = ["andreslucena@gmail.com", "anna@pokecode.net", "ivan@pokecode.net"] s.license = "AGPL-3.0" s.homepage = "https://github.com/decidim-vocdoni/decidim-module-vocdoni" - s.required_ruby_version = ">= 3.0" + s.required_ruby_version = ">= 3.1" s.name = "decidim-vocdoni" s.summary = "A decidim vocdoni module" s.description = "An elections component for decidim's participatory spaces based on the Vocdoni SDK." - s.files = Dir["{app,db,config,lib}/**/*", "LICENSE-AGPLv3.txt", "Rakefile", "README.md"] + s.files = Dir["{app,db,config,lib,node-wrapper}/**/*", "package.json", "package-lock.json", "LICENSE-AGPLv3.txt", "Rakefile", "README.md"] + s.add_dependency "decidim-admin", Decidim::Vocdoni::DECIDIM_COMPAT_VERSION s.add_dependency "decidim-core", Decidim::Vocdoni::DECIDIM_COMPAT_VERSION s.add_dependency "node-runner", "~> 1.1" s.metadata["rubygems_mfa_required"] = "true" diff --git a/lib/decidim/api/vocdoni_elections_type.rb b/lib/decidim/api/vocdoni_elections_type.rb index 739d5545..32130444 100644 --- a/lib/decidim/api/vocdoni_elections_type.rb +++ b/lib/decidim/api/vocdoni_elections_type.rb @@ -25,7 +25,7 @@ def election(**args) module VocdoniElectionsTypeHelper def self.base_scope(component) - Election.where(component: component).where.not(published_at: nil) + Election.where(component:).where.not(published_at: nil) end end end diff --git a/lib/decidim/vocdoni/admin_engine.rb b/lib/decidim/vocdoni/admin_engine.rb index 6fc2a8e3..68d4f6e1 100644 --- a/lib/decidim/vocdoni/admin_engine.rb +++ b/lib/decidim/vocdoni/admin_engine.rb @@ -35,6 +35,13 @@ class AdminEngine < ::Rails::Engine root to: "elections#index" end + initializer "decidim_admin.register_icons" do + Decidim.icons.register(name: "bank-card-line", icon: "bank-card-line", category: "system", description: "", engine: :vocdoni) + Decidim.icons.register(name: "pause-circle-line", icon: "pause-circle-line", category: "system", description: "", engine: :vocdoni) + Decidim.icons.register(name: "play-circle-line", icon: "play-circle-line", category: "system", description: "", engine: :vocdoni) + Decidim.icons.register(name: "stop-circle-line", icon: "stop-circle-line", category: "system", description: "", engine: :vocdoni) + end + def load_seed nil end diff --git a/lib/decidim/vocdoni/component.rb b/lib/decidim/vocdoni/component.rb index 95a16e3f..aaee7ccc 100644 --- a/lib/decidim/vocdoni/component.rb +++ b/lib/decidim/vocdoni/component.rb @@ -45,7 +45,7 @@ name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :vocdoni).i18n_name, manifest_name: :vocdoni, published_at: Time.current, - participatory_space: participatory_space + participatory_space: } component = Decidim.traceability.perform_action!( @@ -82,17 +82,17 @@ end params = { - component: component, + component:, title: Decidim::Faker::Localized.sentence(word_count: 2), stream_uri: Faker::Internet.url, description: Decidim::Faker::Localized.wrapped("", "
") do Decidim::Faker::Localized.paragraph(sentence_count: 3) end, start_time: auto_start ? start_time : 30.seconds.from_now, - end_time: end_time, + end_time:, published_at: Faker::Boolean.boolean(true_ratio: 0.5) ? 1.week.ago : nil, election_type: { - auto_start: auto_start, + auto_start:, interruptible: true, dynamic_census: [true, false].sample, secret_until_the_end: [true, false].sample, @@ -127,7 +127,7 @@ Decidim::Vocdoni::Question, admin_user, { - election: election, + election:, title: Decidim::Faker::Localized.sentence(word_count: 2), description: Decidim::Faker::Localized.wrapped("", "
") do Decidim::Faker::Localized.paragraph(sentence_count: 3) @@ -142,7 +142,7 @@ Decidim::Vocdoni::Answer, admin_user, { - question: question, + question:, title: Decidim::Faker::Localized.sentence(word_count: 2), description: Decidim::Faker::Localized.wrapped("", "
") do Decidim::Faker::Localized.paragraph(sentence_count: 3) diff --git a/lib/decidim/vocdoni/election_status_changer.rb b/lib/decidim/vocdoni/election_status_changer.rb index 56bc0ca0..50428545 100644 --- a/lib/decidim/vocdoni/election_status_changer.rb +++ b/lib/decidim/vocdoni/election_status_changer.rb @@ -36,7 +36,7 @@ def update_elections_status(elections, status) puts "Changing #{elections.count} election to '#{status}' status" # rubocop:enable Rails/Output # rubocop:disable Rails/SkipsModelValidations - elections.update_all(status: status) + elections.update_all(status:) # rubocop:enable Rails/SkipsModelValidations end end diff --git a/lib/decidim/vocdoni/engine.rb b/lib/decidim/vocdoni/engine.rb index 91c2f15e..fd658ade 100644 --- a/lib/decidim/vocdoni/engine.rb +++ b/lib/decidim/vocdoni/engine.rb @@ -2,6 +2,7 @@ require "rails" require "decidim/core" +require "active_support/all" module Decidim module Vocdoni @@ -29,6 +30,12 @@ class Engine < ::Rails::Engine initializer "decidim_vocdoni.webpacker.assets_path" do Decidim.register_assets_path File.expand_path("app/packs", root) end + + initializer "decidim.vocdoni.register_icons" do + Decidim.icons.register(name: "book-2-line", icon: "book-2-line", category: "system", description: "", engine: :vocdoni) + Decidim.icons.register(name: "checkbox-multiple-line", icon: "checkbox-multiple-line", category: "system", description: "", engine: :vocdoni) + Decidim.icons.register(name: "bar-chart-box-line", icon: "bar-chart-box-line", category: "system", description: "", engine: :vocdoni) + end end end end diff --git a/lib/decidim/vocdoni/test/factories.rb b/lib/decidim/vocdoni/test/factories.rb index e5032f71..1166a0de 100644 --- a/lib/decidim/vocdoni/test/factories.rb +++ b/lib/decidim/vocdoni/test/factories.rb @@ -11,12 +11,12 @@ factory :vocdoni_component, parent: :component do name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :vocdoni).i18n_name } manifest_name { :vocdoni } - participatory_space { create(:participatory_process, :with_steps) } + participatory_space { association :participatory_process, :with_steps } end factory :vocdoni_election, class: "Decidim::Vocdoni::Election" do transient do - organization { build(:organization) } + organization { association :organization } end upcoming @@ -35,7 +35,7 @@ "secret_until_the_end" => true } end - component { create(:vocdoni_component, organization: organization) } + component { association :vocdoni_component, organization: } trait :configured do status { "created" } @@ -93,9 +93,9 @@ status { "results_published" } after(:build) do |election, _evaluator| - election.questions << build(:vocdoni_question, :with_votes, election: election, weight: 1) - election.questions << build(:vocdoni_question, :with_votes, election: election, weight: 1) - election.questions << build(:vocdoni_question, :with_votes, election: election, weight: 1) + election.questions << build(:vocdoni_question, :with_votes, election:, weight: 1) + election.questions << build(:vocdoni_question, :with_votes, election:, weight: 1) + election.questions << build(:vocdoni_question, :with_votes, election:, weight: 1) end end @@ -125,25 +125,25 @@ trait :simple do after(:build) do |election, _evaluator| - election.questions << build(:vocdoni_question, :simple, election: election, weight: 1) + election.questions << build(:vocdoni_question, :simple, election:, weight: 1) end end trait :complete do after(:build) do |election, _evaluator| - election.questions << build(:vocdoni_question, :simple, election: election, weight: 1) - election.questions << build(:vocdoni_question, :simple, election: election, weight: 1) - election.questions << build(:vocdoni_question, :simple, election: election, weight: 1) + election.questions << build(:vocdoni_question, :simple, election:, weight: 1) + election.questions << build(:vocdoni_question, :simple, election:, weight: 1) + election.questions << build(:vocdoni_question, :simple, election:, weight: 1) end end trait :with_census do after(:build) do |election, _evaluator| - election.voters << build(:vocdoni_voter, :with_wallet, election: election) - election.voters << build(:vocdoni_voter, :with_wallet, election: election) - election.voters << build(:vocdoni_voter, :with_wallet, election: election) - election.voters << build(:vocdoni_voter, :with_wallet, election: election) - election.voters << build(:vocdoni_voter, :with_wallet, election: election) + election.voters << build(:vocdoni_voter, :with_wallet, election:) + election.voters << build(:vocdoni_voter, :with_wallet, election:) + election.voters << build(:vocdoni_voter, :with_wallet, election:) + election.voters << build(:vocdoni_voter, :with_wallet, election:) + election.voters << build(:vocdoni_voter, :with_wallet, election:) end end @@ -179,21 +179,21 @@ answers { 3 } end - association :election, factory: :vocdoni_election + election factory: [:vocdoni_election] title { generate_localized_title } description { Decidim::Faker::Localized.wrapped("", "
") { generate_localized_title } } weight { Faker::Number.number(digits: 1) } trait :complete do after(:build) do |question, evaluator| - overrides = { question: question } + overrides = { question: } question.answers = build_list(:vocdoni_election_answer, evaluator.answers, overrides) end end trait :with_votes do after(:build) do |question, evaluator| - overrides = { question: question } + overrides = { question: } overrides[:description] = nil unless evaluator.more_information question.answers = build_list(:vocdoni_election_answer, evaluator.answers, :with_votes, overrides) end @@ -205,7 +205,7 @@ end factory :vocdoni_election_answer, class: "Decidim::Vocdoni::Answer" do - association :question, factory: :vocdoni_question + question factory: [:vocdoni_question] title { generate_localized_title } description { Decidim::Faker::Localized.wrapped("", "
") { generate_localized_title } } weight { Faker::Number.number(digits: 1) } @@ -234,7 +234,7 @@ factory :vocdoni_voter, class: "Decidim::Vocdoni::Voter" do email { generate(:email) } token { Faker::String.random(length: 4) } - association :election, factory: :vocdoni_election + election factory: [:vocdoni_election] trait :with_wallet do wallet_address { Faker::Blockchain::Ethereum.address } diff --git a/lib/decidim/vocdoni/version.rb b/lib/decidim/vocdoni/version.rb index 4db19d26..f2f70174 100644 --- a/lib/decidim/vocdoni/version.rb +++ b/lib/decidim/vocdoni/version.rb @@ -3,11 +3,11 @@ module Decidim # This holds the decidim-meetings version. module Vocdoni - DECIDIM_VERSION = "0.27.6" - DECIDIM_COMPAT_VERSION = ">= 0.27" + DECIDIM_VERSION = "0.28.1" + DECIDIM_COMPAT_VERSION = [">= 0.28.0", "< 0.29"].freeze def self.version - "1.0" + "2.0" end end end diff --git a/package-lock.json b/package-lock.json index 8249c5d3..98741d1f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,34 +1,31 @@ { "name": "decidim-vocdoni", - "version": "1.0.0", + "version": "2.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "decidim-vocdoni", - "version": "1.0.0", + "version": "2.0.0", "license": "AGPL-3.0", "dependencies": { "@vocdoni/sdk": "0.8.0" }, "devDependencies": { "@babel/eslint-parser": "^7.19.1", - "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-private-methods": "^7.18.6", - "@babel/plugin-proposal-private-property-in-object": "^7.20.5", + "@babel/plugin-transform-class-properties": "^7.24.1", "@babel/plugin-transform-classes": "^7.20.7", "@babel/plugin-transform-regenerator": "^7.20.5", "@babel/plugin-transform-runtime": "^7.19.6", "@babel/preset-env": "^7.20.2", "@babel/preset-react": "^7.18.6", - "@decidim/dev": "0.27.6", - "@decidim/eslint-config": "0.27.6", - "@decidim/stylelint-config": "0.27.6", - "eslint-config-prettier": "^8.5.0", - "eslint-config-standard": "^11.0.0", - "eslint-plugin-import": "^2.22.0", - "eslint-plugin-standard": "^3.1.0", + "@decidim/dev": "0.28.1", + "@decidim/eslint-config": "0.28.1", + "@decidim/prettier-config": "0.28.1", + "@decidim/stylelint-config": "0.28.1", + "postcss-scss": "^4.0.9", "sass-embedded": "~1.57.1", + "snarkjs": "vocdoni/snarkjs#v0.7.0-groth16browser", "web-worker": "1.2.0" } }, @@ -184,9 +181,9 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.23.10", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.10.tgz", - "integrity": "sha512-2XpP2XhkXzgxecPNEEK8Vz8Asj9aRxt08oKOqtiZoqV2UGZ5T+EkyP9sXQ9nwMxBIG34a7jmasVqoMop7VdPUw==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.4.tgz", + "integrity": "sha512-lG75yeuUSVu0pIcbhiYMXBXANHrpUPaOfu7ryAzskCgKUHuAxRQI5ssrtmF0X9UXldPlvT0XM/A4F44OXRt6iQ==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", @@ -194,7 +191,7 @@ "@babel/helper-function-name": "^7.23.0", "@babel/helper-member-expression-to-functions": "^7.23.0", "@babel/helper-optimise-call-expression": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.20", + "@babel/helper-replace-supers": "^7.24.1", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", "semver": "^6.3.1" @@ -329,9 +326,9 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", - "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz", + "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==", "dev": true, "engines": { "node": ">=6.9.0" @@ -355,13 +352,13 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz", - "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz", + "integrity": "sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==", "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-member-expression-to-functions": "^7.22.15", + "@babel/helper-member-expression-to-functions": "^7.23.0", "@babel/helper-optimise-call-expression": "^7.22.5" }, "engines": { @@ -537,59 +534,6 @@ "@babel/core": "^7.0.0" } }, - "node_modules/@babel/plugin-proposal-class-properties": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", - "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", - "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.", - "dev": true, - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-private-methods": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz", - "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==", - "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead.", - "dev": true, - "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-proposal-private-property-in-object": { - "version": "7.21.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz", - "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==", - "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-create-class-features-plugin": "^7.21.0", - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/plugin-syntax-private-property-in-object": "^7.14.5" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/plugin-syntax-async-generators": { "version": "7.8.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", @@ -921,13 +865,13 @@ } }, "node_modules/@babel/plugin-transform-class-properties": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz", - "integrity": "sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.1.tgz", + "integrity": "sha512-OMLCXi0NqvJfORTaPQBwqLXHhb93wkBKZ4aNwMl6WtehO7ar+cmp+89iPEQPqxAnxsOKTaMcs3POz3rKayJ72g==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.22.15", - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-create-class-features-plugin": "^7.24.1", + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -954,17 +898,17 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.23.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz", - "integrity": "sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.1.tgz", + "integrity": "sha512-ZTIe3W7UejJd3/3R4p7ScyyOoafetUShSf4kCqV0O7F/RiHxVj/wRaRnQlrGwflvcehNA8M42HkAiEDYZu2F1Q==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-function-name": "^7.23.0", - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.20", + "@babel/helper-plugin-utils": "^7.24.0", + "@babel/helper-replace-supers": "^7.24.1", "@babel/helper-split-export-declaration": "^7.22.6", "globals": "^11.1.0" }, @@ -1904,62 +1848,214 @@ "node": ">=6.9.0" } }, + "node_modules/@csstools/css-parser-algorithms": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.6.0.tgz", + "integrity": "sha512-YfEHq0eRH98ffb5/EsrrDspVWAuph6gDggAE74ZtjecsmyyWpW768hOyiONa8zwWGbIWYfa2Xp4tRTrpQQ00CQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "peer": true, + "engines": { + "node": "^14 || ^16 || >=18" + }, + "peerDependencies": { + "@csstools/css-tokenizer": "^2.2.3" + } + }, + "node_modules/@csstools/css-tokenizer": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.2.3.tgz", + "integrity": "sha512-pp//EvZ9dUmGuGtG1p+n17gTHEOqu9jO+FiCUjNN3BDmyhdA2Jq9QsVeR7K8/2QCK17HSsioPlTW9ZkzoWb3Lg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "peer": true, + "engines": { + "node": "^14 || ^16 || >=18" + } + }, + "node_modules/@csstools/media-query-list-parser": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.8.tgz", + "integrity": "sha512-DiD3vG5ciNzeuTEoh74S+JMjQDs50R3zlxHnBnfd04YYfA/kh2KiBCGhzqLxlJcNq+7yNQ3stuZZYLX6wK/U2g==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "peer": true, + "engines": { + "node": "^14 || ^16 || >=18" + }, + "peerDependencies": { + "@csstools/css-parser-algorithms": "^2.6.0", + "@csstools/css-tokenizer": "^2.2.3" + } + }, + "node_modules/@csstools/selector-specificity": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.2.tgz", + "integrity": "sha512-RpHaZ1h9LE7aALeQXmXrJkRG84ZxIsctEN2biEUmFyKpzFM3zZ35eUMcIzZFsw/2olQE6v69+esEqU2f1MKycg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "peer": true, + "engines": { + "node": "^14 || ^16 || >=18" + }, + "peerDependencies": { + "postcss-selector-parser": "^6.0.13" + } + }, "node_modules/@decidim/dev": { - "version": "0.27.6", - "resolved": "https://registry.npmjs.org/@decidim/dev/-/dev-0.27.6.tgz", - "integrity": "sha512-dDCVCEXTCzmB113rN/AXcG5KWHZzcFPRM9DmRUKqP2b6gySfe79RLt3/blZs8l22167QxM/Fqjr3UrtuDIxyvQ==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@decidim/dev/-/dev-0.28.1.tgz", + "integrity": "sha512-s3TwpmhZLwXXzafg7NoFxNoWUgPEEC9exH3fye+gx8PcPWAFcAlebgsONG8/TB0R3ikDcfI8fy6IHt4baVVpdg==", "dev": true, "dependencies": { - "axe-core": "^4.1.4" + "@linthtml/linthtml": "^0.9.6", + "axe-core": "^4.7.2", + "markdownlint-cli": "^0.35.0" } }, "node_modules/@decidim/eslint-config": { - "version": "0.27.6", - "resolved": "https://registry.npmjs.org/@decidim/eslint-config/-/eslint-config-0.27.6.tgz", - "integrity": "sha512-tmYhIbrSPBoWwDopFkZP1BejqHhZPHAvAjJh0wxOhXWTqQZ9l3qgFy+E0hW14CnsKgQ46lGXkI5D2gxS+VvMmg==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@decidim/eslint-config/-/eslint-config-0.28.1.tgz", + "integrity": "sha512-5HmLnR3+6JOYssOGqLHYmsfsk9MBX8LP3MXcsLjkCw3Rk9toHFHrRPj6mwwEAxLHFlO3QsJel/hLHpP9cHcVgA==", "dev": true, "peerDependencies": { - "eslint": "^7.25.0", - "eslint-config-prettier": "^8.2.0", - "eslint-config-standard": "^11.0.0", - "eslint-plugin-import": "^2.22.0", - "eslint-plugin-jsx-a11y": "^6.3.1", + "eslint": "^8.7.0", + "eslint-config-airbnb": "^19.0.4", + "eslint-config-prettier": "^8.8.0", + "eslint-config-standard": "^17.0.0", + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-jsx-a11y": "^6.7.1", + "eslint-plugin-no-relative-import-paths": "^1.5.3", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-promise": "^3.8.0", - "eslint-plugin-react": "^7.20.6", - "eslint-plugin-standard": "^3.1.0" + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-react": "^7.32.2" + } + }, + "node_modules/@decidim/prettier-config": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@decidim/prettier-config/-/prettier-config-0.28.1.tgz", + "integrity": "sha512-fmjs6hcWkcm+9BmFlDCDCAzBXeFn/1J8vlmgSFcoEZyukM3rE4NQIS2AsypP2CcuA3st9Ybn0uf1Mrx9u+rHdA==", + "dev": true, + "peerDependencies": { + "prettier": "^2.3.2" } }, "node_modules/@decidim/stylelint-config": { - "version": "0.27.6", - "resolved": "https://registry.npmjs.org/@decidim/stylelint-config/-/stylelint-config-0.27.6.tgz", - "integrity": "sha512-qcHP1rR3GOLFN0uggKk6gg371dhLCTDDNgDWD0dtFvlDuBxchh0QfHJ+PBZpNDeG3h6tVPOq5ruLhUIC3UWG8w==", + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@decidim/stylelint-config/-/stylelint-config-0.28.1.tgz", + "integrity": "sha512-AT+NsVMA0DZOKuFse9tTYDfV5En4wwNZ6txbLGZh8VE5EDk1v2yr7eVdi+Y7CA3LHbzW1q7SbFr5SRfdMxhntw==", + "dev": true, + "peerDependencies": { + "stylelint": "^15.3.0", + "stylelint-prettier": "^3.0.0" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", "dev": true, + "peer": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, "peerDependencies": { - "stylelint": "13.11.0" + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "peer": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "dev": true, + "peer": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/eslintrc": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", - "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", "dev": true, "peer": true, "dependencies": { "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", - "globals": "^13.9.0", - "ignore": "^4.0.6", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, + "node_modules/@eslint/eslintrc/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "peer": true + }, "node_modules/@eslint/eslintrc/node_modules/globals": { "version": "13.24.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", @@ -1976,6 +2072,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@eslint/eslintrc/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "peer": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/@eslint/eslintrc/node_modules/type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", @@ -1989,6 +2098,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@eslint/js": { + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", + "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "dev": true, + "peer": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, "node_modules/@ethersproject/abstract-provider": { "version": "5.7.0", "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.7.0.tgz", @@ -2585,31 +2704,135 @@ } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", - "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", + "version": "0.11.14", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", + "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", "dev": true, "peer": true, "dependencies": { - "@humanwhocodes/object-schema": "^1.2.0", - "debug": "^4.1.1", - "minimatch": "^3.0.4" + "@humanwhocodes/object-schema": "^2.0.2", + "debug": "^4.3.1", + "minimatch": "^3.0.5" }, "engines": { "node": ">=10.10.0" } }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "peer": true, + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz", + "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==", "dev": true, "peer": true }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.4.tgz", + "integrity": "sha512-Oud2QPM5dHviZNn4y/WhhYKSXksv+1xLEIsNrAbGcFzUN3ubqWRFT5gwPchNc5NuzILOU4tPBDTZ4VwhL8Y7cw==", "dev": true, "peer": true, "dependencies": { @@ -2622,9 +2845,9 @@ } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", - "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", "dev": true, "peer": true, "engines": { @@ -2649,9 +2872,9 @@ "peer": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.22", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz", - "integrity": "sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==", + "version": "0.3.23", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.23.tgz", + "integrity": "sha512-9/4foRoUKp8s96tSkh8DlAAc5A0Ty8vLXld+l9gjKKY6ckwI8G15f0hskGmuLZu78ZlGa1vtsfOa+lnB4vG6Jg==", "dev": true, "peer": true, "dependencies": { @@ -2659,33 +2882,159 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { - "version": "5.1.1-v1", - "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", - "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==", + "node_modules/@linthtml/cli": { + "version": "0.9.5", + "resolved": "https://registry.npmjs.org/@linthtml/cli/-/cli-0.9.5.tgz", + "integrity": "sha512-QA61Fhb6T1ho8jPbbZBoqd5dfiuRtg/61dJgKt08NDrCAiwZeftX0nVjzXJq1BpQzLY7VzugGMnZxWq5IYy64g==", "dev": true, "dependencies": { - "eslint-scope": "5.1.1" + "chalk": "4.1.1", + "inquirer": "^8.1.1", + "js-yaml": "^3.14.0", + "kebabcase": "1.0.1", + "lodash.kebabcase": "^4.1.1", + "meow": "^9.0.0", + "ora": "^5.3.0", + "table-layout": "1.0.1" } }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "peer": true, + "node_modules/@linthtml/cli/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" + "color-convert": "^2.0.1" }, "engines": { - "node": ">= 8" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "peer": true, + "node_modules/@linthtml/cli/node_modules/chalk": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@linthtml/cli/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@linthtml/cli/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/@linthtml/cli/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@linthtml/cli/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@linthtml/dom-utils": { + "version": "0.9.5", + "resolved": "https://registry.npmjs.org/@linthtml/dom-utils/-/dom-utils-0.9.5.tgz", + "integrity": "sha512-q7riY+zNsTJeD0IoRV+0VdlFu2Y5jxxFCtlw97espB7+LiQalvJV/o3bn27DuQ8U6KPbFeFDjkfS8DX5tD+Ggg==", + "dev": true, + "dependencies": { + "domelementtype": "^2.2.0", + "domhandler": "^4.2.2" + } + }, + "node_modules/@linthtml/html-parser": { + "version": "0.9.5", + "resolved": "https://registry.npmjs.org/@linthtml/html-parser/-/html-parser-0.9.5.tgz", + "integrity": "sha512-dvh7+jhGlAVOowlBA5Opy4PjIyT672CLyOVhiPVfkkcJkZSDKcM1GAEPhwtEAWJjdk8rpS7JaQjkZBjqHqWn5g==", + "dev": true, + "dependencies": { + "@linthtml/dom-utils": "^0.9.5", + "domhandler": "^4.2.2", + "htmlparser2": "^7.1.2" + } + }, + "node_modules/@linthtml/linthtml": { + "version": "0.9.6", + "resolved": "https://registry.npmjs.org/@linthtml/linthtml/-/linthtml-0.9.6.tgz", + "integrity": "sha512-balMwDpl0GKq0x35aFSsEuPKUyn2qoz793SprRZvFu30kfdXldH5TBXsud1ltf/N2RIEQctK3xkdtBKbb/ZLYA==", + "dev": true, + "dependencies": { + "@linthtml/cli": "^0.9.3", + "@linthtml/dom-utils": "^0.9.0", + "@linthtml/html-parser": "^0.9.0", + "bulk-require": "1.0.1", + "cosmiconfig": "7.0.0", + "global-modules": "^2.0.0", + "globby": "^11.0.2", + "ignore": "^5.1.4", + "lodash.pull": "4.1.0", + "resolve-from": "^5.0.0" + }, + "bin": { + "linthtml": "bin/linthtml.js" + } + }, + "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { + "version": "5.1.1-v1", + "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", + "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==", + "dev": true, + "dependencies": { + "eslint-scope": "5.1.1" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "engines": { "node": ">= 8" } @@ -2694,7 +3043,6 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "peer": true, "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -2703,6 +3051,16 @@ "node": ">= 8" } }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=14" + } + }, "node_modules/@protobufjs/aspromise": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz", @@ -2801,64 +3159,23 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, - "node_modules/@stylelint/postcss-css-in-js": { - "version": "0.37.3", - "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.3.tgz", - "integrity": "sha512-scLk3cSH1H9KggSniseb2KNAU5D9FWc3H7BxCSAIdtU9OWIyw0zkEZ9qEKHryRM+SExYXRKNb7tOOVNAsQ3iwg==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", - "dev": true, - "peer": true, - "dependencies": { - "@babel/core": "^7.17.9" - }, - "peerDependencies": { - "postcss": ">=7.0.0", - "postcss-syntax": ">=0.36.2" - } - }, - "node_modules/@stylelint/postcss-markdown": { - "version": "0.36.2", - "resolved": "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz", - "integrity": "sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==", - "deprecated": "Use the original unforked package instead: postcss-markdown", - "dev": true, - "peer": true, - "dependencies": { - "remark": "^13.0.0", - "unist-util-find-all-after": "^3.0.2" - }, - "peerDependencies": { - "postcss": ">=7.0.0", - "postcss-syntax": ">=0.36.2" - } - }, "node_modules/@types/json5": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", - "dev": true + "dev": true, + "peer": true }, "node_modules/@types/lodash": { "version": "4.14.202", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz", "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==" }, - "node_modules/@types/mdast": { - "version": "3.0.15", - "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.15.tgz", - "integrity": "sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==", - "dev": true, - "peer": true, - "dependencies": { - "@types/unist": "^2" - } - }, "node_modules/@types/minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz", "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@types/node": { "version": "20.12.11", @@ -2872,20 +3189,18 @@ "version": "2.4.4", "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@types/parse-json": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==", - "dev": true, - "peer": true + "dev": true }, - "node_modules/@types/unist": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz", - "integrity": "sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA==", + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", "dev": true, "peer": true }, @@ -2943,9 +3258,9 @@ } }, "node_modules/acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "version": "8.11.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", + "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", "dev": true, "peer": true, "bin": { @@ -2987,14 +3302,19 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", "dev": true, - "peer": true, + "dependencies": { + "type-fest": "^0.21.3" + }, "engines": { - "node": ">=6" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/ansi-regex": { @@ -3002,7 +3322,6 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, - "peer": true, "engines": { "node": ">=8" } @@ -3037,7 +3356,6 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, - "peer": true, "dependencies": { "sprintf-js": "~1.0.2" } @@ -3052,11 +3370,21 @@ "dequal": "^2.0.3" } }, + "node_modules/array-back": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz", + "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/array-buffer-byte-length": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.5", "is-array-buffer": "^3.0.4" @@ -3073,6 +3401,7 @@ "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -3091,7 +3420,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "peer": true, "engines": { "node": ">=8" } @@ -3101,6 +3429,7 @@ "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz", "integrity": "sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -3120,6 +3449,7 @@ "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz", "integrity": "sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.5", "define-properties": "^1.2.1", @@ -3139,6 +3469,7 @@ "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -3157,6 +3488,7 @@ "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -3189,6 +3521,7 @@ "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", "dev": true, + "peer": true, "dependencies": { "array-buffer-byte-length": "^1.0.1", "call-bind": "^1.0.5", @@ -3211,7 +3544,6 @@ "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", "dev": true, - "peer": true, "engines": { "node": ">=0.10.0" } @@ -3248,41 +3580,15 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, - "node_modules/autoprefixer": { - "version": "9.8.8", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz", - "integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==", + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", "dev": true, "peer": true, "dependencies": { - "browserslist": "^4.12.0", - "caniuse-lite": "^1.0.30001109", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "picocolors": "^0.2.1", - "postcss": "^7.0.32", - "postcss-value-parser": "^4.1.0" - }, - "bin": { - "autoprefixer": "bin/autoprefixer" + "possible-typed-array-names": "^1.0.0" }, - "funding": { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/autoprefixer" - } - }, - "node_modules/autoprefixer/node_modules/picocolors": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", - "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", - "dev": true, - "peer": true - }, - "node_modules/available-typed-arrays": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.6.tgz", - "integrity": "sha512-j1QzY8iPNPG4o4xmO3ptzpRxTciqD3MgEHtifP/YnJpIo58Xu+ne4BejlbkuaLfXn/nz6HFiw29bLpj2PNMdGg==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -3291,9 +3597,9 @@ } }, "node_modules/axe-core": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.8.3.tgz", - "integrity": "sha512-d5ZQHPSPkF9Tw+yfyDcRoUOc4g/8UloJJe5J8m4L5+c7AtDdjDLRxew/knnI4CxvtdxEUVgWz4x3OIQUIFiMfw==", + "version": "4.8.4", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.8.4.tgz", + "integrity": "sha512-CZLSKisu/bhJ2awW4kJndluz2HLZYIHh5Uy1+ZwDRkJi69811xgIXXfdU9HSLX0Th+ILrHj8qfL/5wzamsFtQg==", "dev": true, "engines": { "node": ">=4" @@ -3362,17 +3668,6 @@ "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, - "node_modules/bail": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz", - "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==", - "dev": true, - "peer": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -3403,6 +3698,22 @@ "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz", "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==" }, + "node_modules/bfj": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/bfj/-/bfj-7.1.0.tgz", + "integrity": "sha512-I6MMLkn+anzNdCUp9hMRyui1HaNEUCco50lxbvNS4+EyXg8lN3nJ48PjPWtbH8UVS9CuMoaKE9U2V3l29DaRQw==", + "dev": true, + "dependencies": { + "bluebird": "^3.7.2", + "check-types": "^11.2.3", + "hoopy": "^0.1.4", + "jsonpath": "^1.1.1", + "tryer": "^1.0.1" + }, + "engines": { + "node": ">= 8.0.0" + } + }, "node_modules/binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -3412,6 +3723,31 @@ "node": ">=8" } }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "dev": true, + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/bl/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/blake2b": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/blake2b/-/blake2b-2.1.4.tgz", @@ -3430,6 +3766,12 @@ "nanoassert": "^2.0.0" } }, + "node_modules/bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", + "dev": true + }, "node_modules/bn.js": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", @@ -3449,7 +3791,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "peer": true, "dependencies": { "fill-range": "^7.0.1" }, @@ -3463,9 +3804,9 @@ "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==" }, "node_modules/browserslist": { - "version": "4.22.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.3.tgz", - "integrity": "sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==", + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", + "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", "dev": true, "funding": [ { @@ -3482,8 +3823,8 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001580", - "electron-to-chromium": "^1.4.648", + "caniuse-lite": "^1.0.30001587", + "electron-to-chromium": "^1.4.668", "node-releases": "^2.0.14", "update-browserslist-db": "^1.0.13" }, @@ -3495,9 +3836,10 @@ } }, "node_modules/buffer": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, "funding": [ { "type": "github", @@ -3514,7 +3856,7 @@ ], "dependencies": { "base64-js": "^1.3.1", - "ieee754": "^1.2.1" + "ieee754": "^1.1.13" } }, "node_modules/buffer-builder": { @@ -3523,59 +3865,126 @@ "integrity": "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg==", "dev": true }, - "node_modules/bytes-iec": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/bytes-iec/-/bytes-iec-3.1.1.tgz", - "integrity": "sha512-fey6+4jDK7TFtFg/klGSvNKJctyU7n2aQdnM+CO0ruLPbqqMOM8Tio0Pc+deqUeVKX1tL5DQep1zQ7+37aTAsA==", - "peer": true, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/call-bind": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.6.tgz", - "integrity": "sha512-Mj50FLHtlsoVfRfnHaZvyrooHcrlceNZdL/QBvJJVd9Ta55qCQK0gs4ss2oZDeV9zFCs6ewzYgVE5yfVmfFpVg==", + "node_modules/builtin-modules": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", + "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", "dev": true, - "dependencies": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.3", - "set-function-length": "^1.2.0" - }, + "peer": true, "engines": { - "node": ">= 0.4" + "node": ">=6" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "node_modules/builtins": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", + "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==", "dev": true, "peer": true, - "engines": { - "node": ">=6" + "dependencies": { + "semver": "^7.0.0" } }, - "node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "node_modules/builtins/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "peer": true, + "dependencies": { + "yallist": "^4.0.0" + }, "engines": { - "node": ">=6" + "node": ">=10" } }, - "node_modules/camelcase-keys": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", - "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", + "node_modules/builtins/node_modules/semver": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "dev": true, + "peer": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/builtins/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "peer": true + }, + "node_modules/bulk-require": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bulk-require/-/bulk-require-1.0.1.tgz", + "integrity": "sha512-BLU9AMnm1FMr68fR0sYvOkMew4x2ZJ8YztshITlGArl6aLtfAazOWiFj/bwJJixRO8C0wXx9PnRNRWeoR03e8Q==", + "dev": true, + "dependencies": { + "glob": "^7.1.1" + } + }, + "node_modules/bytes-iec": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/bytes-iec/-/bytes-iec-3.1.1.tgz", + "integrity": "sha512-fey6+4jDK7TFtFg/klGSvNKJctyU7n2aQdnM+CO0ruLPbqqMOM8Tio0Pc+deqUeVKX1tL5DQep1zQ7+37aTAsA==", + "peer": true, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/call-bind": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dev": true, "peer": true, + "dependencies": { + "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" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase-keys": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", + "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", + "dev": true, "dependencies": { "camelcase": "^5.3.1", "map-obj": "^4.0.0", @@ -3589,9 +3998,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001584", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001584.tgz", - "integrity": "sha512-LOz7CCQ9M1G7OjJOF9/mzmqmj3jE/7VOmrfw6Mgs0E8cjOsbRXQJHsPBfmBOXDskXKrHLyyW3n7kpDW/4BsfpQ==", + "version": "1.0.30001589", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001589.tgz", + "integrity": "sha512-vNQWS6kI+q6sBlHbh71IIeC+sRwK2N3EDySc/updIGhIee2x5z00J4c1242/5/d6EpEMdOnk/m+6tuk4/tcsqg==", "dev": true, "funding": [ { @@ -3622,49 +4031,22 @@ "node": ">=4" } }, - "node_modules/character-entities": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz", - "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==", - "dev": true, - "peer": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/character-entities-legacy": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz", - "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==", - "dev": true, - "peer": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } + "node_modules/chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true }, - "node_modules/character-reference-invalid": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz", - "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==", - "dev": true, - "peer": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } + "node_modules/check-types": { + "version": "11.2.3", + "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.2.3.tgz", + "integrity": "sha512-+67P1GkJRaxQD6PKK0Et9DhwQB+vGg3PM5+aavopCpZT1lj9jeqfvpgTLAWErNj8qApkkmXlu/Ug74kmhagkXg==", + "dev": true }, "node_modules/chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "peer": true, "dependencies": { "anymatch": "~3.1.2", @@ -3678,21 +4060,77 @@ "engines": { "node": ">= 8.10.0" }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, "optionalDependencies": { "fsevents": "~2.3.2" } }, - "node_modules/clone-regexp": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz", - "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==", - "dev": true, + "node_modules/chokidar/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "peer": true, "dependencies": { - "is-regexp": "^2.0.0" + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/circom_runtime": { + "version": "0.1.23", + "resolved": "https://registry.npmjs.org/circom_runtime/-/circom_runtime-0.1.23.tgz", + "integrity": "sha512-S0A63qM5LtlcTgsHX4z/U6nWAKo/KQBrz4umxVMyADPHxt6qDWy2AahPc2lAWQT42cFIDuonFPjgCjviSgQU8A==", + "dev": true, + "dependencies": { + "ffjavascript": "0.2.59" + }, + "bin": { + "calcwit": "calcwit.js" + } + }, + "node_modules/cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "dependencies": { + "restore-cursor": "^3.1.0" }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cli-spinners": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", + "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", + "dev": true, "engines": { "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cli-width": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/clone": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", + "dev": true, + "engines": { + "node": ">=0.8" } }, "node_modules/color-convert": { @@ -3710,6 +4148,13 @@ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", "dev": true }, + "node_modules/colord": { + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", + "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==", + "dev": true, + "peer": true + }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -3721,12 +4166,28 @@ "node": ">= 0.8" } }, + "node_modules/commander": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz", + "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==", + "dev": true, + "engines": { + "node": ">=16" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", "dev": true }, + "node_modules/confusing-browser-globals": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz", + "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==", + "dev": true, + "peer": true + }, "node_modules/convert-source-map": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", @@ -3735,12 +4196,12 @@ "peer": true }, "node_modules/core-js-compat": { - "version": "3.35.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.1.tgz", - "integrity": "sha512-sftHa5qUJY3rs9Zht1WEnmkvXputCyDBczPnr7QDgL8n3qrF3CMXY4VPSYtOLLiOUJcah2WNXREd48iOl6mQIw==", + "version": "3.36.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.36.0.tgz", + "integrity": "sha512-iV9Pd/PsgjNWBXeq8XRtWVSgz2tKAfhfvBs7qxYty+RlRd+OCksaWmOnc4JKrTc1cToXL1N0s3l/vwlxPtdElw==", "dev": true, "dependencies": { - "browserslist": "^4.22.2" + "browserslist": "^4.22.3" }, "funding": { "type": "opencollective", @@ -3748,11 +4209,10 @@ } }, "node_modules/cosmiconfig": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", - "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", + "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==", "dev": true, - "peer": true, "dependencies": { "@types/parse-json": "^4.0.0", "import-fresh": "^3.2.1", @@ -3769,7 +4229,6 @@ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, - "peer": true, "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -3779,6 +4238,30 @@ "node": ">= 8" } }, + "node_modules/css-functions-list": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.1.tgz", + "integrity": "sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==", + "dev": true, + "peer": true, + "engines": { + "node": ">=12 || >=16" + } + }, + "node_modules/css-tree": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", + "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==", + "dev": true, + "peer": true, + "dependencies": { + "mdn-data": "2.0.30", + "source-map-js": "^1.0.1" + }, + "engines": { + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" + } + }, "node_modules/cssesc": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", @@ -3821,7 +4304,6 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", "dev": true, - "peer": true, "engines": { "node": ">=0.10.0" } @@ -3831,7 +4313,6 @@ "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", "dev": true, - "peer": true, "dependencies": { "decamelize": "^1.1.0", "map-obj": "^1.0.0" @@ -3848,31 +4329,53 @@ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==", "dev": true, - "peer": true, "engines": { "node": ">=0.10.0" } }, + "node_modules/deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "dev": true, + "engines": { + "node": ">=4.0.0" + } + }, "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, + "node_modules/defaults": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", + "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", "dev": true, - "peer": true + "dependencies": { + "clone": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/define-data-property": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.2.tgz", - "integrity": "sha512-SRtsSqsDbgpJBbW3pABMCOt6rQyeM8s8RiyeSN8jYG8sYmt/kGJejbydttUsnDs1tadr19tvhT4ShwMyoqAm4g==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "dev": true, + "peer": true, "dependencies": { + "es-define-property": "^1.0.0", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.2", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.1" + "gopd": "^1.0.1" }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/define-properties": { @@ -3880,6 +4383,7 @@ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dev": true, + "peer": true, "dependencies": { "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", @@ -3914,7 +4418,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "peer": true, "dependencies": { "path-type": "^4.0.0" }, @@ -3936,71 +4439,79 @@ } }, "node_modules/dom-serializer": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", - "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", + "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", "dev": true, - "peer": true, "dependencies": { "domelementtype": "^2.0.1", + "domhandler": "^4.2.0", "entities": "^2.0.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, - "node_modules/dom-serializer/node_modules/domelementtype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], - "peer": true - }, "node_modules/dom-serializer/node_modules/entities": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", "dev": true, - "peer": true, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } }, "node_modules/domelementtype": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", - "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", "dev": true, - "peer": true + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ] }, "node_modules/domhandler": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", - "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", + "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", "dev": true, - "peer": true, "dependencies": { - "domelementtype": "1" + "domelementtype": "^2.2.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" } }, "node_modules/domutils": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", - "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", + "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", "dev": true, - "peer": true, "dependencies": { - "dom-serializer": "0", - "domelementtype": "1" + "dom-serializer": "^1.0.1", + "domelementtype": "^2.2.0", + "domhandler": "^4.2.0" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" } }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true + }, "node_modules/electron-to-chromium": { - "version": "1.4.658", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.658.tgz", - "integrity": "sha512-LGkxndHz7OEv6ipmL95E83SOZmK96PHk6Njw0nf5UaOLbvPxxJhejlBWl4esuU6JHMiCjysLhKRQmLTd5s2ZPw==", + "version": "1.4.682", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.682.tgz", + "integrity": "sha512-oCglfs8yYKs9RQjJFOHonSnhikPK3y+0SvSYc/YpYJV//6rqc0/hbwd0c7vgK4vrl6y2gJAwjkhkSGWK+z4KRA==", "dev": true }, "node_modules/elliptic": { @@ -4026,85 +4537,77 @@ "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true, - "peer": true + "dev": true }, - "node_modules/enquirer": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", - "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", + "node_modules/entities": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz", + "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==", "dev": true, - "peer": true, - "dependencies": { - "ansi-colors": "^4.1.1", - "strip-ansi": "^6.0.1" - }, "engines": { - "node": ">=8.6" + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" } }, - "node_modules/entities": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", - "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", - "dev": true, - "peer": true - }, "node_modules/error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, - "peer": true, "dependencies": { "is-arrayish": "^0.2.1" } }, "node_modules/es-abstract": { - "version": "1.22.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz", - "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==", + "version": "1.22.4", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.4.tgz", + "integrity": "sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg==", "dev": true, + "peer": true, "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "arraybuffer.prototype.slice": "^1.0.2", - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.5", - "es-set-tostringtag": "^2.0.1", + "array-buffer-byte-length": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.3", + "available-typed-arrays": "^1.0.6", + "call-bind": "^1.0.7", + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.2", "es-to-primitive": "^1.2.1", "function.prototype.name": "^1.1.6", - "get-intrinsic": "^1.2.2", - "get-symbol-description": "^1.0.0", + "get-intrinsic": "^1.2.4", + "get-symbol-description": "^1.0.2", "globalthis": "^1.0.3", "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0", + "has-property-descriptors": "^1.0.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", - "hasown": "^2.0.0", - "internal-slot": "^1.0.5", - "is-array-buffer": "^3.0.2", + "hasown": "^2.0.1", + "internal-slot": "^1.0.7", + "is-array-buffer": "^3.0.4", "is-callable": "^1.2.7", "is-negative-zero": "^2.0.2", "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", - "is-typed-array": "^1.1.12", + "is-typed-array": "^1.1.13", "is-weakref": "^1.0.2", "object-inspect": "^1.13.1", "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.1", - "safe-array-concat": "^1.0.1", - "safe-regex-test": "^1.0.0", + "object.assign": "^4.1.5", + "regexp.prototype.flags": "^1.5.2", + "safe-array-concat": "^1.1.0", + "safe-regex-test": "^1.0.3", "string.prototype.trim": "^1.2.8", "string.prototype.trimend": "^1.0.7", "string.prototype.trimstart": "^1.0.7", - "typed-array-buffer": "^1.0.0", + "typed-array-buffer": "^1.0.1", "typed-array-byte-length": "^1.0.0", "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.13" + "which-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" @@ -4117,49 +4620,69 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", - "dev": true + "dev": true, + "peer": true + }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dev": true, + "peer": true, + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } }, "node_modules/es-errors": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", "dev": true, + "peer": true, "engines": { "node": ">= 0.4" } }, "node_modules/es-iterator-helpers": { - "version": "1.0.15", - "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz", - "integrity": "sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==", + "version": "1.0.17", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.17.tgz", + "integrity": "sha512-lh7BsUqelv4KUbR5a/ZTaGGIMLCjPGPqJ6q+Oq24YP0RdyptX1uzm4vvaqzk7Zx3bpl/76YLTTDj9L7uYQ92oQ==", "dev": true, "peer": true, "dependencies": { "asynciterator.prototype": "^1.0.0", - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", "define-properties": "^1.2.1", - "es-abstract": "^1.22.1", - "es-set-tostringtag": "^2.0.1", - "function-bind": "^1.1.1", - "get-intrinsic": "^1.2.1", + "es-abstract": "^1.22.4", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.2", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", "globalthis": "^1.0.3", - "has-property-descriptors": "^1.0.0", + "has-property-descriptors": "^1.0.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.5", + "internal-slot": "^1.0.7", "iterator.prototype": "^1.1.2", - "safe-array-concat": "^1.0.1" + "safe-array-concat": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/es-set-tostringtag": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", - "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", + "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", "dev": true, + "peer": true, "dependencies": { - "get-intrinsic": "^1.2.2", - "has-tostringtag": "^1.0.0", - "hasown": "^2.0.0" + "get-intrinsic": "^1.2.4", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.1" }, "engines": { "node": ">= 0.4" @@ -4170,6 +4693,7 @@ "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", "dev": true, + "peer": true, "dependencies": { "hasown": "^2.0.0" } @@ -4179,6 +4703,7 @@ "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, + "peer": true, "dependencies": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -4209,69 +4734,205 @@ "node": ">=0.8.0" } }, + "node_modules/escodegen": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "dev": true, + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=4.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/escodegen/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/escodegen/node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/escodegen/node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/escodegen/node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/escodegen/node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/eslint": { - "version": "7.32.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", - "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", + "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", "dev": true, "peer": true, "dependencies": { - "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.3", - "@humanwhocodes/config-array": "^0.5.0", - "ajv": "^6.10.0", + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.0", + "@humanwhocodes/config-array": "^0.11.14", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", - "debug": "^4.0.1", + "debug": "^4.3.2", "doctrine": "^3.0.0", - "enquirer": "^2.3.5", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", - "espree": "^7.3.1", - "esquery": "^1.4.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.1.2", - "globals": "^13.6.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", - "minimatch": "^3.0.4", + "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "progress": "^2.0.0", - "regexpp": "^3.1.0", - "semver": "^7.2.1", - "strip-ansi": "^6.0.0", - "strip-json-comments": "^3.1.0", - "table": "^6.0.9", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" }, "bin": { "eslint": "bin/eslint.js" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint-compat-utils": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.1.2.tgz", + "integrity": "sha512-Jia4JDldWnFNIru1Ehx1H5s9/yxiRHY/TimCuUc0jNexew3cF1gI6CYZil1ociakfWO3rRqFjl1mskBblB3RYg==", + "dev": true, + "peer": true, + "engines": { + "node": ">=12" + }, + "peerDependencies": { + "eslint": ">=6.0.0" + } + }, + "node_modules/eslint-config-airbnb": { + "version": "19.0.4", + "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz", + "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==", + "dev": true, + "peer": true, + "dependencies": { + "eslint-config-airbnb-base": "^15.0.0", + "object.assign": "^4.1.2", + "object.entries": "^1.1.5" + }, + "engines": { + "node": "^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^7.32.0 || ^8.2.0", + "eslint-plugin-import": "^2.25.3", + "eslint-plugin-jsx-a11y": "^6.5.1", + "eslint-plugin-react": "^7.28.0", + "eslint-plugin-react-hooks": "^4.3.0" + } + }, + "node_modules/eslint-config-airbnb-base": { + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz", + "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==", + "dev": true, + "peer": true, + "dependencies": { + "confusing-browser-globals": "^1.0.10", + "object.assign": "^4.1.2", + "object.entries": "^1.1.5", + "semver": "^6.3.0" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + }, + "peerDependencies": { + "eslint": "^7.32.0 || ^8.2.0", + "eslint-plugin-import": "^2.25.2" + } + }, "node_modules/eslint-config-prettier": { "version": "8.10.0", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz", "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==", "dev": true, + "peer": true, "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -4280,16 +4941,33 @@ } }, "node_modules/eslint-config-standard": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-11.0.0.tgz", - "integrity": "sha512-oDdENzpViEe5fwuRCWla7AXQd++/oyIp8zP+iP9jiUPG6NBj3SHgdgtl/kTn00AjeN+1HNvavTKmYbMo+xMOlw==", + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", + "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "peer": true, + "engines": { + "node": ">=12.0.0" + }, "peerDependencies": { - "eslint": ">=4.18.0", - "eslint-plugin-import": ">=2.8.0", - "eslint-plugin-node": ">=5.2.1", - "eslint-plugin-promise": ">=3.6.0", - "eslint-plugin-standard": ">=3.0.1" + "eslint": "^8.0.1", + "eslint-plugin-import": "^2.25.2", + "eslint-plugin-n": "^15.0.0 || ^16.0.0 ", + "eslint-plugin-promise": "^6.0.0" } }, "node_modules/eslint-import-resolver-node": { @@ -4297,6 +4975,7 @@ "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", "dev": true, + "peer": true, "dependencies": { "debug": "^3.2.7", "is-core-module": "^2.13.0", @@ -4308,6 +4987,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, + "peer": true, "dependencies": { "ms": "^2.1.1" } @@ -4317,6 +4997,7 @@ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", "dev": true, + "peer": true, "dependencies": { "debug": "^3.2.7" }, @@ -4334,6 +5015,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, + "peer": true, "dependencies": { "ms": "^2.1.1" } @@ -4358,11 +5040,33 @@ "eslint": ">=4.19.1" } }, + "node_modules/eslint-plugin-es-x": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.5.0.tgz", + "integrity": "sha512-ODswlDSO0HJDzXU0XvgZ3lF3lS3XAZEossh15Q2UHjwrJggWeBoKqqEsLTZLXl+dh5eOAozG0zRcYtuE35oTuQ==", + "dev": true, + "peer": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.1.2", + "@eslint-community/regexpp": "^4.6.0", + "eslint-compat-utils": "^0.1.2" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ota-meshi" + }, + "peerDependencies": { + "eslint": ">=8" + } + }, "node_modules/eslint-plugin-import": { "version": "2.29.1", "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", "dev": true, + "peer": true, "dependencies": { "array-includes": "^3.1.7", "array.prototype.findlastindex": "^1.2.3", @@ -4394,6 +5098,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, + "peer": true, "dependencies": { "ms": "^2.1.1" } @@ -4403,6 +5108,7 @@ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, + "peer": true, "dependencies": { "esutils": "^2.0.2" }, @@ -4451,116 +5157,214 @@ "node": ">=4" } }, - "node_modules/eslint-plugin-node": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", - "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", + "node_modules/eslint-plugin-n": { + "version": "16.6.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.6.2.tgz", + "integrity": "sha512-6TyDmZ1HXoFQXnhCTUjVFULReoBPOAjpuiKELMkeP40yffI/1ZRO+d9ug/VC6fqISo2WkuIBk3cvuRPALaWlOQ==", "dev": true, "peer": true, "dependencies": { - "eslint-plugin-es": "^3.0.0", - "eslint-utils": "^2.0.0", - "ignore": "^5.1.1", - "minimatch": "^3.0.4", - "resolve": "^1.10.1", - "semver": "^6.1.0" + "@eslint-community/eslint-utils": "^4.4.0", + "builtins": "^5.0.1", + "eslint-plugin-es-x": "^7.5.0", + "get-tsconfig": "^4.7.0", + "globals": "^13.24.0", + "ignore": "^5.2.4", + "is-builtin-module": "^3.2.1", + "is-core-module": "^2.12.1", + "minimatch": "^3.1.2", + "resolve": "^1.22.2", + "semver": "^7.5.3" }, "engines": { - "node": ">=8.10.0" + "node": ">=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" }, "peerDependencies": { - "eslint": ">=5.16.0" - } - }, - "node_modules/eslint-plugin-node/node_modules/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", - "dev": true, - "peer": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/eslint-plugin-promise": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.8.0.tgz", - "integrity": "sha512-JiFL9UFR15NKpHyGii1ZcvmtIqa3UTwiDAGb8atSffe43qJ3+1czVGN6UtkklpcJ2DVnqvTMzEKRaJdBkAL2aQ==", - "dev": true, - "peer": true, - "engines": { - "node": ">=4" + "eslint": ">=7.0.0" } }, - "node_modules/eslint-plugin-react": { - "version": "7.33.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz", - "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", + "node_modules/eslint-plugin-n/node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, "peer": true, "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.flatmap": "^1.3.1", - "array.prototype.tosorted": "^1.1.1", - "doctrine": "^2.1.0", - "es-iterator-helpers": "^1.0.12", - "estraverse": "^5.3.0", - "jsx-ast-utils": "^2.4.1 || ^3.0.0", - "minimatch": "^3.1.2", - "object.entries": "^1.1.6", - "object.fromentries": "^2.0.6", - "object.hasown": "^1.1.2", - "object.values": "^1.1.6", - "prop-types": "^15.8.1", - "resolve": "^2.0.0-next.4", - "semver": "^6.3.1", - "string.prototype.matchall": "^4.0.8" + "type-fest": "^0.20.2" }, "engines": { - "node": ">=4" + "node": ">=8" }, - "peerDependencies": { - "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint-plugin-react/node_modules/doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "node_modules/eslint-plugin-n/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "peer": true, "dependencies": { - "esutils": "^2.0.2" + "yallist": "^4.0.0" }, "engines": { - "node": ">=0.10.0" + "node": ">=10" } }, - "node_modules/eslint-plugin-react/node_modules/resolve": { - "version": "2.0.0-next.5", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", - "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "node_modules/eslint-plugin-n/node_modules/semver": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dev": true, "peer": true, "dependencies": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" + "lru-cache": "^6.0.0" }, "bin": { - "resolve": "bin/resolve" + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-plugin-n/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "peer": true, + "engines": { + "node": ">=10" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint-plugin-standard": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.1.0.tgz", - "integrity": "sha512-fVcdyuKRr0EZ4fjWl3c+gp1BANFJD1+RaWa2UPYfMZ6jCtp5RG00kSaXnK/dE5sYzt4kaWJ9qdxqUfc0d9kX0w==", + "node_modules/eslint-plugin-n/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true, + "peer": true + }, + "node_modules/eslint-plugin-no-relative-import-paths": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-no-relative-import-paths/-/eslint-plugin-no-relative-import-paths-1.5.4.tgz", + "integrity": "sha512-2smViH7R3682NR6dwgYr8Vm7emqNP1gEjBku6DbvUy3Ef/2Fz+mhwsFjZGSixzWzazMCj4MAgIWTsHELCCDJKA==", + "dev": true, + "peer": true + }, + "node_modules/eslint-plugin-node": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", + "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", + "dev": true, + "peer": true, + "dependencies": { + "eslint-plugin-es": "^3.0.0", + "eslint-utils": "^2.0.0", + "ignore": "^5.1.1", + "minimatch": "^3.0.4", + "resolve": "^1.10.1", + "semver": "^6.1.0" + }, + "engines": { + "node": ">=8.10.0" + }, + "peerDependencies": { + "eslint": ">=5.16.0" + } + }, + "node_modules/eslint-plugin-promise": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz", + "integrity": "sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==", + "dev": true, + "peer": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + } + }, + "node_modules/eslint-plugin-react": { + "version": "7.33.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz", + "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", + "dev": true, + "peer": true, + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.flatmap": "^1.3.1", + "array.prototype.tosorted": "^1.1.1", + "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.0.12", + "estraverse": "^5.3.0", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.1.2", + "object.entries": "^1.1.6", + "object.fromentries": "^2.0.6", + "object.hasown": "^1.1.2", + "object.values": "^1.1.6", + "prop-types": "^15.8.1", + "resolve": "^2.0.0-next.4", + "semver": "^6.3.1", + "string.prototype.matchall": "^4.0.8" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" + } + }, + "node_modules/eslint-plugin-react-hooks": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", + "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", "dev": true, + "peer": true, + "engines": { + "node": ">=10" + }, "peerDependencies": { - "eslint": ">=3.19.0" + "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0" + } + }, + "node_modules/eslint-plugin-react/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "peer": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/resolve": { + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "dev": true, + "peer": true, + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/eslint-scope": { @@ -4620,16 +5424,6 @@ "node": ">=10" } }, - "node_modules/eslint/node_modules/@babel/code-frame": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", - "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "dev": true, - "peer": true, - "dependencies": { - "@babel/highlight": "^7.10.4" - } - }, "node_modules/eslint/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -4646,6 +5440,13 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/eslint/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "peer": true + }, "node_modules/eslint/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -4696,6 +5497,36 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/eslint/node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "peer": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "peer": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/eslint/node_modules/globals": { "version": "13.24.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", @@ -4722,33 +5553,17 @@ "node": ">=8" } }, - "node_modules/eslint/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "peer": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/eslint/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "node_modules/eslint/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "peer": true, "dependencies": { - "lru-cache": "^6.0.0" + "argparse": "^2.0.1" }, "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" + "js-yaml": "bin/js-yaml.js" } }, "node_modules/eslint/node_modules/supports-color": { @@ -4777,36 +5592,35 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "peer": true - }, "node_modules/espree": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", - "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, "peer": true, "dependencies": { - "acorn": "^7.4.0", - "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^1.3.0" + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "peer": true, "engines": { - "node": ">=4" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/esprima": { @@ -4814,7 +5628,6 @@ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true, - "peer": true, "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -4882,26 +5695,20 @@ "node": ">=0.8.x" } }, - "node_modules/execall": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz", - "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==", + "node_modules/external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, - "peer": true, "dependencies": { - "clone-regexp": "^2.1.0" + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" }, "engines": { - "node": ">=8" + "node": ">=4" } }, - "node_modules/extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true, - "peer": true - }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -4909,11 +5716,17 @@ "dev": true, "peer": true }, + "node_modules/fast-diff": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz", + "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==", + "dev": true, + "peer": true + }, "node_modules/fast-glob": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", - "peer": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -4925,6 +5738,17 @@ "node": ">=8.6.0" } }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -4936,8 +5760,7 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true, - "peer": true + "dev": true }, "node_modules/fastest-levenshtein": { "version": "1.0.16", @@ -4953,11 +5776,36 @@ "version": "1.17.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", - "peer": true, "dependencies": { "reusify": "^1.0.4" } }, + "node_modules/ffjavascript": { + "version": "0.2.59", + "resolved": "https://registry.npmjs.org/ffjavascript/-/ffjavascript-0.2.59.tgz", + "integrity": "sha512-QssOEUv+wilz9Sg7Zaj6KWAm7QceOAEsFuEBTltUsDo1cjn11rA/LGYvzFBPbzNfxRlZxwgJ7uxpCQcdDlrNfw==", + "dev": true, + "dependencies": { + "wasmbuilder": "0.0.16", + "wasmcurves": "0.2.1", + "web-worker": "^1.2.0" + } + }, + "node_modules/figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^1.0.5" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/file-entry-cache": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", @@ -4975,7 +5823,6 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "peer": true, "dependencies": { "to-regex-range": "^5.0.1" }, @@ -4984,17 +5831,20 @@ } }, "node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, "peer": true, "dependencies": { - "locate-path": "^5.0.0", + "locate-path": "^6.0.0", "path-exists": "^4.0.0" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/flat-cache": { @@ -5013,16 +5863,16 @@ } }, "node_modules/flatted": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", "dev": true, "peer": true }, "node_modules/follow-redirects": { - "version": "1.15.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", - "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "funding": [ { "type": "individual", @@ -5043,13 +5893,42 @@ "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", "dev": true, + "peer": true, "dependencies": { "is-callable": "^1.1.3" } }, - "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "node_modules/foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dependencies": { "asynckit": "^0.4.0", @@ -5064,8 +5943,21 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true, - "peer": true + "dev": true + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "peer": true, + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } }, "node_modules/function-bind": { "version": "1.1.2", @@ -5081,6 +5973,7 @@ "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -5094,18 +5987,12 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", - "dev": true, - "peer": true - }, "node_modules/functions-have-names": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", "dev": true, + "peer": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -5125,6 +6012,7 @@ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dev": true, + "peer": true, "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2", @@ -5140,26 +6028,27 @@ } }, "node_modules/get-stdin": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", - "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz", + "integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==", "dev": true, - "peer": true, "engines": { - "node": ">=10" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/get-symbol-description": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.1.tgz", - "integrity": "sha512-KmuibvwbWaM4BHcBRYwJfZ1JxyJeBwB8ct9YYu67SvYdbEIlcQ2e56dHxfbobqW38GXo8/zDFqJeGtHiVbWyQw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", + "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.5", - "es-errors": "^1.3.0" + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4" }, "engines": { "node": ">= 0.4" @@ -5168,12 +6057,24 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/get-tsconfig": { + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz", + "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==", + "dev": true, + "peer": true, + "dependencies": { + "resolve-pkg-maps": "^1.0.0" + }, + "funding": { + "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" + } + }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "dev": true, - "peer": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -5190,15 +6091,16 @@ } }, "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, "peer": true, "dependencies": { - "is-glob": "^4.0.1" + "is-glob": "^4.0.3" }, "engines": { - "node": ">= 6" + "node": ">=10.13.0" } }, "node_modules/global-modules": { @@ -5206,7 +6108,6 @@ "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", "dev": true, - "peer": true, "dependencies": { "global-prefix": "^3.0.0" }, @@ -5219,7 +6120,6 @@ "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", "dev": true, - "peer": true, "dependencies": { "ini": "^1.3.5", "kind-of": "^6.0.2", @@ -5234,7 +6134,6 @@ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, - "peer": true, "dependencies": { "isexe": "^2.0.0" }, @@ -5256,6 +6155,7 @@ "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", "dev": true, + "peer": true, "dependencies": { "define-properties": "^1.1.3" }, @@ -5270,7 +6170,6 @@ "version": "11.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "peer": true, "dependencies": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", @@ -5286,15 +6185,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/globby/node_modules/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", - "peer": true, - "engines": { - "node": ">= 4" - } - }, "node_modules/globjoin": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz", @@ -5302,22 +6192,6 @@ "dev": true, "peer": true }, - "node_modules/gonzales-pe": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz", - "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==", - "dev": true, - "peer": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "gonzales": "bin/gonzales.js" - }, - "engines": { - "node": ">=0.6.0" - } - }, "node_modules/google-protobuf": { "version": "3.21.2", "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz", @@ -5329,6 +6203,7 @@ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", "dev": true, + "peer": true, "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -5336,12 +6211,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, + "peer": true + }, "node_modules/hard-rejection": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", "dev": true, - "peer": true, "engines": { "node": ">=6" } @@ -5351,6 +6232,7 @@ "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", "dev": true, + "peer": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -5365,22 +6247,24 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", - "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dev": true, + "peer": true, "dependencies": { - "get-intrinsic": "^1.2.2" + "es-define-property": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", "dev": true, + "peer": true, "engines": { "node": ">= 0.4" }, @@ -5393,6 +6277,7 @@ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "dev": true, + "peer": true, "engines": { "node": ">= 0.4" }, @@ -5405,6 +6290,7 @@ "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "dev": true, + "peer": true, "dependencies": { "has-symbols": "^1.0.3" }, @@ -5425,9 +6311,9 @@ } }, "node_modules/hasown": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", - "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz", + "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==", "dev": true, "dependencies": { "function-bind": "^1.1.2" @@ -5446,12 +6332,20 @@ "minimalistic-crypto-utils": "^1.0.1" } }, + "node_modules/hoopy": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz", + "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==", + "dev": true, + "engines": { + "node": ">= 6.0.0" + } + }, "node_modules/hosted-git-info": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", "dev": true, - "peer": true, "dependencies": { "lru-cache": "^6.0.0" }, @@ -5464,7 +6358,6 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, - "peer": true, "dependencies": { "yallist": "^4.0.0" }, @@ -5476,8 +6369,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "peer": true + "dev": true }, "node_modules/html-tags": { "version": "3.3.1", @@ -5493,33 +6385,34 @@ } }, "node_modules/htmlparser2": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", - "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz", + "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==", "dev": true, - "peer": true, + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], "dependencies": { - "domelementtype": "^1.3.1", - "domhandler": "^2.3.0", - "domutils": "^1.5.1", - "entities": "^1.1.1", - "inherits": "^2.0.1", - "readable-stream": "^3.1.1" + "domelementtype": "^2.0.1", + "domhandler": "^4.2.2", + "domutils": "^2.8.0", + "entities": "^3.0.1" } }, - "node_modules/htmlparser2/node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, - "peer": true, "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "safer-buffer": ">= 2.1.2 < 3" }, "engines": { - "node": ">= 6" + "node": ">=0.10.0" } }, "node_modules/ieee754": { @@ -5542,11 +6435,9 @@ ] }, "node_modules/ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "dev": true, - "peer": true, + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", "engines": { "node": ">= 4" } @@ -5562,7 +6453,6 @@ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "dev": true, - "peer": true, "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -5574,6 +6464,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/import-fresh/node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/import-lazy": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", @@ -5599,7 +6498,6 @@ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "dev": true, - "peer": true, "engines": { "node": ">=8" } @@ -5609,7 +6507,6 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "dev": true, - "peer": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -5624,47 +6521,117 @@ "version": "1.3.8", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "dev": true + }, + "node_modules/inquirer": { + "version": "8.2.6", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz", + "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==", "dev": true, - "peer": true + "dependencies": { + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.1", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.21", + "mute-stream": "0.0.8", + "ora": "^5.4.1", + "run-async": "^2.4.0", + "rxjs": "^7.5.5", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6", + "wrap-ansi": "^6.0.1" + }, + "engines": { + "node": ">=12.0.0" + } }, - "node_modules/internal-slot": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", - "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", + "node_modules/inquirer/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "dependencies": { - "es-errors": "^1.3.0", - "hasown": "^2.0.0", - "side-channel": "^1.0.4" + "color-convert": "^2.0.1" }, "engines": { - "node": ">= 0.4" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/is-alphabetical": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz", - "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==", + "node_modules/inquirer/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, - "peer": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/is-alphanumerical": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz", - "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==", + "node_modules/inquirer/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/inquirer/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/inquirer/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/inquirer/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/internal-slot": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", "dev": true, "peer": true, "dependencies": { - "is-alphabetical": "^1.0.0", - "is-decimal": "^1.0.0" + "es-errors": "^1.3.0", + "hasown": "^2.0.0", + "side-channel": "^1.0.4" }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" + "engines": { + "node": ">= 0.4" } }, "node_modules/is-array-buffer": { @@ -5672,6 +6639,7 @@ "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.2.1" @@ -5687,8 +6655,7 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true, - "peer": true + "dev": true }, "node_modules/is-async-function": { "version": "2.0.0", @@ -5711,6 +6678,7 @@ "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", "dev": true, + "peer": true, "dependencies": { "has-bigints": "^1.0.1" }, @@ -5735,6 +6703,7 @@ "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -5746,28 +6715,20 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-buffer": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", - "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", + "node_modules/is-builtin-module": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", + "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], "peer": true, + "dependencies": { + "builtin-modules": "^3.3.0" + }, "engines": { - "node": ">=4" + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/is-callable": { @@ -5775,6 +6736,7 @@ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", "dev": true, + "peer": true, "engines": { "node": ">= 0.4" }, @@ -5799,6 +6761,7 @@ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", "dev": true, + "peer": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -5809,17 +6772,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-decimal": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz", - "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==", - "dev": true, - "peer": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -5846,7 +6798,6 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, - "peer": true, "engines": { "node": ">=8" } @@ -5878,15 +6829,13 @@ "node": ">=0.10.0" } }, - "node_modules/is-hexadecimal": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz", - "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==", + "node_modules/is-interactive": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", + "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", "dev": true, - "peer": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" + "engines": { + "node": ">=8" } }, "node_modules/is-map": { @@ -5900,10 +6849,11 @@ } }, "node_modules/is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", + "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", "dev": true, + "peer": true, "engines": { "node": ">= 0.4" }, @@ -5915,7 +6865,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "peer": true, "engines": { "node": ">=0.12.0" } @@ -5925,6 +6874,7 @@ "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", "dev": true, + "peer": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -5935,11 +6885,30 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "peer": true, + "engines": { + "node": ">=8" + } + }, "node_modules/is-plain-obj": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "dev": true, "peer": true, "engines": { "node": ">=0.10.0" @@ -5950,6 +6919,7 @@ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -5961,16 +6931,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-regexp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz", - "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6" - } - }, "node_modules/is-set": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", @@ -5982,12 +6942,16 @@ } }, "node_modules/is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", + "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", "dev": true, + "peer": true, "dependencies": { - "call-bind": "^1.0.2" + "call-bind": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5998,6 +6962,7 @@ "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", "dev": true, + "peer": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -6013,6 +6978,7 @@ "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", "dev": true, + "peer": true, "dependencies": { "has-symbols": "^1.0.2" }, @@ -6028,6 +6994,7 @@ "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", "dev": true, + "peer": true, "dependencies": { "which-typed-array": "^1.1.14" }, @@ -6038,19 +7005,11 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", - "dev": true, - "peer": true - }, "node_modules/is-unicode-supported": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true, - "peer": true, "engines": { "node": ">=10" }, @@ -6073,6 +7032,7 @@ "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2" }, @@ -6098,14 +7058,14 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true + "dev": true, + "peer": true }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true, - "peer": true + "dev": true }, "node_modules/iso-language-codes": { "version": "1.1.0", @@ -6126,6 +7086,24 @@ "set-function-name": "^2.0.1" } }, + "node_modules/jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dev": true, + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, "node_modules/js-sha256": { "version": "0.10.1", "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.10.1.tgz", @@ -6147,7 +7125,6 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, - "peer": true, "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -6180,8 +7157,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, - "peer": true + "dev": true }, "node_modules/json-schema-traverse": { "version": "0.4.1", @@ -6210,6 +7186,36 @@ "node": ">=6" } }, + "node_modules/jsonc-parser": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", + "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", + "dev": true + }, + "node_modules/jsonpath": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/jsonpath/-/jsonpath-1.1.1.tgz", + "integrity": "sha512-l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w==", + "dev": true, + "dependencies": { + "esprima": "1.2.2", + "static-eval": "2.0.2", + "underscore": "1.12.1" + } + }, + "node_modules/jsonpath/node_modules/esprima": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz", + "integrity": "sha512-+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/jsx-ast-utils": { "version": "3.3.5", "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", @@ -6226,6 +7232,12 @@ "node": ">=4.0" } }, + "node_modules/kebabcase": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/kebabcase/-/kebabcase-1.0.1.tgz", + "integrity": "sha512-YSP7DnNnodPG0nkHGEICNx5vUl/lOKkryQlILRqRFmcjWFNomEvPhJlpFvE7sop9t2EDfthZssx3nvwTx5ty0w==", + "dev": true + }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -6241,15 +7253,14 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true, - "peer": true, "engines": { "node": ">=0.10.0" } }, "node_modules/known-css-properties": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz", - "integrity": "sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==", + "version": "0.29.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.29.0.tgz", + "integrity": "sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==", "dev": true, "peer": true }, @@ -6300,20 +7311,31 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true + }, + "node_modules/linkify-it": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz", + "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==", "dev": true, - "peer": true + "dependencies": { + "uc.micro": "^1.0.1" + } }, "node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, "peer": true, "dependencies": { - "p-locate": "^4.1.0" + "p-locate": "^5.0.0" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/lodash": { @@ -6332,6 +7354,12 @@ "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", "dev": true }, + "node_modules/lodash.kebabcase": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", + "integrity": "sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==", + "dev": true + }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -6339,6 +7367,12 @@ "dev": true, "peer": true }, + "node_modules/lodash.pull": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/lodash.pull/-/lodash.pull-4.1.0.tgz", + "integrity": "sha512-EM7CVTzXfkTyusQdN7mgGPh2ZfkKfQ5lA9U+X7NNDeEgKEaO65dB5Kh8+Ppap0X1wQOndPjKP/VVTis7hFvkzg==", + "dev": true + }, "node_modules/lodash.truncate": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", @@ -6351,7 +7385,6 @@ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, - "peer": true, "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -6368,7 +7401,6 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, - "peer": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -6384,7 +7416,6 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, - "peer": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -6401,7 +7432,6 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, - "peer": true, "dependencies": { "color-name": "~1.1.4" }, @@ -6413,15 +7443,13 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "peer": true + "dev": true }, "node_modules/log-symbols/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "peer": true, "engines": { "node": ">=8" } @@ -6431,7 +7459,6 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, - "peer": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -6444,17 +7471,6 @@ "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" }, - "node_modules/longest-streak": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz", - "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==", - "dev": true, - "peer": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", @@ -6482,7 +7498,6 @@ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", "dev": true, - "peer": true, "engines": { "node": ">=8" }, @@ -6490,71 +7505,175 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/mathml-tag-names": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz", - "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==", + "node_modules/markdown-it": { + "version": "13.0.1", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.1.tgz", + "integrity": "sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==", "dev": true, - "peer": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" + "dependencies": { + "argparse": "^2.0.1", + "entities": "~3.0.1", + "linkify-it": "^4.0.1", + "mdurl": "^1.0.1", + "uc.micro": "^1.0.5" + }, + "bin": { + "markdown-it": "bin/markdown-it.js" } }, - "node_modules/mdast-util-from-markdown": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz", - "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==", + "node_modules/markdown-it/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/markdownlint": { + "version": "0.29.0", + "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.29.0.tgz", + "integrity": "sha512-ASAzqpODstu/Qsk0xW5BPgWnK/qjpBQ4e7IpsSvvFXcfYIjanLTdwFRJK1SIEEh0fGSMKXcJf/qhaZYHyME0wA==", + "dev": true, + "dependencies": { + "markdown-it": "13.0.1", + "markdownlint-micromark": "0.1.5" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/markdownlint-cli": { + "version": "0.35.0", + "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.35.0.tgz", + "integrity": "sha512-lVIIIV1MrUtjoocgDqXLxUCxlRbn7Ve8rsWppfwciUNwLlNS28AhNiyQ3PU7jjj4Qvj+rWTTvwkqg7AcdG988g==", + "dev": true, + "dependencies": { + "commander": "~11.0.0", + "get-stdin": "~9.0.0", + "glob": "~10.2.7", + "ignore": "~5.2.4", + "js-yaml": "^4.1.0", + "jsonc-parser": "~3.2.0", + "markdownlint": "~0.29.0", + "minimatch": "~9.0.1", + "run-con": "~1.2.11" + }, + "bin": { + "markdownlint": "markdownlint.js" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/markdownlint-cli/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/markdownlint-cli/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/markdownlint-cli/node_modules/glob": { + "version": "10.2.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.2.7.tgz", + "integrity": "sha512-jTKehsravOJo8IJxUGfZILnkvVJM/MOfHRs8QcXolVef2zNI9Tqyy5+SeuOAZd3upViEZQLyFpQhYiHLrMUNmA==", "dev": true, - "peer": true, "dependencies": { - "@types/mdast": "^3.0.0", - "mdast-util-to-string": "^2.0.0", - "micromark": "~2.11.0", - "parse-entities": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" + "foreground-child": "^3.1.0", + "jackspeak": "^2.0.3", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2", + "path-scurry": "^1.7.0" + }, + "bin": { + "glob": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=16 || 14 >=14.17" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/mdast-util-to-markdown": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz", - "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==", + "node_modules/markdownlint-cli/node_modules/ignore": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", + "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/markdownlint-cli/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/markdownlint-cli/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, - "peer": true, "dependencies": { - "@types/unist": "^2.0.0", - "longest-streak": "^2.0.0", - "mdast-util-to-string": "^2.0.0", - "parse-entities": "^2.0.0", - "repeat-string": "^1.0.0", - "zwitch": "^1.0.0" + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/mdast-util-to-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz", - "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==", + "node_modules/markdownlint-micromark": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.5.tgz", + "integrity": "sha512-HvofNU4QCvfUCWnocQP1IAWaqop5wpWrB0mKB6SSh0fcpV0PdmQNS6tdUuFew1utpYlUvYYzz84oDkrD76GB9A==", + "dev": true, + "engines": { + "node": ">=16" + } + }, + "node_modules/mathml-tag-names": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz", + "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==", "dev": true, "peer": true, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" + "type": "github", + "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/mdn-data": { + "version": "2.0.30", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz", + "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", + "dev": true, + "peer": true + }, + "node_modules/mdurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", + "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", + "dev": true + }, "node_modules/meow": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz", "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==", "dev": true, - "peer": true, "dependencies": { "@types/minimist": "^1.2.0", "camelcase-keys": "^6.2.2", @@ -6576,41 +7695,30 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/meow/node_modules/type-fest": { + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", + "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "peer": true, "engines": { "node": ">= 8" } }, - "node_modules/micromark": { - "version": "2.11.4", - "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz", - "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==", - "dev": true, - "funding": [ - { - "type": "GitHub Sponsors", - "url": "https://github.com/sponsors/unifiedjs" - }, - { - "type": "OpenCollective", - "url": "https://opencollective.com/unified" - } - ], - "peer": true, - "dependencies": { - "debug": "^4.0.0", - "parse-entities": "^2.0.0" - } - }, "node_modules/micromatch": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "peer": true, "dependencies": { "braces": "^3.0.2", "picomatch": "^2.3.1" @@ -6638,12 +7746,20 @@ "node": ">= 0.6" } }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", "dev": true, - "peer": true, "engines": { "node": ">=4" } @@ -6684,7 +7800,6 @@ "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", "dev": true, - "peer": true, "dependencies": { "arrify": "^1.0.1", "is-plain-obj": "^1.1.0", @@ -6694,12 +7809,27 @@ "node": ">= 6" } }, + "node_modules/minipass": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-6.0.2.tgz", + "integrity": "sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==", + "dev": true, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "node_modules/mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "dev": true + }, "node_modules/nanoassert": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-2.0.0.tgz", @@ -6710,6 +7840,25 @@ "resolved": "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz", "integrity": "sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==" }, + "node_modules/nanoid": { + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "peer": true, + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, "node_modules/nanospinner": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/nanospinner/-/nanospinner-1.1.0.tgz", @@ -6737,7 +7886,6 @@ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", "dev": true, - "peer": true, "dependencies": { "hosted-git-info": "^4.0.1", "is-core-module": "^2.5.0", @@ -6753,7 +7901,6 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, - "peer": true, "dependencies": { "yallist": "^4.0.0" }, @@ -6766,7 +7913,6 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dev": true, - "peer": true, "dependencies": { "lru-cache": "^6.0.0" }, @@ -6781,8 +7927,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true, - "peer": true + "dev": true }, "node_modules/normalize-path": { "version": "3.0.0", @@ -6793,30 +7938,6 @@ "node": ">=0.10.0" } }, - "node_modules/normalize-range": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==", - "dev": true, - "peer": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/normalize-selector": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz", - "integrity": "sha512-dxvWdI8gw6eAvk9BlPffgEoGfM7AdijoCwOEJge3e3ulT2XLgmU7KvvxprOaCu05Q1uGRHmOhHe1r6emZoKyFw==", - "dev": true, - "peer": true - }, - "node_modules/num2fraction": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", - "integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==", - "dev": true, - "peer": true - }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -6832,6 +7953,7 @@ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", "dev": true, + "peer": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -6841,6 +7963,7 @@ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true, + "peer": true, "engines": { "node": ">= 0.4" } @@ -6850,6 +7973,7 @@ "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.5", "define-properties": "^1.2.1", @@ -6883,6 +8007,7 @@ "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -6900,6 +8025,7 @@ "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.2.tgz", "integrity": "sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw==", "dev": true, + "peer": true, "dependencies": { "array.prototype.filter": "^1.0.3", "call-bind": "^1.0.5", @@ -6927,6 +8053,7 @@ "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -6944,11 +8071,25 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, - "peer": true, "dependencies": { "wrappy": "1" } }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/optionator": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", @@ -6967,33 +8108,138 @@ "node": ">= 0.8.0" } }, + "node_modules/ora": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", + "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", + "dev": true, + "dependencies": { + "bl": "^4.1.0", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.5.0", + "is-interactive": "^1.0.0", + "is-unicode-supported": "^0.1.0", + "log-symbols": "^4.1.0", + "strip-ansi": "^6.0.0", + "wcwidth": "^1.0.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/ora/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/ora/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/ora/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/ora/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ora/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "peer": true, "dependencies": { - "p-try": "^2.0.0" + "yocto-queue": "^0.1.0" }, "engines": { - "node": ">=6" + "node": ">=10" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, "peer": true, "dependencies": { - "p-limit": "^2.2.0" + "p-limit": "^3.0.2" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-try": { @@ -7001,7 +8247,6 @@ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true, - "peer": true, "engines": { "node": ">=6" } @@ -7011,7 +8256,6 @@ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, - "peer": true, "dependencies": { "callsites": "^3.0.0" }, @@ -7019,31 +8263,11 @@ "node": ">=6" } }, - "node_modules/parse-entities": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", - "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", - "dev": true, - "peer": true, - "dependencies": { - "character-entities": "^1.0.0", - "character-entities-legacy": "^1.0.0", - "character-reference-invalid": "^1.0.0", - "is-alphanumerical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-hexadecimal": "^1.0.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/parse-json": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "dev": true, - "peer": true, "dependencies": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -7062,7 +8286,6 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, - "peer": true, "engines": { "node": ">=8" } @@ -7072,7 +8295,6 @@ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true, - "peer": true, "engines": { "node": ">=0.10.0" } @@ -7082,7 +8304,6 @@ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, - "peer": true, "engines": { "node": ">=8" } @@ -7093,11 +8314,35 @@ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, + "node_modules/path-scurry": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "dev": true, + "dependencies": { + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz", + "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==", + "dev": true, + "engines": { + "node": "14 || >=16.14" + } + }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "peer": true, "engines": { "node": ">=8" } @@ -7111,7 +8356,6 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "peer": true, "engines": { "node": ">=8.6" }, @@ -7119,58 +8363,45 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/postcss": { - "version": "7.0.39", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", - "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", + "node_modules/possible-typed-array-names": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", "dev": true, "peer": true, - "dependencies": { - "picocolors": "^0.2.1", - "source-map": "^0.6.1" - }, "engines": { - "node": ">=6.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - } - }, - "node_modules/postcss-html": { - "version": "0.36.0", - "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz", - "integrity": "sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==", - "dev": true, - "peer": true, - "dependencies": { - "htmlparser2": "^3.10.0" - }, - "peerDependencies": { - "postcss": ">=5.0.0", - "postcss-syntax": ">=0.36.0" + "node": ">= 0.4" } }, - "node_modules/postcss-less": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz", - "integrity": "sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==", + "node_modules/postcss": { + "version": "8.4.35", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz", + "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==", "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "peer": true, "dependencies": { - "postcss": "^7.0.14" + "nanoid": "^3.3.7", + "picocolors": "^1.0.0", + "source-map-js": "^1.0.2" }, "engines": { - "node": ">=6.14.4" + "node": "^10 || ^12 || >=14" } }, - "node_modules/postcss-media-query-parser": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", - "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==", - "dev": true, - "peer": true - }, "node_modules/postcss-resolve-nested-selector": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", @@ -7179,40 +8410,46 @@ "peer": true }, "node_modules/postcss-safe-parser": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz", - "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz", + "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==", "dev": true, "peer": true, - "dependencies": { - "postcss": "^7.0.26" - }, "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/postcss-sass": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz", - "integrity": "sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==", - "dev": true, - "peer": true, - "dependencies": { - "gonzales-pe": "^4.3.0", - "postcss": "^7.0.21" + "node": ">=12.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + "peerDependencies": { + "postcss": "^8.3.3" } }, "node_modules/postcss-scss": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz", - "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==", + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz", + "integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==", "dev": true, - "peer": true, - "dependencies": { - "postcss": "^7.0.6" - }, - "engines": { - "node": ">=6.0.0" + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss-scss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "engines": { + "node": ">=12.0" + }, + "peerDependencies": { + "postcss": "^8.4.29" } }, "node_modules/postcss-selector-parser": { @@ -7229,16 +8466,6 @@ "node": ">=4" } }, - "node_modules/postcss-syntax": { - "version": "0.36.2", - "resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz", - "integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==", - "dev": true, - "peer": true, - "peerDependencies": { - "postcss": ">=5.0.0" - } - }, "node_modules/postcss-value-parser": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", @@ -7246,13 +8473,6 @@ "dev": true, "peer": true }, - "node_modules/postcss/node_modules/picocolors": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", - "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", - "dev": true, - "peer": true - }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -7263,22 +8483,41 @@ "node": ">= 0.8.0" } }, - "node_modules/process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "node_modules/prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "dev": true, + "peer": true, + "bin": { + "prettier": "bin-prettier.js" + }, "engines": { - "node": ">= 0.6.0" + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" } }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "node_modules/prettier-linter-helpers": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", + "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", "dev": true, "peer": true, + "dependencies": { + "fast-diff": "^1.1.2" + }, "engines": { - "node": ">=0.4.0" + "node": ">=6.0.0" + } + }, + "node_modules/process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "engines": { + "node": ">= 0.6.0" } }, "node_modules/prop-types": { @@ -7321,16 +8560,6 @@ "node": ">=12.0.0" } }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6" - } - }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -7348,15 +8577,13 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "peer": true + ] }, "node_modules/quick-lru": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", "dev": true, - "peer": true, "engines": { "node": ">=8" } @@ -7373,7 +8600,6 @@ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", "dev": true, - "peer": true, "dependencies": { "@types/normalize-package-data": "^2.4.0", "normalize-package-data": "^2.5.0", @@ -7389,7 +8615,6 @@ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", "dev": true, - "peer": true, "dependencies": { "find-up": "^4.1.0", "read-pkg": "^5.2.0", @@ -7402,12 +8627,63 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/read-pkg-up/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg-up/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/read-pkg-up/node_modules/type-fest": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", "dev": true, - "peer": true, "engines": { "node": ">=8" } @@ -7416,15 +8692,13 @@ "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", - "dev": true, - "peer": true + "dev": true }, "node_modules/read-pkg/node_modules/normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, - "peer": true, "dependencies": { "hosted-git-info": "^2.1.4", "resolve": "^1.10.0", @@ -7437,7 +8711,6 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, - "peer": true, "bin": { "semver": "bin/semver" } @@ -7447,7 +8720,6 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", "dev": true, - "peer": true, "engines": { "node": ">=8" } @@ -7467,6 +8739,29 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/readable-stream/node_modules/buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -7484,7 +8779,6 @@ "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", "dev": true, - "peer": true, "dependencies": { "indent-string": "^4.0.0", "strip-indent": "^3.0.0" @@ -7493,6 +8787,15 @@ "node": ">=8" } }, + "node_modules/reduce-flatten": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz", + "integrity": "sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/reflect.getprototypeof": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.5.tgz", @@ -7548,14 +8851,16 @@ } }, "node_modules/regexp.prototype.flags": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", - "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", + "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", "dev": true, + "peer": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "set-function-name": "^2.0.0" + "call-bind": "^1.0.6", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "set-function-name": "^2.0.1" }, "engines": { "node": ">= 0.4" @@ -7615,60 +8920,6 @@ "jsesc": "bin/jsesc" } }, - "node_modules/remark": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz", - "integrity": "sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==", - "dev": true, - "peer": true, - "dependencies": { - "remark-parse": "^9.0.0", - "remark-stringify": "^9.0.0", - "unified": "^9.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/remark-parse": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz", - "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==", - "dev": true, - "peer": true, - "dependencies": { - "mdast-util-from-markdown": "^0.8.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/remark-stringify": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz", - "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==", - "dev": true, - "peer": true, - "dependencies": { - "mdast-util-to-markdown": "^0.6.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", - "dev": true, - "peer": true, - "engines": { - "node": ">=0.10" - } - }, "node_modules/require-from-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", @@ -7697,20 +8948,41 @@ } }, "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", "dev": true, "peer": true, + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + } + }, + "node_modules/restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "peer": true, "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" @@ -7732,6 +9004,39 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/run-async": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/run-con": { + "version": "1.2.12", + "resolved": "https://registry.npmjs.org/run-con/-/run-con-1.2.12.tgz", + "integrity": "sha512-5257ILMYIF4RztL9uoZ7V9Q97zHtNHn5bN3NobeAnzB1P3ASLgg8qocM2u+R18ttp+VEM78N2LK8XcNVtnSRrg==", + "dev": true, + "dependencies": { + "deep-extend": "^0.6.0", + "ini": "~3.0.0", + "minimist": "^1.2.8", + "strip-json-comments": "~3.1.1" + }, + "bin": { + "run-con": "cli.js" + } + }, + "node_modules/run-con/node_modules/ini": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz", + "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==", + "dev": true, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -7750,7 +9055,6 @@ "url": "https://feross.org/support" } ], - "peer": true, "dependencies": { "queue-microtask": "^1.2.2" } @@ -7769,6 +9073,7 @@ "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.0.tgz", "integrity": "sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.5", "get-intrinsic": "^1.2.2", @@ -7806,6 +9111,7 @@ "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.6", "es-errors": "^1.3.0", @@ -7818,6 +9124,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, "node_modules/sass-embedded": { "version": "1.57.1", "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.57.1.tgz", @@ -7844,17 +9156,17 @@ "sass-embedded-win32-x64": "1.57.1" } }, - "node_modules/sass-embedded-linux-x64": { + "node_modules/sass-embedded-darwin-arm64": { "version": "1.57.1", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.57.1.tgz", - "integrity": "sha512-AI6CrcuLWP22RXhVrZUN2JfdQ7YdFR30dA4twYwp/Q4hUfj85dJrVD5ORi8G04haMWPOQiFV6pBcMgzpiY2Bog==", + "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.57.1.tgz", + "integrity": "sha512-YSfrLZkM2HdXETQdSznv2DN2GdkmBNWLAlHfDWe0toSEIB2C2YGuoqHYZtl6PBYqu8k8FH4TDyct8VzoIa+rMw==", "cpu": [ - "x64" + "arm64" ], "dev": true, "optional": true, "os": [ - "linux" + "darwin" ], "engines": { "node": ">=14.0.0" @@ -7903,6 +9215,7 @@ "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz", "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==", "dev": true, + "peer": true, "dependencies": { "define-data-property": "^1.1.2", "es-errors": "^1.3.0", @@ -7916,14 +9229,16 @@ } }, "node_modules/set-function-name": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", - "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", "dev": true, + "peer": true, "dependencies": { - "define-data-property": "^1.0.1", + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", "functions-have-names": "^1.2.3", - "has-property-descriptors": "^1.0.0" + "has-property-descriptors": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -7934,7 +9249,6 @@ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, - "peer": true, "dependencies": { "shebang-regex": "^3.0.0" }, @@ -7947,7 +9261,6 @@ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, - "peer": true, "engines": { "node": ">=8" } @@ -7957,6 +9270,7 @@ "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.5.tgz", "integrity": "sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.6", "es-errors": "^1.3.0", @@ -7974,8 +9288,7 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/size-limit": { "version": "8.2.6", @@ -8001,7 +9314,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "peer": true, "engines": { "node": ">=8" } @@ -8060,68 +9372,83 @@ "dev": true, "peer": true }, + "node_modules/snarkjs": { + "version": "0.7.0", + "resolved": "git+ssh://git@github.com/vocdoni/snarkjs.git#d6e37e9120e44b6681e32d8f552d4fec0f3e1b23", + "dev": true, + "license": "GPL-3.0", + "dependencies": { + "bfj": "^7.0.2", + "circom_runtime": "0.1.23", + "ffjavascript": "0.2.59" + } + }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, - "peer": true, + "optional": true, "engines": { "node": ">=0.10.0" } }, - "node_modules/spdx-correct": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", - "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", + "node_modules/source-map-js": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "dev": true, "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/spdx-correct": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", + "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", + "dev": true, "dependencies": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" } }, "node_modules/spdx-exceptions": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.4.0.tgz", - "integrity": "sha512-hcjppoJ68fhxA/cjbN4T8N6uCUejN8yFw69ttpqtBeCbF3u13n7mb31NB9jKwGTTWWnt9IbRA/mf1FprYS8wfw==", - "dev": true, - "peer": true + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", + "dev": true }, "node_modules/spdx-expression-parse": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "dev": true, - "peer": true, "dependencies": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" } }, "node_modules/spdx-license-ids": { - "version": "3.0.16", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz", - "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==", - "dev": true, - "peer": true - }, - "node_modules/specificity": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz", - "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==", - "dev": true, - "peer": true, - "bin": { - "specificity": "bin/specificity" - } + "version": "3.0.17", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz", + "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==", + "dev": true }, "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true + }, + "node_modules/static-eval": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz", + "integrity": "sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==", "dev": true, - "peer": true + "dependencies": { + "escodegen": "^1.8.1" + } }, "node_modules/string_decoder": { "version": "1.3.0", @@ -8136,7 +9463,6 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, - "peer": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -8146,12 +9472,32 @@ "node": ">=8" } }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, "node_modules/string-width/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "peer": true + "dev": true }, "node_modules/string.prototype.matchall": { "version": "4.0.10", @@ -8179,6 +9525,7 @@ "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -8196,6 +9543,7 @@ "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -8210,6 +9558,7 @@ "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -8224,7 +9573,19 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, - "peer": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -8237,6 +9598,7 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true, + "peer": true, "engines": { "node": ">=4" } @@ -8246,7 +9608,6 @@ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", "dev": true, - "peer": true, "dependencies": { "min-indent": "^1.0.0" }, @@ -8259,7 +9620,6 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, - "peer": true, "engines": { "node": ">=8" }, @@ -8275,176 +9635,340 @@ "peer": true }, "node_modules/stylelint": { - "version": "13.11.0", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.11.0.tgz", - "integrity": "sha512-DhrKSWDWGZkCiQMtU+VroXM6LWJVC8hSK24nrUngTSQvXGK75yZUq4yNpynqrxD3a/fzKMED09V+XxO4z4lTbw==", - "dev": true, - "peer": true, - "dependencies": { - "@stylelint/postcss-css-in-js": "^0.37.2", - "@stylelint/postcss-markdown": "^0.36.2", - "autoprefixer": "^9.8.6", - "balanced-match": "^1.0.0", - "chalk": "^4.1.0", - "cosmiconfig": "^7.0.0", - "debug": "^4.3.1", - "execall": "^2.0.0", - "fast-glob": "^3.2.5", - "fastest-levenshtein": "^1.0.12", - "file-entry-cache": "^6.0.0", - "get-stdin": "^8.0.0", + "version": "15.11.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.11.0.tgz", + "integrity": "sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==", + "dev": true, + "peer": true, + "dependencies": { + "@csstools/css-parser-algorithms": "^2.3.1", + "@csstools/css-tokenizer": "^2.2.0", + "@csstools/media-query-list-parser": "^2.1.4", + "@csstools/selector-specificity": "^3.0.0", + "balanced-match": "^2.0.0", + "colord": "^2.9.3", + "cosmiconfig": "^8.2.0", + "css-functions-list": "^3.2.1", + "css-tree": "^2.3.1", + "debug": "^4.3.4", + "fast-glob": "^3.3.1", + "fastest-levenshtein": "^1.0.16", + "file-entry-cache": "^7.0.0", "global-modules": "^2.0.0", - "globby": "^11.0.2", + "globby": "^11.1.0", "globjoin": "^0.1.4", - "html-tags": "^3.1.0", - "ignore": "^5.1.8", + "html-tags": "^3.3.1", + "ignore": "^5.2.4", "import-lazy": "^4.0.0", "imurmurhash": "^0.1.4", - "known-css-properties": "^0.21.0", - "lodash": "^4.17.20", - "log-symbols": "^4.0.0", + "is-plain-object": "^5.0.0", + "known-css-properties": "^0.29.0", "mathml-tag-names": "^2.1.3", - "meow": "^9.0.0", - "micromatch": "^4.0.2", - "normalize-selector": "^0.2.0", - "postcss": "^7.0.35", - "postcss-html": "^0.36.0", - "postcss-less": "^3.1.4", - "postcss-media-query-parser": "^0.2.3", + "meow": "^10.1.5", + "micromatch": "^4.0.5", + "normalize-path": "^3.0.0", + "picocolors": "^1.0.0", + "postcss": "^8.4.28", "postcss-resolve-nested-selector": "^0.1.1", - "postcss-safe-parser": "^4.0.2", - "postcss-sass": "^0.4.4", - "postcss-scss": "^2.1.1", - "postcss-selector-parser": "^6.0.4", - "postcss-syntax": "^0.36.2", - "postcss-value-parser": "^4.1.0", + "postcss-safe-parser": "^6.0.0", + "postcss-selector-parser": "^6.0.13", + "postcss-value-parser": "^4.2.0", "resolve-from": "^5.0.0", - "slash": "^3.0.0", - "specificity": "^0.4.1", - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", "style-search": "^0.1.0", - "sugarss": "^2.0.0", + "supports-hyperlinks": "^3.0.0", "svg-tags": "^1.0.0", - "table": "^6.0.7", - "v8-compile-cache": "^2.2.0", - "write-file-atomic": "^3.0.3" + "table": "^6.8.1", + "write-file-atomic": "^5.0.1" }, "bin": { - "stylelint": "bin/stylelint.js" + "stylelint": "bin/stylelint.mjs" }, "engines": { - "node": ">=10.13.0" + "node": "^14.13.1 || >=16.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/stylelint" } }, - "node_modules/stylelint/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/stylelint-prettier": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/stylelint-prettier/-/stylelint-prettier-3.0.0.tgz", + "integrity": "sha512-kIks1xw6np0zElokMT2kP6ar3S4MBoj6vUtPJuND1pFELMpZxVS/0uHPR4HDAVn0WAD3I5oF0IA3qBFxBpMkLg==", "dev": true, "peer": true, "dependencies": { - "color-convert": "^2.0.1" + "prettier-linter-helpers": "^1.0.0" }, "engines": { - "node": ">=8" + "node": "^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "prettier": ">=2.0.0", + "stylelint": ">=14.0.0" + } + }, + "node_modules/stylelint/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "peer": true + }, + "node_modules/stylelint/node_modules/balanced-match": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", + "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", + "dev": true, + "peer": true + }, + "node_modules/stylelint/node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "peer": true, + "engines": { + "node": ">=10" }, "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/stylelint/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/stylelint/node_modules/camelcase-keys": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz", + "integrity": "sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==", "dev": true, "peer": true, "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "camelcase": "^6.3.0", + "map-obj": "^4.1.0", + "quick-lru": "^5.1.1", + "type-fest": "^1.2.1" }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/stylelint/node_modules/cosmiconfig": { + "version": "8.3.6", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", + "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", + "dev": true, + "peer": true, + "dependencies": { + "import-fresh": "^3.3.0", + "js-yaml": "^4.1.0", + "parse-json": "^5.2.0", + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/stylelint/node_modules/decamelize": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-5.0.1.tgz", + "integrity": "sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==", + "dev": true, + "peer": true, "engines": { "node": ">=10" }, "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/stylelint/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/stylelint/node_modules/file-entry-cache": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-7.0.2.tgz", + "integrity": "sha512-TfW7/1iI4Cy7Y8L6iqNdZQVvdXn0f8B4QcIXmkIbtTIe/Okm/nSlHb4IwGzRVOd3WfSieCgvf5cMzEfySAIl0g==", "dev": true, "peer": true, "dependencies": { - "color-name": "~1.1.4" + "flat-cache": "^3.2.0" }, "engines": { - "node": ">=7.0.0" + "node": ">=12.0.0" } }, - "node_modules/stylelint/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "node_modules/stylelint/node_modules/indent-string": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz", + "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==", "dev": true, - "peer": true + "peer": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, - "node_modules/stylelint/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "node_modules/stylelint/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "peer": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/stylelint/node_modules/meow": { + "version": "10.1.5", + "resolved": "https://registry.npmjs.org/meow/-/meow-10.1.5.tgz", + "integrity": "sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==", "dev": true, "peer": true, + "dependencies": { + "@types/minimist": "^1.2.2", + "camelcase-keys": "^7.0.0", + "decamelize": "^5.0.0", + "decamelize-keys": "^1.1.0", + "hard-rejection": "^2.1.0", + "minimist-options": "4.1.0", + "normalize-package-data": "^3.0.2", + "read-pkg-up": "^8.0.0", + "redent": "^4.0.0", + "trim-newlines": "^4.0.2", + "type-fest": "^1.2.2", + "yargs-parser": "^20.2.9" + }, "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/stylelint/node_modules/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "node_modules/stylelint/node_modules/quick-lru": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", + "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", "dev": true, "peer": true, "engines": { - "node": ">= 4" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/stylelint/node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "node_modules/stylelint/node_modules/read-pkg": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-6.0.0.tgz", + "integrity": "sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==", "dev": true, "peer": true, + "dependencies": { + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^3.0.2", + "parse-json": "^5.2.0", + "type-fest": "^1.0.1" + }, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/stylelint/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/stylelint/node_modules/read-pkg-up": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-8.0.0.tgz", + "integrity": "sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==", "dev": true, "peer": true, "dependencies": { - "has-flag": "^4.0.0" + "find-up": "^5.0.0", + "read-pkg": "^6.0.0", + "type-fest": "^1.0.1" }, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/sugarss": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz", - "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==", + "node_modules/stylelint/node_modules/redent": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-4.0.0.tgz", + "integrity": "sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==", "dev": true, "peer": true, "dependencies": { - "postcss": "^7.0.2" + "indent-string": "^5.0.0", + "strip-indent": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/stylelint/node_modules/strip-indent": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.0.0.tgz", + "integrity": "sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==", + "dev": true, + "peer": true, + "dependencies": { + "min-indent": "^1.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/stylelint/node_modules/trim-newlines": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.1.1.tgz", + "integrity": "sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==", + "dev": true, + "peer": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/stylelint/node_modules/type-fest": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", + "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", + "dev": true, + "peer": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/supports-color": { @@ -8459,6 +9983,43 @@ "node": ">=4" } }, + "node_modules/supports-hyperlinks": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz", + "integrity": "sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==", + "dev": true, + "peer": true, + "dependencies": { + "has-flag": "^4.0.0", + "supports-color": "^7.0.0" + }, + "engines": { + "node": ">=14.18" + } + }, + "node_modules/supports-hyperlinks/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-hyperlinks/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "peer": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", @@ -8495,6 +10056,21 @@ "node": ">=10.0.0" } }, + "node_modules/table-layout": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-1.0.1.tgz", + "integrity": "sha512-dEquqYNJiGwY7iPfZ3wbXDI944iqanTSchrACLL2nOB+1r+h1Nzu2eH+DuPPvWvm5Ry7iAPeFlgEtP5bIp5U7Q==", + "dev": true, + "dependencies": { + "array-back": "^4.0.1", + "deep-extend": "~0.6.0", + "typical": "^5.2.0", + "wordwrapjs": "^4.0.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, "node_modules/table/node_modules/ajv": { "version": "8.12.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", @@ -8526,10 +10102,28 @@ "dev": true, "peer": true }, + "node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "dev": true + }, "node_modules/tiny-invariant": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz", - "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==" + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz", + "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==" + }, + "node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } }, "node_modules/to-fast-properties": { "version": "2.0.0", @@ -8544,7 +10138,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "peer": true, "dependencies": { "is-number": "^7.0.0" }, @@ -8562,27 +10155,22 @@ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", "dev": true, - "peer": true, "engines": { "node": ">=8" } }, - "node_modules/trough": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", - "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==", - "dev": true, - "peer": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } + "node_modules/tryer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", + "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==", + "dev": true }, "node_modules/tsconfig-paths": { "version": "3.15.0", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", "dev": true, + "peer": true, "dependencies": { "@types/json5": "^0.0.29", "json5": "^1.0.2", @@ -8595,6 +10183,7 @@ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "dev": true, + "peer": true, "dependencies": { "minimist": "^1.2.0" }, @@ -8627,11 +10216,10 @@ } }, "node_modules/type-fest": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", - "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", "dev": true, - "peer": true, "engines": { "node": ">=10" }, @@ -8640,29 +10228,32 @@ } }, "node_modules/typed-array-buffer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", - "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", + "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", "dev": true, + "peer": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1", - "is-typed-array": "^1.1.10" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" } }, "node_modules/typed-array-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", - "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", + "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", "dev": true, + "peer": true, "dependencies": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -8672,16 +10263,18 @@ } }, "node_modules/typed-array-byte-offset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", - "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", + "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", "dev": true, + "peer": true, "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", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -8691,34 +10284,47 @@ } }, "node_modules/typed-array-length": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", - "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.5.tgz", + "integrity": "sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==", "dev": true, + "peer": true, "dependencies": { - "call-bind": "^1.0.2", + "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", + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "node_modules/typical": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz", + "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==", "dev": true, - "peer": true, - "dependencies": { - "is-typedarray": "^1.0.0" + "engines": { + "node": ">=8" } }, + "node_modules/uc.micro": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", + "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", + "dev": true + }, "node_modules/unbox-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", "dev": true, + "peer": true, "dependencies": { "call-bind": "^1.0.2", "has-bigints": "^1.0.2", @@ -8729,6 +10335,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/underscore": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz", + "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==", + "dev": true + }, "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", @@ -8774,74 +10386,6 @@ "node": ">=4" } }, - "node_modules/unified": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz", - "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==", - "dev": true, - "peer": true, - "dependencies": { - "bail": "^1.0.0", - "extend": "^3.0.0", - "is-buffer": "^2.0.0", - "is-plain-obj": "^2.0.0", - "trough": "^1.0.0", - "vfile": "^4.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/unified/node_modules/is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", - "dev": true, - "peer": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/unist-util-find-all-after": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz", - "integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==", - "dev": true, - "peer": true, - "dependencies": { - "unist-util-is": "^4.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/unist-util-is": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", - "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==", - "dev": true, - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/unist-util-stringify-position": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz", - "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==", - "dev": true, - "peer": true, - "dependencies": { - "@types/unist": "^2.0.2" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/update-browserslist-db": { "version": "1.0.13", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", @@ -8882,63 +10426,32 @@ "punycode": "^2.1.0" } }, + "node_modules/uri-js/node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "peer": true, + "engines": { + "node": ">=6" + } + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true, - "peer": true - }, - "node_modules/v8-compile-cache": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz", - "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==", - "dev": true, - "peer": true + "dev": true }, "node_modules/validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "dev": true, - "peer": true, "dependencies": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" } }, - "node_modules/vfile": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", - "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==", - "dev": true, - "peer": true, - "dependencies": { - "@types/unist": "^2.0.0", - "is-buffer": "^2.0.0", - "unist-util-stringify-position": "^2.0.0", - "vfile-message": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, - "node_modules/vfile-message": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", - "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", - "dev": true, - "peer": true, - "dependencies": { - "@types/unist": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/unified" - } - }, "node_modules/wasmbuilder": { "version": "0.0.16", "resolved": "https://registry.npmjs.org/wasmbuilder/-/wasmbuilder-0.0.16.tgz", @@ -8952,6 +10465,15 @@ "wasmbuilder": "0.0.16" } }, + "node_modules/wcwidth": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "dev": true, + "dependencies": { + "defaults": "^1.0.3" + } + }, "node_modules/web-worker": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/web-worker/-/web-worker-1.2.0.tgz", @@ -8962,7 +10484,6 @@ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, - "peer": true, "dependencies": { "isexe": "^2.0.0" }, @@ -8978,6 +10499,7 @@ "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", "dev": true, + "peer": true, "dependencies": { "is-bigint": "^1.0.1", "is-boolean-object": "^1.1.0", @@ -9037,6 +10559,7 @@ "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.14.tgz", "integrity": "sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==", "dev": true, + "peer": true, "dependencies": { "available-typed-arrays": "^1.0.6", "call-bind": "^1.0.5", @@ -9051,24 +10574,157 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wordwrapjs": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.1.tgz", + "integrity": "sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==", + "dev": true, + "dependencies": { + "reduce-flatten": "^2.0.0", + "typical": "^5.2.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/wrap-ansi/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", + "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", "dev": true, "peer": true, "dependencies": { "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" + "signal-exit": "^4.0.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/write-file-atomic/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "peer": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/ws": { @@ -9102,7 +10758,6 @@ "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", "dev": true, - "peer": true, "engines": { "node": ">= 6" } @@ -9112,9 +10767,21 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, "peer": true, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/yup": { @@ -9133,17 +10800,6 @@ "engines": { "node": ">=10" } - }, - "node_modules/zwitch": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz", - "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==", - "dev": true, - "peer": true, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } } } } diff --git a/package.json b/package.json index 52e0ecc0..71dff654 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "decidim-vocdoni", - "version": "1.0.0", + "version": "2.0.0", "description": "An elections component for decidim's participatory spaces based on the Vocdoni SDK", "main": "index.js", "directories": { @@ -28,22 +28,19 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.19.1", - "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-private-methods": "^7.18.6", - "@babel/plugin-proposal-private-property-in-object": "^7.20.5", + "@babel/plugin-transform-class-properties": "^7.24.1", "@babel/plugin-transform-classes": "^7.20.7", "@babel/plugin-transform-regenerator": "^7.20.5", "@babel/plugin-transform-runtime": "^7.19.6", "@babel/preset-env": "^7.20.2", "@babel/preset-react": "^7.18.6", - "@decidim/dev": "0.27.6", - "@decidim/eslint-config": "0.27.6", - "@decidim/stylelint-config": "0.27.6", - "eslint-config-prettier": "^8.5.0", - "eslint-config-standard": "^11.0.0", - "eslint-plugin-import": "^2.22.0", - "eslint-plugin-standard": "^3.1.0", + "@decidim/dev": "0.28.1", + "@decidim/eslint-config": "0.28.1", + "@decidim/prettier-config": "0.28.1", + "@decidim/stylelint-config": "0.28.1", + "postcss-scss": "^4.0.9", "sass-embedded": "~1.57.1", + "snarkjs": "vocdoni/snarkjs#v0.7.0-groth16browser", "web-worker": "1.2.0" }, "dependencies": { diff --git a/spec/cells/decidim/vocdoni/census_authorization_modal_cell_spec.rb b/spec/cells/decidim/vocdoni/census_authorization_modal_cell_spec.rb index 6fc29039..d4e63cb6 100644 --- a/spec/cells/decidim/vocdoni/census_authorization_modal_cell_spec.rb +++ b/spec/cells/decidim/vocdoni/census_authorization_modal_cell_spec.rb @@ -9,9 +9,9 @@ module Vocdoni subject { cell("decidim/vocdoni/census_authorization_modal", model) } - let(:model) { create(:vocdoni_election, :published, :started, :with_internal_census, verification_types: verification_types) } + let(:model) { create(:vocdoni_election, :published, :started, :with_internal_census, verification_types:) } let(:verification_types) { [authorization_handler_name] } - let(:current_user) { create(:user, :confirmed, organization: organization) } + let(:current_user) { create(:user, :confirmed, organization:) } let(:organization) { create(:organization, available_authorizations: [authorization_handler_name]) } let(:voter) { create(:vocdoni_voter, election: model, email: current_user.email) } let(:authorization_handler_name) { "id_documents" } @@ -25,7 +25,7 @@ module Vocdoni context "when current_user is present" do it "returns 'internalCensusModal'" do allow(controller).to receive(:current_user).and_return(current_user) - expect(subject.modal_id).to eq "internalCensusModal" + expect(subject.modal_id).to eq "census-authorization-modal" end end diff --git a/spec/cells/decidim/vocdoni/election_cell_spec.rb b/spec/cells/decidim/vocdoni/election_cell_spec.rb index 90fe1a6d..10a4331c 100644 --- a/spec/cells/decidim/vocdoni/election_cell_spec.rb +++ b/spec/cells/decidim/vocdoni/election_cell_spec.rb @@ -19,12 +19,11 @@ let(:model) { election } it "renders the card" do - expect(subject).to have_css(".card--election") + expect(subject).to have_css(".card__grid") end it "renders the title and text" do - expect(subject).to have_css(".card__title") - expect(subject).to have_css(".card__text") + expect(subject).to have_css(".card__grid-text") end end end diff --git a/spec/cells/decidim/vocdoni/election_m_cell_spec.rb b/spec/cells/decidim/vocdoni/election_g_cell_spec.rb similarity index 61% rename from spec/cells/decidim/vocdoni/election_m_cell_spec.rb rename to spec/cells/decidim/vocdoni/election_g_cell_spec.rb index 337e2e71..fe32d14b 100644 --- a/spec/cells/decidim/vocdoni/election_m_cell_spec.rb +++ b/spec/cells/decidim/vocdoni/election_g_cell_spec.rb @@ -2,18 +2,18 @@ require "spec_helper" -describe Decidim::Vocdoni::ElectionMCell, type: :cell do +describe Decidim::Vocdoni::ElectionGCell, type: :cell do controller Decidim::Vocdoni::ElectionsController subject { cell_html } - let(:my_cell) { cell("decidim/vocdoni/election_m", election, context: { show_space: show_space }) } + let(:my_cell) { cell("decidim/vocdoni/election_g", election, context: { show_space: }) } let(:cell_html) { my_cell.call } let(:start_time) { 2.days.ago } let(:end_time) { 1.day.from_now } - let!(:election) { create(:vocdoni_election, :ongoing, :auto_start, start_time: start_time, end_time: end_time) } + let!(:election) { create(:vocdoni_election, :ongoing, :auto_start, start_time:, end_time:) } let(:model) { election } - let(:user) { create :user, organization: election.participatory_space.organization } + let(:user) { create(:user, organization: election.participatory_space.organization) } before do allow(controller).to receive(:current_user).and_return(user) @@ -25,28 +25,30 @@ let(:show_space) { false } it "renders the card" do - expect(subject).to have_css(".card--election") + expect(subject).to have_css(".card__grid") end it "renders the start and end time" do election_start = I18n.l(start_time.to_date, format: :decidim_short) election_end = I18n.l(end_time.to_date, format: :decidim_short) - expect(subject).to have_css(".card-data__item--centerblock", text: election_start) - expect(subject).to have_css(".card-data__item--centerblock", text: election_end) + within ".card__grid-metadata" do + expect(subject).to have_css("span", text: election_start) + expect(subject).to have_css("span", text: election_end) + end end it "renders the title and description" do description = strip_tags(translated(election.description, locale: :en)) - expect(subject).to have_css(".card__title", text: translated(election.title)) - expect(subject).to have_css(".card__text", text: description) + expect(subject).to have_css(".card__grid-text", text: translated(election.title)) + expect(subject).to have_css(".card__grid-text", text: description) end context "when election end less than 12 hours away" do let(:end_time) { 10.hours.from_now } it "renders remaining time callout" do - expect(subject).to have_css(".callout", text: "remaining to vote") + expect(subject).to have_css(".flash__message", text: "remaining to vote") end end @@ -58,7 +60,7 @@ end it "shows the attached image" do - expect(subject).to have_css(".card__image") + expect(subject).to have_css(".card__grid-img") end end end diff --git a/spec/cells/decidim/vocdoni/election_results_realtime_cell_spec.rb b/spec/cells/decidim/vocdoni/election_results_realtime_cell_spec.rb index bc029155..e6cb560d 100644 --- a/spec/cells/decidim/vocdoni/election_results_realtime_cell_spec.rb +++ b/spec/cells/decidim/vocdoni/election_results_realtime_cell_spec.rb @@ -17,7 +17,7 @@ end context "when election is not secret until the end and ongoing" do - let!(:election) { create(:vocdoni_election, :ongoing, :started, component: component, election_type: { "secret_until_the_end" => false }) } + let!(:election) { create(:vocdoni_election, :ongoing, :started, component:, election_type: { "secret_until_the_end" => false }) } it "renders the cell" do expect(subject).to have_css(".realtime-results") @@ -28,7 +28,7 @@ let!(:election) { create(:vocdoni_election, :published, :ongoing, election_type: { "secret_until_the_end" => true }) } it "does not render the cell" do - expect(subject).not_to have_css(".realtime-results") + expect(subject).to have_no_css(".realtime-results") end end @@ -36,7 +36,7 @@ let!(:election) { create(:vocdoni_election, :published, :finished, election_type: { "secret_until_the_end" => false }) } it "does not render the cell" do - expect(subject).not_to have_css(".realtime-results") + expect(subject).to have_no_css(".realtime-results") end end end diff --git a/spec/commands/decidim/vocdoni/admin/create_answer_spec.rb b/spec/commands/decidim/vocdoni/admin/create_answer_spec.rb index d0e9a681..656b6ec4 100644 --- a/spec/commands/decidim/vocdoni/admin/create_answer_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/create_answer_spec.rb @@ -8,9 +8,9 @@ let(:organization) { component.organization } let(:participatory_process) { component.participatory_space } let(:component) { election.component } - let(:question) { create :vocdoni_question, election: election } - let(:election) { create :vocdoni_election } - let(:user) { create :user, :admin, :confirmed, organization: organization } + let(:question) { create(:vocdoni_question, election:) } + let(:election) { create(:vocdoni_election) } + let(:user) { create(:user, :admin, :confirmed, organization:) } let(:form) do double( invalid?: invalid, @@ -20,8 +20,8 @@ current_user: user, current_component: component, current_organization: organization, - election: election, - question: question + election:, + question: ) end let(:invalid) { false } @@ -39,7 +39,7 @@ expect(answer.weight).to eq(10) end - it "traces the action", versioning: true do + it "traces the action", :versioning do expect(Decidim.traceability) .to receive(:create!) .with( @@ -65,7 +65,7 @@ end context "when the election is ongoing" do - let(:election) { create :vocdoni_election, :ongoing } + let(:election) { create(:vocdoni_election, :ongoing) } it "is not valid" do expect { subject.call }.to broadcast(:invalid) diff --git a/spec/commands/decidim/vocdoni/admin/create_census_data_spec.rb b/spec/commands/decidim/vocdoni/admin/create_census_data_spec.rb index 01025982..d9541c34 100644 --- a/spec/commands/decidim/vocdoni/admin/create_census_data_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/create_census_data_spec.rb @@ -6,7 +6,7 @@ module Decidim::Vocdoni::Admin describe CreateCensusData do subject { described_class.new(form, election) } - let(:form) { CensusDataForm.new(file: file) } + let(:form) { CensusDataForm.new(file:) } let(:election) { create(:vocdoni_election) } def valid_census_file @@ -31,7 +31,7 @@ def valid_census_file context "when the file is provided and contains valid data" do let(:file) { Rack::Test::UploadedFile.new(valid_census_file, "text/csv") } - let(:form) { CensusDataForm.new(file: file) } + let(:form) { CensusDataForm.new(file:) } let(:expected_number_of_voters) { 2 } it "successfully creates voters" do @@ -41,7 +41,7 @@ def valid_census_file context "when updates the census type of the election" do let(:file) { Rack::Test::UploadedFile.new(valid_census_file, "text/csv") } - let(:form) { CensusDataForm.new(file: file) } + let(:form) { CensusDataForm.new(file:) } it "sets the internal_census to false" do subject.call diff --git a/spec/commands/decidim/vocdoni/admin/create_election_spec.rb b/spec/commands/decidim/vocdoni/admin/create_election_spec.rb index 6f9e1b4a..ed3081f2 100644 --- a/spec/commands/decidim/vocdoni/admin/create_election_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/create_election_spec.rb @@ -5,10 +5,10 @@ describe Decidim::Vocdoni::Admin::CreateElection do subject { described_class.new(form) } - let(:organization) { create :organization, available_locales: [:en, :ca, :es], default_locale: :en } - let(:participatory_process) { create :participatory_process, organization: organization } - let(:current_component) { create :component, participatory_space: participatory_process, manifest_name: "vocdoni" } - let(:user) { create :user, :admin, :confirmed, organization: organization } + let(:organization) { create(:organization, available_locales: [:en, :ca, :es], default_locale: :en) } + let(:participatory_process) { create(:participatory_process, organization:) } + let(:current_component) { create(:component, participatory_space: participatory_process, manifest_name: "vocdoni") } + let(:user) { create(:user, :admin, :confirmed, organization:) } let(:form) do double( invalid?: invalid, @@ -16,10 +16,10 @@ description: { en: "description" }, stream_uri: "https://example.org/stream", attachment: attachment_params, - photos: photos, + photos:, add_photos: uploaded_photos, current_user: user, - current_component: current_component, + current_component:, current_organization: organization ) end @@ -46,7 +46,7 @@ expect(election.component).to eq current_component end - it "traces the action", versioning: true do + it "traces the action", :versioning do expect(Decidim.traceability) .to receive(:create!) .with( diff --git a/spec/commands/decidim/vocdoni/admin/create_internal_census_spec.rb b/spec/commands/decidim/vocdoni/admin/create_internal_census_spec.rb index eece2d5a..e299c339 100644 --- a/spec/commands/decidim/vocdoni/admin/create_internal_census_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/create_internal_census_spec.rb @@ -8,20 +8,20 @@ module Admin describe CreateInternalCensus do subject { described_class.new(form, election) } - let(:organization) { create(:organization, available_authorizations: available_authorizations) } + let(:organization) { create(:organization, available_authorizations:) } let!(:available_authorizations) { verification_types + another_verification_types } let!(:election) { create(:vocdoni_election) } let(:form) { CensusPermissionsForm.from_params(params).with_context(current_organization: organization) } let(:verification_types) { ["id_document_handler"] } let(:invalid_verification_types) { ["invalid_handler"] } let(:another_verification_types) { ["another_handler"] } - let(:verified_user) { create(:user, :confirmed, organization: organization) } - let(:verified_user_second) { create(:user, :confirmed, organization: organization) } + let(:verified_user) { create(:user, :confirmed, organization:) } + let(:verified_user_second) { create(:user, :confirmed, organization:) } let!(:authorization) { create(:authorization, user: verified_user, name: "id_document_handler") } let!(:authorization_second) { create(:authorization, user: verified_user_second, name: "id_document_handler") } describe "when the form is valid" do - let(:params) { { verification_types: verification_types } } + let(:params) { { verification_types: } } it "creates voters and updates the election" do expect { subject.call }.to change(Decidim::Vocdoni::Voter, :count).by(2) diff --git a/spec/commands/decidim/vocdoni/admin/create_question_spec.rb b/spec/commands/decidim/vocdoni/admin/create_question_spec.rb index d42c78df..02f9ed2a 100644 --- a/spec/commands/decidim/vocdoni/admin/create_question_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/create_question_spec.rb @@ -8,8 +8,8 @@ let(:organization) { current_component.organization } let(:participatory_process) { current_component.participatory_space } let(:current_component) { election.component } - let(:election) { create :vocdoni_election } - let(:user) { create :user, :admin, :confirmed, organization: organization } + let(:election) { create(:vocdoni_election) } + let(:user) { create(:user, :admin, :confirmed, organization:) } let(:form) do double( invalid?: invalid, @@ -17,9 +17,9 @@ description: { en: "description" }, weight: 10, current_user: user, - current_component: current_component, + current_component:, current_organization: organization, - election: election + election: ) end let(:invalid) { false } @@ -37,7 +37,7 @@ expect(question.weight).to eq(10) end - it "traces the action", versioning: true do + it "traces the action", :versioning do expect(Decidim.traceability) .to receive(:create!) .with( @@ -63,7 +63,7 @@ end context "when the election is ongoing" do - let(:election) { create :vocdoni_election, :ongoing } + let(:election) { create(:vocdoni_election, :ongoing) } it "is not valid" do expect { subject.call }.to broadcast(:election_ongoing) diff --git a/spec/commands/decidim/vocdoni/admin/create_wallet_spec.rb b/spec/commands/decidim/vocdoni/admin/create_wallet_spec.rb index 430e24cb..6e82b734 100644 --- a/spec/commands/decidim/vocdoni/admin/create_wallet_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/create_wallet_spec.rb @@ -5,9 +5,9 @@ describe Decidim::Vocdoni::Admin::CreateWallet do subject { described_class.new(user) } - let(:organization) { create :organization, available_locales: [:en, :ca, :es], default_locale: :en } - let(:user) { create :user, :admin, :confirmed, organization: organization } - let(:wallet) { Decidim::Vocdoni::Wallet.find_by(organization: organization) } + let(:organization) { create(:organization, available_locales: [:en, :ca, :es], default_locale: :en) } + let(:user) { create(:user, :admin, :confirmed, organization:) } + let(:wallet) { Decidim::Vocdoni::Wallet.find_by(organization:) } it "creates the wallet" do expect { subject.call }.to change(Decidim::Vocdoni::Wallet, :count).by(1) @@ -24,7 +24,7 @@ first = wallet.private_key wallet.destroy described_class.new(user).call - expect(Decidim::Vocdoni::Wallet.find_by(organization: organization).private_key).to eq first + expect(Decidim::Vocdoni::Wallet.find_by(organization:).private_key).to eq first end it "two equal private keys cannot be stored" do @@ -32,7 +32,7 @@ expect { subject.call }.to raise_error(ActiveRecord::RecordInvalid) end - it "traces the action", versioning: true do + it "traces the action", :versioning do expect(Decidim.traceability) .to receive(:create!) .with( diff --git a/spec/commands/decidim/vocdoni/admin/destroy_answer_spec.rb b/spec/commands/decidim/vocdoni/admin/destroy_answer_spec.rb index befbc961..f70e2e0f 100644 --- a/spec/commands/decidim/vocdoni/admin/destroy_answer_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/destroy_answer_spec.rb @@ -5,18 +5,18 @@ describe Decidim::Vocdoni::Admin::DestroyAnswer do subject(:command) { described_class.new(answer, user) } - let(:election) { create :vocdoni_election } - let(:question) { create :vocdoni_question, election: election } - let!(:answer) { create :vocdoni_election_answer, question: question } + let(:election) { create(:vocdoni_election) } + let(:question) { create(:vocdoni_question, election:) } + let!(:answer) { create(:vocdoni_election_answer, question:) } let(:component) { election.component } let(:organization) { component.organization } - let(:user) { create :user, :admin, :confirmed, organization: organization } + let(:user) { create(:user, :admin, :confirmed, organization:) } it "destroys the answer" do expect { subject.call }.to change(Decidim::Vocdoni::Answer, :count).by(-1) end - it "traces the action", versioning: true do + it "traces the action", :versioning do expect(Decidim.traceability) .to receive(:perform_action!) .with(:delete, answer, user, visibility: "all") @@ -29,7 +29,7 @@ end context "when the election is ongoing" do - let(:election) { create :vocdoni_election, :ongoing } + let(:election) { create(:vocdoni_election, :ongoing) } it "is not valid" do expect { subject.call }.to broadcast(:invalid) diff --git a/spec/commands/decidim/vocdoni/admin/destroy_election_spec.rb b/spec/commands/decidim/vocdoni/admin/destroy_election_spec.rb index 1f857902..db7a5096 100644 --- a/spec/commands/decidim/vocdoni/admin/destroy_election_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/destroy_election_spec.rb @@ -5,15 +5,15 @@ describe Decidim::Vocdoni::Admin::DestroyElection do subject { described_class.new(election, user) } - let!(:election) { create :vocdoni_election } + let!(:election) { create(:vocdoni_election) } let(:organization) { election.component.organization } - let(:user) { create :user, :admin, :confirmed, organization: organization } + let(:user) { create(:user, :admin, :confirmed, organization:) } it "destroys the election" do expect { subject.call }.to change(Decidim::Vocdoni::Election, :count).by(-1) end - it "traces the action", versioning: true do + it "traces the action", :versioning do expect(Decidim.traceability) .to receive(:perform_action!) .with(:delete, election, user, visibility: "all") @@ -26,7 +26,7 @@ end context "when the election is ongoing" do - let(:election) { create :vocdoni_election, :ongoing } + let(:election) { create(:vocdoni_election, :ongoing) } it "is not valid" do expect { subject.call }.to broadcast(:invalid) diff --git a/spec/commands/decidim/vocdoni/admin/destroy_question_spec.rb b/spec/commands/decidim/vocdoni/admin/destroy_question_spec.rb index d045bd25..53cdb3f4 100644 --- a/spec/commands/decidim/vocdoni/admin/destroy_question_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/destroy_question_spec.rb @@ -5,16 +5,16 @@ describe Decidim::Vocdoni::Admin::DestroyQuestion do subject { described_class.new(question, user) } - let(:election) { create :vocdoni_election } - let!(:question) { create :vocdoni_question, election: election } + let(:election) { create(:vocdoni_election) } + let!(:question) { create(:vocdoni_question, election:) } let(:organization) { election.component.organization } - let(:user) { create :user, :admin, :confirmed, organization: organization } + let(:user) { create(:user, :admin, :confirmed, organization:) } it "destroys the question" do expect { subject.call }.to change(Decidim::Vocdoni::Question, :count).by(-1) end - it "traces the action", versioning: true do + it "traces the action", :versioning do expect(Decidim.traceability) .to receive(:perform_action!) .with(:delete, question, user, visibility: "all") @@ -27,7 +27,7 @@ end context "when the election is ongoing" do - let(:election) { create :vocdoni_election, :ongoing } + let(:election) { create(:vocdoni_election, :ongoing) } it "is not valid" do expect { subject.call }.to broadcast(:invalid) diff --git a/spec/commands/decidim/vocdoni/admin/publish_election_spec.rb b/spec/commands/decidim/vocdoni/admin/publish_election_spec.rb index 87bca459..cc2e1349 100644 --- a/spec/commands/decidim/vocdoni/admin/publish_election_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/publish_election_spec.rb @@ -15,7 +15,7 @@ module Decidim::Vocdoni::Admin expect { subject.call }.to change(election, :published?).from(false).to(true) end - it "traces the action", versioning: true do + it "traces the action", :versioning do expect(Decidim.traceability) .to receive(:perform_action!) .with(:publish, election, user, visibility: "all") @@ -27,7 +27,7 @@ module Decidim::Vocdoni::Admin end it "fires an event" do - create :follow, followable: participatory_process, user: user + create(:follow, followable: participatory_process, user:) expect(Decidim::EventsManager) .to receive(:publish) diff --git a/spec/commands/decidim/vocdoni/admin/save_results_spec.rb b/spec/commands/decidim/vocdoni/admin/save_results_spec.rb index 71649c6b..e25ac63b 100644 --- a/spec/commands/decidim/vocdoni/admin/save_results_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/save_results_spec.rb @@ -5,19 +5,21 @@ describe Decidim::Vocdoni::Admin::SaveResults do subject { described_class.new(form) } - let(:election) { create :vocdoni_election } - let(:question1) { create :vocdoni_question, election: election, weight: 1 } - let!(:answer11) { create :vocdoni_election_answer, question: question1, value: 1 } - let!(:answer12) { create :vocdoni_election_answer, question: question1, value: 0 } - let(:question2) { create :vocdoni_question, election: election, weight: 0 } - let!(:answer21) { create :vocdoni_election_answer, question: question2, value: 0 } - let!(:answer22) { create :vocdoni_election_answer, question: question2, value: 1 } + # rubocop:disable RSpec/IndexedLet + let(:election) { create(:vocdoni_election) } + let(:question1) { create(:vocdoni_question, election:, weight: 1) } + let!(:answer11) { create(:vocdoni_election_answer, question: question1, value: 1) } + let!(:answer12) { create(:vocdoni_election_answer, question: question1, value: 0) } + let(:question2) { create(:vocdoni_question, election:, weight: 0) } + let!(:answer21) { create(:vocdoni_election_answer, question: question2, value: 0) } + let!(:answer22) { create(:vocdoni_election_answer, question: question2, value: 1) } + # rubocop:enable RSpec/IndexedLet let(:organization) { election.component.organization } - let(:user) { create :user, :admin, :confirmed, organization: organization } + let(:user) { create(:user, :admin, :confirmed, organization:) } let(:form) do double( - election: election, + election:, current_user: user ) end @@ -67,7 +69,7 @@ expect(election.reload.status).to eq "results_published" end - it "traces the action", versioning: true do + it "traces the action", :versioning do expect(Decidim.traceability) .to receive(:perform_action!) .with(:save_results, election, user, extra: { status: "results_published" }) diff --git a/spec/commands/decidim/vocdoni/admin/setup_election_spec.rb b/spec/commands/decidim/vocdoni/admin/setup_election_spec.rb index b76ae409..532a34d1 100644 --- a/spec/commands/decidim/vocdoni/admin/setup_election_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/setup_election_spec.rb @@ -5,20 +5,20 @@ describe Decidim::Vocdoni::Admin::SetupElection do subject { described_class.new(form) } - let(:organization) { create :organization, available_locales: [:en, :ca, :es], default_locale: :en } + let(:organization) { create(:organization, available_locales: [:en, :ca, :es], default_locale: :en) } let(:invalid) { false } - let(:participatory_process) { create :participatory_process, organization: organization } - let(:current_component) { create :component, participatory_space: participatory_process, manifest_name: "elections" } - let(:user) { create :user, :admin, :confirmed, organization: organization } - let!(:election) { create :vocdoni_election, :complete } + let(:participatory_process) { create(:participatory_process, organization:) } + let(:current_component) { create(:component, participatory_space: participatory_process, manifest_name: "elections") } + let(:user) { create(:user, :admin, :confirmed, organization:) } + let!(:election) { create(:vocdoni_election, :complete) } let(:vocdoni_election_id) { "12345" } let(:form) do double( invalid?: invalid, - election: election, - vocdoni_election_id: vocdoni_election_id, + election:, + vocdoni_election_id:, current_user: user, - current_component: current_component, + current_component:, current_organization: organization ) end @@ -29,7 +29,7 @@ expect { subject.call }.to change { Decidim::Vocdoni::Election.last.status }.from(nil).to("created") end - it "logs the performed action", versioning: true do + it "logs the performed action", :versioning do expect(Decidim.traceability) .to receive(:perform_action!) .with(:setup, election, user, visibility: "all") diff --git a/spec/commands/decidim/vocdoni/admin/unpublish_election_spec.rb b/spec/commands/decidim/vocdoni/admin/unpublish_election_spec.rb index 493c869d..e87610b4 100644 --- a/spec/commands/decidim/vocdoni/admin/unpublish_election_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/unpublish_election_spec.rb @@ -15,7 +15,7 @@ module Decidim::Vocdoni::Admin expect { subject.call }.to change(election, :published?).from(true).to(false) end - it "traces the action", versioning: true do + it "traces the action", :versioning do expect(Decidim.traceability) .to receive(:perform_action!) .with(:unpublish, election, user) diff --git a/spec/commands/decidim/vocdoni/admin/update_answer_spec.rb b/spec/commands/decidim/vocdoni/admin/update_answer_spec.rb index 2adfe3d5..d247c2f0 100644 --- a/spec/commands/decidim/vocdoni/admin/update_answer_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/update_answer_spec.rb @@ -5,12 +5,12 @@ describe Decidim::Vocdoni::Admin::UpdateAnswer do subject(:command) { described_class.new(form, answer) } - let(:election) { create :vocdoni_election } - let(:question) { create :vocdoni_question, election: election } - let(:answer) { create :vocdoni_election_answer, question: question } + let(:election) { create(:vocdoni_election) } + let(:question) { create(:vocdoni_question, election:) } + let(:answer) { create(:vocdoni_election_answer, question:) } let(:component) { election.component } let(:organization) { component.organization } - let(:user) { create :user, :admin, :confirmed, organization: organization } + let(:user) { create(:user, :admin, :confirmed, organization:) } let(:form) do double( invalid?: invalid, @@ -18,8 +18,8 @@ title: { en: "title" }, description: { en: "description" }, weight: 10, - election: election, - question: question + election:, + question: ) end let(:invalid) { false } @@ -31,7 +31,7 @@ expect(answer.weight).to eq(10) end - it "traces the action", versioning: true do + it "traces the action", :versioning do expect(Decidim.traceability) .to receive(:update!) .with(answer, user, hash_including(:title, :description, :weight), visibility: "all") @@ -52,7 +52,7 @@ end context "when the election is ongoing" do - let(:election) { create :vocdoni_election, :ongoing } + let(:election) { create(:vocdoni_election, :ongoing) } it "is not valid" do expect { subject.call }.to broadcast(:invalid) diff --git a/spec/commands/decidim/vocdoni/admin/update_election_calendar_spec.rb b/spec/commands/decidim/vocdoni/admin/update_election_calendar_spec.rb index 46f6245a..54da8700 100644 --- a/spec/commands/decidim/vocdoni/admin/update_election_calendar_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/update_election_calendar_spec.rb @@ -5,19 +5,19 @@ describe Decidim::Vocdoni::Admin::UpdateElectionCalendar do subject { described_class.new(form, election) } - let(:election) { create :vocdoni_election } + let(:election) { create(:vocdoni_election) } let(:organization) { election.component.organization } - let(:user) { create :user, :admin, :confirmed, organization: organization } + let(:user) { create(:user, :admin, :confirmed, organization:) } let(:form) do double( invalid?: invalid, current_user: user, - start_time: start_time, - end_time: end_time, - manual_start: manual_start, + start_time:, + end_time:, + manual_start:, interruptible: true, dynamic_census: false, - result_type: result_type, + result_type:, anonymous: false ) end @@ -40,7 +40,7 @@ expect(election.election_type.fetch("anonymous")).to be_falsy end - it "traces the action", versioning: true do + it "traces the action", :versioning do expect(Decidim.traceability) .to receive(:update!).with(election, user, hash_including(:start_time, :end_time, { election_type: { auto_start: true, anonymous: false, dynamic_census: false, interruptible: true, secret_until_the_end: (result_type == "after_voting") } }), visibility: "all").and_call_original diff --git a/spec/commands/decidim/vocdoni/admin/update_election_spec.rb b/spec/commands/decidim/vocdoni/admin/update_election_spec.rb index e96d23ec..d373dbe0 100644 --- a/spec/commands/decidim/vocdoni/admin/update_election_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/update_election_spec.rb @@ -5,9 +5,9 @@ describe Decidim::Vocdoni::Admin::UpdateElection do subject { described_class.new(form, election) } - let(:election) { create :vocdoni_election } + let(:election) { create(:vocdoni_election) } let(:organization) { election.component.organization } - let(:user) { create :user, :admin, :confirmed, organization: organization } + let(:user) { create(:user, :admin, :confirmed, organization:) } let(:form) do double( invalid?: invalid, @@ -31,7 +31,7 @@ expect(translated(election.description)).to eq "description" end - it "traces the action", versioning: true do + it "traces the action", :versioning do expect(Decidim.traceability) .to receive(:update!) .with(election, user, hash_including(:title, :description), visibility: "all") diff --git a/spec/commands/decidim/vocdoni/admin/update_election_status_spec.rb b/spec/commands/decidim/vocdoni/admin/update_election_status_spec.rb index 45b7b3fb..c165ef43 100644 --- a/spec/commands/decidim/vocdoni/admin/update_election_status_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/update_election_status_spec.rb @@ -5,15 +5,15 @@ describe Decidim::Vocdoni::Admin::UpdateElectionStatus do subject { described_class.new(form) } - let(:election) { create :vocdoni_election, status: :vote } + let(:election) { create(:vocdoni_election, status: :vote) } let(:organization) { election.component.organization } - let(:user) { create :user, :admin, :confirmed, organization: organization } + let(:user) { create(:user, :admin, :confirmed, organization:) } let(:form) do double( invalid?: invalid, current_user: user, status: "paused", - election: election + election: ) end let(:invalid) { false } @@ -38,7 +38,7 @@ expect(election.status).to eq "paused" end - it "traces the action", versioning: true do + it "traces the action", :versioning do expect(Decidim.traceability) .to receive(:perform_action!) .with(:change_election_status, election, user) diff --git a/spec/commands/decidim/vocdoni/admin/update_question_spec.rb b/spec/commands/decidim/vocdoni/admin/update_question_spec.rb index b1fceaa7..85f826f4 100644 --- a/spec/commands/decidim/vocdoni/admin/update_question_spec.rb +++ b/spec/commands/decidim/vocdoni/admin/update_question_spec.rb @@ -5,10 +5,10 @@ describe Decidim::Vocdoni::Admin::UpdateQuestion do subject { described_class.new(form, question) } - let(:election) { create :vocdoni_election } - let(:question) { create :vocdoni_question, election: election } + let(:election) { create(:vocdoni_election) } + let(:question) { create(:vocdoni_question, election:) } let(:organization) { election.component.organization } - let(:user) { create :user, :admin, :confirmed, organization: organization } + let(:user) { create(:user, :admin, :confirmed, organization:) } let(:form) do double( invalid?: invalid, @@ -16,7 +16,7 @@ title: { en: "title" }, description: { en: "description" }, weight: 10, - election: election + election: ) end let(:invalid) { false } @@ -28,7 +28,7 @@ expect(question.weight).to eq(10) end - it "traces the action", versioning: true do + it "traces the action", :versioning do expect(Decidim.traceability) .to receive(:update!) .with(question, user, hash_including(:title, :weight), visibility: "all") @@ -49,7 +49,7 @@ end context "when the election is ongoing" do - let(:election) { create :vocdoni_election, :ongoing } + let(:election) { create(:vocdoni_election, :ongoing) } it "is not valid" do expect { subject.call }.to broadcast(:invalid) diff --git a/spec/controllers/decidim/vocdoni/admin/answers_controller_spec.rb b/spec/controllers/decidim/vocdoni/admin/answers_controller_spec.rb index 245987d3..64dda8fc 100644 --- a/spec/controllers/decidim/vocdoni/admin/answers_controller_spec.rb +++ b/spec/controllers/decidim/vocdoni/admin/answers_controller_spec.rb @@ -5,7 +5,7 @@ module Decidim module Vocdoni module Admin - describe AnswersController, type: :controller do + describe AnswersController do routes { Decidim::Vocdoni::AdminEngine.routes } let(:user) { create(:user, :confirmed, :admin, organization: component.organization) } @@ -20,9 +20,9 @@ module Admin describe "PATCH update" do let(:datetime_format) { I18n.t("time.formats.decidim_short") } let(:component) { create(:vocdoni_component) } - let(:election) { create(:vocdoni_election, component: component) } - let(:question) { create(:vocdoni_question, election: election) } - let(:answer) { create(:vocdoni_election_answer, question: question) } + let(:election) { create(:vocdoni_election, component:) } + let(:question) { create(:vocdoni_question, election:) } + let(:answer) { create(:vocdoni_election_answer, question:) } let(:answer_title) { answer.title } let(:answer_params) do { @@ -44,7 +44,7 @@ module Admin it "updates the election" do allow(controller).to receive(:election_question_answers_path).and_return("/answers") - patch :update, params: params + patch(:update, params:) expect(flash[:notice]).not_to be_empty expect(response).to have_http_status(:found) @@ -53,10 +53,10 @@ module Admin context "when the existing election has photos and there are other errors on the form" do include_context "with controller rendering the view" do let(:answer_title) { { en: "" } } - let(:answer) { create(:vocdoni_election_answer, :with_photos, question: question) } + let(:answer) { create(:vocdoni_election_answer, :with_photos, question:) } it "displays the editing form with errors" do - patch :update, params: params + patch(:update, params:) expect(flash[:alert]).not_to be_empty expect(response).to have_http_status(:ok) diff --git a/spec/controllers/decidim/vocdoni/admin/election_calendar_controller_spec.rb b/spec/controllers/decidim/vocdoni/admin/election_calendar_controller_spec.rb index 389b1186..edb03346 100644 --- a/spec/controllers/decidim/vocdoni/admin/election_calendar_controller_spec.rb +++ b/spec/controllers/decidim/vocdoni/admin/election_calendar_controller_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -describe Decidim::Vocdoni::Admin::ElectionCalendarController, type: :controller do +describe Decidim::Vocdoni::Admin::ElectionCalendarController do routes { Decidim::Vocdoni::AdminEngine.routes } let(:user) { create(:user, :confirmed, :admin, organization: component.organization) } @@ -17,7 +17,7 @@ describe "PATCH update" do let(:datetime_format) { I18n.t("time.formats.decidim_short") } let(:component) { create(:vocdoni_component) } - let(:election) { create(:vocdoni_election, component: component) } + let(:election) { create(:vocdoni_election, component:) } let(:election_params) do { start_time: election.start_time.strftime(datetime_format), @@ -38,7 +38,7 @@ it "updates the election" do allow(controller).to receive(:publish_page_election_path).with(election).and_return("/elections/#{election.id}/publish_page") - patch :update, params: params + patch(:update, params:) expect(response).to have_http_status(:found) end diff --git a/spec/controllers/decidim/vocdoni/admin/elections_controller_spec.rb b/spec/controllers/decidim/vocdoni/admin/elections_controller_spec.rb index d9c83a64..3edae45d 100644 --- a/spec/controllers/decidim/vocdoni/admin/elections_controller_spec.rb +++ b/spec/controllers/decidim/vocdoni/admin/elections_controller_spec.rb @@ -2,12 +2,12 @@ require "spec_helper" -describe Decidim::Vocdoni::Admin::ElectionsController, type: :controller do +describe Decidim::Vocdoni::Admin::ElectionsController do routes { Decidim::Vocdoni::AdminEngine.routes } let(:user) { create(:user, :confirmed, :admin, organization: component.organization) } let(:component) { create(:vocdoni_component) } - let(:election) { create(:vocdoni_election, component: component) } + let(:election) { create(:vocdoni_election, component:) } before do request.env["decidim.current_organization"] = component.organization @@ -72,7 +72,7 @@ it "updates the election" do allow(controller).to receive(:elections_path).and_return("/elections") - patch :update, params: params + patch(:update, params:) expect(flash[:notice]).not_to be_empty expect(response).to have_http_status(:found) @@ -81,10 +81,10 @@ context "when the existing election has photos and there are other errors on the form" do include_context "with controller rendering the view" do let(:election_title) { { en: "" } } - let(:election) { create(:vocdoni_election, :with_photos, component: component) } + let(:election) { create(:vocdoni_election, :with_photos, component:) } it "displays the editing form with errors" do - patch :update, params: params + patch(:update, params:) expect(flash[:alert]).not_to be_empty expect(response).to have_http_status(:ok) diff --git a/spec/controllers/decidim/vocdoni/admin/wallets_controller_spec.rb b/spec/controllers/decidim/vocdoni/admin/wallets_controller_spec.rb index 87c1c639..61549a17 100644 --- a/spec/controllers/decidim/vocdoni/admin/wallets_controller_spec.rb +++ b/spec/controllers/decidim/vocdoni/admin/wallets_controller_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -describe Decidim::Vocdoni::Admin::WalletsController, type: :controller do +describe Decidim::Vocdoni::Admin::WalletsController do routes { Decidim::Vocdoni::AdminEngine.routes } let(:user) { create(:user, :confirmed, :admin) } @@ -19,7 +19,7 @@ let(:params) { { component_id: component.id } } it "renders the empty form" do - get :new, params: params + get(:new, params:) expect(response).to have_http_status(:ok) expect(subject).to render_template(:new) end @@ -31,19 +31,19 @@ { current_organization: component.organization, current_user: user, - private_key: private_key + private_key: } end it "creates a wallet" do - post :create, params: params + post(:create, params:) expect(flash[:notice]).not_to be_empty expect(response).to have_http_status(:found) end it "redirects to that components' path" do - post :create, params: params + post(:create, params:) expect(response.location).to match %r{/manage/$} end @@ -51,7 +51,7 @@ context "when there's redirect_back in the session" do it "redirects to that elections' steps path" do session[:redirect_back] = 1 - post :create, params: params + post(:create, params:) expect(response.location).to match %r{/manage/elections/1/steps$} end diff --git a/spec/controllers/decidim/vocdoni/elections_controller_spec.rb b/spec/controllers/decidim/vocdoni/elections_controller_spec.rb index d9dde331..533e845c 100644 --- a/spec/controllers/decidim/vocdoni/elections_controller_spec.rb +++ b/spec/controllers/decidim/vocdoni/elections_controller_spec.rb @@ -2,11 +2,11 @@ require "spec_helper" -describe Decidim::Vocdoni::ElectionsController, type: :controller do +describe Decidim::Vocdoni::ElectionsController do routes { Decidim::Vocdoni::Engine.routes } let(:component) { create(:vocdoni_component) } - let(:election) { create(:vocdoni_election, :published, component: component) } + let(:election) { create(:vocdoni_election, :published, component:) } let(:user) { create(:user, :confirmed, organization: component.organization) } let!(:wallet) { create(:vocdoni_wallet, organization: component.organization, private_key: Faker::Blockchain::Ethereum.address) } let(:vocdoni_client) { double("Api") } @@ -22,7 +22,7 @@ context "when election is not secret until the end and has data and is ongoing" do let(:election) do - create(:vocdoni_election, :published, :ongoing, component: component, election_type: { "secret_until_the_end" => false }) + create(:vocdoni_election, :published, :ongoing, component:, election_type: { "secret_until_the_end" => false }) end before do @@ -41,7 +41,7 @@ it "renders correct json" do get :show, params: { id: election.id }, format: :json - expect(JSON.parse(response.body)).to eq({ "election_data" => nil }) + expect(response.parsed_body).to eq({ "election_data" => nil }) end end end @@ -62,7 +62,7 @@ describe "#election_metadata" do context "when election is ongoing and not secret until the end" do let(:election) do - create(:vocdoni_election, :published, :ongoing, component: component, + create(:vocdoni_election, :published, :ongoing, component:, election_type: { "secret_until_the_end" => false }, vocdoni_election_id: "123") end @@ -83,7 +83,7 @@ context "when election is not ongoing or is secret until the end" do let(:election) do - create(:vocdoni_election, :published, component: component, + create(:vocdoni_election, :published, component:, election_type: { "secret_until_the_end" => true }) end diff --git a/spec/controllers/decidim/vocdoni/votes_controller_spec.rb b/spec/controllers/decidim/vocdoni/votes_controller_spec.rb index a1ebf72b..b52fa478 100644 --- a/spec/controllers/decidim/vocdoni/votes_controller_spec.rb +++ b/spec/controllers/decidim/vocdoni/votes_controller_spec.rb @@ -2,11 +2,11 @@ require "spec_helper" -describe Decidim::Vocdoni::VotesController, type: :controller do +describe Decidim::Vocdoni::VotesController do routes { Decidim::Vocdoni::Engine.routes } let(:component) { create(:vocdoni_component) } - let(:election) { create(:vocdoni_election, :published, component: component) } + let(:election) { create(:vocdoni_election, :published, component:) } let(:user) { create(:user, :confirmed, organization: component.organization) } before do @@ -30,7 +30,7 @@ end describe "POST check_verification" do - let(:voter) { create(:vocdoni_voter, email: user.email, election: election) } + let(:voter) { create(:vocdoni_voter, email: user.email, election:) } it "returns verification status" do post :check_verification, params: { election_id: election.id } @@ -40,8 +40,7 @@ context "when user is verified and is in the Vocdoni census" do before do - allow(controller).to receive(:voter_verified?).and_return(true) - allow(controller).to receive(:voter).and_return(voter) + allow(controller).to receive_messages(voter_verified?: true, voter:) end it "returns verification status" do @@ -53,8 +52,7 @@ context "when user is verified and is not in the Vocdoni census" do before do - allow(controller).to receive(:voter_verified?).and_return(false) - allow(controller).to receive(:voter).and_return(voter) + allow(controller).to receive_messages(voter_verified?: false, voter:) end it "returns verification status" do diff --git a/spec/events/decidim/vocdoni/election_published_event_spec.rb b/spec/events/decidim/vocdoni/election_published_event_spec.rb index 3b7791a1..2f66059c 100644 --- a/spec/events/decidim/vocdoni/election_published_event_spec.rb +++ b/spec/events/decidim/vocdoni/election_published_event_spec.rb @@ -7,8 +7,8 @@ let(:event_name) { "decidim.events.vocdoni.election_published" } let(:participatory_space) { create(:participatory_process, :with_steps, title: { en: "A participatory process" }) } - let(:component) { create(:vocdoni_component, participatory_space: participatory_space) } - let(:resource) { create(:vocdoni_election, component: component) } + let(:component) { create(:vocdoni_component, participatory_space:) } + let(:resource) { create(:vocdoni_election, component:) } let(:participatory_space_title) { resource.participatory_space.title["en"] } let(:resource_title) { resource.title["en"] } diff --git a/spec/forms/decidim/vocdoni/admin/answer_form_spec.rb b/spec/forms/decidim/vocdoni/admin/answer_form_spec.rb index f060bd40..d1056f4b 100644 --- a/spec/forms/decidim/vocdoni/admin/answer_form_spec.rb +++ b/spec/forms/decidim/vocdoni/admin/answer_form_spec.rb @@ -9,21 +9,21 @@ { current_organization: component.organization, current_component: component, - election: election, - question: question + election:, + question: } end let(:election) { question.election } - let(:question) { create :vocdoni_question } + let(:question) { create(:vocdoni_question) } let(:component) { election.component } let(:title) { Decidim::Faker::Localized.sentence(word_count: 3) } let(:description) { Decidim::Faker::Localized.sentence(word_count: 3) } let(:weight) { 10 } let(:attributes) do { - title: title, - description: description, - weight: weight + title:, + description:, + weight: } end diff --git a/spec/forms/decidim/vocdoni/admin/census_data_form_spec.rb b/spec/forms/decidim/vocdoni/admin/census_data_form_spec.rb index d0077219..55a06260 100644 --- a/spec/forms/decidim/vocdoni/admin/census_data_form_spec.rb +++ b/spec/forms/decidim/vocdoni/admin/census_data_form_spec.rb @@ -4,7 +4,7 @@ module Decidim::Vocdoni::Admin describe CensusDataForm do - subject { described_class.from_params(file: file) } + subject { described_class.from_params(file:) } describe "#data" do context "when the file is in invalid format" do diff --git a/spec/forms/decidim/vocdoni/admin/census_permissions_form_spec.rb b/spec/forms/decidim/vocdoni/admin/census_permissions_form_spec.rb index 0cc1180e..e0ed710b 100644 --- a/spec/forms/decidim/vocdoni/admin/census_permissions_form_spec.rb +++ b/spec/forms/decidim/vocdoni/admin/census_permissions_form_spec.rb @@ -4,24 +4,24 @@ module Decidim::Vocdoni::Admin describe CensusPermissionsForm do - subject { described_class.from_params(verification_types: verification_types).with_context(context) } + subject { described_class.from_params(verification_types:).with_context(context) } let(:verification_types) { %w(id_documents postal_letter) } let(:users) { create_list(:user, 5, :confirmed, organization: current_organization) } let(:other_users) { create_list(:user, 3, :confirmed, organization: current_organization) } let(:users_other_org) { create_list(:user, 2, :confirmed) } let(:current_organization) { create(:organization) } - let(:context) { double("Context", current_organization: current_organization) } + let(:context) { double("Context", current_organization:) } before do users.each do |user| - create(:authorization, name: verification_types[0], user: user) - create(:authorization, name: verification_types[1], user: user) + create(:authorization, name: verification_types[0], user:) + create(:authorization, name: verification_types[1], user:) end users_other_org.each do |user| - create(:authorization, name: verification_types[0], user: user) - create(:authorization, name: verification_types[1], user: user) + create(:authorization, name: verification_types[0], user:) + create(:authorization, name: verification_types[1], user:) end allow(current_organization).to receive(:available_authorizations).and_return([verification_types[0], verification_types[1]]) diff --git a/spec/forms/decidim/vocdoni/admin/election_calendar_form_spec.rb b/spec/forms/decidim/vocdoni/admin/election_calendar_form_spec.rb index 12507842..888f2232 100644 --- a/spec/forms/decidim/vocdoni/admin/election_calendar_form_spec.rb +++ b/spec/forms/decidim/vocdoni/admin/election_calendar_form_spec.rb @@ -9,20 +9,20 @@ let(:context) do { current_organization: organization, - current_component: current_component + current_component: } end - let(:participatory_process) { create :participatory_process, organization: organization } - let(:current_component) { create :vocdoni_component, participatory_space: participatory_process } + let(:participatory_process) { create(:participatory_process, organization:) } + let(:current_component) { create(:vocdoni_component, participatory_space: participatory_process) } let(:start_time) { 1.day.from_now } let(:end_time) { 3.days.from_now } let(:manual_start) { false } let(:attributes) do { - start_time: start_time, - end_time: end_time, - result_type: result_type, - manual_start: manual_start + start_time:, + end_time:, + result_type:, + manual_start: } end let(:result_type) { "after_voting" } diff --git a/spec/forms/decidim/vocdoni/admin/election_form_spec.rb b/spec/forms/decidim/vocdoni/admin/election_form_spec.rb index ad4710e5..dd148c6e 100644 --- a/spec/forms/decidim/vocdoni/admin/election_form_spec.rb +++ b/spec/forms/decidim/vocdoni/admin/election_form_spec.rb @@ -9,18 +9,18 @@ let(:context) do { current_organization: organization, - current_component: current_component + current_component: } end - let(:participatory_process) { create :participatory_process, organization: organization } - let(:current_component) { create :vocdoni_component, participatory_space: participatory_process } + let(:participatory_process) { create(:participatory_process, organization:) } + let(:current_component) { create(:vocdoni_component, participatory_space: participatory_process) } let(:title) { Decidim::Faker::Localized.sentence(word_count: 3) } let(:description) { Decidim::Faker::Localized.sentence(word_count: 3) } let(:attachment_params) { nil } let(:attributes) do { - title: title, - description: description, + title:, + description:, attachment: attachment_params } end @@ -54,8 +54,8 @@ it "adds an error to the `:attachment` field" do expect(subject).not_to be_valid - expect(subject.errors.full_messages).to match_array(["Title en can't be blank", "Attachment Needs to be reattached"]) - expect(subject.errors.attribute_names).to match_array([:title_en, :attachment]) + expect(subject.errors.full_messages).to contain_exactly("Title en cannot be blank", "Attachment Needs to be reattached") + expect(subject.errors.attribute_names).to contain_exactly(:title_en, :attachment) end end end diff --git a/spec/forms/decidim/vocdoni/admin/election_status_form_spec.rb b/spec/forms/decidim/vocdoni/admin/election_status_form_spec.rb index abf4cbc2..3d53ecfd 100644 --- a/spec/forms/decidim/vocdoni/admin/election_status_form_spec.rb +++ b/spec/forms/decidim/vocdoni/admin/election_status_form_spec.rb @@ -9,12 +9,12 @@ let(:status) { "paused" } let(:context) do { - election: election + election: } end let(:attributes) do { - status: status + status: } end diff --git a/spec/forms/decidim/vocdoni/admin/question_form_spec.rb b/spec/forms/decidim/vocdoni/admin/question_form_spec.rb index 39412fd4..6c050d29 100644 --- a/spec/forms/decidim/vocdoni/admin/question_form_spec.rb +++ b/spec/forms/decidim/vocdoni/admin/question_form_spec.rb @@ -9,19 +9,19 @@ { current_organization: component.organization, current_component: component, - election: election + election: } end - let(:election) { create :vocdoni_election } + let(:election) { create(:vocdoni_election) } let(:component) { election.component } let(:title) { Decidim::Faker::Localized.sentence(word_count: 3) } let(:description) { Decidim::Faker::Localized.sentence(word_count: 3) } let(:weight) { 10 } let(:attributes) do { - title: title, - description: description, - weight: weight + title:, + description:, + weight: } end diff --git a/spec/forms/decidim/vocdoni/admin/setup_form_spec.rb b/spec/forms/decidim/vocdoni/admin/setup_form_spec.rb index cc904428..5854cd9b 100644 --- a/spec/forms/decidim/vocdoni/admin/setup_form_spec.rb +++ b/spec/forms/decidim/vocdoni/admin/setup_form_spec.rb @@ -9,12 +9,12 @@ { current_organization: component.organization, current_component: component, - election: election, + election:, current_step: "create_election" } end - let(:election) { create :vocdoni_election, :ready_for_setup, :auto_start, start_time: 1.day.from_now, component: component } - let(:component) { create :vocdoni_component } + let(:election) { create(:vocdoni_election, :ready_for_setup, :auto_start, start_time: 1.day.from_now, component:) } + let(:component) { create(:vocdoni_component) } let(:attributes) { {} } let(:router) { Decidim::EngineRouter.admin_proxy(election.component) } @@ -43,9 +43,9 @@ end context "when the election is not ready for the setup" do - let(:election) { create :vocdoni_election, :auto_start, start_time: 10.days.ago } + let(:election) { create(:vocdoni_election, :auto_start, start_time: 10.days.ago) } - it { is_expected.to be_invalid } + it { is_expected.not_to be_valid } it "shows errors" do subject.valid? @@ -78,10 +78,10 @@ end context "when there are no answers created" do - let(:election) { create :vocdoni_election, :published } - let!(:question) { create :vocdoni_question, election: election, weight: 1 } + let(:election) { create(:vocdoni_election, :published) } + let!(:question) { create(:vocdoni_question, election:, weight: 1) } - it { is_expected.to be_invalid } + it { is_expected.not_to be_valid } it "shows errors" do subject.valid? @@ -94,7 +94,7 @@ end context "when manual start" do - let(:election) { create :vocdoni_election, :ready_for_setup, :manual_start, component: component } + let(:election) { create(:vocdoni_election, :ready_for_setup, :manual_start, component:) } it { is_expected.to be_valid } diff --git a/spec/helpers/decidim/vocdoni/admin/steps_helper_spec.rb b/spec/helpers/decidim/vocdoni/admin/steps_helper_spec.rb index a3b02042..9a44932f 100644 --- a/spec/helpers/decidim/vocdoni/admin/steps_helper_spec.rb +++ b/spec/helpers/decidim/vocdoni/admin/steps_helper_spec.rb @@ -79,11 +79,11 @@ subject { helper.fix_it_button_with_icon(link, icon) } let(:link) { "/admin/participatory_processes/123/elections/2/edit/" } - let(:icon) { "wrench" } + let(:icon) { "tools-line" } it "generates the fix it button with icon" do - expect(subject).to have_link("Fix it", href: link, class: "button tiny") - expect(subject).to have_selector("svg.icon--wrench") + expect(subject).to have_link("Fix it", href: link, class: "button button__xs") + expect(subject).to have_css("svg[role='img'] use[href*='ri-tools-line']") end end end diff --git a/spec/helpers/decidim/vocdoni/admin/steps_wizard_helper_spec.rb b/spec/helpers/decidim/vocdoni/admin/steps_wizard_helper_spec.rb index f290ee75..b0be7da7 100644 --- a/spec/helpers/decidim/vocdoni/admin/steps_wizard_helper_spec.rb +++ b/spec/helpers/decidim/vocdoni/admin/steps_wizard_helper_spec.rb @@ -23,10 +23,12 @@ describe "#tab_link_class" do before do - allow(election).to receive(:ready_for_questions_form?).and_return(true) - allow(election).to receive(:ready_for_census_form?).and_return(true) - allow(election).to receive(:ready_for_calendar_form?).and_return(true) - allow(election).to receive(:ready_for_publish_form?).and_return(true) + allow(election).to receive_messages( + ready_for_questions_form?: true, + ready_for_census_form?: true, + ready_for_calendar_form?: true, + ready_for_publish_form?: true + ) end it 'returns an empty string for the "questions" tab with a present election' do diff --git a/spec/helpers/decidim/vocdoni/votes_helper_spec.rb b/spec/helpers/decidim/vocdoni/votes_helper_spec.rb index 854161eb..96450bfa 100644 --- a/spec/helpers/decidim/vocdoni/votes_helper_spec.rb +++ b/spec/helpers/decidim/vocdoni/votes_helper_spec.rb @@ -5,7 +5,7 @@ module Decidim module Vocdoni describe VotesHelper do - let(:question) { create :vocdoni_question, :complete, answers: 3 } + let(:question) { create(:vocdoni_question, :complete, answers: 3) } let(:helper) do Class.new(ActionView::Base) do @@ -54,7 +54,7 @@ module Vocdoni let(:votes_left) { 3 } it "returns the 'can_vote_again' message" do - expect(votes_left_message).to include(I18n.t("can_vote_again", scope: "decidim.vocdoni.votes.new", votes_left: votes_left)) + expect(votes_left_message).to include(I18n.t("can_vote_again", scope: "decidim.vocdoni.votes.new", votes_left:)) end end diff --git a/spec/jobs/decidim/vocdoni/admin/create_voter_wallets_job_spec.rb b/spec/jobs/decidim/vocdoni/admin/create_voter_wallets_job_spec.rb index 33dba897..7362b045 100644 --- a/spec/jobs/decidim/vocdoni/admin/create_voter_wallets_job_spec.rb +++ b/spec/jobs/decidim/vocdoni/admin/create_voter_wallets_job_spec.rb @@ -2,9 +2,9 @@ require "spec_helper" -RSpec.describe Decidim::Vocdoni::Admin::CreateVoterWalletsJob, type: :job do +RSpec.describe Decidim::Vocdoni::Admin::CreateVoterWalletsJob do let!(:election) { create(:vocdoni_election, :upcoming, :with_internal_census) } - let!(:voters) { create_list(:vocdoni_voter, 2, election: election, wallet_address: nil) } + let!(:voters) { create_list(:vocdoni_voter, 2, election:, wallet_address: nil) } let(:election_id) { election.id } let(:fake_wallet_address) { "0x1234567890abcdef1234567890abcdef12345678" } diff --git a/spec/jobs/decidim/vocdoni/admin/update_election_census_job_spec.rb b/spec/jobs/decidim/vocdoni/admin/update_election_census_job_spec.rb index b27f150e..74557357 100644 --- a/spec/jobs/decidim/vocdoni/admin/update_election_census_job_spec.rb +++ b/spec/jobs/decidim/vocdoni/admin/update_election_census_job_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe Decidim::Vocdoni::Admin::UpdateElectionCensusJob, type: :job do +RSpec.describe Decidim::Vocdoni::Admin::UpdateElectionCensusJob do subject { described_class.perform_later(election.id, non_voter_ids, user.id) } let!(:election) { create(:vocdoni_election, :upcoming, :with_internal_census) } @@ -12,7 +12,7 @@ before do non_voters.each do |nv| - create(:vocdoni_voter, email: nv.email, election: election, wallet_address: nil, in_vocdoni_census: false) + create(:vocdoni_voter, email: nv.email, election:, wallet_address: nil, in_vocdoni_census: false) end allow(Decidim::Vocdoni::VoterService).to receive(:verify_and_insert).and_call_original diff --git a/spec/lib/decidim/vocdoni/election_status_changer_spec.rb b/spec/lib/decidim/vocdoni/election_status_changer_spec.rb index 81a8077d..d2ee0d53 100644 --- a/spec/lib/decidim/vocdoni/election_status_changer_spec.rb +++ b/spec/lib/decidim/vocdoni/election_status_changer_spec.rb @@ -6,10 +6,10 @@ describe Decidim::Vocdoni::ElectionStatusChanger do subject { described_class.new } - let!(:new_election) { create(:vocdoni_election, status: status) } - let!(:upcoming_election) { create(:vocdoni_election, :upcoming, start_mode, status: status) } - let!(:ongoing_election) { create(:vocdoni_election, :ongoing, start_mode, start_time: 1.minute.ago, status: status) } - let!(:finished_election) { create(:vocdoni_election, :finished, start_mode, end_time: 1.minute.ago, status: status) } + let!(:new_election) { create(:vocdoni_election, status:) } + let!(:upcoming_election) { create(:vocdoni_election, :upcoming, start_mode, status:) } + let!(:ongoing_election) { create(:vocdoni_election, :ongoing, start_mode, start_time: 1.minute.ago, status:) } + let!(:finished_election) { create(:vocdoni_election, :finished, start_mode, end_time: 1.minute.ago, status:) } let(:status) { nil } let(:start_mode) { :auto_start } diff --git a/spec/lib/decidim/vocdoni/module_config_spec.rb b/spec/lib/decidim/vocdoni/module_config_spec.rb index f519a17b..3fbb6fd7 100644 --- a/spec/lib/decidim/vocdoni/module_config_spec.rb +++ b/spec/lib/decidim/vocdoni/module_config_spec.rb @@ -23,8 +23,8 @@ module Decidim let(:start_delay) { "33" } let(:reseller_name) { "Test reseller" } let(:reseller_email) { "test_reseller@example.org" } - let(:config) { JSON.parse cmd_capture("bin/rails runner 'puts Decidim::Vocdoni.config.to_json'", env: env) } - let(:endpoint_env) { cmd_capture("bin/rails runner 'puts Decidim::Vocdoni.api_endpoint_env'", env: env) } + let(:config) { JSON.parse cmd_capture("bin/rails runner 'puts Decidim::Vocdoni.config.to_json'", env:) } + let(:endpoint_env) { cmd_capture("bin/rails runner 'puts Decidim::Vocdoni.api_endpoint_env'", env:) } def cmd_capture(cmd, env: {}) Dir.chdir(test_app) do diff --git a/spec/models/decidim/vocdoni/answer_spec.rb b/spec/models/decidim/vocdoni/answer_spec.rb index d39cf7fd..f059f4c9 100644 --- a/spec/models/decidim/vocdoni/answer_spec.rb +++ b/spec/models/decidim/vocdoni/answer_spec.rb @@ -10,10 +10,10 @@ include_examples "resourceable" describe "#votes_percentage" do - subject(:answer1) { create(:vocdoni_election_answer, question: question, votes: 5) } + subject(:answer1) { create(:vocdoni_election_answer, question:, votes: 5) } let(:question) { create(:vocdoni_question) } - let!(:answer2) { create(:vocdoni_election_answer, question: question, votes: 10) } + let!(:answer2) { create(:vocdoni_election_answer, question:, votes: 10) } it "returns a percentage" do expect(subject.votes_percentage).to eq(33.33) @@ -24,10 +24,16 @@ end context "when there are multiple answers" do - let!(:answer3) { create(:vocdoni_election_answer, question: question, votes: 11) } - let!(:answer4) { create(:vocdoni_election_answer, question: question, votes: 22) } - let!(:answer5) { create(:vocdoni_election_answer, question: question, votes: 33) } - let!(:answer6) { create(:vocdoni_election_answer, question: question, votes: 1) } + let!(:answers) do + [ + { question:, votes: 11 }, + { question:, votes: 22 }, + { question:, votes: 33 }, + { question:, votes: 1 } + ].map do |attrs| + create(:vocdoni_election_answer, attrs) + end + end it "sums to 100" do expect(subject.question.answers.map(&:votes_percentage).sum).to eq(100) diff --git a/spec/models/decidim/vocdoni/csv_census/data_spec.rb b/spec/models/decidim/vocdoni/csv_census/data_spec.rb index 9727eb37..78b39c08 100644 --- a/spec/models/decidim/vocdoni/csv_census/data_spec.rb +++ b/spec/models/decidim/vocdoni/csv_census/data_spec.rb @@ -26,10 +26,7 @@ subject { described_class.new(valid_csv_path) } it "reads values correctly" do - expect(subject.values).to match_array([ - %w(john@example.org 123456), - %w(alice@example.org 987654) - ]) + expect(subject.values).to contain_exactly(%w(john@example.org 123456), %w(alice@example.org 987654)) end it "has no errors" do diff --git a/spec/models/decidim/vocdoni/election_spec.rb b/spec/models/decidim/vocdoni/election_spec.rb index ad3f6d1f..91323508 100644 --- a/spec/models/decidim/vocdoni/election_spec.rb +++ b/spec/models/decidim/vocdoni/election_spec.rb @@ -3,7 +3,7 @@ require "spec_helper" describe Decidim::Vocdoni::Election do - subject(:election) { build :vocdoni_election, status: status } + subject(:election) { build(:vocdoni_election, status:) } let(:status) { nil } @@ -36,13 +36,13 @@ it { is_expected.to be_secret_until_the_end } context "when is configured" do - subject(:election) { build :vocdoni_election, :configured } + subject(:election) { build(:vocdoni_election, :configured) } it { is_expected.not_to be_misconfigured } end context "when manual start" do - subject(:election) { build :vocdoni_election, :manual_start } + subject(:election) { build(:vocdoni_election, :manual_start) } it { is_expected.to be_manual_start } it { is_expected.not_to be_auto_start } @@ -54,7 +54,7 @@ end context "when automaic start" do - subject(:election) { build :vocdoni_election, :auto_start } + subject(:election) { build(:vocdoni_election, :auto_start) } it { is_expected.not_to be_manual_start } it { is_expected.to be_auto_start } @@ -66,14 +66,14 @@ end context "when it is ongoing" do - subject(:election) { build :vocdoni_election, :ongoing } + subject(:election) { build(:vocdoni_election, :ongoing) } it { is_expected.to be_started } it { is_expected.to be_ongoing } it { is_expected.not_to be_finished } context "and it doesn't have a status" do - subject(:election) { build :vocdoni_election, :finished, status: nil } + subject(:election) { build(:vocdoni_election, :finished, status: nil) } it { is_expected.not_to be_started } it { is_expected.not_to be_ongoing } @@ -82,14 +82,14 @@ end context "when it is finished" do - subject(:election) { build :vocdoni_election, :finished } + subject(:election) { build(:vocdoni_election, :finished) } it { is_expected.to be_started } it { is_expected.not_to be_ongoing } it { is_expected.to be_finished } context "and it has the old status" do - subject(:election) { build :vocdoni_election, :finished, status: "vote" } + subject(:election) { build(:vocdoni_election, :finished, status: "vote") } it { is_expected.to be_started } it { is_expected.not_to be_ongoing } @@ -97,7 +97,7 @@ end context "and it doesn't have a status" do - subject(:election) { build :vocdoni_election, :finished, status: nil } + subject(:election) { build(:vocdoni_election, :finished, status: nil) } it { is_expected.not_to be_started } it { is_expected.not_to be_ongoing } @@ -107,7 +107,7 @@ describe "with different status" do context "when it is paused" do - subject(:election) { build :vocdoni_election, :started, :paused } + subject(:election) { build(:vocdoni_election, :started, :paused) } it { is_expected.to be_started } it { is_expected.to be_paused } @@ -116,7 +116,7 @@ end context "when it is canceled" do - subject(:election) { build :vocdoni_election, :started, :canceled } + subject(:election) { build(:vocdoni_election, :started, :canceled) } it { is_expected.to be_started } it { is_expected.not_to be_ongoing } @@ -124,7 +124,7 @@ end context "when it is vote_ended" do - subject(:election) { build :vocdoni_election, :started, status: "vote_ended" } + subject(:election) { build(:vocdoni_election, :started, status: "vote_ended") } it { is_expected.to be_started } it { is_expected.not_to be_ongoing } @@ -132,7 +132,7 @@ end context "when it is results_published" do - subject(:election) { build :vocdoni_election, :started, status: "results_published" } + subject(:election) { build(:vocdoni_election, :started, status: "results_published") } it { is_expected.to be_started } it { is_expected.not_to be_ongoing } @@ -141,7 +141,7 @@ end describe "start time checks" do - subject(:election) { build(:vocdoni_election, start_time: start_time) } + subject(:election) { build(:vocdoni_election, start_time:) } let(:start_time) { 40.minutes.from_now } @@ -163,21 +163,21 @@ describe "#answers_have_values?" do subject { election.answers_have_values? } - let(:question) { create(:vocdoni_question, election: election) } - let!(:answer1) { create(:vocdoni_election_answer, question: question, value: 0) } - let!(:answer2) { create(:vocdoni_election_answer, question: question, value: 1) } + let(:question) { create(:vocdoni_question, election:) } + let!(:first_answer) { create(:vocdoni_election_answer, question:, value: 0) } + let!(:second_answer) { create(:vocdoni_election_answer, question:, value: 1) } it { is_expected.to be_truthy } context "when there answers have no values" do - let!(:answer1) { create(:vocdoni_election_answer, question: question, value: nil) } + let!(:first_answer) { create(:vocdoni_election_answer, question:, value: nil) } it { is_expected.to be_falsey } end end describe "#explorer_vote_url" do - subject(:election) { build :vocdoni_election, vocdoni_election_id: "12345" } + subject(:election) { build(:vocdoni_election, vocdoni_election_id: "12345") } before do allow(Decidim::Vocdoni).to receive(:explorer_vote_domain).and_return("example.org") @@ -241,10 +241,10 @@ end describe "#ready_for_census_form?" do - let(:question) { create(:vocdoni_question, election: election) } + let(:question) { create(:vocdoni_question, election:) } context "when minimum_answers? returns true" do - let!(:answers) { create_list(:vocdoni_election_answer, 2, question: question) } + let!(:answers) { create_list(:vocdoni_election_answer, 2, question:) } it "returns true" do expect(subject.ready_for_census_form?).to be true @@ -252,7 +252,7 @@ end context "when minimum_answers? returns false" do - let!(:answer) { create(:vocdoni_election_answer, question: question) } + let!(:answer) { create(:vocdoni_election_answer, question:) } it "returns false" do expect(subject.ready_for_census_form?).to be false @@ -264,8 +264,8 @@ context "when census is ready" do subject(:election) { build(:vocdoni_election, :with_census) } - let(:question) { create(:vocdoni_question, election: election) } - let!(:answers) { create_list(:vocdoni_election_answer, 2, question: question) } + let(:question) { create(:vocdoni_question, election:) } + let!(:answers) { create_list(:vocdoni_election_answer, 2, question:) } it "returns true" do expect(subject.ready_for_calendar_form?).to be true @@ -285,8 +285,8 @@ context "when ready for calendar form and times are set" do subject(:election) { build(:vocdoni_election, :with_census, status: :created) } - let(:question) { create(:vocdoni_question, election: election) } - let!(:answers) { create_list(:vocdoni_election_answer, 2, question: question) } + let(:question) { create(:vocdoni_question, election:) } + let!(:answers) { create_list(:vocdoni_election_answer, 2, question:) } it "returns true" do expect(subject.ready_for_publish_form?).to be true @@ -303,8 +303,8 @@ end describe "#build_answer_values!" do - let(:question) { create(:vocdoni_question, election: election) } - let!(:answers) { create_list(:vocdoni_election_answer, 2, question: question) } + let(:question) { create(:vocdoni_question, election:) } + let!(:answers) { create_list(:vocdoni_election_answer, 2, question:) } it "assigns a value to each answer" do expect { subject.build_answer_values! }.to change { question.answers.pluck(:value) }.from([nil, nil]).to([0, 1]) @@ -312,10 +312,10 @@ end describe "#to_vocdoni" do - let(:election) { create(:vocdoni_election, :with_photos, :simple, election_type: type, component: component, title: title, description: description) } - let!(:voter) { create(:vocdoni_voter, election: election, wallet_address: "0x0000000000000000000000000000000000000001") } + let(:election) { create(:vocdoni_election, :with_photos, :simple, election_type: type, component:, title:, description:) } + let!(:voter) { create(:vocdoni_voter, election:, wallet_address: "0x0000000000000000000000000000000000000001") } let(:component) { create(:vocdoni_component, participatory_space: participatory_process) } - let(:participatory_process) { create(:participatory_process, organization: organization) } + let(:participatory_process) { create(:participatory_process, organization:) } let(:organization) { create(:organization, enable_machine_translations: true) } let(:title) do { @@ -362,7 +362,7 @@ end context "when no attachments" do - let(:election) { create(:vocdoni_election, :simple, election_type: type, component: component, title: title, description: description) } + let(:election) { create(:vocdoni_election, :simple, election_type: type, component:, title:, description:) } it "returns the election as json" do expect(json["title"]).to eq({ "en" => "English title", "ca" => "Catalan title", "es" => "Spanish title", "default" => "English title" }) diff --git a/spec/models/decidim/vocdoni/question_spec.rb b/spec/models/decidim/vocdoni/question_spec.rb index b72ef2d7..1db413e6 100644 --- a/spec/models/decidim/vocdoni/question_spec.rb +++ b/spec/models/decidim/vocdoni/question_spec.rb @@ -10,7 +10,7 @@ include_examples "resourceable" describe "#total_votes" do - subject(:question) { create :vocdoni_question, :complete } + subject(:question) { create(:vocdoni_question, :complete) } before do # rubocop:disable Rails/SkipsModelValidations @@ -24,7 +24,7 @@ end describe "#build_answer_values!" do - subject(:question) { create :vocdoni_question, :complete } + subject(:question) { create(:vocdoni_question, :complete) } it "assigns a value to each answer" do expect { subject.build_answer_values! }.to change { subject.answers.pluck(:value) }.from([nil, nil, nil]).to([0, 1, 2]) @@ -32,44 +32,44 @@ end describe "#to_vocdoni" do - let(:question1) { create :vocdoni_question, :complete } - let(:question2) { create :vocdoni_question, :complete } - let(:vocdoni1) { question1.to_vocdoni } - let(:vocdoni2) { question2.to_vocdoni } + let(:first_question) { create(:vocdoni_question, :complete) } + let(:second_question) { create(:vocdoni_question, :complete) } + let(:first_vocdoni) { first_question.to_vocdoni } + let(:second_vocdoni) { second_question.to_vocdoni } it "returns the question in the Vocdoni format" do - question1.build_answer_values! - expect(vocdoni1[0]["en"]).to eq(question1.title["en"]) - expect(vocdoni1[0]["ca"]).to eq(question1.title["ca"]) - expect(vocdoni1[0]["default"]).to eq(question1.title["en"]) - expect(vocdoni1[1]["en"]).to eq(question1.description["en"]) - expect(vocdoni1[1]["ca"]).to eq(question1.description["ca"]) - expect(vocdoni1[1]["default"]).to eq(question1.description["en"]) - expect(vocdoni1[2][0]["title"]["en"]).to eq(question1.answers[0].title["en"]) - expect(vocdoni1[2][0]["value"]).to eq(0) - expect(vocdoni1[2][1]["title"]["en"]).to eq(question1.answers[1].title["en"]) - expect(vocdoni1[2][1]["value"]).to eq(1) - expect(vocdoni1[2][2]["title"]["en"]).to eq(question1.answers[2].title["en"]) - expect(vocdoni1[2][2]["value"]).to eq(2) + first_question.build_answer_values! + expect(first_vocdoni[0]["en"]).to eq(first_question.title["en"]) + expect(first_vocdoni[0]["ca"]).to eq(first_question.title["ca"]) + expect(first_vocdoni[0]["default"]).to eq(first_question.title["en"]) + expect(first_vocdoni[1]["en"]).to eq(first_question.description["en"]) + expect(first_vocdoni[1]["ca"]).to eq(first_question.description["ca"]) + expect(first_vocdoni[1]["default"]).to eq(first_question.description["en"]) + expect(first_vocdoni[2][0]["title"]["en"]).to eq(first_question.answers[0].title["en"]) + expect(first_vocdoni[2][0]["value"]).to eq(0) + expect(first_vocdoni[2][1]["title"]["en"]).to eq(first_question.answers[1].title["en"]) + expect(first_vocdoni[2][1]["value"]).to eq(1) + expect(first_vocdoni[2][2]["title"]["en"]).to eq(first_question.answers[2].title["en"]) + expect(first_vocdoni[2][2]["value"]).to eq(2) - question2.build_answer_values! - expect(vocdoni2[0]["en"]).to eq(question2.title["en"]) - expect(vocdoni2[0]["ca"]).to eq(question2.title["ca"]) - expect(vocdoni2[0]["default"]).to eq(question2.title["en"]) - expect(vocdoni2[1]["en"]).to eq(question2.description["en"]) - expect(vocdoni2[1]["ca"]).to eq(question2.description["ca"]) - expect(vocdoni2[1]["default"]).to eq(question2.description["en"]) - expect(vocdoni2[2][0]["title"]["en"]).to eq(question2.answers[0].title["en"]) - expect(vocdoni2[2][0]["value"]).to eq(0) - expect(vocdoni2[2][1]["title"]["en"]).to eq(question2.answers[1].title["en"]) - expect(vocdoni2[2][1]["value"]).to eq(1) - expect(vocdoni2[2][2]["title"]["en"]).to eq(question2.answers[2].title["en"]) - expect(vocdoni2[2][2]["value"]).to eq(2) + second_question.build_answer_values! + expect(second_vocdoni[0]["en"]).to eq(second_question.title["en"]) + expect(second_vocdoni[0]["ca"]).to eq(second_question.title["ca"]) + expect(second_vocdoni[0]["default"]).to eq(second_question.title["en"]) + expect(second_vocdoni[1]["en"]).to eq(second_question.description["en"]) + expect(second_vocdoni[1]["ca"]).to eq(second_question.description["ca"]) + expect(second_vocdoni[1]["default"]).to eq(second_question.description["en"]) + expect(second_vocdoni[2][0]["title"]["en"]).to eq(second_question.answers[0].title["en"]) + expect(second_vocdoni[2][0]["value"]).to eq(0) + expect(second_vocdoni[2][1]["title"]["en"]).to eq(second_question.answers[1].title["en"]) + expect(second_vocdoni[2][1]["value"]).to eq(1) + expect(second_vocdoni[2][2]["title"]["en"]).to eq(second_question.answers[2].title["en"]) + expect(second_vocdoni[2][2]["value"]).to eq(2) end end describe "#slug" do - subject(:question) { create :vocdoni_question } + subject(:question) { create(:vocdoni_question) } it "returns the correct slug format" do expect(subject.slug).to eq("question-#{subject.id}") diff --git a/spec/models/decidim/vocdoni/voter_spec.rb b/spec/models/decidim/vocdoni/voter_spec.rb index 3e6832b5..387b1fed 100644 --- a/spec/models/decidim/vocdoni/voter_spec.rb +++ b/spec/models/decidim/vocdoni/voter_spec.rb @@ -3,9 +3,9 @@ require "spec_helper" describe Decidim::Vocdoni::Voter do - subject(:voter) { build :vocdoni_voter } + subject(:voter) { build(:vocdoni_voter) } - let(:election) { create :vocdoni_election } + let(:election) { create(:vocdoni_election) } describe "#validations" do it "is invalid without a valid email" do @@ -19,8 +19,8 @@ end it "does not allow duplicate emails within the same election" do - create(:vocdoni_voter, election: election, email: "user@example.com") - new_voter = build(:vocdoni_voter, election: election, email: "user@example.com") + create(:vocdoni_voter, election:, email: "user@example.com") + new_voter = build(:vocdoni_voter, election:, email: "user@example.com") expect(new_voter).not_to be_valid end end @@ -77,7 +77,7 @@ end describe ".inside" do - let!(:voter) { create(:vocdoni_voter, election: election) } + let!(:voter) { create(:vocdoni_voter, election:) } it "returns voters for a specific election" do expect(Decidim::Vocdoni::Voter.inside(election)).to include(voter) @@ -85,7 +85,7 @@ end describe ".search_user_email" do - let!(:voter) { create(:vocdoni_voter, election: election, email: "user@example.com") } + let!(:voter) { create(:vocdoni_voter, election:, email: "user@example.com") } it "returns the voter for a specific election and email" do expect(Decidim::Vocdoni::Voter.search_user_email(election, "user@example.com")).to eq(voter) @@ -93,7 +93,7 @@ end describe ".clear" do - before { create_list(:vocdoni_voter, 3, election: election, token: "some_token") } + before { create_list(:vocdoni_voter, 3, election:, token: "some_token") } it "removes all voters for a specific election" do expect { Decidim::Vocdoni::Voter.clear(election) }.to change(Decidim::Vocdoni::Voter, :count).by(-3) diff --git a/spec/permissions/decidim/vocdoni/admin/permissions_spec.rb b/spec/permissions/decidim/vocdoni/admin/permissions_spec.rb index 43e5d0bc..3648c81e 100644 --- a/spec/permissions/decidim/vocdoni/admin/permissions_spec.rb +++ b/spec/permissions/decidim/vocdoni/admin/permissions_spec.rb @@ -5,15 +5,15 @@ describe Decidim::Vocdoni::Admin::Permissions do subject { described_class.new(user, permission_action, context).permissions.allowed? } - let(:user) { create :user, :admin, organization: elections_component.organization } + let(:user) { create(:user, :admin, organization: elections_component.organization) } let(:context) do { current_component: elections_component, - election: election + election: } end - let(:elections_component) { create :vocdoni_component } - let(:election) { create :vocdoni_election, component: elections_component } + let(:elections_component) { create(:vocdoni_component) } + let(:election) { create(:vocdoni_election, component: elections_component) } let(:permission_action) { Decidim::PermissionAction.new(**action) } context "when scope is not admin" do @@ -55,15 +55,15 @@ end context "when everything is ok" do - let(:election) { create :vocdoni_election, :with_census, component: elections_component } - let(:question) { create :vocdoni_question, election: election } - let!(:answers) { create_list(:vocdoni_election_answer, 2, question: question) } + let(:election) { create(:vocdoni_election, :with_census, component: elections_component) } + let(:question) { create(:vocdoni_question, election:) } + let!(:answers) { create_list(:vocdoni_election_answer, 2, question:) } it { is_expected.to be true } end context "when election has no census" do - let(:election) { create :vocdoni_election, component: elections_component } + let(:election) { create(:vocdoni_election, component: elections_component) } it { is_expected.to be false } end @@ -83,21 +83,21 @@ end context "when everything is ok" do - let(:election) { create :vocdoni_election, :with_census, status: :created, component: elections_component } - let(:question) { create :vocdoni_question, election: election } - let!(:answers) { create_list(:vocdoni_election_answer, 2, question: question) } + let(:election) { create(:vocdoni_election, :with_census, status: :created, component: elections_component) } + let(:question) { create(:vocdoni_question, election:) } + let!(:answers) { create_list(:vocdoni_election_answer, 2, question:) } it { is_expected.to be true } end context "when election has no census" do - let!(:election) { create :vocdoni_election, component: elections_component } + let!(:election) { create(:vocdoni_election, component: elections_component) } it { is_expected.to be false } end context "when election has no calendar" do - let(:election) { create :vocdoni_election, :with_census, end_time: nil, component: elections_component } + let(:election) { create(:vocdoni_election, :with_census, end_time: nil, component: elections_component) } it { is_expected.to be false } end @@ -112,9 +112,9 @@ end describe "election unpublish" do - let(:election) { create :vocdoni_election, :with_census, :published, status: :created, component: elections_component } - let(:question) { create :vocdoni_question, election: election } - let!(:answers) { create_list(:vocdoni_election_answer, 2, question: question) } + let(:election) { create(:vocdoni_election, :with_census, :published, status: :created, component: elections_component) } + let(:question) { create(:vocdoni_question, election:) } + let!(:answers) { create_list(:vocdoni_election_answer, 2, question:) } let(:action) do { scope: :admin, action: :unpublish, subject: :election } end @@ -130,7 +130,7 @@ it { is_expected.to be true } context "when there's already a wallet for this organization" do - let(:wallet) { create :vocdoni_wallet, organization: elections_component.organization } + let(:wallet) { create(:vocdoni_wallet, organization: elections_component.organization) } it { is_expected.to be true } end diff --git a/spec/permissions/decidim/vocdoni/permissions_spec.rb b/spec/permissions/decidim/vocdoni/permissions_spec.rb index 2fa0fd11..bd72df4d 100644 --- a/spec/permissions/decidim/vocdoni/permissions_spec.rb +++ b/spec/permissions/decidim/vocdoni/permissions_spec.rb @@ -6,15 +6,15 @@ subject { described_class.new(user, permission_action, context).permissions.allowed? } let(:organization) { elections_component.organization } - let(:user) { create :user, organization: organization } + let(:user) { create(:user, organization:) } let(:context) do { current_component: elections_component, - election: election + election: } end - let(:elections_component) { create :vocdoni_component } - let(:election) { create :vocdoni_election, :published, component: elections_component } + let(:elections_component) { create(:vocdoni_component) } + let(:election) { create(:vocdoni_election, :published, component: elections_component) } let(:permission_action) { Decidim::PermissionAction.new(**action) } context "when scope is admin" do @@ -57,7 +57,7 @@ it { is_expected.to be_truthy } context "when election is not published" do - let(:election) { create :vocdoni_election, :upcoming, component: elections_component } + let(:election) { create(:vocdoni_election, :upcoming, component: elections_component) } it { is_expected.to be_falsey } @@ -68,7 +68,7 @@ end context "when user is an administrator" do - let(:user) { create :user, :admin, organization: elections_component.organization } + let(:user) { create(:user, :admin, organization: elections_component.organization) } it { is_expected.to be_truthy } end @@ -89,7 +89,7 @@ it { is_expected.to be_falsey } context "when user is an administrator" do - let(:user) { create :user, :admin, organization: elections_component.organization } + let(:user) { create(:user, :admin, organization: elections_component.organization) } it { is_expected.to be_truthy } end @@ -101,19 +101,19 @@ end context "when election is not published" do - let(:election) { create :vocdoni_election, :upcoming, component: elections_component } + let(:election) { create(:vocdoni_election, :upcoming, component: elections_component) } it { is_expected.to be_falsey } end context "when election is upcoming" do - let(:election) { create :vocdoni_election, :published, :upcoming, component: elections_component } + let(:election) { create(:vocdoni_election, :published, :upcoming, component: elections_component) } it { is_expected.to be_falsey } end context "when election is ongoing" do - let(:election) { create :vocdoni_election, :published, :ongoing, component: elections_component } + let(:election) { create(:vocdoni_election, :published, :ongoing, component: elections_component) } it { is_expected.to be_truthy } @@ -125,19 +125,19 @@ end context "when election is paused" do - let(:election) { create :vocdoni_election, :paused, component: elections_component } + let(:election) { create(:vocdoni_election, :paused, component: elections_component) } it { is_expected.to be_falsey } end context "when election is canceled" do - let(:election) { create :vocdoni_election, :canceled, component: elections_component } + let(:election) { create(:vocdoni_election, :canceled, component: elections_component) } it { is_expected.to be_falsey } end context "when election has finished" do - let(:election) { create :vocdoni_election, :published, :finished, component: elections_component } + let(:election) { create(:vocdoni_election, :published, :finished, component: elections_component) } it { is_expected.to be_falsey } end diff --git a/spec/presenters/decidim/vocdoni/admin_log/election_presenter_spec.rb b/spec/presenters/decidim/vocdoni/admin_log/election_presenter_spec.rb index 3151247e..4714db59 100644 --- a/spec/presenters/decidim/vocdoni/admin_log/election_presenter_spec.rb +++ b/spec/presenters/decidim/vocdoni/admin_log/election_presenter_spec.rb @@ -6,7 +6,7 @@ module Decidim describe Vocdoni::AdminLog::ElectionPresenter, type: :helper do subject { described_class.new(action_log, helper) } - let(:action_log) { create(:action_log, action: action) } + let(:action_log) { create(:action_log, action:) } before do helper.extend(Decidim::ApplicationHelper) diff --git a/spec/presenters/decidim/vocdoni/admin_log/wallet_presenter_spec.rb b/spec/presenters/decidim/vocdoni/admin_log/wallet_presenter_spec.rb index 61c878d6..c0f9f99a 100644 --- a/spec/presenters/decidim/vocdoni/admin_log/wallet_presenter_spec.rb +++ b/spec/presenters/decidim/vocdoni/admin_log/wallet_presenter_spec.rb @@ -6,7 +6,7 @@ module Decidim describe Vocdoni::AdminLog::WalletPresenter, type: :helper do subject { described_class.new(action_log, helper) } - let(:action_log) { create(:action_log, action: action) } + let(:action_log) { create(:action_log, action:) } before do helper.extend(Decidim::ApplicationHelper) diff --git a/spec/presenters/decidim/vocdoni/election_presenter_spec.rb b/spec/presenters/decidim/vocdoni/election_presenter_spec.rb index e863c445..02eef4b1 100644 --- a/spec/presenters/decidim/vocdoni/election_presenter_spec.rb +++ b/spec/presenters/decidim/vocdoni/election_presenter_spec.rb @@ -7,7 +7,7 @@ module Vocdoni describe ElectionPresenter, type: :helper do subject(:presenter) { described_class.new(election) } - let(:election) { create :vocdoni_election, title: title, description: description } + let(:election) { create(:vocdoni_election, title:, description:) } let(:title) do { "en" => "A title
with a lot of HTML & "e;special characters"e;" diff --git a/spec/services/decidim/vocdoni/census_updater_service_spec.rb b/spec/services/decidim/vocdoni/census_updater_service_spec.rb index 9c8efc64..d38c6979 100644 --- a/spec/services/decidim/vocdoni/census_updater_service_spec.rb +++ b/spec/services/decidim/vocdoni/census_updater_service_spec.rb @@ -34,7 +34,7 @@ expect(Rails.logger).not_to receive(:info).with(/Technical voter .* deleted successfully./) expect { service.update_census }.not_to raise_error - expect(Decidim::Vocdoni::Voter.where(email: election.technical_voter_email, election: election)).not_to exist + expect(Decidim::Vocdoni::Voter.where(email: election.technical_voter_email, election:)).not_to exist end it "logs an error if the SDK response is unsuccessful" do diff --git a/spec/services/decidim/vocdoni/sdk_spec.rb b/spec/services/decidim/vocdoni/sdk_spec.rb index 7741d14a..548388a1 100644 --- a/spec/services/decidim/vocdoni/sdk_spec.rb +++ b/spec/services/decidim/vocdoni/sdk_spec.rb @@ -7,8 +7,8 @@ module Vocdoni describe Sdk do subject { described_class.new(organization, election) } let(:organization) { election.organization } - let!(:wallet) { create :vocdoni_wallet, organization: organization, private_key: private_key } - let!(:election) { create :vocdoni_election, vocdoni_election_id: vocdoni_election_id } + let!(:wallet) { create(:vocdoni_wallet, organization:, private_key:) } + let!(:election) { create(:vocdoni_election, vocdoni_election_id:) } let(:vocdoni_election_id) { "0x0000000000000000000000000000000000000001" } let(:private_key) { "0x0000000000000000000000000000000000000000000000000000000000000001" } let(:salt) { Rails.application.secret_key_base } @@ -69,7 +69,7 @@ module Vocdoni context "when election is not present" do let!(:election) { nil } - let(:organization) { create :organization } + let(:organization) { create(:organization) } it "has env variables" do expect(subject.env).to eq({ diff --git a/spec/shared/vote_examples.rb b/spec/shared/vote_examples.rb index b149c23b..d68dd0dd 100644 --- a/spec/shared/vote_examples.rb +++ b/spec/shared/vote_examples.rb @@ -4,7 +4,7 @@ it "doesn't allow clicking in the vote button" do visit router.election_path(id: election.id) - expect(page).not_to have_link("Vote") + expect(page).to have_no_link("Vote") end it "doesn't allow to access directly to the vote page" do @@ -19,11 +19,12 @@ before do visit router.election_path(id: election.id) - - click_link "Preview" + click_link_or_button "Preview" end + # rubocop:disable RSpec/NoExpectationExample it { uses_the_voting_booth({ email: user.email, token: "123456" }) } + # rubocop:enable RSpec/NoExpectationExample it "shows the preview alert" do expect(page).to have_content("This is a preview of the voting booth.") @@ -36,7 +37,7 @@ it "doesn't allow clicking the preview button" do visit router.election_path(id: election.id) - expect(page).not_to have_link("Preview") + expect(page).to have_no_link("Preview") end it "doesn't allow to access directly to the vote page" do @@ -61,13 +62,13 @@ def uses_the_voting_booth(census_data) # confirm step non_question_step("#step-1") do - expect(page).to have_content("CONFIRM YOUR VOTE") + expect(page).to have_content("Confirm your vote") selected_answers.each { |answer| expect(page).to have_i18n_content(answer.title) } non_selected_answers.each { |answer| expect(page).not_to have_i18n_content(answer.title) } within "#edit-step-1" do - click_link("edit") + click_link_or_button("edit") end end @@ -78,12 +79,12 @@ def uses_the_voting_booth(census_data) # confirm step non_question_step("#step-1") do - expect(page).to have_content("CONFIRM YOUR VOTE") + expect(page).to have_content("Confirm your vote") selected_answers.each { |answer| expect(page).to have_i18n_content(answer.title) } non_selected_answers.each { |answer| expect(page).not_to have_i18n_content(answer.title) } - click_link("Confirm") + click_link_or_button("Confirm") end # confirmed vote page @@ -96,21 +97,21 @@ def login_step(census_data) fill_in :login_email, with: census_data.fetch(:email) fill_in :login_token, with: census_data.fetch(:token) - click_button "Access" + click_link_or_button "Access" end end def question_step(number) expect_only_one_step + expect(page).to have_content("QUESTION #{number} OF 1") within "#step-#{number - 1}" do question = election.questions[number - 1] - expect(page).to have_content("QUESTION #{number} OF 1") expect(page).to have_i18n_content(question.title) yield question if block_given? - click_link("Next") + click_link_or_button("Next") end end @@ -147,11 +148,11 @@ def change_answer(question, selected, non_selected) end def expect_only_one_step - expect(page).to have_selector(".focus__step", count: 1) + expect(page).to have_css(".focus__step", count: 1) end def expect_not_valid - expect(page).not_to have_link("Next") + expect(page).to have_no_link("Next") end def expect_valid diff --git a/spec/system/decidim/admin/admin_creates_wallet_spec.rb b/spec/system/decidim/admin/admin_creates_wallet_spec.rb index d042b6e9..7644eda4 100644 --- a/spec/system/decidim/admin/admin_creates_wallet_spec.rb +++ b/spec/system/decidim/admin/admin_creates_wallet_spec.rb @@ -2,10 +2,10 @@ require "spec_helper" -describe "Admin creates wallet", :slow, type: :system do +describe "Admin creates wallet", :slow do # rubocop:disable RSpec/DescribeClass let(:manifest_name) { :vocdoni } - let(:current_component) { create :vocdoni_component } - let!(:election) { create :vocdoni_election, :ready_for_setup, component: current_component, title: { en: "English title" } } + let(:current_component) { create(:vocdoni_component) } + let!(:election) { create(:vocdoni_election, :ready_for_setup, component: current_component, title: { en: "English title" }) } include_context "when managing a component as an admin" @@ -14,7 +14,7 @@ visit_steps_page expect(page).to have_content("It's necessary to create a wallet for this organization") expect(page).to have_content("New organization wallet") - click_link "Create" + click_link_or_button "Create" expect(page).to have_content("The election has at least one question.") expect(Decidim::Vocdoni::Wallet.last.private_key.length).to eq 66 @@ -22,7 +22,7 @@ end context "when there is a wallet" do - let!(:wallet) { create :vocdoni_wallet, organization: current_component.organization } + let!(:wallet) { create(:vocdoni_wallet, organization: current_component.organization) } it "goes to the step page" do visit_steps_page @@ -31,19 +31,25 @@ end it "doesn't create another wallet" do - expect(Decidim::Vocdoni::Wallet.all.count).to eq 1 + expect(Decidim::Vocdoni::Wallet.count).to eq 1 visit Decidim::EngineRouter.admin_proxy(current_component).new_wallet_path(component: current_component.id) expect(page).to have_content("You are not authorized to perform this action") - expect(Decidim::Vocdoni::Wallet.all.count).to eq 1 + expect(Decidim::Vocdoni::Wallet.count).to eq 1 end - context "when prod environment" do + shared_context "with environment settings" do |env| before do - allow(Decidim::Vocdoni).to receive(:api_endpoint_env).and_return("prod") - allow(Decidim::Vocdoni).to receive(:vocdoni_reseller_name).and_return("Test reseller") - allow(Decidim::Vocdoni).to receive(:vocdoni_reseller_email).and_return("test_reseller@example.org") + allow(Decidim::Vocdoni).to receive_messages( + api_endpoint_env: env, + vocdoni_reseller_name: "Test reseller", + vocdoni_reseller_email: "test_reseller@example.org" + ) end + end + + context "when prod environment" do + include_context "with environment settings", "prod" it "shows the information about receiving coins" do visit_steps_page @@ -57,18 +63,14 @@ end context "when stg environment" do - before do - allow(Decidim::Vocdoni).to receive(:api_endpoint_env).and_return("stg") - allow(Decidim::Vocdoni).to receive(:vocdoni_reseller_name).and_return("Test reseller") - allow(Decidim::Vocdoni).to receive(:vocdoni_reseller_email).and_return("test_reseller@example.org") - end + include_context "with environment settings", "stg" it "doesn't show the information about receiving coins" do visit_steps_page - expect(page).not_to have_content("The usage of the Vocdoni platform has costs") - expect(page).not_to have_content("Test reseller") - expect(page).not_to have_css("input[value='#{wallet.private_key}']") + expect(page).to have_no_content("The usage of the Vocdoni platform has costs") + expect(page).to have_no_content("Test reseller") + expect(page).to have_no_css("input[value='#{wallet.private_key}']") end end end @@ -77,7 +79,7 @@ def visit_steps_page relogin_as user, scope: :user visit_component_admin - within find("tr", text: translated(election.title)) do + within "tr", text: translated(election.title) do page.find(".action-icon--manage-steps").click end end diff --git a/spec/system/decidim/admin/admin_manages_census_spec.rb b/spec/system/decidim/admin/admin_manages_census_spec.rb index a12c7ff3..f98662d5 100644 --- a/spec/system/decidim/admin/admin_manages_census_spec.rb +++ b/spec/system/decidim/admin/admin_manages_census_spec.rb @@ -2,10 +2,10 @@ require "spec_helper" -describe "Admin manages census", :slow, type: :system do +describe "Admin manages census", :slow do # rubocop:disable RSpec/DescribeClass let(:manifest_name) { :vocdoni } - let(:current_component) { create :vocdoni_component } - let(:election) { create :vocdoni_election, :upcoming, :published, :complete, component: current_component, title: { en: "English title" } } + let(:current_component) { create(:vocdoni_component) } + let(:election) { create(:vocdoni_election, :upcoming, :published, :complete, component: current_component, title: { en: "English title" }) } before do allow(Rails.application).to receive(:secret_key_base).and_return("a-secret-key-base") @@ -14,8 +14,12 @@ include_context "when managing a component as an admin" context "when there isn't any census" do - let(:voter1) { Decidim::Vocdoni::Voter.find_by(email: "john@example.org") } - let(:voter2) { Decidim::Vocdoni::Voter.find_by(email: "alice@example.org") } + let(:voters) do + [ + Decidim::Vocdoni::Voter.find_by(email: "john@example.org"), + Decidim::Vocdoni::Voter.find_by(email: "alice@example.org") + ] + end it "uploads the census" do visit_census_page @@ -24,24 +28,30 @@ attach_file("census_data[file]", valid_census_file) perform_enqueued_jobs do - click_button "Upload file" + click_link_or_button "Upload file" end expect(page).to have_content("Successfully imported 2 items") expect(page).to have_content("There are 2 records loaded in total") - expect(voter1.wallet_address).to eq("0x0b9eA6587591d888f0b3a2D67f3d416246BB9304") - expect(voter2.wallet_address).to eq("0x5D38b06B50412294532b9A2C0127AD1455Af7934") + expect(voters[0].wallet_address).to eq("0x0b9eA6587591d888f0b3a2D67f3d416246BB9304") + expect(voters[1].wallet_address).to eq("0x5D38b06B50412294532b9A2C0127AD1455Af7934") end end context "when there's already a census" do context "without the credentials" do - let!(:voter1) { create(:vocdoni_voter, election: election, token: "123456", email: "user_1@example.org") } - let!(:voter2) { create(:vocdoni_voter, election: election, token: "123abc", email: "user_2@example.org") } - let!(:voter3) { create(:vocdoni_voter, election: election, token: "123abc", email: "user_3@example.org") } - let!(:voter4) { create(:vocdoni_voter, election: election, token: "abcxyz", email: "user_4@example.org") } - let!(:voter5) { create(:vocdoni_voter, election: election, token: "123abc", email: "user_5@example.org") } + let!(:voters) do + [ + { token: "123456", email: "user_1@example.org" }, + { token: "123abc", email: "user_2@example.org" }, + { token: "123abc", email: "user_3@example.org" }, + { token: "abcxyz", email: "user_4@example.org" }, + { token: "123abc", email: "user_5@example.org" } + ].map do |voter_data| + create(:vocdoni_voter, election:, token: voter_data[:token], email: voter_data[:email]) + end + end it "has progress indicator of the generation of the credentials" do visit_census_page @@ -51,14 +61,14 @@ expect(page).to have_content("Completed 0% of 5 total records") # Simulates the percentage of completion - wallet = Decidim::Vocdoni::Sdk.new(organization, election).deterministicWallet([voter1.email, voter1.token])["address"] - voter1.update(wallet_address: wallet) - voter1.reload + wallet = Decidim::Vocdoni::Sdk.new(organization, election).deterministicWallet([voters[0].email, voters[0].token])["address"] + voters[0].update(wallet_address: wallet) + voters[0].reload sleep 1 expect(page).to have_content("Completed 20% of 5 total records") - expect(voter1.reload.wallet_address).to eq("0xFEA59AF4dD69C285f39CC6836DA2664f36A47A71") - expect(voter2.reload.wallet_address).to be_nil + expect(voters[0].reload.wallet_address).to eq("0xFEA59AF4dD69C285f39CC6836DA2664f36A47A71") + expect(voters[1].reload.wallet_address).to be_nil end describe "and we want to delete it" do @@ -66,25 +76,27 @@ visit_census_page deletes_the_census + expect(page).to have_content("Upload a CSV file") end end end context "with the credentials" do - let!(:voters) { create_list(:vocdoni_voter, 5, :with_wallet, election: election) } + let!(:voters) { create_list(:vocdoni_voter, 5, :with_wallet, election:) } it "doesn't have any form" do visit_census_page - expect(page).not_to have_content("Upload a new census") - expect(page).not_to have_content("Confirm the census data") + expect(page).to have_no_content("Upload a new census") + expect(page).to have_no_content("Confirm the census data") end - describe "and we want to delete it" do + context "and we want to delete it" do it "deletes it" do visit_census_page deletes_the_census + expect(page).to have_content("Upload a CSV file") end end end @@ -95,12 +107,12 @@ let!(:id_document_handler_name) { "another_dummy_authorization_handler" } let(:translated_authorization_handler_name) { I18n.t("decidim.authorization_handlers.#{authorization_handler_name}.name") } let(:translated_id_document_handler_name) { I18n.t("decidim.authorization_handlers.#{id_document_handler_name}.name") } - let!(:organization) { create(:organization, available_authorizations: available_authorizations) } + let!(:organization) { create(:organization, available_authorizations:) } let!(:available_authorizations) { [authorization_handler_name, id_document_handler_name] } let(:authorizations_count) { organization.available_authorizations.count } let(:authorizations_checkboxes) { find_all("input[type='checkbox'][name='census_permissions[verification_types][]']") } - let!(:user_with_authorizations) { create(:user, :admin, :confirmed, organization: organization) } - let!(:user_without_authorizations) { create(:user, :admin, :confirmed, organization: organization) } + let!(:user_with_authorizations) { create(:user, :admin, :confirmed, organization:) } + let!(:user_without_authorizations) { create(:user, :admin, :confirmed, organization:) } let!(:dummy_authorization) { create(:authorization, user: user_with_authorizations, name: id_document_handler_name) } before do @@ -121,7 +133,7 @@ before do check(translated_id_document_handler_name) perform_enqueued_jobs do - click_button "Save census" + click_link_or_button "Save census" end end @@ -143,7 +155,7 @@ check(translated_authorization_handler_name) check(translated_id_document_handler_name) perform_enqueued_jobs do - click_button "Save census" + click_link_or_button "Save census" end end @@ -164,14 +176,14 @@ end it "doesn't have the message that the census isn't ready" do - expect(page).not_to have_content("The census is not ready yet") + expect(page).to have_no_content("The census is not ready yet") end end context "when admin doesn't select any permissions" do before do perform_enqueued_jobs do - click_button "Save census" + click_link_or_button "Save census" end end @@ -184,7 +196,7 @@ end it "doesn't have the message that the census isn't ready" do - expect(page).not_to have_content("The census is not ready yet") + expect(page).to have_no_content("The census is not ready yet") end end end @@ -192,17 +204,12 @@ private def deletes_the_census - click_link "Delete all census data" + click_link_or_button "Delete all census data" - within ".confirm-content" do + within "#confirm-modal-content" do expect(page).to have_content("Are you sure you want to continue?") + click_link_or_button "OK" end - - within ".confirm-modal-footer" do - click_link "OK" - end - - expect(page).to have_content("Upload a CSV file") end def visit_census_page @@ -211,8 +218,8 @@ def visit_census_page relogin_as user, scope: :user visit_component_admin - within find("tr", text: translated(election.title)) do - click_link "Edit" + within "tr", text: translated(election.title) do + click_link_or_button "Edit" end find("li.tabs-title a", text: "Census").click diff --git a/spec/system/decidim/admin/admin_manages_election_steps_spec.rb b/spec/system/decidim/admin/admin_manages_election_steps_spec.rb index d6b45497..4b0aff16 100644 --- a/spec/system/decidim/admin/admin_manages_election_steps_spec.rb +++ b/spec/system/decidim/admin/admin_manages_election_steps_spec.rb @@ -2,21 +2,21 @@ require "spec_helper" -describe "Admin manages election steps", :slow, type: :system do +describe "Admin manages election steps", :slow do # rubocop:disable RSpec/DescribeClass let(:manifest_name) { :vocdoni } - let(:current_component) { create :vocdoni_component } + let(:current_component) { create(:vocdoni_component) } let(:info) do { clientInfo: { address: "0x0000000000000000000000000000000000000001", - balance: balance + balance: } } end let(:balance) { 500 } let(:vocdoni_status) { "UPCOMING" } let(:vocdoni_election_id) { "123456789" } - let!(:wallet) { create :vocdoni_wallet, organization: current_component.organization } + let!(:wallet) { create(:vocdoni_wallet, organization: current_component.organization) } let(:results) do [ [3, 14] @@ -47,7 +47,7 @@ include_context "when managing a component as an admin" describe "setup an election" do - let!(:election) { create :vocdoni_election, :ready_for_setup, :auto_start, component: current_component } + let!(:election) { create(:vocdoni_election, :ready_for_setup, :auto_start, component: current_component) } it "performs the action successfully" do visit_steps_page @@ -57,52 +57,52 @@ expect(page).to have_content("Each question has at least two answers.") expect(page).to have_content("The election is published.") expect(page).to have_content("The census is ready") - expect(page).not_to have_link("Fix it") + expect(page).to have_no_link("Fix it") perform_enqueued_jobs do - click_button "Setup election" + click_link_or_button "Setup election" end end expect(page).to have_content("The election data has been successfully sent to the Vocdoni API") expect(page).to have_admin_callout("successfully") - expect(page).not_to have_content("Vocdoni communication error") + expect(page).to have_no_content("Vocdoni communication error") expect(page).to have_content("The election has been created. We are waiting for the election to start") - expect(page).not_to have_content("This election has been configured to start manually") + expect(page).to have_no_content("This election has been configured to start manually") end context "when manual start" do - let!(:election) { create :vocdoni_election, :ready_for_setup, :manual_start, component: current_component } + let!(:election) { create(:vocdoni_election, :ready_for_setup, :manual_start, component: current_component) } it "performs the action successfully" do visit_steps_page within "form.create_election" do - expect(page).not_to have_link("Fix it") + expect(page).to have_no_link("Fix it") perform_enqueued_jobs do - click_button "Setup election" + click_link_or_button "Setup election" end end expect(page).to have_content("The election data has been successfully sent to the Vocdoni API") expect(page).to have_admin_callout("successfully") - expect(page).not_to have_content("Vocdoni communication error") + expect(page).to have_no_content("Vocdoni communication error") expect(page).to have_content('The election has been created. The election will start manually. Press the button "Start election" to begin the voting period.') expect(page).to have_content("This election has been configured to start manually") - click_button "Start election" + click_link_or_button "Start election" accept_confirm expect(page).to have_admin_callout("successfully") - expect(page).to have_selector("li.text-warning", text: "Vote period") + expect(page).to have_css("li.text-warning", text: "Vote period") end end context "when some misconfiguration" do - let!(:election) { create :vocdoni_election, :ready_for_setup, :auto_start, start_time: 10.minutes.ago, component: current_component } + let!(:election) { create(:vocdoni_election, :ready_for_setup, :auto_start, start_time: 10.minutes.ago, component: current_component) } it "shows the fixit button" do visit_steps_page @@ -127,31 +127,31 @@ within "form.create_election" do perform_enqueued_jobs do - click_button "Setup election" + click_link_or_button "Setup election" end end expect(page).to have_content("The election data has been successfully sent to the Vocdoni API") expect(page).to have_content("Vocdoni communication error") - click_button "Try to resend the election data to the Vocdoni API" + click_link_or_button "Try to resend the election data to the Vocdoni API" # Simulates the job election.update(vocdoni_election_id: "1234567890") - expect(page).not_to have_content("Vocdoni communication error") + expect(page).to have_no_content("Vocdoni communication error") end end context "when the internal census without authorizations" do - let!(:election) { create :vocdoni_election, :with_internal_census, :ready_for_setup, component: current_component } + let!(:election) { create(:vocdoni_election, :with_internal_census, :ready_for_setup, component: current_component) } it "has another message for internal census" do visit_steps_page within "form.create_election" do expect(page).to have_content("The census is ready. Selected census is: Internal (no additional authorizations are required).") - expect(page).not_to have_link("Fix it") + expect(page).to have_no_link("Fix it") expect(page).to have_content("no additional authorizations are required") end end @@ -160,16 +160,16 @@ describe "when continuing the election" do let(:vocdoni_status) { "PAUSED" } - let!(:election) { create :vocdoni_election, :ready_for_setup, :configured, :ongoing, :paused, component: current_component } + let!(:election) { create(:vocdoni_election, :ready_for_setup, :configured, :ongoing, :paused, component: current_component) } it "performs the action successfully" do visit_steps_page - click_button "Continue the election" + click_link_or_button "Continue the election" accept_confirm expect(page).to have_admin_callout("The election has been successfully resumed") - expect(page).to have_selector("li.text-warning", text: "Vote period") + expect(page).to have_css("li.text-warning", text: "Vote period") end context "and out of sync" do @@ -178,69 +178,69 @@ it "performs the action successfully" do visit_steps_page - click_button "Continue the election" + click_link_or_button "Continue the election" accept_confirm expect(page).to have_admin_callout("The election was out of sync with the Vocdoni API. The status has been updated to \"vote\". Please refresh the page") expect(page).to have_content("The election is currently running") - expect(page).to have_selector("li.text-warning", text: "Vote period") + expect(page).to have_css("li.text-warning", text: "Vote period") end end end describe "when pausing the election" do let(:vocdoni_status) { "ONGOING" } - let!(:election) { create :vocdoni_election, :ready_for_setup, :configured, :ongoing, component: current_component } + let!(:election) { create(:vocdoni_election, :ready_for_setup, :configured, :ongoing, component: current_component) } it "performs the action successfully" do visit_steps_page - click_button "Pause the election" + click_link_or_button "Pause the election" accept_confirm expect(page).to have_admin_callout("The election has been successfully paused") expect(page).to have_content("The election is currently running") - expect(page).to have_selector("li.text-warning", text: "Paused") + expect(page).to have_css("li.text-warning", text: "Paused") end end describe "canceling the election" do let(:vocdoni_status) { "ONGOING" } - let!(:election) { create :vocdoni_election, :ready_for_setup, :configured, :ongoing, component: current_component } + let!(:election) { create(:vocdoni_election, :ready_for_setup, :configured, :ongoing, component: current_component) } it "performs the action successfully" do visit_steps_page - click_link "Cancel the election (abort)" + click_link_or_button "Cancel the election (abort)" accept_confirm expect(page).to have_admin_callout("The election has been successfully canceled") expect(page).to have_content("This election has been canceled prematurely") - expect(page).to have_selector("li.text-warning", text: "Canceled") + expect(page).to have_css("li.text-warning", text: "Canceled") end end describe "ending the election" do let(:vocdoni_status) { "ONGOING" } - let!(:election) { create :vocdoni_election, :ready_for_setup, :configured, :ongoing, component: current_component } + let!(:election) { create(:vocdoni_election, :ready_for_setup, :configured, :ongoing, component: current_component) } it "performs the action successfully" do visit_steps_page - click_link "End the election" + click_link_or_button "End the election" accept_confirm expect(page).to have_admin_callout("The election has been ended, the results will be published in a few seconds.") expect(page).to have_content("The vote period has ended. You can publish the results") - expect(page).to have_selector("li.text-warning", text: "Vote period ended") + expect(page).to have_css("li.text-warning", text: "Vote period ended") end end describe "publishing the results" do let(:vocdoni_status) { "ENDED" } - let!(:election) { create :vocdoni_election, :ready_for_setup, :configured, :finished, component: current_component } - let(:answer1) { election.questions.first.answers.first } - let(:answer2) { election.questions.first.answers.second } + let!(:election) { create(:vocdoni_election, :ready_for_setup, :configured, :finished, component: current_component) } + let(:answer_first) { election.questions.first.answers.first } + let(:answer_second) { election.questions.first.answers.second } it "performs the action successfully" do visit_steps_page @@ -248,27 +248,27 @@ election.build_answer_values! perform_enqueued_jobs do - click_button "Publish results" + click_link_or_button "Publish results" end expect(page).to have_admin_callout("The election has been ended, the results will be published in a few seconds.") - expect(page).to have_selector("li.text-warning", text: "Results published") + expect(page).to have_css("li.text-warning", text: "Results published") expect(page).to have_content("Results published") - within find(:xpath, "//td[contains(text(),'#{translated(answer1.title)}')]/following-sibling::td") do + within :xpath, "//td[contains(text(),'#{translated(answer_first.title)}')]/following-sibling::td" do expect(page).to have_content("3") end - within find(:xpath, "//td[contains(text(),'#{translated(answer2.title)}')]/following-sibling::td") do + within :xpath, "//td[contains(text(),'#{translated(answer_second.title)}')]/following-sibling::td" do expect(page).to have_content("14") end end end describe "updating the census" do - let!(:election) { create :vocdoni_election, :with_internal_census, :ready_for_setup, :configured, :ongoing, component: current_component, verification_types: verification_types } + let!(:election) { create(:vocdoni_election, :with_internal_census, :ready_for_setup, :configured, :ongoing, component: current_component, verification_types:) } let(:non_voter_ids) { create_list(:user, 3, organization: current_component.organization).map(&:id) } - let(:authorization) { create(:authorization, user: user, name: "dummy_authorization_handler") } + let(:authorization) { create(:authorization, user:, name: "dummy_authorization_handler") } let(:verification_types) { [authorization.name] } it "performs the action successfully" do @@ -276,11 +276,11 @@ expect(page).to have_content("There are 1 users waiting to be added to the census.") expect(page).to have_content("It is possible to update it during the duration of the election but it requires your manual action as it might cost some credits.") expect(page).to have_content("Example authorization") - click_link "Update census now!" + click_link_or_button "Update census now!" sleep 1 perform_enqueued_jobs sleep 1 - expect(page).not_to have_css("a", text: "Update census now!") + expect(page).to have_no_css("a", text: "Update census now!") expect(page).to have_content("There are 0 users waiting to be added to the census.") end end @@ -291,7 +291,7 @@ def visit_steps_page relogin_as user, scope: :user visit_component_admin - within find("tr", text: translated(election.title)) do + within "tr", text: translated(election.title) do page.find(".action-icon--manage-steps").click end end diff --git a/spec/system/decidim/admin/election_setup_wizard_spec.rb b/spec/system/decidim/admin/election_setup_wizard_spec.rb index 53075d39..82f65257 100644 --- a/spec/system/decidim/admin/election_setup_wizard_spec.rb +++ b/spec/system/decidim/admin/election_setup_wizard_spec.rb @@ -2,9 +2,9 @@ require "spec_helper" -describe "Election setup wizard", :slow, type: :system do +describe "Election setup wizard", :slow do # rubocop:disable RSpec/DescribeClass let(:manifest_name) { :vocdoni } - let(:current_component) { create :vocdoni_component } + let(:current_component) { create(:vocdoni_component) } let(:election_title) { "My election" } let(:election_description) { "My election description" } let(:edit_title) { "Edit election \"#{election_title}\"" } @@ -23,8 +23,10 @@ describe "create a new election" do before do + switch_to_host(organization.host) + login_as user, scope: :user visit_component_admin - click_link "New election" + click_link_or_button "New election" end it_behaves_like "has setup wizard tabs" @@ -47,11 +49,11 @@ context "when the form is not valid" do before do - click_button "Save and go to the next step" + click_link_or_button "Save and go to the next step" end it "shows errors" do - expect(page).to have_content("can't be blank", count: 2) + expect(page).to have_content("cannot be blank", count: 2) end end @@ -80,34 +82,34 @@ end it "can edit previous step" do - expect(page).not_to have_css("li.tabs-title a.disabled", text: "Basic info") + expect(page).to have_no_css("li.tabs-title a.disabled", text: "Basic info") end context "when creates a new question with 2 answers" do before do fill_question - click_link "Manage answers" + click_link_or_button "Manage answers" fill_answer_first fill_answer_second - click_link "Done, go to the next step" + click_link_or_button "Done, go to the next step" end it "goes to the next step" do expect(page).to have_content("Upload a CSV file") - expect(page).not_to have_content("Questions must have at least two answers in order to go to the next step.") + expect(page).to have_no_content("Questions must have at least two answers in order to go to the next step.") end end context "when creates a new question with 1 answer" do before do fill_question - click_link "Manage answers" + click_link_or_button "Manage answers" fill_answer_first - click_link "Back to questions" + click_link_or_button "Back to questions" end it "doesn't go to the next step" do - expect(page).not_to have_css("a.button", text: "Done, go to the next step") + expect(page).to have_no_css("a.button", text: "Done, go to the next step") expect(page).to have_css("li.tabs-title a.disabled", text: "Census") expect(page).to have_content("Questions must have at least two answers in order to go to the next step.") end @@ -118,10 +120,10 @@ before do fill_basic_info fill_question - click_link "Manage answers" + click_link_or_button "Manage answers" fill_answer_first fill_answer_second - click_link "Done, go to the next step" + click_link_or_button "Done, go to the next step" end it "has title" do @@ -137,13 +139,13 @@ end it "can edit previous steps" do - expect(page).not_to have_css("li.tabs-title a.disabled", text: "Basic info") - expect(page).not_to have_css("li.tabs-title a.disabled", text: "Questions") + expect(page).to have_no_css("li.tabs-title a.disabled", text: "Basic info") + expect(page).to have_no_css("li.tabs-title a.disabled", text: "Questions") end context "when the form is not valid" do before do - click_button "Upload file" + click_link_or_button "Upload file" end it "shows errors" do @@ -151,7 +153,7 @@ end it "doesn't go to the next step" do - expect(page).not_to have_css("a.button", text: "Done, go to the next step") + expect(page).to have_no_css("a.button", text: "Done, go to the next step") expect(page).to have_css("li.tabs-title a.disabled", text: "Calendar and results") end end @@ -171,10 +173,10 @@ before do fill_basic_info fill_question - click_link "Manage answers" + click_link_or_button "Manage answers" fill_answer_first fill_answer_second - click_link "Done, go to the next step" + click_link_or_button "Done, go to the next step" upload_census end @@ -192,14 +194,14 @@ end it "can edit previous steps" do - expect(page).not_to have_css("li.tabs-title a.disabled", text: "Basic info") - expect(page).not_to have_css("li.tabs-title a.disabled", text: "Questions") - expect(page).not_to have_css("li.tabs-title a.disabled", text: "Census") + expect(page).to have_no_css("li.tabs-title a.disabled", text: "Basic info") + expect(page).to have_no_css("li.tabs-title a.disabled", text: "Questions") + expect(page).to have_no_css("li.tabs-title a.disabled", text: "Census") end context "when the form is not valid" do before do - click_button "Save and go to the next step" + click_link_or_button "Save and go to the next step" end it "shows errors" do @@ -232,10 +234,10 @@ before do fill_basic_info fill_question - click_link "Manage answers" + click_link_or_button "Manage answers" fill_answer_first fill_answer_second - click_link "Done, go to the next step" + click_link_or_button "Done, go to the next step" upload_census fill_calendar_and_results end @@ -249,17 +251,17 @@ end it "can edit previous steps" do - expect(page).not_to have_css("li.tabs-title a.disabled", text: "Basic info") - expect(page).not_to have_css("li.tabs-title a.disabled", text: "Questions") - expect(page).not_to have_css("li.tabs-title a.disabled", text: "Census") - expect(page).not_to have_css("li.tabs-title a.disabled", text: "Calendar and results") + expect(page).to have_no_css("li.tabs-title a.disabled", text: "Basic info") + expect(page).to have_no_css("li.tabs-title a.disabled", text: "Questions") + expect(page).to have_no_css("li.tabs-title a.disabled", text: "Census") + expect(page).to have_no_css("li.tabs-title a.disabled", text: "Calendar and results") end context "when click the publish button" do before do - find("a.hollow", text: "Publish").click - click_link "Done, go to the next step" - click_link "Create" + find("a.button__secondary", text: "Publish").click + click_link_or_button "Done, go to the next step" + click_link_or_button "Create" end it "redirects to the steps dashboard" do @@ -270,11 +272,11 @@ end describe "edit elections" do - let!(:election) { create :vocdoni_election, component: current_component } + let!(:election) { create(:vocdoni_election, component: current_component) } before do visit_component_admin - click_link "Edit" + click_link_or_button "Edit" end it "has edit title" do @@ -289,38 +291,38 @@ def fill_basic_info fill_in "election_title_#{I18n.locale}", with: election_title fill_in_i18n_editor :election_description, "#election-description-tabs", en: election_description - click_button "Save and go to the next step" + click_link_or_button "Save and go to the next step" end def fill_question - click_link "New question" + click_link_or_button "New question" fill_in "question_title_#{I18n.locale}", with: "My question" fill_in "question_description_#{I18n.locale}", with: "My question description" - click_button "Create question" + click_link_or_button "Create question" end def fill_answer_first - click_link "New answer" + click_link_or_button "New answer" fill_in "answer_title_#{I18n.locale}", with: "My answer" fill_in_i18n_editor :answer_description, "#answer-description-tabs", en: "My answer description" - click_button "Create answer" + click_link_or_button "Create answer" end def fill_answer_second - click_link "New answer" + click_link_or_button "New answer" fill_in "answer_title_#{I18n.locale}", with: "My second answer" fill_in_i18n_editor :answer_description, "#answer-description-tabs", en: "My answer description" - click_button "Create answer" - click_link "Back to questions" + click_link_or_button "Create answer" + click_link_or_button "Back to questions" end def upload_census attach_file("census_data[file]", valid_census_file) # wallets are generated asynchronously perform_enqueued_jobs do - click_button "Upload file" + click_link_or_button "Upload file" end - click_link "Done, go to the next step" + click_link_or_button "Done, go to the next step" end def valid_census_file @@ -328,10 +330,12 @@ def valid_census_file end def fill_calendar_and_results - fill_in "election_calendar_start_time", with: 12.minutes.from_now.strftime("%d/%m/%Y %H:%M") - send_keys(:enter) - fill_in "election_calendar_end_time", with: 12.days.from_now.strftime("%d/%m/%Y %H:%M") - send_keys(:enter) - click_button "Save and go to the next step" + start_time = 12.minutes.from_now.strftime("%Y-%m-%dT%H:%M") + end_time = 12.days.from_now.strftime("%Y-%m-%dT%H:%M") + + page.execute_script("document.getElementById('election_calendar_start_time').value = '#{start_time}'") + page.execute_script("document.getElementById('election_calendar_end_time').value = '#{end_time}'") + + click_link_or_button "Save and go to the next step" end end diff --git a/spec/system/decidim/explore_elections_spec.rb b/spec/system/decidim/explore_elections_spec.rb index 410ad311..3918dede 100644 --- a/spec/system/decidim/explore_elections_spec.rb +++ b/spec/system/decidim/explore_elections_spec.rb @@ -2,13 +2,13 @@ require "spec_helper" -describe "Explore elections", :slow, type: :system do +describe "Explore elections", :slow do # rubocop:disable RSpec/DescribeClass include_context "with a component" let(:manifest_name) { "vocdoni" } let(:elections_count) { 5 } let!(:elections) do - create_list(:vocdoni_election, elections_count, :complete, :published, :auto_start, :ongoing, component: component) + create_list(:vocdoni_election, elections_count, :complete, :published, :auto_start, :ongoing, component:) end describe "index" do @@ -17,13 +17,13 @@ Decidim::Vocdoni::Election.destroy_all end - let!(:single_elections) { create_list(:vocdoni_election, 1, :complete, :published, :auto_start, :ongoing, component: component) } + let!(:single_elections) { create_list(:vocdoni_election, 1, :complete, :published, :auto_start, :ongoing, component:) } it "redirects to the only election" do visit_component expect(page).to have_content("Active voting until") - expect(page).not_to have_content("All elections") + expect(page).to have_no_content("All elections") expect(page).to have_content("These are the questions for this voting process") end end @@ -31,7 +31,7 @@ context "with many elections" do it "shows all elections for the given process" do visit_component - expect(page).to have_selector(".card--election", count: elections_count) + expect(page).to have_css(".card__grid", count: elections_count) elections.each do |election| expect(page).to have_content(translated(election.title)) @@ -46,7 +46,7 @@ it "shows the correct warning" do visit_component - within ".callout" do + within "[data-announcement]" do expect(page).to have_content("any election scheduled") end end @@ -71,25 +71,25 @@ end it "shows accordion with questions and answers" do - expect(page).to have_css(".accordion-item", count: election.questions.count) - expect(page).not_to have_css(".accordion-content") + expect(page).to have_css(".election__accordion", count: election.questions.count) + expect(page).to have_no_css(".election__accordion-panel") - within ".accordion-item:first-child" do - click_link translated(question.title) + within ".election__accordion:first-child" do + click_link_or_button translated(question.title) expect(page).to have_css("li", count: question.answers.count) end end context "with attached photos" do it "shows the image" do - expect(page).to have_xpath("//img[@src=\"#{image.url}\"]") + expect(page).to have_css("img[src*='city.jpeg']") end end end context "with results" do - let(:election) { create(:vocdoni_election, :published, :results_published, component: component) } - let(:question) { create :vocdoni_question, :with_votes, election: election } + let(:election) { create(:vocdoni_election, :published, :results_published, component:) } + let(:question) { create(:vocdoni_question, :with_votes, election:) } before do election.update!(questions: [question]) @@ -98,7 +98,7 @@ it "shows result information" do expect(page).to have_i18n_content(question.title) - expect(page).to have_content("ELECTION RESULTS") + expect(page).to have_content("Election results") end end end diff --git a/spec/system/decidim/preview_vote_online_spec.rb b/spec/system/decidim/preview_vote_online_spec.rb index 3ea3d30f..300d4d99 100644 --- a/spec/system/decidim/preview_vote_online_spec.rb +++ b/spec/system/decidim/preview_vote_online_spec.rb @@ -2,12 +2,12 @@ require "spec_helper" -describe "Preview vote online in an election", type: :system do +describe "Preview vote online in an election" do # rubocop:disable RSpec/DescribeClass let(:manifest_name) { "vocdoni" } - let!(:election) { create :vocdoni_election, :upcoming, :published, :simple, component: component } - let(:admin) { create(:user, :admin, :confirmed, organization: organization) } + let!(:election) { create(:vocdoni_election, :upcoming, :published, :simple, component:) } + let(:admin) { create(:user, :admin, :confirmed, organization:) } let(:organization) { component.organization } - let!(:elections) { create_list(:vocdoni_election, 2, :vote, component: component) } # prevents redirect to single election page + let!(:elections) { create_list(:vocdoni_election, 2, :vote, component:) } # prevents redirect to single election page let(:router) { Decidim::EngineRouter.main_proxy(component).decidim_participatory_process_vocdoni } before do @@ -21,8 +21,9 @@ describe "preview voting with the admin" do it "can vote", :slow do visit_component - click_link translated(election.title) - click_link "Preview" + check("Upcoming") + click_link_or_button translated(election.title) + click_link_or_button "Preview" expect(page).to have_content("This is a preview of the voting booth.") @@ -41,10 +42,11 @@ it "shows a link to view more information about the election" do visit_component - click_link translated(election.title) - click_link "Preview" + check("Upcoming") + click_link_or_button translated(election.title) + click_link_or_button "Preview" login_step({ email: admin.email, token: "123456" }) - expect(page).to have_content("MORE INFORMATION") + expect(page).to have_content("More information") end end @@ -57,21 +59,22 @@ it "does not show the more information link" do visit_component - click_link translated(election.title) - click_link "Preview" - expect(page).not_to have_content("MORE INFORMATION") + check("Upcoming") + click_link_or_button translated(election.title) + click_link_or_button "Preview" + expect(page).to have_no_content("More information") end end end context "when the election is not published" do - let(:election) { create :vocdoni_election, :upcoming, :simple, component: component } + let(:election) { create(:vocdoni_election, :upcoming, :simple, component:) } it_behaves_like "allows admins to preview the voting booth" end context "when the election has not started yet" do - let(:election) { create :vocdoni_election, :upcoming, :published, :simple, component: component } + let(:election) { create(:vocdoni_election, :upcoming, :published, :simple, component:) } it_behaves_like "allows admins to preview the voting booth" end @@ -86,9 +89,9 @@ context "when the ballot was not send" do it "is alerted when trying to leave the component before completing" do visit_component - - click_link translated(election.title) - click_link "Preview" + check("Upcoming") + click_link_or_button translated(election.title) + click_link_or_button "Preview" dismiss_prompt do page.find("a.focus__exit").click diff --git a/spec/system/decidim/results_online_spec.rb b/spec/system/decidim/results_online_spec.rb index 1aae4987..7a70cd91 100644 --- a/spec/system/decidim/results_online_spec.rb +++ b/spec/system/decidim/results_online_spec.rb @@ -2,13 +2,13 @@ require "spec_helper" -describe "Results online", type: :system do +describe "Results online" do # rubocop:disable RSpec/DescribeClass let(:manifest_name) { "vocdoni" } - let(:user) { create(:user, :confirmed, organization: organization) } + let(:user) { create(:user, :confirmed, organization:) } let(:organization) { component.organization } - let!(:elections) { create_list(:vocdoni_election, 2, :vote, component: component) } # prevents redirect to single election page + let!(:elections) { create_list(:vocdoni_election, 2, :vote, component:) } # prevents redirect to single election page let(:router) { Decidim::EngineRouter.main_proxy(component).decidim_participatory_process_vocdoni } - let!(:wallet) { create(:vocdoni_wallet, organization: organization, private_key: private_key) } + let!(:wallet) { create(:vocdoni_wallet, organization:, private_key:) } let(:private_key) { Faker::Blockchain::Ethereum.address } before do @@ -20,9 +20,9 @@ include_context "with a component" context "when until_the_end is false" do - let!(:election) { create :vocdoni_election, :ongoing, :published, :simple, component: component, election_type: { secret_until_the_end: secret_until_the_end }, vocdoni_election_id: vocdoni_election_id } - let(:question) { create :vocdoni_question, election: election } - let(:answers) { create_list :answer, 2, question: question } + let!(:election) { create(:vocdoni_election, :ongoing, :published, :simple, component:, election_type: { secret_until_the_end: }, vocdoni_election_id:) } + let(:question) { create(:vocdoni_question, election:) } + let(:answers) { create_list(:answer, 2, question:) } let(:secret_until_the_end) { false } let(:vocdoni_election_id) { "12345" } @@ -38,44 +38,46 @@ it "shows the results" do visit_component - click_link translated(election.title) + click_link_or_button translated(election.title) - expect(page).to have_content("VOTE STATISTICS") - expect(page).to have_css(".accordion-content table tr td:nth-child(2)", text: "10", count: 1) - expect(page).to have_css(".accordion-content table tr td:nth-child(2)", text: "12", count: 1) + expect(page).to have_content("Vote statistics") + expect(page).to have_css(".election__accordion-panel-result table tr td:nth-child(2)", text: "10", count: 1) + expect(page).to have_css(".election__accordion-panel-result table tr td:nth-child(2)", text: "12", count: 1) end context "when the election is finished" do - let(:election) { create :vocdoni_election, :finished, :published, :simple, component: component } + let(:election) { create(:vocdoni_election, :finished, :published, :simple, component:) } it "shows the results" do visit_component - click_link translated(election.title) + check("Finished") + click_link_or_button translated(election.title) - expect(page).not_to have_content("VOTE STATISTICS") + expect(page).to have_no_content("VOTE STATISTICS") end end context "when the election is not ongoing" do - let(:election) { create :vocdoni_election, :paused, :published, :simple, component: component } + let(:election) { create(:vocdoni_election, :paused, :published, :simple, component:) } it "shows the results" do visit_component - click_link translated(election.title) + check("Upcoming") + click_link_or_button translated(election.title) - expect(page).not_to have_content("VOTE STATISTICS") + expect(page).to have_no_content("Vote statistics") end end end context "when until_the_end is true" do - let(:election) { create :vocdoni_election, :ongoing, :published, :simple, component: component } + let(:election) { create(:vocdoni_election, :ongoing, :published, :simple, component:) } it "doesn't show the results" do visit_component - click_link translated(election.title) + click_link_or_button translated(election.title) - expect(page).not_to have_content("VOTE STATISTICS") + expect(page).to have_no_content("VOTE STATISTICS") end end end diff --git a/spec/system/decidim/vote_online_spec.rb b/spec/system/decidim/vote_online_spec.rb index ba35be49..6dba6f75 100644 --- a/spec/system/decidim/vote_online_spec.rb +++ b/spec/system/decidim/vote_online_spec.rb @@ -2,12 +2,12 @@ require "spec_helper" -describe "Vote online in an election", type: :system do +describe "Vote online in an election" do # rubocop:disable RSpec/DescribeClass let(:manifest_name) { "vocdoni" } - let!(:election) { create :vocdoni_election, :upcoming, :published, :simple, component: component } - let(:user) { create(:user, :confirmed, organization: organization) } + let!(:election) { create(:vocdoni_election, :upcoming, :published, :simple, component:) } + let(:user) { create(:user, :confirmed, organization:) } let(:organization) { component.organization } - let!(:elections) { create_list(:vocdoni_election, 2, :vote, component: component) } # prevents redirect to single election page + let!(:elections) { create_list(:vocdoni_election, 2, :vote, component:) } # prevents redirect to single election page let(:router) { Decidim::EngineRouter.main_proxy(component).decidim_participatory_process_vocdoni } before do @@ -20,89 +20,107 @@ describe "voting with the current user" do context "when the election is ongoing" do - let!(:election) { create :vocdoni_election, :ongoing, :published, :simple, component: component } + let!(:election) { create(:vocdoni_election, :ongoing, :published, :simple, component:) } it "can access", :slow do visit_component - click_link translated(election.title) + click_link_or_button translated(election.title) expect(page).to have_link("Start voting") - expect(page).not_to have_link("Preview") + expect(page).to have_no_link("Preview") - click_link "Start voting" + click_link_or_button "Start voting" expect(page).to have_content("Verify your identity") end end context "when the election is not published" do - let(:election) { create :vocdoni_election, :upcoming, :simple, component: component } + let(:election) { create(:vocdoni_election, :upcoming, :simple, component:) } it_behaves_like "doesn't allow to vote" it_behaves_like "allows admins to preview the voting booth" end context "when the election has not started yet" do - let(:election) { create :vocdoni_election, :upcoming, :published, :simple, component: component } + let(:election) { create(:vocdoni_election, :upcoming, :published, :simple, component:) } it_behaves_like "doesn't allow to vote" it_behaves_like "allows admins to preview the voting booth" end context "when the election is paused" do - let(:election) { create :vocdoni_election, :paused, :simple, component: component } + let(:election) { create(:vocdoni_election, :paused, :simple, component:) } it_behaves_like "doesn't allow to vote" it_behaves_like "allows admins to preview the voting booth" end context "when the election was canceled" do - let(:election) { create :vocdoni_election, :canceled, :simple, component: component } + let(:election) { create(:vocdoni_election, :canceled, :simple, component:) } it_behaves_like "doesn't allow to vote" it_behaves_like "allows admins to preview the voting booth" end context "when the election has finished" do - let(:election) { create :vocdoni_election, :finished, :published, :simple, component: component } + let(:election) { create(:vocdoni_election, :finished, :published, :simple, component:) } it_behaves_like "doesn't allow to vote" it_behaves_like "doesn't allow admins to preview the voting booth" end end + describe "voting without the current user" do + context "when the election is ongoing" do + let!(:election) { create(:vocdoni_election, :ongoing, :published, :simple, component:) } + + before do + logout :user + visit_component + check("Upcoming") + click_link_or_button translated(election.title) + click_link_or_button "Start voting" + end + + it "shows login modal" do + expect(page).to have_content("Please log in") + end + end + end + describe "internal census" do - let!(:election) { create :vocdoni_election, :ongoing, :published, :with_internal_census, component: component, verification_types: verification_types } - let(:authorization) { create(:authorization, user: user, name: "dummy_authorization_handler") } + let!(:election) { create(:vocdoni_election, :ongoing, :published, :with_internal_census, component:, verification_types:) } + let(:authorization) { create(:authorization, user:, name: "dummy_authorization_handler") } let(:verification_types) { [authorization.name] } context "when the user is not logged in" do before do logout :user visit_component - click_link translated(election.title) - click_link "Start voting" + click_link_or_button translated(election.title) + click_link_or_button "Start voting" end it "shows login modal" do visit_component - click_link translated(election.title) + click_link_or_button translated(election.title) - click_link "Start voting" + click_link_or_button "Start voting" - expect(page).to have_content("Please sign in") + expect(page).to have_content("Please log in") end end context "when the user is logged in" do context "when user is not authorized" do - let(:another_user) { create(:user, :confirmed, organization: organization) } + let(:another_user) { create(:user, :confirmed, organization:) } before do login_as another_user, scope: :user visit_component - click_link translated(election.title) - click_link "Start voting" + click_link_or_button translated(election.title) + click_link_or_button "Start voting" end it "shows a modal with required authorizations" do @@ -115,30 +133,30 @@ before do login_as user, scope: :user visit_component - click_link translated(election.title) - click_link "Start voting" + click_link_or_button translated(election.title) + click_link_or_button "Start voting" end it "doesn't show a modal with required authorizations" do - expect(page).not_to have_content("Authorization required") - expect(page).not_to have_link("Authorize with \"Example authorization\"") + expect(page).to have_no_content("Authorization required") + expect(page).to have_no_link("Authorize with \"Example authorization\"") end end end context "when the census was created without authorized users" do context "when the census is not updated" do - let!(:election) { create :vocdoni_election, :ongoing, :published, :with_internal_census, component: component, verification_types: verification_types } - let(:another_user) { create(:user, :confirmed, organization: organization) } - let!(:voter) { create(:vocdoni_voter, election: election, email: another_user.email, in_vocdoni_census: false) } + let!(:election) { create(:vocdoni_election, :ongoing, :published, :with_internal_census, component:, verification_types:) } + let(:another_user) { create(:user, :confirmed, organization:) } + let!(:voter) { create(:vocdoni_voter, election:, email: another_user.email, in_vocdoni_census: false) } let(:non_voter_ids) { [voter.id] } - let(:admin) { create(:user, :admin, organization: organization) } + let(:admin) { create(:user, :admin, organization:) } before do login_as user, scope: :user visit_component - click_link translated(election.title) - click_link "Start voting" + click_link_or_button translated(election.title) + click_link_or_button "Start voting" end it "shows a message to update the census" do @@ -148,16 +166,16 @@ end context "when the census was created with authorized users" do - let!(:user) { create(:user, :confirmed, organization: organization) } - let!(:authorization) { create(:authorization, user: user, name: "dummy_authorization_handler") } - let!(:voter) { create(:vocdoni_voter, election: election, email: user.email, in_vocdoni_census: true) } - let!(:election) { create :vocdoni_election, :ongoing, :published, :with_internal_census, component: component, verification_types: verification_types } + let!(:user) { create(:user, :confirmed, organization:) } + let!(:authorization) { create(:authorization, user:, name: "dummy_authorization_handler") } + let!(:voter) { create(:vocdoni_voter, election:, email: user.email, in_vocdoni_census: true) } + let!(:election) { create(:vocdoni_election, :ongoing, :published, :with_internal_census, component:, verification_types:) } before do login_as user, scope: :user visit_component - click_link translated(election.title) - click_link "Start voting" + click_link_or_button translated(election.title) + click_link_or_button "Start voting" end it "shows a message to update the census" do diff --git a/spec/types/integration_schema_spec.rb b/spec/types/integration_schema_spec.rb index ff947526..fce5fd91 100644 --- a/spec/types/integration_schema_spec.rb +++ b/spec/types/integration_schema_spec.rb @@ -6,7 +6,7 @@ describe "Decidim::Api::QueryType" do include_context "with a graphql decidim component" let(:component_type) { "Vocdoni" } - let!(:current_component) { create :vocdoni_component, participatory_space: participatory_process } + let!(:current_component) { create(:vocdoni_component, participatory_space: participatory_process) } let!(:election) { create(:vocdoni_election, :published, :finished, component: current_component) } let(:election_single_result) do - " data-accordion-item>
- <%= t(".question") %>: <%= translated_attribute(question.title) %>
-
+diff --git a/app/views/decidim/vocdoni/admin/steps/_canceled.html.erb b/app/views/decidim/vocdoni/admin/steps/_canceled.html.erb index c21fa255..246e2f0d 100644 --- a/app/views/decidim/vocdoni/admin/steps/_canceled.html.erb +++ b/app/views/decidim/vocdoni/admin/steps/_canceled.html.erb @@ -1,6 +1,6 @@-
<% tabs_info.each do |tab_name, info| %>
-
+ <%= link_to resource_locator(election).path, class: "button button__sm button__secondary" do %> + <%= icon "eye-line", role: "img", aria_label: t("actions.preview", scope: "decidim.vocdoni"), target: :blank %> + <%= t("view", scope: "decidim.vocdoni.admin.steps.created") %> + <% end %> -<%= link_to election.explorer_vote_url, class: "js-vocdoni-explorer-url button primary hollow", target: :blank, rel: "noopener noreferrer" do %> - <%= t("explorer_vote", scope: "decidim.vocdoni.admin.steps.created") %> -<% end %> + <%= link_to election.explorer_vote_url, + class: "js-vocdoni-explorer-url button button__sm button__transparent-secondary", + target: :blank, rel: "noopener noreferrer" do %> + <%= t("explorer_vote", scope: "decidim.vocdoni.admin.steps.created") %> + <% end %> +diff --git a/app/views/decidim/vocdoni/admin/steps/_available_credits.html.erb b/app/views/decidim/vocdoni/admin/steps/_available_credits.html.erb index 9fe72263..5aa2626c 100644 --- a/app/views/decidim/vocdoni/admin/steps/_available_credits.html.erb +++ b/app/views/decidim/vocdoni/admin/steps/_available_credits.html.erb @@ -1,11 +1,15 @@ --<% if Decidim::Vocdoni.api_endpoint_env == "prod" %> -- <%= icon "credit-card", role: "img", "aria-hidden": true %> - <%= t("available", scope: "decidim.vocdoni.admin.steps.credits") %>: - - - -
+<%= append_javascript_pack_tag "decidim_vocdoni_admin" %> +<%= append_stylesheet_pack_tag "decidim_vocdoni_admin" %> +++ <%= icon "bank-card-line", role: "img", "aria-hidden": true %> ++ <%= t("available", scope: "decidim.vocdoni.admin.steps.credits") %>: + + + +
+@@ -17,42 +21,24 @@-<% else %> -- <%= t("decidim.vocdoni.admin.steps.credits.prod_mode_html", +
++ + <%= render(partial: "wallet_address") %> ++ <%= t("decidim.vocdoni.admin.steps.credits.prod_mode_html", reseller_name: Decidim::Vocdoni.vocdoni_reseller_name, reseller_email: Decidim::Vocdoni.vocdoni_reseller_email, wallet_address: @current_vocdoni_wallet.private_key).html_safe %> -
-- --- ---+- <%= t("dev_mode", scope: "decidim.vocdoni.admin.steps.credits", env: "#{Decidim::Vocdoni.api_endpoint_env}").html_safe %> -
-+<% end %> - <% unless Decidim::Vocdoni.api_endpoint_env == "prod" %> - <%= link_to credits_election_path(election), method: :remote, class: "button primary js-vocdoni-credits-collect-faucet-tokens" do %> - <%= icon "euro", role: "img", "aria-hidden": true %> - <%= t("get_more", scope: "decidim.vocdoni.admin.steps.credits") %> - <% end %> + <%= link_to credits_election_path(election), method: :remote, class: "button button__lg button__secondary js-vocdoni-credits-collect-faucet-tokens" do %> + <%= icon "coin-line", role: "img", "aria-hidden": true %> + <%= t("get_more", scope: "decidim.vocdoni.admin.steps.credits") %> <% end %>+ <%= t("dev_mode", scope: "decidim.vocdoni.admin.steps.credits", env: "#{Decidim::Vocdoni.api_endpoint_env}").html_safe %> +
+-<%= t("title", scope: "decidim.vocdoni.admin.steps.canceled") %>
+<%= t("title", scope: "decidim.vocdoni.admin.steps.canceled") %>
diff --git a/app/views/decidim/vocdoni/admin/steps/_create_election.html.erb b/app/views/decidim/vocdoni/admin/steps/_create_election.html.erb index c0899123..9e78462f 100644 --- a/app/views/decidim/vocdoni/admin/steps/_create_election.html.erb +++ b/app/views/decidim/vocdoni/admin/steps/_create_election.html.erb @@ -1,6 +1,6 @@--<%= t(".title") %>
+<%= t(".title") %>
<% unless @form.invalid? %> @@ -27,22 +27,25 @@- - <% form.messages.each do |key, value| %> +
+ + <% form.messages.each.with_index do |(key, value), index| %>
+ diff --git a/app/views/decidim/vocdoni/admin/steps/_created.html.erb b/app/views/decidim/vocdoni/admin/steps/_created.html.erb index 0a63fb14..7671c66f 100644 --- a/app/views/decidim/vocdoni/admin/steps/_created.html.erb +++ b/app/views/decidim/vocdoni/admin/steps/_created.html.erb @@ -1,6 +1,6 @@<% if form.errors.include?(key) %> <% Array(form.errors[key]).each do |error| %> - <% end %><%= icon "x", class: "text-alert", role: "img", "aria-hidden": true %> <%= error.to_s.html_safe %> -<%= fix_it_button_with_icon(value[:link], "wrench") %> ++ <%= icon "close-line", class: "text-alert w-6 h-6", role: "img", "aria-hidden": true %> <%= error.to_s.html_safe %> +<%= fix_it_button_with_icon(value[:link], "tools-line") %> <% end %> <% else %> -<%= icon "check", class: "text-success", role: "img", "aria-hidden": true %> <%= value[:message].html_safe %> -+ + <%= icon "check-line", class: "text-success w-6 h-6", role: "img", "aria-hidden": true %> <%= value[:message].html_safe %> +<% end %> -<%= t(".title") %>
+<%= t(".title") %>
diff --git a/app/views/decidim/vocdoni/admin/steps/_danger_zone.html.erb b/app/views/decidim/vocdoni/admin/steps/_danger_zone.html.erb index 076b6120..b51564c6 100644 --- a/app/views/decidim/vocdoni/admin/steps/_danger_zone.html.erb +++ b/app/views/decidim/vocdoni/admin/steps/_danger_zone.html.erb @@ -1,6 +1,6 @@">-<% @@ -16,7 +16,7 @@ %><%= t("title", scope: "decidim.vocdoni.admin.steps.danger_zone") %>
+<%= t("title", scope: "decidim.vocdoni.admin.steps.danger_zone") %>
<%= t(action, scope: "decidim.vocdoni.admin.steps.danger_zone.messages") %>
-+<%= f.hidden_field :status, value: action %> <%= danger_zone_submit(f, action) %>@@ -26,19 +26,22 @@ <% if election.interruptible? %>+<%= append_javascript_pack_tag "decidim_vocdoni_admin" %> diff --git a/app/views/decidim/vocdoni/admin/steps/_paused.html.erb b/app/views/decidim/vocdoni/admin/steps/_paused.html.erb index b85fe7de..55b56e89 100644 --- a/app/views/decidim/vocdoni/admin/steps/_paused.html.erb +++ b/app/views/decidim/vocdoni/admin/steps/_paused.html.erb @@ -1,6 +1,6 @@<%= t("cancel_end_html", scope: "decidim.vocdoni.admin.steps.danger_zone.messages") %>
-+<% end %>- <%= link_to election_step_path(election, :cancel, status: :canceled), method: :patch, class: "button alert js-button-submit", + <%= link_to election_step_path(election, :cancel, status: :canceled), method: :patch, + class: "button button__sm button__alert js-button-submit", data: { status: "canceled", confirm: t("confirm", scope: "decidim.vocdoni.admin.steps.danger_zone") } do %> - <%= icon("x", class: "icon--before") %> + <%= icon("close-circle-line", class: "icon--before") %> <%= t("cancel", scope: "decidim.vocdoni.admin.steps.danger_zone.action") %> <% end %> - <%= link_to election_step_path(election, :end, status: :end), method: :patch, class: "button alert js-button-submit", + <%= link_to election_step_path(election, :end, status: :end), method: :patch, + class: "button button__sm button__alert js-button-submit", data: { status: "end", confirm: t("confirm", scope: "decidim.vocdoni.admin.steps.danger_zone") } do %> - <%= icon("media-stop", class: "icon--before") %> + <%= icon("stop-circle-line", class: "icon--before") %> <%= t("end", scope: "decidim.vocdoni.admin.steps.danger_zone.action") %> <% end %>-<%= t("title", scope: "decidim.vocdoni.admin.steps.paused") %>
+<%= t("title", scope: "decidim.vocdoni.admin.steps.paused") %>
diff --git a/app/views/decidim/vocdoni/admin/steps/_results_published.html.erb b/app/views/decidim/vocdoni/admin/steps/_results_published.html.erb index 505068d5..1bbe957b 100644 --- a/app/views/decidim/vocdoni/admin/steps/_results_published.html.erb +++ b/app/views/decidim/vocdoni/admin/steps/_results_published.html.erb @@ -1,8 +1,8 @@--+
+<%= t(".title") %> - +
<%= render partial: "results_stats" %> diff --git a/app/views/decidim/vocdoni/admin/steps/_results_stats.html.erb b/app/views/decidim/vocdoni/admin/steps/_results_stats.html.erb index 184fd146..c80c2ab4 100644 --- a/app/views/decidim/vocdoni/admin/steps/_results_stats.html.erb +++ b/app/views/decidim/vocdoni/admin/steps/_results_stats.html.erb @@ -1,13 +1,13 @@ -- "
+
- "
data-accordion
data-multi-expand="true"
data-allow-all-closed="true">
<% election.questions.each_with_index do |question, i| %>
- + +
-
<% model.questions.each_with_index do |question, question_index| %>
-