Browse Source

fix: type check

fix: ci

fix: ci

fix: ci
pull/3993/head
vben 2 years ago
parent
commit
54b35deeab
  1. 5
      .changeset/config.json
  2. 2
      .github/workflows/changeset-version.yml
  3. 42
      .github/workflows/ci.yml
  4. 3
      internal/lint-configs/commitlint-config/package.json
  5. 3
      internal/lint-configs/eslint-config/package.json
  6. 1
      internal/lint-configs/eslint-config/src/configs/perfectionist.ts
  7. 3
      internal/lint-configs/lint-staged-config/package.json
  8. 3
      internal/lint-configs/prettier-config/package.json
  9. 3
      internal/lint-configs/stylelint-config/package.json
  10. 3
      internal/node-utils/package.json
  11. 3
      internal/tailwind-config/package.json
  12. 3
      internal/vite-config/package.json
  13. 4
      internal/vite-config/src/plugins/index.ts
  14. 4
      package.json
  15. 3
      packages/@core/forward/helpers/package.json
  16. 3
      packages/@core/forward/preferences/package.json
  17. 3
      packages/@core/forward/request/package.json
  18. 3
      packages/@core/forward/stores/package.json
  19. 3
      packages/@core/shared/chche/package.json
  20. 3
      packages/@core/shared/design-tokens/package.json
  21. 3
      packages/@core/shared/design/package.json
  22. 3
      packages/@core/shared/iconify/package.json
  23. 7
      packages/@core/shared/toolkit/package.json
  24. 4
      packages/@core/shared/toolkit/src/cn.ts
  25. 1
      packages/@core/shared/toolkit/src/index.ts
  26. 3
      packages/@core/shared/typings/package.json
  27. 3
      packages/@core/uikit/layout-ui/package.json
  28. 3
      packages/@core/uikit/menu-ui/package.json
  29. 33
      packages/@core/uikit/shadcn-ui/build.config.ts
  30. 4
      packages/@core/uikit/shadcn-ui/components.json
  31. 13
      packages/@core/uikit/shadcn-ui/package.json
  32. 2
      packages/@core/uikit/shadcn-ui/src/components/alert-dialog/alert-dialog.vue
  33. 6
      packages/@core/uikit/shadcn-ui/src/components/avatar/avatar.vue
  34. 4
      packages/@core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue
  35. 8
      packages/@core/uikit/shadcn-ui/src/components/button/button.vue
  36. 8
      packages/@core/uikit/shadcn-ui/src/components/button/icon-button.vue
  37. 3
      packages/@core/uikit/shadcn-ui/src/components/checkbox/checkbox.vue
  38. 5
      packages/@core/uikit/shadcn-ui/src/components/context-menu/context-menu.vue
  39. 2
      packages/@core/uikit/shadcn-ui/src/components/dropdown-menu/dropdown-menu.vue
  40. 2
      packages/@core/uikit/shadcn-ui/src/components/dropdown-menu/dropdown-radio-menu.vue
  41. 4
      packages/@core/uikit/shadcn-ui/src/components/floating-button-group/floating-button-group.vue
  42. 5
      packages/@core/uikit/shadcn-ui/src/components/hover-card/hover-card.vue
  43. 6
      packages/@core/uikit/shadcn-ui/src/components/input-password/input-password.vue
  44. 4
      packages/@core/uikit/shadcn-ui/src/components/pin-input/input.vue
  45. 5
      packages/@core/uikit/shadcn-ui/src/components/popover/popover.vue
  46. 5
      packages/@core/uikit/shadcn-ui/src/components/scrollbar/scrollbar.vue
  47. 7
      packages/@core/uikit/shadcn-ui/src/components/segmented/segmented.vue
  48. 4
      packages/@core/uikit/shadcn-ui/src/components/segmented/tabs-indicator.vue
  49. 10
      packages/@core/uikit/shadcn-ui/src/components/sheet/sheet.vue
  50. 5
      packages/@core/uikit/shadcn-ui/src/components/tooltip/tooltip.vue
  51. 6
      packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogAction.vue
  52. 6
      packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogCancel.vue
  53. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogContent.vue
  54. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogDescription.vue
  55. 2
      packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogFooter.vue
  56. 2
      packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogHeader.vue
  57. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogTitle.vue
  58. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/avatar/Avatar.vue
  59. 2
      packages/@core/uikit/shadcn-ui/src/components/ui/badge/Badge.vue
  60. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbEllipsis.vue
  61. 2
      packages/@core/uikit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbItem.vue
  62. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbLink.vue
  63. 2
      packages/@core/uikit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbList.vue
  64. 2
      packages/@core/uikit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbPage.vue
  65. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbSeparator.vue
  66. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/button/Button.vue
  67. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/checkbox/Checkbox.vue
  68. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuCheckboxItem.vue
  69. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuContent.vue
  70. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuItem.vue
  71. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuLabel.vue
  72. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuRadioItem.vue
  73. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuSeparator.vue
  74. 2
      packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuShortcut.vue
  75. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuSubContent.vue
  76. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuSubTrigger.vue
  77. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogContent.vue
  78. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogDescription.vue
  79. 2
      packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogFooter.vue
  80. 2
      packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogHeader.vue
  81. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogScrollContent.vue
  82. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogTitle.vue
  83. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuCheckboxItem.vue
  84. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuContent.vue
  85. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuItem.vue
  86. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuLabel.vue
  87. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuRadioItem.vue
  88. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuSeparator.vue
  89. 2
      packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuShortcut.vue
  90. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuSubContent.vue
  91. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuSubTrigger.vue
  92. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/hover-card/HoverCardContent.vue
  93. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/pin-input/PinInput.vue
  94. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/pin-input/PinInputGroup.vue
  95. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/pin-input/PinInputInput.vue
  96. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/popover/PopoverContent.vue
  97. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/scroll-area/ScrollArea.vue
  98. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/scroll-area/ScrollBar.vue
  99. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/select/SelectContent.vue
  100. 4
      packages/@core/uikit/shadcn-ui/src/components/ui/select/SelectGroup.vue

5
.changeset/config.json

