Updated UI package to work with the new Shadcn CLI (#59)

Updated UI package to work with the new Shadcn CLI

packages/ui/src/shadcn/accordion.tsx

@@ -5,7 +5,7 @@ import * as React from 'react';
 import * as AccordionPrimitive from '@radix-ui/react-accordion';
 import { ChevronDownIcon } from '@radix-ui/react-icons';
 
-import { cn } from '../utils';
+import { cn } from '../lib/utils';
 
 const Accordion = AccordionPrimitive.Root;
 

packages/ui/src/shadcn/alert-dialog.tsx

@@ -4,7 +4,7 @@ import * as React from 'react';
 
 import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 import { buttonVariants } from './button';
 
 const AlertDialog = AlertDialogPrimitive.Root;

packages/ui/src/shadcn/alert.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 
 import { type VariantProps, cva } from 'class-variance-authority';
 
-import { cn } from '../utils';
+import { cn } from '../lib/utils';
 
 const alertVariants = cva(
   'relative w-full bg-gradient-to-r rounded-lg border px-4 py-3 text-sm [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground [&>svg~*]:pl-7',

packages/ui/src/shadcn/avatar.tsx

@@ -4,7 +4,7 @@ import * as React from 'react';
 
 import * as AvatarPrimitive from '@radix-ui/react-avatar';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 const Avatar = React.forwardRef<
   React.ElementRef<typeof AvatarPrimitive.Root>,

packages/ui/src/shadcn/badge.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 
 import { type VariantProps, cva } from 'class-variance-authority';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 const badgeVariants = cva(
   'inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2',

packages/ui/src/shadcn/breadcrumb.tsx

@@ -3,7 +3,7 @@ import * as React from 'react';
 import { ChevronRightIcon, DotsHorizontalIcon } from '@radix-ui/react-icons';
 import { Slot } from '@radix-ui/react-slot';
 
-import { cn } from '../utils';
+import { cn } from '../lib/utils';
 
 const Breadcrumb = React.forwardRef<
   HTMLElement,

packages/ui/src/shadcn/button.tsx

@@ -4,7 +4,7 @@ import { Slot } from '@radix-ui/react-slot';
 import { cva } from 'class-variance-authority';
 import type { VariantProps } from 'class-variance-authority';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 const buttonVariants = cva(
   'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50',

packages/ui/src/shadcn/calendar.tsx

@@ -5,7 +5,7 @@ import * as React from 'react';
 import { ChevronLeft, ChevronRight } from 'lucide-react';
 import { DayPicker } from 'react-day-picker';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 import { buttonVariants } from './button';
 
 export type { DateRange } from 'react-day-picker';

packages/ui/src/shadcn/card.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 const Card = React.forwardRef<
   HTMLDivElement,

packages/ui/src/shadcn/chart.tsx

@@ -4,7 +4,7 @@ import * as React from 'react';
 
 import * as RechartsPrimitive from 'recharts';
 
-import { cn } from '../utils';
+import { cn } from '../lib/utils';
 
 // Format: { THEME_NAME: CSS_SELECTOR }
 const THEMES = { light: '', dark: '.dark' } as const;

packages/ui/src/shadcn/checkbox.tsx

@@ -5,7 +5,7 @@ import * as React from 'react';
 import * as CheckboxPrimitive from '@radix-ui/react-checkbox';
 import { CheckIcon } from '@radix-ui/react-icons';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 const Checkbox = React.forwardRef<
   React.ElementRef<typeof CheckboxPrimitive.Root>,

packages/ui/src/shadcn/command.tsx

@@ -6,7 +6,7 @@ import { type DialogProps } from '@radix-ui/react-dialog';
 import { MagnifyingGlassIcon } from '@radix-ui/react-icons';
 import { Command as CommandPrimitive } from 'cmdk';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 import { Dialog, DialogContent } from './dialog';
 
 const Command = React.forwardRef<

packages/ui/src/shadcn/dialog.tsx

@@ -5,7 +5,7 @@ import * as React from 'react';
 import * as DialogPrimitive from '@radix-ui/react-dialog';
 import { Cross2Icon } from '@radix-ui/react-icons';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 const Dialog = DialogPrimitive.Root;
 

packages/ui/src/shadcn/dropdown-menu.tsx

@@ -9,7 +9,7 @@ import {
   DotFilledIcon,
 } from '@radix-ui/react-icons';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 const DropdownMenu = DropdownMenuPrimitive.Root;
 

packages/ui/src/shadcn/form.tsx

@@ -7,8 +7,8 @@ import { Slot } from '@radix-ui/react-slot';
 import type { ControllerProps, FieldPath, FieldValues } from 'react-hook-form';
 import { Controller, FormProvider, useFormContext } from 'react-hook-form';
 
+import { cn } from '../lib/utils';
 import { Trans } from '../makerkit/trans';
-import { cn } from '../utils';
 import { Label } from './label';
 
 const Form = FormProvider;

packages/ui/src/shadcn/heading.tsx

@@ -1,4 +1,4 @@
-import { cn } from '../utils';
+import { cn } from '../lib/utils';
 
 type Level = 1 | 2 | 3 | 4 | 5 | 6;
 

packages/ui/src/shadcn/index.ts

@@ -1 +1 @@
-export { cn } from '../utils/cn';
+export { cn } from '../lib/utils';

packages/ui/src/shadcn/input-otp.tsx

@@ -5,7 +5,7 @@ import * as React from 'react';
 import { DashIcon } from '@radix-ui/react-icons';
 import { OTPInput, OTPInputContext } from 'input-otp';
 
-import { cn } from '../utils';
+import { cn } from '../lib/utils';
 
 const InputOTP = React.forwardRef<
   React.ElementRef<typeof OTPInput>,

packages/ui/src/shadcn/input.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 export type InputProps = React.InputHTMLAttributes<HTMLInputElement>;
 

packages/ui/src/shadcn/label.tsx

@@ -5,7 +5,7 @@ import * as React from 'react';
 import * as LabelPrimitive from '@radix-ui/react-label';
 import { type VariantProps, cva } from 'class-variance-authority';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 const labelVariants = cva(
   'text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70',

packages/ui/src/shadcn/navigation-menu.tsx

@@ -6,7 +6,7 @@ import { ChevronDownIcon } from '@radix-ui/react-icons';
 import * as NavigationMenuPrimitive from '@radix-ui/react-navigation-menu';
 import { cva } from 'class-variance-authority';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 const NavigationMenu = React.forwardRef<
   React.ElementRef<typeof NavigationMenuPrimitive.Root>,

packages/ui/src/shadcn/popover.tsx

@@ -4,7 +4,7 @@ import * as React from 'react';
 
 import * as PopoverPrimitive from '@radix-ui/react-popover';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 const Popover = PopoverPrimitive.Root;
 

packages/ui/src/shadcn/radio-group.tsx

@@ -5,7 +5,7 @@ import * as React from 'react';
 import { CheckIcon } from '@radix-ui/react-icons';
 import * as RadioGroupPrimitive from '@radix-ui/react-radio-group';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 const RadioGroup = React.forwardRef<
   React.ElementRef<typeof RadioGroupPrimitive.Root>,

packages/ui/src/shadcn/scroll-area.tsx

@@ -4,7 +4,7 @@ import * as React from 'react';
 
 import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 const ScrollArea = React.forwardRef<
   React.ElementRef<typeof ScrollAreaPrimitive.Root>,

packages/ui/src/shadcn/select.tsx

@@ -10,7 +10,7 @@ import {
 } from '@radix-ui/react-icons';
 import * as SelectPrimitive from '@radix-ui/react-select';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 const Select = SelectPrimitive.Root;
 

packages/ui/src/shadcn/separator.tsx

@@ -4,7 +4,7 @@ import * as React from 'react';
 
 import * as SeparatorPrimitive from '@radix-ui/react-separator';
 
-import { cn } from '../utils';
+import { cn } from '../lib/utils';
 
 const Separator = React.forwardRef<
   React.ElementRef<typeof SeparatorPrimitive.Root>,

packages/ui/src/shadcn/sheet.tsx

@@ -7,7 +7,7 @@ import { cva } from 'class-variance-authority';
 import type { VariantProps } from 'class-variance-authority';
 import { X } from 'lucide-react';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 const Sheet = SheetPrimitive.Root;
 

packages/ui/src/shadcn/switch.tsx

@@ -4,7 +4,7 @@ import * as React from 'react';
 
 import * as SwitchPrimitives from '@radix-ui/react-switch';
 
-import { cn } from '@kit/ui/utils';
+import { cn } from '../lib/utils';
 
 const Switch = React.forwardRef<
   React.ElementRef<typeof SwitchPrimitives.Root>,

packages/ui/src/shadcn/table.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 const Table = React.forwardRef<
   HTMLTableElement,

packages/ui/src/shadcn/tabs.tsx

@@ -4,7 +4,7 @@ import * as React from 'react';
 
 import * as TabsPrimitive from '@radix-ui/react-tabs';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 const Tabs = TabsPrimitive.Root;
 

packages/ui/src/shadcn/textarea.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 export type TextareaProps = React.TextareaHTMLAttributes<HTMLTextAreaElement>;
 

packages/ui/src/shadcn/tooltip.tsx

@@ -4,7 +4,7 @@ import * as React from 'react';
 
 import * as TooltipPrimitive from '@radix-ui/react-tooltip';
 
-import { cn } from '../utils/cn';
+import { cn } from '../lib/utils';
 
 const TooltipProvider = TooltipPrimitive.Provider;