chore: update nuxt to v3.9.3 and vue 3.4.15

components/account/AccountHoverWrapper.vue

@@ -11,7 +11,7 @@ const props = defineProps<{
   disabled?: boolean
 }>()
 
-const account = computed(() => props.account || (props.handle ? useAccountByHandle(props.handle!) : undefined))
+const account = computed(() => props.account || (props.handle ? useAccountByHandle(props.handle!)?.value : undefined))
 const userSettings = useUserSettings()
 </script>
 

components/common/CommonPaginator.vue

@@ -96,8 +96,8 @@ defineExpose({ createEntry, removeEntry, updateEntry })
       </template>
       <template v-else>
         <slot
-          v-for="item, index of items"
-          v-bind="{ key: item[keyProp as keyof U] }"
+          v-for="(item, index) of items"
+          v-bind="{ key: (item as U)[keyProp as keyof U] }"
           :item="item as U"
           :older="items[index + 1] as U"
           :newer="items[index - 1] as U"

composables/content-parse.ts

@@ -72,6 +72,8 @@ const sanitizer = sanitize({
 /**
  * Parse raw HTML form Mastodon server to AST,
  * with interop of custom emojis and inline Markdown syntax
+ * @param html
+ * @param options
  */
 export function parseMastodonHTML(
   html: string,
@@ -140,6 +142,8 @@ export function parseMastodonHTML(
 
 /**
  * Converts raw HTML form Mastodon server to HTML for Tiptap editor
+ * @param html
+ * @param customEmojis
  */
 export function convertMastodonHTML(html: string, customEmojis: Record<string, mastodon.v1.CustomEmoji> = {}) {
   const tree = parseMastodonHTML(html, {

composables/paginator.ts

@@ -122,6 +122,7 @@ export function usePaginator<T, P, U = T>(
         )
           loadNext()
       },
+      { immediate: true, flush: 'post' },
     )
   }
 

composables/settings/storage.ts

@@ -1,14 +1,12 @@
 import type { Ref } from 'vue'
-import type { VueI18n } from 'vue-i18n'
 import type { LocaleObject } from 'vue-i18n-routing'
 import type { FontSize, OldFontSize, PreferencesSettings, UserSettings } from './definition'
 import { STORAGE_KEY_SETTINGS } from '~/constants'
 import { oldFontSizeMap } from '~~/constants/options'
 
 export function useUserSettings() {
-  const i18n = useNuxtApp().vueApp.config.globalProperties.$i18n as VueI18n
-  const { locales } = i18n
-  const supportLanguages = (locales as LocaleObject[]).map(locale => locale.code)
+  const { locales } = useNuxtApp().$i18n
+  const supportLanguages = (unref(locales) as LocaleObject[]).map(locale => locale.code)
   const settingsStorage = useUserLocalStorage<UserSettings>(STORAGE_KEY_SETTINGS, () => getDefaultUserSettings(supportLanguages))
 
   // Backward compatibility, font size was xs, sm, md, lg, xl before

composables/tiptap/shikiji-parser.ts

@@ -1,13 +1,13 @@
 import { type Parser, createParser } from 'prosemirror-highlight/shikiji'
-import type { BuiltinLanguage } from 'shikiji/langs'
+import type { BundledLanguage } from 'shikiji/langs'
 
 let parser: Parser | undefined
 
 export const shikijiParser: Parser = (options) => {
   const lang = options.language ?? 'text'
 
   // Register the language if it's not yet registered
-  const { highlighter, promise } = useHighlighter(lang as BuiltinLanguage)
+  const { highlighter, promise } = useHighlighter(lang as BundledLanguage)
 
   // If the highlighter or the language is not available, return a promise that
   // will resolve when it's ready. When the promise resolves, the editor will

composables/users.ts

@@ -172,24 +172,27 @@ export async function loginTo(masto: ElkMasto, user: Overwrite<UserLogin, { acco
 const accountPreferencesMap = new Map<string, Partial<mastodon.v1.Preference>>()
 
 /**
+ * @param account
  * @returns `true` when user ticked the preference to always expand posts with content warnings
  */
 export function getExpandSpoilersByDefault(account: mastodon.v1.AccountCredentials) {
   return accountPreferencesMap.get(account.acct)?.['reading:expand:spoilers'] ?? false
 }
 
 /**
+ * @param account
  * @returns `true` when user selected "Always show media" as Media Display preference
  */
 export function getExpandMediaByDefault(account: mastodon.v1.AccountCredentials) {
   return accountPreferencesMap.get(account.acct)?.['reading:expand:media'] === 'show_all' ?? false
 }
 
 /**
+ * @param account
  * @returns `true` when user selected "Always hide media" as Media Display preference
  */
 export function getHideMediaByDefault(account: mastodon.v1.AccountCredentials) {
-  return accountPreferencesMap.get(account.acct)?.['reading:expand:media'] === 'hide_all' ?? false
+  return (accountPreferencesMap.get(account.acct)?.['reading:expand:media'] === 'hide_all') ?? false
 }
 
 export async function fetchAccountInfo(client: mastodon.Client, server: string) {
@@ -336,6 +339,8 @@ interface UseUserLocalStorageCache {
 
 /**
  * Create reactive storage for the current user
+ * @param key
+ * @param initial
  */
 export function useUserLocalStorage<T extends object>(key: string, initial: () => T): Ref<T> {
   if (process.server || process.test)
@@ -382,6 +387,7 @@ export function useUserLocalStorage<T extends object>(key: string, initial: () =
 
 /**
  * Clear all storages for the given account
+ * @param account
  */
 export function clearUserLocalStorage(account?: mastodon.v1.Account) {
   if (!account)

config/i18n.config.ts

@@ -0,0 +1,20 @@
+import {
+  currentLocales,
+  datetimeFormats,
+  numberFormats,
+  pluralRules,
+} from './i18n'
+
+export default defineI18nConfig(() => {
+  return {
+    legacy: false,
+    availableLocales: currentLocales.map(l => l.code),
+    fallbackLocale: 'en-US',
+    fallbackWarn: true,
+    missingWarn: true,
+    datetimeFormats,
+    numberFormats,
+    // eslint-disable-next-line @typescript-eslint/comma-dangle
+    pluralRules
+  }
+})

config/i18n.ts

@@ -1,4 +1,3 @@
-import type { NuxtI18nOptions } from '@nuxtjs/i18n'
 import type { DateTimeFormats, NumberFormats, PluralizationRule, PluralizationRules } from '@intlify/core-base'
 
 import type { LocaleObject } from '#i18n'
@@ -256,7 +255,7 @@ function buildLocales() {
 
 export const currentLocales = buildLocales()
 
-const datetimeFormats = Object.values(currentLocales).reduce((acc, data) => {
+export const datetimeFormats = Object.values(currentLocales).reduce((acc, data) => {
   const dateTimeFormats = data.dateTimeFormats
   if (dateTimeFormats) {
     acc[data.code] = { ...dateTimeFormats }
@@ -281,7 +280,7 @@ const datetimeFormats = Object.values(currentLocales).reduce((acc, data) => {
   return acc
 }, <DateTimeFormats>{})
 
-const numberFormats = Object.values(currentLocales).reduce((acc, data) => {
+export const numberFormats = Object.values(currentLocales).reduce((acc, data) => {
   const numberFormats = data.numberFormats
   if (numberFormats) {
     acc[data.code] = { ...numberFormats }
@@ -313,7 +312,7 @@ const numberFormats = Object.values(currentLocales).reduce((acc, data) => {
   return acc
 }, <NumberFormats>{})
 
-const pluralRules = Object.values(currentLocales).reduce((acc, data) => {
+export const pluralRules = Object.values(currentLocales).reduce((acc, data) => {
   const pluralRule = data.pluralRule
   if (pluralRule) {
     acc[data.code] = pluralRule
@@ -322,21 +321,3 @@ const pluralRules = Object.values(currentLocales).reduce((acc, data) => {
 
   return acc
 }, <PluralizationRules>{})
-
-export const i18n: NuxtI18nOptions = {
-  locales: currentLocales,
-  lazy: true,
-  strategy: 'no_prefix',
-  detectBrowserLanguage: false,
-  langDir: 'locales',
-  defaultLocale: 'en-US',
-  vueI18n: {
-    availableLocales: currentLocales.map(l => l.code),
-    fallbackLocale: 'en-US',
-    fallbackWarn: false,
-    missingWarn: false,
-    datetimeFormats,
-    numberFormats,
-    pluralRules,
-  },
-}

docs/package.json

@@ -9,10 +9,10 @@
     "preview": "nuxi preview"
   },
   "dependencies": {
-    "theme-colors": "^0.0.5"
+    "theme-colors": "^0.1.0"
   },
   "devDependencies": {
-    "@nuxt-themes/docus": "^1.14.6",
-    "nuxt": "^3.7.0"
+    "@nuxt-themes/docus": "^1.15.0",
+    "nuxt": "^3.9.0"
   }
 }

emoji-mart-traslation.d.ts

@@ -1,3 +1,3 @@
 declare module 'virtual:emoji-mart-lang-importer' {
-    export default function(lang: string): Promise<any>
+  export default function (lang: string): Promise<any>
 }

modules/emoji-mart-translation.ts

@@ -1,7 +1,6 @@
 import fs from 'fs-extra'
 import { createResolver, defineNuxtModule } from '@nuxt/kit'
-import { i18n } from '../config/i18n'
-import type { LocaleObject } from '#i18n'
+import { currentLocales } from '../config/i18n'
 
 const virtual = 'virtual:emoji-mart-lang-importer'
 const resolvedVirtual = `\0${virtual}.mjs`
@@ -25,7 +24,7 @@ export default defineNuxtModule({
           if (id === resolvedVirtual) {
             const locales = await Promise.all(
               Array
-                .from(new Set((i18n.locales as LocaleObject[]).map(l => l.code.split('-')[0])))
+                .from(new Set((currentLocales).map(l => l.code.split('-')[0])))
                 .map(async (l) => {
                   const exists = await isFile(resolver.resolve(`../node_modules/@emoji-mart/data/i18n/${l}.json`))
                   return [l, exists] as [code: string, exists: boolean]

modules/pwa/i18n.ts

@@ -3,12 +3,11 @@ import { readFile } from 'fs-extra'
 import { createResolver } from '@nuxt/kit'
 import type { ManifestOptions } from 'vite-plugin-pwa'
 import { getEnv } from '../../config/env'
-import { i18n } from '../../config/i18n'
-import type { LocaleObject } from '#i18n'
+import { currentLocales } from '../../config/i18n'
 
 export type LocalizedWebManifest = Record<string, Partial<ManifestOptions>>
 
-export const pwaLocales = i18n.locales as LocaleObject[]
+export const pwaLocales = currentLocales
 
 type WebManifestEntry = Pick<ManifestOptions, 'name' | 'short_name' | 'description' | 'screenshots' | 'shortcuts'>
 type RequiredWebManifestEntry = Required<WebManifestEntry & Pick<ManifestOptions, 'dir' | 'lang' | 'screenshots' | 'shortcuts'>>

nuxt.config.ts

@@ -1,9 +1,9 @@
 import { createResolver, useNuxt } from '@nuxt/kit'
 import { isCI, isDevelopment, isWindows } from 'std-env'
 import { isPreview } from './config/env'
-import { i18n } from './config/i18n'
 import { pwa } from './config/pwa'
 import type { BuildInfo } from './types'
+import { currentLocales } from './config/i18n'
 
 const { resolve } = createResolver(import.meta.url)
 
@@ -44,9 +44,14 @@ export default defineNuxtConfig({
   devtools: {
     enabled: true,
   },
+  features: {
+    inlineStyles: false,
+  },
+  /* future: {
+    typescriptBundlerResolution: true,
+  }, */
   experimental: {
     payloadExtraction: false,
-    inlineSSRStyles: false,
     renderJsonPayloads: true,
   },
   css: [
@@ -84,6 +89,17 @@ export default defineNuxtConfig({
     build: {
       target: 'esnext',
     },
+    optimizeDeps: {
+      include: [
+        '@vueuse/integrations/useFocusTrap', 'browser-fs-access', 'file-saver', 'slimeform', 'iso-639-1', '@tiptap/vue-3', 'string-length',
+        'vue-advanced-cropper', 'github-reserved-names', 'emoji-mart', '@tiptap/extension-placeholder',
+        '@tiptap/extension-document', '@tiptap/extension-paragraph', '@tiptap/extension-text',
+        '@tiptap/extension-mention', '@tiptap/extension-hard-break', '@tiptap/extension-bold',
+        '@tiptap/extension-italic', '@tiptap/extension-code', '@tiptap/extension-history',
+        'prosemirror-state', '@tiptap/core', '@tiptap/extension-code-block', 'prosemirror-highlight',
+        'tippy.js', 'prosemirror-highlight/shikiji',
+      ],
+    },
   },
   postcss: {
     plugins: {
@@ -256,7 +272,15 @@ export default defineNuxtConfig({
     rateLimiter: false,
   },
   colorMode: { classSuffix: '' },
-  i18n,
+  i18n: {
+    locales: currentLocales,
+    lazy: true,
+    strategy: 'no_prefix',
+    detectBrowserLanguage: false,
+    langDir: 'locales',
+    defaultLocale: 'en-US',
+    vueI18n: './config/i18n.config.ts',
+  },
   pwa,
   staleDep: {
     packageManager: 'pnpm',