Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

apps/web-antd/src/adapter/form.ts

@@ -106,6 +106,12 @@ setupVbenForm<FormComponentType>({
       }
       return true;
     },
+    selectRequired: (value, _params, ctx) => {
+      if (value === undefined || value === null) {
+        return $t('formRules.selectRequired', [ctx.label]);
+      }
+      return true;
+    },
   },
 });
 

apps/web-ele/src/adapter/form.ts

@@ -78,6 +78,12 @@ setupVbenForm<FormComponentType>({
       }
       return true;
     },
+    selectRequired: (value, _params, ctx) => {
+      if (value === undefined || value === null) {
+        return $t('formRules.selectRequired', [ctx.label]);
+      }
+      return true;
+    },
   },
 });
 

apps/web-naive/src/adapter/form.ts

@@ -87,6 +87,12 @@ setupVbenForm<FormComponentType>({
       }
       return true;
     },
+    selectRequired: (value, _params, ctx) => {
+      if (value === undefined || value === null) {
+        return $t('formRules.selectRequired', [ctx.label]);
+      }
+      return true;
+    },
   },
 });
 

package.json

@@ -96,7 +96,7 @@
   },
   "engines": {
     "node": ">=20",
-    "pnpm": ">=9"
+    "pnpm": ">=9.5.0"
   },
   "packageManager": "pnpm@9.10.0",
   "pnpm": {

packages/@core/ui-kit/form-ui/src/types.ts

@@ -58,6 +58,7 @@ export type CustomRenderType = (() => Component | string) | string;
 
 export type FormSchemaRuleType =
   | 'required'
+  | 'selectRequired'
   | null
   | (Record<never, never> & string)
   | ZodTypeAny;
@@ -323,5 +324,10 @@ export interface VbenFormAdapterOptions<
       params: any,
       ctx: Record<string, any>,
     ) => boolean | string;
+    selectRequired?: (
+      value: any,
+      params: any,
+      ctx: Record<string, any>,
+    ) => boolean | string;
   };
 }

packages/locales/src/langs/en-US.json

@@ -61,7 +61,8 @@
     }
   },
   "formRules": {
-    "required": "Please enter {0}"
+    "required": "Please enter {0}",
+    "selectRequired": "Please select {0}"
   },
   "widgets": {
     "document": "Document",

packages/locales/src/langs/zh-CN.json

@@ -61,7 +61,8 @@
     }
   },
   "formRules": {
-    "required": "请输入{0}"
+    "required": "请输入{0}",
+    "selectRequired": "请选择{0}"
   },
   "widgets": {
     "document": "文档",

playground/src/adapter/form.ts

@@ -103,6 +103,12 @@ setupVbenForm<FormComponentType>({
       }
       return true;
     },
+    selectRequired: (value, _params, ctx) => {
+      if (value === undefined || value === null) {
+        return $t('formRules.selectRequired', [ctx.label]);
+      }
+      return true;
+    },
   },
 });
 

playground/src/views/examples/form/rules.vue

@@ -102,7 +102,7 @@ const [Form, formApi] = useVbenForm({
       defaultValue: undefined,
       fieldName: 'options',
       label: '下拉选',
-      rules: 'required',
+      rules: 'selectRequired',
     },
     {
       component: 'RadioGroup',
@@ -120,7 +120,7 @@ const [Form, formApi] = useVbenForm({
       },
       fieldName: 'radioGroup',
       label: '单选组',
-      rules: 'required',
+      rules: 'selectRequired',
     },
     {
       component: 'CheckboxGroup',
@@ -139,7 +139,7 @@ const [Form, formApi] = useVbenForm({
       },
       fieldName: 'checkboxGroup',
       label: '多选组',
-      rules: 'required',
+      rules: 'selectRequired',
     },
     {
       component: 'Checkbox',
@@ -150,14 +150,21 @@ const [Form, formApi] = useVbenForm({
           default: () => ['我已阅读并同意'],
         };
       },
-      rules: 'required',
+      rules: 'selectRequired',
     },
     {
       component: 'DatePicker',
       defaultValue: undefined,
       fieldName: 'datePicker',
       label: '日期选择框',
-      rules: 'required',
+      rules: 'selectRequired',
+    },
+    {
+      component: 'RangePicker',
+      defaultValue: undefined,
+      fieldName: 'rangePicker',
+      label: '区间选择框',
+      rules: 'selectRequired',
     },
   ],
   // 大屏一行显示3个，中屏一行显示2个，小屏一行显示1个

pnpm-lock.yaml

@@ -368,7 +368,7 @@ catalogs:
       version: 5.12.0
     sass:
       specifier: ^1.79.1
-      version: 1.79.1
+      version: 1.79.2
     sortablejs:
       specifier: ^1.15.3
       version: 1.15.3
@@ -529,10 +529,17 @@ importers:
         version: link:scripts/vsh
       '@vitejs/plugin-vue':
         specifier: 'catalog:'
+<<<<<<< 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))
       '@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
       '@vue/test-utils':
         specifier: 'catalog:'
         version: 2.4.6