@ -1,6 +1,9 @@
{ {
"$schema": "https://unpkg.com/@changesets/config@3.0.0/schema.json", "$schema": "https://unpkg.com/@changesets/config@3.0.0/schema.json",
"changelog": "@changesets/cli/changelog", "changelog": [
"@changesets/changelog-github",
{ "repo": "vbenjs/vue-vben-admin" }
],
"commit": false, "commit": false,
"fixed": [["@vben-core/*", "@vben/*"]], "fixed": [["@vben-core/*", "@vben/*"]],
"snapshot": { "snapshot": {

2
.github/workflows/changeset-version.yml

@ -50,6 +50,6 @@ jobs:
with: with:
version: pnpm run version version: pnpm run version
commit: "chore: bump versions" commit: "chore: bump versions"
title: "chore: bump versions [skip ci]" title: "chore: bump versions"
env: env:
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}

42
.github/workflows/ci.yml

@ -36,6 +36,8 @@ jobs:
- name: Install pnpm - name: Install pnpm
uses: pnpm/action-setup@v4 uses: pnpm/action-setup@v4
with:
run_install: false
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4 uses: actions/setup-node@v4
@ -43,8 +45,21 @@ jobs:
node-version: ${{ matrix.node-version }} node-version: ${{ matrix.node-version }}
cache: "pnpm" cache: "pnpm"
- name: Find pnpm store path
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- name: Setup pnpm cache
uses: actions/cache@v4
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Install dependencies - name: Install dependencies
run: pnpm install run: pnpm install --frozen-lockfile
# - name: Check Git version # - name: Check Git version
# run: git --version # run: git --version
@ -97,12 +112,29 @@ jobs:
name: Check name: Check
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 20 timeout-minutes: 20
strategy:
matrix:
node-version: [20]
steps: steps:
- uses: actions/checkout@v4 - name: Checkout code
# - uses: ./.github/actions/ci-setup uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install pnpm
uses: pnpm/action-setup@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: "pnpm"
- name: Install dependencies
run: pnpm install
# - name: Typecheck - name: Typecheck
# run: pnpm check:type run: pnpm check:type
# From https://github.com/rhysd/actionlint/blob/main/docs/usage.md#use-actionlint-on-github-actions # From https://github.com/rhysd/actionlint/blob/main/docs/usage.md#use-actionlint-on-github-actions
- name: Check workflow files - name: Check workflow files

3
internal/lint-configs/commitlint-config/package.json

@ -20,9 +20,6 @@
"main": "./dist/index.mjs", "main": "./dist/index.mjs",
"module": "./dist/index.mjs", "module": "./dist/index.mjs",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",

3
internal/lint-configs/eslint-config/package.json

@ -20,9 +20,6 @@
"main": "./dist/index.mjs", "main": "./dist/index.mjs",
"module": "./dist/index.mjs", "module": "./dist/index.mjs",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",

1
internal/lint-configs/eslint-config/src/configs/perfectionist.ts

@ -52,7 +52,6 @@ export async function perfectionist(): Promise<Linter.FlatConfig[]> {
'@/forward/**', '@/forward/**',
'@/router/**', '@/router/**',
'@/views/**', '@/views/**',
'#/**',
], ],
'newlines-between': 'always', 'newlines-between': 'always',
order: 'asc', order: 'asc',

3
internal/lint-configs/lint-staged-config/package.json

@ -20,9 +20,6 @@
"main": "./dist/index.mjs", "main": "./dist/index.mjs",
"module": "./dist/index.mjs", "module": "./dist/index.mjs",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",

3
internal/lint-configs/prettier-config/package.json

@ -20,9 +20,6 @@
"main": "./dist/index.mjs", "main": "./dist/index.mjs",
"module": "./dist/index.mjs", "module": "./dist/index.mjs",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",

3
internal/lint-configs/stylelint-config/package.json

@ -20,9 +20,6 @@
"main": "./dist/index.mjs", "main": "./dist/index.mjs",
"module": "./dist/index.mjs", "module": "./dist/index.mjs",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",

3
internal/node-utils/package.json

@ -20,9 +20,6 @@
"main": "./dist/index.mjs", "main": "./dist/index.mjs",
"module": "./dist/index.mjs", "module": "./dist/index.mjs",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",

3
internal/tailwind-config/package.json

@ -29,9 +29,6 @@
] ]
} }
}, },
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./src/index.ts", "types": "./src/index.ts",

3
internal/vite-config/package.json

@ -20,9 +20,6 @@
"main": "./dist/index.mjs", "main": "./dist/index.mjs",
"module": "./dist/index.mjs", "module": "./dist/index.mjs",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",

4
internal/vite-config/src/plugins/index.ts

@ -134,6 +134,10 @@ async function getApplicationConditionPlugins(
condition: pwa, condition: pwa,
plugins: () => plugins: () =>
VitePWA({ VitePWA({
devOptions: {
enabled: true,
type: 'module',
},
injectRegister: false, injectRegister: false,
workbox: { workbox: {
globPatterns: [], globPatterns: [],

4
package.json

@ -33,10 +33,10 @@
"check:type": "turbo run typecheck", "check:type": "turbo run typecheck",
"clean": "vsh clean", "clean": "vsh clean",
"commit": "czg", "commit": "czg",
"docs": "pnpm -F @vben/website run docs:dev", "docs:dev": "pnpm -F @vben/website run docs:dev",
"dev": "turbo run dev --parallel", "dev": "turbo run dev --parallel",
"format": "vsh lint --format", "format": "vsh lint --format",
"lint": "vsh lint && pnpm run check:circular", "lint": "vsh lint",
"postinstall": "turbo run stub", "postinstall": "turbo run stub",
"preinstall": "npx only-allow pnpm", "preinstall": "npx only-allow pnpm",
"prepare": "is-ci || husky", "prepare": "is-ci || husky",

3
packages/@core/forward/helpers/package.json

@ -20,9 +20,6 @@
"sideEffects": false, "sideEffects": false,
"main": "./dist/index.mjs", "main": "./dist/index.mjs",
"module": "./dist/index.mjs", "module": "./dist/index.mjs",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./src/index.ts", "types": "./src/index.ts",

3
packages/@core/forward/preferences/package.json

@ -21,9 +21,6 @@
"sideEffects": [ "sideEffects": [
"**/*.css" "**/*.css"
], ],
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./src/index.ts", "types": "./src/index.ts",

3
packages/@core/forward/request/package.json

@ -22,9 +22,6 @@
], ],
"main": "./dist/index.mjs", "main": "./dist/index.mjs",
"module": "./dist/index.mjs", "module": "./dist/index.mjs",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./src/index.ts", "types": "./src/index.ts",

3
packages/@core/forward/stores/package.json

@ -22,9 +22,6 @@
], ],
"main": "./dist/index.mjs", "main": "./dist/index.mjs",
"module": "./dist/index.mjs", "module": "./dist/index.mjs",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./src/index.ts", "types": "./src/index.ts",

3
packages/@core/shared/chche/package.json

@ -20,9 +20,6 @@
"sideEffects": false, "sideEffects": false,
"main": "./dist/index.mjs", "main": "./dist/index.mjs",
"module": "./dist/index.mjs", "module": "./dist/index.mjs",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./src/index.ts", "types": "./src/index.ts",

3
packages/@core/shared/design-tokens/package.json

@ -22,9 +22,6 @@
"**/*.css" "**/*.css"
], ],
"main": "./dist/index.css", "main": "./dist/index.css",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./src/index.ts", "types": "./src/index.ts",

3
packages/@core/shared/design/package.json

@ -19,9 +19,6 @@
"dist", "dist",
"src" "src"
], ],
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"development": "./src/scss/index.scss", "development": "./src/scss/index.scss",

