diff --git a/package-lock.json b/package-lock.json index e0f566f..34389fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -73,7 +73,6 @@ "nostr-tools": "^2.13.0", "npubcash-sdk": "^0.2.0", "qrcode": "^1.5.4", - "radix-ui": "^1.0.1", "react": "^18.3.1", "react-day-picker": "^9.0.0", "react-dom": "^18.3.1", @@ -2810,12 +2809,6 @@ "integrity": "sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==", "license": "MIT" }, - "node_modules/radix-ui": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/radix-ui/-/radix-ui-1.5.0.tgz", - "integrity": "sha512-Nzh2HNpClgB31FBHRqt2xG8XNUfVfQRpf34hACC5PNrXTd5JdXdqOXwLs3BL+D8CNYiNQiJiT8QGr5Q4vq+00w==", - "license": "MIT" - }, "node_modules/@remix-run/router": { "version": "1.23.0", "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.0.tgz", diff --git a/package.json b/package.json index 2a56dd2..26c5a62 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ "@noble/hashes": "^2.0.1", "@nostrify/nostrify": "^0.47.1", "@nostrify/react": "^0.2.17", - "radix-ui": "^1.0.1", "@radix-ui/react-accordion": "^1.2.0", "@radix-ui/react-alert-dialog": "^1.1.1", "@radix-ui/react-aspect-ratio": "^1.1.0", diff --git a/src/components/ui/accordion.tsx b/src/components/ui/accordion.tsx index 41dc721..70c31c4 100644 --- a/src/components/ui/accordion.tsx +++ b/src/components/ui/accordion.tsx @@ -1,6 +1,6 @@ import * as React from "react" import { ChevronDownIcon } from "lucide-react" -import { Accordion as AccordionPrimitive } from "radix-ui" +import * as AccordionPrimitive from "@radix-ui/react-accordion" import { cn } from "@/lib/utils" diff --git a/src/components/ui/alert-dialog.tsx b/src/components/ui/alert-dialog.tsx index dad3273..f9684af 100644 --- a/src/components/ui/alert-dialog.tsx +++ b/src/components/ui/alert-dialog.tsx @@ -1,7 +1,7 @@ "use client" import * as React from "react" -import { AlertDialog as AlertDialogPrimitive } from "radix-ui" +import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog" import { cn } from "@/lib/utils" import { Button } from "@/components/ui/button" diff --git a/src/components/ui/aspect-ratio.tsx b/src/components/ui/aspect-ratio.tsx index 57e38fa..3df3fd0 100644 --- a/src/components/ui/aspect-ratio.tsx +++ b/src/components/ui/aspect-ratio.tsx @@ -1,6 +1,6 @@ "use client" -import { AspectRatio as AspectRatioPrimitive } from "radix-ui" +import * as AspectRatioPrimitive from "@radix-ui/react-aspect-ratio" function AspectRatio({ ...props diff --git a/src/components/ui/avatar.tsx b/src/components/ui/avatar.tsx index 52ef0c0..2c8c55b 100644 --- a/src/components/ui/avatar.tsx +++ b/src/components/ui/avatar.tsx @@ -1,5 +1,5 @@ import * as React from "react" -import { Avatar as AvatarPrimitive } from "radix-ui" +import * as AvatarPrimitive from "@radix-ui/react-avatar" import { cn } from "@/lib/utils" diff --git a/src/components/ui/badge.tsx b/src/components/ui/badge.tsx index c0a0c96..0405843 100644 --- a/src/components/ui/badge.tsx +++ b/src/components/ui/badge.tsx @@ -1,6 +1,6 @@ import * as React from "react" import { type VariantProps } from "class-variance-authority" -import { Slot } from "radix-ui" +import { Slot } from "@radix-ui/react-slot" import { cn } from "@/lib/utils" import { badgeVariants } from "./badge-variants" diff --git a/src/components/ui/breadcrumb.tsx b/src/components/ui/breadcrumb.tsx index f0fa16e..ac16e0b 100644 --- a/src/components/ui/breadcrumb.tsx +++ b/src/components/ui/breadcrumb.tsx @@ -1,6 +1,6 @@ import * as React from "react" import { ChevronRight, MoreHorizontal } from "lucide-react" -import { Slot } from "radix-ui" +import { Slot } from "@radix-ui/react-slot" import { cn } from "@/lib/utils" diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx index 6ffa461..2878414 100644 --- a/src/components/ui/button.tsx +++ b/src/components/ui/button.tsx @@ -1,6 +1,6 @@ import * as React from "react" import { type VariantProps } from "class-variance-authority" -import { Slot } from "radix-ui" +import { Slot } from "@radix-ui/react-slot" import { cn } from "@/lib/utils" import { buttonVariants } from "./button-variants" diff --git a/src/components/ui/checkbox.tsx b/src/components/ui/checkbox.tsx index 9cced71..016ff2e 100644 --- a/src/components/ui/checkbox.tsx +++ b/src/components/ui/checkbox.tsx @@ -1,6 +1,6 @@ import * as React from "react" import { CheckIcon } from "lucide-react" -import { Checkbox as CheckboxPrimitive } from "radix-ui" +import * as CheckboxPrimitive from "@radix-ui/react-checkbox" import { cn } from "@/lib/utils" diff --git a/src/components/ui/collapsible.tsx b/src/components/ui/collapsible.tsx index 2f7a4e7..ae9fad0 100644 --- a/src/components/ui/collapsible.tsx +++ b/src/components/ui/collapsible.tsx @@ -1,6 +1,6 @@ "use client" -import { Collapsible as CollapsiblePrimitive } from "radix-ui" +import * as CollapsiblePrimitive from "@radix-ui/react-collapsible" function Collapsible({ ...props diff --git a/src/components/ui/context-menu.tsx b/src/components/ui/context-menu.tsx index 60f80af..7ed40b8 100644 --- a/src/components/ui/context-menu.tsx +++ b/src/components/ui/context-menu.tsx @@ -1,6 +1,6 @@ import * as React from "react" import { CheckIcon, ChevronRightIcon, CircleIcon } from "lucide-react" -import { ContextMenu as ContextMenuPrimitive } from "radix-ui" +import * as ContextMenuPrimitive from "@radix-ui/react-context-menu" import { cn } from "@/lib/utils" diff --git a/src/components/ui/dialog.tsx b/src/components/ui/dialog.tsx index 84bdef4..c3ee070 100644 --- a/src/components/ui/dialog.tsx +++ b/src/components/ui/dialog.tsx @@ -2,7 +2,7 @@ import * as React from "react" import { XIcon } from "lucide-react" -import { Dialog as DialogPrimitive } from "radix-ui" +import * as DialogPrimitive from "@radix-ui/react-dialog" import { cn } from "@/lib/utils" import { Button } from "@/components/ui/button" diff --git a/src/components/ui/dropdown-menu.tsx b/src/components/ui/dropdown-menu.tsx index 0b46dfd..c2289e1 100644 --- a/src/components/ui/dropdown-menu.tsx +++ b/src/components/ui/dropdown-menu.tsx @@ -2,7 +2,7 @@ import * as React from "react" import { CheckIcon, ChevronRightIcon, CircleIcon } from "lucide-react" -import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui" +import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu" import { cn } from "@/lib/utils" diff --git a/src/components/ui/form.tsx b/src/components/ui/form.tsx index 6413e9d..13c58bb 100644 --- a/src/components/ui/form.tsx +++ b/src/components/ui/form.tsx @@ -1,6 +1,6 @@ import * as React from "react" -import type { Label as LabelPrimitive } from "radix-ui" -import { Slot } from "radix-ui" +import type * as LabelPrimitive from "@radix-ui/react-label" +import { Slot } from "@radix-ui/react-slot" import { Controller, FormProvider, diff --git a/src/components/ui/hover-card.tsx b/src/components/ui/hover-card.tsx index 08be724..9a33922 100644 --- a/src/components/ui/hover-card.tsx +++ b/src/components/ui/hover-card.tsx @@ -1,5 +1,5 @@ import * as React from "react" -import { HoverCard as HoverCardPrimitive } from "radix-ui" +import * as HoverCardPrimitive from "@radix-ui/react-hover-card" import { cn } from "@/lib/utils" diff --git a/src/components/ui/label.tsx b/src/components/ui/label.tsx index f752f82..ef7133a 100644 --- a/src/components/ui/label.tsx +++ b/src/components/ui/label.tsx @@ -1,5 +1,5 @@ import * as React from "react" -import { Label as LabelPrimitive } from "radix-ui" +import * as LabelPrimitive from "@radix-ui/react-label" import { cn } from "@/lib/utils" diff --git a/src/components/ui/menubar.tsx b/src/components/ui/menubar.tsx index d73fc3a..a346e4f 100644 --- a/src/components/ui/menubar.tsx +++ b/src/components/ui/menubar.tsx @@ -2,7 +2,7 @@ import * as React from "react" import { CheckIcon, ChevronRightIcon, CircleIcon } from "lucide-react" -import { Menubar as MenubarPrimitive } from "radix-ui" +import * as MenubarPrimitive from "@radix-ui/react-menubar" import { cn } from "@/lib/utils" diff --git a/src/components/ui/navigation-menu.tsx b/src/components/ui/navigation-menu.tsx index ec6b368..2fba4db 100644 --- a/src/components/ui/navigation-menu.tsx +++ b/src/components/ui/navigation-menu.tsx @@ -1,6 +1,6 @@ import * as React from "react" import { ChevronDownIcon } from "lucide-react" -import { NavigationMenu as NavigationMenuPrimitive } from "radix-ui" +import * as NavigationMenuPrimitive from "@radix-ui/react-navigation-menu" import { cn } from "@/lib/utils" import { navigationMenuTriggerStyle } from "./navigation-menu-variants" diff --git a/src/components/ui/popover.tsx b/src/components/ui/popover.tsx index 4182075..223d4d5 100644 --- a/src/components/ui/popover.tsx +++ b/src/components/ui/popover.tsx @@ -1,5 +1,5 @@ import * as React from "react" -import { Popover as PopoverPrimitive } from "radix-ui" +import * as PopoverPrimitive from "@radix-ui/react-popover" import { cn } from "@/lib/utils" diff --git a/src/components/ui/progress.tsx b/src/components/ui/progress.tsx index 5a0a5a6..9cdcda4 100644 --- a/src/components/ui/progress.tsx +++ b/src/components/ui/progress.tsx @@ -1,7 +1,7 @@ "use client" import * as React from "react" -import { Progress as ProgressPrimitive } from "radix-ui" +import * as ProgressPrimitive from "@radix-ui/react-progress" import { cn } from "@/lib/utils" diff --git a/src/components/ui/radio-group.tsx b/src/components/ui/radio-group.tsx index 20416f0..d82469b 100644 --- a/src/components/ui/radio-group.tsx +++ b/src/components/ui/radio-group.tsx @@ -1,6 +1,6 @@ import * as React from "react" import { CircleIcon } from "lucide-react" -import { RadioGroup as RadioGroupPrimitive } from "radix-ui" +import * as RadioGroupPrimitive from "@radix-ui/react-radio-group" import { cn } from "@/lib/utils" diff --git a/src/components/ui/scroll-area.tsx b/src/components/ui/scroll-area.tsx index e38a492..b585ddf 100644 --- a/src/components/ui/scroll-area.tsx +++ b/src/components/ui/scroll-area.tsx @@ -1,5 +1,5 @@ import * as React from "react" -import { ScrollArea as ScrollAreaPrimitive } from "radix-ui" +import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area" import { cn } from "@/lib/utils" diff --git a/src/components/ui/select.tsx b/src/components/ui/select.tsx index 269c90b..4cbb538 100644 --- a/src/components/ui/select.tsx +++ b/src/components/ui/select.tsx @@ -2,7 +2,7 @@ import * as React from "react" import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react" -import { Select as SelectPrimitive } from "radix-ui" +import * as SelectPrimitive from "@radix-ui/react-select" import { cn } from "@/lib/utils" diff --git a/src/components/ui/separator.tsx b/src/components/ui/separator.tsx index db91e97..46aa225 100644 --- a/src/components/ui/separator.tsx +++ b/src/components/ui/separator.tsx @@ -1,5 +1,5 @@ import * as React from "react" -import { Separator as SeparatorPrimitive } from "radix-ui" +import * as SeparatorPrimitive from "@radix-ui/react-separator" import { cn } from "@/lib/utils" diff --git a/src/components/ui/sheet.tsx b/src/components/ui/sheet.tsx index cb53bb2..9aea72f 100644 --- a/src/components/ui/sheet.tsx +++ b/src/components/ui/sheet.tsx @@ -2,7 +2,7 @@ import * as React from "react" import { XIcon } from "lucide-react" -import { Dialog as SheetPrimitive } from "radix-ui" +import * as SheetPrimitive from "@radix-ui/react-dialog" import { cn } from "@/lib/utils" diff --git a/src/components/ui/sidebar.tsx b/src/components/ui/sidebar.tsx index 24f1306..6cd3c19 100644 --- a/src/components/ui/sidebar.tsx +++ b/src/components/ui/sidebar.tsx @@ -3,7 +3,7 @@ import * as React from "react" import { type VariantProps } from "class-variance-authority" import { PanelLeftIcon } from "lucide-react" -import { Slot } from "radix-ui" +import { Slot } from "@radix-ui/react-slot" import { useIsMobile } from "@/hooks/useIsMobile" import { cn } from "@/lib/utils" diff --git a/src/components/ui/slider.tsx b/src/components/ui/slider.tsx index 07f5fbc..a3d86a9 100644 --- a/src/components/ui/slider.tsx +++ b/src/components/ui/slider.tsx @@ -1,5 +1,5 @@ import * as React from "react" -import { Slider as SliderPrimitive } from "radix-ui" +import * as SliderPrimitive from "@radix-ui/react-slider" import { cn } from "@/lib/utils" diff --git a/src/components/ui/switch.tsx b/src/components/ui/switch.tsx index 8baa844..d420898 100644 --- a/src/components/ui/switch.tsx +++ b/src/components/ui/switch.tsx @@ -1,7 +1,7 @@ "use client" import * as React from "react" -import { Switch as SwitchPrimitive } from "radix-ui" +import * as SwitchPrimitive from "@radix-ui/react-switch" import { cn } from "@/lib/utils" diff --git a/src/components/ui/tabs.tsx b/src/components/ui/tabs.tsx index 3e36652..959d5d4 100644 --- a/src/components/ui/tabs.tsx +++ b/src/components/ui/tabs.tsx @@ -2,7 +2,7 @@ import * as React from "react" import { type VariantProps } from "class-variance-authority" -import { Tabs as TabsPrimitive } from "radix-ui" +import * as TabsPrimitive from "@radix-ui/react-tabs" import { cn } from "@/lib/utils" import { tabsListVariants } from "./tabs-variants" diff --git a/src/components/ui/toggle-group.tsx b/src/components/ui/toggle-group.tsx index 686246f..360c51e 100644 --- a/src/components/ui/toggle-group.tsx +++ b/src/components/ui/toggle-group.tsx @@ -2,7 +2,7 @@ import * as React from "react" import { type VariantProps } from "class-variance-authority" -import { ToggleGroup as ToggleGroupPrimitive } from "radix-ui" +import * as ToggleGroupPrimitive from "@radix-ui/react-toggle-group" import { cn } from "@/lib/utils" import { toggleVariants } from "@/components/ui/toggle-variants" diff --git a/src/components/ui/toggle.tsx b/src/components/ui/toggle.tsx index 428171b..172ea6f 100644 --- a/src/components/ui/toggle.tsx +++ b/src/components/ui/toggle.tsx @@ -1,6 +1,6 @@ import * as React from "react" import { type VariantProps } from "class-variance-authority" -import { Toggle as TogglePrimitive } from "radix-ui" +import * as TogglePrimitive from "@radix-ui/react-toggle" import { cn } from "@/lib/utils" import { toggleVariants } from "./toggle-variants" diff --git a/src/components/ui/tooltip.tsx b/src/components/ui/tooltip.tsx index 453def2..36d7368 100644 --- a/src/components/ui/tooltip.tsx +++ b/src/components/ui/tooltip.tsx @@ -1,5 +1,5 @@ import * as React from "react" -import { Tooltip as TooltipPrimitive } from "radix-ui" +import * as TooltipPrimitive from "@radix-ui/react-tooltip" import { cn } from "@/lib/utils"