cleanup

store/index.js

@@ -1,6 +1,19 @@
 import { createStore } from 'zustand/vanilla'
-import { persist } from 'zustand/middleware'
-import { idbStorage } from './middleware/persistence.js'
+import { persist, createJSONStorage } from 'zustand/middleware'
+import { get, set } from 'idb-keyval'
+
+const storage = createJSONStorage(() => ({
+  getItem: async (name) => {
+    const value = await get(name)
+    return value ?? null
+  },
+  setItem: async (name, value) => {
+    await set(name, value)
+  },
+  removeItem: async (name) => {
+    await del(name)
+  },
+}))
 
 export const store = createStore(
   persist(
@@ -16,9 +29,13 @@ export const store = createStore(
     }),
     {
       name: 'app-store',
-      storage: idbStorage,
-      onRehydrateStorage: () => (state) => {
-        if (state) state._hydrated = true
+      storage,
+      onRehydrateStorage: () => {
+        return (state, error) => {
+          if (!error) {
+            store.setState({ _hydrated: true })
+          }
+        }
       },
     }
   )