diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d3363c1b..08ff80b7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -7,7 +7,7 @@ on: jobs: deploy-push-playground-ftp: - name: Deploy Push Ftp + name: Deploy Push Playground Ftp if: github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, '[skip ci]') runs-on: ubuntu-latest steps: @@ -46,7 +46,7 @@ jobs: local-dir: ./docs/.vitepress/dist/ deploy-push-antd-ftp: - name: Deploy Push Ftp + name: Deploy Push Antd Ftp if: github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, '[skip ci]') runs-on: ubuntu-latest steps: @@ -77,7 +77,7 @@ jobs: local-dir: ./apps/web-antd/dist/ deploy-push-ele-ftp: - name: Deploy Push Ftp + name: Deploy Push Element Ftp if: github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, '[skip ci]') runs-on: ubuntu-latest steps: @@ -108,7 +108,7 @@ jobs: local-dir: ./apps/web-ele/dist/ deploy-push-naive-ftp: - name: Deploy Push Ftp + name: Deploy Push Naive Ftp if: github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, '[skip ci]') runs-on: ubuntu-latest steps: diff --git a/package.json b/package.json index be4baaba..025bad21 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,8 @@ "@vben/turbo-run": "workspace:*", "@vben/vite-config": "workspace:*", "@vben/vsh": "workspace:*", + "@vitejs/plugin-vue": "^5.1.2", + "@vitejs/plugin-vue-jsx": "^4.0.0", "@vue/test-utils": "^2.4.6", "autoprefixer": "^10.4.20", "cross-env": "^7.0.3", @@ -85,6 +87,7 @@ "unbuild": "^2.0.0", "vite": "^5.4.0", "vitest": "^2.0.5", + "vue": "^3.4.37", "vue-tsc": "^2.0.29" }, "engines": { diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/alert-dialog/alert-dialog.vue b/packages/@core/ui-kit/shadcn-ui/src/components/alert-dialog/alert-dialog.vue index 83304883..3cc31f66 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/alert-dialog/alert-dialog.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/alert-dialog/alert-dialog.vue @@ -8,7 +8,7 @@ import { AlertDialogHeader, AlertDialog as AlertDialogRoot, AlertDialogTitle, -} from '@vben-core/shadcn-ui/components/ui/alert-dialog'; +} from '../ui/alert-dialog'; interface Props { cancelText?: string; diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue b/packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue index b16f549b..e42326db 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue @@ -7,11 +7,7 @@ import type { import { computed } from 'vue'; -import { - Avatar, - AvatarFallback, - AvatarImage, -} from '@vben-core/shadcn-ui/components/ui/avatar'; +import { Avatar, AvatarFallback, AvatarImage } from '../ui/avatar'; interface Props extends AvatarRootProps, AvatarFallbackProps, AvatarImageProps { alt?: string; diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue b/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue index f27ab442..7ba685a8 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/breadcrumb-background.vue @@ -1,5 +1,5 @@ - - diff --git a/packages/effects/common-ui/src/components/page/page-header.vue b/packages/effects/common-ui/src/components/page/page-header.vue deleted file mode 100644 index 7ee8d180..00000000 --- a/packages/effects/common-ui/src/components/page/page-header.vue +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/packages/effects/common-ui/src/components/page/page.ts b/packages/effects/common-ui/src/components/page/page.ts deleted file mode 100644 index e0bd76b9..00000000 --- a/packages/effects/common-ui/src/components/page/page.ts +++ /dev/null @@ -1,11 +0,0 @@ -interface PageHeaderProps { - title?: string; - description?: string; -} - -interface Props extends PageHeaderProps { - contentClass?: string; - showFooter?: boolean; -} - -export type { PageHeaderProps, Props }; diff --git a/packages/effects/common-ui/src/components/page/page.vue b/packages/effects/common-ui/src/components/page/page.vue index b1bf8ae8..cdbefa23 100644 --- a/packages/effects/common-ui/src/components/page/page.vue +++ b/packages/effects/common-ui/src/components/page/page.vue @@ -1,14 +1,17 @@ diff --git a/playground/src/views/demos/access/super-visible.vue b/playground/src/views/demos/access/super-visible.vue index ce89116b..877fcd11 100644 --- a/playground/src/views/demos/access/super-visible.vue +++ b/playground/src/views/demos/access/super-visible.vue @@ -1,7 +1,11 @@ diff --git a/playground/src/views/demos/access/user-visible.vue b/playground/src/views/demos/access/user-visible.vue index 7523cc5c..a3c5f001 100644 --- a/playground/src/views/demos/access/user-visible.vue +++ b/playground/src/views/demos/access/user-visible.vue @@ -1,7 +1,11 @@ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3bed673a..9a34bb76 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -55,6 +55,12 @@ importers: '@vben/vsh': specifier: workspace:* version: link:scripts/vsh + '@vitejs/plugin-vue': + specifier: ^5.1.2 + version: 5.1.2(vite@5.4.0(@types/node@22.2.0)(sass@1.77.8)(terser@5.31.3))(vue@3.4.37(typescript@5.5.4)) + '@vitejs/plugin-vue-jsx': + specifier: ^4.0.0 + version: 4.0.0(vite@5.4.0(@types/node@22.2.0)(sass@1.77.8)(terser@5.31.3))(vue@3.4.37(typescript@5.5.4)) '@vue/test-utils': specifier: ^2.4.6 version: 2.4.6 @@ -100,6 +106,9 @@ importers: vitest: specifier: ^2.0.5 version: 2.0.5(@types/node@22.2.0)(jsdom@24.1.1)(sass@1.77.8)(terser@5.31.3) + vue: + specifier: ^3.4.37 + version: 3.4.37(typescript@5.5.4) vue-tsc: specifier: ^2.0.29 version: 2.0.29(typescript@5.5.4) @@ -3344,6 +3353,7 @@ packages: '@ls-lint/ls-lint@2.2.3': resolution: {integrity: sha512-ekM12jNm/7O2I/hsRv9HvYkRdfrHpiV1epVuI2NP+eTIcEgdIdKkKCs9KgQydu/8R5YXTov9aHdOgplmCHLupw==} + cpu: [x64, arm64, s390x] os: [darwin, linux, win32] hasBin: true diff --git a/vitest.config.ts b/vitest.config.ts index 647a9e54..cada073f 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -1,6 +1,9 @@ +import Vue from '@vitejs/plugin-vue'; +import VueJsx from '@vitejs/plugin-vue-jsx'; import { defineConfig } from 'vitest/config'; export default defineConfig({ + plugins: [Vue(), VueJsx()], test: { environment: 'jsdom', },