From 05b68fb5f1289dcfc2bfa96ec0cdc8bb7ef4abbb Mon Sep 17 00:00:00 2001 From: lesion Date: Sun, 11 Oct 2020 21:54:36 +0000 Subject: [PATCH 001/271] Translated using Weblate (Spanish) Currently translated at 69.0% (152 of 220 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/es/ --- locales/es.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/locales/es.json b/locales/es.json index 53cf7079..9293fa9b 100644 --- a/locales/es.json +++ b/locales/es.json @@ -48,7 +48,7 @@ "enable": "Habilitar", "disable": "Deshabilita", "me": "Tú", - "password_updated": "Contraseña actualizada!", + "password_updated": "Contraseña actualizada.", "comments": "ningún comentario|un comentario|{n} comentarios", "copy_link": "Copiar Enlace", "send_via_mail": "Enviar correo electrónico", @@ -81,7 +81,8 @@ "delete": "Eliminar", "announcements": "Anuncios", "url": "Dirección URL", - "place": "Lugar" + "place": "Lugar", + "tags": "Tags" }, "login": { "description": "Entrando podrás publicar nuevos eventos.", From b2584a14f4fc4a8889454942fe19de0bc370f046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 10 Oct 2020 23:53:23 +0000 Subject: [PATCH 002/271] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?= =?UTF-8?q?an=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 60.0% (6 of 10 strings) Translation: Gancio/Email Translate-URL: https://hosted.weblate.org/projects/gancio/email/nb_NO/ --- locales/email/nb_NO.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/locales/email/nb_NO.json b/locales/email/nb_NO.json index 14a66268..ba4e259d 100644 --- a/locales/email/nb_NO.json +++ b/locales/email/nb_NO.json @@ -4,13 +4,16 @@ "subject": "Nyregistrering" }, "recover": { - "subject": "Passordgjenoppretting" + "subject": "Passordgjenoppretting", + "content": "Hei, du har forespurt gjenoppretting av passord på {{config.title}}.\nKlikk her for å bekrefte." }, "user_confirm": { - "subject": "Du kan nå begynne publiseringen av hendelser" + "subject": "Du kan nå begynne publiseringen av hendelser", + "content": "Hei, din konto på {{config.title}} har blitt opprettet. Bekreft den og velg et passord." }, "confirm": { - "subject": "Du kan nå begynne publiseringen av hendelser" + "subject": "Du kan nå begynne publiseringen av hendelser", + "content": "Hei, din konto på {{config.title}} har blitt bekreftet.\nSkriv til oss på {{config.admin_email}} for info." }, "register": { "content": "Registreringsforespørsel mottatt. Den vil bekreftes så snart som mulig.", From dd36337a4466ad2e2d8259db3f1e2715ffe7a648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 10 Oct 2020 23:51:29 +0000 Subject: [PATCH 003/271] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?= =?UTF-8?q?an=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 72.2% (159 of 220 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/nb_NO/ --- locales/nb_NO.json | 98 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 89 insertions(+), 9 deletions(-) diff --git a/locales/nb_NO.json b/locales/nb_NO.json index e222f894..38c895ef 100644 --- a/locales/nb_NO.json +++ b/locales/nb_NO.json @@ -2,10 +2,14 @@ "oauth": { "scopes": { "event:write": "Legg til og rediger dine hendelser" - } + }, + "authorization_request": "Programmet {app} ber om følgende autorisering på {instance_name}:", + "redirected_to": "Etter bekreftelse vil du bli videresendt til {url}" }, "confirm": { - "title": "Brukerbekreftelse" + "title": "Brukerbekreftelse", + "valid": "Kontoen din er bekreftet, du kan nå logge inn", + "not_valid": "Noe gikk galt." }, "error": { "email_taken": "Denne e-postadressen er allerede i bruk", @@ -13,10 +17,15 @@ }, "settings": { "password_updated": "Passord endret", - "change_password": "Endre passord" + "change_password": "Endre passord", + "remove_account": "Ved å trykke på følgende knapp vil din brukerkonto slettes. Hendelser du har offentliggjort vil ikke bli det.", + "danger_section": "Farlig del", + "remove_account_confirm": "Du er i ferd med å slette kontoen din for godt", + "update_confirm": "Ønsker du å lagre endringen?" }, "auth": { - "not_confirmed": "Ikke bekreftet enda…" + "not_confirmed": "Ikke bekreftet enda…", + "fail": "Kunne ikke logge inn. Er du sikker på at passordet stemmer?" }, "admin": { "new_announcement": "Ny kunngjøring", @@ -46,7 +55,34 @@ "user_remove_ok": "Bruker fjernet", "delete_user_confirm": "Er du sikker på at du vil fjerne denne brukeren?", "remove_admin": "Fjern administrator", - "delete_user": "Fjern" + "delete_user": "Fjern", + "place_description": "Hvis du har valgt feil sted eller adresse, kan du endre det.
Alle nåværende og foregående hendelser tilknyttet dette stedet vil endre adresse.", + "footer_links": "Bunntekst-lenker", + "trusted_instances_help": "Liste over vennlige instanser vises i toppteksten", + "instance_place": "Indiker sted for denne instansen", + "description_description": "Vises i toppteksten ved siden av tittelen", + "title_description": "Det brukes som overskrift på siden, i emnet av e-posten for eksportering til RSS- og ICS-informasjonsstrømmer.", + "instance_locale_description": "Foretrukket brukerspråk for sider. Noen meldinger vises påsamme bruk for alle (for eksempel ved publisering via ActivityPub, eller ved forsendelse av noen e-poster). I sådant fall vil språket ovenfor bli brukt.", + "user_add_help": "En e-post med instruks om bekreftelse av abonnementet og valg av passord vil bli sendt til den nye brukeren", + "instance_timezone_description": "Gancio er designet for å samle hendelser fra et gitt sted, som en by. Alle hendelser på dette stedet vil bli vist i tidssonen valgt for det.", + "announcement_description": "I denne delen kan du smette inn kunngjøringer som forblir på hjemmesiden", + "hide_boost_bookmark_help": "Skjuler de små ikonene som viser antall framhevelser og bokmerker som kommer fra fediverset", + "hide_boost_bookmark": "Skjuler framhevelser/bokmerker", + "event_confirm_description": "Du kan bekrefte hendelser som oppføres av anonyme brukere her", + "enable_trusted_instances": "Skru på vennlige instanser", + "instance_name_help": "ActivityPub-konto å følge", + "user_blocked": "Brukeren {user} blokkert", + "enable_resources_help": "Tillat tillegg av ressurser til hendelsen fra fediverset", + "enable_federation_help": "Det vil bli mulig å følge denne instansen fra fediverset", + "allow_recurrent_event": "Tillat gjentagende hendelser", + "allow_anon_event": "Tillat anonyme hendelser (må bekreftes)?", + "allow_registration_description": "Tillat selv-registrering?", + "enable_federation": "Skru på føderasjon", + "federation": "Føderasjon/ActivityPub", + "delete_trusted_instance_confirm": "Ønsker du virkelig å slette dette elementet fra venneinstansmenyen?", + "instance_place_help": "Etikett å vise i andres instanser", + "add_trusted_instance": "Legg til en vennlig instans", + "recurrent_event_visible": "Vis gjentagende hendelser som forvalg" }, "event": { "interact_with_me": "Følg meg", @@ -71,12 +107,28 @@ "description_description": "Beskrivelse", "what_description": "Tittel", "same_day": "på samme dag", - "anon": "Anon" + "anon": "Anon", + "follow_me_description": "Én av måtene å holde deg oppdatert på hendelser som publiseres her på {title}\ner å følge kontoen {account} fra fediverset, for eksempel via Gab, og også legge til ressurser til en hendelser derfra.

\nHvis du aldri har hørt om Gab eller fediverset anbefales denne artikkelen.

Skriv inn din instans nedenfor (f.eks. social.librem.one)", + "anon_description": "Du kan legge til en hendelse uten å registrere deg eller logge inn, og den vil bli lagt ut etter at den er bekreftet å være passende. Det vil ikke være mulig å endre den.

\nDu kan istedenfor logge inn, eller registrere deg. Ellers kan du forsette for å få et svar så snart som mulig. ", + "remove_recurrent_confirmation": "Er du sikker på at du ønsker å fjerne denne gjentagende hendelsen?\nHendelser i fortiden vil forbli, men ingen videre hendelser vil bli opprettet.", + "recurrent_2m_ordinal": "|Den {n} {days} i måneden annenhver|Den {n} {days} i måneden annenhver", + "where_description": "Hvor finner hendelsen sted? Hvis ingensteds hen, skriv det og trykk ⏎. ", + "recurrent_1m_ordinal": "På {n} {days} i hver måned", + "recurrent_2m_days": "|På {days} i hver måned annenhver|{days} i hver måned annenhver", + "recurrent_1m_days": "|På {days} i hver måned|{days} i hver måned", + "recurrent_2w_days": "En {days} annenhver", + "multidate_description": "Er det en festival? Velg når den starter og slutter", + "media_description": "Du kan legge til et flygeblad (valgfritt)", + "interact_with_me_at": "Snakk til meg i fediverset på", + "image_too_big": "Bildet kan ikke være større enn 4 MB", + "added_anon": "Hendelse lagt til, men ikke bekreftet enda.", + "added": "Hendelse lagt til" }, "register": { "first_user": "Administrator opprettet", "complete": "Registrering må bekreftes.", - "error": "Feil: " + "error": "Feil: ", + "description": "Sosiale bevegelser bør organisere og finansiere seg selv.
\n
Før du kan publisere, må kontoen godkjennes, ha i minnet at bak denne siden er det mennesker, så skriv to linjer om hvilke hendelser du ønsker å publisere." }, "recover": { "not_valid_code": "Noe gikk galt" @@ -85,7 +137,10 @@ "ok": "Innlogget", "forgot_password": "Glemt passordet?", "not_registered": "Ikke registrert?", - "description": "Ved å logge inn kan du publisere nye hendelser." + "description": "Ved å logge inn kan du publisere nye hendelser.", + "insert_email": "Skriv inn din e-postadresse", + "error": "Kunne ikke logge inn. Sjekk din data.", + "check_email": "Sjekk din e-postinnboks og søppelpost." }, "common": { "reset": "Tilbakestill", @@ -167,6 +222,31 @@ "send": "Send", "export": "Eksporter", "next": "Neste", - "add_event": "Legg til hendelse" + "add_event": "Legg til hendelse", + "associate": "Tilknytt", + "authorize": "Autoriser", + "federation": "Føderasjon", + "n_resources": "ingen ressurs|én ressurs|{n} ressurser" + }, + "export": { + "feed_description": "For å følge oppdateringer fra en datamaskin eller smarttelefon uten å trenge å åpne denne siden, kan du bruke en RSS-leser.

\n\n

Med en RSS-informasjonskanal kan du bruke et egnet program for å motta oppdateringer fra sider som interesserer deg. Det er en bra måte å følge mange sider raskt, uten å måtte opprette en konto eller annet plunder.

\n\n
  • Hvis du har Android, anbefales Flym or Feeder
    • \n
  • For iPhone/iPad kan du bruke Feed4U
    • \n
  • For skrivebord/bærbar anbefales Feedbro, installert på Firefox eller Chrome .
    • \n
    \nÅ legge denne lenken til i din RSS-leser vil holde deg oppdatert.", + "intro": "Ulikt usosiale plattformer som gjør det de kan for å beholde brukere og data om dem, tror vi at den infoen, som folk, må ha sin frihet. Du kan holde deg oppdatert om hendelsene du ønsker, uten å nødvendigvis gå gjennom denne siden.", + "list_description": "Hvis du har en nettside og ønsker å vise en liste over hendelser, bruk følgende kode", + "ical_description": "Datamaskiner og smarttelefoner er vanligvis utstyrt med et kalenderprogram som kan importere kalendere.", + "email_description": "Du kan få hendelser som interesserer deg tilsendt per e-post.", + "insert_your_address": "Skriv inn din e-postadresse" + }, + "about": "\n

    Gancio er en delt agenda for lokale gemenskaper.

    \n ", + "validators": { + "email": "Skriv inn en gyldig e-postadresse", + "required": "{fieldName} kreves" + }, + "ordinal": { + "-1": "siste", + "5": "femte", + "4": "fjerde", + "3": "tredje", + "2": "andre", + "1": "første" } } From 9e285d8b076a0ac08eac66d8e05d079c89bea0ca Mon Sep 17 00:00:00 2001 From: les Date: Fri, 25 Jun 2021 11:36:28 +0200 Subject: [PATCH 004/271] fix AP resource removal --- server/federation/resources.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server/federation/resources.js b/server/federation/resources.js index 0888e7db..b69fee39 100644 --- a/server/federation/resources.js +++ b/server/federation/resources.js @@ -59,7 +59,7 @@ module.exports = { async remove (req, res) { const resource = await Resource.findOne({ where: { activitypub_id: req.body.object.id }, - include: [{ model: APUser, required: false, attributes: ['ap_id'] }] + include: [{ model: APUser, required: true, attributes: ['ap_id'] }] }) if (!resource) { log.info(`Comment ${req.body.object.id} not found`) @@ -67,8 +67,7 @@ module.exports = { } // check if fedi_user that requested resource removal // is the same that created the resource at first place - log.debug(res.fedi_user.ap_id, resource.ap_user.ap_id) - if (res.fedi_user.ap_id === resource.ap_user.id) { + if (req.fedi_user.ap_id === resource.ap_user.id) { await resource.destroy() log.info(`Comment ${req.body.object.id} removed`) res.sendStatus(201) From 1c8cbd8abbc16b2164b245c3777236e09cfef667 Mon Sep 17 00:00:00 2001 From: les Date: Fri, 25 Jun 2021 11:38:01 +0200 Subject: [PATCH 005/271] do not ask for null image --- pages/event/_id.vue | 56 +++++++++++++++++++++++++----------- server/federation/helpers.js | 5 +++- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/pages/event/_id.vue b/pages/event/_id.vue index 7277cfdd..21d7fcaa 100644 --- a/pages/event/_id.vue +++ b/pages/event/_id.vue @@ -11,7 +11,7 @@ v-container#event.pa-0.pa-sm-2 v-row v-col.col-12.col-lg-8 //- fake image to use u-featured in h-event microformat - img.u-featured(v-show='false' :src='`${settings.baseurl}${imgPath}`') + img.u-featured(v-show='false' v-if='event.image_path' :src='`${settings.baseurl}${imgPath}`') v-img.main_image.mb-3( contain :src='imgPath' @@ -64,25 +64,30 @@ v-container#event.pa-0.pa-sm-2 //- resources from fediverse #resources.mt-1(v-if='settings.enable_federation') - div.float-right(v-if='!settings.hide_boosts') - small.mr-3 🔖 {{event.likes.length}} - small ✊ {{event.boost.length}}
    + //- div.float-right(v-if='!settings.hide_boosts') + //- small.mr-3 🔖 {{event.likes.length}} + //- small ✊ {{event.boost.length}}
    - v-dialog.showResource#resourceDialog(v-model='showResources' fullscreen - width='95vw' + v-dialog(v-model='showResources' + fullscreen + width="100%" + max-width="100%" + transition="dialog-bottom-transition" destroy-on-close @keydown.native.right='$refs.carousel.next()' @keydown.native.left='$refs.carousel.prev()') - v-carousel(:interval='10000' ref='carousel' arrow='always') - v-carousel-item(v-for='attachment in selectedResource.data.attachment' :key='attachment.url') - v-img(:src='attachment.url') - v-list.mb-1(v-if='settings.enable_resources' v-for='resource in event.resources' dark + v-carousel.pa-5(:interval='10000' ref='carousel' arrow='always') + v-carousel-item(v-for='attachment in selectedResource.data.attachment' + v-if='isImg(attachment)' + :key='attachment.url' + :src='attachment.url') + + v-card#resources.mb-1(v-if='settings.enable_resources' v-for='resource in event.resources' :key='resource.id' :class='{disabled: resource.hidden}') - v-list-item - v-list-title + v-card-subtitle v-menu(v-if='$auth.user && $auth.user.is_admin' offset-y) - template(v-slot:activator="{ on, attrs }") - v-btn.mr-2(v-on='on' v-attrs='attrs' color='primary' small icon outlined) + template(v-slot:activator="{ on }") + v-btn.mr-2(v-on='on' color='primary' small icon outlined) v-icon mdi-dots-vertical v-list v-list-item(v-if='!resource.hidden' @click='hideResource(resource, true)') @@ -97,9 +102,17 @@ v-container#event.pa-0.pa-sm-2 a(:href='resource.data.url || resource.data.context') small {{resource.data.published|dateFormat('ddd, D MMMM HH:mm')}} + v-card-text + div.mt-1(v-html='resource_filter(resource.data.content)') - span.previewImage(@click='showResource(resource)') - img(v-for='img in resource.data.attachment' :src='img.url') + span(v-for='attachment in resource.data.attachment' :key='attachment.url' @click='showResource(resource)') + span {{attachment}} + audio(v-if='isAudio(attachment)' controls) + source(:src='attachment.url') + v-img.cursorPointer(v-if='isImg(attachment)' :src='attachment.url' + max-height="200px" + max-width="200px" + contain :alt='attachment.name') //- Next/prev arrow .text-center.mt-5.mb-5 @@ -243,6 +256,15 @@ export default { window.removeEventListener('keydown', this.keyDown) }, methods: { + isImg (attachment) { + const type = attachment.mediaType.split('/')[0] + console.error(type) + return type === 'image' + }, + isAudio (attachment) { + const type = attachment.mediaType.split('/')[0] + return type === 'audio' + }, keyDown (ev) { if (ev.altKey || ev.ctrlKey || ev.metaKey || ev.shiftKey) { return } if (ev.key === 'ArrowRight' && this.event.next) { @@ -255,7 +277,7 @@ export default { showResource (resource) { this.showResources = true this.selectedResource = resource - document.getElementById('resourceDialog').focus() + // document.getElementById('resourceDialog').focus() }, async hideResource (resource, hidden) { await this.$axios.$put(`/resources/${resource.id}`, { hidden }) diff --git a/server/federation/helpers.js b/server/federation/helpers.js index bc025444..6160bf5d 100644 --- a/server/federation/helpers.js +++ b/server/federation/helpers.js @@ -211,7 +211,10 @@ const Helpers = { log.info(`Actor ${req.body.actor} not found`) return res.status(401).send('Actor not found') } - if (httpSignature.verifySignature(parsed, user.object.publicKey.publicKeyPem)) { return next() } + if (httpSignature.verifySignature(parsed, user.object.publicKey.publicKeyPem)) { + log.debug(`Valid signature from ${req.body.actor} `) + return next() + } // still not valid log.info(`Invalid signature from user ${req.body.actor}`) From 87950ed524cc18464d14a98cf1cd79db93ee1b00 Mon Sep 17 00:00:00 2001 From: les Date: Fri, 25 Jun 2021 11:41:05 +0200 Subject: [PATCH 006/271] do not ask for null image --- pages/event/_id.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/event/_id.vue b/pages/event/_id.vue index 21d7fcaa..87525869 100644 --- a/pages/event/_id.vue +++ b/pages/event/_id.vue @@ -11,7 +11,7 @@ v-container#event.pa-0.pa-sm-2 v-row v-col.col-12.col-lg-8 //- fake image to use u-featured in h-event microformat - img.u-featured(v-show='false' v-if='event.image_path' :src='`${settings.baseurl}${imgPath}`') + img.u-featured(v-show='false' :src='`${settings.baseurl}${imgPath}`') v-img.main_image.mb-3( contain :src='imgPath' From 9cb050adb839f79c9ae8302bdad92c2bdbbdf426 Mon Sep 17 00:00:00 2001 From: les Date: Fri, 25 Jun 2021 11:42:00 +0200 Subject: [PATCH 007/271] Revert "do not ask for null image" This reverts commit 87950ed524cc18464d14a98cf1cd79db93ee1b00. --- pages/event/_id.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/event/_id.vue b/pages/event/_id.vue index 87525869..21d7fcaa 100644 --- a/pages/event/_id.vue +++ b/pages/event/_id.vue @@ -11,7 +11,7 @@ v-container#event.pa-0.pa-sm-2 v-row v-col.col-12.col-lg-8 //- fake image to use u-featured in h-event microformat - img.u-featured(v-show='false' :src='`${settings.baseurl}${imgPath}`') + img.u-featured(v-show='false' v-if='event.image_path' :src='`${settings.baseurl}${imgPath}`') v-img.main_image.mb-3( contain :src='imgPath' From 58dda736f4c9080080f2920f309f4cd29ec0b5f2 Mon Sep 17 00:00:00 2001 From: les Date: Fri, 25 Jun 2021 11:42:24 +0200 Subject: [PATCH 008/271] Revert "do not ask for null image" This reverts commit 1c8cbd8abbc16b2164b245c3777236e09cfef667. --- pages/event/_id.vue | 56 +++++++++++------------------------- server/federation/helpers.js | 5 +--- 2 files changed, 18 insertions(+), 43 deletions(-) diff --git a/pages/event/_id.vue b/pages/event/_id.vue index 21d7fcaa..7277cfdd 100644 --- a/pages/event/_id.vue +++ b/pages/event/_id.vue @@ -11,7 +11,7 @@ v-container#event.pa-0.pa-sm-2 v-row v-col.col-12.col-lg-8 //- fake image to use u-featured in h-event microformat - img.u-featured(v-show='false' v-if='event.image_path' :src='`${settings.baseurl}${imgPath}`') + img.u-featured(v-show='false' :src='`${settings.baseurl}${imgPath}`') v-img.main_image.mb-3( contain :src='imgPath' @@ -64,30 +64,25 @@ v-container#event.pa-0.pa-sm-2 //- resources from fediverse #resources.mt-1(v-if='settings.enable_federation') - //- div.float-right(v-if='!settings.hide_boosts') - //- small.mr-3 🔖 {{event.likes.length}} - //- small ✊ {{event.boost.length}}
    + div.float-right(v-if='!settings.hide_boosts') + small.mr-3 🔖 {{event.likes.length}} + small ✊ {{event.boost.length}}
    - v-dialog(v-model='showResources' - fullscreen - width="100%" - max-width="100%" - transition="dialog-bottom-transition" + v-dialog.showResource#resourceDialog(v-model='showResources' fullscreen + width='95vw' destroy-on-close @keydown.native.right='$refs.carousel.next()' @keydown.native.left='$refs.carousel.prev()') - v-carousel.pa-5(:interval='10000' ref='carousel' arrow='always') - v-carousel-item(v-for='attachment in selectedResource.data.attachment' - v-if='isImg(attachment)' - :key='attachment.url' - :src='attachment.url') - - v-card#resources.mb-1(v-if='settings.enable_resources' v-for='resource in event.resources' + v-carousel(:interval='10000' ref='carousel' arrow='always') + v-carousel-item(v-for='attachment in selectedResource.data.attachment' :key='attachment.url') + v-img(:src='attachment.url') + v-list.mb-1(v-if='settings.enable_resources' v-for='resource in event.resources' dark :key='resource.id' :class='{disabled: resource.hidden}') - v-card-subtitle + v-list-item + v-list-title v-menu(v-if='$auth.user && $auth.user.is_admin' offset-y) - template(v-slot:activator="{ on }") - v-btn.mr-2(v-on='on' color='primary' small icon outlined) + template(v-slot:activator="{ on, attrs }") + v-btn.mr-2(v-on='on' v-attrs='attrs' color='primary' small icon outlined) v-icon mdi-dots-vertical v-list v-list-item(v-if='!resource.hidden' @click='hideResource(resource, true)') @@ -102,17 +97,9 @@ v-container#event.pa-0.pa-sm-2 a(:href='resource.data.url || resource.data.context') small {{resource.data.published|dateFormat('ddd, D MMMM HH:mm')}} - v-card-text - div.mt-1(v-html='resource_filter(resource.data.content)') - span(v-for='attachment in resource.data.attachment' :key='attachment.url' @click='showResource(resource)') - span {{attachment}} - audio(v-if='isAudio(attachment)' controls) - source(:src='attachment.url') - v-img.cursorPointer(v-if='isImg(attachment)' :src='attachment.url' - max-height="200px" - max-width="200px" - contain :alt='attachment.name') + span.previewImage(@click='showResource(resource)') + img(v-for='img in resource.data.attachment' :src='img.url') //- Next/prev arrow .text-center.mt-5.mb-5 @@ -256,15 +243,6 @@ export default { window.removeEventListener('keydown', this.keyDown) }, methods: { - isImg (attachment) { - const type = attachment.mediaType.split('/')[0] - console.error(type) - return type === 'image' - }, - isAudio (attachment) { - const type = attachment.mediaType.split('/')[0] - return type === 'audio' - }, keyDown (ev) { if (ev.altKey || ev.ctrlKey || ev.metaKey || ev.shiftKey) { return } if (ev.key === 'ArrowRight' && this.event.next) { @@ -277,7 +255,7 @@ export default { showResource (resource) { this.showResources = true this.selectedResource = resource - // document.getElementById('resourceDialog').focus() + document.getElementById('resourceDialog').focus() }, async hideResource (resource, hidden) { await this.$axios.$put(`/resources/${resource.id}`, { hidden }) diff --git a/server/federation/helpers.js b/server/federation/helpers.js index 6160bf5d..bc025444 100644 --- a/server/federation/helpers.js +++ b/server/federation/helpers.js @@ -211,10 +211,7 @@ const Helpers = { log.info(`Actor ${req.body.actor} not found`) return res.status(401).send('Actor not found') } - if (httpSignature.verifySignature(parsed, user.object.publicKey.publicKeyPem)) { - log.debug(`Valid signature from ${req.body.actor} `) - return next() - } + if (httpSignature.verifySignature(parsed, user.object.publicKey.publicKeyPem)) { return next() } // still not valid log.info(`Invalid signature from user ${req.body.actor}`) From 37b966787bbbf4a6dd445c4932247e94c4341e84 Mon Sep 17 00:00:00 2001 From: les Date: Fri, 25 Jun 2021 11:43:50 +0200 Subject: [PATCH 009/271] minor --- server/federation/helpers.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/federation/helpers.js b/server/federation/helpers.js index bc025444..6160bf5d 100644 --- a/server/federation/helpers.js +++ b/server/federation/helpers.js @@ -211,7 +211,10 @@ const Helpers = { log.info(`Actor ${req.body.actor} not found`) return res.status(401).send('Actor not found') } - if (httpSignature.verifySignature(parsed, user.object.publicKey.publicKeyPem)) { return next() } + if (httpSignature.verifySignature(parsed, user.object.publicKey.publicKeyPem)) { + log.debug(`Valid signature from ${req.body.actor} `) + return next() + } // still not valid log.info(`Invalid signature from user ${req.body.actor}`) From afee09f010d3115458be580d00f5c285e1a21c79 Mon Sep 17 00:00:00 2001 From: les Date: Fri, 25 Jun 2021 11:45:16 +0200 Subject: [PATCH 010/271] do not ask for null image --- pages/event/_id.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/event/_id.vue b/pages/event/_id.vue index 7277cfdd..160175ee 100644 --- a/pages/event/_id.vue +++ b/pages/event/_id.vue @@ -11,7 +11,7 @@ v-container#event.pa-0.pa-sm-2 v-row v-col.col-12.col-lg-8 //- fake image to use u-featured in h-event microformat - img.u-featured(v-show='false' :src='`${settings.baseurl}${imgPath}`') + img.u-featured(v-show='false' v-if='event.image_path' :src='`${settings.baseurl}${imgPath}`') v-img.main_image.mb-3( contain :src='imgPath' From 14fd41672745af93a2d904945d42ec2a86e45b19 Mon Sep 17 00:00:00 2001 From: les Date: Fri, 25 Jun 2021 12:11:45 +0200 Subject: [PATCH 011/271] improve AP resource UI --- CHANGELOG | 4 ++++ assets/style.less | 8 +++++++ pages/event/_id.vue | 51 ++++++++++++++++++++++++++++++--------------- 3 files changed, 46 insertions(+), 17 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 67ad4a66..4126850f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,10 @@ All notable changes to this project will be documented in this file. ### Unreleased + + - fix AP resource removal + - improve AP resource UI + ### 1.0 (alpha) This release is a complete rewrite of frontend UI and many internals, main changes are: diff --git a/assets/style.less b/assets/style.less index 4dc453ee..984fe181 100644 --- a/assets/style.less +++ b/assets/style.less @@ -37,6 +37,9 @@ li { .v-dialog { width: 600px; max-width: 800px; + &.v-dialog--fullscreen { + max-width: 100%; + } } .theme--dark.v-list { @@ -116,4 +119,9 @@ li { white-space: nowrap; overflow: hidden; display: block; +} + + +.cursorPointer { + cursor: pointer; } \ No newline at end of file diff --git a/pages/event/_id.vue b/pages/event/_id.vue index 160175ee..daba1346 100644 --- a/pages/event/_id.vue +++ b/pages/event/_id.vue @@ -64,31 +64,33 @@ v-container#event.pa-0.pa-sm-2 //- resources from fediverse #resources.mt-1(v-if='settings.enable_federation') - div.float-right(v-if='!settings.hide_boosts') - small.mr-3 🔖 {{event.likes.length}} - small ✊ {{event.boost.length}}
    + //- div.float-right(v-if='!settings.hide_boosts') + //- small.mr-3 🔖 {{event.likes.length}} + //- small ✊ {{event.boost.length}}
    - v-dialog.showResource#resourceDialog(v-model='showResources' fullscreen - width='95vw' + v-dialog(v-model='showResources' + fullscreen destroy-on-close @keydown.native.right='$refs.carousel.next()' @keydown.native.left='$refs.carousel.prev()') - v-carousel(:interval='10000' ref='carousel' arrow='always') - v-carousel-item(v-for='attachment in selectedResource.data.attachment' :key='attachment.url') - v-img(:src='attachment.url') - v-list.mb-1(v-if='settings.enable_resources' v-for='resource in event.resources' dark + v-carousel.pa-5(:interval='10000' ref='carousel' hide-delimiters height='100%' show-arrows-on-over) + v-carousel-item(v-for='attachment in selectedResource.data.attachment' + v-if='isImg(attachment)' + :key='attachment.url') + v-img(:src='attachment.url' contain max-width='100%' max-height='100%') + + v-card#resources.mb-1(v-if='settings.enable_resources' v-for='resource in event.resources' :key='resource.id' :class='{disabled: resource.hidden}') - v-list-item - v-list-title + v-card-subtitle v-menu(v-if='$auth.user && $auth.user.is_admin' offset-y) - template(v-slot:activator="{ on, attrs }") - v-btn.mr-2(v-on='on' v-attrs='attrs' color='primary' small icon outlined) + template(v-slot:activator="{ on }") + v-btn.mr-2(v-on='on' color='primary' small icon) v-icon mdi-dots-vertical v-list v-list-item(v-if='!resource.hidden' @click='hideResource(resource, true)') v-list-item-title mdi-eye-off {{$t('admin.hide_resource')}} v-list-item(v-else @click='hideResource(resource, false)') - v-list-item-title mdi-eye-on {{$t('admin.show_resource')}} + v-list-item-title mdi-eye {{$t('admin.show_resource')}} v-list-item(@click='deleteResource(resource)') v-list-item-title mdi-delete {{$t('admin.delete_resource')}} v-list-item(@click='blockUser(resource)') @@ -97,9 +99,16 @@ v-container#event.pa-0.pa-sm-2 a(:href='resource.data.url || resource.data.context') small {{resource.data.published|dateFormat('ddd, D MMMM HH:mm')}} + v-card-text + div.mt-1(v-html='resource_filter(resource.data.content)') - span.previewImage(@click='showResource(resource)') - img(v-for='img in resource.data.attachment' :src='img.url') + span(v-for='attachment in resource.data.attachment' :key='attachment.url' @click='showResource(resource)') + audio(v-if='isAudio(attachment)' controls) + source(:src='attachment.url') + v-img.cursorPointer(v-if='isImg(attachment)' :src='attachment.url' + max-height="250px" + max-width="250px" + contain :alt='attachment.name') //- Next/prev arrow .text-center.mt-5.mb-5 @@ -243,6 +252,14 @@ export default { window.removeEventListener('keydown', this.keyDown) }, methods: { + isImg (attachment) { + const type = attachment.mediaType.split('/')[0] + return type === 'image' + }, + isAudio (attachment) { + const type = attachment.mediaType.split('/')[0] + return type === 'audio' + }, keyDown (ev) { if (ev.altKey || ev.ctrlKey || ev.metaKey || ev.shiftKey) { return } if (ev.key === 'ArrowRight' && this.event.next) { @@ -255,7 +272,7 @@ export default { showResource (resource) { this.showResources = true this.selectedResource = resource - document.getElementById('resourceDialog').focus() + // document.getElementById('resourceDialog').focus() }, async hideResource (resource, hidden) { await this.$axios.$put(`/resources/${resource.id}`, { hidden }) From 72141cf5d6890341d0b6aa115130b9880629c5a3 Mon Sep 17 00:00:00 2001 From: Nathan Date: Mon, 28 Jun 2021 10:04:54 +0000 Subject: [PATCH 012/271] Translated using Weblate (French) Currently translated at 100.0% (230 of 230 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/fr/ --- locales/fr.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/locales/fr.json b/locales/fr.json index a6e1680a..8be181d8 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -84,7 +84,9 @@ "address": "Adresse", "where": "Où", "send": "Envoyer", - "export": "Exporter" + "export": "Exporter", + "label": "Nom", + "max_events": "Nb. max d'événements" }, "event": { "follow_me_description": "Une des manières de rester informé sur les évènements publiés ici sur {title}\nest de suivre le compte {account} sur le fediverse, par exemple via Mastodon, et pourquoi pas d'ajouter des ressources à un évènement à partir de là.

    \nSi vous n'avez jamais entendu parler de Mastodon and du fediverse, nous vous recommandons de lire cet article (en anglais).

    Saisissez votre nom d'instance ci-dessous (par ex. mastodon.social)", @@ -129,7 +131,8 @@ "recurrent_2m_days": "|Le {days} un mois sur deux|Les {jours} un mois sur deux", "recurrent_2w_days": "Un {days} sur deux", "edit_recurrent": "Modifier l’évènement récurrent :", - "updated": "Évènement mis à jour" + "updated": "Évènement mis à jour", + "import_description": "Vous pouvez importer des événements depuis d'autres plateformes ou d'autres instances à travers des formats standards (ics et h-event)" }, "register": { "description": "Les mouvements sociaux doivent s'organiser et s'autofinancer.
    \n
    Avant de pouvoir publier, le compte doit être approuvé, considérez que derrière ce site vous trouverez de vraies personnes, à qui vous pouvez écrire en deux lignes pour exprimer les évènements que vous souhaiteriez publier.", @@ -200,7 +203,8 @@ "remove_admin": "Supprimer l'administrateur", "delete_user": "Supprimer", "event_confirm_description": "Vous pouvez confirmer les évènements ajoutés par des utilisateurs anonymes ici", - "place_description": "Si vous avez donné le mauvais lieu ou la mauvaise adresse, vous pouvez les modifier.
    Tous les évènements courants et passés associés à ce lieu seront mis à jour." + "place_description": "Si vous avez donné le mauvais lieu ou la mauvaise adresse, vous pouvez les modifier.
    Tous les évènements courants et passés associés à ce lieu seront mis à jour.", + "add_instance": "Ajouter une instance" }, "oauth": { "scopes": { From c42d5d42769da8833cb2c2b9f7455e58ebab6bda Mon Sep 17 00:00:00 2001 From: les Date: Mon, 28 Jun 2021 12:49:53 +0200 Subject: [PATCH 013/271] improve AP resources reply UI --- pages/event/_id.vue | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pages/event/_id.vue b/pages/event/_id.vue index daba1346..30978be1 100644 --- a/pages/event/_id.vue +++ b/pages/event/_id.vue @@ -71,17 +71,23 @@ v-container#event.pa-0.pa-sm-2 v-dialog(v-model='showResources' fullscreen destroy-on-close - @keydown.native.right='$refs.carousel.next()' - @keydown.native.left='$refs.carousel.prev()') - v-carousel.pa-5(:interval='10000' ref='carousel' hide-delimiters height='100%' show-arrows-on-over) + scrollable + transition='dialog-bottom-transition') + v-card + v-btn.ma-2(icon dark @click='showResources = false') + v-icon mdi-close + v-carousel.pa-5(:interval='10000' ref='carousel' hide-delimiters v-model='currentAttachment' + height='100%' show-arrows-on-over) v-carousel-item(v-for='attachment in selectedResource.data.attachment' v-if='isImg(attachment)' :key='attachment.url') v-img(:src='attachment.url' contain max-width='100%' max-height='100%') + v-card-actions.align-center.justify-center + span {{currentAttachmentLabel}} - v-card#resources.mb-1(v-if='settings.enable_resources' v-for='resource in event.resources' - :key='resource.id' :class='{disabled: resource.hidden}') - v-card-subtitle + v-card.grey.darken-4.mb-3#resources(v-if='settings.enable_resources' v-for='resource in event.resources' + :key='resource.id' :class='{disabled: resource.hidden}' elevation='10' outlined) + v-card-title v-menu(v-if='$auth.user && $auth.user.is_admin' offset-y) template(v-slot:activator="{ on }") v-btn.mr-2(v-on='on' color='primary' small icon) @@ -102,10 +108,10 @@ v-container#event.pa-0.pa-sm-2 v-card-text div.mt-1(v-html='resource_filter(resource.data.content)') - span(v-for='attachment in resource.data.attachment' :key='attachment.url' @click='showResource(resource)') + span(v-for='attachment in resource.data.attachment' :key='attachment.url') audio(v-if='isAudio(attachment)' controls) source(:src='attachment.url') - v-img.cursorPointer(v-if='isImg(attachment)' :src='attachment.url' + v-img.cursorPointer(v-if='isImg(attachment)' :src='attachment.url' @click='showResource(resource)' max-height="250px" max-width="250px" contain :alt='attachment.name') @@ -127,6 +133,7 @@ v-container#event.pa-0.pa-sm-2 import { mapState } from 'vuex' import EventAdmin from './eventAdmin' import EmbedEvent from './embedEvent' +import get from 'lodash/get' import moment from 'dayjs' const htmlToText = require('html-to-text') @@ -143,6 +150,7 @@ export default { }, data () { return { + currentAttachment: 0, event: {}, showEmbed: false, showResources: false, @@ -230,6 +238,9 @@ export default { plainDescription () { return htmlToText.fromString(this.event.description.replace('\n', '').slice(0, 1000)) }, + currentAttachmentLabel () { + return get(this.selectedResource, `data.attachment[${this.currentAttachment}].name`, '') + }, imgPath () { return '/media/' + this.event.image_path }, From 11e026e099dffeb8d4a8ac5793be9f8f268b66b8 Mon Sep 17 00:00:00 2001 From: les Date: Thu, 1 Jul 2021 10:56:12 +0200 Subject: [PATCH 014/271] fix docker setup --- docs/docker/Dockerfile | 4 ++++ docs/docker/entrypoint.sh | 4 ++++ docs/docker/postgres/docker-compose.yml | 3 ++- docs/docker/sqlite/docker-compose.yml | 3 ++- docs/install/docker.md | 8 ++++---- 5 files changed, 16 insertions(+), 6 deletions(-) create mode 100755 docs/docker/entrypoint.sh diff --git a/docs/docker/Dockerfile b/docs/docker/Dockerfile index c1c89a34..7ea8472d 100644 --- a/docs/docker/Dockerfile +++ b/docs/docker/Dockerfile @@ -1,2 +1,6 @@ FROM node:buster RUN yarn global add --silent https://gancio.org/latest.tgz 2> /dev/null + +ADD entrypoint.sh / +RUN chmod 755 /entrypoint.sh +ENTRYPOINT [ "/bin/sh", "/entrypoint.sh" ] diff --git a/docs/docker/entrypoint.sh b/docs/docker/entrypoint.sh new file mode 100755 index 00000000..7f124b75 --- /dev/null +++ b/docs/docker/entrypoint.sh @@ -0,0 +1,4 @@ +#!/bin/bash +chown -R node:node /home/node +su node -c "$*" + diff --git a/docs/docker/postgres/docker-compose.yml b/docs/docker/postgres/docker-compose.yml index 74b8476e..0414194e 100644 --- a/docs/docker/postgres/docker-compose.yml +++ b/docs/docker/postgres/docker-compose.yml @@ -19,12 +19,13 @@ services: build: . restart: always image: node:buster - user: node container_name: gancio environment: - PATH=$PATH:/home/node/.yarn/bin - GANCIO_DATA=/home/node/data + - NODE_ENV=production command: gancio start --docker + entrypoint: /entrypoint.sh volumes: - ./data:/home/node/data ports: diff --git a/docs/docker/sqlite/docker-compose.yml b/docs/docker/sqlite/docker-compose.yml index 478aa72c..e5e3fa18 100644 --- a/docs/docker/sqlite/docker-compose.yml +++ b/docs/docker/sqlite/docker-compose.yml @@ -5,11 +5,12 @@ services: build: . restart: always image: node:buster - user: node container_name: gancio environment: - PATH=$PATH:/home/node/.yarn/bin - GANCIO_DATA=/home/node/data + - NODE_ENV=production + entrypoint: /entrypoint.sh command: gancio start --docker volumes: - ./data:/home/node/data diff --git a/docs/install/docker.md b/docs/install/docker.md index 7e405818..3dd7ecab 100644 --- a/docs/install/docker.md +++ b/docs/install/docker.md @@ -13,12 +13,9 @@ nav_order: 2 ## Initial setup -> info "Clone not needed" -> You do not need to clone the full repo, a `Dockerfile` and a `docker-compose.yml` are enough. - - __Create a directory where everything related to gancio is stored__ ```bash -mkdir -p /opt/gancio/data +mkdir -p /opt/gancio cd /opt/gancio ``` @@ -27,6 +24,7 @@ cd /opt/gancio 1. **Download docker-compose.yml and Dockerfile** ```bash wget {{site.url}}{% link /docker/Dockerfile %} +wget {{site.url}}{% link /docker/entrypoint.sh %} wget {{site.url}}{% link /docker/sqlite/docker-compose.yml %} ``` @@ -44,6 +42,7 @@ docker-compose run --rm gancio gancio setup --docker --db=sqlite 1. **Download docker-compose.yml and Dockerfile** ```bash wget {{site.url}}{% link /docker/Dockerfile %} +wget {{site.url}}{% link /docker/entrypoint.sh %} wget {{site.url}}{% link /docker/postgres/docker-compose.yml %} ``` @@ -86,6 +85,7 @@ tail -f data/logs/gancio.log > 1. `cd /opt/gancio` > 1. [Backup your data]({% link install/backup.md %}) > 1. Download new `Dockerfile`
    `wget {{site.url}}{% link /docker/Dockerfile %}` +> 1. Download new `entrypoint.sh`
    `wget {{site.url}}{% link /docker/entrypoint.sh %}` > 1. Download new `docker-compose.yml` (substitute `sqlite` with `postgres` in case):
    `wget {{site.url}}{% link /docker/sqlite/docker-compose.yml %}` > 1. Build the new container `docker-compose build` > 1. Extract your backup into `./data`
    `mkdir data; tar xvzf gancio--backup.tgz -C data` From d04e14b6024465e01f00611f4207837c91b5b134 Mon Sep 17 00:00:00 2001 From: les Date: Thu, 1 Jul 2021 10:57:01 +0200 Subject: [PATCH 015/271] cleaning --- server/firstrun.js | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/server/firstrun.js b/server/firstrun.js index e29b8068..d793b502 100644 --- a/server/firstrun.js +++ b/server/firstrun.js @@ -38,7 +38,6 @@ module.exports = { // sync db const db = require('./api/models/index') const User = require('./api/models/user') - // const Notification = require('./api/models/notification') const users = await User.findAll() if (users.length) { consola.warn(' ⚠ Non empty db! Please move your current db elsewhere than retry.') @@ -54,28 +53,6 @@ module.exports = { is_active: true }) - // add default notification - consola.info('Add default notification') - - // await db.announcement.create({ - // visible: true, - // title: 'Welcome to Gancio', - // announcement: 'TODO: HTML First presentation post' - // }) - - // try { - - // // send confirmed events to mastodon - // await Notification.create({ action: 'Create', type: 'ap', filters: '{ "is_visible": true }' }) - // await Notification.create({ action: 'Update', type: 'ap', filters: '{ "is_visible": true }' }) - // await Notification.create({ action: 'Delete', type: 'ap', filters: '{ "is_visible": true }' }) - // // // send anon events to admin - // await Notification.create({ action: 'Create', type: 'admin_email', filters: '{ "is_visible": false }' }) - // } - - // TODO email's notifications - // await db.notification.create({ action: 'Create', type: 'email', filters: { is_visible: true } }) - // close db connection await db.close() From 2e85e0318b09619e470a3ed46f0df3e9b6d13165 Mon Sep 17 00:00:00 2001 From: les Date: Thu, 1 Jul 2021 10:59:53 +0200 Subject: [PATCH 016/271] add None as SMTP setup option --- server/cli.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/server/cli.js b/server/cli.js index d07fbad4..d720ef68 100755 --- a/server/cli.js +++ b/server/cli.js @@ -174,7 +174,7 @@ async function setupQuestionnaire (is_docker, db) { name: 'smtp_type', message: 'How should we send the emails ?', type: 'list', - choices: ['SMTP', 'sendmail'] + choices: ['SMTP', 'sendmail', 'None (choose later)'] }) questions.push({ @@ -190,13 +190,13 @@ async function setupQuestionnaire (is_docker, db) { message: 'SMTP Host', default: 'localhost', validate: notEmpty, - when: answers => answers.smtp_type !== 'sendmail' + when: answers => answers.smtp_type === 'SMTP' }) questions.push({ name: 'smtp.secure', message: 'Does SMTP server support TLS?', - when: answers => answers.smtp_type !== 'sendmail' && !['localhost', '127.0.0.1'].includes(answers.smtp.host), + when: answers => answers.smtp_type === 'SMTP' && !['localhost', '127.0.0.1'].includes(answers.smtp.host), default: true, type: 'confirm' }) @@ -205,7 +205,7 @@ async function setupQuestionnaire (is_docker, db) { name: 'smtp.port', message: 'SMTP Port', default: answers => ['localhost', '127.0.0.1'].includes(answers.smtp.host) ? 25 : (answers.smtp.secure ? 465 : 587), - when: answers => answers.smtp_type !== 'sendmail' + when: answers => answers.smtp_type === 'SMTP' }) questions.push({ @@ -213,7 +213,7 @@ async function setupQuestionnaire (is_docker, db) { message: 'is SMTP authentication needed?', type: 'confirm', default: answers => !['localhost', '127.0.0.1'].includes(answers.smtp.host), - when: answers => answers.smtp_type !== 'sendmail' + when: answers => answers.smtp_type === 'SMTP' }) questions.push({ @@ -221,7 +221,7 @@ async function setupQuestionnaire (is_docker, db) { message: 'SMTP User', validate: notEmpty, default: answers => answers.admin.email, - when: answers => answers.smtp_type !== 'sendmail' && answers.smtp_need_auth + when: answers => answers.smtp_type === 'SMTP' && answers.smtp_need_auth }) questions.push({ @@ -229,7 +229,7 @@ async function setupQuestionnaire (is_docker, db) { message: 'SMTP Password', type: 'password', validate: notEmpty, - when: answers => answers.smtp_type !== 'sendmail' && answers.smtp_need_auth + when: answers => answers.smtp_type === 'SMTP' && answers.smtp_need_auth }) const answers = await inquirer.prompt(questions) @@ -287,7 +287,7 @@ async function start (options) { if (firstrun.check(options.config)) { if (options.docker) { consola.error( - '⚠ ️ Something goes wrong, did you run "docker-compose run --rm gancio gancio setup"' + '⚠ ️ Something goes wrong, did you run "docker-compose run --rm gancio gancio setup --docker --db="' ) process.exit(-1) } From 6c3673937234a08e96ed45c800b5ab10ed8ebf3c Mon Sep 17 00:00:00 2001 From: les Date: Thu, 1 Jul 2021 12:19:44 +0200 Subject: [PATCH 017/271] improve admin resource management --- CHANGELOG | 3 +- components/admin/Moderation.vue | 115 ++++++++++++------------------ locales/en.json | 3 +- locales/it.json | 9 +-- server/api/controller/resource.js | 23 +++++- yarn.lock | 105 +++++++++------------------ 6 files changed, 110 insertions(+), 148 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4126850f..7bacb35b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,8 @@ All notable changes to this project will be documented in this file. - fix AP resource removal - improve AP resource UI - + - fix Docker setup + - update deps ### 1.0 (alpha) This release is a complete rewrite of frontend UI and many internals, main changes are: diff --git a/components/admin/Moderation.vue b/components/admin/Moderation.vue index 01184f17..738ae85e 100644 --- a/components/admin/Moderation.vue +++ b/components/admin/Moderation.vue @@ -13,8 +13,7 @@ dense :headers='instancesHeader' @click:row='instanceSelected') template(v-slot:item.blocked="{ item }") - v-icon(v-if='item.blocked') mdi-checkbox-intermediate - v-icon(v-else) mdi-checkbox-blank-outline + v-icon(@click='toggleBlock(item)') {{item.blocked ? 'mdi-checkbox-intermediate' : 'mdi-checkbox-blank-outline'}} v-col(:span='11') span {{$t('common.users')}} @@ -24,49 +23,39 @@ :search='usersFilter' :hide-default-footer='users.length<5' dense :headers='usersHeader') - //- template(v-slot:item.username="{item}") - //- a(:href='item.ap_id') {{item.object.preferredUsername}} - //- el-table-column(:label="$t('common.user')" width='150') - //- template(slot-scope='data') - //- span(slot='reference') - //- a(:href='data.row.object.id' target='_blank') {{data.row.object.name}} - //- small ({{data.row.object.preferredUsername}}) - //- el-table-column(:label="$t('common.resources')" width='90') - //- template(slot-scope='data') - //- span {{data.row.resources.length}} - //- el-table-column(:label="$t('common.actions')" width='200') - //- template(slot-scope='data') - //- el-button-group - //- el-button(size='mini' - //- :type='data.row.blocked?"danger":"warning"' - //- @click='toggleUserBlock(data.row)') {{data.row.blocked?$t('admin.unblock'):$t('admin.block')}} + template(v-slot:item.blocked="{ item }") + v-icon(@click='toggleUserBlock(item)') {{item.blocked?'mdi-checkbox-intermediate':'mdi-checkbox-blank-outline'}} div v-card-title {{$t('common.resources')}} - v-data-table(:items='resources' + v-data-table(:items='resources' dense + :headers='resourcesHeader' :hide-default-footer='resources.length<10' - ) - //- el-table-column(:label="$t('common.event')") - //- template(slot-scope='data') - //- span {{data.row.event}} - //- el-table-column(:label="$t('common.resources')") - //- template(slot-scope='data') - //- span(:class='{disabled: data.row.hidden}' v-html='data.row.data.content') - //- el-table-column(:label="$t('common.user')" width='200') - //- template(slot-scope='data') - //- span(:class='{disabled: data.row.hidden}' v-html='data.row.data.actor') - //- el-table-column(:label="$t('common.actions')" width="150") - //- template(slot-scope='data') - //- el-dropdown - //- el-button(type="primary" icon="el-icon-arrow-down" size='mini') {{$t('common.moderation')}} - //- el-dropdown-menu(slot='dropdown') - //- el-dropdown-item(v-if='!data.row.hidden' icon='el-icon-remove' @click.native='hideResource(data.row, true)') {{$t('admin.hide_resource')}} - //- el-dropdown-item(v-else icon='el-icon-success' @click.native='hideResource(data.row, false)') {{$t('admin.show_resource')}} - //- el-dropdown-item(icon='el-icon-delete' @click.native='deleteResource(data.row)') {{$t('admin.delete_resource')}} - //- el-dropdown-item(icon='el-icon-lock' @click.native='toggleUserBlock(data.row.ap_user)') {{$t('admin.block_user')}} + :items-per-page='10') + template(v-slot:item.content='{ item }') + span(v-html='item.data.content') + template(v-slot:item.user='{ item }') + span {{item.ap_user.preferredUsername}} + template(v-slot:item.event='{ item }') + span {{item.event.title}} + template(v-slot:item.actions='{ item }') + v-menu(offset-y) + template(v-slot:activator="{ on }") + v-btn.mr-2(v-on='on' color='primary' small icon) + v-icon mdi-dots-vertical + v-list + v-list-item(v-if='!item.hidden' @click='hideResource(item, true)') + v-list-item-title mdi-eye-off {{$t('admin.hide_resource')}} + v-list-item(v-else @click='hideResource(item, false)') + v-list-item-title mdi-eye {{$t('admin.show_resource')}} + v-list-item(@click='deleteResource(item)') + v-list-item-title mdi-delete {{$t('admin.delete_resource')}} + //- v-list-item(@click='toggleUserBlock(item.ap_user)') + //- v-list-item-title mdi-lock {{$t('admin.block_user')}} diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue index 64551851..a6d47872 100644 --- a/pages/add/_edit.vue +++ b/pages/add/_edit.vue @@ -45,14 +45,7 @@ //- MEDIA / FLYER / POSTER v-col(cols=12 md=6) - v-file-input( - :label="$t('common.media')" - :hint="$t('event.media_description')" - prepend-icon="mdi-camera" - v-model='event.image' - persistent-hint - accept='image/*') - v-img.col-12.col-sm-2.ml-3(v-if='mediaPreview' :src='mediaPreview') + MediaInput(v-model='event.media[0]' :event='event' @remove='event.media=[]') //- tags v-col(cols=12 md=6) @@ -66,7 +59,7 @@ v-card-actions v-spacer v-btn(@click='done' :loading='loading' :disabled='!valid || loading' - color='primary') {{edit?$t('common.edit'):$t('common.send')}} + color='primary') {{edit?$t('common.save'):$t('common.send')}} + diff --git a/server/helpers.js b/server/helpers.js index 7e846110..8c8bb416 100644 --- a/server/helpers.js +++ b/server/helpers.js @@ -132,6 +132,7 @@ module.exports = { } const events = data.items.map(e => { const props = e.properties + const media = get(props, 'featured[0]') return { title: get(props, 'name[0]', ''), description: get(props, 'description[0]', ''), @@ -142,7 +143,7 @@ module.exports = { start_datetime: dayjs(get(props, 'start[0]', '')).unix(), end_datetime: dayjs(get(props, 'end[0]', '')).unix(), tags: get(props, 'category', []), - media: { url: get(props, 'featured[0]') } + media: media ? [{ name: get(props, 'name[0]', ''), url: get(props, 'featured[0]'), focalpoint: [0, 0] }] : [] } }) return res.json(events) diff --git a/views/feed/rss.pug b/views/feed/rss.pug index 71a1a085..efa285de 100644 --- a/views/feed/rss.pug +++ b/views/feed/rss.pug @@ -14,7 +14,7 @@ rss(version='2.0' xmlns:atom="http://www.w3.org/2005/Atom") |

    #{event.title}

    | #{event.place.name} - #{event.place.address} | (#{moment.unix(event.start_datetime).format("dddd, D MMMM HH:mm")})
    - if (event.media) + if (event.media && event.media.length) | #{event.media[0].name} | 
    !{event.description}
    | ]]> From 579fd90c2d76d0955ecb49d2625503c2bfb9e0df Mon Sep 17 00:00:00 2001 From: les Date: Mon, 19 Jul 2021 12:16:16 +0200 Subject: [PATCH 065/271] fix push from wpgancio --- pages/event/_id.vue | 13 ++++++++----- server/api/controller/event.js | 19 +++++++++++++------ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/pages/event/_id.vue b/pages/event/_id.vue index ad79404f..c47a5b37 100644 --- a/pages/event/_id.vue +++ b/pages/event/_id.vue @@ -11,14 +11,14 @@ v-container#event.pa-0.pa-sm-2 v-row v-col.col-12.col-lg-8 //- fake image to use u-featured in h-event microformat - img.u-featured(v-show='false' v-if='event.media' :src='event | mediaURL') + img.u-featured(v-show='false' v-if='hasMedia' :src='event | mediaURL') v-img.main_image.mb-3( contain :alt='event | mediaURL("alt")' :src='event | mediaURL' :lazy-src='event | mediaURL("thumb")' - v-if='event.media && event.media.length') - .p-description.text-body-1.pa-3.grey.darken-4.rounded(v-if='!event.media && event.description' v-html='event.description') + v-if='hasMedia') + .p-description.text-body-1.pa-3.grey.darken-4.rounded(v-if='!hasMedia && event.description' v-html='event.description') v-col.col-12.col-lg-4 v-card @@ -61,11 +61,11 @@ v-container#event.pa-0.pa-sm-2 :href='`/api/event/${event.slug || event.id}.ics`') v-icon mdi-calendar-export - .p-description.text-body-1.pa-3.grey.darken-4.rounded(v-if='event.media && event.description' v-html='event.description') + .p-description.text-body-1.pa-3.grey.darken-4.rounded(v-if='hasMedia && event.description' v-html='event.description') //- resources from fediverse #resources.mt-1(v-if='settings.enable_federation') - //- div.float-right(v-if='!settings.hide_boosts') + //- div.float-right(v-if='settings.hide_boosts') //- small.mr-3 🔖 {{event.likes.length}} //- small ✊ {{event.boost.length}}
    @@ -236,6 +236,9 @@ export default { }, computed: { ...mapState(['settings']), + hasMedia () { + return this.event.media && this.event.media.length + }, plainDescription () { return htmlToText.fromString(this.event.description.replace('\n', '').slice(0, 1000)) }, diff --git a/server/api/controller/event.js b/server/api/controller/event.js index 01a770ca..f833cb3b 100644 --- a/server/api/controller/event.js +++ b/server/api/controller/event.js @@ -297,13 +297,15 @@ const eventController = { url = await helpers.getImageFromURL(body.image_url) } - const focalpoint = body.image_focalpoint ? body.image_focalpoint.split(',') : [0, 0] + const focalpoint = body.image_focalpoint ? body.image_focalpoint.split(',') : ['0', '0'] eventDetails.media = [{ url, name: body.image_name || '', - focalpoint: [parseFloat(focalpoint[0]), parseFloat(focalpoint[1].toFixed(2))] + focalpoint: [parseFloat(focalpoint[0].slice(0, 6)), parseFloat(focalpoint[1].slice(0, 6))] }] + } else { + eventDetails.media = [] } const event = await Event.create(eventDetails) @@ -374,7 +376,7 @@ const eventController = { recurrent } - if ((req.file || /^https?:\/\//.test(body.image_url)) && !event.recurrent && event.media.length) { + if ((req.file || /^https?:\/\//.test(body.image_url)) && !event.recurrent && event.media && event.media.length) { const old_path = path.resolve(config.upload_path, event.media[0].url) const old_thumb_path = path.resolve(config.upload_path, 'thumb', event.media[0].url) try { @@ -395,8 +397,8 @@ const eventController = { } } - if (body.image_focalpoint) { - const focalpoint = body.image_focalpoint ? body.image_focalpoint.split(',') : [0, 0] + if (url && !event.recurrent) { + const focalpoint = body.image_focalpoint ? body.image_focalpoint.split(',') : ['0', '0'] eventDetails.media = [{ url, name: body.image_name || '', @@ -452,7 +454,12 @@ const eventController = { } const notifier = require('../../notifier') await notifier.notifyEvent('Delete', event.id) - log.debug('[EVENT REMOVED]', event.title) + + // unassociate child events + if (event.recurrent) { + await Event.update({ parentId: null }, { where: { parentId: event.id } }) + } + log.debug('[EVENT REMOVED] ' + event.title) await event.destroy() res.sendStatus(200) } else { From 33f2507cbad7f1d1df198b5cd46e08dcff5da242 Mon Sep 17 00:00:00 2001 From: les Date: Mon, 19 Jul 2021 12:29:35 +0200 Subject: [PATCH 066/271] add attachment with focalPoint to AP --- server/api/models/event.js | 19 +++++++++++-------- server/federation/helpers.js | 3 ++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/server/api/models/event.js b/server/api/models/event.js index 0b226dd0..d4ec1e7f 100644 --- a/server/api/models/event.js +++ b/server/api/models/event.js @@ -86,15 +86,18 @@ Event.prototype.toAPNote = function (username, locale, to = []) { ${tags && tags.map(t => `#${t}`)} ` - // const attachment = [] + const attachment = [] + if (this.media && this.media.length) { + attachment.push({ + type: 'Document', + mediaType: 'image/jpeg', + url: `${config.baseurl}/media/${this.media[0].url}`, + name: this.media[0].name || '', + blurHash: null, + focalPoint: this.media[0].focalPoint || [0, 0] + }) + } // if (this.image_path) { - // attachment.push({ - // type: 'Document', - // mediaType: 'image/jpeg', - // url: `${config.baseurl}/media/${this.image_path}`, - // name: null, - // blurHash: null - // }) // } return { diff --git a/server/federation/helpers.js b/server/federation/helpers.js index e0207152..8267465f 100644 --- a/server/federation/helpers.js +++ b/server/federation/helpers.js @@ -97,7 +97,8 @@ const Helpers = { 'https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1', { - Hashtag: 'as:Hashtag' + Hashtag: 'as:Hashtag', + focalPoint: { '@container': '@list', '@id': 'toot:focalPoint' } }] await Helpers.signAndSend(JSON.stringify(body), sharedInbox) } From 1ab40cffd1b49fd7f4826237d74d03ff63958da2 Mon Sep 17 00:00:00 2001 From: La Kelo Gaztetxea Date: Sun, 18 Jul 2021 10:00:11 +0000 Subject: [PATCH 067/271] Translated using Weblate (Spanish) Currently translated at 100.0% (233 of 233 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/es/ --- locales/es.json | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/locales/es.json b/locales/es.json index d92f526c..7faa9442 100644 --- a/locales/es.json +++ b/locales/es.json @@ -46,7 +46,7 @@ "ok": "Ok", "cancel": "Cancelar", "enable": "Habilitar", - "disable": "Deshabilita", + "disable": "Deshabilitar", "me": "Tú", "password_updated": "Contraseña actualizada.", "comments": "ningún comentario|un comentario|{n} comentarios", @@ -85,7 +85,9 @@ "tags": "Tags", "import": "Importar", "reset": "Reset", - "theme": "Tema" + "theme": "Tema", + "label": "Etiqueta", + "max_events": "Número de eventos máximo" }, "login": { "description": "Entrando podrás publicar nuevos eventos.", @@ -128,8 +130,8 @@ "not_found": "Evento no encontrado", "remove_confirmation": "¿Estás seguro/a de querér eliminar este evento?", "recurrent": "Recurrente", - "recurrent_description": "Elegí la frecuencia y selecciona los días.", - "multidate_description": "¿Un festival o más de un día? Elegí cuándo comienza y cuándo termina.", + "recurrent_description": "Elegí la frecuencia y selecciona los días", + "multidate_description": "¿Un festival o más de un día? Elegí cuándo comienza y cuándo termina", "multidate": "Más días", "normal": "Normal", "normal_description": "Selecciona el día.", @@ -154,14 +156,18 @@ "ics": "ICS", "import_ICS": "Importar desde ICS", "import_URL": "Importar desde la URL", - "only_future": "solo eventos venideros" + "only_future": "solo eventos venideros", + "import_description": "Puedes importar eventos de otras plataformas y otras instancias mediante formatos estandars (ics y h-event)", + "edit_recurrent": "Editar evento recurrente:", + "updated": "Evento actualizado", + "saved": "Evento guardado" }, "admin": { - "place_description": "En el caso de que un lugar sea incorrecto o cambie de dirección, puedes cambiarlo.
    En este caso hay que tener en cuenta que todos los eventos asociados con ese lugar cambiarán de dirección (¡incluso los pasados!)", + "place_description": "En el caso de que un lugar sea incorrecto o cambie de dirección, puedes cambiarlo.
    Todos los eventos presentes y pasados asociados con este lugar cambiarán de dirección.", "event_confirm_description": "Puedes confirmar aquí los eventos agregados por usuarios anónimos", "delete_user": "Elimina", "remove_admin": "Borra admin", - "delete_user_confirm": "¿Estás seguro/a de borrar este usuario?", + "delete_user_confirm": "¿Estás seguro/a de borrar a {user}?", "user_remove_ok": "Usuario eliminado", "user_create_ok": "Usuario creado", "allow_registration_description": "¿Querés habilitar el registro?", @@ -170,7 +176,7 @@ "allow_recurrent_event": "Habilitar eventos fijos", "recurrent_event_visible": "Eventos fijos visibles por defecto", "federation": "Federación / ActivityPub", - "enable_federation": "Habilitar la federación!", + "enable_federation": "Habilitar la federación", "enable_federation_help": "Será posible seguir esta instancia desde el fediverso", "select_instance_timezone": "Uso horario", "enable_resources": "Habilitar recursos", @@ -179,7 +185,7 @@ "hide_boost_bookmark_help": "Oculta los pequeños iconos que muestran el número de impulsos y marcadores que vienen del fediverso", "block": "Bloquear", "unblock": "Desbloquear", - "user_add_help": "Enviaremos un correo electrónico al nuevo usuario con instrucciones para confirmar la suscripción y elegir una contraseña.", + "user_add_help": "Enviaremos un correo electrónico al nuevo usuario con instrucciones para confirmar la suscripción y elegir una contraseña", "instance_name": "Nombre de la instancia", "show_resource": "Mostrar recurso", "hide_resource": "Ocultar recurso", @@ -191,7 +197,7 @@ "resources": "Recursos", "user_blocked": "El usuario {usuario} ya no podrá añadir recursos", "favicon": "Logo", - "user_block_confirm": "¿Estás seguro de que quieres bloquear al usuario?", + "user_block_confirm": "¿Estás seguro de que quieres bloquear a {user}?", "delete_announcement_confirm": "¿Estás seguro de que quieres borrar el anuncio?", "announcement_remove_ok": "Anuncio borrado", "announcement_description": "En esta sección se pueden insertar anuncios que permanecerán en la página de inicio", @@ -212,7 +218,10 @@ "delete_footer_link_confirm": "Seguro que quieres quitar este enlace?", "footer_links": "Enlaces a pie de página", "add_link": "Añadir enlace", - "is_dark": "Tema oscuro" + "is_dark": "Tema oscuro", + "instance_block_confirm": "¿Estás seguro/a que quieres bloquear la instancia {instance}?", + "add_instance": "Añadir instancia", + "disable_user_confirm": "Estas seguro de que quieres deshabilitar a {user}?" }, "auth": { "not_confirmed": "Todavía no hemos confirmado este email…", @@ -227,7 +236,7 @@ "update_confirm": "¿Estás seguro de que quieres guardar los cambios?" }, "error": { - "nick_taken": "Este nickname ya está registrado", + "nick_taken": "Este apodo ya está registrado.", "email_taken": "Este correo electrónico ya está registrado." }, "ordinal": { @@ -238,11 +247,11 @@ "5": "quinto", "-1": "último" }, - "about": "\n

    \n Gancio es un proyecto del underscore hacklab y es uno de los\n servicios de cisti.org.

    \n\n
    ¿Que es gancio?
    \n

    Gancio (se pronuncia \"gancho\") es una herramienta para compartir eventos orientado a las comunidades radicales.\n Dentro del gancio pueden encontrar y agregar eventos.\n Gancio, como todo cisti.org es una herramienta\n antisexista, antirracista, antifascista y anticapitalista, así que piensen en eso cuando\n van a publicar un evento.

    \n\n
    Ok, pero ¿que quiere decir gancio?
    \n

    \n Literalmente sería \"enganche\", pero en realidad viene de una forma de decir que se usa en en Turín (Italia). Ahí si alguien dice: \"ehi, ci diamo un gancio alle 8?\" (\"ehi, ¿nos damos un enganche a las 8?\") quiere decir \"ehí, ¿nos vemos a las 8?\". \"Darsi un gancio\" es juntarse a una hora X en un lugar Y.

    \n \n
      \n
    • ¿A qué hora es el gancio para ir a la marcha?
      • \n
    • No sé, de todos modos no puedo ir, ya tengo un gancio para ir a una reunión.
      • \n
    \n     \n\n
    Contactos
    \n

    \n ¿Escribiste una nueva interfaz para gancio? ¿Quieres abrir un gancio en tu ciudad?\n ¿Hay algo que te gustaría mejorar? Para contribuir el código fuente es libre y disponible \n aquí. Ayuda y sugerencias son siempre bienvenidos, puedes comunicarte con nosotros \n enviando un mail a underscore arroba autistici.org

    ", + "about": "\n

    Gancio es una agenda compartida para comunidades locales.

    \n ", "confirm": { "title": "Confirmación de usuario", "not_valid": "Mmmmm algo salió mal.", - "valid": "Su cuenta ha sido confirmada, ahora puede ingresar." + "valid": "Su cuenta ha sido confirmada, ahora puede ingresar" }, "oauth": { "authorization_request": "La aplicación externa {app} requiere permiso para realizar las siguientes tareas en {instance_name}:", From 9ce370de43efacf6e205509a1fb0115650994248 Mon Sep 17 00:00:00 2001 From: La Kelo Gaztetxea Date: Sun, 18 Jul 2021 10:31:09 +0000 Subject: [PATCH 068/271] Translated using Weblate (Basque) Currently translated at 100.0% (233 of 233 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/eu/ --- locales/eu.json | 98 +++++++++++++++++++++++++++++++------------------ 1 file changed, 63 insertions(+), 35 deletions(-) diff --git a/locales/eu.json b/locales/eu.json index 2abb4dc2..913ce1f8 100644 --- a/locales/eu.json +++ b/locales/eu.json @@ -48,7 +48,7 @@ "enable": "Gaitu", "disable": "Desgaitu", "me": "Zu", - "password_updated": "Pasahitza eguneratuta!", + "password_updated": "Pasahitza eguneratuta.", "activate_user": "Egiaztatuta", "displayname": "Erakutsitako izena", "federation": "Federazioa", @@ -80,37 +80,43 @@ "delete": "Ezabatu", "announcements": "Iragarkiak", "url": "URL esteka", - "place": "Lekua" + "place": "Lekua", + "label": "Etiketa", + "max_events": "Max zenbakidun gertaerak", + "import": "Inportatu", + "reset": "Zeroan jarri", + "theme": "Gai", + "tags": "Tags" }, "login": { - "description": "Saioa hasiz gero, ekitaldi berriak sortu ahal izango dituzu", - "check_email": "Begiratu zure postontzi elektronikoan, baita mezu baztergarrietan", + "description": "Saioa hasiz gero, ekitaldi berriak sortu ahal izango dituzu.", + "check_email": "Begiratu zure postontzi elektronikoan, baita mezu baztergarrietan.", "not_registered": "Ez duzu izena eman?", "forgot_password": "Pasahitza ahaztu duzu?", "error": "Ezin da saioa hasi, egiaztatu zure datuok.", "insert_email": "Sartu zure helbide elektronikoa", - "ok": "Saioa hasi duzu!" + "ok": "Saioa hasi duzu" }, "recover": { "not_valid_code": "Mmmmm zerbaitek huts egin du..." }, "export": { - "intro": "Kapitalismoaren plataformek edozer egingo dute erabiltzaileak eta haien datuak gordetzeko. Guk aldiz, informazioak, pertsonen antzera askeak izan behar dutela sinesten dugu. Horretarako gogoko dituzun ekitaldietaz info eguneratuak jaso ditzakezu webgune honetatik pasatzeko beharrik gabe.", - "email_description": "Interesatzen zaizkizun ekitaldiak jaso ditzakezu posta elektronikoan", + "intro": "Kapitalismoaren plataformek edozer egingo dute erabiltzaileak eta haien datuak gordetzeko. Guk aldiz, informazioak, pertsonen antzera askeak izan behar dutela sinesten dugu. Horretarako gogoko dituzun ekitaldietaz info eguneratuak jaso ditzakezu webgune honetatik pasatzeko beharrik gabe.", + "email_description": "Interesatzen zaizkizun ekitaldiak jaso ditzakezu posta elektronikoan.", "insert_your_address": "Sartu zure helbide elektronikoa", - "feed_description": "Eguneraketak sakelekoan edo ordenagailuan jaso nahi badituzu webgune hau bisitatu gabe, RSS jarioa erabiltzea gomendatzen dizugu.

    \n

    RSS jarioarentzat aplikazio berezi bat erabiliko duzu gogoko dituzun weguneetatik berriak jasotzeko. Oso modu egokia da gune askotako berriak erraz eta azkar jasotzeko eta ez da konturik sortu behar!

    \n\n
  • Android baldin badaukazu Flym edo Feeder gomendatzen dizugu
    • \n
  • iPhone/iPad-erako eskuragarri daukazu Feed4U
    • \n
  • Ordenagailuaren kasuan Feedbro iradokitzen dugu, Firefoxeko edo Chromeko gehigarri gisa instalatzen da eta sistema gehienetan dabil.
    • \n
    \nHonako esteka jario irakurgailuan sartuta, eguneraketa guztiak jasoko dituzu.", - "ical_description": "Normalean ordenagailuak eta smartphoneak egutegiak inportatu eta kudeatzeko aplikazioekin etorri ohi dira", - "list_description": "Webgune bat baduzu eta ekitaldien zerrenda erakutsi nahi baduzu, ondorengo kodea erabili dezakezu" + "feed_description": "Eguneraketak sakelekoan edo ordenagailuan jaso nahi badituzu webgune hau bisitatu gabe, RSS jarioa erabiltzea gomendatzen dizugu.

    \n\n

    RSS jarioarentzat aplikazio berezi bat erabiliko duzu gogoko dituzun weguneetatik berriak jasotzeko. Oso modu egokia da gune askotako berriak erraz eta azkar jasotzeko eta ez da konturik sortu behar!

    \n\n
  • Android baldin badaukazu Flym edo Feeder gomendatzen dizugu
    • \n
  • iPhone/iPad-erako eskuragarri daukazu Feed4U
    • \n
  • Ordenagailuaren kasuan Feedbro iradokitzen dugu, Firefoxeko edo Chromeko gehigarri gisa instalatzen da eta sistema gehienetan dabil.
    • \n
    \nHonako esteka jario irakurgailuan sartuta, eguneraketa guztiak jasoko dituzu.", + "ical_description": "Normalean ordenagailuak eta smartphoneak egutegiak inportatu eta kudeatzeko aplikazioekin etorri ohi dira.", + "list_description": "Webgune bat baduzu eta ekitaldien zerrenda erakutsi nahi baduzu, ondorengo kodea erabili dezakezu" }, "register": { - "description": "Herri mugimenduek autoantolaketaren bidean diru-iturrien beharrak dauzkatela badakigu.
    Honako hauxe oparitxoa da, hortaz erabili ezazue ekitaldi ez-komertzialak iragartzeko, eta esan gabe doa, ekitaldi antifaxistak, antisexistak eta antiarriztetarako :) . \n
    Argitaratzen hasi baino lehen zure kontu berriak onarpena jaso beharko du beraz, webgune honen atzean hezur-haragizko pertsonak gaudela jakinda , (momenutz euskal 'AI'-rik ez daukagu baina adi, agertuko direla) idatzi iezaguzu lerro batzuk argitaratu nahi dituzun ekitaldiei buruz", + "description": "Herri mugimenduek autoantolaketaren bidean diru-iturrien beharrak dauzkatela badakigu.
    Honako hauxe oparitxoa da, hortaz erabili ezazue ekitaldi ez-komertzialak iragartzeko, eta esan gabe doa, ekitaldi antifaxistak, antisexistak eta antiarriztetarako :) .\n
    Argitaratzen hasi baino lehen zure kontu berriak onarpena jaso beharko du beraz, webgune honen atzean hezur-haragizko pertsonak gaudela jakinda , (momenutz euskal 'AI'-rik ez daukagu baina adi, agertuko direla) idatzi iezaguzu lerro batzuk argitaratu nahi dituzun ekitaldiei buruz.", "error": "Hutsa: ", "complete": "Izen-ematea baieztatu behar dute.", "first_user": "Administratzailea sortu da" }, "event": { "anon": "Ezezaguna", - "anon_description": "Ekitaldia sortu dezakezu saioa hasi edo izena eman gabe,\nbaina kasu honetan norbaitek egiaztatu beharko du ekitaldia gune honetarako egokia dela eta itxaron beharko duzu. Gainera, behin egiaztatuta hura aldatzea ez da posiblea izango.

    \n Dena den, ahalik eta azkarren erantzuten saiatuko gara.", + "anon_description": "Ekitaldia sortu dezakezu saioa hasi edo izena eman gabe,\nbaina kasu honetan norbaitek egiaztatu beharko du ekitaldia gune honetarako egokia dela eta itxaron beharko duzu. Gainera, behin egiaztatuta hura aldatzea ez da posiblea izango.

    \nDena den, ahalik eta azkarren erantzuten saiatuko gara. ", "same_day": "egun berean", "what_description": "Ekitaldiaren izena", "description_description": "Ekitaldiaren azalpena", @@ -118,16 +124,16 @@ "media_description": "Eskuorria edo irudia gehitu dezakezu (aukerakoa)", "added": "Ekitaldia sortu da", "added_anon": "Ekitaldia sortu da, baina baieztatzear dago.", - "where_description": "Non da ekitaldia? Lekua ez bada zerrendan agertzen idatzi ezazu eta enter sakatu. ", + "where_description": "Non da ekitaldia? Lekua ez bada zerrendan agertzen idatzi ezazu eta enter sakatu.", "confirmed": "Ekitaldia egiaztatu da", "not_found": "Ezin da ekitaldia aurkitu", "remove_confirmation": "Ziur zaude ekitaldi hau ezabatu nahi duzula?", - "remove_recurrent_confirmation": "Ziur zaude ekitaldi errepikari hau ezabatu nahi duzula??\n\nIragan diren ekitaldiak mantenduko dira, baina ez da ekitaldi berririk sortuko.", + "remove_recurrent_confirmation": "Ziur zaude ekitaldi errepikari hau ezabatu nahi duzula?\nIragan diren ekitaldiak mantenduko dira, baina ez da ekitaldi berririk sortuko.", "recurrent": "Errepikaria", "show_recurrent": "Ekitaldi errepikariak", "show_past": "Erakutsi iraganeko ekitaldiak", "recurrent_description": "Aukera ezazu maiztasuna eta hautatu egunak", - "multidate_description": "Egun bat baino gehiagoko jaialdia da? Aukeratu noiz hasten den eta noiz amaitzen den.", + "multidate_description": "Egun bat baino gehiagoko jaialdia da? Aukeratu noiz hasten den eta noiz amaitzen den", "multidate": "Egun gehiagotan", "normal": "Egunekoa", "normal_description": "Eguna aukeratu.", @@ -143,27 +149,36 @@ "due": "Amaiera ordua", "from": "Hasiera ordua", "image_too_big": "Irudia handiegia omen da (4mb gehienez)", - "interact_with_me": "Elkar gaitezen fedibertsoan: ", - "follow_me_description": " {title}n argitaratutako ekitaldien berri izateko aukeren artean,\n fedibertsoko {account} kontuari jarraitzea daukazu. Horretarako Mastodon erabili dezakezu, eta bertatik baliabideak gehitu ekitaldi baten.

    \n Mastodon eta Fedibertsoa zer diren ez badakizu artikulu hau irakurtzea iradokitzen dizugu.

    Sartu zure instantzia behean (adibidez mastodon.eus edo mastodon.jalgi.eus)" + "interact_with_me": "Elkar gaitezen fedibertsoan", + "follow_me_description": "{title}n argitaratutako ekitaldien berri izateko aukeren artean,\n fedibertsoko {account} kontuari jarraitzea daukazu. Horretarako Mastodon erabili dezakezu, eta bertatik baliabideak gehitu ekitaldi baten.

    \n Mastodon eta Fedibertsoa zer diren ez badakizu artikulu hau irakurtzea iradokitzen dizugu.

    Sartu zure instantzia behean (adibidez mastodon.eus edo mastodon.jalgi.eus)", + "import_description": "Beste plataforma eta adibide batzuetako gertaerak formatu estandarren bidez inportatu ditzakezu (ics eta h-event)", + "ics": "ICS", + "import_ICS": "ICS-ko inportazioa", + "import_URL": "URL-ko inportazioa", + "interact_with_me_at": "Hitz egin nirekin fediversoan", + "only_future": "gertakizunak besterik ez", + "edit_recurrent": "Gertaera errepikakorra:", + "updated": "Gertaera eguneratua", + "saved": "Gertaera salbatua" }, "admin": { "place_description": "Lekuaren zehaztapenak aldatu ditzakezu, bai gaizki idatzita dagoelako, bai helbidez aldatu delako.
    Ondorioz, leku horrekin lotutako ekitaldi guztiak helbidez aldatuko direla kontuan hartu behar da (baita iraganekoak ere!)", "event_confirm_description": "Erabiltzaile ezezagunek sortutako ekitaldiak hemen egiaztatu ditzakezu", "delete_user": "Erabiltzailea ezabatu", "remove_admin": "Administratzailea ezabatu", - "delete_user_confirm": "Ziur zaude erabiltzailea ezabatu nahi duzula?", + "delete_user_confirm": "Ziur zaude {user} ezabatu nahi duzula?", "user_remove_ok": "Erabiltzailea ezabatu da", "user_create_ok": "Erabiltzailea sortu da", "allow_registration_description": "Izen-emateak ahalbidetu nahi dituzu?", - "allow_anon_event": "Ezezagunek ekitaldiak sortzea ahalbidetu nahi duzu? (Beti ere baieztapenarekin) ", - "allow_recurrent_event": "Ekitaldi errepikariak ahalbidetu?", + "allow_anon_event": "Ezezagunek ekitaldiak sortzea ahalbidetu nahi duzu? (Beti ere baieztapenarekin)", + "allow_recurrent_event": "Ekitaldi errepikariak ahalbidetu", "recurrent_event_visible": "Erakutsi ekitaldi errepikariak modu lehenetsian", "federation": "Federazioa / ActivityPub", "enable_federation": "Federatzea gaitu", - "enable_federation_help": "Instantzia hau fedibertsoan jarraitzea gaituko duzu?", + "enable_federation_help": "Instantzia hau fedibertsoan jarraitzea gaituko duzu", "select_instance_timezone": "Ordu-eremua", "instance_timezone_description": "Gancio hiri baten moduko lekuen ekitaldiak biltzeko diseinatuta dago. Leku honen ordu-eremua hautatuz gero ekitaldi gutziek ordu-eremu horrekiko adieraziko dira..", - "enable_resources": "Baliabideak gaitu ", + "enable_resources": "Baliabideak gaitu", "enable_resources_help": "Fedibertsotik ekitaldietan baliabideak gehitzea ahalbidetzen du", "hide_boost_bookmark": "Bultzadak eta laster-markak ezkutatu", "hide_boost_bookmark_help": "Fedibertsotik datozen bultzaden eta laster-marken ikonotxoak ezkutatzen ditu", @@ -181,37 +196,46 @@ "filter_users": "Erabiltzaileak iragazi", "instance_name": "Instantziaren izena", "favicon": "Iruditxoa", - "user_block_confirm": "Ziur zaude erabiltzailea blokeatu nahi duzula?", + "user_block_confirm": "Ziur zaude {user} blokeatu nahi duzula?", "delete_announcement_confirm": "Ziur zaude iragarkia ezabatu nahi duzula?", "announcement_remove_ok": "Iragarkia ezabatu da", "announcement_description": "Atal honetan iragarkiak txertatu ditzakezu hasiera-orrian ager daitezen", "instance_locale": "Instantziaren hizkuntza lehenetsia", "instance_locale_description": "Orriak erakusteko erabilitako hizkuntza erabiltzaileak nahiago duen hizkuntza da. Hala ere, kasu batzuetan mezuak modu berean erakutsi behar ditugu guztiontzat (adibidez ActivityPub-etik argitaratzen dugunean edo posta elektroniko batzuk bidaltzerakoan). Kasu hauetan goian hautatutako hizkuntza erabiliko dugu.", - "instance_place": "Instantziaren kokalekua ", - "title_description": "Orriaren izenburuan, jario eta ics-en esportazioan eta mezu elektronikoen gaian erabiliko da ", + "instance_place": "Instantziaren kokalekua", + "title_description": "Orriaren izenburuan, jario eta ics-en esportazioan eta mezu elektronikoen gaian erabiliko da.", "description_description": "Orriburuan agertuko da, izenburuarekin batera", - "instance_name_help": "Instantziaren kontua ActivityPub-en ", + "instance_name_help": "Instantziaren kontua ActivityPub-en", "enable_trusted_instances": "Kideko instantziak gaitu", "trusted_instances_help": "Kideko instantzien zerrenda orri-buruan agertuko dira", "add_trusted_instance": "Gehitu kideko instantzia bat", - "instance_place_help": "Beste instantzien zerrendetan agertuko den izena ", - "delete_trusted_instance_confirm": "Ziur zaude kideko instantzia hau zerrendatik ezabatu nahi duzula?" + "instance_place_help": "Beste instantzien zerrendetan agertuko den izena", + "delete_trusted_instance_confirm": "Ziur zaude kideko instantzia hau zerrendatik ezabatu nahi duzula?", + "new_announcement": "Iragarpen berria", + "edit_place": "Leku ederrean", + "delete_footer_link_confirm": "Ziur lotura kenduko duzula?", + "footer_links": "Oinezkoen konexioak", + "add_link": "Gehitu lotura", + "is_dark": "Gai iluna", + "instance_block_confirm": "Ziur al zaude blokearen adibidea {instance} nahi duzula?", + "add_instance": "Gehitu adibidea", + "disable_user_confirm": "Ziur zaude {user} deskonektatu nahi duzula?" }, "auth": { - "not_confirmed": "Oraindik baieztatu gabe dago...", + "not_confirmed": "Oraindik baieztatu gabe dago…", "fail": "Saioa hasteak huts egin du! Ziur zaude datuok ondo daudela?" }, "settings": { "update_confirm": "Aldaketak gorde nahi duzu?", "change_password": "Pasahitza aldatu", - "password_updated": "Pasahitza eguneratu da", + "password_updated": "Pasahitza eguneratu da.", "danger_section": "Atal arriskutsua", - "remove_account": "Ondorengo botoia zapalduz gero zure erabiltzailea ezabatuko da. Argitaratutako ekitaldiak ordea, ez dira ezabatuko", + "remove_account": "Ondorengo botoia zapalduz gero zure erabiltzailea ezabatuko da. Argitaratutako ekitaldiak ordea, ez dira ezabatuko.", "remove_account_confirm": "Zure kontua behin betiko ezabatzear zaude" }, "error": { - "nick_taken": "Dagoeneko ezizen hau hartuta dago", - "email_taken": "Dagoeneko posta elektroniko hau hartuta dago" + "nick_taken": "Dagoeneko ezizen hau hartuta dago.", + "email_taken": "Dagoeneko posta elektroniko hau hartuta dago." }, "confirm": { "title": "Erabiltzaile-baieztapena", @@ -226,12 +250,16 @@ "5": "bostgarrena", "-1": "azkena" }, - "about": "

    Descarga la agenda semanal en pdf lista para imprimir pinchando aquí.

    ¿Quiénes somos?

    Somos un grupo de personas que gestionamos la lubakiagenda digital y creamos y colgamos la agenda semanal en pdf y papel. No generamos contenido, solamente moderamos el contenido de la web y subimos las actividades de las que nos enteramos.

    ¿Qué es LubakiAgenda?

    Es la agenda social alternativa de Bilboalde*. Tiene su versión digital, que cada colectivo o espacio autogestionado puede actualizar con su propia programación, y una versión imprimible que se cuelga cada miércoles en la web y en los lugares más frecuentados de Bilbo.

    ¿Cuál es el objetivo de LubakiAgenda?

    Una parte de las actividades que se incluyen en la agenda son las organizadas por gaztetxes, ateneos, distribuidoras,… y por el amplio movimiento popular y juvenil de Bilbo y alrededores. Queremos que esta agenda sea el reflejo de lo que organiza este movimiento en su trabajo cotidiano, resaltando que no hacen falta ni instituciones ni subvenciones para mantener en marcha la cultura popular.

    Nuestro objetivo es dar difusión al movimiento popular desde una perspectiva anticapitalista, antifascista, antirracista, feminista e inclusiva.

    Por ello no se publicarán actividades que vayan en contra de nuestros principios ni por regla general, tampoco actividades comerciales o de agentes sociales que consideremos que ya tienen sus propios medios y fuerzas de difusión y organización (como instituciones, partidos políticos o sindicatos mayoritarios)

    ¿Cómo puedo participar?

    Si formas parte de un colectivo social, puedes colgar directamente las actividades que realicéis en el apartado superior derecho de la web (+ Nuevo evento) y solicitar que generemos una usuaria para tu colectivo. De este modo vuestra programación quedará colgada automáticamente sin necesidad de moderación.

    También nos puedes escribir a agenda@lubakiagenda.net y mandarnos la programación de tu colectivo o espacio y nosotras la subiremos.

    Es muy importante que si quieres que tu programación aparezca en la versión imprimible, nos hagas llegar la información antes del miércoles al mediodía de cada semana (si son actividades periódicas, no hace falta que nos mandes mail todas las semanas)

    Si no perteneces a ningún colectivo pero quieres colgar actividades, siempre puedes subirlas mediante el apartado superior derecho de la web (+ Nuevo evento), pero debes saber que el contenido subido será sujeto a moderación para evitar duplicados o actividades contrarias a nuestros principios.

    ¿Zer da 'Gancio'?

    Gancio, Underscore hacklabeko proiektua da eta cisti.org-eko zerbitzuetariko bat.

    Gancio ( \"gantzio\" ahoskatzen da) ekitaldiak zabaltzeko tresna da eta komunitate erradikalei zuzenduta dago. Bertan ekitaldiak aurkitu eta sortu daitezke. Gainera, Cisti.org osoak bezala, Ganciok izaera antisexista, antiarrazista, antifaxista eta antikapitalista dauka, beraz, izan hori buruan ekitaldia argitaratzera zoazenean.

    Ados, baina ¿zer arraio esan nahi du 'gancio' hitzak?

    Literalki \"kakoa\" litzateke, baina egia esan Turinen (Italia) erabiltzen den esaeratik dator, hau da, norbaitek esaten badu: \n \"- ehi, ci diamo un gancio alle 8?\" (\"aizu, ¿8etan kakoa emango?\") -zera esan nahi du: \n \"-aizu, ¿8retan elkartuko gara?\". \n\"Darsi un gancio\" hitzordu bat lotzea da, X orduan eta Y lekuan.

    • ¿Zein ordutan da gancio-a manira joateko?
    • Ez dakit ta, dena den, ezin naiz joan gancio-a baitaukat bilera baterako.

    \n
    Kontaktuak

    Gancio-ko interfaze berria garatu duzula? Gancio-a abiatu nahi duzula zure hirian? Hobetzeko zerbait bururatu zaizu? Ba, jakin iturri-kodea askea dela eta hemen dagoela eskuragarri. \nLaguntza eta iradokizunak beti direnez ongietorriak, gurekin kontaktuan jarri zaitezkete underscore@autistici.org-en. Ondo izan!

    *Bilboaldea Bilbo, Ezkerraldea, Meatzaldea, Hego Uribe, Uribe Kosta eta Txorierri

    ", + "about": "\n

    Gancio Tokiko komunitateentzako agenda partekatua da.

    \n ", "oauth": { "authorization_request": "{app} aplikazioak baimena eskatu du {instance_name}-n ondorengo lanak egiteko:", - "redirected_to": "Baieztapenaren ondoren {url} helbidera berbideratua izango zara.", + "redirected_to": "Baieztapenaren ondoren {url} helbidera berbideratua izango zara", "scopes": { "event:write": "Zure ekitaldiak sortu eta aldatu" } + }, + "validators": { + "email": "Sar ezazu posta elektroniko baliozko bat", + "required": "{fieldName} beharrezkoa da" } } From 359d30d1f3dbd2542a406f6e6461c2e41f43bca9 Mon Sep 17 00:00:00 2001 From: La Kelo Gaztetxea Date: Sun, 18 Jul 2021 10:00:51 +0000 Subject: [PATCH 069/271] Translated using Weblate (Spanish) Currently translated at 100.0% (10 of 10 strings) Translation: Gancio/Email Translate-URL: https://hosted.weblate.org/projects/gancio/email/es/ --- locales/email/es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/email/es.json b/locales/email/es.json index 35b262d2..79abfe5a 100644 --- a/locales/email/es.json +++ b/locales/email/es.json @@ -1,7 +1,7 @@ { "register": { "subject": "Solicitud de registro recibida", - "content": "Recibimos la solicitud de registro. Lo confirmaremos tan pronto como podamos.\n Adios" + "content": "Recibimos la solicitud de registro. Lo confirmaremos tan pronto como podamos." }, "confirm": { "subject": "Puedes empezar a publicar eventos", From 6f84d904948d697c3bc399b6f7a84ff8abf26ca3 Mon Sep 17 00:00:00 2001 From: les Date: Tue, 20 Jul 2021 11:42:25 +0200 Subject: [PATCH 070/271] add node version in very first log --- server/cli.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/cli.js b/server/cli.js index d720ef68..2dee2057 100755 --- a/server/cli.js +++ b/server/cli.js @@ -322,7 +322,7 @@ async function setup (options) { process.exit(0) } -consola.info(`📅 ${pkg.name} - v${pkg.version} - ${pkg.description}`) +consola.info(`📅 ${pkg.name} - v${pkg.version} - ${pkg.description} (nodejs: ${process.version})`) require('yargs') .usage('Usage $0 [options]') From 02144354149e10c03c06ee5594a8fdea778b117a Mon Sep 17 00:00:00 2001 From: les Date: Tue, 20 Jul 2021 11:45:14 +0200 Subject: [PATCH 071/271] minor --- package.json | 1 - yarn.lock | 109 +++++++++++++++++++++++---------------------------- 2 files changed, 50 insertions(+), 60 deletions(-) diff --git a/package.json b/package.json index 3f6e301e..506fbf09 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,6 @@ "eslint-plugin-promise": "^5.1.0", "eslint-plugin-standard": "^5.0.0", "eslint-plugin-vue": "^7.10.0", - "fibers": "^5.0.0", "less-loader": "7", "prettier": "^2.3.0", "pug": "^3.0.2", diff --git a/yarn.lock b/yarn.lock index f9ae66ed..759b9bd8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1739,7 +1739,7 @@ dependencies: "@types/node" "*" -"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7": +"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8": version "7.0.8" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818" integrity sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg== @@ -1808,72 +1808,72 @@ source-map "^0.6.0" "@typescript-eslint/eslint-plugin@^4.26.0": - version "4.28.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.3.tgz#36cdcd9ca6f9e5cb49b9f61b970b1976708d084b" - integrity sha512-jW8sEFu1ZeaV8xzwsfi6Vgtty2jf7/lJmQmDkDruBjYAbx5DA8JtbcMnP0rNPUG+oH5GoQBTSp+9613BzuIpYg== + version "4.28.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.4.tgz#e73c8cabbf3f08dee0e1bda65ed4e622ae8f8921" + integrity sha512-s1oY4RmYDlWMlcV0kKPBaADn46JirZzvvH7c2CtAqxCY96S538JRBAzt83RrfkDheV/+G/vWNK0zek+8TB3Gmw== dependencies: - "@typescript-eslint/experimental-utils" "4.28.3" - "@typescript-eslint/scope-manager" "4.28.3" + "@typescript-eslint/experimental-utils" "4.28.4" + "@typescript-eslint/scope-manager" "4.28.4" debug "^4.3.1" functional-red-black-tree "^1.0.1" regexpp "^3.1.0" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/experimental-utils@4.28.3", "@typescript-eslint/experimental-utils@^4.0.1": - version "4.28.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.3.tgz#976f8c1191b37105fd06658ed57ddfee4be361ca" - integrity sha512-zZYl9TnrxwEPi3FbyeX0ZnE8Hp7j3OCR+ELoUfbwGHGxWnHg9+OqSmkw2MoCVpZksPCZYpQzC559Ee9pJNHTQw== +"@typescript-eslint/experimental-utils@4.28.4", "@typescript-eslint/experimental-utils@^4.0.1": + version "4.28.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.4.tgz#9c70c35ebed087a5c70fb0ecd90979547b7fec96" + integrity sha512-OglKWOQRWTCoqMSy6pm/kpinEIgdcXYceIcH3EKWUl4S8xhFtN34GQRaAvTIZB9DD94rW7d/U7tUg3SYeDFNHA== dependencies: "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.28.3" - "@typescript-eslint/types" "4.28.3" - "@typescript-eslint/typescript-estree" "4.28.3" + "@typescript-eslint/scope-manager" "4.28.4" + "@typescript-eslint/types" "4.28.4" + "@typescript-eslint/typescript-estree" "4.28.4" eslint-scope "^5.1.1" eslint-utils "^3.0.0" "@typescript-eslint/parser@^4.26.0": - version "4.28.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.3.tgz#95f1d475c08268edffdcb2779993c488b6434b44" - integrity sha512-ZyWEn34bJexn/JNYvLQab0Mo5e+qqQNhknxmc8azgNd4XqspVYR5oHq9O11fLwdZMRcj4by15ghSlIEq+H5ltQ== + version "4.28.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.4.tgz#bc462dc2779afeefdcf49082516afdc3e7b96fab" + integrity sha512-4i0jq3C6n+og7/uCHiE6q5ssw87zVdpUj1k6VlVYMonE3ILdFApEzTWgppSRG4kVNB/5jxnH+gTeKLMNfUelQA== dependencies: - "@typescript-eslint/scope-manager" "4.28.3" - "@typescript-eslint/types" "4.28.3" - "@typescript-eslint/typescript-estree" "4.28.3" + "@typescript-eslint/scope-manager" "4.28.4" + "@typescript-eslint/types" "4.28.4" + "@typescript-eslint/typescript-estree" "4.28.4" debug "^4.3.1" -"@typescript-eslint/scope-manager@4.28.3": - version "4.28.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.3.tgz#c32ad4491b3726db1ba34030b59ea922c214e371" - integrity sha512-/8lMisZ5NGIzGtJB+QizQ5eX4Xd8uxedFfMBXOKuJGP0oaBBVEMbJVddQKDXyyB0bPlmt8i6bHV89KbwOelJiQ== +"@typescript-eslint/scope-manager@4.28.4": + version "4.28.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.4.tgz#bdbce9b6a644e34f767bd68bc17bb14353b9fe7f" + integrity sha512-ZJBNs4usViOmlyFMt9X9l+X0WAFcDH7EdSArGqpldXu7aeZxDAuAzHiMAeI+JpSefY2INHrXeqnha39FVqXb8w== dependencies: - "@typescript-eslint/types" "4.28.3" - "@typescript-eslint/visitor-keys" "4.28.3" + "@typescript-eslint/types" "4.28.4" + "@typescript-eslint/visitor-keys" "4.28.4" -"@typescript-eslint/types@4.28.3": - version "4.28.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.3.tgz#8fffd436a3bada422c2c1da56060a0566a9506c7" - integrity sha512-kQFaEsQBQVtA9VGVyciyTbIg7S3WoKHNuOp/UF5RG40900KtGqfoiETWD/v0lzRXc+euVE9NXmfer9dLkUJrkA== +"@typescript-eslint/types@4.28.4": + version "4.28.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.4.tgz#41acbd79b5816b7c0dd7530a43d97d020d3aeb42" + integrity sha512-3eap4QWxGqkYuEmVebUGULMskR6Cuoc/Wii0oSOddleP4EGx1tjLnZQ0ZP33YRoMDCs5O3j56RBV4g14T4jvww== -"@typescript-eslint/typescript-estree@4.28.3": - version "4.28.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.3.tgz#253d7088100b2a38aefe3c8dd7bd1f8232ec46fb" - integrity sha512-YAb1JED41kJsqCQt1NcnX5ZdTA93vKFCMP4lQYG6CFxd0VzDJcKttRlMrlG+1qiWAw8+zowmHU1H0OzjWJzR2w== +"@typescript-eslint/typescript-estree@4.28.4": + version "4.28.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.4.tgz#252e6863278dc0727244be9e371eb35241c46d00" + integrity sha512-z7d8HK8XvCRyN2SNp+OXC2iZaF+O2BTquGhEYLKLx5k6p0r05ureUtgEfo5f6anLkhCxdHtCf6rPM1p4efHYDQ== dependencies: - "@typescript-eslint/types" "4.28.3" - "@typescript-eslint/visitor-keys" "4.28.3" + "@typescript-eslint/types" "4.28.4" + "@typescript-eslint/visitor-keys" "4.28.4" debug "^4.3.1" globby "^11.0.3" is-glob "^4.0.1" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/visitor-keys@4.28.3": - version "4.28.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.3.tgz#26ac91e84b23529968361045829da80a4e5251c4" - integrity sha512-ri1OzcLnk1HH4gORmr1dllxDzzrN6goUIz/P4MHFV0YZJDCADPR3RvYNp0PW2SetKTThar6wlbFTL00hV2Q+fg== +"@typescript-eslint/visitor-keys@4.28.4": + version "4.28.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.4.tgz#92dacfefccd6751cbb0a964f06683bfd72d0c4d3" + integrity sha512-NIAXAdbz1XdOuzqkJHjNKXKj8QQ4cv5cxR/g0uQhCYf/6//XrmfpaYsM7PnBcNbfvTDLUkqQ5TPNm1sozDdTWg== dependencies: - "@typescript-eslint/types" "4.28.3" + "@typescript-eslint/types" "4.28.4" eslint-visitor-keys "^2.0.0" "@vue/babel-helper-vue-jsx-merge-props@^1.2.1": @@ -4498,9 +4498,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.723: - version "1.3.779" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.779.tgz#de55492a756deec63424f89fbe62aec9776f0e6d" - integrity sha512-nreave0y/1Qhmo8XtO6C/LpawNyC6U26+q7d814/e+tIqUK073pM+4xW7WUXyqCRa5K4wdxHmNMBAi8ap9nEew== + version "1.3.780" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.780.tgz#f946e10dc0005a3b59b9afa2d2c92f5c421f7fc5" + integrity sha512-2KQ9OYm9WMUNpAPA/4aerURl3hwRc9tNlpsiEj3Y8Gf7LVf26NzyLIX2v0hSagQwrS9+cWab+28A2GPKDoVNRA== elliptic@^6.5.3: version "6.5.4" @@ -5284,13 +5284,6 @@ fecha@^4.2.0: resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.1.tgz#0a83ad8f86ef62a091e22bb5a039cd03d23eecce" integrity sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q== -fibers@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/fibers/-/fibers-5.0.0.tgz#3a60e0695b3ee5f6db94e62726716fa7a59acc41" - integrity sha512-UpGv/YAZp7mhKHxDvC1tColrroGRX90sSvh8RMZV9leo+e5+EkRVgCEZPlmXeo3BUNQTZxUaVdLskq1Q2FyCPg== - dependencies: - detect-libc "^1.0.3" - figgy-pudding@^3.5.1: version "3.5.2" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" @@ -10329,9 +10322,9 @@ rechoir@^0.6.2: resolve "^1.1.6" rechoir@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.0.tgz#32650fd52c21ab252aa5d65b19310441c7e03aca" - integrity sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q== + version "0.7.1" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" + integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== dependencies: resolve "^1.9.0" @@ -10706,11 +10699,11 @@ schema-utils@^2.0.0, schema-utils@^2.6.5, schema-utils@^2.7.1: ajv-keywords "^3.5.2" schema-utils@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.0.tgz#95986eb604f66daadeed56e379bfe7a7f963cdb9" - integrity sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w== + version "3.1.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== dependencies: - "@types/json-schema" "^7.0.7" + "@types/json-schema" "^7.0.8" ajv "^6.12.5" ajv-keywords "^3.5.2" @@ -12464,10 +12457,8 @@ watchpack@^1.7.4: resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453" integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ== dependencies: - chokidar "^3.4.1" graceful-fs "^4.1.2" neo-async "^2.5.0" - watchpack-chokidar2 "^2.0.1" optionalDependencies: chokidar "^3.4.1" watchpack-chokidar2 "^2.0.1" From 819a97bda7b23365021f2dc471b5f23cfa5246f3 Mon Sep 17 00:00:00 2001 From: les Date: Tue, 20 Jul 2021 13:14:06 +0200 Subject: [PATCH 072/271] update CHANGELOG --- CHANGELOG | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index a76150db..daf38553 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,14 @@ All notable changes to this project will be documented in this file. +### UNRELEASED + - 12 hour clock selection, #119 + - improve media management + - add alt-text to featured image, fix #106 + - add focalPoint support, fix #116 + - improve a11y + - improve node v16 compatibility + - fix #122 ? (downgrade prettier) + ### 1.0.2 (alpha) - improve oauth flow UI - [WordPress plugin](https://wordpress.org/plugins/wpgancio/) From f38cff21cc8d773fc37c3b7e1114a425aa716593 Mon Sep 17 00:00:00 2001 From: les Date: Tue, 20 Jul 2021 21:30:28 +0200 Subject: [PATCH 073/271] fix unsaved focalPoint --- pages/add/MediaInput.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pages/add/MediaInput.vue b/pages/add/MediaInput.vue index e7425cfa..d09b8159 100644 --- a/pages/add/MediaInput.vue +++ b/pages/add/MediaInput.vue @@ -34,7 +34,7 @@ v-btn(text color='primary' @click='openMediaDetails = true') {{$t('common.edit')}} v-btn(text color='error' @click='remove') {{$t('common.remove')}} div(v-if='mediaPreview') - v-img.col-12.col-sm-2.ml-3(:src='mediaPreview' aspect-ratio='1.7778' :position='`${(this.value.focalpoint[0] + 1) * 50}% ${(this.value.focalpoint[1] + 1) * 50}%`') + v-img.col-12.col-sm-2.ml-3(:src='mediaPreview' aspect-ratio='1.7778' :position='savedPosition') span.float-right {{event.media[0].name}} v-file-input( v-else @@ -68,8 +68,13 @@ export default { const url = this.value.image ? URL.createObjectURL(this.value.image) : /^https?:\/\//.test(this.value.url) ? this.value.url : `/media/thumb/${this.value.url}` return url }, + savedPosition () { + const focalpoint = this.value.focalpoint || [0, 0] + return `${(focalpoint[0] + 1) * 50}% ${(focalpoint[1] + 1) * 50}%` + }, position () { - return `${(this.focalpoint[0] + 1) * 50}% ${(this.focalpoint[1] + 1) * 50}%` + const focalpoint = this.focalpoint || [0, 0] + return `${(focalpoint[0] + 1) * 50}% ${(focalpoint[1] + 1) * 50}%` } }, methods: { From 7c23325a0cc6f64073073e9165a746852235fea4 Mon Sep 17 00:00:00 2001 From: les Date: Wed, 21 Jul 2021 11:23:32 +0200 Subject: [PATCH 074/271] minor on focalPoint precision --- server/api/controller/event.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/api/controller/event.js b/server/api/controller/event.js index f833cb3b..828aa526 100644 --- a/server/api/controller/event.js +++ b/server/api/controller/event.js @@ -297,12 +297,12 @@ const eventController = { url = await helpers.getImageFromURL(body.image_url) } - const focalpoint = body.image_focalpoint ? body.image_focalpoint.split(',') : ['0', '0'] - + let focalpoint = body.image_focalpoint ? body.image_focalpoint.split(',') : ['0', '0'] + focalpoint = [parseFloat(focalpoint[0]).toFixed(2), parseFloat(focalpoint[1]).toFixed(2)] eventDetails.media = [{ url, name: body.image_name || '', - focalpoint: [parseFloat(focalpoint[0].slice(0, 6)), parseFloat(focalpoint[1].slice(0, 6))] + focalpoint: [parseFloat(focalpoint[0]), parseFloat(focalpoint[1])] }] } else { eventDetails.media = [] From 08527e6e60e9144dff12268580a6943bd23209bb Mon Sep 17 00:00:00 2001 From: les Date: Wed, 21 Jul 2021 11:26:58 +0200 Subject: [PATCH 075/271] v1.0.3 --- CHANGELOG | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index daf38553..ea32e01c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,6 @@ All notable changes to this project will be documented in this file. -### UNRELEASED +### 1.0.3 (alpha) - 12 hour clock selection, #119 - improve media management - add alt-text to featured image, fix #106 diff --git a/package.json b/package.json index 506fbf09..439a9a4e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gancio", - "version": "1.0.2-alpha", + "version": "1.0.3-alpha", "description": "A shared agenda for local communities", "author": "lesion", "scripts": { From a03ec444369082a3d2d6b3a28bbef2dd561f1599 Mon Sep 17 00:00:00 2001 From: les Date: Mon, 26 Jul 2021 12:23:02 +0200 Subject: [PATCH 076/271] fix noimg event --- components/Event.vue | 8 +- server/routes.js | 4 + static/noimg.svg | 274 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 282 insertions(+), 4 deletions(-) create mode 100644 static/noimg.svg diff --git a/components/Event.vue b/components/Event.vue index 997d9c18..032f5b52 100644 --- a/components/Event.vue +++ b/components/Event.vue @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/pages/setup/DbStep.vue b/pages/setup/DbStep.vue new file mode 100644 index 00000000..e0a8f990 --- /dev/null +++ b/pages/setup/DbStep.vue @@ -0,0 +1,48 @@ + + \ No newline at end of file diff --git a/pages/setup/index.vue b/pages/setup/index.vue new file mode 100644 index 00000000..9ddf0696 --- /dev/null +++ b/pages/setup/index.vue @@ -0,0 +1,57 @@ + + \ No newline at end of file diff --git a/server/api/controller/setup.js b/server/api/controller/setup.js new file mode 100644 index 00000000..ab83d493 --- /dev/null +++ b/server/api/controller/setup.js @@ -0,0 +1,86 @@ +const log = require('../../log') +const db = require('../models/index.js') +const Umzug = require('umzug') +const path = require('path') +const config = require('../../config') +const Sequelize = require('sequelize') + +const crypto = require('crypto') +const { promisify } = require('util') +const randomBytes = promisify(crypto.randomBytes) +async function randomString (len = 16) { + const bytes = await randomBytes(len * 8) + return crypto + .createHash('sha1') + .update(bytes) + .digest('hex') +} + +const setupController = { + + async setupDb (req, res, next) { + log.debug('[SETUP] Check db') + const dbConf = req.body.db + if (!dbConf) { + return res.sendStatus(400) + } + + try { + const sequelize = await db.connect(dbConf) + const users = await sequelize.query('SELECT * from users').catch(e => {}) + config.db = dbConf + if (users && users.length) { + log.warn(' ⚠ Non empty db! Please move your current db elsewhere than retry.') + return res.status(400).send(' ⚠ Non empty db! Please move your current db elsewhere than retry.') + } else { + // run migrations... + const umzug = new Umzug({ + storage: 'sequelize', + storageOptions: { sequelize }, + logging: log.debug.bind(log), + migrations: { + wrap: fun => { + return () => + fun(sequelize.queryInterface, Sequelize).catch(e => { + log.error(e) + return false + }) + }, + path: path.resolve(__dirname, '..', '..', 'migrations') + } + }) + await umzug.up() + config.firstrun = false + config.db.logging = false + const settingsController = require('./settings') + await settingsController.load() + return res.sendStatus(200) + } + } catch (e) { + return res.status(400).send(String(e)) + } + }, + + async restart (req, res) { + config.write() + + // create admin user + const password = await randomString() + const email = `admin@${req.settings.hostname}` + const User = require('../models/user') + await User.create({ + email, + password, + is_admin: true, + is_active: true + }) + + res.json({ password, email }) + + // exit process so pm2 || docker could restart me + process.exit() + } + +} + +module.exports = setupController \ No newline at end of file From c3c05451dbf5f98f18909a62832e814a4cbb4dfc Mon Sep 17 00:00:00 2001 From: les Date: Mon, 27 Sep 2021 11:14:11 +0200 Subject: [PATCH 118/271] change how db its initialized --- server/api/models/announcement.js | 2 +- server/api/models/ap_user.js | 2 +- server/api/models/event.js | 4 +- server/api/models/eventnotification.js | 2 +- server/api/models/index.js | 58 ++++++++++---------------- server/api/models/instance.js | 2 +- server/api/models/notification.js | 2 +- server/api/models/oauth_client.js | 2 +- server/api/models/oauth_code.js | 2 +- server/api/models/oauth_token.js | 2 +- server/api/models/place.js | 2 +- server/api/models/resource.js | 3 +- server/api/models/setting.js | 2 +- server/api/models/tag.js | 2 +- server/api/models/user.js | 2 +- 15 files changed, 37 insertions(+), 52 deletions(-) diff --git a/server/api/models/announcement.js b/server/api/models/announcement.js index a459bac0..0b0926c5 100644 --- a/server/api/models/announcement.js +++ b/server/api/models/announcement.js @@ -1,4 +1,4 @@ -const sequelize = require('./index') +const sequelize = require('./index').sequelize const { Model, DataTypes } = require('sequelize') class Announcement extends Model {} diff --git a/server/api/models/ap_user.js b/server/api/models/ap_user.js index 30c1f967..20e80a55 100644 --- a/server/api/models/ap_user.js +++ b/server/api/models/ap_user.js @@ -1,4 +1,4 @@ -const sequelize = require('./index') +const sequelize = require('./index').sequelize const { Model, DataTypes } = require('sequelize') class APUser extends Model {} diff --git a/server/api/models/event.js b/server/api/models/event.js index e66368f4..ef0af774 100644 --- a/server/api/models/event.js +++ b/server/api/models/event.js @@ -1,11 +1,11 @@ -const config = require('config') +const config = require('../../config') const moment = require('dayjs') const { htmlToText } = require('html-to-text') const { Model, DataTypes } = require('sequelize') const SequelizeSlugify = require('sequelize-slugify') -const sequelize = require('./index') +const sequelize = require('./index').sequelize const Resource = require('./resource') const Notification = require('./notification') diff --git a/server/api/models/eventnotification.js b/server/api/models/eventnotification.js index d89f99eb..662f05e9 100644 --- a/server/api/models/eventnotification.js +++ b/server/api/models/eventnotification.js @@ -1,4 +1,4 @@ -const sequelize = require('./index') +const sequelize = require('./index').sequelize const { Model, DataTypes } = require('sequelize') class EventNotification extends Model {} diff --git a/server/api/models/index.js b/server/api/models/index.js index f3d523e6..7ff217d3 100644 --- a/server/api/models/index.js +++ b/server/api/models/index.js @@ -1,41 +1,27 @@ -// const fs = require('fs') -// const path = require('path') const Sequelize = require('sequelize') -// const basename = path.basename(__filename) -const config = require('config') -const consola = require('consola') -// const db = {} -let sequelize = null +const config = require('../../config') +const log = require('../../log') -try { - sequelize = new Sequelize(config.db) -} catch (e) { - consola.warn(` ⚠️ Cannot connect to db, check your configuration => ${e}`) - process.exit(-1) +const db = { + sequelize: null, + close () { + return db.sequelize.close() + }, + async connect (dbConf = config.db) { + log.debug(`Connecting to DB: ${dbConf}`) + db.sequelize = new Sequelize(dbConf) + await db.sequelize.authenticate() + return db.sequelize + } } -sequelize.authenticate().catch(e => { - consola.error(' ⚠ Error connecting to DB: ', String(e)) - process.exit(-1) -}) +if (!config.firstrun) { + try { + db.connect() + } catch (e) { + log.warn(` ⚠️ Cannot connect to db, check your configuration => ${e}`) + process.exit(1) + } +} -// fs -// .readdirSync(__dirname) -// .filter(file => { -// return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js') -// }) -// .forEach(file => { -// const model = sequelize.import(path.join(__dirname, file)) -// db[model.name] = model -// }) - -// Object.keys(db).forEach(modelName => { -// if (db[modelName].associate) { -// db[modelName].associate(db) -// } -// }) - -// db.sequelize = sequelize -// db.Sequelize = Sequelize - -module.exports = sequelize +module.exports = db diff --git a/server/api/models/instance.js b/server/api/models/instance.js index 5802767b..a9f8e96b 100644 --- a/server/api/models/instance.js +++ b/server/api/models/instance.js @@ -1,5 +1,5 @@ -const sequelize = require('./index') +const sequelize = require('./index').sequelize const { Model, DataTypes } = require('sequelize') const APUser = require('./ap_user') diff --git a/server/api/models/notification.js b/server/api/models/notification.js index 3f212f5a..19879a77 100644 --- a/server/api/models/notification.js +++ b/server/api/models/notification.js @@ -1,5 +1,5 @@ -const sequelize = require('./index') +const sequelize = require('./index').sequelize const { Model, DataTypes } = require('sequelize') class Notification extends Model {} diff --git a/server/api/models/oauth_client.js b/server/api/models/oauth_client.js index 1f15d790..103aaf59 100644 --- a/server/api/models/oauth_client.js +++ b/server/api/models/oauth_client.js @@ -1,5 +1,5 @@ -const sequelize = require('./index') +const sequelize = require('./index').sequelize const { Model, DataTypes } = require('sequelize') class OAuthClient extends Model {} diff --git a/server/api/models/oauth_code.js b/server/api/models/oauth_code.js index e0be1022..45b98fe5 100644 --- a/server/api/models/oauth_code.js +++ b/server/api/models/oauth_code.js @@ -1,5 +1,5 @@ -const sequelize = require('./index') +const sequelize = require('./index').sequelize const { Model, DataTypes } = require('sequelize') const User = require('./user') diff --git a/server/api/models/oauth_token.js b/server/api/models/oauth_token.js index 4220b130..2530bf1c 100644 --- a/server/api/models/oauth_token.js +++ b/server/api/models/oauth_token.js @@ -1,5 +1,5 @@ -const sequelize = require('./index') +const sequelize = require('./index').sequelize const { Model, DataTypes } = require('sequelize') const User = require('./user') diff --git a/server/api/models/place.js b/server/api/models/place.js index fac19112..e8ef6e90 100644 --- a/server/api/models/place.js +++ b/server/api/models/place.js @@ -1,5 +1,5 @@ const { Model, DataTypes } = require('sequelize') -const sequelize = require('./index') +const sequelize = require('./index').sequelize class Place extends Model {} diff --git a/server/api/models/resource.js b/server/api/models/resource.js index 620e9052..60d65e09 100644 --- a/server/api/models/resource.js +++ b/server/api/models/resource.js @@ -1,7 +1,6 @@ const { Model, DataTypes } = require('sequelize') -const sequelize = require('./index') +const sequelize = require('./index').sequelize -// const Event = require('./event') const APUser = require('./ap_user') class Resource extends Model {} diff --git a/server/api/models/setting.js b/server/api/models/setting.js index a09476e0..5d20fa56 100644 --- a/server/api/models/setting.js +++ b/server/api/models/setting.js @@ -1,5 +1,5 @@ const { Model, DataTypes } = require('sequelize') -const sequelize = require('./index') +const sequelize = require('./index').sequelize class Setting extends Model {} diff --git a/server/api/models/tag.js b/server/api/models/tag.js index ec292354..5dd9e300 100644 --- a/server/api/models/tag.js +++ b/server/api/models/tag.js @@ -1,5 +1,5 @@ const { Model, DataTypes } = require('sequelize') -const sequelize = require('./index') +const sequelize = require('./index').sequelize class Tag extends Model {} diff --git a/server/api/models/user.js b/server/api/models/user.js index 95c06b7e..5c30283b 100644 --- a/server/api/models/user.js +++ b/server/api/models/user.js @@ -1,7 +1,7 @@ const bcrypt = require('bcryptjs') const { Model, DataTypes } = require('sequelize') -const sequelize = require('./index') +const sequelize = require('./index').sequelize class User extends Model {} From a72a9fb501dbad669fbffd51207cf5de893889ce Mon Sep 17 00:00:00 2001 From: les Date: Tue, 28 Sep 2021 12:55:54 +0200 Subject: [PATCH 119/271] do not prepare meta/announcements on firstrun --- store/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/store/index.js b/store/index.js index 851348fb..044eb94f 100644 --- a/store/index.js +++ b/store/index.js @@ -50,8 +50,10 @@ export const actions = { // we use it to get configuration from db, set locale, etc... nuxtServerInit ({ commit }, { req }) { commit('setSettings', req.settings) - commit('setAnnouncements', req.announcements) - commit('update', req.meta) + if (!req.firstrun) { + commit('setAnnouncements', req.announcements) + commit('update', req.meta) + } }, async updateAnnouncements ({ commit }) { const announcements = await this.$axios.$get('/announcements') From 9ed8e3a2b112ee425e80b37ca13a94758727794a Mon Sep 17 00:00:00 2001 From: les Date: Tue, 28 Sep 2021 15:34:43 +0200 Subject: [PATCH 120/271] typo in nginx page --- docs/install/nginx.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/install/nginx.md b/docs/install/nginx.md index 46ba58cd..b3847578 100644 --- a/docs/install/nginx.md +++ b/docs/install/nginx.md @@ -1,4 +1,4 @@ -t--- +--- layout: default title: Nginx setup permalink: /install/nginx From 15cdba96eb88124be64c11a15e2fb165c94bf319 Mon Sep 17 00:00:00 2001 From: les Date: Tue, 28 Sep 2021 21:48:49 +0200 Subject: [PATCH 121/271] minor with light theme --- assets/style.less | 5 ----- 1 file changed, 5 deletions(-) diff --git a/assets/style.less b/assets/style.less index b608603d..0edcaa32 100644 --- a/assets/style.less +++ b/assets/style.less @@ -83,7 +83,6 @@ li { width: 100%; max-height: 250px; min-height: 160px; - background-color: #222; object-fit: cover; object-position: top; } @@ -102,10 +101,6 @@ li { } } -.v-list { - background-color: #333 !important; -} - .vc-past { opacity: 0.4; } From b8931ee8bf38647a257f11234c71bb03105e3ae1 Mon Sep 17 00:00:00 2001 From: les Date: Thu, 30 Sep 2021 11:06:59 +0200 Subject: [PATCH 122/271] refactoring routes --- pages/setup/index.vue | 3 ++ server/api/controller/event.js | 2 +- server/federation/resources.js | 2 +- server/helpers.js | 26 +++++++++- server/routes.js | 91 ++++++++++++++++------------------ 5 files changed, 72 insertions(+), 52 deletions(-) diff --git a/pages/setup/index.vue b/pages/setup/index.vue index 9ddf0696..a5cd32cf 100644 --- a/pages/setup/index.vue +++ b/pages/setup/index.vue @@ -32,6 +32,9 @@ export default { components: { DbStep, Settings, Completed }, middleware: 'setup', layout: 'iframe', + head: { + title: 'Setup', + }, auth: false, data () { return { diff --git a/server/api/controller/event.js b/server/api/controller/event.js index c7c567ab..b7153c56 100644 --- a/server/api/controller/event.js +++ b/server/api/controller/event.js @@ -4,7 +4,7 @@ const config = require('../../config') const fs = require('fs') const { Op } = require('sequelize') const intersection = require('lodash/intersection') -const linkifyHtml = require('linkifyjs/html') +const linkifyHtml = require('linkify-html') const Sequelize = require('sequelize') const dayjs = require('dayjs') const helpers = require('../../helpers') diff --git a/server/federation/resources.js b/server/federation/resources.js index b69fee39..3b566399 100644 --- a/server/federation/resources.js +++ b/server/federation/resources.js @@ -4,7 +4,7 @@ const APUser = require('../api/models/ap_user') const log = require('../log') const helpers = require('../helpers') -const linkifyHtml = require('linkifyjs/html') +const linkifyHtml = require('linkify-html') module.exports = { diff --git a/server/helpers.js b/server/helpers.js index 1e518cd3..bbed4021 100644 --- a/server/helpers.js +++ b/server/helpers.js @@ -1,7 +1,7 @@ const ical = require('ical.js') const settingsController = require('./api/controller/settings') const acceptLanguage = require('accept-language') - +const express = require('express') const dayjs = require('dayjs') const timezone = require('dayjs/plugin/timezone') dayjs.extend(timezone) @@ -78,6 +78,30 @@ module.exports = { next() }, + serveStatic () { + const router = express.Router() + // serve logo, favicon, event's images/thumb + router.use('/media/', express.static(config.upload_path)) + router.use('/noimg.svg', express.static('./static/noimg.svg')) + + router.use('/logo.png', (req, res, next) => { + const logoPath = req.settings.logo || './static/gancio' + return express.static(logoPath + '.png')(req, res, next) + }) + + router.use('/favicon.ico', (req, res, next) => { + const faviconPath = req.settings.logo || './assets/favicon' + return express.static(faviconPath + '.ico')(req, res, next) + }) + + return router + }, + + logRequest (req, res, next) { + log.debug(`${req.method} ${req.path}`) + next() + }, + async getImageFromURL (url) { log.debug(`getImageFromURL ${url}`) const filename = crypto.randomBytes(16).toString('hex') + '.jpg' diff --git a/server/routes.js b/server/routes.js index ffb58898..e390382e 100644 --- a/server/routes.js +++ b/server/routes.js @@ -1,67 +1,55 @@ -const config = require('config') const express = require('express') -const cors = require('cors') -const api = require('./api') -const oauth = require('./api/oauth') -const auth = require('./api/auth') const cookieParser = require('cookie-parser') -const federation = require('./federation') -const webfinger = require('./federation/webfinger') -const { spamFilter } = require('./federation/helpers') -const log = require('./log') -const exportController = require('./api/controller/export') -const eventController = require('./api/controller/event') -const announceController = require('./api/controller/announce') + // const metricsController = require('./metrics') // const promBundle = require('express-prom-bundle') // const metricsMiddleware = promBundle({ includeMethod: true }) +const config = require('./config') const helpers = require('./helpers') +const log = require('./log') +const api = require('./api') + + const app = express() -// ignore unimplemented ping url from fediverse -app.use(spamFilter) +app.use(helpers.logRequest) -// app.use(metricsMiddleware) - -app.use((req, res, next) => { - log.debug(`${req.method} ${req.path}`) - next() -}) - -app.use('/media/', express.static(config.upload_path)) // initialize instance settings / authentication / locale app.use(helpers.initSettings) +app.use(helpers.serveStatic()) -app.use('/noimg.svg', (req, res, next) => { - return express.static('./static/noimg.svg') -}) - -// serve favicon and static content -app.use('/logo.png', (req, res, next) => { - const logoPath = req.settings.logo || './static/gancio' - return express.static(logoPath + '.png')(req, res, next) -}) - -app.use('/favicon.ico', (req, res, next) => { - const faviconPath = req.settings.logo || './assets/favicon' - return express.static(faviconPath + '.ico')(req, res, next) -}) - -// rss/ics/atom feed -app.get('/feed/:type', cors(), exportController.export) - -// federation api / activitypub / webfinger / nodeinfo -app.use('/.well-known', webfinger) -app.use('/federation', federation) - +// ignore unimplemented ping url from fediverse app.use(cookieParser()) -// fill req.user if request is authenticated -app.use(auth.fillUser) + +// do not handle all routes on setup +if (!config.firstrun) { + const cors = require('cors') + const { spamFilter } = require('./federation/helpers') + const oauth = require('./api/oauth') + const auth = require('./api/auth') + const federation = require('./federation') + const webfinger = require('./federation/webfinger') + const exportController = require('./api/controller/export') + + // rss/ics/atom feed + app.get('/feed/:type', cors(), exportController.export) + + // federation api / activitypub / webfinger / nodeinfo + app.use('/.well-known', webfinger) + app.use('/federation', federation) + app.use(spamFilter) + + // fill req.user if request is authenticated + app.use(auth.fillUser) + + app.use('/oauth', oauth) + // app.use(metricsMiddleware) +} + // api! app.use('/api', api) -app.use('/oauth', oauth) // // Handle 500 app.use((error, req, res, next) => { @@ -75,8 +63,13 @@ app.use((error, req, res, next) => { app.use(async (req, res, next) => { // const start_datetime = getUnixTime(startOfWeek(startOfMonth(new Date()))) // req.events = await eventController._select(start_datetime, 100) - req.meta = await eventController._getMeta() - req.announcements = await announceController._getVisible() + if (!config.firstrun) { + const eventController = require('./api/controller/event') + const announceController = require('./api/controller/announce') + req.meta = await eventController._getMeta() + req.announcements = await announceController._getVisible() + } + req.firstrun = config.firstrun next() }) From a247b425443890acb18c969d3f847c7fbebe64e8 Mon Sep 17 00:00:00 2001 From: les Date: Thu, 30 Sep 2021 11:12:26 +0200 Subject: [PATCH 123/271] cleaning last setup step --- server/api/controller/setup.js | 94 +++++++++++++++++----------------- 1 file changed, 48 insertions(+), 46 deletions(-) diff --git a/server/api/controller/setup.js b/server/api/controller/setup.js index ab83d493..52656ba3 100644 --- a/server/api/controller/setup.js +++ b/server/api/controller/setup.js @@ -1,10 +1,8 @@ +const URL = require('url') const log = require('../../log') const db = require('../models/index.js') -const Umzug = require('umzug') -const path = require('path') const config = require('../../config') -const Sequelize = require('sequelize') - +const settingsController = require('./settings') const crypto = require('crypto') const { promisify } = require('util') const randomBytes = promisify(crypto.randomBytes) @@ -26,59 +24,63 @@ const setupController = { } try { - const sequelize = await db.connect(dbConf) - const users = await sequelize.query('SELECT * from users').catch(e => {}) - config.db = dbConf - if (users && users.length) { + // try to connect + dbConf.logging = false + await db.connect(dbConf) + + // is empty ? + const isEmpty = await db.isEmpty() + if (!isEmpty) { log.warn(' ⚠ Non empty db! Please move your current db elsewhere than retry.') return res.status(400).send(' ⚠ Non empty db! Please move your current db elsewhere than retry.') - } else { - // run migrations... - const umzug = new Umzug({ - storage: 'sequelize', - storageOptions: { sequelize }, - logging: log.debug.bind(log), - migrations: { - wrap: fun => { - return () => - fun(sequelize.queryInterface, Sequelize).catch(e => { - log.error(e) - return false - }) - }, - path: path.resolve(__dirname, '..', '..', 'migrations') - } - }) - await umzug.up() - config.firstrun = false - config.db.logging = false - const settingsController = require('./settings') - await settingsController.load() - return res.sendStatus(200) - } + } + + await db.runMigrations() + + config.db = dbConf + config.firstrun = false + config.db.logging = false + const settingsController = require('./settings') + await settingsController.load() + return res.sendStatus(200) } catch (e) { return res.status(400).send(String(e)) } }, async restart (req, res) { - config.write() - // create admin user - const password = await randomString() - const email = `admin@${req.settings.hostname}` - const User = require('../models/user') - await User.create({ - email, - password, - is_admin: true, - is_active: true - }) + try { - res.json({ password, email }) + // write configuration + config.write() - // exit process so pm2 || docker could restart me - process.exit() + // calculate default settings values + await settingsController.set('theme.is_dark', true) + await settingsController.set('instance_name', settingsController.settings.title.toLowerCase().replace(/ /g, '')) + await settingsController.set('baseurl', req.protocol + '://' + req.headers.host) + await settingsController.set('hostname', new URL.URL(settingsController.settings.baseurl).hostname) + + // create admin + const password = await randomString() + const email = `admin@${settingsController.settings.hostname}` + const User = require('../models/user') + await User.create({ + email, + password, + is_admin: true, + is_active: true + }) + + res.json({ password, email }) + + // exit process so pm2 || docker could restart me || service + log.info(`Admin: ${email} / password: ${password}`) + log.info('Restart needed') + process.exit() + } catch (e) { + return res.status(400).send(String(e)) + } } } From 77475624251557524437d0892f6cbe360b379581 Mon Sep 17 00:00:00 2001 From: les Date: Thu, 30 Sep 2021 11:12:45 +0200 Subject: [PATCH 124/271] new /setup api --- server/api/index.js | 278 +++++++++++++++++++++++--------------------- 1 file changed, 147 insertions(+), 131 deletions(-) diff --git a/server/api/index.js b/server/api/index.js index 1e64001e..aa7537f6 100644 --- a/server/api/index.js +++ b/server/api/index.js @@ -2,144 +2,160 @@ const express = require('express') const multer = require('multer') const cors = require('cors')() -const { isAuth, isAdmin } = require('./auth') -const eventController = require('./controller/event') -const exportController = require('./controller/export') -const userController = require('./controller/user') -const settingsController = require('./controller/settings') -const instanceController = require('./controller/instance') -const apUserController = require('./controller/ap_user') -const resourceController = require('./controller/resource') -const oauthController = require('./controller/oauth') -const announceController = require('./controller/announce') -const helpers = require('../helpers') -const storage = require('./storage') -const upload = multer({ storage }) - -const config = require('config') +const config = require('../config') const log = require('../log') const api = express.Router() api.use(express.urlencoded({ extended: false })) api.use(express.json()) -/** - * Get current authenticated user - * @category User - * @name /api/user - * @type GET - * @example **Response** - * ```json -{ - "description" : null, - "recover_code" : "", - "id" : 1, - "createdAt" : "2020-01-29T18:10:16.630Z", - "updatedAt" : "2020-01-30T22:42:14.789Z", - "is_active" : true, - "settings" : "{}", - "email" : "eventi@cisti.org", - "is_admin" : true + +if (config.firstrun) { + + const setupController = require('./controller/setup') + const settingsController = require('./controller/settings') + api.post('/settings', settingsController.setRequest) + api.post('/setup/db', setupController.setupDb) + api.post('/setup/restart', setupController.restart) + +} else { + + + const { isAuth, isAdmin } = require('./auth') + const eventController = require('./controller/event') + const settingsController = require('./controller/settings') + const exportController = require('./controller/export') + const userController = require('./controller/user') + const instanceController = require('./controller/instance') + const apUserController = require('./controller/ap_user') + const resourceController = require('./controller/resource') + const oauthController = require('./controller/oauth') + const announceController = require('./controller/announce') + const helpers = require('../helpers') + const storage = require('./storage') + const upload = multer({ storage }) + + /** + * Get current authenticated user + * @category User + * @name /api/user + * @type GET + * @example **Response** + * ```json + { + "description" : null, + "recover_code" : "", + "id" : 1, + "createdAt" : "2020-01-29T18:10:16.630Z", + "updatedAt" : "2020-01-30T22:42:14.789Z", + "is_active" : true, + "settings" : "{}", + "email" : "eventi@cisti.org", + "is_admin" : true + } + ``` + */ + api.get('/ping', (req, res) => res.sendStatus(200)) + api.get('/user', isAuth, (req, res) => res.json(req.user)) + + + api.post('/user/recover', userController.forgotPassword) + api.post('/user/check_recover_code', userController.checkRecoverCode) + api.post('/user/recover_password', userController.updatePasswordWithRecoverCode) + + // register and add users + api.post('/user/register', userController.register) + api.post('/user', isAdmin, userController.create) + + // update user + api.put('/user', isAuth, userController.update) + + // delete user + api.delete('/user/:id', isAdmin, userController.remove) + api.delete('/user', isAdmin, userController.remove) + + // get all users + api.get('/users', isAdmin, userController.getAll) + + // update a place (modify address..) + api.put('/place', isAdmin, eventController.updatePlace) + + /** + * Add a new event + * @category Event + * @name /event + * @type POST + * @info `Content-Type` has to be `multipart/form-data` to support image upload + * @param {string} title - event's title + * @param {string} description - event's description (html accepted and sanitized) + * @param {string} place_name - the name of the place + * @param {string} [place_address] - the address of the place + * @param {integer} start_datetime - start timestamp + * @param {integer} multidate - is a multidate event? + * @param {array} tags - List of tags + * @param {object} [recurrent] - Recurrent event details + * @param {string} [recurrent.frequency] - could be `1w` or `2w` + * @param {string} [recurrent.type] - not used + * @param {array} [recurrent.days] - array of days + * @param {image} [image] - Image + */ + + // allow anyone to add an event (anon event has to be confirmed, TODO: flood protection) + api.post('/event', upload.single('image'), eventController.add) + + api.put('/event', isAuth, upload.single('image'), eventController.update) + api.get('/event/import', isAuth, helpers.importURL) + + // remove event + api.delete('/event/:id', isAuth, eventController.remove) + + // get tags/places + api.get('/event/meta', eventController.getMeta) + + // get unconfirmed events + api.get('/event/unconfirmed', isAdmin, eventController.getUnconfirmed) + + // add event notification TODO + api.post('/event/notification', eventController.addNotification) + api.delete('/event/notification/:code', eventController.delNotification) + + api.get('/settings', settingsController.getAllRequest) + api.post('/settings', isAdmin, settingsController.setRequest) + api.post('/settings/logo', isAdmin, multer({ dest: config.upload_path }).single('logo'), settingsController.setLogo) + api.post('/settings/smtp', isAdmin, settingsController.testSMTP) + + // confirm event + api.put('/event/confirm/:event_id', isAuth, eventController.confirm) + api.put('/event/unconfirm/:event_id', isAuth, eventController.unconfirm) + + // get event + api.get('/event/:event_id.:format?', cors, eventController.get) + + // export events (rss/ics) + api.get('/export/:type', cors, exportController.export) + + // get events in this range + api.get('/events', cors, eventController.select) + + api.get('/instances', isAdmin, instanceController.getAll) + api.get('/instances/:instance_domain', isAdmin, instanceController.get) + api.post('/instances/toggle_block', isAdmin, instanceController.toggleBlock) + api.post('/instances/toggle_user_block', isAdmin, apUserController.toggleBlock) + api.put('/resources/:resource_id', isAdmin, resourceController.hide) + api.delete('/resources/:resource_id', isAdmin, resourceController.remove) + api.get('/resources', isAdmin, resourceController.getAll) + + // - ADMIN ANNOUNCEMENTS + api.get('/announcements', isAdmin, announceController.getAll) + api.post('/announcements', isAdmin, announceController.add) + api.put('/announcements/:announce_id', isAdmin, announceController.update) + api.delete('/announcements/:announce_id', isAdmin, announceController.remove) + + // OAUTH + api.get('/clients', isAuth, oauthController.getClients) + api.get('/client/:client_id', isAuth, oauthController.getClient) + api.post('/client', oauthController.createClient) } -``` - */ -api.get('/user', isAuth, (req, res) => res.json(req.user)) - -api.post('/user/recover', userController.forgotPassword) -api.post('/user/check_recover_code', userController.checkRecoverCode) -api.post('/user/recover_password', userController.updatePasswordWithRecoverCode) - -// register and add users -api.post('/user/register', userController.register) -api.post('/user', isAdmin, userController.create) - -// update user -api.put('/user', isAuth, userController.update) - -// delete user -api.delete('/user/:id', isAdmin, userController.remove) -api.delete('/user', isAdmin, userController.remove) - -// get all users -api.get('/users', isAdmin, userController.getAll) - -// update a place (modify address..) -api.put('/place', isAdmin, eventController.updatePlace) - -/** - * Add a new event - * @category Event - * @name /event - * @type POST - * @info `Content-Type` has to be `multipart/form-data` to support image upload - * @param {string} title - event's title - * @param {string} description - event's description (html accepted and sanitized) - * @param {string} place_name - the name of the place - * @param {string} [place_address] - the address of the place - * @param {integer} start_datetime - start timestamp - * @param {integer} multidate - is a multidate event? - * @param {array} tags - List of tags - * @param {object} [recurrent] - Recurrent event details - * @param {string} [recurrent.frequency] - could be `1w` or `2w` - * @param {string} [recurrent.type] - not used - * @param {array} [recurrent.days] - array of days - * @param {image} [image] - Image - */ - -// allow anyone to add an event (anon event has to be confirmed, TODO: flood protection) -api.post('/event', upload.single('image'), eventController.add) - -api.put('/event', isAuth, upload.single('image'), eventController.update) -api.get('/event/import', isAuth, helpers.importURL) - -// remove event -api.delete('/event/:id', isAuth, eventController.remove) - -// get tags/places -api.get('/event/meta', eventController.getMeta) - -// get unconfirmed events -api.get('/event/unconfirmed', isAdmin, eventController.getUnconfirmed) - -// add event notification TODO -api.post('/event/notification', eventController.addNotification) -api.delete('/event/notification/:code', eventController.delNotification) - -api.get('/settings', settingsController.getAllRequest) -api.post('/settings', isAdmin, settingsController.setRequest) -api.post('/settings/logo', isAdmin, multer({ dest: config.upload_path }).single('logo'), settingsController.setLogo) - -// confirm event -api.put('/event/confirm/:event_id', isAuth, eventController.confirm) -api.put('/event/unconfirm/:event_id', isAuth, eventController.unconfirm) - -// get event -api.get('/event/:event_id.:format?', cors, eventController.get) - -// export events (rss/ics) -api.get('/export/:type', cors, exportController.export) - -// get events in this range -api.get('/events', cors, eventController.select) - -api.get('/instances', isAdmin, instanceController.getAll) -api.get('/instances/:instance_domain', isAdmin, instanceController.get) -api.post('/instances/toggle_block', isAdmin, instanceController.toggleBlock) -api.post('/instances/toggle_user_block', isAdmin, apUserController.toggleBlock) -api.put('/resources/:resource_id', isAdmin, resourceController.hide) -api.delete('/resources/:resource_id', isAdmin, resourceController.remove) -api.get('/resources', isAdmin, resourceController.getAll) - -// - ADMIN ANNOUNCEMENTS -api.get('/announcements', isAdmin, announceController.getAll) -api.post('/announcements', isAdmin, announceController.add) -api.put('/announcements/:announce_id', isAdmin, announceController.update) -api.delete('/announcements/:announce_id', isAdmin, announceController.remove) - -// OAUTH -api.get('/clients', isAuth, oauthController.getClients) -api.get('/client/:client_id', isAuth, oauthController.getClient) -api.post('/client', oauthController.createClient) api.use((req, res) => res.sendStatus(404)) From 15f4425c4b12861b0811ff665a8494300342645e Mon Sep 17 00:00:00 2001 From: les Date: Thu, 30 Sep 2021 11:13:03 +0200 Subject: [PATCH 125/271] minor --- pages/setup/index.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pages/setup/index.vue b/pages/setup/index.vue index a5cd32cf..40d44322 100644 --- a/pages/setup/index.vue +++ b/pages/setup/index.vue @@ -51,9 +51,13 @@ export default { this.step = this.step + 1 }, async configCompleted () { - const user = await this.$axios.$post('/setup/restart') - this.step = this.step + 1 - this.$refs.completed.start(user) + try { + const user = await this.$axios.$post('/setup/restart') + this.step = this.step + 1 + this.$refs.completed.start(user) + } catch (e) { + this.$root.$message(e.response.data, { color: 'error' }) + } } } } From 5495880c0bb67ea020968af4c4d7640458be3ef6 Mon Sep 17 00:00:00 2001 From: les Date: Thu, 30 Sep 2021 11:13:44 +0200 Subject: [PATCH 126/271] minor on default settings --- server/api/controller/settings.js | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/server/api/controller/settings.js b/server/api/controller/settings.js index 862f0c20..f916db0c 100644 --- a/server/api/controller/settings.js +++ b/server/api/controller/settings.js @@ -1,19 +1,28 @@ -const config = require('../../config') const path = require('path') +const URL = require('url') const fs = require('fs') -const pkg = require('../../../package.json') const crypto = require('crypto') -const util = require('util') -const generateKeyPair = util.promisify(crypto.generateKeyPair) +const { promisify } = require('util') const sharp = require('sharp') +const config = require('../../config') +const pkg = require('../../../package.json') +const generateKeyPair = promisify(crypto.generateKeyPair) const log = require('../../log') + +let defaultHostname +try { + defaultHostname = new URL.URL(config.baseurl).hostname +} catch (e) {} + const defaultSettings = { title: 'Gancio', description: 'A shared agenda for local communities', + baseurl: config.baseurl || '', + hostname: defaultHostname, instance_timezone: 'Europe/Rome', instance_locale: 'en', - instance_name: 'gancio', // config.title.toLowerCase().replace(/ /g, ''), + instance_name: 'gancio', instance_place: '', allow_registration: true, allow_anon_event: true, @@ -29,7 +38,8 @@ const defaultSettings = { footerLinks: [ { href: '/', label: 'home' }, { href: '/about', label: 'about' } - ] + ], + admin_email: config.admin_email || '' } /** From 3b7b2ec6bd9701b66440fdd3f4f3e95c1f5c45a6 Mon Sep 17 00:00:00 2001 From: les Date: Thu, 30 Sep 2021 11:15:21 +0200 Subject: [PATCH 127/271] resolve path in cli/log/config --- server/cli.js | 51 ++++++++---------------------------------------- server/config.js | 24 ++++------------------- server/log.js | 1 + 3 files changed, 13 insertions(+), 63 deletions(-) diff --git a/server/cli.js b/server/cli.js index bdbf0a4d..29b41812 100755 --- a/server/cli.js +++ b/server/cli.js @@ -1,48 +1,17 @@ #!/usr/bin/env node -process.env.NODE_ENV = 'production' - const pkg = require('../package.json') const path = require('path') -const cwd = process.cwd() -const data_path = process.env.GANCIO_DATA || path.resolve('./') +process.env.cwd = path.resolve('./') // needed by nuxt -// process.chdir(path.resolve(__dirname, '..')) - -// async function run_migrations (db_conf) { -// const Umzug = require('umzug') -// const Sequelize = require('sequelize') -// try { -// const db = new Sequelize(db_conf) -// const umzug = new Umzug({ -// storage: 'sequelize', -// storageOptions: { sequelize: db }, -// logging: consola.info, -// migrations: { -// wrap: fun => { -// return () => -// fun(db.queryInterface, Sequelize).catch(e => { -// consola.error(e) -// return false -// }) -// }, -// path: path.resolve(__dirname, 'migrations') -// } -// }) -// await umzug.up() -// return db.close() -// } catch (e) { -// consola.warn(` ⚠️ Cannot connect to db, check your configuration => ${e}`) -// process.exit(-1) -// } -// } +if (process.env.NODE_ENV === 'production') { + process.chdir(path.resolve(__dirname, '..')) +} async function start (options) { try { - const config = require('./config') - config.load() - console.info(`Logging to ${path.resolve(`${config.log_path}/gancio.log`)} [level: ${config.log_level}]`) + require('./config') } catch (e) { console.error(e) process.exit(-1) @@ -51,8 +20,7 @@ async function start (options) { require('./index') } -// async function setup (options) -console.info(`📅 ${pkg.name} - v${pkg.version} - ${pkg.description} (nodejs: ${process.version})`) +console.info(`📅 ${pkg.name} - v${pkg.version} - ${pkg.description} (nodejs: ${process.version}, ENV: ${process.env.NODE_ENV})`) require('yargs') .usage('Usage $0 [options]') @@ -62,16 +30,13 @@ require('yargs') default: false, type: 'boolean' }) - .option('db', { - describe: 'Specify db type' - }) .option('config', { alias: 'c', describe: 'Configuration file', - default: path.resolve(data_path, 'config.json') + default: path.resolve(process.env.cwd, 'config.json') }) .coerce('config', config_path => { - const absolute_config_path = path.resolve(cwd, config_path) + const absolute_config_path = path.resolve(process.env.cwd, config_path) process.env.config_path = absolute_config_path return absolute_config_path }) diff --git a/server/config.js b/server/config.js index 1a84d887..b05145f1 100644 --- a/server/config.js +++ b/server/config.js @@ -1,48 +1,32 @@ const fs = require('fs') const path = require('path') -const log = require('./log') let config = { firstrun: true, - // title: "Gancio", - // description: "A shared agenda for local communities", baseurl: "http://localhost:13120", server: { host: '127.0.0.1', port: 13120 }, log_level: 'debug', - log_path: './logs', + log_path: path.resolve(process.env.cwd, 'logs'), db: {}, - upload_path: './uploads', - // smtp: { - // auth: { - // user: '', - // pass: '' - // }, - // secure: true, - // host: '' - // }, - // admin_email: '', - - // + upload_path: path.resolve(process.env.cwd, 'uploads'), write (config_path= process.env.config_path || './config.json') { - log.error(path.resolve(config_path)) return fs.writeFileSync(config_path, JSON.stringify(config, null, 2)) }, load () { // load configuration from file - console.error(process.env.NODE_ENV) const config_path = process.env.config_path || './config.json' - log.info(`Reading configuration from: ${config_path}`) + console.info(`> Reading configuration from: ${config_path}`) if (fs.existsSync(config_path)) { const configContent = fs.readFileSync(config_path) config = Object.assign(config, JSON.parse(configContent)) config.firstrun = false } else { config.firstrun = true - log.error('configuration file does not exists! we cannot be here!') + console.info('> Configuration file does not exists, running setup..') } } } diff --git a/server/log.js b/server/log.js index d29ea588..16bf014f 100644 --- a/server/log.js +++ b/server/log.js @@ -37,4 +37,5 @@ const logger = createLogger({ )] }) +logger.info(`Logging to ${config.log_path}/gancio.log (level: ${config.log_level})`) module.exports = logger From 0de1932e55658659435c2bb833555b919007f2fa Mon Sep 17 00:00:00 2001 From: les Date: Thu, 30 Sep 2021 11:16:30 +0200 Subject: [PATCH 128/271] start from cli also in dev mode --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index cf0dd2b1..fb447240 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "scripts": { "build": "cross-env nuxt build --modern", "lint": "eslint --ext .js,.vue --ignore-path .gitignore .", - "dev": "NODE_ENV=development node server/index.js", - "dev:inspect": "NODE_ENV=development node --inspect server/index.js", + "dev": "NODE_ENV=development node server/cli.js", + "dev:inspect": "NODE_ENV=development node --inspect server/cli.js", "dev:nuxt": "cross-env NODE_ENV=development nuxt dev --modern", "doc": "cd docs && bundle exec jekyll b", "doc:dev": "cd docs && bundle exec jekyll s --drafts", @@ -49,6 +49,7 @@ "inquirer": "^8.1.5", "jsdom": "^17.0.0", "jsonwebtoken": "^8.5.1", + "linkify-html": "^3.0.2", "linkifyjs": "3.0.1", "lodash": "^4.17.21", "microformat-node": "^2.0.1", From 06c352253a184847e06c512fe2800b50670bc221 Mon Sep 17 00:00:00 2001 From: les Date: Thu, 30 Sep 2021 11:18:49 +0200 Subject: [PATCH 129/271] upadte deps --- yarn.lock | 1678 ++++++++++++++++++++++++++++------------------------- 1 file changed, 891 insertions(+), 787 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7846c772..f1079bca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,25 +9,25 @@ dependencies: "@babel/highlight" "^7.14.5" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.0", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08" - integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw== +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.0", "@babel/compat-data@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176" + integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA== "@babel/core@^7.12.16", "@babel/core@^7.14.0": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.8.tgz#20cdf7c84b5d86d83fac8710a8bc605a7ba3f010" - integrity sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q== + version "7.15.5" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.5.tgz#f8ed9ace730722544609f90c9bb49162dc3bf5b9" + integrity sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg== dependencies: "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.14.8" - "@babel/helper-compilation-targets" "^7.14.5" - "@babel/helper-module-transforms" "^7.14.8" - "@babel/helpers" "^7.14.8" - "@babel/parser" "^7.14.8" - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.8" - "@babel/types" "^7.14.8" + "@babel/generator" "^7.15.4" + "@babel/helper-compilation-targets" "^7.15.4" + "@babel/helper-module-transforms" "^7.15.4" + "@babel/helpers" "^7.15.4" + "@babel/parser" "^7.15.5" + "@babel/template" "^7.15.4" + "@babel/traverse" "^7.15.4" + "@babel/types" "^7.15.4" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -36,59 +36,59 @@ source-map "^0.5.0" "@babel/eslint-parser@^7.12.16": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.14.7.tgz#91be59a4f7dd60d02a3ef772d156976465596bda" - integrity sha512-6WPwZqO5priAGIwV6msJcdc9TsEPzYeYdS/Xuoap+/ihkgN6dzHp2bcAAwyWZ5bLzk0vvjDmKvRwkqNaiJ8BiQ== + version "7.15.7" + resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.15.7.tgz#2dc3d0ff0ea22bb1e08d93b4eeb1149bf1c75f2d" + integrity sha512-yJkHyomClm6A2Xzb8pdAo4HzYMSXFn1O5zrCYvbFP0yQFvHueLedV8WiEno8yJOKStjUXzBZzJFeWQ7b3YMsqQ== dependencies: eslint-scope "^5.1.1" eslint-visitor-keys "^2.1.0" semver "^6.3.0" -"@babel/generator@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz#bf86fd6af96cf3b74395a8ca409515f89423e070" - integrity sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg== +"@babel/generator@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.4.tgz#85acb159a267ca6324f9793986991ee2022a05b0" + integrity sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw== dependencies: - "@babel/types" "^7.14.8" + "@babel/types" "^7.15.4" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz#7bf478ec3b71726d56a8ca5775b046fc29879e61" - integrity sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA== +"@babel/helper-annotate-as-pure@^7.14.5", "@babel/helper-annotate-as-pure@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz#3d0e43b00c5e49fdb6c57e421601a7a658d5f835" + integrity sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.15.4" "@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz#b939b43f8c37765443a19ae74ad8b15978e0a191" - integrity sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w== + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz#21ad815f609b84ee0e3058676c33cf6d1670525f" + integrity sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q== dependencies: - "@babel/helper-explode-assignable-expression" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/helper-explode-assignable-expression" "^7.15.4" + "@babel/types" "^7.15.4" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf" - integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw== +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9" + integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ== dependencies: - "@babel/compat-data" "^7.14.5" + "@babel/compat-data" "^7.15.0" "@babel/helper-validator-option" "^7.14.5" browserslist "^4.16.6" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.14.5": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz#a6f8c3de208b1e5629424a9a63567f56501955fc" - integrity sha512-bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ== +"@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz#7f977c17bd12a5fba363cb19bea090394bf37d2e" + integrity sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw== dependencies: - "@babel/helper-annotate-as-pure" "^7.14.5" - "@babel/helper-function-name" "^7.14.5" - "@babel/helper-member-expression-to-functions" "^7.14.7" - "@babel/helper-optimise-call-expression" "^7.14.5" - "@babel/helper-replace-supers" "^7.14.5" - "@babel/helper-split-export-declaration" "^7.14.5" + "@babel/helper-annotate-as-pure" "^7.15.4" + "@babel/helper-function-name" "^7.15.4" + "@babel/helper-member-expression-to-functions" "^7.15.4" + "@babel/helper-optimise-call-expression" "^7.15.4" + "@babel/helper-replace-supers" "^7.15.4" + "@babel/helper-split-export-declaration" "^7.15.4" "@babel/helper-create-regexp-features-plugin@^7.14.5": version "7.14.5" @@ -112,144 +112,144 @@ resolve "^1.14.2" semver "^6.1.2" -"@babel/helper-explode-assignable-expression@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz#8aa72e708205c7bb643e45c73b4386cdf2a1f645" - integrity sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ== +"@babel/helper-explode-assignable-expression@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz#f9aec9d219f271eaf92b9f561598ca6b2682600c" + integrity sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.15.4" -"@babel/helper-function-name@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4" - integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ== +"@babel/helper-function-name@^7.14.5", "@babel/helper-function-name@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz#845744dafc4381a4a5fb6afa6c3d36f98a787ebc" + integrity sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw== dependencies: - "@babel/helper-get-function-arity" "^7.14.5" - "@babel/template" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/helper-get-function-arity" "^7.15.4" + "@babel/template" "^7.15.4" + "@babel/types" "^7.15.4" -"@babel/helper-get-function-arity@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815" - integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg== +"@babel/helper-get-function-arity@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz#098818934a137fce78b536a3e015864be1e2879b" + integrity sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.15.4" -"@babel/helper-hoist-variables@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d" - integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ== +"@babel/helper-hoist-variables@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz#09993a3259c0e918f99d104261dfdfc033f178df" + integrity sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.15.4" -"@babel/helper-member-expression-to-functions@^7.14.5", "@babel/helper-member-expression-to-functions@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970" - integrity sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA== +"@babel/helper-member-expression-to-functions@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef" + integrity sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.15.4" -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12", "@babel/helper-module-imports@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3" - integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ== +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f" + integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.15.4" -"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz#d4279f7e3fd5f4d5d342d833af36d4dd87d7dc49" - integrity sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA== +"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.4": + version "7.15.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.7.tgz#7da80c8cbc1f02655d83f8b79d25866afe50d226" + integrity sha512-ZNqjjQG/AuFfekFTY+7nY4RgBSklgTu970c7Rj3m/JOhIu5KPBUuTA9AY6zaKcUvk4g6EbDXdBnhi35FAssdSw== dependencies: - "@babel/helper-module-imports" "^7.14.5" - "@babel/helper-replace-supers" "^7.14.5" - "@babel/helper-simple-access" "^7.14.8" - "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/helper-validator-identifier" "^7.14.8" - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.8" - "@babel/types" "^7.14.8" + "@babel/helper-module-imports" "^7.15.4" + "@babel/helper-replace-supers" "^7.15.4" + "@babel/helper-simple-access" "^7.15.4" + "@babel/helper-split-export-declaration" "^7.15.4" + "@babel/helper-validator-identifier" "^7.15.7" + "@babel/template" "^7.15.4" + "@babel/traverse" "^7.15.4" + "@babel/types" "^7.15.6" -"@babel/helper-optimise-call-expression@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c" - integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA== +"@babel/helper-optimise-call-expression@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz#f310a5121a3b9cc52d9ab19122bd729822dee171" + integrity sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.15.4" "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== -"@babel/helper-remap-async-to-generator@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz#51439c913612958f54a987a4ffc9ee587a2045d6" - integrity sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A== +"@babel/helper-remap-async-to-generator@^7.14.5", "@babel/helper-remap-async-to-generator@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz#2637c0731e4c90fbf58ac58b50b2b5a192fc970f" + integrity sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.14.5" - "@babel/helper-wrap-function" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/helper-annotate-as-pure" "^7.15.4" + "@babel/helper-wrap-function" "^7.15.4" + "@babel/types" "^7.15.4" -"@babel/helper-replace-supers@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94" - integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow== +"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a" + integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw== dependencies: - "@babel/helper-member-expression-to-functions" "^7.14.5" - "@babel/helper-optimise-call-expression" "^7.14.5" - "@babel/traverse" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/helper-member-expression-to-functions" "^7.15.4" + "@babel/helper-optimise-call-expression" "^7.15.4" + "@babel/traverse" "^7.15.4" + "@babel/types" "^7.15.4" -"@babel/helper-simple-access@^7.14.5", "@babel/helper-simple-access@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924" - integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg== +"@babel/helper-simple-access@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz#ac368905abf1de8e9781434b635d8f8674bcc13b" + integrity sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg== dependencies: - "@babel/types" "^7.14.8" + "@babel/types" "^7.15.4" -"@babel/helper-skip-transparent-expression-wrappers@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz#96f486ac050ca9f44b009fbe5b7d394cab3a0ee4" - integrity sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ== +"@babel/helper-skip-transparent-expression-wrappers@^7.14.5", "@babel/helper-skip-transparent-expression-wrappers@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz#707dbdba1f4ad0fa34f9114fc8197aec7d5da2eb" + integrity sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.15.4" -"@babel/helper-split-export-declaration@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a" - integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA== +"@babel/helper-split-export-declaration@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz#aecab92dcdbef6a10aa3b62ab204b085f776e257" + integrity sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.15.4" -"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz#32be33a756f29e278a0d644fa08a2c9e0f88a34c" - integrity sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow== +"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.15.7": + version "7.15.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" + integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== "@babel/helper-validator-option@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== -"@babel/helper-wrap-function@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz#5919d115bf0fe328b8a5d63bcb610f51601f2bff" - integrity sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ== +"@babel/helper-wrap-function@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz#6f754b2446cfaf3d612523e6ab8d79c27c3a3de7" + integrity sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw== dependencies: - "@babel/helper-function-name" "^7.14.5" - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/helper-function-name" "^7.15.4" + "@babel/template" "^7.15.4" + "@babel/traverse" "^7.15.4" + "@babel/types" "^7.15.4" -"@babel/helpers@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.8.tgz#839f88f463025886cff7f85a35297007e2da1b77" - integrity sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw== +"@babel/helpers@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.4.tgz#5f40f02050a3027121a3cf48d497c05c555eaf43" + integrity sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ== dependencies: - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.8" - "@babel/types" "^7.14.8" + "@babel/template" "^7.15.4" + "@babel/traverse" "^7.15.4" + "@babel/types" "^7.15.4" "@babel/highlight@^7.14.5": version "7.14.5" @@ -260,27 +260,27 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.14.5", "@babel/parser@^7.14.8", "@babel/parser@^7.6.0", "@babel/parser@^7.9.6": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz#66fd41666b2d7b840bd5ace7f7416d5ac60208d4" - integrity sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA== +"@babel/parser@^7.15.4", "@babel/parser@^7.15.5", "@babel/parser@^7.6.0", "@babel/parser@^7.9.6": + version "7.15.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.7.tgz#0c3ed4a2eb07b165dfa85b3cc45c727334c4edae" + integrity sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g== -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz#4b467302e1548ed3b1be43beae2cc9cf45e0bb7e" - integrity sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ== +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz#dbdeabb1e80f622d9f0b583efb2999605e0a567e" + integrity sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog== dependencies: "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.15.4" "@babel/plugin-proposal-optional-chaining" "^7.14.5" -"@babel/plugin-proposal-async-generator-functions@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz#784a48c3d8ed073f65adcf30b57bcbf6c8119ace" - integrity sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q== +"@babel/plugin-proposal-async-generator-functions@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz#f82aabe96c135d2ceaa917feb9f5fca31635277e" + integrity sha512-2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw== dependencies: "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-remap-async-to-generator" "^7.14.5" + "@babel/helper-remap-async-to-generator" "^7.15.4" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.14.5": @@ -291,21 +291,21 @@ "@babel/helper-create-class-features-plugin" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-proposal-class-static-block@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz#158e9e10d449c3849ef3ecde94a03d9f1841b681" - integrity sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg== +"@babel/plugin-proposal-class-static-block@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz#3e7ca6128453c089e8b477a99f970c63fc1cb8d7" + integrity sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA== dependencies: - "@babel/helper-create-class-features-plugin" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.15.4" "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-proposal-decorators@^7.13.15": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.14.5.tgz#59bc4dfc1d665b5a6749cf798ff42297ed1b2c1d" - integrity sha512-LYz5nvQcvYeRVjui1Ykn28i+3aUiXwQ/3MGoEy0InTaz1pJo/lAzmIDXX+BQny/oufgHzJ6vnEEiXQ8KZjEVFg== + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.15.4.tgz#fb55442bc83ab4d45dda76b91949706bf22881d2" + integrity sha512-WNER+YLs7avvRukEddhu5PSfSaMMimX2xBFgLQS7Bw16yrUxJGWidO9nQp+yLy9MVybg5Ba3BlhAw+BkdhpDmg== dependencies: - "@babel/helper-create-class-features-plugin" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.15.4" "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-decorators" "^7.14.5" @@ -357,16 +357,16 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz#5920a2b3df7f7901df0205974c0641b13fd9d363" - integrity sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g== +"@babel/plugin-proposal-object-rest-spread@^7.15.6": + version "7.15.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz#ef68050c8703d07b25af402cb96cf7f34a68ed11" + integrity sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg== dependencies: - "@babel/compat-data" "^7.14.7" - "@babel/helper-compilation-targets" "^7.14.5" + "@babel/compat-data" "^7.15.0" + "@babel/helper-compilation-targets" "^7.15.4" "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.14.5" + "@babel/plugin-transform-parameters" "^7.15.4" "@babel/plugin-proposal-optional-catch-binding@^7.14.5": version "7.14.5" @@ -393,13 +393,13 @@ "@babel/helper-create-class-features-plugin" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-proposal-private-property-in-object@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz#9f65a4d0493a940b4c01f8aa9d3f1894a587f636" - integrity sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q== +"@babel/plugin-proposal-private-property-in-object@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz#55c5e3b4d0261fd44fe637e3f624cfb0f484e3e5" + integrity sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA== dependencies: - "@babel/helper-annotate-as-pure" "^7.14.5" - "@babel/helper-create-class-features-plugin" "^7.14.5" + "@babel/helper-annotate-as-pure" "^7.15.4" + "@babel/helper-create-class-features-plugin" "^7.15.4" "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" @@ -546,24 +546,24 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-block-scoping@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz#8cc63e61e50f42e078e6f09be775a75f23ef9939" - integrity sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw== +"@babel/plugin-transform-block-scoping@^7.15.3": + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf" + integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q== dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-classes@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz#0e98e82097b38550b03b483f9b51a78de0acb2cf" - integrity sha512-J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA== +"@babel/plugin-transform-classes@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz#50aee17aaf7f332ae44e3bce4c2e10534d5d3bf1" + integrity sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg== dependencies: - "@babel/helper-annotate-as-pure" "^7.14.5" - "@babel/helper-function-name" "^7.14.5" - "@babel/helper-optimise-call-expression" "^7.14.5" + "@babel/helper-annotate-as-pure" "^7.15.4" + "@babel/helper-function-name" "^7.15.4" + "@babel/helper-optimise-call-expression" "^7.15.4" "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-replace-supers" "^7.14.5" - "@babel/helper-split-export-declaration" "^7.14.5" + "@babel/helper-replace-supers" "^7.15.4" + "@babel/helper-split-export-declaration" "^7.15.4" globals "^11.1.0" "@babel/plugin-transform-computed-properties@^7.14.5": @@ -603,10 +603,10 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-for-of@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz#dae384613de8f77c196a8869cbf602a44f7fc0eb" - integrity sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA== +"@babel/plugin-transform-for-of@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz#25c62cce2718cfb29715f416e75d5263fb36a8c2" + integrity sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA== dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -641,25 +641,25 @@ "@babel/helper-plugin-utils" "^7.14.5" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz#7aaee0ea98283de94da98b28f8c35701429dad97" - integrity sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A== +"@babel/plugin-transform-modules-commonjs@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz#8201101240eabb5a76c08ef61b2954f767b6b4c1" + integrity sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA== dependencies: - "@babel/helper-module-transforms" "^7.14.5" + "@babel/helper-module-transforms" "^7.15.4" "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-simple-access" "^7.14.5" + "@babel/helper-simple-access" "^7.15.4" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-systemjs@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz#c75342ef8b30dcde4295d3401aae24e65638ed29" - integrity sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA== +"@babel/plugin-transform-modules-systemjs@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz#b42890c7349a78c827719f1d2d0cd38c7d268132" + integrity sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw== dependencies: - "@babel/helper-hoist-variables" "^7.14.5" - "@babel/helper-module-transforms" "^7.14.5" + "@babel/helper-hoist-variables" "^7.15.4" + "@babel/helper-module-transforms" "^7.15.4" "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-validator-identifier" "^7.14.5" + "@babel/helper-validator-identifier" "^7.14.9" babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-umd@^7.14.5": @@ -670,10 +670,10 @@ "@babel/helper-module-transforms" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-named-capturing-groups-regex@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz#60c06892acf9df231e256c24464bfecb0908fd4e" - integrity sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg== +"@babel/plugin-transform-named-capturing-groups-regex@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz#c68f5c5d12d2ebaba3762e57c2c4f6347a46e7b2" + integrity sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.14.5" @@ -692,10 +692,10 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/helper-replace-supers" "^7.14.5" -"@babel/plugin-transform-parameters@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz#49662e86a1f3ddccac6363a7dfb1ff0a158afeb3" - integrity sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA== +"@babel/plugin-transform-parameters@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz#5f2285cc3160bf48c8502432716b48504d29ed62" + integrity sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ== dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -721,9 +721,9 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-runtime@^7.13.15": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz#30491dad49c6059f8f8fa5ee8896a0089e987523" - integrity sha512-fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg== + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz#d3aa650d11678ca76ce294071fda53d7804183b3" + integrity sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw== dependencies: "@babel/helper-module-imports" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" @@ -784,29 +784,29 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/preset-env@^7.14.1": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.8.tgz#254942f5ca80ccabcfbb2a9f524c74bca574005b" - integrity sha512-a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg== + version "7.15.6" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.6.tgz#0f3898db9d63d320f21b17380d8462779de57659" + integrity sha512-L+6jcGn7EWu7zqaO2uoTDjjMBW+88FXzV8KvrBl2z6MtRNxlsmUNRlZPaNNPUTgqhyC5DHNFk/2Jmra+ublZWw== dependencies: - "@babel/compat-data" "^7.14.7" - "@babel/helper-compilation-targets" "^7.14.5" + "@babel/compat-data" "^7.15.0" + "@babel/helper-compilation-targets" "^7.15.4" "@babel/helper-plugin-utils" "^7.14.5" "@babel/helper-validator-option" "^7.14.5" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5" - "@babel/plugin-proposal-async-generator-functions" "^7.14.7" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.15.4" + "@babel/plugin-proposal-async-generator-functions" "^7.15.4" "@babel/plugin-proposal-class-properties" "^7.14.5" - "@babel/plugin-proposal-class-static-block" "^7.14.5" + "@babel/plugin-proposal-class-static-block" "^7.15.4" "@babel/plugin-proposal-dynamic-import" "^7.14.5" "@babel/plugin-proposal-export-namespace-from" "^7.14.5" "@babel/plugin-proposal-json-strings" "^7.14.5" "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5" "@babel/plugin-proposal-numeric-separator" "^7.14.5" - "@babel/plugin-proposal-object-rest-spread" "^7.14.7" + "@babel/plugin-proposal-object-rest-spread" "^7.15.6" "@babel/plugin-proposal-optional-catch-binding" "^7.14.5" "@babel/plugin-proposal-optional-chaining" "^7.14.5" "@babel/plugin-proposal-private-methods" "^7.14.5" - "@babel/plugin-proposal-private-property-in-object" "^7.14.5" + "@babel/plugin-proposal-private-property-in-object" "^7.15.4" "@babel/plugin-proposal-unicode-property-regex" "^7.14.5" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-class-properties" "^7.12.13" @@ -825,25 +825,25 @@ "@babel/plugin-transform-arrow-functions" "^7.14.5" "@babel/plugin-transform-async-to-generator" "^7.14.5" "@babel/plugin-transform-block-scoped-functions" "^7.14.5" - "@babel/plugin-transform-block-scoping" "^7.14.5" - "@babel/plugin-transform-classes" "^7.14.5" + "@babel/plugin-transform-block-scoping" "^7.15.3" + "@babel/plugin-transform-classes" "^7.15.4" "@babel/plugin-transform-computed-properties" "^7.14.5" "@babel/plugin-transform-destructuring" "^7.14.7" "@babel/plugin-transform-dotall-regex" "^7.14.5" "@babel/plugin-transform-duplicate-keys" "^7.14.5" "@babel/plugin-transform-exponentiation-operator" "^7.14.5" - "@babel/plugin-transform-for-of" "^7.14.5" + "@babel/plugin-transform-for-of" "^7.15.4" "@babel/plugin-transform-function-name" "^7.14.5" "@babel/plugin-transform-literals" "^7.14.5" "@babel/plugin-transform-member-expression-literals" "^7.14.5" "@babel/plugin-transform-modules-amd" "^7.14.5" - "@babel/plugin-transform-modules-commonjs" "^7.14.5" - "@babel/plugin-transform-modules-systemjs" "^7.14.5" + "@babel/plugin-transform-modules-commonjs" "^7.15.4" + "@babel/plugin-transform-modules-systemjs" "^7.15.4" "@babel/plugin-transform-modules-umd" "^7.14.5" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.7" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9" "@babel/plugin-transform-new-target" "^7.14.5" "@babel/plugin-transform-object-super" "^7.14.5" - "@babel/plugin-transform-parameters" "^7.14.5" + "@babel/plugin-transform-parameters" "^7.15.4" "@babel/plugin-transform-property-literals" "^7.14.5" "@babel/plugin-transform-regenerator" "^7.14.5" "@babel/plugin-transform-reserved-words" "^7.14.5" @@ -855,11 +855,11 @@ "@babel/plugin-transform-unicode-escapes" "^7.14.5" "@babel/plugin-transform-unicode-regex" "^7.14.5" "@babel/preset-modules" "^0.1.4" - "@babel/types" "^7.14.8" + "@babel/types" "^7.15.6" babel-plugin-polyfill-corejs2 "^0.2.2" babel-plugin-polyfill-corejs3 "^0.2.2" babel-plugin-polyfill-regenerator "^0.2.2" - core-js-compat "^3.15.0" + core-js-compat "^3.16.0" semver "^6.3.0" "@babel/preset-modules@^0.1.4": @@ -874,50 +874,50 @@ esutils "^2.0.2" "@babel/runtime-corejs3@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.14.8.tgz#68539e0129f13eb1ed9a9aa273d3542b93c88384" - integrity sha512-4dMD5QRBkumn45oweR0SxoNtt15oz3BUBAQ8cIx7HJqZTtE8zjpM0My8aHJHVnyf4XfRg6DNzaE1080WLBiC1w== + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz#403139af262b9a6e8f9ba04a6fdcebf8de692bf1" + integrity sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg== dependencies: - core-js-pure "^3.15.0" + core-js-pure "^3.16.0" regenerator-runtime "^0.13.4" "@babel/runtime@^7.10.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446" - integrity sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg== + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a" + integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw== dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" - integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g== +"@babel/template@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194" + integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg== dependencies: "@babel/code-frame" "^7.14.5" - "@babel/parser" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/parser" "^7.15.4" + "@babel/types" "^7.15.4" -"@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz#c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce" - integrity sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg== +"@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4": + version "7.15.4" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d" + integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA== dependencies: "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.14.8" - "@babel/helper-function-name" "^7.14.5" - "@babel/helper-hoist-variables" "^7.14.5" - "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/parser" "^7.14.8" - "@babel/types" "^7.14.8" + "@babel/generator" "^7.15.4" + "@babel/helper-function-name" "^7.15.4" + "@babel/helper-hoist-variables" "^7.15.4" + "@babel/helper-split-export-declaration" "^7.15.4" + "@babel/parser" "^7.15.4" + "@babel/types" "^7.15.4" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.4.4", "@babel/types@^7.6.1", "@babel/types@^7.9.6": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz#38109de8fcadc06415fbd9b74df0065d4d41c728" - integrity sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q== +"@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.4.4", "@babel/types@^7.6.1", "@babel/types@^7.9.6": + version "7.15.6" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f" + integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig== dependencies: - "@babel/helper-validator-identifier" "^7.14.8" + "@babel/helper-validator-identifier" "^7.14.9" to-fast-properties "^2.0.0" "@csstools/convert-colors@^1.4.0": @@ -935,21 +935,26 @@ kuler "^2.0.0" "@discoveryjs/json-ext@^0.5.0": - version "0.5.3" - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz#90420f9f9c6d3987f176a19a7d8e764271a2f55d" - integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g== + version "0.5.5" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz#9283c9ce5b289a3c4f61c12757469e59377f81f3" + integrity sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA== + +"@gar/promisify@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" + integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw== "@hapi/boom@^9.1.2": - version "9.1.3" - resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.3.tgz#22cad56e39b7a4819161a99b1db19eaaa9b6cc6e" - integrity sha512-RlrGyZ603hE/eRTZtTltocRm50HHmrmL3kGOP0SQ9MasazlW1mt/fkv4C5P/6rnpFXjwld/POFX1C8tMZE3ldg== + version "9.1.4" + resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.4.tgz#1f9dad367c6a7da9f8def24b4a986fc5a7bd9db6" + integrity sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw== dependencies: "@hapi/hoek" "9.x.x" "@hapi/hoek@9.x.x": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.0.tgz#f3933a44e365864f4dad5db94158106d511e8131" - integrity sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug== + version "9.2.1" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" + integrity sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw== "@jimp/bmp@^0.16.1": version "0.16.1" @@ -1308,6 +1313,14 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@npmcli/fs@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz#589612cfad3a6ea0feafcb901d29c63fd52db09f" + integrity sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ== + dependencies: + "@gar/promisify" "^1.0.1" + semver "^7.3.5" + "@npmcli/move-file@^1.0.1": version "1.1.2" resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" @@ -1390,18 +1403,18 @@ wrap-ansi "^7.0.0" "@nuxt/components@^2.1.8": - version "2.1.8" - resolved "https://registry.yarnpkg.com/@nuxt/components/-/components-2.1.8.tgz#2d07fe077768d0a3041a5685c08ad8825ea2f2cd" - integrity sha512-gdVzBiM9V28svAKWlGg+IrvRXF9sHlWaVNKDNNYpYg0zh7f9xNxYAk6DtQeBBJshbAsPaXC9J2ZFxfrREX3H8w== + version "2.2.1" + resolved "https://registry.yarnpkg.com/@nuxt/components/-/components-2.2.1.tgz#49c4442ac5a0ef49f49ef7d9960f4376fc3e7c78" + integrity sha512-r1LHUzifvheTnJtYrMuA+apgsrEJbxcgFKIimeXKb+jl8TnPWdV3egmrxBCaDJchrtY/wmHyP47tunsft7AWwg== dependencies: - chalk "^4.1.1" - chokidar "^3.5.1" - glob "^7.1.6" - globby "^11.0.3" + chalk "^4.1.2" + chokidar "^3.5.2" + glob "^7.1.7" + globby "^11.0.4" scule "^0.2.1" semver "^7.3.5" upath "^2.0.1" - vue-template-compiler "^2.6.12" + vue-template-compiler "^2.6.14" "@nuxt/config@2.15.8": version "2.15.8" @@ -1699,10 +1712,10 @@ mustache "^2.3.0" stack-trace "0.0.10" -"@polka/url@^1.0.0-next.15": - version "1.0.0-next.15" - resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.15.tgz#6a9d143f7f4f49db2d782f9e1c8839a29b43ae23" - integrity sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA== +"@polka/url@^1.0.0-next.20": + version "1.0.0-next.20" + resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.20.tgz#111b5db0f501aa89b05076fa31f0ea0e0c292cd3" + integrity sha512-88p7+M0QGxKpmnkfXjS4V26AnoC/eiqZutE8GLdaI5X12NY75bXSdTY9NkmYb2Xyk1O+MmkuO6Frmsj84V6I8Q== "@selderee/plugin-htmlparser2@^0.6.0": version "0.6.0" @@ -1730,14 +1743,19 @@ "@types/node" "*" "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8": - version "7.0.8" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818" - integrity sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg== + 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== + +"@types/json5@^0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= "@types/lodash@^4.14.165": - version "4.14.171" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.171.tgz#f01b3a5fe3499e34b622c362a46a609fdb23573b" - integrity sha512-7eQ2xYLLI/LsicL2nejW9Wyko3lcpN6O/z0ZLHrEQsg280zIdCv1t/0m6UtBjUHokCGBQ3gYTbHzDkZ1xOBwwg== + version "4.14.175" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.175.tgz#b78dfa959192b01fae0ad90e166478769b215f45" + integrity sha512-XmdEOrKQ8a1Y/yxQFOMbC47G/V2VDO1GvMRnl4O75M4GW/abC5tnfzadQYkqEveqRM1dEJGFFegfPNA2vvx2iw== "@types/minimatch@^3.0.3": version "3.0.5" @@ -1745,9 +1763,9 @@ integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/node@*": - version "16.4.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.7.tgz#f7afa78769d4b477f5092d7c3468e2e8653d779c" - integrity sha512-aDDY54sst8sx47CWT6QQqIZp45yURq4dic0+HCYfYNcY5Ejlb/CLmFnRLfy3wQuYafOeh3lB/DAKaqRKBtcZmA== + version "16.10.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.10.1.tgz#f3647623199ca920960006b3dccf633ea905f243" + integrity sha512-4/Z9DMPKFexZj/Gn3LylFgamNKHm4K3QDi0gz9B26Uk0c8izYf97B5fxfpspMNkWlFupblKM/nV8+NA9Ffvr+w== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -1777,18 +1795,18 @@ source-map "^0.6.1" "@types/webpack-sources@*": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.1.tgz#6af17e3a3ded71eec2b98008d7c12f498a0a4506" - integrity sha512-MjM1R6iuw8XaVbtkCBz0N349cyqBjJHCbQiOeppe3VBeFvxqs74RKHAVt9LkxTnUWc7YLZOEsUfPUnmK6SBPKQ== + version "3.2.0" + resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz#16d759ba096c289034b26553d2df1bf45248d38b" + integrity sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg== dependencies: "@types/node" "*" "@types/source-list-map" "*" source-map "^0.7.3" "@types/webpack@^4.41.8": - version "4.41.30" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.30.tgz#fd3db6d0d41e145a8eeeafcd3c4a7ccde9068ddc" - integrity sha512-GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA== + version "4.41.31" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.31.tgz#c35f252a3559ddf9c85c0d8b0b42019025e581aa" + integrity sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ== dependencies: "@types/node" "*" "@types/tapable" "^1" @@ -1798,49 +1816,49 @@ source-map "^0.6.0" "@typescript-eslint/experimental-utils@^4.0.1": - version "4.28.5" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.5.tgz#66c28bef115b417cf9d80812a713e0e46bb42a64" - integrity sha512-bGPLCOJAa+j49hsynTaAtQIWg6uZd8VLiPcyDe4QPULsvQwLHGLSGKKcBN8/lBxIX14F74UEMK2zNDI8r0okwA== + version "4.32.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.32.0.tgz#53a8267d16ca5a79134739129871966c56a59dc4" + integrity sha512-WLoXcc+cQufxRYjTWr4kFt0DyEv6hDgSaFqYhIzQZ05cF+kXfqXdUh+//kgquPJVUBbL3oQGKQxwPbLxHRqm6A== dependencies: "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.28.5" - "@typescript-eslint/types" "4.28.5" - "@typescript-eslint/typescript-estree" "4.28.5" + "@typescript-eslint/scope-manager" "4.32.0" + "@typescript-eslint/types" "4.32.0" + "@typescript-eslint/typescript-estree" "4.32.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/scope-manager@4.28.5": - version "4.28.5" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.5.tgz#3a1b70c50c1535ac33322786ea99ebe403d3b923" - integrity sha512-PHLq6n9nTMrLYcVcIZ7v0VY1X7dK309NM8ya9oL/yG8syFINIMHxyr2GzGoBYUdv3NUfCOqtuqps0ZmcgnZTfQ== +"@typescript-eslint/scope-manager@4.32.0": + version "4.32.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.32.0.tgz#e03c8668f8b954072b3f944d5b799c0c9225a7d5" + integrity sha512-DK+fMSHdM216C0OM/KR1lHXjP1CNtVIhJ54kQxfOE6x8UGFAjha8cXgDMBEIYS2XCYjjCtvTkjQYwL3uvGOo0w== dependencies: - "@typescript-eslint/types" "4.28.5" - "@typescript-eslint/visitor-keys" "4.28.5" + "@typescript-eslint/types" "4.32.0" + "@typescript-eslint/visitor-keys" "4.32.0" -"@typescript-eslint/types@4.28.5": - version "4.28.5" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.5.tgz#d33edf8e429f0c0930a7c3d44e9b010354c422e9" - integrity sha512-MruOu4ZaDOLOhw4f/6iudyks/obuvvZUAHBDSW80Trnc5+ovmViLT2ZMDXhUV66ozcl6z0LJfKs1Usldgi/WCA== +"@typescript-eslint/types@4.32.0": + version "4.32.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.32.0.tgz#52c633c18da47aee09449144bf59565ab36df00d" + integrity sha512-LE7Z7BAv0E2UvqzogssGf1x7GPpUalgG07nGCBYb1oK4mFsOiFC/VrSMKbZQzFJdN2JL5XYmsx7C7FX9p9ns0w== -"@typescript-eslint/typescript-estree@4.28.5": - version "4.28.5" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.5.tgz#4906d343de693cf3d8dcc301383ed638e0441cd1" - integrity sha512-FzJUKsBX8poCCdve7iV7ShirP8V+ys2t1fvamVeD1rWpiAnIm550a+BX/fmTHrjEpQJ7ZAn+Z7ZZwJjytk9rZw== +"@typescript-eslint/typescript-estree@4.32.0": + version "4.32.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.32.0.tgz#db00ccc41ccedc8d7367ea3f50c6994b8efa9f3b" + integrity sha512-tRYCgJ3g1UjMw1cGG8Yn1KzOzNlQ6u1h9AmEtPhb5V5a1TmiHWcRyF/Ic+91M4f43QeChyYlVTcf3DvDTZR9vw== dependencies: - "@typescript-eslint/types" "4.28.5" - "@typescript-eslint/visitor-keys" "4.28.5" + "@typescript-eslint/types" "4.32.0" + "@typescript-eslint/visitor-keys" "4.32.0" debug "^4.3.1" globby "^11.0.3" is-glob "^4.0.1" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/visitor-keys@4.28.5": - version "4.28.5" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.5.tgz#ffee2c602762ed6893405ee7c1144d9cc0a29675" - integrity sha512-dva/7Rr+EkxNWdJWau26xU/0slnFlkh88v3TsyTgRS/IIYFi5iIfpCFM4ikw0vQTFUR9FYSSyqgK4w64gsgxhg== +"@typescript-eslint/visitor-keys@4.32.0": + version "4.32.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.32.0.tgz#455ba8b51242f2722a497ffae29313f33b14cb7f" + integrity sha512-e7NE0qz8W+atzv3Cy9qaQ7BTLwWsm084Z0c4nIO2l3Bp6u9WIgdqCgyPyV5oSPDMIW3b20H59OOCmVk3jw3Ptw== dependencies: - "@typescript-eslint/types" "4.28.5" + "@typescript-eslint/types" "4.32.0" eslint-visitor-keys "^2.0.0" "@vue/babel-helper-vue-jsx-merge-props@^1.2.1": @@ -2096,10 +2114,10 @@ dependencies: envinfo "^7.7.3" -"@webpack-cli/serve@^1.5.1": - version "1.5.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.1.tgz#b5fde2f0f79c1e120307c415a4c1d5eb15a6f278" - integrity sha512-4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw== +"@webpack-cli/serve@^1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.2.tgz#ea584b637ff63c5a477f6f21604b5a205b72c9ec" + integrity sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw== "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -2156,9 +2174,9 @@ acorn-walk@^7.1.1: integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== acorn-walk@^8.0.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.1.1.tgz#3ddab7f84e4a7e2313f6c414c5b7dac85f4e3ebc" - integrity sha512-FbJdceMlPHEAWJOILDk1fXD8lnTlEIWFkqtfk+MvmL5q/qlHfN7GEHcsFZWt/Tea9jRNPWUZG4G976nqAAmU9w== + version "8.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== acorn@^6.4.1: version "6.4.2" @@ -2171,9 +2189,9 @@ acorn@^7.1.1: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.0.4, acorn@^8.4.1: - version "8.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" - integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA== + 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== agent-base@6: version "6.0.2" @@ -2216,11 +2234,11 @@ alphanum-sort@^1.0.0: integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= ansi-align@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb" - integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw== + version "3.0.1" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" + integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== dependencies: - string-width "^3.0.0" + string-width "^4.1.0" ansi-colors@^4.1.1: version "4.1.1" @@ -2234,10 +2252,10 @@ ansi-escapes@^4.2.1: dependencies: type-fest "^0.21.3" -ansi-html@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" - integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4= +ansi-html-community@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" + integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== ansi-regex@^2.0.0, ansi-regex@^2.1.1: version "2.1.1" @@ -2254,10 +2272,10 @@ ansi-regex@^4.1.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-styles@^2.2.1: version "2.2.1" @@ -2307,17 +2325,17 @@ aproba@^1.0.3, aproba@^1.1.1: integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + version "1.1.7" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" + integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== dependencies: delegates "^1.0.0" readable-stream "^2.0.6" arg@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.0.tgz#a20e2bb5710e82950a516b3f933fee5ed478be90" - integrity sha512-4P8Zm2H+BRS+c/xX1LrHw0qKpEhdlZjLCgWy+d78T9vqa2Z2SiD2wMrYuWIAFy5IZUD7nnNXroRttz+0RzlrzQ== + version "5.0.1" + resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb" + integrity sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA== argparse@^1.0.7: version "1.0.10" @@ -2432,9 +2450,9 @@ assign-symbols@^1.0.0: integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= async@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" - integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== + version "3.2.1" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz#d3274ec66d107a47476a4c49136aacdb00665fc8" + integrity sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg== asynckit@^0.4.0: version "0.4.0" @@ -2452,13 +2470,13 @@ atob@^2.1.2: integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== autoprefixer@^9.6.1: - version "9.8.6" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f" - integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg== + version "9.8.7" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.7.tgz#e3c12de18a800af1a1a8155fbc01dc7de29ea184" + integrity sha512-7Hg99B1eTH5+LgmUBUSmov1Z3bsggQJS7v3IMGo6wcScnbRuvtMc871J9J+4bSbIqa9LSX/zypFXJ8sXHpMJeQ== dependencies: browserslist "^4.12.0" caniuse-lite "^1.0.30001109" - colorette "^1.2.1" + nanocolors "^0.2.8" normalize-range "^0.1.2" num2fraction "^1.2.2" postcss "^7.0.32" @@ -2475,18 +2493,18 @@ aws4@^1.8.0: integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== axios-retry@^3.1.9: - version "3.1.9" - resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.1.9.tgz#6c30fc9aeb4519aebaec758b90ef56fa03fe72e8" - integrity sha512-NFCoNIHq8lYkJa6ku4m+V1837TP6lCa7n79Iuf8/AqATAHYB0ISaAS1eyIenDOfHOLtym34W65Sjke2xjg2fsA== + version "3.2.0" + resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.2.0.tgz#eb48e72f90b177fde62329b2896aa8476cfb90ba" + integrity sha512-RK2cLMgIsAQBDhlIsJR5dOhODPigvel18XUv1dDXW+4k1FzebyfRk+C+orot6WPZOYFKSfhLwHPwVmTVOODQ5w== dependencies: is-retry-allowed "^1.1.0" -axios@^0.21.1: - version "0.21.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" - integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== +axios@^0.21.1, axios@^0.21.4: + version "0.21.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" + integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== dependencies: - follow-redirects "^1.10.0" + follow-redirects "^1.14.0" babel-loader@^8.2.2: version "8.2.2" @@ -2515,12 +2533,12 @@ babel-plugin-polyfill-corejs2@^0.2.2: semver "^6.1.1" babel-plugin-polyfill-corejs3@^0.2.2: - version "0.2.4" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz#68cb81316b0e8d9d721a92e0009ec6ecd4cd2ca9" - integrity sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ== + version "0.2.5" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz#2779846a16a1652244ae268b1e906ada107faf92" + integrity sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw== dependencies: "@babel/helper-define-polyfill-provider" "^0.2.2" - core-js-compat "^3.14.0" + core-js-compat "^3.16.2" babel-plugin-polyfill-regenerator@^0.2.2: version "0.2.2" @@ -2662,15 +2680,15 @@ boolean@3.0.4: integrity sha512-5pyOr+w2LNN72F2mAq6J0ckHUfJYSgRKma7e/wlcMMhgOLV9OI0ERhERYXxUqo+dPyVxcbXKy9n+wg13+LpNnA== boxen@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.0.1.tgz#657528bdd3f59a772b8279b831f27ec2c744664b" - integrity sha512-49VBlw+PrWEF51aCmy7QIteYPIFZxSpvqBdP/2itCPPlJ49kj9zg/XPRFrdkne2W+CfwXUls8exMvu1RysZpKA== + version "5.1.2" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" + integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== dependencies: ansi-align "^3.0.0" camelcase "^6.2.0" chalk "^4.1.0" cli-boxes "^2.2.1" - string-width "^4.2.0" + string-width "^4.2.2" type-fest "^0.20.2" widest-line "^3.1.0" wrap-ansi "^7.0.0" @@ -2777,16 +2795,16 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.6.4: - version "4.16.6" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" - integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.17.1, browserslist@^4.6.4: + version "4.17.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.1.tgz#a98d104f54af441290b7d592626dd541fa642eb9" + integrity sha512-aLD0ZMDSnF4lUt4ZDNgqi5BUn9BZ7YdQdI/cYlILrhdSSZJLU9aNZoD5/NBmM4SK34APB2e83MOsRt1EnkuyaQ== dependencies: - caniuse-lite "^1.0.30001219" - colorette "^1.2.2" - electron-to-chromium "^1.3.723" + caniuse-lite "^1.0.30001259" + electron-to-chromium "^1.3.846" escalade "^3.1.1" - node-releases "^1.1.71" + nanocolors "^0.1.5" + node-releases "^1.1.76" buffer-equal-constant-time@1.0.1: version "1.0.1" @@ -2799,9 +2817,9 @@ buffer-equal@0.0.1: integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs= buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== buffer-json@^2.0.0: version "2.0.0" @@ -2880,10 +2898,11 @@ cacache@^12.0.2: y18n "^4.0.0" cacache@^15.0.5: - version "15.2.0" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.2.0.tgz#73af75f77c58e72d8c630a7a2858cb18ef523389" - integrity sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw== + version "15.3.0" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb" + integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ== dependencies: + "@npmcli/fs" "^1.0.0" "@npmcli/move-file" "^1.0.1" chownr "^2.0.0" fs-minipass "^2.0.0" @@ -2997,10 +3016,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001228: - version "1.0.30001248" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz#26ab45e340f155ea5da2920dadb76a533cb8ebce" - integrity sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001228, caniuse-lite@^1.0.30001259: + version "1.0.30001261" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001261.tgz#96d89813c076ea061209a4e040d8dcf0c66a1d01" + integrity sha512-vM8D9Uvp7bHIN0fZ2KQ4wnmYFpJo/Etb4Vwsuc+ka0tfGDHvOPrFm6S/7CCNLSOkAUjenT2HnUPESdOIL91FaA== caseless@~0.12.0: version "0.12.0" @@ -3027,10 +3046,10 @@ chalk@^2.0.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.1.0, chalk@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" - integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== +chalk@^4.1.0, chalk@^4.1.1, 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== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -3093,7 +3112,7 @@ cheerio@^1.0.0-rc.3: parse5-htmlparser2-tree-adapter "^6.0.1" tslib "^2.2.0" -chokidar@3.5.2, "chokidar@>=3.0.0 <4.0.0", chokidar@^2.1.8, chokidar@^3.4.1, chokidar@^3.5.1: +chokidar@3.5.2, "chokidar@>=3.0.0 <4.0.0", chokidar@^2.1.8, chokidar@^3.4.1, chokidar@^3.5.1, chokidar@^3.5.2: version "3.5.2" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== @@ -3320,7 +3339,7 @@ color@3.0.x: color-convert "^1.9.1" color-string "^1.5.2" -color@^3.0.0, color@^3.1.3: +color@^3.0.0: version "3.2.1" resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== @@ -3328,10 +3347,18 @@ color@^3.0.0, color@^3.1.3: color-convert "^1.9.3" color-string "^1.6.0" +color@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/color/-/color-4.0.1.tgz#21df44cd10245a91b1ccf5ba031609b0e10e7d67" + integrity sha512-rpZjOKN5O7naJxkH2Rx1sZzzBgaiWECc6BYXjeCE6kF0kcASJYbUq02u7JqIHwCb/j3NhV+QhRL2683aICeGZA== + dependencies: + color-convert "^2.0.1" + color-string "^1.6.0" + colorette@^1.2.1, colorette@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" - integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== + version "1.4.0" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" + integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== colors@^1.2.1: version "1.4.0" @@ -3431,13 +3458,6 @@ config-chain@^1.1.12: ini "^1.3.4" proto-list "~1.2.1" -config@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/config/-/config-3.3.6.tgz#b87799db7399cc34988f55379b5f43465b1b065c" - integrity sha512-Hj5916C5HFawjYJat1epbyY2PlAgLpBtDUlr0MxGLgo3p5+7kylyvnRY18PqJHgnNWXcdd0eWDemT7eYWuFgwg== - dependencies: - json5 "^2.1.1" - connect@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" @@ -3561,18 +3581,18 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-js-compat@^3.12.1, core-js-compat@^3.14.0, core-js-compat@^3.15.0: - version "3.15.2" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.15.2.tgz#47272fbb479880de14b4e6081f71f3492f5bd3cb" - integrity sha512-Wp+BJVvwopjI+A1EFqm2dwUmWYXrvucmtIB2LgXn/Rb+gWPKYxtmb4GKHGKG/KGF1eK9jfjzT38DITbTOCX/SQ== +core-js-compat@^3.12.1, core-js-compat@^3.16.0, core-js-compat@^3.16.2: + version "3.18.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.18.1.tgz#01942a0877caf9c6e5007c027183cf0bdae6a191" + integrity sha512-XJMYx58zo4W0kLPmIingVZA10+7TuKrMLPt83+EzDmxFJQUMcTVVmQ+n5JP4r6Z14qSzhQBRi3NSWoeVyKKXUg== dependencies: - browserslist "^4.16.6" + browserslist "^4.17.1" semver "7.0.0" -core-js-pure@^3.15.0: - version "3.15.2" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.15.2.tgz#c8e0874822705f3385d3197af9348f7c9ae2e3ce" - integrity sha512-D42L7RYh1J2grW8ttxoY1+17Y4wXZeKe7uyplAI3FkNQyI5OgBIAjUfFiTPfL1rs0qLpxaabITNbjKl1Sp82tA== +core-js-pure@^3.16.0: + version "3.18.1" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.18.1.tgz#097d34d24484be45cea700a448d1e74622646c80" + integrity sha512-kmW/k8MaSuqpvA1xm2l3TVlBuvW+XBkcaOroFUpO3D4lsTGQWBTb/tBDCf/PNkkPLrwgrkQRIYNPB0CeqGJWGQ== core-js@3.16.0: version "3.16.0" @@ -3585,15 +3605,20 @@ core-js@^2.6.5: integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.15.2: - version "3.15.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61" - integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q== + version "3.18.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.18.1.tgz#289d4be2ce0085d40fc1244c0b1a54c00454622f" + integrity sha512-vJlUi/7YdlCZeL6fXvWNaLUPh/id12WXj3MbkMw5uOyF0PfWPBNOCNbs53YqgrvtujLNlt9JQpruyIKkUZ+PKA== -core-util-is@1.0.2, core-util-is@~1.0.0: +core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + cors@^2.8.5: version "2.8.5" resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" @@ -3955,14 +3980,14 @@ date-fns-tz@^1.1.4: integrity sha512-nyy+URfFI3KUY7udEJozcoftju+KduaqkVfwyTIE0traBiVye09QnyWKLZK7drRr5h9B7sPJITmQnS3U6YOdQg== date-fns@^2.22.1: - version "2.23.0" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.23.0.tgz#4e886c941659af0cf7b30fafdd1eaa37e88788a9" - integrity sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA== + version "2.24.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.24.0.tgz#7d86dc0d93c87b76b63d213b4413337cfd1c105d" + integrity sha512-6ujwvwgPID6zbI0o7UbURi2vlLDR9uP26+tW6Lg+Ji3w7dd0i3DOcjcClLjLPranT60SSEFBwdSyYwn/ZkPIuw== -dayjs@^1.10.5, dayjs@^1.10.6: - version "1.10.6" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63" - integrity sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw== +dayjs@^1.10.6, dayjs@^1.10.7: + version "1.10.7" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468" + integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig== de-indent@^1.0.2: version "1.0.2" @@ -4025,9 +4050,9 @@ deep-extend@^0.6.0: integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== deep-is@~0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" - integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== deepmerge@^4.2.2: version "4.2.2" @@ -4253,16 +4278,16 @@ domhandler@^3.0.0: domelementtype "^2.0.1" domhandler@^4.0.0, domhandler@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059" - integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA== + version "4.2.2" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f" + integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w== dependencies: domelementtype "^2.2.0" -dompurify@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.1.tgz#a47059ca21fd1212d3c8f71fdea6943b8bfbdf6a" - integrity sha512-xGWt+NHAQS+4tpgbOAI08yxW0Pr256Gu/FNE2frZVTbgrBUn8M7tz7/ktS/LZ2MHeGqz6topj0/xY+y8R5FBFw== +dompurify@^2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.3.tgz#c1af3eb88be47324432964d8abc75cf4b98d634c" + integrity sha512-dqnqRkPMAjOZE0FogZ+ceJNM2dZ3V/yNOuFB7+39qpO93hHhfRpHw3heYQC7DPK9FqbQTfBKUJhiSfz4MvXYwg== domutils@1.5.1: version "1.5.1" @@ -4281,9 +4306,9 @@ domutils@^1.5.1, domutils@^1.7.0: domelementtype "1" domutils@^2.0.0, domutils@^2.5.2, domutils@^2.6.0, domutils@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.7.0.tgz#8ebaf0c41ebafcf55b0b72ec31c56323712c5442" - integrity sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg== + version "2.8.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" + integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== dependencies: dom-serializer "^1.0.1" domelementtype "^2.2.0" @@ -4359,10 +4384,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.3.723: - version "1.3.790" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.790.tgz#5c569290929d92c8094fa08c79bc9393ca9e94e7" - integrity sha512-epMH/S2MkhBv+Y0+nHK8dC7bzmOaPwcmiYqt+VwxSUJLgPzkqZnGUEQ8eVhy5zGmgWm9tDDdXkHDzOEsVU979A== +electron-to-chromium@^1.3.846: + version "1.3.852" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.852.tgz#04091fd848b38e7248e4eb70c05e1f9befd2671b" + integrity sha512-vNbdzbbx3d7TStoC0oIVYz6X/tIezHXnreI+4a8I7EqAQ9hpHulz3ar8xChUNcG77A+TtPSKz9B9Xwpt9e1B5w== elliptic@^6.5.3: version "6.5.4" @@ -4485,21 +4510,23 @@ error-stack-parser@^2.0.0: stackframe "^1.1.1" es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2: - version "1.18.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz#25c4c3380a27aa203c44b2b685bba94da31b63e0" - integrity sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw== + version "1.18.6" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.6.tgz#2c44e3ea7a6255039164d26559777a6d978cb456" + integrity sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" function-bind "^1.1.1" get-intrinsic "^1.1.1" + get-symbol-description "^1.0.0" has "^1.0.3" has-symbols "^1.0.2" - is-callable "^1.2.3" + internal-slot "^1.0.3" + is-callable "^1.2.4" is-negative-zero "^2.0.1" - is-regex "^1.1.3" - is-string "^1.0.6" - object-inspect "^1.10.3" + is-regex "^1.1.4" + is-string "^1.0.7" + object-inspect "^1.11.0" object-keys "^1.1.1" object.assign "^4.1.2" string.prototype.trimend "^1.0.4" @@ -4588,18 +4615,18 @@ eslint-config-standard@^16.0.3: resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz#6c8761e544e96c531ff92642eeb87842b8488516" integrity sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg== -eslint-import-resolver-node@^0.3.4: - version "0.3.4" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" - integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== +eslint-import-resolver-node@^0.3.6: + version "0.3.6" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" + integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== dependencies: - debug "^2.6.9" - resolve "^1.13.1" + debug "^3.2.7" + resolve "^1.20.0" -eslint-module-utils@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz#b51be1e473dd0de1c5ea638e22429c2490ea8233" - integrity sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A== +eslint-module-utils@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz#94e5540dd15fe1522e8ffa3ec8db3b7fa7e7a534" + integrity sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q== dependencies: debug "^3.2.7" pkg-dir "^2.0.0" @@ -4613,30 +4640,30 @@ eslint-plugin-es@^3.0.0: regexpp "^3.0.0" eslint-plugin-import@^2.23.3: - version "2.23.4" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz#8dceb1ed6b73e46e50ec9a5bb2411b645e7d3d97" - integrity sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ== + version "2.24.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz#2c8cd2e341f3885918ee27d18479910ade7bb4da" + integrity sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q== dependencies: array-includes "^3.1.3" array.prototype.flat "^1.2.4" debug "^2.6.9" doctrine "^2.1.0" - eslint-import-resolver-node "^0.3.4" - eslint-module-utils "^2.6.1" + eslint-import-resolver-node "^0.3.6" + eslint-module-utils "^2.6.2" find-up "^2.0.0" has "^1.0.3" - is-core-module "^2.4.0" + is-core-module "^2.6.0" minimatch "^3.0.4" - object.values "^1.1.3" + object.values "^1.1.4" pkg-up "^2.0.0" read-pkg-up "^3.0.0" resolve "^1.20.0" - tsconfig-paths "^3.9.0" + tsconfig-paths "^3.11.0" eslint-plugin-jest@^24.3.6: - version "24.4.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.4.0.tgz#fa4b614dbd46a98b652d830377971f097bda9262" - integrity sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg== + version "24.4.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.4.2.tgz#9e8cf05ee6a0e3025e6149df2f36950abfa8d5bf" + integrity sha512-jNMnqwX75z0RXRMXkxwb/+9ylKJYJLJ8nT8nBT0XFM5qx4IQGxP4edMawa0qGkSbHae0BDPBmi8I2QF0/F04XQ== dependencies: "@typescript-eslint/experimental-utils" "^4.0.1" @@ -4682,14 +4709,14 @@ eslint-plugin-unicorn@^28.0.2: semver "^7.3.4" eslint-plugin-vue@^7.9.0: - version "7.14.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.14.0.tgz#8c00f211064bd2708fc1aa4abd0592538fbb2cb1" - integrity sha512-IW5A2Td0wEWjFGaGVEO24JNXa8cVFzAQTXrYv/Vu3zyDVS9sjwOpZY0iqub7FOkT2AK3Imtw4U4wg48pP9oWww== + version "7.18.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.18.0.tgz#02a452142330c7f27c242db21a1b9e25238540f6" + integrity sha512-ceDXlXYMMPMSXw7tdKUR42w9jlzthJGJ3Kvm3YrZ0zuQfvAySNxe8sm6VHuksBW0+060GzYXhHJG6IHVOfF83Q== dependencies: eslint-utils "^2.1.0" natural-compare "^1.4.0" semver "^6.3.0" - vue-eslint-parser "^7.9.0" + vue-eslint-parser "^7.10.0" eslint-scope@^4.0.3: version "4.0.3" @@ -4907,11 +4934,11 @@ express@^4.16.3, express@^4.17.1: vary "~1.1.2" ext@^1.1.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244" - integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A== + version "1.6.0" + resolved "https://registry.yarnpkg.com/ext/-/ext-1.6.0.tgz#3871d50641e874cc172e2b53f919842d19db4c52" + integrity sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg== dependencies: - type "^2.0.0" + type "^2.5.0" extend-shallow@^2.0.1: version "2.0.1" @@ -5002,20 +5029,15 @@ fast-levenshtein@~2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= -fast-safe-stringify@^2.0.4: - version "2.0.8" - resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.8.tgz#dc2af48c46cf712b683e849b2bbd446b32de936f" - integrity sha512-lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag== - fastest-levenshtein@^1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== fastq@^1.6.0: - version "1.11.1" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz#5d8175aae17db61947f8b162cfc7f63264d22807" - integrity sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw== + version "1.13.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" + integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== dependencies: reusify "^1.0.4" @@ -5113,9 +5135,9 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: pkg-dir "^3.0.0" find-cache-dir@^3.0.0, find-cache-dir@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" - integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== + version "3.3.2" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== dependencies: commondir "^1.0.1" make-dir "^3.0.2" @@ -5166,10 +5188,10 @@ fn.name@1.x.x: resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== -follow-redirects@^1.0.0, follow-redirects@^1.10.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43" - integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg== +follow-redirects@^1.0.0, follow-redirects@^1.14.0: + version "1.14.4" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379" + integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g== for-in@^1.0.2: version "1.0.2" @@ -5328,7 +5350,7 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1: +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== @@ -5356,6 +5378,14 @@ get-stream@^6.0.0: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== +get-symbol-description@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" + integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -5390,9 +5420,9 @@ git-up@^4.0.0: parse-url "^6.0.0" git-url-parse@^11.4.4: - version "11.5.0" - resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.5.0.tgz#acaaf65239cb1536185b19165a24bbc754b3f764" - integrity sha512-TZYSMDeM37r71Lqg1mbnMlOqlHd7BSij9qN7XwTkRqSAYFMihGLGhfHwgqQob3GUhEneKnV4nskN9rbQw2KGxA== + version "11.6.0" + resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.6.0.tgz#c634b8de7faa66498a2b88932df31702c67df605" + integrity sha512-WWUxvJs5HsyHL6L08wOusa/IXYtMuCAhrMmnTjQPpBU0TTHyDhnOATNH3xNQz7YOQUsqIIPTGr4xiVti1Hsk5g== dependencies: git-up "^4.0.0" @@ -5409,9 +5439,9 @@ glob-parent@5.1.2, glob-parent@^5.1.2, glob-parent@~5.1.2: is-glob "^4.0.1" glob@^7.0.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -5433,7 +5463,7 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globby@^11.0.3: +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== @@ -5453,9 +5483,9 @@ good-listener@^1.2.2: delegate "^3.1.2" graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4: - version "4.2.6" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" - integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== gzip-size@^6.0.0: version "6.0.0" @@ -5528,6 +5558,13 @@ has-symbols@^1.0.1, has-symbols@^1.0.2: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -5644,10 +5681,10 @@ html-encoding-sniffer@^2.0.1: dependencies: whatwg-encoding "^1.0.5" -html-entities@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc" - integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA== +html-entities@^2.1.0: + version "2.3.2" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" + integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ== html-minifier-terser@^5.0.1: version "5.1.1" @@ -6029,10 +6066,10 @@ inquirer@^7.3.3: strip-ansi "^6.0.0" through "^2.3.6" -inquirer@^8.1.1: - version "8.1.2" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.1.2.tgz#65b204d2cd7fb63400edd925dfe428bafd422e3d" - integrity sha512-DHLKJwLPNgkfwNmsuEUKSejJFbkv0FMO9SMiQbjI3n5NQuCrSIBqP66ggqyz2a6t2qEolKrMjhQ3+W/xXgUQ+Q== +inquirer@^8.1.5: + version "8.1.5" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.1.5.tgz#2dc5159203c826d654915b5fe6990fd17f54a150" + integrity sha512-G6/9xUqmt/r+UvufSyrPpt84NYwhKZ9jLsgMbQzlx804XErNupor8WQdBnBRrXmBfTPpuwf1sV+ss2ovjgdXIg== dependencies: ansi-escapes "^4.2.1" chalk "^4.1.1" @@ -6042,13 +6079,22 @@ inquirer@^8.1.1: figures "^3.0.0" lodash "^4.17.21" mute-stream "0.0.8" - ora "^5.3.0" + 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-slot@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== + dependencies: + get-intrinsic "^1.1.0" + has "^1.0.3" + side-channel "^1.0.4" + interpret@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" @@ -6099,9 +6145,11 @@ is-arrayish@^0.3.1: integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== is-bigint@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a" - integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA== + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" is-binary-path@~2.1.0: version "2.1.0" @@ -6111,21 +6159,22 @@ is-binary-path@~2.1.0: binary-extensions "^2.0.0" is-boolean-object@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8" - integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng== + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== dependencies: call-bind "^1.0.2" + has-tostringtag "^1.0.0" is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-callable@^1.1.4, is-callable@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" - integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== +is-callable@^1.1.4, is-callable@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== is-color-stop@^1.0.0: version "1.1.0" @@ -6139,10 +6188,10 @@ is-color-stop@^1.0.0: rgb-regex "^1.0.1" rgba-regex "^1.0.0" -is-core-module@^2.2.0, is-core-module@^2.4.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491" - integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg== +is-core-module@^2.2.0, is-core-module@^2.6.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz#3c0ef7d31b4acfc574f80c58409d568a836848e3" + integrity sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ== dependencies: has "^1.0.3" @@ -6161,9 +6210,11 @@ is-data-descriptor@^1.0.0: kind-of "^6.0.0" is-date-object@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5" - integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A== + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" is-descriptor@^0.1.0: version "0.1.6" @@ -6246,9 +6297,9 @@ is-generator@^1.0.2: integrity sha1-wUwhBX7TbjKNuANHlmxpP4hjifM= is-glob@^4.0.1, is-glob@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + version "4.0.2" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.2.tgz#859fc2e731e58c902f99fcabccb75a7dd07d29d8" + integrity sha512-ZZTOjRcDjuAAAv2cTBQP/lL59ZTArx77+7UzHdWW/XB1mrfp7DEaVpKmZ0XIzx+M7AxfhKcqV+nMetUQmFifwg== dependencies: is-extglob "^2.1.1" @@ -6268,9 +6319,11 @@ is-negative-zero@^2.0.1: integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== is-number-object@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb" - integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw== + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" + integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== + dependencies: + has-tostringtag "^1.0.0" is-number@^3.0.0: version "3.0.0" @@ -6316,13 +6369,13 @@ is-promise@^2.0.0, is-promise@^2.2.2: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== -is-regex@^1.0.3, is-regex@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f" - integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ== +is-regex@^1.0.3, is-regex@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== dependencies: call-bind "^1.0.2" - has-symbols "^1.0.2" + has-tostringtag "^1.0.0" is-resolvable@^1.0.0: version "1.1.0" @@ -6346,10 +6399,12 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== -is-string@^1.0.5, is-string@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f" - integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w== +is-string@^1.0.5, is-string@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" @@ -6443,9 +6498,9 @@ jimp@0.16.1, jimp@^0.8.3: regenerator-runtime "^0.13.3" jiti@^1.9.2: - version "1.11.0" - resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.11.0.tgz#64120a30d97b9bf37b8b032cf4564dfadc28984c" - integrity sha512-/2c7e61hxxTIN34UeHBB0LCJ5Tq64kgJDV7GR+++e8XRxCKRIKmB8tH6ww1W+Z6Kgd6By+C3RSCu1lXjbPT68A== + version "1.12.3" + resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.12.3.tgz#fe6f9cb066aa2c37981231dffb1d3f04ab4ebdb2" + integrity sha512-p88jl9WzvZYekMS5ZOB61bJ1SPV69o7nEpAU+mFpGzXErqLEg3WvNz3jeXylAiSfLZzvqZssrAu08N3AuvaqwQ== jpeg-js@0.4.2: version "0.4.2" @@ -6565,7 +6620,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.1, json5@^2.1.2, json5@^2.2.0: +json5@^2.1.2: version "2.2.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== @@ -6766,6 +6821,11 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= +linkify-html@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/linkify-html/-/linkify-html-3.0.2.tgz#d9cd1bbb8afa54560d35427a22dbf2018ea44eb8" + integrity sha512-vHIFhMjEFptdaRqk6wfNmtoBKkFPAkZGUwsThMafSnkqc02gZc6+bfAAxVgMZAn7NTxDYgSW2q04kmVAzYtEaA== + linkify-it@3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz#f55eeb8bc1d3ae754049e124ab3bb56d97797fb8" @@ -6773,10 +6833,10 @@ linkify-it@3.0.2: dependencies: uc.micro "^1.0.1" -linkifyjs@3.0.0-beta.3: - version "3.0.0-beta.3" - resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-3.0.0-beta.3.tgz#40697995d7ecf85c464924a30b9e98b1cd6fb253" - integrity sha512-aXq4WJs91NsETo5f9dQrt8Vx+OxAvzJAtR8lLgpum8PDjtCgstycwYbIkAjDGRV/YF1LlKKdbWyOpgMYgwgOvQ== +linkifyjs@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-3.0.1.tgz#fda7b8d399eceef6fd7427f8a6e5d4f962ae74ed" + integrity sha512-HwXVwdNH1wESBfo2sH7Bkl+ywzbGA3+uJEfhquCyi/bMCa49bFUvd/re1NT1Lox/5jdnpQXzI9O/jykit71idg== load-bmfont@^1.3.1, load-bmfont@^1.4.0: version "1.4.1" @@ -7007,14 +7067,14 @@ log-symbols@^4.1.0: is-unicode-supported "^0.1.0" logform@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz#40f036d19161fc76b68ab50fdc7fe495544492f2" - integrity sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg== + version "2.3.0" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.3.0.tgz#a3997a05985de2ebd325ae0d166dffc9c6fe6b57" + integrity sha512-graeoWUH2knKbGthMtuG1EfaSPMZFZBIrhuJHhkS5ZseFBrc7DupCzihOQAzsK/qIKPQaPJ/lFQFctILUY5ARQ== dependencies: colors "^1.2.1" - fast-safe-stringify "^2.0.4" fecha "^4.2.0" ms "^2.1.1" + safe-stable-stringify "^1.1.0" triple-beam "^1.3.0" lower-case@^1.1.1: @@ -7067,9 +7127,9 @@ lru-queue@^0.1.0: es5-ext "~0.10.2" mailparser@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/mailparser/-/mailparser-3.3.0.tgz#1f688f769760dbe46eb1ba8ffbf05eae04cb14ac" - integrity sha512-cSvqT3y735gN3IFLcda/H/grJ+7HItKw8OOshzlhAHAic5R0c33GB1ZizREWmLJONjFMrKUitFeopZd9rsRfvg== + version "3.3.1" + resolved "https://registry.yarnpkg.com/mailparser/-/mailparser-3.3.1.tgz#9741a4175f00e43259b0b1a662aa582e5b0fe746" + integrity sha512-0X5uO4JHkYWyw0Y6v6m53d622AHZUOJLvmsHXxnEIXNBbsbUDruPi/Pwyi/tUkANLY4dfn/WrOfVdaFCwTNbdw== dependencies: encoding-japanese "1.0.30" he "1.2.0" @@ -7077,14 +7137,14 @@ mailparser@^3.3.0: iconv-lite "0.6.3" libmime "5.0.0" linkify-it "3.0.2" - mailsplit "5.0.1" + mailsplit "5.2.0" nodemailer "6.6.3" tlds "1.221.1" -mailsplit@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/mailsplit/-/mailsplit-5.0.1.tgz#070bd883bddc0c6c7f5c6ea4a54847729d95dc6f" - integrity sha512-CcGy1sv8j9jdjKiNIuMZYIKhq4s47nUj9Q98BZfptabH/whmiQX7EvrHx36O4DcyPEsnG152GVNyvqPi9FNIew== +mailsplit@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/mailsplit/-/mailsplit-5.2.0.tgz#c9b5154d05d661f793e7b902747a4241fcceee47" + integrity sha512-B6bXTcriVWOkU4REELr87iWRbV6tvF6w5AX84AFNyd1vxFv9ppIFqE5vnPptWqF1q/jnAmsInKf4wmImCD6bCQ== dependencies: libbase64 "1.2.1" libmime "5.0.0" @@ -7181,9 +7241,9 @@ mem@^8.1.1: mimic-fn "^3.1.0" memfs@^3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.2.2.tgz#5de461389d596e3f23d48bb7c2afb6161f4df40e" - integrity sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q== + version "3.3.0" + resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.3.0.tgz#4da2d1fc40a04b170a56622c7164c6be2c4cbef2" + integrity sha512-BEE62uMfKOavX3iG7GYX43QJ+hAeeWnwIAuJ/R6q96jaMtiLzhsxHJC8B1L7fK7Pt/vXDRwb3SG/yBpNGDPqzg== dependencies: fs-monkey "1.0.3" @@ -7318,11 +7378,16 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.49.0, "mime-db@>= 1.43.0 < 2": +mime-db@1.49.0: version "1.49.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== +"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-types@^2.1.12, mime-types@^2.1.19, mime-types@^2.1.27, mime-types@^2.1.30, mime-types@~2.1.15, mime-types@~2.1.19, mime-types@~2.1.24: version "2.1.32" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5" @@ -7406,9 +7471,9 @@ minipass-pipeline@^1.2.2: minipass "^3.0.0" minipass@^3.0.0, minipass@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" - integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== + version "3.1.5" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732" + integrity sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw== dependencies: yallist "^4.0.0" @@ -7560,15 +7625,25 @@ nanoclone@^0.2.1: resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4" integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA== +nanocolors@^0.1.5: + version "0.1.12" + resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6" + integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ== + +nanocolors@^0.2.8: + version "0.2.11" + resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.2.11.tgz#f2573e6872f1b70067423fc68bbc9d0de2f3bbee" + integrity sha512-83ttyvfJj66dKMadWfBkEUOEDFfRc8FpzTJvh1MySR/pzWFmFikTQZGOV6kHZRz7yR/heiQ1y/MHBBN5P/e7WQ== + nanoid@^2.1.11: version "2.1.11" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== nanoid@^3.1.23: - version "3.1.23" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81" - integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw== + version "3.1.28" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.28.tgz#3c01bac14cb6c5680569014cc65a2f26424c6bd4" + integrity sha512-gSu9VZ2HtmoKYe/lmyPFES5nknFrHa+/DT9muUFWFMi6Jh9E1I7bkvlQ8xxf1Kos9pi9o8lBnIOkatMhKX/YUw== nanomatch@^1.2.9: version "1.2.13" @@ -7608,9 +7683,9 @@ nearley@^2.20.1: randexp "0.4.6" needle@^2.5.2: - version "2.8.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.8.0.tgz#1c8ef9c1a2c29dcc1e83d73809d7bc681c80a048" - integrity sha512-ZTq6WYkN/3782H1393me3utVYdq2XyqNUFBsprEE3VMAT0+hP/cItpnITpqsY6ep2yeFE4Tqtqwc74VqUlUYtw== + version "2.9.1" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz#22d1dffbe3490c2b83e301f7709b6736cd8f2684" + integrity sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ== dependencies: debug "^3.2.6" iconv-lite "^0.4.4" @@ -7652,21 +7727,28 @@ no-case@^3.0.4: tslib "^2.0.3" node-abi@^2.21.0: - version "2.30.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.0.tgz#8be53bf3e7945a34eea10e0fc9a5982776cf550b" - integrity sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg== + version "2.30.1" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" + integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== dependencies: semver "^5.4.1" -node-addon-api@^3.0.0, node-addon-api@^3.2.0: +node-addon-api@^3.0.0: version "3.2.1" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== +node-addon-api@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.2.0.tgz#117cbb5a959dff0992e1c586ae0393573e4d2a87" + integrity sha512-eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q== + node-fetch@^2.6.0, node-fetch@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== + version "2.6.5" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd" + integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ== + dependencies: + whatwg-url "^5.0.0" node-gyp@7.x: version "7.1.2" @@ -7726,10 +7808,10 @@ node-object-hash@^1.2.0: resolved "https://registry.yarnpkg.com/node-object-hash/-/node-object-hash-1.4.2.tgz#385833d85b229902b75826224f6077be969a9e94" integrity sha512-UdS4swXs85fCGWWf6t6DMGgpN/vnlKeSGEQ7hJcrs7PBFoxoKLmibc3QRb7fwiYsjdL7PX8iI/TMSlZ90dgHhQ== -node-releases@^1.1.71: - version "1.1.73" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20" - integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg== +node-releases@^1.1.76: + version "1.1.76" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.76.tgz#df245b062b0cafbd5282ab6792f7dccc2d97f36e" + integrity sha512-9/IECtNr8dXNmPWmFXepT0/7o5eolGesHUa3mtr0KlgnCvnZxwh2qensKL42JJY2vQKC3nIBXetFAqR+PW1CmA== node-res@^5.0.1: version "5.0.1" @@ -7742,11 +7824,16 @@ node-res@^5.0.1: on-finished "^2.3.0" vary "^1.1.2" -nodemailer@6.6.3, nodemailer@^6.6.3: +nodemailer@6.6.3: version "6.6.3" resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.6.3.tgz#31fb53dd4d8ae16fc088a65cb9ffa8d928a69b48" integrity sha512-faZFufgTMrphYoDjvyVpbpJcYzwyFnbAMmQtj1lVBYAUSm3SOy2fIdd9+Mr4UxPosBa0JRw9bJoIwQn+nswiew== +nodemailer@^6.6.3: + version "6.6.5" + resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.6.5.tgz#f9f6953cee5cfe82cbea152eeddacf7a0442049a" + integrity sha512-C/v856DBijUzHcHIgGpQoTrfsH3suKIRAGliIzCstatM2cAa+MYX3LuyCrABiO/cdJTxgBBHXxV1ztiqUwst5A== + nopt@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" @@ -7819,9 +7906,9 @@ nth-check@^1.0.2, nth-check@~1.0.1: boolbase "~1.0.0" nth-check@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125" - integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q== + version "2.0.1" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" + integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w== dependencies: boolbase "^1.0.0" @@ -7912,7 +7999,7 @@ object-hash@^2.0.1: resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5" integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== -object-inspect@^1.10.3, object-inspect@^1.9.0: +object-inspect@^1.11.0, object-inspect@^1.9.0: version "1.11.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== @@ -7955,7 +8042,7 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.1.0, object.values@^1.1.3: +object.values@^1.1.0, object.values@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30" integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg== @@ -8035,7 +8122,7 @@ optionator@^0.8.1: type-check "~0.3.2" word-wrap "~1.2.3" -ora@^5.3.0: +ora@^5.4.1: version "5.4.1" resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== @@ -8201,9 +8288,9 @@ parse-git-config@^3.0.0: ini "^1.3.5" parse-headers@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.3.tgz#5e8e7512383d140ba02f0c7aa9f49b4399c92515" - integrity sha512-QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA== + version "2.0.4" + resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.4.tgz#9eaf2d02bed2d1eff494331ce3df36d7924760bf" + integrity sha512-psZ9iZoCNFLrgRjZ1d8mn0h9WRqJwFxM9q3x7iUjN/YT2OksthDJ5TiPCu2F38kS4zutqfW+YdVVkBZZx3/1aw== parse-json@^4.0.0: version "4.0.0" @@ -9154,10 +9241,10 @@ postgres-interval@^1.1.0: dependencies: xtend "^4.0.0" -prebuild-install@^6.1.2: - version "6.1.3" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.3.tgz#8ea1f9d7386a0b30f7ef20247e36f8b2b82825a2" - integrity sha512-iqqSR84tNYQUQHRXalSKdIaM8Ov1QxOVuBNWI7+BzZWv6Ih9k75wOnH1rGQ9WWTaaLkTpxWKIciOF0KyfM74+Q== +prebuild-install@^6.1.4: + version "6.1.4" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" + integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== dependencies: detect-libc "^1.0.3" expand-template "^2.0.3" @@ -9189,9 +9276,9 @@ prettier@^1.18.2: integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== prettier@^2.3.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d" - integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ== + version "2.4.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c" + integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA== pretty-bytes@^5.6.0: version "5.6.0" @@ -9295,9 +9382,9 @@ prosemirror-dropcursor@^1.3.2: prosemirror-view "^1.1.0" prosemirror-gapcursor@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.1.5.tgz#0c37fd6cbb1d7c46358c2e7397f8da9a8b5c6246" - integrity sha512-SjbUZq5pgsBDuV3hu8GqgIpZR5eZvGLM+gPQTqjVVYSMUCfKW3EGXTEYaLHEl1bGduwqNC95O3bZflgtAb4L6w== + version "1.2.0" + resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.2.0.tgz#28fb60bf3d9baf1f920907d2c3e613137204e8f3" + integrity sha512-yCLy5+0rVqLir/KcHFathQj4Rf8aRHi80FmEfKtM0JmyzvwdomslLzDZ/pX4oFhFKDgjl/WBBBFNqDyNifWg7g== dependencies: prosemirror-keymap "^1.0.0" prosemirror-model "^1.0.0" @@ -9305,9 +9392,9 @@ prosemirror-gapcursor@^1.1.5: prosemirror-view "^1.0.0" prosemirror-history@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.1.3.tgz#4f76a1e71db4ef7cdf0e13dec6d8da2aeaecd489" - integrity sha512-zGDotijea+vnfnyyUGyiy1wfOQhf0B/b6zYcCouBV8yo6JmrE9X23M5q7Nf/nATywEZbgRLG70R4DmfSTC+gfg== + version "1.2.0" + resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.2.0.tgz#04cc4df8d2f7b2a46651a2780de191ada6d465ea" + integrity sha512-B9v9xtf4fYbKxQwIr+3wtTDNLDZcmMMmGiI3TAPShnUzvo+Rmv1GiUrsQChY1meetHl7rhML2cppF3FTs7f7UQ== dependencies: prosemirror-state "^1.2.2" prosemirror-transform "^1.0.0" @@ -9329,14 +9416,7 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.1.4: prosemirror-state "^1.0.0" w3c-keyname "^2.2.0" -prosemirror-model@^1.0.0, prosemirror-model@^1.13.1, prosemirror-model@^1.8.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.14.1.tgz#d784c67f95a5d66b853e82ff9a87a50353ef9cd5" - integrity sha512-vZcbI+24VloFefKZkDnMaEpipL/vSKKPdFiik4KOnTzq3e6AO7+CAOixZ2G/SsfRaYC965XvnOIEbhIQdgki7w== - dependencies: - orderedmap "^1.1.0" - -prosemirror-model@^1.14.3: +prosemirror-model@^1.0.0, prosemirror-model@^1.13.1, prosemirror-model@^1.14.3, prosemirror-model@^1.8.1: version "1.14.3" resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.14.3.tgz#a9c250d3c4023ddf10ecb41a0a7a130e9741d37e" integrity sha512-yzZlBaSxfUPIIP6U5Edh5zKxJPZ5f7bwZRhiCuH3UYkWhj+P3d8swHsbuAMOu/iDatDc5J/Qs5Mb3++mZf+CvQ== @@ -9344,9 +9424,9 @@ prosemirror-model@^1.14.3: orderedmap "^1.1.0" prosemirror-schema-list@^1.1.4: - version "1.1.5" - resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.5.tgz#e7ad9e337ea3d77da6d6a4250f3d7bd51ae980a4" - integrity sha512-9gadhga/wySVfb/iZ2vOpndbG0XroeLw0HkkZN5demNbOea6U5oQtJmvyYWC7ZVf3WkhmVdVsOXrllM9JcC20A== + version "1.1.6" + resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.6.tgz#c3e13fe2f74750e4a53ff88d798dc0c4ccca6707" + integrity sha512-aFGEdaCWmJzouZ8DwedmvSsL50JpRkqhQ6tcpThwJONVVmCgI36LJHtoQ4VGZbusMavaBhXXr33zyD2IVsTlkw== dependencies: prosemirror-model "^1.0.0" prosemirror-transform "^1.0.0" @@ -9378,9 +9458,9 @@ prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transfor prosemirror-model "^1.0.0" prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.16.5: - version "1.18.11" - resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.18.11.tgz#1a839508e7cb6d500a95512af8079661f9e36034" - integrity sha512-KXUM8UEV+IK4JYWHNyxkPGDGbxeTEUHQv3POApfyTRN5eMcPFbY4cB0mDJr0LPelVvYPghmZDOCqfCIm9mYHtQ== + version "1.20.1" + resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.20.1.tgz#174ba8ca358c73cc05e9a92a3d252bcf181ea337" + integrity sha512-djWORhy3a706mUH4A2dgEEV0IPZqQd1tFyz/ZVHJNoqhSgq82FwG6dq7uqHeUB2KdVSNfI2yc3rwfqlC/ll2pA== dependencies: prosemirror-model "^1.14.3" prosemirror-state "^1.0.0" @@ -9799,14 +9879,14 @@ rechoir@^0.7.0: dependencies: resolve "^1.9.0" -regenerate-unicode-properties@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" - integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA== +regenerate-unicode-properties@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" + integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA== dependencies: - regenerate "^1.4.0" + regenerate "^1.4.2" -regenerate@^1.4.0: +regenerate@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== @@ -9832,9 +9912,9 @@ regex-not@^1.0.0, regex-not@^1.0.2: safe-regex "^1.1.0" regexp-tree@^0.1.22, regexp-tree@~0.1.1: - version "0.1.23" - resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.23.tgz#8a8ce1cc5e971acef62213a7ecdb1f6e18a1f1b2" - integrity sha512-+7HWfb4Bvu8Rs2eQTUIpX9I/PlQkYOuTNbRpKLJlQpSgwSkzFYh+pUj0gtvglnOZLKB6YgnIgRuJ2/IlpL48qw== + version "0.1.24" + resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.24.tgz#3d6fa238450a4d66e5bc9c4c14bb720e2196829d" + integrity sha512-s2aEVuLhvnVJW6s/iPgEGK6R+/xngd2jNQ+xy4bXNDKxZKJH6jpPHY6kVeVv1IeLCHgswRj+Kl3ELaDjG6V1iw== regexpp@^3.0.0: version "3.2.0" @@ -9842,26 +9922,26 @@ regexpp@^3.0.0: integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== regexpu-core@^4.7.1: - version "4.7.1" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6" - integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ== + version "4.8.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" + integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg== dependencies: - regenerate "^1.4.0" - regenerate-unicode-properties "^8.2.0" - regjsgen "^0.5.1" - regjsparser "^0.6.4" - unicode-match-property-ecmascript "^1.0.4" - unicode-match-property-value-ecmascript "^1.2.0" + regenerate "^1.4.2" + regenerate-unicode-properties "^9.0.0" + regjsgen "^0.5.2" + regjsparser "^0.7.0" + unicode-match-property-ecmascript "^2.0.0" + unicode-match-property-value-ecmascript "^2.0.0" -regjsgen@^0.5.1: +regjsgen@^0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== -regjsparser@^0.6.4: - version "0.6.9" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6" - integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ== +regjsparser@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968" + integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ== dependencies: jsesc "~0.5.0" @@ -9962,7 +10042,7 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.2.0, resolve@^1.20.0, resolve@^1.5.0, resolve@^1.9.0: +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.2.0, resolve@^1.20.0, resolve@^1.5.0, resolve@^1.9.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -10094,6 +10174,11 @@ safe-regex@^2.1.1: dependencies: regexp-tree "~0.1.1" +safe-stable-stringify@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz#c8a220ab525cd94e60ebf47ddc404d610dc5d84a" + integrity sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw== + "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -10118,9 +10203,9 @@ sass@1.32.12, sass@~1.32.13: chokidar ">=3.0.0 <4.0.0" sass@^1.32.12: - version "1.36.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.36.0.tgz#5912ef9d5d16714171ba11cb17edb274c4bbc07e" - integrity sha512-fQzEjipfOv5kh930nu3Imzq3ie/sGDc/4KtQMJlt7RRdrkQSfe37Bwi/Rf/gfuYHsIuE1fIlDMvpyMcEwjnPvg== + version "1.42.1" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.42.1.tgz#5ab17bebc1cb1881ad2e0c9a932c66ad64e441e2" + integrity sha512-/zvGoN8B7dspKc5mC6HlaygyCBRvnyzzgD5khiaCfglWztY99cYoiTUksVx11NlnemrcfH5CEaCpsUKoW0cQqg== dependencies: chokidar ">=3.0.0 <4.0.0" @@ -10239,10 +10324,10 @@ sequelize-pool@^6.0.0: resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-6.1.0.tgz#caaa0c1e324d3c2c3a399fed2c7998970925d668" integrity sha512-4YwEw3ZgK/tY/so+GfnSgXkdwIJJ1I32uZJztIEgZeAO6HMgj64OzySbWLgxj+tXhZCJnzRfkY9gINw8Ft8ZMg== -sequelize-slugify@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/sequelize-slugify/-/sequelize-slugify-1.5.0.tgz#3305aaf2857ba36122cb36d1091d49e60957bcf6" - integrity sha512-MkniREV0DnH6d4I2gt9IUkQ5C9vv2tqa7WYZXk4hCqRLg7jxFEPrNigMDcdAfnh542U9rpzbnMVGteqYEGmqiA== +sequelize-slugify@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/sequelize-slugify/-/sequelize-slugify-1.6.0.tgz#23e9638acc9fce79feb03d5da8d966c12e4d7e57" + integrity sha512-HGBktOUASnuIBcA+GQ++gD6uMXrBCCiPezX03c6oQFGxsQs6faVoeUDcINohmpH7mwGTOsZRGzQ5D7mmQQVyvA== dependencies: sluglife "^0.9.8" @@ -10348,15 +10433,15 @@ shallow-clone@^3.0.0: dependencies: kind-of "^6.0.2" -sharp@^0.28.2: - version "0.28.3" - resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.28.3.tgz#ecd74cefd020bee4891bb137c9850ee2ce277a8b" - integrity sha512-21GEP45Rmr7q2qcmdnjDkNP04Ooh5v0laGS5FDpojOO84D1DJwUijLiSq8XNNM6e8aGXYtoYRh3sVNdm8NodMA== +sharp@^0.29.1: + version "0.29.1" + resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.29.1.tgz#f60b50f24f399464a24187c86bd2da41aae50b85" + integrity sha512-DpgdAny9TuS+oWCQ7MRS8XyY9x6q1+yW3a5wNx0J3HrGuB/Jot/8WcT+lElHY9iJu2pwtegSGxqMaqFiMhs4rQ== dependencies: - color "^3.1.3" + color "^4.0.1" detect-libc "^1.0.3" - node-addon-api "^3.2.0" - prebuild-install "^6.1.2" + node-addon-api "^4.1.0" + prebuild-install "^6.1.4" semver "^7.3.5" simple-get "^3.1.0" tar-fs "^2.1.1" @@ -10403,9 +10488,9 @@ sigmund@^1.0.1: integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA= signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" - integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + version "3.0.4" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.4.tgz#366a4684d175b9cab2081e3681fda3747b6c51d7" + integrity sha512-rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q== simple-concat@^1.0.0: version "1.0.1" @@ -10429,11 +10514,11 @@ simple-swizzle@^0.2.2: is-arrayish "^0.3.1" sirv@^1.0.7: - version "1.0.12" - resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.12.tgz#d816c882b35489b3c63290e2f455ae3eccd5f652" - integrity sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg== + version "1.0.17" + resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.17.tgz#86e2c63c612da5a1dace1c16c46f524aaa26ac45" + integrity sha512-qx9go5yraB7ekT7bCMqUHJ5jEaOC/GXBxUWv+jeWnb7WzHUFdcQPGWk7YmAwFBaQBrogpuSqd/azbC2lZRqqmw== dependencies: - "@polka/url" "^1.0.0-next.15" + "@polka/url" "^1.0.0-next.20" mime "^2.3.1" totalist "^1.0.0" @@ -10512,10 +10597,10 @@ source-map-resolve@0.6.0, source-map-resolve@^0.5.0: atob "^2.1.2" decode-uri-component "^0.2.0" -source-map-support@~0.5.12, source-map-support@~0.5.19: - version "0.5.19" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" - integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== +source-map-support@~0.5.12, source-map-support@~0.5.20: + version "0.5.20" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" + integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -10562,9 +10647,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.9" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f" - integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ== + version "3.0.10" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b" + integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA== split-on-first@^1.0.0: version "1.1.0" @@ -10746,14 +10831,14 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" - integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== +string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" string.prototype.trimend@^1.0.4: version "1.0.4" @@ -10811,12 +10896,12 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: - ansi-regex "^5.0.0" + ansi-regex "^5.0.1" strip-bom@^3.0.0: version "3.0.0" @@ -10933,9 +11018,9 @@ tar-stream@^2.1.4: readable-stream "^3.1.1" tar@^6.0.2, tar@^6.1.0: - version "6.1.2" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.2.tgz#1f045a90a6eb23557a603595f41a16c57d47adc6" - integrity sha512-EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q== + version "6.1.11" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" + integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" @@ -10984,13 +11069,13 @@ terser@^4.1.2, terser@^4.6.3: source-map-support "~0.5.12" terser@^5.3.4: - version "5.7.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.1.tgz#2dc7a61009b66bb638305cb2a824763b116bf784" - integrity sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg== + version "5.9.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.9.0.tgz#47d6e629a522963240f2b55fcaa3c99083d2c351" + integrity sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ== dependencies: commander "^2.20.0" source-map "~0.7.2" - source-map-support "~0.5.19" + source-map-support "~0.5.20" text-hex@1.0.x: version "1.0.0" @@ -11126,11 +11211,16 @@ titleize@2: resolved "https://registry.yarnpkg.com/titleize/-/titleize-2.1.0.tgz#5530de07c22147a0488887172b5bd94f5b30a48f" integrity sha512-m+apkYlfiQTKLW+sI4vqUkwMEzfgEUEYSqljx1voUE3Wz/z1ZsxyzSxvH2X8uKVrOp7QkByWt0rA6+gvhCKy6g== -tlds@1.221.1, tlds@^1.221.1: +tlds@1.221.1: version "1.221.1" resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.221.1.tgz#6cf6bff5eaf30c5618c5801c3f425a6dc61ca0ad" integrity sha512-N1Afn/SLeOQRpxMwHBuNFJ3GvGrdtY4XPXKPFcx8he0U9Jg9ZkvTKE1k3jQDtCmlFn44UxjVtouF6PT4rEGd3Q== +tlds@^1.221.1: + version "1.222.0" + resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.222.0.tgz#b3cbf4f8dfe15af2b82d40361e7e552649e3aad2" + integrity sha512-jC8RCcx2Z0tfXLQGo2gdrzOCv5B7Shd2SRd9Yctl+cFuy9XZ+25T+ugOVhKUSrCYCKv4fjo93fAreDFhLVklAA== + tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -11229,6 +11319,11 @@ tr46@^2.1.0: dependencies: punycode "^2.1.1" +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + triple-beam@^1.2.0, triple-beam@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" @@ -11239,12 +11334,13 @@ ts-pnp@^1.1.6: resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== -tsconfig-paths@^3.9.0: - version "3.10.1" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7" - integrity sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q== +tsconfig-paths@^3.11.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36" + integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA== dependencies: - json5 "^2.2.0" + "@types/json5" "^0.0.29" + json5 "^1.0.1" minimist "^1.2.0" strip-bom "^3.0.0" @@ -11254,9 +11350,9 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0: integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tslib@^2.0.3, tslib@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" - integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== + version "2.3.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== tslib@~2.1.0: version "2.1.0" @@ -11335,7 +11431,7 @@ type@^1.0.1: resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0" integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== -type@^2.0.0: +type@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d" integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw== @@ -11356,14 +11452,14 @@ uc.micro@^1.0.1: integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== ufo@^0.7.4: - version "0.7.7" - resolved "https://registry.yarnpkg.com/ufo/-/ufo-0.7.7.tgz#0062f9e5e790819b0fb23ca24d7c63a4011c036a" - integrity sha512-N25aY3HBkJBnahm+2l4JRBBrX5I+JPakF/tDHYDTjd3wUR7iFLdyiPhj8mBwBz21v728BKwM9L9tgBfCntgdlw== + version "0.7.9" + resolved "https://registry.yarnpkg.com/ufo/-/ufo-0.7.9.tgz#0268e3734b413c9ed6f3510201f42372821b875c" + integrity sha512-6t9LrLk3FhqTS+GW3IqlITtfRB5JAVr5MMNjpBECfK827W+Vh5Ilw/LhTcHWrt6b3hkeBvcbjx4Ti7QVFzmcww== uglify-js@^3.5.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.1.tgz#e2cb9fe34db9cb4cf7e35d1d26dfea28e09a7d06" - integrity sha512-JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g== + version "3.14.2" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.2.tgz#d7dd6a46ca57214f54a2d0a43cad0f35db82ac99" + integrity sha512-rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A== umzug@^2.3.0: version "2.3.0" @@ -11397,28 +11493,28 @@ unfetch@^4.2.0: resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be" integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA== -unicode-canonical-property-names-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" - integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ== +unicode-canonical-property-names-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" + integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ== -unicode-match-property-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" - integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg== +unicode-match-property-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" + integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q== dependencies: - unicode-canonical-property-names-ecmascript "^1.0.4" - unicode-property-aliases-ecmascript "^1.0.4" + unicode-canonical-property-names-ecmascript "^2.0.0" + unicode-property-aliases-ecmascript "^2.0.0" -unicode-match-property-value-ecmascript@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531" - integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ== +unicode-match-property-value-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" + integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw== -unicode-property-aliases-ecmascript@^1.0.4: - version "1.1.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4" - integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg== +unicode-property-aliases-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" + integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ== unicode@>=11.0.1: version "13.0.0" @@ -11666,17 +11762,17 @@ vue-client-only@^2.0.0: resolved "https://registry.yarnpkg.com/vue-client-only/-/vue-client-only-2.1.0.tgz#1a67a47b8ecacfa86d75830173fffee3bf8a4ee3" integrity sha512-vKl1skEKn8EK9f8P2ZzhRnuaRHLHrlt1sbRmazlvsx6EiC3A8oWF8YCBrMJzoN+W3OnElwIGbVjsx6/xelY1AA== -vue-clipboard2@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/vue-clipboard2/-/vue-clipboard2-0.3.1.tgz#6e551fb7bd384889b28b0da3b12289ed6bca4894" - integrity sha512-H5S/agEDj0kXjUb5GP2c0hCzIXWRBygaWLN3NEFsaI9I3uWin778SFEMt8QRXiPG+7anyjqWiw2lqcxWUSfkYg== +vue-clipboard2@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz#331fec85f9d4f175eb0d4feaef4d77338562af36" + integrity sha512-aNWXIL2DKgJyY/1OOeITwAQz1fHaCIGvUFHf9h8UcoQBG5a74MkdhS/xqoYe7DNZdQmZRL+TAdIbtUs9OyVjbw== dependencies: clipboard "^2.0.0" -vue-eslint-parser@^7.9.0: - version "7.10.0" - resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.10.0.tgz#ea4e4b10fd10aa35c8a79ac783488d8abcd29be8" - integrity sha512-7tc/ewS9Vq9Bn741pvpg8op2fWJPH3k32aL+jcIcWGCTzh/zXSdh7pZ5FV3W2aJancP9+ftPAv292zY5T5IPCg== +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== dependencies: debug "^4.1.1" eslint-scope "^5.1.1" @@ -11691,15 +11787,15 @@ vue-hot-reload-api@^2.3.0: resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== -vue-i18n@^8.24.5: - version "8.25.0" - resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.25.0.tgz#1037d9295fa2845a230b771de473481edb2cfc4c" - integrity sha512-ynhcL+PmTxuuSE1T10htiSXzjBozxYIE3ffbM1RfgAkVbr/v1SP+9Mi/7/uv8ZVV1yGuKjFAYp9BXq+X7op6MQ== +vue-i18n@^8.26.1: + version "8.26.1" + resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.26.1.tgz#56419bcb2414a01e0e9046fe1883d0edd421bf41" + integrity sha512-N6GpogueNQqmAye6lkUySlrXAZqBs9DYz8+8LHxm4IV7hEP/KWQL9VUCV8oJ0DS1asUTlvI2qKm2MydRgoPJFQ== vue-loader@^15.9.7: - version "15.9.7" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.7.tgz#15b05775c3e0c38407679393c2ce6df673b01044" - integrity sha512-qzlsbLV1HKEMf19IqCJqdNvFJRCI58WNbS6XbPqK13MrLz65es75w392MSQ5TsARAfIjUw+ATm3vlCXUJSOH9Q== + version "15.9.8" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.8.tgz#4b0f602afaf66a996be1e534fb9609dc4ab10e61" + integrity sha512-GwSkxPrihfLR69/dSV3+5CdMQ0D+jXg8Ma1S4nQXKJAznYFX14vHdc/NetQc34Dw+rBbIJyP7JOuVb9Fhprvog== dependencies: "@vue/component-compiler-utils" "^3.1.0" hash-sum "^1.0.2" @@ -11764,21 +11860,16 @@ vue@^2.6.12, vue@^2.6.14: resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235" integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ== -vuetify-loader@^1.7.1, vuetify-loader@^1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/vuetify-loader/-/vuetify-loader-1.7.2.tgz#5cdc45309496cf3a5fe431fd7611706ffa4aa8c8" - integrity sha512-2GSo4KvRAOThBsj8mvtIEeIoyBAZx38GDfh8D90e/or7Hzx4813krJKvcQAllyLO/Ln0eQWrq2IuvBXnZ55cSA== +vuetify-loader@^1.7.2, vuetify-loader@^1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/vuetify-loader/-/vuetify-loader-1.7.3.tgz#404657f4925c828f400fe3269003421d586835c6" + integrity sha512-1Kt6Rfvuw3i9BBlxC9WTMnU3WEU7IBWQmDX+fYGAVGpzWCX7oHythUIwPCZGShHSYcPMKSDbXTPP8UvT5RNw8Q== dependencies: decache "^4.6.0" file-loader "^6.2.0" loader-utils "^2.0.0" -vuetify@^2.5.3: - version "2.5.7" - resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.5.7.tgz#0c7cfa143bffa6a14ef3ca5cfd8f2135713f4360" - integrity sha512-3Hn7X6FFtQetc6qy8GcMDKbZRKbiBMDBsYuUjDS4EdpDvHBDTMySpzBWqBNuPjPHRaT3XSrQfoYN84vGDg87Ug== - -vuetify@^2.5.8: +vuetify@^2.5.3, vuetify@^2.5.8: version "2.5.8" resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.5.8.tgz#a23e6a7e77b77de0744b53cf1e7c9d40efac0635" integrity sha512-paLmNhKTYFD41+14rIHnCo+P1jHbUzwBiMowxs5qXVq8RdRMqRmcy05Sfse1WUu90amPGK2fIFQq5rL2N8zqZg== @@ -11844,6 +11935,11 @@ web-resource-inliner@^5.0.0: node-fetch "^2.6.0" valid-data-url "^3.0.0" +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + webidl-conversions@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" @@ -11870,14 +11966,14 @@ webpack-bundle-analyzer@^4.4.1: ws "^7.3.1" webpack-cli@^4.7.2: - version "4.7.2" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.2.tgz#a718db600de6d3906a4357e059ae584a89f4c1a5" - integrity sha512-mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw== + version "4.8.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.8.0.tgz#5fc3c8b9401d3c8a43e2afceacfa8261962338d1" + integrity sha512-+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw== dependencies: "@discoveryjs/json-ext" "^0.5.0" "@webpack-cli/configtest" "^1.0.4" "@webpack-cli/info" "^1.3.0" - "@webpack-cli/serve" "^1.5.1" + "@webpack-cli/serve" "^1.5.2" colorette "^1.2.1" commander "^7.0.0" execa "^5.0.0" @@ -11901,14 +11997,14 @@ webpack-dev-middleware@^4.2.0: schema-utils "^3.0.0" webpack-hot-middleware@^2.25.0: - version "2.25.0" - resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.0.tgz#4528a0a63ec37f8f8ef565cf9e534d57d09fe706" - integrity sha512-xs5dPOrGPCzuRXNi8F6rwhawWvQQkeli5Ro48PRuQh8pYPCPmNnltP9itiUPT4xI8oW+y0m59lyyeQk54s5VgA== + version "2.25.1" + resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.1.tgz#581f59edf0781743f4ca4c200fd32c9266c6cf7c" + integrity sha512-Koh0KyU/RPYwel/khxbsDz9ibDivmUbrRuKSSQvW42KSDdO4w23WI3SkHpSUKHE76LrFnnM/L7JCrpBwu8AXYw== dependencies: - ansi-html "0.0.7" - html-entities "^1.2.0" + ansi-html-community "0.0.8" + html-entities "^2.1.0" querystring "^0.2.0" - strip-ansi "^3.0.0" + strip-ansi "^6.0.0" webpack-merge@^5.7.3: version "5.8.0" @@ -11986,6 +12082,14 @@ whatwg-mimetype@^2.3.0: resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + whatwg-url@^9.0.0: version "9.1.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-9.1.0.tgz#1b112cf237d72cd64fa7882b9c3f6234a1c3050d" @@ -12152,14 +12256,14 @@ write-json-file@^2.3.0: write-file-atomic "^2.0.0" ws@^7.3.1: - version "7.5.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74" - integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg== + version "7.5.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881" + integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w== ws@^8.0.0: - version "8.2.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.1.tgz#bdd92b3c56fdb47d2379b5ae534281922cc5bd12" - integrity sha512-XkgWpJU3sHU7gX8f13NqTn6KQ85bd1WU7noBHTT8fSohx7OS1TPY8k+cyRPCzFkia7C4mM229yeHr1qK9sM4JQ== + version "8.2.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.2.tgz#ca684330c6dd6076a737250ed81ac1606cb0a63e" + integrity sha512-Q6B6H2oc8QY3llc3cB8kVmQ6pnJWVQbP7Q5algTcIxx7YEpc0oU4NBVHlztA7Ekzfhw2r0rPducMUiCGWKQRzw== xhr@^2.0.1: version "2.6.0" @@ -12265,10 +12369,10 @@ yargs@^13.1.0: y18n "^4.0.0" yargs-parser "^13.1.2" -yargs@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz#6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb" - integrity sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ== +yargs@^17.2.0: + version "17.2.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.2.1.tgz#e2c95b9796a0e1f7f3bf4427863b42e0418191ea" + integrity sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q== dependencies: cliui "^7.0.2" escalade "^3.1.1" From 844e9cda169f6262640a463c98da1b5657642368 Mon Sep 17 00:00:00 2001 From: lesion Date: Mon, 18 Oct 2021 11:25:39 +0200 Subject: [PATCH 130/271] using new hostname setting --- components/FollowMe.vue | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/components/FollowMe.vue b/components/FollowMe.vue index 0246d2bf..b5d9aea1 100644 --- a/components/FollowMe.vue +++ b/components/FollowMe.vue @@ -2,7 +2,7 @@ v-card v-card-title(v-text="$t('common.follow_me_title')") v-card-text - p(v-html="$t('event.follow_me_description', { title: settings.title, account: `@${settings.instance_name}@${domain}`})") + p(v-html="$t('event.follow_me_description', { title: settings.title, account: `@${settings.instance_name}@${settings.hostname}`})") v-text-field( :rules="[$validators.required('common.url')]" :loading='loading' @@ -39,10 +39,6 @@ export default { computed: { ...mapState(['settings']), - domain () { - const URL = new window.URL(this.settings.baseurl) - return URL.hostname - }, couldGo () { // check if is mastodon this.get_instance_info(this.instance_hostname) @@ -50,7 +46,7 @@ export default { }, link () { // check if exists - return `https://${this.instance_hostname}/authorize_interaction?uri=${this.settings.instance_name}@${this.domain}` + return `https://${this.instance_hostname}/authorize_interaction?uri=${this.settings.instance_name}@${this.settings.hostname}` } }, methods: { @@ -76,7 +72,7 @@ export default { } } - diff --git a/webcomponents/src/GancioEvents.svelte b/webcomponents/src/GancioEvents.svelte new file mode 100644 index 00000000..179fdf8f --- /dev/null +++ b/webcomponents/src/GancioEvents.svelte @@ -0,0 +1,147 @@ + + +{#if events.length} + +{/if} + diff --git a/webcomponents/src/main.js b/webcomponents/src/main.js new file mode 100644 index 00000000..e31eda52 --- /dev/null +++ b/webcomponents/src/main.js @@ -0,0 +1,2 @@ +export * from './GancioEvents.svelte' +export * from './GancioEvent.svelte' diff --git a/webcomponents/vite.config.js b/webcomponents/vite.config.js new file mode 100644 index 00000000..6a33da8d --- /dev/null +++ b/webcomponents/vite.config.js @@ -0,0 +1,11 @@ +import { defineConfig } from 'vite' +import { svelte } from '@sveltejs/vite-plugin-svelte' + +// https://vitejs.dev/config/ +export default defineConfig({ + plugins: [ + svelte({ + compilerOptions: { customElement: true } + }) + ] +}) diff --git a/webcomponents/vite.lib.config.js b/webcomponents/vite.lib.config.js new file mode 100644 index 00000000..ba3f7a3d --- /dev/null +++ b/webcomponents/vite.lib.config.js @@ -0,0 +1,13 @@ +import { defineConfig } from 'vite' +import { svelte } from '@sveltejs/vite-plugin-svelte' + +// https://vitejs.dev/config/ +export default defineConfig({ + build: { + lib: { + entry: './src/main.js', + name: 'GancioEvents' + } + }, + plugins: [svelte({compilerOptions: { customElement: true }})] +}) diff --git a/webcomponents/yarn.lock b/webcomponents/yarn.lock new file mode 100644 index 00000000..7ebc8484 --- /dev/null +++ b/webcomponents/yarn.lock @@ -0,0 +1,265 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@rollup/pluginutils@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.1.1.tgz#1d4da86dd4eded15656a57d933fda2b9a08d47ec" + integrity sha512-clDjivHqWGXi7u+0d2r2sBi4Ie6VLEAzWMIkvJLnDmxoOhBYOTfzGbOQBA32THHm11/LiJbd01tJUpJsbshSWQ== + dependencies: + estree-walker "^2.0.1" + picomatch "^2.2.2" + +"@sveltejs/vite-plugin-svelte@^1.0.0-next.11": + version "1.0.0-next.30" + resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-1.0.0-next.30.tgz#a6cd181bb406d590c1fa8d480c55950d567689f9" + integrity sha512-YQqdMxjL1VgSFk4/+IY3yLwuRRapPafPiZTiaGEq1psbJYSNYUWx9F1zMm32GMsnogg3zn99mGJOqe3ld3HZSg== + dependencies: + "@rollup/pluginutils" "^4.1.1" + debug "^4.3.2" + kleur "^4.1.4" + magic-string "^0.25.7" + require-relative "^0.8.7" + svelte-hmr "^0.14.7" + +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== + dependencies: + ms "2.1.2" + +esbuild-android-arm64@0.13.14: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.13.14.tgz#c85083ece26be3d67e6c720e088968a98409e023" + integrity sha512-Q+Xhfp827r+ma8/DJgpMRUbDZfefsk13oePFEXEIJ4gxFbNv5+vyiYXYuKm43/+++EJXpnaYmEnu4hAKbAWYbA== + +esbuild-darwin-64@0.13.14: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.13.14.tgz#8e4e237ad847cc54a1d3a5caee26a746b9f0b81f" + integrity sha512-YmOhRns6QBNSjpVdTahi/yZ8dscx9ai7a6OY6z5ACgOuQuaQ2Qk2qgJ0/siZ6LgD0gJFMV8UINFV5oky5TFNQQ== + +esbuild-darwin-arm64@0.13.14: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.14.tgz#b3b5ebd40b2cb06ee0f6fb342dd4bdcca54ad273" + integrity sha512-Lp00VTli2jqZghSa68fx3fEFCPsO1hK59RMo1PRap5RUjhf55OmaZTZYnCDI0FVlCtt+gBwX5qwFt4lc6tI1xg== + +esbuild-freebsd-64@0.13.14: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.14.tgz#175ecb2fa8141428cf70ea2d5f4c27534bad53e0" + integrity sha512-BKosI3jtvTfnmsCW37B1TyxMUjkRWKqopR0CE9AF2ratdpkxdR24Vpe3gLKNyWiZ7BE96/SO5/YfhbPUzY8wKw== + +esbuild-freebsd-arm64@0.13.14: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.14.tgz#a7d64e41d1fa581f8db7775e5200f18e67d70c4d" + integrity sha512-yd2uh0yf+fWv5114+SYTl4/1oDWtr4nN5Op+PGxAkMqHfYfLjFKpcxwCo/QOS/0NWqPVE8O41IYZlFhbEN2B8Q== + +esbuild-linux-32@0.13.14: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.13.14.tgz#14bdd4f6b6cfd35c65c835894651ba335c2117da" + integrity sha512-a8rOnS1oWSfkkYWXoD2yXNV4BdbDKA7PNVQ1klqkY9SoSApL7io66w5H44mTLsfyw7G6Z2vLlaLI2nz9MMAowA== + +esbuild-linux-64@0.13.14: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.13.14.tgz#7fd56851b2982fdd0cd8447ee9858c2c5711708a" + integrity sha512-yPZSoMs9W2MC3Dw+6kflKt5FfQm6Dicex9dGIr1OlHRsn3Hm7yGMUTctlkW53KknnZdOdcdd5upxvbxqymczVQ== + +esbuild-linux-arm64@0.13.14: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.14.tgz#a55634d70679ba509adeafd68eebb9fd1ec5af6c" + integrity sha512-Lvo391ln9PzC334e+jJ2S0Rt0cxP47eoH5gFyv/E8HhOnEJTvm7A+RRnMjjHnejELacTTfYgFGQYPjLsi/jObQ== + +esbuild-linux-arm@0.13.14: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.13.14.tgz#bb96a99677e608b31ff61f37564326d38e846ca2" + integrity sha512-8chZE4pkKRvJ/M/iwsNQ1KqsRg2RyU5eT/x2flNt/f8F2TVrDreR7I0HEeCR50wLla3B1C3wTIOzQBmjuc6uWg== + +esbuild-linux-mips64le@0.13.14: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.14.tgz#6a55362a8fd1e593dea2ecc41877beed8b8184b9" + integrity sha512-MZhgxbmrWbpY3TOE029O6l5tokG9+Yoj2hW7vdit/d/VnmneqeGrSHADuDL6qXM8L5jaCiaivb4VhsyVCpdAbQ== + +esbuild-linux-ppc64le@0.13.14: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.14.tgz#9e0048587ece0a7f184ab147f20d077098045e7f" + integrity sha512-un7KMwS7fX1Un6BjfSZxTT8L5cV/8Uf4SAhM7WYy2XF8o8TI+uRxxD03svZnRNIPsN2J5cl6qV4n7Iwz+yhhVw== + +esbuild-netbsd-64@0.13.14: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.14.tgz#dcab16a4bbcfa16e2e8535dadc5f64fdc891c63b" + integrity sha512-5ekKx/YbOmmlTeNxBjh38Uh5TGn5C4uyqN17i67k18pS3J+U2hTVD7rCxcFcRS1AjNWumkVL3jWqYXadFwMS0Q== + +esbuild-openbsd-64@0.13.14: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.14.tgz#3c7453b155ebb68dc34d5aec3bd6505337bdda08" + integrity sha512-9bzvwewHjct2Cv5XcVoE1yW5YTW12Sk838EYfA46abgnhxGoFSD1mFcaztp5HHC43AsF+hQxbSFG/RilONARUA== + +esbuild-sunos-64@0.13.14: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.13.14.tgz#85addf5fef6b5db154a955d4f2e88953359d75ce" + integrity sha512-mjMrZB76M6FmoiTvj/RGWilrioR7gVwtFBRVugr9qLarXMIU1W/pQx+ieEOtflrW61xo8w1fcxyHsVVGRvoQ0w== + +esbuild-windows-32@0.13.14: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.13.14.tgz#f77f98f30a5c636c44db2428ecdf9bcbbaedb1a7" + integrity sha512-GZa6mrx2rgfbH/5uHg0Rdw50TuOKbdoKCpEBitzmG5tsXBdce+cOL+iFO5joZc6fDVCLW3Y6tjxmSXRk/v20Hg== + +esbuild-windows-64@0.13.14: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.13.14.tgz#bc778674c40d65150d12385e0f23eb3a0badbd0d" + integrity sha512-Lsgqah24bT7ClHjLp/Pj3A9wxjhIAJyWQcrOV4jqXAFikmrp2CspA8IkJgw7HFjx6QrJuhpcKVbCAe/xw0i2yw== + +esbuild-windows-arm64@0.13.14: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.14.tgz#91a8dad35ab2c4dd27cd83860742955b25a354d7" + integrity sha512-KP8FHVlWGhM7nzYtURsGnskXb/cBCPTfj0gOKfjKq2tHtYnhDZywsUG57nk7TKhhK0fL11LcejHG3LRW9RF/9A== + +esbuild@^0.13.2: + version "0.13.14" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.13.14.tgz#98a3f7f42809abdc2b57c84565d0f713382dc1a5" + integrity sha512-xu4D+1ji9x53ocuomcY+KOrwAnWzhBu/wTEjpdgZ8I1c8i5vboYIeigMdzgY1UowYBKa2vZgVgUB32bu7gkxeg== + optionalDependencies: + esbuild-android-arm64 "0.13.14" + esbuild-darwin-64 "0.13.14" + esbuild-darwin-arm64 "0.13.14" + esbuild-freebsd-64 "0.13.14" + esbuild-freebsd-arm64 "0.13.14" + esbuild-linux-32 "0.13.14" + esbuild-linux-64 "0.13.14" + esbuild-linux-arm "0.13.14" + esbuild-linux-arm64 "0.13.14" + esbuild-linux-mips64le "0.13.14" + esbuild-linux-ppc64le "0.13.14" + esbuild-netbsd-64 "0.13.14" + esbuild-openbsd-64 "0.13.14" + esbuild-sunos-64 "0.13.14" + esbuild-windows-32 "0.13.14" + esbuild-windows-64 "0.13.14" + esbuild-windows-arm64 "0.13.14" + +estree-walker@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" + integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== + +fsevents@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +is-core-module@^2.2.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" + integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== + dependencies: + has "^1.0.3" + +kleur@^4.1.4: + version "4.1.4" + resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.4.tgz#8c202987d7e577766d039a8cd461934c01cda04d" + integrity sha512-8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA== + +magic-string@^0.25.7: + version "0.25.7" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" + integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA== + dependencies: + sourcemap-codec "^1.4.4" + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +nanoid@^3.1.30: + version "3.1.30" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362" + integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ== + +path-parse@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +picocolors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== + +picomatch@^2.2.2: + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== + +postcss@^8.3.8: + version "8.3.11" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.11.tgz#c3beca7ea811cd5e1c4a3ec6d2e7599ef1f8f858" + integrity sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA== + dependencies: + nanoid "^3.1.30" + picocolors "^1.0.0" + source-map-js "^0.6.2" + +require-relative@^0.8.7: + version "0.8.7" + resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de" + integrity sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4= + +resolve@^1.20.0: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + +rollup@^2.57.0: + version "2.60.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.60.0.tgz#4ee60ab7bdd0356763f87d7099f413e5460fc193" + integrity sha512-cHdv9GWd58v58rdseC8e8XIaPUo8a9cgZpnCMMDGZFDZKEODOiPPEQFXLriWr/TjXzhPPmG5bkAztPsOARIcGQ== + optionalDependencies: + fsevents "~2.3.2" + +source-map-js@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" + integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== + +sourcemap-codec@^1.4.4: + version "1.4.8" + resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" + integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== + +svelte-hmr@^0.14.7: + version "0.14.7" + resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.14.7.tgz#7fa8261c7b225d9409f0a86f3b9ea5c3ca6f6607" + integrity sha512-pDrzgcWSoMaK6AJkBWkmgIsecW0GChxYZSZieIYfCP0v2oPyx2CYU/zm7TBIcjLVUPP714WxmViE9Thht4etog== + +svelte@^3.37.0: + version "3.44.2" + resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.44.2.tgz#3e69be2598308dfc8354ba584cec54e648a50f7f" + integrity sha512-jrZhZtmH3ZMweXg1Q15onb8QlWD+a5T5Oca4C1jYvSURp2oD35h4A5TV6t6MEa93K4LlX6BkafZPdQoFjw/ylA== + +vite@^2.6.4: + version "2.6.14" + resolved "https://registry.yarnpkg.com/vite/-/vite-2.6.14.tgz#35c09a15e4df823410819a2a239ab11efb186271" + integrity sha512-2HA9xGyi+EhY2MXo0+A2dRsqsAG3eFNEVIo12olkWhOmc8LfiM+eMdrXf+Ruje9gdXgvSqjLI9freec1RUM5EA== + dependencies: + esbuild "^0.13.2" + postcss "^8.3.8" + resolve "^1.20.0" + rollup "^2.57.0" + optionalDependencies: + fsevents "~2.3.2" From 5c80db49c1e9de404eb4020f32a71bc2853762d2 Mon Sep 17 00:00:00 2001 From: hacklabkelo Date: Sun, 28 Nov 2021 11:47:22 +0000 Subject: [PATCH 240/271] Downgrade sharp package to 0.27.2 in order to work with old CPUs --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5e9aee6a..6b9036e7 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "pg": "^8.6.0", "sequelize": "^6.9.0", "sequelize-slugify": "^1.6.0", - "sharp": "^0.29.2", + "sharp": "^0.27.2", "sqlite3": "mapbox/node-sqlite3#918052b", "tiptap": "^1.32.0", "tiptap-extensions": "^1.35.0", From 236cafdddb06458be000a75f1735043b6d002c3d Mon Sep 17 00:00:00 2001 From: lesion Date: Thu, 2 Dec 2021 10:42:36 +0100 Subject: [PATCH 241/271] downgrade sharp, fix #130 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5e9aee6a..6b9036e7 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "pg": "^8.6.0", "sequelize": "^6.9.0", "sequelize-slugify": "^1.6.0", - "sharp": "^0.29.2", + "sharp": "^0.27.2", "sqlite3": "mapbox/node-sqlite3#918052b", "tiptap": "^1.32.0", "tiptap-extensions": "^1.35.0", From 88c9d4843197e2a3e6b778c88d9161cddeb079ef Mon Sep 17 00:00:00 2001 From: lesion Date: Thu, 2 Dec 2021 10:47:37 +0100 Subject: [PATCH 242/271] minor on webcomponents --- nuxt.config.js | 8 + static/gancio-events.es.js | 814 ++++++++++++++++++++++++++ webcomponents/index.html | 5 +- webcomponents/src/GancioEvent.svelte | 21 +- webcomponents/src/GancioEvents.svelte | 23 +- 5 files changed, 844 insertions(+), 27 deletions(-) create mode 100644 static/gancio-events.es.js diff --git a/nuxt.config.js b/nuxt.config.js index fc3be3f3..7e8a3a85 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -11,11 +11,19 @@ module.exports = { { charset: 'utf-8' }, { name: 'viewport', content: 'width=device-width, initial-scale=1' } ], + script: [{ src: '/gancio-events.es.js' }], link: [{ rel: 'icon', type: 'image/png', href: '/logo.png' }] }, dev: (process.env.NODE_ENV !== 'production'), server: config.server, + + vue: { + config: { + ignoredElements: ['gancio-events'] + } + }, + /* ** Customize the progress-bar component */ diff --git a/static/gancio-events.es.js b/static/gancio-events.es.js new file mode 100644 index 00000000..2036c3a1 --- /dev/null +++ b/static/gancio-events.es.js @@ -0,0 +1,814 @@ +function noop() { +} +function run(fn) { + return fn(); +} +function blank_object() { + return Object.create(null); +} +function run_all(fns) { + fns.forEach(run); +} +function is_function(thing) { + return typeof thing === "function"; +} +function safe_not_equal(a, b) { + return a != a ? b == b : a !== b || (a && typeof a === "object" || typeof a === "function"); +} +let src_url_equal_anchor; +function src_url_equal(element_src, url) { + if (!src_url_equal_anchor) { + src_url_equal_anchor = document.createElement("a"); + } + src_url_equal_anchor.href = url; + return element_src === src_url_equal_anchor.href; +} +function is_empty(obj) { + return Object.keys(obj).length === 0; +} +function append(target, node) { + target.appendChild(node); +} +function insert(target, node, anchor) { + target.insertBefore(node, anchor || null); +} +function detach(node) { + node.parentNode.removeChild(node); +} +function destroy_each(iterations, detaching) { + for (let i = 0; i < iterations.length; i += 1) { + if (iterations[i]) + iterations[i].d(detaching); + } +} +function element(name) { + return document.createElement(name); +} +function text(data) { + return document.createTextNode(data); +} +function space() { + return text(" "); +} +function empty() { + return text(""); +} +function attr(node, attribute, value) { + if (value == null) + node.removeAttribute(attribute); + else if (node.getAttribute(attribute) !== value) + node.setAttribute(attribute, value); +} +function children(element2) { + return Array.from(element2.childNodes); +} +function set_data(text2, data) { + data = "" + data; + if (text2.wholeText !== data) + text2.data = data; +} +function attribute_to_object(attributes) { + const result = {}; + for (const attribute of attributes) { + result[attribute.name] = attribute.value; + } + return result; +} +let current_component; +function set_current_component(component) { + current_component = component; +} +function get_current_component() { + if (!current_component) + throw new Error("Function called outside component initialization"); + return current_component; +} +function onMount(fn) { + get_current_component().$$.on_mount.push(fn); +} +const dirty_components = []; +const binding_callbacks = []; +const render_callbacks = []; +const flush_callbacks = []; +const resolved_promise = Promise.resolve(); +let update_scheduled = false; +function schedule_update() { + if (!update_scheduled) { + update_scheduled = true; + resolved_promise.then(flush); + } +} +function add_render_callback(fn) { + render_callbacks.push(fn); +} +let flushing = false; +const seen_callbacks = new Set(); +function flush() { + if (flushing) + return; + flushing = true; + do { + for (let i = 0; i < dirty_components.length; i += 1) { + const component = dirty_components[i]; + set_current_component(component); + update(component.$$); + } + set_current_component(null); + dirty_components.length = 0; + while (binding_callbacks.length) + binding_callbacks.pop()(); + for (let i = 0; i < render_callbacks.length; i += 1) { + const callback = render_callbacks[i]; + if (!seen_callbacks.has(callback)) { + seen_callbacks.add(callback); + callback(); + } + } + render_callbacks.length = 0; + } while (dirty_components.length); + while (flush_callbacks.length) { + flush_callbacks.pop()(); + } + update_scheduled = false; + flushing = false; + seen_callbacks.clear(); +} +function update($$) { + if ($$.fragment !== null) { + $$.update(); + run_all($$.before_update); + const dirty = $$.dirty; + $$.dirty = [-1]; + $$.fragment && $$.fragment.p($$.ctx, dirty); + $$.after_update.forEach(add_render_callback); + } +} +const outroing = new Set(); +function transition_in(block, local) { + if (block && block.i) { + outroing.delete(block); + block.i(local); + } +} +function mount_component(component, target, anchor, customElement) { + const { fragment, on_mount, on_destroy, after_update } = component.$$; + fragment && fragment.m(target, anchor); + if (!customElement) { + add_render_callback(() => { + const new_on_destroy = on_mount.map(run).filter(is_function); + if (on_destroy) { + on_destroy.push(...new_on_destroy); + } else { + run_all(new_on_destroy); + } + component.$$.on_mount = []; + }); + } + after_update.forEach(add_render_callback); +} +function destroy_component(component, detaching) { + const $$ = component.$$; + if ($$.fragment !== null) { + run_all($$.on_destroy); + $$.fragment && $$.fragment.d(detaching); + $$.on_destroy = $$.fragment = null; + $$.ctx = []; + } +} +function make_dirty(component, i) { + if (component.$$.dirty[0] === -1) { + dirty_components.push(component); + schedule_update(); + component.$$.dirty.fill(0); + } + component.$$.dirty[i / 31 | 0] |= 1 << i % 31; +} +function init(component, options, instance2, create_fragment2, not_equal, props, append_styles, dirty = [-1]) { + const parent_component = current_component; + set_current_component(component); + const $$ = component.$$ = { + fragment: null, + ctx: null, + props, + update: noop, + not_equal, + bound: blank_object(), + on_mount: [], + on_destroy: [], + on_disconnect: [], + before_update: [], + after_update: [], + context: new Map(options.context || (parent_component ? parent_component.$$.context : [])), + callbacks: blank_object(), + dirty, + skip_bound: false, + root: options.target || parent_component.$$.root + }; + append_styles && append_styles($$.root); + let ready = false; + $$.ctx = instance2 ? instance2(component, options.props || {}, (i, ret, ...rest) => { + const value = rest.length ? rest[0] : ret; + if ($$.ctx && not_equal($$.ctx[i], $$.ctx[i] = value)) { + if (!$$.skip_bound && $$.bound[i]) + $$.bound[i](value); + if (ready) + make_dirty(component, i); + } + return ret; + }) : []; + $$.update(); + ready = true; + run_all($$.before_update); + $$.fragment = create_fragment2 ? create_fragment2($$.ctx) : false; + if (options.target) { + if (options.hydrate) { + const nodes = children(options.target); + $$.fragment && $$.fragment.l(nodes); + nodes.forEach(detach); + } else { + $$.fragment && $$.fragment.c(); + } + if (options.intro) + transition_in(component.$$.fragment); + mount_component(component, options.target, options.anchor, options.customElement); + flush(); + } + set_current_component(parent_component); +} +let SvelteElement; +if (typeof HTMLElement === "function") { + SvelteElement = class extends HTMLElement { + constructor() { + super(); + this.attachShadow({ mode: "open" }); + } + connectedCallback() { + const { on_mount } = this.$$; + this.$$.on_disconnect = on_mount.map(run).filter(is_function); + for (const key in this.$$.slotted) { + this.appendChild(this.$$.slotted[key]); + } + } + attributeChangedCallback(attr2, _oldValue, newValue) { + this[attr2] = newValue; + } + disconnectedCallback() { + run_all(this.$$.on_disconnect); + } + $destroy() { + destroy_component(this, 1); + this.$destroy = noop; + } + $on(type, callback) { + const callbacks = this.$$.callbacks[type] || (this.$$.callbacks[type] = []); + callbacks.push(callback); + return () => { + const index = callbacks.indexOf(callback); + if (index !== -1) + callbacks.splice(index, 1); + }; + } + $set($$props) { + if (this.$$set && !is_empty($$props)) { + this.$$.skip_bound = true; + this.$$set($$props); + this.$$.skip_bound = false; + } + } + }; +} +function get_each_context(ctx, list, i) { + const child_ctx = ctx.slice(); + child_ctx[6] = list[i]; + return child_ctx; +} +function create_if_block$1(ctx) { + let div1; + let a; + let div0; + let span; + let t0_value = (ctx[1] || "Gancio") + ""; + let t0; + let t1; + let img; + let img_src_value; + let t2; + let each_value = ctx[2]; + let each_blocks = []; + for (let i = 0; i < each_value.length; i += 1) { + each_blocks[i] = create_each_block(get_each_context(ctx, each_value, i)); + } + return { + c() { + div1 = element("div"); + a = element("a"); + div0 = element("div"); + span = element("span"); + t0 = text(t0_value); + t1 = space(); + img = element("img"); + t2 = space(); + for (let i = 0; i < each_blocks.length; i += 1) { + each_blocks[i].c(); + } + attr(span, "id", "headerTitle"); + attr(img, "id", "logo"); + attr(img, "alt", "logo"); + if (!src_url_equal(img.src, img_src_value = "" + (ctx[0] + "/logo.png"))) + attr(img, "src", img_src_value); + attr(div0, "class", "content"); + attr(a, "href", ctx[0]); + attr(a, "target", "_blank"); + attr(div1, "id", "gancioEvents"); + }, + m(target, anchor) { + insert(target, div1, anchor); + append(div1, a); + append(a, div0); + append(div0, span); + append(span, t0); + append(div0, t1); + append(div0, img); + append(div1, t2); + for (let i = 0; i < each_blocks.length; i += 1) { + each_blocks[i].m(div1, null); + } + }, + p(ctx2, dirty) { + if (dirty & 2 && t0_value !== (t0_value = (ctx2[1] || "Gancio") + "")) + set_data(t0, t0_value); + if (dirty & 1 && !src_url_equal(img.src, img_src_value = "" + (ctx2[0] + "/logo.png"))) { + attr(img, "src", img_src_value); + } + if (dirty & 1) { + attr(a, "href", ctx2[0]); + } + if (dirty & 5) { + each_value = ctx2[2]; + let i; + for (i = 0; i < each_value.length; i += 1) { + const child_ctx = get_each_context(ctx2, each_value, i); + if (each_blocks[i]) { + each_blocks[i].p(child_ctx, dirty); + } else { + each_blocks[i] = create_each_block(child_ctx); + each_blocks[i].c(); + each_blocks[i].m(div1, null); + } + } + for (; i < each_blocks.length; i += 1) { + each_blocks[i].d(1); + } + each_blocks.length = each_value.length; + } + }, + d(detaching) { + if (detaching) + detach(div1); + destroy_each(each_blocks, detaching); + } + }; +} +function create_each_block(ctx) { + let a; + let div2; + let div0; + let t0_value = when$1(ctx[6].start_datetime) + ""; + let t0; + let t1; + let span; + let t2; + let t3_value = ctx[6].place.name + ""; + let t3; + let t4; + let div1; + let t5_value = ctx[6].title + ""; + let t5; + let t6; + let a_href_value; + return { + c() { + a = element("a"); + div2 = element("div"); + div0 = element("div"); + t0 = text(t0_value); + t1 = space(); + span = element("span"); + t2 = text("@"); + t3 = text(t3_value); + t4 = space(); + div1 = element("div"); + t5 = text(t5_value); + t6 = space(); + attr(span, "class", "place"); + attr(div0, "class", "subtitle"); + attr(div1, "class", "title"); + attr(div2, "class", "content"); + attr(a, "href", a_href_value = "" + (ctx[0] + "/event/" + (ctx[6].slug || ctx[6].id))); + attr(a, "target", "_blank"); + }, + m(target, anchor) { + insert(target, a, anchor); + append(a, div2); + append(div2, div0); + append(div0, t0); + append(div0, t1); + append(div0, span); + append(span, t2); + append(span, t3); + append(div2, t4); + append(div2, div1); + append(div1, t5); + append(a, t6); + }, + p(ctx2, dirty) { + if (dirty & 4 && t0_value !== (t0_value = when$1(ctx2[6].start_datetime) + "")) + set_data(t0, t0_value); + if (dirty & 4 && t3_value !== (t3_value = ctx2[6].place.name + "")) + set_data(t3, t3_value); + if (dirty & 4 && t5_value !== (t5_value = ctx2[6].title + "")) + set_data(t5, t5_value); + if (dirty & 5 && a_href_value !== (a_href_value = "" + (ctx2[0] + "/event/" + (ctx2[6].slug || ctx2[6].id)))) { + attr(a, "href", a_href_value); + } + }, + d(detaching) { + if (detaching) + detach(a); + } + }; +} +function create_fragment$1(ctx) { + let if_block_anchor; + let if_block = ctx[2].length && create_if_block$1(ctx); + return { + c() { + if (if_block) + if_block.c(); + if_block_anchor = empty(); + this.c = noop; + }, + m(target, anchor) { + if (if_block) + if_block.m(target, anchor); + insert(target, if_block_anchor, anchor); + }, + p(ctx2, [dirty]) { + if (ctx2[2].length) { + if (if_block) { + if_block.p(ctx2, dirty); + } else { + if_block = create_if_block$1(ctx2); + if_block.c(); + if_block.m(if_block_anchor.parentNode, if_block_anchor); + } + } else if (if_block) { + if_block.d(1); + if_block = null; + } + }, + i: noop, + o: noop, + d(detaching) { + if (if_block) + if_block.d(detaching); + if (detaching) + detach(if_block_anchor); + } + }; +} +function when$1(timestamp) { + return new Date(timestamp * 1e3).toLocaleDateString(void 0, { + weekday: "long", + month: "short", + day: "numeric", + hour: "2-digit", + minute: "2-digit" + }); +} +function instance$1($$self, $$props, $$invalidate) { + let { baseurl = "https://dev.gancio.org" } = $$props; + let { title = "Gancio events" } = $$props; + let { maxlength = false } = $$props; + let { tags = false } = $$props; + let events = []; + function update2(v) { + fetch(`${baseurl}/api/events${maxlength ? "?max=" + maxlength : ""}`).then((res) => res.json()).then((e) => $$invalidate(2, events = e)); + } + $$self.$$set = ($$props2) => { + if ("baseurl" in $$props2) + $$invalidate(0, baseurl = $$props2.baseurl); + if ("title" in $$props2) + $$invalidate(1, title = $$props2.title); + if ("maxlength" in $$props2) + $$invalidate(3, maxlength = $$props2.maxlength); + if ("tags" in $$props2) + $$invalidate(4, tags = $$props2.tags); + }; + $$self.$$.update = () => { + if ($$self.$$.dirty & 10) { + update2(); + } + }; + return [baseurl, title, events, maxlength, tags]; +} +class GancioEvents extends SvelteElement { + constructor(options) { + super(); + this.shadowRoot.innerHTML = ``; + init(this, { + target: this.shadowRoot, + props: attribute_to_object(this.attributes), + customElement: true + }, instance$1, create_fragment$1, safe_not_equal, { + baseurl: 0, + title: 1, + maxlength: 3, + tags: 4 + }, null); + if (options) { + if (options.target) { + insert(options.target, this, options.anchor); + } + if (options.props) { + this.$set(options.props); + flush(); + } + } + } + static get observedAttributes() { + return ["baseurl", "title", "maxlength", "tags"]; + } + get baseurl() { + return this.$$.ctx[0]; + } + set baseurl(baseurl) { + this.$$set({ baseurl }); + flush(); + } + get title() { + return this.$$.ctx[1]; + } + set title(title) { + this.$$set({ title }); + flush(); + } + get maxlength() { + return this.$$.ctx[3]; + } + set maxlength(maxlength) { + this.$$set({ maxlength }); + flush(); + } + get tags() { + return this.$$.ctx[4]; + } + set tags(tags) { + this.$$set({ tags }); + flush(); + } +} +customElements.define("gancio-events", GancioEvents); +function create_if_block(ctx) { + let a; + let t0; + let div2; + let strong; + let t1_value = ctx[1].title + ""; + let t1; + let t2; + let div0; + let t3_value = when(ctx[1]) + ""; + let t3; + let t4; + let div1; + let t5; + let t6_value = ctx[1].place.name + ""; + let t6; + let a_href_value; + let if_block = ctx[1].media.length && create_if_block_1(ctx); + return { + c() { + a = element("a"); + if (if_block) + if_block.c(); + t0 = space(); + div2 = element("div"); + strong = element("strong"); + t1 = text(t1_value); + t2 = space(); + div0 = element("div"); + t3 = text(t3_value); + t4 = space(); + div1 = element("div"); + t5 = text("@"); + t6 = text(t6_value); + attr(div1, "class", "place"); + attr(div2, "class", "container"); + attr(a, "href", a_href_value = "" + (ctx[0] + "/event/" + (ctx[1].slug || ctx[1].id))); + attr(a, "class", "card"); + }, + m(target, anchor) { + insert(target, a, anchor); + if (if_block) + if_block.m(a, null); + append(a, t0); + append(a, div2); + append(div2, strong); + append(strong, t1); + append(div2, t2); + append(div2, div0); + append(div0, t3); + append(div2, t4); + append(div2, div1); + append(div1, t5); + append(div1, t6); + }, + p(ctx2, dirty) { + if (ctx2[1].media.length) { + if (if_block) { + if_block.p(ctx2, dirty); + } else { + if_block = create_if_block_1(ctx2); + if_block.c(); + if_block.m(a, t0); + } + } else if (if_block) { + if_block.d(1); + if_block = null; + } + if (dirty & 2 && t1_value !== (t1_value = ctx2[1].title + "")) + set_data(t1, t1_value); + if (dirty & 2 && t3_value !== (t3_value = when(ctx2[1]) + "")) + set_data(t3, t3_value); + if (dirty & 2 && t6_value !== (t6_value = ctx2[1].place.name + "")) + set_data(t6, t6_value); + if (dirty & 3 && a_href_value !== (a_href_value = "" + (ctx2[0] + "/event/" + (ctx2[1].slug || ctx2[1].id)))) { + attr(a, "href", a_href_value); + } + }, + d(detaching) { + if (detaching) + detach(a); + if (if_block) + if_block.d(); + } + }; +} +function create_if_block_1(ctx) { + let img; + let img_src_value; + let img_alt_value; + let img_style_value; + return { + c() { + img = element("img"); + if (!src_url_equal(img.src, img_src_value = ctx[2](ctx[1]))) + attr(img, "src", img_src_value); + attr(img, "alt", img_alt_value = ctx[1].media[0].name); + attr(img, "style", img_style_value = "background-position: " + position(ctx[1]) + "; aspect-ratio=1.7778;"); + }, + m(target, anchor) { + insert(target, img, anchor); + }, + p(ctx2, dirty) { + if (dirty & 2 && !src_url_equal(img.src, img_src_value = ctx2[2](ctx2[1]))) { + attr(img, "src", img_src_value); + } + if (dirty & 2 && img_alt_value !== (img_alt_value = ctx2[1].media[0].name)) { + attr(img, "alt", img_alt_value); + } + if (dirty & 2 && img_style_value !== (img_style_value = "background-position: " + position(ctx2[1]) + "; aspect-ratio=1.7778;")) { + attr(img, "style", img_style_value); + } + }, + d(detaching) { + if (detaching) + detach(img); + } + }; +} +function create_fragment(ctx) { + let if_block_anchor; + let if_block = ctx[1] && create_if_block(ctx); + return { + c() { + if (if_block) + if_block.c(); + if_block_anchor = empty(); + this.c = noop; + }, + m(target, anchor) { + if (if_block) + if_block.m(target, anchor); + insert(target, if_block_anchor, anchor); + }, + p(ctx2, [dirty]) { + if (ctx2[1]) { + if (if_block) { + if_block.p(ctx2, dirty); + } else { + if_block = create_if_block(ctx2); + if_block.c(); + if_block.m(if_block_anchor.parentNode, if_block_anchor); + } + } else if (if_block) { + if_block.d(1); + if_block = null; + } + }, + i: noop, + o: noop, + d(detaching) { + if (if_block) + if_block.d(detaching); + if (detaching) + detach(if_block_anchor); + } + }; +} +function when(event) { + return new Date(event.start_datetime * 1e3).toLocaleDateString(void 0, { + weekday: "long", + month: "short", + day: "numeric", + hour: "2-digit", + minute: "2-digit" + }); +} +function position(event) { + if (event.media[0].focalpoint) { + const focalpoint = event.media[0].focalpoint; + return `${(focalpoint[0] + 1) * 50}% ${(focalpoint[1] + 1) * 50}%`; + } + return "center center"; +} +function instance($$self, $$props, $$invalidate) { + let { baseurl = "https://demo.gancio.org" } = $$props; + let { id } = $$props; + let mounted = false; + let event; + function update2(id2, baseurl2) { + if (mounted) { + fetch(`${baseurl2}/api/event/${id2}`).then((res) => res.json()).then((e) => $$invalidate(1, event = e)); + } + } + onMount(() => { + mounted = true; + console.error("dentro onMount ", id, baseurl); + update2(id, baseurl); + }); + function thumbnail(event2) { + return `${baseurl}/media/thumb/${event2.media[0].url}`; + } + $$self.$$set = ($$props2) => { + if ("baseurl" in $$props2) + $$invalidate(0, baseurl = $$props2.baseurl); + if ("id" in $$props2) + $$invalidate(3, id = $$props2.id); + }; + $$self.$$.update = () => { + if ($$self.$$.dirty & 9) { + update2(id, baseurl); + } + }; + return [baseurl, event, thumbnail, id]; +} +class GancioEvent extends SvelteElement { + constructor(options) { + super(); + this.shadowRoot.innerHTML = ``; + init(this, { + target: this.shadowRoot, + props: attribute_to_object(this.attributes), + customElement: true + }, instance, create_fragment, safe_not_equal, { baseurl: 0, id: 3 }, null); + if (options) { + if (options.target) { + insert(options.target, this, options.anchor); + } + if (options.props) { + this.$set(options.props); + flush(); + } + } + } + static get observedAttributes() { + return ["baseurl", "id"]; + } + get baseurl() { + return this.$$.ctx[0]; + } + set baseurl(baseurl) { + this.$$set({ baseurl }); + flush(); + } + get id() { + return this.$$.ctx[3]; + } + set id(id) { + this.$$set({ id }); + flush(); + } +} +customElements.define("gancio-event", GancioEvent); diff --git a/webcomponents/index.html b/webcomponents/index.html index e162f8a5..95a69b70 100644 --- a/webcomponents/index.html +++ b/webcomponents/index.html @@ -8,9 +8,8 @@ - + baseurl='http://localhost:13120' title='Gancio' tags="test"> + diff --git a/webcomponents/src/GancioEvent.svelte b/webcomponents/src/GancioEvent.svelte index 70d47dd2..ad2f5422 100644 --- a/webcomponents/src/GancioEvent.svelte +++ b/webcomponents/src/GancioEvent.svelte @@ -1,16 +1,25 @@ {#if event} diff --git a/webcomponents/src/GancioEvents.svelte b/webcomponents/src/GancioEvents.svelte index 179fdf8f..474d246c 100644 --- a/webcomponents/src/GancioEvents.svelte +++ b/webcomponents/src/GancioEvents.svelte @@ -40,28 +40,17 @@ {#if events.length}