Skip to content

Commit 2bd28a2

Browse files
authored
Merge pull request #11 from oasisprotocol/csillag/get-rid-of-at-import-alias
Get rid of the @ path alias
2 parents 45b4b42 + 412e625 commit 2bd28a2

File tree

90 files changed

+171
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+171
-174
lines changed

src/components/ui/accordion.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react'
22
import * as AccordionPrimitive from '@radix-ui/react-accordion'
33
import { ChevronDownIcon } from 'lucide-react'
44

5-
import { cn } from '@/lib/utils'
5+
import { cn } from '../../lib/utils'
66

77
function Accordion({ ...props }: React.ComponentProps<typeof AccordionPrimitive.Root>) {
88
return <AccordionPrimitive.Root data-slot="accordion" {...props} />

src/components/ui/alert-dialog.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import * as React from 'react'
22
import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
33

4-
import { cn } from '@/lib/utils'
5-
import { buttonVariants } from '@/components/ui/button'
4+
import { cn } from '../../lib/utils'
5+
import { buttonVariants } from './button'
66

77
function AlertDialog({ ...props }: React.ComponentProps<typeof AlertDialogPrimitive.Root>) {
88
return <AlertDialogPrimitive.Root data-slot="alert-dialog" {...props} />

src/components/ui/alert.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react'
22
import { cva, type VariantProps } from 'class-variance-authority'
33

4-
import { cn } from '@/lib/utils'
4+
import { cn } from '../../lib/utils'
55

66
const alertVariants = cva(
77
'relative w-full rounded-lg border px-4 py-3 text-sm grid has-[>svg]:grid-cols-[calc(var(--spacing)*4)_1fr] grid-cols-[0_1fr] has-[>svg]:gap-x-3 gap-y-0.5 items-start [&>svg]:size-4 [&>svg]:translate-y-0.5 [&>svg]:text-current',

src/components/ui/avatar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react'
22
import * as AvatarPrimitive from '@radix-ui/react-avatar'
33

4-
import { cn } from '@/lib/utils'
4+
import { cn } from '../../lib/utils'
55

66
function Avatar({ className, ...props }: React.ComponentProps<typeof AvatarPrimitive.Root>) {
77
return (

src/components/ui/badge.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react'
22
import { Slot } from '@radix-ui/react-slot'
33
import { cva, type VariantProps } from 'class-variance-authority'
44

5-
import { cn } from '@/lib/utils'
5+
import { cn } from '../../lib/utils'
66

77
const badgeVariants = cva(
88
'inline-flex items-center justify-center rounded-md border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-hidden',

src/components/ui/breadcrumb.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react'
22
import { Slot } from '@radix-ui/react-slot'
33
import { ChevronRight, MoreHorizontal } from 'lucide-react'
44

5-
import { cn } from '@/lib/utils'
5+
import { cn } from '../..//lib/utils'
66

77
function Breadcrumb({ ...props }: React.ComponentProps<'nav'>) {
88
return <nav aria-label="breadcrumb" data-slot="breadcrumb" {...props} />

src/components/ui/button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react'
22
import { Slot } from '@radix-ui/react-slot'
33
import { cva, type VariantProps } from 'class-variance-authority'
44

5-
import { cn } from '@/lib/utils'
5+
import { cn } from '../../lib/utils'
66

77
const buttonVariants = cva(
88
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",

src/components/ui/calendar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import * as React from 'react'
22
import { ChevronLeft, ChevronRight } from 'lucide-react'
33
import { DayPicker } from 'react-day-picker'
44

5-
import { cn } from '@/lib/utils'
6-
import { buttonVariants } from '@/components/ui/button'
5+
import { cn } from '../../lib/utils'
6+
import { buttonVariants } from './button'
77

88
function Calendar({
99
className,

src/components/ui/card.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react'
22

3-
import { cn } from '@/lib/utils'
3+
import { cn } from '../..//lib/utils'
44

55
function Card({ className, ...props }: React.ComponentProps<'div'>) {
66
return (

src/components/ui/carousel.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import * as React from 'react'
22
import useEmblaCarousel, { type UseEmblaCarouselType } from 'embla-carousel-react'
33
import { ArrowLeft, ArrowRight } from 'lucide-react'
44

5-
import { cn } from '@/lib/utils'
6-
import { Button } from '@/components/ui/button'
5+
import { cn } from '../../lib/utils'
6+
import { Button } from './button'
77

88
type CarouselApi = UseEmblaCarouselType[1]
99
type UseCarouselParameters = Parameters<typeof useEmblaCarousel>

0 commit comments

Comments
 (0)