- remove version.store.ts;

- unify useAppStore.ts;

apps/webapp/src/App.tsx

@@ -60,7 +60,7 @@ const App = () => {
       }
     }
 
-    const persistedHasHydrated = useVersionStore.getState()._hasHydrated
+    const persistedHasHydrated = useAppStore.getState()._hasHydrated
     if(persistedHasHydrated){
       forceLogoutAndSetVersion()
     }

libs/core/src/Stores/useAppStore.ts → libs/core/src/Stores/app.store.ts

@@ -1,45 +1,28 @@
 import { compare as semverCompare } from 'semver'
-import create from 'zustand'
-import { persist } from 'zustand/middleware'
 
 import { FeatureFlags, FeatureFlagsType } from '../Types/FeatureFlags'
+import { StoreIdentifier } from '../Types/Store'
 import { IS_DEV } from '../Utils/config'
-
-interface AppStoreType {
-  featureFlags: FeatureFlagsType
-  setFeatureFlags: (featureFlags: FeatureFlagsType) => void
-  version?: string
-  setVersion: (version: string) => void
-}
+import { createStore } from '../Utils/storeCreator'
 
 const defaultFeatureFlags: FeatureFlagsType = {
   [FeatureFlags.PRESENTATION]: IS_DEV,
   [FeatureFlags.ACTIONS]: false
 }
 
-export const useAppStore = create<AppStoreType>(
-  persist(
-    (set, get) => ({
-      featureFlags: defaultFeatureFlags,
-      setFeatureFlags: (featureFlags: FeatureFlagsType) => {
-        set({
-          featureFlags
-        })
-      },
-      version: undefined,
-      setVersion: (version: string) => {
-        set({ version: version })
-      }
-    }),
-    {
-      name: 'mexit-version-webapp',
-      partialize: (store) => ({
-        version: store.version
-      })
-    }
-  )
-)
-// export { useVersionStore } from '@mexit/core'
+export const appStoreConfig = (set, get) => ({
+  featureFlags: defaultFeatureFlags,
+  setFeatureFlags: (featureFlags: FeatureFlagsType) => {
+    set({
+      featureFlags
+    })
+  },
+  version: undefined as string,
+  setVersion: (version: string) => {
+    set({ version: version })
+  }
+})
+export const useAppStore = createStore(appStoreConfig, StoreIdentifier.VERSION, true)
 /**
  * Compares version strings using semver
  * @param {string} persistedVersion - The current version persisted in the store

libs/core/src/index.ts

@@ -8,6 +8,7 @@ export * from './Data/IpcAction'
 export * from './Data/outline'
 export * from './Data/search'
 export * from './Stores/api.store'
+export * from './Stores/app.store'
 export * from './Stores/auth.store'
 export * from './Stores/block.store'
 export * from './Stores/blockHighlight.store'
@@ -44,10 +45,8 @@ export * from './Stores/shareModal.store'
 export * from './Stores/shortcut.store'
 export * from './Stores/smartCapture.store'
 export * from './Stores/snippet.store'
-export * from './Stores/useAppStore'
 export * from './Stores/todo.store'
 export * from './Stores/tree.store'
-export * from './Stores/version.store'
 export * from './Types/Actions'
 export * from './Types/Auth'
 export * from './Types/Comment'