From 6e807a3653ec58ce78b534fa773595c972ca19f4 Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Sat, 5 Oct 2024 13:44:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9C=A8=E7=BA=BF=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/monitor/online/index.ts | 10 +- .../web-antd/src/views/monitor/online/data.ts | 71 +- .../src/views/monitor/online/index.vue | 78 +- pnpm-lock.yaml | 2650 ++--------------- 4 files changed, 369 insertions(+), 2440 deletions(-) diff --git a/apps/web-antd/src/api/monitor/online/index.ts b/apps/web-antd/src/api/monitor/online/index.ts index 88289775..4d8224a2 100644 --- a/apps/web-antd/src/api/monitor/online/index.ts +++ b/apps/web-antd/src/api/monitor/online/index.ts @@ -1,6 +1,6 @@ import type { OnlineUser } from './model'; -import type { PageQuery } from '#/api/common'; +import type { PageQuery, PageResult } from '#/api/common'; import { requestClient } from '#/api/request'; @@ -14,11 +14,11 @@ enum Api { * @returns OnlineUser[] */ export function onlineDeviceList() { - return requestClient.get(Api.root); + return requestClient.get>(Api.root); } export function onlineList(params?: PageQuery) { - return requestClient.get(Api.onlineList, { params }); + return requestClient.get>(Api.onlineList, { params }); } /** @@ -27,7 +27,7 @@ export function onlineList(params?: PageQuery) { * @returns void */ export function forceLogout(tokenId: string) { - return requestClient.delete(`${Api.root}/${tokenId}`); + return requestClient.deleteWithMsg(`${Api.root}/${tokenId}`); } /** @@ -36,5 +36,5 @@ export function forceLogout(tokenId: string) { * @returns void */ export function forceLogout2(tokenId: string) { - return requestClient.post(`${Api.root}/${tokenId}`); + return requestClient.postWithMsg(`${Api.root}/${tokenId}`); } diff --git a/apps/web-antd/src/views/monitor/online/data.ts b/apps/web-antd/src/views/monitor/online/data.ts index 44c1af49..b0f6bef8 100644 --- a/apps/web-antd/src/views/monitor/online/data.ts +++ b/apps/web-antd/src/views/monitor/online/data.ts @@ -1,4 +1,10 @@ -import type { FormSchemaGetter } from '#/adapter'; +import type { FormSchemaGetter, VxeGridProps } from '#/adapter'; + +import type { VNode } from 'vue'; + +import dayjs from 'dayjs'; + +import { renderBrowserIcon, renderOsIcon } from '#/utils/render'; export const querySchema: FormSchemaGetter = () => [ { @@ -12,3 +18,66 @@ export const querySchema: FormSchemaGetter = () => [ label: '用户账号', }, ]; + +export const columns: VxeGridProps['columns'] = [ + { + title: '登录平台', + field: 'deviceType', + }, + { + title: '登录账号', + field: 'userName', + }, + { + title: '部门名称', + field: 'deptName', + }, + { + title: 'IP地址', + field: 'ipaddr', + }, + { + title: '登录地址', + field: 'loginLocation', + }, + { + title: '浏览器', + field: 'browser', + slots: { + default: ({ row }) => { + return renderBrowserIcon(row.browser, true) as VNode; + }, + }, + }, + { + title: '系统', + field: 'os', + slots: { + default: ({ row }) => { + // Windows 10 or Windows Server 2016 太长了 分割一下 详情依旧能看到详细的 + let value = row.os; + if (value) { + const split = value.split(' or '); + if (split.length === 2) { + value = split[0]; + } + } + return renderOsIcon(value, true) as VNode; + }, + }, + }, + { + title: '登录时间', + field: 'loginTime', + formatter: ({ cellValue }) => { + return dayjs(cellValue).format('YYYY-MM-DD HH:mm:ss'); + }, + }, + { + field: 'action', + fixed: 'right', + slots: { default: 'action' }, + title: '操作', + width: 120, + }, +]; diff --git a/apps/web-antd/src/views/monitor/online/index.vue b/apps/web-antd/src/views/monitor/online/index.vue index 7e009d1f..3311c7d6 100644 --- a/apps/web-antd/src/views/monitor/online/index.vue +++ b/apps/web-antd/src/views/monitor/online/index.vue @@ -1,36 +1,68 @@ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8ce6670d..ea3723f4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,11 +10,7 @@ catalogs: specifier: ^0.5.0 version: 0.5.0 '@changesets/cli': -<<<<<<< HEAD - specifier: ^2.27.8 -======= specifier: ^2.27.9 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e version: 2.27.9 '@changesets/git': specifier: ^3.0.1 @@ -29,11 +25,7 @@ catalogs: specifier: ^19.5.0 version: 19.5.0 '@eslint/js': -<<<<<<< HEAD - specifier: ^9.11.1 -======= specifier: ^9.12.0 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e version: 9.12.0 '@faker-js/faker': specifier: ^9.0.3 @@ -66,11 +58,7 @@ catalogs: specifier: ^1.47.2 version: 1.47.2 '@stylistic/stylelint-plugin': -<<<<<<< HEAD - specifier: ^3.1.0 -======= specifier: ^3.1.1 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e version: 3.1.1 '@tailwindcss/nesting': specifier: 0.0.0-insiders.565cd3e @@ -79,11 +67,7 @@ catalogs: specifier: ^0.5.15 version: 0.5.15 '@tanstack/vue-query': -<<<<<<< HEAD - specifier: ^5.59.0 -======= specifier: ^5.59.1 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e version: 5.59.1 '@tanstack/vue-store': specifier: ^0.5.5 @@ -140,17 +124,10 @@ catalogs: specifier: ^4.0.1 version: 4.0.1 '@vue/reactivity': -<<<<<<< HEAD - specifier: ^3.5.10 - version: 3.5.11 - '@vue/shared': - specifier: ^3.5.10 -======= specifier: ^3.5.11 version: 3.5.11 '@vue/shared': specifier: ^3.5.11 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e version: 3.5.11 '@vue/test-utils': specifier: ^2.4.6 @@ -231,11 +208,7 @@ catalogs: specifier: ^2.8.4 version: 2.8.4 eslint: -<<<<<<< HEAD - specifier: ^9.11.1 -======= specifier: ^9.12.0 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e version: 9.12.0 eslint-config-turbo: specifier: ^2.1.3 @@ -343,11 +316,7 @@ catalogs: specifier: ^8.1.0 version: 8.1.0 pinia-plugin-persistedstate: -<<<<<<< HEAD - specifier: ^4.0.2 -======= specifier: ^4.1.1 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e version: 4.1.1 pkg-types: specifier: ^1.2.0 @@ -368,11 +337,7 @@ catalogs: specifier: ^16.1.0 version: 16.1.0 postcss-preset-env: -<<<<<<< HEAD - specifier: ^10.0.5 -======= specifier: ^10.0.6 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e version: 10.0.6 postcss-scss: specifier: ^4.0.9 @@ -438,11 +403,7 @@ catalogs: specifier: ^6.7.0 version: 6.7.0 tailwind-merge: -<<<<<<< HEAD - specifier: ^2.5.2 -======= specifier: ^2.5.3 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e version: 2.5.3 tailwindcss: specifier: ^3.4.13 @@ -514,11 +475,7 @@ catalogs: specifier: ^2.1.6 version: 2.1.6 vxe-pc-ui: -<<<<<<< HEAD - specifier: ^4.2.9 -======= specifier: ^4.2.13 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e version: 4.2.13 vxe-table: specifier: ^4.7.84 @@ -584,17 +541,10 @@ importers: version: link:scripts/vsh '@vitejs/plugin-vue': specifier: 'catalog:' -<<<<<<< HEAD - version: 5.1.4(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3))(vue@3.5.10(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.31.3))(vue@3.5.11(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.31.3))(vue@3.5.10(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.34.1))(vue@3.5.11(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.34.1))(vue@3.5.11(typescript@5.6.2)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e + version: 4.0.1(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3))(vue@3.5.11(typescript@5.6.2)) '@vue/test-utils': specifier: 'catalog:' version: 2.4.6 @@ -639,17 +589,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 version: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) vitest: specifier: 'catalog:' version: 2.1.2(@types/node@22.7.4)(happy-dom@15.7.4)(jsdom@24.1.1)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) -======= - version: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) - vitest: - specifier: 'catalog:' - version: 2.1.2(@types/node@22.7.4)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e vue: specifier: ^3.5.11 version: 3.5.11(typescript@5.6.2) @@ -680,7 +623,7 @@ importers: dependencies: '@tinymce/tinymce-vue': specifier: ^6.0.1 - version: 6.0.1(vue@3.5.10(typescript@5.6.2)) + version: 6.0.1(vue@3.5.11(typescript@5.6.2)) '@vben/access': specifier: workspace:* version: link:../../packages/effects/access @@ -728,17 +671,13 @@ importers: version: 11.1.0(vue@3.5.11(typescript@5.6.2)) ant-design-vue: specifier: 'catalog:' -<<<<<<< HEAD - version: 4.2.5(vue@3.5.10(typescript@5.6.2)) + version: 4.2.5(vue@3.5.11(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.11(typescript@5.6.2)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dayjs: specifier: 'catalog:' version: 1.11.13 @@ -753,24 +692,19 @@ importers: version: 4.17.21 pinia: specifier: 2.2.2 -<<<<<<< HEAD - version: 2.2.2(typescript@5.6.2)(vue@3.5.10(typescript@5.6.2)) + version: 2.2.2(typescript@5.6.2)(vue@3.5.11(typescript@5.6.2)) tinymce: specifier: ^7.3.0 version: 7.3.0 unplugin-vue-components: specifier: ^0.27.3 - version: 0.27.3(@babel/parser@7.25.3)(@nuxt/kit@3.13.2(rollup@4.24.0)(webpack-sources@3.2.3))(rollup@4.24.0)(vue@3.5.10(typescript@5.6.2)) -======= - version: 2.2.2(typescript@5.6.2)(vue@3.5.11(typescript@5.6.2)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e + version: 0.27.3(@babel/parser@7.25.3)(@nuxt/kit@3.13.2(rollup@4.24.0)(webpack-sources@3.2.3))(rollup@4.24.0)(vue@3.5.11(typescript@5.6.2)) vue: specifier: ^3.5.11 version: 3.5.11(typescript@5.6.2) vue-router: specifier: 'catalog:' -<<<<<<< HEAD - version: 4.4.5(vue@3.5.10(typescript@5.6.2)) + version: 4.4.5(vue@3.5.11(typescript@5.6.2)) devDependencies: '@types/crypto-js': specifier: ^4.2.2 @@ -778,9 +712,6 @@ importers: '@types/lodash-es': specifier: ^4.17.12 version: 4.17.12 -======= - version: 4.4.5(vue@3.5.11(typescript@5.6.2)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e apps/web-ele: dependencies: @@ -941,27 +872,16 @@ importers: devDependencies: '@nolebase/vitepress-plugin-git-changelog': specifier: 'catalog:' -<<<<<<< HEAD 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.16.0)(sortablejs@1.15.3)(terser@5.31.3)(typescript@5.6.2) -======= - 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.34.1)(typescript@5.6.2) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@vben/vite-config': specifier: workspace:* version: link:../internal/vite-config '@vite-pwa/vitepress': specifier: 'catalog:' -<<<<<<< HEAD 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.31.3))(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.16.0)(sortablejs@1.15.3)(terser@5.31.3)(typescript@5.6.2) -======= - 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.34.1))(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.34.1)(typescript@5.6.2) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e vue: specifier: ^3.5.11 version: 3.5.11(typescript@5.6.2) @@ -991,7 +911,6 @@ importers: dependencies: eslint-config-turbo: specifier: 'catalog:' -<<<<<<< HEAD version: 2.1.3(eslint@9.12.0(jiti@1.21.6)) eslint-plugin-command: specifier: 'catalog:' @@ -999,15 +918,6 @@ importers: eslint-plugin-import-x: specifier: 'catalog:' version: 4.3.1(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2) -======= - version: 2.1.3(eslint@9.12.0(jiti@2.2.1)) - eslint-plugin-command: - specifier: 'catalog:' - version: 0.2.6(eslint@9.12.0(jiti@2.2.1)) - eslint-plugin-import-x: - specifier: 'catalog:' - version: 4.3.1(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e devDependencies: '@eslint/js': specifier: 'catalog:' @@ -1017,7 +927,6 @@ importers: version: 9.6.1 '@typescript-eslint/eslint-plugin': specifier: 'catalog:' -<<<<<<< HEAD version: 8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2) '@typescript-eslint/parser': specifier: 'catalog:' @@ -1037,33 +946,11 @@ importers: eslint-plugin-n: specifier: 'catalog:' version: 17.10.3(eslint@9.12.0(jiti@1.21.6)) -======= - version: 8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2))(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2) - '@typescript-eslint/parser': - specifier: 'catalog:' - version: 8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2) - eslint: - specifier: 'catalog:' - version: 9.12.0(jiti@2.2.1) - eslint-plugin-eslint-comments: - specifier: 'catalog:' - version: 3.2.0(eslint@9.12.0(jiti@2.2.1)) - eslint-plugin-jsdoc: - specifier: 'catalog:' - version: 50.3.1(eslint@9.12.0(jiti@2.2.1)) - eslint-plugin-jsonc: - specifier: 'catalog:' - version: 2.16.0(eslint@9.12.0(jiti@2.2.1)) - eslint-plugin-n: - specifier: 'catalog:' - version: 17.10.3(eslint@9.12.0(jiti@2.2.1)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e eslint-plugin-no-only-tests: specifier: 'catalog:' version: 3.3.0 eslint-plugin-perfectionist: specifier: 'catalog:' -<<<<<<< HEAD version: 3.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2)(vue-eslint-parser@9.4.3(eslint@9.12.0(jiti@1.21.6))) eslint-plugin-prettier: specifier: 'catalog:' @@ -1073,7 +960,7 @@ importers: version: 2.6.0(eslint@9.12.0(jiti@1.21.6)) eslint-plugin-unicorn: specifier: 'catalog:' - version: 55.0.0(eslint@9.12.0(jiti@1.21.6)) + version: 56.0.0(eslint@9.12.0(jiti@1.21.6)) eslint-plugin-unused-imports: specifier: 'catalog:' version: 4.1.4(@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.12.0(jiti@1.21.6)) @@ -1083,27 +970,6 @@ importers: eslint-plugin-vue: specifier: 'catalog:' version: 9.28.0(eslint@9.12.0(jiti@1.21.6)) -======= - version: 3.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2)(vue-eslint-parser@9.4.3(eslint@9.12.0(jiti@2.2.1))) - eslint-plugin-prettier: - specifier: 'catalog:' - version: 5.2.1(@types/eslint@9.6.1)(eslint@9.12.0(jiti@2.2.1))(prettier@3.3.3) - eslint-plugin-regexp: - specifier: 'catalog:' - version: 2.6.0(eslint@9.12.0(jiti@2.2.1)) - eslint-plugin-unicorn: - specifier: 'catalog:' - version: 56.0.0(eslint@9.12.0(jiti@2.2.1)) - eslint-plugin-unused-imports: - specifier: 'catalog:' - version: 4.1.4(@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2))(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2))(eslint@9.12.0(jiti@2.2.1)) - eslint-plugin-vitest: - specifier: 'catalog:' - version: 0.5.4(@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2))(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2))(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2)(vitest@2.1.2(@types/node@22.7.4)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1)) - eslint-plugin-vue: - specifier: 'catalog:' - version: 9.28.0(eslint@9.12.0(jiti@2.2.1)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e globals: specifier: 'catalog:' version: 15.10.0 @@ -1112,11 +978,7 @@ importers: version: 2.4.0 vue-eslint-parser: specifier: 'catalog:' -<<<<<<< HEAD version: 9.4.3(eslint@9.12.0(jiti@1.21.6)) -======= - version: 9.4.3(eslint@9.12.0(jiti@2.2.1)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e internal/lint-configs/prettier-config: dependencies: @@ -1269,21 +1131,13 @@ importers: version: link:../../packages/types vite: specifier: 'catalog:' -<<<<<<< HEAD version: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) -======= - version: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e internal/vite-config: dependencies: '@intlify/unplugin-vue-i18n': specifier: 'catalog:' -<<<<<<< HEAD - version: 5.2.0(@vue/compiler-dom@3.5.11)(eslint@9.12.0(jiti@1.21.6))(rollup@4.24.0)(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)) -======= - version: 5.2.0(@vue/compiler-dom@3.5.11)(eslint@9.12.0(jiti@2.2.1))(rollup@4.24.0)(typescript@5.6.2)(vue-i18n@10.0.3(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e + version: 5.2.0(@vue/compiler-dom@3.5.11)(eslint@9.12.0(jiti@1.21.6))(rollup@4.24.0)(typescript@5.6.2)(vue-i18n@10.0.3(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2)) '@jspm/generator': specifier: 'catalog:' version: 2.3.1 @@ -1307,23 +1161,13 @@ importers: version: 2.0.2 vite-plugin-lib-inject-css: specifier: 'catalog:' -<<<<<<< HEAD version: 2.1.1(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3)) 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.31.3))(workbox-build@7.1.1)(workbox-window@7.1.0) vite-plugin-vue-devtools: specifier: 'catalog:' - version: 7.4.6(rollup@4.24.0)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3))(vue@3.5.10(typescript@5.6.2)) -======= - version: 2.1.1(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1)) - 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.34.1))(workbox-build@7.1.1)(workbox-window@7.1.0) - vite-plugin-vue-devtools: - specifier: 'catalog:' - version: 7.4.6(rollup@4.24.0)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1))(vue@3.5.11(typescript@5.6.2)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e + version: 7.4.6(rollup@4.24.0)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3))(vue@3.5.11(typescript@5.6.2)) devDependencies: '@types/archiver': specifier: 'catalog:' @@ -1336,17 +1180,10 @@ importers: version: link:../node-utils '@vitejs/plugin-vue': specifier: 'catalog:' -<<<<<<< HEAD - version: 5.1.4(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3))(vue@3.5.10(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.31.3))(vue@3.5.11(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.31.3))(vue@3.5.10(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.34.1))(vue@3.5.11(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.34.1))(vue@3.5.11(typescript@5.6.2)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e + version: 4.0.1(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3))(vue@3.5.11(typescript@5.6.2)) dayjs: specifier: 'catalog:' version: 1.11.13 @@ -1364,7 +1201,6 @@ importers: version: 1.79.4 vite: specifier: 'catalog:' -<<<<<<< HEAD version: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) vite-plugin-compression: specifier: 'catalog:' @@ -1375,18 +1211,6 @@ importers: vite-plugin-html: specifier: 'catalog:' version: 3.2.2(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3)) -======= - version: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) - 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.34.1)) - vite-plugin-dts: - specifier: 'catalog:' - version: 4.2.1(@types/node@22.7.4)(rollup@4.24.0)(typescript@5.6.2)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1)) - vite-plugin-html: - specifier: 'catalog:' - version: 3.2.2(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e vite-plugin-lazy-import: specifier: 'catalog:' version: 1.0.7 @@ -1723,31 +1547,22 @@ importers: version: 11.1.0(vue@3.5.11(typescript@5.6.2)) '@vueuse/integrations': specifier: 'catalog:' -<<<<<<< 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.10(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.11(typescript@5.6.2)) codemirror: specifier: ^6.0.1 version: 6.0.1(@lezer/common@1.2.2) -======= - 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.11(typescript@5.6.2)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e qrcode: specifier: 'catalog:' version: 1.5.4 vue: -<<<<<<< HEAD - specifier: 3.5.10 - version: 3.5.10(typescript@5.6.2) - vue-codemirror6: - specifier: ^1.3.4 - version: 1.3.4(@lezer/common@1.2.2)(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)) -======= specifier: ^3.5.11 version: 3.5.11(typescript@5.6.2) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e + vue-codemirror6: + specifier: ^1.3.4 + version: 1.3.4(@lezer/common@1.2.2)(vue@3.5.11(typescript@5.6.2)) + vue-json-pretty: + specifier: ^2.4.0 + version: 2.4.0(vue@3.5.11(typescript@5.6.2)) vue-router: specifier: 'catalog:' version: 4.4.5(vue@3.5.11(typescript@5.6.2)) @@ -1947,11 +1762,7 @@ importers: version: 2.2.2(typescript@5.6.2)(vue@3.5.11(typescript@5.6.2)) pinia-plugin-persistedstate: specifier: 'catalog:' -<<<<<<< HEAD - version: 4.1.1(pinia@2.2.2(typescript@5.6.2)(vue@3.5.10(typescript@5.6.2)))(rollup@4.24.0)(webpack-sources@3.2.3) -======= - version: 4.1.1(pinia@2.2.2(typescript@5.6.2)(vue@3.5.11(typescript@5.6.2)))(rollup@4.24.0) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e + version: 4.1.1(pinia@2.2.2(typescript@5.6.2)(vue@3.5.11(typescript@5.6.2)))(rollup@4.24.0)(webpack-sources@3.2.3) vue: specifier: ^3.5.11 version: 3.5.11(typescript@5.6.2) @@ -1993,11 +1804,7 @@ importers: dependencies: '@tanstack/vue-query': specifier: 'catalog:' -<<<<<<< HEAD - version: 5.59.1(vue@3.5.10(typescript@5.6.2)) -======= version: 5.59.1(vue@3.5.11(typescript@5.6.2)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@vben/access': specifier: workspace:* version: link:../packages/effects/access @@ -2304,7 +2111,6 @@ packages: resolution: {integrity: sha512-DDFPthgmNTgK4t4z2gfYeSIwxqM4KigdWnNmGSKk9S1w0L2x/Dv788MRFMUNGzFot3nEqmjrf9yQ1Sw5x5AZsw==} engines: {node: '>= 10'} -<<<<<<< HEAD '@babel/code-frame@7.24.7': resolution: {integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==} engines: {node: '>=6.9.0'} @@ -2335,49 +2141,12 @@ packages: '@babel/helper-create-class-features-plugin@7.25.0': resolution: {integrity: sha512-GYM6BxeQsETc9mnct+nIIpf63SAyzvyYN7UB/IlTyd+MBg06afFGp0mIeUqGyWgS2mxad6vqbMrHVlaL3m70sQ==} -======= - '@babel/code-frame@7.25.7': - resolution: {integrity: sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==} - engines: {node: '>=6.9.0'} - - '@babel/compat-data@7.25.7': - resolution: {integrity: sha512-9ickoLz+hcXCeh7jrcin+/SLWm+GkxE2kTvoYyp38p4WkdFXfQJxDFGWp/YHjiKLPx06z2A7W8XKuqbReXDzsw==} - engines: {node: '>=6.9.0'} - - '@babel/core@7.25.7': - resolution: {integrity: sha512-yJ474Zv3cwiSOO9nXJuqzvwEeM+chDuQ8GJirw+pZ91sCGCyOZ3dJkVE09fTV0VEVzXyLWhh3G/AolYTPX7Mow==} - engines: {node: '>=6.9.0'} - - '@babel/generator@7.25.7': - resolution: {integrity: sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==} - engines: {node: '>=6.9.0'} - - '@babel/helper-annotate-as-pure@7.25.7': - resolution: {integrity: sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==} - engines: {node: '>=6.9.0'} - - '@babel/helper-builder-binary-assignment-operator-visitor@7.25.7': - resolution: {integrity: sha512-12xfNeKNH7jubQNm7PAkzlLwEmCs1tfuX3UjIw6vP6QXi+leKh6+LyC/+Ed4EIQermwd58wsyh070yjDHFlNGg==} - engines: {node: '>=6.9.0'} - - '@babel/helper-compilation-targets@7.25.7': - resolution: {integrity: sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==} - engines: {node: '>=6.9.0'} - - '@babel/helper-create-class-features-plugin@7.25.7': - resolution: {integrity: sha512-bD4WQhbkx80mAyj/WCm4ZHcF4rDxkoLFO6ph8/5/mQ3z4vAzltQXAmbc7GvVJx5H+lk5Mi5EmbTeox5nMGCsbw==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 -<<<<<<< HEAD '@babel/helper-create-regexp-features-plugin@7.25.2': resolution: {integrity: sha512-+wqVGP+DFmqwFD3EH6TMTfUNeqDehV3E/dl+Sd54eaXqm17tEUNbEIn4sVivVowbvUpOtIGxdo3GoXyDH9N/9g==} -======= - '@babel/helper-create-regexp-features-plugin@7.25.7': - resolution: {integrity: sha512-byHhumTj/X47wJ6C6eLpK7wW/WBEcnUeb7D0FNc/jFQnQVw7DOso3Zz5u9x/zLrFVkHa89ZGDbkAa1D54NdrCQ==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 @@ -2387,7 +2156,6 @@ packages: peerDependencies: '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 -<<<<<<< HEAD '@babel/helper-member-expression-to-functions@7.24.8': resolution: {integrity: sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==} engines: {node: '>=6.9.0'} @@ -2402,23 +2170,10 @@ packages: '@babel/helper-module-transforms@7.25.2': resolution: {integrity: sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==} -======= - '@babel/helper-member-expression-to-functions@7.25.7': - resolution: {integrity: sha512-O31Ssjd5K6lPbTX9AAYpSKrZmLeagt9uwschJd+Ixo6QiRyfpvgtVQp8qrDR9UNFjZ8+DO34ZkdrN+BnPXemeA==} - engines: {node: '>=6.9.0'} - - '@babel/helper-module-imports@7.25.7': - resolution: {integrity: sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==} - engines: {node: '>=6.9.0'} - - '@babel/helper-module-transforms@7.25.7': - resolution: {integrity: sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 -<<<<<<< HEAD '@babel/helper-optimise-call-expression@7.24.7': resolution: {integrity: sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==} engines: {node: '>=6.9.0'} @@ -2429,34 +2184,16 @@ packages: '@babel/helper-remap-async-to-generator@7.25.0': resolution: {integrity: sha512-NhavI2eWEIz/H9dbrG0TuOicDhNexze43i5z7lEqwYm0WEZVTwnPpA0EafUTP7+6/W79HWIP2cTe3Z5NiSTVpw==} -======= - '@babel/helper-optimise-call-expression@7.25.7': - resolution: {integrity: sha512-VAwcwuYhv/AT+Vfr28c9y6SHzTan1ryqrydSTFGjU0uDJHw3uZ+PduI8plCLkRsDnqK2DMEDmwrOQRsK/Ykjng==} - engines: {node: '>=6.9.0'} - - '@babel/helper-plugin-utils@7.25.7': - resolution: {integrity: sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==} - engines: {node: '>=6.9.0'} - - '@babel/helper-remap-async-to-generator@7.25.7': - resolution: {integrity: sha512-kRGE89hLnPfcz6fTrlNU+uhgcwv0mBE4Gv3P9Ke9kLVJYpi4AMVVEElXvB5CabrPZW4nCM8P8UyyjrzCM0O2sw==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 -<<<<<<< HEAD '@babel/helper-replace-supers@7.25.0': resolution: {integrity: sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==} -======= - '@babel/helper-replace-supers@7.25.7': - resolution: {integrity: sha512-iy8JhqlUW9PtZkd4pHM96v6BdJ66Ba9yWSE4z0W4TvSZwLBPkyDsiIU3ENe4SmrzRBs76F7rQXTy1lYC49n6Lw==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 -<<<<<<< HEAD '@babel/helper-simple-access@7.24.7': resolution: {integrity: sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==} engines: {node: '>=6.9.0'} @@ -2496,47 +2233,6 @@ packages: '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.3': resolution: {integrity: sha512-wUrcsxZg6rqBXG05HG1FPYgsP6EvwF4WpBbxIpWIIYnH8wG0gzx3yZY3dtEHas4sTAOGkbTsc9EGPxwff8lRoA==} -======= - '@babel/helper-simple-access@7.25.7': - resolution: {integrity: sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==} - engines: {node: '>=6.9.0'} - - '@babel/helper-skip-transparent-expression-wrappers@7.25.7': - resolution: {integrity: sha512-pPbNbchZBkPMD50K0p3JGcFMNLVUCuU/ABybm/PGNj4JiHrpmNyqqCphBk4i19xXtNV0JhldQJJtbSW5aUvbyA==} - engines: {node: '>=6.9.0'} - - '@babel/helper-string-parser@7.25.7': - resolution: {integrity: sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==} - engines: {node: '>=6.9.0'} - - '@babel/helper-validator-identifier@7.25.7': - resolution: {integrity: sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==} - engines: {node: '>=6.9.0'} - - '@babel/helper-validator-option@7.25.7': - resolution: {integrity: sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==} - engines: {node: '>=6.9.0'} - - '@babel/helper-wrap-function@7.25.7': - resolution: {integrity: sha512-MA0roW3JF2bD1ptAaJnvcabsVlNQShUaThyJbCDD4bCp8NEgiFvpoqRI2YS22hHlc2thjO/fTg2ShLMC3jygAg==} - engines: {node: '>=6.9.0'} - - '@babel/helpers@7.25.7': - resolution: {integrity: sha512-Sv6pASx7Esm38KQpF/U/OXLwPPrdGHNKoeblRxgZRLXnAtnkEe4ptJPDtAZM7fBLadbc1Q07kQpSiGQ0Jg6tRA==} - engines: {node: '>=6.9.0'} - - '@babel/highlight@7.25.7': - resolution: {integrity: sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==} - engines: {node: '>=6.9.0'} - - '@babel/parser@7.25.7': - resolution: {integrity: sha512-aZn7ETtQsjjGG5HruveUK06cU3Hljuhd9Iojm4M8WWv3wLE6OkE5PWbDUkItmMgegmccaITudyuW5RPYrYlgWw==} - engines: {node: '>=6.0.0'} - hasBin: true - - '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.7': - resolution: {integrity: sha512-UV9Lg53zyebzD1DwQoT9mzkEKa922LNUp5YkTJ6Uta0RbyXaQNUgcvSt7qIu1PpPzVb6rd10OVNTzkyBGeVmxQ==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 @@ -2565,8 +2261,8 @@ packages: peerDependencies: '@babel/core': ^7.0.0 - '@babel/plugin-proposal-decorators@7.25.7': - resolution: {integrity: sha512-q1mqqqH0e1lhmsEQHV5U8OmdueBC2y0RFr2oUzZoFRtN3MvPmt2fsFRcNQAoGLTSNdHBFUYGnlgcRFhkBbKjPw==} + '@babel/plugin-proposal-decorators@7.24.7': + resolution: {integrity: sha512-RL9GR0pUG5Kc8BUWLNDm2T5OpYwSX15r98I0IkgmRQTXuELq/OynH8xtMTMvTJFjXbMWFVTKtYkTaYQsuAwQlQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -2593,8 +2289,8 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-syntax-decorators@7.25.7': - resolution: {integrity: sha512-oXduHo642ZhstLVYTe2z2GSJIruU0c/W3/Ghr6A5yGMsVrvdnxO1z+3pbTcT7f3/Clnt+1z8D/w1r1f1SHaCHw==} + '@babel/plugin-syntax-decorators@7.24.7': + resolution: {integrity: sha512-Ui4uLJJrRV1lb38zg1yYTmRKmiZLiftDEvZN2iq3kd9kUFU+PttmzTbAFC2ucRk/XJmtek6G23gPsuZbhrT8fQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -2615,13 +2311,8 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 -<<<<<<< HEAD '@babel/plugin-syntax-import-attributes@7.24.7': resolution: {integrity: sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==} -======= - '@babel/plugin-syntax-import-attributes@7.25.7': - resolution: {integrity: sha512-AqVo+dguCgmpi/3mYBdu9lkngOBlQ2w2vnNpa6gfiCxQZLzV4ZbhsXitJ2Yblkoe1VQwtHSaNmIaGll/26YWRw==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -2636,8 +2327,8 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-syntax-jsx@7.25.7': - resolution: {integrity: sha512-ruZOnKO+ajVL/MVx+PwNBPOkrnXTXoWMtte1MBpegfCArhqOe3Bj52avVj1huLLxNKYKXYaSxZ2F+woK1ekXfw==} + '@babel/plugin-syntax-jsx@7.24.7': + resolution: {integrity: sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -2684,13 +2375,8 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 -<<<<<<< HEAD '@babel/plugin-syntax-typescript@7.24.7': resolution: {integrity: sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==} -======= - '@babel/plugin-syntax-typescript@7.25.7': - resolution: {integrity: sha512-rR+5FDjpCHqqZN2bzZm18bVYGaejGq5ZkpVCJLXor/+zlSrSoc4KWcHI0URVWjl/68Dyr1uwZUz/1njycEAv9g==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -2839,7 +2525,6 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 -<<<<<<< HEAD '@babel/plugin-transform-modules-commonjs@7.24.8': resolution: {integrity: sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==} engines: {node: '>=6.9.0'} @@ -2848,10 +2533,6 @@ packages: '@babel/plugin-transform-modules-systemjs@7.25.0': resolution: {integrity: sha512-YPJfjQPDXxyQWg/0+jHKj1llnY5f/R6a0p/vP4lPymxLu7Lvl4k2WMitqi08yxwQcCVUUdG9LCUj4TNEgAp3Jw==} -======= - '@babel/plugin-transform-modules-commonjs@7.25.7': - resolution: {integrity: sha512-L9Gcahi0kKFYXvweO6n0wc3ZG1ChpSFdgG+eV1WYZ3/dGbJK7vvk91FgGgak8YwRgrCuihF8tE/Xg07EkL5COg==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -2976,8 +2657,8 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-typescript@7.25.7': - resolution: {integrity: sha512-VKlgy2vBzj8AmEzunocMun2fF06bsSWV+FvVXohtL6FGve/+L217qhHxRTVGHEDO/YR8IANcjzgJsd04J8ge5Q==} + '@babel/plugin-transform-typescript@7.25.2': + resolution: {integrity: sha512-lBwRvjSmqiMYe/pS0+1gggjJleUJi7NzjvQ1Fkqtt69hBa/0t1YuW/MLQMAPixfwaQOHUXsd6jeU3Z+vdGv3+A==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -3017,13 +2698,12 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0 - '@babel/preset-typescript@7.25.7': - resolution: {integrity: sha512-rkkpaXJZOFN45Fb+Gki0c+KMIglk4+zZXOoMJuyEK8y8Kkc8Jd3BDmP7qPsz0zQMJj+UD7EprF+AqAXcILnexw==} + '@babel/preset-typescript@7.24.7': + resolution: {integrity: sha512-SyXRe3OdWwIwalxDg5UtJnJQO+YPcTfwiIY2B0Xlddh9o7jpWLvv8X1RthIeDOxQ+O1ML5BLPCONToObyVQVuQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 -<<<<<<< HEAD '@babel/regjsgen@0.8.0': resolution: {integrity: sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==} @@ -3037,31 +2717,14 @@ packages: '@babel/template@7.25.0': resolution: {integrity: sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==} -======= - '@babel/runtime@7.25.7': - resolution: {integrity: sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==} - engines: {node: '>=6.9.0'} - - '@babel/standalone@7.25.7': - resolution: {integrity: sha512-7H+mK18Ew4C/pIIiZwF1eiVjUEh2Ju/BpwRZwcPeXltF/rIjHjFL0gol7PtGrHocmIq6P6ubJrylmmWQ3lGJPA==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e engines: {node: '>=6.9.0'} '@babel/traverse@7.25.3': resolution: {integrity: sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==} engines: {node: '>=6.9.0'} -<<<<<<< HEAD '@babel/types@7.25.2': resolution: {integrity: sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==} -======= - '@babel/traverse@7.25.7': - resolution: {integrity: sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==} - engines: {node: '>=6.9.0'} - - '@babel/types@7.25.7': - resolution: {integrity: sha512-vwIVdXG+j+FOpkwqHRcBgHLYNL7XMkufrlaFvL9o6Ai9sJn9+PdyIL5qa0XzTZw084c+u9LOls53eoZWP/W5WQ==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e engines: {node: '>=6.9.0'} '@changesets/apply-release-plan@7.0.5': @@ -3712,14 +3375,14 @@ packages: resolution: {integrity: sha512-WyOx8cJQ+FQus4Mm4uPIZA64gbk3Wxh0so5Lcii0aJifqwoVOlfFtorjLE0Hen4OYyHZMXDWqMmaQemBhgxFRQ==} engines: {node: '>=14'} - '@docsearch/css@3.6.2': - resolution: {integrity: sha512-vKNZepO2j7MrYBTZIGXvlUOIR+v9KRf70FApRgovWrj3GTs1EITz/Xb0AOlm1xsQBp16clVZj1SY/qaOJbQtZw==} + '@docsearch/css@3.6.1': + resolution: {integrity: sha512-VtVb5DS+0hRIprU2CO6ZQjK2Zg4QU5HrDM1+ix6rT0umsYvFvatMAnf97NHZlVWDaaLlx7GRfR/7FikANiM2Fg==} - '@docsearch/js@3.6.2': - resolution: {integrity: sha512-pS4YZF+VzUogYrkblCucQ0Oy2m8Wggk8Kk7lECmZM60hTbaydSIhJTTiCrmoxtBqV8wxORnOqcqqOfbmkkQEcA==} + '@docsearch/js@3.6.1': + resolution: {integrity: sha512-erI3RRZurDr1xES5hvYJ3Imp7jtrXj6f1xYIzDzxiS7nNBufYWPbJwrmMqWC5g9y165PmxEmN9pklGCdLi0Iqg==} - '@docsearch/react@3.6.2': - resolution: {integrity: sha512-rtZce46OOkVflCQH71IdbXSFK+S8iJZlUF56XBW5rIgx/eG5qoomC7Ag3anZson1bBac/JFQn7XOBfved/IMRA==} + '@docsearch/react@3.6.1': + resolution: {integrity: sha512-qXZkEPvybVhSXj0K7U3bXc233tk5e8PfhoZ6MhPOiik/qUQxYC+Dn9DnoS7CxHQQhHfCvTiN0eY9M12oRghEXw==} peerDependencies: '@types/react': '>= 16.8.0 < 19.0.0' react: '>= 16.8.0 < 19.0.0' @@ -4413,11 +4076,11 @@ packages: peerDependencies: vue: ^3.5.11 - '@internationalized/date@3.5.6': - resolution: {integrity: sha512-jLxQjefH9VI5P9UQuqB6qNKnvFt1Ky1TPIzHGsIlCi7sZZoMR8SdYbBGRvM0y+Jtb+ez4ieBzmiAUcpmPYpyOw==} + '@internationalized/date@3.5.5': + resolution: {integrity: sha512-H+CfYvOZ0LTJeeLOqm19E3uj/4YjrmOFtBufDHPfvtI80hFAMqtrp7oCACpe4Cil5l8S0Qu/9dYfZc/5lY8WQQ==} - '@internationalized/number@3.5.4': - resolution: {integrity: sha512-h9huwWjNqYyE2FXZZewWqmCdkw1HeFds5q4Siuoms3hUQC5iPJK3aBmkFZoDSLN4UD0Bl8G22L/NdHpeOr+/7A==} + '@internationalized/number@3.5.3': + resolution: {integrity: sha512-rd1wA3ebzlp0Mehj5YTuTI50AQEx80gWFyHcQu+u91/5NgdwBecO8BH6ipPfE+lmQ9d63vpB3H9SHoIUiupllw==} '@intlify/bundle-utils@9.0.0-beta.0': resolution: {integrity: sha512-xVaMrgbr60fYE1Jkq+k6grs2ZoXqh1EU71RVKkHkKh3KP7T6OYtG1Vbp1T09/jCUbv1GBd8Ir5WdZDyN+e8BpQ==} @@ -4578,16 +4241,16 @@ packages: '@microsoft/tsdoc@0.15.0': resolution: {integrity: sha512-HZpPoABogPvjeJOdzCOSJsXeL/SMCBgBZMVC3X3d7YYp2gf31MfxhUoYUNwf1ERPJOnQc0wkFn9trqI6ZEdZuA==} - '@netlify/functions@2.8.2': - resolution: {integrity: sha512-DeoAQh8LuNPvBE4qsKlezjKj0PyXDryOFJfJKo3Z1qZLKzQ21sT314KQKPVjfvw6knqijj+IO+0kHXy/TJiqNA==} + '@netlify/functions@2.8.1': + resolution: {integrity: sha512-+6wtYdoz0yE06dSa9XkP47tw5zm6g13QMeCwM3MmHx1vn8hzwFa51JtmfraprdkL7amvb7gaNM+OOhQU1h6T8A==} engines: {node: '>=14.0.0'} '@netlify/node-cookies@0.1.0': resolution: {integrity: sha512-OAs1xG+FfLX0LoRASpqzVntVV/RpYkgpI0VrUnw2u0Q1qiZUzcPffxRK8HF3gc4GjuhG5ahOEMJ9bswBiZPq0g==} engines: {node: ^14.16.0 || >=16.0.0} - '@netlify/serverless-functions-api@1.26.1': - resolution: {integrity: sha512-q3L9i3HoNfz0SGpTIS4zTcKBbRkxzCRpd169eyiTuk3IwcPC3/85mzLHranlKo2b+HYT0gu37YxGB45aD8A3Tw==} + '@netlify/serverless-functions-api@1.19.1': + resolution: {integrity: sha512-2KYkyluThg1AKfd0JWI7FzpS4A/fzVVGYIf6AM4ydWyNj8eI/86GQVLeRgDoH7CNOxt243R5tutWlmHpVq0/Ew==} engines: {node: '>=18.0.0'} '@nodelib/fs.scandir@2.1.5': @@ -4849,227 +4512,179 @@ packages: rollup: optional: true -<<<<<<< HEAD '@rollup/rollup-android-arm-eabi@4.20.0': resolution: {integrity: sha512-TSpWzflCc4VGAUJZlPpgAJE1+V60MePDQnBd7PPkpuEmOy8i87aL6tinFGKBFKuEDikYpig72QzdT3QPYIi+oA==} cpu: [arm] os: [android] -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/rollup-android-arm-eabi@4.24.0': resolution: {integrity: sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==} cpu: [arm] os: [android] -<<<<<<< HEAD '@rollup/rollup-android-arm64@4.20.0': resolution: {integrity: sha512-u00Ro/nok7oGzVuh/FMYfNoGqxU5CPWz1mxV85S2w9LxHR8OoMQBuSk+3BKVIDYgkpeOET5yXkx90OYFc+ytpQ==} cpu: [arm64] os: [android] -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/rollup-android-arm64@4.24.0': resolution: {integrity: sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==} cpu: [arm64] os: [android] -<<<<<<< HEAD '@rollup/rollup-darwin-arm64@4.20.0': resolution: {integrity: sha512-uFVfvzvsdGtlSLuL0ZlvPJvl6ZmrH4CBwLGEFPe7hUmf7htGAN+aXo43R/V6LATyxlKVC/m6UsLb7jbG+LG39Q==} cpu: [arm64] os: [darwin] -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/rollup-darwin-arm64@4.24.0': resolution: {integrity: sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==} cpu: [arm64] os: [darwin] -<<<<<<< HEAD '@rollup/rollup-darwin-x64@4.20.0': resolution: {integrity: sha512-xbrMDdlev53vNXexEa6l0LffojxhqDTBeL+VUxuuIXys4x6xyvbKq5XqTXBCEUA8ty8iEJblHvFaWRJTk/icAQ==} cpu: [x64] os: [darwin] -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/rollup-darwin-x64@4.24.0': resolution: {integrity: sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==} cpu: [x64] os: [darwin] -<<<<<<< HEAD '@rollup/rollup-linux-arm-gnueabihf@4.20.0': resolution: {integrity: sha512-jMYvxZwGmoHFBTbr12Xc6wOdc2xA5tF5F2q6t7Rcfab68TT0n+r7dgawD4qhPEvasDsVpQi+MgDzj2faOLsZjA==} cpu: [arm] os: [linux] libc: [glibc] -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/rollup-linux-arm-gnueabihf@4.24.0': resolution: {integrity: sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==} cpu: [arm] os: [linux] libc: [glibc] -<<<<<<< HEAD '@rollup/rollup-linux-arm-musleabihf@4.20.0': resolution: {integrity: sha512-1asSTl4HKuIHIB1GcdFHNNZhxAYEdqML/MW4QmPS4G0ivbEcBr1JKlFLKsIRqjSwOBkdItn3/ZDlyvZ/N6KPlw==} cpu: [arm] os: [linux] libc: [musl] -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/rollup-linux-arm-musleabihf@4.24.0': resolution: {integrity: sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==} cpu: [arm] os: [linux] libc: [musl] -<<<<<<< HEAD '@rollup/rollup-linux-arm64-gnu@4.20.0': resolution: {integrity: sha512-COBb8Bkx56KldOYJfMf6wKeYJrtJ9vEgBRAOkfw6Ens0tnmzPqvlpjZiLgkhg6cA3DGzCmLmmd319pmHvKWWlQ==} cpu: [arm64] os: [linux] libc: [glibc] -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/rollup-linux-arm64-gnu@4.24.0': resolution: {integrity: sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==} cpu: [arm64] os: [linux] libc: [glibc] -<<<<<<< HEAD '@rollup/rollup-linux-arm64-musl@4.20.0': resolution: {integrity: sha512-+it+mBSyMslVQa8wSPvBx53fYuZK/oLTu5RJoXogjk6x7Q7sz1GNRsXWjn6SwyJm8E/oMjNVwPhmNdIjwP135Q==} cpu: [arm64] os: [linux] libc: [musl] -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/rollup-linux-arm64-musl@4.24.0': resolution: {integrity: sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==} cpu: [arm64] os: [linux] libc: [musl] -<<<<<<< HEAD '@rollup/rollup-linux-powerpc64le-gnu@4.20.0': resolution: {integrity: sha512-yAMvqhPfGKsAxHN8I4+jE0CpLWD8cv4z7CK7BMmhjDuz606Q2tFKkWRY8bHR9JQXYcoLfopo5TTqzxgPUjUMfw==} cpu: [ppc64] os: [linux] libc: [glibc] -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/rollup-linux-powerpc64le-gnu@4.24.0': resolution: {integrity: sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==} cpu: [ppc64] os: [linux] libc: [glibc] -<<<<<<< HEAD '@rollup/rollup-linux-riscv64-gnu@4.20.0': resolution: {integrity: sha512-qmuxFpfmi/2SUkAw95TtNq/w/I7Gpjurx609OOOV7U4vhvUhBcftcmXwl3rqAek+ADBwSjIC4IVNLiszoj3dPA==} cpu: [riscv64] os: [linux] libc: [glibc] -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/rollup-linux-riscv64-gnu@4.24.0': resolution: {integrity: sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==} cpu: [riscv64] os: [linux] libc: [glibc] -<<<<<<< HEAD '@rollup/rollup-linux-s390x-gnu@4.20.0': resolution: {integrity: sha512-I0BtGXddHSHjV1mqTNkgUZLnS3WtsqebAXv11D5BZE/gfw5KoyXSAXVqyJximQXNvNzUo4GKlCK/dIwXlz+jlg==} cpu: [s390x] os: [linux] libc: [glibc] -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/rollup-linux-s390x-gnu@4.24.0': resolution: {integrity: sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==} cpu: [s390x] os: [linux] libc: [glibc] -<<<<<<< HEAD '@rollup/rollup-linux-x64-gnu@4.20.0': resolution: {integrity: sha512-y+eoL2I3iphUg9tN9GB6ku1FA8kOfmF4oUEWhztDJ4KXJy1agk/9+pejOuZkNFhRwHAOxMsBPLbXPd6mJiCwew==} cpu: [x64] os: [linux] libc: [glibc] -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/rollup-linux-x64-gnu@4.24.0': resolution: {integrity: sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==} cpu: [x64] os: [linux] libc: [glibc] -<<<<<<< HEAD '@rollup/rollup-linux-x64-musl@4.20.0': resolution: {integrity: sha512-hM3nhW40kBNYUkZb/r9k2FKK+/MnKglX7UYd4ZUy5DJs8/sMsIbqWK2piZtVGE3kcXVNj3B2IrUYROJMMCikNg==} cpu: [x64] os: [linux] libc: [musl] -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/rollup-linux-x64-musl@4.24.0': resolution: {integrity: sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==} cpu: [x64] os: [linux] libc: [musl] -<<<<<<< HEAD '@rollup/rollup-win32-arm64-msvc@4.20.0': resolution: {integrity: sha512-psegMvP+Ik/Bg7QRJbv8w8PAytPA7Uo8fpFjXyCRHWm6Nt42L+JtoqH8eDQ5hRP7/XW2UiIriy1Z46jf0Oa1kA==} cpu: [arm64] os: [win32] -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/rollup-win32-arm64-msvc@4.24.0': resolution: {integrity: sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==} cpu: [arm64] os: [win32] -<<<<<<< HEAD '@rollup/rollup-win32-ia32-msvc@4.20.0': resolution: {integrity: sha512-GabekH3w4lgAJpVxkk7hUzUf2hICSQO0a/BLFA11/RMxQT92MabKAqyubzDZmMOC/hcJNlc+rrypzNzYl4Dx7A==} cpu: [ia32] os: [win32] -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/rollup-win32-ia32-msvc@4.24.0': resolution: {integrity: sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==} cpu: [ia32] os: [win32] -<<<<<<< HEAD '@rollup/rollup-win32-x64-msvc@4.20.0': resolution: {integrity: sha512-aJ1EJSuTdGnM6qbVC4B5DSmozPTqIag9fSzXRNNo+humQLG89XpPgdt16Ia56ORD7s+H8Pmyx44uczDQ0yDzpg==} cpu: [x64] os: [win32] -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/rollup-win32-x64-msvc@4.24.0': resolution: {integrity: sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==} cpu: [x64] @@ -5188,7 +4803,7 @@ packages: '@tanstack/vue-virtual@3.8.5': resolution: {integrity: sha512-JBHw3xFUslYgrbvNlCYtTWwFo8zjzRs7c2rs6B4JKFXWyP5yHuoeivgQgeZ34t6O6lJTNqc/K4ccmmcmKqpMPA==} peerDependencies: - vue: 3.5.10 + vue: ^3.5.11 '@tinymce/tinymce-vue@6.0.1': resolution: {integrity: sha512-VzjI8AKlNrrsosIk3WuBez6kubqPsPMeaButkRLuts77uo4e2EwPRFX+VyB6fHbMGHwUPK22zNjOUGMvJFZFCw==} @@ -5267,13 +4882,8 @@ packages: '@types/lodash.clonedeep@4.5.9': resolution: {integrity: sha512-19429mWC+FyaAhOLzsS8kZUsI+/GmBAQ0HFiCPsKGU+7pBXOQWhyrY6xNNDwUSX8SMZMJvuFVMF9O5dQOlQK9Q==} -<<<<<<< HEAD '@types/lodash@4.17.7': resolution: {integrity: sha512-8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA==} -======= - '@types/lodash@4.17.10': - resolution: {integrity: sha512-YpS0zzoduEhuOWjAotS6A5AVCva7X4lVlYLF0FYHAY9sdraBfnatttHItlWeZdGhuEkf+OzMNg2ZYAx8t+52uQ==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@types/markdown-it@14.1.2': resolution: {integrity: sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==} @@ -5448,7 +5058,7 @@ packages: engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: vite: ^5.0.0 - vue: 3.5.10 + vue: ^3.5.11 '@vitejs/plugin-vue@5.1.4': resolution: {integrity: sha512-N2XSI2n3sQqp5w7Y/AN/L2XDjBIRGqXko+eDp42sydYSBeJuSm5a1sLf8zakmo8u7tA8NmBgoDLA1HeOESjp9A==} @@ -5512,50 +5122,27 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 -<<<<<<< HEAD '@vue/compiler-core@3.4.37': resolution: {integrity: sha512-ZDDT/KiLKuCRXyzWecNzC5vTcubGz4LECAtfGPENpo0nrmqJHwuWtRLxk/Sb9RAKtR9iFflFycbkjkY+W/PZUQ==} - '@vue/compiler-core@3.5.10': - resolution: {integrity: sha512-iXWlk+Cg/ag7gLvY0SfVucU8Kh2CjysYZjhhP70w9qI4MvSox4frrP+vDGvtQuzIcgD8+sxM6lZvCtdxGunTAA==} - '@vue/compiler-core@3.5.11': resolution: {integrity: sha512-PwAdxs7/9Hc3ieBO12tXzmTD+Ln4qhT/56S+8DvrrZ4kLDn4Z/AMUr8tXJD0axiJBS0RKIoNaR0yMuQB9v9Udg==} '@vue/compiler-dom@3.4.37': resolution: {integrity: sha512-rIiSmL3YrntvgYV84rekAtU/xfogMUJIclUMeIKEtVBFngOL3IeZHhsH3UaFEgB5iFGpj6IW+8YuM/2Up+vVag==} -======= - '@vue/compiler-core@3.5.11': - resolution: {integrity: sha512-PwAdxs7/9Hc3ieBO12tXzmTD+Ln4qhT/56S+8DvrrZ4kLDn4Z/AMUr8tXJD0axiJBS0RKIoNaR0yMuQB9v9Udg==} '@vue/compiler-dom@3.5.11': resolution: {integrity: sha512-pyGf8zdbDDRkBrEzf8p7BQlMKNNF5Fk/Cf/fQ6PiUz9at4OaUfyXW0dGJTo2Vl1f5U9jSLCNf0EZJEogLXoeew==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - - '@vue/compiler-sfc@3.5.11': - resolution: {integrity: sha512-gsbBtT4N9ANXXepprle+X9YLg2htQk1sqH/qGJ/EApl+dgpUBdTv3yP7YlR535uHZY3n6XaR0/bKo0BgwwDniw==} - -<<<<<<< HEAD - '@vue/compiler-dom@3.5.11': - resolution: {integrity: sha512-pyGf8zdbDDRkBrEzf8p7BQlMKNNF5Fk/Cf/fQ6PiUz9at4OaUfyXW0dGJTo2Vl1f5U9jSLCNf0EZJEogLXoeew==} '@vue/compiler-sfc@3.4.37': resolution: {integrity: sha512-vCfetdas40Wk9aK/WWf8XcVESffsbNkBQwS5t13Y/PcfqKfIwJX2gF+82th6dOpnpbptNMlMjAny80li7TaCIg==} - '@vue/compiler-sfc@3.5.10': - resolution: {integrity: sha512-to8E1BgpakV7224ZCm8gz1ZRSyjNCAWEplwFMWKlzCdP9DkMKhRRwt0WkCjY7jkzi/Vz3xgbpeig5Pnbly4Tow==} - '@vue/compiler-sfc@3.5.11': resolution: {integrity: sha512-gsbBtT4N9ANXXepprle+X9YLg2htQk1sqH/qGJ/EApl+dgpUBdTv3yP7YlR535uHZY3n6XaR0/bKo0BgwwDniw==} '@vue/compiler-ssr@3.4.37': resolution: {integrity: sha512-TyAgYBWrHlFrt4qpdACh8e9Ms6C/AZQ6A6xLJaWrCL8GCX5DxMzxyeFAEMfU/VFr4tylHm+a2NpfJpcd7+20XA==} - '@vue/compiler-ssr@3.5.10': - resolution: {integrity: sha512-hxP4Y3KImqdtyUKXDRSxKSRkSm1H9fCvhojEYrnaoWhE4w/y8vwWhnosJoPPe2AXm5sU7CSbYYAgkt2ZPhDz+A==} - -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@vue/compiler-ssr@3.5.11': resolution: {integrity: sha512-P4+GPjOuC2aFTk1Z4WANvEhyOykcvEd5bIj2KVNGKGfM745LaXGr++5njpdBTzVz5pZifdlR1kpYSJJpIlSePA==} @@ -5593,16 +5180,8 @@ packages: '@vue/reactivity@3.5.11': resolution: {integrity: sha512-Nqo5VZEn8MJWlCce8XoyVqHZbd5P2NH+yuAaFzuNSR96I+y1cnuUiq7xfSG+kyvLSiWmaHTKP1r3OZY4mMD50w==} -<<<<<<< HEAD - '@vue/reactivity@3.5.11': - resolution: {integrity: sha512-Nqo5VZEn8MJWlCce8XoyVqHZbd5P2NH+yuAaFzuNSR96I+y1cnuUiq7xfSG+kyvLSiWmaHTKP1r3OZY4mMD50w==} - - '@vue/runtime-core@3.5.10': - resolution: {integrity: sha512-9Q86I5Qq3swSkFfzrZ+iqEy7Vla325M7S7xc1NwKnRm/qoi1Dauz0rT6mTMmscqx4qz0EDJ1wjB+A36k7rl8mA==} -======= '@vue/runtime-core@3.5.11': resolution: {integrity: sha512-7PsxFGqwfDhfhh0OcDWBG1DaIQIVOLgkwA5q6MtkPiDFjp5gohVnJEahSktwSFLq7R5PtxDKy6WKURVN1UDbzA==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@vue/runtime-dom@3.5.11': resolution: {integrity: sha512-GNghjecT6IrGf0UhuYmpgaOlN7kxzQBhxWEn08c/SQDxv1yy4IXI1bn81JgEpQ4IXjRxWtPyI8x0/7TF5rPfYQ==} @@ -5612,15 +5191,9 @@ packages: peerDependencies: vue: ^3.5.11 -<<<<<<< HEAD '@vue/shared@3.4.37': resolution: {integrity: sha512-nIh8P2fc3DflG8+5Uw8PT/1i17ccFn0xxN/5oE9RfV5SVnd7G0XEFRwakrnNFE/jlS95fpGXDVG5zDETS26nmg==} - '@vue/shared@3.5.10': - resolution: {integrity: sha512-VkkBhU97Ki+XJ0xvl4C9YJsIZ2uIlQ7HqPpZOS3m9VCvmROPaChZU6DexdMJqvz9tbgG+4EtFVrSuailUq5KGQ==} - -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@vue/shared@3.5.11': resolution: {integrity: sha512-W8GgysJVnFo81FthhzurdRAWP/byq3q2qIw70e0JWblzVhjgOMiC2GyovXrZTFQJnFVryYaKGP3Tc9vYzYm6PQ==} @@ -6074,13 +5647,8 @@ packages: caniuse-api@3.0.0: resolution: {integrity: sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==} -<<<<<<< HEAD caniuse-lite@1.0.30001650: resolution: {integrity: sha512-fgEc7hP/LB7iicdXHUI9VsBsMZmUmlVJeQP2qqQW+3lkqVhbmjEU8zp+h5stWeilX+G7uXuIUIIlWlDw9jdt8g==} -======= - caniuse-lite@1.0.30001667: - resolution: {integrity: sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e ccount@2.0.1: resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==} @@ -6361,6 +5929,9 @@ packages: core-js-compat@3.38.0: resolution: {integrity: sha512-75LAicdLa4OJVwFxFbQR3NdnZjNgX6ILpVcVzcC4T2smerB5lELMrJQQQoWV6TiuC/vlaFqgU2tKQx9w5s0e0A==} + core-js-compat@3.38.1: + resolution: {integrity: sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==} + core-js@3.38.0: resolution: {integrity: sha512-XPpwqEodRljce9KswjZShh95qJ1URisBeKCjUdq27YdenkslVe7OO0ZJhlYXAChW7OhXaRLl8AAba7IBfoIHug==} @@ -6397,16 +5968,11 @@ packages: resolution: {integrity: sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==} engines: {node: '>= 14'} -<<<<<<< HEAD crelt@1.0.6: resolution: {integrity: sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==} croner@8.1.1: resolution: {integrity: sha512-1VdUuRnQP4drdFkS8NKvDR1NBgevm8TOuflcaZEKsxw42CxonjW/2vkj1AKlinJb4ZLwBcuWF9GiPr7FQc6AQA==} -======= - croner@8.1.2: - resolution: {integrity: sha512-ypfPFcAXHuAZRCzo3vJL6ltENzniTjwe/qsLleH1V2/7SRDjgvRQyrLmumFTLmjFax4IuSxfGXEn79fozXcJog==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e engines: {node: '>=18.0'} cropperjs@1.6.2: @@ -6432,13 +5998,8 @@ packages: uWebSockets.js: optional: true -<<<<<<< HEAD crypto-js@4.2.0: resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==} -======= - crossws@0.3.1: - resolution: {integrity: sha512-HsZgeVYaG+b5zA+9PbIPGq4+J/CJynJuearykPsXx4V/eMhyQ5EDVg3Ak2FBZtVXCiOLu/U7IiwDHTr9MA+IKw==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e crypto-random-string@2.0.0: resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==} @@ -6880,13 +6441,8 @@ packages: engines: {node: '>=0.10.0'} hasBin: true -<<<<<<< HEAD electron-to-chromium@1.5.5: resolution: {integrity: sha512-QR7/A7ZkMS8tZuoftC/jfqNkZLQO779SSW3YuZHP4eXpj3EffGLFcB/Xu9AAZQzLccTiCV+EmUo3ha4mQ9wnlA==} -======= - electron-to-chromium@1.5.32: - resolution: {integrity: sha512-M+7ph0VGBQqqpTT2YrabjNKSQ2fEl9PVx6AK3N558gDH9NO8O6XN9SXXFWRo9u9PbEg/bWq+tjXQr+eXmxubCw==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e element-plus@2.8.4: resolution: {integrity: sha512-ZlVAdUOoJliv4kW3ntWnnSHMT+u/Os7mXJjk2xzOlqNeHaI2/ozlF+R58ZCEak8ZnDi6+5A2viWEYRsq64IuiA==} @@ -7193,13 +6749,6 @@ packages: resolution: {integrity: sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} -<<<<<<< HEAD - eslint-visitor-keys@4.1.0: - resolution: {integrity: sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e eslint@9.12.0: resolution: {integrity: sha512-UVIOlTEWxwIopRL1wgSQYdnVDcEvs2wyaO6DGo5mXqe3r16IoCNWkR29iHhyaP4cICWjbgbmFUGAhh0GJRuGZw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -7210,8 +6759,8 @@ packages: jiti: optional: true - espree@10.2.0: - resolution: {integrity: sha512-upbkBJbckcCNBDBDXEbuhjbP68n+scUd3k/U2EkyM9nw+I/jPiL4cLF/Al06CF96wRltFda16sxDFrxsI1v0/g==} + espree@10.1.0: + resolution: {integrity: sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} espree@10.2.0: @@ -7320,8 +6869,8 @@ packages: resolution: {integrity: sha512-PY66/8HelapGo5nqMN17ZTKqJj1nppuS1OoC9Y0aI2jsUDlZDEYhMODTpb68wVCq+xMbaEbPGXRd7qutHzkRXA==} engines: {node: ^14.13.1 || >=16.0.0} - fast-uri@3.0.2: - resolution: {integrity: sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==} + fast-uri@3.0.1: + resolution: {integrity: sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==} fastest-levenshtein@1.0.16: resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==} @@ -7330,13 +6879,8 @@ packages: fastq@1.17.1: resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} -<<<<<<< HEAD fdir@6.2.0: resolution: {integrity: sha512-9XaWcDl0riOX5j2kYfy0kKdg7skw3IY6kA4LFT8Tk2yF9UdrADUy8D6AJuBLtf7ISm/MksumwAHE3WVbMRyCLw==} -======= - fdir@6.4.0: - resolution: {integrity: sha512-3oB133prH1o4j/L5lLW7uOCF1PlD+/It2L0eL/iAqWMB91RBbqTewABqxhj0ibBd90EEmWZq7ntIWzVaWcXTGQ==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e peerDependencies: picomatch: ^3 || ^4 peerDependenciesMeta: @@ -8136,13 +7680,6 @@ packages: resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==} hasBin: true -<<<<<<< HEAD -======= - jiti@2.2.1: - resolution: {integrity: sha512-weIl/Bv3G0J3UKamLxEA2G+FfQ33Z1ZkQJGPjKFV21zQdKWu2Pi6o4elpj2uEl5XdFJZ9xzn1fsanWTFSt45zw==} - hasBin: true - ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e jju@1.4.0: resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==} @@ -8192,6 +7729,11 @@ packages: resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==} hasBin: true + jsesc@2.5.2: + resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} + engines: {node: '>=4'} + hasBin: true + jsesc@3.0.2: resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==} engines: {node: '>=6'} @@ -8309,17 +7851,12 @@ packages: engines: {node: '>=18.12.0'} hasBin: true -<<<<<<< HEAD listhen@1.7.2: resolution: {integrity: sha512-7/HamOm5YD9Wb7CFgAZkKgVPA96WwhcTQoqtm2VTZGVbVVn3IWKRBTgrU7cchA3Q8k9iCsG8Osoi9GX4JsGM9g==} -======= - listhen@1.9.0: - resolution: {integrity: sha512-I8oW2+QL5KJo8zXNWX046M134WchxsXC7SawLPvRQpogCbkyQIaFxPE89A2HiwR7vAK2Dm2ERBAmyjTYGYEpBg==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e hasBin: true - listr2@8.2.5: - resolution: {integrity: sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==} + listr2@8.2.4: + resolution: {integrity: sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==} engines: {node: '>=18.0.0'} local-pkg@0.5.0: @@ -8856,6 +8393,9 @@ packages: ohash@1.1.3: resolution: {integrity: sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==} + ohash@1.1.4: + resolution: {integrity: sha512-FlDryZAahJmEF3VR3w1KogSEdWX3WhA5GPakFx4J81kEAiHyLMpdLLElS8n8dfNadMgAne/MywcvmogzscVt4g==} + on-finished@2.4.1: resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==} engines: {node: '>= 0.8'} @@ -8941,8 +8481,8 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} - package-json-from-dist@1.0.1: - resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==} + package-json-from-dist@1.0.0: + resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==} package-json@10.0.1: resolution: {integrity: sha512-ua1L4OgXSBdsu1FPb7F3tYH0F48a6kxvod4pLUlGY9COeJAJQNX/sNH2IiEmsxw7lqYiAwrdHMjz1FctOsyDQg==} @@ -9534,8 +9074,8 @@ packages: peerDependencies: postcss: ^8.3.3 - postcss-safe-parser@7.0.1: - resolution: {integrity: sha512-0AioNCJZ2DPYz5ABT6bddIqlhgwhpHZ/l65YAYo0BCIn0xiDpsnTHz0gnoTGk0OXZW0JRs+cDwL8u/teRdz+8A==} + postcss-safe-parser@7.0.0: + resolution: {integrity: sha512-ovehqRNVCpuFzbXoTb4qLtyzK3xn3t/CUBxOs8LsnQjQrShaB4lKiHoVqY8ANaC0hBMHq5QVWk77rwGklFUDrg==} engines: {node: '>=18.0'} peerDependencies: postcss: ^8.4.31 @@ -9598,13 +9138,8 @@ packages: resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==} engines: {node: ^10 || ^12 || >=14} -<<<<<<< HEAD preact@10.23.1: resolution: {integrity: sha512-O5UdRsNh4vdZaTieWe3XOgSpdMAmkIYBCT3VhQDlKrzyCm8lUYsk0fmVEvoQQifoOjFRTaHZO69ylrzTW2BH+A==} -======= - preact@10.24.2: - resolution: {integrity: sha512-1cSoF0aCC8uaARATfrlz4VCBqE8LwZwRfLgkxJOQwAlQt6ayTmi0D9OF7nXid1POI5SZidFuG9CnlXbDfLqY/Q==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e prelude-ls@1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} @@ -9850,8 +9385,8 @@ packages: resolution: {integrity: sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==} hasBin: true - regexp.prototype.flags@1.5.3: - resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==} + regexp.prototype.flags@1.5.2: + resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==} engines: {node: '>= 0.4'} regexpu-core@5.3.2: @@ -9980,14 +9515,11 @@ packages: engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true -<<<<<<< HEAD rollup@4.20.0: resolution: {integrity: sha512-6rbWBChcnSGzIlXeIdNIZTopKYad8ZG8ajhl78lGRLsI2rX8IkaotQhVas2Ma+GPxJav19wrSzvRvuiv0YKzWw==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e rollup@4.24.0: resolution: {integrity: sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -10570,13 +10102,8 @@ packages: resolution: {integrity: sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==} engines: {node: '>=8'} -<<<<<<< HEAD terser@5.31.3: resolution: {integrity: sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA==} -======= - terser@5.34.1: - resolution: {integrity: sha512-FsJZ7iZLd/BXkz+4xrRTGJ26o/6VTjQytUk8b8OxkwcD2I+79VPJlz7qss1+zE7h8GNIScFqXcDyJ/KqBYZFVA==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e engines: {node: '>=10'} hasBin: true @@ -10613,13 +10140,8 @@ packages: tinyexec@0.3.0: resolution: {integrity: sha512-tVGE0mVJPGb0chKhqmsoosjsS+qUnJVGJpZgsHYQcGoPlG3B51R3PouqTgEGH2Dc9jjFyOqOpix6ZHNMXp1FZg==} -<<<<<<< HEAD tinyglobby@0.2.2: resolution: {integrity: sha512-mZ2sDMaySvi1PkTp4lTo1In2zjU+cY8OvZsfwrDrx3YGRbXPX1/cbPwCR9zkm3O/Fz9Jo0F1HNgIQ1b8BepqyQ==} -======= - tinyglobby@0.2.9: - resolution: {integrity: sha512-8or1+BGEdk1Zkkw2ii16qSS7uVrQJPre5A9o/XkWPATkk23FZh/15BKFxPnlTy6vkljZxLqYCzzBMj30ZrSvjw==} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e engines: {node: '>=12.0.0'} tinymce@7.3.0: @@ -10847,12 +10369,9 @@ packages: resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==} engines: {node: '>=18'} -<<<<<<< HEAD unimport@3.10.0: resolution: {integrity: sha512-/UvKRfWx3mNDWwWQhR62HsoM3wxHwYdTq8ellZzMOHnnw4Dp8tovgthyW7DjTrbjDL+i4idOp06voz2VKlvrLw==} -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e unimport@3.13.1: resolution: {integrity: sha512-nNrVzcs93yrZQOW77qnyOVHtb68LegvhYFwxFMfuuWScmwQmyVCG/NBuN8tYsaGzgQUVYv34E/af+Cc9u4og4A==} @@ -10903,7 +10422,7 @@ packages: peerDependencies: '@babel/parser': ^7.15.8 '@nuxt/kit': ^3.2.2 - vue: 3.5.10 + vue: ^3.5.11 peerDependenciesMeta: '@babel/parser': optional: true @@ -10971,8 +10490,8 @@ packages: resolution: {integrity: sha512-4luGP9LMYszMRZwsvyUd9MrxgEGZdZuZgpVQHEEX0lCYFESasVRvZd0EYpCkOIbJKHMuv0LskpXc/8Un+MJzEQ==} hasBin: true - untyped@1.5.0: - resolution: {integrity: sha512-o2Vjmn2dal08BzCcINxSmWuAteReUUiXseii5VRhmxyLF0b21K0iKZQ9fMYK7RWspVkY+0saqaVQNq4roe3Efg==} + untyped@1.4.2: + resolution: {integrity: sha512-nC5q0DnPEPVURPhfPQLahhSTnemVtPzdx7ofiRxXpOB2SYnb3MfdU3DVGyJdS8Lx+tBWeAePO8BfU/3EgksM7Q==} hasBin: true unwasm@0.3.9: @@ -10982,8 +10501,8 @@ packages: resolution: {integrity: sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==} engines: {node: '>=4'} - update-browserslist-db@1.1.1: - resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==} + update-browserslist-db@1.1.0: + resolution: {integrity: sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' @@ -11183,7 +10702,7 @@ packages: resolution: {integrity: sha512-Gmu2t4Exz3pQdtAsb7wINREx2nswNW+FV+q8S1wmsmeC3OLio5RkybRLsErP1b8+suqsVD/7t0Cx/XmBpQnHJA==} engines: {yarn: '>=1.22.19'} peerDependencies: - vue: 3.5.10 + vue: ^3.5.11 vue-component-type-helpers@2.0.29: resolution: {integrity: sha512-58i+ZhUAUpwQ+9h5Hck0D+jr1qbYl4voRt5KffBx8qzELViQ4XdT/Tuo+mzq8u63teAG8K0lLaOiL5ofqW38rg==} @@ -11215,7 +10734,7 @@ packages: resolution: {integrity: sha512-e9bP41DYYIc2tWaB6KuwqFJq5odZ8/GkE6vHQuGcbPn37kGk4a3n1RNw3ZYeDrl66NWXgTlOfS+M6NKkowmkWw==} engines: {node: '>= 10.0.0', npm: '>= 5.0.0'} peerDependencies: - vue: 3.5.10 + vue: ^3.5.11 vue-router@4.4.5: resolution: {integrity: sha512-4fKZygS8cH1yCyuabAXGUAsyi1b2/o/OKgu/RUb+znIYOxPRxdkytJEx+0wGcpBE1pX6vUgh5jwWOKRGvuA/7Q==} @@ -11752,26 +11271,16 @@ snapshots: '@ast-grep/napi-win32-ia32-msvc': 0.27.2 '@ast-grep/napi-win32-x64-msvc': 0.27.2 -<<<<<<< HEAD '@babel/code-frame@7.24.7': dependencies: '@babel/highlight': 7.24.7 - picocolors: 1.0.1 - - '@babel/compat-data@7.25.2': {} -======= - '@babel/code-frame@7.25.7': - dependencies: - '@babel/highlight': 7.25.7 picocolors: 1.1.0 - '@babel/compat-data@7.25.7': {} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e + '@babel/compat-data@7.25.2': {} - '@babel/core@7.25.7': + '@babel/core@7.25.2': dependencies: '@ampproject/remapping': 2.3.0 -<<<<<<< HEAD '@babel/code-frame': 7.24.7 '@babel/generator': 7.25.0 '@babel/helper-compilation-targets': 7.25.2 @@ -11781,17 +11290,6 @@ snapshots: '@babel/template': 7.25.0 '@babel/traverse': 7.25.3 '@babel/types': 7.25.2 -======= - '@babel/code-frame': 7.25.7 - '@babel/generator': 7.25.7 - '@babel/helper-compilation-targets': 7.25.7 - '@babel/helper-module-transforms': 7.25.7(@babel/core@7.25.7) - '@babel/helpers': 7.25.7 - '@babel/parser': 7.25.7 - '@babel/template': 7.25.7 - '@babel/traverse': 7.25.7 - '@babel/types': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e convert-source-map: 2.0.0 debug: 4.3.6 gensync: 1.0.0-beta.2 @@ -11800,7 +11298,6 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@babel/generator@7.25.0': dependencies: '@babel/types': 7.25.2 @@ -11813,23 +11310,12 @@ snapshots: '@babel/types': 7.25.2 '@babel/helper-builder-binary-assignment-operator-visitor@7.24.7': -======= - '@babel/generator@7.25.7': - dependencies: - '@babel/types': 7.25.7 - '@jridgewell/gen-mapping': 0.3.5 - '@jridgewell/trace-mapping': 0.3.25 - jsesc: 3.0.2 - - '@babel/helper-annotate-as-pure@7.25.7': ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@babel/traverse': 7.25.3 '@babel/types': 7.25.2 transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@babel/helper-compilation-targets@7.25.2': dependencies: '@babel/compat-data': 7.25.2 @@ -11847,63 +11333,28 @@ snapshots: '@babel/helper-replace-supers': 7.25.0(@babel/core@7.25.2) '@babel/helper-skip-transparent-expression-wrappers': 7.24.7 '@babel/traverse': 7.25.3 -======= - '@babel/helper-compilation-targets@7.25.7': - dependencies: - '@babel/compat-data': 7.25.7 - '@babel/helper-validator-option': 7.25.7 - browserslist: 4.24.0 - lru-cache: 5.1.1 - semver: 6.3.1 - - '@babel/helper-create-class-features-plugin@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-annotate-as-pure': 7.25.7 - '@babel/helper-member-expression-to-functions': 7.25.7 - '@babel/helper-optimise-call-expression': 7.25.7 - '@babel/helper-replace-supers': 7.25.7(@babel/core@7.25.7) - '@babel/helper-skip-transparent-expression-wrappers': 7.25.7 - '@babel/traverse': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e semver: 6.3.1 transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@babel/helper-create-regexp-features-plugin@7.25.2(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 '@babel/helper-annotate-as-pure': 7.24.7 regexpu-core: 5.3.2 -======= - '@babel/helper-create-regexp-features-plugin@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-annotate-as-pure': 7.25.7 - regexpu-core: 6.1.1 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e semver: 6.3.1 - '@babel/helper-define-polyfill-provider@0.6.2(@babel/core@7.25.7)': + '@babel/helper-define-polyfill-provider@0.6.2(@babel/core@7.25.2)': dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-compilation-targets': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 debug: 4.3.6 -======= - '@babel/core': 7.25.7 - '@babel/helper-compilation-targets': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - debug: 4.3.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e lodash.debounce: 4.0.8 resolve: 1.22.8 transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@babel/helper-member-expression-to-functions@7.24.8': dependencies: '@babel/traverse': 7.25.3 @@ -11912,29 +11363,18 @@ snapshots: - supports-color '@babel/helper-module-imports@7.22.15': -======= - '@babel/helper-member-expression-to-functions@7.25.7': ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@babel/types': 7.25.2 -<<<<<<< HEAD '@babel/helper-module-imports@7.24.7': dependencies: '@babel/traverse': 7.25.3 '@babel/types': 7.25.2 -======= - '@babel/helper-module-imports@7.25.7': - dependencies: - '@babel/traverse': 7.25.7 - '@babel/types': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - supports-color - '@babel/helper-module-transforms@7.25.7(@babel/core@7.25.7)': + '@babel/helper-module-transforms@7.25.2(@babel/core@7.25.2)': dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-module-imports': 7.24.7 '@babel/helper-simple-access': 7.24.7 @@ -11955,34 +11395,11 @@ snapshots: '@babel/helper-annotate-as-pure': 7.24.7 '@babel/helper-wrap-function': 7.25.0 '@babel/traverse': 7.25.3 -======= - '@babel/core': 7.25.7 - '@babel/helper-module-imports': 7.25.7 - '@babel/helper-simple-access': 7.25.7 - '@babel/helper-validator-identifier': 7.25.7 - '@babel/traverse': 7.25.7 transitivePeerDependencies: - supports-color - '@babel/helper-optimise-call-expression@7.25.7': + '@babel/helper-replace-supers@7.25.0(@babel/core@7.25.2)': dependencies: - '@babel/types': 7.25.7 - - '@babel/helper-plugin-utils@7.25.7': {} - - '@babel/helper-remap-async-to-generator@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-annotate-as-pure': 7.25.7 - '@babel/helper-wrap-function': 7.25.7 - '@babel/traverse': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - transitivePeerDependencies: - - supports-color - - '@babel/helper-replace-supers@7.25.7(@babel/core@7.25.7)': - dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-member-expression-to-functions': 7.24.8 '@babel/helper-optimise-call-expression': 7.24.7 @@ -12011,36 +11428,6 @@ snapshots: '@babel/helper-validator-option@7.24.8': {} '@babel/helper-wrap-function@7.25.0': -======= - '@babel/core': 7.25.7 - '@babel/helper-member-expression-to-functions': 7.25.7 - '@babel/helper-optimise-call-expression': 7.25.7 - '@babel/traverse': 7.25.7 - transitivePeerDependencies: - - supports-color - - '@babel/helper-simple-access@7.25.7': - dependencies: - '@babel/traverse': 7.25.7 - '@babel/types': 7.25.7 - transitivePeerDependencies: - - supports-color - - '@babel/helper-skip-transparent-expression-wrappers@7.25.7': - dependencies: - '@babel/traverse': 7.25.7 - '@babel/types': 7.25.7 - transitivePeerDependencies: - - supports-color - - '@babel/helper-string-parser@7.25.7': {} - - '@babel/helper-validator-identifier@7.25.7': {} - - '@babel/helper-validator-option@7.25.7': {} - - '@babel/helper-wrap-function@7.25.7': ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@babel/template': 7.25.0 '@babel/traverse': 7.25.3 @@ -12048,7 +11435,6 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@babel/helpers@7.25.0': dependencies: '@babel/template': 7.25.0 @@ -12059,21 +11445,12 @@ snapshots: '@babel/helper-validator-identifier': 7.24.7 chalk: 2.4.2 js-tokens: 4.0.0 - picocolors: 1.0.1 + picocolors: 1.1.0 '@babel/parser@7.25.3': -======= - '@babel/helpers@7.25.7': - dependencies: - '@babel/template': 7.25.7 - '@babel/types': 7.25.7 - - '@babel/highlight@7.25.7': ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@babel/types': 7.25.2 -<<<<<<< HEAD '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.3(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 @@ -12106,100 +11483,39 @@ snapshots: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 '@babel/traverse': 7.25.3 -======= - '@babel/parser@7.25.7': - dependencies: - '@babel/types': 7.25.7 - - '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/traverse': 7.25.7 transitivePeerDependencies: - supports-color - '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.7(@babel/core@7.25.7)': + '@babel/plugin-proposal-decorators@7.24.7(@babel/core@7.25.2)': dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/helper-skip-transparent-expression-wrappers': 7.25.7 - '@babel/plugin-transform-optional-chaining': 7.25.7(@babel/core@7.25.7) - transitivePeerDependencies: - - supports-color - - '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/traverse': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - transitivePeerDependencies: - - supports-color - - '@babel/plugin-proposal-decorators@7.25.7(@babel/core@7.25.7)': - dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-create-class-features-plugin': 7.25.0(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.24.8 '@babel/plugin-syntax-decorators': 7.24.7(@babel/core@7.25.2) -======= - '@babel/core': 7.25.7 - '@babel/helper-create-class-features-plugin': 7.25.7(@babel/core@7.25.7) - '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-decorators': 7.25.7(@babel/core@7.25.7) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - supports-color - '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.25.7)': + '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.25.2)': dependencies: - '@babel/core': 7.25.7 + '@babel/core': 7.25.2 - '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.25.7)': + '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.25.2)': dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 -======= - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.25.7)': + '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.25.2)': dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 -======= - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.25.7)': + '@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.25.2)': dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 -======= - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - '@babel/plugin-syntax-decorators@7.25.7(@babel/core@7.25.7)': + '@babel/plugin-syntax-decorators@7.24.7(@babel/core@7.25.2)': dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 @@ -12207,14 +11523,9 @@ snapshots: dependencies: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 -======= - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - '@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.25.7)': + '@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.25.2)': dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 @@ -12227,24 +11538,9 @@ snapshots: dependencies: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 -======= - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.25.7)': + '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.25.2)': dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-syntax-import-assertions@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - - '@babel/plugin-syntax-import-attributes@7.25.7(@babel/core@7.25.7)': - dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 @@ -12252,14 +11548,9 @@ snapshots: dependencies: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 -======= - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.25.7)': + '@babel/plugin-syntax-jsx@7.24.7(@babel/core@7.25.2)': dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 @@ -12267,74 +11558,39 @@ snapshots: dependencies: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 -======= - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.25.7)': + '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.25.2)': dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 -======= - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - '@babel/plugin-syntax-jsx@7.25.7(@babel/core@7.25.7)': + '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.25.2)': dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 -======= - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.25.7)': + '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.25.2)': dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 -======= - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.25.7)': + '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.25.2)': dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 -======= - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.25.7)': + '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.25.2)': dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 -======= - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.25.7)': + '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.25.2)': dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 -======= - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.25.7)': + '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.25.2)': dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 @@ -12408,101 +11664,10 @@ snapshots: '@babel/helper-plugin-utils': 7.24.8 '@babel/helper-replace-supers': 7.25.0(@babel/core@7.25.2) '@babel/traverse': 7.25.3 -======= - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-syntax-typescript@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-create-regexp-features-plugin': 7.25.7(@babel/core@7.25.7) - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-arrow-functions@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-async-generator-functions@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/helper-remap-async-to-generator': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.25.7) - '@babel/traverse': 7.25.7 - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-async-to-generator@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-module-imports': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/helper-remap-async-to-generator': 7.25.7(@babel/core@7.25.7) - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-block-scoped-functions@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-block-scoping@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-class-properties@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-create-class-features-plugin': 7.25.7(@babel/core@7.25.7) - '@babel/helper-plugin-utils': 7.25.7 - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-class-static-block@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-create-class-features-plugin': 7.25.7(@babel/core@7.25.7) - '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.25.7) - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-classes@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-annotate-as-pure': 7.25.7 - '@babel/helper-compilation-targets': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/helper-replace-supers': 7.25.7(@babel/core@7.25.7) - '@babel/traverse': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e globals: 11.12.0 transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@babel/plugin-transform-computed-properties@7.24.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 @@ -12595,106 +11760,11 @@ snapshots: '@babel/core': 7.25.2 '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.24.8 -======= - '@babel/plugin-transform-computed-properties@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/template': 7.25.7 - - '@babel/plugin-transform-destructuring@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-dotall-regex@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-create-regexp-features-plugin': 7.25.7(@babel/core@7.25.7) - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-duplicate-keys@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-create-regexp-features-plugin': 7.25.7(@babel/core@7.25.7) - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-dynamic-import@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.25.7) - - '@babel/plugin-transform-exponentiation-operator@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-builder-binary-assignment-operator-visitor': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 transitivePeerDependencies: - supports-color - '@babel/plugin-transform-export-namespace-from@7.25.7(@babel/core@7.25.7)': + '@babel/plugin-transform-modules-commonjs@7.24.8(@babel/core@7.25.2)': dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.25.7) - - '@babel/plugin-transform-for-of@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/helper-skip-transparent-expression-wrappers': 7.25.7 - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-function-name@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-compilation-targets': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/traverse': 7.25.7 - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-json-strings@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.25.7) - - '@babel/plugin-transform-literals@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-logical-assignment-operators@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.25.7) - - '@babel/plugin-transform-member-expression-literals@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-modules-amd@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-module-transforms': 7.25.7(@babel/core@7.25.7) - '@babel/helper-plugin-utils': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-modules-commonjs@7.25.7(@babel/core@7.25.7)': - dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.24.8 @@ -12840,157 +11910,9 @@ snapshots: dependencies: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 -======= - '@babel/core': 7.25.7 - '@babel/helper-module-transforms': 7.25.7(@babel/core@7.25.7) - '@babel/helper-plugin-utils': 7.25.7 - '@babel/helper-simple-access': 7.25.7 - transitivePeerDependencies: - - supports-color - '@babel/plugin-transform-modules-systemjs@7.25.7(@babel/core@7.25.7)': + '@babel/plugin-transform-typescript@7.25.2(@babel/core@7.25.2)': dependencies: - '@babel/core': 7.25.7 - '@babel/helper-module-transforms': 7.25.7(@babel/core@7.25.7) - '@babel/helper-plugin-utils': 7.25.7 - '@babel/helper-validator-identifier': 7.25.7 - '@babel/traverse': 7.25.7 - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-modules-umd@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-module-transforms': 7.25.7(@babel/core@7.25.7) - '@babel/helper-plugin-utils': 7.25.7 - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-named-capturing-groups-regex@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-create-regexp-features-plugin': 7.25.7(@babel/core@7.25.7) - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-new-target@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-nullish-coalescing-operator@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.25.7) - - '@babel/plugin-transform-numeric-separator@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.25.7) - - '@babel/plugin-transform-object-rest-spread@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-compilation-targets': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.25.7) - '@babel/plugin-transform-parameters': 7.25.7(@babel/core@7.25.7) - - '@babel/plugin-transform-object-super@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/helper-replace-supers': 7.25.7(@babel/core@7.25.7) - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-optional-catch-binding@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.25.7) - - '@babel/plugin-transform-optional-chaining@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/helper-skip-transparent-expression-wrappers': 7.25.7 - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.25.7) - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-parameters@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-private-methods@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-create-class-features-plugin': 7.25.7(@babel/core@7.25.7) - '@babel/helper-plugin-utils': 7.25.7 - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-private-property-in-object@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-annotate-as-pure': 7.25.7 - '@babel/helper-create-class-features-plugin': 7.25.7(@babel/core@7.25.7) - '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.25.7) - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-property-literals@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-regenerator@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - regenerator-transform: 0.15.2 - - '@babel/plugin-transform-reserved-words@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-shorthand-properties@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-spread@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/helper-skip-transparent-expression-wrappers': 7.25.7 - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-sticky-regex@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-template-literals@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-typeof-symbol@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - - '@babel/plugin-transform-typescript@7.25.7(@babel/core@7.25.7)': - dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-annotate-as-pure': 7.24.7 '@babel/helper-create-class-features-plugin': 7.25.0(@babel/core@7.25.2) @@ -13108,154 +12030,28 @@ snapshots: babel-plugin-polyfill-corejs3: 0.10.6(@babel/core@7.25.2) babel-plugin-polyfill-regenerator: 0.6.2(@babel/core@7.25.2) core-js-compat: 3.38.0 -======= - '@babel/core': 7.25.7 - '@babel/helper-annotate-as-pure': 7.25.7 - '@babel/helper-create-class-features-plugin': 7.25.7(@babel/core@7.25.7) - '@babel/helper-plugin-utils': 7.25.7 - '@babel/helper-skip-transparent-expression-wrappers': 7.25.7 - '@babel/plugin-syntax-typescript': 7.25.7(@babel/core@7.25.7) - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-unicode-escapes@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-unicode-property-regex@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-create-regexp-features-plugin': 7.25.7(@babel/core@7.25.7) - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-unicode-regex@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-create-regexp-features-plugin': 7.25.7(@babel/core@7.25.7) - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/plugin-transform-unicode-sets-regex@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-create-regexp-features-plugin': 7.25.7(@babel/core@7.25.7) - '@babel/helper-plugin-utils': 7.25.7 - - '@babel/preset-env@7.25.7(@babel/core@7.25.7)': - dependencies: - '@babel/compat-data': 7.25.7 - '@babel/core': 7.25.7 - '@babel/helper-compilation-targets': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/helper-validator-option': 7.25.7 - '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.25.7) - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.25.7) - '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.25.7) - '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.25.7) - '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.25.7) - '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.25.7) - '@babel/plugin-syntax-import-assertions': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-syntax-import-attributes': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.25.7) - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.25.7) - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.25.7) - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.25.7) - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.25.7) - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.25.7) - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.25.7) - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.25.7) - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.25.7) - '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.25.7) - '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.25.7) - '@babel/plugin-transform-arrow-functions': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-async-generator-functions': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-async-to-generator': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-block-scoped-functions': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-block-scoping': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-class-properties': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-class-static-block': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-classes': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-computed-properties': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-destructuring': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-dotall-regex': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-duplicate-keys': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-dynamic-import': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-exponentiation-operator': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-export-namespace-from': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-for-of': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-function-name': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-json-strings': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-literals': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-logical-assignment-operators': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-member-expression-literals': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-modules-amd': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-modules-commonjs': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-modules-systemjs': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-modules-umd': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-named-capturing-groups-regex': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-new-target': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-nullish-coalescing-operator': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-numeric-separator': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-object-rest-spread': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-object-super': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-optional-catch-binding': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-optional-chaining': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-parameters': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-private-methods': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-private-property-in-object': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-property-literals': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-regenerator': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-reserved-words': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-shorthand-properties': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-spread': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-sticky-regex': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-template-literals': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-typeof-symbol': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-unicode-escapes': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-unicode-property-regex': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-unicode-regex': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-unicode-sets-regex': 7.25.7(@babel/core@7.25.7) - '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.25.7) - babel-plugin-polyfill-corejs2: 0.4.11(@babel/core@7.25.7) - babel-plugin-polyfill-corejs3: 0.10.6(@babel/core@7.25.7) - babel-plugin-polyfill-regenerator: 0.6.2(@babel/core@7.25.7) - core-js-compat: 3.38.1 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e semver: 6.3.1 transitivePeerDependencies: - supports-color - '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.25.7)': + '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.25.2)': dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 '@babel/types': 7.25.2 -======= - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/types': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e esutils: 2.0.3 - '@babel/preset-typescript@7.25.7(@babel/core@7.25.7)': + '@babel/preset-typescript@7.24.7(@babel/core@7.25.2)': dependencies: - '@babel/core': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/helper-validator-option': 7.25.7 - '@babel/plugin-syntax-jsx': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-modules-commonjs': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-transform-typescript': 7.25.7(@babel/core@7.25.7) + '@babel/core': 7.25.2 + '@babel/helper-plugin-utils': 7.24.8 + '@babel/helper-validator-option': 7.24.8 + '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.25.2) + '@babel/plugin-transform-modules-commonjs': 7.24.8(@babel/core@7.25.2) + '@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.2) transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@babel/regjsgen@0.8.0': {} '@babel/runtime@7.25.0': @@ -13278,43 +12074,14 @@ snapshots: '@babel/template': 7.25.0 '@babel/types': 7.25.2 debug: 4.3.6 -======= - '@babel/runtime@7.25.7': - dependencies: - regenerator-runtime: 0.14.1 - - '@babel/standalone@7.25.7': {} - - '@babel/template@7.25.7': - dependencies: - '@babel/code-frame': 7.25.7 - '@babel/parser': 7.25.7 - '@babel/types': 7.25.7 - - '@babel/traverse@7.25.7': - dependencies: - '@babel/code-frame': 7.25.7 - '@babel/generator': 7.25.7 - '@babel/parser': 7.25.7 - '@babel/template': 7.25.7 - '@babel/types': 7.25.7 - debug: 4.3.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e globals: 11.12.0 transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@babel/types@7.25.2': dependencies: '@babel/helper-string-parser': 7.24.8 '@babel/helper-validator-identifier': 7.24.7 -======= - '@babel/types@7.25.7': - dependencies: - '@babel/helper-string-parser': 7.25.7 - '@babel/helper-validator-identifier': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e to-fast-properties: 2.0.0 '@changesets/apply-release-plan@7.0.5': @@ -13393,7 +12160,7 @@ snapshots: '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 - micromatch: 4.0.7 + micromatch: 4.0.8 '@changesets/errors@0.2.0': dependencies: @@ -13945,9 +12712,9 @@ snapshots: '@csstools/postcss-cascade-layers@5.0.0(postcss@8.4.47)': dependencies: - '@csstools/selector-specificity': 4.0.0(postcss-selector-parser@6.1.1) + '@csstools/selector-specificity': 4.0.0(postcss-selector-parser@6.1.2) postcss: 8.4.47 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 '@csstools/postcss-color-function@4.0.2(postcss@8.4.47)': dependencies: @@ -14026,9 +12793,9 @@ snapshots: '@csstools/postcss-is-pseudo-class@5.0.0(postcss@8.4.47)': dependencies: - '@csstools/selector-specificity': 4.0.0(postcss-selector-parser@6.1.1) + '@csstools/selector-specificity': 4.0.0(postcss-selector-parser@6.1.2) postcss: 8.4.47 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 '@csstools/postcss-light-dark-function@2.0.4(postcss@8.4.47)': dependencies: @@ -14113,7 +12880,7 @@ snapshots: '@csstools/postcss-scope-pseudo-class@4.0.0(postcss@8.4.47)': dependencies: postcss: 8.4.47 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 '@csstools/postcss-stepped-value-functions@4.0.1(postcss@8.4.47)': dependencies: @@ -14139,13 +12906,9 @@ snapshots: dependencies: postcss: 8.4.47 - '@csstools/selector-resolve-nested@2.0.0(postcss-selector-parser@6.1.1)': + '@csstools/selector-resolve-nested@2.0.0(postcss-selector-parser@6.1.2)': dependencies: - postcss-selector-parser: 6.1.1 - - '@csstools/selector-specificity@4.0.0(postcss-selector-parser@6.1.1)': - dependencies: - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 '@csstools/selector-specificity@4.0.0(postcss-selector-parser@6.1.2)': dependencies: @@ -14157,19 +12920,12 @@ snapshots: '@ctrl/tinycolor@4.1.0': {} - '@docsearch/css@3.6.2': {} + '@docsearch/css@3.6.1': {} -<<<<<<< HEAD '@docsearch/js@3.6.1(@algolia/client-search@4.24.0)(search-insights@2.16.0)': dependencies: '@docsearch/react': 3.6.1(@algolia/client-search@4.24.0)(search-insights@2.16.0) preact: 10.23.1 -======= - '@docsearch/js@3.6.2(@algolia/client-search@4.24.0)(search-insights@2.17.2)': - dependencies: - '@docsearch/react': 3.6.2(@algolia/client-search@4.24.0)(search-insights@2.17.2) - preact: 10.24.2 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - '@algolia/client-search' - '@types/react' @@ -14177,15 +12933,11 @@ snapshots: - react-dom - search-insights -<<<<<<< HEAD '@docsearch/react@3.6.1(@algolia/client-search@4.24.0)(search-insights@2.16.0)': -======= - '@docsearch/react@3.6.2(@algolia/client-search@4.24.0)(search-insights@2.17.2)': ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@algolia/autocomplete-core': 1.9.3(@algolia/client-search@4.24.0)(algoliasearch@4.24.0)(search-insights@2.16.0) '@algolia/autocomplete-preset-algolia': 1.9.3(@algolia/client-search@4.24.0)(algoliasearch@4.24.0) - '@docsearch/css': 3.6.2 + '@docsearch/css': 3.6.1 algoliasearch: 4.24.0 optionalDependencies: search-insights: 2.16.0 @@ -14489,15 +13241,9 @@ snapshots: '@esbuild/win32-x64@0.23.0': optional: true -<<<<<<< HEAD '@eslint-community/eslint-utils@4.4.0(eslint@9.12.0(jiti@1.21.6))': dependencies: eslint: 9.12.0(jiti@1.21.6) -======= - '@eslint-community/eslint-utils@4.4.0(eslint@9.12.0(jiti@2.2.1))': - dependencies: - eslint: 9.12.0(jiti@2.2.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.11.0': {} @@ -14515,14 +13261,10 @@ snapshots: '@eslint/eslintrc@3.1.0': dependencies: ajv: 6.12.6 -<<<<<<< HEAD debug: 4.3.6 -======= - debug: 4.3.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e espree: 10.2.0 globals: 14.0.0 - ignore: 5.3.1 + ignore: 5.3.2 import-fresh: 3.3.0 js-yaml: 4.1.0 minimatch: 3.1.2 @@ -14553,19 +13295,11 @@ snapshots: '@floating-ui/utils@0.2.7': {} -<<<<<<< HEAD - '@floating-ui/vue@1.1.4(vue@3.5.10(typescript@5.6.2))': + '@floating-ui/vue@1.1.4(vue@3.5.11(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.10(typescript@5.6.2)) -======= - '@floating-ui/vue@1.1.5(vue@3.5.11(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.11(typescript@5.6.2)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - '@vue/composition-api' - vue @@ -14623,11 +13357,11 @@ snapshots: '@iconify/types': 2.0.0 vue: 3.5.11(typescript@5.6.2) - '@internationalized/date@3.5.6': + '@internationalized/date@3.5.5': dependencies: '@swc/helpers': 0.5.12 - '@internationalized/number@3.5.4': + '@internationalized/number@3.5.3': dependencies: '@swc/helpers': 0.5.12 @@ -14653,7 +13387,7 @@ snapshots: '@intlify/message-compiler@10.0.0': dependencies: '@intlify/shared': 10.0.0 - source-map-js: 1.2.0 + source-map-js: 1.2.1 '@intlify/message-compiler@10.0.3': dependencies: @@ -14664,23 +13398,13 @@ snapshots: '@intlify/shared@10.0.3': {} -<<<<<<< HEAD - '@intlify/unplugin-vue-i18n@5.2.0(@vue/compiler-dom@3.5.11)(eslint@9.12.0(jiti@1.21.6))(rollup@4.24.0)(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))': + '@intlify/unplugin-vue-i18n@5.2.0(@vue/compiler-dom@3.5.11)(eslint@9.12.0(jiti@1.21.6))(rollup@4.24.0)(typescript@5.6.2)(vue-i18n@10.0.3(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(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 - '@intlify/vue-i18n-extensions': 7.0.0(@intlify/shared@10.0.0)(@vue/compiler-dom@3.5.11)(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.0(rollup@4.24.0) -======= - '@intlify/unplugin-vue-i18n@5.2.0(@vue/compiler-dom@3.5.11)(eslint@9.12.0(jiti@2.2.1))(rollup@4.24.0)(typescript@5.6.2)(vue-i18n@10.0.3(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))': - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@2.2.1)) '@intlify/bundle-utils': 9.0.0-beta.0(vue-i18n@10.0.3(vue@3.5.11(typescript@5.6.2))) '@intlify/shared': 10.0.0 '@intlify/vue-i18n-extensions': 7.0.0(@intlify/shared@10.0.0)(@vue/compiler-dom@3.5.11)(vue-i18n@10.0.3(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2)) - '@rollup/pluginutils': 5.1.2(rollup@4.24.0) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e + '@rollup/pluginutils': 5.1.0(rollup@4.24.0) '@typescript-eslint/scope-manager': 7.18.0 '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.6.2) debug: 4.3.6 @@ -14688,17 +13412,10 @@ snapshots: js-yaml: 4.1.0 json5: 2.2.3 pathe: 1.1.2 -<<<<<<< HEAD picocolors: 1.0.1 source-map-js: 1.2.0 unplugin: 1.12.0 - vue: 3.5.10(typescript@5.6.2) -======= - picocolors: 1.1.0 - source-map-js: 1.2.1 - unplugin: 1.14.1 vue: 3.5.11(typescript@5.6.2) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e optionalDependencies: vue-i18n: 10.0.3(vue@3.5.11(typescript@5.6.2)) transitivePeerDependencies: @@ -14708,23 +13425,14 @@ snapshots: - supports-color - typescript -<<<<<<< HEAD - '@intlify/vue-i18n-extensions@7.0.0(@intlify/shared@10.0.0)(@vue/compiler-dom@3.5.11)(vue-i18n@10.0.3(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2))': -======= '@intlify/vue-i18n-extensions@7.0.0(@intlify/shared@10.0.0)(@vue/compiler-dom@3.5.11)(vue-i18n@10.0.3(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))': ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@babel/parser': 7.25.3 optionalDependencies: '@intlify/shared': 10.0.0 '@vue/compiler-dom': 3.5.11 -<<<<<<< HEAD - vue: 3.5.10(typescript@5.6.2) - vue-i18n: 10.0.3(vue@3.5.10(typescript@5.6.2)) -======= vue: 3.5.11(typescript@5.6.2) vue-i18n: 10.0.3(vue@3.5.11(typescript@5.6.2)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@ioredis/commands@1.2.0': {} @@ -14761,15 +13469,9 @@ snapshots: '@jspm/generator@2.3.1': dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/plugin-syntax-import-attributes': 7.24.7(@babel/core@7.25.2) '@babel/preset-typescript': 7.24.7(@babel/core@7.25.2) -======= - '@babel/core': 7.25.7 - '@babel/plugin-syntax-import-attributes': 7.25.7(@babel/core@7.25.7) - '@babel/preset-typescript': 7.25.7(@babel/core@7.25.7) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@jspm/import-map': 1.1.0 es-module-lexer: 1.5.4 make-fetch-happen: 8.0.14 @@ -14824,11 +13526,7 @@ snapshots: '@manypkg/find-root@1.1.0': dependencies: -<<<<<<< HEAD '@babel/runtime': 7.25.0 -======= - '@babel/runtime': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@types/node': 12.20.55 find-up: 4.1.0 fs-extra: 8.1.0 @@ -14841,11 +13539,7 @@ snapshots: '@manypkg/get-packages@1.1.3': dependencies: -<<<<<<< HEAD '@babel/runtime': 7.25.0 -======= - '@babel/runtime': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@changesets/types': 4.1.0 '@manypkg/find-root': 1.1.0 fs-extra: 8.1.0 @@ -14914,13 +13608,13 @@ snapshots: '@microsoft/tsdoc@0.15.0': {} - '@netlify/functions@2.8.2': + '@netlify/functions@2.8.1': dependencies: - '@netlify/serverless-functions-api': 1.26.1 + '@netlify/serverless-functions-api': 1.19.1 '@netlify/node-cookies@0.1.0': {} - '@netlify/serverless-functions-api@1.26.1': + '@netlify/serverless-functions-api@1.19.1': dependencies: '@netlify/node-cookies': 0.1.0 urlpattern-polyfill: 8.0.2 @@ -14937,21 +13631,12 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.17.1 -<<<<<<< HEAD '@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.16.0)(sortablejs@1.15.3)(terser@5.31.3)(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.16.0)(sortablejs@1.15.3)(terser@5.31.3)(typescript@5.6.2) - vue: 3.5.10(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.34.1)(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.34.1)(typescript@5.6.2) vue: 3.5.11(typescript@5.6.2) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - '@algolia/client-search' - '@types/node' @@ -14981,17 +13666,10 @@ snapshots: - typescript - universal-cookie -<<<<<<< HEAD '@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.16.0)(sortablejs@1.15.3)(terser@5.31.3)(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.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.16.0)(sortablejs@1.15.3)(terser@5.31.3)(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.34.1)(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.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.34.1)(typescript@5.6.2) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e colorette: 2.0.20 date-fns: 3.6.0 defu: 6.1.4 @@ -15001,11 +13679,7 @@ snapshots: gray-matter: 4.0.3 less: 4.2.0 uncrypto: 0.1.3 -<<<<<<< HEAD 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.16.0)(sortablejs@1.15.3)(terser@5.31.3)(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.34.1)(typescript@5.6.2) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - '@algolia/client-search' - '@types/node' @@ -15065,13 +13739,8 @@ snapshots: semver: 7.6.3 ufo: 1.5.4 unctx: 2.3.1 -<<<<<<< HEAD unimport: 3.13.1(rollup@4.24.0)(webpack-sources@3.2.3) untyped: 1.4.2 -======= - unimport: 3.13.1(rollup@4.24.0) - untyped: 1.5.0 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - magicast - rollup @@ -15090,13 +13759,8 @@ snapshots: std-env: 3.7.0 ufo: 1.5.4 uncrypto: 0.1.3 -<<<<<<< HEAD unimport: 3.13.1(rollup@4.24.0)(webpack-sources@3.2.3) untyped: 1.4.2 -======= - unimport: 3.13.1(rollup@4.24.0) - untyped: 1.5.0 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - rollup - supports-color @@ -15194,7 +13858,6 @@ snapshots: optionalDependencies: rollup: 3.29.4 -<<<<<<< HEAD '@rollup/plugin-alias@5.1.0(rollup@4.20.0)': dependencies: slash: 4.0.0 @@ -15207,18 +13870,6 @@ snapshots: '@babel/helper-module-imports': 7.24.7 '@rollup/pluginutils': 3.1.0(rollup@2.79.1) rollup: 2.79.1 -======= - '@rollup/plugin-alias@5.1.1(rollup@4.24.0)': - optionalDependencies: - rollup: 4.24.0 - - '@rollup/plugin-babel@5.3.1(@babel/core@7.25.7)(rollup@2.79.2)': - dependencies: - '@babel/core': 7.25.7 - '@babel/helper-module-imports': 7.25.7 - '@rollup/pluginutils': 3.1.0(rollup@2.79.2) - rollup: 2.79.2 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - supports-color @@ -15233,22 +13884,15 @@ snapshots: optionalDependencies: rollup: 3.29.4 -<<<<<<< HEAD '@rollup/plugin-commonjs@25.0.8(rollup@4.20.0)': dependencies: '@rollup/pluginutils': 5.1.0(rollup@4.20.0) -======= - '@rollup/plugin-commonjs@25.0.8(rollup@4.24.0)': - dependencies: - '@rollup/pluginutils': 5.1.2(rollup@4.24.0) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e commondir: 1.0.1 estree-walker: 2.0.2 glob: 8.1.0 is-reference: 1.2.1 magic-string: 0.30.11 optionalDependencies: -<<<<<<< HEAD rollup: 4.20.0 '@rollup/plugin-inject@5.0.5(rollup@4.20.0)': @@ -15258,17 +13902,6 @@ snapshots: magic-string: 0.30.11 optionalDependencies: rollup: 4.20.0 -======= - rollup: 4.24.0 - - '@rollup/plugin-inject@5.0.5(rollup@4.24.0)': - dependencies: - '@rollup/pluginutils': 5.1.2(rollup@4.24.0) - estree-walker: 2.0.2 - magic-string: 0.30.11 - optionalDependencies: - rollup: 4.24.0 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/plugin-json@6.1.0(rollup@3.29.4)': dependencies: @@ -15276,19 +13909,11 @@ snapshots: optionalDependencies: rollup: 3.29.4 -<<<<<<< HEAD '@rollup/plugin-json@6.1.0(rollup@4.20.0)': dependencies: '@rollup/pluginutils': 5.1.0(rollup@4.20.0) optionalDependencies: rollup: 4.20.0 -======= - '@rollup/plugin-json@6.1.0(rollup@4.24.0)': - dependencies: - '@rollup/pluginutils': 5.1.2(rollup@4.24.0) - optionalDependencies: - rollup: 4.24.0 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/plugin-node-resolve@15.2.3(rollup@2.79.1)': dependencies: @@ -15312,26 +13937,16 @@ snapshots: optionalDependencies: rollup: 3.29.4 -<<<<<<< HEAD '@rollup/plugin-node-resolve@15.2.3(rollup@4.20.0)': dependencies: '@rollup/pluginutils': 5.1.0(rollup@4.20.0) -======= - '@rollup/plugin-node-resolve@15.3.0(rollup@4.24.0)': - dependencies: - '@rollup/pluginutils': 5.1.2(rollup@4.24.0) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-builtin-module: 3.2.1 is-module: 1.0.0 resolve: 1.22.8 optionalDependencies: -<<<<<<< HEAD rollup: 4.20.0 -======= - rollup: 4.24.0 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/plugin-replace@2.4.2(rollup@2.79.1)': dependencies: @@ -15346,35 +13961,21 @@ snapshots: optionalDependencies: rollup: 3.29.4 -<<<<<<< HEAD '@rollup/plugin-replace@5.0.7(rollup@4.20.0)': dependencies: '@rollup/pluginutils': 5.1.0(rollup@4.20.0) magic-string: 0.30.11 optionalDependencies: rollup: 4.20.0 -======= - '@rollup/plugin-replace@5.0.7(rollup@4.24.0)': - dependencies: - '@rollup/pluginutils': 5.1.2(rollup@4.24.0) - magic-string: 0.30.11 - optionalDependencies: - rollup: 4.24.0 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/plugin-terser@0.4.4(rollup@2.79.1)': dependencies: serialize-javascript: 6.0.2 smob: 1.5.0 -<<<<<<< HEAD terser: 5.31.3 -======= - terser: 5.34.1 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e optionalDependencies: rollup: 2.79.1 -<<<<<<< HEAD '@rollup/plugin-terser@0.4.4(rollup@4.20.0)': dependencies: serialize-javascript: 6.0.2 @@ -15382,15 +13983,6 @@ snapshots: terser: 5.31.3 optionalDependencies: rollup: 4.20.0 -======= - '@rollup/plugin-terser@0.4.4(rollup@4.24.0)': - dependencies: - serialize-javascript: 6.0.2 - smob: 1.5.0 - terser: 5.34.1 - optionalDependencies: - rollup: 4.24.0 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/pluginutils@3.1.0(rollup@2.79.1)': dependencies: @@ -15420,7 +14012,6 @@ snapshots: optionalDependencies: rollup: 3.29.4 -<<<<<<< HEAD '@rollup/pluginutils@5.1.0(rollup@4.20.0)': dependencies: '@types/estree': 1.0.5 @@ -15430,9 +14021,6 @@ snapshots: rollup: 4.20.0 '@rollup/pluginutils@5.1.0(rollup@4.24.0)': -======= - '@rollup/pluginutils@5.1.2(rollup@4.24.0)': ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@types/estree': 1.0.5 estree-walker: 2.0.2 @@ -15440,10 +14028,9 @@ snapshots: optionalDependencies: rollup: 4.24.0 -<<<<<<< HEAD '@rollup/pluginutils@5.1.2(rollup@4.24.0)': dependencies: - '@types/estree': 1.0.5 + '@types/estree': 1.0.6 estree-walker: 2.0.2 picomatch: 2.3.1 optionalDependencies: @@ -15542,53 +14129,6 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.20.0': optional: true -======= - '@rollup/rollup-android-arm-eabi@4.24.0': - optional: true - - '@rollup/rollup-android-arm64@4.24.0': - optional: true - - '@rollup/rollup-darwin-arm64@4.24.0': - optional: true - - '@rollup/rollup-darwin-x64@4.24.0': - optional: true - - '@rollup/rollup-linux-arm-gnueabihf@4.24.0': - optional: true - - '@rollup/rollup-linux-arm-musleabihf@4.24.0': - optional: true - - '@rollup/rollup-linux-arm64-gnu@4.24.0': - optional: true - - '@rollup/rollup-linux-arm64-musl@4.24.0': - optional: true - - '@rollup/rollup-linux-powerpc64le-gnu@4.24.0': - optional: true - - '@rollup/rollup-linux-riscv64-gnu@4.24.0': - optional: true - - '@rollup/rollup-linux-s390x-gnu@4.24.0': - optional: true - - '@rollup/rollup-linux-x64-gnu@4.24.0': - optional: true - - '@rollup/rollup-linux-x64-musl@4.24.0': - optional: true - - '@rollup/rollup-win32-arm64-msvc@4.24.0': - optional: true - - '@rollup/rollup-win32-ia32-msvc@4.24.0': - optional: true - ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@rollup/rollup-win32-x64-msvc@4.24.0': optional: true @@ -15715,15 +14255,6 @@ snapshots: '@tanstack/virtual-core@3.8.4': {} -<<<<<<< HEAD - '@tanstack/vue-query@5.59.1(vue@3.5.10(typescript@5.6.2))': - dependencies: - '@tanstack/match-sorter-utils': 8.19.4 - '@tanstack/query-core': 5.59.0 - '@vue/devtools-api': 6.6.3 - vue: 3.5.10(typescript@5.6.2) - vue-demi: 0.14.10(vue@3.5.10(typescript@5.6.2)) -======= '@tanstack/vue-query@5.59.1(vue@3.5.11(typescript@5.6.2))': dependencies: '@tanstack/match-sorter-utils': 8.19.4 @@ -15731,7 +14262,6 @@ snapshots: '@vue/devtools-api': 6.6.4 vue: 3.5.11(typescript@5.6.2) vue-demi: 0.14.10(vue@3.5.11(typescript@5.6.2)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@tanstack/vue-store@0.5.5(vue@3.5.11(typescript@5.6.2))': dependencies: @@ -15739,22 +14269,15 @@ snapshots: vue: 3.5.11(typescript@5.6.2) vue-demi: 0.14.10(vue@3.5.11(typescript@5.6.2)) -<<<<<<< HEAD - '@tanstack/vue-virtual@3.8.5(vue@3.5.10(typescript@5.6.2))': + '@tanstack/vue-virtual@3.8.5(vue@3.5.11(typescript@5.6.2))': dependencies: '@tanstack/virtual-core': 3.8.4 - vue: 3.5.10(typescript@5.6.2) + vue: 3.5.11(typescript@5.6.2) - '@tinymce/tinymce-vue@6.0.1(vue@3.5.10(typescript@5.6.2))': + '@tinymce/tinymce-vue@6.0.1(vue@3.5.11(typescript@5.6.2))': dependencies: tinymce: 7.3.0 - vue: 3.5.10(typescript@5.6.2) -======= - '@tanstack/vue-virtual@3.10.8(vue@3.5.11(typescript@5.6.2))': - dependencies: - '@tanstack/virtual-core': 3.10.8 vue: 3.5.11(typescript@5.6.2) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@tootallnate/once@1.1.2': {} @@ -15822,7 +14345,6 @@ snapshots: '@types/lodash-es@4.17.12': dependencies: -<<<<<<< HEAD '@types/lodash': 4.17.7 '@types/lodash.clonedeep@4.5.9': @@ -15830,15 +14352,6 @@ snapshots: '@types/lodash': 4.17.7 '@types/lodash@4.17.7': {} -======= - '@types/lodash': 4.17.10 - - '@types/lodash.clonedeep@4.5.9': - dependencies: - '@types/lodash': 4.17.10 - - '@types/lodash@4.17.10': {} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@types/markdown-it@14.1.2': dependencies: @@ -15893,7 +14406,6 @@ snapshots: '@types/web-bluetooth@0.0.20': {} -<<<<<<< HEAD '@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2)': dependencies: '@eslint-community/regexpp': 4.11.0 @@ -15903,17 +14415,6 @@ snapshots: '@typescript-eslint/utils': 8.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2) '@typescript-eslint/visitor-keys': 8.8.0 eslint: 9.12.0(jiti@1.21.6) -======= - '@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2))(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2)': - dependencies: - '@eslint-community/regexpp': 4.11.1 - '@typescript-eslint/parser': 8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2) - '@typescript-eslint/scope-manager': 8.8.0 - '@typescript-eslint/type-utils': 8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2) - '@typescript-eslint/utils': 8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2) - '@typescript-eslint/visitor-keys': 8.8.0 - eslint: 9.12.0(jiti@2.2.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e graphemer: 1.4.0 ignore: 5.3.1 natural-compare: 1.4.0 @@ -15923,23 +14424,14 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2)': -======= - '@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2)': ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@typescript-eslint/scope-manager': 8.8.0 '@typescript-eslint/types': 8.8.0 '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.6.2) '@typescript-eslint/visitor-keys': 8.8.0 -<<<<<<< HEAD debug: 4.3.6 eslint: 9.12.0(jiti@1.21.6) -======= - debug: 4.3.7 - eslint: 9.12.0(jiti@2.2.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e optionalDependencies: typescript: 5.6.2 transitivePeerDependencies: @@ -15955,19 +14447,11 @@ snapshots: '@typescript-eslint/types': 8.8.0 '@typescript-eslint/visitor-keys': 8.8.0 -<<<<<<< HEAD '@typescript-eslint/type-utils@8.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2)': dependencies: '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.6.2) '@typescript-eslint/utils': 8.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2) debug: 4.3.6 -======= - '@typescript-eslint/type-utils@8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2)': - dependencies: - '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.6.2) - '@typescript-eslint/utils': 8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2) - debug: 4.3.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e ts-api-utils: 1.3.0(typescript@5.6.2) optionalDependencies: typescript: 5.6.2 @@ -16009,7 +14493,6 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@typescript-eslint/utils@7.18.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@1.21.6)) @@ -16017,20 +14500,10 @@ snapshots: '@typescript-eslint/types': 7.18.0 '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.6.2) eslint: 9.12.0(jiti@1.21.6) -======= - '@typescript-eslint/utils@7.18.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2)': - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@2.2.1)) - '@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.12.0(jiti@2.2.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - supports-color - typescript -<<<<<<< HEAD '@typescript-eslint/utils@8.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@1.21.6)) @@ -16038,15 +14511,6 @@ snapshots: '@typescript-eslint/types': 8.8.0 '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.6.2) eslint: 9.12.0(jiti@1.21.6) -======= - '@typescript-eslint/utils@8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2)': - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@2.2.1)) - '@typescript-eslint/scope-manager': 8.8.0 - '@typescript-eslint/types': 8.8.0 - '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.6.2) - eslint: 9.12.0(jiti@2.2.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - supports-color - typescript @@ -16065,13 +14529,8 @@ snapshots: '@vee-validate/zod@4.13.2(vue@3.5.11(typescript@5.6.2))': dependencies: -<<<<<<< HEAD type-fest: 4.23.0 - vee-validate: 4.13.2(vue@3.5.10(typescript@5.6.2)) -======= - type-fest: 4.26.1 vee-validate: 4.13.2(vue@3.5.11(typescript@5.6.2)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e zod: 3.23.8 transitivePeerDependencies: - vue @@ -16094,50 +14553,29 @@ snapshots: - encoding - supports-color -<<<<<<< HEAD '@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.31.3))(workbox-build@7.1.1)(workbox-window@7.1.0))': 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.31.3))(workbox-build@7.1.1)(workbox-window@7.1.0) - '@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.31.3))(vue@3.5.10(typescript@5.6.2))': + '@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.31.3))(vue@3.5.11(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.2(@babel/core@7.25.2) vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) - vue: 3.5.10(typescript@5.6.2) - transitivePeerDependencies: - - supports-color - - '@vitejs/plugin-vue@5.1.2(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3))(vue@3.5.10(typescript@5.6.2))': - dependencies: - vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) - vue: 3.5.10(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.31.3))(vue@3.5.10(typescript@5.6.2))': - dependencies: - vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) - vue: 3.5.10(typescript@5.6.2) -======= - '@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.34.1))(workbox-build@7.1.1)(workbox-window@7.1.0))': - 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.34.1))(workbox-build@7.1.1)(workbox-window@7.1.0) - - '@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.34.1))(vue@3.5.11(typescript@5.6.2))': - dependencies: - '@babel/core': 7.25.7 - '@babel/plugin-transform-typescript': 7.25.7(@babel/core@7.25.7) - '@vue/babel-plugin-jsx': 1.2.5(@babel/core@7.25.7) - vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) vue: 3.5.11(typescript@5.6.2) 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.34.1))(vue@3.5.11(typescript@5.6.2))': + '@vitejs/plugin-vue@5.1.2(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3))(vue@3.5.11(typescript@5.6.2))': dependencies: - vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) + vue: 3.5.11(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.31.3))(vue@3.5.11(typescript@5.6.2))': + dependencies: + vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) vue: 3.5.11(typescript@5.6.2) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@vitest/expect@2.1.2': dependencies: @@ -16146,21 +14584,13 @@ snapshots: chai: 5.1.1 tinyrainbow: 1.2.0 -<<<<<<< HEAD '@vitest/mocker@2.1.2(@vitest/spy@2.1.2)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3))': -======= - '@vitest/mocker@2.1.2(@vitest/spy@2.1.2)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1))': ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@vitest/spy': 2.1.2 estree-walker: 3.0.3 magic-string: 0.30.11 optionalDependencies: -<<<<<<< HEAD vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) -======= - vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@vitest/pretty-format@2.1.2': dependencies: @@ -16201,7 +14631,6 @@ snapshots: '@vue/babel-helper-vue-transform-on@1.2.2': {} -<<<<<<< HEAD '@vue/babel-plugin-jsx@1.2.2(@babel/core@7.25.2)': dependencies: '@babel/helper-module-imports': 7.22.15 @@ -16213,26 +14642,13 @@ snapshots: '@vue/babel-helper-vue-transform-on': 1.2.2 '@vue/babel-plugin-resolve-type': 1.2.2(@babel/core@7.25.2) camelcase: 6.3.0 -======= - '@vue/babel-plugin-jsx@1.2.5(@babel/core@7.25.7)': - dependencies: - '@babel/helper-module-imports': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-syntax-jsx': 7.25.7(@babel/core@7.25.7) - '@babel/template': 7.25.7 - '@babel/traverse': 7.25.7 - '@babel/types': 7.25.7 - '@vue/babel-helper-vue-transform-on': 1.2.5 - '@vue/babel-plugin-resolve-type': 1.2.5(@babel/core@7.25.7) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e html-tags: 3.3.1 svg-tags: 1.0.0 optionalDependencies: - '@babel/core': 7.25.7 + '@babel/core': 7.25.2 transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@vue/babel-plugin-resolve-type@1.2.2(@babel/core@7.25.2)': dependencies: '@babel/code-frame': 7.24.7 @@ -16240,7 +14656,7 @@ snapshots: '@babel/helper-module-imports': 7.22.15 '@babel/helper-plugin-utils': 7.24.8 '@babel/parser': 7.25.3 - '@vue/compiler-sfc': 3.4.37 + '@vue/compiler-sfc': 3.5.11 '@vue/compiler-core@3.4.37': dependencies: @@ -16248,52 +14664,21 @@ snapshots: '@vue/shared': 3.4.37 entities: 5.0.0 estree-walker: 2.0.2 - source-map-js: 1.2.0 -======= - '@vue/babel-plugin-resolve-type@1.2.5(@babel/core@7.25.7)': - dependencies: - '@babel/code-frame': 7.25.7 - '@babel/core': 7.25.7 - '@babel/helper-module-imports': 7.25.7 - '@babel/helper-plugin-utils': 7.25.7 - '@babel/parser': 7.25.7 - '@vue/compiler-sfc': 3.5.11 - transitivePeerDependencies: - - supports-color ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e + source-map-js: 1.2.1 - '@vue/compiler-core@3.5.11': - dependencies: -<<<<<<< HEAD - '@babel/parser': 7.25.3 - '@vue/shared': 3.5.10 -======= - '@babel/parser': 7.25.7 - '@vue/shared': 3.5.11 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - entities: 4.5.0 - estree-walker: 2.0.2 - source-map-js: 1.2.0 - -<<<<<<< HEAD '@vue/compiler-core@3.5.11': dependencies: '@babel/parser': 7.25.3 '@vue/shared': 3.5.11 entities: 4.5.0 estree-walker: 2.0.2 - source-map-js: 1.2.0 + source-map-js: 1.2.1 '@vue/compiler-dom@3.4.37': dependencies: '@vue/compiler-core': 3.4.37 '@vue/shared': 3.4.37 - '@vue/compiler-dom@3.5.10': - dependencies: - '@vue/compiler-core': 3.5.10 - '@vue/shared': 3.5.10 - '@vue/compiler-dom@3.5.11': dependencies: '@vue/compiler-core': 3.5.11 @@ -16311,33 +14696,6 @@ snapshots: postcss: 8.4.41 source-map-js: 1.2.0 - '@vue/compiler-sfc@3.5.10': - dependencies: - '@babel/parser': 7.25.3 - '@vue/compiler-core': 3.5.10 - '@vue/compiler-dom': 3.5.10 - '@vue/compiler-ssr': 3.5.10 - '@vue/shared': 3.5.10 -======= - '@vue/compiler-dom@3.5.11': - dependencies: - '@vue/compiler-core': 3.5.11 - '@vue/shared': 3.5.11 - - '@vue/compiler-sfc@3.5.11': - dependencies: - '@babel/parser': 7.25.7 - '@vue/compiler-core': 3.5.11 - '@vue/compiler-dom': 3.5.11 - '@vue/compiler-ssr': 3.5.11 - '@vue/shared': 3.5.11 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e - estree-walker: 2.0.2 - magic-string: 0.30.11 - postcss: 8.4.47 - source-map-js: 1.2.0 - -<<<<<<< HEAD '@vue/compiler-sfc@3.5.11': dependencies: '@babel/parser': 7.25.3 @@ -16348,24 +14706,15 @@ snapshots: estree-walker: 2.0.2 magic-string: 0.30.11 postcss: 8.4.47 - source-map-js: 1.2.0 + source-map-js: 1.2.1 '@vue/compiler-ssr@3.4.37': dependencies: '@vue/compiler-dom': 3.4.37 '@vue/shared': 3.4.37 - '@vue/compiler-ssr@3.5.10': - dependencies: - '@vue/compiler-dom': 3.5.10 - '@vue/shared': 3.5.10 - '@vue/compiler-ssr@3.5.11': dependencies: -======= - '@vue/compiler-ssr@3.5.11': - dependencies: ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@vue/compiler-dom': 3.5.11 '@vue/shared': 3.5.11 @@ -16382,24 +14731,15 @@ snapshots: dependencies: '@vue/devtools-kit': 7.4.6 -<<<<<<< HEAD - '@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.31.3))(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.34.1))(vue@3.5.11(typescript@5.6.2))': ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e + '@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.31.3))(vue@3.5.11(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 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.31.3)) - vue: 3.5.10(typescript@5.6.2) -======= - 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.34.1)) vue: 3.5.11(typescript@5.6.2) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - vite @@ -16420,15 +14760,9 @@ snapshots: '@vue/language-core@2.1.6(typescript@5.6.2)': dependencies: '@volar/language-core': 2.4.5 -<<<<<<< HEAD - '@vue/compiler-dom': 3.4.37 - '@vue/compiler-vue2': 2.7.16 - '@vue/shared': 3.4.37 -======= '@vue/compiler-dom': 3.5.11 '@vue/compiler-vue2': 2.7.16 '@vue/shared': 3.5.11 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e computeds: 0.0.1 minimatch: 9.0.5 muggle-string: 0.4.1 @@ -16440,15 +14774,7 @@ snapshots: dependencies: '@vue/shared': 3.5.11 -<<<<<<< HEAD - '@vue/reactivity@3.5.11': - dependencies: - '@vue/shared': 3.5.11 - - '@vue/runtime-core@3.5.10': -======= '@vue/runtime-core@3.5.11': ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@vue/reactivity': 3.5.11 '@vue/shared': 3.5.11 @@ -16466,13 +14792,8 @@ snapshots: '@vue/shared': 3.5.11 vue: 3.5.11(typescript@5.6.2) -<<<<<<< HEAD '@vue/shared@3.4.37': {} - '@vue/shared@3.5.10': {} - -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@vue/shared@3.5.11': {} '@vue/test-utils@2.4.6': @@ -16510,11 +14831,7 @@ snapshots: - '@vue/composition-api' - vue -<<<<<<< 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.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.11(typescript@5.6.2))': ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e + '@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.11(typescript@5.6.2))': dependencies: '@vueuse/core': 11.1.0(vue@3.5.11(typescript@5.6.2)) '@vueuse/shared': 11.1.0(vue@3.5.11(typescript@5.6.2)) @@ -16639,7 +14956,7 @@ snapshots: ajv@8.17.1: dependencies: fast-deep-equal: 3.1.3 - fast-uri: 3.0.2 + fast-uri: 3.0.1 json-schema-traverse: 1.0.0 require-from-string: 2.0.2 @@ -16688,13 +15005,8 @@ snapshots: ant-design-vue@4.2.5(vue@3.5.11(typescript@5.6.2)): dependencies: '@ant-design/colors': 6.0.0 -<<<<<<< HEAD - '@ant-design/icons-vue': 7.0.1(vue@3.5.10(typescript@5.6.2)) - '@babel/runtime': 7.25.0 -======= '@ant-design/icons-vue': 7.0.1(vue@3.5.11(typescript@5.6.2)) - '@babel/runtime': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e + '@babel/runtime': 7.25.0 '@ctrl/tinycolor': 4.1.0 '@emotion/hash': 0.9.2 '@emotion/unitless': 0.8.1 @@ -16813,13 +15125,8 @@ snapshots: autoprefixer@10.4.20(postcss@8.4.41): dependencies: -<<<<<<< HEAD browserslist: 4.23.3 caniuse-lite: 1.0.30001650 -======= - browserslist: 4.24.0 - caniuse-lite: 1.0.30001667 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.0.1 @@ -16856,39 +15163,27 @@ snapshots: b4a@1.6.6: {} - babel-plugin-polyfill-corejs2@0.4.11(@babel/core@7.25.7): + babel-plugin-polyfill-corejs2@0.4.11(@babel/core@7.25.2): dependencies: -<<<<<<< HEAD '@babel/compat-data': 7.25.2 '@babel/core': 7.25.2 '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.2) -======= - '@babel/compat-data': 7.25.7 - '@babel/core': 7.25.7 - '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.7) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e semver: 6.3.1 transitivePeerDependencies: - supports-color - babel-plugin-polyfill-corejs3@0.10.6(@babel/core@7.25.7): + babel-plugin-polyfill-corejs3@0.10.6(@babel/core@7.25.2): dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.2) core-js-compat: 3.38.0 -======= - '@babel/core': 7.25.7 - '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.7) - core-js-compat: 3.38.1 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - supports-color - babel-plugin-polyfill-regenerator@0.6.2(@babel/core@7.25.7): + babel-plugin-polyfill-regenerator@0.6.2(@babel/core@7.25.2): dependencies: - '@babel/core': 7.25.7 - '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.7) + '@babel/core': 7.25.2 + '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.2) transitivePeerDependencies: - supports-color @@ -16943,17 +15238,10 @@ snapshots: browserslist@4.23.3: dependencies: -<<<<<<< HEAD caniuse-lite: 1.0.30001650 electron-to-chromium: 1.5.5 node-releases: 2.0.18 update-browserslist-db: 1.1.0(browserslist@4.23.3) -======= - caniuse-lite: 1.0.30001667 - electron-to-chromium: 1.5.32 - node-releases: 2.0.18 - update-browserslist-db: 1.1.1(browserslist@4.24.0) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e buffer-crc32@1.0.0: {} @@ -17054,21 +15342,12 @@ snapshots: caniuse-api@3.0.0: dependencies: -<<<<<<< HEAD browserslist: 4.23.3 caniuse-lite: 1.0.30001650 lodash.memoize: 4.1.2 lodash.uniq: 4.5.0 caniuse-lite@1.0.30001650: {} -======= - browserslist: 4.24.0 - caniuse-lite: 1.0.30001667 - lodash.memoize: 4.1.2 - lodash.uniq: 4.5.0 - - caniuse-lite@1.0.30001667: {} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e ccount@2.0.1: {} @@ -17157,7 +15436,7 @@ snapshots: commander: 12.1.0 get-tsconfig: 4.8.1 graph-cycles: 3.0.0 - listr2: 8.2.5 + listr2: 8.2.4 minimatch: 9.0.5 node-cleanup: 2.1.2 typescript: 5.5.4 @@ -17370,6 +15649,10 @@ snapshots: dependencies: browserslist: 4.23.3 + core-js-compat@3.38.1: + dependencies: + browserslist: 4.23.3 + core-js@3.38.0: {} core-util-is@1.0.3: {} @@ -17405,13 +15688,9 @@ snapshots: crc-32: 1.2.2 readable-stream: 4.5.2 -<<<<<<< HEAD crelt@1.0.6: {} croner@8.1.1: {} -======= - croner@8.1.2: {} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e cropperjs@1.6.2: {} @@ -17433,13 +15712,7 @@ snapshots: crossws@0.2.4: {} -<<<<<<< HEAD crypto-js@4.2.0: {} -======= - crossws@0.3.1: - dependencies: - uncrypto: 0.1.3 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e crypto-random-string@2.0.0: {} @@ -17536,7 +15809,7 @@ snapshots: css-blank-pseudo@7.0.0(postcss@8.4.47): dependencies: postcss: 8.4.47 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 css-declaration-sorter@7.2.0(postcss@8.4.41): dependencies: @@ -17550,9 +15823,9 @@ snapshots: css-has-pseudo@7.0.0(postcss@8.4.47): dependencies: - '@csstools/selector-specificity': 4.0.0(postcss-selector-parser@6.1.1) + '@csstools/selector-specificity': 4.0.0(postcss-selector-parser@6.1.2) postcss: 8.4.47 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 postcss-value-parser: 4.2.0 css-prefers-color-scheme@10.0.0(postcss@8.4.47): @@ -17583,7 +15856,7 @@ snapshots: css-tree@2.2.1: dependencies: mdn-data: 2.0.28 - source-map-js: 1.2.0 + source-map-js: 1.2.1 css-tree@2.3.1: dependencies: @@ -17801,15 +16074,9 @@ snapshots: depcheck@1.4.7: dependencies: -<<<<<<< HEAD '@babel/parser': 7.25.3 '@babel/traverse': 7.25.3 '@vue/compiler-sfc': 3.4.37 -======= - '@babel/parser': 7.25.7 - '@babel/traverse': 7.25.7 - '@vue/compiler-sfc': 3.5.11 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e callsite: 1.0.0 camelcase: 6.3.0 cosmiconfig: 7.1.0 @@ -17960,26 +16227,15 @@ snapshots: dependencies: jake: 10.9.2 -<<<<<<< HEAD electron-to-chromium@1.5.5: {} -======= - electron-to-chromium@1.5.32: {} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e element-plus@2.8.4(vue@3.5.11(typescript@5.6.2)): dependencies: '@ctrl/tinycolor': 4.1.0 -<<<<<<< HEAD - '@element-plus/icons-vue': 2.3.1(vue@3.5.10(typescript@5.6.2)) + '@element-plus/icons-vue': 2.3.1(vue@3.5.11(typescript@5.6.2)) '@floating-ui/dom': 1.6.10 '@popperjs/core': '@sxzz/popperjs-es@2.11.7' '@types/lodash': 4.17.7 -======= - '@element-plus/icons-vue': 2.3.1(vue@3.5.11(typescript@5.6.2)) - '@floating-ui/dom': 1.6.11 - '@popperjs/core': '@sxzz/popperjs-es@2.11.7' - '@types/lodash': 4.17.10 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@types/lodash-es': 4.17.12 '@vueuse/core': 9.13.0(vue@3.5.11(typescript@5.6.2)) async-validator: 4.2.5 @@ -18083,7 +16339,7 @@ snapshots: object-inspect: 1.13.2 object-keys: 1.1.1 object.assign: 4.1.5 - regexp.prototype.flags: 1.5.3 + regexp.prototype.flags: 1.5.2 safe-array-concat: 1.1.2 safe-regex-test: 1.0.3 string.prototype.trim: 1.2.9 @@ -18247,7 +16503,6 @@ snapshots: optionalDependencies: source-map: 0.6.1 -<<<<<<< HEAD eslint-compat-utils@0.5.1(eslint@9.12.0(jiti@1.21.6)): dependencies: eslint: 9.12.0(jiti@1.21.6) @@ -18262,17 +16517,6 @@ snapshots: dependencies: eslint: 9.12.0(jiti@1.21.6) eslint-plugin-turbo: 2.1.3(eslint@9.12.0(jiti@1.21.6)) -======= - eslint-compat-utils@0.5.1(eslint@9.12.0(jiti@2.2.1)): - dependencies: - eslint: 9.12.0(jiti@2.2.1) - semver: 7.6.3 - - eslint-config-turbo@2.1.3(eslint@9.12.0(jiti@2.2.1)): - dependencies: - eslint: 9.12.0(jiti@2.2.1) - eslint-plugin-turbo: 2.1.3(eslint@9.12.0(jiti@2.2.1)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e eslint-import-resolver-node@0.3.9: dependencies: @@ -18282,7 +16526,6 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD eslint-plugin-command@0.2.6(eslint@9.12.0(jiti@1.21.6)): dependencies: '@es-joy/jsdoccomment': 0.48.0 @@ -18307,32 +16550,6 @@ snapshots: debug: 4.3.6 doctrine: 3.0.0 eslint: 9.12.0(jiti@1.21.6) -======= - eslint-plugin-command@0.2.6(eslint@9.12.0(jiti@2.2.1)): - dependencies: - '@es-joy/jsdoccomment': 0.48.0 - eslint: 9.12.0(jiti@2.2.1) - - eslint-plugin-es-x@7.8.0(eslint@9.12.0(jiti@2.2.1)): - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@2.2.1)) - '@eslint-community/regexpp': 4.11.1 - eslint: 9.12.0(jiti@2.2.1) - eslint-compat-utils: 0.5.1(eslint@9.12.0(jiti@2.2.1)) - - eslint-plugin-eslint-comments@3.2.0(eslint@9.12.0(jiti@2.2.1)): - dependencies: - escape-string-regexp: 1.0.5 - eslint: 9.12.0(jiti@2.2.1) - ignore: 5.3.2 - - eslint-plugin-import-x@4.3.1(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2): - dependencies: - '@typescript-eslint/utils': 8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2) - debug: 4.3.7 - doctrine: 3.0.0 - eslint: 9.12.0(jiti@2.2.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e eslint-import-resolver-node: 0.3.9 get-tsconfig: 4.7.6 is-glob: 4.0.3 @@ -18344,24 +16561,15 @@ snapshots: - supports-color - typescript -<<<<<<< HEAD eslint-plugin-jsdoc@50.3.1(eslint@9.12.0(jiti@1.21.6)): -======= - eslint-plugin-jsdoc@50.3.1(eslint@9.12.0(jiti@2.2.1)): ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@es-joy/jsdoccomment': 0.48.0 are-docs-informative: 0.0.2 comment-parser: 1.4.1 debug: 4.3.6 escape-string-regexp: 4.0.0 -<<<<<<< HEAD eslint: 9.12.0(jiti@1.21.6) espree: 10.1.0 -======= - eslint: 9.12.0(jiti@2.2.1) - espree: 10.2.0 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e esquery: 1.6.0 parse-imports: 2.1.1 semver: 7.6.3 @@ -18370,26 +16578,17 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD eslint-plugin-jsonc@2.16.0(eslint@9.12.0(jiti@1.21.6)): dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@1.21.6)) eslint: 9.12.0(jiti@1.21.6) eslint-compat-utils: 0.5.1(eslint@9.12.0(jiti@1.21.6)) -======= - eslint-plugin-jsonc@2.16.0(eslint@9.12.0(jiti@2.2.1)): - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@2.2.1)) - eslint: 9.12.0(jiti@2.2.1) - eslint-compat-utils: 0.5.1(eslint@9.12.0(jiti@2.2.1)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e espree: 9.6.1 graphemer: 1.4.0 jsonc-eslint-parser: 2.4.0 natural-compare: 1.4.0 synckit: 0.6.2 -<<<<<<< HEAD eslint-plugin-n@17.10.3(eslint@9.12.0(jiti@1.21.6)): dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@1.21.6)) @@ -18397,15 +16596,6 @@ snapshots: eslint: 9.12.0(jiti@1.21.6) eslint-plugin-es-x: 7.8.0(eslint@9.12.0(jiti@1.21.6)) get-tsconfig: 4.7.6 -======= - eslint-plugin-n@17.10.3(eslint@9.12.0(jiti@2.2.1)): - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@2.2.1)) - enhanced-resolve: 5.17.1 - eslint: 9.12.0(jiti@2.2.1) - eslint-plugin-es-x: 7.8.0(eslint@9.12.0(jiti@2.2.1)) - get-tsconfig: 4.8.1 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e globals: 15.10.0 ignore: 5.3.1 minimatch: 9.0.5 @@ -18413,7 +16603,6 @@ snapshots: eslint-plugin-no-only-tests@3.3.0: {} -<<<<<<< HEAD eslint-plugin-perfectionist@3.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2)(vue-eslint-parser@9.4.3(eslint@9.12.0(jiti@1.21.6))): dependencies: '@typescript-eslint/types': 8.8.0 @@ -18423,30 +16612,13 @@ snapshots: natural-compare-lite: 1.4.0 optionalDependencies: vue-eslint-parser: 9.4.3(eslint@9.12.0(jiti@1.21.6)) -======= - eslint-plugin-perfectionist@3.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2)(vue-eslint-parser@9.4.3(eslint@9.12.0(jiti@2.2.1))): - dependencies: - '@typescript-eslint/types': 8.8.0 - '@typescript-eslint/utils': 8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2) - eslint: 9.12.0(jiti@2.2.1) - minimatch: 9.0.5 - natural-compare-lite: 1.4.0 - optionalDependencies: - vue-eslint-parser: 9.4.3(eslint@9.12.0(jiti@2.2.1)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - supports-color - typescript -<<<<<<< HEAD eslint-plugin-prettier@5.2.1(@types/eslint@9.6.1)(eslint-config-prettier@9.1.0(eslint@9.12.0(jiti@1.21.6)))(eslint@9.12.0(jiti@1.21.6))(prettier@3.3.3): dependencies: eslint: 9.12.0(jiti@1.21.6) -======= - eslint-plugin-prettier@5.2.1(@types/eslint@9.6.1)(eslint@9.12.0(jiti@2.2.1))(prettier@3.3.3): - dependencies: - eslint: 9.12.0(jiti@2.2.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e prettier: 3.3.3 prettier-linter-helpers: 1.0.0 synckit: 0.9.1 @@ -18454,55 +16626,30 @@ snapshots: '@types/eslint': 9.6.1 eslint-config-prettier: 9.1.0(eslint@9.12.0(jiti@1.21.6)) -<<<<<<< HEAD eslint-plugin-regexp@2.6.0(eslint@9.12.0(jiti@1.21.6)): dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@1.21.6)) '@eslint-community/regexpp': 4.11.0 comment-parser: 1.4.1 eslint: 9.12.0(jiti@1.21.6) -======= - eslint-plugin-regexp@2.6.0(eslint@9.12.0(jiti@2.2.1)): - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@2.2.1)) - '@eslint-community/regexpp': 4.11.1 - comment-parser: 1.4.1 - eslint: 9.12.0(jiti@2.2.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e jsdoc-type-pratt-parser: 4.1.0 refa: 0.12.1 regexp-ast-analysis: 0.7.1 scslre: 0.3.0 -<<<<<<< HEAD eslint-plugin-turbo@2.1.3(eslint@9.12.0(jiti@1.21.6)): dependencies: dotenv: 16.0.3 eslint: 9.12.0(jiti@1.21.6) - eslint-plugin-unicorn@55.0.0(eslint@9.12.0(jiti@1.21.6)): + eslint-plugin-unicorn@56.0.0(eslint@9.12.0(jiti@1.21.6)): dependencies: '@babel/helper-validator-identifier': 7.24.7 '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@1.21.6)) ci-info: 4.0.0 clean-regexp: 1.0.0 - core-js-compat: 3.38.0 - eslint: 9.12.0(jiti@1.21.6) -======= - eslint-plugin-turbo@2.1.3(eslint@9.12.0(jiti@2.2.1)): - dependencies: - dotenv: 16.0.3 - eslint: 9.12.0(jiti@2.2.1) - - eslint-plugin-unicorn@56.0.0(eslint@9.12.0(jiti@2.2.1)): - dependencies: - '@babel/helper-validator-identifier': 7.25.7 - '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@2.2.1)) - ci-info: 4.0.0 - clean-regexp: 1.0.0 core-js-compat: 3.38.1 - eslint: 9.12.0(jiti@2.2.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e + eslint: 9.12.0(jiti@1.21.6) esquery: 1.6.0 globals: 15.10.0 indent-string: 4.0.0 @@ -18515,7 +16662,6 @@ snapshots: semver: 7.6.3 strip-indent: 3.0.0 -<<<<<<< HEAD eslint-plugin-unused-imports@4.1.4(@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.12.0(jiti@1.21.6)): dependencies: eslint: 9.12.0(jiti@1.21.6) @@ -18529,46 +16675,20 @@ snapshots: optionalDependencies: '@typescript-eslint/eslint-plugin': 8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.12.0(jiti@1.21.6))(typescript@5.6.2) vitest: 2.1.2(@types/node@22.7.4)(happy-dom@15.7.4)(jsdom@24.1.1)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) -======= - eslint-plugin-unused-imports@4.1.4(@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2))(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2))(eslint@9.12.0(jiti@2.2.1)): - dependencies: - eslint: 9.12.0(jiti@2.2.1) - optionalDependencies: - '@typescript-eslint/eslint-plugin': 8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2))(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2) - - eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2))(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2))(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2)(vitest@2.1.2(@types/node@22.7.4)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1)): - dependencies: - '@typescript-eslint/utils': 7.18.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2) - eslint: 9.12.0(jiti@2.2.1) - optionalDependencies: - '@typescript-eslint/eslint-plugin': 8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2))(eslint@9.12.0(jiti@2.2.1))(typescript@5.6.2) - vitest: 2.1.2(@types/node@22.7.4)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - supports-color - typescript -<<<<<<< HEAD eslint-plugin-vue@9.28.0(eslint@9.12.0(jiti@1.21.6)): dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@1.21.6)) eslint: 9.12.0(jiti@1.21.6) -======= - eslint-plugin-vue@9.28.0(eslint@9.12.0(jiti@2.2.1)): - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@2.2.1)) - eslint: 9.12.0(jiti@2.2.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e globals: 13.24.0 natural-compare: 1.4.0 nth-check: 2.1.1 postcss-selector-parser: 6.1.1 semver: 7.6.3 -<<<<<<< HEAD vue-eslint-parser: 9.4.3(eslint@9.12.0(jiti@1.21.6)) -======= - vue-eslint-parser: 9.4.3(eslint@9.12.0(jiti@2.2.1)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e xml-name-validator: 4.0.0 transitivePeerDependencies: - supports-color @@ -18587,19 +16707,10 @@ snapshots: eslint-visitor-keys@4.1.0: {} -<<<<<<< HEAD - eslint-visitor-keys@4.1.0: {} - eslint@9.12.0(jiti@1.21.6): dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@1.21.6)) '@eslint-community/regexpp': 4.11.0 -======= - eslint@9.12.0(jiti@2.2.1): - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@2.2.1)) - '@eslint-community/regexpp': 4.11.1 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@eslint/config-array': 0.18.0 '@eslint/core': 0.6.0 '@eslint/eslintrc': 3.1.0 @@ -18624,7 +16735,7 @@ snapshots: file-entry-cache: 8.0.0 find-up: 5.0.0 glob-parent: 6.0.2 - ignore: 5.3.1 + ignore: 5.3.2 imurmurhash: 0.1.4 is-glob: 4.0.3 json-stable-stringify-without-jsonify: 1.0.1 @@ -18634,15 +16745,11 @@ snapshots: optionator: 0.9.4 text-table: 0.2.0 optionalDependencies: -<<<<<<< HEAD jiti: 1.21.6 -======= - jiti: 2.2.1 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - supports-color - espree@10.2.0: + espree@10.1.0: dependencies: acorn: 8.12.1 acorn-jsx: 5.3.2(acorn@8.12.1) @@ -18678,7 +16785,7 @@ snapshots: estree-walker@3.0.3: dependencies: - '@types/estree': 1.0.5 + '@types/estree': 1.0.6 esutils@2.0.3: {} @@ -18757,7 +16864,7 @@ snapshots: fast-string-compare@3.0.0: {} - fast-uri@3.0.2: {} + fast-uri@3.0.1: {} fastest-levenshtein@1.0.16: {} @@ -18765,11 +16872,7 @@ snapshots: dependencies: reusify: 1.0.4 -<<<<<<< HEAD fdir@6.2.0(picomatch@4.0.2): -======= - fdir@6.4.0(picomatch@4.0.2): ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e optionalDependencies: picomatch: 4.0.2 @@ -19005,7 +17108,7 @@ snapshots: jackspeak: 3.4.3 minimatch: 9.0.5 minipass: 7.1.2 - package-json-from-dist: 1.0.1 + package-json-from-dist: 1.0.0 path-scurry: 1.11.1 glob@11.0.0: @@ -19014,7 +17117,7 @@ snapshots: jackspeak: 4.0.1 minimatch: 10.0.1 minipass: 7.1.2 - package-json-from-dist: 1.0.1 + package-json-from-dist: 1.0.0 path-scurry: 2.0.0 glob@7.2.3: @@ -19090,7 +17193,7 @@ snapshots: dependencies: dir-glob: 3.0.1 fast-glob: 3.3.2 - ignore: 5.3.1 + ignore: 5.3.2 merge2: 1.4.1 slash: 4.0.0 @@ -19135,15 +17238,17 @@ snapshots: h3@1.13.0: dependencies: cookie-es: 1.2.2 - crossws: 0.3.1 + crossws: 0.2.4 defu: 6.1.4 destr: 2.0.3 iron-webcrypto: 1.2.1 - ohash: 1.1.3 + ohash: 1.1.4 radix3: 1.1.2 ufo: 1.5.4 uncrypto: 0.1.3 unenv: 1.10.0 + transitivePeerDependencies: + - uWebSockets.js happy-dom@15.7.4: dependencies: @@ -19222,11 +17327,7 @@ snapshots: he: 1.2.0 param-case: 3.0.4 relateurl: 0.2.7 -<<<<<<< HEAD terser: 5.31.3 -======= - terser: 5.34.1 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e html-minifier-terser@7.2.0: dependencies: @@ -19236,11 +17337,7 @@ snapshots: entities: 4.5.0 param-case: 3.0.4 relateurl: 0.2.7 -<<<<<<< HEAD terser: 5.31.3 -======= - terser: 5.34.1 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e html-tags@3.3.1: {} @@ -19503,7 +17600,7 @@ snapshots: is-reference@1.2.1: dependencies: - '@types/estree': 1.0.5 + '@types/estree': 1.0.6 is-regex@1.1.4: dependencies: @@ -19595,11 +17692,6 @@ snapshots: jiti@1.21.6: {} -<<<<<<< HEAD -======= - jiti@2.2.1: {} - ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e jju@1.4.0: {} js-beautify@1.15.1: @@ -19662,6 +17754,8 @@ snapshots: jsesc@0.5.0: {} + jsesc@2.5.2: {} + jsesc@3.0.2: {} json-buffer@3.0.1: {} @@ -19781,7 +17875,7 @@ snapshots: debug: 4.3.6 execa: 8.0.1 lilconfig: 3.1.2 - listr2: 8.2.5 + listr2: 8.2.4 micromatch: 4.0.8 pidtree: 0.6.0 string-argv: 0.3.2 @@ -19789,11 +17883,7 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD listhen@1.7.2: -======= - listhen@1.9.0: ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@parcel/watcher': 2.4.1 '@parcel/watcher-wasm': 2.4.1 @@ -19805,11 +17895,7 @@ snapshots: get-port-please: 3.1.2 h3: 1.13.0 http-shutdown: 1.2.2 -<<<<<<< HEAD jiti: 1.21.6 -======= - jiti: 2.2.1 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e mlly: 1.7.1 node-forge: 1.3.1 pathe: 1.1.2 @@ -19820,7 +17906,7 @@ snapshots: transitivePeerDependencies: - uWebSockets.js - listr2@8.2.5: + listr2@8.2.4: dependencies: cli-truncate: 4.0.0 colorette: 2.0.20 @@ -20195,11 +18281,7 @@ snapshots: '@css-render/plugin-bem': 0.15.14(css-render@0.15.14) '@css-render/vue3-ssr': 0.15.14(vue@3.5.11(typescript@5.6.2)) '@types/katex': 0.16.7 -<<<<<<< HEAD '@types/lodash': 4.17.7 -======= - '@types/lodash': 4.17.10 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@types/lodash-es': 4.17.12 async-validator: 4.2.5 css-render: 0.15.14 @@ -20212,17 +18294,10 @@ snapshots: lodash-es: 4.17.21 seemly: 0.3.8 treemate: 0.3.11 -<<<<<<< HEAD - vdirs: 0.1.8(vue@3.5.10(typescript@5.6.2)) - vooks: 0.2.12(vue@3.5.10(typescript@5.6.2)) - vue: 3.5.10(typescript@5.6.2) - vueuc: 0.4.64(vue@3.5.10(typescript@5.6.2)) -======= vdirs: 0.1.8(vue@3.5.11(typescript@5.6.2)) vooks: 0.2.12(vue@3.5.11(typescript@5.6.2)) vue: 3.5.11(typescript@5.6.2) vueuc: 0.4.64(vue@3.5.11(typescript@5.6.2)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e nanoid@3.3.7: {} @@ -20243,7 +18318,6 @@ snapshots: nitropack@2.9.7(encoding@0.1.13): dependencies: '@cloudflare/kv-asset-handler': 0.3.4 -<<<<<<< HEAD '@netlify/functions': 2.8.1 '@rollup/plugin-alias': 5.1.0(rollup@4.20.0) '@rollup/plugin-commonjs': 25.0.8(rollup@4.20.0) @@ -20253,17 +18327,6 @@ snapshots: '@rollup/plugin-replace': 5.0.7(rollup@4.20.0) '@rollup/plugin-terser': 0.4.4(rollup@4.20.0) '@rollup/pluginutils': 5.1.0(rollup@4.20.0) -======= - '@netlify/functions': 2.8.2 - '@rollup/plugin-alias': 5.1.1(rollup@4.24.0) - '@rollup/plugin-commonjs': 25.0.8(rollup@4.24.0) - '@rollup/plugin-inject': 5.0.5(rollup@4.24.0) - '@rollup/plugin-json': 6.1.0(rollup@4.24.0) - '@rollup/plugin-node-resolve': 15.3.0(rollup@4.24.0) - '@rollup/plugin-replace': 5.0.7(rollup@4.24.0) - '@rollup/plugin-terser': 0.4.4(rollup@4.24.0) - '@rollup/pluginutils': 5.1.2(rollup@4.24.0) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@types/http-proxy': 1.17.15 '@vercel/nft': 0.26.5(encoding@0.1.13) archiver: 7.0.1 @@ -20273,7 +18336,7 @@ snapshots: citty: 0.1.6 consola: 3.2.3 cookie-es: 1.2.2 - croner: 8.1.2 + croner: 8.1.1 crossws: 0.2.4 db0: 0.1.4 defu: 6.1.4 @@ -20292,11 +18355,7 @@ snapshots: jiti: 1.21.6 klona: 2.0.6 knitwork: 1.1.0 -<<<<<<< HEAD listhen: 1.7.2 -======= - listhen: 1.9.0 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e magic-string: 0.30.11 mime: 4.0.4 mlly: 1.7.1 @@ -20310,13 +18369,8 @@ snapshots: pkg-types: 1.1.3 pretty-bytes: 6.1.1 radix3: 1.1.2 -<<<<<<< HEAD rollup: 4.20.0 rollup-plugin-visualizer: 5.12.0(rollup@4.20.0) -======= - rollup: 4.24.0 - rollup-plugin-visualizer: 5.12.0(rollup@4.24.0) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e scule: 1.3.0 semver: 7.6.3 serve-placeholder: 2.0.2 @@ -20326,13 +18380,8 @@ snapshots: uncrypto: 0.1.3 unctx: 2.3.1 unenv: 1.10.0 -<<<<<<< HEAD unimport: 3.10.0(rollup@4.20.0) unstorage: 1.10.2(ioredis@5.4.1) -======= - unimport: 3.13.1(rollup@4.24.0) - unstorage: 1.12.0(ioredis@5.4.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e unwasm: 0.3.9 transitivePeerDependencies: - '@azure/app-configuration' @@ -20448,7 +18497,7 @@ snapshots: consola: 3.2.3 execa: 8.0.1 pathe: 1.1.2 - pkg-types: 1.1.3 + pkg-types: 1.2.0 ufo: 1.5.4 object-assign@4.1.1: {} @@ -20474,6 +18523,8 @@ snapshots: ohash@1.1.3: {} + ohash@1.1.4: {} + on-finished@2.4.1: dependencies: ee-first: 1.1.1 @@ -20577,7 +18628,7 @@ snapshots: p-try@2.2.0: {} - package-json-from-dist@1.0.1: {} + package-json-from-dist@1.0.0: {} package-json@10.0.1: dependencies: @@ -20608,7 +18659,7 @@ snapshots: parse-json@5.2.0: dependencies: - '@babel/code-frame': 7.25.7 + '@babel/code-frame': 7.24.7 error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 @@ -20689,15 +18740,9 @@ snapshots: pify@4.0.1: {} -<<<<<<< HEAD - pinia-plugin-persistedstate@4.1.1(pinia@2.2.2(typescript@5.6.2)(vue@3.5.10(typescript@5.6.2)))(rollup@4.24.0)(webpack-sources@3.2.3): + pinia-plugin-persistedstate@4.1.1(pinia@2.2.2(typescript@5.6.2)(vue@3.5.11(typescript@5.6.2)))(rollup@4.24.0)(webpack-sources@3.2.3): dependencies: '@nuxt/kit': 3.13.2(rollup@4.24.0)(webpack-sources@3.2.3) -======= - pinia-plugin-persistedstate@4.1.1(pinia@2.2.2(typescript@5.6.2)(vue@3.5.11(typescript@5.6.2)))(rollup@4.24.0): - dependencies: - '@nuxt/kit': 3.13.2(rollup@4.24.0) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e deep-pick-omit: 1.2.1 defu: 6.1.4 destr: 2.0.3 @@ -20711,15 +18756,9 @@ snapshots: pinia@2.2.2(typescript@5.6.2)(vue@3.5.11(typescript@5.6.2)): dependencies: -<<<<<<< HEAD '@vue/devtools-api': 6.6.3 - vue: 3.5.10(typescript@5.6.2) - vue-demi: 0.14.10(vue@3.5.10(typescript@5.6.2)) -======= - '@vue/devtools-api': 6.6.4 vue: 3.5.11(typescript@5.6.2) vue-demi: 0.14.10(vue@3.5.11(typescript@5.6.2)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e optionalDependencies: typescript: 5.6.2 @@ -20762,12 +18801,12 @@ snapshots: postcss-attribute-case-insensitive@7.0.0(postcss@8.4.47): dependencies: postcss: 8.4.47 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 postcss-calc@10.0.1(postcss@8.4.41): dependencies: postcss: 8.4.41 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 postcss-value-parser: 4.2.0 postcss-calc@10.0.2(postcss@8.4.47): @@ -20853,17 +18892,17 @@ snapshots: '@csstools/css-parser-algorithms': 3.0.1(@csstools/css-tokenizer@3.0.1) '@csstools/css-tokenizer': 3.0.1 postcss: 8.4.47 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 postcss-dir-pseudo-class@9.0.0(postcss@8.4.47): dependencies: postcss: 8.4.47 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 postcss-discard-comments@7.0.2(postcss@8.4.41): dependencies: postcss: 8.4.41 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 postcss-discard-comments@7.0.3(postcss@8.4.47): dependencies: @@ -20904,12 +18943,12 @@ snapshots: postcss-focus-visible@10.0.0(postcss@8.4.47): dependencies: postcss: 8.4.47 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 postcss-focus-within@9.0.0(postcss@8.4.47): dependencies: postcss: 8.4.47 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 postcss-font-variant@5.0.0(postcss@8.4.47): dependencies: @@ -20992,7 +19031,7 @@ snapshots: caniuse-api: 3.0.0 cssnano-utils: 5.0.0(postcss@8.4.41) postcss: 8.4.41 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 postcss-merge-rules@7.0.4(postcss@8.4.47): dependencies: @@ -21044,7 +19083,7 @@ snapshots: dependencies: cssesc: 3.0.0 postcss: 8.4.41 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 postcss-minify-selectors@7.0.4(postcss@8.4.47): dependencies: @@ -21055,24 +19094,24 @@ snapshots: postcss-nested@5.0.6(postcss@8.4.47): dependencies: postcss: 8.4.47 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 postcss-nested@6.2.0(postcss@8.4.41): dependencies: postcss: 8.4.41 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 postcss-nested@6.2.0(postcss@8.4.47): dependencies: postcss: 8.4.47 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 postcss-nesting@13.0.0(postcss@8.4.47): dependencies: - '@csstools/selector-resolve-nested': 2.0.0(postcss-selector-parser@6.1.1) - '@csstools/selector-specificity': 4.0.0(postcss-selector-parser@6.1.1) + '@csstools/selector-resolve-nested': 2.0.0(postcss-selector-parser@6.1.2) + '@csstools/selector-specificity': 4.0.0(postcss-selector-parser@6.1.2) postcss: 8.4.47 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 postcss-normalize-charset@7.0.0(postcss@8.4.41): dependencies: @@ -21262,7 +19301,7 @@ snapshots: postcss-pseudo-class-any-link@10.0.0(postcss@8.4.47): dependencies: postcss: 8.4.47 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 postcss-reduce-initial@7.0.2(postcss@8.4.41): dependencies: @@ -21296,7 +19335,7 @@ snapshots: dependencies: postcss: 8.4.47 - postcss-safe-parser@7.0.1(postcss@8.4.47): + postcss-safe-parser@7.0.0(postcss@8.4.47): dependencies: postcss: 8.4.47 @@ -21307,7 +19346,7 @@ snapshots: postcss-selector-not@8.0.0(postcss@8.4.47): dependencies: postcss: 8.4.47 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 postcss-selector-parser@6.0.10: dependencies: @@ -21343,7 +19382,7 @@ snapshots: postcss-unique-selectors@7.0.2(postcss@8.4.41): dependencies: postcss: 8.4.41 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 postcss-unique-selectors@7.0.3(postcss@8.4.47): dependencies: @@ -21355,8 +19394,8 @@ snapshots: postcss@8.4.41: dependencies: nanoid: 3.3.7 - picocolors: 1.0.1 - source-map-js: 1.2.0 + picocolors: 1.1.0 + source-map-js: 1.2.1 postcss@8.4.47: dependencies: @@ -21364,11 +19403,7 @@ snapshots: picocolors: 1.1.0 source-map-js: 1.2.1 -<<<<<<< HEAD preact@10.23.1: {} -======= - preact@10.24.2: {} ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e prelude-ls@1.2.1: {} @@ -21444,23 +19479,13 @@ snapshots: radix-vue@1.9.6(vue@3.5.11(typescript@5.6.2)): dependencies: -<<<<<<< HEAD '@floating-ui/dom': 1.6.10 - '@floating-ui/vue': 1.1.4(vue@3.5.10(typescript@5.6.2)) + '@floating-ui/vue': 1.1.4(vue@3.5.11(typescript@5.6.2)) '@internationalized/date': 3.5.5 '@internationalized/number': 3.5.3 - '@tanstack/vue-virtual': 3.8.5(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)) -======= - '@floating-ui/dom': 1.6.11 - '@floating-ui/vue': 1.1.5(vue@3.5.11(typescript@5.6.2)) - '@internationalized/date': 3.5.6 - '@internationalized/number': 3.5.4 - '@tanstack/vue-virtual': 3.10.8(vue@3.5.11(typescript@5.6.2)) + '@tanstack/vue-virtual': 3.8.5(vue@3.5.11(typescript@5.6.2)) '@vueuse/core': 10.11.1(vue@3.5.11(typescript@5.6.2)) '@vueuse/shared': 10.11.1(vue@3.5.11(typescript@5.6.2)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e aria-hidden: 1.2.4 defu: 6.1.4 fast-deep-equal: 3.1.3 @@ -21578,7 +19603,7 @@ snapshots: regexp-tree@0.1.27: {} - regexp.prototype.flags@1.5.3: + regexp.prototype.flags@1.5.2: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 @@ -21666,7 +19691,7 @@ snapshots: rimraf@6.0.1: dependencies: glob: 11.0.0 - package-json-from-dist: 1.0.1 + package-json-from-dist: 1.0.0 rollup-plugin-dts@6.1.1(rollup@3.29.4)(typescript@5.6.2): dependencies: @@ -21674,7 +19699,6 @@ snapshots: rollup: 3.29.4 typescript: 5.6.2 optionalDependencies: -<<<<<<< HEAD '@babel/code-frame': 7.24.7 rollup-plugin-visualizer@5.12.0(rollup@4.20.0): @@ -21685,9 +19709,6 @@ snapshots: yargs: 17.7.2 optionalDependencies: rollup: 4.20.0 -======= - '@babel/code-frame': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e rollup-plugin-visualizer@5.12.0(rollup@4.24.0): dependencies: @@ -21706,7 +19727,6 @@ snapshots: optionalDependencies: fsevents: 2.3.3 -<<<<<<< HEAD rollup@4.20.0: dependencies: '@types/estree': 1.0.5 @@ -21729,8 +19749,6 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.20.0 fsevents: 2.3.3 -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e rollup@4.24.0: dependencies: '@types/estree': 1.0.6 @@ -22092,7 +20110,7 @@ snapshots: gopd: 1.0.1 has-symbols: 1.0.3 internal-slot: 1.0.7 - regexp.prototype.flags: 1.5.3 + regexp.prototype.flags: 1.5.2 set-function-name: 2.0.2 side-channel: 1.0.6 @@ -22174,7 +20192,7 @@ snapshots: dependencies: browserslist: 4.23.3 postcss: 8.4.41 - postcss-selector-parser: 6.1.1 + postcss-selector-parser: 6.1.2 stylehacks@7.0.4(postcss@8.4.47): dependencies: @@ -22272,7 +20290,7 @@ snapshots: picocolors: 1.0.1 postcss: 8.4.47 postcss-resolve-nested-selector: 0.1.6 - postcss-safe-parser: 7.0.1(postcss@8.4.47) + postcss-safe-parser: 7.0.0(postcss@8.4.47) postcss-selector-parser: 6.1.2 postcss-value-parser: 4.2.0 resolve-from: 5.0.0 @@ -22337,7 +20355,7 @@ snapshots: css-tree: 2.3.1 css-what: 6.1.0 csso: 5.0.5 - picocolors: 1.0.1 + picocolors: 1.1.0 symbol-tree@3.2.4: optional: true @@ -22424,11 +20442,7 @@ snapshots: term-size@2.2.1: {} -<<<<<<< HEAD terser@5.31.3: -======= - terser@5.34.1: ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@jridgewell/source-map': 0.3.6 acorn: 8.12.1 @@ -22461,15 +20475,9 @@ snapshots: tinyexec@0.3.0: {} -<<<<<<< HEAD tinyglobby@0.2.2: dependencies: fdir: 6.2.0(picomatch@4.0.2) -======= - tinyglobby@0.2.9: - dependencies: - fdir: 6.4.0(picomatch@4.0.2) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e picomatch: 4.0.2 tinymce@7.3.0: {} @@ -22642,7 +20650,7 @@ snapshots: rollup: 3.29.4 rollup-plugin-dts: 6.1.1(rollup@3.29.4)(typescript@5.6.2) scule: 1.3.0 - untyped: 1.5.0 + untyped: 1.4.2 optionalDependencies: typescript: 5.6.2 transitivePeerDependencies: @@ -22692,7 +20700,6 @@ snapshots: unicorn-magic@0.3.0: {} -<<<<<<< HEAD unimport@3.10.0(rollup@4.20.0): dependencies: '@rollup/pluginutils': 5.1.0(rollup@4.20.0) @@ -22712,9 +20719,6 @@ snapshots: - rollup unimport@3.13.1(rollup@4.24.0)(webpack-sources@3.2.3): -======= - unimport@3.13.1(rollup@4.24.0): ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@rollup/pluginutils': 5.1.2(rollup@4.24.0) acorn: 8.12.1 @@ -22784,7 +20788,7 @@ snapshots: transitivePeerDependencies: - rollup - unplugin-vue-components@0.27.3(@babel/parser@7.25.3)(@nuxt/kit@3.13.2(rollup@4.24.0)(webpack-sources@3.2.3))(rollup@4.24.0)(vue@3.5.10(typescript@5.6.2)): + unplugin-vue-components@0.27.3(@babel/parser@7.25.3)(@nuxt/kit@3.13.2(rollup@4.24.0)(webpack-sources@3.2.3))(rollup@4.24.0)(vue@3.5.11(typescript@5.6.2)): dependencies: '@antfu/utils': 0.7.10 '@rollup/pluginutils': 5.1.0(rollup@4.24.0) @@ -22796,7 +20800,7 @@ snapshots: minimatch: 9.0.5 mlly: 1.7.1 unplugin: 1.12.0 - vue: 3.5.10(typescript@5.6.2) + vue: 3.5.11(typescript@5.6.2) optionalDependencies: '@babel/parser': 7.25.3 '@nuxt/kit': 3.13.2(rollup@4.24.0)(webpack-sources@3.2.3) @@ -22823,13 +20827,8 @@ snapshots: anymatch: 3.1.3 chokidar: 3.6.0 destr: 2.0.3 -<<<<<<< HEAD - h3: 1.12.0 - listhen: 1.7.2 -======= h3: 1.13.0 - listhen: 1.9.0 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e + listhen: 1.7.2 lru-cache: 10.4.3 mri: 1.2.0 node-fetch-native: 1.6.4 @@ -22846,19 +20845,13 @@ snapshots: consola: 3.2.3 pathe: 1.1.2 - untyped@1.5.0: + untyped@1.4.2: dependencies: -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/standalone': 7.25.3 '@babel/types': 7.25.2 -======= - '@babel/core': 7.25.7 - '@babel/standalone': 7.25.7 - '@babel/types': 7.25.7 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e defu: 6.1.4 - jiti: 2.2.1 + jiti: 1.21.6 mri: 1.2.0 scule: 1.3.0 transitivePeerDependencies: @@ -22875,11 +20868,7 @@ snapshots: upath@1.2.0: {} -<<<<<<< HEAD update-browserslist-db@1.1.0(browserslist@4.23.3): -======= - update-browserslist-db@1.1.1(browserslist@4.24.0): ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: browserslist: 4.23.3 escalade: 3.1.2 @@ -22926,15 +20915,9 @@ snapshots: vee-validate@4.13.2(vue@3.5.11(typescript@5.6.2)): dependencies: -<<<<<<< HEAD '@vue/devtools-api': 6.6.3 type-fest: 4.23.0 - vue: 3.5.10(typescript@5.6.2) -======= - '@vue/devtools-api': 6.6.4 - type-fest: 4.26.1 vue: 3.5.11(typescript@5.6.2) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e vfile-message@4.0.2: dependencies: @@ -22946,28 +20929,16 @@ snapshots: '@types/unist': 3.0.2 vfile-message: 4.0.2 -<<<<<<< HEAD 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.31.3)): dependencies: vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) vite-node@2.1.2(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3): -======= - 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.34.1)): - dependencies: - vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) - - vite-node@2.1.2(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1): ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: cac: 6.7.14 debug: 4.3.6 pathe: 1.1.2 -<<<<<<< HEAD vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) -======= - vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - '@types/node' - less @@ -22979,28 +20950,16 @@ snapshots: - supports-color - terser -<<<<<<< HEAD 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.31.3)): -======= - 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.34.1)): ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: chalk: 4.1.2 debug: 4.3.6 fs-extra: 10.1.0 -<<<<<<< HEAD vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) transitivePeerDependencies: - supports-color vite-plugin-dts@4.2.1(@types/node@22.7.4)(rollup@4.24.0)(typescript@5.6.2)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3)): -======= - vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) - transitivePeerDependencies: - - supports-color - - vite-plugin-dts@4.2.1(@types/node@22.7.4)(rollup@4.24.0)(typescript@5.6.2)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1)): ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@microsoft/api-extractor': 7.47.7(@types/node@22.7.4) '@rollup/pluginutils': 5.1.0(rollup@4.24.0) @@ -23013,21 +20972,13 @@ snapshots: magic-string: 0.30.11 typescript: 5.6.2 optionalDependencies: -<<<<<<< HEAD vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) -======= - vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - '@types/node' - rollup - supports-color -<<<<<<< HEAD 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.31.3)): -======= - 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.34.1)): ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@rollup/pluginutils': 4.2.1 colorette: 2.0.20 @@ -23041,15 +20992,9 @@ snapshots: html-minifier-terser: 6.1.0 node-html-parser: 5.4.2 pathe: 0.2.0 -<<<<<<< HEAD vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) vite-plugin-inspect@0.8.7(rollup@4.24.0)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3)): -======= - vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) - - vite-plugin-inspect@0.8.7(rollup@4.24.0)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1)): ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@antfu/utils': 0.7.10 '@rollup/pluginutils': 5.1.0(rollup@4.24.0) @@ -23060,11 +21005,7 @@ snapshots: perfect-debounce: 1.0.0 picocolors: 1.0.1 sirv: 2.0.4 -<<<<<<< HEAD vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) -======= - vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - rollup - supports-color @@ -23076,7 +21017,6 @@ snapshots: rollup: 4.24.0 xe-utils: 3.5.30 -<<<<<<< HEAD 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.31.3)): dependencies: '@ast-grep/napi': 0.22.6 @@ -23085,60 +21025,32 @@ snapshots: vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.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.31.3))(workbox-build@7.1.1)(workbox-window@7.1.0): -======= - 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.34.1)): - dependencies: - '@ast-grep/napi': 0.22.6 - magic-string: 0.30.11 - picocolors: 1.1.0 - vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) - - 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.34.1))(workbox-build@7.1.1)(workbox-window@7.1.0): ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: debug: 4.3.6 pretty-bytes: 6.1.1 -<<<<<<< HEAD tinyglobby: 0.2.2 vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) -======= - tinyglobby: 0.2.9 - vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e workbox-build: 7.1.1 workbox-window: 7.1.0 transitivePeerDependencies: - supports-color -<<<<<<< HEAD - vite-plugin-vue-devtools@7.4.6(rollup@4.24.0)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3))(vue@3.5.10(typescript@5.6.2)): + vite-plugin-vue-devtools@7.4.6(rollup@4.24.0)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3))(vue@3.5.11(typescript@5.6.2)): 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.31.3))(vue@3.5.10(typescript@5.6.2)) -======= - vite-plugin-vue-devtools@7.4.6(rollup@4.24.0)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1))(vue@3.5.11(typescript@5.6.2)): - 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.34.1))(vue@3.5.11(typescript@5.6.2)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e + '@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.31.3))(vue@3.5.11(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 vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) vite-plugin-inspect: 0.8.7(rollup@4.24.0)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3)) 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.31.3)) -======= - vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) - vite-plugin-inspect: 0.8.7(rollup@4.24.0)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1)) - 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.34.1)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e transitivePeerDependencies: - '@nuxt/kit' - rollup - supports-color - vue -<<<<<<< HEAD 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.31.3)): dependencies: '@babel/core': 7.25.2 @@ -23147,7 +21059,7 @@ snapshots: '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.25.2) '@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.2) '@vue/babel-plugin-jsx': 1.2.2(@babel/core@7.25.2) - '@vue/compiler-dom': 3.4.37 + '@vue/compiler-dom': 3.5.11 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.31.3) @@ -23155,24 +21067,6 @@ snapshots: - supports-color vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3): -======= - 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.34.1)): - dependencies: - '@babel/core': 7.25.7 - '@babel/plugin-proposal-decorators': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-syntax-import-attributes': 7.25.7(@babel/core@7.25.7) - '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.25.7) - '@babel/plugin-transform-typescript': 7.25.7(@babel/core@7.25.7) - '@vue/babel-plugin-jsx': 1.2.5(@babel/core@7.25.7) - '@vue/compiler-dom': 3.5.11 - 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.34.1) - transitivePeerDependencies: - - supports-color - - vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1): ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: esbuild: 0.21.5 postcss: 8.4.47 @@ -23182,11 +21076,7 @@ snapshots: fsevents: 2.3.3 less: 4.2.0 sass: 1.79.4 -<<<<<<< HEAD terser: 5.31.3 -======= - terser: 5.34.1 ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e vitepress-plugin-group-icons@1.2.4: dependencies: @@ -23196,7 +21086,6 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD 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.16.0)(sortablejs@1.15.3)(terser@5.31.3)(typescript@5.6.2): dependencies: '@docsearch/css': 3.6.1 @@ -23204,37 +21093,17 @@ snapshots: '@shikijs/core': 1.21.0 '@shikijs/transformers': 1.21.0 '@types/markdown-it': 14.1.2 - '@vitejs/plugin-vue': 5.1.2(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3))(vue@3.5.10(typescript@5.6.2)) + '@vitejs/plugin-vue': 5.1.2(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3))(vue@3.5.11(typescript@5.6.2)) '@vue/devtools-api': 7.4.6 '@vue/shared': 3.5.11 - '@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)) + '@vueuse/core': 11.1.0(vue@3.5.11(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.11(typescript@5.6.2)) focus-trap: 7.5.4 mark.js: 8.11.1 minisearch: 7.1.0 shiki: 1.21.0 vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) - vue: 3.5.10(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.34.1)(typescript@5.6.2): - dependencies: - '@docsearch/css': 3.6.2 - '@docsearch/js': 3.6.2(@algolia/client-search@4.24.0)(search-insights@2.17.2) - '@shikijs/core': 1.21.0 - '@shikijs/transformers': 1.21.0 - '@types/markdown-it': 14.1.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.34.1))(vue@3.5.11(typescript@5.6.2)) - '@vue/devtools-api': 7.4.6 - '@vue/shared': 3.5.11 - '@vueuse/core': 11.1.0(vue@3.5.11(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.11(typescript@5.6.2)) - focus-trap: 7.6.0 - mark.js: 8.11.1 - minisearch: 7.1.0 - shiki: 1.21.0 - vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) vue: 3.5.11(typescript@5.6.2) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e optionalDependencies: postcss: 8.4.47 transitivePeerDependencies: @@ -23265,17 +21134,10 @@ snapshots: - typescript - universal-cookie -<<<<<<< HEAD vitest@2.1.2(@types/node@22.7.4)(happy-dom@15.7.4)(jsdom@24.1.1)(less@4.2.0)(sass@1.79.4)(terser@5.31.3): dependencies: '@vitest/expect': 2.1.2 '@vitest/mocker': 2.1.2(@vitest/spy@2.1.2)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3)) -======= - vitest@2.1.2(@types/node@22.7.4)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1): - dependencies: - '@vitest/expect': 2.1.2 - '@vitest/mocker': 2.1.2(@vitest/spy@2.1.2)(vite@5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1)) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@vitest/pretty-format': 2.1.2 '@vitest/runner': 2.1.2 '@vitest/snapshot': 2.1.2 @@ -23290,13 +21152,8 @@ snapshots: tinyexec: 0.3.0 tinypool: 1.0.0 tinyrainbow: 1.2.0 -<<<<<<< HEAD vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) vite-node: 2.1.2(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.31.3) -======= - vite: 5.4.8(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) - vite-node: 2.1.2(@types/node@22.7.4)(less@4.2.0)(sass@1.79.4)(terser@5.34.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 22.7.4 @@ -23322,11 +21179,11 @@ snapshots: vscode-uri@3.0.8: {} - vue-codemirror6@1.3.4(@lezer/common@1.2.2)(vue@3.5.10(typescript@5.6.2)): + vue-codemirror6@1.3.4(@lezer/common@1.2.2)(vue@3.5.11(typescript@5.6.2)): dependencies: codemirror: 6.0.1(@lezer/common@1.2.2) - vue: 3.5.10(typescript@5.6.2) - vue-demi: 0.14.10(vue@3.5.10(typescript@5.6.2)) + vue: 3.5.11(typescript@5.6.2) + vue-demi: 0.14.10(vue@3.5.11(typescript@5.6.2)) transitivePeerDependencies: - '@lezer/common' - '@vue/composition-api' @@ -23337,17 +21194,10 @@ snapshots: dependencies: vue: 3.5.11(typescript@5.6.2) -<<<<<<< HEAD vue-eslint-parser@9.4.3(eslint@9.12.0(jiti@1.21.6)): dependencies: debug: 4.3.6 eslint: 9.12.0(jiti@1.21.6) -======= - vue-eslint-parser@9.4.3(eslint@9.12.0(jiti@2.2.1)): - dependencies: - debug: 4.3.7 - eslint: 9.12.0(jiti@2.2.1) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e eslint-scope: 7.2.2 eslint-visitor-keys: 3.4.3 espree: 9.6.1 @@ -23361,17 +21211,12 @@ snapshots: dependencies: '@intlify/core-base': 10.0.3 '@intlify/shared': 10.0.3 -<<<<<<< HEAD '@vue/devtools-api': 6.6.3 - vue: 3.5.10(typescript@5.6.2) - - vue-json-pretty@2.4.0(vue@3.5.10(typescript@5.6.2)): - dependencies: - vue: 3.5.10(typescript@5.6.2) -======= - '@vue/devtools-api': 6.6.4 vue: 3.5.11(typescript@5.6.2) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e + + vue-json-pretty@2.4.0(vue@3.5.11(typescript@5.6.2)): + dependencies: + vue: 3.5.11(typescript@5.6.2) vue-router@4.4.5(vue@3.5.11(typescript@5.6.2)): dependencies: @@ -23400,11 +21245,7 @@ snapshots: optionalDependencies: typescript: 5.6.2 -<<<<<<< HEAD - vueuc@0.4.64(vue@3.5.10(typescript@5.6.2)): -======= vueuc@0.4.64(vue@3.5.11(typescript@5.6.2)): ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e dependencies: '@css-render/vue3-ssr': 0.15.14(vue@3.5.11(typescript@5.6.2)) '@juggle/resize-observer': 3.4.0 @@ -23422,7 +21263,6 @@ snapshots: vxe-table@4.7.85: dependencies: vxe-pc-ui: 4.2.13 -<<<<<<< HEAD w3c-keyname@2.2.8: {} @@ -23430,8 +21270,6 @@ snapshots: dependencies: xml-name-validator: 5.0.0 optional: true -======= ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e warning@4.0.3: dependencies: @@ -23529,7 +21367,6 @@ snapshots: workbox-build@7.1.1: dependencies: '@apideck/better-ajv-errors': 0.3.6(ajv@8.17.1) -<<<<<<< HEAD '@babel/core': 7.25.2 '@babel/preset-env': 7.25.3(@babel/core@7.25.2) '@babel/runtime': 7.25.0 @@ -23537,15 +21374,6 @@ snapshots: '@rollup/plugin-node-resolve': 15.2.3(rollup@2.79.1) '@rollup/plugin-replace': 2.4.2(rollup@2.79.1) '@rollup/plugin-terser': 0.4.4(rollup@2.79.1) -======= - '@babel/core': 7.25.7 - '@babel/preset-env': 7.25.7(@babel/core@7.25.7) - '@babel/runtime': 7.25.7 - '@rollup/plugin-babel': 5.3.1(@babel/core@7.25.7)(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) ->>>>>>> 402eaf42751c62e2746973db7fef34dfc26ec97e '@surma/rollup-plugin-off-main-thread': 2.2.3 ajv: 8.17.1 common-tags: 1.8.2