Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

chore: Remove tsconfig paths (#49770)

Ivan Vasilov02cf09212edf
diff --git a/apps/design-system/app/(app)/page.tsx b/apps/design-system/app/(app)/page.tsx
index 14b69506f78..c8a6e7d3d78 100644
--- a/apps/design-system/app/(app)/page.tsx
+++ b/apps/design-system/app/(app)/page.tsx
@@ -1,4 +1,4 @@
-import { Auth, Database, Realtime } from 'icons/src/icons'
+import { Auth, Database, Realtime } from 'icons'
import { Paintbrush } from 'lucide-react'
import Link from 'next/link'
diff --git a/apps/design-system/components/colors.tsx b/apps/design-system/components/colors.tsx
index 5a0660ac63a..23948a3802a 100644
--- a/apps/design-system/components/colors.tsx
+++ b/apps/design-system/components/colors.tsx
@@ -1,9 +1,10 @@
import { useState } from 'react'
-import { cn } from 'ui'
-import color from 'ui/src/lib/tailwind-demo-classes'
+import { cn, colors } from 'ui'
import { Grid, GridItem } from './grid'
+const color = colors['default']
+
const Colors = ({
definition,
}: {
diff --git a/apps/design-system/content/docs/components/alert.mdx b/apps/design-system/content/docs/components/alert.mdx
index f5c277e7c21..f688e7e79c4 100644
--- a/apps/design-system/content/docs/components/alert.mdx
+++ b/apps/design-system/content/docs/components/alert.mdx
@@ -18,7 +18,7 @@ Use [Collapsible Alert](../fragments/collapsible-alert) when a callout also need
## Usage
```tsx
-import { Alert, AlertDescription, AlertTitle } from 'ui/src/components/shadcn/ui/alert'
+import { Alert, AlertDescription, AlertTitle } from 'ui'
```
```tsx
@@ -36,5 +36,5 @@ import { Alert, AlertDescription, AlertTitle } from 'ui/src/components/shadcn/ui
Use `alertVariants` when building shared wrappers around the primitive.
```tsx
-import { alertVariants } from 'ui/src/components/shadcn/ui/alert'
+import { alertVariants } from 'ui'
```
diff --git a/apps/design-system/content/docs/components/collapsible.mdx b/apps/design-system/content/docs/components/collapsible.mdx
index 7eb271478ed..3b6b31bd1ff 100644
--- a/apps/design-system/content/docs/components/collapsible.mdx
+++ b/apps/design-system/content/docs/components/collapsible.mdx
@@ -13,11 +13,7 @@ Use Collapsible for generic disclosure behaviour: rows, sections, menus, tool de
## Usage
```tsx
-import {
- Collapsible,
- CollapsibleContent,
- CollapsibleTrigger,
-} from 'ui/src/components/shadcn/ui/collapsible'
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'
```
```tsx
diff --git a/apps/design-system/registry/default/example/commandmenu-badge.tsx b/apps/design-system/registry/default/example/commandmenu-badge.tsx
index edeb2f3df2f..d048bba3104 100644
--- a/apps/design-system/registry/default/example/commandmenu-badge.tsx
+++ b/apps/design-system/registry/default/example/commandmenu-badge.tsx
@@ -1,4 +1,4 @@
-import { Button } from '@ui/components/shadcn/ui/button'
+import { Button } from 'ui'
import {
BadgeExperimental,
CommandMenu,
diff --git a/apps/design-system/registry/default/example/commandmenu-conditional.tsx b/apps/design-system/registry/default/example/commandmenu-conditional.tsx
index 2be767247be..711c8e6e355 100644
--- a/apps/design-system/registry/default/example/commandmenu-conditional.tsx
+++ b/apps/design-system/registry/default/example/commandmenu-conditional.tsx
@@ -1,5 +1,5 @@
-import { Button } from '@ui/components/shadcn/ui/button'
import { useMemo, useState } from 'react'
+import { Button } from 'ui'
import {
CommandMenu,
CommandMenuInput,
diff --git a/apps/design-system/registry/default/example/commandmenu-demo.tsx b/apps/design-system/registry/default/example/commandmenu-demo.tsx
index e4df0a43850..1f8bd002fcc 100644
--- a/apps/design-system/registry/default/example/commandmenu-demo.tsx
+++ b/apps/design-system/registry/default/example/commandmenu-demo.tsx
@@ -1,4 +1,4 @@
-import { Button } from '@ui/components/shadcn/ui/button'
+import { Button } from 'ui'
import {
CommandMenu,
CommandMenuInput,
diff --git a/apps/design-system/registry/default/example/commandmenu-force.tsx b/apps/design-system/registry/default/example/commandmenu-force.tsx
index b7f297d3ba2..9ddee6bf754 100644
--- a/apps/design-system/registry/default/example/commandmenu-force.tsx
+++ b/apps/design-system/registry/default/example/commandmenu-force.tsx
@@ -1,4 +1,4 @@
-import { Button } from '@ui/components/shadcn/ui/button'
+import { Button } from 'ui'
import {
CommandMenu,
CommandMenuInput,
diff --git a/apps/design-system/registry/default/example/commandmenu-hidden.tsx b/apps/design-system/registry/default/example/commandmenu-hidden.tsx
index 3e693b32b60..ebecc132593 100644
--- a/apps/design-system/registry/default/example/commandmenu-hidden.tsx
+++ b/apps/design-system/registry/default/example/commandmenu-hidden.tsx
@@ -1,4 +1,4 @@
-import { Button } from '@ui/components/shadcn/ui/button'
+import { Button } from 'ui'
import {
CommandMenu,
CommandMenuInput,
diff --git a/apps/design-system/registry/default/example/commandmenu-icon.tsx b/apps/design-system/registry/default/example/commandmenu-icon.tsx
index 7de6da43f0c..407888b2144 100644
--- a/apps/design-system/registry/default/example/commandmenu-icon.tsx
+++ b/apps/design-system/registry/default/example/commandmenu-icon.tsx
@@ -1,5 +1,5 @@
-import { Button } from '@ui/components/shadcn/ui/button'
import { Github } from 'lucide-react'
+import { Button } from 'ui'
import {
CommandMenu,
CommandMenuInput,
diff --git a/apps/design-system/registry/default/example/commandmenu-subpage-custom.tsx b/apps/design-system/registry/default/example/commandmenu-subpage-custom.tsx
index 93f833dbae5..8c74449289d 100644
--- a/apps/design-system/registry/default/example/commandmenu-subpage-custom.tsx
+++ b/apps/design-system/registry/default/example/commandmenu-subpage-custom.tsx
@@ -1,4 +1,4 @@
-import { Button } from '@ui/components/shadcn/ui/button'
+import { Button } from 'ui'
import {
Breadcrumb,
CommandMenu,
diff --git a/apps/design-system/registry/default/example/commandmenu-subpage.tsx b/apps/design-system/registry/default/example/commandmenu-subpage.tsx
index 3bc2112c669..49530f45b62 100644
--- a/apps/design-system/registry/default/example/commandmenu-subpage.tsx
+++ b/apps/design-system/registry/default/example/commandmenu-subpage.tsx
@@ -1,5 +1,5 @@
-import { Button } from '@ui/components/shadcn/ui/button'
import { useMemo } from 'react'
+import { Button } from 'ui'
import {
CommandMenu,
CommandMenuInput,
diff --git a/apps/design-system/registry/default/example/field-checkbox.tsx b/apps/design-system/registry/default/example/field-checkbox.tsx
index 0d222ae78c9..9eac860240f 100644
--- a/apps/design-system/registry/default/example/field-checkbox.tsx
+++ b/apps/design-system/registry/default/example/field-checkbox.tsx
@@ -1,5 +1,5 @@
-import { Checkbox } from 'ui'
import {
+ Checkbox,
Field,
FieldContent,
FieldDescription,
@@ -8,7 +8,7 @@ import {
FieldLegend,
FieldSeparator,
FieldSet,
-} from 'ui/src/components/shadcn/ui/field'
+} from 'ui'
export default function FieldCheckbox() {
return (
diff --git a/apps/design-system/registry/default/example/field-choice-card.tsx b/apps/design-system/registry/default/example/field-choice-card.tsx
index 26cf6af26ed..b806462644a 100644
--- a/apps/design-system/registry/default/example/field-choice-card.tsx
+++ b/apps/design-system/registry/default/example/field-choice-card.tsx
@@ -6,8 +6,9 @@ import {
FieldLabel,
FieldSet,
FieldTitle,
-} from 'ui/src/components/shadcn/ui/field'
-import { RadioGroup, RadioGroupItem } from 'ui/src/components/shadcn/ui/radio-group'
+ RadioGroup,
+ RadioGroupItem,
+} from 'ui'
export default function FieldChoiceCard() {
return (
diff --git a/apps/design-system/registry/default/example/field-demo.tsx b/apps/design-system/registry/default/example/field-demo.tsx
index 7f73f348158..45cad3c1f18 100644
--- a/apps/design-system/registry/default/example/field-demo.tsx
+++ b/apps/design-system/registry/default/example/field-demo.tsx
@@ -1,5 +1,6 @@
-import { Button, Checkbox, Input, Textarea } from 'ui'
import {
+ Button,
+ Checkbox,
Field,
FieldDescription,
FieldGroup,
@@ -7,14 +8,14 @@ import {
FieldLegend,
FieldSeparator,
FieldSet,
-} from 'ui/src/components/shadcn/ui/field'
-import {
+ Input,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
-} from 'ui/src/components/shadcn/ui/select'
+ Textarea,
+} from 'ui'
export default function FieldDemo() {
return (
diff --git a/apps/design-system/registry/default/example/field-fieldset.tsx b/apps/design-system/registry/default/example/field-fieldset.tsx
index a91c1d4d86e..7d3cb96a02e 100644
--- a/apps/design-system/registry/default/example/field-fieldset.tsx
+++ b/apps/design-system/registry/default/example/field-fieldset.tsx
@@ -1,12 +1,4 @@
-import { Input } from 'ui'
-import {
- Field,
- FieldDescription,
- FieldGroup,
- FieldLabel,
- FieldLegend,
- FieldSet,
-} from 'ui/src/components/shadcn/ui/field'
+import { Field, FieldDescription, FieldGroup, FieldLabel, FieldLegend, FieldSet, Input } from 'ui'
export default function FieldFieldset() {
return (
diff --git a/apps/design-system/registry/default/example/field-group.tsx b/apps/design-system/registry/default/example/field-group.tsx
index 73b66eaf8e0..f8a2d7a55d8 100644
--- a/apps/design-system/registry/default/example/field-group.tsx
+++ b/apps/design-system/registry/default/example/field-group.tsx
@@ -1,12 +1,12 @@
-import { Checkbox } from 'ui'
import {
+ Checkbox,
Field,
FieldDescription,
FieldGroup,
FieldLabel,
FieldSeparator,
FieldSet,
-} from 'ui/src/components/shadcn/ui/field'
+} from 'ui'
export default function FieldGroupExample() {
return (
diff --git a/apps/design-system/registry/default/example/field-hear.tsx b/apps/design-system/registry/default/example/field-hear.tsx
index 80bee715127..87bdd25843e 100644
--- a/apps/design-system/registry/default/example/field-hear.tsx
+++ b/apps/design-system/registry/default/example/field-hear.tsx
@@ -1,5 +1,7 @@
-import { Card, CardContent, Checkbox } from 'ui'
import {
+ Card,
+ CardContent,
+ Checkbox,
Field,
FieldDescription,
FieldGroup,
@@ -7,7 +9,7 @@ import {
FieldLegend,
FieldSet,
FieldTitle,
-} from 'ui/src/components/shadcn/ui/field'
+} from 'ui'
const options = [
{
diff --git a/apps/design-system/registry/default/example/field-input.tsx b/apps/design-system/registry/default/example/field-input.tsx
index 17eee8e9b2b..f027cc5325a 100644
--- a/apps/design-system/registry/default/example/field-input.tsx
+++ b/apps/design-system/registry/default/example/field-input.tsx
@@ -1,11 +1,4 @@
-import { Input } from 'ui'
-import {
- Field,
- FieldDescription,
- FieldGroup,
- FieldLabel,
- FieldSet,
-} from 'ui/src/components/shadcn/ui/field'
+import { Field, FieldDescription, FieldGroup, FieldLabel, FieldSet, Input } from 'ui'
export default function FieldInput() {
return (
diff --git a/apps/design-system/registry/default/example/field-radio.tsx b/apps/design-system/registry/default/example/field-radio.tsx
index 59d703a015d..d96420a05ce 100644
--- a/apps/design-system/registry/default/example/field-radio.tsx
+++ b/apps/design-system/registry/default/example/field-radio.tsx
@@ -1,5 +1,4 @@
-import { Field, FieldDescription, FieldLabel, FieldSet } from 'ui/src/components/shadcn/ui/field'
-import { RadioGroup, RadioGroupItem } from 'ui/src/components/shadcn/ui/radio-group'
+import { Field, FieldDescription, FieldLabel, FieldSet, RadioGroup, RadioGroupItem } from 'ui'
export default function FieldRadio() {
return (
diff --git a/apps/design-system/registry/default/example/field-responsive.tsx b/apps/design-system/registry/default/example/field-responsive.tsx
index 568e583485d..c59bbbeb254 100644
--- a/apps/design-system/registry/default/example/field-responsive.tsx
+++ b/apps/design-system/registry/default/example/field-responsive.tsx
@@ -1,5 +1,5 @@
-import { Button, Input, Textarea } from 'ui'
import {
+ Button,
Field,
FieldContent,
FieldDescription,
@@ -8,7 +8,9 @@ import {
FieldLegend,
FieldSeparator,
FieldSet,
-} from 'ui/src/components/shadcn/ui/field'
+ Input,
+ Textarea,
+} from 'ui'
export default function FieldResponsive() {
return (
diff --git a/apps/design-system/registry/default/example/field-select.tsx b/apps/design-system/registry/default/example/field-select.tsx
index be6996b554c..7d9a56c4c1c 100644
--- a/apps/design-system/registry/default/example/field-select.tsx
+++ b/apps/design-system/registry/default/example/field-select.tsx
@@ -1,11 +1,13 @@
-import { Field, FieldDescription, FieldLabel } from 'ui/src/components/shadcn/ui/field'
import {
+ Field,
+ FieldDescription,
+ FieldLabel,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
-} from 'ui/src/components/shadcn/ui/select'
+} from 'ui'
export default function FieldSelect() {
return (
diff --git a/apps/design-system/registry/default/example/field-slider.tsx b/apps/design-system/registry/default/example/field-slider.tsx
index 6f7fb54d7ab..26822ce0781 100644
--- a/apps/design-system/registry/default/example/field-slider.tsx
+++ b/apps/design-system/registry/default/example/field-slider.tsx
@@ -1,8 +1,7 @@
'use client'
import { useState } from 'react'
-import { Slider } from 'ui'
-import { Field, FieldDescription, FieldTitle } from 'ui/src/components/shadcn/ui/field'
+import { Field, FieldDescription, FieldTitle, Slider } from 'ui'
export default function FieldSlider() {
const [value, setValue] = useState([200, 800])
diff --git a/apps/design-system/registry/default/example/field-switch.tsx b/apps/design-system/registry/default/example/field-switch.tsx
index ba08cec8f4d..9601fe5df76 100644
--- a/apps/design-system/registry/default/example/field-switch.tsx
+++ b/apps/design-system/registry/default/example/field-switch.tsx
@@ -1,10 +1,4 @@
-import { Switch } from 'ui'
-import {
- Field,
- FieldContent,
- FieldDescription,
- FieldLabel,
-} from 'ui/src/components/shadcn/ui/field'
+import { Field, FieldContent, FieldDescription, FieldLabel, Switch } from 'ui'
export default function FieldSwitch() {
return (
diff --git a/apps/design-system/registry/default/example/field-textarea.tsx b/apps/design-system/registry/default/example/field-textarea.tsx
index 91980c1d3fd..df43668d625 100644
--- a/apps/design-system/registry/default/example/field-textarea.tsx
+++ b/apps/design-system/registry/default/example/field-textarea.tsx
@@ -1,11 +1,4 @@
-import { Textarea } from 'ui'
-import {
- Field,
- FieldDescription,
- FieldGroup,
- FieldLabel,
- FieldSet,
-} from 'ui/src/components/shadcn/ui/field'
+import { Field, FieldDescription, FieldGroup, FieldLabel, FieldSet, Textarea } from 'ui'
export default function FieldTextarea() {
return (
diff --git a/apps/design-system/tsconfig.json b/apps/design-system/tsconfig.json
index d96c6722dbf..c52f02adc4b 100644
--- a/apps/design-system/tsconfig.json
+++ b/apps/design-system/tsconfig.json
@@ -6,7 +6,6 @@
"lib": ["dom", "dom.iterable", "esnext"],
"paths": {
"@/*": ["./*"],
- "@ui/*": ["./../../packages/ui/src/*"], // handle ui package paths
"contentlayer/generated": ["./.contentlayer/generated"],
"icons/*": ["./../../packages/icons/*"]
},
diff --git a/apps/docs/app/guides/getting-started/ai-skills/AiSkillsIndex.tsx b/apps/docs/app/guides/getting-started/ai-skills/AiSkillsIndex.tsx
index 0d04fd700cc..d9a58e69a46 100644
--- a/apps/docs/app/guides/getting-started/ai-skills/AiSkillsIndex.tsx
+++ b/apps/docs/app/guides/getting-started/ai-skills/AiSkillsIndex.tsx
@@ -1,5 +1,5 @@
+import { Heading } from 'ui'
import { CodeBlock } from 'ui-patterns/CodeBlock'
-import Heading from 'ui/src/components/CustomHTMLElements/Heading'
import { getAiSkills } from './AiSkills.utils'
diff --git a/apps/docs/app/guides/local-development/cli/config/page.tsx b/apps/docs/app/guides/local-development/cli/config/page.tsx
index 8461b6baeb4..f01fe0562a1 100644
--- a/apps/docs/app/guides/local-development/cli/config/page.tsx
+++ b/apps/docs/app/guides/local-development/cli/config/page.tsx
@@ -4,8 +4,8 @@ import { genGuideMeta } from '~/features/docs/GuidesMdx.utils'
import type { Parameter } from '~/lib/refGenerator/refTypes'
import specFile from '~/spec/cli_v1_config.yaml' with { type: 'yml' }
import ReactMarkdown from 'react-markdown'
+import { Heading } from 'ui'
import { CodeBlock } from 'ui-patterns/CodeBlock'
-import { Heading } from 'ui/src/components/CustomHTMLElements'
const meta = {
title: 'Supabase CLI config',
diff --git a/apps/docs/components/ContentListings/ContentListings.client.tsx b/apps/docs/components/ContentListings/ContentListings.client.tsx
index 2e699cbd2d6..fc9e817f278 100644
--- a/apps/docs/components/ContentListings/ContentListings.client.tsx
+++ b/apps/docs/components/ContentListings/ContentListings.client.tsx
@@ -11,9 +11,8 @@ import { useSendTelemetryEvent } from '~/lib/telemetry'
import Link from 'next/link'
import { useCallback, useMemo } from 'react'
import ReactMarkdown from 'react-markdown'
-import { Badge } from 'ui'
+import { Badge, Heading } from 'ui'
import { GlassPanel } from 'ui-patterns/GlassPanel'
-import { Heading } from 'ui/src/components/CustomHTMLElements'
import { resolveContentListingIcon } from './iconChip'
diff --git a/apps/docs/features/docs/MdxBase.shared.tsx b/apps/docs/features/docs/MdxBase.shared.tsx
index 78d5347b573..a7124288ec4 100644
--- a/apps/docs/features/docs/MdxBase.shared.tsx
+++ b/apps/docs/features/docs/MdxBase.shared.tsx
@@ -33,11 +33,10 @@ import { TabPanel, Tabs } from '~/features/ui/Tabs'
import { ArrowDown, Check, X } from 'lucide-react'
import Link from 'next/link'
import { type ComponentPropsWithoutRef } from 'react'
-import { Badge, Button } from 'ui'
+import { Badge, Button, Heading } from 'ui'
import { Admonition, type AdmonitionProps } from 'ui-patterns/Admonition'
import { GlassPanel } from 'ui-patterns/GlassPanel'
import SqlToRest from 'ui-patterns/SqlToRest'
-import { Heading } from 'ui/src/components/CustomHTMLElements'
import { AgentPluginsPanel } from '../ui/AgentPluginsPanel'
import { AiPrompt } from '../ui/AiPrompt'
diff --git a/apps/docs/layouts/ref/RefSubLayout.tsx b/apps/docs/layouts/ref/RefSubLayout.tsx
index 4aa5101ff71..e30ed7989fe 100644
--- a/apps/docs/layouts/ref/RefSubLayout.tsx
+++ b/apps/docs/layouts/ref/RefSubLayout.tsx
@@ -1,12 +1,11 @@
-import { useInView } from 'react-intersection-observer'
-import { FC, PropsWithChildren } from 'react'
-import { highlightSelectedNavItem } from 'ui/src/components/CustomHTMLElements/CustomHTMLElements.utils'
-import { useRouter } from 'next/compat/router'
import { useNavigationMenuContext } from '~/components/Navigation/NavigationMenu/NavigationMenu.Context'
import { menuState } from '~/hooks/useMenuState'
-import Image from 'next/legacy/image'
-import { cn } from 'ui'
import { safeHistoryReplaceState } from '~/lib/historyUtils'
+import { useRouter } from 'next/compat/router'
+import Image from 'next/legacy/image'
+import { FC, PropsWithChildren } from 'react'
+import { useInView } from 'react-intersection-observer'
+import { cn, highlightSelectedNavItem } from 'ui'
interface ISectionContainer {
id: string
diff --git a/apps/docs/layouts/ref/RefSubLayoutNonFunc.tsx b/apps/docs/layouts/ref/RefSubLayoutNonFunc.tsx
index c6f466e32f5..0c6e465315a 100644
--- a/apps/docs/layouts/ref/RefSubLayoutNonFunc.tsx
+++ b/apps/docs/layouts/ref/RefSubLayoutNonFunc.tsx
@@ -1,10 +1,10 @@
-import { useInView } from 'react-intersection-observer'
-import { FC, PropsWithChildren } from 'react'
-import { highlightSelectedNavItem } from 'ui/src/components/CustomHTMLElements/CustomHTMLElements.utils'
-import { useRouter } from 'next/compat/router'
import { useNavigationMenuContext } from '~/components/Navigation/NavigationMenu/NavigationMenu.Context'
import { menuState } from '~/hooks/useMenuState'
import { safeHistoryReplaceState } from '~/lib/historyUtils'
+import { useRouter } from 'next/compat/router'
+import { FC, PropsWithChildren } from 'react'
+import { useInView } from 'react-intersection-observer'
+import { highlightSelectedNavItem } from 'ui'
interface ISectionContainer {
id: string
diff --git a/apps/learn/tsconfig.json b/apps/learn/tsconfig.json
index 3ea68ca96d8..2a94aacb8e9 100644
--- a/apps/learn/tsconfig.json
+++ b/apps/learn/tsconfig.json
@@ -6,7 +6,6 @@
// @deprecated: Don't import directly without suffix. Use @/ always.
"*": ["./*"],
"@/*": ["./*"],
- "@ui/*": ["./../../packages/ui/src/*"], // handle ui package paths
"contentlayer/generated": ["./.contentlayer/generated"]
},
"plugins": [{ "name": "next" }],
diff --git a/apps/studio/components/interfaces/APIKeys/ApiKeyPill.tsx b/apps/studio/components/interfaces/APIKeys/ApiKeyPill.tsx
index b46c07b230d..f4b6f6e6c43 100644
--- a/apps/studio/components/interfaces/APIKeys/ApiKeyPill.tsx
+++ b/apps/studio/components/interfaces/APIKeys/ApiKeyPill.tsx
@@ -1,10 +1,9 @@
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { InputVariants } from '@ui/components/shadcn/ui/input'
import { useParams } from 'common'
import { Eye, EyeOff } from 'lucide-react'
import { useEffect, useState } from 'react'
import { toast } from 'sonner'
-import { Button, cn, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
+import { Button, cn, InputVariants, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
import { useRevealedSecret } from './useRevealedSecret'
import CopyButton from '@/components/ui/CopyButton'
diff --git a/apps/studio/components/interfaces/APIKeys/SecretAPIKeys.tsx b/apps/studio/components/interfaces/APIKeys/SecretAPIKeys.tsx
index 366fa02005a..a863818bf62 100644
--- a/apps/studio/components/interfaces/APIKeys/SecretAPIKeys.tsx
+++ b/apps/studio/components/interfaces/APIKeys/SecretAPIKeys.tsx
@@ -3,15 +3,8 @@ import { IS_PLATFORM, useParams } from 'common'
import { parseAsString, useQueryState } from 'nuqs'
import { useEffect, useMemo } from 'react'
import { toast } from 'sonner'
-import { Card } from 'ui'
+import { Card, Table, TableBody, TableHead, TableHeader, TableRow } from 'ui'
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
-import {
- Table,
- TableBody,
- TableHead,
- TableHeader,
- TableRow,
-} from 'ui/src/components/shadcn/ui/table'
import { APIKeyRow } from './APIKeyRow'
import { CreateSecretAPIKeyDialog } from './CreateSecretAPIKeyDialog'
diff --git a/apps/studio/components/interfaces/Account/AccessTokens/AccessTokenList.tsx b/apps/studio/components/interfaces/Account/AccessTokens/AccessTokenList.tsx
index 72de6b84163..b95ba903350 100644
--- a/apps/studio/components/interfaces/Account/AccessTokens/AccessTokenList.tsx
+++ b/apps/studio/components/interfaces/Account/AccessTokens/AccessTokenList.tsx
@@ -8,9 +8,10 @@ import {
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
+ TableCell,
+ TableRow,
} from 'ui'
import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
-import { TableCell, TableRow } from 'ui/src/components/shadcn/ui/table'
import {
ACCESS_TOKEN_SORT_VALUES,
diff --git a/apps/studio/components/interfaces/Account/AccessTokens/AccessTokenTable/RowLoading.tsx b/apps/studio/components/interfaces/Account/AccessTokens/AccessTokenTable/RowLoading.tsx
index 53f799da494..4ef0d8b165f 100644
--- a/apps/studio/components/interfaces/Account/AccessTokens/AccessTokenTable/RowLoading.tsx
+++ b/apps/studio/components/interfaces/Account/AccessTokens/AccessTokenTable/RowLoading.tsx
@@ -1,5 +1,4 @@
-import { Skeleton } from 'ui'
-import { TableCell, TableRow } from 'ui/src/components/shadcn/ui/table'
+import { Skeleton, TableCell, TableRow } from 'ui'
export const RowLoading = () => (
<TableRow>
diff --git a/apps/studio/components/interfaces/Account/AccessTokens/AccessTokenTable/TableContainer.tsx b/apps/studio/components/interfaces/Account/AccessTokens/AccessTokenTable/TableContainer.tsx
index e684a587677..0415a1fb745 100644
--- a/apps/studio/components/interfaces/Account/AccessTokens/AccessTokenTable/TableContainer.tsx
+++ b/apps/studio/components/interfaces/Account/AccessTokens/AccessTokenTable/TableContainer.tsx
@@ -1,12 +1,14 @@
-import { Card, CardContent, cn } from 'ui'
import {
+ Card,
+ CardContent,
+ cn,
Table,
TableBody,
TableHead,
TableHeader,
TableHeadSort,
TableRow,
-} from 'ui/src/components/shadcn/ui/table'
+} from 'ui'
import { AccessTokenSort, AccessTokenSortColumn } from '../AccessToken.types'
diff --git a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx
index 606e6198125..794d865cd2f 100644
--- a/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx
+++ b/apps/studio/components/interfaces/App/FeaturePreview/FeaturePreviewModal.tsx
@@ -20,16 +20,14 @@ import {
DialogSectionSeparator,
DialogTitle,
ScrollArea,
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from 'ui'
-import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
-} from 'ui/src/components/shadcn/ui/select'
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
+} from 'ui'
import { AdvisorRulesPreview } from './AdvisorRulesPreview'
import { CLSPreview } from './CLSPreview'
diff --git a/apps/studio/components/interfaces/Auth/RedirectUrls/AddNewURLModal.tsx b/apps/studio/components/interfaces/Auth/RedirectUrls/AddNewURLModal.tsx
index a468dbc6c96..43eee80ea08 100644
--- a/apps/studio/components/interfaces/Auth/RedirectUrls/AddNewURLModal.tsx
+++ b/apps/studio/components/interfaces/Auth/RedirectUrls/AddNewURLModal.tsx
@@ -1,5 +1,4 @@
import { zodResolver } from '@hookform/resolvers/zod'
-import { Label } from '@ui/components/shadcn/ui/label'
import { useParams } from 'common'
import { useEffect } from 'react'
import { useForm, useWatch } from 'react-hook-form'
@@ -16,6 +15,7 @@ import {
DialogSectionSeparator,
DialogTitle,
Form,
+ Label,
ScrollArea,
} from 'ui'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
diff --git a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/NewPaymentMethodElement.tsx b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/NewPaymentMethodElement.tsx
index c2b2e72f3c3..2aac6747753 100644
--- a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/NewPaymentMethodElement.tsx
+++ b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/NewPaymentMethodElement.tsx
@@ -11,7 +11,6 @@ import {
StripeAddressElementOptions,
type SetupIntent,
} from '@stripe/stripe-js'
-import { Form } from '@ui/components/shadcn/ui/form'
import { Check, ChevronsUpDown, HelpCircle } from 'lucide-react'
import { forwardRef, useEffect, useId, useImperativeHandle, useMemo, useRef, useState } from 'react'
import { useForm, useWatch } from 'react-hook-form'
@@ -26,6 +25,7 @@ import {
CommandInput,
CommandItem,
CommandList,
+ Form,
FormControl,
FormField,
FormItem,
diff --git a/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/QueryError.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/QueryError.tsx
index 3edd410b0d8..735e5124014 100644
--- a/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/QueryError.tsx
+++ b/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/QueryError.tsx
@@ -1,4 +1,3 @@
-import styles from '@ui/layout/ai-icon-animation/ai-icon-animation-style.module.css'
import { initial, last } from 'lodash'
import { Dispatch, SetStateAction } from 'react'
import {
@@ -9,6 +8,7 @@ import {
Collapsible,
CollapsibleContent,
CollapsibleTrigger,
+ aiIconAnimationStyles as styles,
} from 'ui'
import { QueryResponseError } from '@/data/sql/execute-sql-mutation'
diff --git a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.utils.tsx b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.utils.tsx
index 21b02412ecb..689faa5e1d6 100644
--- a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.utils.tsx
+++ b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.utils.tsx
@@ -1,4 +1,4 @@
-import { getAnchor } from '@ui/components/CustomHTMLElements/CustomHTMLElements.utils'
+import { getAnchor } from 'ui'
import { EdgeFunction } from '@/data/edge-functions/edge-function-query'
import { DOCS_URL } from '@/lib/constants'
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx
index 1e98e0e3d25..1ff0eed0e06 100644
--- a/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx
@@ -1,6 +1,5 @@
import { zodResolver } from '@hookform/resolvers/zod'
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { useWatch } from '@ui/components/shadcn/ui/form'
import { useParams } from 'common'
import { parseAsString, useQueryState } from 'nuqs'
import { useEffect, useState } from 'react'
@@ -21,6 +20,7 @@ import {
SheetHeader,
SheetSection,
SheetTitle,
+ useWatch,
WarningIcon,
} from 'ui'
import { Admonition } from 'ui-patterns/Admonition'
diff --git a/apps/studio/components/interfaces/Integrations/Wrappers/InputField.tsx b/apps/studio/components/interfaces/Integrations/Wrappers/InputField.tsx
index 664fb36f4df..c34eb91a652 100644
--- a/apps/studio/components/interfaces/Integrations/Wrappers/InputField.tsx
+++ b/apps/studio/components/interfaces/Integrations/Wrappers/InputField.tsx
@@ -1,8 +1,7 @@
-import { InputVariants } from '@ui/components/shadcn/ui/input'
import { HelpCircle } from 'lucide-react'
import Link from 'next/link'
import type { Control, FieldPath, FieldValues } from 'react-hook-form'
-import { cn, FormControl, FormField, Input, Textarea } from 'ui'
+import { cn, FormControl, FormField, Input, InputVariants, Textarea } from 'ui'
import { Input as PasswordInput } from 'ui-patterns/DataInputs/Input'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.tsx
index a035f9a4650..f8248859abf 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.tsx
@@ -1,12 +1,11 @@
import { zodResolver } from '@hookform/resolvers/zod'
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { Form, FormControl, FormField } from '@ui/components/shadcn/ui/form'
import { useParams } from 'common'
import { useEffect } from 'react'
import { useForm, useWatch } from 'react-hook-form'
import { useInView } from 'react-intersection-observer'
import { toast } from 'sonner'
-import { FormMessage, Input } from 'ui'
+import { Form, FormControl, FormField, FormMessage, Input } from 'ui'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import { InfoTooltip } from 'ui-patterns/info-tooltip'
import {
diff --git a/apps/studio/components/interfaces/Organization/CloudMarketplace/NewAwsMarketplaceOrgModal.tsx b/apps/studio/components/interfaces/Organization/CloudMarketplace/NewAwsMarketplaceOrgModal.tsx
index e5fd1c09424..11c34f1ea1c 100644
--- a/apps/studio/components/interfaces/Organization/CloudMarketplace/NewAwsMarketplaceOrgModal.tsx
+++ b/apps/studio/components/interfaces/Organization/CloudMarketplace/NewAwsMarketplaceOrgModal.tsx
@@ -1,4 +1,7 @@
+import { SubmitHandler } from 'react-hook-form'
+import { toast } from 'sonner'
import {
+ Button,
Dialog,
DialogContent,
DialogDescription,
@@ -7,10 +10,7 @@ import {
DialogSection,
DialogSectionSeparator,
DialogTitle,
-} from '@ui/components/shadcn/ui/dialog'
-import { SubmitHandler } from 'react-hook-form'
-import { toast } from 'sonner'
-import { Button } from 'ui'
+} from 'ui'
import {
CREATE_AWS_MANAGED_ORG_FORM_ID,
diff --git a/apps/studio/components/interfaces/QueryPerformance/QueryIndexes.tsx b/apps/studio/components/interfaces/QueryPerformance/QueryIndexes.tsx
index 5902c8753f1..1fe97d0dcc1 100644
--- a/apps/studio/components/interfaces/QueryPerformance/QueryIndexes.tsx
+++ b/apps/studio/components/interfaces/QueryPerformance/QueryIndexes.tsx
@@ -1,10 +1,10 @@
-import { AccordionTrigger } from '@ui/components/shadcn/ui/accordion'
import { Check, Lightbulb, Table2 } from 'lucide-react'
import { useEffect, useState } from 'react'
import {
Accordion,
AccordionContent,
AccordionItem,
+ AccordionTrigger,
Alert,
AlertDescription,
AlertTitle,
diff --git a/apps/studio/components/interfaces/Reports/ReportFilterBar.tsx b/apps/studio/components/interfaces/Reports/ReportFilterBar.tsx
index 4c3aaba51c5..b3d8aded436 100644
--- a/apps/studio/components/interfaces/Reports/ReportFilterBar.tsx
+++ b/apps/studio/components/interfaces/Reports/ReportFilterBar.tsx
@@ -1,4 +1,3 @@
-import { Popover, PopoverContent, PopoverTrigger } from '@ui/components/shadcn/ui/popover'
import { useParams } from 'common'
import { Auth, Realtime, Storage } from 'icons'
import { ChevronDown, Database, Network, Plus, RefreshCw, X } from 'lucide-react'
@@ -13,6 +12,9 @@ import {
DropdownMenuSeparator,
DropdownMenuTrigger,
Input,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
Select,
SelectContent,
SelectGroup,
diff --git a/apps/studio/components/interfaces/Reports/v2/ReportsNumericFilter.tsx b/apps/studio/components/interfaces/Reports/v2/ReportsNumericFilter.tsx
index f102e68f338..86efb5b81fe 100644
--- a/apps/studio/components/interfaces/Reports/v2/ReportsNumericFilter.tsx
+++ b/apps/studio/components/interfaces/Reports/v2/ReportsNumericFilter.tsx
@@ -1,15 +1,18 @@
-import { Label } from '@ui/components/shadcn/ui/label'
-import { Popover, PopoverContent, PopoverTrigger } from '@ui/components/shadcn/ui/popover'
+import { ChevronDown } from 'lucide-react'
+import { useEffect, useState } from 'react'
import {
+ Button,
+ cn,
+ Label,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
-} from '@ui/components/shadcn/ui/select'
-import { ChevronDown } from 'lucide-react'
-import { useEffect, useState } from 'react'
-import { Button, cn } from 'ui'
+} from 'ui'
import { Input } from 'ui-patterns/DataInputs/Input'
import { z } from 'zod'
diff --git a/apps/studio/components/interfaces/Reports/v2/ReportsSelectFilter.tsx b/apps/studio/components/interfaces/Reports/v2/ReportsSelectFilter.tsx
index 4727ce55c6a..dbb142abc14 100644
--- a/apps/studio/components/interfaces/Reports/v2/ReportsSelectFilter.tsx
+++ b/apps/studio/components/interfaces/Reports/v2/ReportsSelectFilter.tsx
@@ -1,10 +1,20 @@
-import { Checkbox } from '@ui/components/shadcn/ui/checkbox'
-import { CommandGroup } from '@ui/components/shadcn/ui/command'
-import { Label } from '@ui/components/shadcn/ui/label'
-import { Popover, PopoverContent, PopoverTrigger } from '@ui/components/shadcn/ui/popover'
import { ChevronDown } from 'lucide-react'
import { useEffect, useState } from 'react'
-import { Button, cn, Command, CommandEmpty, CommandInput, CommandItem, CommandList } from 'ui'
+import {
+ Button,
+ Checkbox,
+ cn,
+ Command,
+ CommandEmpty,
+ CommandGroup,
+ CommandInput,
+ CommandItem,
+ CommandList,
+ Label,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from 'ui'
import { z } from 'zod'
export interface ReportSelectOption {
diff --git a/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx b/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx
index 89f17a3f8de..fe73a36671f 100644
--- a/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx
+++ b/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx
@@ -1,5 +1,4 @@
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { ContextMenuContent } from '@ui/components/shadcn/ui/context-menu'
import { IS_PLATFORM, useParams } from 'common'
import { Copy, Eye, EyeOff, Play } from 'lucide-react'
import { Key, ReactNode, useCallback, useEffect, useMemo, useRef, useState } from 'react'
@@ -10,6 +9,7 @@ import {
Checkbox,
cn,
ContextMenu,
+ ContextMenuContent,
ContextMenuItem,
ContextMenuTrigger,
copyToClipboard,
diff --git a/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx b/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx
index 811191d918a..bceb9af95fb 100644
--- a/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx
+++ b/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx
@@ -1,5 +1,3 @@
-import { Label } from '@ui/components/shadcn/ui/label'
-import { RadioGroup, RadioGroupItem } from '@ui/components/shadcn/ui/radio-group'
import dayjs from 'dayjs'
import { Clock, HistoryIcon, Lock } from 'lucide-react'
import type { PropsWithChildren } from 'react'
@@ -11,9 +9,12 @@ import {
cn,
copyToClipboard,
Input,
+ Label,
Popover,
PopoverContent,
PopoverTrigger,
+ RadioGroup,
+ RadioGroupItem,
} from 'ui'
import { LOGS_LARGE_DATE_RANGE_DAYS_THRESHOLD } from './Logs.constants'
diff --git a/apps/studio/components/interfaces/Settings/Logs/LogsFilterPopover.tsx b/apps/studio/components/interfaces/Settings/Logs/LogsFilterPopover.tsx
index bd606e42e9a..df7de4a1480 100644
--- a/apps/studio/components/interfaces/Settings/Logs/LogsFilterPopover.tsx
+++ b/apps/studio/components/interfaces/Settings/Logs/LogsFilterPopover.tsx
@@ -1,8 +1,5 @@
-import { Checkbox } from '@ui/components/shadcn/ui/checkbox'
-import { Label } from '@ui/components/shadcn/ui/label'
-import { Popover, PopoverContent, PopoverTrigger } from '@ui/components/shadcn/ui/popover'
import { useEffect, useMemo, useState } from 'react'
-import { Button, cn } from 'ui'
+import { Button, Checkbox, cn, Label, Popover, PopoverContent, PopoverTrigger } from 'ui'
import type { Filters, FilterSet } from './Logs.types'
diff --git a/apps/studio/components/interfaces/Storage/StorageSettings/S3Connection.tsx b/apps/studio/components/interfaces/Storage/StorageSettings/S3Connection.tsx
index f4f54e73b91..725327e2301 100644
--- a/apps/studio/components/interfaces/Storage/StorageSettings/S3Connection.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageSettings/S3Connection.tsx
@@ -1,6 +1,5 @@
import { zodResolver } from '@hookform/resolvers/zod'
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { AlertTitle } from '@ui/components/shadcn/ui/alert'
import { useParams } from 'common'
import Link from 'next/link'
import { useEffect, useState } from 'react'
@@ -9,6 +8,7 @@ import { toast } from 'sonner'
import {
Alert,
AlertDescription,
+ AlertTitle,
Button,
Card,
CardContent,
diff --git a/apps/studio/components/ui/AIAssistantPanel/AssistantChatForm.tsx b/apps/studio/components/ui/AIAssistantPanel/AssistantChatForm.tsx
index 9db5c0488e5..eb92e6c1570 100644
--- a/apps/studio/components/ui/AIAssistantPanel/AssistantChatForm.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/AssistantChatForm.tsx
@@ -1,8 +1,7 @@
import { useBreakpoint } from 'common'
import { ArrowUp, Loader2, Square } from 'lucide-react'
import { ChangeEvent, FormEvent, forwardRef, KeyboardEvent, memo, useRef } from 'react'
-import { ExpandingTextArea } from 'ui'
-import { cn } from 'ui/src/lib/utils'
+import { cn, ExpandingTextArea } from 'ui'
import { ButtonTooltip } from '../ButtonTooltip'
import { formatAttachedSnippets } from './AIAssistant.utils'
diff --git a/apps/studio/components/ui/DatePicker/index.tsx b/apps/studio/components/ui/DatePicker/index.tsx
index df04c8977dd..bf42d1be0ab 100644
--- a/apps/studio/components/ui/DatePicker/index.tsx
+++ b/apps/studio/components/ui/DatePicker/index.tsx
@@ -4,13 +4,13 @@ import { ArrowRight, Calendar } from 'lucide-react'
import { ReactNode, useCallback, useEffect, useMemo, useState } from 'react'
import {
Button,
+ ButtonProps,
Calendar as CalendarPicker,
Popover,
PopoverContent,
PopoverSeparator,
PopoverTrigger,
} from 'ui'
-import { ButtonProps } from 'ui/src/components/Button/Button'
import { TimeSplitInput } from './TimeSplitInput'
import type { DatePickerToFrom } from '@/components/interfaces/Settings/Logs/Logs.types'
diff --git a/apps/studio/components/ui/Shortcut.tsx b/apps/studio/components/ui/Shortcut.tsx
index 7cf020951f6..e166e9c8210 100644
--- a/apps/studio/components/ui/Shortcut.tsx
+++ b/apps/studio/components/ui/Shortcut.tsx
@@ -1,5 +1,5 @@
-import { TooltipContentProps } from '@ui/components/shadcn/ui/tooltip'
import type { ReactNode } from 'react'
+import { TooltipContentProps } from 'ui'
import { ShortcutTooltip } from './ShortcutTooltip'
import type { ShortcutId } from '@/state/shortcuts/registry'
diff --git a/apps/studio/components/ui/ShortcutTooltip.tsx b/apps/studio/components/ui/ShortcutTooltip.tsx
index 23bc80df5b7..0a1b7c68f87 100644
--- a/apps/studio/components/ui/ShortcutTooltip.tsx
+++ b/apps/studio/components/ui/ShortcutTooltip.tsx
@@ -1,7 +1,6 @@
import { HotkeySequence } from '@tanstack/react-hotkeys'
-import { TooltipContentProps } from '@ui/components/shadcn/ui/tooltip'
import { Fragment, useState, type ReactNode } from 'react'
-import { KeyboardShortcut, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
+import { KeyboardShortcut, Tooltip, TooltipContent, TooltipContentProps, TooltipTrigger } from 'ui'
import { hotkeyToKeys } from '@/state/shortcuts/formatShortcut'
import { SHORTCUT_DEFINITIONS, type ShortcutId } from '@/state/shortcuts/registry'
diff --git a/apps/studio/tsconfig.json b/apps/studio/tsconfig.json
index ab88b971924..0a9beb90283 100644
--- a/apps/studio/tsconfig.json
+++ b/apps/studio/tsconfig.json
@@ -7,8 +7,7 @@
"noUnusedParameters": true,
"lib": ["dom", "dom.iterable", "esnext"],
"paths": {
- "@/*": ["./*"],
- "@ui/*": ["./../../packages/ui/src/*"] // handle ui package paths
+ "@/*": ["./*"]
},
"plugins": [{ "name": "next" }],
"jsx": "react-jsx",
diff --git a/apps/www/components/Forms/ApplyToSupaSquadForm.tsx b/apps/www/components/Forms/ApplyToSupaSquadForm.tsx
index 45470d76216..564ed774f31 100644
--- a/apps/www/components/Forms/ApplyToSupaSquadForm.tsx
+++ b/apps/www/components/Forms/ApplyToSupaSquadForm.tsx
@@ -7,6 +7,15 @@ import { AlertCircle } from 'lucide-react'
import { FC, memo, useEffect, useState } from 'react'
import { useForm } from 'react-hook-form'
import {
+ Alert,
+ AlertDescription,
+ AlertDialog,
+ AlertDialogAction,
+ AlertDialogContent,
+ AlertDialogDescription,
+ AlertDialogFooter,
+ AlertDialogHeader,
+ AlertDialogTitle,
Button,
Form,
FormControl,
@@ -26,16 +35,6 @@ import {
MultiSelectorList,
MultiSelectorTrigger,
} from 'ui-patterns/multi-select'
-import { Alert, AlertDescription } from 'ui/src/components/shadcn/ui/alert'
-import {
- AlertDialog,
- AlertDialogAction,
- AlertDialogContent,
- AlertDialogDescription,
- AlertDialogFooter,
- AlertDialogHeader,
- AlertDialogTitle,
-} from 'ui/src/components/shadcn/ui/alert-dialog'
import { CountrySelector } from '../Supasquad/CountrySelector'
diff --git a/apps/www/components/Forms/RequestADemoForm.tsx b/apps/www/components/Forms/RequestADemoForm.tsx
index ebe80dc4eb7..67656f9cf9d 100644
--- a/apps/www/components/Forms/RequestADemoForm.tsx
+++ b/apps/www/components/Forms/RequestADemoForm.tsx
@@ -2,8 +2,7 @@ import { useSendTelemetryEvent } from '~/lib/telemetry'
import { CircleAlert } from 'lucide-react'
import Link from 'next/link'
import { FC, useEffect, useState } from 'react'
-import { Button, cn, Input, Label, Separator, TextArea } from 'ui'
-import { Alert } from 'ui/src/components/shadcn/ui/alert'
+import { Alert, Button, cn, Input, Label, Separator, TextArea } from 'ui'
interface FormData {
firstName: string
diff --git a/apps/www/components/Forms/TalkToPartnershipTeamForm.tsx b/apps/www/components/Forms/TalkToPartnershipTeamForm.tsx
index 64a24982746..4c0dfaaa905 100644
--- a/apps/www/components/Forms/TalkToPartnershipTeamForm.tsx
+++ b/apps/www/components/Forms/TalkToPartnershipTeamForm.tsx
@@ -2,8 +2,7 @@ import { useSendTelemetryEvent } from '~/lib/telemetry'
import { CircleAlert } from 'lucide-react'
import Link from 'next/link'
import { FC, useEffect, useState } from 'react'
-import { Button, cn, Input, Label, Separator, TextArea } from 'ui'
-import { Alert } from 'ui/src/components/shadcn/ui/alert'
+import { Alert, Button, cn, Input, Label, Separator, TextArea } from 'ui'
interface FormData {
firstName: string
diff --git a/apps/www/components/Nav/index.tsx b/apps/www/components/Nav/index.tsx
index 5c20e1fa310..1f45ce23f2e 100644
--- a/apps/www/components/Nav/index.tsx
+++ b/apps/www/components/Nav/index.tsx
@@ -9,17 +9,19 @@ import Link from 'next/link'
import { usePathname } from 'next/navigation'
import React, { useState } from 'react'
import { useWindowSize } from 'react-use'
-import { Button, buttonVariants, cn } from 'ui'
-import { AuthenticatedDropdownMenu } from 'ui-patterns/AuthenticatedDropdownMenu'
-import { AnnouncementBanner } from 'ui-patterns/Banners/AnnouncementBanner'
import {
+ Button,
+ buttonVariants,
+ cn,
NavigationMenu,
NavigationMenuContent,
NavigationMenuItem,
NavigationMenuLink,
NavigationMenuList,
NavigationMenuTrigger,
-} from 'ui/src/components/shadcn/ui/navigation-menu'
+} from 'ui'
+import { AuthenticatedDropdownMenu } from 'ui-patterns/AuthenticatedDropdownMenu'
+import { AnnouncementBanner } from 'ui-patterns/Banners/AnnouncementBanner'
import GitHubButton from './GitHubButton'
import HamburgerButton from './HamburgerMenu'
diff --git a/apps/www/components/Pricing/ComputePricingCalculator.tsx b/apps/www/components/Pricing/ComputePricingCalculator.tsx
index 130d4f6b523..99c4cc43370 100644
--- a/apps/www/components/Pricing/ComputePricingCalculator.tsx
+++ b/apps/www/components/Pricing/ComputePricingCalculator.tsx
@@ -2,10 +2,9 @@ import pricingAddOn from '~/data/PricingAddOnTable.json'
import { Plus, Trash2 } from 'lucide-react'
import { useEffect, useState } from 'react'
import { plans as allPlans } from 'shared-data/plans'
-import { Button, cn, Slider } from 'ui'
+import { Button, cn, Slider, ToggleGroup, ToggleGroupItem } from 'ui'
import { ComputeBadge } from 'ui-patterns/ComputeBadge'
import { InfoTooltip } from 'ui-patterns/info-tooltip'
-import { ToggleGroup, ToggleGroupItem } from 'ui/src/components/shadcn/ui/toggle-group'
const STANDALONE_PLANS = allPlans
.filter((plan) => plan.planId === 'pro' || plan.planId === 'team')
diff --git a/apps/www/components/Pricing/PricingComputeSection.tsx b/apps/www/components/Pricing/PricingComputeSection.tsx
index 861dc6454bc..1d3ff037f7f 100644
--- a/apps/www/components/Pricing/PricingComputeSection.tsx
+++ b/apps/www/components/Pricing/PricingComputeSection.tsx
@@ -5,8 +5,7 @@ import Link from 'next/link'
import React, { useEffect, useRef, useState } from 'react'
import { useWindowSize } from 'react-use'
import { plans as allPlans } from 'shared-data/plans'
-import { Button, cn } from 'ui'
-import { ToggleGroup, ToggleGroupItem } from 'ui/src/components/shadcn/ui/toggle-group'
+import { Button, cn, ToggleGroup, ToggleGroupItem } from 'ui'
import Panel from '../Panel'
import ComputePricingCalculator from './ComputePricingCalculator'
diff --git a/packages/ui-patterns/src/AssistantChat/AssistantChatForm.tsx b/packages/ui-patterns/src/AssistantChat/AssistantChatForm.tsx
index 53d8313dfac..b7a25b85cd8 100644
--- a/packages/ui-patterns/src/AssistantChat/AssistantChatForm.tsx
+++ b/packages/ui-patterns/src/AssistantChat/AssistantChatForm.tsx
@@ -3,8 +3,7 @@
import { useBreakpoint } from 'common'
import { Loader2 } from 'lucide-react'
import React, { ChangeEvent, memo, useRef } from 'react'
-import { ExpandingTextArea } from 'ui'
-import { cn } from 'ui/src/lib/utils'
+import { cn, ExpandingTextArea } from 'ui'
export interface FormProps extends React.FormHTMLAttributes<HTMLFormElement> {
/* The ref for the textarea, optional. Exposed for the CommandsPopover to attach events. */
diff --git a/packages/ui-patterns/src/AssistantChat/AssistantCommandsPopover.tsx b/packages/ui-patterns/src/AssistantChat/AssistantCommandsPopover.tsx
index b4a1226f278..8ef147cb66c 100644
--- a/packages/ui-patterns/src/AssistantChat/AssistantCommandsPopover.tsx
+++ b/packages/ui-patterns/src/AssistantChat/AssistantCommandsPopover.tsx
@@ -12,6 +12,7 @@ import {
useRef,
} from 'react'
import {
+ cn,
Command,
CommandEmpty,
CommandGroup,
@@ -19,9 +20,10 @@ import {
CommandItem,
CommandList,
CommandSeparator,
-} from 'ui/src/components/shadcn/ui/command'
-import { Popover, PopoverAnchor, PopoverContent } from 'ui/src/components/shadcn/ui/popover'
-import { cn } from 'ui/src/lib/utils/cn'
+ Popover,
+ PopoverAnchor,
+ PopoverContent,
+} from 'ui'
const AssistantCommandsPopover = forwardRef<
ComponentRef<typeof Popover>,
diff --git a/packages/ui-patterns/src/Banners/LW15Banner.tsx b/packages/ui-patterns/src/Banners/LW15Banner.tsx
index b5eca5bcd01..29593298609 100644
--- a/packages/ui-patterns/src/Banners/LW15Banner.tsx
+++ b/packages/ui-patterns/src/Banners/LW15Banner.tsx
@@ -3,7 +3,7 @@
import Link from 'next/link'
import { usePathname } from 'next/navigation'
import { useEffect, useRef } from 'react'
-import { Button } from 'ui/src/components/Button'
+import { Button } from 'ui'
import announcement from '../Banners/data.json'
diff --git a/packages/ui-patterns/src/CommandMenu/prepackaged/DocsAi/DocsAiPage.tsx b/packages/ui-patterns/src/CommandMenu/prepackaged/DocsAi/DocsAiPage.tsx
index d9bbf5d7507..113409ae90d 100644
--- a/packages/ui-patterns/src/CommandMenu/prepackaged/DocsAi/DocsAiPage.tsx
+++ b/packages/ui-patterns/src/CommandMenu/prepackaged/DocsAi/DocsAiPage.tsx
@@ -5,9 +5,8 @@ import { User } from 'lucide-react'
import { Fragment, useCallback, useEffect, useRef, useState } from 'react'
import ReactMarkdown from 'react-markdown'
import remarkGfm from 'remark-gfm'
-import { AiIconAnimation, Button, cn, CommandGroup, CommandItem, CommandList } from 'ui'
+import { AiIconAnimation, Button, cn, CommandGroup, CommandItem, CommandList, StatusIcon } from 'ui'
import { markdownComponents } from 'ui-patterns/Markdown'
-import { StatusIcon } from 'ui/src/components/StatusIcon'
import {
Breadcrumb,
diff --git a/packages/ui-patterns/src/CommandMenu/prepackaged/DocsSearch/DocsSearchPage.tsx b/packages/ui-patterns/src/CommandMenu/prepackaged/DocsSearch/DocsSearchPage.tsx
index 0f27b16def4..378b2fedbdc 100644
--- a/packages/ui-patterns/src/CommandMenu/prepackaged/DocsSearch/DocsSearchPage.tsx
+++ b/packages/ui-patterns/src/CommandMenu/prepackaged/DocsSearch/DocsSearchPage.tsx
@@ -8,8 +8,7 @@ import {
} from 'common'
import { Book, ChevronRight, Github, Hash, Loader2, MessageSquare, Search } from 'lucide-react'
import { useCallback, useEffect, useRef } from 'react'
-import { Button, cn, CommandGroup, CommandItem, CommandList } from 'ui'
-import { StatusIcon } from 'ui/src/components/StatusIcon'
+import { Button, cn, CommandGroup, CommandItem, CommandList, StatusIcon } from 'ui'
import {
Breadcrumb,
diff --git a/packages/ui-patterns/src/CountdownWidget/index.tsx b/packages/ui-patterns/src/CountdownWidget/index.tsx
index 744fe7e701c..83420ca7000 100644
--- a/packages/ui-patterns/src/CountdownWidget/index.tsx
+++ b/packages/ui-patterns/src/CountdownWidget/index.tsx
@@ -1,4 +1,4 @@
-import { cn } from 'ui/src/lib/utils'
+import { cn } from 'ui'
import CountdownStep from './CountdownStep'
diff --git a/packages/ui-patterns/src/Dialogs/ConfirmationModal.tsx b/packages/ui-patterns/src/Dialogs/ConfirmationModal.tsx
index 89460076fbd..5e246f02c9b 100644
--- a/packages/ui-patterns/src/Dialogs/ConfirmationModal.tsx
+++ b/packages/ui-patterns/src/Dialogs/ConfirmationModal.tsx
@@ -10,11 +10,12 @@ import {
cn,
Dialog,
DialogContent,
+ DialogDescription,
+ DialogHeader,
DialogSection,
DialogSectionSeparator,
DialogTitle,
} from 'ui'
-import { DialogDescription, DialogHeader } from 'ui/src/components/shadcn/ui/dialog'
import { Admonition } from '../Admonition'
diff --git a/packages/ui-patterns/src/Dialogs/TextConfirmModal.tsx b/packages/ui-patterns/src/Dialogs/TextConfirmModal.tsx
index c3e156a071c..498178245f8 100644
--- a/packages/ui-patterns/src/Dialogs/TextConfirmModal.tsx
+++ b/packages/ui-patterns/src/Dialogs/TextConfirmModal.tsx
@@ -14,6 +14,7 @@ import {
copyToClipboard,
Dialog,
DialogContent,
+ DialogHeader,
DialogSection,
DialogSectionSeparator,
DialogTitle,
@@ -26,7 +27,6 @@ import {
FormMessage,
Input,
} from 'ui'
-import { DialogHeader } from 'ui/src/components/shadcn/ui/dialog'
import { z } from 'zod'
import { Admonition } from '../Admonition'
diff --git a/packages/ui-patterns/src/Markdown/index.tsx b/packages/ui-patterns/src/Markdown/index.tsx
index 7074a36646f..5223dae6646 100644
--- a/packages/ui-patterns/src/Markdown/index.tsx
+++ b/packages/ui-patterns/src/Markdown/index.tsx
@@ -3,8 +3,7 @@
import React from 'react'
import ReactMarkdown, { type Components, type Options } from 'react-markdown'
import remarkGfm from 'remark-gfm'
-import { cn } from 'ui'
-import { Heading } from 'ui/src/components/CustomHTMLElements'
+import { cn, Heading } from 'ui'
import {
Avatar,
diff --git a/packages/ui-patterns/src/McpUrlBuilder/components/McpConfigurationOptions.tsx b/packages/ui-patterns/src/McpUrlBuilder/components/McpConfigurationOptions.tsx
index 695cea5834b..3729a0c7dc0 100644
--- a/packages/ui-patterns/src/McpUrlBuilder/components/McpConfigurationOptions.tsx
+++ b/packages/ui-patterns/src/McpUrlBuilder/components/McpConfigurationOptions.tsx
@@ -1,7 +1,6 @@
'use client'
-import { cn, Switch } from 'ui'
-import { Label } from 'ui/src/components/shadcn/ui/label'
+import { cn, Label, Switch } from 'ui'
import { InfoTooltip } from '../../info-tooltip'
import {
diff --git a/packages/ui-patterns/src/MobileSheetNav/MobileSheetNav.tsx b/packages/ui-patterns/src/MobileSheetNav/MobileSheetNav.tsx
index 47ebc96ae86..89a3d220866 100644
--- a/packages/ui-patterns/src/MobileSheetNav/MobileSheetNav.tsx
+++ b/packages/ui-patterns/src/MobileSheetNav/MobileSheetNav.tsx
@@ -4,8 +4,7 @@ import { useRouter } from 'next/router'
import { ComponentProps, useEffect } from 'react'
import { ErrorBoundary } from 'react-error-boundary'
import { useWindowSize } from 'react-use'
-import { CommandEmpty, Sheet, SheetContent } from 'ui'
-import { cn } from 'ui/src/lib/utils'
+import { cn, CommandEmpty, Sheet, SheetContent } from 'ui'
const MobileSheetNav: React.FC<{
children: React.ReactNode
diff --git a/packages/ui-patterns/src/PromoToast/PromoBg.tsx b/packages/ui-patterns/src/PromoToast/PromoBg.tsx
index c30b0fd6220..79564da9612 100644
--- a/packages/ui-patterns/src/PromoToast/PromoBg.tsx
+++ b/packages/ui-patterns/src/PromoToast/PromoBg.tsx
@@ -1,4 +1,4 @@
-import { cn } from 'ui/src/lib/utils/cn'
+import { cn } from 'ui'
interface Props {
className?: string
diff --git a/packages/ui-patterns/src/PromoToast/PromoToast.tsx b/packages/ui-patterns/src/PromoToast/PromoToast.tsx
index ac2db741c21..7f9be18587f 100644
--- a/packages/ui-patterns/src/PromoToast/PromoToast.tsx
+++ b/packages/ui-patterns/src/PromoToast/PromoToast.tsx
@@ -3,8 +3,7 @@
import { hasConsented, LOCAL_STORAGE_KEYS } from 'common'
import Link from 'next/link'
import { useEffect, useState } from 'react'
-import { Button } from 'ui/src/components/Button/Button'
-import { cn } from 'ui/src/lib/utils/cn'
+import { Button, cn } from 'ui'
import announcement from '../Banners/data.json'
diff --git a/packages/ui-patterns/src/SqlToRest/base-url-dialog.tsx b/packages/ui-patterns/src/SqlToRest/base-url-dialog.tsx
index b0d422defc7..fc1a743b299 100644
--- a/packages/ui-patterns/src/SqlToRest/base-url-dialog.tsx
+++ b/packages/ui-patterns/src/SqlToRest/base-url-dialog.tsx
@@ -1,14 +1,14 @@
import { useState } from 'react'
-import { Alert } from 'ui/src/components/shadcn/ui/alert'
-import { Button } from 'ui/src/components/shadcn/ui/button'
import {
+ Alert,
+ Button,
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
-} from 'ui/src/components/shadcn/ui/dialog'
+} from 'ui'
import { Input } from '../DataInputs/Input'
diff --git a/packages/ui-patterns/src/Toc/toc.tsx b/packages/ui-patterns/src/Toc/toc.tsx
index 7297ba2b9ff..442b2d3963d 100644
--- a/packages/ui-patterns/src/Toc/toc.tsx
+++ b/packages/ui-patterns/src/Toc/toc.tsx
@@ -1,8 +1,7 @@
'use client'
import { Fragment, useRef, type ComponentProps, type HTMLAttributes, type ReactNode } from 'react'
-import { cn, ScrollArea, ScrollViewport } from 'ui'
-import { removeAnchor } from 'ui/src/components/CustomHTMLElements/CustomHTMLElements.utils'
+import { cn, removeAnchor, ScrollArea, ScrollViewport } from 'ui'
import type { TOCItemType } from './server/get-toc'
import * as Primitive from './toc-primitive'
diff --git a/packages/ui-patterns/src/TweetCard/index.tsx b/packages/ui-patterns/src/TweetCard/index.tsx
index 806d57178bd..1d1f16e7e62 100644
--- a/packages/ui-patterns/src/TweetCard/index.tsx
+++ b/packages/ui-patterns/src/TweetCard/index.tsx
@@ -1,5 +1,5 @@
import Image from 'next/image'
-import { cn } from 'ui/src/lib/utils'
+import { cn } from 'ui'
interface TweetCard {
handle: string
diff --git a/packages/ui-patterns/src/collapsible-alert.tsx b/packages/ui-patterns/src/collapsible-alert.tsx
index 0b17745e98b..b83b8bc27d0 100644
--- a/packages/ui-patterns/src/collapsible-alert.tsx
+++ b/packages/ui-patterns/src/collapsible-alert.tsx
@@ -3,13 +3,7 @@
import { type VariantProps } from 'class-variance-authority'
import { ChevronDown } from 'lucide-react'
import * as React from 'react'
-import { Button, cn } from 'ui'
-import { alertVariants } from 'ui/src/components/shadcn/ui/alert'
-import {
- Collapsible,
- CollapsibleContent,
- CollapsibleTrigger,
-} from 'ui/src/components/shadcn/ui/collapsible'
+import { alertVariants, Button, cn, Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'
export interface CollapsibleAlertProps
extends Omit<React.HTMLAttributes<HTMLDivElement>, 'title'>, VariantProps<typeof alertVariants> {
diff --git a/packages/ui-patterns/src/form/Layout/FormLayout.tsx b/packages/ui-patterns/src/form/Layout/FormLayout.tsx
index 2b2db87dca1..284e6a9faaf 100644
--- a/packages/ui-patterns/src/form/Layout/FormLayout.tsx
+++ b/packages/ui-patterns/src/form/Layout/FormLayout.tsx
@@ -1,7 +1,6 @@
import { cva } from 'class-variance-authority'
import React from 'react'
-import { cn, FormDescription, FormLabel, FormMessage, Label } from 'ui'
-import { SIZE } from 'ui/src/lib/constants'
+import { cn, FormDescription, FormLabel, FormMessage, Label, SIZE } from 'ui'
type Props = {
align?: 'left' | 'right'
diff --git a/packages/ui-patterns/src/multi-select/multi-select.tsx b/packages/ui-patterns/src/multi-select/multi-select.tsx
index 9e5e63eca9c..b74627751c2 100644
--- a/packages/ui-patterns/src/multi-select/multi-select.tsx
+++ b/packages/ui-patterns/src/multi-select/multi-select.tsx
@@ -17,8 +17,9 @@ import {
PopoverAnchor,
PopoverContent,
PopoverContentProps,
+ SIZE_VARIANTS,
+ SIZE_VARIANTS_DEFAULT,
} from 'ui'
-import { SIZE_VARIANTS, SIZE_VARIANTS_DEFAULT } from 'ui/src/lib/constants'
interface MultiSelectContextProps {
id: string
diff --git a/packages/ui/index.tsx b/packages/ui/index.tsx
index ebbc9499e84..8630256e6a6 100644
--- a/packages/ui/index.tsx
+++ b/packages/ui/index.tsx
@@ -14,7 +14,12 @@ export * from './src/components/SidePanel'
// HTML
-export { Heading } from './src/components/CustomHTMLElements'
+export {
+ Heading,
+ getAnchor,
+ removeAnchor,
+ highlightSelectedNavItem,
+} from './src/components/CustomHTMLElements'
// UTILITIES
@@ -31,6 +36,7 @@ export * from './src/components/LoadingLine'
// ai icon
export * from './src/layout/ai-icon-animation'
+export { default as aiIconAnimationStyles } from './src/layout/ai-icon-animation/ai-icon-animation-style.module.css'
// theme switcher
export * from './src/components/ThemeProvider/singleThemes'
@@ -160,3 +166,6 @@ export * from './src/lib/Hooks'
export * from './src/components/hooks/use-mobile'
export * from './src/components/KeyboardShortcut/KeyboardShortcut'
+
+export * as colors from './src/lib/tailwind-demo-classes'
+export * from './src/lib/constants'
diff --git a/packages/ui/src/components/CustomHTMLElements/index.tsx b/packages/ui/src/components/CustomHTMLElements/index.tsx
index 51b2839dcc1..14440ef4447 100644
--- a/packages/ui/src/components/CustomHTMLElements/index.tsx
+++ b/packages/ui/src/components/CustomHTMLElements/index.tsx
@@ -1,5 +1,4 @@
import Heading from './Heading'
export { Heading }
-
-export default Heading
+export { getAnchor, removeAnchor, highlightSelectedNavItem } from './CustomHTMLElements.utils'