From cb9a2ee1a2b6ccde34c308ca43b5de84e53b735a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?cls=5F=E5=AE=81=E6=B3=A2=E6=9C=AC=E6=9C=BA?= <908705107@qq.com> Date: Tue, 9 Jun 2026 10:05:58 +0800 Subject: [PATCH] Use direct motion dependency in web ele --- web/apps/web-ele/package.json | 2 +- web/apps/web-ele/src/bootstrap.ts | 2 +- web/apps/web-ele/vite.config.mts | 8 ------ web/pnpm-lock.yaml | 44 +++++++++++++++---------------- 4 files changed, 24 insertions(+), 32 deletions(-) diff --git a/web/apps/web-ele/package.json b/web/apps/web-ele/package.json index 06f0b0c..e09e9f1 100644 --- a/web/apps/web-ele/package.json +++ b/web/apps/web-ele/package.json @@ -51,7 +51,6 @@ "@vben/icons": "workspace:*", "@vben/layouts": "workspace:*", "@vben/locales": "workspace:*", - "@vben/plugins": "workspace:*", "@vben/preferences": "workspace:*", "@vben/request": "workspace:*", "@vben/stores": "workspace:*", @@ -63,6 +62,7 @@ "@vue-flow/core": "^1.48.0", "@vue-flow/minimap": "^1.5.4", "@vueuse/core": "catalog:", + "@vueuse/motion": "catalog:", "codemirror": "^6.0.2", "cron-parser": "^4.9.0", "dayjs": "catalog:", diff --git a/web/apps/web-ele/src/bootstrap.ts b/web/apps/web-ele/src/bootstrap.ts index a9cf5d7..1a46d31 100644 --- a/web/apps/web-ele/src/bootstrap.ts +++ b/web/apps/web-ele/src/bootstrap.ts @@ -140,7 +140,7 @@ async function bootstrap(namespace: string) { app.use(router); // 配置Motion插件 - const { MotionPlugin } = await import('@vben/plugins/motion'); + const { MotionPlugin } = await import('@vueuse/motion'); app.use(MotionPlugin); // 动态更新标题 diff --git a/web/apps/web-ele/vite.config.mts b/web/apps/web-ele/vite.config.mts index 1d4ca69..d99a514 100644 --- a/web/apps/web-ele/vite.config.mts +++ b/web/apps/web-ele/vite.config.mts @@ -127,14 +127,6 @@ export default defineConfig(async () => { '../../packages/effects/layouts/src/widgets/preferences/blocks/index.ts', ), exactAlias('@vben/locales', '../../packages/locales/src/index.ts'), - exactAlias( - '@vben/plugins/echarts', - '../../packages/effects/plugins/src/echarts/index.ts', - ), - exactAlias( - '@vben/plugins/motion', - '../../packages/effects/plugins/src/motion/index.ts', - ), exactAlias( '@vben/preferences', '../../packages/preferences/src/index.ts', diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 7f175b9..6b730fd 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -589,10 +589,10 @@ importers: version: link:scripts/vsh '@vitejs/plugin-vue': specifier: 'catalog:' - version: 6.0.2(vite@7.2.6(@types/node@22.19.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2))(vue@3.5.25(typescript@5.9.3)) + version: 6.0.2(vite@7.2.6(@types/node@22.19.1)(jiti@1.21.7)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2))(vue@3.5.25(typescript@5.9.3)) '@vitejs/plugin-vue-jsx': specifier: 'catalog:' - version: 5.1.2(vite@7.2.6(@types/node@22.19.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2))(vue@3.5.25(typescript@5.9.3)) + version: 5.1.2(vite@7.2.6(@types/node@22.19.1)(jiti@1.21.7)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2))(vue@3.5.25(typescript@5.9.3)) '@vue/test-utils': specifier: 'catalog:' version: 2.4.6 @@ -634,10 +634,10 @@ importers: version: 3.6.1(sass@1.94.2)(typescript@5.9.3)(vue-tsc@2.2.10(typescript@5.9.3))(vue@3.5.25(typescript@5.9.3)) vite: specifier: 'catalog:' - version: 7.2.6(@types/node@22.19.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) + version: 7.2.6(@types/node@22.19.1)(jiti@1.21.7)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) vitest: specifier: 'catalog:' - version: 3.2.4(@types/debug@4.1.13)(@types/node@22.19.1)(happy-dom@17.6.3)(jiti@2.6.1)(jsdom@26.1.0(canvas@3.2.2))(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) + version: 3.2.4(@types/debug@4.1.13)(@types/node@22.19.1)(happy-dom@17.6.3)(jiti@1.21.7)(jsdom@26.1.0(canvas@3.2.2))(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) vue: specifier: ^3.5.17 version: 3.5.25(typescript@5.9.3) @@ -722,9 +722,6 @@ importers: '@vben/locales': specifier: workspace:* version: link:../../packages/locales - '@vben/plugins': - specifier: workspace:* - version: link:../../packages/effects/plugins '@vben/preferences': specifier: workspace:* version: link:../../packages/preferences @@ -758,6 +755,9 @@ importers: '@vueuse/core': specifier: 'catalog:' version: 13.4.0(vue@3.5.25(typescript@5.9.3)) + '@vueuse/motion': + specifier: 'catalog:' + version: 3.0.3(magicast@0.5.1)(vue@3.5.25(typescript@5.9.3)) codemirror: specifier: ^6.0.2 version: 6.0.2 @@ -14386,14 +14386,14 @@ snapshots: dependencies: vite: 7.2.6(@types/node@24.10.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) - '@vitejs/plugin-vue-jsx@5.1.2(vite@7.2.6(@types/node@22.19.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2))(vue@3.5.25(typescript@5.9.3))': + '@vitejs/plugin-vue-jsx@5.1.2(vite@7.2.6(@types/node@22.19.1)(jiti@1.21.7)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2))(vue@3.5.25(typescript@5.9.3))': dependencies: '@babel/core': 7.28.5 '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.28.5) '@babel/plugin-transform-typescript': 7.28.5(@babel/core@7.28.5) '@rolldown/pluginutils': 1.0.0-beta.52 '@vue/babel-plugin-jsx': 2.0.1(@babel/core@7.28.5) - vite: 7.2.6(@types/node@22.19.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) + vite: 7.2.6(@types/node@22.19.1)(jiti@1.21.7)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) vue: 3.5.25(typescript@5.9.3) transitivePeerDependencies: - supports-color @@ -14415,10 +14415,10 @@ snapshots: vite: 5.4.21(@types/node@24.10.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1) vue: 3.5.25(typescript@5.9.3) - '@vitejs/plugin-vue@6.0.2(vite@7.2.6(@types/node@22.19.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2))(vue@3.5.25(typescript@5.9.3))': + '@vitejs/plugin-vue@6.0.2(vite@7.2.6(@types/node@22.19.1)(jiti@1.21.7)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2))(vue@3.5.25(typescript@5.9.3))': dependencies: '@rolldown/pluginutils': 1.0.0-beta.50 - vite: 7.2.6(@types/node@22.19.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) + vite: 7.2.6(@types/node@22.19.1)(jiti@1.21.7)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) vue: 3.5.25(typescript@5.9.3) '@vitejs/plugin-vue@6.0.2(vite@7.2.6(@types/node@24.10.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2))(vue@3.5.25(typescript@5.9.3))': @@ -14435,13 +14435,13 @@ snapshots: chai: 5.3.3 tinyrainbow: 2.0.0 - '@vitest/mocker@3.2.4(vite@7.2.6(@types/node@22.19.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2))': + '@vitest/mocker@3.2.4(vite@7.2.6(@types/node@22.19.1)(jiti@1.21.7)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2))': dependencies: '@vitest/spy': 3.2.4 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: - vite: 7.2.6(@types/node@22.19.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) + vite: 7.2.6(@types/node@22.19.1)(jiti@1.21.7)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) '@vitest/pretty-format@3.2.4': dependencies: @@ -20634,13 +20634,13 @@ snapshots: dependencies: vite: 7.2.6(@types/node@24.10.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) - vite-node@3.2.4(@types/node@22.19.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2): + vite-node@3.2.4(@types/node@22.19.1)(jiti@1.21.7)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2): dependencies: cac: 6.7.14 debug: 4.4.3 es-module-lexer: 1.7.0 pathe: 2.0.3 - vite: 7.2.6(@types/node@22.19.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) + vite: 7.2.6(@types/node@22.19.1)(jiti@1.21.7)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) transitivePeerDependencies: - '@types/node' - jiti @@ -20809,7 +20809,7 @@ snapshots: sass: 1.94.2 terser: 5.44.1 - vite@7.2.6(@types/node@22.19.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2): + vite@7.2.6(@types/node@22.19.1)(jiti@1.21.7)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2): dependencies: esbuild: 0.25.3 fdir: 6.5.0(picomatch@4.0.3) @@ -20820,7 +20820,7 @@ snapshots: optionalDependencies: '@types/node': 22.19.1 fsevents: 2.3.3 - jiti: 2.6.1 + jiti: 1.21.7 less: 4.4.2 sass: 1.94.2 terser: 5.44.1 @@ -20900,11 +20900,11 @@ snapshots: - typescript - universal-cookie - vitest@3.2.4(@types/debug@4.1.13)(@types/node@22.19.1)(happy-dom@17.6.3)(jiti@2.6.1)(jsdom@26.1.0(canvas@3.2.2))(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2): + vitest@3.2.4(@types/debug@4.1.13)(@types/node@22.19.1)(happy-dom@17.6.3)(jiti@1.21.7)(jsdom@26.1.0(canvas@3.2.2))(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2): dependencies: '@types/chai': 5.2.3 '@vitest/expect': 3.2.4 - '@vitest/mocker': 3.2.4(vite@7.2.6(@types/node@22.19.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2)) + '@vitest/mocker': 3.2.4(vite@7.2.6(@types/node@22.19.1)(jiti@1.21.7)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2)) '@vitest/pretty-format': 3.2.4 '@vitest/runner': 3.2.4 '@vitest/snapshot': 3.2.4 @@ -20922,8 +20922,8 @@ snapshots: tinyglobby: 0.2.15 tinypool: 1.1.1 tinyrainbow: 2.0.0 - vite: 7.2.6(@types/node@22.19.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) - vite-node: 3.2.4(@types/node@22.19.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) + vite: 7.2.6(@types/node@22.19.1)(jiti@1.21.7)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) + vite-node: 3.2.4(@types/node@22.19.1)(jiti@1.21.7)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2) why-is-node-running: 2.3.0 optionalDependencies: '@types/debug': 4.1.13 @@ -20948,7 +20948,7 @@ snapshots: dependencies: '@types/chai': 5.2.3 '@vitest/expect': 3.2.4 - '@vitest/mocker': 3.2.4(vite@7.2.6(@types/node@22.19.1)(jiti@2.6.1)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2)) + '@vitest/mocker': 3.2.4(vite@7.2.6(@types/node@22.19.1)(jiti@1.21.7)(less@4.4.2)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2)) '@vitest/pretty-format': 3.2.4 '@vitest/runner': 3.2.4 '@vitest/snapshot': 3.2.4