3
packages/@core/shared/iconify/package.json

@ -15,9 +15,6 @@
], ],
"main": "./src/index.ts", "main": "./src/index.ts",
"module": "./src/index.ts", "module": "./src/index.ts",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"default": "./src/index.ts" "default": "./src/index.ts"

7
packages/@core/shared/toolkit/package.json

@ -20,9 +20,6 @@
"sideEffects": false, "sideEffects": false,
"main": "./dist/index.mjs", "main": "./dist/index.mjs",
"module": "./dist/index.mjs", "module": "./dist/index.mjs",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./src/index.ts", "types": "./src/index.ts",
@ -41,9 +38,11 @@
"dependencies": { "dependencies": {
"@ctrl/tinycolor": "4.1.0", "@ctrl/tinycolor": "4.1.0",
"@vue/shared": "^3.4.29", "@vue/shared": "^3.4.29",
"clsx": "2.1.1",
"dayjs": "^1.11.11", "dayjs": "^1.11.11",
"defu": "^6.1.4", "defu": "^6.1.4",
"nprogress": "^0.2.0" "nprogress": "^0.2.0",
"tailwind-merge": "^2.3.0"
}, },
"devDependencies": { "devDependencies": {
"@types/nprogress": "^0.2.3" "@types/nprogress": "^0.2.3"

4
packages/@core/uikit/shadcn-ui/src/lib/utils.ts → packages/@core/shared/toolkit/src/cn.ts

@ -1,6 +1,8 @@
import { type ClassValue, clsx } from 'clsx'; import { type ClassValue, clsx } from 'clsx';
import { twMerge } from 'tailwind-merge'; import { twMerge } from 'tailwind-merge';
export function cn(...inputs: ClassValue[]) { function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs)); return twMerge(clsx(inputs));
} }
export { cn };

1
packages/@core/shared/toolkit/src/index.ts

@ -1,3 +1,4 @@
export * from './cn';
export * from './color'; export * from './color';
export * from './diff'; export * from './diff';
export * from './hash'; export * from './hash';

3
packages/@core/shared/typings/package.json

@ -20,9 +20,6 @@
"main": "./dist/index.mjs", "main": "./dist/index.mjs",
"module": "./dist/index.mjs", "module": "./dist/index.mjs",
"types": "./dist/index.d.ts", "types": "./dist/index.d.ts",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./src/index.ts", "types": "./src/index.ts",

3
packages/@core/uikit/layout-ui/package.json

@ -22,9 +22,6 @@
], ],
"main": "./dist/index.mjs", "main": "./dist/index.mjs",
"module": "./dist/index.mjs", "module": "./dist/index.mjs",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./src/index.ts", "types": "./src/index.ts",

3
packages/@core/uikit/menu-ui/package.json

@ -22,9 +22,6 @@
], ],
"main": "./dist/index.mjs", "main": "./dist/index.mjs",
"module": "./dist/index.mjs", "module": "./dist/index.mjs",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./src/index.ts", "types": "./src/index.ts",

33
packages/@core/uikit/shadcn-ui/build.config.ts

@ -0,0 +1,33 @@
import { defineBuildConfig } from 'unbuild';
export default defineBuildConfig({
clean: true,
declaration: true,
entries: [
{
builder: 'mkdist',
input: './src',
pattern: ['**/*'],
},
{
builder: 'mkdist',
input: './src',
loaders: ['vue'],
pattern: ['**/*.vue'],
},
// {
// builder: 'mkdist',
// format: 'cjs',
// input: './src',
// loaders: ['js'],
// pattern: ['**/*.ts'],
// },
{
builder: 'mkdist',
format: 'esm',
input: './src',
loaders: ['js'],
pattern: ['**/*.ts'],
},
],
});

4
packages/@core/uikit/shadcn-ui/components.json

@ -10,7 +10,7 @@
}, },
"framework": "vite", "framework": "vite",
"aliases": { "aliases": {
"components": "#/components", "components": "@vben-core/shadcn-ui/components",
"utils": "#/lib/utils" "utils": "@vben-core/toolkit"
} }
} }

13
packages/@core/uikit/shadcn-ui/package.json

@ -11,7 +11,7 @@
}, },
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"scripts": { "scripts": {
"build": "pnpm vite build", "build": "pnpm unbuild",
"prepublishOnly": "npm run build" "prepublishOnly": "npm run build"
}, },
"files": [ "files": [
@ -22,9 +22,6 @@
], ],
"main": "./dist/index.mjs", "main": "./dist/index.mjs",
"module": "./dist/index.mjs", "module": "./dist/index.mjs",
"imports": {
"#*": "./src/*"
},
"exports": { "exports": {
".": { ".": {
"types": "./src/index.ts", "types": "./src/index.ts",
@ -32,9 +29,9 @@
"default": "./dist/index.mjs" "default": "./dist/index.mjs"
}, },
"./*": { "./*": {
"types": "./src/*.ts", "types": "./src/*/index.ts",
"development": "./src/*.ts", "development": "./src/*/index.ts",
"default": "./dist/*.mjs" "default": "./dist/*/index.mjs"
} }
}, },
"publishConfig": { "publishConfig": {
@ -51,9 +48,7 @@
"@vben-core/typings": "workspace:*", "@vben-core/typings": "workspace:*",
"@vueuse/core": "^10.11.0", "@vueuse/core": "^10.11.0",
"class-variance-authority": "^0.7.0", "class-variance-authority": "^0.7.0",
"clsx": "2.1.1",
"radix-vue": "^1.8.3", "radix-vue": "^1.8.3",
"tailwind-merge": "^2.3.0",
"vue": "^3.4.29", "vue": "^3.4.29",
"vue-sonner": "^1.1.2" "vue-sonner": "^1.1.2"
} }

2
packages/@core/uikit/shadcn-ui/src/components/alert-dialog/alert-dialog.vue

