From 7dbcf02d9a69271fae9893ead6277cce1c22a3d0 Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Wed, 25 Sep 2024 10:52:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/system/role/menu-select.vue | 141 +- .../src/views/system/role/role-drawer.vue | 67 +- pnpm-lock.yaml | 2244 +++++------------ 3 files changed, 737 insertions(+), 1715 deletions(-) diff --git a/apps/web-antd/src/views/system/role/menu-select.vue b/apps/web-antd/src/views/system/role/menu-select.vue index 272771a7..ef44b28b 100644 --- a/apps/web-antd/src/views/system/role/menu-select.vue +++ b/apps/web-antd/src/views/system/role/menu-select.vue @@ -3,46 +3,85 @@ import type { CheckboxChangeEvent } from 'ant-design-vue/es/checkbox/interface'; import type { DataNode } from 'ant-design-vue/es/tree'; import type { CheckInfo } from 'ant-design-vue/es/vc-tree/props'; -import type { Menu } from '#/api/system/menu/model'; +import { computed, type PropType, ref, watch } from 'vue'; -import { computed, onMounted, type PropType, ref } from 'vue'; - -import { filter, listToTree } from '@vben/utils'; +import { findGroupParentIds, treeToList } from '@vben/utils'; import { Checkbox, Tree } from 'ant-design-vue'; -import { menuList } from '#/api/system/menu'; - -import { excludeIds } from '../tenantPackage/data'; - defineOptions({ inheritAttrs: false }); +const props = defineProps({ + checkStrictly: { + default: true, + type: Boolean, + }, + menuTree: { + default: () => [], + type: Array as PropType, + }, +}); +const emit = defineEmits<{ checkStrictlyChange: [boolean] }>(); + const expandStatus = ref(false); const selectAllStatus = ref(false); -const association = ref(true); -const associationText = computed(() => { - return association.value ? '父子节点关联' : '父子节点独立'; +/** + * 后台的这个字段跟antd/ele是反的 + * 组件库这个字段代表不关联 + * 后台这个代表关联 + */ +const innerCheckedStrictly = computed(() => { + return !props.checkStrictly; }); -const menuTree = ref([]); -// checkable 状态下节点选择完全受控(父子节点选中状态不再关联) -const menuCheckStrictly = ref(false); -// const checkedKeys = ref([]); +function handleCheckStrictlyChange(e: CheckboxChangeEvent) { + emit('checkStrictlyChange', e.target.checked); +} + +const associationText = computed(() => { + return props.checkStrictly ? '父子节点关联' : '父子节点独立'; +}); + +/** + * 这个只用于界面显示 + * 关联情况下 只会有最末尾的节点被选中 + */ const checkedKeys = defineModel('value', { default: () => [], type: Array as PropType<(number | string)[]>, }); // 所有节点的ID -const responseAllKeys = ref([]); +const allKeys = computed(() => { + return treeToList(props.menuTree).map((item: any) => item.id); +}); /** 已经选择的所有节点 包括子/父节点 */ -// const checkedMenuKeys = ref<(number | string)[]>([]); +const checkedMenuKeys = ref<(number | string)[]>([]); + +/** + * 取第一次的menuTree id 设置到checkedMenuKeys + * 主要为了解决没有任何修改 直接点击保存的情况 + */ +const stop = watch( + () => props.menuTree, + () => { + /** 节点关联情况下是不带父节点的 */ + if (props.checkStrictly) { + /** 找到父节点 添加上 */ + const parentIds = findGroupParentIds( + props.menuTree, + checkedKeys.value as any, + ); + checkedMenuKeys.value = [...parentIds, ...checkedKeys.value]; + } else { + /** 节点独立 这里是全部的节点 */ + checkedMenuKeys.value = checkedKeys.value; + } + stop(); + }, +); -const checkedMenuKeys = defineModel('none', { - default: () => [], - type: Array as PropType<(number | string)[]>, -}); /** * * @param checkedKeys 已经选中的子节点的ID @@ -61,43 +100,22 @@ function handleChecked(checkedKeys: CheckedState, info: CheckInfo) { } } -/** - * 不显示租户相关菜单 分配了也没法使用 - * @param menuTree menus - */ -function transformMenu(menuTree: Menu[]) { - return filter( - menuTree, - (item) => { - if (excludeIds.includes(item.menuId)) { - return false; - } - return true; - }, - { id: 'menuId', pid: 'parentId', children: 'children' }, - ); -} - function handleExpandChange(e: CheckboxChangeEvent) { // 这个用于展示 - checkedKeys.value = e.target.checked ? responseAllKeys.value : []; + checkedKeys.value = e.target.checked ? allKeys.value : []; // 这个用于提交 - checkedMenuKeys.value = e.target.checked ? responseAllKeys.value : []; + checkedMenuKeys.value = e.target.checked ? allKeys.value : []; } -onMounted(async () => { - const resp = await menuList(); - // 去除租户相关菜单(分配了也无权限) - const afterTransform = transformMenu(resp); - responseAllKeys.value = afterTransform.map((item) => item.menuId); - console.log(responseAllKeys.value); - const tree = listToTree(afterTransform, { id: 'menuId' }); - menuTree.value = tree; +const expandedKeys = ref([]); +function handleExpandOrCollapseAll(e: CheckboxChangeEvent) { + const expand = e.target.checked; + expandedKeys.value = expand ? allKeys.value : []; +} + +defineExpose({ + getCheckedKeys: () => checkedMenuKeys.value, }); - -function test() { - console.log(checkedMenuKeys.value); -} diff --git a/apps/web-antd/src/views/system/role/role-drawer.vue b/apps/web-antd/src/views/system/role/role-drawer.vue index 26b94be6..95408ba6 100644 --- a/apps/web-antd/src/views/system/role/role-drawer.vue +++ b/apps/web-antd/src/views/system/role/role-drawer.vue @@ -4,8 +4,10 @@ import { computed, ref } from 'vue'; import { useVbenDrawer } from '@vben/common-ui'; import { $t } from '@vben/locales'; +import { cloneDeep } from 'lodash-es'; + import { useVbenForm } from '#/adapter'; -import { roleMenuTreeSelect } from '#/api/system/menu'; +import { menuTreeSelect, roleMenuTreeSelect } from '#/api/system/menu'; import { roleAdd, roleInfo, roleUpdate } from '#/api/system/role'; import { drawerSchema } from './data'; @@ -31,10 +33,19 @@ const [BasicForm, formApi] = useVbenForm({ wrapperClass: 'grid-cols-2', }); -async function setupMenuTree(id: number | string) { - const resp = await roleMenuTreeSelect(id); - console.log(resp); - formApi.setFieldValue('menuIds', resp.checkedKeys); +const menuTree = ref([]); +async function setupMenuTree(id?: number | string) { + if (id) { + const resp = await roleMenuTreeSelect(id); + formApi.setFieldValue('menuIds', resp.checkedKeys); + // 设置菜单信息 + menuTree.value = resp.menus; + } else { + const resp = await menuTreeSelect(); + formApi.setFieldValue('menuIds', []); + // 设置菜单信息 + menuTree.value = resp; + } } const [BasicDrawer, drawerApi] = useVbenDrawer({ @@ -47,18 +58,25 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({ drawerApi.drawerLoading(true); const { id } = drawerApi.getData() as { id?: number | string }; isUpdate.value = !!id; + if (isUpdate.value && id) { const record = await roleInfo(id); for (const key in record) { await formApi.setFieldValue(key, record[key as keyof typeof record]); } - // 设置选中的菜单 - await setupMenuTree(id); } + // init菜单 注意顺序要放在赋值record之后 内部watch会依赖record + await setupMenuTree(id); + drawerApi.drawerLoading(false); }, }); +/** + * 这里拿到的是一个数组ref + */ +const menuSelectRef = ref(); + async function handleConfirm() { try { drawerApi.drawerLoading(true); @@ -66,7 +84,11 @@ async function handleConfirm() { if (!valid) { return; } - const data = await formApi.getValues(); + // 这个用于提交 + const menuIds = menuSelectRef.value?.[0]?.getCheckedKeys() ?? []; + // formApi.getValues拿到的是一个readonly对象,不能直接修改,需要cloneDeep + const data = cloneDeep(await formApi.getValues()); + data.menuIds = menuIds; await (isUpdate.value ? roleUpdate(data) : roleAdd(data)); emit('reload'); await handleCancel(); @@ -82,9 +104,12 @@ async function handleCancel() { await formApi.resetForm(); } -async function test() { - const data = await formApi.getValues(); - console.log(data); +/** + * 通过回调更新 无法通过v-model + * @param value 菜单选择是否严格模式 + */ +function handleMenuCheckStrictlyChange(value: boolean) { + formApi.setFieldValue('menuCheckStrictly', value); } @@ -92,19 +117,15 @@ async function test() { - 测试 - - diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ca4ff4ec..1446b497 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -532,24 +532,10 @@ importers: version: link:scripts/vsh '@vitejs/plugin-vue': specifier: 'catalog:' -<<<<<<< HEAD -<<<<<<< HEAD - version: 5.1.4(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(vue@3.5.6(typescript@5.6.2)) + version: 5.1.4(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(vue@3.5.7(typescript@5.6.2)) '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - version: 4.0.1(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(vue@3.5.6(typescript@5.6.2)) -======= - version: 5.1.4(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(vue@3.5.6(typescript@5.6.2)) - '@vitejs/plugin-vue-jsx': - specifier: 'catalog:' - version: 4.0.1(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(vue@3.5.6(typescript@5.6.2)) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - version: 5.1.4(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2)) - '@vitejs/plugin-vue-jsx': - specifier: 'catalog:' - version: 4.0.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2)) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + version: 4.0.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(vue@3.5.7(typescript@5.6.2)) '@vue/test-utils': specifier: 'catalog:' version: 2.4.6 @@ -594,32 +580,10 @@ importers: version: 2.0.0(sass@1.79.3)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2)) vite: specifier: 'catalog:' -<<<<<<< HEAD -<<<<<<< HEAD - version: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) + version: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) vitest: specifier: 'catalog:' - version: 2.1.1(@types/node@22.5.5)(jsdom@25.0.0)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) -======= - version: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) - vitest: - specifier: 'catalog:' - version: 2.1.1(@types/node@22.5.5)(jsdom@25.0.0)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - version: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) - vitest: - specifier: 'catalog:' -<<<<<<< HEAD -<<<<<<< HEAD - version: 2.1.1(@types/node@22.5.5)(jsdom@25.0.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - version: 2.1.1(@types/node@22.5.5)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> 31f6cc64164464f00a8ebfb3d83582a83d867f47 -======= - version: 2.1.1(@types/node@22.5.5)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> 2a83f1d666729c72df7e02be2d8665fbf2526825 + version: 2.1.1(@types/node@22.5.5)(happy-dom@15.7.4)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) vue: specifier: 3.5.7 version: 3.5.7(typescript@5.6.2) @@ -647,7 +611,7 @@ importers: dependencies: '@tinymce/tinymce-vue': specifier: ^6.0.1 - version: 6.0.1(vue@3.5.6(typescript@5.6.2)) + version: 6.0.1(vue@3.5.7(typescript@5.6.2)) '@vben/access': specifier: workspace:* version: link:../../packages/effects/access @@ -690,24 +654,18 @@ importers: '@vben/utils': specifier: workspace:* version: link:../../packages/utils -<<<<<<< HEAD - ant-design-vue: - specifier: 'catalog:' - version: 4.2.5(vue@3.5.6(typescript@5.6.2)) - cropperjs: - specifier: ^1.6.2 - version: 1.6.2 - crypto-js: - specifier: ^4.2.0 - version: 4.2.0 -======= '@vueuse/core': specifier: 'catalog:' version: 11.1.0(vue@3.5.7(typescript@5.6.2)) ant-design-vue: specifier: 'catalog:' version: 4.2.5(vue@3.5.7(typescript@5.6.2)) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + cropperjs: + specifier: ^1.6.2 + version: 1.6.2 + crypto-js: + specifier: ^4.2.0 + version: 4.2.0 dayjs: specifier: 'catalog:' version: 1.11.13 @@ -722,24 +680,19 @@ importers: version: 4.17.21 pinia: specifier: 2.2.2 -<<<<<<< HEAD - version: 2.2.2(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2)) + version: 2.2.2(typescript@5.6.2)(vue@3.5.7(typescript@5.6.2)) tinymce: specifier: ^7.3.0 version: 7.3.0 unplugin-vue-components: specifier: ^0.27.3 - version: 0.27.4(@babel/parser@7.25.6)(@nuxt/kit@3.13.2(rollup@4.22.0)(webpack-sources@3.2.3))(rollup@4.22.0)(vue@3.5.6(typescript@5.6.2)) -======= - version: 2.2.2(typescript@5.6.2)(vue@3.5.7(typescript@5.6.2)) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + version: 0.27.4(@babel/parser@7.25.6)(@nuxt/kit@3.13.2(rollup@4.22.4))(rollup@4.22.4)(vue@3.5.7(typescript@5.6.2)) vue: specifier: 3.5.7 version: 3.5.7(typescript@5.6.2) vue-router: specifier: 'catalog:' -<<<<<<< HEAD - version: 4.4.5(vue@3.5.6(typescript@5.6.2)) + version: 4.4.5(vue@3.5.7(typescript@5.6.2)) devDependencies: '@types/crypto-js': specifier: ^4.2.2 @@ -747,12 +700,6 @@ importers: '@types/lodash-es': specifier: ^4.17.12 version: 4.17.12 - '@vueuse/core': - specifier: 'catalog:' - version: 11.1.0(vue@3.5.6(typescript@5.6.2)) -======= - version: 4.4.5(vue@3.5.7(typescript@5.6.2)) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 apps/web-ele: dependencies: @@ -819,15 +766,7 @@ importers: devDependencies: unplugin-element-plus: specifier: 'catalog:' -<<<<<<< HEAD -<<<<<<< HEAD - version: 0.8.0(rollup@4.22.0)(webpack-sources@3.2.3) -======= - version: 0.8.0(rollup@4.22.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - version: 0.8.0(rollup@4.22.4) ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + version: 0.8.0(rollup@4.22.4)(webpack-sources@3.2.3) apps/web-naive: dependencies: @@ -927,42 +866,16 @@ importers: devDependencies: '@nolebase/vitepress-plugin-git-changelog': specifier: 'catalog:' -<<<<<<< HEAD -<<<<<<< HEAD - version: 2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.1)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2) -======= - version: 2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.2)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - version: 2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + version: 2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2) '@vben/vite-config': specifier: workspace:* version: link:../internal/vite-config '@vite-pwa/vitepress': specifier: 'catalog:' -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0)) + version: 0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0)) vitepress: specifier: 'catalog:' - version: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.1)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2) -======= - version: 0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0)) - vitepress: - specifier: 'catalog:' - version: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.2)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - version: 0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0)) -======= - version: 0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0)) ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 - vitepress: - specifier: 'catalog:' - version: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + version: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2) vue: specifier: 3.5.7 version: 3.5.7(typescript@5.6.2) @@ -1035,11 +948,7 @@ importers: version: 3.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2)(vue-eslint-parser@9.4.3(eslint@9.11.0(jiti@1.21.6))) eslint-plugin-prettier: specifier: 'catalog:' -<<<<<<< HEAD - version: 5.2.1(@types/eslint@9.6.1)(eslint-config-prettier@9.1.0(eslint@9.10.0(jiti@1.21.6)))(eslint@9.10.0(jiti@1.21.6))(prettier@3.3.3) -======= - version: 5.2.1(@types/eslint@9.6.1)(eslint@9.11.0(jiti@1.21.6))(prettier@3.3.3) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + version: 5.2.1(@types/eslint@9.6.1)(eslint-config-prettier@9.1.0(eslint@9.11.0(jiti@1.21.6)))(eslint@9.11.0(jiti@1.21.6))(prettier@3.3.3) eslint-plugin-regexp: specifier: 'catalog:' version: 2.6.0(eslint@9.11.0(jiti@1.21.6)) @@ -1051,23 +960,7 @@ importers: version: 4.1.4(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6)) eslint-plugin-vitest: specifier: 'catalog:' -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 0.5.4(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.5.5)(jsdom@25.0.0)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)) -======= - version: 0.5.4(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.5.5)(jsdom@25.0.0)(less@4.2.0)(sass@1.79.2)(terser@5.33.0)) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - version: 0.5.4(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.5.5)(jsdom@25.0.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - version: 0.5.4(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.5.5)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) ->>>>>>> 31f6cc64164464f00a8ebfb3d83582a83d867f47 -======= - version: 0.5.4(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.5.5)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) ->>>>>>> 2a83f1d666729c72df7e02be2d8665fbf2526825 + version: 0.5.4(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.5.5)(happy-dom@15.7.4)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)) eslint-plugin-vue: specifier: 'catalog:' version: 9.28.0(eslint@9.11.0(jiti@1.21.6)) @@ -1232,37 +1125,13 @@ importers: version: link:../../packages/types vite: specifier: 'catalog:' -<<<<<<< HEAD -<<<<<<< HEAD - version: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) -======= - version: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - version: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + version: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) internal/vite-config: dependencies: '@intlify/unplugin-vue-i18n': specifier: 'catalog:' -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - version: 5.0.0(@vue/compiler-dom@3.5.6)(eslint@9.10.0(jiti@1.21.6))(rollup@4.22.0)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)))(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3) -======= - version: 5.0.0(@vue/compiler-dom@3.5.7)(eslint@9.11.0(jiti@1.21.6))(rollup@4.22.2)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2)) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - version: 5.0.0(@vue/compiler-dom@3.5.7)(eslint@9.11.0(jiti@1.21.6))(rollup@4.22.4)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2)) ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 -======= - version: 5.0.0(@vue/compiler-dom@3.5.8)(eslint@9.11.0(jiti@1.21.6))(rollup@4.22.4)(typescript@5.6.2)(vue-i18n@10.0.2(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2)) ->>>>>>> 31f6cc64164464f00a8ebfb3d83582a83d867f47 -======= - version: 5.2.0(@vue/compiler-dom@3.5.8)(eslint@9.11.0(jiti@1.21.6))(rollup@4.22.4)(typescript@5.6.2)(vue-i18n@10.0.3(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2)) ->>>>>>> 2a83f1d666729c72df7e02be2d8665fbf2526825 + version: 5.2.0(@vue/compiler-dom@3.5.7)(eslint@9.11.0(jiti@1.21.6))(rollup@4.22.4)(typescript@5.6.2)(vue-i18n@10.0.3(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2))(webpack-sources@3.2.3) '@jspm/generator': specifier: 'catalog:' version: 2.3.1 @@ -1286,35 +1155,13 @@ importers: version: 2.0.2 vite-plugin-lib-inject-css: specifier: 'catalog:' -<<<<<<< HEAD -<<<<<<< HEAD - version: 2.1.1(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)) + version: 2.1.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)) vite-plugin-pwa: specifier: 'catalog:' - version: 0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0) + version: 0.20.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0) vite-plugin-vue-devtools: specifier: 'catalog:' - version: 7.4.5(rollup@4.22.0)(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(vue@3.5.6(typescript@5.6.2)) -======= - version: 2.1.1(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0)) -======= - version: 2.1.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 - vite-plugin-pwa: - specifier: 'catalog:' - version: 0.20.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0) - vite-plugin-vue-devtools: - specifier: 'catalog:' -<<<<<<< HEAD -<<<<<<< HEAD - version: 7.4.5(rollup@4.22.0)(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(vue@3.5.6(typescript@5.6.2)) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - version: 7.4.5(rollup@4.22.2)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2)) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - version: 7.4.5(rollup@4.22.4)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2)) ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + version: 7.4.5(rollup@4.22.4)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(vue@3.5.7(typescript@5.6.2)) devDependencies: '@types/archiver': specifier: 'catalog:' @@ -1327,24 +1174,10 @@ importers: version: link:../node-utils '@vitejs/plugin-vue': specifier: 'catalog:' -<<<<<<< HEAD -<<<<<<< HEAD - version: 5.1.4(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(vue@3.5.6(typescript@5.6.2)) + version: 5.1.4(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(vue@3.5.7(typescript@5.6.2)) '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - version: 4.0.1(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(vue@3.5.6(typescript@5.6.2)) -======= - version: 5.1.4(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(vue@3.5.6(typescript@5.6.2)) - '@vitejs/plugin-vue-jsx': - specifier: 'catalog:' - version: 4.0.1(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(vue@3.5.6(typescript@5.6.2)) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - version: 5.1.4(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2)) - '@vitejs/plugin-vue-jsx': - specifier: 'catalog:' - version: 4.0.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2)) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + version: 4.0.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(vue@3.5.7(typescript@5.6.2)) dayjs: specifier: 'catalog:' version: 1.11.13 @@ -1362,37 +1195,16 @@ importers: version: 1.79.3 vite: specifier: 'catalog:' -<<<<<<< HEAD -<<<<<<< HEAD - version: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) + version: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) vite-plugin-compression: specifier: 'catalog:' - version: 0.5.1(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)) + version: 0.5.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)) vite-plugin-dts: specifier: 'catalog:' - version: 4.2.1(@types/node@22.5.5)(rollup@4.22.0)(typescript@5.6.2)(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)) + version: 4.2.1(@types/node@22.5.5)(rollup@4.22.4)(typescript@5.6.2)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)) vite-plugin-html: specifier: 'catalog:' - version: 3.2.2(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)) -======= - version: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) -======= - version: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 - vite-plugin-compression: - specifier: 'catalog:' - version: 0.5.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) - vite-plugin-dts: - specifier: 'catalog:' - version: 4.2.1(@types/node@22.5.5)(rollup@4.22.4)(typescript@5.6.2)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) - vite-plugin-html: - specifier: 'catalog:' -<<<<<<< HEAD - version: 3.2.2(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0)) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - version: 3.2.2(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + version: 3.2.2(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)) packages/@core/base/design: {} @@ -1729,31 +1541,22 @@ importers: version: 11.1.0(vue@3.5.7(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.6(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.7(typescript@5.6.2)) codemirror: specifier: ^6.0.1 version: 6.0.1(@lezer/common@1.2.1) -======= - version: 11.1.0(async-validator@4.2.5)(axios@1.7.7)(focus-trap@7.6.0)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.7(typescript@5.6.2)) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 qrcode: specifier: 'catalog:' version: 1.5.4 vue: -<<<<<<< HEAD - specifier: 3.5.6 - version: 3.5.6(typescript@5.6.2) - vue-codemirror6: - specifier: ^1.3.4 - version: 1.3.4(@lezer/common@1.2.1)(vue@3.5.6(typescript@5.6.2)) - vue-json-pretty: - specifier: ^2.4.0 - version: 2.4.0(vue@3.5.6(typescript@5.6.2)) -======= specifier: 3.5.7 version: 3.5.7(typescript@5.6.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + vue-codemirror6: + specifier: ^1.3.4 + version: 1.3.4(@lezer/common@1.2.1)(vue@3.5.7(typescript@5.6.2)) + vue-json-pretty: + specifier: ^2.4.0 + version: 2.4.0(vue@3.5.7(typescript@5.6.2)) vue-router: specifier: 'catalog:' version: 4.4.5(vue@3.5.7(typescript@5.6.2)) @@ -1920,15 +1723,7 @@ importers: version: 2.2.2(typescript@5.6.2)(vue@3.5.7(typescript@5.6.2)) pinia-plugin-persistedstate: specifier: 'catalog:' -<<<<<<< HEAD -<<<<<<< HEAD - version: 4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2)))(rollup@4.22.0)(webpack-sources@3.2.3) -======= - version: 4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.7(typescript@5.6.2)))(rollup@4.22.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - version: 4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.7(typescript@5.6.2)))(rollup@4.22.4) ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + version: 4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.7(typescript@5.6.2)))(rollup@3.29.4) vue: specifier: 3.5.7 version: 3.5.7(typescript@5.6.2) @@ -4548,13 +4343,8 @@ packages: resolution: {integrity: sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw==} engines: {node: '>=12'} -<<<<<<< HEAD - '@polka/url@1.0.0-next.25': - resolution: {integrity: sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==} -======= '@polka/url@1.0.0-next.28': resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==} ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c '@radix-icons/vue@1.0.0': resolution: {integrity: sha512-gKWWk9tTK/laDRRNe5KLLR8A0qUwx4q4+DN8Fq48hJ904u78R82ayAO3TrxbNLgyn2D0h6rRiGdLzQWj7rPcvA==} @@ -4659,26 +4449,14 @@ packages: rollup: optional: true -<<<<<<< HEAD - '@rollup/rollup-android-arm-eabi@4.21.3': - resolution: {integrity: sha512-MmKSfaB9GX+zXl6E8z4koOr/xU63AMVleLEa64v7R0QF/ZloMs5vcD1sHgM64GXXS1csaJutG+ddtzcueI/BLg==} - cpu: [arm] - os: [android] - '@rollup/rollup-android-arm-eabi@4.22.0': resolution: {integrity: sha512-/IZQvg6ZR0tAkEi4tdXOraQoWeJy9gbQ/cx4I7k9dJaCk9qrXEcdouxRVz5kZXt5C2bQ9pILoAA+KB4C/d3pfw==} cpu: [arm] os: [android] -<<<<<<< HEAD - '@rollup/rollup-android-arm64@4.21.3': - resolution: {integrity: sha512-zrt8ecH07PE3sB4jPOggweBjJMzI1JG5xI2DIsUbkA+7K+Gkjys6eV7i9pOenNSDJH3eOr/jLb/PzqtmdwDq5g==} - cpu: [arm64] -======= - '@rollup/rollup-android-arm-eabi@4.22.2': - resolution: {integrity: sha512-8Ao+EDmTPjZ1ZBABc1ohN7Ylx7UIYcjReZinigedTOnGFhIctyGPxY2II+hJ6gD2/vkDKZTyQ0e7++kwv6wDrw==} + '@rollup/rollup-android-arm-eabi@4.22.4': + resolution: {integrity: sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==} cpu: [arm] ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 os: [android] '@rollup/rollup-android-arm64@4.22.0': @@ -4686,32 +4464,19 @@ packages: cpu: [arm64] os: [android] -<<<<<<< HEAD - '@rollup/rollup-darwin-arm64@4.21.3': - resolution: {integrity: sha512-P0UxIOrKNBFTQaXTxOH4RxuEBVCgEA5UTNV6Yz7z9QHnUJ7eLX9reOd/NYMO3+XZO2cco19mXTxDMXxit4R/eQ==} - cpu: [arm64] - os: [darwin] -======= - '@rollup/rollup-android-arm64@4.22.2': - resolution: {integrity: sha512-I+B1v0a4iqdS9DvYt1RJZ3W+Oh9EVWjbY6gp79aAYipIbxSLEoQtFQlZEnUuwhDXCqMxJ3hluxKAdPD+GiluFQ==} + '@rollup/rollup-android-arm64@4.22.4': + resolution: {integrity: sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==} cpu: [arm64] os: [android] ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 '@rollup/rollup-darwin-arm64@4.22.0': resolution: {integrity: sha512-ZWgARzhSKE+gVUX7QWaECoRQsPwaD8ZR0Oxb3aUpzdErTvlEadfQpORPXkKSdKbFci9v8MJfkTtoEHnnW9Ulng==} cpu: [arm64] os: [darwin] -<<<<<<< HEAD - '@rollup/rollup-darwin-x64@4.21.3': - resolution: {integrity: sha512-L1M0vKGO5ASKntqtsFEjTq/fD91vAqnzeaF6sfNAy55aD+Hi2pBI5DKwCO+UNDQHWsDViJLqshxOahXyLSh3EA==} - cpu: [x64] -======= - '@rollup/rollup-darwin-arm64@4.22.2': - resolution: {integrity: sha512-BTHO7rR+LC67OP7I8N8GvdvnQqzFujJYWo7qCQ8fGdQcb8Gn6EQY+K1P+daQLnDCuWKbZ+gHAQZuKiQkXkqIYg==} + '@rollup/rollup-darwin-arm64@4.22.4': + resolution: {integrity: sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==} cpu: [arm64] ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 os: [darwin] '@rollup/rollup-darwin-x64@4.22.0': @@ -4719,271 +4484,127 @@ packages: cpu: [x64] os: [darwin] -<<<<<<< HEAD - '@rollup/rollup-linux-arm-gnueabihf@4.21.3': - resolution: {integrity: sha512-btVgIsCjuYFKUjopPoWiDqmoUXQDiW2A4C3Mtmp5vACm7/GnyuprqIDPNczeyR5W8rTXEbkmrJux7cJmD99D2g==} - cpu: [arm] - os: [linux] - libc: [glibc] -======= - '@rollup/rollup-darwin-x64@4.22.2': - resolution: {integrity: sha512-1esGwDNFe2lov4I6GsEeYaAMHwkqk0IbuGH7gXGdBmd/EP9QddJJvTtTF/jv+7R8ZTYPqwcdLpMTxK8ytP6k6Q==} - cpu: [x64] - os: [darwin] ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 - - '@rollup/rollup-linux-arm-gnueabihf@4.22.0': - resolution: {integrity: sha512-9pxQJSPwFsVi0ttOmqLY4JJ9pg9t1gKhK0JDbV1yUEETSx55fdyCjt39eBQ54OQCzAF0nVGO6LfEH1KnCPvelA==} -======= - '@rollup/rollup-android-arm-eabi@4.22.4': - resolution: {integrity: sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==} - cpu: [arm] - os: [android] - - '@rollup/rollup-android-arm64@4.22.4': - resolution: {integrity: sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==} - cpu: [arm64] - os: [android] - - '@rollup/rollup-darwin-arm64@4.22.4': - resolution: {integrity: sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==} - cpu: [arm64] - os: [darwin] - '@rollup/rollup-darwin-x64@4.22.4': resolution: {integrity: sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==} cpu: [x64] os: [darwin] - '@rollup/rollup-linux-arm-gnueabihf@4.22.4': - resolution: {integrity: sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==} ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + '@rollup/rollup-linux-arm-gnueabihf@4.22.0': + resolution: {integrity: sha512-9pxQJSPwFsVi0ttOmqLY4JJ9pg9t1gKhK0JDbV1yUEETSx55fdyCjt39eBQ54OQCzAF0nVGO6LfEH1KnCPvelA==} cpu: [arm] os: [linux] libc: [glibc] -<<<<<<< HEAD -<<<<<<< HEAD - '@rollup/rollup-linux-arm-musleabihf@4.21.3': - resolution: {integrity: sha512-zmjbSphplZlau6ZTkxd3+NMtE4UKVy7U4aVFMmHcgO5CUbw17ZP6QCgyxhzGaU/wFFdTfiojjbLG3/0p9HhAqA==} - cpu: [arm] - os: [linux] - libc: [musl] -======= - '@rollup/rollup-linux-arm-gnueabihf@4.22.2': - resolution: {integrity: sha512-GBHuY07x96OTEM3OQLNaUSUwrOhdMea/LDmlFHi/HMonrgF6jcFrrFFwJhhe84XtA1oK/Qh4yFS+VMREf6dobg==} + '@rollup/rollup-linux-arm-gnueabihf@4.22.4': + resolution: {integrity: sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==} cpu: [arm] os: [linux] libc: [glibc] ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 '@rollup/rollup-linux-arm-musleabihf@4.22.0': resolution: {integrity: sha512-YJ5Ku5BmNJZb58A4qSEo3JlIG4d3G2lWyBi13ABlXzO41SsdnUKi3HQHe83VpwBVG4jHFTW65jOQb8qyoR+qzg==} -======= - '@rollup/rollup-linux-arm-musleabihf@4.22.4': - resolution: {integrity: sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==} ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 cpu: [arm] os: [linux] libc: [musl] -<<<<<<< HEAD -<<<<<<< HEAD - '@rollup/rollup-linux-arm64-gnu@4.21.3': - resolution: {integrity: sha512-nSZfcZtAnQPRZmUkUQwZq2OjQciR6tEoJaZVFvLHsj0MF6QhNMg0fQ6mUOsiCUpTqxTx0/O6gX0V/nYc7LrgPw==} - cpu: [arm64] - os: [linux] - libc: [glibc] -======= - '@rollup/rollup-linux-arm-musleabihf@4.22.2': - resolution: {integrity: sha512-Dbfa9Sc1G1lWxop0gNguXOfGhaXQWAGhZUcqA0Vs6CnJq8JW/YOw/KvyGtQFmz4yDr0H4v9X248SM7bizYj4yQ==} + '@rollup/rollup-linux-arm-musleabihf@4.22.4': + resolution: {integrity: sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==} cpu: [arm] os: [linux] libc: [musl] ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 '@rollup/rollup-linux-arm64-gnu@4.22.0': resolution: {integrity: sha512-U4G4u7f+QCqHlVg1Nlx+qapZy+QoG+NV6ux+upo/T7arNGwKvKP2kmGM4W5QTbdewWFgudQxi3kDNST9GT1/mg==} -======= - '@rollup/rollup-linux-arm64-gnu@4.22.4': - resolution: {integrity: sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==} ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 cpu: [arm64] os: [linux] libc: [glibc] -<<<<<<< HEAD -<<<<<<< HEAD - '@rollup/rollup-linux-arm64-musl@4.21.3': - resolution: {integrity: sha512-MnvSPGO8KJXIMGlQDYfvYS3IosFN2rKsvxRpPO2l2cum+Z3exiExLwVU+GExL96pn8IP+GdH8Tz70EpBhO0sIQ==} - cpu: [arm64] - os: [linux] - libc: [musl] -======= - '@rollup/rollup-linux-arm64-gnu@4.22.2': - resolution: {integrity: sha512-Z1YpgBvFYhZIyBW5BoopwSg+t7yqEhs5HCei4JbsaXnhz/eZehT18DaXl957aaE9QK7TRGFryCAtStZywcQe1A==} + '@rollup/rollup-linux-arm64-gnu@4.22.4': + resolution: {integrity: sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==} cpu: [arm64] os: [linux] libc: [glibc] ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 '@rollup/rollup-linux-arm64-musl@4.22.0': resolution: {integrity: sha512-aQpNlKmx3amwkA3a5J6nlXSahE1ijl0L9KuIjVOUhfOh7uw2S4piR3mtpxpRtbnK809SBtyPsM9q15CPTsY7HQ==} -======= - '@rollup/rollup-linux-arm64-musl@4.22.4': - resolution: {integrity: sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==} ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 cpu: [arm64] os: [linux] libc: [musl] -<<<<<<< HEAD -<<<<<<< HEAD - '@rollup/rollup-linux-powerpc64le-gnu@4.21.3': - resolution: {integrity: sha512-+W+p/9QNDr2vE2AXU0qIy0qQE75E8RTwTwgqS2G5CRQ11vzq0tbnfBd6brWhS9bCRjAjepJe2fvvkvS3dno+iw==} - cpu: [ppc64] - os: [linux] - libc: [glibc] -======= - '@rollup/rollup-linux-arm64-musl@4.22.2': - resolution: {integrity: sha512-66Zszr7i/JaQ0u/lefcfaAw16wh3oT72vSqubIMQqWzOg85bGCPhoeykG/cC5uvMzH80DQa2L539IqKht6twVA==} + '@rollup/rollup-linux-arm64-musl@4.22.4': + resolution: {integrity: sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==} cpu: [arm64] os: [linux] libc: [musl] ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 '@rollup/rollup-linux-powerpc64le-gnu@4.22.0': resolution: {integrity: sha512-9fx6Zj/7vve/Fp4iexUFRKb5+RjLCff6YTRQl4CoDhdMfDoobWmhAxQWV3NfShMzQk1Q/iCnageFyGfqnsmeqQ==} -======= - '@rollup/rollup-linux-powerpc64le-gnu@4.22.4': - resolution: {integrity: sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==} ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 cpu: [ppc64] os: [linux] libc: [glibc] -<<<<<<< HEAD -<<<<<<< HEAD - '@rollup/rollup-linux-riscv64-gnu@4.21.3': - resolution: {integrity: sha512-yXH6K6KfqGXaxHrtr+Uoy+JpNlUlI46BKVyonGiaD74ravdnF9BUNC+vV+SIuB96hUMGShhKV693rF9QDfO6nQ==} - cpu: [riscv64] -======= - '@rollup/rollup-linux-powerpc64le-gnu@4.22.2': - resolution: {integrity: sha512-HpJCMnlMTfEhwo19bajvdraQMcAq3FX08QDx3OfQgb+414xZhKNf3jNvLFYKbbDSGBBrQh5yNwWZrdK0g0pokg==} + '@rollup/rollup-linux-powerpc64le-gnu@4.22.4': + resolution: {integrity: sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==} cpu: [ppc64] ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 os: [linux] libc: [glibc] '@rollup/rollup-linux-riscv64-gnu@4.22.0': resolution: {integrity: sha512-VWQiCcN7zBgZYLjndIEh5tamtnKg5TGxyZPWcN9zBtXBwfcGSZ5cHSdQZfQH/GB4uRxk0D3VYbOEe/chJhPGLQ==} -======= - '@rollup/rollup-linux-riscv64-gnu@4.22.4': - resolution: {integrity: sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==} ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 cpu: [riscv64] os: [linux] libc: [glibc] -<<<<<<< HEAD -<<<<<<< HEAD - '@rollup/rollup-linux-s390x-gnu@4.21.3': - resolution: {integrity: sha512-R8cwY9wcnApN/KDYWTH4gV/ypvy9yZUHlbJvfaiXSB48JO3KpwSpjOGqO4jnGkLDSk1hgjYkTbTt6Q7uvPf8eg==} - cpu: [s390x] -======= - '@rollup/rollup-linux-riscv64-gnu@4.22.2': - resolution: {integrity: sha512-/egzQzbOSRef2vYCINKITGrlwkzP7uXRnL+xU2j75kDVp3iPdcF0TIlfwTRF8woBZllhk3QaxNOEj2Ogh3t9hg==} + '@rollup/rollup-linux-riscv64-gnu@4.22.4': + resolution: {integrity: sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==} cpu: [riscv64] ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 os: [linux] libc: [glibc] '@rollup/rollup-linux-s390x-gnu@4.22.0': resolution: {integrity: sha512-EHmPnPWvyYqncObwqrosb/CpH3GOjE76vWVs0g4hWsDRUVhg61hBmlVg5TPXqF+g+PvIbqkC7i3h8wbn4Gp2Fg==} -======= - '@rollup/rollup-linux-s390x-gnu@4.22.4': - resolution: {integrity: sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==} ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 cpu: [s390x] os: [linux] libc: [glibc] -<<<<<<< HEAD -<<<<<<< HEAD - '@rollup/rollup-linux-x64-gnu@4.21.3': - resolution: {integrity: sha512-kZPbX/NOPh0vhS5sI+dR8L1bU2cSO9FgxwM8r7wHzGydzfSjLRCFAT87GR5U9scj2rhzN3JPYVC7NoBbl4FZ0g==} - cpu: [x64] -======= - '@rollup/rollup-linux-s390x-gnu@4.22.2': - resolution: {integrity: sha512-qgYbOEbrPfEkH/OnUJd1/q4s89FvNJQIUldx8X2F/UM5sEbtkqZpf2s0yly2jSCKr1zUUOY1hnTP2J1WOzMAdA==} + '@rollup/rollup-linux-s390x-gnu@4.22.4': + resolution: {integrity: sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==} cpu: [s390x] ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 os: [linux] libc: [glibc] '@rollup/rollup-linux-x64-gnu@4.22.0': resolution: {integrity: sha512-tsSWy3YQzmpjDKnQ1Vcpy3p9Z+kMFbSIesCdMNgLizDWFhrLZIoN21JSq01g+MZMDFF+Y1+4zxgrlqPjid5ohg==} -======= - '@rollup/rollup-linux-x64-gnu@4.22.4': - resolution: {integrity: sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==} ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 cpu: [x64] os: [linux] libc: [glibc] -<<<<<<< HEAD -<<<<<<< HEAD - '@rollup/rollup-linux-x64-musl@4.21.3': - resolution: {integrity: sha512-S0Yq+xA1VEH66uiMNhijsWAafffydd2X5b77eLHfRmfLsRSpbiAWiRHV6DEpz6aOToPsgid7TI9rGd6zB1rhbg==} - cpu: [x64] - os: [linux] - libc: [musl] -======= - '@rollup/rollup-linux-x64-gnu@4.22.2': - resolution: {integrity: sha512-a0lkvNhFLhf+w7A95XeBqGQaG0KfS3hPFJnz1uraSdUe/XImkp/Psq0Ca0/UdD5IEAGoENVmnYrzSC9Y2a2uKQ==} + '@rollup/rollup-linux-x64-gnu@4.22.4': + resolution: {integrity: sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==} cpu: [x64] os: [linux] libc: [glibc] ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 '@rollup/rollup-linux-x64-musl@4.22.0': resolution: {integrity: sha512-anr1Y11uPOQrpuU8XOikY5lH4Qu94oS6j0xrulHk3NkLDq19MlX8Ng/pVipjxBJ9a2l3+F39REZYyWQFkZ4/fw==} -======= - '@rollup/rollup-linux-x64-musl@4.22.4': - resolution: {integrity: sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==} ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 cpu: [x64] os: [linux] libc: [musl] -<<<<<<< HEAD -<<<<<<< HEAD - '@rollup/rollup-win32-arm64-msvc@4.21.3': - resolution: {integrity: sha512-9isNzeL34yquCPyerog+IMCNxKR8XYmGd0tHSV+OVx0TmE0aJOo9uw4fZfUuk2qxobP5sug6vNdZR6u7Mw7Q+Q==} - cpu: [arm64] - os: [win32] -======= - '@rollup/rollup-linux-x64-musl@4.22.2': - resolution: {integrity: sha512-sSWBVZgzwtsuG9Dxi9kjYOUu/wKW+jrbzj4Cclabqnfkot8Z3VEHcIgyenA3lLn/Fu11uDviWjhctulkhEO60g==} + '@rollup/rollup-linux-x64-musl@4.22.4': + resolution: {integrity: sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==} cpu: [x64] os: [linux] libc: [musl] ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 '@rollup/rollup-win32-arm64-msvc@4.22.0': resolution: {integrity: sha512-7LB+Bh+Ut7cfmO0m244/asvtIGQr5pG5Rvjz/l1Rnz1kDzM02pSX9jPaS0p+90H5I1x4d1FkCew+B7MOnoatNw==} cpu: [arm64] os: [win32] -<<<<<<< HEAD - '@rollup/rollup-win32-ia32-msvc@4.21.3': - resolution: {integrity: sha512-nMIdKnfZfzn1Vsk+RuOvl43ONTZXoAPUUxgcU0tXooqg4YrAqzfKzVenqqk2g5efWh46/D28cKFrOzDSW28gTA==} - cpu: [ia32] -======= - '@rollup/rollup-win32-arm64-msvc@4.22.2': - resolution: {integrity: sha512-t/YgCbZ638R/r7IKb9yCM6nAek1RUvyNdfU0SHMDLOf6GFe/VG1wdiUAsxTWHKqjyzkRGg897ZfCpdo1bsCSsA==} + '@rollup/rollup-win32-arm64-msvc@4.22.4': + resolution: {integrity: sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==} cpu: [arm64] ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 os: [win32] '@rollup/rollup-win32-ia32-msvc@4.22.0': @@ -4991,15 +4612,9 @@ packages: cpu: [ia32] os: [win32] -<<<<<<< HEAD - '@rollup/rollup-win32-x64-msvc@4.21.3': - resolution: {integrity: sha512-fOvu7PCQjAj4eWDEuD8Xz5gpzFqXzGlxHZozHP4b9Jxv9APtdxL6STqztDzMLuRXEc4UpXGGhx029Xgm91QBeA==} - cpu: [x64] -======= - '@rollup/rollup-win32-ia32-msvc@4.22.2': - resolution: {integrity: sha512-kTmX5uGs3WYOA+gYDgI6ITkZng9SP71FEMoHNkn+cnmb9Zuyyay8pf0oO5twtTwSjNGy1jlaWooTIr+Dw4tIbw==} + '@rollup/rollup-win32-ia32-msvc@4.22.4': + resolution: {integrity: sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==} cpu: [ia32] ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 os: [win32] '@rollup/rollup-win32-x64-msvc@4.22.0': @@ -5007,22 +4622,8 @@ packages: cpu: [x64] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.22.2': - resolution: {integrity: sha512-Yy8So+SoRz8I3NS4Bjh91BICPOSVgdompTIPYTByUqU66AXSIOgmW3Lv1ke3NORPqxdF+RdrZET+8vYai6f4aA==} -======= - '@rollup/rollup-win32-arm64-msvc@4.22.4': - resolution: {integrity: sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==} - cpu: [arm64] - os: [win32] - - '@rollup/rollup-win32-ia32-msvc@4.22.4': - resolution: {integrity: sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==} - cpu: [ia32] - os: [win32] - '@rollup/rollup-win32-x64-msvc@4.22.4': resolution: {integrity: sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==} ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 cpu: [x64] os: [win32] @@ -5051,22 +4652,6 @@ packages: '@sec-ant/readable-stream@0.4.1': resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} -<<<<<<< HEAD - '@shikijs/core@1.17.0': - resolution: {integrity: sha512-Mkk4Mp4bNnW1kytU8I7S5PK5teNSe0iKlfqxPss4sdwnlcU8a2N62Z3te2gVmZfU9t1HF6L3wyWuM43IvEeEsg==} - - '@shikijs/engine-javascript@1.17.0': - resolution: {integrity: sha512-EiBVlxmzJZdC2ypzn8k+vxLngbBNgHLS4RilwrFOABGRc72kUZubbD/6Chrq2RcVtD3yq1GtiiIdFMGd9BTX3Q==} - - '@shikijs/engine-oniguruma@1.17.0': - resolution: {integrity: sha512-nsXzJGLQ0fhKmA4Gwt1cF7vC8VuZ1HSDrTRuj48h/qDeX/TzmOlTDXQ3uPtyuhyg/2rbZRzNhN8UFU4fSnQfXg==} - - '@shikijs/transformers@1.17.0': - resolution: {integrity: sha512-C/s6z0knkWBVRG6cmklTUn+70URKVE8qlQuFg6Bi/9iqpX68NZloZhxCtVHeTd56pit15hivTlgSAY+SP7C8hA==} - - '@shikijs/types@1.17.0': - resolution: {integrity: sha512-Tvu2pA69lbpXB+MmgIaROP1tio8y0uYvKb5Foh3q0TJBTAJuaoa5eDEtS/0LquyveacsiVrYF4uEZILju+7Ybg==} -======= '@shikijs/core@1.18.0': resolution: {integrity: sha512-VK4BNVCd2leY62Nm2JjyxtRLkyrZT/tv104O81eyaCjHq4Adceq2uJVFJJAIof6lT1mBwZrEo2qT/T+grv3MQQ==} @@ -5081,7 +4666,6 @@ packages: '@shikijs/types@1.18.0': resolution: {integrity: sha512-O9N36UEaGGrxv1yUrN2nye7gDLG5Uq0/c1LyfmxsvzNPqlHzWo9DI0A4+fhW2y3bGKuQu/fwS7EPdKJJCowcVA==} ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c '@shikijs/vscode-textmate@9.2.2': resolution: {integrity: sha512-TMp15K+GGYrWlZM8+Lnj9EaHEFmOen0WJBrfa17hF7taDOYthuPPV0GWzfd/9iMij0akS/8Yw2ikquH7uVi/fg==} @@ -5156,7 +4740,7 @@ packages: '@tanstack/vue-virtual@3.10.7': resolution: {integrity: sha512-OSK1fkvz4GaBhF80KVmBsJZoMI9ncVaUU//pI8OqTdBnepw467zcuF2Y+Ia1VC0CPYfUEALyS8n4Ar0RI/7ASg==} peerDependencies: - vue: 3.5.6 + vue: 3.5.7 '@tinymce/tinymce-vue@6.0.1': resolution: {integrity: sha512-VzjI8AKlNrrsosIk3WuBez6kubqPsPMeaButkRLuts77uo4e2EwPRFX+VyB6fHbMGHwUPK22zNjOUGMvJFZFCw==} @@ -5465,30 +5049,30 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 + '@vue/compiler-core@3.5.6': + resolution: {integrity: sha512-r+gNu6K4lrvaQLQGmf+1gc41p3FO2OUJyWmNqaIITaJU6YFiV5PtQSFZt8jfztYyARwqhoCayjprC7KMvT3nRA==} + '@vue/compiler-core@3.5.7': resolution: {integrity: sha512-A0gay3lK71MddsSnGlBxRPOugIVdACze9L/rCo5X5srCyjQfZOfYtSFMJc3aOZCM+xN55EQpb4R97rYn/iEbSw==} - '@vue/compiler-core@3.5.8': - resolution: {integrity: sha512-Uzlxp91EPjfbpeO5KtC0KnXPkuTfGsNDeaKQJxQN718uz+RqDYarEf7UhQJGK+ZYloD2taUbHTI2J4WrUaZQNA==} + '@vue/compiler-dom@3.5.6': + resolution: {integrity: sha512-xRXqxDrIqK8v8sSScpistyYH0qYqxakpsIvqMD2e5sV/PXQ1mTwtXp4k42yHK06KXxKSmitop9e45Ui/3BrTEw==} '@vue/compiler-dom@3.5.7': resolution: {integrity: sha512-GYWl3+gO8/g0ZdYaJ18fYHdI/WVic2VuuUd1NsPp60DWXKy+XjdhFsDW7FbUto8siYYZcosBGn9yVBkjhq1M8Q==} - '@vue/compiler-dom@3.5.8': - resolution: {integrity: sha512-GUNHWvoDSbSa5ZSHT9SnV5WkStWfzJwwTd6NMGzilOE/HM5j+9EB9zGXdtu/fCNEmctBqMs6C9SvVPpVPuk1Eg==} + '@vue/compiler-sfc@3.5.6': + resolution: {integrity: sha512-pjWJ8Kj9TDHlbF5LywjVso+BIxCY5wVOLhkEXRhuCHDxPFIeX1zaFefKs8RYoHvkSMqRWt93a0f2gNJVJixHwg==} '@vue/compiler-sfc@3.5.7': resolution: {integrity: sha512-EjOJtCWJrC7HqoCEzOwpIYHm+JH7YmkxC1hG6VkqIukYRqj8KFUlTLK6hcT4nGgtVov2+ZfrdrRlcaqS78HnBA==} - '@vue/compiler-sfc@3.5.8': - resolution: {integrity: sha512-taYpngQtSysrvO9GULaOSwcG5q821zCoIQBtQQSx7Uf7DxpR6CIHR90toPr9QfDD2mqHQPCSgoWBvJu0yV9zjg==} + '@vue/compiler-ssr@3.5.6': + resolution: {integrity: sha512-VpWbaZrEOCqnmqjE83xdwegtr5qO/2OPUC6veWgvNqTJ3bYysz6vY3VqMuOijubuUYPRpG3OOKIh9TD0Stxb9A==} '@vue/compiler-ssr@3.5.7': resolution: {integrity: sha512-oZx+jXP2k5arV/8Ly3TpQbfFyimMw2ANrRqvHJoKjPqtEzazxQGZjCLOfq8TnZ3wy2TOXdqfmVp4q7FyYeHV4g==} - '@vue/compiler-ssr@3.5.8': - resolution: {integrity: sha512-W96PtryNsNG9u0ZnN5Q5j27Z/feGrFV6zy9q5tzJVyJaLiwYxvC0ek4IXClZygyhjm+XKM7WD9pdKi/wIRVC/Q==} - '@vue/compiler-vue2@2.7.16': resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==} @@ -5534,6 +5118,9 @@ packages: peerDependencies: vue: 3.5.7 + '@vue/shared@3.5.6': + resolution: {integrity: sha512-eidH0HInnL39z6wAt6SFIwBrvGOpDWsDxlw3rCgo1B+CQ1781WzQUSU3YjxgdkcJo9Q8S6LmXTkvI+cLHGkQfA==} + '@vue/shared@3.5.7': resolution: {integrity: sha512-NBE1PBIvzIedxIc2RZiKXvGbJkrZ2/hLf3h8GlS4/sP9xcXEZMFWOazFkNd6aGeUCMaproe5MHVYB3/4AW9q9g==} @@ -5645,6 +5232,10 @@ packages: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} + agent-base@7.1.1: + resolution: {integrity: sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==} + engines: {node: '>= 14'} + agentkeepalive@4.5.0: resolution: {integrity: sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==} engines: {node: '>= 8.0.0'} @@ -6448,6 +6039,10 @@ packages: resolution: {integrity: sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==} engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'} + cssstyle@4.1.0: + resolution: {integrity: sha512-h66W1URKpBS5YMI/V8PyXvTMFT8SupJ1IzoIV8IeBC/ji8WVmrO8dGlTi+2dh6whmdk6BiKJLD/ZBkhWbcg6nA==} + engines: {node: '>=18'} + csstype@3.0.11: resolution: {integrity: sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==} @@ -6467,6 +6062,10 @@ packages: resolution: {integrity: sha512-wAV9QHOsNbwnWdNW2FYvE1P56wtgSbM+3SZcdGiWQILwVjACCXDCI3Ai8QlCjMDB8YK5zySiXZYBiwGmNY3lnw==} engines: {node: '>=12'} + data-urls@5.0.0: + resolution: {integrity: sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==} + engines: {node: '>=18'} + data-view-buffer@1.0.1: resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==} engines: {node: '>= 0.4'} @@ -6552,6 +6151,9 @@ packages: resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==} engines: {node: '>=0.10.0'} + decimal.js@10.4.3: + resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==} + deep-eql@5.0.2: resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==} engines: {node: '>=6'} @@ -6753,13 +6355,8 @@ packages: engines: {node: '>=0.10.0'} hasBin: true -<<<<<<< HEAD electron-to-chromium@1.5.19: resolution: {integrity: sha512-kpLJJi3zxTR1U828P+LIUDZ5ohixyo68/IcYOHLqnbTPr/wdgn4i1ECvmALN9E16JPA6cvCG5UG79gVwVdEK5w==} -======= - electron-to-chromium@1.5.27: - resolution: {integrity: sha512-o37j1vZqCoEgBuWWXLHQgTN/KDKe7zwpiY5CPeq2RvUqOyJw9xnrULzZAEVQ5p4h+zjMk7hgtOoPdnLxr7m/jw==} ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 element-plus@2.8.3: resolution: {integrity: sha512-BXQOyDf0s7JHyNEV8iaO+iaOzTZPsBXVKMzMI967vLCodUBDLrtiY5vglAn1YEebQcUOEUMhGcttTpIvEkcBjQ==} @@ -7544,8 +7141,8 @@ packages: resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} engines: {node: '>= 0.4'} - hast-util-to-html@9.0.2: - resolution: {integrity: sha512-RP5wNpj5nm1Z8cloDv4Sl4RS8jH5HYa0v93YB6Wb4poEzgMo/dAAL0KcT4974dCjcNG5pkLqTImeFHHCwwfY3g==} + hast-util-to-html@9.0.3: + resolution: {integrity: sha512-M17uBDzMJ9RPCqLMO92gNNUDuBSq10a25SDBI08iCCxmorf4Yy6sYHK57n9WAbRAAaU+DuR4W6GN9K4DFZesYg==} hast-util-whitespace@3.0.0: resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==} @@ -7568,6 +7165,10 @@ packages: hosted-git-info@2.8.9: resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==} + html-encoding-sniffer@4.0.0: + resolution: {integrity: sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==} + engines: {node: '>=18'} + html-minifier-terser@6.1.0: resolution: {integrity: sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==} engines: {node: '>=12'} @@ -7602,6 +7203,10 @@ packages: resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==} engines: {node: '>= 6'} + http-proxy-agent@7.0.2: + resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==} + engines: {node: '>= 14'} + http-shutdown@1.2.2: resolution: {integrity: sha512-S9wWkJ/VSY9/k4qcjG318bqJNruzE4HySUhFYknwmu6LBP97KLLfwNf+n4V1BHurvFNkSKLFnK/RsuUnRTf9Vw==} engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'} @@ -7610,6 +7215,10 @@ packages: resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} engines: {node: '>= 6'} + https-proxy-agent@7.0.5: + resolution: {integrity: sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==} + engines: {node: '>= 14'} + httpxy@0.1.5: resolution: {integrity: sha512-hqLDO+rfststuyEUTWObQK6zHEEmZ/kaIP2/zclGGZn6X8h/ESTWg+WKecQ/e5k4nPswjzZD+q2VqZIbr15CoQ==} @@ -7861,6 +7470,9 @@ packages: resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==} engines: {node: '>=0.10.0'} + is-potential-custom-element-name@1.0.1: + resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==} + is-reference@1.2.1: resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==} @@ -8000,7 +7612,6 @@ packages: resolution: {integrity: sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg==} engines: {node: '>=12.0.0'} -<<<<<<< HEAD jsdom@25.0.1: resolution: {integrity: sha512-8i7LzZj7BF8uplX+ZyOlIz86V6TAsSs+np6m1kpW9u0JWi4z/1t+FzcK1aek+ybTnAC4KhBL4uXCNT0wcUIeCw==} engines: {node: '>=18'} @@ -8013,8 +7624,6 @@ packages: jsencrypt@3.3.2: resolution: {integrity: sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A==} -======= ->>>>>>> 2a83f1d666729c72df7e02be2d8665fbf2526825 jsesc@0.5.0: resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==} hasBin: true @@ -8645,6 +8254,9 @@ packages: nth-check@2.1.1: resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==} + nwsapi@2.2.12: + resolution: {integrity: sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==} + nypm@0.3.11: resolution: {integrity: sha512-E5GqaAYSnbb6n1qZyik2wjPDZON43FqOJO59+3OkWrnmQtjggrMOVnsyzfjxp/tS6nlYJBA4zRA5jSM2YaadMg==} engines: {node: ^14.16.0 || >=16.10.0} @@ -8670,8 +8282,8 @@ packages: resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==} engines: {node: '>= 0.4'} - ofetch@1.4.0: - resolution: {integrity: sha512-MuHgsEhU6zGeX+EMh+8mSMrYTnsqJQQrpM00Q6QHMKNqQ0bKy0B43tk8tL1wg+CnsSTy1kg4Ir2T5Ig6rD+dfQ==} + ofetch@1.3.4: + resolution: {integrity: sha512-KLIET85ik3vhEfS+3fDlc/BAZiAp+43QEC/yCo5zkNoY2YaKvNkOaFr/6wCFgFH1kuYQM5pMNi0Tg8koiIemtw==} ohash@1.1.3: resolution: {integrity: sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==} @@ -8691,8 +8303,8 @@ packages: resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==} engines: {node: '>=18'} - oniguruma-to-js@0.3.3: - resolution: {integrity: sha512-m90/WEhgs8g4BxG37+Nu3YrMfJDs2YXtYtIllhsEPR+wP3+K4EZk6dDUvy2v2K4MNFDDOYKL4/yqYPXDqyozTQ==} + oniguruma-to-js@0.4.3: + resolution: {integrity: sha512-X0jWUcAlxORhOqqBREgPMgnshB7ZGYszBNspP+tS9hPD3l13CdaXcHbgImoHUHlrvGx/7AvFEkTRhAGYh+jzjQ==} open@10.1.0: resolution: {integrity: sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==} @@ -8782,8 +8394,8 @@ packages: resolution: {integrity: sha512-uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg==} engines: {node: '>=8'} - parse-imports@2.2.1: - resolution: {integrity: sha512-OL/zLggRp8mFhKL0rNORUTR4yBYujK/uU+xZL+/0Rgm2QE4nLO9v8PzEweSJEbMGKmDRjJE4R3IMJlL2di4JeQ==} + parse-imports@2.1.1: + resolution: {integrity: sha512-TDT4HqzUiTMO1wJRwg/t/hYk8Wdp3iF/ToMIlAoVQfL1Xs/sTxq1dKWSMjMbQmIarfWKymOyly40+zmPHXMqCA==} engines: {node: '>= 18'} parse-json@5.2.0: @@ -9725,28 +9337,18 @@ packages: engines: {node: '>=10.0.0'} hasBin: true - rollup@3.29.5: - resolution: {integrity: sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==} + rollup@3.29.4: + resolution: {integrity: sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true -<<<<<<< HEAD - rollup@4.21.3: - resolution: {integrity: sha512-7sqRtBNnEbcBtMeRVc6VRsJMmpI+JU1z9VTvW8D4gXIYQFz0aLcsE6rRkyghZkLfEgUZgVvOG7A5CVz/VW5GIA==} - engines: {node: '>=18.0.0', npm: '>=8.0.0'} - hasBin: true - rollup@4.22.0: resolution: {integrity: sha512-W21MUIFPZ4+O2Je/EU+GP3iz7PH4pVPUXSbEZdatQnxo29+3rsUjgrJmzuAZU24z7yRAnFN6ukxeAhZh/c7hzg==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true - rollup@4.22.2: - resolution: {integrity: sha512-JWWpTrZmqQGQWt16xvNn6KVIUz16VtZwl984TKw0dfqqRpFwtLJYYk1/4BTgplndMQKWUk/yB4uOShYmMzA2Vg==} -======= rollup@4.22.4: resolution: {integrity: sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==} ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -9754,6 +9356,9 @@ packages: resolution: {integrity: sha512-G7689wvCM0szMFXUAhi3GfNGcSPlndg077cdRWoq7UegOAwfU2MJ0jD7s7jB+2ppKA75Kr/O0HwAP9+rRdBctg==} engines: {node: ^14.13.1 || >=16.0.0} + rrweb-cssom@0.7.1: + resolution: {integrity: sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==} + run-applescript@7.0.0: resolution: {integrity: sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==} engines: {node: '>=18'} @@ -9790,6 +9395,10 @@ packages: sax@1.4.1: resolution: {integrity: sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==} + saxes@6.0.0: + resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==} + engines: {node: '>=v12.22.7'} + scroll-into-view-if-needed@2.2.31: resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==} @@ -9878,13 +9487,8 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} -<<<<<<< HEAD - shiki@1.17.0: - resolution: {integrity: sha512-VZf8cPShRwfzPcaswv81+YP7qJEoFwRT+Ehy6bizim7M0zG9bk8Egug550C+xS9g7rKIOPhzAlp2uEyuCxbk/A==} -======= shiki@1.18.0: resolution: {integrity: sha512-8jo7tOXr96h9PBQmOHVrltnETn1honZZY76YA79MHheGQg55jBvbm9dtU+MI5pjC5NJCFuA6rvVTLVeSW5cE4A==} ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c short-tree@3.0.0: resolution: {integrity: sha512-Yd9NFs/o9QSoH4/wTjxk4Xe0+CIzitDRN1Qg7iBeTSejKjlCg/3PbgiRwDUVuaIxD0RRdv7Iz9jKr7e0HljtUg==} @@ -10254,6 +9858,9 @@ packages: engines: {node: '>=14.0.0'} hasBin: true + symbol-tree@3.2.4: + resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} + synckit@0.6.2: resolution: {integrity: sha512-Vhf+bUa//YSTYKseDiiEuQmhGCoIF3CVBhunm3r/DQnYiGT4JssmnKQc44BIyOZRK2pKjXXAgbhfmbeoC9CJpA==} engines: {node: '>=12.20'} @@ -10366,6 +9973,13 @@ packages: resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==} engines: {node: '>=14.0.0'} + tldts-core@6.1.47: + resolution: {integrity: sha512-6SWyFMnlst1fEt7GQVAAu16EGgFK0cLouH/2Mk6Ftlwhv3Ol40L0dlpGMcnnNiiOMyD2EV/aF3S+U2nKvvLvrA==} + + tldts@6.1.47: + resolution: {integrity: sha512-R/K2tZ5MiY+mVrnSkNJkwqYT2vUv1lcT6wJvd2emGaMJ7PHUGRY4e3tUsdFCXgqxi2QgbHjL3yJgXCo40v9Hxw==} + hasBin: true + tmp@0.0.33: resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} engines: {node: '>=0.6.0'} @@ -10386,12 +10000,20 @@ packages: resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==} engines: {node: '>=6'} + tough-cookie@5.0.0: + resolution: {integrity: sha512-FRKsF7cz96xIIeMZ82ehjC3xW2E+O2+v11udrDYewUbszngYhsGa8z6YUMMzO9QJZzzyd0nGGXnML/TReX6W8Q==} + engines: {node: '>=16'} + tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} tr46@1.0.1: resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} + tr46@5.0.0: + resolution: {integrity: sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==} + engines: {node: '>=18'} + treemate@0.3.11: resolution: {integrity: sha512-M8RGFoKtZ8dF+iwJfAJTOH/SM4KluKOKRJpjCMhI8bG3qB74zrFoArKZ62ll0Fr3mqkMJiQOmWYkdYgDeITYQg==} @@ -10606,7 +10228,7 @@ packages: peerDependencies: '@babel/parser': ^7.15.8 '@nuxt/kit': ^3.2.2 - vue: 3.5.6 + vue: 3.5.7 peerDependenciesMeta: '@babel/parser': optional: true @@ -10794,6 +10416,37 @@ packages: peerDependencies: vite: ^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0 + vite@5.4.6: + resolution: {integrity: sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@types/node': ^18.0.0 || >=20.0.0 + less: '*' + lightningcss: ^1.21.0 + sass: '*' + sass-embedded: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + sass-embedded: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + vite@5.4.7: resolution: {integrity: sha512-5l2zxqMEPVENgvzTuBpHer2awaetimj2BGkhBPdnwKbPNOlHsODU+oiazEZzLK7KhAnOrO+XGYJYn4ZlUhDtDQ==} engines: {node: ^18.0.0 || >=20.0.0} @@ -10880,7 +10533,7 @@ packages: resolution: {integrity: sha512-Gmu2t4Exz3pQdtAsb7wINREx2nswNW+FV+q8S1wmsmeC3OLio5RkybRLsErP1b8+suqsVD/7t0Cx/XmBpQnHJA==} engines: {yarn: '>=1.22.19'} peerDependencies: - vue: 3.5.6 + vue: 3.5.7 vue-component-type-helpers@2.1.6: resolution: {integrity: sha512-ng11B8B/ZADUMMOsRbqv0arc442q7lifSubD0v8oDXIFoMg/mXwAPUunrroIDkY+mcD0dHKccdaznSVp8EoX3w==} @@ -10912,7 +10565,7 @@ packages: resolution: {integrity: sha512-e9bP41DYYIc2tWaB6KuwqFJq5odZ8/GkE6vHQuGcbPn37kGk4a3n1RNw3ZYeDrl66NWXgTlOfS+M6NKkowmkWw==} engines: {node: '>= 10.0.0', npm: '>= 5.0.0'} peerDependencies: - vue: 3.5.6 + vue: 3.5.7 vue-router@4.4.5: resolution: {integrity: sha512-4fKZygS8cH1yCyuabAXGUAsyi1b2/o/OKgu/RUb+znIYOxPRxdkytJEx+0wGcpBE1pX6vUgh5jwWOKRGvuA/7Q==} @@ -10944,7 +10597,6 @@ packages: peerDependencies: vue: 3.5.7 -<<<<<<< HEAD w3c-keyname@2.2.8: resolution: {integrity: sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==} @@ -10952,8 +10604,6 @@ packages: resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==} engines: {node: '>=18'} -======= ->>>>>>> 2a83f1d666729c72df7e02be2d8665fbf2526825 warning@4.0.3: resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==} @@ -10990,6 +10640,10 @@ packages: resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==} engines: {node: '>=18'} + whatwg-url@14.0.0: + resolution: {integrity: sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==} + engines: {node: '>=18'} + whatwg-url@5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} @@ -11106,6 +10760,18 @@ packages: resolution: {integrity: sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + ws@8.18.0: + resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==} + engines: {node: '>=10.0.0'} + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: '>=5.0.2' + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + xdg-basedir@5.1.0: resolution: {integrity: sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==} engines: {node: '>=12'} @@ -11114,6 +10780,13 @@ packages: resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==} engines: {node: '>=12'} + xml-name-validator@5.0.0: + resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==} + engines: {node: '>=18'} + + xmlchars@2.2.0: + resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==} + y18n@4.0.3: resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==} @@ -11197,13 +10870,8 @@ packages: zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} -<<<<<<< HEAD - zx@8.1.6: - resolution: {integrity: sha512-SYAriWG+i2CFqMOJcF8QayI8wprlMYQsrmP6tFD7rSPnDLcImNSW7n/8crOYvNVrB2EFgz8LAQk23U1+Y7WrKA==} -======= zx@8.1.8: resolution: {integrity: sha512-m8s48skYQ8EcRz9KXfc7rZCjqlZevOGiNxq5tNhDiGnhOvXKRGxVr+ajUma9B6zxMdHGSSbnjV/R/r7Ue2xd+A==} ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c engines: {node: '>= 12.17.0'} hasBin: true @@ -13438,19 +13106,11 @@ snapshots: '@floating-ui/utils@0.2.7': {} -<<<<<<< HEAD - '@floating-ui/vue@1.1.4(vue@3.5.6(typescript@5.6.2))': + '@floating-ui/vue@1.1.4(vue@3.5.7(typescript@5.6.2))': dependencies: '@floating-ui/dom': 1.6.10 '@floating-ui/utils': 0.2.7 - vue-demi: 0.14.10(vue@3.5.6(typescript@5.6.2)) -======= - '@floating-ui/vue@1.1.5(vue@3.5.7(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.7(typescript@5.6.2)) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 transitivePeerDependencies: - '@vue/composition-api' - vue @@ -13542,28 +13202,12 @@ snapshots: '@intlify/shared@10.0.3': {} -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - '@intlify/unplugin-vue-i18n@5.0.0(@vue/compiler-dom@3.5.6)(eslint@9.10.0(jiti@1.21.6))(rollup@4.22.0)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.6(typescript@5.6.2)))(vue@3.5.6(typescript@5.6.2))(webpack-sources@3.2.3)': -======= - '@intlify/unplugin-vue-i18n@5.0.0(@vue/compiler-dom@3.5.7)(eslint@9.11.0(jiti@1.21.6))(rollup@4.22.2)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2))': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - '@intlify/unplugin-vue-i18n@5.0.0(@vue/compiler-dom@3.5.7)(eslint@9.11.0(jiti@1.21.6))(rollup@4.22.4)(typescript@5.6.2)(vue-i18n@10.0.1(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2))': ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 -======= - '@intlify/unplugin-vue-i18n@5.0.0(@vue/compiler-dom@3.5.8)(eslint@9.11.0(jiti@1.21.6))(rollup@4.22.4)(typescript@5.6.2)(vue-i18n@10.0.2(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2))': ->>>>>>> 31f6cc64164464f00a8ebfb3d83582a83d867f47 -======= - '@intlify/unplugin-vue-i18n@5.2.0(@vue/compiler-dom@3.5.8)(eslint@9.11.0(jiti@1.21.6))(rollup@4.22.4)(typescript@5.6.2)(vue-i18n@10.0.3(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2))': ->>>>>>> 2a83f1d666729c72df7e02be2d8665fbf2526825 + '@intlify/unplugin-vue-i18n@5.2.0(@vue/compiler-dom@3.5.7)(eslint@9.11.0(jiti@1.21.6))(rollup@4.22.4)(typescript@5.6.2)(vue-i18n@10.0.3(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2))(webpack-sources@3.2.3)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.0(jiti@1.21.6)) '@intlify/bundle-utils': 9.0.0-beta.0(vue-i18n@10.0.3(vue@3.5.7(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.8)(vue-i18n@10.0.3(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2)) + '@intlify/vue-i18n-extensions': 7.0.0(@intlify/shared@10.0.0)(@vue/compiler-dom@3.5.7)(vue-i18n@10.0.3(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2)) '@rollup/pluginutils': 5.1.0(rollup@4.22.4) '@typescript-eslint/scope-manager': 7.18.0 '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.6.2) @@ -13574,13 +13218,8 @@ snapshots: pathe: 1.1.2 picocolors: 1.1.0 source-map-js: 1.2.1 -<<<<<<< HEAD unplugin: 1.14.1(webpack-sources@3.2.3) - vue: 3.5.6(typescript@5.6.2) -======= - unplugin: 1.14.1 vue: 3.5.7(typescript@5.6.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 optionalDependencies: vue-i18n: 10.0.3(vue@3.5.7(typescript@5.6.2)) transitivePeerDependencies: @@ -13591,12 +13230,12 @@ snapshots: - typescript - webpack-sources - '@intlify/vue-i18n-extensions@7.0.0(@intlify/shared@10.0.0)(@vue/compiler-dom@3.5.8)(vue-i18n@10.0.3(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2))': + '@intlify/vue-i18n-extensions@7.0.0(@intlify/shared@10.0.0)(@vue/compiler-dom@3.5.7)(vue-i18n@10.0.3(vue@3.5.7(typescript@5.6.2)))(vue@3.5.7(typescript@5.6.2))': dependencies: '@babel/parser': 7.25.6 optionalDependencies: '@intlify/shared': 10.0.0 - '@vue/compiler-dom': 3.5.8 + '@vue/compiler-dom': 3.5.7 vue: 3.5.7(typescript@5.6.2) vue-i18n: 10.0.3(vue@3.5.7(typescript@5.6.2)) @@ -13794,29 +13433,12 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.17.1 -<<<<<<< HEAD -<<<<<<< HEAD - '@nolebase/ui@2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.1)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2)': + '@nolebase/ui@2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2)': dependencies: '@iconify-json/octicon': 1.2.0 less: 4.2.0 - vitepress: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.1)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2) -======= - '@nolebase/ui@2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.2)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2)': - dependencies: - '@iconify-json/octicon': 1.2.0 - less: 4.2.0 - vitepress: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.2)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c - vue: 3.5.6(typescript@5.6.2) -======= - '@nolebase/ui@2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2)': - dependencies: - '@iconify-json/octicon': 1.2.0 - less: 4.2.0 - vitepress: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) + vitepress: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2) vue: 3.5.7(typescript@5.6.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 transitivePeerDependencies: - '@algolia/client-search' - '@types/node' @@ -13846,24 +13468,10 @@ snapshots: - typescript - universal-cookie -<<<<<<< HEAD -<<<<<<< HEAD - '@nolebase/vitepress-plugin-git-changelog@2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.1)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2)': + '@nolebase/vitepress-plugin-git-changelog@2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2)': dependencies: '@iconify-json/octicon': 1.2.0 - '@nolebase/ui': 2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.1)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2) -======= - '@nolebase/vitepress-plugin-git-changelog@2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.2)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2)': - dependencies: - '@iconify-json/octicon': 1.2.0 - '@nolebase/ui': 2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.2)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - '@nolebase/vitepress-plugin-git-changelog@2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2)': - dependencies: - '@iconify-json/octicon': 1.2.0 - '@nolebase/ui': 2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@nolebase/ui': 2.5.0(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2) colorette: 2.0.20 date-fns: 3.6.0 defu: 6.1.4 @@ -13873,15 +13481,7 @@ snapshots: gray-matter: 4.0.3 less: 4.2.0 uncrypto: 0.1.3 -<<<<<<< HEAD -<<<<<<< HEAD - vitepress: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.1)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2) -======= - vitepress: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.2)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - vitepress: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + vitepress: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2) transitivePeerDependencies: - '@algolia/client-search' - '@types/node' @@ -13921,21 +13521,9 @@ snapshots: mkdirp: 1.0.4 rimraf: 3.0.2 -<<<<<<< HEAD -<<<<<<< HEAD - '@nuxt/kit@3.13.2(rollup@4.22.0)(webpack-sources@3.2.3)': + '@nuxt/kit@3.13.2(rollup@3.29.4)': dependencies: - '@nuxt/schema': 3.13.2(rollup@4.22.0)(webpack-sources@3.2.3) -======= - '@nuxt/kit@3.13.2(rollup@4.22.2)': - dependencies: - '@nuxt/schema': 3.13.2(rollup@4.22.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - '@nuxt/kit@3.13.2(rollup@4.22.4)': - dependencies: - '@nuxt/schema': 3.13.2(rollup@4.22.4) ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + '@nuxt/schema': 3.13.2(rollup@3.29.4) c12: 1.11.2 consola: 3.2.3 defu: 6.1.4 @@ -13952,17 +13540,8 @@ snapshots: scule: 1.3.0 semver: 7.6.3 ufo: 1.5.4 -<<<<<<< HEAD unctx: 2.3.1(webpack-sources@3.2.3) - unimport: 3.12.0(rollup@4.22.0)(webpack-sources@3.2.3) -======= - unctx: 2.3.1 -<<<<<<< HEAD - unimport: 3.12.0(rollup@4.22.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - unimport: 3.12.0(rollup@4.22.4) ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + unimport: 3.12.0(rollup@3.29.4) untyped: 1.4.2 transitivePeerDependencies: - magicast @@ -13970,15 +13549,36 @@ snapshots: - supports-color - webpack-sources -<<<<<<< HEAD -<<<<<<< HEAD - '@nuxt/schema@3.13.2(rollup@4.22.0)(webpack-sources@3.2.3)': -======= - '@nuxt/schema@3.13.2(rollup@4.22.2)': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - '@nuxt/schema@3.13.2(rollup@4.22.4)': ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + '@nuxt/kit@3.13.2(rollup@4.22.4)': + dependencies: + '@nuxt/schema': 3.13.2(rollup@4.22.4) + c12: 1.11.2 + consola: 3.2.3 + defu: 6.1.4 + destr: 2.0.3 + globby: 14.0.2 + hash-sum: 2.0.0 + ignore: 5.3.2 + jiti: 1.21.6 + klona: 2.0.6 + knitwork: 1.1.0 + mlly: 1.7.1 + pathe: 1.1.2 + pkg-types: 1.2.0 + scule: 1.3.0 + semver: 7.6.3 + ufo: 1.5.4 + unctx: 2.3.1(webpack-sources@3.2.3) + unimport: 3.12.0(rollup@4.22.4) + untyped: 1.4.2 + transitivePeerDependencies: + - magicast + - rollup + - supports-color + - webpack-sources + optional: true + + '@nuxt/schema@3.13.2(rollup@3.29.4)': dependencies: compatx: 0.1.8 consola: 3.2.3 @@ -13990,21 +13590,33 @@ snapshots: std-env: 3.7.0 ufo: 1.5.4 uncrypto: 0.1.3 -<<<<<<< HEAD -<<<<<<< HEAD - unimport: 3.12.0(rollup@4.22.0)(webpack-sources@3.2.3) -======= - unimport: 3.12.0(rollup@4.22.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - unimport: 3.12.0(rollup@4.22.4) ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + unimport: 3.12.0(rollup@3.29.4) untyped: 1.4.2 transitivePeerDependencies: - rollup - supports-color - webpack-sources + '@nuxt/schema@3.13.2(rollup@4.22.4)': + dependencies: + compatx: 0.1.8 + consola: 3.2.3 + defu: 6.1.4 + hookable: 5.5.3 + pathe: 1.1.2 + pkg-types: 1.2.0 + scule: 1.3.0 + std-env: 3.7.0 + ufo: 1.5.4 + uncrypto: 0.1.3 + unimport: 3.12.0(rollup@4.22.4) + untyped: 1.4.2 + transitivePeerDependencies: + - rollup + - supports-color + - webpack-sources + optional: true + '@one-ini/wasm@0.1.1': {} '@parcel/watcher-android-arm64@2.4.1': @@ -14089,35 +13701,23 @@ snapshots: '@pnpm/network.ca-file': 1.0.2 config-chain: 1.1.13 -<<<<<<< HEAD - '@polka/url@1.0.0-next.25': {} -======= '@polka/url@1.0.0-next.28': {} ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c '@radix-icons/vue@1.0.0(vue@3.5.7(typescript@5.6.2))': dependencies: vue: 3.5.7(typescript@5.6.2) - '@rollup/plugin-alias@5.1.0(rollup@3.29.5)': + '@rollup/plugin-alias@5.1.0(rollup@3.29.4)': dependencies: slash: 4.0.0 optionalDependencies: - rollup: 3.29.5 + rollup: 3.29.4 -<<<<<<< HEAD - '@rollup/plugin-alias@5.1.0(rollup@4.21.3)': + '@rollup/plugin-alias@5.1.0(rollup@4.22.0)': dependencies: slash: 4.0.0 optionalDependencies: - rollup: 4.21.3 -======= - '@rollup/plugin-alias@5.1.0(rollup@4.22.4)': - dependencies: - slash: 4.0.0 - optionalDependencies: - rollup: 4.22.4 ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + rollup: 4.22.0 '@rollup/plugin-babel@5.3.1(@babel/core@7.25.2)(rollup@2.79.1)': dependencies: @@ -14128,73 +13728,47 @@ snapshots: transitivePeerDependencies: - supports-color - '@rollup/plugin-commonjs@25.0.8(rollup@3.29.5)': + '@rollup/plugin-commonjs@25.0.8(rollup@3.29.4)': dependencies: - '@rollup/pluginutils': 5.1.0(rollup@3.29.5) + '@rollup/pluginutils': 5.1.0(rollup@3.29.4) commondir: 1.0.1 estree-walker: 2.0.2 glob: 8.1.0 is-reference: 1.2.1 magic-string: 0.30.11 optionalDependencies: - rollup: 3.29.5 + rollup: 3.29.4 -<<<<<<< HEAD - '@rollup/plugin-commonjs@25.0.8(rollup@4.21.3)': + '@rollup/plugin-commonjs@25.0.8(rollup@4.22.0)': dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.21.3) -======= - '@rollup/plugin-commonjs@25.0.8(rollup@4.22.4)': - dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.22.4) ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + '@rollup/pluginutils': 5.1.0(rollup@4.22.0) 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.21.3 + rollup: 4.22.0 - '@rollup/plugin-inject@5.0.5(rollup@4.21.3)': + '@rollup/plugin-inject@5.0.5(rollup@4.22.0)': dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.21.3) + '@rollup/pluginutils': 5.1.0(rollup@4.22.0) estree-walker: 2.0.2 magic-string: 0.30.11 optionalDependencies: - rollup: 4.21.3 -======= - rollup: 4.22.4 + rollup: 4.22.0 - '@rollup/plugin-inject@5.0.5(rollup@4.22.4)': + '@rollup/plugin-json@6.1.0(rollup@3.29.4)': dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.22.4) - estree-walker: 2.0.2 - magic-string: 0.30.11 + '@rollup/pluginutils': 5.1.0(rollup@3.29.4) optionalDependencies: - rollup: 4.22.4 ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + rollup: 3.29.4 - '@rollup/plugin-json@6.1.0(rollup@3.29.5)': + '@rollup/plugin-json@6.1.0(rollup@4.22.0)': dependencies: - '@rollup/pluginutils': 5.1.0(rollup@3.29.5) + '@rollup/pluginutils': 5.1.0(rollup@4.22.0) optionalDependencies: - rollup: 3.29.5 - -<<<<<<< HEAD - '@rollup/plugin-json@6.1.0(rollup@4.21.3)': - dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.21.3) - optionalDependencies: - rollup: 4.21.3 -======= - '@rollup/plugin-json@6.1.0(rollup@4.22.4)': - dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.22.4) - optionalDependencies: - rollup: 4.22.4 ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + rollup: 4.22.0 '@rollup/plugin-node-resolve@15.2.3(rollup@2.79.1)': dependencies: @@ -14207,37 +13781,27 @@ snapshots: optionalDependencies: rollup: 2.79.1 - '@rollup/plugin-node-resolve@15.2.3(rollup@3.29.5)': + '@rollup/plugin-node-resolve@15.2.3(rollup@3.29.4)': dependencies: - '@rollup/pluginutils': 5.1.0(rollup@3.29.5) + '@rollup/pluginutils': 5.1.0(rollup@3.29.4) '@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: - rollup: 3.29.5 + rollup: 3.29.4 -<<<<<<< HEAD - '@rollup/plugin-node-resolve@15.2.3(rollup@4.21.3)': + '@rollup/plugin-node-resolve@15.2.3(rollup@4.22.0)': dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.21.3) -======= - '@rollup/plugin-node-resolve@15.2.3(rollup@4.22.4)': - dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.22.4) ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + '@rollup/pluginutils': 5.1.0(rollup@4.22.0) '@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.21.3 -======= - rollup: 4.22.4 ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + rollup: 4.22.0 '@rollup/plugin-replace@2.4.2(rollup@2.79.1)': dependencies: @@ -14245,28 +13809,19 @@ snapshots: magic-string: 0.25.9 rollup: 2.79.1 - '@rollup/plugin-replace@5.0.7(rollup@3.29.5)': + '@rollup/plugin-replace@5.0.7(rollup@3.29.4)': dependencies: - '@rollup/pluginutils': 5.1.0(rollup@3.29.5) + '@rollup/pluginutils': 5.1.0(rollup@3.29.4) magic-string: 0.30.11 optionalDependencies: - rollup: 3.29.5 + rollup: 3.29.4 -<<<<<<< HEAD - '@rollup/plugin-replace@5.0.7(rollup@4.21.3)': + '@rollup/plugin-replace@5.0.7(rollup@4.22.0)': dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.21.3) + '@rollup/pluginutils': 5.1.0(rollup@4.22.0) magic-string: 0.30.11 optionalDependencies: - rollup: 4.21.3 -======= - '@rollup/plugin-replace@5.0.7(rollup@4.22.4)': - dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.22.4) - magic-string: 0.30.11 - optionalDependencies: - rollup: 4.22.4 ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + rollup: 4.22.0 '@rollup/plugin-terser@0.4.4(rollup@2.79.1)': dependencies: @@ -14276,21 +13831,13 @@ snapshots: optionalDependencies: rollup: 2.79.1 -<<<<<<< HEAD - '@rollup/plugin-terser@0.4.4(rollup@4.21.3)': -======= - '@rollup/plugin-terser@0.4.4(rollup@4.22.4)': ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + '@rollup/plugin-terser@0.4.4(rollup@4.22.0)': dependencies: serialize-javascript: 6.0.2 smob: 1.5.0 terser: 5.32.0 optionalDependencies: -<<<<<<< HEAD - rollup: 4.21.3 -======= - rollup: 4.22.4 ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + rollup: 4.22.0 '@rollup/pluginutils@3.1.0(rollup@2.79.1)': dependencies: @@ -14312,27 +13859,23 @@ snapshots: optionalDependencies: rollup: 2.79.1 - '@rollup/pluginutils@5.1.0(rollup@3.29.5)': + '@rollup/pluginutils@5.1.0(rollup@3.29.4)': dependencies: '@types/estree': 1.0.5 estree-walker: 2.0.2 picomatch: 2.3.1 optionalDependencies: - rollup: 3.29.5 - -<<<<<<< HEAD - '@rollup/pluginutils@5.1.0(rollup@4.21.3)': - dependencies: - '@types/estree': 1.0.5 - estree-walker: 2.0.2 - picomatch: 2.3.1 - optionalDependencies: - rollup: 4.21.3 + rollup: 3.29.4 '@rollup/pluginutils@5.1.0(rollup@4.22.0)': -======= + dependencies: + '@types/estree': 1.0.5 + estree-walker: 2.0.2 + picomatch: 2.3.1 + optionalDependencies: + rollup: 4.22.0 + '@rollup/pluginutils@5.1.0(rollup@4.22.4)': ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 dependencies: '@types/estree': 1.0.5 estree-walker: 2.0.2 @@ -14340,208 +13883,100 @@ snapshots: optionalDependencies: rollup: 4.22.4 -<<<<<<< HEAD -<<<<<<< HEAD - '@rollup/rollup-android-arm-eabi@4.21.3': - optional: true -======= - '@rollup/pluginutils@5.1.0(rollup@4.22.2)': - dependencies: - '@types/estree': 1.0.6 - estree-walker: 2.0.2 - picomatch: 2.3.1 - optionalDependencies: - rollup: 4.22.2 ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 - '@rollup/rollup-android-arm-eabi@4.22.0': optional: true -<<<<<<< HEAD - '@rollup/rollup-android-arm64@4.21.3': -======= - '@rollup/rollup-android-arm-eabi@4.22.2': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= '@rollup/rollup-android-arm-eabi@4.22.4': optional: true + '@rollup/rollup-android-arm64@4.22.0': + optional: true + '@rollup/rollup-android-arm64@4.22.4': ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + optional: true + + '@rollup/rollup-darwin-arm64@4.22.0': optional: true '@rollup/rollup-darwin-arm64@4.22.4': optional: true -<<<<<<< HEAD -<<<<<<< HEAD - '@rollup/rollup-darwin-arm64@4.21.3': -======= - '@rollup/rollup-android-arm64@4.22.2': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= + '@rollup/rollup-darwin-x64@4.22.0': + optional: true + '@rollup/rollup-darwin-x64@4.22.4': ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + optional: true + + '@rollup/rollup-linux-arm-gnueabihf@4.22.0': optional: true '@rollup/rollup-linux-arm-gnueabihf@4.22.4': optional: true -<<<<<<< HEAD -<<<<<<< HEAD - '@rollup/rollup-darwin-x64@4.21.3': -======= - '@rollup/rollup-darwin-arm64@4.22.2': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= + '@rollup/rollup-linux-arm-musleabihf@4.22.0': + optional: true + '@rollup/rollup-linux-arm-musleabihf@4.22.4': ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + optional: true + + '@rollup/rollup-linux-arm64-gnu@4.22.0': optional: true '@rollup/rollup-linux-arm64-gnu@4.22.4': optional: true -<<<<<<< HEAD -<<<<<<< HEAD - '@rollup/rollup-linux-arm-gnueabihf@4.21.3': -======= - '@rollup/rollup-darwin-x64@4.22.2': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= + '@rollup/rollup-linux-arm64-musl@4.22.0': + optional: true + '@rollup/rollup-linux-arm64-musl@4.22.4': ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 - optional: true - - '@rollup/rollup-linux-powerpc64le-gnu@4.22.4': - optional: true - -<<<<<<< HEAD -<<<<<<< HEAD - '@rollup/rollup-linux-arm-musleabihf@4.21.3': -======= - '@rollup/rollup-linux-arm-gnueabihf@4.22.2': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - '@rollup/rollup-linux-riscv64-gnu@4.22.4': ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 - optional: true - - '@rollup/rollup-linux-s390x-gnu@4.22.4': - optional: true - -<<<<<<< HEAD -<<<<<<< HEAD - '@rollup/rollup-linux-arm64-gnu@4.21.3': -======= - '@rollup/rollup-linux-arm-musleabihf@4.22.2': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - '@rollup/rollup-linux-x64-gnu@4.22.4': ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 - optional: true - - '@rollup/rollup-linux-x64-musl@4.22.4': - optional: true - -<<<<<<< HEAD -<<<<<<< HEAD - '@rollup/rollup-linux-arm64-musl@4.21.3': -======= - '@rollup/rollup-linux-arm64-gnu@4.22.2': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - '@rollup/rollup-win32-arm64-msvc@4.22.4': ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 - optional: true - - '@rollup/rollup-win32-ia32-msvc@4.22.4': - optional: true - -<<<<<<< HEAD -<<<<<<< HEAD - '@rollup/rollup-linux-powerpc64le-gnu@4.21.3': -======= - '@rollup/rollup-linux-arm64-musl@4.22.2': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 optional: true '@rollup/rollup-linux-powerpc64le-gnu@4.22.0': optional: true -<<<<<<< HEAD - '@rollup/rollup-linux-riscv64-gnu@4.21.3': -======= - '@rollup/rollup-linux-powerpc64le-gnu@4.22.2': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@rollup/rollup-linux-powerpc64le-gnu@4.22.4': optional: true '@rollup/rollup-linux-riscv64-gnu@4.22.0': optional: true -<<<<<<< HEAD - '@rollup/rollup-linux-s390x-gnu@4.21.3': -======= - '@rollup/rollup-linux-riscv64-gnu@4.22.2': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@rollup/rollup-linux-riscv64-gnu@4.22.4': optional: true '@rollup/rollup-linux-s390x-gnu@4.22.0': optional: true -<<<<<<< HEAD - '@rollup/rollup-linux-x64-gnu@4.21.3': -======= - '@rollup/rollup-linux-s390x-gnu@4.22.2': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@rollup/rollup-linux-s390x-gnu@4.22.4': optional: true '@rollup/rollup-linux-x64-gnu@4.22.0': optional: true -<<<<<<< HEAD - '@rollup/rollup-linux-x64-musl@4.21.3': -======= - '@rollup/rollup-linux-x64-gnu@4.22.2': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@rollup/rollup-linux-x64-gnu@4.22.4': optional: true '@rollup/rollup-linux-x64-musl@4.22.0': optional: true -<<<<<<< HEAD - '@rollup/rollup-win32-arm64-msvc@4.21.3': -======= - '@rollup/rollup-linux-x64-musl@4.22.2': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@rollup/rollup-linux-x64-musl@4.22.4': optional: true '@rollup/rollup-win32-arm64-msvc@4.22.0': optional: true -<<<<<<< HEAD - '@rollup/rollup-win32-ia32-msvc@4.21.3': -======= - '@rollup/rollup-win32-arm64-msvc@4.22.2': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@rollup/rollup-win32-arm64-msvc@4.22.4': optional: true '@rollup/rollup-win32-ia32-msvc@4.22.0': optional: true -<<<<<<< HEAD - '@rollup/rollup-win32-x64-msvc@4.21.3': -======= - '@rollup/rollup-win32-ia32-msvc@4.22.2': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@rollup/rollup-win32-ia32-msvc@4.22.4': optional: true '@rollup/rollup-win32-x64-msvc@4.22.0': optional: true - '@rollup/rollup-win32-x64-msvc@4.22.2': -======= '@rollup/rollup-win32-x64-msvc@4.22.4': ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 optional: true '@rushstack/node-core-library@5.7.0(@types/node@22.5.5)': @@ -14580,41 +14015,15 @@ snapshots: '@sec-ant/readable-stream@0.4.1': {} -<<<<<<< HEAD - '@shikijs/core@1.17.0': - dependencies: - '@shikijs/engine-javascript': 1.17.0 - '@shikijs/engine-oniguruma': 1.17.0 - '@shikijs/types': 1.17.0 -======= '@shikijs/core@1.18.0': dependencies: '@shikijs/engine-javascript': 1.18.0 '@shikijs/engine-oniguruma': 1.18.0 '@shikijs/types': 1.18.0 ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c '@shikijs/vscode-textmate': 9.2.2 '@types/hast': 3.0.4 - hast-util-to-html: 9.0.2 + hast-util-to-html: 9.0.3 -<<<<<<< HEAD - '@shikijs/engine-javascript@1.17.0': - dependencies: - '@shikijs/types': 1.17.0 - oniguruma-to-js: 0.3.3 - regex: 4.3.2 - - '@shikijs/engine-oniguruma@1.17.0': - dependencies: - '@shikijs/types': 1.17.0 - '@shikijs/vscode-textmate': 9.2.2 - - '@shikijs/transformers@1.17.0': - dependencies: - shiki: 1.17.0 - - '@shikijs/types@1.17.0': -======= '@shikijs/engine-javascript@1.18.0': dependencies: '@shikijs/types': 1.18.0 @@ -14631,7 +14040,6 @@ snapshots: shiki: 1.18.0 '@shikijs/types@1.18.0': ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c dependencies: '@shikijs/vscode-textmate': 9.2.2 '@types/hast': 3.0.4 @@ -14708,22 +14116,15 @@ snapshots: vue: 3.5.7(typescript@5.6.2) vue-demi: 0.14.10(vue@3.5.7(typescript@5.6.2)) -<<<<<<< HEAD - '@tanstack/vue-virtual@3.10.7(vue@3.5.6(typescript@5.6.2))': + '@tanstack/vue-virtual@3.10.7(vue@3.5.7(typescript@5.6.2))': dependencies: '@tanstack/virtual-core': 3.10.7 - vue: 3.5.6(typescript@5.6.2) + vue: 3.5.7(typescript@5.6.2) - '@tinymce/tinymce-vue@6.0.1(vue@3.5.6(typescript@5.6.2))': + '@tinymce/tinymce-vue@6.0.1(vue@3.5.7(typescript@5.6.2))': dependencies: tinymce: 7.3.0 - vue: 3.5.6(typescript@5.6.2) -======= - '@tanstack/vue-virtual@3.10.8(vue@3.5.7(typescript@5.6.2))': - dependencies: - '@tanstack/virtual-core': 3.10.8 vue: 3.5.7(typescript@5.6.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 '@tootallnate/once@1.1.2': {} @@ -14850,13 +14251,8 @@ snapshots: '@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2)': dependencies: -<<<<<<< HEAD '@eslint-community/regexpp': 4.11.0 - '@typescript-eslint/parser': 8.6.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) -======= - '@eslint-community/regexpp': 4.11.1 '@typescript-eslint/parser': 8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 '@typescript-eslint/scope-manager': 8.6.0 '@typescript-eslint/type-utils': 8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2) '@typescript-eslint/utils': 8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2) @@ -15000,66 +14396,29 @@ snapshots: - encoding - supports-color -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - '@vite-pwa/vitepress@0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0))': + '@vite-pwa/vitepress@0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0))': dependencies: - vite-plugin-pwa: 0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0) + vite-plugin-pwa: 0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0) - '@vitejs/plugin-vue-jsx@4.0.1(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(vue@3.5.6(typescript@5.6.2))': -======= - '@vite-pwa/vitepress@0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0))': -======= - '@vite-pwa/vitepress@0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0))': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - '@vite-pwa/vitepress@0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0))': ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 - dependencies: - vite-plugin-pwa: 0.20.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0) - -<<<<<<< HEAD - '@vitejs/plugin-vue-jsx@4.0.1(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(vue@3.5.6(typescript@5.6.2))': ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - '@vitejs/plugin-vue-jsx@4.0.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2))': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@vitejs/plugin-vue-jsx@4.0.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(vue@3.5.7(typescript@5.6.2))': dependencies: '@babel/core': 7.25.2 '@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.2) '@vue/babel-plugin-jsx': 1.2.5(@babel/core@7.25.2) -<<<<<<< HEAD -<<<<<<< HEAD - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) -======= - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c - vue: 3.5.6(typescript@5.6.2) - transitivePeerDependencies: - - supports-color - -<<<<<<< HEAD - '@vitejs/plugin-vue@5.1.4(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(vue@3.5.6(typescript@5.6.2))': - dependencies: - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) -======= - '@vitejs/plugin-vue@5.1.4(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(vue@3.5.6(typescript@5.6.2))': - dependencies: - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c - vue: 3.5.6(typescript@5.6.2) -======= - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) + vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) vue: 3.5.7(typescript@5.6.2) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue@5.1.4(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2))': + '@vitejs/plugin-vue@5.1.4(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(vue@3.5.7(typescript@5.6.2))': dependencies: - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) + vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) + vue: 3.5.7(typescript@5.6.2) + + '@vitejs/plugin-vue@5.1.4(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(vue@3.5.7(typescript@5.6.2))': + dependencies: + vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) vue: 3.5.7(typescript@5.6.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 '@vitest/expect@2.1.1': dependencies: @@ -15068,29 +14427,13 @@ snapshots: chai: 5.1.1 tinyrainbow: 1.2.0 -<<<<<<< HEAD -<<<<<<< HEAD - '@vitest/mocker@2.1.1(@vitest/spy@2.1.1)(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))': -======= - '@vitest/mocker@2.1.1(@vitest/spy@2.1.1)(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))': ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - '@vitest/mocker@2.1.1(@vitest/spy@2.1.1)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@vitest/mocker@2.1.1(@vitest/spy@2.1.1)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))': dependencies: '@vitest/spy': 2.1.1 estree-walker: 3.0.3 magic-string: 0.30.11 optionalDependencies: -<<<<<<< HEAD -<<<<<<< HEAD - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) -======= - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) '@vitest/pretty-format@2.1.1': dependencies: @@ -15155,10 +14498,18 @@ snapshots: '@babel/helper-module-imports': 7.24.7 '@babel/helper-plugin-utils': 7.24.8 '@babel/parser': 7.25.6 - '@vue/compiler-sfc': 3.5.8 + '@vue/compiler-sfc': 3.5.6 transitivePeerDependencies: - supports-color + '@vue/compiler-core@3.5.6': + dependencies: + '@babel/parser': 7.25.6 + '@vue/shared': 3.5.6 + entities: 4.5.0 + estree-walker: 2.0.2 + source-map-js: 1.2.1 + '@vue/compiler-core@3.5.7': dependencies: '@babel/parser': 7.25.6 @@ -15167,23 +14518,27 @@ snapshots: estree-walker: 2.0.2 source-map-js: 1.2.1 - '@vue/compiler-core@3.5.8': + '@vue/compiler-dom@3.5.6': dependencies: - '@babel/parser': 7.25.6 - '@vue/shared': 3.5.8 - entities: 4.5.0 - estree-walker: 2.0.2 - source-map-js: 1.2.1 + '@vue/compiler-core': 3.5.6 + '@vue/shared': 3.5.6 '@vue/compiler-dom@3.5.7': dependencies: '@vue/compiler-core': 3.5.7 '@vue/shared': 3.5.7 - '@vue/compiler-dom@3.5.8': + '@vue/compiler-sfc@3.5.6': dependencies: - '@vue/compiler-core': 3.5.8 - '@vue/shared': 3.5.8 + '@babel/parser': 7.25.6 + '@vue/compiler-core': 3.5.6 + '@vue/compiler-dom': 3.5.6 + '@vue/compiler-ssr': 3.5.6 + '@vue/shared': 3.5.6 + estree-walker: 2.0.2 + magic-string: 0.30.11 + postcss: 8.4.47 + source-map-js: 1.2.1 '@vue/compiler-sfc@3.5.7': dependencies: @@ -15197,28 +14552,16 @@ snapshots: postcss: 8.4.47 source-map-js: 1.2.1 - '@vue/compiler-sfc@3.5.8': + '@vue/compiler-ssr@3.5.6': dependencies: - '@babel/parser': 7.25.6 - '@vue/compiler-core': 3.5.8 - '@vue/compiler-dom': 3.5.8 - '@vue/compiler-ssr': 3.5.8 - '@vue/shared': 3.5.8 - estree-walker: 2.0.2 - magic-string: 0.30.11 - postcss: 8.4.47 - source-map-js: 1.2.1 + '@vue/compiler-dom': 3.5.6 + '@vue/shared': 3.5.6 '@vue/compiler-ssr@3.5.7': dependencies: '@vue/compiler-dom': 3.5.7 '@vue/shared': 3.5.7 - '@vue/compiler-ssr@3.5.8': - dependencies: - '@vue/compiler-dom': 3.5.8 - '@vue/shared': 3.5.8 - '@vue/compiler-vue2@2.7.16': dependencies: de-indent: 1.0.2 @@ -15230,32 +14573,15 @@ snapshots: dependencies: '@vue/devtools-kit': 7.4.5 -<<<<<<< HEAD -<<<<<<< HEAD - '@vue/devtools-core@7.4.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(vue@3.5.6(typescript@5.6.2))': -======= - '@vue/devtools-core@7.4.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(vue@3.5.6(typescript@5.6.2))': ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - '@vue/devtools-core@7.4.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2))': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@vue/devtools-core@7.4.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(vue@3.5.7(typescript@5.6.2))': dependencies: '@vue/devtools-kit': 7.4.5 '@vue/devtools-shared': 7.4.5 mitt: 3.0.1 nanoid: 3.3.7 pathe: 1.1.2 -<<<<<<< HEAD -<<<<<<< HEAD - vite-hot-client: 0.2.3(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)) -======= - vite-hot-client: 0.2.3(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0)) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c - vue: 3.5.6(typescript@5.6.2) -======= - vite-hot-client: 0.2.3(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) + vite-hot-client: 0.2.3(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)) vue: 3.5.7(typescript@5.6.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 transitivePeerDependencies: - vite @@ -15275,19 +14601,10 @@ snapshots: '@vue/language-core@2.1.6(typescript@5.6.2)': dependencies: -<<<<<<< HEAD '@volar/language-core': 2.4.4 '@vue/compiler-dom': 3.5.6 -======= - '@volar/language-core': 2.4.5 -<<<<<<< HEAD - '@vue/compiler-dom': 3.5.7 ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - '@vue/compiler-dom': 3.5.8 ->>>>>>> 31f6cc64164464f00a8ebfb3d83582a83d867f47 '@vue/compiler-vue2': 2.7.16 - '@vue/shared': 3.5.8 + '@vue/shared': 3.5.6 computeds: 0.0.1 minimatch: 9.0.5 muggle-string: 0.4.1 @@ -15321,6 +14638,8 @@ snapshots: '@vue/shared': 3.5.7 vue: 3.5.7(typescript@5.6.2) + '@vue/shared@3.5.6': {} + '@vue/shared@3.5.7': {} '@vue/shared@3.5.8': {} @@ -15360,11 +14679,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.6(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.7(typescript@5.6.2))': ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@vueuse/integrations@11.1.0(async-validator@4.2.5)(axios@1.7.7)(focus-trap@7.5.4)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.7(typescript@5.6.2))': dependencies: '@vueuse/core': 11.1.0(vue@3.5.7(typescript@5.6.2)) '@vueuse/shared': 11.1.0(vue@3.5.7(typescript@5.6.2)) @@ -15436,6 +14751,13 @@ snapshots: transitivePeerDependencies: - supports-color + agent-base@7.1.1: + dependencies: + debug: 4.3.7 + transitivePeerDependencies: + - supports-color + optional: true + agentkeepalive@4.5.0: dependencies: humanize-ms: 1.2.1 @@ -15749,13 +15071,8 @@ snapshots: browserslist@4.23.3: dependencies: -<<<<<<< HEAD caniuse-lite: 1.0.30001660 electron-to-chromium: 1.5.19 -======= - caniuse-lite: 1.0.30001662 - electron-to-chromium: 1.5.27 ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 node-releases: 2.0.18 update-browserslist-db: 1.1.0(browserslist@4.23.3) @@ -15933,7 +15250,7 @@ snapshots: circular-dependency-scanner@2.3.0: dependencies: '@ast-grep/napi': 0.27.1 - '@vue/compiler-sfc': 3.5.8 + '@vue/compiler-sfc': 3.5.6 commander: 12.1.0 get-tsconfig: 4.8.0 graph-cycles: 3.0.0 @@ -15942,11 +15259,7 @@ snapshots: node-cleanup: 2.1.2 typescript: 5.6.2 update-notifier: 7.3.1 -<<<<<<< HEAD - zx: 8.1.6 -======= zx: 8.1.8 ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c citty@0.1.6: dependencies: @@ -16414,6 +15727,11 @@ snapshots: dependencies: css-tree: 2.2.1 + cssstyle@4.1.0: + dependencies: + rrweb-cssom: 0.7.1 + optional: true + csstype@3.0.11: {} csstype@3.1.3: {} @@ -16424,6 +15742,12 @@ snapshots: dargs@8.1.0: {} + data-urls@5.0.0: + dependencies: + whatwg-mimetype: 4.0.0 + whatwg-url: 14.0.0 + optional: true + data-view-buffer@1.0.1: dependencies: call-bind: 1.0.7 @@ -16478,6 +15802,9 @@ snapshots: decamelize@1.2.0: {} + decimal.js@10.4.3: + optional: true + deep-eql@5.0.2: {} deep-extend@0.6.0: {} @@ -16523,7 +15850,7 @@ snapshots: dependencies: '@babel/parser': 7.25.6 '@babel/traverse': 7.25.6 - '@vue/compiler-sfc': 3.5.8 + '@vue/compiler-sfc': 3.5.6 callsite: 1.0.0 camelcase: 6.3.0 cosmiconfig: 7.1.0 @@ -16672,22 +15999,13 @@ snapshots: dependencies: jake: 10.9.2 -<<<<<<< HEAD electron-to-chromium@1.5.19: {} -======= - electron-to-chromium@1.5.27: {} ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 element-plus@2.8.3(vue@3.5.7(typescript@5.6.2)): dependencies: '@ctrl/tinycolor': 4.1.0 -<<<<<<< HEAD - '@element-plus/icons-vue': 2.3.1(vue@3.5.6(typescript@5.6.2)) - '@floating-ui/dom': 1.6.10 -======= '@element-plus/icons-vue': 2.3.1(vue@3.5.7(typescript@5.6.2)) - '@floating-ui/dom': 1.6.11 ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@floating-ui/dom': 1.6.10 '@popperjs/core': '@sxzz/popperjs-es@2.11.7' '@types/lodash': 4.17.7 '@types/lodash-es': 4.17.12 @@ -16960,16 +16278,12 @@ snapshots: eslint: 9.11.0(jiti@1.21.6) semver: 7.6.3 -<<<<<<< HEAD - eslint-config-prettier@9.1.0(eslint@9.10.0(jiti@1.21.6)): + eslint-config-prettier@9.1.0(eslint@9.11.0(jiti@1.21.6)): dependencies: - eslint: 9.10.0(jiti@1.21.6) + eslint: 9.11.0(jiti@1.21.6) optional: true - eslint-config-turbo@2.1.2(eslint@9.10.0(jiti@1.21.6)): -======= eslint-config-turbo@2.1.2(eslint@9.11.0(jiti@1.21.6)): ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 dependencies: eslint: 9.11.0(jiti@1.21.6) eslint-plugin-turbo: 2.1.2(eslint@9.11.0(jiti@1.21.6)) @@ -16989,17 +16303,10 @@ snapshots: eslint-plugin-es-x@7.8.0(eslint@9.11.0(jiti@1.21.6)): dependencies: -<<<<<<< HEAD - '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@1.21.6)) - '@eslint-community/regexpp': 4.11.0 - eslint: 9.10.0(jiti@1.21.6) - eslint-compat-utils: 0.5.1(eslint@9.10.0(jiti@1.21.6)) -======= '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.0(jiti@1.21.6)) - '@eslint-community/regexpp': 4.11.1 + '@eslint-community/regexpp': 4.11.0 eslint: 9.11.0(jiti@1.21.6) eslint-compat-utils: 0.5.1(eslint@9.11.0(jiti@1.21.6)) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 eslint-plugin-eslint-comments@3.2.0(eslint@9.11.0(jiti@1.21.6)): dependencies: @@ -17034,7 +16341,7 @@ snapshots: eslint: 9.11.0(jiti@1.21.6) espree: 10.1.0 esquery: 1.6.0 - parse-imports: 2.2.1 + parse-imports: 2.1.1 semver: 7.6.3 spdx-expression-parse: 4.0.0 synckit: 0.9.1 @@ -17056,15 +16363,9 @@ snapshots: dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.0(jiti@1.21.6)) enhanced-resolve: 5.17.1 -<<<<<<< HEAD - eslint: 9.10.0(jiti@1.21.6) - eslint-plugin-es-x: 7.8.0(eslint@9.10.0(jiti@1.21.6)) - get-tsconfig: 4.8.0 -======= eslint: 9.11.0(jiti@1.21.6) eslint-plugin-es-x: 7.8.0(eslint@9.11.0(jiti@1.21.6)) - get-tsconfig: 4.8.1 ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + get-tsconfig: 4.8.0 globals: 15.9.0 ignore: 5.3.2 minimatch: 9.0.5 @@ -17085,11 +16386,7 @@ snapshots: - supports-color - typescript -<<<<<<< HEAD - eslint-plugin-prettier@5.2.1(@types/eslint@9.6.1)(eslint-config-prettier@9.1.0(eslint@9.10.0(jiti@1.21.6)))(eslint@9.10.0(jiti@1.21.6))(prettier@3.3.3): -======= - eslint-plugin-prettier@5.2.1(@types/eslint@9.6.1)(eslint@9.11.0(jiti@1.21.6))(prettier@3.3.3): ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + eslint-plugin-prettier@5.2.1(@types/eslint@9.6.1)(eslint-config-prettier@9.1.0(eslint@9.11.0(jiti@1.21.6)))(eslint@9.11.0(jiti@1.21.6))(prettier@3.3.3): dependencies: eslint: 9.11.0(jiti@1.21.6) prettier: 3.3.3 @@ -17097,17 +16394,12 @@ snapshots: synckit: 0.9.1 optionalDependencies: '@types/eslint': 9.6.1 - eslint-config-prettier: 9.1.0(eslint@9.10.0(jiti@1.21.6)) + eslint-config-prettier: 9.1.0(eslint@9.11.0(jiti@1.21.6)) eslint-plugin-regexp@2.6.0(eslint@9.11.0(jiti@1.21.6)): dependencies: -<<<<<<< HEAD - '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@1.21.6)) - '@eslint-community/regexpp': 4.11.0 -======= '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.0(jiti@1.21.6)) - '@eslint-community/regexpp': 4.11.1 ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@eslint-community/regexpp': 4.11.0 comment-parser: 1.4.1 eslint: 9.11.0(jiti@1.21.6) jsdoc-type-pratt-parser: 4.1.0 @@ -17146,46 +16438,13 @@ snapshots: optionalDependencies: '@typescript-eslint/eslint-plugin': 8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2) -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.5.5)(jsdom@25.0.0)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)): -======= - eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.5.5)(jsdom@25.0.0)(less@4.2.0)(sass@1.79.2)(terser@5.33.0)): ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.5.5)(jsdom@25.0.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.5.5)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): ->>>>>>> 31f6cc64164464f00a8ebfb3d83582a83d867f47 -======= - eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.5.5)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): ->>>>>>> 2a83f1d666729c72df7e02be2d8665fbf2526825 + eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2)(vitest@2.1.1(@types/node@22.5.5)(happy-dom@15.7.4)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)): dependencies: '@typescript-eslint/utils': 7.18.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2) eslint: 9.11.0(jiti@1.21.6) optionalDependencies: -<<<<<<< HEAD - '@typescript-eslint/eslint-plugin': 8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2) -<<<<<<< HEAD - vitest: 2.1.1(@types/node@22.5.5)(jsdom@25.0.0)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) -======= - vitest: 2.1.1(@types/node@22.5.5)(jsdom@25.0.0)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= '@typescript-eslint/eslint-plugin': 8.6.0(@typescript-eslint/parser@8.6.0(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.0(jiti@1.21.6))(typescript@5.6.2) -<<<<<<< HEAD -<<<<<<< HEAD - vitest: 2.1.1(@types/node@22.5.5)(jsdom@25.0.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - vitest: 2.1.1(@types/node@22.5.5)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> 31f6cc64164464f00a8ebfb3d83582a83d867f47 -======= - vitest: 2.1.1(@types/node@22.5.5)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> 2a83f1d666729c72df7e02be2d8665fbf2526825 + vitest: 2.1.1(@types/node@22.5.5)(happy-dom@15.7.4)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) transitivePeerDependencies: - supports-color - typescript @@ -17220,13 +16479,8 @@ snapshots: eslint@9.11.0(jiti@1.21.6): dependencies: -<<<<<<< HEAD - '@eslint-community/eslint-utils': 4.4.0(eslint@9.10.0(jiti@1.21.6)) - '@eslint-community/regexpp': 4.11.0 -======= '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.0(jiti@1.21.6)) - '@eslint-community/regexpp': 4.11.1 ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@eslint-community/regexpp': 4.11.0 '@eslint/config-array': 0.18.0 '@eslint/eslintrc': 3.1.0 '@eslint/js': 9.11.0 @@ -17785,7 +17039,7 @@ snapshots: dependencies: function-bind: 1.1.2 - hast-util-to-html@9.0.2: + hast-util-to-html@9.0.3: dependencies: '@types/hast': 3.0.4 '@types/unist': 3.0.3 @@ -17815,6 +17069,11 @@ snapshots: hosted-git-info@2.8.9: {} + html-encoding-sniffer@4.0.0: + dependencies: + whatwg-encoding: 3.1.1 + optional: true + html-minifier-terser@6.1.0: dependencies: camel-case: 4.1.2 @@ -17871,6 +17130,14 @@ snapshots: transitivePeerDependencies: - supports-color + http-proxy-agent@7.0.2: + dependencies: + agent-base: 7.1.1 + debug: 4.3.7 + transitivePeerDependencies: + - supports-color + optional: true + http-shutdown@1.2.2: {} https-proxy-agent@5.0.1: @@ -17880,6 +17147,14 @@ snapshots: transitivePeerDependencies: - supports-color + https-proxy-agent@7.0.5: + dependencies: + agent-base: 7.1.1 + debug: 4.3.7 + transitivePeerDependencies: + - supports-color + optional: true + httpxy@0.1.5: {} human-id@1.0.2: {} @@ -18075,6 +17350,9 @@ snapshots: is-plain-object@5.0.0: {} + is-potential-custom-element-name@1.0.1: + optional: true + is-reference@1.2.1: dependencies: '@types/estree': 1.0.5 @@ -18198,7 +17476,6 @@ snapshots: jsdoc-type-pratt-parser@4.1.0: {} -<<<<<<< HEAD jsdom@25.0.1: dependencies: cssstyle: 4.1.0 @@ -18226,11 +17503,10 @@ snapshots: - bufferutil - supports-color - utf-8-validate + optional: true jsencrypt@3.3.2: {} -======= ->>>>>>> 2a83f1d666729c72df7e02be2d8665fbf2526825 jsesc@0.5.0: {} jsesc@2.5.2: {} @@ -18793,25 +18069,14 @@ snapshots: dependencies: '@cloudflare/kv-asset-handler': 0.3.4 '@netlify/functions': 2.8.1 -<<<<<<< HEAD - '@rollup/plugin-alias': 5.1.0(rollup@4.21.3) - '@rollup/plugin-commonjs': 25.0.8(rollup@4.21.3) - '@rollup/plugin-inject': 5.0.5(rollup@4.21.3) - '@rollup/plugin-json': 6.1.0(rollup@4.21.3) - '@rollup/plugin-node-resolve': 15.2.3(rollup@4.21.3) - '@rollup/plugin-replace': 5.0.7(rollup@4.21.3) - '@rollup/plugin-terser': 0.4.4(rollup@4.21.3) - '@rollup/pluginutils': 5.1.0(rollup@4.21.3) -======= - '@rollup/plugin-alias': 5.1.0(rollup@4.22.4) - '@rollup/plugin-commonjs': 25.0.8(rollup@4.22.4) - '@rollup/plugin-inject': 5.0.5(rollup@4.22.4) - '@rollup/plugin-json': 6.1.0(rollup@4.22.4) - '@rollup/plugin-node-resolve': 15.2.3(rollup@4.22.4) - '@rollup/plugin-replace': 5.0.7(rollup@4.22.4) - '@rollup/plugin-terser': 0.4.4(rollup@4.22.4) - '@rollup/pluginutils': 5.1.0(rollup@4.22.4) ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + '@rollup/plugin-alias': 5.1.0(rollup@4.22.0) + '@rollup/plugin-commonjs': 25.0.8(rollup@4.22.0) + '@rollup/plugin-inject': 5.0.5(rollup@4.22.0) + '@rollup/plugin-json': 6.1.0(rollup@4.22.0) + '@rollup/plugin-node-resolve': 15.2.3(rollup@4.22.0) + '@rollup/plugin-replace': 5.0.7(rollup@4.22.0) + '@rollup/plugin-terser': 0.4.4(rollup@4.22.0) + '@rollup/pluginutils': 5.1.0(rollup@4.22.0) '@types/http-proxy': 1.17.15 '@vercel/nft': 0.26.5(encoding@0.1.13) archiver: 7.0.1 @@ -18846,26 +18111,16 @@ snapshots: mlly: 1.7.1 mri: 1.2.0 node-fetch-native: 1.6.4 -<<<<<<< HEAD ofetch: 1.3.4 ohash: 1.1.3 -======= - ofetch: 1.4.0 - ohash: 1.1.4 ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 openapi-typescript: 6.7.6 pathe: 1.1.2 perfect-debounce: 1.0.0 pkg-types: 1.2.0 pretty-bytes: 6.1.1 radix3: 1.1.2 -<<<<<<< HEAD - rollup: 4.21.3 - rollup-plugin-visualizer: 5.12.0(rollup@4.21.3) -======= - rollup: 4.22.4 - rollup-plugin-visualizer: 5.12.0(rollup@4.22.4) ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + rollup: 4.22.0 + rollup-plugin-visualizer: 5.12.0(rollup@4.22.0) scule: 1.3.0 semver: 7.6.3 serve-placeholder: 2.0.2 @@ -18875,11 +18130,7 @@ snapshots: uncrypto: 0.1.3 unctx: 2.3.1(webpack-sources@3.2.3) unenv: 1.10.0 -<<<<<<< HEAD - unimport: 3.12.0(rollup@4.21.3)(webpack-sources@3.2.3) -======= - unimport: 3.12.0(rollup@4.22.4) ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + unimport: 3.12.0(rollup@4.22.0)(webpack-sources@3.2.3) unstorage: 1.12.0(ioredis@5.4.1) unwasm: 0.3.9(webpack-sources@3.2.3) transitivePeerDependencies: @@ -18988,6 +18239,9 @@ snapshots: dependencies: boolbase: 1.0.0 + nwsapi@2.2.12: + optional: true + nypm@0.3.11: dependencies: citty: 0.1.6 @@ -19012,7 +18266,7 @@ snapshots: has-symbols: 1.0.3 object-keys: 1.1.1 - ofetch@1.4.0: + ofetch@1.3.4: dependencies: destr: 2.0.3 node-fetch-native: 1.6.4 @@ -19036,7 +18290,9 @@ snapshots: dependencies: mimic-function: 5.0.1 - oniguruma-to-js@0.3.3: {} + oniguruma-to-js@0.4.3: + dependencies: + regex: 4.3.2 open@10.1.0: dependencies: @@ -19145,7 +18401,7 @@ snapshots: dependencies: callsites: 3.1.0 - parse-imports@2.2.1: + parse-imports@2.1.1: dependencies: es-module-lexer: 1.5.4 slashes: 3.0.12 @@ -19231,21 +18487,9 @@ snapshots: pify@4.0.1: {} -<<<<<<< HEAD -<<<<<<< HEAD - pinia-plugin-persistedstate@4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2)))(rollup@4.22.0)(webpack-sources@3.2.3): + pinia-plugin-persistedstate@4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.7(typescript@5.6.2)))(rollup@3.29.4): dependencies: - '@nuxt/kit': 3.13.2(rollup@4.22.0)(webpack-sources@3.2.3) -======= - pinia-plugin-persistedstate@4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.7(typescript@5.6.2)))(rollup@4.22.2): - dependencies: - '@nuxt/kit': 3.13.2(rollup@4.22.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - pinia-plugin-persistedstate@4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.7(typescript@5.6.2)))(rollup@4.22.4): - dependencies: - '@nuxt/kit': 3.13.2(rollup@4.22.4) ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + '@nuxt/kit': 3.13.2(rollup@3.29.4) deep-pick-omit: 1.2.0 defu: 6.1.4 destr: 2.0.3 @@ -19805,23 +19049,13 @@ snapshots: radix-vue@1.9.6(vue@3.5.7(typescript@5.6.2)): dependencies: -<<<<<<< HEAD '@floating-ui/dom': 1.6.10 - '@floating-ui/vue': 1.1.4(vue@3.5.6(typescript@5.6.2)) + '@floating-ui/vue': 1.1.4(vue@3.5.7(typescript@5.6.2)) '@internationalized/date': 3.5.5 '@internationalized/number': 3.5.3 - '@tanstack/vue-virtual': 3.10.7(vue@3.5.6(typescript@5.6.2)) - '@vueuse/core': 10.11.1(vue@3.5.6(typescript@5.6.2)) - '@vueuse/shared': 10.11.1(vue@3.5.6(typescript@5.6.2)) -======= - '@floating-ui/dom': 1.6.11 - '@floating-ui/vue': 1.1.5(vue@3.5.7(typescript@5.6.2)) - '@internationalized/date': 3.5.5 - '@internationalized/number': 3.5.3 - '@tanstack/vue-virtual': 3.10.8(vue@3.5.7(typescript@5.6.2)) + '@tanstack/vue-virtual': 3.10.7(vue@3.5.7(typescript@5.6.2)) '@vueuse/core': 10.11.1(vue@3.5.7(typescript@5.6.2)) '@vueuse/shared': 10.11.1(vue@3.5.7(typescript@5.6.2)) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 aria-hidden: 1.2.4 defu: 6.1.4 fast-deep-equal: 3.1.3 @@ -20026,28 +19260,24 @@ snapshots: glob: 11.0.0 package-json-from-dist: 1.0.0 - rollup-plugin-dts@6.1.1(rollup@3.29.5)(typescript@5.6.2): + rollup-plugin-dts@6.1.1(rollup@3.29.4)(typescript@5.6.2): dependencies: magic-string: 0.30.11 - rollup: 3.29.5 + rollup: 3.29.4 typescript: 5.6.2 optionalDependencies: '@babel/code-frame': 7.24.7 -<<<<<<< HEAD - rollup-plugin-visualizer@5.12.0(rollup@4.21.3): + rollup-plugin-visualizer@5.12.0(rollup@4.22.0): dependencies: open: 8.4.2 picomatch: 2.3.1 source-map: 0.7.4 yargs: 17.7.2 optionalDependencies: - rollup: 4.21.3 + rollup: 4.22.0 - rollup-plugin-visualizer@5.12.0(rollup@4.22.0): -======= rollup-plugin-visualizer@5.12.0(rollup@4.22.4): ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 dependencies: open: 8.4.2 picomatch: 2.3.1 @@ -20060,37 +19290,33 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - rollup@3.29.5: + rollup@3.29.4: optionalDependencies: fsevents: 2.3.3 -<<<<<<< HEAD - rollup@4.21.3: - dependencies: - '@types/estree': 1.0.5 - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.21.3 - '@rollup/rollup-android-arm64': 4.21.3 - '@rollup/rollup-darwin-arm64': 4.21.3 - '@rollup/rollup-darwin-x64': 4.21.3 - '@rollup/rollup-linux-arm-gnueabihf': 4.21.3 - '@rollup/rollup-linux-arm-musleabihf': 4.21.3 - '@rollup/rollup-linux-arm64-gnu': 4.21.3 - '@rollup/rollup-linux-arm64-musl': 4.21.3 - '@rollup/rollup-linux-powerpc64le-gnu': 4.21.3 - '@rollup/rollup-linux-riscv64-gnu': 4.21.3 - '@rollup/rollup-linux-s390x-gnu': 4.21.3 - '@rollup/rollup-linux-x64-gnu': 4.21.3 - '@rollup/rollup-linux-x64-musl': 4.21.3 - '@rollup/rollup-win32-arm64-msvc': 4.21.3 - '@rollup/rollup-win32-ia32-msvc': 4.21.3 - '@rollup/rollup-win32-x64-msvc': 4.21.3 - fsevents: 2.3.3 - rollup@4.22.0: -======= + dependencies: + '@types/estree': 1.0.5 + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.22.0 + '@rollup/rollup-android-arm64': 4.22.0 + '@rollup/rollup-darwin-arm64': 4.22.0 + '@rollup/rollup-darwin-x64': 4.22.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.22.0 + '@rollup/rollup-linux-arm-musleabihf': 4.22.0 + '@rollup/rollup-linux-arm64-gnu': 4.22.0 + '@rollup/rollup-linux-arm64-musl': 4.22.0 + '@rollup/rollup-linux-powerpc64le-gnu': 4.22.0 + '@rollup/rollup-linux-riscv64-gnu': 4.22.0 + '@rollup/rollup-linux-s390x-gnu': 4.22.0 + '@rollup/rollup-linux-x64-gnu': 4.22.0 + '@rollup/rollup-linux-x64-musl': 4.22.0 + '@rollup/rollup-win32-arm64-msvc': 4.22.0 + '@rollup/rollup-win32-ia32-msvc': 4.22.0 + '@rollup/rollup-win32-x64-msvc': 4.22.0 + fsevents: 2.3.3 + rollup@4.22.4: ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 dependencies: '@types/estree': 1.0.5 optionalDependencies: @@ -20114,6 +19340,9 @@ snapshots: rotated-array-set@3.0.0: {} + rrweb-cssom@0.7.1: + optional: true + run-applescript@7.0.0: {} run-parallel@1.2.0: @@ -20152,6 +19381,11 @@ snapshots: sax@1.4.1: optional: true + saxes@6.0.0: + dependencies: + xmlchars: 2.2.0 + optional: true + scroll-into-view-if-needed@2.2.31: dependencies: compute-scroll-into-view: 1.0.20 @@ -20254,19 +19488,12 @@ snapshots: shebang-regex@3.0.0: {} -<<<<<<< HEAD - shiki@1.17.0: - dependencies: - '@shikijs/core': 1.17.0 - '@shikijs/types': 1.17.0 -======= shiki@1.18.0: dependencies: '@shikijs/core': 1.18.0 '@shikijs/engine-javascript': 1.18.0 '@shikijs/engine-oniguruma': 1.18.0 '@shikijs/types': 1.18.0 ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c '@shikijs/vscode-textmate': 9.2.2 '@types/hast': 3.0.4 @@ -20290,11 +19517,7 @@ snapshots: sirv@2.0.4: dependencies: -<<<<<<< HEAD - '@polka/url': 1.0.0-next.25 -======= '@polka/url': 1.0.0-next.28 ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c mrmime: 2.0.0 totalist: 3.0.1 @@ -20690,6 +19913,9 @@ snapshots: csso: 5.0.5 picocolors: 1.1.0 + symbol-tree@3.2.4: + optional: true + synckit@0.6.2: dependencies: tslib: 2.7.0 @@ -20818,6 +20044,14 @@ snapshots: tinyspy@3.0.2: {} + tldts-core@6.1.47: + optional: true + + tldts@6.1.47: + dependencies: + tldts-core: 6.1.47 + optional: true + tmp@0.0.33: dependencies: os-tmpdir: 1.0.2 @@ -20832,12 +20066,22 @@ snapshots: totalist@3.0.1: {} + tough-cookie@5.0.0: + dependencies: + tldts: 6.1.47 + optional: true + tr46@0.0.3: {} tr46@1.0.1: dependencies: punycode: 2.3.1 + tr46@5.0.0: + dependencies: + punycode: 2.3.1 + optional: true + treemate@0.3.11: {} trim-lines@3.0.1: {} @@ -20942,12 +20186,12 @@ snapshots: unbuild@2.0.0(sass@1.79.3)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2)): dependencies: - '@rollup/plugin-alias': 5.1.0(rollup@3.29.5) - '@rollup/plugin-commonjs': 25.0.8(rollup@3.29.5) - '@rollup/plugin-json': 6.1.0(rollup@3.29.5) - '@rollup/plugin-node-resolve': 15.2.3(rollup@3.29.5) - '@rollup/plugin-replace': 5.0.7(rollup@3.29.5) - '@rollup/pluginutils': 5.1.0(rollup@3.29.5) + '@rollup/plugin-alias': 5.1.0(rollup@3.29.4) + '@rollup/plugin-commonjs': 25.0.8(rollup@3.29.4) + '@rollup/plugin-json': 6.1.0(rollup@3.29.4) + '@rollup/plugin-node-resolve': 15.2.3(rollup@3.29.4) + '@rollup/plugin-replace': 5.0.7(rollup@3.29.4) + '@rollup/pluginutils': 5.1.0(rollup@3.29.4) chalk: 5.3.0 citty: 0.1.6 consola: 3.2.3 @@ -20962,8 +20206,8 @@ snapshots: pathe: 1.1.2 pkg-types: 1.2.0 pretty-bytes: 6.1.1 - rollup: 3.29.5 - rollup-plugin-dts: 6.1.1(rollup@3.29.5)(typescript@5.6.2) + rollup: 3.29.4 + rollup-plugin-dts: 6.1.1(rollup@3.29.4)(typescript@5.6.2) scule: 1.3.0 untyped: 1.4.2 optionalDependencies: @@ -21015,10 +20259,9 @@ snapshots: unicorn-magic@0.3.0: {} -<<<<<<< HEAD - unimport@3.12.0(rollup@4.21.3)(webpack-sources@3.2.3): + unimport@3.12.0(rollup@3.29.4): dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.21.3) + '@rollup/pluginutils': 5.1.0(rollup@3.29.4) acorn: 8.12.1 escape-string-regexp: 5.0.0 estree-walker: 3.0.3 @@ -21054,14 +20297,9 @@ snapshots: - rollup - webpack-sources - unimport@3.12.0(rollup@4.22.2): - dependencies: - '@rollup/pluginutils': 5.1.0(rollup@4.22.2) -======= unimport@3.12.0(rollup@4.22.4): dependencies: '@rollup/pluginutils': 5.1.0(rollup@4.22.4) ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 acorn: 8.12.1 escape-string-regexp: 5.0.0 estree-walker: 3.0.3 @@ -21073,10 +20311,11 @@ snapshots: pkg-types: 1.2.0 scule: 1.3.0 strip-literal: 2.1.0 - unplugin: 1.14.1 + unplugin: 1.14.1(webpack-sources@3.2.3) transitivePeerDependencies: - rollup - webpack-sources + optional: true unique-filename@1.1.1: dependencies: @@ -21117,15 +20356,7 @@ snapshots: universalify@2.0.1: {} -<<<<<<< HEAD -<<<<<<< HEAD - unplugin-element-plus@0.8.0(rollup@4.22.0)(webpack-sources@3.2.3): -======= - unplugin-element-plus@0.8.0(rollup@4.22.2): ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - unplugin-element-plus@0.8.0(rollup@4.22.4): ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + unplugin-element-plus@0.8.0(rollup@4.22.4)(webpack-sources@3.2.3): dependencies: '@rollup/pluginutils': 5.1.0(rollup@4.22.4) es-module-lexer: 1.5.4 @@ -21135,10 +20366,10 @@ snapshots: - rollup - webpack-sources - unplugin-vue-components@0.27.4(@babel/parser@7.25.6)(@nuxt/kit@3.13.2(rollup@4.22.0)(webpack-sources@3.2.3))(rollup@4.22.0)(vue@3.5.6(typescript@5.6.2)): + unplugin-vue-components@0.27.4(@babel/parser@7.25.6)(@nuxt/kit@3.13.2(rollup@4.22.4))(rollup@4.22.4)(vue@3.5.7(typescript@5.6.2)): dependencies: '@antfu/utils': 0.7.10 - '@rollup/pluginutils': 5.1.0(rollup@4.22.0) + '@rollup/pluginutils': 5.1.0(rollup@4.22.4) chokidar: 3.6.0 debug: 4.3.6 fast-glob: 3.3.2 @@ -21147,10 +20378,10 @@ snapshots: minimatch: 9.0.5 mlly: 1.7.1 unplugin: 1.12.2 - vue: 3.5.6(typescript@5.6.2) + vue: 3.5.7(typescript@5.6.2) optionalDependencies: '@babel/parser': 7.25.6 - '@nuxt/kit': 3.13.2(rollup@4.22.0)(webpack-sources@3.2.3) + '@nuxt/kit': 3.13.2(rollup@4.22.4) transitivePeerDependencies: - rollup - supports-color @@ -21179,7 +20410,7 @@ snapshots: lru-cache: 10.4.3 mri: 1.2.0 node-fetch-native: 1.6.4 - ofetch: 1.4.0 + ofetch: 1.3.4 ufo: 1.5.4 optionalDependencies: ioredis: 5.4.1 @@ -21272,40 +20503,16 @@ snapshots: '@types/unist': 3.0.3 vfile-message: 4.0.2 -<<<<<<< HEAD -<<<<<<< HEAD - vite-hot-client@0.2.3(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)): + vite-hot-client@0.2.3(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)): dependencies: - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) + vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) - vite-node@2.1.1(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0): -======= - vite-hot-client@0.2.3(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0)): -======= - vite-hot-client@0.2.3(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 - dependencies: - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) - -<<<<<<< HEAD - vite-node@2.1.1(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0): ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - vite-node@2.1.1(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0): ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + vite-node@2.1.1(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0): dependencies: cac: 6.7.14 debug: 4.3.7 pathe: 1.1.2 -<<<<<<< HEAD -<<<<<<< HEAD - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) -======= - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) transitivePeerDependencies: - '@types/node' - less @@ -21317,48 +20524,20 @@ snapshots: - supports-color - terser -<<<<<<< HEAD -<<<<<<< HEAD - vite-plugin-compression@0.5.1(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)): -======= - vite-plugin-compression@0.5.1(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0)): ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - vite-plugin-compression@0.5.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + vite-plugin-compression@0.5.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)): dependencies: chalk: 4.1.2 debug: 4.3.7 fs-extra: 10.1.0 -<<<<<<< HEAD -<<<<<<< HEAD - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) + vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) transitivePeerDependencies: - supports-color - vite-plugin-dts@4.2.1(@types/node@22.5.5)(rollup@4.22.0)(typescript@5.6.2)(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)): -======= - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) - transitivePeerDependencies: - - supports-color - - vite-plugin-dts@4.2.1(@types/node@22.5.5)(rollup@4.22.0)(typescript@5.6.2)(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0)): ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c - dependencies: - '@microsoft/api-extractor': 7.47.7(@types/node@22.5.5) - '@rollup/pluginutils': 5.1.0(rollup@4.22.0) - '@volar/typescript': 2.4.4 -======= - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) - transitivePeerDependencies: - - supports-color - - vite-plugin-dts@4.2.1(@types/node@22.5.5)(rollup@4.22.4)(typescript@5.6.2)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): + vite-plugin-dts@4.2.1(@types/node@22.5.5)(rollup@4.22.4)(typescript@5.6.2)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)): dependencies: '@microsoft/api-extractor': 7.47.7(@types/node@22.5.5) '@rollup/pluginutils': 5.1.0(rollup@4.22.4) - '@volar/typescript': 2.4.5 ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@volar/typescript': 2.4.4 '@vue/language-core': 2.1.6(typescript@5.6.2) compare-versions: 6.1.1 debug: 4.3.7 @@ -21367,29 +20546,13 @@ snapshots: magic-string: 0.30.11 typescript: 5.6.2 optionalDependencies: -<<<<<<< HEAD -<<<<<<< HEAD - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) -======= - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) transitivePeerDependencies: - '@types/node' - rollup - supports-color -<<<<<<< HEAD -<<<<<<< HEAD - vite-plugin-html@3.2.2(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)): -======= - vite-plugin-html@3.2.2(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0)): ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - vite-plugin-html@3.2.2(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + vite-plugin-html@3.2.2(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)): dependencies: '@rollup/pluginutils': 4.2.1 colorette: 2.0.20 @@ -21403,25 +20566,9 @@ snapshots: html-minifier-terser: 6.1.0 node-html-parser: 5.4.2 pathe: 0.2.0 -<<<<<<< HEAD -<<<<<<< HEAD - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) + vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) - vite-plugin-inspect@0.8.7(rollup@4.22.0)(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)): -======= - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) - - vite-plugin-inspect@0.8.7(rollup@4.22.0)(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0)): ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) - -<<<<<<< HEAD - vite-plugin-inspect@0.8.7(rollup@4.22.2)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 -======= - vite-plugin-inspect@0.8.7(rollup@4.22.4)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + vite-plugin-inspect@0.8.7(rollup@4.22.4)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)): dependencies: '@antfu/utils': 0.7.10 '@rollup/pluginutils': 5.1.0(rollup@4.22.4) @@ -21432,128 +20579,57 @@ snapshots: perfect-debounce: 1.0.0 picocolors: 1.1.0 sirv: 2.0.4 -<<<<<<< HEAD -<<<<<<< HEAD - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) -======= - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) transitivePeerDependencies: - rollup - supports-color -<<<<<<< HEAD -<<<<<<< HEAD - vite-plugin-lib-inject-css@2.1.1(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)): -======= - vite-plugin-lib-inject-css@2.1.1(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0)): ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - vite-plugin-lib-inject-css@2.1.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + vite-plugin-lib-inject-css@2.1.1(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)): dependencies: '@ast-grep/napi': 0.22.6 magic-string: 0.30.11 picocolors: 1.1.0 -<<<<<<< HEAD -<<<<<<< HEAD - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) + vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) - vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0): -======= - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) - - vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0): ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) - -<<<<<<< HEAD - vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0): ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + vite-plugin-pwa@0.20.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0): dependencies: debug: 4.3.7 pretty-bytes: 6.1.1 tinyglobby: 0.2.6 -<<<<<<< HEAD -<<<<<<< HEAD - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) -======= - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) workbox-build: 7.1.1 workbox-window: 7.1.0 transitivePeerDependencies: - supports-color -<<<<<<< HEAD -<<<<<<< HEAD - vite-plugin-vue-devtools@7.4.5(rollup@4.22.0)(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(vue@3.5.6(typescript@5.6.2)): - dependencies: - '@vue/devtools-core': 7.4.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(vue@3.5.6(typescript@5.6.2)) -======= - vite-plugin-vue-devtools@7.4.5(rollup@4.22.0)(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(vue@3.5.6(typescript@5.6.2)): - dependencies: - '@vue/devtools-core': 7.4.5(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(vue@3.5.6(typescript@5.6.2)) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= -======= ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 - vite-plugin-pwa@0.20.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(workbox-build@7.1.1)(workbox-window@7.1.0): + vite-plugin-pwa@0.20.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0): dependencies: debug: 4.3.7 pretty-bytes: 6.1.1 tinyglobby: 0.2.6 - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) + vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) workbox-build: 7.1.1 workbox-window: 7.1.0 transitivePeerDependencies: - supports-color - vite-plugin-vue-devtools@7.4.5(rollup@4.22.4)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2)): + vite-plugin-vue-devtools@7.4.5(rollup@4.22.4)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(vue@3.5.7(typescript@5.6.2)): dependencies: - '@vue/devtools-core': 7.4.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2)) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@vue/devtools-core': 7.4.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(vue@3.5.7(typescript@5.6.2)) '@vue/devtools-kit': 7.4.5 '@vue/devtools-shared': 7.4.5 execa: 8.0.1 sirv: 2.0.4 -<<<<<<< HEAD -<<<<<<< HEAD - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) - vite-plugin-inspect: 0.8.7(rollup@4.22.0)(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)) - vite-plugin-vue-inspector: 5.2.0(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)) -======= - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) - vite-plugin-inspect: 0.8.7(rollup@4.22.0)(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0)) - vite-plugin-vue-inspector: 5.2.0(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0)) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) - vite-plugin-inspect: 0.8.7(rollup@4.22.4)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) - vite-plugin-vue-inspector: 5.2.0(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) + vite-plugin-inspect: 0.8.7(rollup@4.22.4)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)) + vite-plugin-vue-inspector: 5.2.0(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)) transitivePeerDependencies: - '@nuxt/kit' - rollup - supports-color - vue -<<<<<<< HEAD -<<<<<<< HEAD - vite-plugin-vue-inspector@5.2.0(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)): -======= - vite-plugin-vue-inspector@5.2.0(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0)): ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - vite-plugin-vue-inspector@5.2.0(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)): ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + vite-plugin-vue-inspector@5.2.0(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)): dependencies: '@babel/core': 7.25.2 '@babel/plugin-proposal-decorators': 7.24.7(@babel/core@7.25.2) @@ -21561,68 +20637,36 @@ snapshots: '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.25.2) '@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.2) '@vue/babel-plugin-jsx': 1.2.5(@babel/core@7.25.2) - '@vue/compiler-dom': 3.5.8 + '@vue/compiler-dom': 3.5.6 kolorist: 1.8.0 magic-string: 0.30.11 -<<<<<<< HEAD -<<<<<<< HEAD - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) + vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) transitivePeerDependencies: - supports-color - vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0): -======= - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) - transitivePeerDependencies: - - supports-color - - vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0): ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c + vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0): dependencies: esbuild: 0.21.5 postcss: 8.4.47 - rollup: 4.21.3 -======= - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) - transitivePeerDependencies: - - supports-color - -<<<<<<< HEAD - vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0): - dependencies: - esbuild: 0.21.5 - postcss: 8.4.47 - rollup: 4.22.2 ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + rollup: 4.22.0 optionalDependencies: '@types/node': 22.5.5 fsevents: 2.3.3 less: 4.2.0 -<<<<<<< HEAD -<<<<<<< HEAD - sass: 1.79.1 + sass: 1.79.3 terser: 5.32.0 -======= - sass: 1.79.2 -======= - sass: 1.79.3 - terser: 5.33.0 -======= ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 - vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0): + vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0): dependencies: esbuild: 0.21.5 postcss: 8.4.47 - rollup: 4.22.4 + rollup: 4.22.0 optionalDependencies: '@types/node': 22.5.5 fsevents: 2.3.3 less: 4.2.0 sass: 1.79.3 ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 - terser: 5.33.0 ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c + terser: 5.32.0 vitepress-plugin-group-icons@1.2.4: dependencies: @@ -21632,66 +20676,24 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD -<<<<<<< HEAD - vitepress@1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.1)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2): - dependencies: - '@docsearch/css': 3.6.1 - '@docsearch/js': 3.6.1(@algolia/client-search@4.24.0)(search-insights@2.17.2) - '@shikijs/core': 1.17.0 - '@shikijs/transformers': 1.17.0 - '@types/markdown-it': 14.1.2 - '@vitejs/plugin-vue': 5.1.4(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0))(vue@3.5.6(typescript@5.6.2)) -======= - vitepress@1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.2)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2): -======= - vitepress@1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.33.0)(typescript@5.6.2): ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + vitepress@1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.5)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.47)(qrcode@1.5.4)(sass@1.79.3)(search-insights@2.17.2)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2): dependencies: '@docsearch/css': 3.6.1 '@docsearch/js': 3.6.1(@algolia/client-search@4.24.0)(search-insights@2.17.2) '@shikijs/core': 1.18.0 '@shikijs/transformers': 1.18.0 '@types/markdown-it': 14.1.2 -<<<<<<< HEAD -<<<<<<< HEAD - '@vitejs/plugin-vue': 5.1.4(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0))(vue@3.5.6(typescript@5.6.2)) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c + '@vitejs/plugin-vue': 5.1.4(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0))(vue@3.5.7(typescript@5.6.2)) '@vue/devtools-api': 7.4.5 '@vue/shared': 3.5.6 - '@vueuse/core': 11.1.0(vue@3.5.6(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.6(typescript@5.6.2)) - focus-trap: 7.5.4 -======= - '@vitejs/plugin-vue': 5.1.4(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2)) -======= - '@vitejs/plugin-vue': 5.1.4(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.7(typescript@5.6.2)) ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 - '@vue/devtools-api': 7.4.5 - '@vue/shared': 3.5.8 '@vueuse/core': 11.1.0(vue@3.5.7(typescript@5.6.2)) - '@vueuse/integrations': 11.1.0(async-validator@4.2.5)(axios@1.7.7)(focus-trap@7.6.0)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.7(typescript@5.6.2)) - focus-trap: 7.6.0 ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@vueuse/integrations': 11.1.0(async-validator@4.2.5)(axios@1.7.7)(focus-trap@7.5.4)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.3)(vue@3.5.7(typescript@5.6.2)) + focus-trap: 7.5.4 mark.js: 8.11.1 minisearch: 7.1.0 -<<<<<<< HEAD - shiki: 1.17.0 - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) -======= shiki: 1.18.0 -<<<<<<< HEAD -<<<<<<< HEAD - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c - vue: 3.5.6(typescript@5.6.2) -======= - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) -======= - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> dac80703d937b31933d0d6e915b5d8c20b0383e9 + vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) vue: 3.5.7(typescript@5.6.2) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 optionalDependencies: postcss: 8.4.47 transitivePeerDependencies: @@ -21722,32 +20724,10 @@ snapshots: - typescript - universal-cookie -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - vitest@2.1.1(@types/node@22.5.5)(jsdom@25.0.0)(less@4.2.0)(sass@1.79.1)(terser@5.32.0): + vitest@2.1.1(@types/node@22.5.5)(happy-dom@15.7.4)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.3)(terser@5.32.0): dependencies: '@vitest/expect': 2.1.1 - '@vitest/mocker': 2.1.1(@vitest/spy@2.1.1)(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)) -======= - vitest@2.1.1(@types/node@22.5.5)(jsdom@25.0.0)(less@4.2.0)(sass@1.79.2)(terser@5.33.0): - dependencies: - '@vitest/expect': 2.1.1 - '@vitest/mocker': 2.1.1(@vitest/spy@2.1.1)(vite@5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0)) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - vitest@2.1.1(@types/node@22.5.5)(jsdom@25.0.0)(less@4.2.0)(sass@1.79.3)(terser@5.33.0): -======= - vitest@2.1.1(@types/node@22.5.5)(jsdom@25.0.1)(less@4.2.0)(sass@1.79.3)(terser@5.33.0): ->>>>>>> 31f6cc64164464f00a8ebfb3d83582a83d867f47 -======= - vitest@2.1.1(@types/node@22.5.5)(happy-dom@15.7.4)(less@4.2.0)(sass@1.79.3)(terser@5.33.0): ->>>>>>> 2a83f1d666729c72df7e02be2d8665fbf2526825 - dependencies: - '@vitest/expect': 2.1.1 - '@vitest/mocker': 2.1.1(@vitest/spy@2.1.1)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0)) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + '@vitest/mocker': 2.1.1(@vitest/spy@2.1.1)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0)) '@vitest/pretty-format': 2.1.1 '@vitest/runner': 2.1.1 '@vitest/snapshot': 2.1.1 @@ -21762,22 +20742,13 @@ snapshots: tinyexec: 0.3.0 tinypool: 1.0.1 tinyrainbow: 1.2.0 -<<<<<<< HEAD -<<<<<<< HEAD - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) - vite-node: 2.1.1(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0) -======= - vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) - vite-node: 2.1.1(@types/node@22.5.5)(less@4.2.0)(sass@1.79.2)(terser@5.33.0) ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c -======= - vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) - vite-node: 2.1.1(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.33.0) ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 + vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) + vite-node: 2.1.1(@types/node@22.5.5)(less@4.2.0)(sass@1.79.3)(terser@5.32.0) why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 22.5.5 happy-dom: 15.7.4 + jsdom: 25.0.1 transitivePeerDependencies: - less - lightningcss @@ -21798,11 +20769,11 @@ snapshots: vscode-uri@3.0.8: {} - vue-codemirror6@1.3.4(@lezer/common@1.2.1)(vue@3.5.6(typescript@5.6.2)): + vue-codemirror6@1.3.4(@lezer/common@1.2.1)(vue@3.5.7(typescript@5.6.2)): dependencies: codemirror: 6.0.1(@lezer/common@1.2.1) - vue: 3.5.6(typescript@5.6.2) - vue-demi: 0.14.10(vue@3.5.6(typescript@5.6.2)) + vue: 3.5.7(typescript@5.6.2) + vue-demi: 0.14.10(vue@3.5.7(typescript@5.6.2)) transitivePeerDependencies: - '@lezer/common' - '@vue/composition-api' @@ -21833,15 +20804,11 @@ snapshots: '@vue/devtools-api': 6.6.4 vue: 3.5.7(typescript@5.6.2) -<<<<<<< HEAD - vue-json-pretty@2.4.0(vue@3.5.6(typescript@5.6.2)): + vue-json-pretty@2.4.0(vue@3.5.7(typescript@5.6.2)): dependencies: - vue: 3.5.6(typescript@5.6.2) + vue: 3.5.7(typescript@5.6.2) - vue-router@4.4.5(vue@3.5.6(typescript@5.6.2)): -======= vue-router@4.4.5(vue@3.5.7(typescript@5.6.2)): ->>>>>>> 37645f08be4dafe78c7f04a998dd1a6d18d82153 dependencies: '@vue/devtools-api': 6.6.4 vue: 3.5.7(typescript@5.6.2) @@ -21879,15 +20846,13 @@ snapshots: vooks: 0.2.12(vue@3.5.7(typescript@5.6.2)) vue: 3.5.7(typescript@5.6.2) -<<<<<<< HEAD w3c-keyname@2.2.8: {} w3c-xmlserializer@5.0.0: dependencies: xml-name-validator: 5.0.0 + optional: true -======= ->>>>>>> 2a83f1d666729c72df7e02be2d8665fbf2526825 warning@4.0.3: dependencies: loose-envify: 1.4.0 @@ -21912,6 +20877,12 @@ snapshots: whatwg-mimetype@4.0.0: {} + whatwg-url@14.0.0: + dependencies: + tr46: 5.0.0 + webidl-conversions: 7.0.0 + optional: true + whatwg-url@5.0.0: dependencies: tr46: 0.0.3 @@ -22110,10 +21081,19 @@ snapshots: imurmurhash: 0.1.4 signal-exit: 4.1.0 + ws@8.18.0: + optional: true + xdg-basedir@5.1.0: {} xml-name-validator@4.0.0: {} + xml-name-validator@5.0.0: + optional: true + + xmlchars@2.2.0: + optional: true + y18n@4.0.3: {} y18n@5.0.8: {} @@ -22201,11 +21181,7 @@ snapshots: zwitch@2.0.4: {} -<<<<<<< HEAD - zx@8.1.6: -======= zx@8.1.8: ->>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c optionalDependencies: '@types/fs-extra': 11.0.4 '@types/node': 22.5.5