fix: top level await (chrome 129) (#2970)

composables/idb/index.ts

@@ -9,6 +9,7 @@ export async function useAsyncIDBKeyval<T>(
   key: IDBValidKey,
   initialValue: MaybeRefOrGetter<T>,
   options: UseIDBOptions = {},
+  source?: Ref<T>,
 ): Promise<RemovableRef<T>> {
   const {
     flush = 'pre',
@@ -19,7 +20,7 @@ export async function useAsyncIDBKeyval<T>(
     },
   } = options
 
-  const data = (shallow ? shallowRef : ref)(initialValue) as Ref<T>
+  const data = source ?? (shallow ? shallowRef : ref)(initialValue) as Ref<T>
 
   const rawInit: T = toValue<T>(initialValue)
 

composables/users.ts

@@ -12,37 +12,12 @@ import {
   STORAGE_KEY_NOTIFICATION,
   STORAGE_KEY_NOTIFICATION_POLICY,
   STORAGE_KEY_SERVERS,
-  STORAGE_KEY_USERS,
 } from '~/constants'
 import type { PushNotificationPolicy, PushNotificationRequest } from '~/composables/push-notifications/types'
-import { useAsyncIDBKeyval } from '~/composables/idb'
 
 const mock = process.mock
 
-function initializeUsers(): Promise<Ref<UserLogin[]> | RemovableRef<UserLogin[]>> | Ref<UserLogin[]> | RemovableRef<UserLogin[]> {
-  let defaultUsers = mock ? [mock.user] : []
-
-  // Backward compatibility with localStorage
-  let removeUsersOnLocalStorage = false
-  if (globalThis?.localStorage) {
-    const usersOnLocalStorageString = globalThis.localStorage.getItem(STORAGE_KEY_USERS)
-    if (usersOnLocalStorageString) {
-      defaultUsers = JSON.parse(usersOnLocalStorageString)
-      removeUsersOnLocalStorage = true
-    }
-  }
-
-  const users = import.meta.server
-    ? ref<UserLogin[]>(defaultUsers)
-    : useAsyncIDBKeyval<UserLogin[]>(STORAGE_KEY_USERS, defaultUsers, { deep: true })
-
-  if (removeUsersOnLocalStorage)
-    globalThis.localStorage.removeItem(STORAGE_KEY_USERS)
-
-  return users
-}
-
-const users = import.meta.server ? initializeUsers() as Ref<UserLogin[]> | RemovableRef<UserLogin[]> : await initializeUsers()
+const users: Ref<UserLogin[]> | RemovableRef<UserLogin[]> = import.meta.server ? ref<UserLogin[]>([]) : ref<UserLogin[]>([]) as RemovableRef<UserLogin[]>
 const nodes = useLocalStorage<Record<string, any>>(STORAGE_KEY_NODES, {}, { deep: true })
 const currentUserHandle = useLocalStorage<string>(STORAGE_KEY_CURRENT_USER_HANDLE, mock ? mock.user.account.id : '')
 export const instanceStorage = useLocalStorage<Record<string, mastodon.v1.Instance>>(STORAGE_KEY_SERVERS, mock ? mock.server : {}, { deep: true })

package.json

@@ -37,7 +37,7 @@
     "@iconify-emoji/twemoji": "^1.0.2",
     "@iconify/json": "^2.2.170",
     "@iconify/utils": "^2.1.22",
-    "@nuxt/devtools": "^1.4.2",
+    "@nuxt/devtools": "^1.5.0",
     "@nuxt/test-utils": "^3.14.2",
     "@nuxtjs/color-mode": "^3.4.4",
     "@nuxtjs/i18n": "^8.5.3",

plugins/0.setup-users.ts

@@ -0,0 +1,34 @@
+import { useAsyncIDBKeyval } from '~/composables/idb'
+import type { UserLogin } from '~/types'
+import { STORAGE_KEY_USERS } from '~/constants'
+
+const mock = process.mock
+
+export default defineNuxtPlugin({
+  parallel: import.meta.server,
+  async setup() {
+    const users = useUsers()
+
+    let defaultUsers = mock ? [mock.user] : []
+
+    // Backward compatibility with localStorage
+    let removeUsersOnLocalStorage = false
+    if (globalThis?.localStorage) {
+      const usersOnLocalStorageString = globalThis.localStorage.getItem(STORAGE_KEY_USERS)
+      if (usersOnLocalStorageString) {
+        defaultUsers = JSON.parse(usersOnLocalStorageString)
+        removeUsersOnLocalStorage = true
+      }
+    }
+
+    if (import.meta.server) {
+      users.value = defaultUsers
+    }
+    if (import.meta.client) {
+      await useAsyncIDBKeyval<UserLogin[]>(STORAGE_KEY_USERS, defaultUsers, { deep: true }, users)
+    }
+
+    if (removeUsersOnLocalStorage)
+      globalThis.localStorage.removeItem(STORAGE_KEY_USERS)
+  },
+})