@@ -571,13 +578,20 @@ importers:
         version: 5.6.2
       unbuild:
         specifier: 'catalog:'
-        version: 2.0.0(sass@1.79.1)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2))
+        version: 2.0.0(sass@1.79.2)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2))
       vite:
         specifier: 'catalog:'
+<<<<<<< HEAD
         version: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(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
       vue:
         specifier: 3.5.6
         version: 3.5.6(typescript@5.6.2)
@@ -848,16 +862,27 @@ importers:
     devDependencies:
       '@nolebase/vitepress-plugin-git-changelog':
         specifier: 'catalog:'
+<<<<<<< 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
       '@vben/vite-config':
         specifier: workspace:*
         version: link:../internal/vite-config
       '@vite-pwa/vitepress':
         specifier: 'catalog:'
+<<<<<<< HEAD
         version: 0.5.3(vite-plugin-pwa@0.20.5(vite@5.4.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))
       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
       vue:
         specifier: 3.5.6
         version: 3.5.6(typescript@5.6.2)
@@ -942,7 +967,11 @@ importers:
         version: 4.1.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))
       eslint-plugin-vitest:
         specifier: 'catalog:'
+<<<<<<< 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
       eslint-plugin-vue:
         specifier: 'catalog:'
         version: 9.28.0(eslint@9.10.0(jiti@1.21.6))
@@ -1107,7 +1136,11 @@ importers:
         version: link:../../packages/types
       vite:
         specifier: 'catalog:'
+<<<<<<< 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
 
   internal/vite-config:
     dependencies:
@@ -1137,6 +1170,7 @@ importers:
         version: 2.0.2
       vite-plugin-lib-inject-css:
         specifier: 'catalog:'
+<<<<<<< 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))
       vite-plugin-pwa:
         specifier: 'catalog:'
@@ -1144,6 +1178,15 @@ importers:
       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))
+      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.2)(terser@5.33.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.2)(terser@5.33.0))(vue@3.5.6(typescript@5.6.2))
+>>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c
     devDependencies:
       '@types/archiver':
         specifier: 'catalog:'
@@ -1156,10 +1199,17 @@ importers:
         version: link:../node-utils
       '@vitejs/plugin-vue':
         specifier: 'catalog:'
+<<<<<<< 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))
       '@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
       dayjs:
         specifier: 'catalog:'
         version: 1.11.13
@@ -1174,9 +1224,10 @@ importers:
         version: 5.12.0(rollup@4.22.0)
       sass:
         specifier: 'catalog:'
-        version: 1.79.1
+        version: 1.79.2
       vite:
         specifier: 'catalog:'
+<<<<<<< HEAD
         version: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(terser@5.32.0)
       vite-plugin-compression:
         specifier: 'catalog:'
@@ -1187,6 +1238,18 @@ importers:
       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)
+      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.2)(terser@5.33.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.2)(terser@5.33.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.2)(terser@5.33.0))
+>>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c
 
   packages/@core/base/design: {}
 
