From 91cfb3d06826dba868ce8fe337943444134b717a Mon Sep 17 00:00:00 2001 From: Maofeng Date: Mon, 21 Sep 2026 17:32:06 +0800 Subject: [PATCH] refactor(ui): use relative internal imports --- packages/ui/src/components/accordion.tsx | 4 ++-- packages/ui/src/components/alert-dialog.tsx | 4 ++-- packages/ui/src/components/alert.tsx | 2 +- .../ui/src/components/anchored-surface.tsx | 2 +- packages/ui/src/components/aspect-ratio.tsx | 2 +- packages/ui/src/components/attachment.tsx | 4 ++-- packages/ui/src/components/avatar.tsx | 2 +- packages/ui/src/components/badge.tsx | 2 +- packages/ui/src/components/breadcrumb.tsx | 11 +++------- packages/ui/src/components/bubble.tsx | 2 +- packages/ui/src/components/button-group.tsx | 4 ++-- packages/ui/src/components/button.tsx | 2 +- packages/ui/src/components/calendar.tsx | 12 ++++------- packages/ui/src/components/card.tsx | 2 +- packages/ui/src/components/carousel.tsx | 9 +++------ packages/ui/src/components/chart.tsx | 2 +- packages/ui/src/components/checkbox.tsx | 4 ++-- packages/ui/src/components/combobox.tsx | 12 ++++------- packages/ui/src/components/command.tsx | 11 ++++------ packages/ui/src/components/context-menu.tsx | 4 ++-- packages/ui/src/components/dialog.tsx | 6 +++--- packages/ui/src/components/drawer.tsx | 2 +- packages/ui/src/components/dropdown-menu.tsx | 6 +++--- packages/ui/src/components/empty.tsx | 2 +- packages/ui/src/components/field.tsx | 6 +++--- packages/ui/src/components/hover-card.tsx | 2 +- packages/ui/src/components/input-group.tsx | 8 ++++---- packages/ui/src/components/input-otp.tsx | 4 ++-- packages/ui/src/components/input.tsx | 2 +- packages/ui/src/components/item.tsx | 4 ++-- packages/ui/src/components/kbd.tsx | 2 +- packages/ui/src/components/label.tsx | 2 +- packages/ui/src/components/marker.tsx | 6 ++---- packages/ui/src/components/menubar.tsx | 6 +++--- .../ui/src/components/message-scroller.tsx | 6 +++--- packages/ui/src/components/message.tsx | 2 +- packages/ui/src/components/native-select.tsx | 4 ++-- .../ui/src/components/navigation-menu.tsx | 4 ++-- packages/ui/src/components/pagination.tsx | 10 +++------- packages/ui/src/components/popover.tsx | 4 ++-- packages/ui/src/components/progress.tsx | 2 +- packages/ui/src/components/radio-group.tsx | 2 +- packages/ui/src/components/resizable.tsx | 2 +- packages/ui/src/components/scroll-area.tsx | 2 +- packages/ui/src/components/select.tsx | 8 ++------ packages/ui/src/components/separator.tsx | 2 +- packages/ui/src/components/sheet.tsx | 6 +++--- packages/ui/src/components/sidebar.tsx | 20 ++++++++----------- packages/ui/src/components/skeleton.tsx | 2 +- packages/ui/src/components/slider.tsx | 2 +- packages/ui/src/components/spinner.tsx | 7 ++----- packages/ui/src/components/switch.tsx | 2 +- packages/ui/src/components/table.tsx | 2 +- packages/ui/src/components/tabs.tsx | 2 +- packages/ui/src/components/textarea.tsx | 2 +- packages/ui/src/components/toast.tsx | 6 +++--- packages/ui/src/components/toggle-group.tsx | 4 ++-- packages/ui/src/components/toggle.tsx | 2 +- packages/ui/src/components/tooltip.tsx | 4 ++-- 59 files changed, 114 insertions(+), 150 deletions(-) diff --git a/packages/ui/src/components/accordion.tsx b/packages/ui/src/components/accordion.tsx index b7aa919..7f6005d 100644 --- a/packages/ui/src/components/accordion.tsx +++ b/packages/ui/src/components/accordion.tsx @@ -1,7 +1,7 @@ import { Accordion as AccordionPrimitive } from "@base-ui/react/accordion" -import { cn } from "@workspace/ui/lib/utils" -import { ChevronDownIcon, ChevronUpIcon } from "@workspace/ui/components/icon" +import { cn } from "../lib/utils" +import { ChevronDownIcon, ChevronUpIcon } from "./icon" function Accordion({ className, ...props }: AccordionPrimitive.Root.Props) { return ( diff --git a/packages/ui/src/components/alert-dialog.tsx b/packages/ui/src/components/alert-dialog.tsx index 8cefbf0..4bf3293 100644 --- a/packages/ui/src/components/alert-dialog.tsx +++ b/packages/ui/src/components/alert-dialog.tsx @@ -1,8 +1,8 @@ import * as React from "react" import { AlertDialog as AlertDialogPrimitive } from "@base-ui/react/alert-dialog" -import { cn } from "@workspace/ui/lib/utils" -import { Button } from "@workspace/ui/components/button" +import { cn } from "../lib/utils" +import { Button } from "./button" function AlertDialog({ ...props }: AlertDialogPrimitive.Root.Props) { return diff --git a/packages/ui/src/components/alert.tsx b/packages/ui/src/components/alert.tsx index 51cb3c1..78aaaaf 100644 --- a/packages/ui/src/components/alert.tsx +++ b/packages/ui/src/components/alert.tsx @@ -1,7 +1,7 @@ import * as React from "react" import { cva, type VariantProps } from "class-variance-authority" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" const alertVariants = cva( "group/alert relative grid w-full gap-0.5 rounded-lg border px-4 py-3 text-start text-sm has-data-[slot=alert-action]:relative has-data-[slot=alert-action]:pe-18 has-[>svg]:grid-cols-[auto_1fr] has-[>svg]:gap-x-2.5 *:[svg]:row-span-2 *:[svg]:translate-y-0.5 *:[svg]:text-current *:[svg:not([class*='size-'])]:size-4", diff --git a/packages/ui/src/components/anchored-surface.tsx b/packages/ui/src/components/anchored-surface.tsx index feef7b7..3264ccd 100644 --- a/packages/ui/src/components/anchored-surface.tsx +++ b/packages/ui/src/components/anchored-surface.tsx @@ -4,7 +4,7 @@ import * as React from "react" import { useRender } from "@base-ui/react/use-render" import { useMergedRefs } from "@base-ui/utils/useMergedRefs" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" const QUARTER_CIRCLE_BEZIER = 0.5522847498 diff --git a/packages/ui/src/components/aspect-ratio.tsx b/packages/ui/src/components/aspect-ratio.tsx index d9a6f84..02650ab 100644 --- a/packages/ui/src/components/aspect-ratio.tsx +++ b/packages/ui/src/components/aspect-ratio.tsx @@ -1,4 +1,4 @@ -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function AspectRatio({ ratio, diff --git a/packages/ui/src/components/attachment.tsx b/packages/ui/src/components/attachment.tsx index dd6b81c..1573b63 100644 --- a/packages/ui/src/components/attachment.tsx +++ b/packages/ui/src/components/attachment.tsx @@ -3,8 +3,8 @@ import { mergeProps } from "@base-ui/react/merge-props" import { useRender } from "@base-ui/react/use-render" import { cva, type VariantProps } from "class-variance-authority" -import { cn } from "@workspace/ui/lib/utils" -import { Button } from "@workspace/ui/components/button" +import { cn } from "../lib/utils" +import { Button } from "./button" const attachmentVariants = cva( "group/attachment relative flex w-fit max-w-full min-w-0 shrink-0 flex-wrap rounded-xl border bg-card text-card-foreground transition-colors focus-within:ring-1 focus-within:ring-ring/50 has-[>a,>button]:hover:bg-muted/50 data-[state=error]:border-destructive/30 data-[state=idle]:border-dashed", diff --git a/packages/ui/src/components/avatar.tsx b/packages/ui/src/components/avatar.tsx index 67a19be..71c3186 100644 --- a/packages/ui/src/components/avatar.tsx +++ b/packages/ui/src/components/avatar.tsx @@ -1,7 +1,7 @@ import * as React from "react" import { Avatar as AvatarPrimitive } from "@base-ui/react/avatar" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function Avatar({ className, diff --git a/packages/ui/src/components/badge.tsx b/packages/ui/src/components/badge.tsx index 0ced148..1be0cb4 100644 --- a/packages/ui/src/components/badge.tsx +++ b/packages/ui/src/components/badge.tsx @@ -2,7 +2,7 @@ import { mergeProps } from "@base-ui/react/merge-props" import { useRender } from "@base-ui/react/use-render" import { cva, type VariantProps } from "class-variance-authority" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" const badgeVariants = cva( "group/badge inline-flex h-5 w-fit shrink-0 items-center justify-center gap-1 overflow-hidden rounded-4xl border border-transparent px-2 py-0.5 text-xs font-medium whitespace-nowrap transition-all focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 has-data-[icon=inline-end]:pe-1.5 has-data-[icon=inline-start]:ps-1.5 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&>svg]:pointer-events-none [&>svg]:size-3!", diff --git a/packages/ui/src/components/breadcrumb.tsx b/packages/ui/src/components/breadcrumb.tsx index 5970db1..93f10d4 100644 --- a/packages/ui/src/components/breadcrumb.tsx +++ b/packages/ui/src/components/breadcrumb.tsx @@ -2,11 +2,8 @@ import * as React from "react" import { mergeProps } from "@base-ui/react/merge-props" import { useRender } from "@base-ui/react/use-render" -import { cn } from "@workspace/ui/lib/utils" -import { - ChevronRightIcon, - MoreHorizontalIcon, -} from "@workspace/ui/components/icon" +import { cn } from "../lib/utils" +import { ChevronRightIcon, MoreHorizontalIcon } from "./icon" import { LocalizedText, uiMessages, useMessage } from "./i18n" function Breadcrumb({ @@ -57,9 +54,7 @@ function BreadcrumbLink({ return useRender({ defaultTagName: "a", props: mergeProps<"a">( - { - className: cn("transition-colors hover:text-foreground", className), - }, + { className: cn("transition-colors hover:text-foreground", className) }, props ), render, diff --git a/packages/ui/src/components/bubble.tsx b/packages/ui/src/components/bubble.tsx index 6be97f1..3897c3b 100644 --- a/packages/ui/src/components/bubble.tsx +++ b/packages/ui/src/components/bubble.tsx @@ -3,7 +3,7 @@ import { mergeProps } from "@base-ui/react/merge-props" import { useRender } from "@base-ui/react/use-render" import { cva, type VariantProps } from "class-variance-authority" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function BubbleGroup({ className, ...props }: React.ComponentProps<"div">) { return ( diff --git a/packages/ui/src/components/button-group.tsx b/packages/ui/src/components/button-group.tsx index 4606329..427948b 100644 --- a/packages/ui/src/components/button-group.tsx +++ b/packages/ui/src/components/button-group.tsx @@ -2,8 +2,8 @@ import { mergeProps } from "@base-ui/react/merge-props" import { useRender } from "@base-ui/react/use-render" import { cva, type VariantProps } from "class-variance-authority" -import { cn } from "@workspace/ui/lib/utils" -import { Separator } from "@workspace/ui/components/separator" +import { cn } from "../lib/utils" +import { Separator } from "./separator" const buttonGroupVariants = cva( "flex w-fit items-stretch *:focus-visible:relative *:focus-visible:z-10 has-[>[data-slot=button-group]]:gap-2 has-[select[aria-hidden=true]:last-child]:[&>[data-slot=select-trigger]:last-of-type]:rounded-e-md [&>[data-slot=select-trigger]:not([class*='w-'])]:w-fit [&>input]:flex-1", diff --git a/packages/ui/src/components/button.tsx b/packages/ui/src/components/button.tsx index d685f3e..317bb76 100644 --- a/packages/ui/src/components/button.tsx +++ b/packages/ui/src/components/button.tsx @@ -1,7 +1,7 @@ import { Button as ButtonPrimitive } from "@base-ui/react/button" import { cva, type VariantProps } from "class-variance-authority" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" import { useRippleRef } from "@workspace/ui/hooks/use-ripple" const buttonVariants = cva( diff --git a/packages/ui/src/components/calendar.tsx b/packages/ui/src/components/calendar.tsx index de710e3..fe582d1 100644 --- a/packages/ui/src/components/calendar.tsx +++ b/packages/ui/src/components/calendar.tsx @@ -7,14 +7,10 @@ import { type DayButton, } from "react-day-picker" -import { cn } from "@workspace/ui/lib/utils" -import { Button, buttonVariants } from "@workspace/ui/components/button" -import { useCalendarLocale, useLocale } from "@workspace/ui/components/i18n" -import { - ChevronLeftIcon, - ChevronRightIcon, - ChevronDownIcon, -} from "@workspace/ui/components/icon" +import { cn } from "../lib/utils" +import { Button, buttonVariants } from "./button" +import { useCalendarLocale, useLocale } from "./i18n" +import { ChevronLeftIcon, ChevronRightIcon, ChevronDownIcon } from "./icon" type CalendarComponents = NonNullable< React.ComponentProps["components"] diff --git a/packages/ui/src/components/card.tsx b/packages/ui/src/components/card.tsx index 4d6cf7a..0b3e56d 100644 --- a/packages/ui/src/components/card.tsx +++ b/packages/ui/src/components/card.tsx @@ -1,6 +1,6 @@ import * as React from "react" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function Card({ className, diff --git a/packages/ui/src/components/carousel.tsx b/packages/ui/src/components/carousel.tsx index 4768cde..50a64fd 100644 --- a/packages/ui/src/components/carousel.tsx +++ b/packages/ui/src/components/carousel.tsx @@ -3,12 +3,9 @@ import useEmblaCarousel, { type UseEmblaCarouselType, } from "embla-carousel-react" -import { cn } from "@workspace/ui/lib/utils" -import { Button } from "@workspace/ui/components/button" -import { - ChevronLeftIcon, - ChevronRightIcon, -} from "@workspace/ui/components/icon" +import { cn } from "../lib/utils" +import { Button } from "./button" +import { ChevronLeftIcon, ChevronRightIcon } from "./icon" import { LocalizedText, uiMessages } from "./i18n" type CarouselApi = UseEmblaCarouselType[1] diff --git a/packages/ui/src/components/chart.tsx b/packages/ui/src/components/chart.tsx index 04f12bf..b180958 100644 --- a/packages/ui/src/components/chart.tsx +++ b/packages/ui/src/components/chart.tsx @@ -4,7 +4,7 @@ import * as React from "react" import * as RechartsPrimitive from "recharts" import type { TooltipValueType } from "recharts" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" // Format: { THEME_NAME: CSS_SELECTOR } const THEMES = { light: "", dark: ".dark" } as const diff --git a/packages/ui/src/components/checkbox.tsx b/packages/ui/src/components/checkbox.tsx index 552dfa2..bab8381 100644 --- a/packages/ui/src/components/checkbox.tsx +++ b/packages/ui/src/components/checkbox.tsx @@ -2,8 +2,8 @@ import { Checkbox as CheckboxPrimitive } from "@base-ui/react/checkbox" -import { cn } from "@workspace/ui/lib/utils" -import { CheckIcon } from "@workspace/ui/components/icon" +import { cn } from "../lib/utils" +import { CheckIcon } from "./icon" function Checkbox({ className, ...props }: CheckboxPrimitive.Root.Props) { return ( diff --git a/packages/ui/src/components/combobox.tsx b/packages/ui/src/components/combobox.tsx index 6a144aa..f9a7450 100644 --- a/packages/ui/src/components/combobox.tsx +++ b/packages/ui/src/components/combobox.tsx @@ -3,19 +3,15 @@ import * as React from "react" import { Combobox as ComboboxPrimitive } from "@base-ui/react" -import { cn } from "@workspace/ui/lib/utils" -import { Button } from "@workspace/ui/components/button" +import { cn } from "../lib/utils" +import { Button } from "./button" import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput, -} from "@workspace/ui/components/input-group" -import { - ChevronDownIcon, - XIcon, - CheckIcon, -} from "@workspace/ui/components/icon" +} from "./input-group" +import { ChevronDownIcon, XIcon, CheckIcon } from "./icon" const Combobox = ComboboxPrimitive.Root diff --git a/packages/ui/src/components/command.tsx b/packages/ui/src/components/command.tsx index a781c6a..57ed1fe 100644 --- a/packages/ui/src/components/command.tsx +++ b/packages/ui/src/components/command.tsx @@ -1,19 +1,16 @@ import * as React from "react" import { Command as CommandPrimitive } from "cmdk" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, -} from "@workspace/ui/components/dialog" -import { - InputGroup, - InputGroupAddon, -} from "@workspace/ui/components/input-group" -import { SearchIcon, CheckIcon } from "@workspace/ui/components/icon" +} from "./dialog" +import { InputGroup, InputGroupAddon } from "./input-group" +import { SearchIcon, CheckIcon } from "./icon" function Command({ className, diff --git a/packages/ui/src/components/context-menu.tsx b/packages/ui/src/components/context-menu.tsx index 5a14c4d..068992f 100644 --- a/packages/ui/src/components/context-menu.tsx +++ b/packages/ui/src/components/context-menu.tsx @@ -3,8 +3,8 @@ import * as React from "react" import { ContextMenu as ContextMenuPrimitive } from "@base-ui/react/context-menu" -import { cn } from "@workspace/ui/lib/utils" -import { ChevronRightIcon, CheckIcon } from "@workspace/ui/components/icon" +import { cn } from "../lib/utils" +import { ChevronRightIcon, CheckIcon } from "./icon" function ContextMenu({ ...props }: ContextMenuPrimitive.Root.Props) { return diff --git a/packages/ui/src/components/dialog.tsx b/packages/ui/src/components/dialog.tsx index ef7d4b6..5ab2564 100644 --- a/packages/ui/src/components/dialog.tsx +++ b/packages/ui/src/components/dialog.tsx @@ -3,9 +3,9 @@ import * as React from "react" import { Dialog as DialogPrimitive } from "@base-ui/react/dialog" -import { cn } from "@workspace/ui/lib/utils" -import { Button } from "@workspace/ui/components/button" -import { XIcon } from "@workspace/ui/components/icon" +import { cn } from "../lib/utils" +import { Button } from "./button" +import { XIcon } from "./icon" import { LocalizedText, uiMessages } from "./i18n" type DialogHandle = DialogPrimitive.Handle diff --git a/packages/ui/src/components/drawer.tsx b/packages/ui/src/components/drawer.tsx index 9fc8d5f..c650f8c 100644 --- a/packages/ui/src/components/drawer.tsx +++ b/packages/ui/src/components/drawer.tsx @@ -3,7 +3,7 @@ import * as React from "react" import { Drawer as DrawerPrimitive } from "@base-ui/react/drawer" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" type DrawerContextProps = { hasSnapPoints: boolean diff --git a/packages/ui/src/components/dropdown-menu.tsx b/packages/ui/src/components/dropdown-menu.tsx index 7c165f2..dfd5d82 100644 --- a/packages/ui/src/components/dropdown-menu.tsx +++ b/packages/ui/src/components/dropdown-menu.tsx @@ -7,9 +7,9 @@ import { AnchoredSurfaceArrow, type AnchoredSurfaceProps, getAnchoredSurfaceSideOffset, -} from "@workspace/ui/components/anchored-surface" -import { cn } from "@workspace/ui/lib/utils" -import { ChevronRightIcon, CheckIcon } from "@workspace/ui/components/icon" +} from "./anchored-surface" +import { cn } from "../lib/utils" +import { ChevronRightIcon, CheckIcon } from "./icon" import { useRippleRef } from "../hooks/use-ripple" function DropdownMenu({ ...props }: MenuPrimitive.Root.Props) { diff --git a/packages/ui/src/components/empty.tsx b/packages/ui/src/components/empty.tsx index a2f0750..5ec6a2a 100644 --- a/packages/ui/src/components/empty.tsx +++ b/packages/ui/src/components/empty.tsx @@ -1,6 +1,6 @@ import { cva, type VariantProps } from "class-variance-authority" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function Empty({ className, ...props }: React.ComponentProps<"div">) { return ( diff --git a/packages/ui/src/components/field.tsx b/packages/ui/src/components/field.tsx index 97974f9..60f115e 100644 --- a/packages/ui/src/components/field.tsx +++ b/packages/ui/src/components/field.tsx @@ -3,9 +3,9 @@ import { useMemo } from "react" import { cva, type VariantProps } from "class-variance-authority" -import { cn } from "@workspace/ui/lib/utils" -import { Label } from "@workspace/ui/components/label" -import { Separator } from "@workspace/ui/components/separator" +import { cn } from "../lib/utils" +import { Label } from "./label" +import { Separator } from "./separator" function FieldSet({ className, ...props }: React.ComponentProps<"fieldset">) { return ( diff --git a/packages/ui/src/components/hover-card.tsx b/packages/ui/src/components/hover-card.tsx index b4f03e5..0b8123a 100644 --- a/packages/ui/src/components/hover-card.tsx +++ b/packages/ui/src/components/hover-card.tsx @@ -2,7 +2,7 @@ import { PreviewCard as PreviewCardPrimitive } from "@base-ui/react/preview-card" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function HoverCard({ ...props }: PreviewCardPrimitive.Root.Props) { return diff --git a/packages/ui/src/components/input-group.tsx b/packages/ui/src/components/input-group.tsx index d3680a5..607347d 100644 --- a/packages/ui/src/components/input-group.tsx +++ b/packages/ui/src/components/input-group.tsx @@ -1,10 +1,10 @@ import * as React from "react" import { cva, type VariantProps } from "class-variance-authority" -import { cn } from "@workspace/ui/lib/utils" -import { Button } from "@workspace/ui/components/button" -import { Input } from "@workspace/ui/components/input" -import { Textarea } from "@workspace/ui/components/textarea" +import { cn } from "../lib/utils" +import { Button } from "./button" +import { Input } from "./input" +import { Textarea } from "./textarea" function InputGroup({ className, ...props }: React.ComponentProps<"div">) { return ( diff --git a/packages/ui/src/components/input-otp.tsx b/packages/ui/src/components/input-otp.tsx index 92b2fce..c4755ed 100644 --- a/packages/ui/src/components/input-otp.tsx +++ b/packages/ui/src/components/input-otp.tsx @@ -1,8 +1,8 @@ import * as React from "react" import { OTPInput, OTPInputContext } from "input-otp" -import { cn } from "@workspace/ui/lib/utils" -import { MinusIcon } from "@workspace/ui/components/icon" +import { cn } from "../lib/utils" +import { MinusIcon } from "./icon" function InputOTP({ className, diff --git a/packages/ui/src/components/input.tsx b/packages/ui/src/components/input.tsx index 9c5924a..c43a106 100644 --- a/packages/ui/src/components/input.tsx +++ b/packages/ui/src/components/input.tsx @@ -1,7 +1,7 @@ import * as React from "react" import { Input as InputPrimitive } from "@base-ui/react/input" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function Input({ className, type, ...props }: React.ComponentProps<"input">) { return ( diff --git a/packages/ui/src/components/item.tsx b/packages/ui/src/components/item.tsx index 22d27ab..efacc7b 100644 --- a/packages/ui/src/components/item.tsx +++ b/packages/ui/src/components/item.tsx @@ -3,8 +3,8 @@ import { mergeProps } from "@base-ui/react/merge-props" import { useRender } from "@base-ui/react/use-render" import { cva, type VariantProps } from "class-variance-authority" -import { cn } from "@workspace/ui/lib/utils" -import { Separator } from "@workspace/ui/components/separator" +import { cn } from "../lib/utils" +import { Separator } from "./separator" function ItemGroup({ className, ...props }: React.ComponentProps<"div">) { return ( diff --git a/packages/ui/src/components/kbd.tsx b/packages/ui/src/components/kbd.tsx index d904a86..8a4e3b6 100644 --- a/packages/ui/src/components/kbd.tsx +++ b/packages/ui/src/components/kbd.tsx @@ -1,4 +1,4 @@ -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function Kbd({ className, ...props }: React.ComponentProps<"kbd">) { return ( diff --git a/packages/ui/src/components/label.tsx b/packages/ui/src/components/label.tsx index 1424d7c..3e315a6 100644 --- a/packages/ui/src/components/label.tsx +++ b/packages/ui/src/components/label.tsx @@ -2,7 +2,7 @@ import * as React from "react" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function Label({ className, ...props }: React.ComponentProps<"label">) { return ( diff --git a/packages/ui/src/components/marker.tsx b/packages/ui/src/components/marker.tsx index 4e7a986..877d081 100644 --- a/packages/ui/src/components/marker.tsx +++ b/packages/ui/src/components/marker.tsx @@ -3,7 +3,7 @@ import { mergeProps } from "@base-ui/react/merge-props" import { useRender } from "@base-ui/react/use-render" import { cva, type VariantProps } from "class-variance-authority" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" const markerVariants = cva( "group/marker relative flex min-h-4 w-full items-center gap-2 text-start text-sm text-muted-foreground [&_svg:not([class*='size-'])]:size-4 [a]:underline [a]:underline-offset-3 [a]:hover:text-foreground", @@ -28,9 +28,7 @@ function Marker({ return useRender({ defaultTagName: "div", props: mergeProps<"div">( - { - className: cn(markerVariants({ variant, className })), - }, + { className: cn(markerVariants({ variant, className })) }, props ), render, diff --git a/packages/ui/src/components/menubar.tsx b/packages/ui/src/components/menubar.tsx index 1d1ae53..21cb005 100644 --- a/packages/ui/src/components/menubar.tsx +++ b/packages/ui/src/components/menubar.tsx @@ -2,7 +2,7 @@ import * as React from "react" import { Menu as MenuPrimitive } from "@base-ui/react/menu" import { Menubar as MenubarPrimitive } from "@base-ui/react/menubar" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" import { DropdownMenu, DropdownMenuContent, @@ -17,8 +17,8 @@ import { DropdownMenuSubContent, DropdownMenuSubTrigger, DropdownMenuTrigger, -} from "@workspace/ui/components/dropdown-menu" -import { CheckIcon } from "@workspace/ui/components/icon" +} from "./dropdown-menu" +import { CheckIcon } from "./icon" function Menubar({ className, ...props }: MenubarPrimitive.Props) { return ( diff --git a/packages/ui/src/components/message-scroller.tsx b/packages/ui/src/components/message-scroller.tsx index d0a9bda..426786d 100644 --- a/packages/ui/src/components/message-scroller.tsx +++ b/packages/ui/src/components/message-scroller.tsx @@ -6,9 +6,9 @@ import { useMessageScrollerVisibility, } from "@shadcn/react/message-scroller" -import { cn } from "@workspace/ui/lib/utils" -import { Button } from "@workspace/ui/components/button" -import { ArrowDownIcon } from "@workspace/ui/components/icon" +import { cn } from "../lib/utils" +import { Button } from "./button" +import { ArrowDownIcon } from "./icon" function MessageScrollerProvider( props: React.ComponentProps diff --git a/packages/ui/src/components/message.tsx b/packages/ui/src/components/message.tsx index 4d7054b..aceb6a8 100644 --- a/packages/ui/src/components/message.tsx +++ b/packages/ui/src/components/message.tsx @@ -1,6 +1,6 @@ import * as React from "react" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function MessageGroup({ className, ...props }: React.ComponentProps<"div">) { return ( diff --git a/packages/ui/src/components/native-select.tsx b/packages/ui/src/components/native-select.tsx index 9a1c741..20191bf 100644 --- a/packages/ui/src/components/native-select.tsx +++ b/packages/ui/src/components/native-select.tsx @@ -1,7 +1,7 @@ import * as React from "react" -import { cn } from "@workspace/ui/lib/utils" -import { ChevronDownIcon } from "@workspace/ui/components/icon" +import { cn } from "../lib/utils" +import { ChevronDownIcon } from "./icon" type NativeSelectProps = Omit, "size"> & { size?: "sm" | "default" diff --git a/packages/ui/src/components/navigation-menu.tsx b/packages/ui/src/components/navigation-menu.tsx index 0a3b88c..82e5fb3 100644 --- a/packages/ui/src/components/navigation-menu.tsx +++ b/packages/ui/src/components/navigation-menu.tsx @@ -1,8 +1,8 @@ import { NavigationMenu as NavigationMenuPrimitive } from "@base-ui/react/navigation-menu" import { cva } from "class-variance-authority" -import { cn } from "@workspace/ui/lib/utils" -import { ChevronDownIcon } from "@workspace/ui/components/icon" +import { cn } from "../lib/utils" +import { ChevronDownIcon } from "./icon" function NavigationMenu({ align = "start", diff --git a/packages/ui/src/components/pagination.tsx b/packages/ui/src/components/pagination.tsx index 0980d1b..fd3b0db 100644 --- a/packages/ui/src/components/pagination.tsx +++ b/packages/ui/src/components/pagination.tsx @@ -1,12 +1,8 @@ import * as React from "react" -import { cn } from "@workspace/ui/lib/utils" -import { Button } from "@workspace/ui/components/button" -import { - ChevronLeftIcon, - ChevronRightIcon, - MoreHorizontalIcon, -} from "@workspace/ui/components/icon" +import { cn } from "../lib/utils" +import { Button } from "./button" +import { ChevronLeftIcon, ChevronRightIcon, MoreHorizontalIcon } from "./icon" import { LocalizedText, uiMessages, useMessage } from "./i18n" function Pagination({ diff --git a/packages/ui/src/components/popover.tsx b/packages/ui/src/components/popover.tsx index 0d23e89..d9b9037 100644 --- a/packages/ui/src/components/popover.tsx +++ b/packages/ui/src/components/popover.tsx @@ -7,8 +7,8 @@ import { AnchoredSurfaceArrow, type AnchoredSurfaceProps, getAnchoredSurfaceSideOffset, -} from "@workspace/ui/components/anchored-surface" -import { cn } from "@workspace/ui/lib/utils" +} from "./anchored-surface" +import { cn } from "../lib/utils" type PopoverHandle = PopoverPrimitive.Handle diff --git a/packages/ui/src/components/progress.tsx b/packages/ui/src/components/progress.tsx index 1532968..f345f4d 100644 --- a/packages/ui/src/components/progress.tsx +++ b/packages/ui/src/components/progress.tsx @@ -2,7 +2,7 @@ import { Progress as ProgressPrimitive } from "@base-ui/react/progress" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function Progress({ className, diff --git a/packages/ui/src/components/radio-group.tsx b/packages/ui/src/components/radio-group.tsx index c500abe..36b63e0 100644 --- a/packages/ui/src/components/radio-group.tsx +++ b/packages/ui/src/components/radio-group.tsx @@ -1,7 +1,7 @@ import { Radio as RadioPrimitive } from "@base-ui/react/radio" import { RadioGroup as RadioGroupPrimitive } from "@base-ui/react/radio-group" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function RadioGroup({ className, ...props }: RadioGroupPrimitive.Props) { return ( diff --git a/packages/ui/src/components/resizable.tsx b/packages/ui/src/components/resizable.tsx index 2299497..cab1bb0 100644 --- a/packages/ui/src/components/resizable.tsx +++ b/packages/ui/src/components/resizable.tsx @@ -2,7 +2,7 @@ import * as ResizablePrimitive from "react-resizable-panels" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function ResizablePanelGroup({ className, diff --git a/packages/ui/src/components/scroll-area.tsx b/packages/ui/src/components/scroll-area.tsx index 3582dee..d37a03d 100644 --- a/packages/ui/src/components/scroll-area.tsx +++ b/packages/ui/src/components/scroll-area.tsx @@ -1,6 +1,6 @@ import { ScrollArea as ScrollAreaPrimitive } from "@base-ui/react/scroll-area" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function ScrollArea({ className, diff --git a/packages/ui/src/components/select.tsx b/packages/ui/src/components/select.tsx index f85024a..e0b4ee0 100644 --- a/packages/ui/src/components/select.tsx +++ b/packages/ui/src/components/select.tsx @@ -3,12 +3,8 @@ import * as React from "react" import { Select as SelectPrimitive } from "@base-ui/react/select" -import { cn } from "@workspace/ui/lib/utils" -import { - ChevronDownIcon, - CheckIcon, - ChevronUpIcon, -} from "@workspace/ui/components/icon" +import { cn } from "../lib/utils" +import { ChevronDownIcon, CheckIcon, ChevronUpIcon } from "./icon" const Select = SelectPrimitive.Root diff --git a/packages/ui/src/components/separator.tsx b/packages/ui/src/components/separator.tsx index eae1e67..672308e 100644 --- a/packages/ui/src/components/separator.tsx +++ b/packages/ui/src/components/separator.tsx @@ -1,6 +1,6 @@ import { Separator as SeparatorPrimitive } from "@base-ui/react/separator" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function Separator({ className, diff --git a/packages/ui/src/components/sheet.tsx b/packages/ui/src/components/sheet.tsx index 5bc950b..8cf80bb 100644 --- a/packages/ui/src/components/sheet.tsx +++ b/packages/ui/src/components/sheet.tsx @@ -3,9 +3,9 @@ import * as React from "react" import { Dialog as SheetPrimitive } from "@base-ui/react/dialog" -import { cn } from "@workspace/ui/lib/utils" -import { Button } from "@workspace/ui/components/button" -import { XIcon } from "@workspace/ui/components/icon" +import { cn } from "../lib/utils" +import { Button } from "./button" +import { XIcon } from "./icon" import { LocalizedText, uiMessages } from "./i18n" function createSheetHandle(): SheetPrimitive.Handle { diff --git a/packages/ui/src/components/sidebar.tsx b/packages/ui/src/components/sidebar.tsx index 255be0e..72ce4ed 100644 --- a/packages/ui/src/components/sidebar.tsx +++ b/packages/ui/src/components/sidebar.tsx @@ -4,24 +4,20 @@ import { useRender } from "@base-ui/react/use-render" import { cva, type VariantProps } from "class-variance-authority" import { useIsMobile } from "@workspace/ui/hooks/use-mobile" -import { cn } from "@workspace/ui/lib/utils" -import { Button } from "@workspace/ui/components/button" -import { Input } from "@workspace/ui/components/input" -import { Separator } from "@workspace/ui/components/separator" +import { cn } from "../lib/utils" +import { Button } from "./button" +import { Input } from "./input" +import { Separator } from "./separator" import { Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle, -} from "@workspace/ui/components/sheet" -import { Skeleton } from "@workspace/ui/components/skeleton" -import { - Tooltip, - TooltipContent, - TooltipTrigger, -} from "@workspace/ui/components/tooltip" -import { PanelLeftIcon } from "@workspace/ui/components/icon" +} from "./sheet" +import { Skeleton } from "./skeleton" +import { Tooltip, TooltipContent, TooltipTrigger } from "./tooltip" +import { PanelLeftIcon } from "./icon" import { LocalizedText, uiMessages, useMessage } from "./i18n" const SIDEBAR_COOKIE_NAME = "sidebar_state" diff --git a/packages/ui/src/components/skeleton.tsx b/packages/ui/src/components/skeleton.tsx index d93ccf3..67837b3 100644 --- a/packages/ui/src/components/skeleton.tsx +++ b/packages/ui/src/components/skeleton.tsx @@ -1,4 +1,4 @@ -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function Skeleton({ className, ...props }: React.ComponentProps<"div">) { return ( diff --git a/packages/ui/src/components/slider.tsx b/packages/ui/src/components/slider.tsx index 72c07d9..7b76221 100644 --- a/packages/ui/src/components/slider.tsx +++ b/packages/ui/src/components/slider.tsx @@ -1,6 +1,6 @@ import { Slider as SliderPrimitive } from "@base-ui/react/slider" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function Slider({ className, diff --git a/packages/ui/src/components/spinner.tsx b/packages/ui/src/components/spinner.tsx index b053f77..bc9bd71 100644 --- a/packages/ui/src/components/spinner.tsx +++ b/packages/ui/src/components/spinner.tsx @@ -1,8 +1,5 @@ -import { cn } from "@workspace/ui/lib/utils" -import { - Loader2Icon, - type IconComponentProps, -} from "@workspace/ui/components/icon" +import { cn } from "../lib/utils" +import { Loader2Icon, type IconComponentProps } from "./icon" import { uiMessages, useMessage } from "./i18n" function Spinner({ className, ...props }: IconComponentProps) { diff --git a/packages/ui/src/components/switch.tsx b/packages/ui/src/components/switch.tsx index 121358a..58093d8 100644 --- a/packages/ui/src/components/switch.tsx +++ b/packages/ui/src/components/switch.tsx @@ -2,7 +2,7 @@ import { Switch as SwitchPrimitive } from "@base-ui/react/switch" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function Switch({ className, diff --git a/packages/ui/src/components/table.tsx b/packages/ui/src/components/table.tsx index 6f484dd..ecdb059 100644 --- a/packages/ui/src/components/table.tsx +++ b/packages/ui/src/components/table.tsx @@ -1,6 +1,6 @@ import * as React from "react" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function Table({ className, ...props }: React.ComponentProps<"table">) { return ( diff --git a/packages/ui/src/components/tabs.tsx b/packages/ui/src/components/tabs.tsx index d77686c..15bba8e 100644 --- a/packages/ui/src/components/tabs.tsx +++ b/packages/ui/src/components/tabs.tsx @@ -3,7 +3,7 @@ import { Tabs as TabsPrimitive } from "@base-ui/react/tabs" import { cva, type VariantProps } from "class-variance-authority" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function Tabs({ className, diff --git a/packages/ui/src/components/textarea.tsx b/packages/ui/src/components/textarea.tsx index 6c3fa2f..c5b624b 100644 --- a/packages/ui/src/components/textarea.tsx +++ b/packages/ui/src/components/textarea.tsx @@ -1,6 +1,6 @@ import * as React from "react" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" function Textarea({ className, ...props }: React.ComponentProps<"textarea">) { return ( diff --git a/packages/ui/src/components/toast.tsx b/packages/ui/src/components/toast.tsx index 59dc163..9e8ec00 100644 --- a/packages/ui/src/components/toast.tsx +++ b/packages/ui/src/components/toast.tsx @@ -1,8 +1,8 @@ import * as React from "react" import { Toast as ToastPrimitive } from "@base-ui/react/toast" -import { cn } from "@workspace/ui/lib/utils" -import { Button } from "@workspace/ui/components/button" +import { cn } from "../lib/utils" +import { Button } from "./button" import { XIcon, CircleCheckIcon, @@ -10,7 +10,7 @@ import { TriangleAlertIcon, OctagonXIcon, Loader2Icon, -} from "@workspace/ui/components/icon" +} from "./icon" import { uiMessages, useMessage } from "./i18n" const toast = ToastPrimitive.createToastManager() diff --git a/packages/ui/src/components/toggle-group.tsx b/packages/ui/src/components/toggle-group.tsx index 2ca89c1..6ce29ec 100644 --- a/packages/ui/src/components/toggle-group.tsx +++ b/packages/ui/src/components/toggle-group.tsx @@ -5,8 +5,8 @@ import { Toggle as TogglePrimitive } from "@base-ui/react/toggle" import { ToggleGroup as ToggleGroupPrimitive } from "@base-ui/react/toggle-group" import { type VariantProps } from "class-variance-authority" -import { cn } from "@workspace/ui/lib/utils" -import { toggleVariants } from "@workspace/ui/components/toggle" +import { cn } from "../lib/utils" +import { toggleVariants } from "./toggle" const ToggleGroupContext = React.createContext< VariantProps & { diff --git a/packages/ui/src/components/toggle.tsx b/packages/ui/src/components/toggle.tsx index 145970d..f97c50c 100644 --- a/packages/ui/src/components/toggle.tsx +++ b/packages/ui/src/components/toggle.tsx @@ -1,7 +1,7 @@ import { Toggle as TogglePrimitive } from "@base-ui/react/toggle" import { cva, type VariantProps } from "class-variance-authority" -import { cn } from "@workspace/ui/lib/utils" +import { cn } from "../lib/utils" const toggleVariants = cva( "group/toggle inline-flex items-center justify-center gap-1 rounded-md text-sm font-medium whitespace-nowrap transition-[color,box-shadow] outline-none hover:bg-muted hover:text-foreground focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 aria-pressed:bg-muted dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4", diff --git a/packages/ui/src/components/tooltip.tsx b/packages/ui/src/components/tooltip.tsx index 5e3e185..a88374d 100644 --- a/packages/ui/src/components/tooltip.tsx +++ b/packages/ui/src/components/tooltip.tsx @@ -8,8 +8,8 @@ import { AnchoredSurfaceArrow, type AnchoredSurfaceProps, getAnchoredSurfaceSideOffset, -} from "@workspace/ui/components/anchored-surface" -import { cn } from "@workspace/ui/lib/utils" +} from "./anchored-surface" +import { cn } from "../lib/utils" function TooltipProvider({ delay = 0,