diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index c8df8b2e..40bf10ad 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -1,6 +1,6 @@ { "name": "@vben/web-antd", - "version": "1.5.2", + "version": "1.5.3", "homepage": "https://vben.pro", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { @@ -27,8 +27,8 @@ "#/*": "./src/*" }, "dependencies": { - "@ant-design/icons-vue": "^7.0.1", - "@tinymce/tinymce-vue": "^6.0.1", + "@ant-design/icons-vue": "catalog:", + "@tinymce/tinymce-vue": "catalog:", "@vben/access": "workspace:*", "@vben/common-ui": "workspace:*", "@vben/constants": "workspace:*", @@ -45,18 +45,18 @@ "@vben/utils": "workspace:*", "@vueuse/core": "catalog:", "ant-design-vue": "catalog:", - "cropperjs": "^1.6.2", + "cropperjs": "catalog:", "dayjs": "catalog:", - "echarts": "^5.5.1", - "lodash-es": "^4.17.21", + "echarts": "catalog:conflicts_echarts_h5_5_1", + "lodash-es": "catalog:", "pinia": "catalog:", - "tinymce": "7.9.1", - "unplugin-vue-components": "^0.27.3", + "tinymce": "catalog:", + "unplugin-vue-components": "catalog:", "vue": "catalog:", "vue-router": "catalog:", - "vue3-colorpicker": "^2.3.0" + "vue3-colorpicker": "catalog:" }, "devDependencies": { - "@types/lodash-es": "^4.17.12" + "@types/lodash-es": "catalog:" } } diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 0460629b..77290f46 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -23,6 +23,7 @@ overrides: vue: 'catalog:' catalog: + '@ant-design/icons-vue': ^7.0.1 '@ast-grep/napi': ^0.39.9 '@changesets/changelog-github': ^0.5.2 '@changesets/cli': ^2.29.8 @@ -48,11 +49,13 @@ catalog: '@tailwindcss/typography': ^0.5.19 '@tanstack/vue-query': ^5.92.9 '@tanstack/vue-store': ^0.8.0 + '@tinymce/tinymce-vue': ^6.0.1 '@types/archiver': ^6.0.4 '@types/eslint': ^9.6.1 '@types/html-minifier-terser': ^7.0.2 '@types/json-bigint': ^1.0.4 '@types/jsonwebtoken': ^9.0.10 + '@types/lodash-es': ^4.17.12 '@types/lodash.clonedeep': ^4.5.9 '@types/node': ^24.10.9 '@types/nprogress': ^0.2.3 @@ -84,6 +87,7 @@ catalog: clsx: ^2.1.1 commitlint-plugin-function-rules: ^4.3.1 consola: ^3.4.2 + cropperjs: ^1.6.2 cross-env: ^10.1.0 cspell: ^9.6.2 cssnano: ^7.1.2 @@ -94,7 +98,6 @@ catalog: depcheck: ^1.4.7 dotenv: ^16.6.1 echarts: ^6.0.0 - element-plus: ^2.13.1 es-toolkit: ^1.44.0 esbuild: ^0.25.12 eslint: ^9.39.2 @@ -128,10 +131,10 @@ catalog: jsonc-eslint-parser: ^2.4.2 jsonwebtoken: ^9.0.3 lefthook: ^2.0.16 + lodash-es: ^4.17.21 lodash.clonedeep: ^4.5.0 lucide-vue-next: ^0.553.0 medium-zoom: ^1.1.0 - naive-ui: ^2.43.2 nitropack: ^2.13.1 nprogress: ^0.2.0 ora: ^8.2.0 @@ -170,13 +173,13 @@ catalog: tailwind-merge: ^2.6.0 tailwindcss: ^3.4.19 tailwindcss-animate: ^1.0.7 - tdesign-vue-next: ^1.18.0 theme-colors: ^0.1.0 + tinymce: 7.9.1 tippy.js: ^6.3.7 turbo: ^2.7.6 typescript: ^5.9.3 unbuild: ^3.6.1 - unplugin-element-plus: ^0.11.2 + unplugin-vue-components: ^0.27.3 vee-validate: ^4.15.1 vite: ^7.3.1 vite-plugin-compression: ^0.5.1 @@ -195,9 +198,13 @@ catalog: vue-router: ^4.6.4 vue-tippy: ^6.7.1 vue-tsc: ^3.2.4 + vue3-colorpicker: ^2.3.0 vxe-pc-ui: ^4.12.16 vxe-table: ^4.17.46 watermark-js-plus: ^1.6.3 yaml-eslint-parser: ^1.3.2 zod: ^3.25.76 zod-defaults: 0.1.3 +catalogs: + conflicts_echarts_h5_5_1: + echarts: ^5.5.1