diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index 96e0c774..2705dc2d 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -52,7 +52,7 @@ "pinia": "2.2.2", "tinymce": "^7.3.0", "vue": "^3.5.4", - "vue-router": "^4.4.3" + "vue-router": "^4.4.4" }, "devDependencies": { "@types/crypto-js": "^4.2.2", diff --git a/apps/web-antd/src/router/routes/modules/dashboard.ts b/apps/web-antd/src/router/routes/modules/dashboard.ts index a8cdb05d..1bddab9d 100644 --- a/apps/web-antd/src/router/routes/modules/dashboard.ts +++ b/apps/web-antd/src/router/routes/modules/dashboard.ts @@ -29,6 +29,7 @@ const routes: RouteRecordRaw[] = [ path: '/workspace', component: () => import('#/views/dashboard/workspace/index.vue'), meta: { + icon: 'carbon:workspace', title: $t('page.dashboard.workspace'), }, }, diff --git a/apps/web-antd/src/router/routes/modules/vben.ts b/apps/web-antd/src/router/routes/modules/vben.ts index f1a836fb..46947212 100644 --- a/apps/web-antd/src/router/routes/modules/vben.ts +++ b/apps/web-antd/src/router/routes/modules/vben.ts @@ -58,6 +58,7 @@ const routes: RouteRecordRaw[] = [ component: IFrameView, meta: { badgeType: 'dot', + icon: 'logos:naiveui', link: VBEN_NAIVE_PREVIEW_URL, title: $t('page.vben.naive-ui'), }, @@ -68,6 +69,7 @@ const routes: RouteRecordRaw[] = [ component: IFrameView, meta: { badgeType: 'dot', + icon: 'logos:element', link: VBEN_ELE_PREVIEW_URL, title: $t('page.vben.element-plus'), }, diff --git a/apps/web-ele/package.json b/apps/web-ele/package.json index f89bb7a9..ff2af4ab 100644 --- a/apps/web-ele/package.json +++ b/apps/web-ele/package.json @@ -45,7 +45,7 @@ "element-plus": "^2.8.2", "pinia": "2.2.2", "vue": "^3.5.4", - "vue-router": "^4.4.3" + "vue-router": "^4.4.4" }, "devDependencies": { "unplugin-element-plus": "^0.8.0" diff --git a/apps/web-ele/src/router/routes/modules/dashboard.ts b/apps/web-ele/src/router/routes/modules/dashboard.ts index a8cdb05d..1bddab9d 100644 --- a/apps/web-ele/src/router/routes/modules/dashboard.ts +++ b/apps/web-ele/src/router/routes/modules/dashboard.ts @@ -29,6 +29,7 @@ const routes: RouteRecordRaw[] = [ path: '/workspace', component: () => import('#/views/dashboard/workspace/index.vue'), meta: { + icon: 'carbon:workspace', title: $t('page.dashboard.workspace'), }, }, diff --git a/apps/web-ele/src/router/routes/modules/vben.ts b/apps/web-ele/src/router/routes/modules/vben.ts index fab1905d..6cd3588a 100644 --- a/apps/web-ele/src/router/routes/modules/vben.ts +++ b/apps/web-ele/src/router/routes/modules/vben.ts @@ -7,6 +7,7 @@ import { VBEN_LOGO_URL, VBEN_NAIVE_PREVIEW_URL, } from '@vben/constants'; +import { SvgAntdvLogoIcon } from '@vben/icons'; import { BasicLayout, IFrameView } from '#/layouts'; import { $t } from '#/locales'; @@ -58,6 +59,7 @@ const routes: RouteRecordRaw[] = [ component: IFrameView, meta: { badgeType: 'dot', + icon: 'logos:naiveui', link: VBEN_NAIVE_PREVIEW_URL, title: $t('page.vben.naive-ui'), }, @@ -68,6 +70,7 @@ const routes: RouteRecordRaw[] = [ component: IFrameView, meta: { badgeType: 'dot', + icon: SvgAntdvLogoIcon, link: VBEN_ANT_PREVIEW_URL, title: $t('page.vben.antdv'), }, diff --git a/apps/web-naive/package.json b/apps/web-naive/package.json index 61fe8691..22f105b1 100644 --- a/apps/web-naive/package.json +++ b/apps/web-naive/package.json @@ -44,6 +44,6 @@ "naive-ui": "^2.39.0", "pinia": "2.2.2", "vue": "^3.5.4", - "vue-router": "^4.4.3" + "vue-router": "^4.4.4" } } diff --git a/apps/web-naive/src/router/routes/modules/dashboard.ts b/apps/web-naive/src/router/routes/modules/dashboard.ts index a8cdb05d..1bddab9d 100644 --- a/apps/web-naive/src/router/routes/modules/dashboard.ts +++ b/apps/web-naive/src/router/routes/modules/dashboard.ts @@ -29,6 +29,7 @@ const routes: RouteRecordRaw[] = [ path: '/workspace', component: () => import('#/views/dashboard/workspace/index.vue'), meta: { + icon: 'carbon:workspace', title: $t('page.dashboard.workspace'), }, }, diff --git a/apps/web-naive/src/router/routes/modules/vben.ts b/apps/web-naive/src/router/routes/modules/vben.ts index 4f067498..01041bf4 100644 --- a/apps/web-naive/src/router/routes/modules/vben.ts +++ b/apps/web-naive/src/router/routes/modules/vben.ts @@ -7,6 +7,7 @@ import { VBEN_GITHUB_URL, VBEN_LOGO_URL, } from '@vben/constants'; +import { SvgAntdvLogoIcon } from '@vben/icons'; import { BasicLayout, IFrameView } from '#/layouts'; import { $t } from '#/locales'; @@ -58,6 +59,7 @@ const routes: RouteRecordRaw[] = [ component: IFrameView, meta: { badgeType: 'dot', + icon: SvgAntdvLogoIcon, link: VBEN_ANT_PREVIEW_URL, title: $t('page.vben.antdv'), }, @@ -68,6 +70,7 @@ const routes: RouteRecordRaw[] = [ component: IFrameView, meta: { badgeType: 'dot', + icon: 'logos:element', link: VBEN_ELE_PREVIEW_URL, title: $t('page.vben.element-plus'), }, diff --git a/docs/.vitepress/config/plugins/demo-preview.ts b/docs/.vitepress/config/plugins/demo-preview.ts index 46c35a96..fba835cc 100644 --- a/docs/.vitepress/config/plugins/demo-preview.ts +++ b/docs/.vitepress/config/plugins/demo-preview.ts @@ -47,7 +47,10 @@ export const demoPreviewPlugin = (md: MarkdownRenderer) => { const regex = /]*\sdir="([^"]*)"/g; // Iterate through the Markdown content and replace the pattern state.src = state.src.replaceAll(regex, (_match, dir) => { - const componentDir = join(process.cwd(), 'src', dir); + const componentDir = join(process.cwd(), 'src', dir).replaceAll( + '\\', + '/', + ); let childFiles: string[] = []; let dirExists = true; diff --git a/package.json b/package.json index 683bdbfa..9e18b5ba 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "@ctrl/tinycolor": "4.1.0", "clsx": "2.1.1", "pinia": "2.2.2", - "vue": "3.5.3" + "vue": "3.5.4" }, "neverBuiltDependencies": [ "canvas", diff --git a/packages/@core/base/typings/package.json b/packages/@core/base/typings/package.json index 1dba6a74..d35f73b6 100644 --- a/packages/@core/base/typings/package.json +++ b/packages/@core/base/typings/package.json @@ -39,6 +39,6 @@ }, "dependencies": { "vue": "^3.5.4", - "vue-router": "^4.4.3" + "vue-router": "^4.4.4" } } diff --git a/packages/@core/ui-kit/menu-ui/src/components/menu-item.vue b/packages/@core/ui-kit/menu-ui/src/components/menu-item.vue index 9b44e06c..53152661 100644 --- a/packages/@core/ui-kit/menu-ui/src/components/menu-item.vue +++ b/packages/@core/ui-kit/menu-ui/src/components/menu-item.vue @@ -113,7 +113,7 @@ onBeforeUnmount(() => { class="right-2" v-bind="props" /> - + diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue b/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue index a85ecac8..2d38e0a7 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue @@ -31,7 +31,6 @@ function handleClick(path?: string) { diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue b/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue index c7c00bef..7d256202 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue @@ -47,12 +47,7 @@ function handleClick(path?: string) {
- + {{ item.title }} @@ -77,7 +72,6 @@ function handleClick(path?: string) { @@ -89,7 +83,6 @@ function handleClick(path?: string) { diff --git a/packages/@core/ui-kit/tabs-ui/src/components/tabs-chrome/tabs.vue b/packages/@core/ui-kit/tabs-ui/src/components/tabs-chrome/tabs.vue index fc43310f..9f322e23 100644 --- a/packages/@core/ui-kit/tabs-ui/src/components/tabs-chrome/tabs.vue +++ b/packages/@core/ui-kit/tabs-ui/src/components/tabs-chrome/tabs.vue @@ -134,7 +134,6 @@ const tabsView = computed((): TabConfig[] => { v-if="showIcon" :icon="tab.icon" class="mr-1 flex size-4 items-center overflow-hidden" - fallback /> diff --git a/packages/effects/common-ui/package.json b/packages/effects/common-ui/package.json index ba20713b..c07c792e 100644 --- a/packages/effects/common-ui/package.json +++ b/packages/effects/common-ui/package.json @@ -41,7 +41,7 @@ "vue": "^3.5.4", "vue-codemirror6": "^1.3.4", "vue-json-pretty": "^2.4.0", - "vue-router": "^4.4.3" + "vue-router": "^4.4.4" }, "devDependencies": { "@types/qrcode": "^1.5.5" diff --git a/packages/effects/common-ui/src/components/ellipsis-text/ellipsis-text.vue b/packages/effects/common-ui/src/components/ellipsis-text/ellipsis-text.vue index 7e6572eb..bd4f1fd3 100644 --- a/packages/effects/common-ui/src/components/ellipsis-text/ellipsis-text.vue +++ b/packages/effects/common-ui/src/components/ellipsis-text/ellipsis-text.vue @@ -116,7 +116,7 @@ function handleExpand() { ref="ellipsis" :class="{ '!cursor-pointer': expand, - ['inline-block truncate']: line === 1, + ['block truncate']: line === 1, [$style.ellipsisMultiLine]: line > 1, }" :style="{ diff --git a/packages/effects/hooks/package.json b/packages/effects/hooks/package.json index f2fd7565..061e7482 100644 --- a/packages/effects/hooks/package.json +++ b/packages/effects/hooks/package.json @@ -26,7 +26,7 @@ "@vben/types": "workspace:*", "@vben/utils": "workspace:*", "vue": "^3.5.4", - "vue-router": "^4.4.3", + "vue-router": "^4.4.4", "watermark-js-plus": "^1.5.6" } } diff --git a/packages/effects/layouts/package.json b/packages/effects/layouts/package.json index eb67cd5a..2c8b3fe6 100644 --- a/packages/effects/layouts/package.json +++ b/packages/effects/layouts/package.json @@ -37,6 +37,6 @@ "@vben/utils": "workspace:*", "@vueuse/core": "^11.0.3", "vue": "^3.5.4", - "vue-router": "^4.4.3" + "vue-router": "^4.4.4" } } diff --git a/packages/icons/src/svg/icons/antdv-logo.svg b/packages/icons/src/svg/icons/antdv-logo.svg new file mode 100644 index 00000000..dbfcee7e --- /dev/null +++ b/packages/icons/src/svg/icons/antdv-logo.svg @@ -0,0 +1,29 @@ + + + + Vue + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/icons/src/svg/index.ts b/packages/icons/src/svg/index.ts index 27d2780e..a4a53ddf 100644 --- a/packages/icons/src/svg/index.ts +++ b/packages/icons/src/svg/index.ts @@ -10,8 +10,10 @@ const SvgDownloadIcon = createIconifyIcon('svg:download'); const SvgCardIcon = createIconifyIcon('svg:card'); const SvgBellIcon = createIconifyIcon('svg:bell'); const SvgCakeIcon = createIconifyIcon('svg:cake'); +const SvgAntdvLogoIcon = createIconifyIcon('svg:antdv-logo'); export { + SvgAntdvLogoIcon, SvgAvatar1Icon, SvgAvatar2Icon, SvgAvatar3Icon, diff --git a/packages/stores/package.json b/packages/stores/package.json index 04e63be1..c2e21660 100644 --- a/packages/stores/package.json +++ b/packages/stores/package.json @@ -25,6 +25,6 @@ "pinia": "2.2.2", "pinia-plugin-persistedstate": "^3.2.3", "vue": "^3.5.4", - "vue-router": "^4.4.3" + "vue-router": "^4.4.4" } } diff --git a/packages/types/package.json b/packages/types/package.json index 7fc6783a..d7db6e5a 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -22,6 +22,6 @@ "dependencies": { "@vben-core/typings": "workspace:*", "vue": "^3.5.4", - "vue-router": "^4.4.3" + "vue-router": "^4.4.4" } } diff --git a/packages/utils/package.json b/packages/utils/package.json index 55f91a8e..e72508e8 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -24,6 +24,6 @@ "dependencies": { "@vben-core/shared": "workspace:*", "@vben-core/typings": "workspace:*", - "vue-router": "^4.4.3" + "vue-router": "^4.4.4" } } diff --git a/playground/package.json b/playground/package.json index 4a0978b8..acedfc2d 100644 --- a/playground/package.json +++ b/playground/package.json @@ -46,6 +46,6 @@ "dayjs": "^1.11.13", "pinia": "2.2.2", "vue": "^3.5.4", - "vue-router": "^4.4.3" + "vue-router": "^4.4.4" } } diff --git a/playground/src/router/routes/modules/dashboard.ts b/playground/src/router/routes/modules/dashboard.ts index a8cdb05d..1bddab9d 100644 --- a/playground/src/router/routes/modules/dashboard.ts +++ b/playground/src/router/routes/modules/dashboard.ts @@ -29,6 +29,7 @@ const routes: RouteRecordRaw[] = [ path: '/workspace', component: () => import('#/views/dashboard/workspace/index.vue'), meta: { + icon: 'carbon:workspace', title: $t('page.dashboard.workspace'), }, }, diff --git a/playground/src/router/routes/modules/examples.ts b/playground/src/router/routes/modules/examples.ts index b2b6a9c7..c946e79c 100644 --- a/playground/src/router/routes/modules/examples.ts +++ b/playground/src/router/routes/modules/examples.ts @@ -20,6 +20,7 @@ const routes: RouteRecordRaw[] = [ path: '/examples/modal', component: () => import('#/views/examples/modal/index.vue'), meta: { + icon: 'system-uicons:window-content', title: $t('page.examples.modal.title'), }, }, @@ -28,6 +29,7 @@ const routes: RouteRecordRaw[] = [ path: '/examples/drawer', component: () => import('#/views/examples/drawer/index.vue'), meta: { + icon: 'iconoir:drawer', title: $t('page.examples.drawer.title'), }, }, @@ -36,6 +38,7 @@ const routes: RouteRecordRaw[] = [ path: '/examples/ellipsis', component: () => import('#/views/examples/ellipsis/index.vue'), meta: { + icon: 'ion:ellipsis-horizontal', title: $t('page.examples.ellipsis.title'), }, }, @@ -44,6 +47,7 @@ const routes: RouteRecordRaw[] = [ path: '/examples/captcha', component: () => import('#/views/examples/captcha/index.vue'), meta: { + icon: 'logos:recaptcha', title: $t('page.examples.captcha.title'), }, }, @@ -51,6 +55,7 @@ const routes: RouteRecordRaw[] = [ name: 'FormExample', path: '/examples/form', meta: { + icon: 'mdi:form-select', title: $t('page.examples.form.title'), }, children: [ diff --git a/playground/src/router/routes/modules/vben.ts b/playground/src/router/routes/modules/vben.ts index 1519a4a2..baf24756 100644 --- a/playground/src/router/routes/modules/vben.ts +++ b/playground/src/router/routes/modules/vben.ts @@ -8,6 +8,7 @@ import { VBEN_LOGO_URL, VBEN_NAIVE_PREVIEW_URL, } from '@vben/constants'; +import { SvgAntdvLogoIcon } from '@vben/icons'; import { BasicLayout, IFrameView } from '#/layouts'; import { $t } from '#/locales'; @@ -59,6 +60,7 @@ const routes: RouteRecordRaw[] = [ component: IFrameView, meta: { badgeType: 'dot', + icon: SvgAntdvLogoIcon, link: VBEN_ANT_PREVIEW_URL, title: $t('page.vben.antdv'), }, @@ -69,6 +71,7 @@ const routes: RouteRecordRaw[] = [ component: IFrameView, meta: { badgeType: 'dot', + icon: 'logos:naiveui', link: VBEN_NAIVE_PREVIEW_URL, title: $t('page.vben.naive-ui'), }, @@ -79,6 +82,7 @@ const routes: RouteRecordRaw[] = [ component: IFrameView, meta: { badgeType: 'dot', + icon: 'logos:element', link: VBEN_ELE_PREVIEW_URL, title: $t('page.vben.element-plus'), }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 65df8f41..6c7b2636 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,7 +8,7 @@ overrides: '@ctrl/tinycolor': 4.1.0 clsx: 2.1.1 pinia: 2.2.2 - vue: 3.5.3 + vue: 3.5.4 importers: @@ -55,10 +55,10 @@ importers: version: link:scripts/vsh '@vitejs/plugin-vue': specifier: ^5.1.3 - version: 5.1.3(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.3(typescript@5.6.2)) + version: 5.1.3(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.4(typescript@5.6.2)) '@vitejs/plugin-vue-jsx': specifier: ^4.0.1 - version: 4.0.1(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.3(typescript@5.6.2)) + version: 4.0.1(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.4(typescript@5.6.2)) '@vue/test-utils': specifier: ^2.4.6 version: 2.4.6 @@ -105,8 +105,8 @@ importers: specifier: ^2.0.5 version: 2.0.5(@types/node@22.5.4)(jsdom@25.0.0)(less@4.2.0)(sass@1.78.0)(terser@5.32.0) vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) vue-tsc: specifier: ^2.1.6 version: 2.1.6(typescript@5.6.2) @@ -176,9 +176,10 @@ importers: version: link:../../packages/utils '@vueuse/core': specifier: ^11.0.3 - version: 11.0.3(vue@3.5.3(typescript@5.6.2)) + version: 11.0.3(vue@3.5.4(typescript@5.6.2)) ant-design-vue: specifier: ^4.2.3 +<<<<<<< HEAD version: 4.2.3(vue@3.5.3(typescript@5.6.2)) cropperjs: specifier: ^1.6.2 @@ -186,6 +187,9 @@ importers: crypto-js: specifier: ^4.2.0 version: 4.2.0 +======= + version: 4.2.3(vue@3.5.4(typescript@5.6.2)) +>>>>>>> 8f6bf6add3bc0f28df3f2269cbdb2f32fa72470d dayjs: specifier: ^1.11.13 version: 1.11.13 @@ -200,14 +204,19 @@ importers: version: 4.17.21 pinia: specifier: 2.2.2 +<<<<<<< HEAD version: 2.2.2(typescript@5.6.2)(vue@3.5.3(typescript@5.6.2)) tinymce: specifier: ^7.3.0 version: 7.3.0 +======= + version: 2.2.2(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)) +>>>>>>> 8f6bf6add3bc0f28df3f2269cbdb2f32fa72470d vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) vue-router: +<<<<<<< HEAD specifier: ^4.4.3 version: 4.4.3(vue@3.5.3(typescript@5.6.2)) devDependencies: @@ -220,6 +229,10 @@ importers: unplugin-vue-components: specifier: ^0.27.3 version: 0.27.4(@babel/parser@7.25.6)(rollup@4.21.2)(vue@3.5.3(typescript@5.6.2)) +======= + specifier: ^4.4.4 + version: 4.4.4(vue@3.5.4(typescript@5.6.2)) +>>>>>>> 8f6bf6add3bc0f28df3f2269cbdb2f32fa72470d apps/web-ele: dependencies: @@ -267,22 +280,22 @@ importers: version: link:../../packages/utils '@vueuse/core': specifier: ^11.0.3 - version: 11.0.3(vue@3.5.3(typescript@5.6.2)) + version: 11.0.3(vue@3.5.4(typescript@5.6.2)) dayjs: specifier: ^1.11.13 version: 1.11.13 element-plus: specifier: ^2.8.2 - version: 2.8.2(vue@3.5.3(typescript@5.6.2)) + version: 2.8.2(vue@3.5.4(typescript@5.6.2)) pinia: specifier: 2.2.2 - version: 2.2.2(typescript@5.6.2)(vue@3.5.3(typescript@5.6.2)) + version: 2.2.2(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)) vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) vue-router: - specifier: ^4.4.3 - version: 4.4.3(vue@3.5.3(typescript@5.6.2)) + specifier: ^4.4.4 + version: 4.4.4(vue@3.5.4(typescript@5.6.2)) devDependencies: unplugin-element-plus: specifier: ^0.8.0 @@ -334,19 +347,19 @@ importers: version: link:../../packages/utils '@vueuse/core': specifier: ^11.0.3 - version: 11.0.3(vue@3.5.3(typescript@5.6.2)) + version: 11.0.3(vue@3.5.4(typescript@5.6.2)) naive-ui: specifier: ^2.39.0 - version: 2.39.0(vue@3.5.3(typescript@5.6.2)) + version: 2.39.0(vue@3.5.4(typescript@5.6.2)) pinia: specifier: 2.2.2 - version: 2.2.2(typescript@5.6.2)(vue@3.5.3(typescript@5.6.2)) + version: 2.2.2(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)) vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) vue-router: - specifier: ^4.4.3 - version: 4.4.3(vue@3.5.3(typescript@5.6.2)) + specifier: ^4.4.4 + version: 4.4.4(vue@3.5.4(typescript@5.6.2)) docs: dependencies: @@ -361,13 +374,13 @@ importers: version: link:../packages/styles lucide-vue-next: specifier: ^0.439.0 - version: 0.439.0(vue@3.5.3(typescript@5.6.2)) + version: 0.439.0(vue@3.5.4(typescript@5.6.2)) medium-zoom: specifier: ^1.1.0 version: 1.1.0 radix-vue: specifier: ^1.9.5 - version: 1.9.5(vue@3.5.3(typescript@5.6.2)) + version: 1.9.5(vue@3.5.4(typescript@5.6.2)) devDependencies: '@nolebase/vitepress-plugin-git-changelog': specifier: ^2.5.0 @@ -382,8 +395,8 @@ importers: specifier: ^1.3.4 version: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.4)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.45)(qrcode@1.5.4)(sass@1.78.0)(search-insights@2.17.1)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2) vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) internal/lint-configs/commitlint-config: dependencies: @@ -639,7 +652,11 @@ importers: dependencies: '@intlify/unplugin-vue-i18n': specifier: ^4.0.0 +<<<<<<< HEAD version: 4.0.0(rollup@4.21.2)(vue-i18n@9.14.0(vue@3.5.3(typescript@5.6.2)))(webpack-sources@3.2.3) +======= + version: 4.0.0(rollup@4.21.2)(vue-i18n@9.14.0(vue@3.5.4(typescript@5.6.2))) +>>>>>>> 8f6bf6add3bc0f28df3f2269cbdb2f32fa72470d '@jspm/generator': specifier: ^2.3.0 version: 2.3.0 @@ -669,7 +686,7 @@ importers: version: 0.20.5(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0) vite-plugin-vue-devtools: specifier: ^7.4.4 - version: 7.4.4(rollup@4.21.2)(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.3(typescript@5.6.2)) + version: 7.4.4(rollup@4.21.2)(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.4(typescript@5.6.2)) devDependencies: '@types/archiver': specifier: ^6.0.2 @@ -682,10 +699,10 @@ importers: version: link:../node-utils '@vitejs/plugin-vue': specifier: ^5.1.3 - version: 5.1.3(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.3(typescript@5.6.2)) + version: 5.1.3(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.4(typescript@5.6.2)) '@vitejs/plugin-vue-jsx': specifier: ^4.0.1 - version: 4.0.1(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.3(typescript@5.6.2)) + version: 4.0.1(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.4(typescript@5.6.2)) dayjs: specifier: ^1.11.13 version: 1.11.13 @@ -720,13 +737,13 @@ importers: dependencies: '@iconify/vue': specifier: ^4.1.2 - version: 4.1.2(vue@3.5.3(typescript@5.6.2)) + version: 4.1.2(vue@3.5.4(typescript@5.6.2)) lucide-vue-next: specifier: ^0.439.0 - version: 0.439.0(vue@3.5.3(typescript@5.6.2)) + version: 0.439.0(vue@3.5.4(typescript@5.6.2)) vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) packages/@core/base/shared: dependencies: @@ -735,7 +752,7 @@ importers: version: 4.1.0 '@tanstack/vue-store': specifier: ^0.5.5 - version: 0.5.5(vue@3.5.3(typescript@5.6.2)) + version: 0.5.5(vue@3.5.4(typescript@5.6.2)) '@vue/shared': specifier: ^3.5.4 version: 3.5.4 @@ -768,11 +785,11 @@ importers: packages/@core/base/typings: dependencies: vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) vue-router: - specifier: ^4.4.3 - version: 4.4.3(vue@3.5.3(typescript@5.6.2)) + specifier: ^4.4.4 + version: 4.4.4(vue@3.5.4(typescript@5.6.2)) packages/@core/composables: dependencies: @@ -781,16 +798,16 @@ importers: version: link:../base/shared '@vueuse/core': specifier: ^11.0.3 - version: 11.0.3(vue@3.5.3(typescript@5.6.2)) + version: 11.0.3(vue@3.5.4(typescript@5.6.2)) radix-vue: specifier: ^1.9.5 - version: 1.9.5(vue@3.5.3(typescript@5.6.2)) + version: 1.9.5(vue@3.5.4(typescript@5.6.2)) sortablejs: specifier: ^1.15.3 version: 1.15.3 vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) devDependencies: '@types/sortablejs': specifier: ^1.15.8 @@ -806,10 +823,10 @@ importers: version: link:../base/typings '@vueuse/core': specifier: ^11.0.3 - version: 11.0.3(vue@3.5.3(typescript@5.6.2)) + version: 11.0.3(vue@3.5.4(typescript@5.6.2)) vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) packages/@core/ui-kit/form-ui: dependencies: @@ -824,16 +841,16 @@ importers: version: link:../../base/shared '@vee-validate/zod': specifier: ^4.13.2 - version: 4.13.2(vue@3.5.3(typescript@5.6.2)) + version: 4.13.2(vue@3.5.4(typescript@5.6.2)) '@vueuse/core': specifier: ^11.0.3 - version: 11.0.3(vue@3.5.3(typescript@5.6.2)) + version: 11.0.3(vue@3.5.4(typescript@5.6.2)) vee-validate: specifier: ^4.13.2 - version: 4.13.2(vue@3.5.3(typescript@5.6.2)) + version: 4.13.2(vue@3.5.4(typescript@5.6.2)) vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) zod: specifier: ^3.23.8 version: 3.23.8 @@ -857,10 +874,10 @@ importers: version: link:../../base/typings '@vueuse/core': specifier: ^11.0.3 - version: 11.0.3(vue@3.5.3(typescript@5.6.2)) + version: 11.0.3(vue@3.5.4(typescript@5.6.2)) vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) packages/@core/ui-kit/menu-ui: dependencies: @@ -881,10 +898,10 @@ importers: version: link:../../base/typings '@vueuse/core': specifier: ^11.0.3 - version: 11.0.3(vue@3.5.3(typescript@5.6.2)) + version: 11.0.3(vue@3.5.4(typescript@5.6.2)) vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) packages/@core/ui-kit/popup-ui: dependencies: @@ -902,16 +919,16 @@ importers: version: link:../../base/shared '@vueuse/core': specifier: ^11.0.3 - version: 11.0.3(vue@3.5.3(typescript@5.6.2)) + version: 11.0.3(vue@3.5.4(typescript@5.6.2)) vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) packages/@core/ui-kit/shadcn-ui: dependencies: '@radix-icons/vue': specifier: ^1.0.0 - version: 1.0.0(vue@3.5.3(typescript@5.6.2)) + version: 1.0.0(vue@3.5.4(typescript@5.6.2)) '@vben-core/icons': specifier: workspace:* version: link:../../base/icons @@ -923,22 +940,22 @@ importers: version: link:../../base/typings '@vueuse/core': specifier: ^11.0.3 - version: 11.0.3(vue@3.5.3(typescript@5.6.2)) + version: 11.0.3(vue@3.5.4(typescript@5.6.2)) class-variance-authority: specifier: ^0.7.0 version: 0.7.0 lucide-vue-next: specifier: ^0.439.0 - version: 0.439.0(vue@3.5.3(typescript@5.6.2)) + version: 0.439.0(vue@3.5.4(typescript@5.6.2)) radix-vue: specifier: ^1.9.5 - version: 1.9.5(vue@3.5.3(typescript@5.6.2)) + version: 1.9.5(vue@3.5.4(typescript@5.6.2)) vee-validate: specifier: ^4.13.2 - version: 4.13.2(vue@3.5.3(typescript@5.6.2)) + version: 4.13.2(vue@3.5.4(typescript@5.6.2)) vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) packages/@core/ui-kit/tabs-ui: dependencies: @@ -956,10 +973,10 @@ importers: version: link:../../base/typings '@vueuse/core': specifier: ^11.0.3 - version: 11.0.3(vue@3.5.3(typescript@5.6.2)) + version: 11.0.3(vue@3.5.4(typescript@5.6.2)) vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) packages/constants: dependencies: @@ -982,8 +999,8 @@ importers: specifier: workspace:* version: link:../../utils vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) packages/effects/common-ui: dependencies: @@ -1034,14 +1051,19 @@ importers: version: link:../../types '@vueuse/integrations': specifier: ^11.0.3 +<<<<<<< HEAD version: 11.0.3(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.3(typescript@5.6.2)) codemirror: specifier: ^6.0.1 version: 6.0.1(@lezer/common@1.2.1) +======= + version: 11.0.3(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.4(typescript@5.6.2)) +>>>>>>> 8f6bf6add3bc0f28df3f2269cbdb2f32fa72470d qrcode: specifier: ^1.5.4 version: 1.5.4 vue: +<<<<<<< HEAD specifier: 3.5.3 version: 3.5.3(typescript@5.6.2) vue-codemirror6: @@ -1050,9 +1072,13 @@ importers: vue-json-pretty: specifier: ^2.4.0 version: 2.4.0(vue@3.5.3(typescript@5.6.2)) +======= + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) +>>>>>>> 8f6bf6add3bc0f28df3f2269cbdb2f32fa72470d vue-router: - specifier: ^4.4.3 - version: 4.4.3(vue@3.5.3(typescript@5.6.2)) + specifier: ^4.4.4 + version: 4.4.4(vue@3.5.4(typescript@5.6.2)) devDependencies: '@types/qrcode': specifier: ^1.5.5 @@ -1076,11 +1102,11 @@ importers: specifier: workspace:* version: link:../../utils vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) vue-router: - specifier: ^4.4.3 - version: 4.4.3(vue@3.5.3(typescript@5.6.2)) + specifier: ^4.4.4 + version: 4.4.4(vue@3.5.4(typescript@5.6.2)) watermark-js-plus: specifier: ^1.5.6 version: 1.5.6 @@ -1134,13 +1160,13 @@ importers: version: link:../../utils '@vueuse/core': specifier: ^11.0.3 - version: 11.0.3(vue@3.5.3(typescript@5.6.2)) + version: 11.0.3(vue@3.5.4(typescript@5.6.2)) vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) vue-router: - specifier: ^4.4.3 - version: 4.4.3(vue@3.5.3(typescript@5.6.2)) + specifier: ^4.4.4 + version: 4.4.4(vue@3.5.4(typescript@5.6.2)) packages/effects/plugins: dependencies: @@ -1149,13 +1175,13 @@ importers: version: link:../../preferences '@vueuse/core': specifier: ^11.0.3 - version: 11.0.3(vue@3.5.3(typescript@5.6.2)) + version: 11.0.3(vue@3.5.4(typescript@5.6.2)) echarts: specifier: ^5.5.1 version: 5.5.1 vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) packages/effects/request: dependencies: @@ -1188,11 +1214,11 @@ importers: specifier: workspace:* version: link:../@core/composables vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) vue-i18n: specifier: ^9.14.0 - version: 9.14.0(vue@3.5.3(typescript@5.6.2)) + version: 9.14.0(vue@3.5.4(typescript@5.6.2)) packages/preferences: dependencies: @@ -1213,16 +1239,16 @@ importers: version: link:../@core/base/typings pinia: specifier: 2.2.2 - version: 2.2.2(typescript@5.6.2)(vue@3.5.3(typescript@5.6.2)) + version: 2.2.2(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)) pinia-plugin-persistedstate: specifier: ^3.2.3 - version: 3.2.3(pinia@2.2.2(typescript@5.6.2)(vue@3.5.3(typescript@5.6.2))) + version: 3.2.3(pinia@2.2.2(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2))) vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) vue-router: - specifier: ^4.4.3 - version: 4.4.3(vue@3.5.3(typescript@5.6.2)) + specifier: ^4.4.4 + version: 4.4.4(vue@3.5.4(typescript@5.6.2)) packages/styles: dependencies: @@ -1236,11 +1262,11 @@ importers: specifier: workspace:* version: link:../@core/base/typings vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) vue-router: - specifier: ^4.4.3 - version: 4.4.3(vue@3.5.3(typescript@5.6.2)) + specifier: ^4.4.4 + version: 4.4.4(vue@3.5.4(typescript@5.6.2)) packages/utils: dependencies: @@ -1251,14 +1277,14 @@ importers: specifier: workspace:* version: link:../@core/base/typings vue-router: - specifier: ^4.4.3 - version: 4.4.3(vue@3.5.3(typescript@5.6.2)) + specifier: ^4.4.4 + version: 4.4.4(vue@3.5.4(typescript@5.6.2)) playground: dependencies: '@tanstack/vue-query': specifier: ^5.55.4 - version: 5.55.4(vue@3.5.3(typescript@5.6.2)) + version: 5.55.4(vue@3.5.4(typescript@5.6.2)) '@vben/access': specifier: workspace:* version: link:../packages/effects/access @@ -1303,22 +1329,22 @@ importers: version: link:../packages/utils '@vueuse/core': specifier: ^11.0.3 - version: 11.0.3(vue@3.5.3(typescript@5.6.2)) + version: 11.0.3(vue@3.5.4(typescript@5.6.2)) ant-design-vue: specifier: ^4.2.3 - version: 4.2.3(vue@3.5.3(typescript@5.6.2)) + version: 4.2.3(vue@3.5.4(typescript@5.6.2)) dayjs: specifier: ^1.11.13 version: 1.11.13 pinia: specifier: 2.2.2 - version: 2.2.2(typescript@5.6.2)(vue@3.5.3(typescript@5.6.2)) + version: 2.2.2(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)) vue: - specifier: 3.5.3 - version: 3.5.3(typescript@5.6.2) + specifier: 3.5.4 + version: 3.5.4(typescript@5.6.2) vue-router: - specifier: ^4.4.3 - version: 4.4.3(vue@3.5.3(typescript@5.6.2)) + specifier: ^4.4.4 + version: 4.4.4(vue@3.5.4(typescript@5.6.2)) scripts/turbo-run: dependencies: @@ -1434,7 +1460,7 @@ packages: '@ant-design/icons-vue@7.0.1': resolution: {integrity: sha512-eCqY2unfZK6Fe02AwFlDHLfoyEFreP6rBwAZMIJ1LugmfMiVgwWDYlp1YsRugaPtICYOabV1iWxXdP12u9U43Q==} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 '@antfu/utils@0.7.10': resolution: {integrity: sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==} @@ -2573,7 +2599,7 @@ packages: '@css-render/vue3-ssr@0.15.14': resolution: {integrity: sha512-//8027GSbxE9n3QlD73xFY6z4ZbHbvrOVB7AO6hsmrEzGbg+h2A09HboUyDgu+xsmj7JnvJD39Irt+2D0+iV8g==} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 '@csstools/cascade-layer-name-parser@2.0.1': resolution: {integrity: sha512-G9ZYN5+yr/E6xYSiy1BwOEFP5p88ZtWo8sL4NztKBkRRAwRkzVGa70M+D+fYHugMID5jkLeNt5X9jYd5EaVuyg==} @@ -2848,7 +2874,7 @@ packages: '@element-plus/icons-vue@2.3.1': resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 '@emotion/hash@0.8.0': resolution: {integrity: sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==} @@ -3493,7 +3519,7 @@ packages: '@iconify/vue@4.1.2': resolution: {integrity: sha512-CQnYqLiQD5LOAaXhBrmj1mdL2/NCJvwcC4jtW2Z8ukhThiFkLDkutarTOV2trfc9EXqUqRs0KqXOL9pZ/IyysA==} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 '@internationalized/date@3.5.5': resolution: {integrity: sha512-H+CfYvOZ0LTJeeLOqm19E3uj/4YjrmOFtBufDHPfvtI80hFAMqtrp7oCACpe4Cil5l8S0Qu/9dYfZc/5lY8WQQ==} @@ -3790,7 +3816,7 @@ packages: '@radix-icons/vue@1.0.0': resolution: {integrity: sha512-gKWWk9tTK/laDRRNe5KLLR8A0qUwx4q4+DN8Fq48hJ904u78R82ayAO3TrxbNLgyn2D0h6rRiGdLzQWj7rPcvA==} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 '@rollup/plugin-alias@5.1.0': resolution: {integrity: sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==} @@ -4066,7 +4092,7 @@ packages: resolution: {integrity: sha512-oxNS99UKzmE+95LcEYz3MA5pmN9rLeiMvNVXwbEJo33lOoJZkNAArQeNdlBvaPYtRHRVFbtJPMXegudgbFsw1g==} peerDependencies: '@vue/composition-api': ^1.1.2 - vue: 3.5.3 + vue: 3.5.4 peerDependenciesMeta: '@vue/composition-api': optional: true @@ -4075,7 +4101,7 @@ packages: resolution: {integrity: sha512-j+CDrxVhtQQNOjWzLmCqJeDwmmTAQGvEaNbLr1uPJ9rxJITodJtFNdBFj7l+Nd5o34v2ayEv64Ugh6+1BtuGNg==} peerDependencies: '@vue/composition-api': ^1.2.1 - vue: 3.5.3 + vue: 3.5.4 peerDependenciesMeta: '@vue/composition-api': optional: true @@ -4083,7 +4109,7 @@ packages: '@tanstack/vue-virtual@3.10.7': resolution: {integrity: sha512-OSK1fkvz4GaBhF80KVmBsJZoMI9ncVaUU//pI8OqTdBnepw467zcuF2Y+Ia1VC0CPYfUEALyS8n4Ar0RI/7ASg==} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 '@tinymce/tinymce-vue@6.0.1': resolution: {integrity: sha512-VzjI8AKlNrrsosIk3WuBez6kubqPsPMeaButkRLuts77uo4e2EwPRFX+VyB6fHbMGHwUPK22zNjOUGMvJFZFCw==} @@ -4328,14 +4354,14 @@ packages: engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: vite: ^5.0.0 - vue: 3.5.3 + vue: 3.5.4 '@vitejs/plugin-vue@5.1.3': resolution: {integrity: sha512-3xbWsKEKXYlmX82aOHufFQVnkbMC/v8fLpWwh6hWOUrK5fbbtBh9Q/WWse27BFgSy2/e2c0fz5Scgya9h2GLhw==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: vite: ^5.0.0 - vue: 3.5.3 + vue: 3.5.4 '@vitest/expect@2.0.5': resolution: {integrity: sha512-yHZtwuP7JZivj65Gxoi8upUN2OzHTi3zVfjwdpu2WrvCZPLwsJ2Ey5ILIPccoW23dd/zQBlJ4/dhi7DWNyXCpA==} @@ -4380,27 +4406,15 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@vue/compiler-core@3.5.3': - resolution: {integrity: sha512-adAfy9boPkP233NTyvLbGEqVuIfK/R0ZsBsIOW4BZNfb4BRpRW41Do1u+ozJpsb+mdoy80O20IzAsHaihRb5qA==} - '@vue/compiler-core@3.5.4': resolution: {integrity: sha512-oNwn+BAt3n9dK9uAYvI+XGlutwuTq/wfj4xCBaZCqwwVIGtD7D6ViihEbyYZrDHIHTDE3Q6oL3/hqmAyFEy9DQ==} - '@vue/compiler-dom@3.5.3': - resolution: {integrity: sha512-wnzFArg9zpvk/811CDOZOadJRugf1Bgl/TQ3RfV4nKfSPok4hi0w10ziYUQR6LnnBAUlEXYLUfZ71Oj9ds/+QA==} - '@vue/compiler-dom@3.5.4': resolution: {integrity: sha512-yP9RRs4BDLOLfldn6ah+AGCNovGjMbL9uHvhDHf5wan4dAHLnFGOkqtfE7PPe4HTXIqE7l/NILdYw53bo1C8jw==} - '@vue/compiler-sfc@3.5.3': - resolution: {integrity: sha512-P3uATLny2tfyvMB04OQFe7Sczteno7SLFxwrOA/dw01pBWQHB5HL15a8PosoNX2aG/EAMGqnXTu+1LnmzFhpTQ==} - '@vue/compiler-sfc@3.5.4': resolution: {integrity: sha512-P+yiPhL+NYH7m0ZgCq7AQR2q7OIE+mpAEgtkqEeH9oHSdIRvUO+4X6MPvblJIWcoe4YC5a2Gdf/RsoyP8FFiPQ==} - '@vue/compiler-ssr@3.5.3': - resolution: {integrity: sha512-F/5f+r2WzL/2YAPl7UlKcJWHrvoZN8XwEBLnT7S4BXwncH25iDOabhO2M2DWioyTguJAGavDOawejkFXj8EM1w==} - '@vue/compiler-ssr@3.5.4': resolution: {integrity: sha512-acESdTXsxPnYr2C4Blv0ggx5zIFMgOzZmYU2UgvIff9POdRGbRNBHRyzHAnizcItvpgerSKQbllUc9USp3V7eg==} @@ -4416,7 +4430,7 @@ packages: '@vue/devtools-core@7.4.4': resolution: {integrity: sha512-DLxgA3DfeADkRzhAfm3G2Rw/cWxub64SdP5b+s5dwL30+whOGj+QNhmyFpwZ8ZTrHDFRIPj0RqNzJ8IRR1pz7w==} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 '@vue/devtools-kit@7.4.4': resolution: {integrity: sha512-awK/4NfsUG0nQ7qnTM37m7ZkEUMREyPh8taFCX+uQYps/MTFEum0AD05VeGDRMXwWvMmGIcWX9xp8ZiBddY0jw==} @@ -4432,22 +4446,19 @@ packages: typescript: optional: true - '@vue/reactivity@3.5.3': - resolution: {integrity: sha512-2w61UnRWTP7+rj1H/j6FH706gRBHdFVpIqEkSDAyIpafBXYH8xt4gttstbbCWdU3OlcSWO8/3mbKl/93/HSMpw==} + '@vue/reactivity@3.5.4': + resolution: {integrity: sha512-HKKbEuP7tYSGCq4e4nK6ZW6l5hyG66OUetefBp4budUyjvAYsnQDf+bgFzg2RAgnH0CInyqXwD9y47jwJEHrQw==} - '@vue/runtime-core@3.5.3': - resolution: {integrity: sha512-5b2AQw5OZlmCzSsSBWYoZOsy75N4UdMWenTfDdI5bAzXnuVR7iR8Q4AOzQm2OGoA41xjk53VQKrqQhOz2ktWaw==} + '@vue/runtime-core@3.5.4': + resolution: {integrity: sha512-f3ek2sTA0AFu0n+w+kCtz567Euqqa3eHewvo4klwS7mWfSj/A+UmYTwsnUFo35KeyAFY60JgrCGvEBsu1n/3LA==} - '@vue/runtime-dom@3.5.3': - resolution: {integrity: sha512-wPR1DEGc3XnQ7yHbmkTt3GoY0cEnVGQnARRdAkDzZ8MbUKEs26gogCQo6AOvvgahfjIcnvWJzkZArQ1fmWjcSg==} + '@vue/runtime-dom@3.5.4': + resolution: {integrity: sha512-ofyc0w6rbD5KtjhP1i9hGOKdxGpvmuB1jprP7Djlj0X7R5J/oLwuNuE98GJ8WW31Hu2VxQHtk/LYTAlW8xrJdw==} - '@vue/server-renderer@3.5.3': - resolution: {integrity: sha512-28volmaZVG2PGO3V3+gBPKoSHvLlE8FGfG/GKXKkjjfxLuj/50B/0OQGakM/g6ehQeqCrZYM4eHC4Ks48eig1Q==} + '@vue/server-renderer@3.5.4': + resolution: {integrity: sha512-FbjV6DJLgKRetMYFBA1UXCroCiED/Ckr53/ba9wivyd7D/Xw9fpo0T6zXzCnxQwyvkyrL7y6plgYhWhNjGxY5g==} peerDependencies: - vue: 3.5.3 - - '@vue/shared@3.5.3': - resolution: {integrity: sha512-Jp2v8nylKBT+PlOUjun2Wp/f++TfJVFjshLzNtJDdmFJabJa7noGMncqXRM1vXGX+Yo2V7WykQFNxusSim8SCA==} + vue: 3.5.4 '@vue/shared@3.5.4': resolution: {integrity: sha512-L2MCDD8l7yC62Te5UUyPVpmexhL9ipVnYRw9CsWfm/BGRL5FwDX4a25bcJ/OJSD3+Hx+k/a8LDKcG2AFdJV3BA==} @@ -4635,7 +4646,7 @@ packages: resolution: {integrity: sha512-kqGyWvZtFlSInFP93Ow6wS8LzEsxxUgpI+ZY5jQQkuX8WAcqdwXCA7IcHMpECW6JB89DZMo2Bw85jUg2SjlgQA==} engines: {node: '>=12.22.0'} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 any-promise@1.3.0: resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} @@ -5657,7 +5668,7 @@ packages: element-plus@2.8.2: resolution: {integrity: sha512-pqoQlaUmzUFCjjTHyxGO7Cd0CizsQpIaad1ozV9PCaYjh2T4MIMnjfifqiYs2lWoZ/8GVwrRG1WTCfnZEjwfcg==} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 emoji-regex@10.4.0: resolution: {integrity: sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==} @@ -7169,7 +7180,7 @@ packages: lucide-vue-next@0.439.0: resolution: {integrity: sha512-XZ4KbYoEbVvAYxSuFjzZ/9oGTpCSK0CXWV6bUXe3PVN7tkSxRaoiYz+p8d/2vk43pxxOb6BSwAMfsxwbOzFk0Q==} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 magic-string@0.25.9: resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==} @@ -7385,7 +7396,7 @@ packages: naive-ui@2.39.0: resolution: {integrity: sha512-5oUJzRG+rtLSH8eRU+fJvVYiQids2BxF9jp+fwGoAqHOptEINrBlgBu9uy+95RHE5FLJ7Q/z41o+qkoGnUrKxQ==} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 nanoid@3.3.7: resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} @@ -7772,7 +7783,7 @@ packages: peerDependencies: '@vue/composition-api': ^1.4.0 typescript: '>=4.4.4' - vue: 3.5.3 + vue: 3.5.4 peerDependenciesMeta: '@vue/composition-api': optional: true @@ -8363,7 +8374,7 @@ packages: radix-vue@1.9.5: resolution: {integrity: sha512-vtCq+WDAZj5BQtJiChGf/oC7w3y7jaod3agcntgph7fD6aqdcghLZYcUWdgT/XNJs2bEsk+3cjK3ONPRNeFcuQ==} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 radix3@1.1.2: resolution: {integrity: sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA==} @@ -9538,12 +9549,12 @@ packages: vdirs@0.1.8: resolution: {integrity: sha512-H9V1zGRLQZg9b+GdMk8MXDN2Lva0zx72MPahDKc30v+DtwKjfyOSXWRIX4t2mhDubM1H09gPhWeth/BJWPHGUw==} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 vee-validate@4.13.2: resolution: {integrity: sha512-HlpR/6MJ92TW9f135umMZKUqdd/tFQTxLNSf2ImbU4Y/MlLVAUpF1l64VdjTOhbClAqPjCb5p/SqHDxLpUHXrw==} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 vite-hot-client@0.2.3: resolution: {integrity: sha512-rOGAV7rUlUHX89fP2p2v0A2WWvV3QMX2UYq0fRqsWSvFvev4atHWqjwGoKaZT1VTKyLGk533ecu3eyd0o59CAg==} @@ -9684,7 +9695,7 @@ packages: vooks@0.2.12: resolution: {integrity: sha512-iox0I3RZzxtKlcgYaStQYKEzWWGAduMmq+jS7OrNdQo1FgGfPMubGL3uGHOU9n97NIvfFDBGnpSvkWyb/NSn/Q==} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 vscode-languageserver-textdocument@1.0.12: resolution: {integrity: sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==} @@ -9707,7 +9718,7 @@ packages: hasBin: true peerDependencies: '@vue/composition-api': ^1.0.0-rc.1 - vue: 3.5.3 + vue: 3.5.4 peerDependenciesMeta: '@vue/composition-api': optional: true @@ -9722,8 +9733,9 @@ packages: resolution: {integrity: sha512-LxmpRuCt2rI8gqU+kxeflRZMQn4D5+4M3oP3PWZdowW/ePJraHqhF7p4CuaME52mUxdw3Mmy2yAUKgfZYgCRjA==} engines: {node: '>= 16'} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 +<<<<<<< HEAD vue-json-pretty@2.4.0: resolution: {integrity: sha512-e9bP41DYYIc2tWaB6KuwqFJq5odZ8/GkE6vHQuGcbPn37kGk4a3n1RNw3ZYeDrl66NWXgTlOfS+M6NKkowmkWw==} engines: {node: '>= 10.0.0', npm: '>= 5.0.0'} @@ -9732,8 +9744,12 @@ packages: vue-router@4.4.3: resolution: {integrity: sha512-sv6wmNKx2j3aqJQDMxLFzs/u/mjA9Z5LCgy6BE0f7yFWMjrPLnS/sPNn8ARY/FXw6byV18EFutn5lTO6+UsV5A==} +======= + vue-router@4.4.4: + resolution: {integrity: sha512-3MlnDqwRwZwCQVbtVfpsU+nrNymNjnXSsQtXName5925NVC1+326VVfYH9vSrA0N13teGEo8z5x7gbRnGjCDiQ==} +>>>>>>> 8f6bf6add3bc0f28df3f2269cbdb2f32fa72470d peerDependencies: - vue: 3.5.3 + vue: 3.5.4 vue-tsc@2.1.6: resolution: {integrity: sha512-f98dyZp5FOukcYmbFpuSCJ4Z0vHSOSmxGttZJCsFeX0M4w/Rsq0s4uKXjcSRsZqsRgQa6z7SfuO+y0HVICE57Q==} @@ -9745,10 +9761,10 @@ packages: resolution: {integrity: sha512-IwUC0Aq2zwaXqy74h4WCvFCUtoV0iSWr0snWnE9TnU18S66GAQyqQbRf2qfJtUuiFsBf6qp0MEwdonlwznlcrw==} engines: {node: '>=10.15.0'} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 - vue@3.5.3: - resolution: {integrity: sha512-xvRbd0HpuLovYbOHXRHlSBsSvmUJbo0pzbkKTApWnQGf3/cu5Z39mQeA5cZdLRVIoNf3zI6MSoOgHUT5i2jO+Q==} + vue@3.5.4: + resolution: {integrity: sha512-3yAj2gkmiY+i7+22A1PWM+kjOVXjU74UPINcTiN7grIVPyFFI0lpGwHlV/4xydDmobaBn7/xmi+YG8HeSlCTcg==} peerDependencies: typescript: '*' peerDependenciesMeta: @@ -9758,7 +9774,7 @@ packages: vueuc@0.4.58: resolution: {integrity: sha512-Wnj/N8WbPRSxSt+9ji1jtDHPzda5h2OH/0sFBhvdxDRuyCZbjGg3/cKMaKqEoe+dErTexG2R+i6Q8S/Toq1MYg==} peerDependencies: - vue: 3.5.3 + vue: 3.5.4 w3c-keyname@2.2.8: resolution: {integrity: sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==} @@ -10150,11 +10166,11 @@ snapshots: '@ant-design/icons-svg@4.4.2': {} - '@ant-design/icons-vue@7.0.1(vue@3.5.3(typescript@5.6.2))': + '@ant-design/icons-vue@7.0.1(vue@3.5.4(typescript@5.6.2))': dependencies: '@ant-design/colors': 6.0.0 '@ant-design/icons-svg': 4.4.2 - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) '@antfu/utils@0.7.10': {} @@ -11640,9 +11656,9 @@ snapshots: dependencies: css-render: 0.15.14 - '@css-render/vue3-ssr@0.15.14(vue@3.5.3(typescript@5.6.2))': + '@css-render/vue3-ssr@0.15.14(vue@3.5.4(typescript@5.6.2))': dependencies: - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) '@csstools/cascade-layer-name-parser@2.0.1(@csstools/css-parser-algorithms@3.0.1(@csstools/css-tokenizer@3.0.1))(@csstools/css-tokenizer@3.0.1)': dependencies: @@ -11910,9 +11926,9 @@ snapshots: '@dual-bundle/import-meta-resolve@4.1.0': {} - '@element-plus/icons-vue@2.3.1(vue@3.5.3(typescript@5.6.2))': + '@element-plus/icons-vue@2.3.1(vue@3.5.4(typescript@5.6.2))': dependencies: - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) '@emotion/hash@0.8.0': {} @@ -12255,11 +12271,11 @@ snapshots: '@floating-ui/utils@0.2.7': {} - '@floating-ui/vue@1.1.4(vue@3.5.3(typescript@5.6.2))': + '@floating-ui/vue@1.1.4(vue@3.5.4(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.3(typescript@5.6.2)) + vue-demi: 0.14.10(vue@3.5.4(typescript@5.6.2)) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -12285,10 +12301,10 @@ snapshots: '@iconify/types@2.0.0': {} - '@iconify/vue@4.1.2(vue@3.5.3(typescript@5.6.2))': + '@iconify/vue@4.1.2(vue@3.5.4(typescript@5.6.2))': dependencies: '@iconify/types': 2.0.0 - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) '@internationalized/date@3.5.5': dependencies: @@ -12298,7 +12314,7 @@ snapshots: dependencies: '@swc/helpers': 0.5.13 - '@intlify/bundle-utils@8.0.0(vue-i18n@9.14.0(vue@3.5.3(typescript@5.6.2)))': + '@intlify/bundle-utils@8.0.0(vue-i18n@9.14.0(vue@3.5.4(typescript@5.6.2)))': dependencies: '@intlify/message-compiler': 9.14.0 '@intlify/shared': 9.14.0 @@ -12310,7 +12326,7 @@ snapshots: source-map-js: 1.2.1 yaml-eslint-parser: 1.2.3 optionalDependencies: - vue-i18n: 9.14.0(vue@3.5.3(typescript@5.6.2)) + vue-i18n: 9.14.0(vue@3.5.4(typescript@5.6.2)) '@intlify/core-base@9.14.0': dependencies: @@ -12324,9 +12340,13 @@ snapshots: '@intlify/shared@9.14.0': {} +<<<<<<< HEAD '@intlify/unplugin-vue-i18n@4.0.0(rollup@4.21.2)(vue-i18n@9.14.0(vue@3.5.3(typescript@5.6.2)))(webpack-sources@3.2.3)': +======= + '@intlify/unplugin-vue-i18n@4.0.0(rollup@4.21.2)(vue-i18n@9.14.0(vue@3.5.4(typescript@5.6.2)))': +>>>>>>> 8f6bf6add3bc0f28df3f2269cbdb2f32fa72470d dependencies: - '@intlify/bundle-utils': 8.0.0(vue-i18n@9.14.0(vue@3.5.3(typescript@5.6.2))) + '@intlify/bundle-utils': 8.0.0(vue-i18n@9.14.0(vue@3.5.4(typescript@5.6.2))) '@intlify/shared': 9.14.0 '@rollup/pluginutils': 5.1.0(rollup@4.21.2) '@vue/compiler-sfc': 3.5.4 @@ -12339,7 +12359,7 @@ snapshots: source-map-js: 1.2.1 unplugin: 1.14.0(webpack-sources@3.2.3) optionalDependencies: - vue-i18n: 9.14.0(vue@3.5.3(typescript@5.6.2)) + vue-i18n: 9.14.0(vue@3.5.4(typescript@5.6.2)) transitivePeerDependencies: - rollup - supports-color @@ -12544,7 +12564,7 @@ snapshots: '@iconify-json/octicon': 1.2.0 less: 4.2.0 vitepress: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.5.4)(async-validator@4.2.5)(axios@1.7.7)(less@4.2.0)(nprogress@0.2.0)(postcss@8.4.45)(qrcode@1.5.4)(sass@1.78.0)(search-insights@2.17.1)(sortablejs@1.15.3)(terser@5.32.0)(typescript@5.6.2) - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) transitivePeerDependencies: - '@algolia/client-search' - '@types/node' @@ -12709,9 +12729,9 @@ snapshots: '@polka/url@1.0.0-next.25': {} - '@radix-icons/vue@1.0.0(vue@3.5.3(typescript@5.6.2))': + '@radix-icons/vue@1.0.0(vue@3.5.4(typescript@5.6.2))': dependencies: - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) '@rollup/plugin-alias@5.1.0(rollup@3.29.4)': dependencies: @@ -13034,24 +13054,24 @@ snapshots: '@tanstack/virtual-core@3.10.7': {} - '@tanstack/vue-query@5.55.4(vue@3.5.3(typescript@5.6.2))': + '@tanstack/vue-query@5.55.4(vue@3.5.4(typescript@5.6.2))': dependencies: '@tanstack/match-sorter-utils': 8.19.4 '@tanstack/query-core': 5.55.4 '@vue/devtools-api': 6.6.4 - vue: 3.5.3(typescript@5.6.2) - vue-demi: 0.14.10(vue@3.5.3(typescript@5.6.2)) + vue: 3.5.4(typescript@5.6.2) + vue-demi: 0.14.10(vue@3.5.4(typescript@5.6.2)) - '@tanstack/vue-store@0.5.5(vue@3.5.3(typescript@5.6.2))': + '@tanstack/vue-store@0.5.5(vue@3.5.4(typescript@5.6.2))': dependencies: '@tanstack/store': 0.5.5 - vue: 3.5.3(typescript@5.6.2) - vue-demi: 0.14.10(vue@3.5.3(typescript@5.6.2)) + vue: 3.5.4(typescript@5.6.2) + vue-demi: 0.14.10(vue@3.5.4(typescript@5.6.2)) - '@tanstack/vue-virtual@3.10.7(vue@3.5.3(typescript@5.6.2))': + '@tanstack/vue-virtual@3.10.7(vue@3.5.4(typescript@5.6.2))': dependencies: '@tanstack/virtual-core': 3.10.7 - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) '@tinymce/tinymce-vue@6.0.1(vue@3.5.3(typescript@5.6.2))': dependencies: @@ -13304,10 +13324,10 @@ snapshots: '@typescript-eslint/types': 8.5.0 eslint-visitor-keys: 3.4.3 - '@vee-validate/zod@4.13.2(vue@3.5.3(typescript@5.6.2))': + '@vee-validate/zod@4.13.2(vue@3.5.4(typescript@5.6.2))': dependencies: type-fest: 4.26.1 - vee-validate: 4.13.2(vue@3.5.3(typescript@5.6.2)) + vee-validate: 4.13.2(vue@3.5.4(typescript@5.6.2)) zod: 3.23.8 transitivePeerDependencies: - vue @@ -13334,20 +13354,20 @@ snapshots: dependencies: vite-plugin-pwa: 0.20.5(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(workbox-build@7.1.1)(workbox-window@7.1.0) - '@vitejs/plugin-vue-jsx@4.0.1(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.3(typescript@5.6.2))': + '@vitejs/plugin-vue-jsx@4.0.1(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.4(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.4(@babel/core@7.25.2) vite: 5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0) - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue@5.1.3(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.3(typescript@5.6.2))': + '@vitejs/plugin-vue@5.1.3(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.4(typescript@5.6.2))': dependencies: vite: 5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0) - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) '@vitest/expect@2.0.5': dependencies: @@ -13424,14 +13444,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@vue/compiler-core@3.5.3': - dependencies: - '@babel/parser': 7.25.6 - '@vue/shared': 3.5.3 - entities: 4.5.0 - estree-walker: 2.0.2 - source-map-js: 1.2.1 - '@vue/compiler-core@3.5.4': dependencies: '@babel/parser': 7.25.6 @@ -13440,28 +13452,11 @@ snapshots: estree-walker: 2.0.2 source-map-js: 1.2.1 - '@vue/compiler-dom@3.5.3': - dependencies: - '@vue/compiler-core': 3.5.3 - '@vue/shared': 3.5.3 - '@vue/compiler-dom@3.5.4': dependencies: '@vue/compiler-core': 3.5.4 '@vue/shared': 3.5.4 - '@vue/compiler-sfc@3.5.3': - dependencies: - '@babel/parser': 7.25.6 - '@vue/compiler-core': 3.5.3 - '@vue/compiler-dom': 3.5.3 - '@vue/compiler-ssr': 3.5.3 - '@vue/shared': 3.5.3 - estree-walker: 2.0.2 - magic-string: 0.30.11 - postcss: 8.4.45 - source-map-js: 1.2.1 - '@vue/compiler-sfc@3.5.4': dependencies: '@babel/parser': 7.25.6 @@ -13474,11 +13469,6 @@ snapshots: postcss: 8.4.45 source-map-js: 1.2.1 - '@vue/compiler-ssr@3.5.3': - dependencies: - '@vue/compiler-dom': 3.5.3 - '@vue/shared': 3.5.3 - '@vue/compiler-ssr@3.5.4': dependencies: '@vue/compiler-dom': 3.5.4 @@ -13495,7 +13485,7 @@ snapshots: dependencies: '@vue/devtools-kit': 7.4.4 - '@vue/devtools-core@7.4.4(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.3(typescript@5.6.2))': + '@vue/devtools-core@7.4.4(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.4(typescript@5.6.2))': dependencies: '@vue/devtools-kit': 7.4.4 '@vue/devtools-shared': 7.4.4 @@ -13503,7 +13493,7 @@ snapshots: nanoid: 3.3.7 pathe: 1.1.2 vite-hot-client: 0.2.3(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0)) - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) transitivePeerDependencies: - vite @@ -13534,29 +13524,27 @@ snapshots: optionalDependencies: typescript: 5.6.2 - '@vue/reactivity@3.5.3': + '@vue/reactivity@3.5.4': dependencies: - '@vue/shared': 3.5.3 + '@vue/shared': 3.5.4 - '@vue/runtime-core@3.5.3': + '@vue/runtime-core@3.5.4': dependencies: - '@vue/reactivity': 3.5.3 - '@vue/shared': 3.5.3 + '@vue/reactivity': 3.5.4 + '@vue/shared': 3.5.4 - '@vue/runtime-dom@3.5.3': + '@vue/runtime-dom@3.5.4': dependencies: - '@vue/reactivity': 3.5.3 - '@vue/runtime-core': 3.5.3 - '@vue/shared': 3.5.3 + '@vue/reactivity': 3.5.4 + '@vue/runtime-core': 3.5.4 + '@vue/shared': 3.5.4 csstype: 3.1.3 - '@vue/server-renderer@3.5.3(vue@3.5.3(typescript@5.6.2))': + '@vue/server-renderer@3.5.4(vue@3.5.4(typescript@5.6.2))': dependencies: - '@vue/compiler-ssr': 3.5.3 - '@vue/shared': 3.5.3 - vue: 3.5.3(typescript@5.6.2) - - '@vue/shared@3.5.3': {} + '@vue/compiler-ssr': 3.5.4 + '@vue/shared': 3.5.4 + vue: 3.5.4(typescript@5.6.2) '@vue/shared@3.5.4': {} @@ -13565,41 +13553,41 @@ snapshots: js-beautify: 1.15.1 vue-component-type-helpers: 2.1.6 - '@vueuse/core@10.11.1(vue@3.5.3(typescript@5.6.2))': + '@vueuse/core@10.11.1(vue@3.5.4(typescript@5.6.2))': dependencies: '@types/web-bluetooth': 0.0.20 '@vueuse/metadata': 10.11.1 - '@vueuse/shared': 10.11.1(vue@3.5.3(typescript@5.6.2)) - vue-demi: 0.14.10(vue@3.5.3(typescript@5.6.2)) + '@vueuse/shared': 10.11.1(vue@3.5.4(typescript@5.6.2)) + vue-demi: 0.14.10(vue@3.5.4(typescript@5.6.2)) transitivePeerDependencies: - '@vue/composition-api' - vue - '@vueuse/core@11.0.3(vue@3.5.3(typescript@5.6.2))': + '@vueuse/core@11.0.3(vue@3.5.4(typescript@5.6.2))': dependencies: '@types/web-bluetooth': 0.0.20 '@vueuse/metadata': 11.0.3 - '@vueuse/shared': 11.0.3(vue@3.5.3(typescript@5.6.2)) - vue-demi: 0.14.10(vue@3.5.3(typescript@5.6.2)) + '@vueuse/shared': 11.0.3(vue@3.5.4(typescript@5.6.2)) + vue-demi: 0.14.10(vue@3.5.4(typescript@5.6.2)) transitivePeerDependencies: - '@vue/composition-api' - vue - '@vueuse/core@9.13.0(vue@3.5.3(typescript@5.6.2))': + '@vueuse/core@9.13.0(vue@3.5.4(typescript@5.6.2))': dependencies: '@types/web-bluetooth': 0.0.16 '@vueuse/metadata': 9.13.0 - '@vueuse/shared': 9.13.0(vue@3.5.3(typescript@5.6.2)) - vue-demi: 0.14.10(vue@3.5.3(typescript@5.6.2)) + '@vueuse/shared': 9.13.0(vue@3.5.4(typescript@5.6.2)) + vue-demi: 0.14.10(vue@3.5.4(typescript@5.6.2)) transitivePeerDependencies: - '@vue/composition-api' - vue - '@vueuse/integrations@11.0.3(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.3(typescript@5.6.2))': + '@vueuse/integrations@11.0.3(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.4(typescript@5.6.2))': dependencies: - '@vueuse/core': 11.0.3(vue@3.5.3(typescript@5.6.2)) - '@vueuse/shared': 11.0.3(vue@3.5.3(typescript@5.6.2)) - vue-demi: 0.14.10(vue@3.5.3(typescript@5.6.2)) + '@vueuse/core': 11.0.3(vue@3.5.4(typescript@5.6.2)) + '@vueuse/shared': 11.0.3(vue@3.5.4(typescript@5.6.2)) + vue-demi: 0.14.10(vue@3.5.4(typescript@5.6.2)) optionalDependencies: async-validator: 4.2.5 axios: 1.7.7 @@ -13617,23 +13605,23 @@ snapshots: '@vueuse/metadata@9.13.0': {} - '@vueuse/shared@10.11.1(vue@3.5.3(typescript@5.6.2))': + '@vueuse/shared@10.11.1(vue@3.5.4(typescript@5.6.2))': dependencies: - vue-demi: 0.14.10(vue@3.5.3(typescript@5.6.2)) + vue-demi: 0.14.10(vue@3.5.4(typescript@5.6.2)) transitivePeerDependencies: - '@vue/composition-api' - vue - '@vueuse/shared@11.0.3(vue@3.5.3(typescript@5.6.2))': + '@vueuse/shared@11.0.3(vue@3.5.4(typescript@5.6.2))': dependencies: - vue-demi: 0.14.10(vue@3.5.3(typescript@5.6.2)) + vue-demi: 0.14.10(vue@3.5.4(typescript@5.6.2)) transitivePeerDependencies: - '@vue/composition-api' - vue - '@vueuse/shared@9.13.0(vue@3.5.3(typescript@5.6.2))': + '@vueuse/shared@9.13.0(vue@3.5.4(typescript@5.6.2))': dependencies: - vue-demi: 0.14.10(vue@3.5.3(typescript@5.6.2)) + vue-demi: 0.14.10(vue@3.5.4(typescript@5.6.2)) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -13760,10 +13748,10 @@ snapshots: ansi-styles@6.2.1: {} - ant-design-vue@4.2.3(vue@3.5.3(typescript@5.6.2)): + ant-design-vue@4.2.3(vue@3.5.4(typescript@5.6.2)): dependencies: '@ant-design/colors': 6.0.0 - '@ant-design/icons-vue': 7.0.1(vue@3.5.3(typescript@5.6.2)) + '@ant-design/icons-vue': 7.0.1(vue@3.5.4(typescript@5.6.2)) '@babel/runtime': 7.25.6 '@ctrl/tinycolor': 4.1.0 '@emotion/hash': 0.9.2 @@ -13782,8 +13770,8 @@ snapshots: shallow-equal: 1.2.1 stylis: 4.3.4 throttle-debounce: 5.0.2 - vue: 3.5.3(typescript@5.6.2) - vue-types: 3.0.2(vue@3.5.3(typescript@5.6.2)) + vue: 3.5.4(typescript@5.6.2) + vue-types: 3.0.2(vue@3.5.4(typescript@5.6.2)) warning: 4.0.3 any-promise@1.3.0: {} @@ -14891,15 +14879,15 @@ snapshots: electron-to-chromium@1.5.18: {} - element-plus@2.8.2(vue@3.5.3(typescript@5.6.2)): + element-plus@2.8.2(vue@3.5.4(typescript@5.6.2)): dependencies: '@ctrl/tinycolor': 4.1.0 - '@element-plus/icons-vue': 2.3.1(vue@3.5.3(typescript@5.6.2)) + '@element-plus/icons-vue': 2.3.1(vue@3.5.4(typescript@5.6.2)) '@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 - '@vueuse/core': 9.13.0(vue@3.5.3(typescript@5.6.2)) + '@vueuse/core': 9.13.0(vue@3.5.4(typescript@5.6.2)) async-validator: 4.2.5 dayjs: 1.11.13 escape-html: 1.0.3 @@ -14908,7 +14896,7 @@ snapshots: lodash-unified: 1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.17.21)(lodash@4.17.21) memoize-one: 6.0.0 normalize-wheel-es: 1.2.0 - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) transitivePeerDependencies: - '@vue/composition-api' @@ -16638,9 +16626,9 @@ snapshots: dependencies: yallist: 4.0.0 - lucide-vue-next@0.439.0(vue@3.5.3(typescript@5.6.2)): + lucide-vue-next@0.439.0(vue@3.5.4(typescript@5.6.2)): dependencies: - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) magic-string@0.25.9: dependencies: @@ -16850,10 +16838,10 @@ snapshots: object-assign: 4.1.1 thenify-all: 1.6.0 - naive-ui@2.39.0(vue@3.5.3(typescript@5.6.2)): + naive-ui@2.39.0(vue@3.5.4(typescript@5.6.2)): dependencies: '@css-render/plugin-bem': 0.15.14(css-render@0.15.14) - '@css-render/vue3-ssr': 0.15.14(vue@3.5.3(typescript@5.6.2)) + '@css-render/vue3-ssr': 0.15.14(vue@3.5.4(typescript@5.6.2)) '@types/katex': 0.16.7 '@types/lodash': 4.17.7 '@types/lodash-es': 4.17.12 @@ -16868,10 +16856,10 @@ snapshots: lodash-es: 4.17.21 seemly: 0.3.8 treemate: 0.3.11 - vdirs: 0.1.8(vue@3.5.3(typescript@5.6.2)) - vooks: 0.2.12(vue@3.5.3(typescript@5.6.2)) - vue: 3.5.3(typescript@5.6.2) - vueuc: 0.4.58(vue@3.5.3(typescript@5.6.2)) + vdirs: 0.1.8(vue@3.5.4(typescript@5.6.2)) + vooks: 0.2.12(vue@3.5.4(typescript@5.6.2)) + vue: 3.5.4(typescript@5.6.2) + vueuc: 0.4.58(vue@3.5.4(typescript@5.6.2)) nanoid@3.3.7: {} @@ -17303,15 +17291,15 @@ snapshots: pify@4.0.1: {} - pinia-plugin-persistedstate@3.2.3(pinia@2.2.2(typescript@5.6.2)(vue@3.5.3(typescript@5.6.2))): + pinia-plugin-persistedstate@3.2.3(pinia@2.2.2(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2))): dependencies: - pinia: 2.2.2(typescript@5.6.2)(vue@3.5.3(typescript@5.6.2)) + pinia: 2.2.2(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)) - pinia@2.2.2(typescript@5.6.2)(vue@3.5.3(typescript@5.6.2)): + pinia@2.2.2(typescript@5.6.2)(vue@3.5.4(typescript@5.6.2)): dependencies: '@vue/devtools-api': 6.6.4 - vue: 3.5.3(typescript@5.6.2) - vue-demi: 0.14.10(vue@3.5.3(typescript@5.6.2)) + vue: 3.5.4(typescript@5.6.2) + vue-demi: 0.14.10(vue@3.5.4(typescript@5.6.2)) optionalDependencies: typescript: 5.6.2 @@ -17847,20 +17835,20 @@ snapshots: queue-tick@1.0.1: {} - radix-vue@1.9.5(vue@3.5.3(typescript@5.6.2)): + radix-vue@1.9.5(vue@3.5.4(typescript@5.6.2)): dependencies: '@floating-ui/dom': 1.6.10 - '@floating-ui/vue': 1.1.4(vue@3.5.3(typescript@5.6.2)) + '@floating-ui/vue': 1.1.4(vue@3.5.4(typescript@5.6.2)) '@internationalized/date': 3.5.5 '@internationalized/number': 3.5.3 - '@tanstack/vue-virtual': 3.10.7(vue@3.5.3(typescript@5.6.2)) - '@vueuse/core': 10.11.1(vue@3.5.3(typescript@5.6.2)) - '@vueuse/shared': 10.11.1(vue@3.5.3(typescript@5.6.2)) + '@tanstack/vue-virtual': 3.10.7(vue@3.5.4(typescript@5.6.2)) + '@vueuse/core': 10.11.1(vue@3.5.4(typescript@5.6.2)) + '@vueuse/shared': 10.11.1(vue@3.5.4(typescript@5.6.2)) aria-hidden: 1.2.4 defu: 6.1.4 fast-deep-equal: 3.1.3 nanoid: 5.0.7 - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) transitivePeerDependencies: - '@vue/composition-api' @@ -19169,16 +19157,16 @@ snapshots: spdx-correct: 3.2.0 spdx-expression-parse: 3.0.1 - vdirs@0.1.8(vue@3.5.3(typescript@5.6.2)): + vdirs@0.1.8(vue@3.5.4(typescript@5.6.2)): dependencies: evtd: 0.2.4 - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) - vee-validate@4.13.2(vue@3.5.3(typescript@5.6.2)): + vee-validate@4.13.2(vue@3.5.4(typescript@5.6.2)): dependencies: '@vue/devtools-api': 6.6.4 type-fest: 4.26.1 - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) vite-hot-client@0.2.3(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0)): dependencies: @@ -19280,9 +19268,9 @@ snapshots: transitivePeerDependencies: - supports-color - vite-plugin-vue-devtools@7.4.4(rollup@4.21.2)(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.3(typescript@5.6.2)): + vite-plugin-vue-devtools@7.4.4(rollup@4.21.2)(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.4(typescript@5.6.2)): dependencies: - '@vue/devtools-core': 7.4.4(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.3(typescript@5.6.2)) + '@vue/devtools-core': 7.4.4(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.4(typescript@5.6.2)) '@vue/devtools-kit': 7.4.4 '@vue/devtools-shared': 7.4.4 execa: 8.0.1 @@ -19330,17 +19318,17 @@ snapshots: '@shikijs/core': 1.16.3 '@shikijs/transformers': 1.16.3 '@types/markdown-it': 14.1.2 - '@vitejs/plugin-vue': 5.1.3(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.3(typescript@5.6.2)) + '@vitejs/plugin-vue': 5.1.3(vite@5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0))(vue@3.5.4(typescript@5.6.2)) '@vue/devtools-api': 7.4.4 '@vue/shared': 3.5.4 - '@vueuse/core': 11.0.3(vue@3.5.3(typescript@5.6.2)) - '@vueuse/integrations': 11.0.3(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.3(typescript@5.6.2)) + '@vueuse/core': 11.0.3(vue@3.5.4(typescript@5.6.2)) + '@vueuse/integrations': 11.0.3(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.4(typescript@5.6.2)) focus-trap: 7.5.4 mark.js: 8.11.1 minisearch: 7.1.0 shiki: 1.16.3 vite: 5.4.3(@types/node@22.5.4)(less@4.2.0)(sass@1.78.0)(terser@5.32.0) - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) optionalDependencies: postcss: 8.4.45 transitivePeerDependencies: @@ -19405,10 +19393,10 @@ snapshots: - supports-color - terser - vooks@0.2.12(vue@3.5.3(typescript@5.6.2)): + vooks@0.2.12(vue@3.5.4(typescript@5.6.2)): dependencies: evtd: 0.2.4 - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) vscode-languageserver-textdocument@1.0.12: {} @@ -19425,9 +19413,9 @@ snapshots: vue-component-type-helpers@2.1.6: {} - vue-demi@0.14.10(vue@3.5.3(typescript@5.6.2)): + vue-demi@0.14.10(vue@3.5.4(typescript@5.6.2)): dependencies: - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) vue-eslint-parser@9.4.3(eslint@9.10.0(jiti@1.21.6)): dependencies: @@ -19442,21 +19430,25 @@ snapshots: transitivePeerDependencies: - supports-color - vue-i18n@9.14.0(vue@3.5.3(typescript@5.6.2)): + vue-i18n@9.14.0(vue@3.5.4(typescript@5.6.2)): dependencies: '@intlify/core-base': 9.14.0 '@intlify/shared': 9.14.0 '@vue/devtools-api': 6.6.4 - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) +<<<<<<< HEAD vue-json-pretty@2.4.0(vue@3.5.3(typescript@5.6.2)): dependencies: vue: 3.5.3(typescript@5.6.2) vue-router@4.4.3(vue@3.5.3(typescript@5.6.2)): +======= + vue-router@4.4.4(vue@3.5.4(typescript@5.6.2)): +>>>>>>> 8f6bf6add3bc0f28df3f2269cbdb2f32fa72470d dependencies: '@vue/devtools-api': 6.6.4 - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) vue-tsc@2.1.6(typescript@5.6.2): dependencies: @@ -19465,31 +19457,31 @@ snapshots: semver: 7.6.3 typescript: 5.6.2 - vue-types@3.0.2(vue@3.5.3(typescript@5.6.2)): + vue-types@3.0.2(vue@3.5.4(typescript@5.6.2)): dependencies: is-plain-object: 3.0.1 - vue: 3.5.3(typescript@5.6.2) + vue: 3.5.4(typescript@5.6.2) - vue@3.5.3(typescript@5.6.2): + vue@3.5.4(typescript@5.6.2): dependencies: - '@vue/compiler-dom': 3.5.3 - '@vue/compiler-sfc': 3.5.3 - '@vue/runtime-dom': 3.5.3 - '@vue/server-renderer': 3.5.3(vue@3.5.3(typescript@5.6.2)) - '@vue/shared': 3.5.3 + '@vue/compiler-dom': 3.5.4 + '@vue/compiler-sfc': 3.5.4 + '@vue/runtime-dom': 3.5.4 + '@vue/server-renderer': 3.5.4(vue@3.5.4(typescript@5.6.2)) + '@vue/shared': 3.5.4 optionalDependencies: typescript: 5.6.2 - vueuc@0.4.58(vue@3.5.3(typescript@5.6.2)): + vueuc@0.4.58(vue@3.5.4(typescript@5.6.2)): dependencies: - '@css-render/vue3-ssr': 0.15.14(vue@3.5.3(typescript@5.6.2)) + '@css-render/vue3-ssr': 0.15.14(vue@3.5.4(typescript@5.6.2)) '@juggle/resize-observer': 3.4.0 css-render: 0.15.14 evtd: 0.2.4 seemly: 0.3.8 - vdirs: 0.1.8(vue@3.5.3(typescript@5.6.2)) - vooks: 0.2.12(vue@3.5.3(typescript@5.6.2)) - vue: 3.5.3(typescript@5.6.2) + vdirs: 0.1.8(vue@3.5.4(typescript@5.6.2)) + vooks: 0.2.12(vue@3.5.4(typescript@5.6.2)) + vue: 3.5.4(typescript@5.6.2) w3c-keyname@2.2.8: {}