Cutlery/moodist
1
0
Fork 0
mirror of https://github.com/remvze/moodist.git synced 2025-12-04 12:15:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

feat: add deep merge to Zustand Persist

Browse Source
This commit is contained in:
MAZE 2023-10-27 12:49:03 +03:30
parent c184246a12
commit 01f4031812
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc.json
View File

@ -40,6 +40,7 @@
], ],
"rules": { "rules": {
"@typescript-eslint/ban-ts-comment": "off",
"prettier/prettier": "error", "prettier/prettier": "error",
"sort-keys-fix/sort-keys-fix": ["warn", "asc"], "sort-keys-fix/sort-keys-fix": ["warn", "asc"],
"sort-destructure-keys/sort-destructure-keys": "warn", "sort-destructure-keys/sort-destructure-keys": "warn",

9
package-lock.json generated
View File

@ -13,6 +13,7 @@
"@types/react": "^18.2.25", "@types/react": "^18.2.25",
"@types/react-dom": "^18.2.10", "@types/react-dom": "^18.2.10",
"astro": "^3.2.3", "astro": "^3.2.3",
"deepmerge": "4.3.1",
"framer-motion": "10.16.4", "framer-motion": "10.16.4",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
@ -5730,6 +5731,14 @@
"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
"dev": true "dev": true
}, },
"node_modules/deepmerge": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
"integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/default-browser": { "node_modules/default-browser": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz", "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz",

1
package.json
View File

@ -26,6 +26,7 @@
"@types/react": "^18.2.25", "@types/react": "^18.2.25",
"@types/react-dom": "^18.2.10", "@types/react-dom": "^18.2.10",
"astro": "^3.2.3", "astro": "^3.2.3",
"deepmerge": "4.3.1",
"framer-motion": "10.16.4", "framer-motion": "10.16.4",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",

7
src/store/sound/index.ts
View File

@ -1,5 +1,6 @@
import { create } from 'zustand'; import { create } from 'zustand';
import { createJSONStorage, persist } from 'zustand/middleware'; import { createJSONStorage, persist } from 'zustand/middleware';
import merge from 'deepmerge';
import { type SoundState, createState } from './sound.state'; import { type SoundState, createState } from './sound.state';
import { type SoundActions, createActions } from './sound.actions'; import { type SoundActions, createActions } from './sound.actions';
@ -11,6 +12,12 @@ export const useSoundStore = create<SoundState & SoundActions>()(
...createActions(...a), ...createActions(...a),
}), }),
{ {
merge: (persisted, current) =>
merge(
current,
// @ts-ignore
persisted,
),
name: 'moodist-sounds', name: 'moodist-sounds',
partialize: state => ({ sounds: state.sounds }), partialize: state => ({ sounds: state.sounds }),
skipHydration: true, skipHydration: true,