diff --git a/.changeset/config.json b/.changeset/config.json index faeefa98..7f769543 100644 --- a/.changeset/config.json +++ b/.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": { diff --git a/.github/workflows/changeset-version.yml b/.github/workflows/changeset-version.yml index 4843eff6..7bc9b261 100644 --- a/.github/workflows/changeset-version.yml +++ b/.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 }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 65247253..b311b780 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/internal/lint-configs/commitlint-config/package.json b/internal/lint-configs/commitlint-config/package.json index d3ff985b..2c4478b9 100644 --- a/internal/lint-configs/commitlint-config/package.json +++ b/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", diff --git a/internal/lint-configs/eslint-config/package.json b/internal/lint-configs/eslint-config/package.json index f12aa7ad..9d298249 100644 --- a/internal/lint-configs/eslint-config/package.json +++ b/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", diff --git a/internal/lint-configs/eslint-config/src/configs/perfectionist.ts b/internal/lint-configs/eslint-config/src/configs/perfectionist.ts index 250a4525..592b365e 100644 --- a/internal/lint-configs/eslint-config/src/configs/perfectionist.ts +++ b/internal/lint-configs/eslint-config/src/configs/perfectionist.ts @@ -52,7 +52,6 @@ export async function perfectionist(): Promise { '@/forward/**', '@/router/**', '@/views/**', - '#/**', ], 'newlines-between': 'always', order: 'asc', diff --git a/internal/lint-configs/lint-staged-config/package.json b/internal/lint-configs/lint-staged-config/package.json index 56c450d8..48d80da4 100644 --- a/internal/lint-configs/lint-staged-config/package.json +++ b/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", diff --git a/internal/lint-configs/prettier-config/package.json b/internal/lint-configs/prettier-config/package.json index ccff6879..0fd3bf0d 100644 --- a/internal/lint-configs/prettier-config/package.json +++ b/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", diff --git a/internal/lint-configs/stylelint-config/package.json b/internal/lint-configs/stylelint-config/package.json index aa70648c..52e8e1a0 100644 --- a/internal/lint-configs/stylelint-config/package.json +++ b/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", diff --git a/internal/node-utils/package.json b/internal/node-utils/package.json index 7e0845af..324cbbb0 100644 --- a/internal/node-utils/package.json +++ b/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", diff --git a/internal/tailwind-config/package.json b/internal/tailwind-config/package.json index 9b4ec59f..90538fee 100644 --- a/internal/tailwind-config/package.json +++ b/internal/tailwind-config/package.json @@ -29,9 +29,6 @@ ] } }, - "imports": { - "#*": "./src/*" - }, "exports": { ".": { "types": "./src/index.ts", diff --git a/internal/vite-config/package.json b/internal/vite-config/package.json index 4a9a9097..90d66f35 100644 --- a/internal/vite-config/package.json +++ b/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", diff --git a/internal/vite-config/src/plugins/index.ts b/internal/vite-config/src/plugins/index.ts index 87787baf..62e3c45d 100644 --- a/internal/vite-config/src/plugins/index.ts +++ b/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: [], diff --git a/package.json b/package.json index b8862eef..e502f86e 100644 --- a/package.json +++ b/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", diff --git a/packages/@core/forward/helpers/package.json b/packages/@core/forward/helpers/package.json index 25e47d2b..4d0b0f29 100644 --- a/packages/@core/forward/helpers/package.json +++ b/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", diff --git a/packages/@core/forward/preferences/package.json b/packages/@core/forward/preferences/package.json index 6e785002..100a1235 100644 --- a/packages/@core/forward/preferences/package.json +++ b/packages/@core/forward/preferences/package.json @@ -21,9 +21,6 @@ "sideEffects": [ "**/*.css" ], - "imports": { - "#*": "./src/*" - }, "exports": { ".": { "types": "./src/index.ts", diff --git a/packages/@core/forward/request/package.json b/packages/@core/forward/request/package.json index 8acaf578..16878d47 100644 --- a/packages/@core/forward/request/package.json +++ b/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", diff --git a/packages/@core/forward/stores/package.json b/packages/@core/forward/stores/package.json index 92ed6af6..2e8808b9 100644 --- a/packages/@core/forward/stores/package.json +++ b/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", diff --git a/packages/@core/shared/chche/package.json b/packages/@core/shared/chche/package.json index 32b528ad..d9ea8a17 100644 --- a/packages/@core/shared/chche/package.json +++ b/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", diff --git a/packages/@core/shared/design-tokens/package.json b/packages/@core/shared/design-tokens/package.json index 6a426128..1539f3b0 100644 --- a/packages/@core/shared/design-tokens/package.json +++ b/packages/@core/shared/design-tokens/package.json @@ -22,9 +22,6 @@ "**/*.css" ], "main": "./dist/index.css", - "imports": { - "#*": "./src/*" - }, "exports": { ".": { "types": "./src/index.ts", diff --git a/packages/@core/shared/design/package.json b/packages/@core/shared/design/package.json index e7118004..1ef0feb5 100644 --- a/packages/@core/shared/design/package.json +++ b/packages/@core/shared/design/package.json @@ -19,9 +19,6 @@ "dist", "src" ], - "imports": { - "#*": "./src/*" - }, "exports": { ".": { "development": "./src/scss/index.scss", diff --git a/packages/@core/shared/iconify/package.json b/packages/@core/shared/iconify/package.json index 19abac83..104ea9c6 100644 --- a/packages/@core/shared/iconify/package.json +++ b/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" diff --git a/packages/@core/shared/toolkit/package.json b/packages/@core/shared/toolkit/package.json index 6936196c..56e30840 100644 --- a/packages/@core/shared/toolkit/package.json +++ b/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" diff --git a/packages/@core/uikit/shadcn-ui/src/lib/utils.ts b/packages/@core/shared/toolkit/src/cn.ts similarity index 69% rename from packages/@core/uikit/shadcn-ui/src/lib/utils.ts rename to packages/@core/shared/toolkit/src/cn.ts index 9ad0df42..5503cc58 100644 --- a/packages/@core/uikit/shadcn-ui/src/lib/utils.ts +++ b/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 }; diff --git a/packages/@core/shared/toolkit/src/index.ts b/packages/@core/shared/toolkit/src/index.ts index 3d64019b..c1d89d43 100644 --- a/packages/@core/shared/toolkit/src/index.ts +++ b/packages/@core/shared/toolkit/src/index.ts @@ -1,3 +1,4 @@ +export * from './cn'; export * from './color'; export * from './diff'; export * from './hash'; diff --git a/packages/@core/shared/typings/package.json b/packages/@core/shared/typings/package.json index c555131d..ecb19350 100644 --- a/packages/@core/shared/typings/package.json +++ b/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", diff --git a/packages/@core/uikit/layout-ui/package.json b/packages/@core/uikit/layout-ui/package.json index 968f1cf3..13dc3d69 100644 --- a/packages/@core/uikit/layout-ui/package.json +++ b/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", diff --git a/packages/@core/uikit/menu-ui/package.json b/packages/@core/uikit/menu-ui/package.json index 29ef5f20..9a2dedd8 100644 --- a/packages/@core/uikit/menu-ui/package.json +++ b/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", diff --git a/packages/@core/uikit/shadcn-ui/build.config.ts b/packages/@core/uikit/shadcn-ui/build.config.ts new file mode 100644 index 00000000..72049510 --- /dev/null +++ b/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'], + }, + ], +}); diff --git a/packages/@core/uikit/shadcn-ui/components.json b/packages/@core/uikit/shadcn-ui/components.json index 0c7ea8ae..66dd2f63 100644 --- a/packages/@core/uikit/shadcn-ui/components.json +++ b/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" } } diff --git a/packages/@core/uikit/shadcn-ui/package.json b/packages/@core/uikit/shadcn-ui/package.json index 9569a56f..a54c6d11 100644 --- a/packages/@core/uikit/shadcn-ui/package.json +++ b/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" } diff --git a/packages/@core/uikit/shadcn-ui/src/components/alert-dialog/alert-dialog.vue b/packages/@core/uikit/shadcn-ui/src/components/alert-dialog/alert-dialog.vue index a75a5d24..83304883 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/alert-dialog/alert-dialog.vue +++ b/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; diff --git a/packages/@core/uikit/shadcn-ui/src/components/avatar/avatar.vue b/packages/@core/uikit/shadcn-ui/src/components/avatar/avatar.vue index 9524b863..1e535f6f 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/avatar/avatar.vue +++ b/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; diff --git a/packages/@core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue b/packages/@core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue index ab725664..1d36f1fc 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/breadcrumb/breadcrumb.vue +++ b/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 '../'; diff --git a/packages/@core/uikit/shadcn-ui/src/components/button/button.vue b/packages/@core/uikit/shadcn-ui/src/components/button/button.vue index f937dcb8..4f400e19 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/button/button.vue +++ b/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; diff --git a/packages/@core/uikit/shadcn-ui/src/components/button/icon-button.vue b/packages/@core/uikit/shadcn-ui/src/components/button/icon-button.vue index 6e9ae4d0..52956443 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/button/icon-button.vue +++ b/packages/@core/uikit/shadcn-ui/src/components/button/icon-button.vue @@ -1,11 +1,11 @@ diff --git a/packages/@core/uikit/shadcn-ui/src/components/hover-card/hover-card.vue b/packages/@core/uikit/shadcn-ui/src/components/hover-card/hover-card.vue index 179420fb..8100c5f8 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/hover-card/hover-card.vue +++ b/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< { diff --git a/packages/@core/uikit/shadcn-ui/src/components/input-password/input-password.vue b/packages/@core/uikit/shadcn-ui/src/components/input-password/input-password.vue index 3e3dc20c..a34d8ddd 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/input-password/input-password.vue +++ b/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 {} diff --git a/packages/@core/uikit/shadcn-ui/src/components/pin-input/input.vue b/packages/@core/uikit/shadcn-ui/src/components/pin-input/input.vue index 58812ead..a0b57de9 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/pin-input/input.vue +++ b/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, diff --git a/packages/@core/uikit/shadcn-ui/src/components/popover/popover.vue b/packages/@core/uikit/shadcn-ui/src/components/popover/popover.vue index f3997f54..a4234d1a 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/popover/popover.vue +++ b/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< diff --git a/packages/@core/uikit/shadcn-ui/src/components/scrollbar/scrollbar.vue b/packages/@core/uikit/shadcn-ui/src/components/scrollbar/scrollbar.vue index 04e61252..d8f0db02 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/scrollbar/scrollbar.vue +++ b/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']; diff --git a/packages/@core/uikit/shadcn-ui/src/components/segmented/segmented.vue b/packages/@core/uikit/shadcn-ui/src/components/segmented/segmented.vue index 017c7da8..dcb430d4 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/segmented/segmented.vue +++ b/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 { diff --git a/packages/@core/uikit/shadcn-ui/src/components/segmented/tabs-indicator.vue b/packages/@core/uikit/shadcn-ui/src/components/segmented/tabs-indicator.vue index 69614ac5..63aaa286 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/segmented/tabs-indicator.vue +++ b/packages/@core/uikit/shadcn-ui/src/components/segmented/tabs-indicator.vue @@ -1,14 +1,14 @@ diff --git a/packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogHeader.vue b/packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogHeader.vue index 1401d41d..28851d23 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogHeader.vue +++ b/packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogHeader.vue @@ -1,7 +1,7 @@ diff --git a/packages/@core/uikit/shadcn-ui/src/components/ui/sheet/SheetHeader.vue b/packages/@core/uikit/shadcn-ui/src/components/ui/sheet/SheetHeader.vue index ff8309f5..7d3e8b28 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/ui/sheet/SheetHeader.vue +++ b/packages/@core/uikit/shadcn-ui/src/components/ui/sheet/SheetHeader.vue @@ -1,7 +1,7 @@ diff --git a/packages/@core/uikit/shadcn-ui/src/components/ui/sheet/SheetTitle.vue b/packages/@core/uikit/shadcn-ui/src/components/ui/sheet/SheetTitle.vue index bac73779..2c721f57 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/ui/sheet/SheetTitle.vue +++ b/packages/@core/uikit/shadcn-ui/src/components/ui/sheet/SheetTitle.vue @@ -1,9 +1,9 @@