@ -8,7 +8,7 @@ import {
AlertDialogHeader, AlertDialogHeader,
AlertDialog as AlertDialogRoot, AlertDialog as AlertDialogRoot,
AlertDialogTitle, AlertDialogTitle,
} from '#/components/ui/alert-dialog'; } from '@vben-core/shadcn-ui/components/ui/alert-dialog';
interface Props { interface Props {
cancelText?: string; cancelText?: string;

6
packages/@core/uikit/shadcn-ui/src/components/avatar/avatar.vue

@ -8,7 +8,11 @@ import type {
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { computed } from 'vue'; import { computed } from 'vue';
import { Avatar, AvatarFallback, AvatarImage } from '#/components/ui/avatar'; import {
Avatar,
AvatarFallback,
AvatarImage,
} from '@vben-core/shadcn-ui/components/ui/avatar';
interface Props extends AvatarRootProps, AvatarFallbackProps, AvatarImageProps { interface Props extends AvatarRootProps, AvatarFallbackProps, AvatarImageProps {
alt?: string; alt?: string;

4
packages/@core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue

@ -10,13 +10,13 @@ import {
BreadcrumbList, BreadcrumbList,
BreadcrumbPage, BreadcrumbPage,
BreadcrumbSeparator, BreadcrumbSeparator,
} from '#/components/ui/breadcrumb'; } from '@vben-core/shadcn-ui/components/ui/breadcrumb';
import { import {
DropdownMenu, DropdownMenu,
DropdownMenuContent, DropdownMenuContent,
DropdownMenuItem, DropdownMenuItem,
DropdownMenuTrigger, DropdownMenuTrigger,
} from '#/components/ui/dropdown-menu'; } from '@vben-core/shadcn-ui/components/ui/dropdown-menu';
import { VbenIcon } from '../'; import { VbenIcon } from '../';

8
packages/@core/uikit/shadcn-ui/src/components/button/button.vue

@ -3,12 +3,14 @@ import type { HTMLAttributes } from 'vue';
import { computed } from 'vue'; import { computed } from 'vue';
import { MdiLoading } from '@vben-core/iconify'; import { MdiLoading } from '@vben-core/iconify';
import { cn } from '@vben-core/toolkit';
import {
type ButtonVariants,
buttonVariants,
} from '@vben-core/shadcn-ui/components/ui/button';
import { Primitive, type PrimitiveProps } from 'radix-vue'; import { Primitive, type PrimitiveProps } from 'radix-vue';
import { type ButtonVariants, buttonVariants } from '#/components/ui/button';
import { cn } from '#/lib/utils';
interface Props extends PrimitiveProps { interface Props extends PrimitiveProps {
class?: HTMLAttributes['class']; class?: HTMLAttributes['class'];
disabled?: boolean; disabled?: boolean;

8
packages/@core/uikit/shadcn-ui/src/components/button/icon-button.vue

@ -1,11 +1,11 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed, useSlots } from 'vue'; import { type HTMLAttributes, computed, useSlots } from 'vue';
import { type PrimitiveProps } from 'radix-vue'; import { cn } from '@vben-core/toolkit';
import { VbenTooltip } from '#/components/tooltip'; import { VbenTooltip } from '@vben-core/shadcn-ui/components/tooltip';
import { ButtonVariants } from '#/components/ui/button'; import { ButtonVariants } from '@vben-core/shadcn-ui/components/ui/button';
import { cn } from '#/lib/utils'; import { type PrimitiveProps } from 'radix-vue';
import VbenButton from './button.vue'; import VbenButton from './button.vue';

3
packages/@core/uikit/shadcn-ui/src/components/checkbox/checkbox.vue

@ -1,10 +1,9 @@
<script setup lang="ts"> <script setup lang="ts">
import type { CheckboxRootEmits, CheckboxRootProps } from 'radix-vue'; import type { CheckboxRootEmits, CheckboxRootProps } from 'radix-vue';
import { Checkbox } from '@vben-core/shadcn-ui/components/ui/checkbox';
import { useForwardPropsEmits } from 'radix-vue'; import { useForwardPropsEmits } from 'radix-vue';
import { Checkbox } from '#/components/ui/checkbox';
const props = defineProps< const props = defineProps<
{ {
name: string; name: string;

5
packages/@core/uikit/shadcn-ui/src/components/context-menu/context-menu.vue

@ -10,8 +10,6 @@ import type { IContextMenuItem } from './interface';
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { computed } from 'vue'; import { computed } from 'vue';
import { useForwardPropsEmits } from 'radix-vue';
import { import {
ContextMenu, ContextMenu,
ContextMenuContent, ContextMenuContent,
@ -19,7 +17,8 @@ import {
ContextMenuSeparator, ContextMenuSeparator,
ContextMenuShortcut, ContextMenuShortcut,
ContextMenuTrigger, ContextMenuTrigger,
} from '#/components/ui/context-menu'; } from '@vben-core/shadcn-ui/components/ui/context-menu';
import { useForwardPropsEmits } from 'radix-vue';
const props = defineProps< const props = defineProps<
{ {

2
packages/@core/uikit/shadcn-ui/src/components/dropdown-menu/dropdown-menu.vue

@ -11,7 +11,7 @@ import {
DropdownMenuItem, DropdownMenuItem,
DropdownMenuSeparator, DropdownMenuSeparator,
DropdownMenuTrigger, DropdownMenuTrigger,
} from '#/components/ui/dropdown-menu'; } from '@vben-core/shadcn-ui/components/ui/dropdown-menu';
interface Props extends DropdownMenuProps {} interface Props extends DropdownMenuProps {}

2
packages/@core/uikit/shadcn-ui/src/components/dropdown-menu/dropdown-radio-menu.vue

@ -7,7 +7,7 @@ import {
DropdownMenuGroup, DropdownMenuGroup,
DropdownMenuItem, DropdownMenuItem,
DropdownMenuTrigger, DropdownMenuTrigger,
} from '#/components/ui/dropdown-menu'; } from '@vben-core/shadcn-ui/components/ui/dropdown-menu';
interface Props extends DropdownMenuProps {} interface Props extends DropdownMenuProps {}

4
packages/@core/uikit/shadcn-ui/src/components/floating-button-group/floating-button-group.vue

@ -1,4 +1,4 @@
<script setup> <script setup lang="ts">
import { ref } from 'vue'; import { ref } from 'vue';
const isMenuOpen = ref(false); const isMenuOpen = ref(false);
@ -8,7 +8,7 @@ const toggleMenu = () => {
isMenuOpen.value = !isMenuOpen.value; isMenuOpen.value = !isMenuOpen.value;
}; };
const handleMenuItemClick = (_item) => { const handleMenuItemClick = (_item: any) => {
// console.log(111, item); // console.log(111, item);
}; };
</script> </script>

5
packages/@core/uikit/shadcn-ui/src/components/hover-card/hover-card.vue

@ -3,13 +3,12 @@ import type { HoverCardRootEmits, HoverCardRootProps } from 'radix-vue';
import { HTMLAttributes, computed } from 'vue'; import { HTMLAttributes, computed } from 'vue';
import { HoverCardContentProps, useForwardPropsEmits } from 'radix-vue';
import { import {
HoverCard, HoverCard,
HoverCardContent, HoverCardContent,
HoverCardTrigger, HoverCardTrigger,
} from '#/components/ui/hover-card'; } from '@vben-core/shadcn-ui/components/ui/hover-card';
import { HoverCardContentProps, useForwardPropsEmits } from 'radix-vue';
const props = defineProps< const props = defineProps<
{ {

6
packages/@core/uikit/shadcn-ui/src/components/input-password/input-password.vue

@ -6,10 +6,12 @@ import {
IcOutlineVisibilityOff, IcOutlineVisibilityOff,
} from '@vben-core/iconify'; } from '@vben-core/iconify';
import {
type InputProps,
VbenInput,
} from '@vben-core/shadcn-ui/components/input';
import { useForwardProps } from 'radix-vue'; import { useForwardProps } from 'radix-vue';
import { type InputProps, VbenInput } from '#/components/input/index';
import PasswordStrength from './password-strength.vue'; import PasswordStrength from './password-strength.vue';
interface Props extends InputProps {} interface Props extends InputProps {}

4
packages/@core/uikit/shadcn-ui/src/components/pin-input/input.vue

@ -3,12 +3,12 @@ import type { PinInputProps } from './interface';
import { computed, ref, watch } from 'vue'; import { computed, ref, watch } from 'vue';
import { VbenButton } from '#/components/button'; import { VbenButton } from '@vben-core/shadcn-ui/components/button';
import { import {
PinInput, PinInput,
PinInputGroup, PinInputGroup,
PinInputInput, PinInputInput,
} from '#/components/ui/pin-input'; } from '@vben-core/shadcn-ui/components/ui/pin-input';
defineOptions({ defineOptions({
inheritAttrs: false, inheritAttrs: false,

5
packages/@core/uikit/shadcn-ui/src/components/popover/popover.vue

@ -7,13 +7,12 @@ import type {
import { HTMLAttributes, computed } from 'vue'; import { HTMLAttributes, computed } from 'vue';
import { useForwardPropsEmits } from 'radix-vue';
import { import {
PopoverContent, PopoverContent,
Popover as PopoverRoot, Popover as PopoverRoot,
PopoverTrigger, PopoverTrigger,
} from '#/components/ui/popover'; } from '@vben-core/shadcn-ui/components/ui/popover';
import { useForwardPropsEmits } from 'radix-vue';
const props = withDefaults( const props = withDefaults(
defineProps< defineProps<

5
packages/@core/uikit/shadcn-ui/src/components/scrollbar/scrollbar.vue

@ -2,8 +2,9 @@
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { ref } from 'vue'; import { ref } from 'vue';
import { ScrollArea } from '#/components/ui/scroll-area'; import { cn } from '@vben-core/toolkit';
import { cn } from '#/lib/utils';
import { ScrollArea } from '@vben-core/shadcn-ui/components/ui/scroll-area';
interface Props { interface Props {
class?: HTMLAttributes['class']; class?: HTMLAttributes['class'];

7
packages/@core/uikit/shadcn-ui/src/components/segmented/segmented.vue

@ -3,10 +3,13 @@ import type { SegmentedItem } from './interface';
import { computed } from 'vue'; import { computed } from 'vue';
import {
Tabs,
TabsContent,
TabsList,
} from '@vben-core/shadcn-ui/components/ui/tabs';
import { TabsTrigger } from 'radix-vue'; import { TabsTrigger } from 'radix-vue';
import { Tabs, TabsContent, TabsList } from '#/components/ui/tabs';
import TabsIndicator from './tabs-indicator.vue'; import TabsIndicator from './tabs-indicator.vue';
interface Props { interface Props {

4
packages/@core/uikit/shadcn-ui/src/components/segmented/tabs-indicator.vue

@ -1,14 +1,14 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
TabsIndicator, TabsIndicator,
type TabsIndicatorProps, type TabsIndicatorProps,
useForwardProps, useForwardProps,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & TabsIndicatorProps { class?: HTMLAttributes['class'] } & TabsIndicatorProps
>(); >();

10
packages/@core/uikit/shadcn-ui/src/components/sheet/sheet.vue

@ -2,9 +2,11 @@
import { computed, useSlots } from 'vue'; import { computed, useSlots } from 'vue';
import { Cross2Icon } from '@radix-icons/vue'; import { Cross2Icon } from '@radix-icons/vue';
import {
import { VbenButton, VbenIconButton } from '#/components/button'; VbenButton,
import { VbenScrollbar } from '#/components/scrollbar'; VbenIconButton,
} from '@vben-core/shadcn-ui/components/button';
import { VbenScrollbar } from '@vben-core/shadcn-ui/components/scrollbar';
import { import {
Sheet, Sheet,
SheetClose, SheetClose,
@ -14,7 +16,7 @@ import {
SheetHeader, SheetHeader,
SheetTitle, SheetTitle,
SheetTrigger, SheetTrigger,
} from '#/components/ui/sheet'; } from '@vben-core/shadcn-ui/components/ui/sheet';
interface Props { interface Props {
cancelText?: string; cancelText?: string;

5
packages/@core/uikit/shadcn-ui/src/components/tooltip/tooltip.vue

@ -1,12 +1,11 @@
<script setup lang="ts"> <script setup lang="ts">
import { TooltipContentProps } from 'radix-vue';
import { import {
Tooltip, Tooltip,
TooltipContent, TooltipContent,
TooltipProvider, TooltipProvider,
TooltipTrigger, TooltipTrigger,
} from '#/components/ui/tooltip'; } from '@vben-core/shadcn-ui/components/ui/tooltip';
import { TooltipContentProps } from 'radix-vue';
interface Props { interface Props {
delayDuration?: number; delayDuration?: number;

6
packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogAction.vue

@ -1,10 +1,10 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { AlertDialogAction, type AlertDialogActionProps } from 'radix-vue'; import { cn } from '@vben-core/toolkit';
import { buttonVariants } from '#/components/ui/button'; import { buttonVariants } from '@vben-core/shadcn-ui/components/ui/button';
import { cn } from '#/lib/utils'; import { AlertDialogAction, type AlertDialogActionProps } from 'radix-vue';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & AlertDialogActionProps { class?: HTMLAttributes['class'] } & AlertDialogActionProps

6
packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogCancel.vue

@ -1,10 +1,10 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { AlertDialogCancel, type AlertDialogCancelProps } from 'radix-vue'; import { cn } from '@vben-core/toolkit';
import { buttonVariants } from '#/components/ui/button'; import { buttonVariants } from '@vben-core/shadcn-ui/components/ui/button';
import { cn } from '#/lib/utils'; import { AlertDialogCancel, type AlertDialogCancelProps } from 'radix-vue';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & AlertDialogCancelProps { class?: HTMLAttributes['class'] } & AlertDialogCancelProps

4
packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogContent.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
AlertDialogContent, AlertDialogContent,
type AlertDialogContentEmits, type AlertDialogContentEmits,
@ -10,8 +12,6 @@ import {
useForwardPropsEmits, useForwardPropsEmits,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & AlertDialogContentProps { class?: HTMLAttributes['class'] } & AlertDialogContentProps
>(); >();

4
packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogDescription.vue

@ -1,13 +1,13 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
AlertDialogDescription, AlertDialogDescription,
type AlertDialogDescriptionProps, type AlertDialogDescriptionProps,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & AlertDialogDescriptionProps { class?: HTMLAttributes['class'] } & AlertDialogDescriptionProps
>(); >();

2
packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogFooter.vue

@ -1,7 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { cn } from '#/lib/utils'; import { cn } from '@vben-core/toolkit';
const props = defineProps<{ const props = defineProps<{
class?: HTMLAttributes['class']; class?: HTMLAttributes['class'];

2
packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogHeader.vue

@ -1,7 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { cn } from '#/lib/utils'; import { cn } from '@vben-core/toolkit';
const props = defineProps<{ const props = defineProps<{
class?: HTMLAttributes['class']; class?: HTMLAttributes['class'];

4
packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogTitle.vue

@ -1,9 +1,9 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { AlertDialogTitle, type AlertDialogTitleProps } from 'radix-vue'; import { cn } from '@vben-core/toolkit';
import { cn } from '#/lib/utils'; import { AlertDialogTitle, type AlertDialogTitleProps } from 'radix-vue';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & AlertDialogTitleProps { class?: HTMLAttributes['class'] } & AlertDialogTitleProps

4
packages/@core/uikit/shadcn-ui/src/components/ui/avatar/Avatar.vue

@ -1,9 +1,9 @@
<script setup lang="ts"> <script setup lang="ts">
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { AvatarRoot } from 'radix-vue'; import { cn } from '@vben-core/toolkit';
import { cn } from '#/lib/utils'; import { AvatarRoot } from 'radix-vue';
import { type AvatarVariants, avatarVariant } from './avatar'; import { type AvatarVariants, avatarVariant } from './avatar';

2
packages/@core/uikit/shadcn-ui/src/components/ui/badge/Badge.vue

@ -1,7 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { cn } from '#/lib/utils'; import { cn } from '@vben-core/toolkit';
import { type BadgeVariants, badgeVariants } from './badge'; import { type BadgeVariants, badgeVariants } from './badge';

4
packages/@core/uikit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbEllipsis.vue

@ -1,9 +1,9 @@
<script lang="ts" setup> <script lang="ts" setup>
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { DotsHorizontalIcon } from '@radix-icons/vue'; import { cn } from '@vben-core/toolkit';
import { cn } from '#/lib/utils'; import { DotsHorizontalIcon } from '@radix-icons/vue';
const props = defineProps<{ const props = defineProps<{
class?: HTMLAttributes['class']; class?: HTMLAttributes['class'];

2
packages/@core/uikit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbItem.vue

@ -1,7 +1,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { cn } from '#/lib/utils'; import { cn } from '@vben-core/toolkit';
const props = defineProps<{ const props = defineProps<{
class?: HTMLAttributes['class']; class?: HTMLAttributes['class'];

4
packages/@core/uikit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbLink.vue

@ -1,9 +1,9 @@
<script lang="ts" setup> <script lang="ts" setup>
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { Primitive, type PrimitiveProps } from 'radix-vue'; import { cn } from '@vben-core/toolkit';
import { cn } from '#/lib/utils'; import { Primitive, type PrimitiveProps } from 'radix-vue';
const props = withDefaults( const props = withDefaults(
defineProps<{ class?: HTMLAttributes['class'] } & PrimitiveProps>(), defineProps<{ class?: HTMLAttributes['class'] } & PrimitiveProps>(),

2
packages/@core/uikit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbList.vue

@ -1,7 +1,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { cn } from '#/lib/utils'; import { cn } from '@vben-core/toolkit';
const props = defineProps<{ const props = defineProps<{
class?: HTMLAttributes['class']; class?: HTMLAttributes['class'];

2
packages/@core/uikit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbPage.vue

@ -1,7 +1,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { cn } from '#/lib/utils'; import { cn } from '@vben-core/toolkit';
const props = defineProps<{ const props = defineProps<{
class?: HTMLAttributes['class']; class?: HTMLAttributes['class'];

4
packages/@core/uikit/shadcn-ui/src/components/ui/breadcrumb/BreadcrumbSeparator.vue

@ -1,9 +1,9 @@
<script lang="ts" setup> <script lang="ts" setup>
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { ChevronRightIcon } from '@radix-icons/vue'; import { cn } from '@vben-core/toolkit';
import { cn } from '#/lib/utils'; import { ChevronRightIcon } from '@radix-icons/vue';
const props = defineProps<{ const props = defineProps<{
class?: HTMLAttributes['class']; class?: HTMLAttributes['class'];

4
packages/@core/uikit/shadcn-ui/src/components/ui/button/Button.vue

@ -1,9 +1,9 @@
<script setup lang="ts"> <script setup lang="ts">
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { Primitive, type PrimitiveProps } from 'radix-vue'; import { cn } from '@vben-core/toolkit';
import { cn } from '#/lib/utils'; import { Primitive, type PrimitiveProps } from 'radix-vue';
import { type ButtonVariants, buttonVariants } from './button'; import { type ButtonVariants, buttonVariants } from './button';

4
packages/@core/uikit/shadcn-ui/src/components/ui/checkbox/Checkbox.vue

@ -3,6 +3,8 @@ import type { CheckboxRootEmits, CheckboxRootProps } from 'radix-vue';
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { CheckIcon } from '@radix-icons/vue'; import { CheckIcon } from '@radix-icons/vue';
import { import {
CheckboxIndicator, CheckboxIndicator,
@ -10,8 +12,6 @@ import {
useForwardPropsEmits, useForwardPropsEmits,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & CheckboxRootProps { class?: HTMLAttributes['class'] } & CheckboxRootProps
>(); >();

4
packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuCheckboxItem.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { CheckIcon } from '@radix-icons/vue'; import { CheckIcon } from '@radix-icons/vue';
import { import {
ContextMenuCheckboxItem, ContextMenuCheckboxItem,
@ -10,8 +12,6 @@ import {
useForwardPropsEmits, useForwardPropsEmits,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & ContextMenuCheckboxItemProps { class?: HTMLAttributes['class'] } & ContextMenuCheckboxItemProps
>(); >();

4
packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuContent.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
ContextMenuContent, ContextMenuContent,
type ContextMenuContentEmits, type ContextMenuContentEmits,
@ -9,8 +11,6 @@ import {
useForwardPropsEmits, useForwardPropsEmits,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & ContextMenuContentProps { class?: HTMLAttributes['class'] } & ContextMenuContentProps
>(); >();

4
packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuItem.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
ContextMenuItem, ContextMenuItem,
type ContextMenuItemEmits, type ContextMenuItemEmits,
@ -8,8 +10,6 @@ import {
useForwardPropsEmits, useForwardPropsEmits,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class']; inset?: boolean } & ContextMenuItemProps { class?: HTMLAttributes['class']; inset?: boolean } & ContextMenuItemProps
>(); >();

4
packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuLabel.vue

@ -1,9 +1,9 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { ContextMenuLabel, type ContextMenuLabelProps } from 'radix-vue'; import { cn } from '@vben-core/toolkit';
import { cn } from '#/lib/utils'; import { ContextMenuLabel, type ContextMenuLabelProps } from 'radix-vue';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class']; inset?: boolean } & ContextMenuLabelProps { class?: HTMLAttributes['class']; inset?: boolean } & ContextMenuLabelProps

4
packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuRadioItem.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { DotFilledIcon } from '@radix-icons/vue'; import { DotFilledIcon } from '@radix-icons/vue';
import { import {
ContextMenuItemIndicator, ContextMenuItemIndicator,
@ -10,8 +12,6 @@ import {
useForwardPropsEmits, useForwardPropsEmits,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & ContextMenuRadioItemProps { class?: HTMLAttributes['class'] } & ContextMenuRadioItemProps
>(); >();

4
packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuSeparator.vue

@ -1,13 +1,13 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
ContextMenuSeparator, ContextMenuSeparator,
type ContextMenuSeparatorProps, type ContextMenuSeparatorProps,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & ContextMenuSeparatorProps { class?: HTMLAttributes['class'] } & ContextMenuSeparatorProps
>(); >();

2
packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuShortcut.vue

@ -1,7 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { cn } from '#/lib/utils'; import { cn } from '@vben-core/toolkit';
const props = defineProps<{ const props = defineProps<{
class?: HTMLAttributes['class']; class?: HTMLAttributes['class'];

4
packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuSubContent.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
ContextMenuSubContent, ContextMenuSubContent,
type DropdownMenuSubContentEmits, type DropdownMenuSubContentEmits,
@ -8,8 +10,6 @@ import {
useForwardPropsEmits, useForwardPropsEmits,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & DropdownMenuSubContentProps { class?: HTMLAttributes['class'] } & DropdownMenuSubContentProps
>(); >();

4
packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuSubTrigger.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { ChevronRightIcon } from '@radix-icons/vue'; import { ChevronRightIcon } from '@radix-icons/vue';
import { import {
ContextMenuSubTrigger, ContextMenuSubTrigger,
@ -8,8 +10,6 @@ import {
useForwardProps, useForwardProps,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ {
class?: HTMLAttributes['class']; class?: HTMLAttributes['class'];

4
packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogContent.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { Cross2Icon } from '@radix-icons/vue'; import { Cross2Icon } from '@radix-icons/vue';
import { import {
DialogClose, DialogClose,
@ -12,8 +14,6 @@ import {
useForwardPropsEmits, useForwardPropsEmits,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & DialogContentProps { class?: HTMLAttributes['class'] } & DialogContentProps
>(); >();

4
packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogDescription.vue

@ -1,14 +1,14 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
DialogDescription, DialogDescription,
type DialogDescriptionProps, type DialogDescriptionProps,
useForwardProps, useForwardProps,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & DialogDescriptionProps { class?: HTMLAttributes['class'] } & DialogDescriptionProps
>(); >();

2
packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogFooter.vue

@ -1,7 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { cn } from '#/lib/utils'; import { cn } from '@vben-core/toolkit';
const props = defineProps<{ class?: HTMLAttributes['class'] }>(); const props = defineProps<{ class?: HTMLAttributes['class'] }>();
</script> </script>

2
packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogHeader.vue

@ -1,7 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { cn } from '#/lib/utils'; import { cn } from '@vben-core/toolkit';
const props = defineProps<{ const props = defineProps<{
class?: HTMLAttributes['class']; class?: HTMLAttributes['class'];

4
packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogScrollContent.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
DialogClose, DialogClose,
DialogContent, DialogContent,
@ -11,8 +13,6 @@ import {
useForwardPropsEmits, useForwardPropsEmits,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & DialogContentProps { class?: HTMLAttributes['class'] } & DialogContentProps
>(); >();

4
packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogTitle.vue

@ -1,9 +1,9 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { DialogTitle, type DialogTitleProps, useForwardProps } from 'radix-vue'; import { cn } from '@vben-core/toolkit';
import { cn } from '#/lib/utils'; import { DialogTitle, type DialogTitleProps, useForwardProps } from 'radix-vue';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & DialogTitleProps { class?: HTMLAttributes['class'] } & DialogTitleProps

4
packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuCheckboxItem.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { CheckIcon } from '@radix-icons/vue'; import { CheckIcon } from '@radix-icons/vue';
import { import {
DropdownMenuCheckboxItem, DropdownMenuCheckboxItem,
@ -10,8 +12,6 @@ import {
useForwardPropsEmits, useForwardPropsEmits,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & DropdownMenuCheckboxItemProps { class?: HTMLAttributes['class'] } & DropdownMenuCheckboxItemProps
>(); >();

4
packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuContent.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
DropdownMenuContent, DropdownMenuContent,
type DropdownMenuContentEmits, type DropdownMenuContentEmits,
@ -9,8 +11,6 @@ import {
useForwardPropsEmits, useForwardPropsEmits,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = withDefaults( const props = withDefaults(
defineProps<{ class?: HTMLAttributes['class'] } & DropdownMenuContentProps>(), defineProps<{ class?: HTMLAttributes['class'] } & DropdownMenuContentProps>(),
{ {

4
packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuItem.vue

@ -1,14 +1,14 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
DropdownMenuItem, DropdownMenuItem,
type DropdownMenuItemProps, type DropdownMenuItemProps,
useForwardProps, useForwardProps,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class']; inset?: boolean } & DropdownMenuItemProps { class?: HTMLAttributes['class']; inset?: boolean } & DropdownMenuItemProps
>(); >();

4
packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuLabel.vue

@ -1,14 +1,14 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
DropdownMenuLabel, DropdownMenuLabel,
type DropdownMenuLabelProps, type DropdownMenuLabelProps,
useForwardProps, useForwardProps,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class']; inset?: boolean } & DropdownMenuLabelProps { class?: HTMLAttributes['class']; inset?: boolean } & DropdownMenuLabelProps
>(); >();

4
packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuRadioItem.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { DotFilledIcon } from '@radix-icons/vue'; import { DotFilledIcon } from '@radix-icons/vue';
import { import {
DropdownMenuItemIndicator, DropdownMenuItemIndicator,
@ -10,8 +12,6 @@ import {
useForwardPropsEmits, useForwardPropsEmits,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & DropdownMenuRadioItemProps { class?: HTMLAttributes['class'] } & DropdownMenuRadioItemProps
>(); >();

4
packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuSeparator.vue

@ -1,13 +1,13 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
DropdownMenuSeparator, DropdownMenuSeparator,
type DropdownMenuSeparatorProps, type DropdownMenuSeparatorProps,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ {
class?: HTMLAttributes['class']; class?: HTMLAttributes['class'];

2
packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuShortcut.vue

@ -1,7 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import type { HTMLAttributes } from 'vue'; import type { HTMLAttributes } from 'vue';
import { cn } from '#/lib/utils'; import { cn } from '@vben-core/toolkit';
const props = defineProps<{ const props = defineProps<{
class?: HTMLAttributes['class']; class?: HTMLAttributes['class'];

4
packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuSubContent.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
DropdownMenuSubContent, DropdownMenuSubContent,
type DropdownMenuSubContentEmits, type DropdownMenuSubContentEmits,
@ -8,8 +10,6 @@ import {
useForwardPropsEmits, useForwardPropsEmits,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & DropdownMenuSubContentProps { class?: HTMLAttributes['class'] } & DropdownMenuSubContentProps
>(); >();

4
packages/@core/uikit/shadcn-ui/src/components/ui/dropdown-menu/DropdownMenuSubTrigger.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { ChevronRightIcon } from '@radix-icons/vue'; import { ChevronRightIcon } from '@radix-icons/vue';
import { import {
DropdownMenuSubTrigger, DropdownMenuSubTrigger,
@ -8,8 +10,6 @@ import {
useForwardProps, useForwardProps,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & DropdownMenuSubTriggerProps { class?: HTMLAttributes['class'] } & DropdownMenuSubTriggerProps
>(); >();

4
packages/@core/uikit/shadcn-ui/src/components/ui/hover-card/HoverCardContent.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
HoverCardContent, HoverCardContent,
type HoverCardContentProps, type HoverCardContentProps,
@ -8,8 +10,6 @@ import {
useForwardProps, useForwardProps,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = withDefaults( const props = withDefaults(
defineProps<{ class?: HTMLAttributes['class'] } & HoverCardContentProps>(), defineProps<{ class?: HTMLAttributes['class'] } & HoverCardContentProps>(),
{ {

4
packages/@core/uikit/shadcn-ui/src/components/ui/pin-input/PinInput.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
PinInputRoot, PinInputRoot,
type PinInputRootEmits, type PinInputRootEmits,
@ -8,8 +10,6 @@ import {
useForwardPropsEmits, useForwardPropsEmits,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & PinInputRootProps { class?: HTMLAttributes['class'] } & PinInputRootProps
>(); >();

4
packages/@core/uikit/shadcn-ui/src/components/ui/pin-input/PinInputGroup.vue

@ -1,9 +1,9 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { Primitive, type PrimitiveProps, useForwardProps } from 'radix-vue'; import { cn } from '@vben-core/toolkit';
import { cn } from '#/lib/utils'; import { Primitive, type PrimitiveProps, useForwardProps } from 'radix-vue';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & PrimitiveProps { class?: HTMLAttributes['class'] } & PrimitiveProps

4
packages/@core/uikit/shadcn-ui/src/components/ui/pin-input/PinInputInput.vue

@ -1,14 +1,14 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
PinInputInput, PinInputInput,
type PinInputInputProps, type PinInputInputProps,
useForwardProps, useForwardProps,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & PinInputInputProps { class?: HTMLAttributes['class'] } & PinInputInputProps
>(); >();

4
packages/@core/uikit/shadcn-ui/src/components/ui/popover/PopoverContent.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
PopoverContent, PopoverContent,
type PopoverContentEmits, type PopoverContentEmits,
@ -9,8 +11,6 @@ import {
useForwardPropsEmits, useForwardPropsEmits,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
defineOptions({ defineOptions({
inheritAttrs: false, inheritAttrs: false,
}); });

4
packages/@core/uikit/shadcn-ui/src/components/ui/scroll-area/ScrollArea.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
ScrollAreaCorner, ScrollAreaCorner,
ScrollAreaRoot, ScrollAreaRoot,
@ -8,8 +10,6 @@ import {
ScrollAreaViewport, ScrollAreaViewport,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
import ScrollBar from './ScrollBar.vue'; import ScrollBar from './ScrollBar.vue';
const props = withDefaults( const props = withDefaults(

4
packages/@core/uikit/shadcn-ui/src/components/ui/scroll-area/ScrollBar.vue

@ -1,14 +1,14 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
ScrollAreaScrollbar, ScrollAreaScrollbar,
type ScrollAreaScrollbarProps, type ScrollAreaScrollbarProps,
ScrollAreaThumb, ScrollAreaThumb,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
const props = withDefaults( const props = withDefaults(
defineProps<{ class?: HTMLAttributes['class'] } & ScrollAreaScrollbarProps>(), defineProps<{ class?: HTMLAttributes['class'] } & ScrollAreaScrollbarProps>(),
{ {

4
packages/@core/uikit/shadcn-ui/src/components/ui/select/SelectContent.vue

@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { cn } from '@vben-core/toolkit';
import { import {
SelectContent, SelectContent,
type SelectContentEmits, type SelectContentEmits,
@ -10,8 +12,6 @@ import {
useForwardPropsEmits, useForwardPropsEmits,
} from 'radix-vue'; } from 'radix-vue';
import { cn } from '#/lib/utils';
import { SelectScrollDownButton, SelectScrollUpButton } from '.'; import { SelectScrollDownButton, SelectScrollUpButton } from '.';
defineOptions({ defineOptions({

4
packages/@core/uikit/shadcn-ui/src/components/ui/select/SelectGroup.vue

@ -1,9 +1,9 @@
<script setup lang="ts"> <script setup lang="ts">
import { type HTMLAttributes, computed } from 'vue'; import { type HTMLAttributes, computed } from 'vue';
import { SelectGroup, type SelectGroupProps } from 'radix-vue'; import { cn } from '@vben-core/toolkit';
import { cn } from '#/lib/utils'; import { SelectGroup, type SelectGroupProps } from 'radix-vue';
const props = defineProps< const props = defineProps<
{ class?: HTMLAttributes['class'] } & SelectGroupProps { class?: HTMLAttributes['class'] } & SelectGroupProps

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save