@@ -2990,8 +3053,8 @@ packages:
   '@cspell/dict-node@5.0.1':
     resolution: {integrity: sha512-lax/jGz9h3Dv83v8LHa5G0bf6wm8YVRMzbjJPG/9rp7cAGPtdrga+XANFq+B7bY5+jiSA3zvj10LUFCFjnnCCg==}
 
-  '@cspell/dict-npm@5.1.4':
+  '@cspell/dict-npm@5.1.5':
-    resolution: {integrity: sha512-yzqVTY4P5neom4z9orV2IFOqDZ7fDotmisP7nwQkEmftoELgn5CUtNdnJhWDoDQQn6yrxOxA8jEqmyETIWzN4Q==}
+    resolution: {integrity: sha512-oAOGWuJYU3DlO+cAsStKMWN8YEkBue25cRC9EwdiL5Z84nchU20UIoYrLfIQejMlZca+1GyrNeyxRAgn4KiivA==}
 
   '@cspell/dict-php@4.0.10':
     resolution: {integrity: sha512-NfTZdp6kcZDF1PvgQ6cY0zE4FUO5rSwNmBH/iwCBuaLfJAFQ97rgjxo+D2bic4CFwNjyHutnHPtjJBRANO5XQw==}
@@ -3017,8 +3080,8 @@ packages:
   '@cspell/dict-scala@5.0.3':
     resolution: {integrity: sha512-4yGb4AInT99rqprxVNT9TYb1YSpq58Owzq7zi3ZS5T0u899Y4VsxsBiOgHnQ/4W+ygi+sp+oqef8w8nABR2lkg==}
 
-  '@cspell/dict-software-terms@4.1.3':
+  '@cspell/dict-software-terms@4.1.4':
-    resolution: {integrity: sha512-5Wn5JG4IzCboX5pjISdkipsPKGaz1//iuBZdHl4US5x7mO4jOGXLpjzx6ZoPM4PXUlMEFz9NJRCDepAu8fXVtA==}
+    resolution: {integrity: sha512-AHS25sYEzWze/aFglp9ODKSu+phjkuGx+OLwIcmOnvyn8axtSq5GCn9UqS4XG1/Qn0UG2Lgb4i5PJbZ0QNPNXQ==}
 
   '@cspell/dict-sql@2.1.5':
     resolution: {integrity: sha512-FmxanytHXss7GAWAXmgaxl3icTCW7YxlimyOSPNfm+njqeUDjw3kEv4mFNDDObBJv8Ec5AWCbUDkWIpkE3IpKg==}
@@ -4314,8 +4377,13 @@ 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==}
@@ -4623,6 +4691,7 @@ 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==}
 
@@ -4637,6 +4706,22 @@ packages:
 
   '@shikijs/types@1.17.0':
     resolution: {integrity: sha512-Tvu2pA69lbpXB+MmgIaROP1tio8y0uYvKb5Foh3q0TJBTAJuaoa5eDEtS/0LquyveacsiVrYF4uEZILju+7Ybg==}
+=======
+  '@shikijs/core@1.18.0':
+    resolution: {integrity: sha512-VK4BNVCd2leY62Nm2JjyxtRLkyrZT/tv104O81eyaCjHq4Adceq2uJVFJJAIof6lT1mBwZrEo2qT/T+grv3MQQ==}
+
+  '@shikijs/engine-javascript@1.18.0':
+    resolution: {integrity: sha512-qoP/aO/ATNwYAUw1YMdaip/YVEstMZEgrwhePm83Ll9OeQPuxDZd48szZR8oSQNQBT8m8UlWxZv8EA3lFuyI5A==}
+
+  '@shikijs/engine-oniguruma@1.18.0':
+    resolution: {integrity: sha512-B9u0ZKI/cud+TcmF8Chyh+R4V5qQVvyDOqXC2l2a4x73PBSBc6sZ0JRAX3eqyJswqir6ktwApUUGBYePdKnMJg==}
+
+  '@shikijs/transformers@1.18.0':
+    resolution: {integrity: sha512-EdX/UIVaaS8qp9NWRyHIXp2dmuLpdVvx+UVpbIn9eafFlLemAuljPb2+K40ie6jrlg0uUIqkg25CM/8I34yBNw==}
+
+  '@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==}
@@ -9333,8 +9418,8 @@ packages:
   safer-buffer@2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
 
