From fb1ca7d8f1533ccb88eedc891e1b1b9bbb3941db Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Sat, 15 Apr 2023 17:16:20 +0100 Subject: [PATCH 01/39] fix: use `purpose: any` for normal pwa icon (#1981) --- modules/pwa/i18n.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/pwa/i18n.ts b/modules/pwa/i18n.ts index 52856a02..c65daf9d 100644 --- a/modules/pwa/i18n.ts +++ b/modules/pwa/i18n.ts @@ -93,12 +93,13 @@ export async function createI18n(): Promise { src: 'pwa-512x512.png', sizes: '512x512', type: 'image/png', + purpose: 'any', }, { src: 'maskable-icon.png', sizes: '512x512', type: 'image/png', - purpose: 'any maskable', + purpose: 'maskable', }, ], share_target: { @@ -140,12 +141,13 @@ export async function createI18n(): Promise { src: 'pwa-512x512.png', sizes: '512x512', type: 'image/png', + purpose: 'any', }, { src: 'maskable-icon.png', sizes: '512x512', type: 'image/png', - purpose: 'any maskable', + purpose: 'maskable', }, ], share_target: { From 621d280a960f20fab2d8958267d00b448ee418e4 Mon Sep 17 00:00:00 2001 From: Cesar Gomez <65884507+mrcego@users.noreply.github.com> Date: Sat, 15 Apr 2023 11:57:52 -0500 Subject: [PATCH 02/39] feat(i18n): sync `es` base lang (#1979) --- locales/es.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/es.json b/locales/es.json index bf83abb8..8f188c4c 100644 --- a/locales/es.json +++ b/locales/es.json @@ -34,6 +34,7 @@ "posts": "Publicaciones", "posts_count": "{0} Publicaciones|{0} Publicación|{0} Publicaciones", "profile_description": "Encabezado del perfil de {0}", + "profile_personal_note": "Nota Personal", "profile_unavailable": "Perfil no disponible", "request_follow": "Solicitar seguirle", "unblock": "Desbloquear", @@ -225,6 +226,7 @@ "sequence_then": "seguido de" }, "menu": { + "add_personal_note": "Agregar una nota personal a {0}", "block_account": "Bloquear a {0}", "block_domain": "Bloquear dominio {0}", "copy_link_to_post": "Copiar enlace", @@ -239,6 +241,7 @@ "mute_conversation": "Silenciar publicación", "open_in_original_site": "Abrir página original", "pin_on_profile": "Fijar en tu perfil", + "remove_personal_note": "Eliminar nota personal de {0}", "share_post": "Compartir esta publicación", "show_favourited_and_boosted_by": "Mostrar quien marcó como favorita y quien retooteó", "show_reblogs": "Mostrar retoots de {0}", From ce5e81e1600dd2d8ba4c9987b72badb56c5d57fc Mon Sep 17 00:00:00 2001 From: Glaydus <77715324+Glaydus@users.noreply.github.com> Date: Sun, 16 Apr 2023 14:17:31 +0200 Subject: [PATCH 03/39] fix(i18n): update Polish translations (#1982) --- locales/pl-PL.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/pl-PL.json b/locales/pl-PL.json index 12b62c09..17765688 100644 --- a/locales/pl-PL.json +++ b/locales/pl-PL.json @@ -34,6 +34,7 @@ "posts": "Wpisy", "posts_count": "{0} Wpisów|{0} Wpis|{0} Wpisy|{0} Wpisów", "profile_description": "nagłówek profilu {0}", + "profile_personal_note": "Notatka osobista", "profile_unavailable": "Profil niedostępny", "request_follow": "Prośba o śledzenie", "unblock": "Odblokuj", @@ -200,6 +201,7 @@ "save": "Zapisz zmiany" }, "menu": { + "add_personal_note": "Dodaj osobistą notatkę do {0}", "block_account": "Zablokuj {0}", "block_domain": "Zablokuj domenę {0}", "copy_link_to_post": "Skopiuj odnośnik do wpisu", @@ -214,6 +216,7 @@ "mute_conversation": "Wycisz ten wpis", "open_in_original_site": "Otwórz na oryginalnej stronie", "pin_on_profile": "Przypnij do profilu", + "remove_personal_note": "Usuń osobistą notatkę z {0}", "share_post": "Udostępnij ten wpis", "show_favourited_and_boosted_by": "Pokaż, kto dodał do ulubionych i udostępnił", "show_reblogs": "Pokaż podbicia od {0}", From 3442dfe75db5de3af2ec46cd183a8af59a1fcfce Mon Sep 17 00:00:00 2001 From: Shinigami Date: Sun, 16 Apr 2023 14:22:03 +0200 Subject: [PATCH 04/39] feat: hide status from suspended account (#1967) --- components/status/StatusCard.vue | 111 ++++++++++++++++++------------- locales/de-DE.json | 4 ++ locales/en.json | 4 ++ 3 files changed, 72 insertions(+), 47 deletions(-) diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue index 17cee428..a7303333 100644 --- a/components/status/StatusCard.vue +++ b/components/status/StatusCard.vue @@ -65,6 +65,8 @@ const isDM = $computed(() => status.visibility === 'direct') const showUpperBorder = $computed(() => props.newer && !directReply) const showReplyTo = $computed(() => !replyToMain && !directReply) + +const forceShow = ref(false) diff --git a/locales/de-DE.json b/locales/de-DE.json index 50098569..7cd9a2e8 100644 --- a/locales/de-DE.json +++ b/locales/de-DE.json @@ -385,6 +385,10 @@ "uploading": "Hochladen..." }, "status": { + "account": { + "suspended_message": "Der Account dieses Status wurde vorübergehend gesperrt.", + "suspended_show": "Inhalt trotzdem anzeigen?" + }, "boosted_by": "Boosted von", "edited": "Zuletzt bearbeitet: {0}", "favourited_by": "Favorisiert von", diff --git a/locales/en.json b/locales/en.json index 116476d6..26457e6e 100644 --- a/locales/en.json +++ b/locales/en.json @@ -497,6 +497,10 @@ "uploading": "Uploading..." }, "status": { + "account": { + "suspended_message": "The account of this status has been suspended.", + "suspended_show": "Show content anyways?" + }, "boosted_by": "Boosted By", "edited": "Edited {0}", "favourited_by": "Favorited By", From dac044e6addbd008ff1b56a0640e78917132aead Mon Sep 17 00:00:00 2001 From: Emanuel Pina Date: Sun, 16 Apr 2023 13:27:59 +0100 Subject: [PATCH 05/39] fix(i18n): update portuguese from Portugal translation (#1975) --- locales/pt-PT.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/locales/pt-PT.json b/locales/pt-PT.json index 6b29de59..860ad993 100644 --- a/locales/pt-PT.json +++ b/locales/pt-PT.json @@ -34,6 +34,7 @@ "posts": "Publicações", "posts_count": "{0} Publicações|{0} Publicação|{0} Publicações", "profile_description": "Descrição de perfil de {0}", + "profile_personal_note": "Nota Pessoal", "profile_unavailable": "Perfil indisponível", "request_follow": "Pedir para seguir", "unblock": "Desbloquear", @@ -225,6 +226,7 @@ "sequence_then": "seguido de" }, "menu": { + "add_personal_note": "Adicionar nota pessoal para {0}", "block_account": "Bloquear {0}", "block_domain": "Bloquear domínio {0}", "copy_link_to_post": "Copiar ligação para esta publicação", @@ -239,6 +241,7 @@ "mute_conversation": "Silenciar esta publicação", "open_in_original_site": "Abrir no sítio original", "pin_on_profile": "Fixar no perfil", + "remove_personal_note": "Remover nota pessoal para {0}", "share_post": "Partilhar esta publicação", "show_favourited_and_boosted_by": "Mostrar quem adicionou aos favoritos e partilhou", "show_reblogs": "Mostrar partilhas de {0}", From 2267556b8bd00d3f01ea1e7ec7fd3b4576495693 Mon Sep 17 00:00:00 2001 From: Ivan Demchuk Date: Sun, 16 Apr 2023 15:28:45 +0300 Subject: [PATCH 06/39] chore: add a script to cleanup old translations (#1963) --- locales/ar.json | 16 -------- locales/ca-valencia.json | 3 -- locales/cs-CZ.json | 7 ---- locales/de-DE.json | 10 +---- locales/fi-FI.json | 7 ---- locales/id-ID.json | 11 ------ locales/nl-NL.json | 7 ---- locales/ru-RU.json | 18 --------- locales/tr-TR.json | 3 +- locales/uk-UA.json | 4 -- locales/zh-TW.json | 7 ---- package.json | 1 + scripts/cleanup-translations.ts | 65 +++++++++++++++++++++++++++++++++ 13 files changed, 68 insertions(+), 91 deletions(-) create mode 100644 scripts/cleanup-translations.ts diff --git a/locales/ar.json b/locales/ar.json index b0ee13da..841fbf06 100644 --- a/locales/ar.json +++ b/locales/ar.json @@ -91,11 +91,6 @@ "toggle_zen_mode": "تبديل الوضع الهادئ" }, "common": { - "confirm_dialog": { - "cancel": "لا", - "confirm": "نعم", - "title": "هل أنت متأكد؟" - }, "end_of_list": "نهاية القائمة", "error": "حدث خطأ", "in": "في", @@ -191,11 +186,6 @@ "copy_original_link_to_post": "انسخ الرابط الأصلي لهذا المنشور", "delete": "حذف", "delete_and_redraft": "حذف وإعادة صياغة", - "delete_confirm": { - "cancel": "إلغاء", - "confirm": "حذف", - "title": "هل أنت متأكد أنك تريد حذف هذا المنشور؟" - }, "direct_message_account": "إرسال رسالة مباشرة إلى {0}", "edit": "تعديل", "hide_reblogs": "إخفاء المشاركات من {0}", @@ -314,12 +304,6 @@ "description": "قم بتحرير إعدادات حسابك في موقع ماستودون الأصل", "label": "إعدادت الحساب" }, - "feature_flags": { - "github_cards": "بطاقات GitHub", - "title": "الميزات التجريبية", - "user_picker": "الشريط الجانبي لمبدل المستخدم", - "virtual_scroll": "التمرير الافتراضي" - }, "interface": { "color_mode": "وضع اللون", "dark_mode": "الوضع الداكن", diff --git a/locales/ca-valencia.json b/locales/ca-valencia.json index 5d16c8b3..d83ce706 100644 --- a/locales/ca-valencia.json +++ b/locales/ca-valencia.json @@ -54,7 +54,6 @@ "not_found": "404 No s'ha trobat", "offline_desc": "Sembla que estàs fora de línia. Comprova la connexió de xarxa." }, - "compose": {}, "confirm": { "block_account": { "cancel": "Cancel·la", @@ -91,7 +90,6 @@ "title": "Segur que vols deixar de seguir-lo?" } }, - "conversation": {}, "custom_cards": { "stackblitz": { "open": "Obri", @@ -119,7 +117,6 @@ "footer_team": "L'equip d'Elk", "title": "Elk està en proves!" }, - "language": {}, "list": { "add_account": "Afig el compte a una llista", "create": "Crea", diff --git a/locales/cs-CZ.json b/locales/cs-CZ.json index 9648f526..694fdf50 100644 --- a/locales/cs-CZ.json +++ b/locales/cs-CZ.json @@ -142,13 +142,6 @@ "replying": "Sem napište odpověď", "the_thread": "vlákno" }, - "settings": { - "feature_flags": { - "github_cards": "GitHub Cards", - "user_picker": "User Picker", - "virtual_scroll": "Virtual Scrolling" - } - }, "state": { "edited": "(Upraveno)", "editing": "Upravuje se", diff --git a/locales/de-DE.json b/locales/de-DE.json index 7cd9a2e8..5dc480fe 100644 --- a/locales/de-DE.json +++ b/locales/de-DE.json @@ -28,7 +28,6 @@ "muted_users": "Stummgeschaltete Accounts", "muting": "Stummgeschaltet", "mutuals": "Freunde", - "notify_on_post": "Benachrichtige mich, wenn {username} etwas postet", "pinned": "Angepinnt", "posts": "Beiträge", "posts_count": "{0} Beiträge", @@ -102,8 +101,7 @@ "confirm": { "common": { "cancel": "Abbrechen", - "confirm": "OK", - "title": "Bist du sicher, {0}?" + "confirm": "OK" }, "delete_posts": { "cancel": "Abbrechen", @@ -256,12 +254,6 @@ "description": "Bearbeite Kontoeinstellungen in der Mastodon-Benutzeroberfläche", "label": "Account Einstellungen" }, - "feature_flags": { - "github_cards": "GitHub Cards", - "title": "Experimentelle Funktionen", - "user_picker": "Benutzerauswahl", - "virtual_scroll": "Virtuelles Scrollen" - }, "interface": { "color_mode": "Farbschema", "dark_mode": "Dunkles Farbschema", diff --git a/locales/fi-FI.json b/locales/fi-FI.json index 8cb79f5e..136794ef 100644 --- a/locales/fi-FI.json +++ b/locales/fi-FI.json @@ -295,13 +295,6 @@ "font_size": "Kirjasinkoko", "label": "Käyttöliittymä", "light_mode": "Vaalea", - "size_label": { - "lg": "Suuri", - "md": "Keski", - "sm": "Pieni", - "xl": "Ekstra-suuri", - "xs": "Ekstra-pieni" - }, "system_mode": "Laitteen asetus", "theme_color": "Korostusväri" }, diff --git a/locales/id-ID.json b/locales/id-ID.json index af8f83fe..a1aa2beb 100644 --- a/locales/id-ID.json +++ b/locales/id-ID.json @@ -30,7 +30,6 @@ "mutuals": "Terkait", "notifications_on_post_disable": "Berhenti memberi tahu saya saat {username} memposting", "notifications_on_post_enable": "Beri tahu saya jika {username} memposting", - "notify_on_post": "Beri tahu saya jika {username} memposting", "pinned": "Dilekatkan", "posts": "Posting", "posts_count": "{0} Pos|{0} Pos|{0} Pos", @@ -92,11 +91,6 @@ "toggle_zen_mode": "Beralih ke modus zen" }, "common": { - "confirm_dialog": { - "cancel": "Tidak", - "confirm": "Ya", - "title": "Apakah Anda yakin {0}?" - }, "end_of_list": "Akhir dari daftar", "error": "KESALAHAN", "in": "di dalam", @@ -180,11 +174,6 @@ "copy_link_to_post": "Salin tautan pos ini", "delete": "Hapus", "delete_and_redraft": "Hapus dan buat ulang draf", - "delete_confirm": { - "cancel": "Batalkan", - "confirm": "Hapus", - "title": "Yakin ingin menghapus postingan ini?" - }, "direct_message_account": "Pesan langsung {0}", "edit": "Sunting", "hide_reblogs": "Sembunyikan dukungan dari {0}", diff --git a/locales/nl-NL.json b/locales/nl-NL.json index 24d4e2c0..49597b8d 100644 --- a/locales/nl-NL.json +++ b/locales/nl-NL.json @@ -193,12 +193,6 @@ "about": { "label": "Over" }, - "feature_flags": { - "github_cards": "GitHub Cards", - "title": "Experimentele Functies", - "user_picker": "Gebruiker Kiezer", - "virtual_scroll": "Virtueel Scrollen" - }, "interface": { "color_mode": "Kleur Modus", "dark_mode": "Donkere Modus", @@ -284,7 +278,6 @@ } }, "state": { - "attachments_exceed_server_limit": "De hoeveelheid bijlagen is meer dan het limiet per post.", "attachments_limit_error": "Limiet per post overschreden", "edited": "(Aangepast)", diff --git a/locales/ru-RU.json b/locales/ru-RU.json index d44d7261..0eec1898 100644 --- a/locales/ru-RU.json +++ b/locales/ru-RU.json @@ -59,7 +59,6 @@ "more": "Больше", "next": "Следующее", "prev": "Предыдущее", - "previous": "Предыдущее", "publish": "Опубликовать", "reply": "Ответить", "reply_count": "{0}", @@ -90,11 +89,6 @@ "toggle_zen_mode": "Переключить режим дзен" }, "common": { - "confirm_dialog": { - "cancel": "Нет", - "confirm": "Да", - "title": "Вы уверены?" - }, "end_of_list": "Конец списка", "error": "ОШИБКА", "in": "в", @@ -171,11 +165,6 @@ "copy_link_to_post": "Скопировать ссылку на этот пост", "delete": "Удалить", "delete_and_redraft": "Удалить и переписать", - "delete_confirm": { - "cancel": "Отменить", - "confirm": "Удалить", - "title": "Вы уверены, что хотите удалить этот пост?" - }, "direct_message_account": "Отправьте личное сообщение {0}", "edit": "Редактировать", "hide_reblogs": "Скрыть репосты от {0}", @@ -295,13 +284,6 @@ "font_size": "Размер текста", "label": "Интерфейс", "light_mode": "Светлая", - "size_label": { - "lg": "Большой", - "md": "Средний", - "sm": "Маленький", - "xl": "Очень большой", - "xs": "Очень маленький" - }, "system_mode": "Системная", "theme_color": "Цвет" }, diff --git a/locales/tr-TR.json b/locales/tr-TR.json index b9133679..64e58631 100644 --- a/locales/tr-TR.json +++ b/locales/tr-TR.json @@ -99,8 +99,7 @@ "confirm": { "common": { "cancel": "Hayır", - "confirm": "Evet", - "title": "Emin misiniz?" + "confirm": "Evet" }, "delete_posts": { "cancel": "İptal et", diff --git a/locales/uk-UA.json b/locales/uk-UA.json index b09b5b08..6513db71 100644 --- a/locales/uk-UA.json +++ b/locales/uk-UA.json @@ -216,10 +216,6 @@ "description": "Відредагуйте налаштування облікового запису використовуєчи інтерфейс Mastodon", "label": "Налаштування облікового запису" }, - "feature_flags": { - "github_cards": "GitHub картки", - "title": "Експериментальні налаштування" - }, "interface": { "color_mode": "Кольорова тема", "dark_mode": "Темна", diff --git a/locales/zh-TW.json b/locales/zh-TW.json index adbd14f0..74f134b7 100644 --- a/locales/zh-TW.json +++ b/locales/zh-TW.json @@ -30,7 +30,6 @@ "mutuals": "互相關注", "notifications_on_post_disable": "當 {username} 發布時，停止通知我", "notifications_on_post_enable": "當 {username} 發布時，通知我", - "notify_on_post": "{username} 發文時通知我", "pinned": "置頂的貼文", "posts": "貼文", "posts_count": "{0} 則貼文", @@ -63,7 +62,6 @@ "more": "更多", "next": "下一個", "prev": "上一個", - "previous": "之前的", "publish": "發布", "reply": "回覆", "reply_count": "{0}", @@ -94,11 +92,6 @@ "toggle_zen_mode": "切換禪模式" }, "common": { - "confirm_dialog": { - "cancel": "取消", - "confirm": "確認", - "title": "你確定嗎？" - }, "end_of_list": "清單到底了", "error": "錯誤", "in": "在", diff --git a/package.json b/package.json index 675a1070..311baa26 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "test:typecheck": "stale-dep && vue-tsc --noEmit && vue-tsc --noEmit --project service-worker/tsconfig.json", "test": "nr test:unit", "update:team:avatars": "esno scripts/avatars.ts", + "cleanup-translations": "esno scripts/cleanup-translations.ts", "prepare-translation-status": "esno scripts/prepare-translation-status.ts", "postinstall": "ignore-dependency-scripts \"stale-dep -u && simple-git-hooks && nuxi prepare && nr prepare-translation-status\"", "release": "stale-dep && bumpp && esno scripts/release.ts" diff --git a/scripts/cleanup-translations.ts b/scripts/cleanup-translations.ts new file mode 100644 index 00000000..58646c1e --- /dev/null +++ b/scripts/cleanup-translations.ts @@ -0,0 +1,65 @@ +import flatten from 'flat' +import { createResolver } from '@nuxt/kit' +import fs from 'fs-extra' +import { currentLocales } from '../config/i18n' + +const resolver = createResolver(import.meta.url) + +const sourceLanguageLocale = currentLocales.find(l => l.code === 'en-US')! + +function merge(src: Record, dst: Record) { + for (const key in src) { + if (typeof src[key] === 'object') { + if (!dst[key]) + dst[key] = {} + + merge(src[key], dst[key]) + } + else { + dst[key] = src[key] + } + } +} + +const sourceFiles: string[] = sourceLanguageLocale.files ? sourceLanguageLocale.files : [sourceLanguageLocale.file!] + +const sourceTranslations: Record = {} + +for (const file of sourceFiles) { + const data = JSON.parse(Buffer.from( + await fs.readFile(resolver.resolve(`../locales/${file}`), 'utf-8'), + ).toString()) as Record + + merge(flatten(data), sourceTranslations) +} + +async function removeOutdatedTranslations() { + for (const locale of currentLocales.filter(l => l.code !== 'en-US')) { + const files: string[] = locale.files ? locale.files : [locale.file!] + + for (const file of files) { + const path = resolver.resolve(`../locales/${file}`) + + const data = JSON.parse(Buffer.from( + await fs.readFile(path, 'utf-8'), + ).toString()) + + const targetTranslations: Record = flatten(data) + + for (const key in targetTranslations) { + if (!sourceTranslations[key]) + delete targetTranslations[key] + } + + const unflattened = flatten.unflatten(targetTranslations) + + await fs.writeFile( + path, + `${JSON.stringify(unflattened, null, 2)}\n`, + { encoding: 'utf-8' }, + ) + } + } +} + +removeOutdatedTranslations() From 587f73c4a00f4db8bd3486657481ea00d3b0e9e3 Mon Sep 17 00:00:00 2001 From: Emanuel Pina Date: Sun, 16 Apr 2023 19:36:35 +0100 Subject: [PATCH 07/39] fix(i18n): update portuguese from Portugal translation (#1984) --- locales/pt-PT.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/locales/pt-PT.json b/locales/pt-PT.json index 860ad993..897dcb2f 100644 --- a/locales/pt-PT.json +++ b/locales/pt-PT.json @@ -497,6 +497,10 @@ "uploading": "A carregar..." }, "status": { + "account": { + "suspended_message": "A conta de estado foi suspensa.", + "suspended_show": "Mostrar conteúdo mesmo assim?" + }, "boosted_by": "Partilhada Por", "edited": "Editada {0}", "favourited_by": "Adicionada Aos Favoritos Por", From 13581323b0f428f9ce4027747e47f9780600f2c1 Mon Sep 17 00:00:00 2001 From: patak Date: Sun, 16 Apr 2023 21:25:55 +0200 Subject: [PATCH 08/39] chore: fix lint --- scripts/cleanup-translations.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/cleanup-translations.ts b/scripts/cleanup-translations.ts index 58646c1e..46f3cf99 100644 --- a/scripts/cleanup-translations.ts +++ b/scripts/cleanup-translations.ts @@ -1,3 +1,4 @@ +import { Buffer } from 'node:buffer' import flatten from 'flat' import { createResolver } from '@nuxt/kit' import fs from 'fs-extra' From c71259334c313c1fef968c914a64d29d9335f4dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= Date: Sun, 16 Apr 2023 21:33:51 +0200 Subject: [PATCH 09/39] fix: remove flashing text on page reload (#1939) --- components/nav/NavTitle.vue | 2 +- components/status/StatusDetails.vue | 2 +- composables/setups.ts | 2 +- composables/vue.ts | 24 +++++++++++++++++++ .../[[server]]/@[account]/index/followers.vue | 2 +- .../[[server]]/@[account]/index/following.vue | 2 +- pages/[[server]]/@[account]/index/index.vue | 2 +- pages/[[server]]/@[account]/index/media.vue | 2 +- .../@[account]/index/with_replies.vue | 2 +- pages/[[server]]/explore/index.vue | 2 +- pages/[[server]]/explore/links.vue | 2 +- pages/[[server]]/explore/tags.vue | 2 +- pages/[[server]]/explore/users.vue | 2 +- pages/[[server]]/list/[list]/index.vue | 2 +- pages/[[server]]/lists.vue | 2 +- pages/[[server]]/public/index.vue | 2 +- pages/[[server]]/public/local.vue | 2 +- pages/[[server]]/tags/[tag].vue | 2 +- pages/blocks.vue | 2 +- pages/bookmarks.vue | 2 +- pages/compose.vue | 2 +- pages/conversations.vue | 2 +- pages/domain_blocks.vue | 2 +- pages/favourites.vue | 2 +- pages/home.vue | 2 +- pages/mutes.vue | 2 +- pages/notifications/index.vue | 2 +- pages/notifications/mention.vue | 2 +- pages/pinned.vue | 2 +- pages/settings.vue | 16 ++++++------- pages/settings/about/index.vue | 2 +- pages/settings/index.vue | 2 +- pages/settings/interface/index.vue | 2 +- pages/settings/language/index.vue | 2 +- pages/settings/notifications/index.vue | 10 ++++---- .../settings/notifications/notifications.vue | 8 +++---- .../notifications/push-notifications.vue | 4 ++-- pages/settings/preferences/index.vue | 2 +- pages/settings/profile/appearance.vue | 2 +- pages/settings/profile/featured-tags.vue | 2 +- pages/settings/profile/index.vue | 12 +++++----- pages/settings/users/index.vue | 2 +- plugins/setup-i18n.client.ts | 3 +++ 43 files changed, 88 insertions(+), 61 deletions(-) diff --git a/components/nav/NavTitle.vue b/components/nav/NavTitle.vue index 50aea711..3e442316 100644 --- a/components/nav/NavTitle.vue +++ b/components/nav/NavTitle.vue @@ -29,7 +29,7 @@ router.afterEach(() => { @click.prevent="onClickLogo" > -
-
- {{ field.name }} | +
+
+ |
From 58a7f15216d01a9a1dd79ee30dad9760da16c901 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Thu, 20 Apr 2023 12:15:12 +0100 Subject: [PATCH 16/39] chore: bump `nuxt-vitest` version --- package.json | 2 +- pnpm-lock.yaml | 428 +++++++++++++++++++++++++++---------------------- 2 files changed, 236 insertions(+), 194 deletions(-) diff --git a/package.json b/package.json index 311baa26..4a57483e 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "lru-cache": "^9.0.1", "masto": "^5.11.1", "nuxt-security": "^0.13.0", - "nuxt-vitest": "^0.6.9", + "nuxt-vitest": "^0.6.10", "page-lifecycle": "^0.1.2", "pinia": "^2.0.34", "postcss-nested": "^6.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 57823583..c34e4406 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -148,8 +148,8 @@ importers: specifier: ^0.13.0 version: 0.13.0(patch_hash=4zi7vnypkav7i5l74w6qfcndqy)(rollup@2.79.1) nuxt-vitest: - specifier: ^0.6.9 - version: 0.6.9(@vue/compiler-dom@3.2.47)(rollup@2.79.1)(vite@4.2.1)(vue@3.2.45) + specifier: ^0.6.10 + version: 0.6.10(@vitejs/plugin-vue-jsx@3.0.1)(@vitejs/plugin-vue@4.1.0)(@vue/compiler-dom@3.2.47)(rollup@2.79.1)(vite@4.2.1)(vue@3.2.45) page-lifecycle: specifier: ^0.1.2 version: 0.1.2 @@ -185,10 +185,10 @@ importers: version: 5.0.1 tauri-plugin-log-api: specifier: github:tauri-apps/tauri-plugin-log - version: github.com/tauri-apps/tauri-plugin-log/05a9bfd9edb9b5f4ab95412bb607691708b65a25 + version: github.com/tauri-apps/tauri-plugin-log/36100c269e33ac91246b0a4bfadd18c1caee5296 tauri-plugin-store-api: specifier: github:tauri-apps/tauri-plugin-store - version: github.com/tauri-apps/tauri-plugin-store/f0da2d1ac8370bd4cc7c1c0617175f0d5b5833a0 + version: github.com/tauri-apps/tauri-plugin-store/df267506bf12de451762f3f4b7f929ebed1421c9 theme-vitesse: specifier: ^0.6.4 version: 0.6.4 @@ -291,7 +291,7 @@ importers: version: 5.0.4 vitest: specifier: ^0.30.1 - version: 0.30.1 + version: 0.30.1(@vitest/ui@0.30.1) vue-tsc: specifier: ^1.2.0 version: 1.2.0(typescript@5.0.4) @@ -2196,7 +2196,7 @@ packages: nopt: 5.0.0 npmlog: 5.0.1 rimraf: 3.0.2 - semver: 7.4.0 + semver: 7.5.0 tar: 6.1.13 transitivePeerDependencies: - encoding @@ -2243,14 +2243,14 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} dependencies: '@gar/promisify': 1.1.3 - semver: 7.4.0 + semver: 7.5.0 dev: false /@npmcli/fs@3.1.0: resolution: {integrity: sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} dependencies: - semver: 7.4.0 + semver: 7.5.0 dev: false /@npmcli/git@4.0.3: @@ -2264,7 +2264,7 @@ packages: proc-log: 3.0.0 promise-inflight: 1.0.1 promise-retry: 2.0.1 - semver: 7.4.0 + semver: 7.5.0 which: 3.0.0 transitivePeerDependencies: - bluebird @@ -2448,7 +2448,7 @@ packages: nuxt: ^3.3.1 vite: '*' dependencies: - '@nuxt/kit': 3.4.0(rollup@2.79.1) + '@nuxt/kit': 3.4.1(rollup@2.79.1) '@nuxt/schema': 3.4.0(rollup@2.79.1) execa: 7.1.1 nuxt: 3.4.0(@types/node@18.15.3)(eslint@8.38.0)(rollup@2.79.1)(typescript@5.0.4)(vue-tsc@1.2.0) @@ -2605,11 +2605,65 @@ packages: - supports-color dev: true + /@nuxt/kit@3.4.1(rollup@2.79.1): + resolution: {integrity: sha512-VeH26umZW6Rf4F1QX9nTIuTBp6HeL/MgmKY3+FgQiLD07afgFTLUJZohVE5xU7hb66zCnYvwKxa3JpjXFJZrhQ==} + engines: {node: ^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0} + dependencies: + '@nuxt/schema': 3.4.1(rollup@2.79.1) + c12: 1.4.1 + consola: 3.1.0 + defu: 6.1.2 + globby: 13.1.4 + hash-sum: 2.0.0 + ignore: 5.2.4 + jiti: 1.18.2 + knitwork: 1.0.0 + lodash.template: 4.5.0 + mlly: 1.2.0 + pathe: 1.1.0 + pkg-types: 1.0.2 + scule: 1.0.0 + semver: 7.5.0 + unctx: 2.3.0 + unimport: 3.0.6(rollup@2.79.1) + untyped: 1.3.2 + transitivePeerDependencies: + - rollup + - supports-color + dev: false + + /@nuxt/kit@3.4.1(rollup@3.20.2): + resolution: {integrity: sha512-VeH26umZW6Rf4F1QX9nTIuTBp6HeL/MgmKY3+FgQiLD07afgFTLUJZohVE5xU7hb66zCnYvwKxa3JpjXFJZrhQ==} + engines: {node: ^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0} + dependencies: + '@nuxt/schema': 3.4.1(rollup@3.20.2) + c12: 1.4.1 + consola: 3.1.0 + defu: 6.1.2 + globby: 13.1.4 + hash-sum: 2.0.0 + ignore: 5.2.4 + jiti: 1.18.2 + knitwork: 1.0.0 + lodash.template: 4.5.0 + mlly: 1.2.0 + pathe: 1.1.0 + pkg-types: 1.0.2 + scule: 1.0.0 + semver: 7.5.0 + unctx: 2.3.0 + unimport: 3.0.6(rollup@3.20.2) + untyped: 1.3.2 + transitivePeerDependencies: + - rollup + - supports-color + dev: true + /@nuxt/schema@3.2.3(rollup@3.20.2): resolution: {integrity: sha512-AXzRnBivCwn5RpNFWjUkvOPGPSHl5BM+6GfOpSNglPXi0tiQJ+rawSl7no7BkxGDmQ44Bx9AXwvHTrgjpcuo4g==} engines: {node: ^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0} dependencies: - c12: 1.2.0 + c12: 1.4.1 create-require: 1.1.1 defu: 6.1.2 hookable: 5.5.3 @@ -2670,6 +2724,50 @@ packages: - supports-color dev: true + /@nuxt/schema@3.4.1(rollup@2.79.1): + resolution: {integrity: sha512-xhPh9JfVKXRQVfdUT6BKieDTCljBjbIGgGCQnxplVi4FUTWRKUXR7MFwsobr5D9AJpeE0mg5/kRRh5gUX37vAQ==} + engines: {node: ^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0} + dependencies: + c12: 1.4.1 + create-require: 1.1.1 + defu: 6.1.2 + hookable: 5.5.3 + jiti: 1.18.2 + pathe: 1.1.0 + pkg-types: 1.0.2 + postcss-import-resolver: 2.0.0 + scule: 1.0.0 + std-env: 3.3.2 + ufo: 1.1.1 + unimport: 3.0.6(rollup@2.79.1) + untyped: 1.3.2 + transitivePeerDependencies: + - rollup + - supports-color + dev: false + + /@nuxt/schema@3.4.1(rollup@3.20.2): + resolution: {integrity: sha512-xhPh9JfVKXRQVfdUT6BKieDTCljBjbIGgGCQnxplVi4FUTWRKUXR7MFwsobr5D9AJpeE0mg5/kRRh5gUX37vAQ==} + engines: {node: ^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0} + dependencies: + c12: 1.4.1 + create-require: 1.1.1 + defu: 6.1.2 + hookable: 5.5.3 + jiti: 1.18.2 + pathe: 1.1.0 + pkg-types: 1.0.2 + postcss-import-resolver: 2.0.0 + scule: 1.0.0 + std-env: 3.3.2 + ufo: 1.1.1 + unimport: 3.0.6(rollup@3.20.2) + untyped: 1.3.2 + transitivePeerDependencies: + - rollup + - supports-color + dev: true + /@nuxt/telemetry@2.2.0(rollup@2.79.1): resolution: {integrity: sha512-Z2UmPkBy5WjxvHKuUcl1X6vKWnIyWSP+9UGde1F+MzzZxYgAQybFud1uL2B3KCowxZdoqT1hd2WklV7EtyCwrQ==} hasBin: true @@ -2881,7 +2979,7 @@ packages: /@nuxtjs/color-mode@3.2.0(rollup@3.20.2): resolution: {integrity: sha512-isDR01yfadopiHQ/VEVUpyNSPrk5PCjUHS4t1qYRZwuRGefU4s9Iaxf6H9nmr1QFzoMgTm+3T0r/54jLwtpZbA==} dependencies: - '@nuxt/kit': 3.4.0(rollup@3.20.2) + '@nuxt/kit': 3.4.1(rollup@3.20.2) lodash.template: 4.5.0 pathe: 1.1.0 transitivePeerDependencies: @@ -2937,7 +3035,6 @@ packages: /@polka/url@1.0.0-next.21: resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} - dev: false /@popperjs/core@2.11.6: resolution: {integrity: sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==} @@ -4152,29 +4249,12 @@ packages: vite: 4.2.1(@types/node@18.15.3) vue: 3.2.45 - /@vitest/expect@0.29.8: - resolution: {integrity: sha512-xlcVXn5I5oTq6NiZSY3ykyWixBxr5mG8HYtjvpgg6KaqHm0mvhX18xuwl5YGxIRNt/A5jidd7CWcNHrSvgaQqQ==} - dependencies: - '@vitest/spy': 0.29.8 - '@vitest/utils': 0.29.8 - chai: 4.3.7 - dev: false - /@vitest/expect@0.30.1: resolution: {integrity: sha512-c3kbEtN8XXJSeN81iDGq29bUzSjQhjES2WR3aColsS4lPGbivwLtas4DNUe0jD9gg/FYGIteqOenfU95EFituw==} dependencies: '@vitest/spy': 0.30.1 '@vitest/utils': 0.30.1 chai: 4.3.7 - dev: true - - /@vitest/runner@0.29.8: - resolution: {integrity: sha512-FzdhnRDwEr/A3Oo1jtIk/B952BBvP32n1ObMEb23oEJNO+qO5cBet6M2XWIDQmA7BDKGKvmhUf2naXyp/2JEwQ==} - dependencies: - '@vitest/utils': 0.29.8 - p-limit: 4.0.0 - pathe: 1.1.0 - dev: false /@vitest/runner@0.30.1: resolution: {integrity: sha512-W62kT/8i0TF1UBCNMRtRMOBWJKRnNyv9RrjIgdUryEe0wNpGZvvwPDLuzYdxvgSckzjp54DSpv1xUbv4BQ0qVA==} @@ -4183,7 +4263,6 @@ packages: concordance: 5.0.4 p-limit: 4.0.0 pathe: 1.1.0 - dev: true /@vitest/snapshot@0.30.1: resolution: {integrity: sha512-fJZqKrE99zo27uoZA/azgWyWbFvM1rw2APS05yB0JaLwUIg9aUtvvnBf4q7JWhEcAHmSwbrxKFgyBUga6tq9Tw==} @@ -4191,38 +4270,22 @@ packages: magic-string: 0.30.0 pathe: 1.1.0 pretty-format: 27.5.1 - dev: true - - /@vitest/spy@0.29.8: - resolution: {integrity: sha512-VdjBe9w34vOMl5I5mYEzNX8inTxrZ+tYUVk9jxaZJmHFwmDFC/GV3KBFTA/JKswr3XHvZL+FE/yq5EVhb6pSAw==} - dependencies: - tinyspy: 1.1.1 - dev: false /@vitest/spy@0.30.1: resolution: {integrity: sha512-YfJeIf37GvTZe04ZKxzJfnNNuNSmTEGnla2OdL60C8od16f3zOfv9q9K0nNii0NfjDJRt/CVN/POuY5/zTS+BA==} dependencies: tinyspy: 2.1.0 - dev: true - /@vitest/ui@0.29.8: - resolution: {integrity: sha512-+vbLd+c1R/XUWfzJsWeyjeiw13fwJ95I5tguxaqXRg61y9iYUKesVljg7Pttp2uo7VK+kAjvY91J41NZ1Vx3vg==} + /@vitest/ui@0.30.1: + resolution: {integrity: sha512-Izz4ElDmdvX02KImSC2nCJI6CsGo9aETbKqxli55M0rbbPPAMtF0zDcJIqgEP5V6Y+4Ysf6wvsjLbLCTnaBvKw==} dependencies: + '@vitest/utils': 0.30.1 fast-glob: 3.2.12 + fflate: 0.7.4 flatted: 3.2.7 pathe: 1.1.0 picocolors: 1.0.0 sirv: 2.0.2 - dev: false - - /@vitest/utils@0.29.8: - resolution: {integrity: sha512-qGzuf3vrTbnoY+RjjVVIBYfuWMjn3UMUqyQtdGNZ6ZIIyte7B37exj6LaVkrZiUTvzSadVvO/tJm8AEgbGCBPg==} - dependencies: - cli-truncate: 3.1.0 - diff: 5.1.0 - loupe: 2.3.6 - pretty-format: 27.5.1 - dev: false /@vitest/utils@0.30.1: resolution: {integrity: sha512-/c8Xv2zUVc+rnNt84QF0Y0zkfxnaGhp87K2dYJMLtLOIckPzuxLVzAtFCicGFdB4NeBHNzTRr1tNn7rCtQcWFA==} @@ -4230,7 +4293,6 @@ packages: concordance: 5.0.4 loupe: 2.3.6 pretty-format: 27.5.1 - dev: true /@volar/language-core@1.3.0-alpha.0: resolution: {integrity: sha512-W3uMzecHPcbwddPu4SJpUcPakRBK/y/BP+U0U6NiPpUX1tONLC4yCawt+QBJqtgJ+sfD6ztf5PyvPL3hQRqfOA==} @@ -5506,7 +5568,6 @@ packages: /blueimp-md5@2.19.0: resolution: {integrity: sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==} - dev: true /blurhash@2.0.5: resolution: {integrity: sha512-cRygWd7kGBQO3VEhPiTgq4Wc43ctsM+o46urrmPOiuAe+07fzlSB9OJVdpgDL0jPqXUVQ9ht7aq7kxOeJHRK+w==} @@ -5602,6 +5663,23 @@ packages: transitivePeerDependencies: - supports-color + /c12@1.4.1: + resolution: {integrity: sha512-0x7pWfLZpZsgtyotXtuepJc0rZYE0Aw8PwNAXs0jSG9zq6Sl5xmbWnFqfmRY01ieZLHNbvneSFm9/x88CvzAuw==} + dependencies: + chokidar: 3.5.3 + defu: 6.1.2 + dotenv: 16.0.3 + giget: 1.1.2 + jiti: 1.18.2 + mlly: 1.2.0 + ohash: 1.1.1 + pathe: 1.1.0 + perfect-debounce: 0.1.3 + pkg-types: 1.0.2 + rc9: 2.1.0 + transitivePeerDependencies: + - supports-color + /cac@6.7.14: resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} engines: {node: '>=8'} @@ -5755,7 +5833,7 @@ packages: resolution: {integrity: sha512-p1dJO1Z995odIxdypzAykHIaUu+XnEvwYPSTyKJsbpL82o99sxN1G24tbecoMxTsV4PI+ZId82GJXRL2hhOeJA==} hasBin: true dependencies: - c12: 1.2.0 + c12: 1.4.1 consola: 2.15.3 convert-gitmoji: 0.1.3 execa: 6.1.0 @@ -5763,7 +5841,7 @@ packages: node-fetch-native: 1.1.0 pkg-types: 1.0.2 scule: 1.0.0 - semver: 7.4.0 + semver: 7.5.0 transitivePeerDependencies: - supports-color dev: true @@ -5890,6 +5968,7 @@ packages: dependencies: slice-ansi: 5.0.0 string-width: 5.1.2 + dev: true /cli-width@4.0.0: resolution: {integrity: sha512-ZksGS2xpa/bYkNzN3BAw1wEjsLV/ZKOf/CCrJ/QOBsxx6fOARIkwTutxp1XIOIohi6HKmOFjMoK/XaqDVUpEEw==} @@ -6005,7 +6084,6 @@ packages: md5-hex: 3.0.1 semver: 7.4.0 well-known-symbols: 2.0.0 - dev: true /config-chain@1.1.13: resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==} @@ -6020,6 +6098,9 @@ packages: /consola@3.0.1: resolution: {integrity: sha512-08E7bC2N6gaFdzPU/qtBi4ulVvJitYnfrDdxEiwElC3jSNICbOvkcE+8N56EfIrBoxp37O9Qnn5ZZPElov83UQ==} + /consola@3.1.0: + resolution: {integrity: sha512-rrrJE6rP0qzl/Srg+C9x/AE5Kxfux7reVm1Wh0wCjuXvih6DqZgqDZe8auTD28fzJ9TF0mHlSDrPpWlujQRo1Q==} + /console-control-strings@1.1.0: resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==} @@ -6217,7 +6298,6 @@ packages: engines: {node: '>=6'} dependencies: time-zone: 1.0.0 - dev: true /de-indent@1.0.2: resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==} @@ -7349,7 +7429,6 @@ packages: /fast-diff@1.2.0: resolution: {integrity: sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==} - dev: true /fast-glob@3.2.12: resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==} @@ -7379,6 +7458,9 @@ packages: node-domexception: 1.0.0 web-streams-polyfill: 3.2.1 + /fflate@0.7.4: + resolution: {integrity: sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw==} + /figures@5.0.0: resolution: {integrity: sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==} engines: {node: '>=14'} @@ -7772,6 +7854,16 @@ packages: merge2: 1.4.1 slash: 4.0.0 + /globby@13.1.4: + resolution: {integrity: sha512-iui/IiiW+QrJ1X1hKH5qwlMQyv34wJAYwH1vrf8b9kBA4sNiif3gKsMHa+BrdnOpEudWjpotfa7LrTzB1ERS/g==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dependencies: + dir-glob: 3.0.1 + fast-glob: 3.2.12 + ignore: 5.2.4 + merge2: 1.4.1 + slash: 4.0.0 + /gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} dependencies: @@ -7807,18 +7899,15 @@ packages: ufo: 1.1.1 uncrypto: 0.1.2 - /happy-dom@8.9.0: - resolution: {integrity: sha512-JZwJuGdR7ko8L61136YzmrLv7LgTh5b8XaEM3P709mLjyQuXJ3zHTDXvUtBBahRjGlcYW0zGjIiEWizoTUGKfA==} + /happy-dom@9.8.4: + resolution: {integrity: sha512-IB2glIailsAloOmTfRRQfpA3aW/bbhpdw9wX1CKvDrmj8tMVtdabjM+579YLdHpBXVyOku+p07+aea7TdnGnyw==} dependencies: css.escape: 1.5.1 he: 1.2.0 iconv-lite: 0.6.3 - node-fetch: 2.6.9 webidl-conversions: 7.0.0 whatwg-encoding: 2.0.0 whatwg-mimetype: 3.0.0 - transitivePeerDependencies: - - encoding dev: false /has-bigints@1.0.2: @@ -8320,6 +8409,7 @@ packages: /is-fullwidth-code-point@4.0.0: resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==} engines: {node: '>=12'} + dev: true /is-generator-function@1.0.10: resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==} @@ -8574,7 +8664,6 @@ packages: /js-string-escape@1.0.1: resolution: {integrity: sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==} engines: {node: '>= 0.8'} - dev: true /js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} @@ -9073,7 +9162,6 @@ packages: engines: {node: '>=8'} dependencies: blueimp-md5: 2.19.0 - dev: true /md5@2.3.0: resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==} @@ -9697,7 +9785,7 @@ packages: defu: 6.1.2 esbuild: 0.17.16 fs-extra: 11.1.1 - globby: 13.1.3 + globby: 13.1.4 jiti: 1.18.2 mlly: 1.2.0 mri: 1.2.0 @@ -9720,7 +9808,6 @@ packages: /mrmime@1.0.1: resolution: {integrity: sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==} engines: {node: '>=10'} - dev: false /ms@2.0.0: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} @@ -9897,7 +9984,7 @@ packages: nopt: 6.0.0 npmlog: 6.0.2 rimraf: 3.0.2 - semver: 7.4.0 + semver: 7.5.0 tar: 6.1.13 which: 2.0.2 transitivePeerDependencies: @@ -9938,7 +10025,7 @@ packages: dependencies: hosted-git-info: 6.1.1 is-core-module: 2.11.0 - semver: 7.4.0 + semver: 7.5.0 validate-npm-package-license: 3.0.4 dev: false @@ -9961,7 +10048,7 @@ packages: resolution: {integrity: sha512-SBU9oFglRVZnfElwAtF14NivyulDqF1VKqqwNsFW9HDcbHMAPHpRSsVFgKuwFGq/hVvWZExz62Th0kvxn/XE7Q==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} dependencies: - semver: 7.4.0 + semver: 7.5.0 dev: false /npm-normalize-package-bin@3.0.0: @@ -9975,7 +10062,7 @@ packages: dependencies: hosted-git-info: 6.1.1 proc-log: 3.0.0 - semver: 7.4.0 + semver: 7.5.0 validate-npm-package-name: 5.0.0 dev: false @@ -9993,7 +10080,7 @@ packages: npm-install-checks: 6.0.0 npm-normalize-package-bin: 3.0.0 npm-package-arg: 10.1.0 - semver: 7.4.0 + semver: 7.5.0 dev: false /npm-registry-fetch@14.0.3: @@ -10057,7 +10144,7 @@ packages: /nuxt-component-meta@0.5.1(rollup@3.20.2): resolution: {integrity: sha512-vwx5wySyVX+QbFrNb3wLYNMPlADho8E66MO45d5i5fTlEkmhopVpQ9YXwlAvM3pLCPjupxG3R3D5rKpLDeitkw==} dependencies: - '@nuxt/kit': 3.4.0(rollup@3.20.2) + '@nuxt/kit': 3.4.1(rollup@3.20.2) scule: 1.0.0 typescript: 5.0.4 vue-component-meta: 1.2.0(typescript@5.0.4) @@ -10069,7 +10156,7 @@ packages: /nuxt-config-schema@0.4.5(rollup@3.20.2): resolution: {integrity: sha512-Y5anu5puDfMJfDP7IYjXsn6Dvj262HtjZqa73jCBbFRCc5jnjrs+BEpJJmtPG32ZsqzO2+RL4oTNb3H6IfKZLQ==} dependencies: - '@nuxt/kit': 3.4.0(rollup@3.20.2) + '@nuxt/kit': 3.4.1(rollup@3.20.2) changelogen: 0.4.1 defu: 6.1.2 jiti: 1.18.2 @@ -10094,7 +10181,7 @@ packages: resolution: {integrity: sha512-KdhJAigBGTP8/YIFZ3orwetk40AgLq6VQ5HRYuDLmv5hiDptor9Ro+WIdZggHw7nciRxZvDdQkEwi9B5G/jrkQ==} dependencies: '@iconify/vue': 4.1.0(vue@3.2.45) - '@nuxt/kit': 3.4.0(rollup@3.20.2) + '@nuxt/kit': 3.4.1(rollup@3.20.2) nuxt-config-schema: 0.4.5(rollup@3.20.2) transitivePeerDependencies: - rollup @@ -10119,24 +10206,27 @@ packages: dev: false patched: true - /nuxt-vitest@0.6.9(@vue/compiler-dom@3.2.47)(rollup@2.79.1)(vite@4.2.1)(vue@3.2.45): - resolution: {integrity: sha512-IzR1NYSOGVqSW/9GD7fwB71V7TUO3uidvlnIuLC08nTPIuJNsN4eyVn0lobeELvsXQkaOJDAxkwA42Am4xGLJg==} + /nuxt-vitest@0.6.10(@vitejs/plugin-vue-jsx@3.0.1)(@vitejs/plugin-vue@4.1.0)(@vue/compiler-dom@3.2.47)(rollup@2.79.1)(vite@4.2.1)(vue@3.2.45): + resolution: {integrity: sha512-jkAx07lfLghk7Ca4yPkkWOodgH17verEXqCmps8UyDC3qDkFcxIJiJ8BImVz26XtYl0ONBFL0LqjIFKni9hDNw==} peerDependencies: + '@vitejs/plugin-vue': '*' + '@vitejs/plugin-vue-jsx': '*' vite: '*' dependencies: - '@nuxt/kit': 3.4.0(rollup@2.79.1) - '@vitest/ui': 0.29.8 + '@nuxt/kit': file:../nuxt/ecosystem-ci/workspace/nuxt/packages/kit(rollup@2.79.1) + '@vitejs/plugin-vue': 4.1.0(vite@4.2.1)(vue@3.2.45) + '@vitejs/plugin-vue-jsx': 3.0.1(vite@4.2.1)(vue@3.2.45) + '@vitest/ui': 0.30.1 get-port-please: 3.0.1 perfect-debounce: 0.1.3 std-env: 3.3.2 vite: 4.2.1(@types/node@18.15.3) - vitest: 0.29.8(@vitest/ui@0.29.8) - vitest-environment-nuxt: 0.6.9(@vue/compiler-dom@3.2.47)(rollup@2.79.1)(vitest@0.29.8)(vue@3.2.45) + vitest: 0.30.1(@vitest/ui@0.30.1) + vitest-environment-nuxt: 0.6.10(@vue/compiler-dom@3.2.47)(rollup@2.79.1)(vitest@0.30.1)(vue@3.2.45) transitivePeerDependencies: - '@edge-runtime/vm' - '@vitest/browser' - '@vue/compiler-dom' - - encoding - happy-dom - jsdom - less @@ -10379,6 +10469,9 @@ packages: /ohash@1.0.0: resolution: {integrity: sha512-kxSyzq6tt+6EE/xCnD1XaFhCCjUNUaz3X30rJp6mnjGLXAAvuPFqohMdv0aScWzajR45C29HyBaXZ8jXBwnh9A==} + /ohash@1.1.1: + resolution: {integrity: sha512-N9UDJn2IV6oO6pNclJ80tRXraNNJqw/asscr3Lu7+ibRQdEswejJuuXNclMQTJVTsVhQs+ZJThVziy6t2v2KXA==} + /on-finished@2.4.1: resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==} engines: {node: '>= 0.8'} @@ -11833,6 +11926,13 @@ packages: dependencies: lru-cache: 6.0.0 + /semver@7.5.0: + resolution: {integrity: sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==} + engines: {node: '>=10'} + hasBin: true + dependencies: + lru-cache: 6.0.0 + /send@0.18.0: resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} engines: {node: '>= 0.8.0'} @@ -11972,7 +12072,6 @@ packages: '@polka/url': 1.0.0-next.21 mrmime: 1.0.1 totalist: 3.0.0 - dev: false /sisteransi@1.0.5: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} @@ -12010,6 +12109,7 @@ packages: dependencies: ansi-styles: 6.2.1 is-fullwidth-code-point: 4.0.0 + dev: true /slimeform@0.9.1(vue@3.2.45): resolution: {integrity: sha512-14P7vyo1UN70o5+TlSsteceQ3J4flIUMPm9QLFeR6dFhtu+RYAVXvTFQ2Si2xO3vzeVP14TicXsvX1Sl7MX9EQ==} @@ -12490,7 +12590,6 @@ packages: /time-zone@1.0.0: resolution: {integrity: sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA==} engines: {node: '>=4'} - dev: true /tiny-decode@0.1.3: resolution: {integrity: sha512-1z+tXaZpPUyREOfjKDQj5lR6HfD6Pa4NF7pb/9ep7sP4+X5WF76bGdJktWCY1Rm+aMR46vJ75VAL/oAptpD1AA==} @@ -12512,15 +12611,9 @@ packages: resolution: {integrity: sha512-2ksntHOKf893wSAH4z/+JbPpi92esw8Gn9N2deXX+B0EO92hexAVI9GIZZPx7P5aYo5KULfeOSt3kMOmSOy6uA==} engines: {node: '>=14.0.0'} - /tinyspy@1.1.1: - resolution: {integrity: sha512-UVq5AXt/gQlti7oxoIg5oi/9r0WpF7DGEVwXgqWSMmyN16+e3tl5lIvTaOpJ3TAtu5xFzWccFRM4R5NaWHF+4g==} - engines: {node: '>=14.0.0'} - dev: false - /tinyspy@2.1.0: resolution: {integrity: sha512-7eORpyqImoOvkQJCSkL0d0mB4NHHIFAy4b1u8PHdDa7SjGS2njzl6/lyGoZLm+eyYEtlUmFGE0rFj66SWxZgQQ==} engines: {node: '>=14.0.0'} - dev: true /tinyws@0.1.0(ws@8.13.0): resolution: {integrity: sha512-6WQ2FlFM7qm6lAXxeKnzsAEfmnBHz5W5EwonNs52V0++YfK1IoCCAWM429afcChFE9BFrDgOFnq7ligaWMsa/A==} @@ -12560,7 +12653,6 @@ packages: /totalist@3.0.0: resolution: {integrity: sha512-eM+pCBxXO/njtF7vdFsHuqb+ElbxqtI4r5EAvk6grfAFyJ6IvWlSkfZ5T9ozC6xWw3Fj1fGoSmrl0gUs46JVIw==} engines: {node: '>=6'} - dev: false /tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} @@ -12730,7 +12822,7 @@ packages: consola: 2.15.3 defu: 6.1.2 esbuild: 0.17.16 - globby: 13.1.3 + globby: 13.1.4 hookable: 5.5.3 jiti: 1.18.2 magic-string: 0.29.0 @@ -12769,6 +12861,14 @@ packages: magic-string: 0.30.0 unplugin: 1.3.1 + /unctx@2.3.0: + resolution: {integrity: sha512-xs79V1T5JEQ/5aQ3j4ipbQEaReMosMz/ktOdsZMEtKv1PfbdRrKY/PaU0CxdspkX3zEink2keQU4nRzAXgui1A==} + dependencies: + acorn: 8.8.2 + estree-walker: 3.0.3 + magic-string: 0.30.0 + unplugin: 1.3.1 + /unenv@1.3.1: resolution: {integrity: sha512-4hTMiJf1TgQNnOsZxaI6XpCpVvOUNYLW3NxEkjdzXf+Dukys4b01AShapcXzKzvgoyoWByP3MLbg/CkzcKx+GA==} dependencies: @@ -13255,27 +13355,6 @@ packages: vfile-message: 3.1.3 dev: true - /vite-node@0.29.8(@types/node@18.15.3): - resolution: {integrity: sha512-b6OtCXfk65L6SElVM20q5G546yu10/kNrhg08afEoWlFRJXFq9/6glsvSVY+aI6YeC1tu2TtAqI2jHEQmOmsFw==} - engines: {node: '>=v14.16.0'} - hasBin: true - dependencies: - cac: 6.7.14 - debug: 4.3.4 - mlly: 1.2.0 - pathe: 1.1.0 - picocolors: 1.0.0 - vite: 4.2.1(@types/node@18.15.3) - transitivePeerDependencies: - - '@types/node' - - less - - sass - - stylus - - sugarss - - supports-color - - terser - dev: false - /vite-node@0.30.1(@types/node@18.15.3): resolution: {integrity: sha512-vTikpU/J7e6LU/8iM3dzBo8ZhEiKZEKRznEMm+mJh95XhWaPrJQraT/QsT2NWmuEf+zgAoMe64PKT7hfZ1Njmg==} engines: {node: '>=v14.18.0'} @@ -13442,95 +13521,29 @@ packages: optionalDependencies: fsevents: 2.3.2 - /vitest-environment-nuxt@0.6.9(@vue/compiler-dom@3.2.47)(rollup@2.79.1)(vitest@0.29.8)(vue@3.2.45): - resolution: {integrity: sha512-iymEP6sOy0lj/erhvo99dKMzPd4qOX6cv7FNcLTsu7oMEvn+NZH/C6dETUwQElSQgFEYJfPwz+sYCtYiIHfhMQ==} + /vitest-environment-nuxt@0.6.10(@vue/compiler-dom@3.2.47)(rollup@2.79.1)(vitest@0.30.1)(vue@3.2.45): + resolution: {integrity: sha512-22BvkJnLVDuMH65Rst3iLkUl69fKO9g7n5Ax2GDsl8NWZae7n9rRAGqVk2M5f5pRHdkhTyNGiChyvpYA8j2gCQ==} peerDependencies: - vitest: ^0.24.5 || ^0.26.0 || ^0.27.0 || ^0.28.0 || ^0.29.0 + vitest: ^0.24.5 || ^0.26.0 || ^0.27.0 || ^0.28.0 || ^0.29.0 || ^0.30.0 vue: ^3.2.45 dependencies: - '@nuxt/kit': 3.4.0(rollup@2.79.1) + '@nuxt/kit': 3.4.1(rollup@2.79.1) '@vue/test-utils': 2.2.8(@vue/compiler-dom@3.2.47)(vue@3.2.45) estree-walker: 3.0.3 h3: 1.6.4 - happy-dom: 8.9.0 + happy-dom: 9.8.4 magic-string: 0.30.0 ofetch: 1.0.1 unenv: 1.3.1 - vitest: 0.29.8(@vitest/ui@0.29.8) + vitest: 0.30.1(@vitest/ui@0.30.1) vue: 3.2.45 transitivePeerDependencies: - '@vue/compiler-dom' - - encoding - rollup - supports-color dev: false - /vitest@0.29.8(@vitest/ui@0.29.8): - resolution: {integrity: sha512-JIAVi2GK5cvA6awGpH0HvH/gEG9PZ0a/WoxdiV3PmqK+3CjQMf8c+J/Vhv4mdZ2nRyXFw66sAg6qz7VNkaHfDQ==} - engines: {node: '>=v14.16.0'} - hasBin: true - peerDependencies: - '@edge-runtime/vm': '*' - '@vitest/browser': '*' - '@vitest/ui': '*' - happy-dom: '*' - jsdom: '*' - playwright: '*' - safaridriver: '*' - webdriverio: '*' - peerDependenciesMeta: - '@edge-runtime/vm': - optional: true - '@vitest/browser': - optional: true - '@vitest/ui': - optional: true - happy-dom: - optional: true - jsdom: - optional: true - playwright: - optional: true - safaridriver: - optional: true - webdriverio: - optional: true - dependencies: - '@types/chai': 4.3.4 - '@types/chai-subset': 1.3.3 - '@types/node': 18.15.3 - '@vitest/expect': 0.29.8 - '@vitest/runner': 0.29.8 - '@vitest/spy': 0.29.8 - '@vitest/ui': 0.29.8 - '@vitest/utils': 0.29.8 - acorn: 8.8.2 - acorn-walk: 8.2.0 - cac: 6.7.14 - chai: 4.3.7 - debug: 4.3.4 - local-pkg: 0.4.3 - pathe: 1.1.0 - picocolors: 1.0.0 - source-map: 0.6.1 - std-env: 3.3.2 - strip-literal: 1.0.1 - tinybench: 2.4.0 - tinypool: 0.4.0 - tinyspy: 1.1.1 - vite: 4.2.1(@types/node@18.15.3) - vite-node: 0.29.8(@types/node@18.15.3) - why-is-node-running: 2.2.2 - transitivePeerDependencies: - - less - - sass - - stylus - - sugarss - - supports-color - - terser - dev: false - - /vitest@0.30.1: + /vitest@0.30.1(@vitest/ui@0.30.1): resolution: {integrity: sha512-y35WTrSTlTxfMLttgQk4rHcaDkbHQwDP++SNwPb+7H8yb13Q3cu2EixrtHzF27iZ8v0XCciSsLg00RkPAzB/aA==} engines: {node: '>=v14.18.0'} hasBin: true @@ -13568,6 +13581,7 @@ packages: '@vitest/runner': 0.30.1 '@vitest/snapshot': 0.30.1 '@vitest/spy': 0.30.1 + '@vitest/ui': 0.30.1 '@vitest/utils': 0.30.1 acorn: 8.8.2 acorn-walk: 8.2.0 @@ -13594,7 +13608,6 @@ packages: - sugarss - supports-color - terser - dev: true /vscode-jsonrpc@6.0.0: resolution: {integrity: sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==} @@ -13605,7 +13618,7 @@ packages: engines: {vscode: ^1.52.0} dependencies: minimatch: 3.1.2 - semver: 7.4.0 + semver: 7.5.0 vscode-languageserver-protocol: 3.16.0 /vscode-languageserver-protocol@3.16.0: @@ -13921,7 +13934,6 @@ packages: /well-known-symbols@2.0.0: resolution: {integrity: sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==} engines: {node: '>=6'} - dev: true /whatwg-encoding@2.0.0: resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==} @@ -14310,16 +14322,46 @@ packages: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} dev: true - github.com/tauri-apps/tauri-plugin-log/05a9bfd9edb9b5f4ab95412bb607691708b65a25: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/05a9bfd9edb9b5f4ab95412bb607691708b65a25} + file:../nuxt/ecosystem-ci/workspace/nuxt/packages/kit(rollup@2.79.1): + resolution: {directory: ../nuxt/ecosystem-ci/workspace/nuxt/packages/kit, type: directory} + id: file:../nuxt/ecosystem-ci/workspace/nuxt/packages/kit + name: '@nuxt/kit' + version: 3.4.1 + engines: {node: ^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0} + dependencies: + '@nuxt/schema': link:../schema + c12: 1.4.1 + consola: 3.1.0 + defu: 6.1.2 + globby: 13.1.4 + hash-sum: 2.0.0 + ignore: 5.2.4 + jiti: 1.18.2 + knitwork: 1.0.0 + lodash.template: 4.5.0 + mlly: 1.2.0 + pathe: 1.1.0 + pkg-types: 1.0.2 + scule: 1.0.0 + semver: 7.5.0 + unctx: 2.3.0 + unimport: 3.0.6(rollup@2.79.1) + untyped: 1.3.2 + transitivePeerDependencies: + - rollup + - supports-color + dev: false + + github.com/tauri-apps/tauri-plugin-log/36100c269e33ac91246b0a4bfadd18c1caee5296: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/36100c269e33ac91246b0a4bfadd18c1caee5296} name: tauri-plugin-log-api version: 0.0.0 dependencies: '@tauri-apps/api': 1.2.0 dev: false - github.com/tauri-apps/tauri-plugin-store/f0da2d1ac8370bd4cc7c1c0617175f0d5b5833a0: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/f0da2d1ac8370bd4cc7c1c0617175f0d5b5833a0} + github.com/tauri-apps/tauri-plugin-store/df267506bf12de451762f3f4b7f929ebed1421c9: + resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/df267506bf12de451762f3f4b7f929ebed1421c9} name: tauri-plugin-store-api version: 0.0.0 dependencies: From 6fc65178111d5d3724fe9eb461cb9cfb8b3bcbc2 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Thu, 20 Apr 2023 12:16:49 +0100 Subject: [PATCH 17/39] chore: fix lockfile --- pnpm-lock.yaml | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c34e4406..93ff7e0a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10213,7 +10213,7 @@ packages: '@vitejs/plugin-vue-jsx': '*' vite: '*' dependencies: - '@nuxt/kit': file:../nuxt/ecosystem-ci/workspace/nuxt/packages/kit(rollup@2.79.1) + '@nuxt/kit': 3.4.1(rollup@2.79.1) '@vitejs/plugin-vue': 4.1.0(vite@4.2.1)(vue@3.2.45) '@vitejs/plugin-vue-jsx': 3.0.1(vite@4.2.1)(vue@3.2.45) '@vitest/ui': 0.30.1 @@ -14322,36 +14322,6 @@ packages: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} dev: true - file:../nuxt/ecosystem-ci/workspace/nuxt/packages/kit(rollup@2.79.1): - resolution: {directory: ../nuxt/ecosystem-ci/workspace/nuxt/packages/kit, type: directory} - id: file:../nuxt/ecosystem-ci/workspace/nuxt/packages/kit - name: '@nuxt/kit' - version: 3.4.1 - engines: {node: ^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0} - dependencies: - '@nuxt/schema': link:../schema - c12: 1.4.1 - consola: 3.1.0 - defu: 6.1.2 - globby: 13.1.4 - hash-sum: 2.0.0 - ignore: 5.2.4 - jiti: 1.18.2 - knitwork: 1.0.0 - lodash.template: 4.5.0 - mlly: 1.2.0 - pathe: 1.1.0 - pkg-types: 1.0.2 - scule: 1.0.0 - semver: 7.5.0 - unctx: 2.3.0 - unimport: 3.0.6(rollup@2.79.1) - untyped: 1.3.2 - transitivePeerDependencies: - - rollup - - supports-color - dev: false - github.com/tauri-apps/tauri-plugin-log/36100c269e33ac91246b0a4bfadd18c1caee5296: resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-log/tar.gz/36100c269e33ac91246b0a4bfadd18c1caee5296} name: tauri-plugin-log-api From 6f19d54586370c8b9bb3eca82cab59ee4c1fe2c0 Mon Sep 17 00:00:00 2001 From: patak Date: Fri, 21 Apr 2023 15:15:40 +0200 Subject: [PATCH 18/39] chore: release v0.8.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4a57483e..6f1ace4c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@elk-zone/elk", "type": "module", - "version": "0.8.0", + "version": "0.8.1", "packageManager": "pnpm@8.2.0", "license": "MIT", "homepage": "https://elk.zone/", From ce149e4cb4d3429d8624b399ddcc27f37108ee29 Mon Sep 17 00:00:00 2001 From: patak Date: Fri, 21 Apr 2023 21:35:39 +0200 Subject: [PATCH 19/39] fix: notification with null status should be excluded Fixes #1995 --- components/notification/NotificationPaginator.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/components/notification/NotificationPaginator.vue b/components/notification/NotificationPaginator.vue index 2385e043..65fc142f 100644 --- a/components/notification/NotificationPaginator.vue +++ b/components/notification/NotificationPaginator.vue @@ -75,7 +75,12 @@ function groupItems(items: mastodon.v1.Notification[]): NotificationSlot[] { } return } - else if (group.length && group[0].status && (group[0].type === 'reblog' || group[0].type === 'favourite')) { + else if (group.length && (group[0].type === 'reblog' || group[0].type === 'favourite')) { + if (!group[0].status) { + // Ignore favourite or reblog if status is null, sometimes the API is sending these + // notifications + return + } // All notifications in these group are reblogs or favourites of the same status const likes: GroupedAccountLike[] = [] for (const notification of group) { From bda18e7ac5347b5cbb086e16ebb4d2bd161fe016 Mon Sep 17 00:00:00 2001 From: patak Date: Fri, 21 Apr 2023 21:38:45 +0200 Subject: [PATCH 20/39] chore: use "boosted" instead of "reblogged" --- locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en.json b/locales/en.json index 26457e6e..0a2ae179 100644 --- a/locales/en.json +++ b/locales/en.json @@ -293,7 +293,7 @@ "followed_you": "followed you", "followed_you_count": "{0} people followed you|{0} person followed you|{0} people followed you", "missing_type": "MISSING notification.type:", - "reblogged_post": "reblogged your post", + "reblogged_post": "boosted your post", "request_to_follow": "requested to follow you", "signed_up": "signed up", "update_status": "updated their post" From dbbbe8aa01c8a7910a56c7e777ea99273e6a3773 Mon Sep 17 00:00:00 2001 From: Tuur Martens Date: Sat, 22 Apr 2023 12:41:27 +0200 Subject: [PATCH 21/39] feat: improve personal notes (#1978) --- components/account/AccountHeader.vue | 42 ++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/components/account/AccountHeader.vue b/components/account/AccountHeader.vue index ffe610b8..b1d63781 100644 --- a/components/account/AccountHeader.vue +++ b/components/account/AccountHeader.vue @@ -81,6 +81,8 @@ watchEffect(() => { iconFields.value = icons }) +const personalNoteDraft = ref(relationship?.note ?? '') + async function editNote(event: Event) { if (!event.target || !('value' in event.target) || !relationship) return @@ -92,10 +94,13 @@ async function editNote(event: Event) { const newNoteApiResult = await client.v1.accounts.createNote(account.id, { comment: newNote }) relationship.note = newNoteApiResult.note + personalNoteDraft.value = relationship.note ?? '' } const isSelf = $(useSelfAccount(() => account)) const isNotifiedOnPost = $computed(() => !!relationship?.notifying) + +const personalNoteMaxLength = 2000