Merge branch 'main' into shuuji3/fix/github-preview-card

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
       # ref. `pnpm@10.1.0` / `pnpm@9.15.4` cannot be installed due to key id mismatch · Issue #612 · nodejs/corepack
       # - https://github.com/nodejs/corepack/issues/612#issuecomment-2629496091
       - run: npm i -g corepack@latest && corepack enable
-      - uses: actions/setup-node@v4.1.0
+      - uses: actions/setup-node@v4.2.0
 
       - name: 📦 Install dependencies
         run: pnpm install --frozen-lockfile

components/modal/ModalConfirm.vue

@@ -40,7 +40,7 @@ function handleChoice(choice: ConfirmDialogChoice['choice']) {
     </div>
     <div v-if="isMute" flex-col flex gap-4>
       <CommonCheckbox v-model="hasDuration" :label="$t('confirm.mute_account.specify_duration')" prepend-checkbox checked-icon-color="text-primary" />
-      <DurationPicker v-if="hasDuration" v-model="duration" v-model:is-valid="isValidDuration" />
+      <ModalDurationPicker v-if="hasDuration" v-model="duration" v-model:is-valid="isValidDuration" />
       <CommonCheckbox v-model="shouldMuteNotifications" :label="$t('confirm.mute_account.notifications')" prepend-checkbox checked-icon-color="text-primary" />
     </div>
 

components/status/StatusPreviewCardNormal.vue

@@ -109,7 +109,7 @@ function loadAttachment() {
       <StatusPreviewCardInfo :p="isSquare ? 'x-4' : '4'" :root="root" :card="card" :provider="providerName" />
     </div>
     <StatusPreviewCardMoreFromAuthor
-      v-if="card?.authors?.[0].account"
+      v-if="card?.authors?.[0]?.account"
       :account="card.authors[0].account"
     />
   </NuxtLink>

composables/tiptap/shiki-parser.ts

@@ -1,5 +1,6 @@
+import type { Parser } from 'prosemirror-highlight/shiki'
 import type { BuiltinLanguage } from 'shiki'
-import { createParser, type Parser } from 'prosemirror-highlight/shiki'
+import { createParser } from 'prosemirror-highlight/shiki'
 
 let parser: Parser | undefined
 

locales/de-DE.json

@@ -86,6 +86,9 @@
     "switch_account": "Account wechseln",
     "vote": "Abstimmen"
   },
+  "actions": {
+    "more": "Mehr"
+  },
   "app_desc_short": "Ein flinker Mastodon Web-Client",
   "app_logo": "Elk Logo",
   "app_name": "Elk",
@@ -654,6 +657,10 @@
     "list": "Liste",
     "media": "Medien",
     "news": "Nachrichten",
+    "notifications_admin": {
+      "report": "Meldung",
+      "sign_up": "Registrierung"
+    },
     "notifications_all": "Alle",
     "notifications_favourite": "Favorisiert",
     "notifications_follow": "Folgen",
@@ -722,6 +729,7 @@
     "change_content_visibility": "Sichtbarkeit von Inhalten ändern",
     "change_language": "Sprache ändern",
     "emoji": "Emoji",
+    "emojis": "Emojis",
     "explore_links_intro": "Diese Nachrichten werden gerade von Leuten auf diesem und anderen Servern des dezentralen Netzwerks besprochen.",
     "explore_posts_intro": "Diese Beiträge von diesem Server gewinnen gerade unter den Leuten von diesem und anderen Servern des dezentralen Netzwerks an Reichweite.",
     "explore_tags_intro": "Diese Hashtags gewinnen gerade unter den Leuten von diesem und anderen Servern des dezentralen Netzweks an Reichweite.",

locales/it-IT.json

@@ -639,7 +639,8 @@
     "poll": {
       "count": "{0} voti|{0} voto|{0} voti",
       "ends": "termina {0}",
-      "finished": "terminato {0}"
+      "finished": "terminato {0}",
+      "update": "Aggiorna sondaggio"
     },
     "replying_to": "In risposta a {0}",
     "show_full_thread": "Mostra discussione",
@@ -749,7 +750,7 @@
     "add_existing": "Aggiungi account esistente",
     "server_address_label": "Indirizzo istanza Mastodon",
     "sign_in_desc": "Accedi per seguire profili o hashtag, apprezzare, condividere e rispondere a post o interagire dal tuo account su un'altra istanza.",
-    "sign_in_notice_title": "Visualizzando {0} dati pubblici",
+    "sign_in_notice_title": "Visualizzando i dati pubblici di {0}",
     "sign_out_account": "Esci {0}",
     "single_instance_sign_in_desc": "Accedi per seguire profili o hastag, apprezzare condividere o rispondere a post.",
     "tip_no_account": "Se ancora non hai un account Mastodon, {0}.",

modules/pwa/index.ts

@@ -1,6 +1,7 @@
 import type { Buffer } from 'node:buffer'
 import type { Plugin } from 'vite'
 import type { VitePluginPWAAPI } from 'vite-plugin-pwa'
+import type { LocalizedWebManifest } from './i18n'
 import type { VitePWANuxtOptions } from './types'
 import { mkdir, readFile, writeFile } from 'node:fs/promises'
 import { dirname } from 'node:path'
@@ -9,7 +10,7 @@ import { addPlugin, createResolver, defineNuxtModule } from '@nuxt/kit'
 import { join, resolve } from 'pathe'
 import { VitePWA } from 'vite-plugin-pwa'
 import { configurePWAOptions } from './config'
-import { createI18n, type LocalizedWebManifest, pwaLocales } from './i18n'
+import { createI18n, pwaLocales } from './i18n'
 
 export * from './types'
 

package.json

@@ -2,7 +2,7 @@
   "name": "@elk-zone/elk",
   "type": "module",
   "version": "0.16.0",
-  "packageManager": "pnpm@9.15.4",
+  "packageManager": "pnpm@9.15.5+sha512.845196026aab1cc3f098a0474b64dfbab2afe7a1b4e91dd86895d8e4aa32a7a6d03049e2d0ad770bbe4de023a7122fb68c1a1d6e0d033c7076085f9d5d4800d4",
   "license": "MIT",
   "homepage": "https://elk.zone/",
   "main": "./nuxt.config.ts",
@@ -90,12 +90,12 @@
     "page-lifecycle": "^0.1.2",
     "pinia": "^2.2.6",
     "postcss-nested": "^7.0.0",
-    "prosemirror-highlight": "^0.11.0",
+    "prosemirror-highlight": "^0.12.0",
     "rollup-plugin-node-polyfills": "^0.2.1",
     "shiki": "^1.22.2",
     "simple-git": "^3.19.1",
     "slimeform": "^0.10.0",
-    "stale-dep": "^0.7.0",
+    "stale-dep": "^0.8.0",
     "std-env": "^3.7.0",
     "string-length": "^5.0.1",
     "tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log",
@@ -114,9 +114,9 @@
     "ws": "^8.15.1"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^3.14.0",
-    "@antfu/ni": "^0.23.2",
-    "@types/chroma-js": "^2.4.5",
+    "@antfu/eslint-config": "^4.1.1",
+    "@antfu/ni": "^23.3.1",
+    "@types/chroma-js": "^3.1.1",
     "@types/file-saver": "^2.0.7",
     "@types/fnando__sparkline": "^0.3.7",
     "@types/fs-extra": "^11.0.4",
@@ -126,9 +126,9 @@
     "@unlazy/nuxt": "^0.12.1",
     "@unocss/eslint-config": "^65.4.3",
     "@vue/test-utils": "2.4.6",
-    "bumpp": "^9.10.2",
+    "bumpp": "^10.0.1",
     "consola": "^3.4.0",
-    "eslint": "^9.18.0",
+    "eslint": "^9.19.0",
     "eslint-plugin-format": "^1.0.1",
     "flat": "^6.0.1",
     "fs-extra": "^11.3.0",
@@ -140,7 +140,7 @@
     "simple-git-hooks": "^2.11.1",
     "tsx": "^4.19.2",
     "typescript": "^5.4.4",
-    "vitest": "2.1.8",
+    "vitest": "3.0.5",
     "vue-tsc": "^2.1.6"
   },
   "pnpm": {
@@ -151,7 +151,7 @@
   "resolutions": {
     "nuxt-component-meta": "0.10.0",
     "unstorage": "^1.14.4",
-    "vitest": "2.1.8",
+    "vitest": "3.0.5",
     "vue": "^3.5.4"
   },
   "simple-git-hooks": {

utils/elk-idb.ts

@@ -1,10 +1,11 @@
+import type { UseStore } from 'idb-keyval'
 import {
   del as delIdb,
   get as getIdb,
   promisifyRequest,
   set as setIdb,
   update as updateIdb,
-  type UseStore,
+
 } from 'idb-keyval'
 
 const databases: IDBOpenDBRequest[] = []