From 11e6969cd350307aaaf955972a204042e99206f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 06:04:10 +0000 Subject: [PATCH 1/2] chore(deps): bump pinia-plugin-persistedstate in the vue group Bumps the vue group with 1 update: [pinia-plugin-persistedstate](https://github.com/prazdevs/pinia-plugin-persistedstate). Updates `pinia-plugin-persistedstate` from 3.2.3 to 4.0.1 - [Release notes](https://github.com/prazdevs/pinia-plugin-persistedstate/releases) - [Changelog](https://github.com/prazdevs/pinia-plugin-persistedstate/blob/main/CHANGELOG.md) - [Commits](https://github.com/prazdevs/pinia-plugin-persistedstate/compare/v3.2.3...v4.0.1) --- updated-dependencies: - dependency-name: pinia-plugin-persistedstate dependency-type: direct:production update-type: version-update:semver-major dependency-group: vue ... Signed-off-by: dependabot[bot] --- package.json | 2 +- pnpm-lock.yaml | 189 ++++++++++++++++++------------------------------- 2 files changed, 69 insertions(+), 122 deletions(-) diff --git a/package.json b/package.json index c30ce807..9baa21a4 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "favico.js": "^0.3.10", "humanize-duration": "^3.32.1", "pinia": "2.2.2", - "pinia-plugin-persistedstate": "^3.2.3", + "pinia-plugin-persistedstate": "^4.0.1", "sortablejs": "^1.15.3", "vue": "^3.5.4", "vue-demi": "^0.14.10", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a938200a..0d606fea 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -57,8 +57,8 @@ importers: specifier: 2.2.2 version: 2.2.2(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)) pinia-plugin-persistedstate: - specifier: ^3.2.3 - version: 3.2.3(pinia@2.2.2(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2))) + specifier: ^4.0.1 + version: 4.0.1(pinia@2.2.2(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)))(rollup@4.21.0)(webpack-sources@3.2.3) sortablejs: specifier: ^1.15.3 version: 1.15.3 @@ -1198,6 +1198,9 @@ packages: deep-is@0.1.4: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} + deep-pick-omit@1.2.0: + resolution: {integrity: sha512-2CGvfTM2c+IP/MhdRZMpaHhTc6zIlgz3tQXJ/VGAkc7mjMrjqSU28qiI63yEcy+fcYfd/K+NNJcGRzap4M4bqw==} + deepmerge@4.3.1: resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} engines: {node: '>=0.10.0'} @@ -1831,10 +1834,16 @@ packages: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} - pinia-plugin-persistedstate@3.2.3: - resolution: {integrity: sha512-Cm819WBj/s5K5DGw55EwbXDtx+EZzM0YR5AZbq9XE3u0xvXwvX2JnWoFpWIcdzISBHqy9H1UiSIUmXyXqWsQRQ==} + pinia-plugin-persistedstate@4.0.1: + resolution: {integrity: sha512-Gs2nhKUi6Rwhhc8PH9wvEAxfz4iZeJ/36qQv2ieYs94+zMozbGtMLIR4p9Aoim3c/PKf8J9orOz9n+f0ZF9CdA==} peerDependencies: - pinia: ^2.0.0 + '@pinia/nuxt': '>=0.5.0' + pinia: '>=2.0.0' + peerDependenciesMeta: + '@pinia/nuxt': + optional: true + pinia: + optional: true pinia@2.2.2: resolution: {integrity: sha512-ja2XqFWZC36mupU4z1ZzxeTApV7DOw44cV4dhQ9sGwun+N89v/XP7+j7q6TanS1u1tdbK4r+1BUx7heMaIdagA==} @@ -2407,10 +2416,8 @@ snapshots: dependencies: '@babel/highlight': 7.24.7 picocolors: 1.1.0 - optional: true - '@babel/compat-data@7.25.4': - optional: true + '@babel/compat-data@7.25.4': {} '@babel/core@7.25.2': dependencies: @@ -2431,7 +2438,6 @@ snapshots: semver: 6.3.1 transitivePeerDependencies: - supports-color - optional: true '@babel/generator@7.25.6': dependencies: @@ -2439,7 +2445,6 @@ snapshots: '@jridgewell/gen-mapping': 0.3.5 '@jridgewell/trace-mapping': 0.3.25 jsesc: 2.5.2 - optional: true '@babel/helper-compilation-targets@7.25.2': dependencies: @@ -2448,7 +2453,6 @@ snapshots: browserslist: 4.23.3 lru-cache: 5.1.1 semver: 6.3.1 - optional: true '@babel/helper-module-imports@7.24.7': dependencies: @@ -2456,7 +2460,6 @@ snapshots: '@babel/types': 7.25.6 transitivePeerDependencies: - supports-color - optional: true '@babel/helper-module-transforms@7.25.2(@babel/core@7.25.2)': dependencies: @@ -2467,7 +2470,6 @@ snapshots: '@babel/traverse': 7.25.6 transitivePeerDependencies: - supports-color - optional: true '@babel/helper-simple-access@7.24.7': dependencies: @@ -2475,20 +2477,17 @@ snapshots: '@babel/types': 7.25.6 transitivePeerDependencies: - supports-color - optional: true '@babel/helper-string-parser@7.24.8': {} '@babel/helper-validator-identifier@7.24.7': {} - '@babel/helper-validator-option@7.24.8': - optional: true + '@babel/helper-validator-option@7.24.8': {} '@babel/helpers@7.25.6': dependencies: '@babel/template': 7.25.0 '@babel/types': 7.25.6 - optional: true '@babel/highlight@7.24.7': dependencies: @@ -2496,21 +2495,18 @@ snapshots: chalk: 2.4.2 js-tokens: 4.0.0 picocolors: 1.1.0 - optional: true '@babel/parser@7.25.6': dependencies: '@babel/types': 7.25.6 - '@babel/standalone@7.25.6': - optional: true + '@babel/standalone@7.25.6': {} '@babel/template@7.25.0': dependencies: '@babel/code-frame': 7.24.7 '@babel/parser': 7.25.6 '@babel/types': 7.25.6 - optional: true '@babel/traverse@7.25.6': dependencies: @@ -2523,7 +2519,6 @@ snapshots: globals: 11.12.0 transitivePeerDependencies: - supports-color - optional: true '@babel/types@7.25.6': dependencies: @@ -2842,7 +2837,6 @@ snapshots: - rollup - supports-color - webpack-sources - optional: true '@nuxt/schema@3.13.1(rollup@4.21.0)(webpack-sources@3.2.3)': dependencies: @@ -2862,7 +2856,6 @@ snapshots: - rollup - supports-color - webpack-sources - optional: true '@one-ini/wasm@0.1.1': {} @@ -2933,8 +2926,7 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.21.0': optional: true - '@sindresorhus/merge-streams@2.3.0': - optional: true + '@sindresorhus/merge-streams@2.3.0': {} '@types/echarts@4.9.22': dependencies: @@ -3324,7 +3316,6 @@ snapshots: ansi-styles@3.2.1: dependencies: color-convert: 1.9.3 - optional: true ansi-styles@4.3.0: dependencies: @@ -3388,7 +3379,6 @@ snapshots: electron-to-chromium: 1.5.19 node-releases: 2.0.18 update-browserslist-db: 1.1.0(browserslist@4.23.3) - optional: true c12@1.11.2: dependencies: @@ -3404,14 +3394,12 @@ snapshots: perfect-debounce: 1.0.0 pkg-types: 1.2.0 rc9: 2.1.2 - optional: true cac@6.7.14: {} callsites@3.1.0: {} - caniuse-lite@1.0.30001660: - optional: true + caniuse-lite@1.0.30001660: {} chai@5.1.1: dependencies: @@ -3426,7 +3414,6 @@ snapshots: ansi-styles: 3.2.1 escape-string-regexp: 1.0.5 supports-color: 5.5.0 - optional: true chalk@4.1.2: dependencies: @@ -3447,25 +3434,21 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - chownr@2.0.0: - optional: true + chownr@2.0.0: {} citty@0.1.6: dependencies: consola: 3.2.3 - optional: true color-convert@1.9.3: dependencies: color-name: 1.1.3 - optional: true color-convert@2.0.1: dependencies: color-name: 1.1.4 - color-name@1.1.3: - optional: true + color-name@1.1.3: {} color-name@1.1.4: {} @@ -3475,8 +3458,7 @@ snapshots: commander@10.0.1: {} - compatx@0.1.8: - optional: true + compatx@0.1.8: {} computeds@0.0.1: {} @@ -3489,11 +3471,9 @@ snapshots: ini: 1.3.8 proto-list: 1.2.4 - consola@3.2.3: - optional: true + consola@3.2.3: {} - convert-source-map@2.0.0: - optional: true + convert-source-map@2.0.0: {} core-js@3.38.1: {} @@ -3527,22 +3507,21 @@ snapshots: deep-is@0.1.4: {} + deep-pick-omit@1.2.0: {} + deepmerge@4.3.1: {} - defu@6.1.4: - optional: true + defu@6.1.4: {} delayed-stream@1.0.0: {} - destr@2.0.3: - optional: true + destr@2.0.3: {} dir-glob@3.0.1: dependencies: path-type: 4.0.0 - dotenv@16.4.5: - optional: true + dotenv@16.4.5: {} eastasianwidth@0.2.0: {} @@ -3558,8 +3537,7 @@ snapshots: minimatch: 9.0.1 semver: 7.6.3 - electron-to-chromium@1.5.19: - optional: true + electron-to-chromium@1.5.19: {} element-resize-detector@1.2.4: dependencies: @@ -3597,11 +3575,9 @@ snapshots: '@esbuild/win32-ia32': 0.21.5 '@esbuild/win32-x64': 0.21.5 - escalade@3.2.0: - optional: true + escalade@3.2.0: {} - escape-string-regexp@1.0.5: - optional: true + escape-string-regexp@1.0.5: {} escape-string-regexp@4.0.0: {} @@ -3789,7 +3765,6 @@ snapshots: fs-minipass@2.1.0: dependencies: minipass: 3.3.6 - optional: true fsevents@2.3.2: optional: true @@ -3797,8 +3772,7 @@ snapshots: fsevents@2.3.3: optional: true - gensync@1.0.0-beta.2: - optional: true + gensync@1.0.0-beta.2: {} get-func-name@2.0.2: {} @@ -3814,7 +3788,6 @@ snapshots: ohash: 1.1.3 pathe: 1.1.2 tar: 6.2.1 - optional: true glob-parent@5.1.2: dependencies: @@ -3832,8 +3805,7 @@ snapshots: minipass: 7.1.2 path-scurry: 1.11.1 - globals@11.12.0: - optional: true + globals@11.12.0: {} globals@13.24.0: dependencies: @@ -3860,7 +3832,6 @@ snapshots: path-type: 5.0.0 slash: 5.1.0 unicorn-magic: 0.1.0 - optional: true graphemer@1.4.0: {} @@ -3870,18 +3841,15 @@ snapshots: webidl-conversions: 7.0.0 whatwg-mimetype: 3.0.0 - has-flag@3.0.0: - optional: true + has-flag@3.0.0: {} has-flag@4.0.0: {} - hash-sum@2.0.0: - optional: true + hash-sum@2.0.0: {} he@1.2.0: {} - hookable@5.5.3: - optional: true + hookable@5.5.3: {} human-signals@5.0.0: {} @@ -3926,8 +3894,7 @@ snapshots: optionalDependencies: '@pkgjs/parseargs': 0.11.0 - jiti@1.21.6: - optional: true + jiti@1.21.6: {} js-beautify@1.15.1: dependencies: @@ -3939,8 +3906,7 @@ snapshots: js-cookie@3.0.5: {} - js-tokens@4.0.0: - optional: true + js-tokens@4.0.0: {} js-tokens@9.0.0: {} @@ -3948,8 +3914,7 @@ snapshots: dependencies: argparse: 2.0.1 - jsesc@2.5.2: - optional: true + jsesc@2.5.2: {} json-buffer@3.0.1: {} @@ -3957,18 +3922,15 @@ snapshots: json-stable-stringify-without-jsonify@1.0.1: {} - json5@2.2.3: - optional: true + json5@2.2.3: {} keyv@4.5.4: dependencies: json-buffer: 3.0.1 - klona@2.0.6: - optional: true + klona@2.0.6: {} - knitwork@1.1.0: - optional: true + knitwork@1.1.0: {} kolorist@1.8.0: {} @@ -3999,7 +3961,6 @@ snapshots: lru-cache@5.1.1: dependencies: yallist: 3.1.1 - optional: true magic-string@0.30.11: dependencies: @@ -4037,10 +3998,8 @@ snapshots: minipass@3.3.6: dependencies: yallist: 4.0.0 - optional: true - minipass@5.0.0: - optional: true + minipass@5.0.0: {} minipass@7.1.2: {} @@ -4048,12 +4007,10 @@ snapshots: dependencies: minipass: 3.3.6 yallist: 4.0.0 - optional: true mitt@3.0.1: {} - mkdirp@1.0.4: - optional: true + mkdirp@1.0.4: {} mlly@1.7.1: dependencies: @@ -4062,8 +4019,7 @@ snapshots: pkg-types: 1.1.3 ufo: 1.5.4 - mri@1.2.0: - optional: true + mri@1.2.0: {} ms@2.1.2: {} @@ -4077,11 +4033,9 @@ snapshots: natural-compare@1.4.0: {} - node-fetch-native@1.6.4: - optional: true + node-fetch-native@1.6.4: {} - node-releases@2.0.18: - optional: true + node-releases@2.0.18: {} nopt@7.2.1: dependencies: @@ -4105,10 +4059,8 @@ snapshots: pathe: 1.1.2 pkg-types: 1.2.0 ufo: 1.5.4 - optional: true - ohash@1.1.3: - optional: true + ohash@1.1.3: {} onetime@6.0.0: dependencies: @@ -4152,23 +4104,31 @@ snapshots: path-type@4.0.0: {} - path-type@5.0.0: - optional: true + path-type@5.0.0: {} pathe@1.1.2: {} pathval@2.0.0: {} - perfect-debounce@1.0.0: - optional: true + perfect-debounce@1.0.0: {} picocolors@1.1.0: {} picomatch@2.3.1: {} - pinia-plugin-persistedstate@3.2.3(pinia@2.2.2(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2))): + pinia-plugin-persistedstate@4.0.1(pinia@2.2.2(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)))(rollup@4.21.0)(webpack-sources@3.2.3): dependencies: + '@nuxt/kit': 3.13.1(rollup@4.21.0)(webpack-sources@3.2.3) + deep-pick-omit: 1.2.0 + defu: 6.1.4 + destr: 2.0.3 + optionalDependencies: pinia: 2.2.2(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)) + transitivePeerDependencies: + - magicast + - rollup + - supports-color + - webpack-sources pinia@2.2.2(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)): dependencies: @@ -4239,7 +4199,6 @@ snapshots: dependencies: defu: 6.1.4 destr: 2.0.3 - optional: true readdirp@3.6.0: dependencies: @@ -4283,8 +4242,7 @@ snapshots: scule@1.3.0: {} - semver@6.3.1: - optional: true + semver@6.3.1: {} semver@7.6.3: {} @@ -4300,8 +4258,7 @@ snapshots: slash@3.0.0: {} - slash@5.1.0: - optional: true + slash@5.1.0: {} sortablejs@1.15.3: {} @@ -4344,7 +4301,6 @@ snapshots: supports-color@5.5.0: dependencies: has-flag: 3.0.0 - optional: true supports-color@7.2.0: dependencies: @@ -4363,7 +4319,6 @@ snapshots: minizlib: 2.1.2 mkdirp: 1.0.4 yallist: 4.0.0 - optional: true text-table@0.2.0: {} @@ -4412,8 +4367,7 @@ snapshots: ufo@1.5.4: {} - uncrypto@0.1.3: - optional: true + uncrypto@0.1.3: {} unctx@2.3.1(webpack-sources@3.2.3): dependencies: @@ -4423,12 +4377,10 @@ snapshots: unplugin: 1.14.1(webpack-sources@3.2.3) transitivePeerDependencies: - webpack-sources - optional: true undici-types@6.19.8: {} - unicorn-magic@0.1.0: - optional: true + unicorn-magic@0.1.0: {} unimport@3.11.1(rollup@4.21.0)(webpack-sources@3.2.3): dependencies: @@ -4448,7 +4400,6 @@ snapshots: transitivePeerDependencies: - rollup - webpack-sources - optional: true unimport@3.9.1(rollup@4.21.0): dependencies: @@ -4552,14 +4503,12 @@ snapshots: scule: 1.3.0 transitivePeerDependencies: - supports-color - optional: true update-browserslist-db@1.1.0(browserslist@4.23.3): dependencies: browserslist: 4.23.3 escalade: 3.2.0 picocolors: 1.1.0 - optional: true uri-js@4.4.1: dependencies: @@ -4742,11 +4691,9 @@ snapshots: xml-name-validator@4.0.0: {} - yallist@3.1.1: - optional: true + yallist@3.1.1: {} - yallist@4.0.0: - optional: true + yallist@4.0.0: {} yocto-queue@0.1.0: {} From 952965c3bad3e1c7bb7778c304653c0f006edbbe Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 11 Sep 2024 19:29:21 +0200 Subject: [PATCH 2/2] chore: update persist keys to new interface --- src/stores/colors.ts | 2 +- src/stores/layout.ts | 2 +- src/stores/pairlistConfig.ts | 2 +- src/stores/plotConfig.ts | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/stores/colors.ts b/src/stores/colors.ts index cb063822..f6c51a05 100644 --- a/src/stores/colors.ts +++ b/src/stores/colors.ts @@ -36,7 +36,7 @@ export const useColorStore = defineStore('colorStore', { }, persist: { key: STORE_UI_COLORS, - paths: ['colorPreference'], + pick: ['colorPreference'], }, }); diff --git a/src/stores/layout.ts b/src/stores/layout.ts index 1984c72e..ce770723 100644 --- a/src/stores/layout.ts +++ b/src/stores/layout.ts @@ -117,7 +117,7 @@ export const useLayoutStore = defineStore('layoutStore', { }, persist: { key: STORE_LAYOUTS, - afterRestore: (context) => { + afterHydrate: (context) => { if ( context.store.dashboardLayout === null || typeof context.store.dashboardLayout === 'string' || diff --git a/src/stores/pairlistConfig.ts b/src/stores/pairlistConfig.ts index ec2b1f7c..2de8dad7 100644 --- a/src/stores/pairlistConfig.ts +++ b/src/stores/pairlistConfig.ts @@ -250,7 +250,7 @@ export const usePairlistConfigStore = defineStore( { persist: { key: 'ftPairlistConfig', - paths: ['savedConfigs', 'configName'], + pick: ['savedConfigs', 'configName'], }, }, ); diff --git a/src/stores/plotConfig.ts b/src/stores/plotConfig.ts index 534dab2e..b1acf6ff 100644 --- a/src/stores/plotConfig.ts +++ b/src/stores/plotConfig.ts @@ -80,8 +80,8 @@ export const usePlotConfigStore = defineStore('plotConfig', { }, persist: { key: FT_PLOT_CONFIG_KEY, - paths: ['plotConfigName', 'customPlotConfigs'], - afterRestore: (context) => { + pick: ['plotConfigName', 'customPlotConfigs'], + afterHydrate: (context) => { if (Object.keys(context.store.customPlotConfigs).length === 0) { console.log('Initialized plotconfig'); context.store.customPlotConfigs = { default: deepClone(EMPTY_PLOTCONFIG) };