Merge branch 'main' into milletpeak-fontsize

apps/web-tdesign/package.json

@@ -42,7 +42,7 @@
     "@vben/utils": "workspace:*",
     "@vueuse/core": "catalog:",
     "dayjs": "catalog:",
-    "lodash-es": "^4.17.21",
+    "es-toolkit": "catalog:",
     "pinia": "catalog:",
     "tdesign-vue-next": "^1.17.1",
     "vue": "catalog:",

apps/web-tdesign/src/app.vue

@@ -1,12 +1,12 @@
 <script lang="ts" setup>
 import type { GlobalConfigProvider } from 'tdesign-vue-next';
+import { ConfigProvider } from 'tdesign-vue-next';
 
 import { onMounted } from 'vue';
 
 import { usePreferences } from '@vben/preferences';
 
-import { merge } from 'lodash-es';
+import { merge } from 'es-toolkit/compat';
-import { ConfigProvider } from 'tdesign-vue-next';
 import zhConfig from 'tdesign-vue-next/es/locale/zh_CN';
 
 defineOptions({ name: 'App' });

apps/web-tdesign/src/bootstrap.ts

@@ -5,8 +5,9 @@ import { registerLoadingDirective } from '@vben/common-ui/es/loading';
 import { preferences } from '@vben/preferences';
 import { initStores } from '@vben/stores';
 import '@vben/styles';
-import '@vben/styles/antd';
+// import '@vben/styles/antd';
-
+// 引入组件库的少量全局样式变量
+import 'tdesign-vue-next/es/style/index.css';
 import { useTitle } from '@vueuse/core';
 
 import { $t, setupI18n } from '#/locales';
@@ -16,8 +17,6 @@ import { initSetupVbenForm } from './adapter/form';
 import App from './app.vue';
 import { router } from './router';
 
