From cf9cbfd6d2620bccffce69f88915fed58266a62d Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Mon, 30 Sep 2024 07:49:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E5=B2=97=E4=BD=8D=E9=80=89=E6=8B=A9?= =?UTF-8?q?option=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/system/user/user-drawer.vue | 18 +- pnpm-lock.yaml | 2226 +++-------------- 2 files changed, 348 insertions(+), 1896 deletions(-) diff --git a/apps/web-antd/src/views/system/user/user-drawer.vue b/apps/web-antd/src/views/system/user/user-drawer.vue index daafcbf6..d0b5c496 100644 --- a/apps/web-antd/src/views/system/user/user-drawer.vue +++ b/apps/web-antd/src/views/system/user/user-drawer.vue @@ -136,7 +136,17 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({ }, ]); // 更新 && 赋值 - const { postIds = [], roleIds = [], roles, user } = await findUserInfo(id); + const { + postIds = [], + posts, + roleIds = [], + roles, + user, + } = await findUserInfo(id); + const postOptions = posts.map((item) => ({ + label: item.postName, + value: item.postId, + })); formApi.updateSchema([ { componentProps: { @@ -151,6 +161,12 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({ }, fieldName: 'roleIds', }, + { + componentProps: { + options: postOptions, + }, + fieldName: 'postIds', + }, ]); // 部门选择 await setupDeptSelect(); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 063f7363..3e4f6987 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -529,31 +529,10 @@ importers: version: link:scripts/vsh '@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)) + version: 5.1.4(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0))(vue@3.5.10(typescript@5.6.2)) '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - version: 4.0.1(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)) -======= - version: 5.1.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)) - '@vitejs/plugin-vue-jsx': - specifier: 'catalog:' - version: 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 -======= - version: 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-jsx': - 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 + version: 4.0.1(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0))(vue@3.5.10(typescript@5.6.2)) '@vue/test-utils': specifier: 'catalog:' version: 2.4.6 @@ -598,31 +577,10 @@ importers: 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) + version: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) vitest: specifier: 'catalog:' - version: 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) -======= - version: 5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) - vitest: - specifier: 'catalog:' - version: 2.1.1(@types/node@22.7.0)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - version: 5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) - vitest: - 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 + version: 2.1.1(@types/node@22.7.4)(happy-dom@15.7.4)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) vue: specifier: 3.5.10 version: 3.5.10(typescript@5.6.2) @@ -650,7 +608,7 @@ importers: dependencies: '@tinymce/tinymce-vue': specifier: ^6.0.1 - version: 6.0.1(vue@3.5.7(typescript@5.6.2)) + version: 6.0.1(vue@3.5.10(typescript@5.6.2)) '@vben/access': specifier: workspace:* version: link:../../packages/effects/access @@ -698,21 +656,13 @@ importers: 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)) + version: 4.2.5(vue@3.5.10(typescript@5.6.2)) cropperjs: specifier: ^1.6.2 version: 1.6.2 crypto-js: specifier: ^4.2.0 version: 4.2.0 -======= - 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 @@ -727,29 +677,19 @@ 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)) + version: 2.2.2(typescript@5.6.2)(vue@3.5.10(typescript@5.6.2)) tinymce: specifier: ^7.3.0 version: 7.3.0 unplugin-vue-components: specifier: ^0.27.3 - version: 0.27.4(@babel/parser@7.25.6)(@nuxt/kit@3.13.2(rollup@4.22.4))(rollup@4.22.4)(vue@3.5.7(typescript@5.6.2)) -======= - 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 + version: 0.27.4(@babel/parser@7.25.6)(@nuxt/kit@3.13.2(rollup@4.22.5))(rollup@4.22.5)(vue@3.5.10(typescript@5.6.2)) vue: 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)) + version: 4.4.5(vue@3.5.10(typescript@5.6.2)) devDependencies: '@types/crypto-js': specifier: ^4.2.2 @@ -757,12 +697,6 @@ importers: '@types/lodash-es': specifier: ^4.17.12 version: 4.17.12 -======= - 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: @@ -829,11 +763,7 @@ importers: 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 + version: 0.8.0(rollup@4.22.5)(webpack-sources@3.2.3) apps/web-naive: dependencies: @@ -933,49 +863,16 @@ importers: devDependencies: '@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) -======= - version: 2.5.0(@algolia/client-search@4.24.0)(@types/node@22.7.0)(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) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - 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 + 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.32.0)(typescript@5.6.2) '@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)) + 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.32.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.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) -======= - version: 0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(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.0)(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) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - version: 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)) - vitepress: - 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 + 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.32.0)(typescript@5.6.2) vue: specifier: 3.5.10 version: 3.5.10(typescript@5.6.2) @@ -1005,13 +902,13 @@ importers: dependencies: eslint-config-turbo: specifier: 'catalog:' - version: 2.1.2(eslint@9.11.1(jiti@2.0.0)) + version: 2.1.2(eslint@9.11.1(jiti@1.21.6)) eslint-plugin-command: specifier: 'catalog:' - version: 0.2.6(eslint@9.11.1(jiti@2.0.0)) + version: 0.2.6(eslint@9.11.1(jiti@1.21.6)) eslint-plugin-import-x: specifier: 'catalog:' - version: 4.3.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + version: 4.3.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) devDependencies: '@eslint/js': specifier: 'catalog:' @@ -1021,69 +918,49 @@ importers: version: 9.6.1 '@typescript-eslint/eslint-plugin': specifier: 'catalog:' - version: 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) + version: 8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) '@typescript-eslint/parser': specifier: 'catalog:' - version: 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + version: 8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) eslint: specifier: 'catalog:' - version: 9.11.1(jiti@2.0.0) + version: 9.11.1(jiti@1.21.6) eslint-plugin-eslint-comments: specifier: 'catalog:' - version: 3.2.0(eslint@9.11.1(jiti@2.0.0)) + version: 3.2.0(eslint@9.11.1(jiti@1.21.6)) eslint-plugin-jsdoc: specifier: 'catalog:' - version: 50.3.0(eslint@9.11.1(jiti@2.0.0)) + version: 50.3.0(eslint@9.11.1(jiti@1.21.6)) eslint-plugin-jsonc: specifier: 'catalog:' - version: 2.16.0(eslint@9.11.1(jiti@2.0.0)) + version: 2.16.0(eslint@9.11.1(jiti@1.21.6)) eslint-plugin-n: specifier: 'catalog:' - version: 17.10.3(eslint@9.11.1(jiti@2.0.0)) + version: 17.10.3(eslint@9.11.1(jiti@1.21.6)) eslint-plugin-no-only-tests: specifier: 'catalog:' version: 3.3.0 eslint-plugin-perfectionist: specifier: 'catalog:' - version: 3.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)(vue-eslint-parser@9.4.3(eslint@9.11.1(jiti@2.0.0))) + version: 3.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2)(vue-eslint-parser@9.4.3(eslint@9.11.1(jiti@1.21.6))) eslint-plugin-prettier: specifier: 'catalog:' -<<<<<<< HEAD -<<<<<<< HEAD - version: 5.2.1(@types/eslint@9.6.1)(eslint-config-prettier@9.1.0(eslint@9.11.0(jiti@1.21.6)))(eslint@9.11.0(jiti@1.21.6))(prettier@3.3.3) -======= - version: 5.2.1(@types/eslint@9.6.1)(eslint@9.11.1(jiti@1.21.6))(prettier@3.3.3) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - version: 5.2.1(@types/eslint@9.6.1)(eslint@9.11.1(jiti@2.0.0))(prettier@3.3.3) ->>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 + version: 5.2.1(@types/eslint@9.6.1)(eslint-config-prettier@9.1.0(eslint@9.11.1(jiti@1.21.6)))(eslint@9.11.1(jiti@1.21.6))(prettier@3.3.3) eslint-plugin-regexp: specifier: 'catalog:' - version: 2.6.0(eslint@9.11.1(jiti@2.0.0)) + version: 2.6.0(eslint@9.11.1(jiti@1.21.6)) eslint-plugin-unicorn: specifier: 'catalog:' - version: 55.0.0(eslint@9.11.1(jiti@2.0.0)) + version: 55.0.0(eslint@9.11.1(jiti@1.21.6)) eslint-plugin-unused-imports: specifier: 'catalog:' - version: 4.1.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)) + version: 4.1.4(@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6)) 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)) -======= - version: 0.5.4(@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.7.0)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - 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 + version: 0.5.4(@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.7.4)(happy-dom@15.7.4)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.4)(terser@5.32.0)) eslint-plugin-vue: specifier: 'catalog:' - version: 9.28.0(eslint@9.11.1(jiti@2.0.0)) + version: 9.28.0(eslint@9.11.1(jiti@1.21.6)) globals: specifier: 'catalog:' version: 15.9.0 @@ -1092,7 +969,7 @@ importers: version: 2.4.0 vue-eslint-parser: specifier: 'catalog:' - version: 9.4.3(eslint@9.11.1(jiti@2.0.0)) + version: 9.4.3(eslint@9.11.1(jiti@1.21.6)) internal/lint-configs/prettier-config: dependencies: @@ -1245,37 +1122,13 @@ importers: version: link:../../packages/types 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) -======= - version: 5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - 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 + version: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) 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) -======= - version: 5.2.0(@vue/compiler-dom@3.5.8)(eslint@9.11.1(jiti@1.21.6))(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)) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - 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 + version: 5.2.0(@vue/compiler-dom@3.5.10)(eslint@9.11.1(jiti@1.21.6))(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))(webpack-sources@3.2.3) '@jspm/generator': specifier: 'catalog:' version: 2.3.1 @@ -1299,39 +1152,13 @@ importers: version: 2.0.2 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)) + version: 2.1.1(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0)) vite-plugin-pwa: specifier: 'catalog:' - version: 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) + version: 0.20.5(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0) vite-plugin-vue-devtools: specifier: 'catalog:' - version: 7.4.5(rollup@4.22.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)) -======= - version: 2.1.1(vite@5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) -======= - 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.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 + 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.32.0))(vue@3.5.10(typescript@5.6.2)) devDependencies: '@types/archiver': specifier: 'catalog:' @@ -1344,31 +1171,10 @@ importers: version: link:../node-utils '@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)) + version: 5.1.4(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0))(vue@3.5.10(typescript@5.6.2)) '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - version: 4.0.1(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)) -======= - version: 5.1.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)) - '@vitejs/plugin-vue-jsx': - specifier: 'catalog:' - version: 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 -======= - version: 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-jsx': - 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 + version: 4.0.1(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0))(vue@3.5.10(typescript@5.6.2)) dayjs: specifier: 'catalog:' version: 1.11.13 @@ -1386,45 +1192,16 @@ importers: 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) + version: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) vite-plugin-compression: specifier: 'catalog:' - version: 0.5.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)) + version: 0.5.1(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0)) vite-plugin-dts: specifier: 'catalog:' - version: 4.2.1(@types/node@22.5.5)(rollup@4.22.4)(typescript@5.6.2)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.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.32.0)) vite-plugin-html: specifier: 'catalog:' - version: 3.2.2(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)) -======= - version: 5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) -======= - 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.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.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 + version: 3.2.2(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0)) packages/@core/base/design: {} @@ -1758,40 +1535,22 @@ importers: 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)) + 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.10(typescript@5.6.2)) codemirror: specifier: ^6.0.1 version: 6.0.1(@lezer/common@1.2.1) -======= - 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) - vue-codemirror6: - specifier: ^1.3.4 - version: 1.3.4(@lezer/common@1.2.1)(vue@3.5.7(typescript@5.6.2)) - vue-json-pretty: - specifier: ^2.4.0 - version: 2.4.0(vue@3.5.7(typescript@5.6.2)) -======= - 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-codemirror6: + specifier: ^1.3.4 + version: 1.3.4(@lezer/common@1.2.1)(vue@3.5.10(typescript@5.6.2)) + vue-json-pretty: + specifier: ^2.4.0 + version: 2.4.0(vue@3.5.10(typescript@5.6.2)) vue-router: specifier: 'catalog:' version: 4.4.5(vue@3.5.10(typescript@5.6.2)) @@ -1958,15 +1717,7 @@ importers: 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 + version: 4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.10(typescript@5.6.2)))(rollup@3.29.4) vue: specifier: 3.5.10 version: 3.5.10(typescript@5.6.2) @@ -4224,8 +3975,11 @@ packages: '@floating-ui/utils@0.2.7': resolution: {integrity: sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA==} - '@floating-ui/vue@1.1.4': - resolution: {integrity: sha512-ammH7T3vyCx7pmm9OF19Wc42zrGnUw0QvLoidgypWsCLJMtGXEwY7paYIHO+K+oLC3mbWpzIHzeTVienYenlNg==} + '@floating-ui/utils@0.2.8': + resolution: {integrity: sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==} + + '@floating-ui/vue@1.1.5': + resolution: {integrity: sha512-ynL1p5Z+woPVSwgMGqeDrx6HrJfGIDzFyESFkyqJKilGW1+h/8yVY29Khn0LaU6wHBRwZ13ntG6reiHWK6jyzw==} '@gar/promisify@1.1.3': resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==} @@ -4691,25 +4445,14 @@ packages: rollup: optional: true - '@rollup/rollup-android-arm-eabi@4.22.0': - resolution: {integrity: sha512-/IZQvg6ZR0tAkEi4tdXOraQoWeJy9gbQ/cx4I7k9dJaCk9qrXEcdouxRVz5kZXt5C2bQ9pILoAA+KB4C/d3pfw==} - cpu: [arm] - os: [android] - '@rollup/rollup-android-arm-eabi@4.22.4': resolution: {integrity: sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==} 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': @@ -4717,32 +4460,19 @@ 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': @@ -4750,18 +4480,10 @@ 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==} @@ -4769,19 +4491,11 @@ 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==} @@ -4789,19 +4503,11 @@ 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==} @@ -4809,19 +4515,11 @@ 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==} @@ -4829,19 +4527,11 @@ 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==} @@ -4849,15 +4539,9 @@ 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] @@ -4867,15 +4551,9 @@ 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] @@ -4885,15 +4563,9 @@ 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] @@ -4903,19 +4575,11 @@ 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==} @@ -4923,33 +4587,20 @@ 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': @@ -4957,15 +4608,9 @@ 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': @@ -5067,8 +4712,8 @@ packages: '@tanstack/store@0.5.5': resolution: {integrity: sha512-EOSrgdDAJExbvRZEQ/Xhh9iZchXpMN+ga1Bnk8Nmygzs8TfiE6hbzThF+Pr2G19uHL6+DTDTHhJ8VQiOd7l4tA==} - '@tanstack/virtual-core@3.10.7': - resolution: {integrity: sha512-ND5dfsU0n9F4gROzwNNDJmg6y8n9pI8YWxtgbfJ5UcNn7Hx+MxEXtXcQ189tS7sh8pmCObgz2qSiyRKTZxT4dg==} + '@tanstack/virtual-core@3.10.8': + resolution: {integrity: sha512-PBu00mtt95jbKFi6Llk9aik8bnR3tR/oQP1o3TSi+iG//+Q2RTIzCEgKkHG8BB86kxMNW6O8wku+Lmi+QFR6jA==} '@tanstack/vue-query@5.56.2': resolution: {integrity: sha512-VW7qS8JXwC3SZpawJHxQ+mWwWa5WVIQUUOh/OD6WI85eLcbJPg83ezjGupPXGKF9h31gl7CIRrnJDi4g5pK3Jg==} @@ -5088,10 +4733,10 @@ packages: '@vue/composition-api': optional: true - '@tanstack/vue-virtual@3.10.7': - resolution: {integrity: sha512-OSK1fkvz4GaBhF80KVmBsJZoMI9ncVaUU//pI8OqTdBnepw467zcuF2Y+Ia1VC0CPYfUEALyS8n4Ar0RI/7ASg==} + '@tanstack/vue-virtual@3.10.8': + resolution: {integrity: sha512-DB5QA8c/LfqOqIUCpSs3RdOTVroRRdqeHMqBkYrcashSZtOzIv8xbiqHgg7RYxDfkH5F3Y+e0MkuuyGNDVB0BQ==} peerDependencies: - vue: 3.5.7 + vue: 3.5.10 '@tinymce/tinymce-vue@6.0.1': resolution: {integrity: sha512-VzjI8AKlNrrsosIk3WuBez6kubqPsPMeaButkRLuts77uo4e2EwPRFX+VyB6fHbMGHwUPK22zNjOUGMvJFZFCw==} @@ -5134,6 +4779,9 @@ packages: '@types/estree@1.0.5': resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} + '@types/estree@1.0.6': + resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} + '@types/fs-extra@11.0.4': resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==} @@ -5185,6 +4833,9 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} + '@types/node@22.7.0': + resolution: {integrity: sha512-MOdOibwBs6KW1vfqz2uKMlxq5xAfAZ98SZjO8e3XnAbFnTJtAspqhWk7hrdSAs9/Y14ZWMiy7/MxMUzAOadYEw==} + '@types/node@22.7.4': resolution: {integrity: sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==} @@ -5400,37 +5051,9 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 -<<<<<<< HEAD -<<<<<<< HEAD - '@vue/compiler-core@3.5.6': - resolution: {integrity: sha512-r+gNu6K4lrvaQLQGmf+1gc41p3FO2OUJyWmNqaIITaJU6YFiV5PtQSFZt8jfztYyARwqhoCayjprC7KMvT3nRA==} - - '@vue/compiler-core@3.5.7': - resolution: {integrity: sha512-A0gay3lK71MddsSnGlBxRPOugIVdACze9L/rCo5X5srCyjQfZOfYtSFMJc3aOZCM+xN55EQpb4R97rYn/iEbSw==} - - '@vue/compiler-dom@3.5.6': - resolution: {integrity: sha512-xRXqxDrIqK8v8sSScpistyYH0qYqxakpsIvqMD2e5sV/PXQ1mTwtXp4k42yHK06KXxKSmitop9e45Ui/3BrTEw==} - - '@vue/compiler-dom@3.5.7': - resolution: {integrity: sha512-GYWl3+gO8/g0ZdYaJ18fYHdI/WVic2VuuUd1NsPp60DWXKy+XjdhFsDW7FbUto8siYYZcosBGn9yVBkjhq1M8Q==} - - '@vue/compiler-sfc@3.5.6': - resolution: {integrity: sha512-pjWJ8Kj9TDHlbF5LywjVso+BIxCY5wVOLhkEXRhuCHDxPFIeX1zaFefKs8RYoHvkSMqRWt93a0f2gNJVJixHwg==} - - '@vue/compiler-sfc@3.5.7': - resolution: {integrity: sha512-EjOJtCWJrC7HqoCEzOwpIYHm+JH7YmkxC1hG6VkqIukYRqj8KFUlTLK6hcT4nGgtVov2+ZfrdrRlcaqS78HnBA==} - - '@vue/compiler-ssr@3.5.6': - resolution: {integrity: sha512-VpWbaZrEOCqnmqjE83xdwegtr5qO/2OPUC6veWgvNqTJ3bYysz6vY3VqMuOijubuUYPRpG3OOKIh9TD0Stxb9A==} - - '@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==} @@ -5451,7 +5074,6 @@ packages: '@vue/compiler-ssr@3.5.8': resolution: {integrity: sha512-W96PtryNsNG9u0ZnN5Q5j27Z/feGrFV6zy9q5tzJVyJaLiwYxvC0ek4IXClZygyhjm+XKM7WD9pdKi/wIRVC/Q==} ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f '@vue/compiler-vue2@2.7.16': resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==} @@ -5493,24 +5115,10 @@ packages: '@vue/server-renderer@3.5.10': resolution: {integrity: sha512-IVE97tt2kGKwHNq9yVO0xdh1IvYfZCShvDSy46JIh5OQxP1/EXSpoDqetVmyIzL7CYOWnnmMkVqd7YK2QSWkdw==} peerDependencies: -<<<<<<< HEAD -<<<<<<< HEAD - vue: 3.5.7 - - '@vue/shared@3.5.6': - resolution: {integrity: sha512-eidH0HInnL39z6wAt6SFIwBrvGOpDWsDxlw3rCgo1B+CQ1781WzQUSU3YjxgdkcJo9Q8S6LmXTkvI+cLHGkQfA==} - - '@vue/shared@3.5.7': - resolution: {integrity: sha512-NBE1PBIvzIedxIc2RZiKXvGbJkrZ2/hLf3h8GlS4/sP9xcXEZMFWOazFkNd6aGeUCMaproe5MHVYB3/4AW9q9g==} -======= - 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==} @@ -5815,8 +5423,8 @@ packages: axios@1.7.7: resolution: {integrity: sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==} - b4a@1.6.7: - resolution: {integrity: sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==} + b4a@1.6.6: + resolution: {integrity: sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==} babel-plugin-polyfill-corejs2@0.4.11: resolution: {integrity: sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==} @@ -5954,13 +5562,8 @@ packages: caniuse-api@3.0.0: resolution: {integrity: sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==} -<<<<<<< HEAD - caniuse-lite@1.0.30001660: - resolution: {integrity: sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==} -======= caniuse-lite@1.0.30001663: resolution: {integrity: sha512-o9C3X27GLKbLeTYZ6HBOLU1tsAcBZsLis28wrVzddShCS16RujjHp9GDHKZqrB3meE0YjhawvMFsGb/igqiPzA==} ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f ccount@2.0.1: resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==} @@ -6744,18 +6347,8 @@ packages: engines: {node: '>=0.10.0'} hasBin: true -<<<<<<< HEAD -<<<<<<< HEAD - electron-to-chromium@1.5.19: - resolution: {integrity: sha512-kpLJJi3zxTR1U828P+LIUDZ5ohixyo68/IcYOHLqnbTPr/wdgn4i1ECvmALN9E16JPA6cvCG5UG79gVwVdEK5w==} -======= electron-to-chromium@1.5.28: resolution: {integrity: sha512-VufdJl+rzaKZoYVUijN13QcXVF5dWPZANeFTLNy+OSpHdDL5ynXTF35+60RSBbaQYB1ae723lQXHCrf4pyLsMw==} ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - electron-to-chromium@1.5.29: - resolution: {integrity: sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==} ->>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 element-plus@2.8.4: resolution: {integrity: sha512-ZlVAdUOoJliv4kW3ntWnnSHMT+u/Os7mXJjk2xzOlqNeHaI2/ozlF+R58ZCEak8ZnDi6+5A2viWEYRsq64IuiA==} @@ -6848,13 +6441,8 @@ packages: resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==} engines: {node: '>= 0.4'} -<<<<<<< HEAD - es-toolkit@1.17.0: - resolution: {integrity: sha512-aJvpNxK7d+I+Rt9tmdwzelxTe4EwtxX1Kv0xv6ZTRWJBpMCxe0vxTLLW4STz6pHYjtyTTrEkonNXLaBsYHg2Yw==} -======= es-toolkit@1.21.0: resolution: {integrity: sha512-d1T3yyOBPYVbmLtjxsuzuIInuJaw7kcbtu/7sQyfM04hT98X8Z0bLKhYYYePdCBYH4GoA5AnWUyodV5xDcdrOw==} ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f esbuild@0.19.12: resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==} @@ -7983,10 +7571,6 @@ packages: resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==} hasBin: true - jiti@2.0.0: - resolution: {integrity: sha512-CJ7e7Abb779OTRv3lomfp7Mns/Sy1+U4pcAx5VbjxCZD5ZM/VJaXPpPjNKjtSvWQy/H86E49REXR34dl1JEz9w==} - hasBin: true - jju@1.4.0: resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==} @@ -8158,8 +7742,8 @@ packages: engines: {node: '>=18.12.0'} hasBin: true - listhen@1.8.0: - resolution: {integrity: sha512-Wj5hk++HPDqnG/0nc9++oXf8M3GlzObC6AJJJ9VYAVhVTdeW+t3HyeiKhK6Ro0GPhVd8lOYM75zsckrtzLB2Gw==} + listhen@1.7.2: + resolution: {integrity: sha512-7/HamOm5YD9Wb7CFgAZkKgVPA96WwhcTQoqtm2VTZGVbVVn3IWKRBTgrU7cchA3Q8k9iCsG8Osoi9GX4JsGM9g==} hasBin: true listr2@8.2.4: @@ -8662,16 +8246,11 @@ packages: nth-check@2.1.1: resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==} -<<<<<<< HEAD nwsapi@2.2.12: resolution: {integrity: sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==} nypm@0.3.11: resolution: {integrity: sha512-E5GqaAYSnbb6n1qZyik2wjPDZON43FqOJO59+3OkWrnmQtjggrMOVnsyzfjxp/tS6nlYJBA4zRA5jSM2YaadMg==} -======= - nypm@0.3.12: - resolution: {integrity: sha512-D3pzNDWIvgA+7IORhD/IuWzEk4uXv6GsgOxiid4UU3h9oq5IqV1KtPDi63n4sZJ/xcWlr88c0QM2RgN5VbOhFA==} ->>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 engines: {node: ^14.16.0 || >=16.10.0} hasBin: true @@ -9387,13 +8966,8 @@ packages: resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==} engines: {node: ^10 || ^12 || >=14} -<<<<<<< HEAD - preact@10.23.2: - resolution: {integrity: sha512-kKYfePf9rzKnxOAKDpsWhg/ysrHPqT+yQ7UW4JjdnqjFIeNUnNcEJvhuA8fDenxAGWzUqtd51DfVg7xp/8T9NA==} -======= preact@10.24.1: resolution: {integrity: sha512-PnBAwFI3Yjxxcxw75n6VId/5TFxNW/81zexzWD9jn1+eSrOP84NdsS38H5IkF/UH3frqRPT+MvuCoVHjTDTnDw==} ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f prelude-ls@1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} @@ -9750,8 +9324,8 @@ packages: rollup: optional: true - rollup@2.79.2: - resolution: {integrity: sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==} + rollup@2.79.1: + resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==} engines: {node: '>=10.0.0'} hasBin: true @@ -9760,11 +9334,6 @@ packages: engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true - rollup@4.22.0: - resolution: {integrity: sha512-W21MUIFPZ4+O2Je/EU+GP3iz7PH4pVPUXSbEZdatQnxo29+3rsUjgrJmzuAZU24z7yRAnFN6ukxeAhZh/c7hzg==} - engines: {node: '>=18.0.0', npm: '>=8.0.0'} - hasBin: true - rollup@4.22.4: resolution: {integrity: sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -10651,7 +10220,7 @@ packages: peerDependencies: '@babel/parser': ^7.15.8 '@nuxt/kit': ^3.2.2 - vue: 3.5.7 + vue: 3.5.10 peerDependenciesMeta: '@babel/parser': optional: true @@ -10839,44 +10408,8 @@ packages: peerDependencies: vite: ^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0 -<<<<<<< HEAD - vite@5.4.6: - resolution: {integrity: sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - peerDependencies: - '@types/node': ^18.0.0 || >=20.0.0 - less: '*' - lightningcss: ^1.21.0 - sass: '*' - sass-embedded: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - sass-embedded: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - - vite@5.4.7: - resolution: {integrity: sha512-5l2zxqMEPVENgvzTuBpHer2awaetimj2BGkhBPdnwKbPNOlHsODU+oiazEZzLK7KhAnOrO+XGYJYn4ZlUhDtDQ==} -======= vite@5.4.8: resolution: {integrity: sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==} ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -10961,7 +10494,7 @@ packages: resolution: {integrity: sha512-Gmu2t4Exz3pQdtAsb7wINREx2nswNW+FV+q8S1wmsmeC3OLio5RkybRLsErP1b8+suqsVD/7t0Cx/XmBpQnHJA==} engines: {yarn: '>=1.22.19'} peerDependencies: - vue: 3.5.7 + vue: 3.5.10 vue-component-type-helpers@2.1.6: resolution: {integrity: sha512-ng11B8B/ZADUMMOsRbqv0arc442q7lifSubD0v8oDXIFoMg/mXwAPUunrroIDkY+mcD0dHKccdaznSVp8EoX3w==} @@ -10993,7 +10526,7 @@ packages: resolution: {integrity: sha512-e9bP41DYYIc2tWaB6KuwqFJq5odZ8/GkE6vHQuGcbPn37kGk4a3n1RNw3ZYeDrl66NWXgTlOfS+M6NKkowmkWw==} engines: {node: '>= 10.0.0', npm: '>= 5.0.0'} peerDependencies: - vue: 3.5.7 + vue: 3.5.10 vue-router@4.4.5: resolution: {integrity: sha512-4fKZygS8cH1yCyuabAXGUAsyi1b2/o/OKgu/RUb+znIYOxPRxdkytJEx+0wGcpBE1pX6vUgh5jwWOKRGvuA/7Q==} @@ -12499,9 +12032,6 @@ 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)': dependencies: '@codemirror/language': 6.10.2 @@ -12618,16 +12148,7 @@ snapshots: style-mod: 4.1.2 w3c-keyname: 2.2.8 - '@commitlint/cli@19.5.0(@types/node@22.5.5)(typescript@5.6.2)': -======= - '@commitlint/cli@19.5.0(@types/node@22.7.0)(typescript@5.6.2)': ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - '@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 @@ -13180,11 +12701,7 @@ snapshots: '@docsearch/js@3.6.1(@algolia/client-search@4.24.0)(search-insights@2.17.2)': dependencies: '@docsearch/react': 3.6.1(@algolia/client-search@4.24.0)(search-insights@2.17.2) -<<<<<<< HEAD - preact: 10.23.2 -======= preact: 10.24.1 ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f transitivePeerDependencies: - '@algolia/client-search' - '@types/react' @@ -13500,9 +13017,9 @@ snapshots: '@esbuild/win32-x64@0.23.1': optional: true - '@eslint-community/eslint-utils@4.4.0(eslint@9.11.1(jiti@2.0.0))': + '@eslint-community/eslint-utils@4.4.0(eslint@9.11.1(jiti@1.21.6))': dependencies: - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.11.1(jiti@1.21.6) eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.11.0': {} @@ -13552,27 +13069,13 @@ snapshots: '@floating-ui/utils@0.2.7': {} -<<<<<<< HEAD -<<<<<<< HEAD - '@floating-ui/vue@1.1.4(vue@3.5.7(typescript@5.6.2))': - dependencies: - '@floating-ui/dom': 1.6.10 - '@floating-ui/utils': 0.2.7 - vue-demi: 0.14.10(vue@3.5.7(typescript@5.6.2)) -======= - '@floating-ui/vue@1.1.5(vue@3.5.8(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.8(typescript@5.6.2)) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= + '@floating-ui/utils@0.2.8': {} + '@floating-ui/vue@1.1.5(vue@3.5.10(typescript@5.6.2))': dependencies: - '@floating-ui/dom': 1.6.11 + '@floating-ui/dom': 1.6.10 '@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 @@ -13664,35 +13167,13 @@ 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)': -======= - '@intlify/unplugin-vue-i18n@5.2.0(@vue/compiler-dom@3.5.8)(eslint@9.11.1(jiti@1.21.6))(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))': ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - '@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 + '@intlify/unplugin-vue-i18n@5.2.0(@vue/compiler-dom@3.5.10)(eslint@9.11.1(jiti@1.21.6))(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))(webpack-sources@3.2.3)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@1.21.6)) '@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) -======= - '@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 @@ -13702,17 +13183,8 @@ snapshots: pathe: 1.1.2 picocolors: 1.1.0 source-map-js: 1.2.1 -<<<<<<< HEAD unplugin: 1.14.1(webpack-sources@3.2.3) - 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.10(typescript@5.6.2)) transitivePeerDependencies: @@ -13723,34 +13195,14 @@ 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) - vue-i18n: 10.0.3(vue@3.5.7(typescript@5.6.2)) -======= - '@vue/compiler-dom': 3.5.8 - 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': {} @@ -13946,34 +13398,12 @@ 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)': + '@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.32.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.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) - vue: 3.5.7(typescript@5.6.2) -======= - '@nolebase/ui@2.5.0(@algolia/client-search@4.24.0)(@types/node@22.7.0)(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.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 - 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.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) + 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.32.0)(typescript@5.6.2) vue: 3.5.10(typescript@5.6.2) ->>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 transitivePeerDependencies: - '@algolia/client-search' - '@types/node' @@ -14003,51 +13433,20 @@ 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)': + '@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.32.0)(typescript@5.6.2)': dependencies: '@iconify-json/octicon': 1.2.0 - '@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) - colorette: 2.0.20 - date-fns: 3.6.0 - defu: 6.1.4 - es-toolkit: 1.17.0 -======= - '@nolebase/vitepress-plugin-git-changelog@2.5.0(@algolia/client-search@4.24.0)(@types/node@22.7.0)(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/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.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) + '@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.32.0)(typescript@5.6.2) colorette: 2.0.20 date-fns: 3.6.0 defu: 6.1.4 es-toolkit: 1.21.0 ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f execa: 8.0.1 globby: 14.0.2 gray-matter: 4.0.3 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) -======= - vitepress: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.7.0)(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) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - 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 + 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.32.0)(typescript@5.6.2) transitivePeerDependencies: - '@algolia/client-search' - '@types/node' @@ -14087,7 +13486,6 @@ 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) @@ -14116,12 +13514,9 @@ snapshots: - supports-color - webpack-sources - '@nuxt/kit@3.13.2(rollup@4.22.4)': -======= - '@nuxt/kit@3.13.2(rollup@3.29.5)': ->>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 + '@nuxt/kit@3.13.2(rollup@4.22.5)': dependencies: - '@nuxt/schema': 3.13.2(rollup@3.29.5) + '@nuxt/schema': 3.13.2(rollup@4.22.5) c12: 1.11.2 consola: 3.2.3 defu: 6.1.4 @@ -14138,13 +13533,8 @@ 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 + unimport: 3.12.0(rollup@4.22.5) untyped: 1.4.2 transitivePeerDependencies: - magicast @@ -14172,7 +13562,7 @@ snapshots: - supports-color - webpack-sources - '@nuxt/schema@3.13.2(rollup@3.29.5)': + '@nuxt/schema@3.13.2(rollup@4.22.5)': dependencies: compatx: 0.1.8 consola: 3.2.3 @@ -14184,7 +13574,7 @@ snapshots: std-env: 3.7.0 ufo: 1.5.4 uncrypto: 0.1.3 - unimport: 3.12.0(rollup@3.29.5) + unimport: 3.12.0(rollup@4.22.5) untyped: 1.4.2 transitivePeerDependencies: - rollup @@ -14278,49 +13668,26 @@ snapshots: '@polka/url@1.0.0-next.28': {} -<<<<<<< HEAD - '@radix-icons/vue@1.0.0(vue@3.5.8(typescript@5.6.2))': - dependencies: - vue: 3.5.8(typescript@5.6.2) - -<<<<<<< HEAD - '@rollup/plugin-alias@5.1.0(rollup@3.29.4)': - dependencies: - slash: 4.0.0 -======= -======= ->>>>>>> 639d2e15253a73c0235d16c6721864961a7510c0 - '@rollup/plugin-alias@5.1.1(rollup@3.29.5)': ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f + '@rollup/plugin-alias@5.1.1(rollup@3.29.4)': optionalDependencies: rollup: 3.29.4 -<<<<<<< HEAD - '@rollup/plugin-alias@5.1.0(rollup@4.22.0)': - dependencies: - slash: 4.0.0 -======= '@rollup/plugin-alias@5.1.1(rollup@4.22.4)': ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f optionalDependencies: - rollup: 4.22.0 + rollup: 4.22.4 - '@rollup/plugin-babel@5.3.1(@babel/core@7.25.2)(rollup@2.79.2)': + '@rollup/plugin-babel@5.3.1(@babel/core@7.25.2)(rollup@2.79.1)': dependencies: '@babel/core': 7.25.2 '@babel/helper-module-imports': 7.24.7 - '@rollup/pluginutils': 3.1.0(rollup@2.79.2) - rollup: 2.79.2 + '@rollup/pluginutils': 3.1.0(rollup@2.79.1) + rollup: 2.79.1 transitivePeerDependencies: - supports-color '@rollup/plugin-commonjs@25.0.8(rollup@3.29.4)': dependencies: -<<<<<<< HEAD - '@rollup/pluginutils': 5.1.0(rollup@3.29.4) -======= - '@rollup/pluginutils': 5.1.2(rollup@3.29.5) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f + '@rollup/pluginutils': 5.1.2(rollup@3.29.4) commondir: 1.0.1 estree-walker: 2.0.2 glob: 8.1.0 @@ -14329,72 +13696,50 @@ snapshots: optionalDependencies: rollup: 3.29.4 - '@rollup/plugin-commonjs@25.0.8(rollup@4.22.0)': + '@rollup/plugin-commonjs@25.0.8(rollup@4.22.4)': dependencies: -<<<<<<< HEAD - '@rollup/pluginutils': 5.1.0(rollup@4.22.0) -======= '@rollup/pluginutils': 5.1.2(rollup@4.22.4) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f commondir: 1.0.1 estree-walker: 2.0.2 glob: 8.1.0 is-reference: 1.2.1 magic-string: 0.30.11 optionalDependencies: - rollup: 4.22.0 + rollup: 4.22.4 - '@rollup/plugin-inject@5.0.5(rollup@4.22.0)': + '@rollup/plugin-inject@5.0.5(rollup@4.22.4)': dependencies: -<<<<<<< HEAD - '@rollup/pluginutils': 5.1.0(rollup@4.22.0) -======= '@rollup/pluginutils': 5.1.2(rollup@4.22.4) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f estree-walker: 2.0.2 magic-string: 0.30.11 optionalDependencies: - rollup: 4.22.0 + rollup: 4.22.4 '@rollup/plugin-json@6.1.0(rollup@3.29.4)': dependencies: -<<<<<<< HEAD - '@rollup/pluginutils': 5.1.0(rollup@3.29.4) -======= - '@rollup/pluginutils': 5.1.2(rollup@3.29.5) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f + '@rollup/pluginutils': 5.1.2(rollup@3.29.4) optionalDependencies: rollup: 3.29.4 - '@rollup/plugin-json@6.1.0(rollup@4.22.0)': + '@rollup/plugin-json@6.1.0(rollup@4.22.4)': dependencies: -<<<<<<< HEAD - '@rollup/pluginutils': 5.1.0(rollup@4.22.0) -======= '@rollup/pluginutils': 5.1.2(rollup@4.22.4) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f optionalDependencies: - rollup: 4.22.0 + rollup: 4.22.4 - '@rollup/plugin-node-resolve@15.3.0(rollup@2.79.2)': + '@rollup/plugin-node-resolve@15.3.0(rollup@2.79.1)': dependencies: - '@rollup/pluginutils': 5.1.2(rollup@2.79.2) + '@rollup/pluginutils': 5.1.2(rollup@2.79.1) '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-module: 1.0.0 resolve: 1.22.8 optionalDependencies: - rollup: 2.79.2 + rollup: 2.79.1 -<<<<<<< HEAD - '@rollup/plugin-node-resolve@15.2.3(rollup@3.29.4)': + '@rollup/plugin-node-resolve@15.3.0(rollup@3.29.4)': dependencies: - '@rollup/pluginutils': 5.1.0(rollup@3.29.4) -======= - '@rollup/plugin-node-resolve@15.3.0(rollup@3.29.5)': - dependencies: - '@rollup/pluginutils': 5.1.2(rollup@3.29.5) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f + '@rollup/pluginutils': 5.1.2(rollup@3.29.4) '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-module: 1.0.0 @@ -14402,91 +13747,73 @@ snapshots: optionalDependencies: rollup: 3.29.4 -<<<<<<< HEAD - '@rollup/plugin-node-resolve@15.2.3(rollup@4.22.0)': - dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.22.0) -======= '@rollup/plugin-node-resolve@15.3.0(rollup@4.22.4)': dependencies: '@rollup/pluginutils': 5.1.2(rollup@4.22.4) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-module: 1.0.0 resolve: 1.22.8 optionalDependencies: - rollup: 4.22.0 + rollup: 4.22.4 - '@rollup/plugin-replace@2.4.2(rollup@2.79.2)': + '@rollup/plugin-replace@2.4.2(rollup@2.79.1)': dependencies: - '@rollup/pluginutils': 3.1.0(rollup@2.79.2) + '@rollup/pluginutils': 3.1.0(rollup@2.79.1) magic-string: 0.25.9 - rollup: 2.79.2 + rollup: 2.79.1 '@rollup/plugin-replace@5.0.7(rollup@3.29.4)': dependencies: -<<<<<<< HEAD - '@rollup/pluginutils': 5.1.0(rollup@3.29.4) -======= - '@rollup/pluginutils': 5.1.2(rollup@3.29.5) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f + '@rollup/pluginutils': 5.1.2(rollup@3.29.4) magic-string: 0.30.11 optionalDependencies: rollup: 3.29.4 - '@rollup/plugin-replace@5.0.7(rollup@4.22.0)': + '@rollup/plugin-replace@5.0.7(rollup@4.22.4)': dependencies: -<<<<<<< HEAD - '@rollup/pluginutils': 5.1.0(rollup@4.22.0) -======= '@rollup/pluginutils': 5.1.2(rollup@4.22.4) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f magic-string: 0.30.11 optionalDependencies: - rollup: 4.22.0 + rollup: 4.22.4 - '@rollup/plugin-terser@0.4.4(rollup@2.79.2)': + '@rollup/plugin-terser@0.4.4(rollup@2.79.1)': dependencies: serialize-javascript: 6.0.2 smob: 1.5.0 terser: 5.32.0 optionalDependencies: - rollup: 2.79.2 + rollup: 2.79.1 - '@rollup/plugin-terser@0.4.4(rollup@4.22.0)': + '@rollup/plugin-terser@0.4.4(rollup@4.22.4)': dependencies: serialize-javascript: 6.0.2 smob: 1.5.0 terser: 5.32.0 optionalDependencies: - rollup: 4.22.0 + rollup: 4.22.4 - '@rollup/pluginutils@3.1.0(rollup@2.79.2)': + '@rollup/pluginutils@3.1.0(rollup@2.79.1)': dependencies: '@types/estree': 0.0.39 estree-walker: 1.0.1 picomatch: 2.3.1 - rollup: 2.79.2 + rollup: 2.79.1 '@rollup/pluginutils@4.2.1': dependencies: estree-walker: 2.0.2 picomatch: 2.3.1 - '@rollup/pluginutils@5.1.2(rollup@2.79.2)': + '@rollup/pluginutils@5.1.2(rollup@2.79.1)': dependencies: '@types/estree': 1.0.5 estree-walker: 2.0.2 picomatch: 2.3.1 optionalDependencies: - rollup: 2.79.2 + rollup: 2.79.1 -<<<<<<< HEAD - '@rollup/pluginutils@5.1.0(rollup@3.29.4)': -======= - '@rollup/pluginutils@5.1.2(rollup@3.29.5)': ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f + '@rollup/pluginutils@5.1.2(rollup@3.29.4)': dependencies: '@types/estree': 1.0.5 estree-walker: 2.0.2 @@ -14494,14 +13821,6 @@ snapshots: optionalDependencies: rollup: 3.29.4 - '@rollup/pluginutils@5.1.0(rollup@4.22.0)': - dependencies: - '@types/estree': 1.0.5 - estree-walker: 2.0.2 - picomatch: 2.3.1 - optionalDependencies: - rollup: 4.22.0 - '@rollup/pluginutils@5.1.2(rollup@4.22.4)': dependencies: '@types/estree': 1.0.5 @@ -14510,167 +13829,102 @@ 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 + '@types/estree': 1.0.5 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': @@ -14800,7 +14054,7 @@ snapshots: '@tanstack/store@0.5.5': {} - '@tanstack/virtual-core@3.10.7': {} + '@tanstack/virtual-core@3.10.8': {} '@tanstack/vue-query@5.56.2(vue@3.5.10(typescript@5.6.2))': dependencies: @@ -14816,29 +14070,15 @@ snapshots: 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: - '@tanstack/virtual-core': 3.10.7 - vue: 3.5.7(typescript@5.6.2) - - '@tinymce/tinymce-vue@6.0.1(vue@3.5.7(typescript@5.6.2))': - dependencies: - tinymce: 7.3.0 - vue: 3.5.7(typescript@5.6.2) -======= - '@tanstack/vue-virtual@3.10.8(vue@3.5.8(typescript@5.6.2))': - dependencies: - '@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 + + '@tinymce/tinymce-vue@6.0.1(vue@3.5.10(typescript@5.6.2))': + dependencies: + tinymce: 7.3.0 + vue: 3.5.10(typescript@5.6.2) '@tootallnate/once@1.1.2': {} @@ -14858,7 +14098,7 @@ snapshots: '@types/conventional-commits-parser@5.0.0': dependencies: - '@types/node': 22.7.4 + '@types/node': 22.7.0 '@types/crypto-js@4.2.2': {} @@ -14871,10 +14111,12 @@ snapshots: '@types/estree@1.0.5': {} + '@types/estree@1.0.6': {} + '@types/fs-extra@11.0.4': dependencies: '@types/jsonfile': 6.1.4 - '@types/node': 22.7.4 + '@types/node': 22.7.0 optional: true '@types/hast@3.0.4': @@ -14885,18 +14127,18 @@ snapshots: '@types/http-proxy@1.17.15': dependencies: - '@types/node': 22.7.4 + '@types/node': 22.7.0 '@types/json-schema@7.0.15': {} '@types/jsonfile@6.1.4': dependencies: - '@types/node': 22.7.4 + '@types/node': 22.7.0 optional: true '@types/jsonwebtoken@9.0.7': dependencies: - '@types/node': 22.7.4 + '@types/node': 22.7.0 '@types/katex@0.16.7': {} @@ -14927,6 +14169,10 @@ snapshots: '@types/node@12.20.55': {} + '@types/node@22.7.0': + dependencies: + undici-types: 6.19.8 + '@types/node@22.7.4': dependencies: undici-types: 6.19.8 @@ -14943,11 +14189,11 @@ snapshots: '@types/qrcode@1.5.5': dependencies: - '@types/node': 22.7.4 + '@types/node': 22.7.0 '@types/readdir-glob@1.1.5': dependencies: - '@types/node': 22.7.4 + '@types/node': 22.7.0 '@types/resolve@1.20.2': {} @@ -14963,29 +14209,15 @@ snapshots: '@types/web-bluetooth@0.0.20': {} - '@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)': + '@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2)': dependencies: -<<<<<<< HEAD '@eslint-community/regexpp': 4.11.0 - '@typescript-eslint/parser': 8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2) - '@typescript-eslint/scope-manager': 8.6.0 - '@typescript-eslint/type-utils': 8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2) - '@typescript-eslint/utils': 8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2) - '@typescript-eslint/visitor-keys': 8.6.0 - eslint: 9.11.0(jiti@1.21.6) -======= - '@eslint-community/regexpp': 4.11.1 - '@typescript-eslint/parser': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/parser': 8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) '@typescript-eslint/scope-manager': 8.7.0 - '@typescript-eslint/type-utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/type-utils': 8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) + '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) '@typescript-eslint/visitor-keys': 8.7.0 -<<<<<<< HEAD eslint: 9.11.1(jiti@1.21.6) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - eslint: 9.11.1(jiti@2.0.0) ->>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 @@ -14995,14 +14227,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2)': dependencies: '@typescript-eslint/scope-manager': 8.7.0 '@typescript-eslint/types': 8.7.0 '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.6.2) '@typescript-eslint/visitor-keys': 8.7.0 debug: 4.3.7 - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.11.1(jiti@1.21.6) optionalDependencies: typescript: 5.6.2 transitivePeerDependencies: @@ -15018,10 +14250,10 @@ snapshots: '@typescript-eslint/types': 8.7.0 '@typescript-eslint/visitor-keys': 8.7.0 - '@typescript-eslint/type-utils@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/type-utils@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2)': dependencies: '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.6.2) - '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) debug: 4.3.7 ts-api-utils: 1.3.0(typescript@5.6.2) optionalDependencies: @@ -15064,24 +14296,24 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@7.18.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/utils@7.18.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@1.21.6)) '@typescript-eslint/scope-manager': 7.18.0 '@typescript-eslint/types': 7.18.0 '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.6.2) - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.11.1(jiti@1.21.6) transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/utils@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/utils@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@1.21.6)) '@typescript-eslint/scope-manager': 8.7.0 '@typescript-eslint/types': 8.7.0 '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.6.2) - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.11.1(jiti@1.21.6) transitivePeerDependencies: - supports-color - typescript @@ -15124,79 +14356,24 @@ 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))': + '@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.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0))': dependencies: - 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) + 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.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0) - '@vitejs/plugin-vue-jsx@4.0.1(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))': -======= - '@vite-pwa/vitepress@0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0))': -======= - '@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.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 + '@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.32.0))(vue@3.5.10(typescript@5.6.2))': 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) + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) + vue: 3.5.10(typescript@5.6.2) transitivePeerDependencies: - supports-color - '@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))': + '@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.32.0))(vue@3.5.10(typescript@5.6.2))': dependencies: - 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) - - '@vitejs/plugin-vue@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))': - dependencies: - 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) -======= - vite: 5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) -======= - 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) + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.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.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: @@ -15205,37 +14382,13 @@ 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))': -======= - '@vitest/mocker@2.1.1(@vitest/spy@2.1.1)(vite@5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))': ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - '@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 + '@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.32.0))': 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) -======= - vite: 5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - 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 + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) '@vitest/pretty-format@2.1.1': dependencies: @@ -15300,15 +14453,7 @@ 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 + '@vue/compiler-sfc': 3.5.8 transitivePeerDependencies: - supports-color @@ -15321,17 +14466,13 @@ snapshots: source-map-js: 1.2.1 '@vue/compiler-core@3.5.8': ->>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@babel/parser': 7.25.6 - '@vue/shared': 3.5.6 + '@vue/shared': 3.5.8 entities: 4.5.0 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 @@ -15355,83 +14496,26 @@ snapshots: source-map-js: 1.2.1 '@vue/compiler-sfc@3.5.8': ->>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 dependencies: '@babel/parser': 7.25.6 - '@vue/shared': 3.5.7 - entities: 4.5.0 - estree-walker: 2.0.2 - source-map-js: 1.2.1 - - '@vue/compiler-dom@3.5.6': -======= - '@vue/compiler-core@3.5.8': ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f - dependencies: - '@vue/compiler-core': 3.5.6 - '@vue/shared': 3.5.6 - -<<<<<<< HEAD - '@vue/compiler-dom@3.5.7': - dependencies: - '@vue/compiler-core': 3.5.7 - '@vue/shared': 3.5.7 - - '@vue/compiler-sfc@3.5.6': -======= - '@vue/compiler-dom@3.5.8': ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f - dependencies: - '@babel/parser': 7.25.6 - '@vue/compiler-core': 3.5.6 - '@vue/compiler-dom': 3.5.6 - '@vue/compiler-ssr': 3.5.6 - '@vue/shared': 3.5.6 + '@vue/compiler-core': 3.5.8 + '@vue/compiler-dom': 3.5.8 + '@vue/compiler-ssr': 3.5.8 + '@vue/shared': 3.5.8 estree-walker: 2.0.2 magic-string: 0.30.11 postcss: 8.4.47 source-map-js: 1.2.1 -<<<<<<< HEAD -<<<<<<< HEAD - '@vue/compiler-sfc@3.5.7': - dependencies: - '@babel/parser': 7.25.6 - '@vue/compiler-core': 3.5.7 - '@vue/compiler-dom': 3.5.7 - '@vue/compiler-ssr': 3.5.7 - '@vue/shared': 3.5.7 - estree-walker: 2.0.2 - magic-string: 0.30.11 - postcss: 8.4.47 - source-map-js: 1.2.1 - - '@vue/compiler-ssr@3.5.6': -======= - '@vue/compiler-sfc@3.5.8': ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f - dependencies: - '@vue/compiler-dom': 3.5.6 - '@vue/shared': 3.5.6 - -<<<<<<< HEAD - '@vue/compiler-ssr@3.5.7': - dependencies: - '@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 '@vue/shared': 3.5.8 ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f '@vue/compiler-vue2@2.7.16': dependencies: @@ -15444,41 +14528,15 @@ 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))': -======= - '@vue/devtools-core@7.4.6(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 -======= - '@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 + '@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.32.0))(vue@3.5.10(typescript@5.6.2))': dependencies: '@vue/devtools-kit': 7.4.6 '@vue/devtools-shared': 7.4.6 mitt: 3.0.1 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) -======= - vite-hot-client: 0.2.3(vite@5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) -======= - 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 - 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)) + 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.32.0)) vue: 3.5.10(typescript@5.6.2) ->>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 transitivePeerDependencies: - vite @@ -15498,17 +14556,10 @@ 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-dom': 3.5.8 '@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 + '@vue/shared': 3.5.8 computeds: 0.0.1 minimatch: 9.0.5 muggle-string: 0.4.1 @@ -15534,27 +14585,11 @@ snapshots: '@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 - vue: 3.5.7(typescript@5.6.2) - - '@vue/shared@3.5.6': {} - - '@vue/shared@3.5.7': {} -======= - '@vue/compiler-ssr': 3.5.8 - '@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': {} @@ -15593,15 +14628,7 @@ snapshots: - '@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 + '@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.10(typescript@5.6.2))': dependencies: '@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)) @@ -15890,13 +14917,8 @@ snapshots: autoprefixer@10.4.20(postcss@8.4.47): dependencies: -<<<<<<< HEAD - browserslist: 4.23.3 - caniuse-lite: 1.0.30001660 -======= browserslist: 4.24.0 caniuse-lite: 1.0.30001663 ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.1.0 @@ -15921,7 +14943,7 @@ snapshots: transitivePeerDependencies: - debug - b4a@1.6.7: {} + b4a@1.6.6: {} babel-plugin-polyfill-corejs2@0.4.11(@babel/core@7.25.2): dependencies: @@ -15998,17 +15020,8 @@ snapshots: browserslist@4.24.0: dependencies: -<<<<<<< HEAD - caniuse-lite: 1.0.30001660 - electron-to-chromium: 1.5.19 -======= caniuse-lite: 1.0.30001663 -<<<<<<< HEAD electron-to-chromium: 1.5.28 ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - electron-to-chromium: 1.5.29 ->>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 node-releases: 2.0.18 update-browserslist-db: 1.1.0(browserslist@4.24.0) @@ -16096,21 +15109,12 @@ snapshots: caniuse-api@3.0.0: dependencies: -<<<<<<< HEAD - browserslist: 4.23.3 - caniuse-lite: 1.0.30001660 - lodash.memoize: 4.1.2 - lodash.uniq: 4.5.0 - - caniuse-lite@1.0.30001660: {} -======= browserslist: 4.24.0 caniuse-lite: 1.0.30001663 lodash.memoize: 4.1.2 lodash.uniq: 4.5.0 caniuse-lite@1.0.30001663: {} ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f ccount@2.0.1: {} @@ -16194,13 +15198,8 @@ snapshots: circular-dependency-scanner@2.3.0: dependencies: -<<<<<<< HEAD - '@ast-grep/napi': 0.27.1 - '@vue/compiler-sfc': 3.5.6 -======= '@ast-grep/napi': 0.27.2 '@vue/compiler-sfc': 3.5.8 ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f commander: 12.1.0 get-tsconfig: 4.8.0 graph-cycles: 3.0.0 @@ -16796,7 +15795,7 @@ snapshots: dependencies: '@babel/parser': 7.25.6 '@babel/traverse': 7.25.6 - '@vue/compiler-sfc': 3.5.6 + '@vue/compiler-sfc': 3.5.8 callsite: 1.0.0 camelcase: 6.3.0 cosmiconfig: 7.1.0 @@ -16945,30 +15944,13 @@ snapshots: dependencies: jake: 10.9.2 -<<<<<<< HEAD -<<<<<<< HEAD - electron-to-chromium@1.5.19: {} -======= electron-to-chromium@1.5.28: {} ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - electron-to-chromium@1.5.29: {} ->>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 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 + '@floating-ui/dom': 1.6.10 '@popperjs/core': '@sxzz/popperjs-es@2.11.7' '@types/lodash': 4.17.9 '@types/lodash-es': 4.17.12 @@ -17109,11 +16091,7 @@ snapshots: is-date-object: 1.0.5 is-symbol: 1.0.4 -<<<<<<< HEAD - es-toolkit@1.17.0: {} -======= es-toolkit@1.21.0: {} ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f esbuild@0.19.12: optionalDependencies: @@ -17240,28 +16218,20 @@ snapshots: optionalDependencies: source-map: 0.6.1 - eslint-compat-utils@0.5.1(eslint@9.11.1(jiti@2.0.0)): + eslint-compat-utils@0.5.1(eslint@9.11.1(jiti@1.21.6)): dependencies: - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.11.1(jiti@1.21.6) semver: 7.6.3 -<<<<<<< HEAD -<<<<<<< HEAD - eslint-config-prettier@9.1.0(eslint@9.11.0(jiti@1.21.6)): + eslint-config-prettier@9.1.0(eslint@9.11.1(jiti@1.21.6)): dependencies: - eslint: 9.11.0(jiti@1.21.6) + eslint: 9.11.1(jiti@1.21.6) optional: true - eslint-config-turbo@2.1.2(eslint@9.11.0(jiti@1.21.6)): -======= eslint-config-turbo@2.1.2(eslint@9.11.1(jiti@1.21.6)): ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - eslint-config-turbo@2.1.2(eslint@9.11.1(jiti@2.0.0)): ->>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 dependencies: - eslint: 9.11.1(jiti@2.0.0) - eslint-plugin-turbo: 2.1.2(eslint@9.11.1(jiti@2.0.0)) + eslint: 9.11.1(jiti@1.21.6) + eslint-plugin-turbo: 2.1.2(eslint@9.11.1(jiti@1.21.6)) eslint-import-resolver-node@0.3.9: dependencies: @@ -17271,44 +16241,30 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-command@0.2.6(eslint@9.11.1(jiti@2.0.0)): + eslint-plugin-command@0.2.6(eslint@9.11.1(jiti@1.21.6)): dependencies: '@es-joy/jsdoccomment': 0.48.0 - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.11.1(jiti@1.21.6) - eslint-plugin-es-x@7.8.0(eslint@9.11.1(jiti@2.0.0)): + eslint-plugin-es-x@7.8.0(eslint@9.11.1(jiti@1.21.6)): dependencies: -<<<<<<< HEAD -<<<<<<< HEAD - '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.0(jiti@1.21.6)) - '@eslint-community/regexpp': 4.11.0 - eslint: 9.11.0(jiti@1.21.6) - eslint-compat-utils: 0.5.1(eslint@9.11.0(jiti@1.21.6)) -======= '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@1.21.6)) - '@eslint-community/regexpp': 4.11.1 + '@eslint-community/regexpp': 4.11.0 eslint: 9.11.1(jiti@1.21.6) eslint-compat-utils: 0.5.1(eslint@9.11.1(jiti@1.21.6)) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0)) - '@eslint-community/regexpp': 4.11.1 - eslint: 9.11.1(jiti@2.0.0) - eslint-compat-utils: 0.5.1(eslint@9.11.1(jiti@2.0.0)) ->>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 - eslint-plugin-eslint-comments@3.2.0(eslint@9.11.1(jiti@2.0.0)): + eslint-plugin-eslint-comments@3.2.0(eslint@9.11.1(jiti@1.21.6)): dependencies: escape-string-regexp: 1.0.5 - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.11.1(jiti@1.21.6) ignore: 5.3.2 - eslint-plugin-import-x@4.3.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2): + eslint-plugin-import-x@4.3.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2): dependencies: - '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) debug: 4.3.7 doctrine: 3.0.0 - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.11.1(jiti@1.21.6) eslint-import-resolver-node: 0.3.9 get-tsconfig: 4.8.0 is-glob: 4.0.3 @@ -17320,14 +16276,14 @@ snapshots: - supports-color - typescript - eslint-plugin-jsdoc@50.3.0(eslint@9.11.1(jiti@2.0.0)): + eslint-plugin-jsdoc@50.3.0(eslint@9.11.1(jiti@1.21.6)): dependencies: '@es-joy/jsdoccomment': 0.48.0 are-docs-informative: 0.0.2 comment-parser: 1.4.1 debug: 4.3.7 escape-string-regexp: 4.0.0 - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.11.1(jiti@1.21.6) espree: 10.1.0 esquery: 1.6.0 parse-imports: 2.1.1 @@ -17337,35 +16293,24 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-jsonc@2.16.0(eslint@9.11.1(jiti@2.0.0)): + eslint-plugin-jsonc@2.16.0(eslint@9.11.1(jiti@1.21.6)): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0)) - eslint: 9.11.1(jiti@2.0.0) - eslint-compat-utils: 0.5.1(eslint@9.11.1(jiti@2.0.0)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@1.21.6)) + eslint: 9.11.1(jiti@1.21.6) + eslint-compat-utils: 0.5.1(eslint@9.11.1(jiti@1.21.6)) espree: 9.6.1 graphemer: 1.4.0 jsonc-eslint-parser: 2.4.0 natural-compare: 1.4.0 synckit: 0.6.2 - eslint-plugin-n@17.10.3(eslint@9.11.1(jiti@2.0.0)): + eslint-plugin-n@17.10.3(eslint@9.11.1(jiti@1.21.6)): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@1.21.6)) enhanced-resolve: 5.17.1 -<<<<<<< HEAD -<<<<<<< HEAD - eslint: 9.11.0(jiti@1.21.6) - eslint-plugin-es-x: 7.8.0(eslint@9.11.0(jiti@1.21.6)) - get-tsconfig: 4.8.0 -======= eslint: 9.11.1(jiti@1.21.6) eslint-plugin-es-x: 7.8.0(eslint@9.11.1(jiti@1.21.6)) -======= - eslint: 9.11.1(jiti@2.0.0) - eslint-plugin-es-x: 7.8.0(eslint@9.11.1(jiti@2.0.0)) ->>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 - get-tsconfig: 4.8.1 ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f + get-tsconfig: 4.8.0 globals: 15.9.0 ignore: 5.3.2 minimatch: 9.0.5 @@ -17373,70 +16318,53 @@ snapshots: eslint-plugin-no-only-tests@3.3.0: {} - eslint-plugin-perfectionist@3.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)(vue-eslint-parser@9.4.3(eslint@9.11.1(jiti@2.0.0))): + eslint-plugin-perfectionist@3.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2)(vue-eslint-parser@9.4.3(eslint@9.11.1(jiti@1.21.6))): dependencies: '@typescript-eslint/types': 8.7.0 - '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) - eslint: 9.11.1(jiti@2.0.0) + '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) + eslint: 9.11.1(jiti@1.21.6) minimatch: 9.0.5 natural-compare-lite: 1.4.0 optionalDependencies: - vue-eslint-parser: 9.4.3(eslint@9.11.1(jiti@2.0.0)) + vue-eslint-parser: 9.4.3(eslint@9.11.1(jiti@1.21.6)) transitivePeerDependencies: - supports-color - typescript -<<<<<<< HEAD -<<<<<<< HEAD - eslint-plugin-prettier@5.2.1(@types/eslint@9.6.1)(eslint-config-prettier@9.1.0(eslint@9.11.0(jiti@1.21.6)))(eslint@9.11.0(jiti@1.21.6))(prettier@3.3.3): -======= - eslint-plugin-prettier@5.2.1(@types/eslint@9.6.1)(eslint@9.11.1(jiti@1.21.6))(prettier@3.3.3): ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - eslint-plugin-prettier@5.2.1(@types/eslint@9.6.1)(eslint@9.11.1(jiti@2.0.0))(prettier@3.3.3): ->>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 + eslint-plugin-prettier@5.2.1(@types/eslint@9.6.1)(eslint-config-prettier@9.1.0(eslint@9.11.1(jiti@1.21.6)))(eslint@9.11.1(jiti@1.21.6))(prettier@3.3.3): dependencies: - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.11.1(jiti@1.21.6) prettier: 3.3.3 prettier-linter-helpers: 1.0.0 synckit: 0.9.1 optionalDependencies: '@types/eslint': 9.6.1 - eslint-config-prettier: 9.1.0(eslint@9.11.0(jiti@1.21.6)) + eslint-config-prettier: 9.1.0(eslint@9.11.1(jiti@1.21.6)) - eslint-plugin-regexp@2.6.0(eslint@9.11.1(jiti@2.0.0)): + eslint-plugin-regexp@2.6.0(eslint@9.11.1(jiti@1.21.6)): dependencies: -<<<<<<< HEAD -<<<<<<< HEAD - '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.0(jiti@1.21.6)) - '@eslint-community/regexpp': 4.11.0 -======= '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@1.21.6)) -======= - '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0)) ->>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 - '@eslint-community/regexpp': 4.11.1 ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f + '@eslint-community/regexpp': 4.11.0 comment-parser: 1.4.1 - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.11.1(jiti@1.21.6) jsdoc-type-pratt-parser: 4.1.0 refa: 0.12.1 regexp-ast-analysis: 0.7.1 scslre: 0.3.0 - eslint-plugin-turbo@2.1.2(eslint@9.11.1(jiti@2.0.0)): + eslint-plugin-turbo@2.1.2(eslint@9.11.1(jiti@1.21.6)): dependencies: dotenv: 16.0.3 - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.11.1(jiti@1.21.6) - eslint-plugin-unicorn@55.0.0(eslint@9.11.1(jiti@2.0.0)): + eslint-plugin-unicorn@55.0.0(eslint@9.11.1(jiti@1.21.6)): dependencies: '@babel/helper-validator-identifier': 7.24.7 - '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@1.21.6)) ci-info: 4.0.0 clean-regexp: 1.0.0 core-js-compat: 3.38.1 - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.11.1(jiti@1.21.6) esquery: 1.6.0 globals: 15.9.0 indent-string: 4.0.0 @@ -17449,59 +16377,33 @@ snapshots: semver: 7.6.3 strip-indent: 3.0.0 - eslint-plugin-unused-imports@4.1.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)): + eslint-plugin-unused-imports@4.1.4(@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6)): dependencies: - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.11.1(jiti@1.21.6) 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)): -======= - eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.7.0)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - 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) - optionalDependencies: -<<<<<<< HEAD -<<<<<<< HEAD - '@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) - 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) -======= '@typescript-eslint/eslint-plugin': 8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) - vitest: 2.1.1(@types/node@22.7.0)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> 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 + + eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.7.4)(happy-dom@15.7.4)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.4)(terser@5.32.0)): + dependencies: + '@typescript-eslint/utils': 7.18.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) + eslint: 9.11.1(jiti@1.21.6) + optionalDependencies: + '@typescript-eslint/eslint-plugin': 8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) + vitest: 2.1.1(@types/node@22.7.4)(happy-dom@15.7.4)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) transitivePeerDependencies: - supports-color - typescript - eslint-plugin-vue@9.28.0(eslint@9.11.1(jiti@2.0.0)): + eslint-plugin-vue@9.28.0(eslint@9.11.1(jiti@1.21.6)): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0)) - eslint: 9.11.1(jiti@2.0.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@1.21.6)) + eslint: 9.11.1(jiti@1.21.6) globals: 13.24.0 natural-compare: 1.4.0 nth-check: 2.1.1 postcss-selector-parser: 6.1.2 semver: 7.6.3 - vue-eslint-parser: 9.4.3(eslint@9.11.1(jiti@2.0.0)) + vue-eslint-parser: 9.4.3(eslint@9.11.1(jiti@1.21.6)) xml-name-validator: 4.0.0 transitivePeerDependencies: - supports-color @@ -17520,19 +16422,10 @@ snapshots: eslint-visitor-keys@4.0.0: {} - eslint@9.11.1(jiti@2.0.0): + eslint@9.11.1(jiti@1.21.6): dependencies: -<<<<<<< HEAD -<<<<<<< HEAD - '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.0(jiti@1.21.6)) - '@eslint-community/regexpp': 4.11.0 -======= '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@1.21.6)) -======= - '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0)) ->>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 - '@eslint-community/regexpp': 4.11.1 ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f + '@eslint-community/regexpp': 4.11.0 '@eslint/config-array': 0.18.0 '@eslint/core': 0.6.0 '@eslint/eslintrc': 3.1.0 @@ -17569,7 +16462,7 @@ snapshots: strip-ansi: 6.0.1 text-table: 0.2.0 optionalDependencies: - jiti: 2.0.0 + jiti: 1.21.6 transitivePeerDependencies: - supports-color @@ -17893,13 +16786,8 @@ snapshots: consola: 3.2.3 defu: 6.1.4 node-fetch-native: 1.6.4 -<<<<<<< HEAD nypm: 0.3.11 ohash: 1.1.3 -======= - nypm: 0.3.12 - ohash: 1.1.4 ->>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 pathe: 1.1.2 tar: 6.2.1 @@ -18505,8 +17393,6 @@ snapshots: jiti@1.21.6: {} - jiti@2.0.0: {} - jju@1.4.0: {} js-beautify@1.15.1: @@ -18698,7 +17584,7 @@ snapshots: transitivePeerDependencies: - supports-color - listhen@1.8.0: + listhen@1.7.2: dependencies: '@parcel/watcher': 2.4.1 '@parcel/watcher-wasm': 2.4.1 @@ -18710,7 +17596,7 @@ snapshots: get-port-please: 3.1.2 h3: 1.12.0 http-shutdown: 1.2.2 - jiti: 2.0.0 + jiti: 1.21.6 mlly: 1.7.1 node-forge: 1.3.1 pathe: 1.1.2 @@ -19129,16 +18015,6 @@ snapshots: dependencies: '@cloudflare/kv-asset-handler': 0.3.4 '@netlify/functions': 2.8.1 -<<<<<<< HEAD - '@rollup/plugin-alias': 5.1.0(rollup@4.22.0) - '@rollup/plugin-commonjs': 25.0.8(rollup@4.22.0) - '@rollup/plugin-inject': 5.0.5(rollup@4.22.0) - '@rollup/plugin-json': 6.1.0(rollup@4.22.0) - '@rollup/plugin-node-resolve': 15.2.3(rollup@4.22.0) - '@rollup/plugin-replace': 5.0.7(rollup@4.22.0) - '@rollup/plugin-terser': 0.4.4(rollup@4.22.0) - '@rollup/pluginutils': 5.1.0(rollup@4.22.0) -======= '@rollup/plugin-alias': 5.1.1(rollup@4.22.4) '@rollup/plugin-commonjs': 25.0.8(rollup@4.22.4) '@rollup/plugin-inject': 5.0.5(rollup@4.22.4) @@ -19147,7 +18023,6 @@ snapshots: '@rollup/plugin-replace': 5.0.7(rollup@4.22.4) '@rollup/plugin-terser': 0.4.4(rollup@4.22.4) '@rollup/pluginutils': 5.1.2(rollup@4.22.4) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f '@types/http-proxy': 1.17.15 '@vercel/nft': 0.26.5(encoding@0.1.13) archiver: 7.0.1 @@ -19176,7 +18051,7 @@ snapshots: jiti: 1.21.6 klona: 2.0.6 knitwork: 1.1.0 - listhen: 1.8.0 + listhen: 1.7.2 magic-string: 0.30.11 mime: 4.0.4 mlly: 1.7.1 @@ -19190,8 +18065,8 @@ snapshots: pkg-types: 1.2.0 pretty-bytes: 6.1.1 radix3: 1.1.2 - rollup: 4.22.0 - rollup-plugin-visualizer: 5.12.0(rollup@4.22.0) + rollup: 4.22.4 + rollup-plugin-visualizer: 5.12.0(rollup@4.22.4) scule: 1.3.0 semver: 7.6.3 serve-placeholder: 2.0.2 @@ -19201,7 +18076,7 @@ snapshots: uncrypto: 0.1.3 unctx: 2.3.1(webpack-sources@3.2.3) unenv: 1.10.0 - unimport: 3.12.0(rollup@4.22.0)(webpack-sources@3.2.3) + unimport: 3.12.0(rollup@4.22.4)(webpack-sources@3.2.3) unstorage: 1.12.0(ioredis@5.4.1) unwasm: 0.3.9(webpack-sources@3.2.3) transitivePeerDependencies: @@ -19310,14 +18185,10 @@ snapshots: dependencies: boolbase: 1.0.0 -<<<<<<< HEAD nwsapi@2.2.12: optional: true nypm@0.3.11: -======= - nypm@0.3.12: ->>>>>>> a72b8acaf96c8c1706806b0b063d273a5bd0ee39 dependencies: citty: 0.1.6 consola: 3.2.3 @@ -19562,19 +18433,9 @@ 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): -======= - pinia-plugin-persistedstate@4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.8(typescript@5.6.2)))(rollup@4.22.4): ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f + 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.4): 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 @@ -20064,11 +18925,7 @@ snapshots: picocolors: 1.1.0 source-map-js: 1.2.1 -<<<<<<< HEAD - preact@10.23.2: {} -======= preact@10.24.1: {} ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f prelude-ls@1.2.1: {} @@ -20138,29 +18995,13 @@ snapshots: radix-vue@1.9.6(vue@3.5.10(typescript@5.6.2)): dependencies: -<<<<<<< HEAD '@floating-ui/dom': 1.6.10 - '@floating-ui/vue': 1.1.4(vue@3.5.7(typescript@5.6.2)) - '@internationalized/date': 3.5.5 - '@internationalized/number': 3.5.3 - '@tanstack/vue-virtual': 3.10.7(vue@3.5.7(typescript@5.6.2)) - '@vueuse/core': 10.11.1(vue@3.5.7(typescript@5.6.2)) - '@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.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 @@ -20373,15 +19214,6 @@ snapshots: optionalDependencies: '@babel/code-frame': 7.24.7 - rollup-plugin-visualizer@5.12.0(rollup@4.22.0): - dependencies: - open: 8.4.2 - picomatch: 2.3.1 - source-map: 0.7.4 - yargs: 17.7.2 - optionalDependencies: - rollup: 4.22.0 - rollup-plugin-visualizer@5.12.0(rollup@4.22.4): dependencies: open: 8.4.2 @@ -20400,7 +19232,7 @@ snapshots: optionalDependencies: rollup: 4.22.5 - rollup@2.79.2: + rollup@2.79.1: optionalDependencies: fsevents: 2.3.3 @@ -20408,28 +19240,6 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - rollup@4.22.0: - dependencies: - '@types/estree': 1.0.5 - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.22.0 - '@rollup/rollup-android-arm64': 4.22.0 - '@rollup/rollup-darwin-arm64': 4.22.0 - '@rollup/rollup-darwin-x64': 4.22.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.22.0 - '@rollup/rollup-linux-arm-musleabihf': 4.22.0 - '@rollup/rollup-linux-arm64-gnu': 4.22.0 - '@rollup/rollup-linux-arm64-musl': 4.22.0 - '@rollup/rollup-linux-powerpc64le-gnu': 4.22.0 - '@rollup/rollup-linux-riscv64-gnu': 4.22.0 - '@rollup/rollup-linux-s390x-gnu': 4.22.0 - '@rollup/rollup-linux-x64-gnu': 4.22.0 - '@rollup/rollup-linux-x64-musl': 4.22.0 - '@rollup/rollup-win32-arm64-msvc': 4.22.0 - '@rollup/rollup-win32-ia32-msvc': 4.22.0 - '@rollup/rollup-win32-x64-msvc': 4.22.0 - fsevents: 2.3.3 - rollup@4.22.4: dependencies: '@types/estree': 1.0.5 @@ -21110,7 +19920,7 @@ snapshots: tar-stream@3.1.7: dependencies: - b4a: 1.6.7 + b4a: 1.6.6 fast-fifo: 1.3.2 streamx: 2.20.0 @@ -21143,7 +19953,7 @@ snapshots: text-decoder@1.1.1: dependencies: - b4a: 1.6.7 + b4a: 1.6.6 text-extensions@2.4.0: {} @@ -21322,21 +20132,12 @@ snapshots: 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) + '@rollup/plugin-alias': 5.1.1(rollup@3.29.4) '@rollup/plugin-commonjs': 25.0.8(rollup@3.29.4) '@rollup/plugin-json': 6.1.0(rollup@3.29.4) - '@rollup/plugin-node-resolve': 15.2.3(rollup@3.29.4) + '@rollup/plugin-node-resolve': 15.3.0(rollup@3.29.4) '@rollup/plugin-replace': 5.0.7(rollup@3.29.4) - '@rollup/pluginutils': 5.1.0(rollup@3.29.4) -======= - '@rollup/plugin-alias': 5.1.1(rollup@3.29.5) - '@rollup/plugin-commonjs': 25.0.8(rollup@3.29.5) - '@rollup/plugin-json': 6.1.0(rollup@3.29.5) - '@rollup/plugin-node-resolve': 15.3.0(rollup@3.29.5) - '@rollup/plugin-replace': 5.0.7(rollup@3.29.5) - '@rollup/pluginutils': 5.1.2(rollup@3.29.5) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f + '@rollup/pluginutils': 5.1.2(rollup@3.29.4) chalk: 5.3.0 citty: 0.1.6 consola: 3.2.3 @@ -21404,35 +20205,9 @@ 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 - fast-glob: 3.3.2 - local-pkg: 0.5.0 - magic-string: 0.30.11 - mlly: 1.7.1 - pathe: 1.1.2 - 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 - - webpack-sources - - unimport@3.12.0(rollup@4.22.0)(webpack-sources@3.2.3): - dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.22.0) + '@rollup/pluginutils': 5.1.2(rollup@3.29.4) acorn: 8.12.1 escape-string-regexp: 5.0.0 estree-walker: 3.0.3 @@ -21445,14 +20220,11 @@ 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 - unimport@3.12.0(rollup@4.22.4): + unimport@3.12.0(rollup@4.22.4)(webpack-sources@3.2.3): dependencies: '@rollup/pluginutils': 5.1.2(rollup@4.22.4) acorn: 8.12.1 @@ -21470,6 +20242,25 @@ snapshots: transitivePeerDependencies: - rollup - webpack-sources + + unimport@3.12.0(rollup@4.22.5): + dependencies: + '@rollup/pluginutils': 5.1.2(rollup@4.22.5) + acorn: 8.12.1 + escape-string-regexp: 5.0.0 + estree-walker: 3.0.3 + fast-glob: 3.3.2 + local-pkg: 0.5.0 + magic-string: 0.30.11 + mlly: 1.7.1 + pathe: 1.1.2 + pkg-types: 1.2.0 + scule: 1.3.0 + strip-literal: 2.1.0 + unplugin: 1.14.1(webpack-sources@3.2.3) + transitivePeerDependencies: + - rollup + - webpack-sources optional: true unique-filename@1.1.1: @@ -21511,11 +20302,7 @@ 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 + unplugin-element-plus@0.8.0(rollup@4.22.5)(webpack-sources@3.2.3): dependencies: '@rollup/pluginutils': 5.1.2(rollup@4.22.5) es-module-lexer: 1.5.4 @@ -21525,10 +20312,10 @@ snapshots: - rollup - webpack-sources - unplugin-vue-components@0.27.4(@babel/parser@7.25.6)(@nuxt/kit@3.13.2(rollup@4.22.4))(rollup@4.22.4)(vue@3.5.7(typescript@5.6.2)): + unplugin-vue-components@0.27.4(@babel/parser@7.25.6)(@nuxt/kit@3.13.2(rollup@4.22.5))(rollup@4.22.5)(vue@3.5.10(typescript@5.6.2)): dependencies: '@antfu/utils': 0.7.10 - '@rollup/pluginutils': 5.1.0(rollup@4.22.4) + '@rollup/pluginutils': 5.1.2(rollup@4.22.5) chokidar: 3.6.0 debug: 4.3.6 fast-glob: 3.3.2 @@ -21537,10 +20324,10 @@ snapshots: minimatch: 9.0.5 mlly: 1.7.1 unplugin: 1.12.2 - vue: 3.5.7(typescript@5.6.2) + vue: 3.5.10(typescript@5.6.2) optionalDependencies: '@babel/parser': 7.25.6 - '@nuxt/kit': 3.13.2(rollup@4.22.4) + '@nuxt/kit': 3.13.2(rollup@4.22.5) transitivePeerDependencies: - rollup - supports-color @@ -21565,7 +20352,7 @@ snapshots: chokidar: 3.6.0 destr: 2.0.3 h3: 1.12.0 - listhen: 1.8.0 + listhen: 1.7.2 lru-cache: 10.4.3 mri: 1.2.0 node-fetch-native: 1.6.4 @@ -21662,52 +20449,16 @@ 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)): + 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.32.0)): dependencies: - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(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): -======= - vite-hot-client@0.2.3(vite@5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): -======= - 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.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 + vite-node@2.1.1(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0): 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) -======= - vite: 5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - 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 + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) transitivePeerDependencies: - '@types/node' - less @@ -21719,52 +20470,20 @@ 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)): -======= - vite-plugin-compression@0.5.1(vite@5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - 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 + 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.32.0)): 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) + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) transitivePeerDependencies: - supports-color - vite-plugin-dts@4.2.1(@types/node@22.5.5)(rollup@4.22.4)(typescript@5.6.2)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)): - dependencies: - '@microsoft/api-extractor': 7.47.7(@types/node@22.5.5) - '@rollup/pluginutils': 5.1.0(rollup@4.22.4) - '@volar/typescript': 2.4.4 -======= - vite: 5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.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) ->>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 - transitivePeerDependencies: - - supports-color - - 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)): + 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.32.0)): dependencies: '@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 + '@volar/typescript': 2.4.4 '@vue/language-core': 2.1.6(typescript@5.6.2) compare-versions: 6.1.1 debug: 4.3.7 @@ -21773,37 +20492,13 @@ snapshots: magic-string: 0.30.11 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) -======= - vite: 5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - 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 + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) 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)): -======= - vite-plugin-html@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 -======= - 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 + 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.32.0)): dependencies: '@rollup/pluginutils': 4.2.1 colorette: 2.0.20 @@ -21817,27 +20512,9 @@ snapshots: html-minifier-terser: 6.1.0 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) + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) - vite-plugin-inspect@0.8.7(rollup@4.22.4)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)): -======= - 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)): ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - vite: 5.4.8(@types/node@22.7.2)(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.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 + 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.32.0)): dependencies: '@antfu/utils': 0.7.10 '@rollup/pluginutils': 5.1.2(rollup@4.22.5) @@ -21848,156 +20525,46 @@ snapshots: perfect-debounce: 1.0.0 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) -======= - vite: 5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - 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 + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) 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)): -======= - vite-plugin-lib-inject-css@2.1.1(vite@5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - 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 + 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.32.0)): 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) + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) - 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): -======= - vite: 5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) - - vite-plugin-pwa@0.20.5(vite@5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0): ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - vite: 5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) - - 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 + 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.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0): 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) -======= - vite: 5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - 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 + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) 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): + 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.32.0))(vue@3.5.10(typescript@5.6.2)): dependencies: - debug: 4.3.7 - pretty-bytes: 6.1.1 - tinyglobby: 0.2.6 - 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 - transitivePeerDependencies: - - supports-color - - vite-plugin-vue-devtools@7.4.5(rollup@4.22.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)): - dependencies: - '@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)) - '@vue/devtools-kit': 7.4.5 - '@vue/devtools-shared': 7.4.5 - execa: 8.0.1 - sirv: 2.0.4 - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) - vite-plugin-inspect: 0.8.7(rollup@4.22.4)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)) - 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)) -======= - vite-plugin-vue-devtools@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)): -======= - 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.4)(less@4.2.0)(sass@1.79.4)(terser@5.33.0))(vue@3.5.10(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.32.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)) - vite-plugin-vue-inspector: 5.2.0(vite@5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - vite: 5.4.8(@types/node@22.7.2)(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.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 + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.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.32.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.32.0)) 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)): -======= - vite-plugin-vue-inspector@5.2.0(vite@5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - 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 + 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.32.0)): dependencies: '@babel/core': 7.25.2 '@babel/plugin-proposal-decorators': 7.24.7(@babel/core@7.25.2) @@ -22005,72 +20572,24 @@ 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 + '@vue/compiler-dom': 3.5.8 kolorist: 1.8.0 magic-string: 0.30.11 -<<<<<<< HEAD -<<<<<<< HEAD - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) transitivePeerDependencies: - supports-color - vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0): -======= - vite: 5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) - transitivePeerDependencies: - - supports-color - - vite@5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0): ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - vite: 5.4.8(@types/node@22.7.2)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) - transitivePeerDependencies: - - supports-color - - 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.32.0): dependencies: 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 + rollup: 4.22.4 optionalDependencies: '@types/node': 22.7.4 fsevents: 2.3.3 less: 4.2.0 -<<<<<<< HEAD - sass: 1.79.3 - terser: 5.32.0 - - vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0): - dependencies: - esbuild: 0.21.5 - postcss: 8.4.47 - rollup: 4.22.0 - optionalDependencies: - '@types/node': 22.5.5 - fsevents: 2.3.3 - less: 4.2.0 - sass: 1.79.3 - terser: 5.32.0 -======= sass: 1.79.4 - terser: 5.33.0 ->>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 + terser: 5.32.0 vitepress-plugin-group-icons@1.2.4: dependencies: @@ -22080,63 +20599,24 @@ 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): -======= - vitepress@1.3.4(@algolia/client-search@4.24.0)(@types/node@22.7.0)(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): ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - 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 + 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.32.0)(typescript@5.6.2): dependencies: '@docsearch/css': 3.6.1 '@docsearch/js': 3.6.1(@algolia/client-search@4.24.0)(search-insights@2.17.2) '@shikijs/core': 1.18.0 '@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 - '@vue/shared': 3.5.6 - '@vueuse/core': 11.1.0(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.5.4)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.7(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.32.0))(vue@3.5.10(typescript@5.6.2)) + '@vue/devtools-api': 7.4.6 + '@vue/shared': 3.5.8 + '@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.5.4)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.10(typescript@5.6.2)) focus-trap: 7.5.4 mark.js: 8.11.1 minisearch: 7.1.0 shiki: 1.18.0 - 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) -======= - '@vitejs/plugin-vue': 5.1.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)) -======= - '@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.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) + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) vue: 3.5.10(typescript@5.6.2) ->>>>>>> 2d1519eca740c4a09d94c7f0daff714b20a5acd7 optionalDependencies: postcss: 8.4.47 transitivePeerDependencies: @@ -22167,31 +20647,10 @@ 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): + vitest@2.1.1(@types/node@22.7.4)(happy-dom@15.7.4)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.4)(terser@5.32.0): dependencies: '@vitest/expect': 2.1.1 - '@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)) -======= - vitest@2.1.1(@types/node@22.7.0)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.3)(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.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - 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): - dependencies: - '@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/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.32.0)) '@vitest/pretty-format': 2.1.1 '@vitest/runner': 2.1.1 '@vitest/snapshot': 2.1.1 @@ -22206,23 +20665,8 @@ snapshots: tinyexec: 0.3.0 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) -======= - vite: 5.4.8(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) - vite-node: 2.1.1(@types/node@22.7.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> a46c85d77df8622e0771e136bb7a583fd500120f -======= - 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 + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) + vite-node: 2.1.1(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.32.0) why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 22.7.4 @@ -22248,11 +20692,11 @@ snapshots: vscode-uri@3.0.8: {} - vue-codemirror6@1.3.4(@lezer/common@1.2.1)(vue@3.5.7(typescript@5.6.2)): + vue-codemirror6@1.3.4(@lezer/common@1.2.1)(vue@3.5.10(typescript@5.6.2)): dependencies: codemirror: 6.0.1(@lezer/common@1.2.1) - vue: 3.5.7(typescript@5.6.2) - vue-demi: 0.14.10(vue@3.5.7(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)) transitivePeerDependencies: - '@lezer/common' - '@vue/composition-api' @@ -22263,10 +20707,10 @@ snapshots: dependencies: vue: 3.5.10(typescript@5.6.2) - vue-eslint-parser@9.4.3(eslint@9.11.1(jiti@2.0.0)): + vue-eslint-parser@9.4.3(eslint@9.11.1(jiti@1.21.6)): dependencies: debug: 4.3.7 - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.11.1(jiti@1.21.6) eslint-scope: 7.2.2 eslint-visitor-keys: 3.4.3 espree: 9.6.1 @@ -22283,19 +20727,11 @@ snapshots: '@vue/devtools-api': 6.6.4 vue: 3.5.10(typescript@5.6.2) -<<<<<<< HEAD -<<<<<<< HEAD - vue-json-pretty@2.4.0(vue@3.5.7(typescript@5.6.2)): + vue-json-pretty@2.4.0(vue@3.5.10(typescript@5.6.2)): dependencies: - vue: 3.5.7(typescript@5.6.2) + vue: 3.5.10(typescript@5.6.2) - vue-router@4.4.5(vue@3.5.7(typescript@5.6.2)): -======= - 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.10(typescript@5.6.2) @@ -22439,10 +20875,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.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) + '@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) '@surma/rollup-plugin-off-main-thread': 2.2.3 ajv: 8.17.1 common-tags: 1.8.2 @@ -22451,7 +20887,7 @@ snapshots: glob: 7.2.3 lodash: 4.17.21 pretty-bytes: 5.6.0 - rollup: 2.79.2 + rollup: 2.79.1 source-map: 0.8.0-beta.0 stringify-object: 3.3.0 strip-comments: 2.0.1 @@ -22671,4 +21107,4 @@ snapshots: zx@8.1.8: optionalDependencies: '@types/fs-extra': 11.0.4 - '@types/node': 22.7.4 + '@types/node': 22.7.0