fix: type check

fix: ci

fix: ci

fix: ci

.changeset/config.json

@@ -1,6 +1,9 @@
 {
   "$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,
   "fixed": [["@vben-core/*", "@vben/*"]],
   "snapshot": {

.github/workflows/changeset-version.yml

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

.github/workflows/ci.yml

@@ -36,6 +36,8 @@ jobs:
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
+        with:
+          run_install: false
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
@@ -43,8 +45,21 @@ jobs:
           node-version: ${{ matrix.node-version }}
           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
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
 
       # - name: Check Git version
       #   run: git --version
@@ -97,12 +112,29 @@ jobs:
     name: Check
     runs-on: ubuntu-latest
     timeout-minutes: 20
+    strategy:
+      matrix:
+        node-version: [20]
     steps:
-      - uses: actions/checkout@v4
-      # - uses: ./.github/actions/ci-setup
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-      # - name: Typecheck
-      #   run: pnpm check:type
+      - 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
+        run: pnpm check:type
 
       # From https://github.com/rhysd/actionlint/blob/main/docs/usage.md#use-actionlint-on-github-actions
       - name: Check workflow files

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

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

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

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

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

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

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

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

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

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

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

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

internal/node-utils/package.json

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

internal/tailwind-config/package.json

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

internal/vite-config/package.json

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

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

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

package.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

packages/@core/shared/toolkit/src/cn.ts

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

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

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

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

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

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

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

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

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

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'],
+    },
+  ],
+});

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

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

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

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

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

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

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

@@ -8,7 +8,11 @@ import type {
 import type { HTMLAttributes } 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 {
   alt?: string;

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

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

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

@@ -3,12 +3,14 @@ import type { HTMLAttributes } from 'vue';
 import { computed } from 'vue';
 
 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 { type ButtonVariants, buttonVariants } from '#/components/ui/button';
-import { cn } from '#/lib/utils';
-
 interface Props extends PrimitiveProps {
   class?: HTMLAttributes['class'];
   disabled?: boolean;

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

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

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

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

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 { computed } from 'vue';
 
-import { useForwardPropsEmits } from 'radix-vue';
-
 import {
   ContextMenu,
   ContextMenuContent,
@@ -19,7 +17,8 @@ import {
   ContextMenuSeparator,
   ContextMenuShortcut,
   ContextMenuTrigger,
-} from '#/components/ui/context-menu';
+} from '@vben-core/shadcn-ui/components/ui/context-menu';
+import { useForwardPropsEmits } from 'radix-vue';
 
 const props = defineProps<
   {

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

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

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

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

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';
 
 const isMenuOpen = ref(false);
@@ -8,7 +8,7 @@ const toggleMenu = () => {
   isMenuOpen.value = !isMenuOpen.value;
 };
 
-const handleMenuItemClick = (_item) => {
+const handleMenuItemClick = (_item: any) => {
   // console.log(111, item);
 };
 </script>

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 { HoverCardContentProps, useForwardPropsEmits } from 'radix-vue';
-
 import {
   HoverCard,
   HoverCardContent,
   HoverCardTrigger,
-} from '#/components/ui/hover-card';
+} from '@vben-core/shadcn-ui/components/ui/hover-card';
+import { HoverCardContentProps, useForwardPropsEmits } from 'radix-vue';
 
 const props = defineProps<
   {

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

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

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 { VbenButton } from '#/components/button';
+import { VbenButton } from '@vben-core/shadcn-ui/components/button';
 import {
   PinInput,
   PinInputGroup,
   PinInputInput,
-} from '#/components/ui/pin-input';
+} from '@vben-core/shadcn-ui/components/ui/pin-input';
 
 defineOptions({
   inheritAttrs: false,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 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<
   { class?: HTMLAttributes['class'] } & AlertDialogTitleProps

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

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 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';
 

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

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

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

@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 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<{
   class?: HTMLAttributes['class'];

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

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

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

@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 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(
   defineProps<{ class?: HTMLAttributes['class'] } & PrimitiveProps>(),

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

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

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

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

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

@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 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<{
   class?: HTMLAttributes['class'];

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

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 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';
 

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

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

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

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

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

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

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

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

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 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<
   { class?: HTMLAttributes['class']; inset?: boolean } & ContextMenuLabelProps

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 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<
   { class?: HTMLAttributes['class'] } & DialogTitleProps

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 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<
   { class?: HTMLAttributes['class'] } & PrimitiveProps

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

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

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

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

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

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

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

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

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

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

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

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 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<
   { class?: HTMLAttributes['class'] } & SelectGroupProps