From 4fe562559772cf3f752183e9bb9730b30551534f Mon Sep 17 00:00:00 2001 From: Thomas Citharel <tcit@tcit.fr> Date: Mon, 8 Nov 2021 11:03:02 +0100 Subject: [PATCH 01/14] Fix map height Signed-off-by: Thomas Citharel <tcit@tcit.fr> --- js/src/components/Map.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/components/Map.vue b/js/src/components/Map.vue index 0935b82b3..819fb8685 100644 --- a/js/src/components/Map.vue +++ b/js/src/components/Map.vue @@ -163,7 +163,7 @@ export default class Map extends Vue { </script> <style lang="scss" scoped> div.map-container { - height: 80vh; + height: 100%; width: 100%; .leaflet-map { From df21729ba0e1e42c7464fd355db9c7bd7029eada Mon Sep 17 00:00:00 2001 From: Thomas Citharel <tcit@tcit.fr> Date: Mon, 8 Nov 2021 12:13:12 +0100 Subject: [PATCH 02/14] Add UPGRADE.md and CHANGELOG.md instructions for 2.0 Signed-off-by: Thomas Citharel <tcit@tcit.fr> --- CHANGELOG.md | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ UPGRADE.md | 27 ++++++++++++++++++ 2 files changed, 105 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 760bcdd51..c3ff1ae24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,84 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 2.0.0 - unreleased + +### Added + +- Added possibility to follow groups and be notified from new upcoming events +- Export list of participants to CSV, `PDF` and `ODS` +- Allow to set timezone for an event. The timezone is automatically defined from the address if one is defined. If the event timezone is different than the user's current one, a toggle is shown to switch between the two. +- Added initial support for Right To Left languages (such as arabic) and [BiDi](https://en.wikipedia.org/wiki/Bidirectional_text) +- Build releases in `arm` and `arm64` format in addition to `amd64` +- Build Docker images in `arm` and `arm64` format in addition to `amd64` +- Added possibility to indicate the event is fully online +- Added possibility to search only for online events +- Added possibility to search only in past events +- Detect event, comments and posts languages automatically. Allows setting language +- Allow to change an user's password through the users.modify mix task +- Add instance setting so that only the admin can create groups +- Add instance setting so that only groups can create events +- Added JSON-LD metadata about the event in emails +- Added a quick link to email notification settings at the bottom of emails +- Allow to access Mobilizon with a specific language directly by using `https://instance.tld/lang` where `lang` is a language supported by Mobilizon + +### Changed + +- Multiple UI improvements, including post, event and participation cards, discussions and emails. The « My Events » page was also redesigned to allow showing events from your groups. +- Various accessibility improvements +- Delete current actor ID as well from local storage when unlogging +- Show a default text for instance contact in default terms text when no instance contact is set +- Only show locatecontrol button in leaflet map when we can do geolocation +- Disable push column in notification settings when push is not available +- Show actual language instead of language code in Users admin view +- Empty old & new passwords fields when successful password change +- Don't link to the group page from admin when actor is suspended +- Warn participants when the event organizer is suspended (and therefore the event cancelled) +- Improve metadata on public page +- Make sure some event action pages (participate remotely or without an account) don't get indexed by search engines +- Only send `Tombstone` element in `Delete` activities, not the whole previous deleted element. +- Only add address and tags to event icalendar export if they exist + +### Removed + +- Support for Elixir < 1.12 and OTP < 22 + +### Fixed + +- Fix tags autocomplete +- Fix config onboarding after LDAP initial connexion +- Fix events pagination on tags page +- Fixed deduplicated files from orphan media being deleted as well +- Fix deleting own account +- Fix search returning user profiles instead of only groups +- Fix federating geo coordinates +- Fix an issue with group activity items when moving resources +- Fix an issue with Identity Picker +- Fix an issue with TagInput +- Fix an issue when leaving a group +- Fix admin settings edition +- Fix an issue when showing public page of suspended group +- Removed non existing page (`/about/mobilizon`) from sitemap +- Fix action logs containing group suspension events +- Fixed group physical address not exposed to ActivityPub + +### Security + +- Fixed private messages sent as event replies from Mastodon that were shown publically as public comments. They are now discarded. +### Translations + +- Czech +- Gaelic +- German +- Indonesian +- Norwegian Nynorsk +- Occitan +- Persian +- Portuguese (Brazil) +- Russian +- Slovenian +- Spanish + ## 1.3.2 - 2021-08-23 ### Fixed diff --git a/UPGRADE.md b/UPGRADE.md index 257e16eb9..58bb9087f 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,3 +1,30 @@ +# Upgrading from 1.3 to 2.0 + +Requirements dependencies depend on the way Mobilizon is installed. +## New dependencies requirements + +### Release and Docker + +You are already using latest Elixir version in the release tarball and Docker images. + +### Source install + +* Elixir 1.12 and Erlang OTP 22 is now required. If your distribution doesn't provide these versions, you can uninstall them and install [Elixir](https://github.com/asdf-vm/asdf-elixir) through the [ASDF tool](https://asdf-vm.com/). + +## Optional dependencies + +These are optional, installing them will allow Mobilizon to export to PDF and ODS as well. +### Docker +Everything is included in our Docker image. +### Release and source install + +New optional Python dependencies: +* `Python` >= 3.6 +* `weasyprint` for PDF export (with [a few extra dependencies](https://doc.courtbouillon.org/weasyprint/stable/first_steps.html)) +* `pyexcel-ods3` for ODS export (no extra dependencies) + +Both can be installed through pip. + # Upgrading from 1.0 to 1.1 The 1.1 version of Mobilizon brings Elixir releases support. An Elixir release is a self-contained directory that contains all of Mobilizon's code (front-end and backend), it's dependencies, as well as the Erlang Virtual Machine and runtime (only the parts you need). As long as the release has been assembled on the same OS and architecture, it can be deploy and run straight away. [Read more about releases](https://elixir-lang.org/getting-started/mix-otp/config-and-releases.html#releases). From ea276fbe73fe3c7c16e2fad8d2a9eadb026657d9 Mon Sep 17 00:00:00 2001 From: Thomas Citharel <tcit@tcit.fr> Date: Mon, 8 Nov 2021 12:14:13 +0100 Subject: [PATCH 03/14] Detect if Python3 is installed before launching PythonPort Genserver Signed-off-by: Thomas Citharel <tcit@tcit.fr> --- lib/mobilizon.ex | 8 +++++++- lib/service/export/participants/ods.ex | 6 ++---- lib/service/export/participants/pdf.ex | 6 ++---- lib/service/python_port.ex | 22 +++++++++++++++++++--- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/lib/mobilizon.ex b/lib/mobilizon.ex index 95fdc27cf..608bb4c2c 100644 --- a/lib/mobilizon.ex +++ b/lib/mobilizon.ex @@ -51,7 +51,6 @@ defmodule Mobilizon do # workers Guardian.DB.Token.SweeperServer, ActivityPub.Federator, - Mobilizon.PythonWorker, TzWorld.Backend.DetsWithIndexCache, cachex_spec(:feed, 2500, 60, 60, &Feed.create_cache/1), cachex_spec(:ics, 2500, 60, 60, &ICalendar.create_cache/1), @@ -73,6 +72,13 @@ defmodule Mobilizon do ] ++ task_children(@env) + children = + if Mobilizon.PythonPort.python_exists?() do + children ++ [Mobilizon.PythonWorker] + else + children + end + ErrorReporting.configure() # Only attach the telemetry logger when we aren't in an IEx shell diff --git a/lib/service/export/participants/ods.ex b/lib/service/export/participants/ods.ex index bf5299cae..e6eb6c4c9 100644 --- a/lib/service/export/participants/ods.ex +++ b/lib/service/export/participants/ods.ex @@ -3,10 +3,8 @@ defmodule Mobilizon.Service.Export.Participants.ODS do Export a list of participants to ODS """ - alias Mobilizon.Events + alias Mobilizon.{Events, Export, PythonPort, PythonWorker} alias Mobilizon.Events.Event - alias Mobilizon.Export - alias Mobilizon.PythonWorker alias Mobilizon.Storage.Repo alias Mobilizon.Web.Gettext, as: GettextBackend import Mobilizon.Web.Gettext, only: [gettext: 2] @@ -91,7 +89,7 @@ defmodule Mobilizon.Service.Export.Participants.ODS do @spec dependencies_ok? :: boolean def dependencies_ok? do - PythonWorker.has_module("pyexcel_ods3") + PythonPort.python_exists?() && PythonWorker.has_module("pyexcel_ods3") end @spec enabled? :: boolean diff --git a/lib/service/export/participants/pdf.ex b/lib/service/export/participants/pdf.ex index e1e8259dd..3d488e6c5 100644 --- a/lib/service/export/participants/pdf.ex +++ b/lib/service/export/participants/pdf.ex @@ -3,10 +3,8 @@ defmodule Mobilizon.Service.Export.Participants.PDF do Export a list of participants to PDF """ - alias Mobilizon.Events + alias Mobilizon.{Events, Export, PythonPort, PythonWorker} alias Mobilizon.Events.Event - alias Mobilizon.Export - alias Mobilizon.PythonWorker alias Mobilizon.Storage.Repo alias Mobilizon.Web.ExportView alias Mobilizon.Web.Gettext, as: GettextBackend @@ -105,7 +103,7 @@ defmodule Mobilizon.Service.Export.Participants.PDF do @spec dependencies_ok? :: boolean def dependencies_ok? do - PythonWorker.has_module("weasyprint") + PythonPort.python_exists?() && PythonWorker.has_module("weasyprint") end @spec enabled? :: boolean diff --git a/lib/service/python_port.ex b/lib/service/python_port.ex index 356c32c8a..af9aff69a 100644 --- a/lib/service/python_port.ex +++ b/lib/service/python_port.ex @@ -5,15 +5,23 @@ defmodule Mobilizon.PythonPort do use Export.Python + @python_path "/usr/bin/python3" + + @doc """ + Whether Python3 is installed + """ + @spec python_exists? :: boolean + def python_exists? do + File.exists?(python_path()) + end + @doc """ ## Parameters - path: directory to include in python path """ @spec python_instance(String.t()) :: pid def python_instance(path) do - python = "/usr/bin/python3" - - {:ok, pid} = Python.start(python: python, python_path: path) + {:ok, pid} = Python.start(python: python_path(), python_path: path) pid end @@ -25,4 +33,12 @@ defmodule Mobilizon.PythonPort do def call_python(pid, module, function, arguments \\ []) do Python.call(pid, module, function, arguments) end + + @spec python_path :: String.t() + defp python_path do + case get_in(Application.get_env(:mobilizon, __MODULE__), [:path]) do + path when is_binary(path) -> path + nil -> @python_path + end + end end From e7662d3c777157a6632fc8b0345ddde0376dc0fe Mon Sep 17 00:00:00 2001 From: Thomas Citharel <tcit@tcit.fr> Date: Mon, 8 Nov 2021 12:15:02 +0100 Subject: [PATCH 04/14] Add necessary dependencies for exports into Docker image Signed-off-by: Thomas Citharel <tcit@tcit.fr> --- docker/production/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile index 2d33ae3df..05a898c78 100644 --- a/docker/production/Dockerfile +++ b/docker/production/Dockerfile @@ -48,7 +48,8 @@ LABEL org.opencontainers.image.title="mobilizon" \ org.opencontainers.image.revision=$VCS_REF \ org.opencontainers.image.created=$BUILD_DATE -RUN apk add --no-cache openssl ca-certificates ncurses-libs file postgresql-client libgcc libstdc++ imagemagick +RUN apk add --no-cache openssl ca-certificates ncurses-libs file postgresql-client libgcc libstdc++ imagemagick python3 py3-pip py3-pillow py3-cffi py3-brotli gcc musl-dev python3-dev pango libxslt-dev +RUN pip install weasyprint pyexcel-ods3 RUN mkdir -p /app/uploads && chown nobody:nobody /app/uploads RUN mkdir -p /etc/mobilizon && chown nobody:nobody /etc/mobilizon From 41eb62bc2b7dd6a4c20d6f7f3740d7d8a605a66f Mon Sep 17 00:00:00 2001 From: Thomas Citharel <tcit@tcit.fr> Date: Mon, 8 Nov 2021 16:53:07 +0100 Subject: [PATCH 05/14] Remove tzworld loading dynamically Signed-off-by: Thomas Citharel <tcit@tcit.fr> --- lib/mobilizon.ex | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/mobilizon.ex b/lib/mobilizon.ex index 608bb4c2c..f200c5254 100644 --- a/lib/mobilizon.ex +++ b/lib/mobilizon.ex @@ -14,7 +14,6 @@ defmodule Mobilizon do import Cachex.Spec - alias Mix.Tasks.TzWorld.Update, as: TzWorldUpdate alias Mobilizon.{Config, Storage, Web} alias Mobilizon.Federation.ActivityPub alias Mobilizon.Service.{ErrorPage, ErrorReporting} @@ -37,9 +36,6 @@ defmodule Mobilizon do @spec start(:normal | {:takeover, node} | {:failover, node}, term) :: {:ok, pid} | {:ok, pid, term} | {:error, term} def start(_type, _args) do - # We update TzWorld at runtime so that the data is not contained in releases - TzWorldUpdate.run(nil) - children = [ # supervisors From 729a6a7113f07d7642ab706a8c97769e5046eeb3 Mon Sep 17 00:00:00 2001 From: Thomas Citharel <tcit@tcit.fr> Date: Mon, 8 Nov 2021 18:44:26 +0100 Subject: [PATCH 06/14] Add custom task to update tz_world data Signed-off-by: Thomas Citharel <tcit@tcit.fr> --- lib/mix/tasks/mobilizon/tz_world/update.ex | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 lib/mix/tasks/mobilizon/tz_world/update.ex diff --git a/lib/mix/tasks/mobilizon/tz_world/update.ex b/lib/mix/tasks/mobilizon/tz_world/update.ex new file mode 100644 index 000000000..4d56ea75f --- /dev/null +++ b/lib/mix/tasks/mobilizon/tz_world/update.ex @@ -0,0 +1,34 @@ +# Portions of this file are derived from Pleroma: +# Pleroma: A lightweight social networking server +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Mix.Tasks.Mobilizon.TzWorld.Update do + use Mix.Task + alias Mix.Tasks.TzWorld.Update, as: TzWorldUpdate + import Mix.Tasks.Mobilizon.Common + require Logger + + @shortdoc "Wrapper on `tz_world.update` task." + + @moduledoc """ + Changes `Logger` level to `:info` before downloading. + Changes level back when downloads ends. + + ## Update TzWorld data + + mix mobilizon.tz_world.update + """ + + @impl true + def run(_args) do + start_mobilizon() + + level = Logger.level() + Logger.configure(level: :info) + + TzWorldUpdate.run(nil) + + Logger.configure(level: level) + end +end From 3961a2067b526a94db842e2c23baa883e277b0c0 Mon Sep 17 00:00:00 2001 From: Thomas Citharel <tcit@tcit.fr> Date: Mon, 8 Nov 2021 18:46:04 +0100 Subject: [PATCH 07/14] Fix search exposing events to unlogged users Closes #892 Signed-off-by: Thomas Citharel <tcit@tcit.fr> --- .../Event/FullAddressAutoComplete.vue | 25 +++++++++------ js/src/views/Search.vue | 32 +++++++++++++++++-- lib/graphql/api/search.ex | 11 +++++-- lib/graphql/resolvers/event.ex | 27 ++++++---------- lib/graphql/resolvers/event/utils.ex | 9 ++++++ lib/graphql/resolvers/search.ex | 10 ++++-- 6 files changed, 78 insertions(+), 36 deletions(-) diff --git a/js/src/components/Event/FullAddressAutoComplete.vue b/js/src/components/Event/FullAddressAutoComplete.vue index 0434e944f..e42fe2d30 100644 --- a/js/src/components/Event/FullAddressAutoComplete.vue +++ b/js/src/components/Event/FullAddressAutoComplete.vue @@ -9,19 +9,19 @@ > <template slot="label"> {{ actualLabel }} + <span + class="is-size-6 has-text-weight-normal" + v-if="gettingLocation" + >{{ $t("Getting location") }}</span + > + </template> + <p class="control" v-if="canShowLocateMeButton && !gettingLocation"> <b-button - v-if="canShowLocateMeButton && !gettingLocation" - size="is-small" icon-right="map-marker" @click="locateMe" :title="$t('Use my location')" /> - <span - class="is-size-6 has-text-weight-normal" - v-else-if="gettingLocation" - >{{ $t("Getting location") }}</span - > - </template> + </p> <b-autocomplete :data="addressData" v-model="queryText" @@ -29,7 +29,7 @@ field="fullName" :loading="isFetching" @typing="fetchAsyncData" - icon="map-marker" + :icon="canShowLocateMeButton ? null : 'map-marker'" expanded @select="updateSelected" v-bind="$attrs" @@ -71,7 +71,10 @@ :title="$t('Clear address field')" /> </b-field> - <div class="card" v-if="selected.originId || selected.url"> + <div + class="card" + v-if="!hideSelected && (selected.originId || selected.url)" + > <div class="card-content"> <address-info :address="selected" @@ -119,6 +122,8 @@ export default class FullAddressAutoComplete extends Mixins( @Prop({ required: false }) userTimezone!: string; @Prop({ required: false, default: false, type: Boolean }) disabled!: boolean; @Prop({ required: false, default: false, type: Boolean }) hideMap!: boolean; + @Prop({ required: false, default: false, type: Boolean }) + hideSelected!: boolean; addressModalActive = false; diff --git a/js/src/views/Search.vue b/js/src/views/Search.vue index 885368b21..17cefe1cc 100644 --- a/js/src/views/Search.vue +++ b/js/src/views/Search.vue @@ -34,6 +34,8 @@ ref="aac" :placeholder="$t('For instance: London')" @input="locchange" + :hideMap="true" + :hideSelected="true" /> <b-field :label="$t('Radius')" @@ -144,9 +146,16 @@ </b-pagination> </div> </div> - <b-message v-else-if="$apollo.loading === false" type="is-danger">{{ - $t("No events found") - }}</b-message> + <b-message v-else-if="$apollo.loading === false" type="is-danger"> + <p>{{ $t("No events found") }}</p> + <p v-if="searchIsUrl && !currentUser.id"> + {{ + $t( + "Only registered users may fetch remote events from their URL." + ) + }} + </p> + </b-message> </b-tab-item> <b-tab-item v-if="!tag"> <template slot="header"> @@ -211,6 +220,8 @@ import MultiGroupCard from "../components/Group/MultiGroupCard.vue"; import { CONFIG } from "../graphql/config"; import { REVERSE_GEOCODE } from "../graphql/address"; import debounce from "lodash/debounce"; +import { CURRENT_USER_CLIENT } from "@/graphql/user"; +import { ICurrentUser } from "@/types/current-user.model"; interface ISearchTimeOption { label: string; @@ -267,6 +278,7 @@ const GEOHASH_DEPTH = 9; // put enough accuracy, radius will be used anyway this.searchGroups = data.searchGroups; }, }, + currentUser: CURRENT_USER_CLIENT, }, metaInfo() { return { @@ -292,6 +304,8 @@ export default class Search extends Vue { location: IAddress = new Address(); + currentUser!: ICurrentUser; + dateOptions: Record<string, ISearchTimeOption> = { past: { label: this.$t("In the past") as string, @@ -570,6 +584,18 @@ export default class Search extends Vue { private stringExists(value: string | null | undefined): boolean { return this.valueExists(value) && (value as string).length > 0; } + + get searchIsUrl(): boolean { + let url; + if (!this.search) return false; + try { + url = new URL(this.search); + } catch (_) { + return false; + } + + return url.protocol === "http:" || url.protocol === "https:"; + } } </script> diff --git a/lib/graphql/api/search.ex b/lib/graphql/api/search.ex index 902e43a35..799f1234d 100644 --- a/lib/graphql/api/search.ex +++ b/lib/graphql/api/search.ex @@ -11,6 +11,7 @@ defmodule Mobilizon.GraphQL.API.Search do alias Mobilizon.Federation.ActivityPub alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor + import Mobilizon.GraphQL.Resolvers.Event.Utils require Logger @@ -67,10 +68,14 @@ defmodule Mobilizon.GraphQL.API.Search do term = String.trim(term) if is_url(term) do - # skip, if it's w not an actor + # skip, if it's not an event case process_from_url(term) do - %Page{total: _total, elements: [%Event{} = _event]} = page -> - {:ok, page} + %Page{total: _total, elements: [%Event{} = event]} = page -> + if Map.get(args, :current_user) != nil || check_event_access?(event) do + {:ok, page} + else + {:ok, %{total: 0, elements: []}} + end _ -> {:ok, %{total: 0, elements: []}} diff --git a/lib/graphql/resolvers/event.ex b/lib/graphql/resolvers/event.ex index 4f25dcd4b..110f27d89 100644 --- a/lib/graphql/resolvers/event.ex +++ b/lib/graphql/resolvers/event.ex @@ -117,28 +117,19 @@ defmodule Mobilizon.GraphQL.Resolvers.Event do @spec find_event(any(), map(), Absinthe.Resolution.t()) :: {:ok, Event.t()} | {:error, :event_not_found} def find_event(parent, %{uuid: uuid} = args, %{context: context} = resolution) do - with {:has_event, %Event{} = event} <- - {:has_event, Events.get_public_event_by_uuid_with_preload(uuid)}, - {:access_valid, true} <- - {:access_valid, Map.has_key?(context, :current_user) || check_event_access(event)} do - {:ok, event} - else - {:has_event, _} -> + case Events.get_public_event_by_uuid_with_preload(uuid) do + %Event{} = event -> + if Map.has_key?(context, :current_user) || check_event_access?(event) do + {:ok, event} + else + {:error, :event_not_found} + end + + _ -> find_private_event(parent, args, resolution) - - {:access_valid, _} -> - {:error, :event_not_found} end end - @spec check_event_access(Event.t()) :: boolean() - defp check_event_access(%Event{local: true}), do: true - - defp check_event_access(%Event{url: url}) do - relay_actor_id = Config.relay_actor_id() - Events.check_if_event_has_instance_follow(url, relay_actor_id) - end - @doc """ List participants for event (through an event request) """ diff --git a/lib/graphql/resolvers/event/utils.ex b/lib/graphql/resolvers/event/utils.ex index 841c6e9a4..a120f8e7d 100644 --- a/lib/graphql/resolvers/event/utils.ex +++ b/lib/graphql/resolvers/event/utils.ex @@ -4,6 +4,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Event.Utils do """ alias Mobilizon.Actors.Actor + alias Mobilizon.{Config, Events} alias Mobilizon.Events.Event alias Mobilizon.Federation.ActivityPub.Permission import Mobilizon.Service.Guards, only: [is_valid_string: 1] @@ -37,4 +38,12 @@ defmodule Mobilizon.GraphQL.Resolvers.Event.Utils do def can_event_be_deleted_by?(%Event{} = event, %Actor{id: actor_member_id}) do Event.can_be_managed_by?(event, actor_member_id) end + + @spec check_event_access?(Event.t()) :: boolean() + def check_event_access?(%Event{local: true}), do: true + + def check_event_access?(%Event{url: url}) do + relay_actor_id = Config.relay_actor_id() + Events.check_if_event_has_instance_follow(url, relay_actor_id) + end end diff --git a/lib/graphql/resolvers/search.ex b/lib/graphql/resolvers/search.ex index c9b32ec13..d4112f2c0 100644 --- a/lib/graphql/resolvers/search.ex +++ b/lib/graphql/resolvers/search.ex @@ -26,7 +26,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Search do %{page: page, limit: limit} = args, %{context: context} = _resolution ) do - current_actor = Map.get(context, :current_actor, nil) + current_actor = Map.get(context, :current_actor) current_actor_id = if current_actor, do: current_actor.id, else: nil args = Map.put(args, :current_actor_id, current_actor_id) Search.search_actors(args, page, limit, :Group) @@ -37,7 +37,13 @@ defmodule Mobilizon.GraphQL.Resolvers.Search do """ @spec search_events(any(), map(), Absinthe.Resolution.t()) :: {:ok, Page.t(Event.t())} | {:error, String.t()} - def search_events(_parent, %{page: page, limit: limit} = args, _resolution) do + def search_events( + _parent, + %{page: page, limit: limit} = args, + %{context: context} = _resolution + ) do + current_user = Map.get(context, :current_user) + args = Map.put(args, :current_user, current_user) Search.search_events(args, page, limit) end From 7e15b5fb7ab4d4782036fef17d1f6f4b7da7539c Mon Sep 17 00:00:00 2001 From: Thomas Citharel <tcit@tcit.fr> Date: Mon, 8 Nov 2021 20:27:13 +0100 Subject: [PATCH 08/14] Set tzworld default dir in config Signed-off-by: Thomas Citharel <tcit@tcit.fr> --- config/config.exs | 2 ++ config/dev.exs | 2 ++ config/docker.exs | 9 +++++---- config/test.exs | 2 ++ docker/production/Dockerfile | 3 ++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/config/config.exs b/config/config.exs index bec1c440a..9d0aabaf8 100644 --- a/config/config.exs +++ b/config/config.exs @@ -88,6 +88,8 @@ config :mobilizon, Mobilizon.Web.Upload, config :mobilizon, Mobilizon.Web.Upload.Uploader.Local, uploads: "/var/lib/mobilizon/uploads" +config :tz_world, data_dir: "/var/lib/mobilizon/timezones" + config :mobilizon, :media_proxy, enabled: true, proxy_opts: [ diff --git a/config/dev.exs b/config/dev.exs index cd4d9ea1c..0484b983e 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -94,6 +94,8 @@ config :mobilizon, Mobilizon.Web.Auth.Guardian, config :mobilizon, Mobilizon.Web.Upload.Uploader.Local, uploads: "uploads" +config :tz_world, data_dir: "_build/dev/lib/tz_world/priv" + config :mobilizon, :anonymous, reports: [ allowed: true diff --git a/config/docker.exs b/config/docker.exs index c20141428..e370644e8 100644 --- a/config/docker.exs +++ b/config/docker.exs @@ -33,9 +33,6 @@ config :mobilizon, :instance, email_from: System.get_env("MOBILIZON_INSTANCE_EMAIL", "noreply@mobilizon.lan"), email_reply_to: System.get_env("MOBILIZON_REPLY_EMAIL", "noreply@mobilizon.lan") -config :mobilizon, Mobilizon.Web.Upload.Uploader.Local, - uploads: System.get_env("MOBILIZON_UPLOADS", "/app/uploads") - config :mobilizon, Mobilizon.Storage.Repo, adapter: Ecto.Adapters.Postgres, username: System.get_env("MOBILIZON_DATABASE_USERNAME", "username"), @@ -68,4 +65,8 @@ config :geolix, } ] -config :mobilizon, Mobilizon.Web.Upload.Uploader.Local, uploads: "/var/lib/mobilizon/uploads" +config :mobilizon, Mobilizon.Web.Upload.Uploader.Local, + uploads: System.get_env("MOBILIZON_UPLOADS", "/var/lib/mobilizon/uploads") + +config :tz_world, + data_dir: System.get_env("MOBILIZON_TIMEZONES_DIR", "/var/lib/mobilizon/timezones") diff --git a/config/test.exs b/config/test.exs index 86dce9eb7..507e4cd0c 100644 --- a/config/test.exs +++ b/config/test.exs @@ -60,6 +60,8 @@ config :mobilizon, Mobilizon.Web.Upload, filters: [], link_name: false config :mobilizon, Mobilizon.Web.Upload.Uploader.Local, uploads: "test/uploads" +config :tz_world, data_dir: "_build/test/lib/tz_world/priv" + config :exvcr, vcr_cassette_library_dir: "test/fixtures/vcr_cassettes" diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile index 05a898c78..e031be942 100644 --- a/docker/production/Dockerfile +++ b/docker/production/Dockerfile @@ -51,7 +51,8 @@ LABEL org.opencontainers.image.title="mobilizon" \ RUN apk add --no-cache openssl ca-certificates ncurses-libs file postgresql-client libgcc libstdc++ imagemagick python3 py3-pip py3-pillow py3-cffi py3-brotli gcc musl-dev python3-dev pango libxslt-dev RUN pip install weasyprint pyexcel-ods3 -RUN mkdir -p /app/uploads && chown nobody:nobody /app/uploads +RUN mkdir -p /var/lib/mobilizon/uploads && chown nobody:nobody /var/lib/mobilizon/uploads +RUN mkdir -p /var/lib/mobilizon/timezones && chown nobody:nobody /var/lib/mobilizon/timezones RUN mkdir -p /etc/mobilizon && chown nobody:nobody /etc/mobilizon USER nobody From 6a03e49b63e579717a2b626a4d66a4beb2f506f7 Mon Sep 17 00:00:00 2001 From: Thomas Citharel <tcit@tcit.fr> Date: Mon, 8 Nov 2021 20:27:27 +0100 Subject: [PATCH 09/14] Remove obsolete configuration Signed-off-by: Thomas Citharel <tcit@tcit.fr> --- config/prod.exs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/config/prod.exs b/config/prod.exs index 382d36559..9400d1ef2 100644 --- a/config/prod.exs +++ b/config/prod.exs @@ -37,12 +37,3 @@ config :mobilizon, :cldr, "ru", "sv" ] - -cond do - System.get_env("INSTANCE_CONFIG") && - File.exists?("./config/#{System.get_env("INSTANCE_CONFIG")}") -> - import_config System.get_env("INSTANCE_CONFIG") - - true -> - :ok -end From 90665f029466ace80d0397ffe5381097ba78d8e7 Mon Sep 17 00:00:00 2001 From: Thomas Citharel <tcit@tcit.fr> Date: Tue, 9 Nov 2021 08:52:43 +0100 Subject: [PATCH 10/14] Fix some new eslint rules Signed-off-by: Thomas Citharel <tcit@tcit.fr> --- js/src/components/Account/PopoverActorCard.vue | 2 +- js/src/components/NavBar.vue | 6 +----- js/src/views/Event/Event.vue | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/js/src/components/Account/PopoverActorCard.vue b/js/src/components/Account/PopoverActorCard.vue index 7374376c5..4f75672b8 100644 --- a/js/src/components/Account/PopoverActorCard.vue +++ b/js/src/components/Account/PopoverActorCard.vue @@ -6,7 +6,7 @@ :class="{ inline, clickable: actor && actor.type === ActorType.GROUP }" > <slot></slot> - <template slot="popover" class="popover"> + <template slot="popover"> <actor-card :full="true" :actor="actor" :popover="true" /> </template> </v-popover> diff --git a/js/src/components/NavBar.vue b/js/src/components/NavBar.vue index 150ec5a59..8034e3f1c 100644 --- a/js/src/components/NavBar.vue +++ b/js/src/components/NavBar.vue @@ -82,11 +82,7 @@ tag="span" @keyup.enter="toggleMenu" > - <template - slot="label" - v-if="currentActor" - class="navbar-dropdown-profile" - > + <template slot="label" v-if="currentActor"> <div class="identity-wrapper"> <div> <figure class="image is-32x32" v-if="currentActor.avatar"> diff --git a/js/src/views/Event/Event.vue b/js/src/views/Event/Event.vue index 8154cbdd8..0a977c1f3 100755 --- a/js/src/views/Event/Event.vue +++ b/js/src/views/Event/Event.vue @@ -83,7 +83,7 @@ @cancel-anonymous-participation="cancelAnonymousParticipation" /> <div class="has-text-right"> - <template class="visibility" v-if="!event.draft"> + <template v-if="!event.draft"> <p v-if="event.visibility === EventVisibility.PUBLIC"> {{ $t("Public event") }} <b-icon icon="earth" /> From a54607a57da2f985c81c6761b26d8d36a7e39bf8 Mon Sep 17 00:00:00 2001 From: Thomas Citharel <tcit@tcit.fr> Date: Tue, 9 Nov 2021 08:53:04 +0100 Subject: [PATCH 11/14] Upgrade deps Signed-off-by: Thomas Citharel <tcit@tcit.fr> --- js/.eslintrc.js | 3 +- js/package.json | 32 +- js/yarn.lock | 902 ++++++++++++++++++++++++------------------------ mix.lock | 2 +- 4 files changed, 464 insertions(+), 475 deletions(-) diff --git a/js/.eslintrc.js b/js/.eslintrc.js index 7ee28a445..5d4700196 100644 --- a/js/.eslintrc.js +++ b/js/.eslintrc.js @@ -9,8 +9,7 @@ module.exports = { "plugin:vue/essential", "eslint:recommended", "@vue/typescript/recommended", - "@vue/prettier", - "@vue/prettier/@typescript-eslint", + "plugin:prettier/recommended", ], plugins: ["prettier"], diff --git a/js/package.json b/js/package.json index ef9662ea3..3e212cf1c 100644 --- a/js/package.json +++ b/js/package.json @@ -39,7 +39,7 @@ "core-js": "^3.6.4", "date-fns": "^2.16.0", "date-fns-tz": "^1.1.6", - "graphql": "^15.0.0", + "graphql": "^16.0.0", "graphql-tag": "^2.10.3", "intersection-observer": "^0.12.0", "jwt-decode": "^3.1.2", @@ -74,27 +74,27 @@ "@types/prosemirror-model": "^1.7.2", "@types/prosemirror-state": "^1.2.4", "@types/prosemirror-view": "^1.11.4", - "@typescript-eslint/eslint-plugin": "^4.18.0", - "@typescript-eslint/parser": "^4.18.0", - "@vue/cli-plugin-babel": "~5.0.0-beta.7", - "@vue/cli-plugin-e2e-cypress": "~5.0.0-beta.7", - "@vue/cli-plugin-eslint": "~5.0.0-beta.7", - "@vue/cli-plugin-pwa": "~5.0.0-beta.7", - "@vue/cli-plugin-router": "~5.0.0-beta.7", - "@vue/cli-plugin-typescript": "~5.0.0-beta.7", - "@vue/cli-plugin-unit-jest": "~5.0.0-beta.7", - "@vue/cli-service": "~5.0.0-beta.7", - "@vue/eslint-config-prettier": "^6.0.0", - "@vue/eslint-config-typescript": "^7.0.0", + "@typescript-eslint/eslint-plugin": "^5.3.0", + "@typescript-eslint/parser": "^5.3.0", + "@vue/cli-plugin-babel": "~5.0.0-rc.0", + "@vue/cli-plugin-e2e-cypress": "~5.0.0-rc.0", + "@vue/cli-plugin-eslint": "~5.0.0-rc.0", + "@vue/cli-plugin-pwa": "~5.0.0-rc.0", + "@vue/cli-plugin-router": "~5.0.0-rc.0", + "@vue/cli-plugin-typescript": "~5.0.0-rc.0", + "@vue/cli-plugin-unit-jest": "~5.0.0-rc.0", + "@vue/cli-service": "~5.0.0-rc.0", + "@vue/eslint-config-typescript": "^9.0.0", "@vue/test-utils": "^1.1.0", - "@vue/vue2-jest": "^27.0.0-alpha.2", + "@vue/vue2-jest": "^27.0.0-alpha.3", "@vue/vue3-jest": "^27.0.0-alpha.1", "cypress": "^8.3.0", - "eslint": "^7.20.0", + "eslint": "^8.2.0", + "eslint-config-prettier": "^8.3.0", "eslint-plugin-cypress": "^2.10.3", "eslint-plugin-import": "^2.20.2", "eslint-plugin-prettier": "^4.0.0", - "eslint-plugin-vue": "^7.6.0", + "eslint-plugin-vue": "^8.0.3", "flush-promises": "^1.0.2", "jest": "^27.1.0", "jest-junit": "^13.0.0", diff --git a/js/yarn.lock b/js/yarn.lock index 70e11c5cb..1e6849cdd 100644 --- a/js/yarn.lock +++ b/js/yarn.lock @@ -37,9 +37,9 @@ leven "^3.1.0" "@apollo/client@^3.0.0", "@apollo/client@^3.3.16": - version "3.4.16" - resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.4.16.tgz#67090d5655aa843fa64d26f1913315e384a5fa0f" - integrity sha512-iF4zEYwvebkri0BZQyv8zfavPfVEafsK0wkOofa6eC2yZu50J18uTutKtC174rjHZ2eyxZ8tV7NvAPKRT+OtZw== + version "3.4.17" + resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.4.17.tgz#4972e19a49809e16d17c5adc67f45623a6dac135" + integrity sha512-MDt2rwMX1GqodiVEKJqmDmAz8xr0qJmq5PdWeIt0yDaT4GOkKYWZiWkyfhfv3raTk8PyJvbsNG9q2CqmUrlGfg== dependencies: "@graphql-typed-document-node/core" "^3.0.0" "@wry/context" "^0.6.0" @@ -1004,9 +1004,9 @@ integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== "@cypress/request@^2.88.6": - version "2.88.6" - resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.6.tgz#a970dd675befc6bdf8a8921576c01f51cc5798e9" - integrity sha512-z0UxBE/+qaESAHY9p9sM2h8Y4XqtsbDCt0/DPOrqA/RZgKi4PkxdpXyK4wCCnSk1xHqWHZZAE+gV6aDAR6+caQ== + version "2.88.7" + resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.7.tgz#386d960ab845a96953723348088525d5a75aaac4" + integrity sha512-FTULIP2rnDJvZDT9t6B4nSfYR40ue19tVmv3wUcY05R9/FPCoMl1nAPJkzWzBCo7ltVn5ThQTbxiMoGBN7k0ig== dependencies: aws-sign2 "~0.7.0" aws4 "^1.8.0" @@ -1056,6 +1056,21 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@eslint/eslintrc@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.4.tgz#dfe0ff7ba270848d10c5add0715e04964c034b31" + integrity sha512-h8Vx6MdxwWI2WM8/zREHMoqdgLNXEL4QX3MWSVMdyNJGvXVOs+6lp+m2hc3FnuMHDc4poxFNI20vCk0OmI4G0Q== + dependencies: + ajv "^6.12.4" + debug "^4.3.2" + espree "^9.0.0" + globals "^13.9.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^4.1.0" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + "@graphql-typed-document-node/core@^3.0.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.1.0.tgz#0eee6373e11418bfe0b5638f654df7a4ca6a3950" @@ -1082,6 +1097,15 @@ debug "^4.1.1" minimatch "^3.0.4" +"@humanwhocodes/config-array@^0.6.0": + version "0.6.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.6.0.tgz#b5621fdb3b32309d2d16575456cbc277fa8f021a" + integrity sha512-JQlEKbcgEUjBFhLIF4iqM7u/9lwgHRBcpHrmUNCALK0Q3amXN6lxdoXLnF0sm11E9VqTmBALR87IlUg1bZ8A9A== + dependencies: + "@humanwhocodes/object-schema" "^1.2.0" + debug "^4.1.1" + minimatch "^3.0.4" + "@humanwhocodes/object-schema@^1.2.0": version "1.2.1" resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" @@ -1399,9 +1423,9 @@ type-detect "4.0.8" "@sinonjs/fake-timers@^8.0.1": - version "8.0.1" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.0.1.tgz#1c1c9a91419f804e59ae8df316a07dd1c3a76b94" - integrity sha512-AU7kwFxreVd6OAXcAFlKSmZquiRUU0FvYm44k1Y1QbK7Co4m0aqfGMhjykIeQp/H6rcl+nFmj0zfdUcGVs9Dew== + version "8.1.0" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz#3fdc2b6cb58935b21bfb8d1625eb1300484316e7" + integrity sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg== dependencies: "@sinonjs/commons" "^1.7.0" @@ -1428,25 +1452,25 @@ ejs "^2.6.1" magic-string "^0.25.0" -"@tiptap/core@^2.0.0-beta.130", "@tiptap/core@^2.0.0-beta.41": - version "2.0.0-beta.130" - resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.0.0-beta.130.tgz#d0b0f14bd6aaf2ad79515fe2307beced7d9c704e" - integrity sha512-mHj1ZF4Fw0JGmICf2OgUfb1dNDqCLUZY3RjPgGpQNcvCEBqb4nnF30gipFMBhxzEcr4GvqrVzU6fQJelh31WOA== +"@tiptap/core@^2.0.0-beta.133", "@tiptap/core@^2.0.0-beta.41": + version "2.0.0-beta.133" + resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.0.0-beta.133.tgz#8fd471dada981e775338eb85261c6281b023b8b1" + integrity sha512-Fi2uBgT0nvGm+FYLDUXGWlqUq03ufPpuaqi2KlCis+mr+hP8GX1gYOdJIKTaf5kPVQ++hMyGP9Nh+pjml074tQ== dependencies: "@types/prosemirror-commands" "^1.0.4" "@types/prosemirror-keymap" "^1.0.4" "@types/prosemirror-model" "^1.13.2" "@types/prosemirror-schema-list" "^1.0.3" - "@types/prosemirror-state" "^1.2.7" + "@types/prosemirror-state" "^1.2.8" "@types/prosemirror-transform" "^1.1.4" "@types/prosemirror-view" "^1.19.1" - prosemirror-commands "^1.1.11" - prosemirror-keymap "^1.1.3" + prosemirror-commands "^1.1.12" + prosemirror-keymap "^1.1.5" prosemirror-model "^1.15.0" prosemirror-schema-list "^1.1.6" prosemirror-state "^1.3.4" prosemirror-transform "^1.3.3" - prosemirror-view "^1.20.3" + prosemirror-view "^1.22.0" "@tiptap/extension-blockquote@^2.0.0-beta.21", "@tiptap/extension-blockquote@^2.0.0-beta.6": version "2.0.0-beta.21" @@ -1458,14 +1482,14 @@ resolved "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-2.0.0-beta.21.tgz#50eea83e3bc7f85f6eeb90145927189041ade9d7" integrity sha512-GRsImvcUJ4vspvoZvugO7Y9akigjeHFpHti1sGJGULPsv4oX5vMMxys4yaI3/qA+Tm8qyK+14ju6Jb7YKwvdBA== -"@tiptap/extension-bubble-menu@^2.0.0-beta.44", "@tiptap/extension-bubble-menu@^2.0.0-beta.9": - version "2.0.0-beta.44" - resolved "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.0.0-beta.44.tgz#2a2b42b59c6906cba1ce54bdbbb153324e45ee16" - integrity sha512-kpU38X2FwW6n2LCQ9RY5wyFpJayuA7uGjvIS8IDKPuWjHSNMaS32T5ybjBBkxCace8z8w6lXa8U7IwZkk7tAcA== +"@tiptap/extension-bubble-menu@^2.0.0-beta.46", "@tiptap/extension-bubble-menu@^2.0.0-beta.9": + version "2.0.0-beta.46" + resolved "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.0.0-beta.46.tgz#a76b10740552d1ee4f7ea2bdec23f20566ce8781" + integrity sha512-61JufrJn0513x9VFRpgSIcMKM1JaDjSGVDHbjeWT+cRZPXQBPRXKQ2vG/rUn+EVAE+u1Ifi2PVAOMJpyfHGzJQ== dependencies: prosemirror-state "^1.3.4" - prosemirror-view "^1.20.3" - tippy.js "^6.3.2" + prosemirror-view "^1.22.0" + tippy.js "^6.3.4" "@tiptap/extension-bullet-list@^2.0.0-beta.20": version "2.0.0-beta.20" @@ -1502,14 +1526,14 @@ "@types/prosemirror-dropcursor" "^1.0.3" prosemirror-dropcursor "^1.3.5" -"@tiptap/extension-floating-menu@^2.0.0-beta.38": - version "2.0.0-beta.38" - resolved "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.0.0-beta.38.tgz#cbfe13fc5c397da1345889761ab4ba34680bad0a" - integrity sha512-FbAF9brNMKxLPdvQf7e4O73OAYXwgtyc8dPhxVCj53n4h1oYLykB9tsvGit2/KWcMHeUSKjnUuTVARflA6wr+Q== +"@tiptap/extension-floating-menu@^2.0.0-beta.40": + version "2.0.0-beta.40" + resolved "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.0.0-beta.40.tgz#93db26da6fd2f7920926983bee6f75d36b6f931c" + integrity sha512-zq+VkbnaIsEiPwR+/9J8AJSATG3Fcm4HlZvZhb5a0SrFA6Qe8W1kQ2UGDQpO8jpEGqaqCSAm+3nYMHyi1vI41A== dependencies: prosemirror-state "^1.3.4" - prosemirror-view "^1.20.3" - tippy.js "^6.3.2" + prosemirror-view "^1.22.0" + tippy.js "^6.3.4" "@tiptap/extension-gapcursor@^2.0.0-beta.30": version "2.0.0-beta.30" @@ -1519,10 +1543,10 @@ "@types/prosemirror-gapcursor" "^1.0.4" prosemirror-gapcursor "^1.2.0" -"@tiptap/extension-hard-break@^2.0.0-beta.26": - version "2.0.0-beta.26" - resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.0.0-beta.26.tgz#04f814d41941e5b9148fbf6be30b28b60751a3c0" - integrity sha512-6TmFJ6GAOuZ1J4kCyaZUl6XaBSgGbd9kGYGKzhBH+ps4OHtQDl23A+RVxTr8wUVD2mMo2/VsJi9MyLRzI2KBnA== +"@tiptap/extension-hard-break@^2.0.0-beta.27": + version "2.0.0-beta.27" + resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.0.0-beta.27.tgz#23ea8b9544863722c01d3a748301443c10bfe364" + integrity sha512-Jki9LWsOyWwXypU0vr3aRDZwu0SrZ1CjMgMrEg9R6yUEB5lhb2g4orgaCGecmVDnl4Zx0Yq/3et/FbMGTVupCA== "@tiptap/extension-heading@^2.0.0-beta.20": version "2.0.0-beta.20" @@ -1537,10 +1561,10 @@ "@types/prosemirror-history" "^1.0.3" prosemirror-history "^1.2.0" -"@tiptap/extension-horizontal-rule@^2.0.0-beta.26": - version "2.0.0-beta.26" - resolved "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.0.0-beta.26.tgz#95741cb62278319edbc3146c85d8dbc3b8be4e9a" - integrity sha512-9kmmZiV79cn7Q9SObFNkVEjXykUY+kBANOB4MFNpkd1/X43deOv+fBJFWywRHbnGa324egtOePHQfdqnP8s8tA== +"@tiptap/extension-horizontal-rule@^2.0.0-beta.27": + version "2.0.0-beta.27" + resolved "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.0.0-beta.27.tgz#f10d6d375bc0db0a036235c27b17598613b2553b" + integrity sha512-qia/dB+JXk55t4/RVxK84ZNMXlwWxdJeC6o3ecM7K35beY9xkF7aeVy16mZZSsSmR41kD5p6hsdMSdyvB2ds5A== dependencies: prosemirror-state "^1.3.4" @@ -1568,11 +1592,11 @@ integrity sha512-I/Tmj9zW5BHeftGByYj/TVJBqZi6cRLsiwufaV4CTMlfYUHE8DDjiQlukGSksa+Nba+wPErWriXAOaBBkjFhjw== "@tiptap/extension-mention@^2.0.0-beta.42": - version "2.0.0-beta.81" - resolved "https://registry.yarnpkg.com/@tiptap/extension-mention/-/extension-mention-2.0.0-beta.81.tgz#19304b53e6f474b58283e1d6da0e20e80fc8a295" - integrity sha512-EOgNHffWUxFNZBBiz7Fvj/BcbpxlSTDMm5M1msU2MgQ+cA62fevIvvKLpIBqKK1f0p+nzLxQWd8gL5axJ3bHbQ== + version "2.0.0-beta.83" + resolved "https://registry.yarnpkg.com/@tiptap/extension-mention/-/extension-mention-2.0.0-beta.83.tgz#3c939466ed09b923c8cabb0d35e060dc432b09d5" + integrity sha512-NxkkjtSF8irtLynIaB2Cwid+TBp6Hy1bnV4+5uskFAipC1FQYngYmZSKYhM+pR8SpYM2OGt7SPsvYTEyTH1iEQ== dependencies: - "@tiptap/suggestion" "^2.0.0-beta.77" + "@tiptap/suggestion" "^2.0.0-beta.79" prosemirror-model "^1.15.0" prosemirror-state "^1.3.4" @@ -1602,11 +1626,11 @@ integrity sha512-zYx9aAAbwKdrF/QJvRhaZFpBebcmXNYAjZmYyyErTR1NXmPi2SMAE8OaDC3S7xRnt8HeHwDAUbqiUfXJWG1XRA== "@tiptap/starter-kit@^2.0.0-beta.37": - version "2.0.0-beta.132" - resolved "https://registry.yarnpkg.com/@tiptap/starter-kit/-/starter-kit-2.0.0-beta.132.tgz#7f6b3e5b7e99bab769dd5ce6d5f02a97af471d57" - integrity sha512-LQxYMpFdRW5/PLcbRzw0PhwVLk7hm7n/NMYZd9W76W3rLmAaTQ/9CfxkgFjV0yfLxtgVDkg6OCtpZbpbbQZOfA== + version "2.0.0-beta.135" + resolved "https://registry.yarnpkg.com/@tiptap/starter-kit/-/starter-kit-2.0.0-beta.135.tgz#cad8cc07de8d8d067bd29e3e5b8eab3a5c01c988" + integrity sha512-rolfgLHlv2SVRpWWaiJTWtVeSclAg2d4bnbN8GHrgnxKCpEqFsJQtaQQnEJLq58nAOJcVOx4fR7rqz5bxXjHuw== dependencies: - "@tiptap/core" "^2.0.0-beta.130" + "@tiptap/core" "^2.0.0-beta.133" "@tiptap/extension-blockquote" "^2.0.0-beta.21" "@tiptap/extension-bold" "^2.0.0-beta.21" "@tiptap/extension-bullet-list" "^2.0.0-beta.20" @@ -1615,10 +1639,10 @@ "@tiptap/extension-document" "^2.0.0-beta.13" "@tiptap/extension-dropcursor" "^2.0.0-beta.21" "@tiptap/extension-gapcursor" "^2.0.0-beta.30" - "@tiptap/extension-hard-break" "^2.0.0-beta.26" + "@tiptap/extension-hard-break" "^2.0.0-beta.27" "@tiptap/extension-heading" "^2.0.0-beta.20" "@tiptap/extension-history" "^2.0.0-beta.18" - "@tiptap/extension-horizontal-rule" "^2.0.0-beta.26" + "@tiptap/extension-horizontal-rule" "^2.0.0-beta.27" "@tiptap/extension-italic" "^2.0.0-beta.21" "@tiptap/extension-list-item" "^2.0.0-beta.16" "@tiptap/extension-ordered-list" "^2.0.0-beta.21" @@ -1626,23 +1650,23 @@ "@tiptap/extension-strike" "^2.0.0-beta.23" "@tiptap/extension-text" "^2.0.0-beta.13" -"@tiptap/suggestion@^2.0.0-beta.77": - version "2.0.0-beta.77" - resolved "https://registry.yarnpkg.com/@tiptap/suggestion/-/suggestion-2.0.0-beta.77.tgz#bbe0c16e67ac15e3ca937d74e30e82584c40ba0b" - integrity sha512-yN/tupeV+UEzrYLatB04Jq9UiBXLWwfjxl081SteFViECa3b627m/n3dLp/UThiZXSTLML3N/4noH3L/rAbFrA== +"@tiptap/suggestion@^2.0.0-beta.79": + version "2.0.0-beta.79" + resolved "https://registry.yarnpkg.com/@tiptap/suggestion/-/suggestion-2.0.0-beta.79.tgz#cbd2818d0617ec5f8e79a6e80618ea0fbfcdb3ce" + integrity sha512-c1wYRwPN0vkNhy2SmSfJ+Zar+X36zQf+DJMRUrd3ab+zWLLDdcrIVX3z/SBv1JUpoLsBKjxCYezd7dLUbdDqng== dependencies: prosemirror-model "^1.15.0" prosemirror-state "^1.3.4" - prosemirror-view "^1.20.3" + prosemirror-view "^1.22.0" "@tiptap/vue-2@^2.0.0-beta.21": - version "2.0.0-beta.62" - resolved "https://registry.yarnpkg.com/@tiptap/vue-2/-/vue-2-2.0.0-beta.62.tgz#1ff0569113ee00ea99dc63400bbb054ebb9800e6" - integrity sha512-P+TcoDXWy/+cAe1IxrHzqaVihrN8S7rkBQgeqKQsmseo5NGipl0kT6vgN0Of6o6Vmo9yfKhgT2L5LdjA9hdXDQ== + version "2.0.0-beta.64" + resolved "https://registry.yarnpkg.com/@tiptap/vue-2/-/vue-2-2.0.0-beta.64.tgz#18324420719f2f12386139c99bdc813481ae61ca" + integrity sha512-KwVIXGTuoPyKY75vL7yjonGU0acl/ZEDbqukbQ1uNqrU7THKvHr2PVBFjyNwc6AS1SoAecvkvkB0i4pQl41kEQ== dependencies: - "@tiptap/extension-bubble-menu" "^2.0.0-beta.44" - "@tiptap/extension-floating-menu" "^2.0.0-beta.38" - prosemirror-view "^1.20.3" + "@tiptap/extension-bubble-menu" "^2.0.0-beta.46" + "@tiptap/extension-floating-menu" "^2.0.0-beta.40" + prosemirror-view "^1.22.0" "@tootallnate/once@1": version "1.1.2" @@ -1730,7 +1754,7 @@ resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d" integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag== -"@types/eslint@*", "@types/eslint@^7.2.4": +"@types/eslint@*", "@types/eslint@^7.28.2": version "7.28.2" resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.2.tgz#0ff2947cdd305897c52d5372294e8c76f351db68" integrity sha512-KubbADPkfoU75KgKeKLsFHXnU4ipH7wYg0TRT33NK3N3yiu7jlFAAoygIWBV+KbuHx/G+AvuGX6DllnK35gfJA== @@ -1818,7 +1842,7 @@ jest-diff "^27.0.0" pretty-format "^27.0.0" -"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8": +"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.9" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== @@ -1863,14 +1887,14 @@ integrity sha512-rr20mmx41OkWx4q5du2dv2sESR/6xH2tzScUQXwO8SiaQWa6PYTuan1nqBtA76FR9qkVfZY7nwQwZNC9StX/Ww== "@types/node@*": - version "16.11.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" - integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== + version "16.11.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.7.tgz#36820945061326978c42a01e56b61cd223dfdc42" + integrity sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw== "@types/node@^14.14.31": - version "14.17.32" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.32.tgz#2ca61c9ef8c77f6fa1733be9e623ceb0d372ad96" - integrity sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ== + version "14.17.33" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.33.tgz#011ee28e38dc7aee1be032ceadf6332a0ab15b12" + integrity sha512-noEeJ06zbn3lOh4gqe2v7NMGS33jrulfNqYFDjjEbhpDEHR5VTxgYNQSBqBlJIsBJW3uEYDgD6kvMnrrhGzq8g== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -1963,7 +1987,7 @@ "@types/prosemirror-model" "*" "@types/prosemirror-state" "*" -"@types/prosemirror-state@*", "@types/prosemirror-state@^1.2.4", "@types/prosemirror-state@^1.2.7": +"@types/prosemirror-state@*", "@types/prosemirror-state@^1.2.4", "@types/prosemirror-state@^1.2.8": version "1.2.8" resolved "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.8.tgz#65080eeec52f63c50bf7034377f07773b4f6b2ac" integrity sha512-mq9uyQWcpu8jeamO6Callrdvf/e1H/aRLR2kZWSpZrPHctEsxWHBbluD/wqVjXBRIOoMHLf6ZvOkrkmGLoCHVA== @@ -2108,17 +2132,17 @@ resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.3.tgz#781d360c282436494b32fe7d9f7f8e64b3118aa3" integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw== -"@typescript-eslint/eslint-plugin@^4.18.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276" - integrity sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg== +"@typescript-eslint/eslint-plugin@^5.3.0": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.3.1.tgz#d8ff412f10f54f6364e7fd7c1e70eb6767f434c3" + integrity sha512-cFImaoIr5Ojj358xI/SDhjog57OK2NqlpxwdcgyxDA3bJlZcJq5CPzUXtpD7CxI2Hm6ATU7w5fQnnkVnmwpHqw== dependencies: - "@typescript-eslint/experimental-utils" "4.33.0" - "@typescript-eslint/scope-manager" "4.33.0" - debug "^4.3.1" + "@typescript-eslint/experimental-utils" "5.3.1" + "@typescript-eslint/scope-manager" "5.3.1" + debug "^4.3.2" functional-red-black-tree "^1.0.1" ignore "^5.1.8" - regexpp "^3.1.0" + regexpp "^3.2.0" semver "^7.3.5" tsutils "^3.21.0" @@ -2133,15 +2157,15 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/experimental-utils@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz#6f2a786a4209fa2222989e9380b5331b2810f7fd" - integrity sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q== +"@typescript-eslint/experimental-utils@5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.3.1.tgz#bbd8f9b67b4d5fdcb9d2f90297d8fcda22561e05" + integrity sha512-RgFn5asjZ5daUhbK5Sp0peq0SSMytqcrkNfU4pnDma2D8P3ElZ6JbYjY8IMSFfZAJ0f3x3tnO3vXHweYg0g59w== dependencies: - "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.33.0" - "@typescript-eslint/types" "4.33.0" - "@typescript-eslint/typescript-estree" "4.33.0" + "@types/json-schema" "^7.0.9" + "@typescript-eslint/scope-manager" "5.3.1" + "@typescript-eslint/types" "5.3.1" + "@typescript-eslint/typescript-estree" "5.3.1" eslint-scope "^5.1.1" eslint-utils "^3.0.0" @@ -2156,33 +2180,33 @@ "@typescript-eslint/typescript-estree" "3.10.1" eslint-visitor-keys "^1.1.0" -"@typescript-eslint/parser@^4.18.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz#dfe797570d9694e560528d18eecad86c8c744899" - integrity sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA== +"@typescript-eslint/parser@^5.3.0": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.3.1.tgz#8ff1977c3d3200c217b3e4628d43ef92f89e5261" + integrity sha512-TD+ONlx5c+Qhk21x9gsJAMRohWAUMavSOmJgv3JGy9dgPhuBd5Wok0lmMClZDyJNLLZK1JRKiATzCKZNUmoyfw== dependencies: - "@typescript-eslint/scope-manager" "4.33.0" - "@typescript-eslint/types" "4.33.0" - "@typescript-eslint/typescript-estree" "4.33.0" - debug "^4.3.1" + "@typescript-eslint/scope-manager" "5.3.1" + "@typescript-eslint/types" "5.3.1" + "@typescript-eslint/typescript-estree" "5.3.1" + debug "^4.3.2" -"@typescript-eslint/scope-manager@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz#d38e49280d983e8772e29121cf8c6e9221f280a3" - integrity sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ== +"@typescript-eslint/scope-manager@5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.3.1.tgz#3cfbfbcf5488fb2a9a6fbbe97963ee1e8d419269" + integrity sha512-XksFVBgAq0Y9H40BDbuPOTUIp7dn4u8oOuhcgGq7EoDP50eqcafkMVGrypyVGvDYHzjhdUCUwuwVUK4JhkMAMg== dependencies: - "@typescript-eslint/types" "4.33.0" - "@typescript-eslint/visitor-keys" "4.33.0" + "@typescript-eslint/types" "5.3.1" + "@typescript-eslint/visitor-keys" "5.3.1" "@typescript-eslint/types@3.10.1": version "3.10.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727" integrity sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ== -"@typescript-eslint/types@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72" - integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ== +"@typescript-eslint/types@5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.3.1.tgz#afaa715b69ebfcfde3af8b0403bf27527912f9b7" + integrity sha512-bG7HeBLolxKHtdHG54Uac750eXuQQPpdJfCYuw4ZI3bZ7+GgKClMWM8jExBtp7NSP4m8PmLRM8+lhzkYnSmSxQ== "@typescript-eslint/typescript-estree@3.10.1": version "3.10.1" @@ -2198,16 +2222,16 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/typescript-estree@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609" - integrity sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA== +"@typescript-eslint/typescript-estree@5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.1.tgz#50cc4bfb93dc31bc75e08ae52e29fcb786d606ec" + integrity sha512-PwFbh/PKDVo/Wct6N3w+E4rLZxUDgsoII/GrWM2A62ETOzJd4M6s0Mu7w4CWsZraTbaC5UQI+dLeyOIFF1PquQ== dependencies: - "@typescript-eslint/types" "4.33.0" - "@typescript-eslint/visitor-keys" "4.33.0" - debug "^4.3.1" - globby "^11.0.3" - is-glob "^4.0.1" + "@typescript-eslint/types" "5.3.1" + "@typescript-eslint/visitor-keys" "5.3.1" + debug "^4.3.2" + globby "^11.0.4" + is-glob "^4.0.3" semver "^7.3.5" tsutils "^3.21.0" @@ -2218,13 +2242,13 @@ dependencies: eslint-visitor-keys "^1.1.0" -"@typescript-eslint/visitor-keys@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd" - integrity sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg== +"@typescript-eslint/visitor-keys@5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.3.1.tgz#c2860ff22939352db4f3806f34b21d8ad00588ba" + integrity sha512-3cHUzUuVTuNHx0Gjjt5pEHa87+lzyqOiHXy/Gz+SJOCW1mpw9xQHIIEwnKn+Thph1mgWyZ90nboOcSuZr/jTTQ== dependencies: - "@typescript-eslint/types" "4.33.0" - eslint-visitor-keys "^2.0.0" + "@typescript-eslint/types" "5.3.1" + eslint-visitor-keys "^3.0.0" "@vue-a11y/announcer@^2.1.0": version "2.1.0" @@ -2280,10 +2304,10 @@ lodash.kebabcase "^4.1.1" svg-tags "^1.0.0" -"@vue/babel-preset-app@^5.0.0-beta.7": - version "5.0.0-beta.7" - resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-5.0.0-beta.7.tgz#fbff6a4198e69f6283b41bd71db10b8ae2c9440e" - integrity sha512-V4GqcBz+qx3EqCVvw1PAOVLc6HlOF+UaJdaC5Jd5oeD+VpUaZDaOTHydtVz1TLN4VHW3vkCABYf+BDRPLNkfpg== +"@vue/babel-preset-app@^5.0.0-rc.0": + version "5.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-5.0.0-rc.0.tgz#54644a87c0c55d91e5cd724c7b151de15d1dbe4e" + integrity sha512-44+ibKgrKH/gCKq13Yo6CVDRnuFkUEXN6LVoKQPHL9d4bs/3MEnOdG+Rz9PzMJjB2hgLVqf2nlfbpmNmtaMh7A== dependencies: "@babel/core" "^7.12.16" "@babel/helper-compilation-targets" "^7.12.16" @@ -2365,113 +2389,112 @@ "@vue/babel-plugin-transform-vue-jsx" "^1.2.1" camelcase "^5.0.0" -"@vue/cli-overlay@^5.0.0-beta.7": - version "5.0.0-beta.7" - resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-5.0.0-beta.7.tgz#a417a4f9c7b0102b6ab0df9a41c7a0a70dfac30b" - integrity sha512-OwG3wZA2ruG6XNQdHsn5hBk0sjRJHkbCARkbnnwKDfULrsGt8xMqFEowiPH0xzVGQgPGqHPXyKvGbE/MRGJBeA== +"@vue/cli-overlay@^5.0.0-rc.0": + version "5.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-5.0.0-rc.0.tgz#d403bf3f30409a9388bbf43a2f9684872f5ce8eb" + integrity sha512-jzgGinruzu3fRGIi1MtPwld2VkG1tQn7DVjBYo9WKp1CBUuTwwasJoevHnoRLc7c/TK+erCX2M6exCHhJbfPAA== -"@vue/cli-plugin-babel@~5.0.0-beta.7": - version "5.0.0-beta.7" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-5.0.0-beta.7.tgz#2e149bf26b9001aa8cb9622ed49b3a5973b7b2db" - integrity sha512-xB7NFldn+k17NXY5JsoNB6ZCwNd6yAZ+Xn9tEEaH3B/J+VQjCsSIgT4NxTpl0xBptq5CeCvFS7hW3fHIexcKFw== +"@vue/cli-plugin-babel@~5.0.0-rc.0": + version "5.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-5.0.0-rc.0.tgz#288520e83aa2d3a19bb80dd9e9c5d1d3482b8757" + integrity sha512-hYwR/1iAKR/s0PHE8s1IxrA1YyZBGrcGXke4eSx2iwDLodUUq/ZXPRKOeWkiJ8aBMJq3yoQdERTA795SoSzSnA== dependencies: "@babel/core" "^7.12.16" - "@vue/babel-preset-app" "^5.0.0-beta.7" - "@vue/cli-shared-utils" "^5.0.0-beta.7" + "@vue/babel-preset-app" "^5.0.0-rc.0" + "@vue/cli-shared-utils" "^5.0.0-rc.0" babel-loader "^8.2.2" thread-loader "^3.0.0" webpack "^5.22.0" -"@vue/cli-plugin-e2e-cypress@~5.0.0-beta.7": - version "5.0.0-beta.7" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-e2e-cypress/-/cli-plugin-e2e-cypress-5.0.0-beta.7.tgz#6d51ea711e0f226f34dfecb91f837103db873786" - integrity sha512-8030gvuFAQjRnyJhwhsabEw/8+nodyP8oWwbPL/CejhWBe6xnrAoBNkXtyu2qDvJxzc4hNy45hUdEobAtTO/dg== +"@vue/cli-plugin-e2e-cypress@~5.0.0-rc.0": + version "5.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-e2e-cypress/-/cli-plugin-e2e-cypress-5.0.0-rc.0.tgz#f5322a8ba7e1a3946e9bd1b598c381beea4d018f" + integrity sha512-VxoN5QRXY+zYKM+7HyQMtXeWUvKL+9vJ9BiUdsEP3oqKmPX5tNxavGW2oJ5R0Xb1y73sauOXHhNY4PMjw5j5dQ== dependencies: - "@vue/cli-shared-utils" "^5.0.0-beta.7" + "@vue/cli-shared-utils" "^5.0.0-rc.0" eslint-plugin-cypress "^2.11.2" -"@vue/cli-plugin-eslint@~5.0.0-beta.7": - version "5.0.0-beta.7" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-5.0.0-beta.7.tgz#4978907bf63a5d2446d70183e4c4a0fdeea95ad7" - integrity sha512-ACKuxOI5XpuXZBIHwSI2RwLAOMikxFMKBPBICse/qNDmihU2kXfDcGMrqQOh7HbqQE4XdpwhaUvARHz80psxEg== +"@vue/cli-plugin-eslint@~5.0.0-rc.0": + version "5.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-5.0.0-rc.0.tgz#d3d1ff6a62312418058e15c354756a8d4c341627" + integrity sha512-yd4lLrKQEHUncMa6kN4TcuoBUvYYtbpttAmAaCWV8qiZvIi3s6d+PAqNFNGwkZG9M7QaVNR4U8DOXDqGOGgn6A== dependencies: - "@vue/cli-shared-utils" "^5.0.0-beta.7" - eslint-webpack-plugin "2.4.3" + "@vue/cli-shared-utils" "^5.0.0-rc.0" + eslint-webpack-plugin "^3.1.0" globby "^11.0.2" - inquirer "^8.0.0" webpack "^5.22.0" yorkie "^2.0.0" -"@vue/cli-plugin-pwa@~5.0.0-beta.7": - version "5.0.0-beta.7" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-pwa/-/cli-plugin-pwa-5.0.0-beta.7.tgz#9276ae9d832bbeb5281653b7fa1b0fd46608ccc7" - integrity sha512-4vHbKF1yicxS2vyOnhBiqJCE+iG1sFPshNgFYfzPrMC3r1b+MvZIXbSPsUOQtoNmNyi4qiucRssgh4n9pDr/eA== +"@vue/cli-plugin-pwa@~5.0.0-rc.0": + version "5.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-pwa/-/cli-plugin-pwa-5.0.0-rc.0.tgz#84de5365403ffa9760bf123da67e0d4b755bc6ce" + integrity sha512-0GWbaQRpArD9o13FPsjNCusrbjXfNj67PlTCjPwx4/pPkZpMaP4EuzbFLkeO+8h5cU8fV4qIp2vY87hbCqr6hA== dependencies: - "@vue/cli-shared-utils" "^5.0.0-beta.7" + "@vue/cli-shared-utils" "^5.0.0-rc.0" html-webpack-plugin "^5.1.0" webpack "^5.22.0" workbox-webpack-plugin "^6.1.0" -"@vue/cli-plugin-router@^5.0.0-beta.7", "@vue/cli-plugin-router@~5.0.0-beta.7": - version "5.0.0-beta.7" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-5.0.0-beta.7.tgz#dd4b41c2bbf9532f46d41ca856e589a82472172f" - integrity sha512-EK4xNS/tt5QVR/v6ZYGxFeLobgMA4K9IuLvY2sdGWblDci3r9MpGETgg4IJPNvWEZukRGVTWjLjoJYpodUdJOA== +"@vue/cli-plugin-router@^5.0.0-rc.0", "@vue/cli-plugin-router@~5.0.0-rc.0": + version "5.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-5.0.0-rc.0.tgz#b671f373808aaeda0b5aa25cf962e780e4356cb0" + integrity sha512-OYJP/aPzAV0BsY0slB2mqMr0qJBCUndn8c56+b7P5FHhYNzO3CvyIirtjKOaczt7+iMPanMdSC8XRQj3zEqz+g== dependencies: - "@vue/cli-shared-utils" "^5.0.0-beta.7" + "@vue/cli-shared-utils" "^5.0.0-rc.0" -"@vue/cli-plugin-typescript@~5.0.0-beta.7": - version "5.0.0-beta.7" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-typescript/-/cli-plugin-typescript-5.0.0-beta.7.tgz#7ae79ca38910b819437ccc557b250ebcdc2e84bd" - integrity sha512-01JD5yMmc+enhy7KmNJCSxX3wscy3EgNz3dXP1yNlgCkhiqmzeS5d+DOCN9JO+buGcP1S9h48RAnwAlEmY4zMA== +"@vue/cli-plugin-typescript@~5.0.0-rc.0": + version "5.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-typescript/-/cli-plugin-typescript-5.0.0-rc.0.tgz#f8c98e57d29dd3d95c7142f5b04794e32dfc7ff8" + integrity sha512-ctfdACa/p/BMp6PcMZNwiZfTIx5OuCsKEwr86+8wAZW1Hv58ygqP7jdkuUZBrPtYaSwwJI+7CVcf7Zd/JtrvuA== dependencies: "@babel/core" "^7.12.16" "@types/webpack-env" "^1.15.2" - "@vue/cli-shared-utils" "^5.0.0-beta.7" + "@vue/cli-shared-utils" "^5.0.0-rc.0" babel-loader "^8.2.2" cache-loader "^4.1.0" - fork-ts-checker-webpack-plugin "^6.1.0" + fork-ts-checker-webpack-plugin "^6.4.0" globby "^11.0.2" thread-loader "^3.0.0" - ts-loader "^8.0.17" + ts-loader "^9.2.5" webpack "^5.22.0" yorkie "^2.0.0" -"@vue/cli-plugin-unit-jest@~5.0.0-beta.7": - version "5.0.0-beta.7" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-unit-jest/-/cli-plugin-unit-jest-5.0.0-beta.7.tgz#5a004944033594db8172c606040927e71fd6a408" - integrity sha512-/ZoJ6bUhXyxD3YckGa9dJnDFP0oA0h22ZTGsYxD9EumVzoVryd4YllpLXKI7awcg5HLxmZJmUD2kaVgwwmuK8w== +"@vue/cli-plugin-unit-jest@~5.0.0-rc.0": + version "5.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-unit-jest/-/cli-plugin-unit-jest-5.0.0-rc.0.tgz#172e7a4830b0542b9d7ca4c3bc6c4cd852a6e222" + integrity sha512-hEJfl1sgTZiljiPmAKa1iqIgX/TuDp0ICoBy/VO5A9xX3eyG/vn7YMhVeZ3q7J8awyXWMFBBkmLC9fg950lTGg== dependencies: "@babel/core" "^7.12.16" "@babel/plugin-transform-modules-commonjs" "^7.15.0" "@types/jest" "^27.0.1" - "@vue/cli-shared-utils" "^5.0.0-beta.7" + "@vue/cli-shared-utils" "^5.0.0-rc.0" babel-jest "^27.1.0" deepmerge "^4.2.2" jest "^27.1.0" jest-serializer-vue "^2.0.2" jest-transform-stub "^2.0.0" - jest-watch-typeahead "^0.6.1" + jest-watch-typeahead "^1.0.0" -"@vue/cli-plugin-vuex@^5.0.0-beta.7": - version "5.0.0-beta.7" - resolved "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.0-beta.7.tgz#080f03375f9c1a8af21c5afb129a13be2e591b3c" - integrity sha512-RoQGXGtz1brmsSYLrkm/LnXlp+SGVVM4ncWAJv9pYoUBJAocOEX+WmfNhbYe6l9jtfq1AmimVV3Id7drOZDAOw== +"@vue/cli-plugin-vuex@^5.0.0-rc.0": + version "5.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.0-rc.0.tgz#7470ba2c4631a33aee985913228144770470cb90" + integrity sha512-x4aW7m6yMy9+LMJBqVCRrU5JNDJhrdYDe6K7tnkHywvMjLATHSDb0Wq8fustSJ13RT65cMDu4GczWIm6tGB1Cg== -"@vue/cli-service@~5.0.0-beta.7": - version "5.0.0-beta.7" - resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-5.0.0-beta.7.tgz#e1805fc3cb1654539b9ca306c15c21ac556b4b4d" - integrity sha512-C0sClCPzYFO1vwn4y6RQTdWPePX70tvoHJNrLFZHQiyp9vfY3zsnXjloEihqvdg6o7HxQfg/f8xPcS7WsM1Wbg== +"@vue/cli-service@~5.0.0-rc.0": + version "5.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-5.0.0-rc.0.tgz#36ccaead7d0e7e4209da86f97f1e6b297382f712" + integrity sha512-Fh4sKLKEvG4jalCq2+TFYf82vplhUjN/eiJHeXSYy7NcS2V21gfql7le8FYTO9uF+hEK2F4IQMQBTY4lkkkPjg== dependencies: "@babel/helper-compilation-targets" "^7.12.16" "@soda/friendly-errors-webpack-plugin" "^1.8.0" "@soda/get-current-script" "^1.0.2" "@types/minimist" "^1.2.0" "@types/webpack-dev-server" "^4.1.0" - "@vue/cli-overlay" "^5.0.0-beta.7" - "@vue/cli-plugin-router" "^5.0.0-beta.7" - "@vue/cli-plugin-vuex" "^5.0.0-beta.7" - "@vue/cli-shared-utils" "^5.0.0-beta.7" - "@vue/component-compiler-utils" "^3.1.2" + "@vue/cli-overlay" "^5.0.0-rc.0" + "@vue/cli-plugin-router" "^5.0.0-rc.0" + "@vue/cli-plugin-vuex" "^5.0.0-rc.0" + "@vue/cli-shared-utils" "^5.0.0-rc.0" + "@vue/component-compiler-utils" "^3.3.0" "@vue/vue-loader-v15" "npm:vue-loader@^15.9.7" "@vue/web-component-wrapper" "^1.3.0" acorn "^8.0.5" @@ -2485,7 +2508,7 @@ clipboardy "^2.3.0" cliui "^7.0.4" copy-webpack-plugin "^9.0.1" - css-loader "^5.1.1" + css-loader "^6.5.0" css-minimizer-webpack-plugin "^3.0.2" cssnano "^5.0.0" debug "^4.1.1" @@ -2500,7 +2523,7 @@ launch-editor-middleware "^2.2.1" lodash.defaultsdeep "^4.6.1" lodash.mapvalues "^4.6.0" - mini-css-extract-plugin "^1.3.7" + mini-css-extract-plugin "^2.4.3" minimist "^1.2.5" module-alias "^2.2.2" portfinder "^1.0.26" @@ -2510,7 +2533,7 @@ ssri "^8.0.1" terser-webpack-plugin "^5.1.1" thread-loader "^3.0.0" - vue-loader "^16.4.0" + vue-loader "^16.8.2" vue-style-loader "^4.1.3" webpack "^5.22.0" webpack-bundle-analyzer "^4.4.0" @@ -2520,10 +2543,10 @@ webpack-virtual-modules "^0.4.2" whatwg-fetch "^3.6.2" -"@vue/cli-shared-utils@^5.0.0-beta.7": - version "5.0.0-beta.7" - resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-5.0.0-beta.7.tgz#b7dc167d6e7a66ae2e02065c2ff46acefe21b569" - integrity sha512-5z+z+pSjM55aGbLf2HF4ND4rQhOYACRWmn+9P2va8bL5ZPP2K3162m1R1YGP3ftCsZwIzII7ksIFBba75TNjkg== +"@vue/cli-shared-utils@^5.0.0-rc.0": + version "5.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-5.0.0-rc.0.tgz#62429b8baaec3a9c9afe49bb14ea1cdd237c7a8b" + integrity sha512-pcNDDXSP4PXO3EZCBmOGKH8xeqkcgglsNV91/f6IwjGYCCcnA2RpS79Ev+jTBUe+n4WmShndcHg7R9jCFzR8cg== dependencies: chalk "^4.1.2" execa "^1.0.0" @@ -2538,7 +2561,7 @@ semver "^7.3.4" strip-ansi "^6.0.0" -"@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2": +"@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.3.0": version "3.3.0" resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz#f9f5fb53464b0c37b2c8d2f3fbfe44df60f61dc9" integrity sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ== @@ -2554,19 +2577,12 @@ optionalDependencies: prettier "^1.18.2 || ^2.0.0" -"@vue/eslint-config-prettier@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@vue/eslint-config-prettier/-/eslint-config-prettier-6.0.0.tgz#ad5912b308f4ae468458e02a2b05db0b9d246700" - integrity sha512-wFQmv45c3ige5EA+ngijq40YpVcIkAy0Lihupnsnd1Dao5CBbPyfCzqtejFLZX1EwH/kCJdpz3t6s+5wd3+KxQ== +"@vue/eslint-config-typescript@^9.0.0": + version "9.0.1" + resolved "https://registry.yarnpkg.com/@vue/eslint-config-typescript/-/eslint-config-typescript-9.0.1.tgz#692fc007cf20012882ac7466b69c3967a0b9809b" + integrity sha512-LmhEEy7xYLpPQDQnFhRP3ZEd9zFFKsQX7/qF3AKcNxTrgc4E0aASWK0Ciinlnw17hXNtq8LZKd3mYgtMigwxVg== dependencies: - eslint-config-prettier "^6.0.0" - -"@vue/eslint-config-typescript@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@vue/eslint-config-typescript/-/eslint-config-typescript-7.0.0.tgz#220c70c2edf7a253e739298525f4d401b8ef0038" - integrity sha512-UxUlvpSrFOoF8aQ+zX1leYiEBEm7CZmXYn/ZEM1zwSadUzpamx56RB4+Htdjisv1mX2tOjBegNUqH3kz2OL+Aw== - dependencies: - vue-eslint-parser "^7.0.0" + vue-eslint-parser "^8.0.0" "@vue/test-utils@^1.1.0": version "1.2.2" @@ -2588,7 +2604,7 @@ vue-hot-reload-api "^2.3.0" vue-style-loader "^4.1.0" -"@vue/vue2-jest@^27.0.0-alpha.2": +"@vue/vue2-jest@^27.0.0-alpha.3": version "27.0.0-alpha.3" resolved "https://registry.yarnpkg.com/@vue/vue2-jest/-/vue2-jest-27.0.0-alpha.3.tgz#fe28c70ee21db494ea8ac1ddbce7a81dd9cabb73" integrity sha512-50UrwXn7xO92TwsJCUGiA9CCpjKCZRWlW2Q3eOgR8Y05bbDnTRrhc23ZDc9gKqeWCykEIdRnUXo5Qb1XeDl+7A== @@ -2843,7 +2859,7 @@ acorn@^7.1.1, acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.4, acorn@^8.0.5, acorn@^8.2.4, acorn@^8.4.1: +acorn@^8.0.4, acorn@^8.0.5, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0: version "8.5.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2" integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q== @@ -2884,9 +2900,9 @@ ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ajv@^8.0.1, ajv@^8.6.0: - version "8.6.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764" - integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw== + version "8.7.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.7.1.tgz#52be6f1736b076074798124293618f132ad07a7e" + integrity sha512-gPpOObTO1QjbnN1sVMjJcp1TF9nggMfO4MBR5uQl6ZVTOaEPq5i4oq/6R9q2alMMPB3eg53wFv1RuJBLuxf3Hw== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -3061,15 +3077,10 @@ array.prototype.flat@^1.2.5: define-properties "^1.1.3" es-abstract "^1.19.0" -arrify@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" - integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug== - asn1@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== + version "0.2.6" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d" + integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ== dependencies: safer-buffer "~2.1.0" @@ -3391,9 +3402,9 @@ bser@2.1.1: node-int64 "^0.4.0" buefy@^0.9.0: - version "0.9.11" - resolved "https://registry.yarnpkg.com/buefy/-/buefy-0.9.11.tgz#69ab7f46e4f172d43247916f770f29764f9e0931" - integrity sha512-WP32SiaM9WVxDtzgdiq7V2zyIvn41NboPgluVqdB6OAi1/QhjO/63m6hd/jy6Vk8r+zuhIZD+aP9KlQ10EhxTQ== + version "0.9.13" + resolved "https://registry.yarnpkg.com/buefy/-/buefy-0.9.13.tgz#fa530257fc47a8cb00d1e36faa93bbeba4aefce0" + integrity sha512-W8QhvAz+YlKhxDQe/oag4Fl/zYTvXOPoNVr4pseYDR7r52Ta6s51iedBdvw4It68Sq+g7mcxIzwK7mv3PR6O4g== dependencies: bulma "0.9.3" @@ -3514,9 +3525,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001274: - version "1.0.30001275" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001275.tgz#26f5076629fe4e52bbd245f9046ad7b90aafdf57" - integrity sha512-ihJVvj8RX0kn9GgP43HKhb5q9s2XQn4nEQhdldEJvZhCsuiB2XOq6fAMYQZaN6FPWfsr2qU0cdL0CSbETwbJAg== + version "1.0.30001279" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001279.tgz#eb06818da481ef5096a3b3760f43e5382ed6b0ce" + integrity sha512-VfEHpzHEXj6/CxggTwSFoZBBYGQfQv9Cf42KPlO79sWXCD1QNKWKsKzFeWL7QpZHJQYAvocqV6Rty1yJMkqWLQ== case-sensitive-paths-webpack-plugin@^2.3.0: version "2.4.0" @@ -3548,7 +3559,7 @@ chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -3561,10 +3572,10 @@ char-regex@^1.0.2: resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== -chardet@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" - integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== +char-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-2.0.0.tgz#16f98f3f874edceddd300fda5d58df380a7641a6" + integrity sha512-oGu2QekBMXgyQNWPDRQ001bjvDnZe4/zBTz37TMbiKz1NbNiyiH5hRkobe7npRN6GfbGbxMYFck/vQ1r9c1VMA== check-more-types@^2.24.0: version "2.24.0" @@ -3667,11 +3678,6 @@ cli-truncate@^2.1.0: slice-ansi "^3.0.0" string-width "^4.2.0" -cli-width@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" - integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== - clipboardy@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz#3c2903650c68e46a91b388985bc2774287dba290" @@ -3997,30 +4003,27 @@ css-declaration-sorter@^6.0.3: dependencies: timsort "^0.3.0" -css-loader@^5.1.1: - version "5.2.7" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" - integrity sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg== +css-loader@^6.5.0: + version "6.5.1" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.5.1.tgz#0c43d4fbe0d97f699c91e9818cb585759091d1b1" + integrity sha512-gEy2w9AnJNnD9Kuo4XAP9VflW/ujKoS9c/syO+uWMlm5igc7LysKzPXaDoR2vroROkSwsTS2tGr1yGGEbZOYZQ== dependencies: icss-utils "^5.1.0" - loader-utils "^2.0.0" postcss "^8.2.15" postcss-modules-extract-imports "^3.0.0" postcss-modules-local-by-default "^4.0.0" postcss-modules-scope "^3.0.0" postcss-modules-values "^4.0.0" postcss-value-parser "^4.1.0" - schema-utils "^3.0.0" semver "^7.3.5" css-minimizer-webpack-plugin@^3.0.2: - version "3.1.1" - resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.1.1.tgz#27bafa3b75054713565b2266c64b0228acd18634" - integrity sha512-KlB8l5uoNcf9F7i5kXnkxoqJGd2BXH4f0+Lj2vSWSmuvMLYO1kNsJ1KHSzeDW8e45/whgSOPcKVT/3JopkT8dg== + version "3.1.2" + resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.1.2.tgz#ca16768c03fd929dee50d751c4ae4ef67cfa067c" + integrity sha512-pJ0DMd590fjvQ4+MrGcrUN+cqT9BAqml0/t3I4HxYLC2K3TfihWf5ZNGHQ411pJv+H5agbnZhtOlrV4hJfk/QQ== dependencies: cssnano "^5.0.6" jest-worker "^27.0.2" - p-limit "^3.0.2" postcss "^8.3.5" schema-utils "^3.1.0" serialize-javascript "^6.0.0" @@ -4065,10 +4068,10 @@ cssesc@^3.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-default@^5.1.5: - version "5.1.5" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.5.tgz#6effb7175ee5d296f95330e137587e27ee974d44" - integrity sha512-fF00UI+d3PWkGfMd62geqmoUe5h+LOhGE2GH4Fqq3beNKdCU1LWwLUyIcu4/A72lWv0737cHey5zhhWw3rW0sA== +cssnano-preset-default@^5.1.6: + version "5.1.6" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.6.tgz#1bdb83be6a6b1fee6dc5e9ec2e61286bcadcc7a6" + integrity sha512-X2nDeNGBXc0486oHjT2vSj+TdeyVsxRvJUxaOH50hOM6vSDLkKd0+59YXpSZRInJ4sNtBOykS4KsPfhdrU/35w== dependencies: css-declaration-sorter "^6.0.3" cssnano-utils "^2.0.1" @@ -4079,7 +4082,7 @@ cssnano-preset-default@^5.1.5: postcss-discard-duplicates "^5.0.1" postcss-discard-empty "^5.0.1" postcss-discard-overridden "^5.0.1" - postcss-merge-longhand "^5.0.2" + postcss-merge-longhand "^5.0.3" postcss-merge-rules "^5.0.2" postcss-minify-font-values "^5.0.1" postcss-minify-gradients "^5.0.3" @@ -4106,11 +4109,11 @@ cssnano-utils@^2.0.1: integrity sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ== cssnano@^5.0.0, cssnano@^5.0.6: - version "5.0.9" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.9.tgz#bd03168835c0883c16754085704f57861a32d99c" - integrity sha512-Y4olTKBKsPKl5izpcXHRDiB/1rVdbIDM4qVXgEKBt466kYT42SEEsnCYOQFFXzEkUYV8pJNCII9JKzb8KfDk+g== + version "5.0.10" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.10.tgz#92207eb7c9c6dc08d318050726f9fad0adf7220b" + integrity sha512-YfNhVJJ04imffOpbPbXP2zjIoByf0m8E2c/s/HnvSvjXgzXMfgopVjAEGvxYOjkOpWuRQDg/OZFjO7WW94Ri8w== dependencies: - cssnano-preset-default "^5.1.5" + cssnano-preset-default "^5.1.6" is-resolvable "^1.1.0" lilconfig "^2.0.3" yaml "^1.10.2" @@ -4230,7 +4233,7 @@ debug@2.6.9, debug@^2.6.9: dependencies: ms "2.0.0" -debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== @@ -4516,9 +4519,9 @@ ejs@^2.6.1: integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== electron-to-chromium@^1.3.886: - version "1.3.887" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.887.tgz#b36aeed12a28aaa19460a467823f5bbe1f3c6f06" - integrity sha512-QQUumrEjFDKSVYVdaeBmFdyQGoaV+fCSMyWHvfx/u22bRHSTeBQYt6P4jMY+gFd4kgKB9nqk7RMtWkDB49OYPA== + version "1.3.892" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.892.tgz#0e3f5bb1de577e2e5a6dffd5a4b278c4a735cd39" + integrity sha512-YDW4yIjdfMnbRoBjRZ/aNQYmT6JgQFLwmTSDRJMQdrY4MByEzppdXp3rnJ0g4LBWcsYTUvwKKClYN1ofZ0COOQ== emittery@^0.8.1: version "0.8.1" @@ -4547,16 +4550,7 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" -enhanced-resolve@^4.0.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec" - integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg== - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.5.0" - tapable "^1.0.0" - -enhanced-resolve@^5.8.3: +enhanced-resolve@^5.0.0, enhanced-resolve@^5.8.3: version "5.8.3" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" integrity sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA== @@ -4581,13 +4575,6 @@ envinfo@^7.7.3: resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== -errno@^0.1.3: - version "0.1.8" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" - integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== - dependencies: - prr "~1.0.1" - error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -4679,12 +4666,10 @@ escodegen@^2.0.0: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@^6.0.0: - version "6.15.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz#7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9" - integrity sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw== - dependencies: - get-stdin "^6.0.0" +eslint-config-prettier@^8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a" + integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew== eslint-import-resolver-node@^0.3.6: version "0.3.6" @@ -4736,15 +4721,15 @@ eslint-plugin-prettier@^4.0.0: dependencies: prettier-linter-helpers "^1.0.0" -eslint-plugin-vue@^7.6.0: - version "7.20.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.20.0.tgz#98c21885a6bfdf0713c3a92957a5afeaaeed9253" - integrity sha512-oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw== +eslint-plugin-vue@^8.0.3: + version "8.0.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-8.0.3.tgz#791cc4543940319e612ea61a1d779e8c87cf749a" + integrity sha512-Rlhhy5ltzde0sRwSkqHuNePTXLMMaJ5+qsQubM4RYloYsQ8cXlnJT5MDaCzSirkGADipOHtmQXIbbPFAzUrADg== dependencies: - eslint-utils "^2.1.0" + eslint-utils "^3.0.0" natural-compare "^1.4.0" - semver "^6.3.0" - vue-eslint-parser "^7.10.0" + semver "^7.3.5" + vue-eslint-parser "^8.0.1" eslint-scope@5.1.1, eslint-scope@^5.0.0, eslint-scope@^5.1.1: version "5.1.1" @@ -4754,6 +4739,14 @@ eslint-scope@5.1.1, eslint-scope@^5.0.0, eslint-scope@^5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" +eslint-scope@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-6.0.0.tgz#9cf45b13c5ac8f3d4c50f46a5121f61b3e318978" + integrity sha512-uRDL9MWmQCkaFus8RF5K9/L/2fn+80yoW3jkD53l4shjCh26fCtvJGasxjUqP5OT87SYTxCVA3BwTUzuELx9kA== + dependencies: + esrecurse "^4.3.0" + estraverse "^5.2.0" + eslint-utils@^2.0.0, eslint-utils@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" @@ -4778,18 +4771,23 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint-webpack-plugin@2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.4.3.tgz#59afc76ab747e47fcc3ccd05375b58cbc5a034d5" - integrity sha512-+15ifHFkGn0gB7lQBe+xgyKcjelxv9xlTutGHEPYBUUj+1Rjrjq3+1REJLJpyAHgpQTatpqkRY1z8gQuyn3Aww== - dependencies: - "@types/eslint" "^7.2.4" - arrify "^2.0.1" - jest-worker "^26.6.2" - micromatch "^4.0.2" - schema-utils "^3.0.0" +eslint-visitor-keys@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2" + integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA== -eslint@^7.20.0, eslint@^7.9.0: +eslint-webpack-plugin@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-3.1.0.tgz#86ee426f076e2d82f9d9eaab12db1de4311c35b2" + integrity sha512-1UTDzwN5br3z3E2bzhuNtjbSsW2EJiIEGdxH8uWRbOsTEEY0zw8QYGHLeQQrClMWO0gD9QuB5uDh6uQ8tbbv5A== + dependencies: + "@types/eslint" "^7.28.2" + jest-worker "^27.3.1" + micromatch "^4.0.4" + normalize-path "^3.0.0" + schema-utils "^3.1.1" + +eslint@^7.9.0: version "7.32.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== @@ -4835,6 +4833,50 @@ eslint@^7.20.0, eslint@^7.9.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" +eslint@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.2.0.tgz#44d3fb506d0f866a506d97a0fc0e90ee6d06a815" + integrity sha512-erw7XmM+CLxTOickrimJ1SiF55jiNlVSp2qqm0NuBWPtHYQCegD5ZMaW0c3i5ytPqL+SSLaCxdvQXFPLJn+ABw== + dependencies: + "@eslint/eslintrc" "^1.0.4" + "@humanwhocodes/config-array" "^0.6.0" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.3.2" + doctrine "^3.0.0" + enquirer "^2.3.5" + escape-string-regexp "^4.0.0" + eslint-scope "^6.0.0" + eslint-utils "^3.0.0" + eslint-visitor-keys "^3.0.0" + espree "^9.0.0" + esquery "^1.4.0" + 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 "^6.0.1" + globals "^13.6.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + 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" + natural-compare "^1.4.0" + optionator "^0.9.1" + progress "^2.0.0" + regexpp "^3.2.0" + semver "^7.2.1" + strip-ansi "^6.0.1" + strip-json-comments "^3.1.0" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + espree@^6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a" @@ -4853,6 +4895,15 @@ espree@^7.3.0, espree@^7.3.1: acorn-jsx "^5.3.1" eslint-visitor-keys "^1.3.0" +espree@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.0.0.tgz#e90a2965698228502e771c7a58489b1a9d107090" + integrity sha512-r5EQJcYZ2oaGbeR0jR0fFVijGOcwai07/690YRXLINuhmVeRY4UKSAsQPe/0BNuDgwP7Ophoc1PRsr2E3tkbdQ== + dependencies: + acorn "^8.5.0" + acorn-jsx "^5.3.1" + eslint-visitor-keys "^3.0.0" + esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" @@ -5045,15 +5096,6 @@ extend@~3.0.2: resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== -external-editor@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" - integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== - dependencies: - chardet "^0.7.0" - iconv-lite "^0.4.24" - tmp "^0.0.33" - extract-from-css@^0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/extract-from-css/-/extract-from-css-0.4.4.tgz#1ea7df2e7c7c6eb9922fa08e8adaea486f6f8f92" @@ -5158,7 +5200,7 @@ figures@^2.0.0: dependencies: escape-string-regexp "^1.0.5" -figures@^3.0.0, figures@^3.2.0: +figures@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== @@ -5254,7 +5296,7 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= -fork-ts-checker-webpack-plugin@^6.1.0: +fork-ts-checker-webpack-plugin@^6.4.0: version "6.4.0" resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.4.0.tgz#057e477cf1d8b013b2ed2669437f818680289c4c" integrity sha512-3I3wFkc4DbzaUDPWEi96wdYGu4EKtxBafhZYm0o4mX51d9bphAY4P3mBl8K5mFXFJqVzHfmdbm9kLGnm7vwwBg== @@ -5370,11 +5412,6 @@ get-package-type@^0.1.0: resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== -get-stdin@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b" - integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g== - get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" @@ -5428,7 +5465,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -glob-parent@^6.0.0: +glob-parent@^6.0.0, glob-parent@^6.0.1: version "6.0.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== @@ -5471,7 +5508,7 @@ globals@^13.6.0, globals@^13.9.0: dependencies: type-fest "^0.20.2" -globby@^11.0.1, globby@^11.0.2, globby@^11.0.3: +globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.0.4: version "11.0.4" resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== @@ -5489,9 +5526,9 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== graphql-tag@^2.10.3, graphql-tag@^2.12.3: - version "2.12.5" - resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.5.tgz#5cff974a67b417747d05c8d9f5f3cb4495d0db8f" - integrity sha512-5xNhP4063d16Pz3HBtKprutsPrmHZi5IdUGOWRxA2B6VF7BIRGOHZ5WQvDmJXZuPcBg7rYwaFxvQYjqkSdR3TQ== + version "2.12.6" + resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1" + integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg== dependencies: tslib "^2.1.0" @@ -5507,6 +5544,11 @@ graphql@^15.0.0: resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.7.2.tgz#85ab0eeb83722977151b3feb4d631b5f2ab287ef" integrity sha512-AnnKk7hFQFmU/2I9YSQf3xw44ctnSFCfp3zE0N6W174gqe9fWG/2rKaKxROK7CcI3XtERpjEKFqts8o319Kf7A== +graphql@^16.0.0: + version "16.0.1" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.0.1.tgz#93a13cd4e0e38ca8d0832e79614c8578bfd34f10" + integrity sha512-oPvCuu6dlLdiz8gZupJ47o1clgb72r1u8NDBcQYjcV6G/iEdmE11B1bBlkhXRvV0LisP/SXRFP7tT6AgaTjpzg== + gzip-size@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462" @@ -5774,7 +5816,7 @@ human-signals@^2.1.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== -iconv-lite@0.4.24, iconv-lite@^0.4.24: +iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -5802,9 +5844,9 @@ ignore@^4.0.6: integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== ignore@^5.1.4, ignore@^5.1.8: - version "5.1.8" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" - integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== + version "5.1.9" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb" + integrity sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ== import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: version "3.3.0" @@ -5860,26 +5902,6 @@ ini@^1.3.4: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -inquirer@^8.0.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.0.tgz#f44f008dd344bbfc4b30031f45d984e034a3ac3a" - integrity sha512-0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ== - 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.2.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - through "^2.3.6" - internal-ip@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-6.2.0.tgz#d5541e79716e406b74ac6b07b856ef18dc1621c1" @@ -6689,18 +6711,18 @@ jest-validate@^27.3.1: leven "^3.1.0" pretty-format "^27.3.1" -jest-watch-typeahead@^0.6.1: - version "0.6.5" - resolved "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-0.6.5.tgz#b809f79eed106b6cf832e59a5fe54481f2d1918e" - integrity sha512-GIbV6h37/isatMDtqZlA8Q5vC6T3w+5qdvtF+3LIkPc58zEWzbKmTHvlUIp3wvBm400RzrQWcVPcsAJqKWu7XQ== +jest-watch-typeahead@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-1.0.0.tgz#4de2ca1eb596acb1889752afbab84b74fcd99173" + integrity sha512-jxoszalAb394WElmiJTFBMzie/RDCF+W7Q29n5LzOPtcoQoHWfdUtHFkbhgf5NwWe8uMOxvKb/g7ea7CshfkTw== dependencies: ansi-escapes "^4.3.1" chalk "^4.0.0" jest-regex-util "^27.0.0" jest-watcher "^27.0.0" - slash "^3.0.0" - string-length "^4.0.1" - strip-ansi "^6.0.0" + slash "^4.0.0" + string-length "^5.0.1" + strip-ansi "^7.0.1" jest-watcher@^27.0.0, jest-watcher@^27.3.1: version "27.3.1" @@ -6715,7 +6737,7 @@ jest-watcher@^27.0.0, jest-watcher@^27.3.1: jest-util "^27.3.1" string-length "^4.0.1" -jest-worker@^26.2.1, jest-worker@^26.6.2: +jest-worker@^26.2.1: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== @@ -7000,9 +7022,9 @@ levn@~0.3.0: type-check "~0.3.2" lilconfig@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.3.tgz#68f3005e921dafbd2a2afb48379986aa6d2579fd" - integrity sha512-EHKqr/+ZvdKCifpNrJCKxBTgk5XupZA3y/aCPY9mxfgBzmgh93Mt/WqjjQ38oMxXuvDokaKiM3lAgvSH2sjtHg== + version "2.0.4" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" + integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA== lines-and-columns@^1.1.6: version "1.1.6" @@ -7043,9 +7065,9 @@ loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4 json5 "^1.0.1" loader-utils@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.1.tgz#3b8d4386f42378d6434d32d7bc08e7a52d39575e" - integrity sha512-g4miPa9uUrZz4iElkaVJgDFwKJGh8aQGM7pUL4ejXl6cu7kSb30seQOVGNMP6sW8j7DW77X68hJZ+GM7UGhXeQ== + version "2.0.2" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" + integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A== dependencies: big.js "^5.2.2" emojis-list "^3.0.0" @@ -7066,11 +7088,6 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" -lodash.clonedeep@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -7238,14 +7255,6 @@ memfs@^3.1.2, memfs@^3.2.2: dependencies: fs-monkey "1.0.3" -memory-fs@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c" - integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA== - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" @@ -7281,17 +7290,17 @@ micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4: braces "^3.0.1" picomatch "^2.2.3" -mime-db@1.50.0, "mime-db@>= 1.43.0 < 2": - version "1.50.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f" - integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A== +mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": + version "1.51.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" + integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.33" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz#1fa12a904472fafd068e48d9e8401f74d3f70edb" - integrity sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g== + version "2.1.34" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" + integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== dependencies: - mime-db "1.50.0" + mime-db "1.51.0" mime@1.6.0: version "1.6.0" @@ -7313,14 +7322,12 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mini-css-extract-plugin@^1.3.7: - version "1.6.2" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" - integrity sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q== +mini-css-extract-plugin@^2.4.3: + version "2.4.4" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.4.tgz#c7e5d2d931dcf100ae50ae949ba757c506b54b0f" + integrity sha512-UJ+aNuFQaQaECu7AamlWOBLj2cJ6XSGU4zNiqXeZ7lZLe5VD0DoSPWFbWArXueo+6FZVbgHzpX9lUIaBIDLuYg== dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" - webpack-sources "^1.1.0" + schema-utils "^3.1.0" minimalistic-assert@^1.0.0: version "1.0.1" @@ -7401,11 +7408,6 @@ multicast-dns@^6.0.1: dns-packet "^1.3.1" thunky "^1.0.2" -mute-stream@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" - integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== - mz@^2.4.0: version "2.7.0" resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" @@ -7678,7 +7680,7 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" -ora@^5.3.0, ora@^5.4.1: +ora@^5.3.0: version "5.4.1" resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== @@ -7698,11 +7700,6 @@ orderedmap@^1.1.0: resolved "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.1.1.tgz#c618e77611b3b21d0fe3edc92586265e0059c789" integrity sha512-3Ux8um0zXbVacKUkcytc0u3HgC0b0bBLT+I60r2J/En72cI0nZffqrA7Xtf2Hqs27j1g82llR5Mhbd0Z1XW4AQ== -os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - ospath@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b" @@ -7739,7 +7736,7 @@ p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.2, p-limit@^3.1.0: +p-limit@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== @@ -8011,10 +8008,10 @@ postcss-loader@^6.1.1: klona "^2.0.4" semver "^7.3.5" -postcss-merge-longhand@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz#277ada51d9a7958e8ef8cf263103c9384b322a41" - integrity sha512-BMlg9AXSI5G9TBT0Lo/H3PfUy63P84rVz3BjCFE9e9Y9RXQZD3+h3YO1kgTNsNJy7bBc1YQp8DmSnwLIW5VPcw== +postcss-merge-longhand@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.3.tgz#42194a5ffbaa5513edbf606ef79c44958564658b" + integrity sha512-kmB+1TjMTj/bPw6MCDUiqSA5e/x4fvLffiAdthra3a0m2/IjTrWsTmD3FdSskzUjEwkj5ZHBDEbv5dOcqD7CMQ== dependencies: css-color-names "^1.0.1" postcss-value-parser "^4.1.0" @@ -8348,7 +8345,7 @@ prop-types@^15.7.2: object-assign "^4.1.1" react-is "^16.8.1" -prosemirror-commands@^1.1.11: +prosemirror-commands@^1.1.12: version "1.1.12" resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.12.tgz#5cb0fef4e5a0039e2fa19b42a5626af03d7c2ec3" integrity sha512-+CrMs3w/ZVPSkR+REg8KL/clyFLv/1+SgY/OMN+CB22Z24j9TZDje72vL36lOZ/E4NeRXuiCcmENcW/vAcG67A== @@ -8385,7 +8382,7 @@ prosemirror-history@^1.2.0: prosemirror-transform "^1.0.0" rope-sequence "^1.3.0" -prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.3: +prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.5.tgz#b5984c7d30f5c75956c853126c54e9e624c0327b" integrity sha512-8SZgPH3K+GLsHL2wKuwBD9rxhsbnVBTwpHCO4VUO5GmqUQlxd/2GtBVWTsyLq4Dp3N9nGgPd3+lZFKUDuVp+Vw== @@ -8423,10 +8420,10 @@ prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transfor dependencies: prosemirror-model "^1.0.0" -prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.20.3: - version "1.21.0" - resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.21.0.tgz#d793cd338eda224026b8fe18a4f3163204963b8b" - integrity sha512-Pjh0vXw/l2Ifc3QcBVKJ/qHej33MX4sdq4/uAVqkSmHLf//bVWTYSZibihMya3lsIxTbDzNl/Z03KrhXWMHaoA== +prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.22.0: + version "1.22.0" + resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.22.0.tgz#235dca38ed62ae028d627be5684d45b36550d310" + integrity sha512-kCZoHp0Sa2AHhwV64aNFi69QlqBocZ8G8gbvZRFDdEj57whOCdPjdVLYBVyM9+S5oHDSrzjkoMm+JvvHFhMRJw== dependencies: prosemirror-model "^1.14.3" prosemirror-state "^1.0.0" @@ -8450,11 +8447,6 @@ proxy-from-env@1.0.0: resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee" integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4= -prr@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" - integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY= - pseudomap@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" @@ -8642,7 +8634,7 @@ regexp.prototype.flags@^1.2.0: call-bind "^1.0.2" define-properties "^1.1.3" -regexpp@^3.1.0: +regexpp@^3.1.0, regexpp@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== @@ -8809,11 +8801,6 @@ rope-sequence@^1.3.0: resolved "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.2.tgz#a19e02d72991ca71feb6b5f8a91154e48e3c098b" integrity sha512-ku6MFrwEVSVmXLvy3dYph3LAMNS0890K7fabn+0YIRQ2T96T9F4gkFf0vf0WW0JUraNWwGRtInEpH7yO4tbQZg== -run-async@^2.4.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" - integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== - run-parallel@^1.1.9: version "1.2.0" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" @@ -8821,7 +8808,7 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -rxjs@^7.2.0, rxjs@^7.4.0: +rxjs@^7.4.0: version "7.4.0" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68" integrity sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w== @@ -9073,6 +9060,11 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== +slash@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" + integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== + slice-ansi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" @@ -9277,6 +9269,14 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" +string-length@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-5.0.1.tgz#3d647f497b6e8e8d41e422f7e0b23bc536c8381e" + integrity sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow== + dependencies: + char-regex "^2.0.0" + strip-ansi "^7.0.1" + string-width@^2.0.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" @@ -9361,7 +9361,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^7.0.0: +strip-ansi@^7.0.0, strip-ansi@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== @@ -9479,12 +9479,11 @@ symbol-tree@^3.2.4: integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== table@^6.0.9: - version "6.7.2" - resolved "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz#a8d39b9f5966693ca8b0feba270a78722cbaf3b0" - integrity sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g== + version "6.7.3" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.3.tgz#255388439715a738391bd2ee4cbca89a4d05a9b7" + integrity sha512-5DkIxeA7XERBqMwJq0aHZOdMadBx4e6eDoFRuyT5VR82J0Ycg2DwM6GfA/EQAhJ+toRTaS1lIdSQCqgrmhPnlw== dependencies: ajv "^8.0.1" - lodash.clonedeep "^4.5.0" lodash.truncate "^4.4.2" slice-ansi "^4.0.0" string-width "^4.2.3" @@ -9524,12 +9523,11 @@ terminal-link@^2.0.0: supports-hyperlinks "^2.0.0" terser-webpack-plugin@^5.1.1, terser-webpack-plugin@^5.1.3: - version "5.2.4" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.2.4.tgz#ad1be7639b1cbe3ea49fab995cbe7224b31747a1" - integrity sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA== + version "5.2.5" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.2.5.tgz#ce65b9880a0c36872555c4874f45bbdb02ee32c9" + integrity sha512-3luOVHku5l0QBeYS8r4CdHYWEGMmIj3H1U64jgkdZzECcSOJAyJ9TjuqcQZvw1Y+4AOBN9SeYJPJmFn2cM4/2g== dependencies: jest-worker "^27.0.6" - p-limit "^3.1.0" schema-utils "^3.1.1" serialize-javascript "^6.0.0" source-map "^0.6.1" @@ -9598,7 +9596,7 @@ throttleit@^1.0.0: resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= -through@^2.3.6, through@^2.3.8: +through@^2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= @@ -9613,20 +9611,13 @@ timsort@^0.3.0: resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= -tippy.js@^6.2.3, tippy.js@^6.3.2: - version "6.3.3" - resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.3.tgz#04810e79fc217acacc4bd4acb5acf428d7c33974" - integrity sha512-Y3bLm4p33a8TJ49idtxfe6YYxcrmGKkOosry5clshy+wue622nhOxpf+KDfOQmif8etqsoIYFfVyVyXKQDqWVw== +tippy.js@^6.2.3, tippy.js@^6.3.4: + version "6.3.5" + resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.5.tgz#cbc99d34f87ccc127e6460032b86c8d47971d38f" + integrity sha512-B9hAQ5KNF+jDJRg6cRysV6Y3J+5fiNfD60GuXR5TP0sfrcltpgdzVc7f1wMtjQ3W0+Xsy80CDvk0Z+Vr0cM4sQ== dependencies: "@popperjs/core" "^2.9.0" -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== - dependencies: - os-tmpdir "~1.0.2" - tmp@~0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" @@ -9725,14 +9716,13 @@ ts-jest@27: semver "7.x" yargs-parser "20.x" -ts-loader@^8.0.17: - version "8.3.0" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.3.0.tgz#83360496d6f8004fab35825279132c93412edf33" - integrity sha512-MgGly4I6cStsJy27ViE32UoqxPTN9Xly4anxxVyaIWR+9BGxboV4EyJBGfR3RePV7Ksjj3rHmPZJeIt+7o4Vag== +ts-loader@^9.2.5: + version "9.2.6" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.2.6.tgz#9937c4dd0a1e3dbbb5e433f8102a6601c6615d74" + integrity sha512-QMTC4UFzHmu9wU2VHZEmWWE9cUajjfcdcws+Gh7FhiO+Dy0RnR1bNz0YCHqhI0yRowCE9arVnNxYHqELOy9Hjw== dependencies: chalk "^4.1.0" - enhanced-resolve "^4.0.0" - loader-utils "^2.0.0" + enhanced-resolve "^5.0.0" micromatch "^4.0.0" semver "^7.3.4" @@ -10035,18 +10025,18 @@ vue-class-component@^7.2.3: resolved "https://registry.yarnpkg.com/vue-class-component/-/vue-class-component-7.2.6.tgz#8471e037b8e4762f5a464686e19e5afc708502e4" integrity sha512-+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w== -vue-eslint-parser@^7.0.0, vue-eslint-parser@^7.10.0: - version "7.11.0" - resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz#214b5dea961007fcffb2ee65b8912307628d0daf" - integrity sha512-qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg== +vue-eslint-parser@^8.0.0, vue-eslint-parser@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-8.0.1.tgz#25e08b20a414551531f3e19f999902e1ecf45f13" + integrity sha512-lhWjDXJhe3UZw2uu3ztX51SJAPGPey1Tff2RK3TyZURwbuI4vximQLzz4nQfCv8CZq4xx7uIiogHMMoSJPr33A== dependencies: - debug "^4.1.1" - eslint-scope "^5.1.1" - eslint-visitor-keys "^1.1.0" - espree "^6.2.1" + debug "^4.3.2" + eslint-scope "^6.0.0" + eslint-visitor-keys "^3.0.0" + espree "^9.0.0" esquery "^1.4.0" lodash "^4.17.21" - semver "^6.3.0" + semver "^7.3.5" vue-eslint-parser@~7.1.0: version "7.1.1" @@ -10081,10 +10071,10 @@ vue-i18n@^8.14.0: resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.26.7.tgz#adfd48373449fe31438c48e3b3bd43044dc3a681" integrity sha512-7apa5PvRg1YCLoraE3lOgpCG8hJGupLCtywQWedWsgBbvF0TOgFvhitqK9xRH0PBGG1G8aiJz9oklyNDFfDxLg== -vue-loader@^16.4.0: - version "16.8.2" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.8.2.tgz#78552d6558207a93f09e4fb68b068d44964eb740" - integrity sha512-Nkq+z9mAsMEK+qkXgK+9Ia7D8w9uu9j4ut0IMT5coMfux3rCgIp1QBB1CYwY0M34A1nRMSONEaWXxAAw6xSl/Q== +vue-loader@^16.8.2: + version "16.8.3" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.8.3.tgz#d43e675def5ba9345d6c7f05914c13d861997087" + integrity sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA== dependencies: chalk "^4.1.0" hash-sum "^2.0.0" @@ -10318,7 +10308,7 @@ webpack-merge@^5.7.3: clone-deep "^4.0.1" wildcard "^2.0.0" -webpack-sources@^1.1.0, webpack-sources@^1.4.3: +webpack-sources@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== @@ -10337,9 +10327,9 @@ webpack-virtual-modules@^0.4.2: integrity sha512-5NUqC2JquIL2pBAAo/VfBP6KuGkHIZQXW/lNKupLPfhViwh8wNsu0BObtl09yuKZszeEUfbXz8xhrHvSG16Nqw== webpack@*, webpack@^5.22.0, webpack@^5.38.1: - version "5.61.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.61.0.tgz#fa827f0ee9bdfd141dd73c3e891e955ebd52fe7f" - integrity sha512-fPdTuaYZ/GMGFm4WrPi2KRCqS1vDp773kj9S0iI5Uc//5cszsFEDgHNaX4Rj1vobUiU1dFIV3mA9k1eHeluFpw== + version "5.62.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.62.1.tgz#06f09b56a7b1bb13ed5137ad4b118358a90c9505" + integrity sha512-jNLtnWChS2CMZ7vqWtztv0G6fYB5hz11Zsadp5tE7e4/66zVDj7/KUeQZOsOl8Hz5KrLJH1h2eIDl6AnlyE12Q== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.50" diff --git a/mix.lock b/mix.lock index 4f2320016..1ba5ddd85 100644 --- a/mix.lock +++ b/mix.lock @@ -98,7 +98,7 @@ "mogrify": {:hex, :mogrify, "0.9.1", "a26f107c4987477769f272bd0f7e3ac4b7b75b11ba597fd001b877beffa9c068", [:mix], [], "hexpm", "134edf189337d2125c0948bf0c228fdeef975c594317452d536224069a5b7f05"}, "mox": {:hex, :mox, "1.0.1", "b651bf0113265cda0ba3a827fcb691f848b683c373b77e7d7439910a8d754d6e", [:mix], [], "hexpm", "35bc0dea5499d18db4ef7fe4360067a59b06c74376eb6ab3bd67e6295b133469"}, "nimble_csv": {:hex, :nimble_csv, "1.1.0", "b1dba4a86be9e03065c9de829050468e591f569100332db949e7ce71be0afc25", [:mix], [], "hexpm", "e986755bc302832cac429be6deda0fc9d82d3c82b47abefb68b3c17c9d949a3f"}, - "nimble_parsec": {:hex, :nimble_parsec, "1.1.0", "3a6fca1550363552e54c216debb6a9e95bd8d32348938e13de5eda962c0d7f89", [:mix], [], "hexpm", "08eb32d66b706e913ff748f11694b17981c0b04a33ef470e33e11b3d3ac8f54b"}, + "nimble_parsec": {:hex, :nimble_parsec, "1.2.0", "b44d75e2a6542dcb6acf5d71c32c74ca88960421b6874777f79153bbbbd7dccc", [:mix], [], "hexpm", "52b2871a7515a5ac49b00f214e4165a40724cf99798d8e4a65e4fd64ebd002c1"}, "nimble_pool": {:hex, :nimble_pool, "0.1.0", "ffa9d5be27eee2b00b0c634eb649aa27f97b39186fec3c493716c2a33e784ec6", [:mix], [], "hexpm", "343a1eaa620ddcf3430a83f39f2af499fe2370390d4f785cd475b4df5acaf3f9"}, "oauth2": {:hex, :oauth2, "2.0.0", "338382079fe16c514420fa218b0903f8ad2d4bfc0ad0c9f988867dfa246731b0", [:mix], [{:hackney, "~> 1.13", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "881b8364ac7385f9fddc7949379cbe3f7081da37233a1aa7aab844670a91e7e7"}, "oauther": {:hex, :oauther, "1.3.0", "82b399607f0ca9d01c640438b34d74ebd9e4acd716508f868e864537ecdb1f76", [:mix], [], "hexpm", "78eb888ea875c72ca27b0864a6f550bc6ee84f2eeca37b093d3d833fbcaec04e"}, From cd8a5552bb90006068c04a411fcedd3196e489f0 Mon Sep 17 00:00:00 2001 From: Thomas Citharel <tcit@tcit.fr> Date: Tue, 9 Nov 2021 09:01:40 +0100 Subject: [PATCH 12/14] Improve converting to username from non-latin characters Signed-off-by: Thomas Citharel <tcit@tcit.fr> --- js/src/i18n/en_US.json | 3 ++- js/src/i18n/fr_FR.json | 3 ++- js/src/mixins/identityEdition.ts | 4 +++- js/src/utils/username.ts | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json index 98c5994af..66276437d 100644 --- a/js/src/i18n/en_US.json +++ b/js/src/i18n/en_US.json @@ -1232,5 +1232,6 @@ "View full profile": "View full profile", "Any type": "Any type", "In person": "In person", - "In the past": "In the past" + "In the past": "In the past", + "Only registered users may fetch remote events from their URL.": "Only registered users may fetch remote events from their URL." } diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json index d1b380733..a4e63e70c 100644 --- a/js/src/i18n/fr_FR.json +++ b/js/src/i18n/fr_FR.json @@ -1336,5 +1336,6 @@ "View full profile": "Voir le profil complet", "Any type": "N'importe quel type", "In person": "En personne", - "In the past": "Dans le passé" + "In the past": "Dans le passé", + "Only registered users may fetch remote events from their URL.": "Seul⋅es les utilisateur⋅ices enregistré⋅es peuvent récupérer des événements depuis leur URL." } diff --git a/js/src/mixins/identityEdition.ts b/js/src/mixins/identityEdition.ts index 246b423ce..f3e0a2282 100644 --- a/js/src/mixins/identityEdition.ts +++ b/js/src/mixins/identityEdition.ts @@ -29,8 +29,10 @@ export default class IdentityEditionMixin extends Mixins(Vue) { .toLocaleLowerCase() .normalize("NFD") .replace(/[\u0300-\u036f]/g, "") + .replace(/\s{2,}/, " ") .replace(/ /g, "_") - .replace(/[^a-z0-9_]/g, ""); + .replace(/[^a-z0-9_]/g, "") + .replace(/_{2,}/, ""); } validateUsername(): boolean { diff --git a/js/src/utils/username.ts b/js/src/utils/username.ts index 2b51a4c0e..aaf3bb1e7 100644 --- a/js/src/utils/username.ts +++ b/js/src/utils/username.ts @@ -8,8 +8,10 @@ function convertToUsername(value: string | null): string { .toLocaleLowerCase() .normalize("NFD") .replace(/[\u0300-\u036f]/g, "") + .replace(/\s{2,}/, " ") .replace(/ /g, "_") - .replace(/[^a-z0-9_]/g, ""); + .replace(/[^a-z0-9_]/g, "") + .replace(/_{2,}/, ""); } function autoUpdateUsername( From 184b1cbdd23050a5cb6a689af57afb627fd280b7 Mon Sep 17 00:00:00 2001 From: Thomas Citharel <tcit@tcit.fr> Date: Tue, 9 Nov 2021 09:02:35 +0100 Subject: [PATCH 13/14] Bump version to 2.0.0-beta.1 Signed-off-by: Thomas Citharel <tcit@tcit.fr> --- js/package.json | 2 +- mix.exs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/package.json b/js/package.json index 3e212cf1c..8799976bf 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "mobilizon", - "version": "1.3.2", + "version": "2.0.0-beta.1", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/mix.exs b/mix.exs index ab4276597..83e2e84da 100644 --- a/mix.exs +++ b/mix.exs @@ -1,7 +1,7 @@ defmodule Mobilizon.Mixfile do use Mix.Project - @version "1.3.2" + @version "2.0.0-beta.1" def project do [ From 0bc78ad26ea5343e589c5f1685d112853bb7ad5a Mon Sep 17 00:00:00 2001 From: Thomas Citharel <tcit@tcit.fr> Date: Tue, 9 Nov 2021 09:17:38 +0100 Subject: [PATCH 14/14] Mention the main branch name change in the changelog Signed-off-by: Thomas Citharel <tcit@tcit.fr> --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3ff1ae24..61d16627e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Make sure some event action pages (participate remotely or without an account) don't get indexed by search engines - Only send `Tombstone` element in `Delete` activities, not the whole previous deleted element. - Only add address and tags to event icalendar export if they exist +- `master` branch has been renamed to `main` ### Removed