-  sass@1.79.1:
+  sass@1.79.2:
-    resolution: {integrity: sha512-+mA7svoNKeL0DiJqZGeR/ZGUu8he4I8o3jyUcOFyo4eBJrwNgIMmAEwCMo/N2Y3wdjOBcRzoNxZIOtrtMX8EXg==}
+    resolution: {integrity: sha512-YmT1aoF1MwHsZEu/eXhbAJNsPGAhNP4UixW9ckEwWCvPcVdVF0/C104OGDVEqtoctKq0N+wM20O/rj+sSPsWeg==}
     engines: {node: '>=14.0.0'}
     hasBin: true
 
@@ -9433,8 +9518,13 @@ 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==}
@@ -10781,8 +10871,13 @@ 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
 
@@ -12247,7 +12342,7 @@ snapshots:
       '@cspell/dict-makefile': 1.0.0
       '@cspell/dict-monkeyc': 1.0.6
       '@cspell/dict-node': 5.0.1
-      '@cspell/dict-npm': 5.1.4
+      '@cspell/dict-npm': 5.1.5
       '@cspell/dict-php': 4.0.10
       '@cspell/dict-powershell': 5.0.8
       '@cspell/dict-public-licenses': 2.0.8
@@ -12256,7 +12351,7 @@ snapshots:
       '@cspell/dict-ruby': 5.0.3
       '@cspell/dict-rust': 4.0.5
       '@cspell/dict-scala': 5.0.3
-      '@cspell/dict-software-terms': 4.1.3
+      '@cspell/dict-software-terms': 4.1.4
       '@cspell/dict-sql': 2.1.5
       '@cspell/dict-svelte': 1.0.2
       '@cspell/dict-swift': 2.0.1
@@ -12354,7 +12449,7 @@ snapshots:
 
   '@cspell/dict-node@5.0.1': {}
 
-  '@cspell/dict-npm@5.1.4': {}
+  '@cspell/dict-npm@5.1.5': {}
 
   '@cspell/dict-php@4.0.10': {}
 
@@ -12374,7 +12469,7 @@ snapshots:
 
   '@cspell/dict-scala@5.0.3': {}
 
-  '@cspell/dict-software-terms@4.1.3': {}
+  '@cspell/dict-software-terms@4.1.4': {}
 
   '@cspell/dict-sql@2.1.5': {}
 
@@ -13345,11 +13440,19 @@ snapshots:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.17.1
 
+<<<<<<< HEAD
   '@nolebase/ui@2.5.0(@algolia/client-search@4.24.0)(@types/node@22.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)':
     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)
     transitivePeerDependencies:
       - '@algolia/client-search'
@@ -13380,10 +13483,17 @@ snapshots:
       - typescript
       - universal-cookie
 
+<<<<<<< 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)':
     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
       colorette: 2.0.20
       date-fns: 3.6.0
       defu: 6.1.4
@@ -13393,7 +13503,11 @@ snapshots:
       gray-matter: 4.0.3
       less: 4.2.0
       uncrypto: 0.1.3
+<<<<<<< HEAD
       vitepress: 1.3.4(@algolia/client-search@4.24.0)(@types/node@22.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
     transitivePeerDependencies:
       - '@algolia/client-search'
       - '@types/node'
@@ -13560,7 +13674,11 @@ 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.6(typescript@5.6.2))':
     dependencies:
@@ -13874,15 +13992,24 @@ 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
 
+<<<<<<< HEAD
   '@shikijs/engine-javascript@1.17.0':
     dependencies:
       '@shikijs/types': 1.17.0
@@ -13899,6 +14026,24 @@ snapshots:
       shiki: 1.17.0
 
   '@shikijs/types@1.17.0':