-// 引入组件库的少量全局样式变量
-
 async function bootstrap(namespace: string) {
   // 初始化组件适配器
   await initComponentAdapter();

package.json

@@ -93,7 +93,7 @@
     "unbuild": "catalog:",
     "vite": "catalog:",
     "vitest": "catalog:",
-    "vue": "catalog:",
+    "vue": "^3.5.24",
     "vue-tsc": "catalog:"
   },
   "engines": {

packages/@core/base/shared/package.json

@@ -85,10 +85,7 @@
     "clsx": "catalog:",
     "dayjs": "catalog:",
     "defu": "catalog:",
-    "lodash.clonedeep": "catalog:",
+    "es-toolkit": "catalog:",
-    "lodash.get": "catalog:",
-    "lodash.isequal": "catalog:",
-    "lodash.set": "catalog:",
     "nprogress": "catalog:",
     "tailwind-merge": "catalog:",
     "theme-colors": "catalog:"

packages/@core/base/shared/src/utils/index.ts

@@ -15,7 +15,9 @@ export * from './unique';
 export * from './update-css-variables';
 export * from './util';
 export * from './window';
-export { default as cloneDeep } from 'lodash.clonedeep';
+export { get, isEqual, set } from 'es-toolkit/compat';
-export { default as get } from 'lodash.get';
+export { cloneDeep } from 'es-toolkit/object';
-export { default as isEqual } from 'lodash.isequal';
+// export { default as cloneDeep } from 'lodash.clonedeep';
-export { default as set } from 'lodash.set';
+// export { default as get } from 'lodash.get';
+// export { default as isEqual } from 'lodash.isequal';
+// export { default as set } from 'lodash.set';

pnpm-workspace.yaml

@@ -16,7 +16,7 @@ packages:
 catalog:
   '@ast-grep/napi': ^0.37.0
   '@changesets/changelog-github': ^0.5.1
-  '@changesets/cli': ^2.29.5
+  '@changesets/cli': ^2.29.7
   '@changesets/git': ^3.0.4
   '@clack/prompts': ^0.10.1
   '@commitlint/cli': ^19.8.1
@@ -32,7 +32,7 @@ catalog:
   '@jspm/generator': ^2.6.2
   '@manypkg/get-packages': ^3.0.0
   '@nolebase/vitepress-plugin-git-changelog': ^2.18.0
-  '@playwright/test': ^1.53.2
+  '@playwright/test': ^1.56.1
   '@pnpm/workspace.read-manifest': ^1000.2.0
   '@stylistic/stylelint-plugin': ^3.1.3
   '@tailwindcss/nesting': 0.0.0-insiders.565cd3e
@@ -48,7 +48,7 @@ catalog:
   '@types/lodash.get': ^4.4.9
   '@types/lodash.isequal': ^4.5.8
   '@types/lodash.set': ^4.3.9
-  '@types/node': ^24.9.2
+  '@types/node': ^24.10.1
   '@types/nprogress': ^0.2.3
   '@types/postcss-import': ^14.0.3
   '@types/qrcode': ^1.5.5
@@ -59,7 +59,7 @@ catalog:
   '@vee-validate/zod': ^4.15.1
   '@vite-pwa/vitepress': ^1.0.0
   '@vitejs/plugin-vue': ^6.0.1
-  '@vitejs/plugin-vue-jsx': ^5.0.1
+  '@vitejs/plugin-vue-jsx': ^5.1.1
   '@vue/reactivity': ^3.5.17
   '@vue/shared': ^3.5.17
   '@vue/test-utils': ^2.4.6
@@ -68,7 +68,7 @@ catalog:
   '@vueuse/motion': ^3.0.3
   ant-design-vue: ^4.2.6
   archiver: ^7.0.1
-  autoprefixer: ^10.4.21
+  autoprefixer: ^10.4.22
   axios: ^1.10.0
   axios-mock-adapter: ^2.1.0
   cac: ^6.7.14
@@ -88,7 +88,7 @@ catalog:
   defu: ^6.1.4
   depcheck: ^1.4.7
   dotenv: ^16.6.1
-  echarts: ^5.6.0
+  echarts: ^6.0.0
   element-plus: ^2.10.2
   eslint: ^9.30.1
   eslint-config-turbo: ^2.5.4
@@ -117,7 +117,7 @@ catalog:
   json-bigint: ^1.0.0
   jsonc-eslint-parser: ^2.4.0
   jsonwebtoken: ^9.0.2
-  lefthook: ^1.11.14
+  lefthook: ^1.13.6
   lodash.clonedeep: ^4.5.0
   lodash.get: ^4.4.2
   lodash.isequal: ^4.5.0
@@ -131,7 +131,7 @@ catalog:
   pinia: ^3.0.3
   pinia-plugin-persistedstate: ^4.4.1
   pkg-types: ^2.2.0
-  playwright: ^1.53.2
+  playwright: ^1.56.1
   postcss: ^8.5.6
   postcss-antd-fixes: ^0.2.0
   postcss-html: ^1.8.0
@@ -145,7 +145,7 @@ catalog:
   qs: ^6.14.0
   reka-ui: ^2.6.0
   resolve.exports: ^2.0.3
-  rimraf: ^6.0.1
+  rimraf: ^6.1.0
   rollup: ^4.44.1
   rollup-plugin-visualizer: ^5.14.0
   sass: ^1.89.2
@@ -153,7 +153,7 @@ catalog:
   sortablejs: ^1.15.6
   stylelint: ^16.21.0
   stylelint-config-recess-order: ^6.1.0
-  stylelint-config-recommended: ^16.0.0
+  stylelint-config-recommended: ^17.0.0
   stylelint-config-recommended-scss: ^14.1.0
   stylelint-config-recommended-vue: ^1.6.1
   stylelint-config-standard: ^38.0.0
@@ -161,16 +161,16 @@ catalog:
   stylelint-prettier: ^5.0.3
   stylelint-scss: ^6.12.1
   tailwind-merge: ^2.6.0
-  tailwindcss: ^3.4.17
+  tailwindcss: ^3.4.18
   tailwindcss-animate: ^1.0.7
   theme-colors: ^0.1.0
   tippy.js: ^6.3.7
-  turbo: ^2.5.4
+  turbo: ^2.6.1
-  typescript: ^5.8.3
+  typescript: ^5.9.3
   unbuild: ^3.6.1
   unplugin-element-plus: ^0.10.0
   vee-validate: ^4.15.1
-  vite: ^7.1.2
+  vite: ^7.2.2
   vite-plugin-compression: ^0.5.1
   vite-plugin-dts: ^4.5.4
   vite-plugin-html: ^3.2.2
@@ -192,3 +192,4 @@ catalog:
   watermark-js-plus: ^1.6.2
   zod: ^3.25.67
   zod-defaults: ^0.1.3
+  es-toolkit: ^1.41.0