sync with latest

zeevo · Mar 14, 2024 · bfb8542 · bfb8542
1 parent 38c714d
commit bfb8542
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/packages/shadcn-ui/src/components/ui/alert-dialog.tsx b/packages/shadcn-ui/src/components/ui/alert-dialog.tsx
@@ -4,7 +4,7 @@ import * as React from "react"
 import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog"
 
 import { cn } from "../../lib/utils"
-import { buttonVariants } from "./button"
+import { buttonVariants } from "../../components/ui/button"
 
 const AlertDialog = AlertDialogPrimitive.Root
 

diff --git a/packages/shadcn-ui/src/components/ui/breadcrumb.tsx b/packages/shadcn-ui/src/components/ui/breadcrumb.tsx
@@ -83,7 +83,7 @@ const BreadcrumbSeparator = ({
     className={cn("[&>svg]:size-3.5", className)}
     {...props}
   >
-    {children || <ChevronRightIcon />}
+    {children ?? <ChevronRightIcon />}
   </li>
 )
 BreadcrumbSeparator.displayName = "BreadcrumbSeparator"

diff --git a/packages/shadcn-ui/src/components/ui/calendar.tsx b/packages/shadcn-ui/src/components/ui/calendar.tsx
@@ -5,7 +5,7 @@ import { ChevronLeftIcon, ChevronRightIcon } from "@radix-ui/react-icons"
 import { DayPicker } from "react-day-picker"
 
 import { cn } from "../../lib/utils"
-import { buttonVariants } from "./button"
+import { buttonVariants } from "../../components/ui/button"
 
 export type CalendarProps = React.ComponentProps<typeof DayPicker>
 

diff --git a/packages/shadcn-ui/src/components/ui/carousel.tsx b/packages/shadcn-ui/src/components/ui/carousel.tsx
@@ -7,7 +7,7 @@ import useEmblaCarousel, {
 } from "embla-carousel-react"
 
 import { cn } from "../../lib/utils"
-import { Button } from "./button"
+import { Button } from "../../components/ui/button"
 
 type CarouselApi = UseEmblaCarouselType[1]
 type UseCarouselParameters = Parameters<typeof useEmblaCarousel>

diff --git a/packages/shadcn-ui/src/components/ui/command.tsx b/packages/shadcn-ui/src/components/ui/command.tsx
@@ -6,7 +6,7 @@ import { MagnifyingGlassIcon } from "@radix-ui/react-icons"
 import { Command as CommandPrimitive } from "cmdk"
 
 import { cn } from "../../lib/utils"
-import { Dialog, DialogContent } from "./dialog"
+import { Dialog, DialogContent } from "@/components/ui/dialog"
 
 const Command = React.forwardRef<
   React.ElementRef<typeof CommandPrimitive>,

diff --git a/packages/shadcn-ui/src/components/ui/form.tsx b/packages/shadcn-ui/src/components/ui/form.tsx
@@ -11,7 +11,7 @@ import {
 } from "react-hook-form"
 
 import { cn } from "../../lib/utils"
-import { Label } from "./label"
+import { Label } from "@/components/ui/label"
 
 const Form = FormProvider
 

diff --git a/packages/shadcn-ui/src/components/ui/pagination.tsx b/packages/shadcn-ui/src/components/ui/pagination.tsx
@@ -6,7 +6,7 @@ import {
 } from "@radix-ui/react-icons"
 
 import { cn } from "../../lib/utils"
-import { ButtonProps, buttonVariants } from "./button"
+import { ButtonProps, buttonVariants } from "../../components/ui/button"
 
 const Pagination = ({ className, ...props }: React.ComponentProps<"nav">) => (
   <nav

diff --git a/packages/shadcn-ui/src/components/ui/toaster.tsx b/packages/shadcn-ui/src/components/ui/toaster.tsx
@@ -7,8 +7,8 @@ import {
   ToastProvider,
   ToastTitle,
   ToastViewport,
-} from "./toast"
-import { useToast } from "./use-toast"
+} from "@/components/ui/toast"
+import { useToast } from "@/components/ui/use-toast"
 
 export function Toaster() {
   const { toasts } = useToast()

diff --git a/packages/shadcn-ui/src/components/ui/toggle-group.tsx b/packages/shadcn-ui/src/components/ui/toggle-group.tsx
@@ -5,7 +5,7 @@ import * as ToggleGroupPrimitive from "@radix-ui/react-toggle-group"
 import { VariantProps } from "class-variance-authority"
 
 import { cn } from "../../lib/utils"
-import { toggleVariants } from "./toggle"
+import { toggleVariants } from "@/components/ui/toggle"
 
 const ToggleGroupContext = React.createContext<
   VariantProps<typeof toggleVariants>

diff --git a/packages/shadcn-ui/src/components/ui/use-toast.ts b/packages/shadcn-ui/src/components/ui/use-toast.ts
@@ -6,7 +6,7 @@ import * as React from "react"
 import type {
   ToastActionElement,
   ToastProps,
-} from "./toast"
+} from "@/components/ui/toast"
 
 const TOAST_LIMIT = 1
 const TOAST_REMOVE_DELAY = 1000000