+=======
+  '@shikijs/engine-javascript@1.18.0':
+    dependencies:
+      '@shikijs/types': 1.18.0
+      '@shikijs/vscode-textmate': 9.2.2
+      oniguruma-to-js: 0.4.3
+
+  '@shikijs/engine-oniguruma@1.18.0':
+    dependencies:
+      '@shikijs/types': 1.18.0
+      '@shikijs/vscode-textmate': 9.2.2
+
+  '@shikijs/transformers@1.18.0':
+    dependencies:
+      shiki: 1.18.0
+
+  '@shikijs/types@1.18.0':
+>>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c
     dependencies:
       '@shikijs/vscode-textmate': 9.2.2
       '@types/hast': 3.0.4
@@ -14263,23 +14408,41 @@ snapshots:
       - encoding
       - supports-color
 
+<<<<<<< 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))':
     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)
 
   '@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))':
+    dependencies:
+      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)
+
+  '@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
     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
       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)
 
   '@vitest/expect@2.1.1':
@@ -14289,13 +14452,21 @@ snapshots:
       chai: 5.1.1
       tinyrainbow: 1.2.0
 
+<<<<<<< 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
     dependencies:
       '@vitest/spy': 2.1.1
       estree-walker: 3.0.3
       magic-string: 0.30.11
     optionalDependencies:
+<<<<<<< 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
 
   '@vitest/pretty-format@2.1.1':
     dependencies:
@@ -14405,14 +14576,22 @@ snapshots:
     dependencies:
       '@vue/devtools-kit': 7.4.5
 
+<<<<<<< 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
     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
       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)
     transitivePeerDependencies:
       - vite
@@ -15082,7 +15261,11 @@ 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:
@@ -16258,13 +16441,21 @@ snapshots:
     optionalDependencies:
       '@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
   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
     dependencies:
       '@typescript-eslint/utils': 7.18.0(eslint@9.10.0(jiti@1.21.6))(typescript@5.6.2)
       eslint: 9.10.0(jiti@1.21.6)
     optionalDependencies:
       '@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
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -17779,7 +17970,7 @@ snapshots:
 
   mkdirp@1.0.4: {}
 
-  mkdist@1.5.9(sass@1.79.1)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2)):
+  mkdist@1.5.9(sass@1.79.2)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2)):
     dependencies:
       autoprefixer: 10.4.20(postcss@8.4.47)
       citty: 0.1.6
@@ -17795,7 +17986,7 @@ snapshots:
       postcss-nested: 6.2.0(postcss@8.4.47)
       semver: 7.6.3
     optionalDependencies:
-      sass: 1.79.1
+      sass: 1.79.2
       typescript: 5.6.2
       vue-tsc: 2.1.6(typescript@5.6.2)
 
@@ -19172,7 +19363,7 @@ snapshots:
 
   safer-buffer@2.1.2: {}
 
-  sass@1.79.1:
+  sass@1.79.2:
     dependencies:
       chokidar: 4.0.0
       immutable: 4.3.7
@@ -19287,10 +19478,19 @@ 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
 
@@ -19314,7 +19514,11 @@ 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
 
@@ -19973,7 +20177,7 @@ snapshots:
       has-symbols: 1.0.3
       which-boxed-primitive: 1.0.2
 
-  unbuild@2.0.0(sass@1.79.1)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2)):
+  unbuild@2.0.0(sass@1.79.2)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2)):
     dependencies:
       '@rollup/plugin-alias': 5.1.0(rollup@3.29.4)
       '@rollup/plugin-commonjs': 25.0.8(rollup@3.29.4)
@@ -19990,7 +20194,7 @@ snapshots:
       hookable: 5.5.3
       jiti: 1.21.6
       magic-string: 0.30.11
-      mkdist: 1.5.9(sass@1.79.1)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2))
+      mkdist: 1.5.9(sass@1.79.2)(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2))
       mlly: 1.7.1
       pathe: 1.1.2
       pkg-types: 1.2.0
@@ -20279,16 +20483,28 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.2
 
+<<<<<<< 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)):
     dependencies:
       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-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)):
+    dependencies:
+      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
     dependencies:
       cac: 6.7.14
       debug: 4.3.7
       pathe: 1.1.2
+<<<<<<< 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
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -20300,16 +20516,28 @@ snapshots:
       - supports-color
       - terser
 
