From cb161eab89df9816914586afcdba1637daa1c74d Mon Sep 17 00:00:00 2001 From: vince Date: Wed, 17 Jul 2024 22:30:18 +0800 Subject: [PATCH] fix: fixed svg icon load failure and enabled global injection bem.scss --- apps/backend-mock/package.json | 2 +- apps/web-antd/package.json | 2 +- .../lint-configs/eslint-config/package.json | 4 +- .../stylelint-config/package.json | 2 +- internal/node-utils/package.json | 2 +- internal/tailwind-config/package.json | 2 +- internal/vite-config/package.json | 2 +- .../vite-config/src/config/application.ts | 27 + internal/vite-config/src/typing.ts | 2 + package.json | 8 +- .../@core/forward/preferences/package.json | 2 +- packages/@core/forward/stores/package.json | 2 +- packages/@core/hooks/package.json | 2 +- packages/@core/locales/package.json | 2 +- packages/@core/shared/design/package.json | 3 - .../shared/design/src/css/transition.css | 236 ++ packages/@core/shared/design/src/index.ts | 2 +- .../@core/shared/design/src/scss/index.scss | 3 - .../design/src/scss/transition/animation.scss | 81 - .../design/src/scss/transition/collapse.scss | 14 - .../design/src/scss/transition/fade.scss | 97 - .../design/src/scss/transition/index.scss | 4 - .../design/src/scss/transition/mixin.scss | 10 - .../design/src/scss/transition/slide.scss | 41 - packages/@core/shared/icons/package.json | 2 +- packages/@core/shared/toolkit/package.json | 2 +- packages/@core/shared/typings/package.json | 2 +- packages/@core/ui-kit/layout-ui/package.json | 2 +- packages/@core/ui-kit/menu-ui/package.json | 2 +- packages/@core/ui-kit/shadcn-ui/package.json | 2 +- packages/@core/ui-kit/tabs-ui/package.json | 2 +- packages/effects/access/package.json | 2 +- packages/effects/chart-ui/package.json | 2 +- packages/effects/common-ui/package.json | 2 +- packages/effects/layouts/package.json | 2 +- .../src/widgets/theme-toggle/theme-button.vue | 20 +- packages/icons/build.config.ts | 10 +- packages/styles/build.config.ts | 23 + packages/styles/package.json | 13 +- .../styles/src/antd/{base.css => index.css} | 0 packages/styles/src/antd/index.ts | 1 - .../src/{bem/bem.scss => global/index.scss} | 0 packages/styles/vite.config.mts | 18 - packages/types/package.json | 2 +- packages/utils/build.config.ts | 7 + pnpm-lock.yaml | 2530 +++++++++-------- scripts/vsh/package.json | 2 +- website/package.json | 2 +- 48 files changed, 1626 insertions(+), 1576 deletions(-) create mode 100644 packages/@core/shared/design/src/css/transition.css delete mode 100644 packages/@core/shared/design/src/scss/index.scss delete mode 100644 packages/@core/shared/design/src/scss/transition/animation.scss delete mode 100644 packages/@core/shared/design/src/scss/transition/collapse.scss delete mode 100644 packages/@core/shared/design/src/scss/transition/fade.scss delete mode 100644 packages/@core/shared/design/src/scss/transition/index.scss delete mode 100644 packages/@core/shared/design/src/scss/transition/mixin.scss delete mode 100644 packages/@core/shared/design/src/scss/transition/slide.scss create mode 100644 packages/styles/build.config.ts rename packages/styles/src/antd/{base.css => index.css} (100%) delete mode 100644 packages/styles/src/antd/index.ts rename packages/styles/src/{bem/bem.scss => global/index.scss} (100%) delete mode 100644 packages/styles/vite.config.mts create mode 100644 packages/utils/build.config.ts diff --git a/apps/backend-mock/package.json b/apps/backend-mock/package.json index 67556d5f..c0391761 100644 --- a/apps/backend-mock/package.json +++ b/apps/backend-mock/package.json @@ -38,7 +38,7 @@ "@nestjs/schematics": "^10.1.2", "@types/express": "^4.17.21", "@types/mockjs": "^1.0.10", - "@types/node": "^20.14.10", + "@types/node": "^20.14.11", "nodemon": "^3.1.4", "ts-node": "^10.9.2", "typescript": "^5.5.3" diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index e4d76dc4..8a41045e 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -45,7 +45,7 @@ "ant-design-vue": "^4.2.3", "dayjs": "^1.11.11", "pinia": "2.1.7", - "vue": "^3.4.31", + "vue": "^3.4.32", "vue-router": "^4.4.0" } } diff --git a/internal/lint-configs/eslint-config/package.json b/internal/lint-configs/eslint-config/package.json index 47a4fb95..56ac4caf 100644 --- a/internal/lint-configs/eslint-config/package.json +++ b/internal/lint-configs/eslint-config/package.json @@ -27,7 +27,7 @@ } }, "dependencies": { - "eslint-config-turbo": "^2.0.6", + "eslint-config-turbo": "^2.0.7", "eslint-plugin-command": "^0.2.3" }, "devDependencies": { @@ -44,7 +44,7 @@ "eslint-plugin-n": "^17.9.0", "eslint-plugin-no-only-tests": "^3.1.0", "eslint-plugin-perfectionist": "^2.11.0", - "eslint-plugin-prettier": "^5.1.3", + "eslint-plugin-prettier": "^5.2.1", "eslint-plugin-regexp": "^2.6.0", "eslint-plugin-unicorn": "^54.0.0", "eslint-plugin-unused-imports": "^4.0.0", diff --git a/internal/lint-configs/stylelint-config/package.json b/internal/lint-configs/stylelint-config/package.json index b99a9e3b..eb8f3330 100644 --- a/internal/lint-configs/stylelint-config/package.json +++ b/internal/lint-configs/stylelint-config/package.json @@ -43,6 +43,6 @@ "stylelint-config-recommended-vue": "^1.5.0", "stylelint-config-standard": "^36.0.1", "stylelint-order": "^6.0.4", - "stylelint-prettier": "^5.0.1" + "stylelint-prettier": "^5.0.2" } } diff --git a/internal/node-utils/package.json b/internal/node-utils/package.json index 130d69fe..5cce0161 100644 --- a/internal/node-utils/package.json +++ b/internal/node-utils/package.json @@ -22,7 +22,7 @@ "types": "./dist/index.d.ts", "exports": { ".": { - "types": "./dist/index.d.ts", + "types": "./src/index.ts", "import": "./dist/index.mjs", "default": "./dist/index.mjs" } diff --git a/internal/tailwind-config/package.json b/internal/tailwind-config/package.json index bab95eb0..a13c7ee5 100644 --- a/internal/tailwind-config/package.json +++ b/internal/tailwind-config/package.json @@ -58,7 +58,7 @@ "postcss-antd-fixes": "^0.2.0", "postcss-import": "^16.1.0", "postcss-preset-env": "^9.6.0", - "tailwindcss": "^3.4.5", + "tailwindcss": "^3.4.6", "tailwindcss-animate": "^1.0.7" }, "devDependencies": { diff --git a/internal/vite-config/package.json b/internal/vite-config/package.json index 88bc8242..9bd1ca09 100644 --- a/internal/vite-config/package.json +++ b/internal/vite-config/package.json @@ -22,7 +22,7 @@ "types": "./dist/index.d.ts", "exports": { ".": { - "types": "./dist/index.d.ts", + "types": "./src/index.ts", "default": "./dist/index.mjs" } }, diff --git a/internal/vite-config/src/config/application.ts b/internal/vite-config/src/config/application.ts index b562a38f..38537a10 100644 --- a/internal/vite-config/src/config/application.ts +++ b/internal/vite-config/src/config/application.ts @@ -2,6 +2,10 @@ import type { UserConfig } from 'vite'; import type { DefineApplicationOptions } from '../typing'; +import { relative } from 'node:path'; + +import { findMonorepoRoot } from '@vben/node-utils'; + import { defineConfig, loadEnv, mergeConfig } from 'vite'; import { loadApplicationPlugins } from '../plugins'; @@ -33,6 +37,8 @@ function defineApplicationConfig(userConfigPromise: DefineApplicationOptions) { ...application, }); + const { injectGlobalScss = true } = application; + const applicationConfig: UserConfig = { build: { rollupOptions: { @@ -44,6 +50,7 @@ function defineApplicationConfig(userConfigPromise: DefineApplicationOptions) { }, target: 'es2015', }, + css: createCssOptions(injectGlobalScss), esbuild: { drop: isBuild ? [ @@ -71,4 +78,24 @@ function defineApplicationConfig(userConfigPromise: DefineApplicationOptions) { }); } +function createCssOptions(injectGlobalScss = true) { + const root = findMonorepoRoot(); + return { + preprocessorOptions: injectGlobalScss + ? { + scss: { + additionalData: (content: string, filepath: string) => { + const relativePath = relative(root, filepath); + // apps下的包注入全局样式 + if (relativePath.startsWith('apps/')) { + return `@import "@vben/styles/global";\n${content}`; + } + return content; + }, + }, + } + : {}, + }; +} + export { defineApplicationConfig }; diff --git a/internal/vite-config/src/typing.ts b/internal/vite-config/src/typing.ts index ed77cd25..5b5d6f88 100644 --- a/internal/vite-config/src/typing.ts +++ b/internal/vite-config/src/typing.ts @@ -67,6 +67,8 @@ interface ApplicationPluginOptions extends CommonPluginOptions { importmapOptions?: ImportmapPluginOptions; /** 是否注入app loading */ injectAppLoading?: boolean; + /** 是否注入全局scss */ + injectGlobalScss?: boolean; /** 是否注入版权信息 */ license?: boolean; /** 是否开启pwa */ diff --git a/package.json b/package.json index 70f0f417..a99019c1 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@changesets/cli": "^2.27.7", "@ls-lint/ls-lint": "^2.2.3", "@types/jsdom": "^21.1.7", - "@types/node": "^20.14.10", + "@types/node": "^20.14.11", "@vben/commitlint-config": "workspace:*", "@vben/eslint-config": "workspace:*", "@vben/lint-staged-config": "workspace:*", @@ -65,12 +65,12 @@ "@vben/vsh": "workspace:*", "@vue/test-utils": "^2.4.6", "cross-env": "^7.0.3", - "cspell": "^8.10.4", + "cspell": "^8.11.0", "husky": "^9.0.11", "is-ci": "^3.0.1", "jsdom": "^24.1.0", "rimraf": "^6.0.1", - "turbo": "^2.0.6", + "turbo": "^2.0.7", "typescript": "^5.5.3", "unbuild": "^2.0.0", "vite": "^5.3.4", @@ -87,7 +87,7 @@ "@ctrl/tinycolor": "^4.1.0", "clsx": "^2.1.1", "eslint": "^8.57.0", - "vue": "^3.4.31", + "vue": "^3.4.32", "zx": "^7.2.3" }, "neverBuiltDependencies": [ diff --git a/packages/@core/forward/preferences/package.json b/packages/@core/forward/preferences/package.json index f27cf092..50818490 100644 --- a/packages/@core/forward/preferences/package.json +++ b/packages/@core/forward/preferences/package.json @@ -32,6 +32,6 @@ "@vben-core/toolkit": "workspace:*", "@vben-core/typings": "workspace:*", "@vueuse/core": "^10.11.0", - "vue": "^3.4.31" + "vue": "^3.4.32" } } diff --git a/packages/@core/forward/stores/package.json b/packages/@core/forward/stores/package.json index d17e362e..4c7761fc 100644 --- a/packages/@core/forward/stores/package.json +++ b/packages/@core/forward/stores/package.json @@ -42,7 +42,7 @@ "@vben-core/typings": "workspace:*", "pinia": "2.1.7", "pinia-plugin-persistedstate": "^3.2.1", - "vue": "^3.4.31", + "vue": "^3.4.32", "vue-router": "^4.4.0" } } diff --git a/packages/@core/hooks/package.json b/packages/@core/hooks/package.json index f969ebd5..603e8901 100644 --- a/packages/@core/hooks/package.json +++ b/packages/@core/hooks/package.json @@ -41,7 +41,7 @@ "@vueuse/core": "^10.11.0", "radix-vue": "^1.9.1", "sortablejs": "^1.15.2", - "vue": "^3.4.31" + "vue": "^3.4.32" }, "devDependencies": { "@types/sortablejs": "^1.15.8" diff --git a/packages/@core/locales/package.json b/packages/@core/locales/package.json index 43b61fe9..4ed089ff 100644 --- a/packages/@core/locales/package.json +++ b/packages/@core/locales/package.json @@ -43,7 +43,7 @@ "dependencies": { "@intlify/core-base": "^9.13.1", "@vben-core/typings": "workspace:*", - "vue": "^3.4.31", + "vue": "^3.4.32", "vue-i18n": "^9.13.1" } } diff --git a/packages/@core/shared/design/package.json b/packages/@core/shared/design/package.json index 55b2c198..08d5dde7 100644 --- a/packages/@core/shared/design/package.json +++ b/packages/@core/shared/design/package.json @@ -37,8 +37,5 @@ "default": "./dist/index.mjs" } } - }, - "dependencies": { - "modern-normalize": "^2.0.0" } } diff --git a/packages/@core/shared/design/src/css/transition.css b/packages/@core/shared/design/src/css/transition.css new file mode 100644 index 00000000..c1cb0e48 --- /dev/null +++ b/packages/@core/shared/design/src/css/transition.css @@ -0,0 +1,236 @@ +.slide-up-enter-active, +.slide-up-leave-active { + transition: 0.25s cubic-bezier(0.25, 0.8, 0.5, 1); +} + +.slide-up-move { + transition: transform 0.3s; +} + +.slide-up-enter-from, +.slide-up-leave-to { + opacity: 0; + transform: translateY(-15px); +} + +.slide-down-enter-active, +.slide-down-leave-active { + transition: 0.25s cubic-bezier(0.25, 0.8, 0.5, 1); +} + +.slide-down-move { + transition: transform 0.3s; +} + +.slide-down-enter-from, +.slide-down-leave-to { + opacity: 0; + transform: translateY(15px); +} + +.slide-left-enter-active, +.slide-left-leave-active { + transition: 0.25s cubic-bezier(0.25, 0.8, 0.5, 1); +} + +.slide-left-move { + transition: transform 0.3s; +} + +.slide-left-enter-from, +.slide-left-leave-to { + opacity: 0; + transform: translate(-15px); +} + +.slide-right-enter-active, +.slide-right-leave-active { + transition: 0.25s cubic-bezier(0.25, 0.8, 0.5, 1); +} + +.slide-right-move { + transition: transform 0.3s; +} + +.slide-right-enter-from, +.slide-right-leave-to { + opacity: 0; + transform: translate(15px); +} + +.fade-transition-enter-active, +.fade-transition-leave-active { + transition: opacity 0.2s ease-in-out; +} + +.fade-transition-enter-from, +.fade-transition-leave-to { + opacity: 0; +} + +.fade-enter-active, +.fade-leave-active { + transition: opacity 0.2s ease-in-out; +} + +.fade-enter-from, +.fade-leave-to { + opacity: 0; +} + +.fade-slide-leave-active, +.fade-slide-enter-active { + transition: all 0.3s; +} + +.fade-slide-enter-from { + opacity: 0; + transform: translate(-30px); +} + +.fade-slide-leave-to { + opacity: 0; + transform: translate(30px); +} + +.fade-down-enter-active, +.fade-down-leave-active { + transition: + opacity 0.25s, + transform 0.3s; +} + +.fade-down-enter-from { + opacity: 0; + transform: translateY(-10%); +} + +.fade-down-leave-to { + opacity: 0; + transform: translateY(10%); +} + +.fade-scale-leave-active, +.fade-scale-enter-active { + transition: all 0.28s; +} + +.fade-scale-enter-from { + opacity: 0; + transform: scale(1.2); +} + +.fade-scale-leave-to { + opacity: 0; + transform: scale(0.8); +} + +.fade-up-enter-active, +.fade-up-leave-active { + transition: + opacity 0.2s, + transform 0.25s; +} + +.fade-up-enter-from { + opacity: 0; + transform: translateY(10%); +} + +.fade-up-leave-to { + opacity: 0; + transform: translateY(-10%); +} + +@keyframes fade-slide { + 0% { + opacity: 0; + transform: translate(-30px); + } + + 50% { + opacity: 1; + } + + 100% { + opacity: 0; + transform: translate(30px); + } +} + +@keyframes fade { + 0% { + opacity: 0; + } + + 50% { + opacity: 1; + } + + 100% { + opacity: 0; + } +} + +@keyframes fade-up { + 0% { + opacity: 0; + transform: translateY(10%); + } + + 50% { + opacity: 1; + } + + 100% { + opacity: 0; + transform: translateY(-10%); + } +} + +@keyframes fade-down { + 0% { + opacity: 0; + transform: translateY(-10%); + } + + 50% { + opacity: 1; + } + + 100% { + opacity: 0; + transform: translateY(10%); + } +} + +.fade-slow { + animation: fade 3s infinite; +} + +.fade-slide-slow { + animation: fade-slide 3s infinite; +} + +.fade-up-slow { + animation: fade-up 3s infinite; +} + +.fade-down-slow { + animation: fade-down 3s infinite; +} + +.collapse-transition { + transition: + 0.2s height ease-in-out, + 0.2s padding-top ease-in-out, + 0.2s padding-bottom ease-in-out; +} + +.collapse-transition-leave-active, +.collapse-transition-enter-active { + transition: + 0.2s max-height ease-in-out, + 0.2s padding-top ease-in-out, + 0.2s margin-top ease-in-out; +} diff --git a/packages/@core/shared/design/src/index.ts b/packages/@core/shared/design/src/index.ts index 0543cc97..7265f722 100644 --- a/packages/@core/shared/design/src/index.ts +++ b/packages/@core/shared/design/src/index.ts @@ -1,5 +1,5 @@ -import './scss/index.scss'; import './css/global.css'; +import './css/transition.css'; import './css/nprogress.css'; import './design-tokens'; diff --git a/packages/@core/shared/design/src/scss/index.scss b/packages/@core/shared/design/src/scss/index.scss deleted file mode 100644 index 14a1e27d..00000000 --- a/packages/@core/shared/design/src/scss/index.scss +++ /dev/null @@ -1,3 +0,0 @@ -/** css 样式重置 */ -@import 'modern-normalize/modern-normalize.css'; -@import './transition'; diff --git a/packages/@core/shared/design/src/scss/transition/animation.scss b/packages/@core/shared/design/src/scss/transition/animation.scss deleted file mode 100644 index b46c6207..00000000 --- a/packages/@core/shared/design/src/scss/transition/animation.scss +++ /dev/null @@ -1,81 +0,0 @@ -@keyframes fade-slide { - 0% { - opacity: 0; - transform: translateX(-30px); - } - - 50% { - opacity: 1; - } - - 100% { - opacity: 0; - transform: translateX(30px); - } -} - -@keyframes fade { - 0% { - opacity: 0; - } - - 50% { - opacity: 1; - } - - 100% { - opacity: 0; - } -} - -@keyframes fade-up { - 0% { - opacity: 0; - transform: translateY(10%); - } - - 50% { - opacity: 1; - } - - 100% { - opacity: 0; - transform: translateY(-10%); - } -} - -@keyframes fade-down { - 0% { - opacity: 0; - transform: translateY(-10%); - } - - 50% { - opacity: 1; - } - - 100% { - opacity: 0; - transform: translateY(10%); - } -} - -.fade-slow { - animation: fade 3s infinite; -} - -// .fade-slide-fast { -// animation: fade-slide 0.3s infinite; -// } - -.fade-slide-slow { - animation: fade-slide 3s infinite; -} - -.fade-up-slow { - animation: fade-up 3s infinite; -} - -.fade-down-slow { - animation: fade-down 3s infinite; -} diff --git a/packages/@core/shared/design/src/scss/transition/collapse.scss b/packages/@core/shared/design/src/scss/transition/collapse.scss deleted file mode 100644 index 6278b641..00000000 --- a/packages/@core/shared/design/src/scss/transition/collapse.scss +++ /dev/null @@ -1,14 +0,0 @@ -.collapse-transition { - transition: - 0.2s height ease-in-out, - 0.2s padding-top ease-in-out, - 0.2s padding-bottom ease-in-out; -} - -.collapse-transition-leave-active, -.collapse-transition-enter-active { - transition: - 0.2s max-height ease-in-out, - 0.2s padding-top ease-in-out, - 0.2s margin-top ease-in-out; -} diff --git a/packages/@core/shared/design/src/scss/transition/fade.scss b/packages/@core/shared/design/src/scss/transition/fade.scss deleted file mode 100644 index 0f4c6f61..00000000 --- a/packages/@core/shared/design/src/scss/transition/fade.scss +++ /dev/null @@ -1,97 +0,0 @@ -.fade-transition { - &-enter-active, - &-leave-active { - transition: opacity 0.2s ease-in-out; - } - - &-enter-from, - &-leave-to { - opacity: 0; - } -} - -.fade-enter-active, -.fade-leave-active { - transition: opacity 0.2s ease-in-out; -} - -.fade-enter-from, -.fade-leave-to { - opacity: 0; -} - -/* fade-slide */ -.fade-slide-leave-active, -.fade-slide-enter-active { - transition: all 0.3s; -} - -.fade-slide-enter-from { - opacity: 0; - transform: translateX(-30px); -} - -.fade-slide-leave-to { - opacity: 0; - transform: translateX(30px); -} - -// /////////////////////////////////////////////// -// Fade down -// /////////////////////////////////////////////// - -// Speed: 1x -.fade-down-enter-active, -.fade-down-leave-active { - transition: - opacity 0.25s, - transform 0.3s; -} - -.fade-down-enter-from { - opacity: 0; - transform: translateY(-10%); -} - -.fade-down-leave-to { - opacity: 0; - transform: translateY(10%); -} - -// fade-scale -.fade-scale-leave-active, -.fade-scale-enter-active { - transition: all 0.28s; -} - -.fade-scale-enter-from { - opacity: 0; - transform: scale(1.2); -} - -.fade-scale-leave-to { - opacity: 0; - transform: scale(0.8); -} - -// /////////////////////////////////////////////// -// Fade Top -// /////////////////////////////////////////////// - -// Speed: 1x -.fade-up-enter-active, -.fade-up-leave-active { - transition: - opacity 0.2s, - transform 0.25s; -} - -.fade-up-enter-from { - opacity: 0; - transform: translateY(10%); -} - -.fade-up-leave-to { - opacity: 0; - transform: translateY(-10%); -} diff --git a/packages/@core/shared/design/src/scss/transition/index.scss b/packages/@core/shared/design/src/scss/transition/index.scss deleted file mode 100644 index cec4cda3..00000000 --- a/packages/@core/shared/design/src/scss/transition/index.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import './slide'; -@import './fade'; -@import './animation'; -@import './collapse'; diff --git a/packages/@core/shared/design/src/scss/transition/mixin.scss b/packages/@core/shared/design/src/scss/transition/mixin.scss deleted file mode 100644 index e3c09503..00000000 --- a/packages/@core/shared/design/src/scss/transition/mixin.scss +++ /dev/null @@ -1,10 +0,0 @@ -@mixin transition() { - &-enter-active, - &-leave-active { - transition: 0.25s cubic-bezier(0.25, 0.8, 0.5, 1); - } - - &-move { - transition: transform 0.3s; - } -} diff --git a/packages/@core/shared/design/src/scss/transition/slide.scss b/packages/@core/shared/design/src/scss/transition/slide.scss deleted file mode 100644 index 405690e6..00000000 --- a/packages/@core/shared/design/src/scss/transition/slide.scss +++ /dev/null @@ -1,41 +0,0 @@ -@use 'mixin.scss' as *; - -.slide-up { - @include transition; - - &-enter-from, - &-leave-to { - opacity: 0; - transform: translateY(-15px); - } -} - -.slide-down { - @include transition; - - &-enter-from, - &-leave-to { - opacity: 0; - transform: translateY(15px); - } -} - -.slide-left { - @include transition; - - &-enter-from, - &-leave-to { - opacity: 0; - transform: translateX(-15px); - } -} - -.slide-right { - @include transition; - - &-enter-from, - &-leave-to { - opacity: 0; - transform: translateX(15px); - } -} diff --git a/packages/@core/shared/icons/package.json b/packages/@core/shared/icons/package.json index 67a4f68e..fa8c9c56 100644 --- a/packages/@core/shared/icons/package.json +++ b/packages/@core/shared/icons/package.json @@ -36,6 +36,6 @@ }, "dependencies": { "@iconify/vue": "^4.1.2", - "vue": "^3.4.31" + "vue": "^3.4.32" } } diff --git a/packages/@core/shared/toolkit/package.json b/packages/@core/shared/toolkit/package.json index 56dddfd4..f112653e 100644 --- a/packages/@core/shared/toolkit/package.json +++ b/packages/@core/shared/toolkit/package.json @@ -37,7 +37,7 @@ }, "dependencies": { "@ctrl/tinycolor": "^4.1.0", - "@vue/shared": "^3.4.31", + "@vue/shared": "^3.4.32", "clsx": "^2.1.1", "defu": "^6.1.4", "lodash.clonedeep": "^4.5.0", diff --git a/packages/@core/shared/typings/package.json b/packages/@core/shared/typings/package.json index 367376fc..fd213307 100644 --- a/packages/@core/shared/typings/package.json +++ b/packages/@core/shared/typings/package.json @@ -39,7 +39,7 @@ } }, "dependencies": { - "vue": "^3.4.31", + "vue": "^3.4.32", "vue-router": "^4.4.0" } } diff --git a/packages/@core/ui-kit/layout-ui/package.json b/packages/@core/ui-kit/layout-ui/package.json index caba24c9..bfd0e3c4 100644 --- a/packages/@core/ui-kit/layout-ui/package.json +++ b/packages/@core/ui-kit/layout-ui/package.json @@ -43,6 +43,6 @@ "@vben-core/toolkit": "workspace:*", "@vben-core/typings": "workspace:*", "@vueuse/core": "^10.11.0", - "vue": "^3.4.31" + "vue": "^3.4.32" } } diff --git a/packages/@core/ui-kit/menu-ui/package.json b/packages/@core/ui-kit/menu-ui/package.json index a3919628..2943bdce 100644 --- a/packages/@core/ui-kit/menu-ui/package.json +++ b/packages/@core/ui-kit/menu-ui/package.json @@ -43,6 +43,6 @@ "@vben-core/toolkit": "workspace:*", "@vben-core/typings": "workspace:*", "@vueuse/core": "^10.11.0", - "vue": "^3.4.31" + "vue": "^3.4.32" } } diff --git a/packages/@core/ui-kit/shadcn-ui/package.json b/packages/@core/ui-kit/shadcn-ui/package.json index 59164228..983289b6 100644 --- a/packages/@core/ui-kit/shadcn-ui/package.json +++ b/packages/@core/ui-kit/shadcn-ui/package.json @@ -50,6 +50,6 @@ "class-variance-authority": "^0.7.0", "lucide-vue-next": "^0.408.0", "radix-vue": "^1.9.1", - "vue": "^3.4.31" + "vue": "^3.4.32" } } diff --git a/packages/@core/ui-kit/tabs-ui/package.json b/packages/@core/ui-kit/tabs-ui/package.json index 55adab12..273945d5 100644 --- a/packages/@core/ui-kit/tabs-ui/package.json +++ b/packages/@core/ui-kit/tabs-ui/package.json @@ -41,6 +41,6 @@ "@vben-core/icons": "workspace:*", "@vben-core/shadcn-ui": "workspace:*", "@vben-core/typings": "workspace:*", - "vue": "^3.4.31" + "vue": "^3.4.32" } } diff --git a/packages/effects/access/package.json b/packages/effects/access/package.json index 848b108b..ab27e3e7 100644 --- a/packages/effects/access/package.json +++ b/packages/effects/access/package.json @@ -42,6 +42,6 @@ "@vben-core/stores": "workspace:*", "@vben-core/toolkit": "workspace:*", "@vben-core/typings": "workspace:*", - "vue": "^3.4.31" + "vue": "^3.4.32" } } diff --git a/packages/effects/chart-ui/package.json b/packages/effects/chart-ui/package.json index 0b8fb1b4..af79148e 100644 --- a/packages/effects/chart-ui/package.json +++ b/packages/effects/chart-ui/package.json @@ -40,6 +40,6 @@ "@vben-core/preferences": "workspace:*", "@vueuse/core": "^10.11.0", "echarts": "^5.5.1", - "vue": "^3.4.31" + "vue": "^3.4.32" } } diff --git a/packages/effects/common-ui/package.json b/packages/effects/common-ui/package.json index f2710b04..4ee12c17 100644 --- a/packages/effects/common-ui/package.json +++ b/packages/effects/common-ui/package.json @@ -45,7 +45,7 @@ "@vben/types": "workspace:*", "@vueuse/integrations": "^10.11.0", "qrcode": "^1.5.3", - "vue": "^3.4.31", + "vue": "^3.4.32", "vue-router": "^4.4.0" }, "devDependencies": { diff --git a/packages/effects/layouts/package.json b/packages/effects/layouts/package.json index e86c5cab..e8940299 100644 --- a/packages/effects/layouts/package.json +++ b/packages/effects/layouts/package.json @@ -50,7 +50,7 @@ "@vben-core/toolkit": "workspace:*", "@vben-core/typings": "workspace:*", "@vueuse/core": "^10.11.0", - "vue": "^3.4.31", + "vue": "^3.4.32", "vue-router": "^4.4.0" } } diff --git a/packages/effects/layouts/src/widgets/theme-toggle/theme-button.vue b/packages/effects/layouts/src/widgets/theme-toggle/theme-button.vue index a8cb88ca..34ae39c5 100644 --- a/packages/effects/layouts/src/widgets/theme-toggle/theme-button.vue +++ b/packages/effects/layouts/src/widgets/theme-toggle/theme-button.vue @@ -121,7 +121,7 @@ function toggleTheme(event: MouseEvent) { -