diff --git a/package.json b/package.json index 03b87fce..10200bf1 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "@ctrl/tinycolor": "4.1.0", "clsx": "2.1.1", "pinia": "2.2.2", - "vue": "3.5.8" + "vue": "3.5.10" }, "neverBuiltDependencies": [ "canvas", diff --git a/packages/stores/src/index.ts b/packages/stores/src/index.ts index 4a88d690..41b3662c 100644 --- a/packages/stores/src/index.ts +++ b/packages/stores/src/index.ts @@ -1,3 +1,3 @@ export * from './modules'; export * from './setup'; -export { storeToRefs } from 'pinia'; +export { defineStore, storeToRefs } from 'pinia'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2801b9b3..063f7363 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -28,8 +28,8 @@ catalogs: specifier: ^9.11.1 version: 9.11.1 '@iconify/json': - specifier: ^2.2.252 - version: 2.2.252 + specifier: ^2.2.254 + version: 2.2.254 '@iconify/tailwind': specifier: ^1.1.3 version: 1.1.3 @@ -88,8 +88,8 @@ catalogs: specifier: ^4.5.9 version: 4.5.9 '@types/node': - specifier: ^22.7.2 - version: 22.7.2 + specifier: ^22.7.4 + version: 22.7.4 '@types/nprogress': specifier: ^0.2.3 version: 0.2.3 @@ -121,11 +121,11 @@ catalogs: specifier: ^4.0.1 version: 4.0.1 '@vue/reactivity': - specifier: ^3.5.8 - version: 3.5.8 + specifier: ^3.5.10 + version: 3.5.10 '@vue/shared': - specifier: ^3.5.8 - version: 3.5.8 + specifier: ^3.5.10 + version: 3.5.10 '@vue/test-utils': specifier: ^2.4.6 version: 2.4.6 @@ -181,11 +181,11 @@ catalogs: specifier: ^7.0.6 version: 7.0.6 cz-git: - specifier: ^1.9.4 - version: 1.9.4 + specifier: ^1.10.0 + version: 1.10.0 czg: - specifier: ^1.9.4 - version: 1.9.4 + specifier: ^1.10.0 + version: 1.10.0 dayjs: specifier: ^1.11.13 version: 1.11.13 @@ -202,8 +202,8 @@ catalogs: specifier: ^5.5.1 version: 5.5.1 element-plus: - specifier: ^2.8.3 - version: 2.8.3 + specifier: ^2.8.4 + version: 2.8.4 eslint: specifier: ^9.11.1 version: 9.11.1 @@ -211,8 +211,8 @@ catalogs: specifier: ^2.1.2 version: 2.1.2 eslint-plugin-command: - specifier: ^0.2.5 - version: 0.2.5 + specifier: ^0.2.6 + version: 0.2.6 eslint-plugin-eslint-comments: specifier: ^3.2.0 version: 3.2.0 @@ -220,8 +220,8 @@ catalogs: specifier: ^4.3.0 version: 4.3.0 eslint-plugin-jsdoc: - specifier: ^50.2.5 - version: 50.2.5 + specifier: ^50.3.0 + version: 50.3.0 eslint-plugin-jsonc: specifier: ^2.16.0 version: 2.16.0 @@ -298,7 +298,7 @@ catalogs: specifier: ^1.1.0 version: 1.1.0 naive-ui: - specifier: ^2.40.0 + specifier: ^2.40.1 version: 2.40.1 nanoid: specifier: ^5.0.7 @@ -361,14 +361,14 @@ catalogs: specifier: ^6.0.1 version: 6.0.1 rollup: - specifier: ^4.22.4 - version: 4.22.4 + specifier: ^4.22.5 + version: 4.22.5 rollup-plugin-visualizer: specifier: ^5.12.0 version: 5.12.0 sass: - specifier: ^1.79.3 - version: 1.79.3 + specifier: ^1.79.4 + version: 1.79.4 sortablejs: specifier: ^1.15.3 version: 1.15.3 @@ -482,7 +482,7 @@ overrides: '@ctrl/tinycolor': 4.1.0 clsx: 2.1.1 pinia: 2.2.2 - vue: 3.5.8 + vue: 3.5.10 importers: @@ -499,7 +499,7 @@ importers: version: 1.47.2 '@types/node': specifier: 'catalog:' - version: 22.7.2 + version: 22.7.4 '@vben/commitlint-config': specifier: workspace:* version: link:internal/lint-configs/commitlint-config @@ -530,6 +530,7 @@ importers: '@vitejs/plugin-vue': specifier: 'catalog:' <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD version: 5.1.4(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(vue@3.5.7(typescript@5.6.2)) '@vitejs/plugin-vue-jsx': @@ -547,6 +548,12 @@ importers: specifier: 'catalog:' version: 4.0.1(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.8(typescript@5.6.2)) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + version: 5.1.4(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))(vue@3.5.10(typescript@5.6.2)) + '@vitejs/plugin-vue-jsx': + specifier: 'catalog:' + version: 4.0.1(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))(vue@3.5.10(typescript@5.6.2)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@vue/test-utils': specifier: 'catalog:' version: 2.4.6 @@ -588,10 +595,11 @@ importers: version: 5.6.2 unbuild: specifier: 'catalog:' - version: 2.0.0(sass@1.79.3)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2)) + version: 2.0.0(sass@1.79.4)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2)) vite: specifier: 'catalog:' <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD version: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) vitest: @@ -609,9 +617,15 @@ importers: specifier: 'catalog:' version: 2.1.1(@types/node@22.7.2)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + version: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) + vitest: + specifier: 'catalog:' + version: 2.1.1(@types/node@22.7.4)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) vue-tsc: specifier: 'catalog:' version: 2.1.6(typescript@5.6.2) @@ -681,9 +695,10 @@ importers: version: link:../../packages/utils '@vueuse/core': specifier: 'catalog:' - version: 11.1.0(vue@3.5.8(typescript@5.6.2)) + version: 11.1.0(vue@3.5.10(typescript@5.6.2)) ant-design-vue: specifier: 'catalog:' +<<<<<<< HEAD <<<<<<< HEAD version: 4.2.5(vue@3.5.7(typescript@5.6.2)) cropperjs: @@ -695,6 +710,9 @@ importers: ======= version: 4.2.5(vue@3.5.8(typescript@5.6.2)) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + version: 4.2.5(vue@3.5.10(typescript@5.6.2)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dayjs: specifier: 'catalog:' version: 1.11.13 @@ -709,6 +727,7 @@ importers: version: 4.17.21 pinia: specifier: 2.2.2 +<<<<<<< HEAD <<<<<<< HEAD version: 2.2.2(typescript@5.6.2)(vue@3.5.7(typescript@5.6.2)) tinymce: @@ -720,11 +739,15 @@ importers: ======= version: 2.2.2(typescript@5.6.2)(vue@3.5.8(typescript@5.6.2)) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + version: 2.2.2(typescript@5.6.2)(vue@3.5.10(typescript@5.6.2)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) vue-router: specifier: 'catalog:' +<<<<<<< HEAD <<<<<<< HEAD version: 4.4.5(vue@3.5.7(typescript@5.6.2)) devDependencies: @@ -737,6 +760,9 @@ importers: ======= version: 4.4.5(vue@3.5.8(typescript@5.6.2)) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + version: 4.4.5(vue@3.5.10(typescript@5.6.2)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 apps/web-ele: dependencies: @@ -784,26 +810,30 @@ importers: version: link:../../packages/utils '@vueuse/core': specifier: 'catalog:' - version: 11.1.0(vue@3.5.8(typescript@5.6.2)) + version: 11.1.0(vue@3.5.10(typescript@5.6.2)) dayjs: specifier: 'catalog:' version: 1.11.13 element-plus: specifier: 'catalog:' - version: 2.8.3(vue@3.5.8(typescript@5.6.2)) + version: 2.8.4(vue@3.5.10(typescript@5.6.2)) pinia: specifier: 2.2.2 - version: 2.2.2(typescript@5.6.2)(vue@3.5.8(typescript@5.6.2)) + version: 2.2.2(typescript@5.6.2)(vue@3.5.10(typescript@5.6.2)) vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) vue-router: specifier: 'catalog:' - version: 4.4.5(vue@3.5.8(typescript@5.6.2)) + version: 4.4.5(vue@3.5.10(typescript@5.6.2)) devDependencies: unplugin-element-plus: specifier: 'catalog:' +<<<<<<< HEAD version: 0.8.0(rollup@4.22.4)(webpack-sources@3.2.3) +======= + version: 0.8.0(rollup@4.22.5) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 apps/web-naive: dependencies: @@ -851,19 +881,19 @@ importers: version: link:../../packages/utils '@vueuse/core': specifier: 'catalog:' - version: 11.1.0(vue@3.5.8(typescript@5.6.2)) + version: 11.1.0(vue@3.5.10(typescript@5.6.2)) naive-ui: specifier: 'catalog:' - version: 2.40.1(vue@3.5.8(typescript@5.6.2)) + version: 2.40.1(vue@3.5.10(typescript@5.6.2)) pinia: specifier: 2.2.2 - version: 2.2.2(typescript@5.6.2)(vue@3.5.8(typescript@5.6.2)) + version: 2.2.2(typescript@5.6.2)(vue@3.5.10(typescript@5.6.2)) vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) vue-router: specifier: 'catalog:' - version: 4.4.5(vue@3.5.8(typescript@5.6.2)) + version: 4.4.5(vue@3.5.10(typescript@5.6.2)) docs: dependencies: @@ -887,16 +917,16 @@ importers: version: link:../packages/styles ant-design-vue: specifier: 'catalog:' - version: 4.2.5(vue@3.5.8(typescript@5.6.2)) + version: 4.2.5(vue@3.5.10(typescript@5.6.2)) lucide-vue-next: specifier: 'catalog:' - version: 0.446.0(vue@3.5.8(typescript@5.6.2)) + version: 0.446.0(vue@3.5.10(typescript@5.6.2)) medium-zoom: specifier: 'catalog:' version: 1.1.0 radix-vue: specifier: 'catalog:' - version: 1.9.6(vue@3.5.8(typescript@5.6.2)) + version: 1.9.6(vue@3.5.10(typescript@5.6.2)) vitepress-plugin-group-icons: specifier: 'catalog:' version: 1.2.4 @@ -904,6 +934,7 @@ importers: '@nolebase/vitepress-plugin-git-changelog': specifier: 'catalog:' <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD version: 2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2) ======= @@ -912,12 +943,16 @@ importers: ======= version: 2.5.0(@algolia/client-search@4.24.0)(@types/node@22.7.2)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + version: 2.5.0(@algolia/client-search@4.24.0)(@types/node@22.7.4)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.4)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@vben/vite-config': specifier: workspace:* version: link:../internal/vite-config '@vite-pwa/vitepress': specifier: 'catalog:' <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD version: 0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0)) vitepress: @@ -935,15 +970,21 @@ importers: specifier: 'catalog:' version: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.7.2)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + version: 0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0)) + vitepress: + specifier: 'catalog:' + version: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.7.4)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.4)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) internal/lint-configs/commitlint-config: dependencies: '@commitlint/cli': specifier: 'catalog:' - version: 19.5.0(@types/node@22.7.2)(typescript@5.6.2) + version: 19.5.0(@types/node@22.7.4)(typescript@5.6.2) '@commitlint/config-conventional': specifier: 'catalog:' version: 19.5.0 @@ -955,10 +996,10 @@ importers: version: 4.0.0(@commitlint/lint@19.5.0) cz-git: specifier: 'catalog:' - version: 1.9.4 + version: 1.10.0 czg: specifier: 'catalog:' - version: 1.9.4 + version: 1.10.0 internal/lint-configs/eslint-config: dependencies: @@ -967,7 +1008,7 @@ importers: version: 2.1.2(eslint@9.11.1(jiti@2.0.0)) eslint-plugin-command: specifier: 'catalog:' - version: 0.2.5(eslint@9.11.1(jiti@2.0.0)) + version: 0.2.6(eslint@9.11.1(jiti@2.0.0)) eslint-plugin-import-x: specifier: 'catalog:' version: 4.3.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) @@ -992,7 +1033,7 @@ importers: version: 3.2.0(eslint@9.11.1(jiti@2.0.0)) eslint-plugin-jsdoc: specifier: 'catalog:' - version: 50.2.5(eslint@9.11.1(jiti@2.0.0)) + version: 50.3.0(eslint@9.11.1(jiti@2.0.0)) eslint-plugin-jsonc: specifier: 'catalog:' version: 2.16.0(eslint@9.11.1(jiti@2.0.0)) @@ -1028,6 +1069,7 @@ importers: eslint-plugin-vitest: specifier: 'catalog:' <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD version: 0.5.4(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.5.5)(happy-dom@15.7.4)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)) ======= @@ -1036,6 +1078,9 @@ importers: ======= version: 0.5.4(@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.7.2)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + version: 0.5.4(@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.7.4)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 eslint-plugin-vue: specifier: 'catalog:' version: 9.28.0(eslint@9.11.1(jiti@2.0.0)) @@ -1151,7 +1196,7 @@ importers: dependencies: '@iconify/json': specifier: 'catalog:' - version: 2.2.252 + version: 2.2.254 '@iconify/tailwind': specifier: 'catalog:' version: 1.1.3 @@ -1201,6 +1246,7 @@ importers: vite: specifier: 'catalog:' <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD version: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) ======= @@ -1209,12 +1255,16 @@ importers: ======= version: 5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + version: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 internal/vite-config: dependencies: '@intlify/unplugin-vue-i18n': specifier: 'catalog:' <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD version: 5.2.0(@vue/compiler-dom@3.5.7)(eslint@9.11.0(jiti@1.21.6))(rollup@4.22.4)(typescript@5.6.2)(vue-i18n@10.0.3(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2))(webpack-sources@3.2.3) ======= @@ -1223,6 +1273,9 @@ importers: ======= version: 5.2.0(@vue/compiler-dom@3.5.8)(eslint@9.11.1(jiti@2.0.0))(rollup@4.22.4)(typescript@5.6.2)(vue-i18n@10.0.3(vue@3.5.8(typescript@5.6.2)))(vue@3.5.8(typescript@5.6.2)) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + version: 5.2.0(@vue/compiler-dom@3.5.10)(eslint@9.11.1(jiti@2.0.0))(rollup@4.22.5)(typescript@5.6.2)(vue-i18n@10.0.3(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@jspm/generator': specifier: 'catalog:' version: 2.3.1 @@ -1247,6 +1300,7 @@ importers: vite-plugin-lib-inject-css: specifier: 'catalog:' <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD version: 2.1.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)) vite-plugin-pwa: @@ -1260,17 +1314,24 @@ importers: ======= version: 2.1.1(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + version: 2.1.1(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 vite-plugin-pwa: specifier: 'catalog:' - version: 0.20.5(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0) + version: 0.20.5(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0) vite-plugin-vue-devtools: specifier: 'catalog:' +<<<<<<< HEAD <<<<<<< HEAD version: 7.4.6(rollup@4.22.4)(vite@5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.8(typescript@5.6.2)) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f ======= version: 7.4.6(rollup@4.22.4)(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.8(typescript@5.6.2)) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + version: 7.4.6(rollup@4.22.5)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))(vue@3.5.10(typescript@5.6.2)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 devDependencies: '@types/archiver': specifier: 'catalog:' @@ -1284,6 +1345,7 @@ importers: '@vitejs/plugin-vue': specifier: 'catalog:' <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD version: 5.1.4(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(vue@3.5.7(typescript@5.6.2)) '@vitejs/plugin-vue-jsx': @@ -1301,6 +1363,12 @@ importers: specifier: 'catalog:' version: 4.0.1(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.8(typescript@5.6.2)) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + version: 5.1.4(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))(vue@3.5.10(typescript@5.6.2)) + '@vitejs/plugin-vue-jsx': + specifier: 'catalog:' + version: 4.0.1(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))(vue@3.5.10(typescript@5.6.2)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dayjs: specifier: 'catalog:' version: 1.11.13 @@ -1309,16 +1377,17 @@ importers: version: 16.4.5 rollup: specifier: 'catalog:' - version: 4.22.4 + version: 4.22.5 rollup-plugin-visualizer: specifier: 'catalog:' - version: 5.12.0(rollup@4.22.4) + version: 5.12.0(rollup@4.22.5) sass: specifier: 'catalog:' - version: 1.79.3 + version: 1.79.4 vite: specifier: 'catalog:' <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD version: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) vite-plugin-compression: @@ -1335,20 +1404,27 @@ importers: ======= version: 5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + version: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 vite-plugin-compression: specifier: 'catalog:' - version: 0.5.1(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) + version: 0.5.1(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0)) vite-plugin-dts: specifier: 'catalog:' - version: 4.2.1(@types/node@22.7.2)(rollup@4.22.4)(typescript@5.6.2)(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) + version: 4.2.1(@types/node@22.7.4)(rollup@4.22.5)(typescript@5.6.2)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0)) vite-plugin-html: specifier: 'catalog:' +<<<<<<< HEAD <<<<<<< HEAD version: 3.2.2(vite@5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f ======= version: 3.2.2(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + version: 3.2.2(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 packages/@core/base/design: {} @@ -1356,13 +1432,13 @@ importers: dependencies: '@iconify/vue': specifier: 'catalog:' - version: 4.1.2(vue@3.5.8(typescript@5.6.2)) + version: 4.1.2(vue@3.5.10(typescript@5.6.2)) lucide-vue-next: specifier: 'catalog:' - version: 0.446.0(vue@3.5.8(typescript@5.6.2)) + version: 0.446.0(vue@3.5.10(typescript@5.6.2)) vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) packages/@core/base/shared: dependencies: @@ -1371,13 +1447,13 @@ importers: version: 4.1.0 '@tanstack/vue-store': specifier: 'catalog:' - version: 0.5.5(vue@3.5.8(typescript@5.6.2)) + version: 0.5.5(vue@3.5.10(typescript@5.6.2)) '@vue/reactivity': specifier: 'catalog:' - version: 3.5.8 + version: 3.5.10 '@vue/shared': specifier: 'catalog:' - version: 3.5.8 + version: 3.5.10 clsx: specifier: 2.1.1 version: 2.1.1 @@ -1407,11 +1483,11 @@ importers: packages/@core/base/typings: dependencies: vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) vue-router: specifier: 'catalog:' - version: 4.4.5(vue@3.5.8(typescript@5.6.2)) + version: 4.4.5(vue@3.5.10(typescript@5.6.2)) packages/@core/composables: dependencies: @@ -1420,16 +1496,16 @@ importers: version: link:../base/shared '@vueuse/core': specifier: 'catalog:' - version: 11.1.0(vue@3.5.8(typescript@5.6.2)) + version: 11.1.0(vue@3.5.10(typescript@5.6.2)) radix-vue: specifier: 'catalog:' - version: 1.9.6(vue@3.5.8(typescript@5.6.2)) + version: 1.9.6(vue@3.5.10(typescript@5.6.2)) sortablejs: specifier: 'catalog:' version: 1.15.3 vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) devDependencies: '@types/sortablejs': specifier: 'catalog:' @@ -1445,10 +1521,10 @@ importers: version: link:../base/typings '@vueuse/core': specifier: 'catalog:' - version: 11.1.0(vue@3.5.8(typescript@5.6.2)) + version: 11.1.0(vue@3.5.10(typescript@5.6.2)) vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) packages/@core/ui-kit/form-ui: dependencies: @@ -1463,16 +1539,16 @@ importers: version: link:../../base/shared '@vee-validate/zod': specifier: 'catalog:' - version: 4.13.2(vue@3.5.8(typescript@5.6.2)) + version: 4.13.2(vue@3.5.10(typescript@5.6.2)) '@vueuse/core': specifier: 'catalog:' - version: 11.1.0(vue@3.5.8(typescript@5.6.2)) + version: 11.1.0(vue@3.5.10(typescript@5.6.2)) vee-validate: specifier: 'catalog:' - version: 4.13.2(vue@3.5.8(typescript@5.6.2)) + version: 4.13.2(vue@3.5.10(typescript@5.6.2)) vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) zod: specifier: 'catalog:' version: 3.23.8 @@ -1496,10 +1572,10 @@ importers: version: link:../../base/typings '@vueuse/core': specifier: 'catalog:' - version: 11.1.0(vue@3.5.8(typescript@5.6.2)) + version: 11.1.0(vue@3.5.10(typescript@5.6.2)) vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) packages/@core/ui-kit/menu-ui: dependencies: @@ -1520,10 +1596,10 @@ importers: version: link:../../base/typings '@vueuse/core': specifier: 'catalog:' - version: 11.1.0(vue@3.5.8(typescript@5.6.2)) + version: 11.1.0(vue@3.5.10(typescript@5.6.2)) vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) packages/@core/ui-kit/popup-ui: dependencies: @@ -1541,10 +1617,10 @@ importers: version: link:../../base/shared '@vueuse/core': specifier: 'catalog:' - version: 11.1.0(vue@3.5.8(typescript@5.6.2)) + version: 11.1.0(vue@3.5.10(typescript@5.6.2)) vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) packages/@core/ui-kit/shadcn-ui: dependencies: @@ -1562,22 +1638,22 @@ importers: version: link:../../base/typings '@vueuse/core': specifier: 'catalog:' - version: 11.1.0(vue@3.5.8(typescript@5.6.2)) + version: 11.1.0(vue@3.5.10(typescript@5.6.2)) class-variance-authority: specifier: 'catalog:' version: 0.7.0 lucide-vue-next: specifier: 'catalog:' - version: 0.446.0(vue@3.5.8(typescript@5.6.2)) + version: 0.446.0(vue@3.5.10(typescript@5.6.2)) radix-vue: specifier: 'catalog:' - version: 1.9.6(vue@3.5.8(typescript@5.6.2)) + version: 1.9.6(vue@3.5.10(typescript@5.6.2)) vee-validate: specifier: 'catalog:' - version: 4.13.2(vue@3.5.8(typescript@5.6.2)) + version: 4.13.2(vue@3.5.10(typescript@5.6.2)) vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) packages/@core/ui-kit/tabs-ui: dependencies: @@ -1598,10 +1674,10 @@ importers: version: link:../../base/typings '@vueuse/core': specifier: 'catalog:' - version: 11.1.0(vue@3.5.8(typescript@5.6.2)) + version: 11.1.0(vue@3.5.10(typescript@5.6.2)) vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) packages/constants: dependencies: @@ -1624,8 +1700,8 @@ importers: specifier: workspace:* version: link:../../utils vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) packages/effects/common-ui: dependencies: @@ -1679,9 +1755,10 @@ importers: version: link:../../types '@vueuse/core': specifier: 'catalog:' - version: 11.1.0(vue@3.5.8(typescript@5.6.2)) + version: 11.1.0(vue@3.5.10(typescript@5.6.2)) '@vueuse/integrations': specifier: 'catalog:' +<<<<<<< HEAD <<<<<<< HEAD version: 11.1.0(async-validator@4.2.5)(axios@1.7.7)(focus-trap@7.5.4)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.7(typescript@5.6.2)) codemirror: @@ -1690,10 +1767,14 @@ importers: ======= version: 11.1.0(async-validator@4.2.5)(axios@1.7.7)(focus-trap@7.6.0)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.8(typescript@5.6.2)) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + version: 11.1.0(async-validator@4.2.5)(axios@1.7.7)(focus-trap@7.6.0)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.10(typescript@5.6.2)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 qrcode: specifier: 'catalog:' version: 1.5.4 vue: +<<<<<<< HEAD <<<<<<< HEAD specifier: 3.5.7 version: 3.5.7(typescript@5.6.2) @@ -1707,9 +1788,13 @@ importers: specifier: 3.5.8 version: 3.5.8(typescript@5.6.2) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 vue-router: specifier: 'catalog:' - version: 4.4.5(vue@3.5.8(typescript@5.6.2)) + version: 4.4.5(vue@3.5.10(typescript@5.6.2)) devDependencies: '@types/qrcode': specifier: 'catalog:' @@ -1733,11 +1818,11 @@ importers: specifier: workspace:* version: link:../../utils vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) vue-router: specifier: 'catalog:' - version: 4.4.5(vue@3.5.8(typescript@5.6.2)) + version: 4.4.5(vue@3.5.10(typescript@5.6.2)) watermark-js-plus: specifier: 'catalog:' version: 1.5.7 @@ -1791,13 +1876,13 @@ importers: version: link:../../utils '@vueuse/core': specifier: 'catalog:' - version: 11.1.0(vue@3.5.8(typescript@5.6.2)) + version: 11.1.0(vue@3.5.10(typescript@5.6.2)) vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) vue-router: specifier: 'catalog:' - version: 4.4.5(vue@3.5.8(typescript@5.6.2)) + version: 4.4.5(vue@3.5.10(typescript@5.6.2)) packages/effects/plugins: dependencies: @@ -1806,13 +1891,13 @@ importers: version: link:../../preferences '@vueuse/core': specifier: 'catalog:' - version: 11.1.0(vue@3.5.8(typescript@5.6.2)) + version: 11.1.0(vue@3.5.10(typescript@5.6.2)) echarts: specifier: 'catalog:' version: 5.5.1 vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) packages/effects/request: dependencies: @@ -1845,11 +1930,11 @@ importers: specifier: workspace:* version: link:../@core/composables vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) vue-i18n: specifier: 'catalog:' - version: 10.0.3(vue@3.5.8(typescript@5.6.2)) + version: 10.0.3(vue@3.5.10(typescript@5.6.2)) packages/preferences: dependencies: @@ -1870,20 +1955,24 @@ importers: version: link:../@core/base/typings pinia: specifier: 2.2.2 - version: 2.2.2(typescript@5.6.2)(vue@3.5.8(typescript@5.6.2)) + version: 2.2.2(typescript@5.6.2)(vue@3.5.10(typescript@5.6.2)) pinia-plugin-persistedstate: specifier: 'catalog:' +<<<<<<< HEAD <<<<<<< HEAD version: 4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.7(typescript@5.6.2)))(rollup@3.29.4) ======= version: 4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.8(typescript@5.6.2)))(rollup@4.22.4) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + version: 4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.10(typescript@5.6.2)))(rollup@3.29.5) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) vue-router: specifier: 'catalog:' - version: 4.4.5(vue@3.5.8(typescript@5.6.2)) + version: 4.4.5(vue@3.5.10(typescript@5.6.2)) packages/styles: dependencies: @@ -1897,11 +1986,11 @@ importers: specifier: workspace:* version: link:../@core/base/typings vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) vue-router: specifier: 'catalog:' - version: 4.4.5(vue@3.5.8(typescript@5.6.2)) + version: 4.4.5(vue@3.5.10(typescript@5.6.2)) packages/utils: dependencies: @@ -1913,13 +2002,13 @@ importers: version: link:../@core/base/typings vue-router: specifier: 'catalog:' - version: 4.4.5(vue@3.5.8(typescript@5.6.2)) + version: 4.4.5(vue@3.5.10(typescript@5.6.2)) playground: dependencies: '@tanstack/vue-query': specifier: 'catalog:' - version: 5.56.2(vue@3.5.8(typescript@5.6.2)) + version: 5.56.2(vue@3.5.10(typescript@5.6.2)) '@vben/access': specifier: workspace:* version: link:../packages/effects/access @@ -1964,22 +2053,22 @@ importers: version: link:../packages/utils '@vueuse/core': specifier: 'catalog:' - version: 11.1.0(vue@3.5.8(typescript@5.6.2)) + version: 11.1.0(vue@3.5.10(typescript@5.6.2)) ant-design-vue: specifier: 'catalog:' - version: 4.2.5(vue@3.5.8(typescript@5.6.2)) + version: 4.2.5(vue@3.5.10(typescript@5.6.2)) dayjs: specifier: 'catalog:' version: 1.11.13 pinia: specifier: 2.2.2 - version: 2.2.2(typescript@5.6.2)(vue@3.5.8(typescript@5.6.2)) + version: 2.2.2(typescript@5.6.2)(vue@3.5.10(typescript@5.6.2)) vue: - specifier: 3.5.8 - version: 3.5.8(typescript@5.6.2) + specifier: 3.5.10 + version: 3.5.10(typescript@5.6.2) vue-router: specifier: 'catalog:' - version: 4.4.5(vue@3.5.8(typescript@5.6.2)) + version: 4.4.5(vue@3.5.10(typescript@5.6.2)) scripts/turbo-run: dependencies: @@ -2095,7 +2184,7 @@ packages: '@ant-design/icons-vue@7.0.1': resolution: {integrity: sha512-eCqY2unfZK6Fe02AwFlDHLfoyEFreP6rBwAZMIJ1LugmfMiVgwWDYlp1YsRugaPtICYOabV1iWxXdP12u9U43Q==} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 '@antfu/install-pkg@0.4.1': resolution: {integrity: sha512-T7yB5QNG29afhWVkVq7XeIMBa5U/vs9mX69YqayXypPRmYzUmzwnYltplHmPtZ4HPCn+sQKeXW8I47wCbuBOjw==} @@ -3240,7 +3329,7 @@ packages: '@css-render/vue3-ssr@0.15.14': resolution: {integrity: sha512-//8027GSbxE9n3QlD73xFY6z4ZbHbvrOVB7AO6hsmrEzGbg+h2A09HboUyDgu+xsmj7JnvJD39Irt+2D0+iV8g==} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 '@csstools/cascade-layer-name-parser@2.0.1': resolution: {integrity: sha512-G9ZYN5+yr/E6xYSiy1BwOEFP5p88ZtWo8sL4NztKBkRRAwRkzVGa70M+D+fYHugMID5jkLeNt5X9jYd5EaVuyg==} @@ -3515,7 +3604,7 @@ packages: '@element-plus/icons-vue@2.3.1': resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 '@emotion/hash@0.8.0': resolution: {integrity: sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==} @@ -4158,8 +4247,8 @@ packages: '@iconify-json/vscode-icons@1.2.2': resolution: {integrity: sha512-bTpT0HJDRqGkxQv8oiETNHLEnBZpnA1QaRD35CQyO7M7qgWVLx2xwn/lK6e4waojmlPC3ckMBx3WFIUUn0/Jdg==} - '@iconify/json@2.2.252': - resolution: {integrity: sha512-AtdDjLhN4aBEncnWghiw9JdBRxKAXFcaQmwDFDWPL1UF/cPuuC8BADZzfHIoVcVlEvEbv69tFrzmhj1z/+PGlA==} + '@iconify/json@2.2.254': + resolution: {integrity: sha512-Czl0QoUY6339X+VovtTmsguvBTbkT//IdO9CTIz9nUwpWE23cf0yKydoAsQpa1i3cxGI+03ytmaTQqwivFYumg==} '@iconify/tailwind@1.1.3': resolution: {integrity: sha512-SfyeT+2b/aKWA6DjwdevXdLUqaEqJ5xWTegD92KItaWc47IYsGuqrt/GOz4dJCPcTVCrsUjlvMpy8cNd+uV5nQ==} @@ -4173,7 +4262,7 @@ packages: '@iconify/vue@4.1.2': resolution: {integrity: sha512-CQnYqLiQD5LOAaXhBrmj1mdL2/NCJvwcC4jtW2Z8ukhThiFkLDkutarTOV2trfc9EXqUqRs0KqXOL9pZ/IyysA==} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 '@internationalized/date@3.5.5': resolution: {integrity: sha512-H+CfYvOZ0LTJeeLOqm19E3uj/4YjrmOFtBufDHPfvtI80hFAMqtrp7oCACpe4Cil5l8S0Qu/9dYfZc/5lY8WQQ==} @@ -4218,7 +4307,7 @@ packages: engines: {node: '>= 18'} peerDependencies: petite-vue-i18n: '*' - vue: 3.5.8 + vue: 3.5.10 vue-i18n: '*' peerDependenciesMeta: petite-vue-i18n: @@ -4232,7 +4321,7 @@ packages: peerDependencies: '@intlify/shared': ^9.0.0 || ^10.0.0 '@vue/compiler-dom': ^3.0.0 - vue: 3.5.8 + vue: 3.5.10 vue-i18n: ^9.0.0 || ^10.0.0 peerDependenciesMeta: '@intlify/shared': @@ -4612,9 +4701,15 @@ packages: cpu: [arm] os: [android] +<<<<<<< HEAD '@rollup/rollup-android-arm64@4.22.0': resolution: {integrity: sha512-ETHi4bxrYnvOtXeM7d4V4kZWixib2jddFacJjsOjwbgYSRsyXYtZHC4ht134OsslPIcnkqT+TKV4eU8rNBKyyQ==} cpu: [arm64] +======= + '@rollup/rollup-android-arm-eabi@4.22.5': + resolution: {integrity: sha512-SU5cvamg0Eyu/F+kLeMXS7GoahL+OoizlclVFX3l5Ql6yNlywJJ0OuqTzUx0v+aHhPHEB/56CT06GQrRrGNYww==} + cpu: [arm] +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 os: [android] '@rollup/rollup-android-arm64@4.22.4': @@ -4622,19 +4717,32 @@ packages: cpu: [arm64] os: [android] +<<<<<<< HEAD '@rollup/rollup-darwin-arm64@4.22.0': resolution: {integrity: sha512-ZWgARzhSKE+gVUX7QWaECoRQsPwaD8ZR0Oxb3aUpzdErTvlEadfQpORPXkKSdKbFci9v8MJfkTtoEHnnW9Ulng==} cpu: [arm64] os: [darwin] +======= + '@rollup/rollup-android-arm64@4.22.5': + resolution: {integrity: sha512-S4pit5BP6E5R5C8S6tgU/drvgjtYW76FBuG6+ibG3tMvlD1h9LHVF9KmlmaUBQ8Obou7hEyS+0w+IR/VtxwNMQ==} + cpu: [arm64] + os: [android] +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@rollup/rollup-darwin-arm64@4.22.4': resolution: {integrity: sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==} cpu: [arm64] os: [darwin] +<<<<<<< HEAD '@rollup/rollup-darwin-x64@4.22.0': resolution: {integrity: sha512-h0ZAtOfHyio8Az6cwIGS+nHUfRMWBDO5jXB8PQCARVF6Na/G6XS2SFxDl8Oem+S5ZsHQgtsI7RT4JQnI1qrlaw==} cpu: [x64] +======= + '@rollup/rollup-darwin-arm64@4.22.5': + resolution: {integrity: sha512-250ZGg4ipTL0TGvLlfACkIxS9+KLtIbn7BCZjsZj88zSg2Lvu3Xdw6dhAhfe/FjjXPVNCtcSp+WZjVsD3a/Zlw==} + cpu: [arm64] +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 os: [darwin] '@rollup/rollup-darwin-x64@4.22.4': @@ -4642,11 +4750,18 @@ packages: cpu: [x64] os: [darwin] +<<<<<<< HEAD '@rollup/rollup-linux-arm-gnueabihf@4.22.0': resolution: {integrity: sha512-9pxQJSPwFsVi0ttOmqLY4JJ9pg9t1gKhK0JDbV1yUEETSx55fdyCjt39eBQ54OQCzAF0nVGO6LfEH1KnCPvelA==} cpu: [arm] os: [linux] libc: [glibc] +======= + '@rollup/rollup-darwin-x64@4.22.5': + resolution: {integrity: sha512-D8brJEFg5D+QxFcW6jYANu+Rr9SlKtTenmsX5hOSzNYVrK5oLAEMTUgKWYJP+wdKyCdeSwnapLsn+OVRFycuQg==} + cpu: [x64] + os: [darwin] +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@rollup/rollup-linux-arm-gnueabihf@4.22.4': resolution: {integrity: sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==} @@ -4654,11 +4769,19 @@ packages: os: [linux] libc: [glibc] +<<<<<<< HEAD '@rollup/rollup-linux-arm-musleabihf@4.22.0': resolution: {integrity: sha512-YJ5Ku5BmNJZb58A4qSEo3JlIG4d3G2lWyBi13ABlXzO41SsdnUKi3HQHe83VpwBVG4jHFTW65jOQb8qyoR+qzg==} cpu: [arm] os: [linux] libc: [musl] +======= + '@rollup/rollup-linux-arm-gnueabihf@4.22.5': + resolution: {integrity: sha512-PNqXYmdNFyWNg0ma5LdY8wP+eQfdvyaBAojAXgO7/gs0Q/6TQJVXAXe8gwW9URjbS0YAammur0fynYGiWsKlXw==} + cpu: [arm] + os: [linux] + libc: [glibc] +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@rollup/rollup-linux-arm-musleabihf@4.22.4': resolution: {integrity: sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==} @@ -4666,11 +4789,19 @@ packages: os: [linux] libc: [musl] +<<<<<<< HEAD '@rollup/rollup-linux-arm64-gnu@4.22.0': resolution: {integrity: sha512-U4G4u7f+QCqHlVg1Nlx+qapZy+QoG+NV6ux+upo/T7arNGwKvKP2kmGM4W5QTbdewWFgudQxi3kDNST9GT1/mg==} cpu: [arm64] os: [linux] libc: [glibc] +======= + '@rollup/rollup-linux-arm-musleabihf@4.22.5': + resolution: {integrity: sha512-kSSCZOKz3HqlrEuwKd9TYv7vxPYD77vHSUvM2y0YaTGnFc8AdI5TTQRrM1yIp3tXCKrSL9A7JLoILjtad5t8pQ==} + cpu: [arm] + os: [linux] + libc: [musl] +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@rollup/rollup-linux-arm64-gnu@4.22.4': resolution: {integrity: sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==} @@ -4678,11 +4809,19 @@ packages: os: [linux] libc: [glibc] +<<<<<<< HEAD '@rollup/rollup-linux-arm64-musl@4.22.0': resolution: {integrity: sha512-aQpNlKmx3amwkA3a5J6nlXSahE1ijl0L9KuIjVOUhfOh7uw2S4piR3mtpxpRtbnK809SBtyPsM9q15CPTsY7HQ==} cpu: [arm64] os: [linux] libc: [musl] +======= + '@rollup/rollup-linux-arm64-gnu@4.22.5': + resolution: {integrity: sha512-oTXQeJHRbOnwRnRffb6bmqmUugz0glXaPyspp4gbQOPVApdpRrY/j7KP3lr7M8kTfQTyrBUzFjj5EuHAhqH4/w==} + cpu: [arm64] + os: [linux] + libc: [glibc] +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@rollup/rollup-linux-arm64-musl@4.22.4': resolution: {integrity: sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==} @@ -4690,11 +4829,19 @@ packages: os: [linux] libc: [musl] +<<<<<<< HEAD '@rollup/rollup-linux-powerpc64le-gnu@4.22.0': resolution: {integrity: sha512-9fx6Zj/7vve/Fp4iexUFRKb5+RjLCff6YTRQl4CoDhdMfDoobWmhAxQWV3NfShMzQk1Q/iCnageFyGfqnsmeqQ==} cpu: [ppc64] os: [linux] libc: [glibc] +======= + '@rollup/rollup-linux-arm64-musl@4.22.5': + resolution: {integrity: sha512-qnOTIIs6tIGFKCHdhYitgC2XQ2X25InIbZFor5wh+mALH84qnFHvc+vmWUpyX97B0hNvwNUL4B+MB8vJvH65Fw==} + cpu: [arm64] + os: [linux] + libc: [musl] +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@rollup/rollup-linux-powerpc64le-gnu@4.22.4': resolution: {integrity: sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==} @@ -4702,9 +4849,15 @@ packages: os: [linux] libc: [glibc] +<<<<<<< HEAD '@rollup/rollup-linux-riscv64-gnu@4.22.0': resolution: {integrity: sha512-VWQiCcN7zBgZYLjndIEh5tamtnKg5TGxyZPWcN9zBtXBwfcGSZ5cHSdQZfQH/GB4uRxk0D3VYbOEe/chJhPGLQ==} cpu: [riscv64] +======= + '@rollup/rollup-linux-powerpc64le-gnu@4.22.5': + resolution: {integrity: sha512-TMYu+DUdNlgBXING13rHSfUc3Ky5nLPbWs4bFnT+R6Vu3OvXkTkixvvBKk8uO4MT5Ab6lC3U7x8S8El2q5o56w==} + cpu: [ppc64] +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 os: [linux] libc: [glibc] @@ -4714,9 +4867,15 @@ packages: os: [linux] libc: [glibc] +<<<<<<< HEAD '@rollup/rollup-linux-s390x-gnu@4.22.0': resolution: {integrity: sha512-EHmPnPWvyYqncObwqrosb/CpH3GOjE76vWVs0g4hWsDRUVhg61hBmlVg5TPXqF+g+PvIbqkC7i3h8wbn4Gp2Fg==} cpu: [s390x] +======= + '@rollup/rollup-linux-riscv64-gnu@4.22.5': + resolution: {integrity: sha512-PTQq1Kz22ZRvuhr3uURH+U/Q/a0pbxJoICGSprNLAoBEkyD3Sh9qP5I0Asn0y0wejXQBbsVMRZRxlbGFD9OK4A==} + cpu: [riscv64] +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 os: [linux] libc: [glibc] @@ -4726,9 +4885,15 @@ packages: os: [linux] libc: [glibc] +<<<<<<< HEAD '@rollup/rollup-linux-x64-gnu@4.22.0': resolution: {integrity: sha512-tsSWy3YQzmpjDKnQ1Vcpy3p9Z+kMFbSIesCdMNgLizDWFhrLZIoN21JSq01g+MZMDFF+Y1+4zxgrlqPjid5ohg==} cpu: [x64] +======= + '@rollup/rollup-linux-s390x-gnu@4.22.5': + resolution: {integrity: sha512-bR5nCojtpuMss6TDEmf/jnBnzlo+6n1UhgwqUvRoe4VIotC7FG1IKkyJbwsT7JDsF2jxR+NTnuOwiGv0hLyDoQ==} + cpu: [s390x] +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 os: [linux] libc: [glibc] @@ -4738,11 +4903,19 @@ packages: os: [linux] libc: [glibc] +<<<<<<< HEAD '@rollup/rollup-linux-x64-musl@4.22.0': resolution: {integrity: sha512-anr1Y11uPOQrpuU8XOikY5lH4Qu94oS6j0xrulHk3NkLDq19MlX8Ng/pVipjxBJ9a2l3+F39REZYyWQFkZ4/fw==} cpu: [x64] os: [linux] libc: [musl] +======= + '@rollup/rollup-linux-x64-gnu@4.22.5': + resolution: {integrity: sha512-N0jPPhHjGShcB9/XXZQWuWBKZQnC1F36Ce3sDqWpujsGjDz/CQtOL9LgTrJ+rJC8MJeesMWrMWVLKKNR/tMOCA==} + cpu: [x64] + os: [linux] + libc: [glibc] +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@rollup/rollup-linux-x64-musl@4.22.4': resolution: {integrity: sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==} @@ -4750,19 +4923,33 @@ packages: os: [linux] libc: [musl] +<<<<<<< HEAD '@rollup/rollup-win32-arm64-msvc@4.22.0': resolution: {integrity: sha512-7LB+Bh+Ut7cfmO0m244/asvtIGQr5pG5Rvjz/l1Rnz1kDzM02pSX9jPaS0p+90H5I1x4d1FkCew+B7MOnoatNw==} cpu: [arm64] os: [win32] +======= + '@rollup/rollup-linux-x64-musl@4.22.5': + resolution: {integrity: sha512-uBa2e28ohzNNwjr6Uxm4XyaA1M/8aTgfF2T7UIlElLaeXkgpmIJ2EitVNQxjO9xLLLy60YqAgKn/AqSpCUkE9g==} + cpu: [x64] + os: [linux] + libc: [musl] +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@rollup/rollup-win32-arm64-msvc@4.22.4': resolution: {integrity: sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==} cpu: [arm64] os: [win32] +<<<<<<< HEAD '@rollup/rollup-win32-ia32-msvc@4.22.0': resolution: {integrity: sha512-+3qZ4rer7t/QsC5JwMpcvCVPRcJt1cJrYS/TMJZzXIJbxWFQEVhrIc26IhB+5Z9fT9umfVc+Es2mOZgl+7jdJQ==} cpu: [ia32] +======= + '@rollup/rollup-win32-arm64-msvc@4.22.5': + resolution: {integrity: sha512-RXT8S1HP8AFN/Kr3tg4fuYrNxZ/pZf1HemC5Tsddc6HzgGnJm0+Lh5rAHJkDuW3StI0ynNXukidROMXYl6ew8w==} + cpu: [arm64] +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 os: [win32] '@rollup/rollup-win32-ia32-msvc@4.22.4': @@ -4770,9 +4957,15 @@ packages: cpu: [ia32] os: [win32] +<<<<<<< HEAD '@rollup/rollup-win32-x64-msvc@4.22.0': resolution: {integrity: sha512-YdicNOSJONVx/vuPkgPTyRoAPx3GbknBZRCOUkK84FJ/YTfs/F0vl/YsMscrB6Y177d+yDRcj+JWMPMCgshwrA==} cpu: [x64] +======= + '@rollup/rollup-win32-ia32-msvc@4.22.5': + resolution: {integrity: sha512-ElTYOh50InL8kzyUD6XsnPit7jYCKrphmddKAe1/Ytt74apOxDq5YEcbsiKs0fR3vff3jEneMM+3I7jbqaMyBg==} + cpu: [ia32] +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 os: [win32] '@rollup/rollup-win32-x64-msvc@4.22.4': @@ -4780,6 +4973,11 @@ packages: cpu: [x64] os: [win32] + '@rollup/rollup-win32-x64-msvc@4.22.5': + resolution: {integrity: sha512-+lvL/4mQxSV8MukpkKyyvfwhH266COcWlXE/1qxwN08ajovta3459zrjLghYMgDerlzNwLAcFpvU+WWE5y6nAQ==} + cpu: [x64] + os: [win32] + '@rushstack/node-core-library@5.7.0': resolution: {integrity: sha512-Ff9Cz/YlWu9ce4dmqNBZpA45AEya04XaBFIjV7xTVeEf+y/kTjEasmozqFELXlNG4ROdevss75JrrZ5WgufDkQ==} peerDependencies: @@ -4876,7 +5074,7 @@ packages: resolution: {integrity: sha512-VW7qS8JXwC3SZpawJHxQ+mWwWa5WVIQUUOh/OD6WI85eLcbJPg83ezjGupPXGKF9h31gl7CIRrnJDi4g5pK3Jg==} peerDependencies: '@vue/composition-api': ^1.1.2 - vue: 3.5.8 + vue: 3.5.10 peerDependenciesMeta: '@vue/composition-api': optional: true @@ -4885,7 +5083,7 @@ packages: resolution: {integrity: sha512-j+CDrxVhtQQNOjWzLmCqJeDwmmTAQGvEaNbLr1uPJ9rxJITodJtFNdBFj7l+Nd5o34v2ayEv64Ugh6+1BtuGNg==} peerDependencies: '@vue/composition-api': ^1.2.1 - vue: 3.5.8 + vue: 3.5.10 peerDependenciesMeta: '@vue/composition-api': optional: true @@ -4898,7 +5096,7 @@ packages: '@tinymce/tinymce-vue@6.0.1': resolution: {integrity: sha512-VzjI8AKlNrrsosIk3WuBez6kubqPsPMeaButkRLuts77uo4e2EwPRFX+VyB6fHbMGHwUPK22zNjOUGMvJFZFCw==} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 '@tootallnate/once@1.1.2': resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==} @@ -4987,8 +5185,8 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@22.7.2': - resolution: {integrity: sha512-866lXSrpGpgyHBZUa2m9YNWqHDjjM0aBTJlNtYaGEw4rqY/dcD7deRVTbBBAJelfA7oaGDbNftXF/TL/A6RgoA==} + '@types/node@22.7.4': + resolution: {integrity: sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==} '@types/normalize-package-data@2.4.4': resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} @@ -5138,14 +5336,14 @@ packages: engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: vite: ^5.0.0 - vue: 3.5.8 + vue: 3.5.10 '@vitejs/plugin-vue@5.1.4': resolution: {integrity: sha512-N2XSI2n3sQqp5w7Y/AN/L2XDjBIRGqXko+eDp42sydYSBeJuSm5a1sLf8zakmo8u7tA8NmBgoDLA1HeOESjp9A==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: vite: ^5.0.0 - vue: 3.5.8 + vue: 3.5.10 '@vitest/expect@2.1.1': resolution: {integrity: sha512-YeueunS0HiHiQxk+KEOnq/QMzlUuOzbU1Go+PgAsHvvv3tUkJPm9xWt+6ITNTlzsMXUjmgm5T+U7KBPK2qQV6w==} @@ -5202,6 +5400,7 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 +<<<<<<< HEAD <<<<<<< HEAD '@vue/compiler-core@3.5.6': resolution: {integrity: sha512-r+gNu6K4lrvaQLQGmf+1gc41p3FO2OUJyWmNqaIITaJU6YFiV5PtQSFZt8jfztYyARwqhoCayjprC7KMvT3nRA==} @@ -5227,15 +5426,29 @@ packages: '@vue/compiler-ssr@3.5.7': resolution: {integrity: sha512-oZx+jXP2k5arV/8Ly3TpQbfFyimMw2ANrRqvHJoKjPqtEzazxQGZjCLOfq8TnZ3wy2TOXdqfmVp4q7FyYeHV4g==} ======= +======= + '@vue/compiler-core@3.5.10': + resolution: {integrity: sha512-iXWlk+Cg/ag7gLvY0SfVucU8Kh2CjysYZjhhP70w9qI4MvSox4frrP+vDGvtQuzIcgD8+sxM6lZvCtdxGunTAA==} + +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@vue/compiler-core@3.5.8': resolution: {integrity: sha512-Uzlxp91EPjfbpeO5KtC0KnXPkuTfGsNDeaKQJxQN718uz+RqDYarEf7UhQJGK+ZYloD2taUbHTI2J4WrUaZQNA==} + '@vue/compiler-dom@3.5.10': + resolution: {integrity: sha512-DyxHC6qPcktwYGKOIy3XqnHRrrXyWR2u91AjP+nLkADko380srsC2DC3s7Y1Rk6YfOlxOlvEQKa9XXmLI+W4ZA==} + '@vue/compiler-dom@3.5.8': resolution: {integrity: sha512-GUNHWvoDSbSa5ZSHT9SnV5WkStWfzJwwTd6NMGzilOE/HM5j+9EB9zGXdtu/fCNEmctBqMs6C9SvVPpVPuk1Eg==} + '@vue/compiler-sfc@3.5.10': + resolution: {integrity: sha512-to8E1BgpakV7224ZCm8gz1ZRSyjNCAWEplwFMWKlzCdP9DkMKhRRwt0WkCjY7jkzi/Vz3xgbpeig5Pnbly4Tow==} + '@vue/compiler-sfc@3.5.8': resolution: {integrity: sha512-taYpngQtSysrvO9GULaOSwcG5q821zCoIQBtQQSx7Uf7DxpR6CIHR90toPr9QfDD2mqHQPCSgoWBvJu0yV9zjg==} + '@vue/compiler-ssr@3.5.10': + resolution: {integrity: sha512-hxP4Y3KImqdtyUKXDRSxKSRkSm1H9fCvhojEYrnaoWhE4w/y8vwWhnosJoPPe2AXm5sU7CSbYYAgkt2ZPhDz+A==} + '@vue/compiler-ssr@3.5.8': resolution: {integrity: sha512-W96PtryNsNG9u0ZnN5Q5j27Z/feGrFV6zy9q5tzJVyJaLiwYxvC0ek4IXClZygyhjm+XKM7WD9pdKi/wIRVC/Q==} >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f @@ -5252,7 +5465,7 @@ packages: '@vue/devtools-core@7.4.6': resolution: {integrity: sha512-7ATNPEbVqThOOAp2bg/YUIm9MqqgimbSk24D05hdXUp89JlXX12aTzdrWd9xZRwS78hDR+wCToHl1C/8sopBrg==} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 '@vue/devtools-kit@7.4.6': resolution: {integrity: sha512-NbYBwPWgEic1AOd9bWExz9weBzFdjiIfov0yRn4DrRfR+EQJCI9dn4I0XS7IxYGdkmUJi8mFW42LLk18WsGqew==} @@ -5268,18 +5481,19 @@ packages: typescript: optional: true - '@vue/reactivity@3.5.8': - resolution: {integrity: sha512-mlgUyFHLCUZcAYkqvzYnlBRCh0t5ZQfLYit7nukn1GR96gc48Bp4B7OIcSfVSvlG1k3BPfD+p22gi1t2n9tsXg==} + '@vue/reactivity@3.5.10': + resolution: {integrity: sha512-kW08v06F6xPSHhid9DJ9YjOGmwNDOsJJQk0ax21wKaUYzzuJGEuoKNU2Ujux8FLMrP7CFJJKsHhXN9l2WOVi2g==} - '@vue/runtime-core@3.5.8': - resolution: {integrity: sha512-fJuPelh64agZ8vKkZgp5iCkPaEqFJsYzxLk9vSC0X3G8ppknclNDr61gDc45yBGTaN5Xqc1qZWU3/NoaBMHcjQ==} + '@vue/runtime-core@3.5.10': + resolution: {integrity: sha512-9Q86I5Qq3swSkFfzrZ+iqEy7Vla325M7S7xc1NwKnRm/qoi1Dauz0rT6mTMmscqx4qz0EDJ1wjB+A36k7rl8mA==} - '@vue/runtime-dom@3.5.8': - resolution: {integrity: sha512-DpAUz+PKjTZPUOB6zJgkxVI3GuYc2iWZiNeeHQUw53kdrparSTG6HeXUrYDjaam8dVsCdvQxDz6ZWxnyjccUjQ==} + '@vue/runtime-dom@3.5.10': + resolution: {integrity: sha512-t3x7ht5qF8ZRi1H4fZqFzyY2j+GTMTDxRheT+i8M9Ph0oepUxoadmbwlFwMoW7RYCpNQLpP2Yx3feKs+fyBdpA==} - '@vue/server-renderer@3.5.8': - resolution: {integrity: sha512-7AmC9/mEeV9mmXNVyUIm1a1AjUhyeeGNbkLh39J00E7iPeGks8OGRB5blJiMmvqSh8SkaS7jkLWSpXtxUCeagA==} + '@vue/server-renderer@3.5.10': + resolution: {integrity: sha512-IVE97tt2kGKwHNq9yVO0xdh1IvYfZCShvDSy46JIh5OQxP1/EXSpoDqetVmyIzL7CYOWnnmMkVqd7YK2QSWkdw==} peerDependencies: +<<<<<<< HEAD <<<<<<< HEAD vue: 3.5.7 @@ -5291,6 +5505,12 @@ packages: ======= vue: 3.5.8 >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + vue: 3.5.10 + + '@vue/shared@3.5.10': + resolution: {integrity: sha512-VkkBhU97Ki+XJ0xvl4C9YJsIZ2uIlQ7HqPpZOS3m9VCvmROPaChZU6DexdMJqvz9tbgG+4EtFVrSuailUq5KGQ==} +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@vue/shared@3.5.8': resolution: {integrity: sha512-mJleSWbAGySd2RJdX1RBtcrUBX6snyOc0qHpgk3lGi4l9/P/3ny3ELqFWqYdkXIwwNN/kdm8nD9ky8o6l/Lx2A==} @@ -5478,7 +5698,7 @@ packages: resolution: {integrity: sha512-dh5CBXSaxJZBFQBd156sOUuZPfxI7pZsNXDYpHNBt/JyKZoYlbetRp/nJmSragS2Oo0mVC23Ote+TQSGc0TX6g==} engines: {node: '>=12.22.0'} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 any-promise@1.3.0: resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} @@ -6222,12 +6442,12 @@ packages: csstype@3.1.3: resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} - cz-git@1.9.4: - resolution: {integrity: sha512-VntWcIEFfW8+7RgwYaRn1r10NhUkl8/8ZdJQRupEdqE7QXBCSjNP8hKSk9zhSLzYAsdXfGEAwiAYJM1T2Qsh8w==} + cz-git@1.10.0: + resolution: {integrity: sha512-WJidM6BwqJXPi2KUBzkUgZwZYh9U5VP5tJSIZ5G4+CDDv0lzLo8vrOrsWItE12f3xpAvlZTeQipreSczuaxFRA==} engines: {node: '>=v12.20.0'} - czg@1.9.4: - resolution: {integrity: sha512-x9V/FXA3XUmK6PMvP2WC3WPTA4xAUCcjFcL6HxJSLUAn4gKshMHWLkIfWSCsEqmenn5IIX0/L7NuBJ7/luDqCA==} + czg@1.10.0: + resolution: {integrity: sha512-RJqFwHtEoDe6eivsLXI1hrUTNRd7Fy16+wivm+q9C9VT6/uC+g77piaz27rcMVeqa5zmtTlWuSGr3svzqWe2WA==} engines: {node: '>=v12.20.0'} hasBin: true @@ -6537,10 +6757,10 @@ packages: resolution: {integrity: sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==} >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 - element-plus@2.8.3: - resolution: {integrity: sha512-BXQOyDf0s7JHyNEV8iaO+iaOzTZPsBXVKMzMI967vLCodUBDLrtiY5vglAn1YEebQcUOEUMhGcttTpIvEkcBjQ==} + element-plus@2.8.4: + resolution: {integrity: sha512-ZlVAdUOoJliv4kW3ntWnnSHMT+u/Os7mXJjk2xzOlqNeHaI2/ozlF+R58ZCEak8ZnDi6+5A2viWEYRsq64IuiA==} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 emoji-regex@10.4.0: resolution: {integrity: sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==} @@ -6704,8 +6924,8 @@ packages: eslint-import-resolver-node@0.3.9: resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==} - eslint-plugin-command@0.2.5: - resolution: {integrity: sha512-mbCaSHD37MT8nVJnJUz2oeDfhz0wdOjfrqQVWkSpXuj3uU8m7/FK/niV2bL922af3M1js5x7Xcu3PwqWsrahfA==} + eslint-plugin-command@0.2.6: + resolution: {integrity: sha512-T0bHZ1oblW1xUHUVoBKZJR2osSNNGkfZuK4iqboNwuNS/M7tdp3pmURaJtTi/XDzitxaQ02lvOdFH0mUd5QLvQ==} peerDependencies: eslint: '*' @@ -6727,8 +6947,8 @@ packages: peerDependencies: eslint: ^8.57.0 || ^9.0.0 - eslint-plugin-jsdoc@50.2.5: - resolution: {integrity: sha512-o3pVL19dSO3et+env3uV2WjrMX8oEqZjBF8lZBpLl9/CgqaRAIx5UaSPfrbHKB/JlHldWOFFGrUeZWmpWUds6g==} + eslint-plugin-jsdoc@50.3.0: + resolution: {integrity: sha512-P7qDB/RckdKETpBM4CtjHRQ5qXByPmFhRi86sN3E+J+tySchq+RSOGGhI2hDIefmmKFuTi/1ACjqsnDJDDDfzg==} engines: {node: '>=18'} peerDependencies: eslint: ^7.0.0 || ^8.0.0 || ^9.0.0 @@ -8082,7 +8302,7 @@ packages: lucide-vue-next@0.446.0: resolution: {integrity: sha512-ddx9NRczKulV4a2GcbY9F5l/zuUW0ARB4mRc+kOzFur9XvvrVxVmAmhqVChZUlj9Wmraopn8ujDfhxB6FlVfIw==} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 magic-string@0.25.9: resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==} @@ -8316,7 +8536,7 @@ packages: naive-ui@2.40.1: resolution: {integrity: sha512-3NkL+vLRQZKQxCHXa+7xiD6oM74OrQELaehDkGYRYpr6kjT+JJB+Z7h+5LC70gn8VkbgCAETv0+uRWF+6MLlgQ==} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 nanoid@3.3.7: resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} @@ -8718,7 +8938,7 @@ packages: peerDependencies: '@vue/composition-api': ^1.4.0 typescript: '>=4.4.4' - vue: 3.5.8 + vue: 3.5.10 peerDependenciesMeta: '@vue/composition-api': optional: true @@ -9321,7 +9541,7 @@ packages: radix-vue@1.9.6: resolution: {integrity: sha512-legrn9jHbEpbJS4QYrA0VmIafj1bmc4MSVzN55WZatGiXMJg3oFrQL5QxpiURJciS+OlATbKA2KAGkMuuLA0LA==} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 radix3@1.1.2: resolution: {integrity: sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA==} @@ -9530,8 +9750,8 @@ packages: rollup: optional: true - rollup@2.79.1: - resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==} + rollup@2.79.2: + resolution: {integrity: sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==} engines: {node: '>=10.0.0'} hasBin: true @@ -9550,6 +9770,11 @@ packages: engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true + rollup@4.22.5: + resolution: {integrity: sha512-WoinX7GeQOFMGznEcWA1WrTQCd/tpEbMkc3nuMs9BT0CPjMdSjPMTVClwWd4pgSQwJdP65SK9mTCNvItlr5o7w==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} + hasBin: true + rotated-array-set@3.0.0: resolution: {integrity: sha512-G7689wvCM0szMFXUAhi3GfNGcSPlndg077cdRWoq7UegOAwfU2MJ0jD7s7jB+2ppKA75Kr/O0HwAP9+rRdBctg==} engines: {node: ^14.13.1 || >=16.0.0} @@ -9585,8 +9810,8 @@ packages: safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - sass@1.79.3: - resolution: {integrity: sha512-m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA==} + sass@1.79.4: + resolution: {integrity: sha512-K0QDSNPXgyqO4GZq2HO5Q70TLxTH6cIT59RdoCHMivrC8rqzaTw5ab9prjz9KUN1El4FLXrBXJhik61JR4HcGg==} engines: {node: '>=14.0.0'} hasBin: true @@ -10533,12 +10758,12 @@ packages: vdirs@0.1.8: resolution: {integrity: sha512-H9V1zGRLQZg9b+GdMk8MXDN2Lva0zx72MPahDKc30v+DtwKjfyOSXWRIX4t2mhDubM1H09gPhWeth/BJWPHGUw==} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 vee-validate@4.13.2: resolution: {integrity: sha512-HlpR/6MJ92TW9f135umMZKUqdd/tFQTxLNSf2ImbU4Y/MlLVAUpF1l64VdjTOhbClAqPjCb5p/SqHDxLpUHXrw==} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 vfile-message@4.0.2: resolution: {integrity: sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==} @@ -10724,7 +10949,7 @@ packages: vooks@0.2.12: resolution: {integrity: sha512-iox0I3RZzxtKlcgYaStQYKEzWWGAduMmq+jS7OrNdQo1FgGfPMubGL3uGHOU9n97NIvfFDBGnpSvkWyb/NSn/Q==} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 vscode-languageserver-textdocument@1.0.12: resolution: {integrity: sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==} @@ -10747,7 +10972,7 @@ packages: hasBin: true peerDependencies: '@vue/composition-api': ^1.0.0-rc.1 - vue: 3.5.8 + vue: 3.5.10 peerDependenciesMeta: '@vue/composition-api': optional: true @@ -10762,7 +10987,7 @@ packages: resolution: {integrity: sha512-8ul2S4Hy9orKs7eOlkw/zqnVu98GttUdyIMRyjoMpv6hFPxnybgBLdep/UCmdan5kUHyxqMnr2cGHTBuPBYJaw==} engines: {node: '>= 16'} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 vue-json-pretty@2.4.0: resolution: {integrity: sha512-e9bP41DYYIc2tWaB6KuwqFJq5odZ8/GkE6vHQuGcbPn37kGk4a3n1RNw3ZYeDrl66NWXgTlOfS+M6NKkowmkWw==} @@ -10773,7 +10998,7 @@ packages: vue-router@4.4.5: resolution: {integrity: sha512-4fKZygS8cH1yCyuabAXGUAsyi1b2/o/OKgu/RUb+znIYOxPRxdkytJEx+0wGcpBE1pX6vUgh5jwWOKRGvuA/7Q==} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 vue-tsc@2.1.6: resolution: {integrity: sha512-f98dyZp5FOukcYmbFpuSCJ4Z0vHSOSmxGttZJCsFeX0M4w/Rsq0s4uKXjcSRsZqsRgQa6z7SfuO+y0HVICE57Q==} @@ -10785,10 +11010,10 @@ packages: resolution: {integrity: sha512-IwUC0Aq2zwaXqy74h4WCvFCUtoV0iSWr0snWnE9TnU18S66GAQyqQbRf2qfJtUuiFsBf6qp0MEwdonlwznlcrw==} engines: {node: '>=10.15.0'} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 - vue@3.5.8: - resolution: {integrity: sha512-hvuvuCy51nP/1fSRvrrIqTLSvrSyz2Pq+KQ8S8SXCxTWVE0nMaOnSDnSOxV1eYmGfvK7mqiwvd1C59CEEz7dAQ==} + vue@3.5.10: + resolution: {integrity: sha512-Vy2kmJwHPlouC/tSnIgXVg03SG+9wSqT1xu1Vehc+ChsXsRd7jLkKgMltVEFOzUdBr3uFwBCG+41LJtfAcBRng==} peerDependencies: typescript: '*' peerDependenciesMeta: @@ -10798,7 +11023,7 @@ packages: vueuc@0.4.63: resolution: {integrity: sha512-QJT0z9yYWXdKpUq6f6IrAgJ83e34iTYMCVHjcAP8lCjldG0JzHnDfJYMpPWkNuLB5SdBZCbYGmYTKnTR+ff7CQ==} peerDependencies: - vue: 3.5.8 + vue: 3.5.10 w3c-keyname@2.2.8: resolution: {integrity: sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==} @@ -11197,11 +11422,11 @@ snapshots: '@ant-design/icons-svg@4.4.2': {} - '@ant-design/icons-vue@7.0.1(vue@3.5.8(typescript@5.6.2))': + '@ant-design/icons-vue@7.0.1(vue@3.5.10(typescript@5.6.2))': dependencies: '@ant-design/colors': 6.0.0 '@ant-design/icons-svg': 4.4.2 - vue: 3.5.8(typescript@5.6.2) + vue: 3.5.10(typescript@5.6.2) '@antfu/install-pkg@0.4.1': dependencies: @@ -12274,6 +12499,7 @@ snapshots: dependencies: mime: 3.0.0 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD '@codemirror/autocomplete@6.18.0(@codemirror/language@6.10.2)(@codemirror/state@6.4.1)(@codemirror/view@6.33.0)(@lezer/common@1.2.1)': @@ -12399,10 +12625,13 @@ snapshots: ======= '@commitlint/cli@19.5.0(@types/node@22.7.2)(typescript@5.6.2)': >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + '@commitlint/cli@19.5.0(@types/node@22.7.4)(typescript@5.6.2)': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@commitlint/format': 19.5.0 '@commitlint/lint': 19.5.0 - '@commitlint/load': 19.5.0(@types/node@22.7.2)(typescript@5.6.2) + '@commitlint/load': 19.5.0(@types/node@22.7.4)(typescript@5.6.2) '@commitlint/read': 19.5.0 '@commitlint/types': 19.5.0 tinyexec: 0.3.0 @@ -12449,7 +12678,7 @@ snapshots: '@commitlint/rules': 19.5.0 '@commitlint/types': 19.5.0 - '@commitlint/load@19.5.0(@types/node@22.7.2)(typescript@5.6.2)': + '@commitlint/load@19.5.0(@types/node@22.7.4)(typescript@5.6.2)': dependencies: '@commitlint/config-validator': 19.5.0 '@commitlint/execute-rule': 19.5.0 @@ -12457,7 +12686,7 @@ snapshots: '@commitlint/types': 19.5.0 chalk: 5.3.0 cosmiconfig: 9.0.0(typescript@5.6.2) - cosmiconfig-typescript-loader: 5.0.0(@types/node@22.7.2)(cosmiconfig@9.0.0(typescript@5.6.2))(typescript@5.6.2) + cosmiconfig-typescript-loader: 5.0.0(@types/node@22.7.4)(cosmiconfig@9.0.0(typescript@5.6.2))(typescript@5.6.2) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 @@ -12702,9 +12931,9 @@ snapshots: dependencies: css-render: 0.15.14 - '@css-render/vue3-ssr@0.15.14(vue@3.5.8(typescript@5.6.2))': + '@css-render/vue3-ssr@0.15.14(vue@3.5.10(typescript@5.6.2))': dependencies: - vue: 3.5.8(typescript@5.6.2) + vue: 3.5.10(typescript@5.6.2) '@csstools/cascade-layer-name-parser@2.0.1(@csstools/css-parser-algorithms@3.0.1(@csstools/css-tokenizer@3.0.1))(@csstools/css-tokenizer@3.0.1)': dependencies: @@ -12976,9 +13205,9 @@ snapshots: '@dual-bundle/import-meta-resolve@4.1.0': {} - '@element-plus/icons-vue@2.3.1(vue@3.5.8(typescript@5.6.2))': + '@element-plus/icons-vue@2.3.1(vue@3.5.10(typescript@5.6.2))': dependencies: - vue: 3.5.8(typescript@5.6.2) + vue: 3.5.10(typescript@5.6.2) '@emotion/hash@0.8.0': {} @@ -13323,6 +13552,7 @@ snapshots: '@floating-ui/utils@0.2.7': {} +<<<<<<< HEAD <<<<<<< HEAD '@floating-ui/vue@1.1.4(vue@3.5.7(typescript@5.6.2))': dependencies: @@ -13336,6 +13566,13 @@ snapshots: '@floating-ui/utils': 0.2.8 vue-demi: 0.14.10(vue@3.5.8(typescript@5.6.2)) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + '@floating-ui/vue@1.1.5(vue@3.5.10(typescript@5.6.2))': + dependencies: + '@floating-ui/dom': 1.6.11 + '@floating-ui/utils': 0.2.8 + vue-demi: 0.14.10(vue@3.5.10(typescript@5.6.2)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 transitivePeerDependencies: - '@vue/composition-api' - vue @@ -13358,7 +13595,7 @@ snapshots: dependencies: '@iconify/types': 2.0.0 - '@iconify/json@2.2.252': + '@iconify/json@2.2.254': dependencies: '@iconify/types': 2.0.0 pathe: 1.1.2 @@ -13381,10 +13618,10 @@ snapshots: transitivePeerDependencies: - supports-color - '@iconify/vue@4.1.2(vue@3.5.8(typescript@5.6.2))': + '@iconify/vue@4.1.2(vue@3.5.10(typescript@5.6.2))': dependencies: '@iconify/types': 2.0.0 - vue: 3.5.8(typescript@5.6.2) + vue: 3.5.10(typescript@5.6.2) '@internationalized/date@3.5.5': dependencies: @@ -13394,7 +13631,7 @@ snapshots: dependencies: '@swc/helpers': 0.5.13 - '@intlify/bundle-utils@9.0.0-beta.0(vue-i18n@10.0.3(vue@3.5.8(typescript@5.6.2)))': + '@intlify/bundle-utils@9.0.0-beta.0(vue-i18n@10.0.3(vue@3.5.10(typescript@5.6.2)))': dependencies: '@intlify/message-compiler': 10.0.0 '@intlify/shared': 10.0.0 @@ -13406,7 +13643,7 @@ snapshots: source-map-js: 1.2.1 yaml-eslint-parser: 1.2.3 optionalDependencies: - vue-i18n: 10.0.3(vue@3.5.8(typescript@5.6.2)) + vue-i18n: 10.0.3(vue@3.5.10(typescript@5.6.2)) '@intlify/core-base@10.0.3': dependencies: @@ -13427,6 +13664,7 @@ snapshots: '@intlify/shared@10.0.3': {} +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD '@intlify/unplugin-vue-i18n@5.2.0(@vue/compiler-dom@3.5.7)(eslint@9.11.0(jiti@1.21.6))(rollup@4.22.4)(typescript@5.6.2)(vue-i18n@10.0.3(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2))(webpack-sources@3.2.3)': @@ -13436,10 +13674,14 @@ snapshots: ======= '@intlify/unplugin-vue-i18n@5.2.0(@vue/compiler-dom@3.5.8)(eslint@9.11.1(jiti@2.0.0))(rollup@4.22.4)(typescript@5.6.2)(vue-i18n@10.0.3(vue@3.5.8(typescript@5.6.2)))(vue@3.5.8(typescript@5.6.2))': >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + '@intlify/unplugin-vue-i18n@5.2.0(@vue/compiler-dom@3.5.10)(eslint@9.11.1(jiti@2.0.0))(rollup@4.22.5)(typescript@5.6.2)(vue-i18n@10.0.3(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2))': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0)) - '@intlify/bundle-utils': 9.0.0-beta.0(vue-i18n@10.0.3(vue@3.5.8(typescript@5.6.2))) + '@intlify/bundle-utils': 9.0.0-beta.0(vue-i18n@10.0.3(vue@3.5.10(typescript@5.6.2))) '@intlify/shared': 10.0.0 +<<<<<<< HEAD <<<<<<< HEAD '@intlify/vue-i18n-extensions': 7.0.0(@intlify/shared@10.0.0)(@vue/compiler-dom@3.5.7)(vue-i18n@10.0.3(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2)) '@rollup/pluginutils': 5.1.0(rollup@4.22.4) @@ -13447,6 +13689,10 @@ snapshots: '@intlify/vue-i18n-extensions': 7.0.0(@intlify/shared@10.0.0)(@vue/compiler-dom@3.5.8)(vue-i18n@10.0.3(vue@3.5.8(typescript@5.6.2)))(vue@3.5.8(typescript@5.6.2)) '@rollup/pluginutils': 5.1.2(rollup@4.22.4) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + '@intlify/vue-i18n-extensions': 7.0.0(@intlify/shared@10.0.0)(@vue/compiler-dom@3.5.10)(vue-i18n@10.0.3(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2)) + '@rollup/pluginutils': 5.1.2(rollup@4.22.5) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@typescript-eslint/scope-manager': 7.18.0 '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.6.2) debug: 4.3.7 @@ -13461,10 +13707,14 @@ snapshots: vue: 3.5.7(typescript@5.6.2) ======= unplugin: 1.14.1 +<<<<<<< HEAD vue: 3.5.8(typescript@5.6.2) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + vue: 3.5.10(typescript@5.6.2) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optionalDependencies: - vue-i18n: 10.0.3(vue@3.5.8(typescript@5.6.2)) + vue-i18n: 10.0.3(vue@3.5.10(typescript@5.6.2)) transitivePeerDependencies: - '@vue/compiler-dom' - eslint @@ -13473,15 +13723,20 @@ snapshots: - typescript - webpack-sources +<<<<<<< HEAD <<<<<<< HEAD '@intlify/vue-i18n-extensions@7.0.0(@intlify/shared@10.0.0)(@vue/compiler-dom@3.5.7)(vue-i18n@10.0.3(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2))': ======= '@intlify/vue-i18n-extensions@7.0.0(@intlify/shared@10.0.0)(@vue/compiler-dom@3.5.8)(vue-i18n@10.0.3(vue@3.5.8(typescript@5.6.2)))(vue@3.5.8(typescript@5.6.2))': >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + '@intlify/vue-i18n-extensions@7.0.0(@intlify/shared@10.0.0)(@vue/compiler-dom@3.5.10)(vue-i18n@10.0.3(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2))': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@babel/parser': 7.25.6 optionalDependencies: '@intlify/shared': 10.0.0 +<<<<<<< HEAD <<<<<<< HEAD '@vue/compiler-dom': 3.5.7 vue: 3.5.7(typescript@5.6.2) @@ -13491,6 +13746,11 @@ snapshots: vue: 3.5.8(typescript@5.6.2) vue-i18n: 10.0.3(vue@3.5.8(typescript@5.6.2)) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + '@vue/compiler-dom': 3.5.10 + vue: 3.5.10(typescript@5.6.2) + vue-i18n: 10.0.3(vue@3.5.10(typescript@5.6.2)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@ioredis/commands@1.2.0': {} @@ -13628,23 +13888,23 @@ snapshots: - encoding - supports-color - '@microsoft/api-extractor-model@7.29.6(@types/node@22.7.2)': + '@microsoft/api-extractor-model@7.29.6(@types/node@22.7.4)': dependencies: '@microsoft/tsdoc': 0.15.0 '@microsoft/tsdoc-config': 0.17.0 - '@rushstack/node-core-library': 5.7.0(@types/node@22.7.2) + '@rushstack/node-core-library': 5.7.0(@types/node@22.7.4) transitivePeerDependencies: - '@types/node' - '@microsoft/api-extractor@7.47.7(@types/node@22.7.2)': + '@microsoft/api-extractor@7.47.7(@types/node@22.7.4)': dependencies: - '@microsoft/api-extractor-model': 7.29.6(@types/node@22.7.2) + '@microsoft/api-extractor-model': 7.29.6(@types/node@22.7.4) '@microsoft/tsdoc': 0.15.0 '@microsoft/tsdoc-config': 0.17.0 - '@rushstack/node-core-library': 5.7.0(@types/node@22.7.2) + '@rushstack/node-core-library': 5.7.0(@types/node@22.7.4) '@rushstack/rig-package': 0.5.3 - '@rushstack/terminal': 0.14.0(@types/node@22.7.2) - '@rushstack/ts-command-line': 4.22.6(@types/node@22.7.2) + '@rushstack/terminal': 0.14.0(@types/node@22.7.4) + '@rushstack/ts-command-line': 4.22.6(@types/node@22.7.4) lodash: 4.17.21 minimatch: 3.0.8 resolve: 1.22.8 @@ -13686,6 +13946,7 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.17.1 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD '@nolebase/ui@2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2)': @@ -13705,6 +13966,14 @@ snapshots: vitepress: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.7.2)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) vue: 3.5.8(typescript@5.6.2) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + '@nolebase/ui@2.5.0(@algolia/client-search@4.24.0)(@types/node@22.7.4)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.4)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2)': + dependencies: + '@iconify-json/octicon': 1.2.0 + less: 4.2.0 + vitepress: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.7.4)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.4)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) + vue: 3.5.10(typescript@5.6.2) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 transitivePeerDependencies: - '@algolia/client-search' - '@types/node' @@ -13734,6 +14003,7 @@ snapshots: - typescript - universal-cookie +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD '@nolebase/vitepress-plugin-git-changelog@2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2)': @@ -13749,9 +14019,12 @@ snapshots: ======= '@nolebase/vitepress-plugin-git-changelog@2.5.0(@algolia/client-search@4.24.0)(@types/node@22.7.2)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2)': >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + '@nolebase/vitepress-plugin-git-changelog@2.5.0(@algolia/client-search@4.24.0)(@types/node@22.7.4)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.4)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2)': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@iconify-json/octicon': 1.2.0 - '@nolebase/ui': 2.5.0(@algolia/client-search@4.24.0)(@types/node@22.7.2)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) + '@nolebase/ui': 2.5.0(@algolia/client-search@4.24.0)(@types/node@22.7.4)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.4)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) colorette: 2.0.20 date-fns: 3.6.0 defu: 6.1.4 @@ -13763,6 +14036,7 @@ snapshots: less: 4.2.0 uncrypto: 0.1.3 <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD vitepress: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2) ======= @@ -13771,6 +14045,9 @@ snapshots: ======= vitepress: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.7.2)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vitepress: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.7.4)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.4)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 transitivePeerDependencies: - '@algolia/client-search' - '@types/node' @@ -13810,6 +14087,7 @@ snapshots: mkdirp: 1.0.4 rimraf: 3.0.2 +<<<<<<< HEAD '@nuxt/kit@3.13.2(rollup@3.29.4)': dependencies: '@nuxt/schema': 3.13.2(rollup@3.29.4) @@ -13839,8 +14117,11 @@ snapshots: - webpack-sources '@nuxt/kit@3.13.2(rollup@4.22.4)': +======= + '@nuxt/kit@3.13.2(rollup@3.29.5)': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: - '@nuxt/schema': 3.13.2(rollup@4.22.4) + '@nuxt/schema': 3.13.2(rollup@3.29.5) c12: 1.11.2 consola: 3.2.3 defu: 6.1.4 @@ -13857,8 +14138,13 @@ snapshots: scule: 1.3.0 semver: 7.6.3 ufo: 1.5.4 +<<<<<<< HEAD unctx: 2.3.1(webpack-sources@3.2.3) unimport: 3.12.0(rollup@4.22.4) +======= + unctx: 2.3.1 + unimport: 3.12.0(rollup@3.29.5) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 untyped: 1.4.2 transitivePeerDependencies: - magicast @@ -13886,7 +14172,7 @@ snapshots: - supports-color - webpack-sources - '@nuxt/schema@3.13.2(rollup@4.22.4)': + '@nuxt/schema@3.13.2(rollup@3.29.5)': dependencies: compatx: 0.1.8 consola: 3.2.3 @@ -13898,7 +14184,7 @@ snapshots: std-env: 3.7.0 ufo: 1.5.4 uncrypto: 0.1.3 - unimport: 3.12.0(rollup@4.22.4) + unimport: 3.12.0(rollup@3.29.5) untyped: 1.4.2 transitivePeerDependencies: - rollup @@ -14019,12 +14305,12 @@ snapshots: optionalDependencies: rollup: 4.22.0 - '@rollup/plugin-babel@5.3.1(@babel/core@7.25.2)(rollup@2.79.1)': + '@rollup/plugin-babel@5.3.1(@babel/core@7.25.2)(rollup@2.79.2)': dependencies: '@babel/core': 7.25.2 '@babel/helper-module-imports': 7.24.7 - '@rollup/pluginutils': 3.1.0(rollup@2.79.1) - rollup: 2.79.1 + '@rollup/pluginutils': 3.1.0(rollup@2.79.2) + rollup: 2.79.2 transitivePeerDependencies: - supports-color @@ -14090,15 +14376,15 @@ snapshots: optionalDependencies: rollup: 4.22.0 - '@rollup/plugin-node-resolve@15.3.0(rollup@2.79.1)': + '@rollup/plugin-node-resolve@15.3.0(rollup@2.79.2)': dependencies: - '@rollup/pluginutils': 5.1.2(rollup@2.79.1) + '@rollup/pluginutils': 5.1.2(rollup@2.79.2) '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-module: 1.0.0 resolve: 1.22.8 optionalDependencies: - rollup: 2.79.1 + rollup: 2.79.2 <<<<<<< HEAD '@rollup/plugin-node-resolve@15.2.3(rollup@3.29.4)': @@ -14132,11 +14418,11 @@ snapshots: optionalDependencies: rollup: 4.22.0 - '@rollup/plugin-replace@2.4.2(rollup@2.79.1)': + '@rollup/plugin-replace@2.4.2(rollup@2.79.2)': dependencies: - '@rollup/pluginutils': 3.1.0(rollup@2.79.1) + '@rollup/pluginutils': 3.1.0(rollup@2.79.2) magic-string: 0.25.9 - rollup: 2.79.1 + rollup: 2.79.2 '@rollup/plugin-replace@5.0.7(rollup@3.29.4)': dependencies: @@ -14160,13 +14446,13 @@ snapshots: optionalDependencies: rollup: 4.22.0 - '@rollup/plugin-terser@0.4.4(rollup@2.79.1)': + '@rollup/plugin-terser@0.4.4(rollup@2.79.2)': dependencies: serialize-javascript: 6.0.2 smob: 1.5.0 terser: 5.32.0 optionalDependencies: - rollup: 2.79.1 + rollup: 2.79.2 '@rollup/plugin-terser@0.4.4(rollup@4.22.0)': dependencies: @@ -14176,25 +14462,25 @@ snapshots: optionalDependencies: rollup: 4.22.0 - '@rollup/pluginutils@3.1.0(rollup@2.79.1)': + '@rollup/pluginutils@3.1.0(rollup@2.79.2)': dependencies: '@types/estree': 0.0.39 estree-walker: 1.0.1 picomatch: 2.3.1 - rollup: 2.79.1 + rollup: 2.79.2 '@rollup/pluginutils@4.2.1': dependencies: estree-walker: 2.0.2 picomatch: 2.3.1 - '@rollup/pluginutils@5.1.2(rollup@2.79.1)': + '@rollup/pluginutils@5.1.2(rollup@2.79.2)': dependencies: '@types/estree': 1.0.5 estree-walker: 2.0.2 picomatch: 2.3.1 optionalDependencies: - rollup: 2.79.1 + rollup: 2.79.2 <<<<<<< HEAD '@rollup/pluginutils@5.1.0(rollup@3.29.4)': @@ -14224,103 +14510,176 @@ snapshots: optionalDependencies: rollup: 4.22.4 +<<<<<<< HEAD '@rollup/rollup-android-arm-eabi@4.22.0': optional: true +======= + '@rollup/pluginutils@5.1.2(rollup@4.22.5)': + dependencies: + '@types/estree': 1.0.6 + estree-walker: 2.0.2 + picomatch: 2.3.1 + optionalDependencies: + rollup: 4.22.5 +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@rollup/rollup-android-arm-eabi@4.22.4': optional: true +<<<<<<< HEAD '@rollup/rollup-android-arm64@4.22.0': +======= + '@rollup/rollup-android-arm-eabi@4.22.5': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optional: true '@rollup/rollup-android-arm64@4.22.4': optional: true +<<<<<<< HEAD '@rollup/rollup-darwin-arm64@4.22.0': +======= + '@rollup/rollup-android-arm64@4.22.5': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optional: true '@rollup/rollup-darwin-arm64@4.22.4': optional: true +<<<<<<< HEAD '@rollup/rollup-darwin-x64@4.22.0': +======= + '@rollup/rollup-darwin-arm64@4.22.5': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optional: true '@rollup/rollup-darwin-x64@4.22.4': optional: true +<<<<<<< HEAD '@rollup/rollup-linux-arm-gnueabihf@4.22.0': +======= + '@rollup/rollup-darwin-x64@4.22.5': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optional: true '@rollup/rollup-linux-arm-gnueabihf@4.22.4': optional: true +<<<<<<< HEAD '@rollup/rollup-linux-arm-musleabihf@4.22.0': +======= + '@rollup/rollup-linux-arm-gnueabihf@4.22.5': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optional: true '@rollup/rollup-linux-arm-musleabihf@4.22.4': optional: true +<<<<<<< HEAD '@rollup/rollup-linux-arm64-gnu@4.22.0': +======= + '@rollup/rollup-linux-arm-musleabihf@4.22.5': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optional: true '@rollup/rollup-linux-arm64-gnu@4.22.4': optional: true +<<<<<<< HEAD '@rollup/rollup-linux-arm64-musl@4.22.0': +======= + '@rollup/rollup-linux-arm64-gnu@4.22.5': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optional: true '@rollup/rollup-linux-arm64-musl@4.22.4': optional: true +<<<<<<< HEAD '@rollup/rollup-linux-powerpc64le-gnu@4.22.0': +======= + '@rollup/rollup-linux-arm64-musl@4.22.5': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optional: true '@rollup/rollup-linux-powerpc64le-gnu@4.22.4': optional: true +<<<<<<< HEAD '@rollup/rollup-linux-riscv64-gnu@4.22.0': +======= + '@rollup/rollup-linux-powerpc64le-gnu@4.22.5': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optional: true '@rollup/rollup-linux-riscv64-gnu@4.22.4': optional: true +<<<<<<< HEAD '@rollup/rollup-linux-s390x-gnu@4.22.0': +======= + '@rollup/rollup-linux-riscv64-gnu@4.22.5': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optional: true '@rollup/rollup-linux-s390x-gnu@4.22.4': optional: true +<<<<<<< HEAD '@rollup/rollup-linux-x64-gnu@4.22.0': +======= + '@rollup/rollup-linux-s390x-gnu@4.22.5': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optional: true '@rollup/rollup-linux-x64-gnu@4.22.4': optional: true +<<<<<<< HEAD '@rollup/rollup-linux-x64-musl@4.22.0': +======= + '@rollup/rollup-linux-x64-gnu@4.22.5': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optional: true '@rollup/rollup-linux-x64-musl@4.22.4': optional: true +<<<<<<< HEAD '@rollup/rollup-win32-arm64-msvc@4.22.0': +======= + '@rollup/rollup-linux-x64-musl@4.22.5': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optional: true '@rollup/rollup-win32-arm64-msvc@4.22.4': optional: true +<<<<<<< HEAD '@rollup/rollup-win32-ia32-msvc@4.22.0': +======= + '@rollup/rollup-win32-arm64-msvc@4.22.5': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optional: true '@rollup/rollup-win32-ia32-msvc@4.22.4': optional: true +<<<<<<< HEAD '@rollup/rollup-win32-x64-msvc@4.22.0': +======= + '@rollup/rollup-win32-ia32-msvc@4.22.5': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optional: true '@rollup/rollup-win32-x64-msvc@4.22.4': optional: true - '@rushstack/node-core-library@5.7.0(@types/node@22.7.2)': + '@rollup/rollup-win32-x64-msvc@4.22.5': + optional: true + + '@rushstack/node-core-library@5.7.0(@types/node@22.7.4)': dependencies: ajv: 8.13.0 ajv-draft-04: 1.0.0(ajv@8.13.0) @@ -14331,23 +14690,23 @@ snapshots: resolve: 1.22.8 semver: 7.5.4 optionalDependencies: - '@types/node': 22.7.2 + '@types/node': 22.7.4 '@rushstack/rig-package@0.5.3': dependencies: resolve: 1.22.8 strip-json-comments: 3.1.1 - '@rushstack/terminal@0.14.0(@types/node@22.7.2)': + '@rushstack/terminal@0.14.0(@types/node@22.7.4)': dependencies: - '@rushstack/node-core-library': 5.7.0(@types/node@22.7.2) + '@rushstack/node-core-library': 5.7.0(@types/node@22.7.4) supports-color: 8.1.1 optionalDependencies: - '@types/node': 22.7.2 + '@types/node': 22.7.4 - '@rushstack/ts-command-line@4.22.6(@types/node@22.7.2)': + '@rushstack/ts-command-line@4.22.6(@types/node@22.7.4)': dependencies: - '@rushstack/terminal': 0.14.0(@types/node@22.7.2) + '@rushstack/terminal': 0.14.0(@types/node@22.7.4) '@types/argparse': 1.0.38 argparse: 1.0.10 string-argv: 0.3.2 @@ -14443,20 +14802,21 @@ snapshots: '@tanstack/virtual-core@3.10.7': {} - '@tanstack/vue-query@5.56.2(vue@3.5.8(typescript@5.6.2))': + '@tanstack/vue-query@5.56.2(vue@3.5.10(typescript@5.6.2))': dependencies: '@tanstack/match-sorter-utils': 8.19.4 '@tanstack/query-core': 5.56.2 '@vue/devtools-api': 6.6.4 - vue: 3.5.8(typescript@5.6.2) - vue-demi: 0.14.10(vue@3.5.8(typescript@5.6.2)) + vue: 3.5.10(typescript@5.6.2) + vue-demi: 0.14.10(vue@3.5.10(typescript@5.6.2)) - '@tanstack/vue-store@0.5.5(vue@3.5.8(typescript@5.6.2))': + '@tanstack/vue-store@0.5.5(vue@3.5.10(typescript@5.6.2))': dependencies: '@tanstack/store': 0.5.5 - vue: 3.5.8(typescript@5.6.2) - vue-demi: 0.14.10(vue@3.5.8(typescript@5.6.2)) + vue: 3.5.10(typescript@5.6.2) + vue-demi: 0.14.10(vue@3.5.10(typescript@5.6.2)) +<<<<<<< HEAD <<<<<<< HEAD '@tanstack/vue-virtual@3.10.7(vue@3.5.7(typescript@5.6.2))': dependencies: @@ -14473,6 +14833,12 @@ snapshots: '@tanstack/virtual-core': 3.10.8 vue: 3.5.8(typescript@5.6.2) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + '@tanstack/vue-virtual@3.10.8(vue@3.5.10(typescript@5.6.2))': + dependencies: + '@tanstack/virtual-core': 3.10.8 + vue: 3.5.10(typescript@5.6.2) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@tootallnate/once@1.1.2': {} @@ -14492,7 +14858,7 @@ snapshots: '@types/conventional-commits-parser@5.0.0': dependencies: - '@types/node': 22.7.2 + '@types/node': 22.7.4 '@types/crypto-js@4.2.2': {} @@ -14508,7 +14874,7 @@ snapshots: '@types/fs-extra@11.0.4': dependencies: '@types/jsonfile': 6.1.4 - '@types/node': 22.7.2 + '@types/node': 22.7.4 optional: true '@types/hast@3.0.4': @@ -14519,18 +14885,18 @@ snapshots: '@types/http-proxy@1.17.15': dependencies: - '@types/node': 22.7.2 + '@types/node': 22.7.4 '@types/json-schema@7.0.15': {} '@types/jsonfile@6.1.4': dependencies: - '@types/node': 22.7.2 + '@types/node': 22.7.4 optional: true '@types/jsonwebtoken@9.0.7': dependencies: - '@types/node': 22.7.2 + '@types/node': 22.7.4 '@types/katex@0.16.7': {} @@ -14561,7 +14927,7 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@22.7.2': + '@types/node@22.7.4': dependencies: undici-types: 6.19.8 @@ -14577,11 +14943,11 @@ snapshots: '@types/qrcode@1.5.5': dependencies: - '@types/node': 22.7.2 + '@types/node': 22.7.4 '@types/readdir-glob@1.1.5': dependencies: - '@types/node': 22.7.2 + '@types/node': 22.7.4 '@types/resolve@1.20.2': {} @@ -14732,10 +15098,10 @@ snapshots: '@ungap/structured-clone@1.2.0': {} - '@vee-validate/zod@4.13.2(vue@3.5.8(typescript@5.6.2))': + '@vee-validate/zod@4.13.2(vue@3.5.10(typescript@5.6.2))': dependencies: type-fest: 4.26.1 - vee-validate: 4.13.2(vue@3.5.8(typescript@5.6.2)) + vee-validate: 4.13.2(vue@3.5.10(typescript@5.6.2)) zod: 3.23.8 transitivePeerDependencies: - vue @@ -14758,6 +15124,7 @@ snapshots: - encoding - supports-color +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD '@vite-pwa/vitepress@0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0))': @@ -14770,20 +15137,28 @@ snapshots: ======= '@vite-pwa/vitepress@0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0))': >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + '@vite-pwa/vitepress@0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0))': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: - vite-plugin-pwa: 0.20.5(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0) + vite-plugin-pwa: 0.20.5(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0) +<<<<<<< HEAD <<<<<<< HEAD '@vitejs/plugin-vue-jsx@4.0.1(vite@5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.8(typescript@5.6.2))': >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f ======= '@vitejs/plugin-vue-jsx@4.0.1(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.8(typescript@5.6.2))': >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + '@vitejs/plugin-vue-jsx@4.0.1(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))(vue@3.5.10(typescript@5.6.2))': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@babel/core': 7.25.2 '@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.2) '@vue/babel-plugin-jsx': 1.2.5(@babel/core@7.25.2) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) vue: 3.5.7(typescript@5.6.2) @@ -14805,14 +15180,23 @@ snapshots: vite: 5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 vue: 3.5.8(typescript@5.6.2) +======= + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) + vue: 3.5.10(typescript@5.6.2) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue@5.1.4(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.8(typescript@5.6.2))': + '@vitejs/plugin-vue@5.1.4(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))(vue@3.5.10(typescript@5.6.2))': dependencies: +<<<<<<< HEAD vite: 5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) vue: 3.5.8(typescript@5.6.2) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) + vue: 3.5.10(typescript@5.6.2) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@vitest/expect@2.1.1': dependencies: @@ -14821,6 +15205,7 @@ snapshots: chai: 5.1.1 tinyrainbow: 1.2.0 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD '@vitest/mocker@2.1.1(@vitest/spy@2.1.1)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))': @@ -14830,12 +15215,16 @@ snapshots: ======= '@vitest/mocker@2.1.1(@vitest/spy@2.1.1)(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))': >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + '@vitest/mocker@2.1.1(@vitest/spy@2.1.1)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@vitest/spy': 2.1.1 estree-walker: 3.0.3 magic-string: 0.30.11 optionalDependencies: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) ======= @@ -14844,6 +15233,9 @@ snapshots: ======= vite: 5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@vitest/pretty-format@2.1.1': dependencies: @@ -14908,12 +15300,28 @@ snapshots: '@babel/helper-module-imports': 7.24.7 '@babel/helper-plugin-utils': 7.24.8 '@babel/parser': 7.25.6 +<<<<<<< HEAD '@vue/compiler-sfc': 3.5.6 transitivePeerDependencies: - supports-color <<<<<<< HEAD '@vue/compiler-core@3.5.6': +======= + '@vue/compiler-sfc': 3.5.10 + transitivePeerDependencies: + - supports-color + + '@vue/compiler-core@3.5.10': + dependencies: + '@babel/parser': 7.25.6 + '@vue/shared': 3.5.10 + entities: 4.5.0 + estree-walker: 2.0.2 + source-map-js: 1.2.1 + + '@vue/compiler-core@3.5.8': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@babel/parser': 7.25.6 '@vue/shared': 3.5.6 @@ -14921,7 +15329,33 @@ snapshots: estree-walker: 2.0.2 source-map-js: 1.2.1 +<<<<<<< HEAD '@vue/compiler-core@3.5.7': +======= + '@vue/compiler-dom@3.5.10': + dependencies: + '@vue/compiler-core': 3.5.10 + '@vue/shared': 3.5.10 + + '@vue/compiler-dom@3.5.8': + dependencies: + '@vue/compiler-core': 3.5.8 + '@vue/shared': 3.5.8 + + '@vue/compiler-sfc@3.5.10': + dependencies: + '@babel/parser': 7.25.6 + '@vue/compiler-core': 3.5.10 + '@vue/compiler-dom': 3.5.10 + '@vue/compiler-ssr': 3.5.10 + '@vue/shared': 3.5.10 + estree-walker: 2.0.2 + magic-string: 0.30.11 + postcss: 8.4.47 + source-map-js: 1.2.1 + + '@vue/compiler-sfc@3.5.8': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@babel/parser': 7.25.6 '@vue/shared': 3.5.7 @@ -14958,6 +15392,7 @@ snapshots: postcss: 8.4.47 source-map-js: 1.2.1 +<<<<<<< HEAD <<<<<<< HEAD '@vue/compiler-sfc@3.5.7': dependencies: @@ -14985,6 +15420,13 @@ snapshots: '@vue/compiler-dom': 3.5.7 '@vue/shared': 3.5.7 ======= +======= + '@vue/compiler-ssr@3.5.10': + dependencies: + '@vue/compiler-dom': 3.5.10 + '@vue/shared': 3.5.10 + +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@vue/compiler-ssr@3.5.8': dependencies: '@vue/compiler-dom': 3.5.8 @@ -15002,6 +15444,7 @@ snapshots: dependencies: '@vue/devtools-kit': 7.4.6 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD '@vue/devtools-core@7.4.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(vue@3.5.7(typescript@5.6.2))': @@ -15011,6 +15454,9 @@ snapshots: ======= '@vue/devtools-core@7.4.6(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.8(typescript@5.6.2))': >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + '@vue/devtools-core@7.4.6(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))(vue@3.5.10(typescript@5.6.2))': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@vue/devtools-kit': 7.4.6 '@vue/devtools-shared': 7.4.6 @@ -15018,6 +15464,7 @@ snapshots: nanoid: 3.3.7 pathe: 1.1.2 <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD vite-hot-client: 0.2.3(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)) vue: 3.5.7(typescript@5.6.2) @@ -15028,6 +15475,10 @@ snapshots: >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 vue: 3.5.8(typescript@5.6.2) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + vite-hot-client: 0.2.3(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0)) + vue: 3.5.10(typescript@5.6.2) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 transitivePeerDependencies: - vite @@ -15047,10 +15498,17 @@ snapshots: '@vue/language-core@2.1.6(typescript@5.6.2)': dependencies: +<<<<<<< HEAD '@volar/language-core': 2.4.4 '@vue/compiler-dom': 3.5.6 '@vue/compiler-vue2': 2.7.16 '@vue/shared': 3.5.6 +======= + '@volar/language-core': 2.4.5 + '@vue/compiler-dom': 3.5.10 + '@vue/compiler-vue2': 2.7.16 + '@vue/shared': 3.5.10 +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 computeds: 0.0.1 minimatch: 9.0.5 muggle-string: 0.4.1 @@ -15058,24 +15516,25 @@ snapshots: optionalDependencies: typescript: 5.6.2 - '@vue/reactivity@3.5.8': + '@vue/reactivity@3.5.10': dependencies: - '@vue/shared': 3.5.8 + '@vue/shared': 3.5.10 - '@vue/runtime-core@3.5.8': + '@vue/runtime-core@3.5.10': dependencies: - '@vue/reactivity': 3.5.8 - '@vue/shared': 3.5.8 + '@vue/reactivity': 3.5.10 + '@vue/shared': 3.5.10 - '@vue/runtime-dom@3.5.8': + '@vue/runtime-dom@3.5.10': dependencies: - '@vue/reactivity': 3.5.8 - '@vue/runtime-core': 3.5.8 - '@vue/shared': 3.5.8 + '@vue/reactivity': 3.5.10 + '@vue/runtime-core': 3.5.10 + '@vue/shared': 3.5.10 csstype: 3.1.3 - '@vue/server-renderer@3.5.8(vue@3.5.8(typescript@5.6.2))': + '@vue/server-renderer@3.5.10(vue@3.5.10(typescript@5.6.2))': dependencies: +<<<<<<< HEAD <<<<<<< HEAD '@vue/compiler-ssr': 3.5.7 '@vue/shared': 3.5.7 @@ -15089,6 +15548,13 @@ snapshots: '@vue/shared': 3.5.8 vue: 3.5.8(typescript@5.6.2) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + '@vue/compiler-ssr': 3.5.10 + '@vue/shared': 3.5.10 + vue: 3.5.10(typescript@5.6.2) + + '@vue/shared@3.5.10': {} +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@vue/shared@3.5.8': {} @@ -15097,45 +15563,49 @@ snapshots: js-beautify: 1.15.1 vue-component-type-helpers: 2.1.6 - '@vueuse/core@10.11.1(vue@3.5.8(typescript@5.6.2))': + '@vueuse/core@10.11.1(vue@3.5.10(typescript@5.6.2))': dependencies: '@types/web-bluetooth': 0.0.20 '@vueuse/metadata': 10.11.1 - '@vueuse/shared': 10.11.1(vue@3.5.8(typescript@5.6.2)) - vue-demi: 0.14.10(vue@3.5.8(typescript@5.6.2)) + '@vueuse/shared': 10.11.1(vue@3.5.10(typescript@5.6.2)) + vue-demi: 0.14.10(vue@3.5.10(typescript@5.6.2)) transitivePeerDependencies: - '@vue/composition-api' - vue - '@vueuse/core@11.1.0(vue@3.5.8(typescript@5.6.2))': + '@vueuse/core@11.1.0(vue@3.5.10(typescript@5.6.2))': dependencies: '@types/web-bluetooth': 0.0.20 '@vueuse/metadata': 11.1.0 - '@vueuse/shared': 11.1.0(vue@3.5.8(typescript@5.6.2)) - vue-demi: 0.14.10(vue@3.5.8(typescript@5.6.2)) + '@vueuse/shared': 11.1.0(vue@3.5.10(typescript@5.6.2)) + vue-demi: 0.14.10(vue@3.5.10(typescript@5.6.2)) transitivePeerDependencies: - '@vue/composition-api' - vue - '@vueuse/core@9.13.0(vue@3.5.8(typescript@5.6.2))': + '@vueuse/core@9.13.0(vue@3.5.10(typescript@5.6.2))': dependencies: '@types/web-bluetooth': 0.0.16 '@vueuse/metadata': 9.13.0 - '@vueuse/shared': 9.13.0(vue@3.5.8(typescript@5.6.2)) - vue-demi: 0.14.10(vue@3.5.8(typescript@5.6.2)) + '@vueuse/shared': 9.13.0(vue@3.5.10(typescript@5.6.2)) + vue-demi: 0.14.10(vue@3.5.10(typescript@5.6.2)) transitivePeerDependencies: - '@vue/composition-api' - vue +<<<<<<< HEAD <<<<<<< HEAD '@vueuse/integrations@11.1.0(async-validator@4.2.5)(axios@1.7.7)(focus-trap@7.5.4)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.7(typescript@5.6.2))': ======= '@vueuse/integrations@11.1.0(async-validator@4.2.5)(axios@1.7.7)(focus-trap@7.6.0)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.8(typescript@5.6.2))': >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + '@vueuse/integrations@11.1.0(async-validator@4.2.5)(axios@1.7.7)(focus-trap@7.6.0)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.10(typescript@5.6.2))': +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: - '@vueuse/core': 11.1.0(vue@3.5.8(typescript@5.6.2)) - '@vueuse/shared': 11.1.0(vue@3.5.8(typescript@5.6.2)) - vue-demi: 0.14.10(vue@3.5.8(typescript@5.6.2)) + '@vueuse/core': 11.1.0(vue@3.5.10(typescript@5.6.2)) + '@vueuse/shared': 11.1.0(vue@3.5.10(typescript@5.6.2)) + vue-demi: 0.14.10(vue@3.5.10(typescript@5.6.2)) optionalDependencies: async-validator: 4.2.5 axios: 1.7.7 @@ -15153,23 +15623,23 @@ snapshots: '@vueuse/metadata@9.13.0': {} - '@vueuse/shared@10.11.1(vue@3.5.8(typescript@5.6.2))': + '@vueuse/shared@10.11.1(vue@3.5.10(typescript@5.6.2))': dependencies: - vue-demi: 0.14.10(vue@3.5.8(typescript@5.6.2)) + vue-demi: 0.14.10(vue@3.5.10(typescript@5.6.2)) transitivePeerDependencies: - '@vue/composition-api' - vue - '@vueuse/shared@11.1.0(vue@3.5.8(typescript@5.6.2))': + '@vueuse/shared@11.1.0(vue@3.5.10(typescript@5.6.2))': dependencies: - vue-demi: 0.14.10(vue@3.5.8(typescript@5.6.2)) + vue-demi: 0.14.10(vue@3.5.10(typescript@5.6.2)) transitivePeerDependencies: - '@vue/composition-api' - vue - '@vueuse/shared@9.13.0(vue@3.5.8(typescript@5.6.2))': + '@vueuse/shared@9.13.0(vue@3.5.10(typescript@5.6.2))': dependencies: - vue-demi: 0.14.10(vue@3.5.8(typescript@5.6.2)) + vue-demi: 0.14.10(vue@3.5.10(typescript@5.6.2)) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -15297,10 +15767,10 @@ snapshots: ansi-styles@6.2.1: {} - ant-design-vue@4.2.5(vue@3.5.8(typescript@5.6.2)): + ant-design-vue@4.2.5(vue@3.5.10(typescript@5.6.2)): dependencies: '@ant-design/colors': 6.0.0 - '@ant-design/icons-vue': 7.0.1(vue@3.5.8(typescript@5.6.2)) + '@ant-design/icons-vue': 7.0.1(vue@3.5.10(typescript@5.6.2)) '@babel/runtime': 7.25.6 '@ctrl/tinycolor': 4.1.0 '@emotion/hash': 0.9.2 @@ -15319,8 +15789,8 @@ snapshots: shallow-equal: 1.2.1 stylis: 4.3.4 throttle-debounce: 5.0.2 - vue: 3.5.8(typescript@5.6.2) - vue-types: 3.0.2(vue@3.5.8(typescript@5.6.2)) + vue: 3.5.10(typescript@5.6.2) + vue-types: 3.0.2(vue@3.5.10(typescript@5.6.2)) warning: 4.0.3 any-promise@1.3.0: {} @@ -15951,9 +16421,9 @@ snapshots: core-util-is@1.0.3: {} - cosmiconfig-typescript-loader@5.0.0(@types/node@22.7.2)(cosmiconfig@9.0.0(typescript@5.6.2))(typescript@5.6.2): + cosmiconfig-typescript-loader@5.0.0(@types/node@22.7.4)(cosmiconfig@9.0.0(typescript@5.6.2))(typescript@5.6.2): dependencies: - '@types/node': 22.7.2 + '@types/node': 22.7.4 cosmiconfig: 9.0.0(typescript@5.6.2) jiti: 1.21.6 typescript: 5.6.2 @@ -16216,9 +16686,9 @@ snapshots: csstype@3.1.3: {} - cz-git@1.9.4: {} + cz-git@1.10.0: {} - czg@1.9.4: {} + czg@1.10.0: {} dargs@8.1.0: {} @@ -16485,20 +16955,24 @@ snapshots: electron-to-chromium@1.5.29: {} >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 - element-plus@2.8.3(vue@3.5.8(typescript@5.6.2)): + element-plus@2.8.4(vue@3.5.10(typescript@5.6.2)): dependencies: '@ctrl/tinycolor': 4.1.0 +<<<<<<< HEAD <<<<<<< HEAD '@element-plus/icons-vue': 2.3.1(vue@3.5.7(typescript@5.6.2)) '@floating-ui/dom': 1.6.10 ======= '@element-plus/icons-vue': 2.3.1(vue@3.5.8(typescript@5.6.2)) +======= + '@element-plus/icons-vue': 2.3.1(vue@3.5.10(typescript@5.6.2)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@floating-ui/dom': 1.6.11 >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f '@popperjs/core': '@sxzz/popperjs-es@2.11.7' '@types/lodash': 4.17.9 '@types/lodash-es': 4.17.12 - '@vueuse/core': 9.13.0(vue@3.5.8(typescript@5.6.2)) + '@vueuse/core': 9.13.0(vue@3.5.10(typescript@5.6.2)) async-validator: 4.2.5 dayjs: 1.11.13 escape-html: 1.0.3 @@ -16507,7 +16981,7 @@ snapshots: lodash-unified: 1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.17.21)(lodash@4.17.21) memoize-one: 6.0.0 normalize-wheel-es: 1.2.0 - vue: 3.5.8(typescript@5.6.2) + vue: 3.5.10(typescript@5.6.2) transitivePeerDependencies: - '@vue/composition-api' @@ -16797,7 +17271,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-command@0.2.5(eslint@9.11.1(jiti@2.0.0)): + eslint-plugin-command@0.2.6(eslint@9.11.1(jiti@2.0.0)): dependencies: '@es-joy/jsdoccomment': 0.48.0 eslint: 9.11.1(jiti@2.0.0) @@ -16846,7 +17320,7 @@ snapshots: - supports-color - typescript - eslint-plugin-jsdoc@50.2.5(eslint@9.11.1(jiti@2.0.0)): + eslint-plugin-jsdoc@50.3.0(eslint@9.11.1(jiti@2.0.0)): dependencies: '@es-joy/jsdoccomment': 0.48.0 are-docs-informative: 0.0.2 @@ -16981,6 +17455,7 @@ snapshots: optionalDependencies: '@typescript-eslint/eslint-plugin': 8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.5.5)(happy-dom@15.7.4)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)): @@ -16990,6 +17465,9 @@ snapshots: ======= eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.7.2)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.7.4)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0)): +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@typescript-eslint/utils': 7.18.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) eslint: 9.11.1(jiti@2.0.0) @@ -17004,8 +17482,12 @@ snapshots: >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f ======= '@typescript-eslint/eslint-plugin': 8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) +<<<<<<< HEAD vitest: 2.1.1(@types/node@22.7.2)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vitest: 2.1.1(@types/node@22.7.4)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 transitivePeerDependencies: - supports-color - typescript @@ -18363,9 +18845,9 @@ snapshots: dependencies: yallist: 4.0.0 - lucide-vue-next@0.446.0(vue@3.5.8(typescript@5.6.2)): + lucide-vue-next@0.446.0(vue@3.5.10(typescript@5.6.2)): dependencies: - vue: 3.5.8(typescript@5.6.2) + vue: 3.5.10(typescript@5.6.2) magic-string@0.25.9: dependencies: @@ -18551,7 +19033,7 @@ snapshots: mkdirp@1.0.4: {} - mkdist@1.5.9(sass@1.79.3)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2)): + mkdist@1.5.9(sass@1.79.4)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2)): dependencies: autoprefixer: 10.4.20(postcss@8.4.47) citty: 0.1.6 @@ -18567,7 +19049,7 @@ snapshots: postcss-nested: 6.2.0(postcss@8.4.47) semver: 7.6.3 optionalDependencies: - sass: 1.79.3 + sass: 1.79.4 typescript: 5.6.2 vue-tsc: 2.1.6(typescript@5.6.2) @@ -18604,10 +19086,10 @@ snapshots: object-assign: 4.1.1 thenify-all: 1.6.0 - naive-ui@2.40.1(vue@3.5.8(typescript@5.6.2)): + naive-ui@2.40.1(vue@3.5.10(typescript@5.6.2)): dependencies: '@css-render/plugin-bem': 0.15.14(css-render@0.15.14) - '@css-render/vue3-ssr': 0.15.14(vue@3.5.8(typescript@5.6.2)) + '@css-render/vue3-ssr': 0.15.14(vue@3.5.10(typescript@5.6.2)) '@types/katex': 0.16.7 '@types/lodash': 4.17.9 '@types/lodash-es': 4.17.12 @@ -18622,10 +19104,10 @@ snapshots: lodash-es: 4.17.21 seemly: 0.3.8 treemate: 0.3.11 - vdirs: 0.1.8(vue@3.5.8(typescript@5.6.2)) - vooks: 0.2.12(vue@3.5.8(typescript@5.6.2)) - vue: 3.5.8(typescript@5.6.2) - vueuc: 0.4.63(vue@3.5.8(typescript@5.6.2)) + vdirs: 0.1.8(vue@3.5.10(typescript@5.6.2)) + vooks: 0.2.12(vue@3.5.10(typescript@5.6.2)) + vue: 3.5.10(typescript@5.6.2) + vueuc: 0.4.63(vue@3.5.10(typescript@5.6.2)) nanoid@3.3.7: {} @@ -19080,6 +19562,7 @@ snapshots: pify@4.0.1: {} +<<<<<<< HEAD <<<<<<< HEAD pinia-plugin-persistedstate@4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.7(typescript@5.6.2)))(rollup@3.29.4): ======= @@ -19087,22 +19570,27 @@ snapshots: >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f dependencies: '@nuxt/kit': 3.13.2(rollup@3.29.4) +======= + pinia-plugin-persistedstate@4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.10(typescript@5.6.2)))(rollup@3.29.5): + dependencies: + '@nuxt/kit': 3.13.2(rollup@3.29.5) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 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.8(typescript@5.6.2)) + pinia: 2.2.2(typescript@5.6.2)(vue@3.5.10(typescript@5.6.2)) transitivePeerDependencies: - magicast - rollup - supports-color - webpack-sources - pinia@2.2.2(typescript@5.6.2)(vue@3.5.8(typescript@5.6.2)): + pinia@2.2.2(typescript@5.6.2)(vue@3.5.10(typescript@5.6.2)): dependencies: '@vue/devtools-api': 6.6.4 - vue: 3.5.8(typescript@5.6.2) - vue-demi: 0.14.10(vue@3.5.8(typescript@5.6.2)) + vue: 3.5.10(typescript@5.6.2) + vue-demi: 0.14.10(vue@3.5.10(typescript@5.6.2)) optionalDependencies: typescript: 5.6.2 @@ -19648,7 +20136,7 @@ snapshots: queue-tick@1.0.1: {} - radix-vue@1.9.6(vue@3.5.8(typescript@5.6.2)): + radix-vue@1.9.6(vue@3.5.10(typescript@5.6.2)): dependencies: <<<<<<< HEAD '@floating-ui/dom': 1.6.10 @@ -19660,18 +20148,24 @@ snapshots: '@vueuse/shared': 10.11.1(vue@3.5.7(typescript@5.6.2)) ======= '@floating-ui/dom': 1.6.11 - '@floating-ui/vue': 1.1.5(vue@3.5.8(typescript@5.6.2)) + '@floating-ui/vue': 1.1.5(vue@3.5.10(typescript@5.6.2)) '@internationalized/date': 3.5.5 '@internationalized/number': 3.5.3 +<<<<<<< HEAD '@tanstack/vue-virtual': 3.10.8(vue@3.5.8(typescript@5.6.2)) '@vueuse/core': 10.11.1(vue@3.5.8(typescript@5.6.2)) '@vueuse/shared': 10.11.1(vue@3.5.8(typescript@5.6.2)) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + '@tanstack/vue-virtual': 3.10.8(vue@3.5.10(typescript@5.6.2)) + '@vueuse/core': 10.11.1(vue@3.5.10(typescript@5.6.2)) + '@vueuse/shared': 10.11.1(vue@3.5.10(typescript@5.6.2)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 aria-hidden: 1.2.4 defu: 6.1.4 fast-deep-equal: 3.1.3 nanoid: 5.0.7 - vue: 3.5.8(typescript@5.6.2) + vue: 3.5.10(typescript@5.6.2) transitivePeerDependencies: - '@vue/composition-api' @@ -19897,7 +20391,16 @@ snapshots: optionalDependencies: rollup: 4.22.4 - rollup@2.79.1: + rollup-plugin-visualizer@5.12.0(rollup@4.22.5): + dependencies: + open: 8.4.2 + picomatch: 2.3.1 + source-map: 0.7.4 + yargs: 17.7.2 + optionalDependencies: + rollup: 4.22.5 + + rollup@2.79.2: optionalDependencies: fsevents: 2.3.3 @@ -19949,6 +20452,28 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.22.4 fsevents: 2.3.3 + rollup@4.22.5: + dependencies: + '@types/estree': 1.0.6 + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.22.5 + '@rollup/rollup-android-arm64': 4.22.5 + '@rollup/rollup-darwin-arm64': 4.22.5 + '@rollup/rollup-darwin-x64': 4.22.5 + '@rollup/rollup-linux-arm-gnueabihf': 4.22.5 + '@rollup/rollup-linux-arm-musleabihf': 4.22.5 + '@rollup/rollup-linux-arm64-gnu': 4.22.5 + '@rollup/rollup-linux-arm64-musl': 4.22.5 + '@rollup/rollup-linux-powerpc64le-gnu': 4.22.5 + '@rollup/rollup-linux-riscv64-gnu': 4.22.5 + '@rollup/rollup-linux-s390x-gnu': 4.22.5 + '@rollup/rollup-linux-x64-gnu': 4.22.5 + '@rollup/rollup-linux-x64-musl': 4.22.5 + '@rollup/rollup-win32-arm64-msvc': 4.22.5 + '@rollup/rollup-win32-ia32-msvc': 4.22.5 + '@rollup/rollup-win32-x64-msvc': 4.22.5 + fsevents: 2.3.3 + rotated-array-set@3.0.0: {} rrweb-cssom@0.7.1: @@ -19983,7 +20508,7 @@ snapshots: safer-buffer@2.1.2: {} - sass@1.79.3: + sass@1.79.4: dependencies: chokidar: 4.0.1 immutable: 4.3.7 @@ -20795,7 +21320,7 @@ snapshots: has-symbols: 1.0.3 which-boxed-primitive: 1.0.2 - unbuild@2.0.0(sass@1.79.3)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2)): + unbuild@2.0.0(sass@1.79.4)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2)): dependencies: <<<<<<< HEAD '@rollup/plugin-alias': 5.1.0(rollup@3.29.4) @@ -20821,7 +21346,7 @@ snapshots: hookable: 5.5.3 jiti: 1.21.6 magic-string: 0.30.11 - mkdist: 1.5.9(sass@1.79.3)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2)) + mkdist: 1.5.9(sass@1.79.4)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2)) mlly: 1.7.1 pathe: 1.1.2 pkg-types: 1.2.0 @@ -20879,9 +21404,15 @@ snapshots: unicorn-magic@0.3.0: {} +<<<<<<< HEAD unimport@3.12.0(rollup@3.29.4): dependencies: '@rollup/pluginutils': 5.1.0(rollup@3.29.4) +======= + unimport@3.12.0(rollup@3.29.5): + dependencies: + '@rollup/pluginutils': 5.1.2(rollup@3.29.5) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 acorn: 8.12.1 escape-string-regexp: 5.0.0 estree-walker: 3.0.3 @@ -20893,6 +21424,7 @@ snapshots: pkg-types: 1.2.0 scule: 1.3.0 strip-literal: 2.1.0 +<<<<<<< HEAD unplugin: 1.14.1(webpack-sources@3.2.3) transitivePeerDependencies: - rollup @@ -20913,6 +21445,9 @@ snapshots: scule: 1.3.0 strip-literal: 2.1.0 unplugin: 1.14.1(webpack-sources@3.2.3) +======= + unplugin: 1.14.1 +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 transitivePeerDependencies: - rollup - webpack-sources @@ -20976,9 +21511,13 @@ snapshots: universalify@2.0.1: {} +<<<<<<< HEAD unplugin-element-plus@0.8.0(rollup@4.22.4)(webpack-sources@3.2.3): +======= + unplugin-element-plus@0.8.0(rollup@4.22.5): +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: - '@rollup/pluginutils': 5.1.2(rollup@4.22.4) + '@rollup/pluginutils': 5.1.2(rollup@4.22.5) es-module-lexer: 1.5.4 magic-string: 0.30.11 unplugin: 1.14.1(webpack-sources@3.2.3) @@ -21102,16 +21641,16 @@ snapshots: spdx-correct: 3.2.0 spdx-expression-parse: 3.0.1 - vdirs@0.1.8(vue@3.5.8(typescript@5.6.2)): + vdirs@0.1.8(vue@3.5.10(typescript@5.6.2)): dependencies: evtd: 0.2.4 - vue: 3.5.8(typescript@5.6.2) + vue: 3.5.10(typescript@5.6.2) - vee-validate@4.13.2(vue@3.5.8(typescript@5.6.2)): + vee-validate@4.13.2(vue@3.5.10(typescript@5.6.2)): dependencies: '@vue/devtools-api': 6.6.4 type-fest: 4.26.1 - vue: 3.5.8(typescript@5.6.2) + vue: 3.5.10(typescript@5.6.2) vfile-message@4.0.2: dependencies: @@ -21123,6 +21662,7 @@ snapshots: '@types/unist': 3.0.3 vfile-message: 4.0.2 +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD vite-hot-client@0.2.3(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)): @@ -21135,20 +21675,28 @@ snapshots: ======= vite-hot-client@0.2.3(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vite-hot-client@0.2.3(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0)): +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: - vite: 5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) +<<<<<<< HEAD <<<<<<< HEAD vite-node@2.1.1(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0): >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f ======= vite-node@2.1.1(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0): >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vite-node@2.1.1(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0): +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: cac: 6.7.14 debug: 4.3.7 pathe: 1.1.2 <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) ======= @@ -21157,6 +21705,9 @@ snapshots: ======= vite: 5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 transitivePeerDependencies: - '@types/node' - less @@ -21168,6 +21719,7 @@ snapshots: - supports-color - terser +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD vite-plugin-compression@0.5.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)): @@ -21177,11 +21729,15 @@ snapshots: ======= vite-plugin-compression@0.5.1(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vite-plugin-compression@0.5.1(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0)): +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: chalk: 4.1.2 debug: 4.3.7 fs-extra: 10.1.0 <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) transitivePeerDependencies: @@ -21197,13 +21753,16 @@ snapshots: ======= vite: 5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 transitivePeerDependencies: - supports-color - vite-plugin-dts@4.2.1(@types/node@22.7.2)(rollup@4.22.4)(typescript@5.6.2)(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): + vite-plugin-dts@4.2.1(@types/node@22.7.4)(rollup@4.22.5)(typescript@5.6.2)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0)): dependencies: - '@microsoft/api-extractor': 7.47.7(@types/node@22.7.2) - '@rollup/pluginutils': 5.1.2(rollup@4.22.4) + '@microsoft/api-extractor': 7.47.7(@types/node@22.7.4) + '@rollup/pluginutils': 5.1.2(rollup@4.22.5) '@volar/typescript': 2.4.5 >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f '@vue/language-core': 2.1.6(typescript@5.6.2) @@ -21215,6 +21774,7 @@ snapshots: typescript: 5.6.2 optionalDependencies: <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) ======= @@ -21223,11 +21783,15 @@ snapshots: ======= vite: 5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 transitivePeerDependencies: - '@types/node' - rollup - supports-color +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD vite-plugin-html@3.2.2(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)): @@ -21237,6 +21801,9 @@ snapshots: ======= vite-plugin-html@3.2.2(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vite-plugin-html@3.2.2(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0)): +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@rollup/pluginutils': 4.2.1 colorette: 2.0.20 @@ -21251,6 +21818,7 @@ snapshots: node-html-parser: 5.4.2 pathe: 0.2.0 <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) @@ -21265,9 +21833,14 @@ snapshots: vite-plugin-inspect@0.8.7(rollup@4.22.4)(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) + + vite-plugin-inspect@0.8.7(rollup@4.22.5)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0)): +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@antfu/utils': 0.7.10 - '@rollup/pluginutils': 5.1.2(rollup@4.22.4) + '@rollup/pluginutils': 5.1.2(rollup@4.22.5) debug: 4.3.7 error-stack-parser-es: 0.1.5 fs-extra: 11.2.0 @@ -21276,6 +21849,7 @@ snapshots: picocolors: 1.1.0 sirv: 2.0.4 <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) ======= @@ -21284,10 +21858,14 @@ snapshots: ======= vite: 5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 transitivePeerDependencies: - rollup - supports-color +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD vite-plugin-lib-inject-css@2.1.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)): @@ -21297,11 +21875,15 @@ snapshots: ======= vite-plugin-lib-inject-css@2.1.1(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vite-plugin-lib-inject-css@2.1.1(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0)): +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@ast-grep/napi': 0.22.6 magic-string: 0.30.11 picocolors: 1.1.0 <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) @@ -21316,11 +21898,17 @@ snapshots: vite-plugin-pwa@0.20.5(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0): >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) + + vite-plugin-pwa@0.20.5(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0): +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: debug: 4.3.7 pretty-bytes: 6.1.1 tinyglobby: 0.2.6 <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) ======= @@ -21329,11 +21917,15 @@ snapshots: ======= vite: 5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 workbox-build: 7.1.1 workbox-window: 7.1.0 transitivePeerDependencies: - supports-color +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD vite-plugin-pwa@0.20.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0): @@ -21362,12 +21954,16 @@ snapshots: ======= vite-plugin-vue-devtools@7.4.6(rollup@4.22.4)(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.8(typescript@5.6.2)): >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vite-plugin-vue-devtools@7.4.6(rollup@4.22.5)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))(vue@3.5.10(typescript@5.6.2)): +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: - '@vue/devtools-core': 7.4.6(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.8(typescript@5.6.2)) + '@vue/devtools-core': 7.4.6(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))(vue@3.5.10(typescript@5.6.2)) '@vue/devtools-kit': 7.4.6 '@vue/devtools-shared': 7.4.6 execa: 8.0.1 sirv: 2.0.4 +<<<<<<< HEAD <<<<<<< HEAD vite: 5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) vite-plugin-inspect: 0.8.7(rollup@4.22.4)(vite@5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) @@ -21378,12 +21974,18 @@ snapshots: vite-plugin-inspect: 0.8.7(rollup@4.22.4)(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) vite-plugin-vue-inspector: 5.2.0(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) + vite-plugin-inspect: 0.8.7(rollup@4.22.5)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0)) + vite-plugin-vue-inspector: 5.2.0(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 transitivePeerDependencies: - '@nuxt/kit' - rollup - supports-color - vue +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD vite-plugin-vue-inspector@5.2.0(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)): @@ -21393,6 +21995,9 @@ snapshots: ======= vite-plugin-vue-inspector@5.2.0(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vite-plugin-vue-inspector@5.2.0(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0)): +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@babel/core': 7.25.2 '@babel/plugin-proposal-decorators': 7.24.7(@babel/core@7.25.2) @@ -21400,6 +22005,7 @@ snapshots: '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.25.2) '@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.2) '@vue/babel-plugin-jsx': 1.2.5(@babel/core@7.25.2) +<<<<<<< HEAD '@vue/compiler-dom': 3.5.6 kolorist: 1.8.0 magic-string: 0.30.11 @@ -21428,10 +22034,25 @@ snapshots: esbuild: 0.21.5 postcss: 8.4.47 rollup: 4.22.0 +======= + '@vue/compiler-dom': 3.5.10 + kolorist: 1.8.0 + magic-string: 0.30.11 + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) + transitivePeerDependencies: + - supports-color + + vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0): + dependencies: + esbuild: 0.21.5 + postcss: 8.4.47 + rollup: 4.22.5 +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optionalDependencies: - '@types/node': 22.7.2 + '@types/node': 22.7.4 fsevents: 2.3.3 less: 4.2.0 +<<<<<<< HEAD sass: 1.79.3 terser: 5.32.0 @@ -21446,6 +22067,10 @@ snapshots: less: 4.2.0 sass: 1.79.3 terser: 5.32.0 +======= + sass: 1.79.4 + terser: 5.33.0 +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 vitepress-plugin-group-icons@1.2.4: dependencies: @@ -21455,6 +22080,7 @@ snapshots: transitivePeerDependencies: - supports-color +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD vitepress@1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2): @@ -21464,6 +22090,9 @@ snapshots: ======= vitepress@1.3.4(@algolia/client-search@4.24.0)(@types/node@22.7.2)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2): >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vitepress@1.3.4(@algolia/client-search@4.24.0)(@types/node@22.7.4)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.4)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2): +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@docsearch/css': 3.6.1 '@docsearch/js': 3.6.1(@algolia/client-search@4.24.0)(search-insights@2.17.2) @@ -21471,6 +22100,7 @@ snapshots: '@shikijs/transformers': 1.18.0 '@types/markdown-it': 14.1.2 <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD '@vitejs/plugin-vue': 5.1.4(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(vue@3.5.7(typescript@5.6.2)) '@vue/devtools-api': 7.4.5 @@ -21488,17 +22118,25 @@ snapshots: ======= '@vitejs/plugin-vue': 5.1.4(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.8(typescript@5.6.2)) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + '@vitejs/plugin-vue': 5.1.4(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))(vue@3.5.10(typescript@5.6.2)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@vue/devtools-api': 7.4.6 - '@vue/shared': 3.5.8 - '@vueuse/core': 11.1.0(vue@3.5.8(typescript@5.6.2)) - '@vueuse/integrations': 11.1.0(async-validator@4.2.5)(axios@1.7.7)(focus-trap@7.6.0)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.8(typescript@5.6.2)) + '@vue/shared': 3.5.10 + '@vueuse/core': 11.1.0(vue@3.5.10(typescript@5.6.2)) + '@vueuse/integrations': 11.1.0(async-validator@4.2.5)(axios@1.7.7)(focus-trap@7.6.0)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.10(typescript@5.6.2)) focus-trap: 7.6.0 mark.js: 8.11.1 minisearch: 7.1.0 shiki: 1.18.0 +<<<<<<< HEAD vite: 5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) vue: 3.5.8(typescript@5.6.2) >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) + vue: 3.5.10(typescript@5.6.2) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optionalDependencies: postcss: 8.4.47 transitivePeerDependencies: @@ -21529,6 +22167,7 @@ snapshots: - typescript - universal-cookie +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD vitest@2.1.1(@types/node@22.5.5)(happy-dom@15.7.4)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.3)(terser@5.32.0): @@ -21547,6 +22186,12 @@ snapshots: '@vitest/expect': 2.1.1 '@vitest/mocker': 2.1.1(@vitest/spy@2.1.1)(vite@5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vitest@2.1.1(@types/node@22.7.4)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0): + dependencies: + '@vitest/expect': 2.1.1 + '@vitest/mocker': 2.1.1(@vitest/spy@2.1.1)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0)) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 '@vitest/pretty-format': 2.1.1 '@vitest/runner': 2.1.1 '@vitest/snapshot': 2.1.1 @@ -21562,6 +22207,7 @@ snapshots: tinypool: 1.0.1 tinyrainbow: 1.2.0 <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) vite-node: 2.1.1(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) @@ -21573,9 +22219,13 @@ snapshots: vite: 5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) vite-node: 2.1.1(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) >>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 +======= + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) + vite-node: 2.1.1(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0) +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.7.2 + '@types/node': 22.7.4 happy-dom: 15.7.4 jsdom: 25.0.1 transitivePeerDependencies: @@ -21589,10 +22239,10 @@ snapshots: - supports-color - terser - vooks@0.2.12(vue@3.5.8(typescript@5.6.2)): + vooks@0.2.12(vue@3.5.10(typescript@5.6.2)): dependencies: evtd: 0.2.4 - vue: 3.5.8(typescript@5.6.2) + vue: 3.5.10(typescript@5.6.2) vscode-languageserver-textdocument@1.0.12: {} @@ -21609,9 +22259,9 @@ snapshots: vue-component-type-helpers@2.1.6: {} - vue-demi@0.14.10(vue@3.5.8(typescript@5.6.2)): + vue-demi@0.14.10(vue@3.5.10(typescript@5.6.2)): dependencies: - vue: 3.5.8(typescript@5.6.2) + vue: 3.5.10(typescript@5.6.2) vue-eslint-parser@9.4.3(eslint@9.11.1(jiti@2.0.0)): dependencies: @@ -21626,13 +22276,14 @@ snapshots: transitivePeerDependencies: - supports-color - vue-i18n@10.0.3(vue@3.5.8(typescript@5.6.2)): + vue-i18n@10.0.3(vue@3.5.10(typescript@5.6.2)): dependencies: '@intlify/core-base': 10.0.3 '@intlify/shared': 10.0.3 '@vue/devtools-api': 6.6.4 - vue: 3.5.8(typescript@5.6.2) + vue: 3.5.10(typescript@5.6.2) +<<<<<<< HEAD <<<<<<< HEAD vue-json-pretty@2.4.0(vue@3.5.7(typescript@5.6.2)): dependencies: @@ -21642,9 +22293,12 @@ snapshots: ======= vue-router@4.4.5(vue@3.5.8(typescript@5.6.2)): >>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f +======= + vue-router@4.4.5(vue@3.5.10(typescript@5.6.2)): +>>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@vue/devtools-api': 6.6.4 - vue: 3.5.8(typescript@5.6.2) + vue: 3.5.10(typescript@5.6.2) vue-tsc@2.1.6(typescript@5.6.2): dependencies: @@ -21653,31 +22307,31 @@ snapshots: semver: 7.6.3 typescript: 5.6.2 - vue-types@3.0.2(vue@3.5.8(typescript@5.6.2)): + vue-types@3.0.2(vue@3.5.10(typescript@5.6.2)): dependencies: is-plain-object: 3.0.1 - vue: 3.5.8(typescript@5.6.2) + vue: 3.5.10(typescript@5.6.2) - vue@3.5.8(typescript@5.6.2): + vue@3.5.10(typescript@5.6.2): dependencies: - '@vue/compiler-dom': 3.5.8 - '@vue/compiler-sfc': 3.5.8 - '@vue/runtime-dom': 3.5.8 - '@vue/server-renderer': 3.5.8(vue@3.5.8(typescript@5.6.2)) - '@vue/shared': 3.5.8 + '@vue/compiler-dom': 3.5.10 + '@vue/compiler-sfc': 3.5.10 + '@vue/runtime-dom': 3.5.10 + '@vue/server-renderer': 3.5.10(vue@3.5.10(typescript@5.6.2)) + '@vue/shared': 3.5.10 optionalDependencies: typescript: 5.6.2 - vueuc@0.4.63(vue@3.5.8(typescript@5.6.2)): + vueuc@0.4.63(vue@3.5.10(typescript@5.6.2)): dependencies: - '@css-render/vue3-ssr': 0.15.14(vue@3.5.8(typescript@5.6.2)) + '@css-render/vue3-ssr': 0.15.14(vue@3.5.10(typescript@5.6.2)) '@juggle/resize-observer': 3.4.0 css-render: 0.15.14 evtd: 0.2.4 seemly: 0.3.8 - vdirs: 0.1.8(vue@3.5.8(typescript@5.6.2)) - vooks: 0.2.12(vue@3.5.8(typescript@5.6.2)) - vue: 3.5.8(typescript@5.6.2) + vdirs: 0.1.8(vue@3.5.10(typescript@5.6.2)) + vooks: 0.2.12(vue@3.5.10(typescript@5.6.2)) + vue: 3.5.10(typescript@5.6.2) w3c-keyname@2.2.8: {} @@ -21785,10 +22439,10 @@ snapshots: '@babel/core': 7.25.2 '@babel/preset-env': 7.25.4(@babel/core@7.25.2) '@babel/runtime': 7.25.6 - '@rollup/plugin-babel': 5.3.1(@babel/core@7.25.2)(rollup@2.79.1) - '@rollup/plugin-node-resolve': 15.3.0(rollup@2.79.1) - '@rollup/plugin-replace': 2.4.2(rollup@2.79.1) - '@rollup/plugin-terser': 0.4.4(rollup@2.79.1) + '@rollup/plugin-babel': 5.3.1(@babel/core@7.25.2)(rollup@2.79.2) + '@rollup/plugin-node-resolve': 15.3.0(rollup@2.79.2) + '@rollup/plugin-replace': 2.4.2(rollup@2.79.2) + '@rollup/plugin-terser': 0.4.4(rollup@2.79.2) '@surma/rollup-plugin-off-main-thread': 2.2.3 ajv: 8.17.1 common-tags: 1.8.2 @@ -21797,7 +22451,7 @@ snapshots: glob: 7.2.3 lodash: 4.17.21 pretty-bytes: 5.6.0 - rollup: 2.79.1 + rollup: 2.79.2 source-map: 0.8.0-beta.0 stringify-object: 3.3.0 strip-comments: 2.0.1 @@ -22017,4 +22671,4 @@ snapshots: zx@8.1.8: optionalDependencies: '@types/fs-extra': 11.0.4 - '@types/node': 22.7.2 + '@types/node': 22.7.4 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 511e0738..4299ac07 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -21,7 +21,7 @@ catalog: '@commitlint/config-conventional': ^19.5.0 '@ctrl/tinycolor': ^4.1.0 '@eslint/js': ^9.11.1 - '@iconify/json': ^2.2.252 + '@iconify/json': ^2.2.254 '@iconify/tailwind': ^1.1.3 '@iconify/vue': ^4.1.2 '@intlify/core-base': ^10.0.3 @@ -41,7 +41,7 @@ catalog: '@types/html-minifier-terser': ^7.0.2 '@types/jsonwebtoken': ^9.0.7 '@types/lodash.clonedeep': ^4.5.9 - '@types/node': ^22.7.2 + '@types/node': ^22.7.4 '@types/nprogress': ^0.2.3 '@types/postcss-import': ^14.0.3 '@types/qrcode': ^1.5.5 @@ -52,8 +52,8 @@ catalog: '@vite-pwa/vitepress': ^0.5.3 '@vitejs/plugin-vue': ^5.1.4 '@vitejs/plugin-vue-jsx': ^4.0.1 - '@vue/reactivity': ^3.5.8 - '@vue/shared': ^3.5.8 + '@vue/reactivity': ^3.5.10 + '@vue/shared': ^3.5.10 '@vue/test-utils': ^2.4.6 '@vueuse/core': ^11.1.0 '@vueuse/integrations': ^11.1.0 @@ -73,20 +73,20 @@ catalog: cross-env: ^7.0.3 cspell: ^8.14.4 cssnano: ^7.0.6 - cz-git: ^1.9.4 - czg: ^1.9.4 + cz-git: ^1.10.0 + czg: ^1.10.0 dayjs: ^1.11.13 defu: ^6.1.4 depcheck: ^1.4.7 dotenv: ^16.4.5 echarts: ^5.5.1 - element-plus: ^2.8.3 + element-plus: ^2.8.4 eslint: ^9.11.1 eslint-config-turbo: ^2.1.2 - eslint-plugin-command: ^0.2.5 + eslint-plugin-command: ^0.2.6 eslint-plugin-eslint-comments: ^3.2.0 eslint-plugin-import-x: ^4.3.0 - eslint-plugin-jsdoc: ^50.2.5 + eslint-plugin-jsdoc: ^50.3.0 eslint-plugin-jsonc: ^2.16.0 eslint-plugin-n: ^17.10.3 eslint-plugin-no-only-tests: ^3.3.0 @@ -112,7 +112,7 @@ catalog: lodash.clonedeep: ^4.5.0 lucide-vue-next: ^0.446.0 medium-zoom: ^1.1.0 - naive-ui: ^2.40.0 + naive-ui: ^2.40.1 nanoid: ^5.0.7 nitropack: ^2.9.7 nprogress: ^0.2.0 @@ -134,9 +134,9 @@ catalog: radix-vue: ^1.9.6 resolve.exports: ^2.0.2 rimraf: ^6.0.1 - rollup: ^4.22.4 + rollup: ^4.22.5 rollup-plugin-visualizer: ^5.12.0 - sass: ^1.79.3 + sass: ^1.79.4 sortablejs: ^1.15.3 stylelint: ^16.9.0 stylelint-config-recess-order: ^5.1.1 @@ -166,7 +166,7 @@ catalog: vitepress: ^1.3.4 vitepress-plugin-group-icons: ^1.2.4 vitest: ^2.1.1 - vue: ^3.5.8 + vue: ^3.5.10 vue-eslint-parser: ^9.4.3 vue-i18n: ^10.0.3 vue-router: ^4.4.5