+<<<<<<< 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
     dependencies:
       chalk: 4.1.2
       debug: 4.3.7
       fs-extra: 10.1.0
+<<<<<<< HEAD
       vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(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)
@@ -20322,13 +20550,21 @@ snapshots:
       magic-string: 0.30.11
       typescript: 5.6.2
     optionalDependencies:
+<<<<<<< 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
     transitivePeerDependencies:
       - '@types/node'
       - rollup
       - supports-color
 
+<<<<<<< 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
     dependencies:
       '@rollup/pluginutils': 4.2.1
       colorette: 2.0.20
@@ -20342,9 +20578,15 @@ snapshots:
       html-minifier-terser: 6.1.0
       node-html-parser: 5.4.2
       pathe: 0.2.0
+<<<<<<< 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: 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
     dependencies:
       '@antfu/utils': 0.7.10
       '@rollup/pluginutils': 5.1.0(rollup@4.22.0)
@@ -20355,46 +20597,80 @@ snapshots:
       perfect-debounce: 1.0.0
       picocolors: 1.1.0
       sirv: 2.0.4
+<<<<<<< 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
     transitivePeerDependencies:
       - rollup
       - supports-color
 
+<<<<<<< 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
     dependencies:
       '@ast-grep/napi': 0.22.6
       magic-string: 0.30.11
       picocolors: 1.1.0
+<<<<<<< HEAD
       vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(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
     dependencies:
       debug: 4.3.7
       pretty-bytes: 6.1.1
       tinyglobby: 0.2.6
+<<<<<<< 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
       workbox-build: 7.1.1
       workbox-window: 7.1.0
     transitivePeerDependencies:
       - supports-color
 
+<<<<<<< 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
       '@vue/devtools-kit': 7.4.5
       '@vue/devtools-shared': 7.4.5
       execa: 8.0.1
       sirv: 2.0.4
+<<<<<<< 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
     transitivePeerDependencies:
       - '@nuxt/kit'
       - rollup
       - supports-color
       - vue
 
+<<<<<<< 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
     dependencies:
       '@babel/core': 7.25.2
       '@babel/plugin-proposal-decorators': 7.24.7(@babel/core@7.25.2)
@@ -20405,11 +20681,19 @@ snapshots:
       '@vue/compiler-dom': 3.5.6
       kolorist: 1.8.0
       magic-string: 0.30.11
+<<<<<<< HEAD
       vite: 5.4.6(@types/node@22.5.5)(less@4.2.0)(sass@1.79.1)(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
     dependencies:
       esbuild: 0.21.5
       postcss: 8.4.47
@@ -20418,8 +20702,13 @@ snapshots:
       '@types/node': 22.5.5
       fsevents: 2.3.3
       less: 4.2.0
+<<<<<<< HEAD
       sass: 1.79.1
       terser: 5.32.0
+=======
+      sass: 1.79.2
+      terser: 5.33.0
+>>>>>>> c72747c649c6d6c240a42697e5a4773b58d0066c
 
   vitepress-plugin-group-icons@1.2.4:
     dependencies:
@@ -20429,6 +20718,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+<<<<<<< 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
@@ -20437,6 +20727,16 @@ snapshots:
       '@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):
+    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
+      '@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
       '@vue/devtools-api': 7.4.5
       '@vue/shared': 3.5.6
       '@vueuse/core': 11.1.0(vue@3.5.6(typescript@5.6.2))
@@ -20444,8 +20744,13 @@ snapshots:
       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
+      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)
     optionalDependencies:
       postcss: 8.4.47
@@ -20477,10 +20782,17 @@ snapshots:
       - typescript
       - universal-cookie
 
+<<<<<<< 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):
     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/pretty-format': 2.1.1
       '@vitest/runner': 2.1.1
       '@vitest/snapshot': 2.1.1
@@ -20495,8 +20807,13 @@ snapshots:
       tinyexec: 0.3.0
       tinypool: 1.0.1
       tinyrainbow: 1.2.0
+<<<<<<< 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
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/node': 22.5.5
@@ -20926,7 +21243,11 @@ 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