Skip to content

Commit 5e31661

Browse files
committed
Force imports ordering with eslint
1 parent 177b0a1 commit 5e31661

File tree

14 files changed

+267
-51
lines changed

14 files changed

+267
-51
lines changed

.prettierrc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
"semi": false,
44
"tabWidth": 2,
55
"trailingComma": "all",
6-
"importOrder": ["^@/(.*)$", "^[./]"],
7-
"importOrderSeparation": true,
8-
"importOrderSortSpecifiers": true,
96
"plugins": [
10-
"prettier-plugin-organize-imports",
11-
"prettier-plugin-tailwindcss",
12-
"@trivago/prettier-plugin-sort-imports"
7+
"prettier-plugin-tailwindcss"
138
]
149
}

app/frontend/components/ui/avatar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ function AvatarFallback({
5050
)
5151
}
5252

53-
export { Avatar, AvatarImage, AvatarFallback }
53+
export { Avatar, AvatarFallback, AvatarImage }

app/frontend/components/ui/breadcrumb.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ function BreadcrumbEllipsis({
100100

101101
export {
102102
Breadcrumb,
103-
BreadcrumbList,
103+
BreadcrumbEllipsis,
104104
BreadcrumbItem,
105105
BreadcrumbLink,
106+
BreadcrumbList,
106107
BreadcrumbPage,
107108
BreadcrumbSeparator,
108-
BreadcrumbEllipsis,
109109
}

app/frontend/components/ui/card.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ function CardFooter({ className, ...props }: React.ComponentProps<"div">) {
8383

8484
export {
8585
Card,
86-
CardHeader,
87-
CardFooter,
88-
CardTitle,
8986
CardAction,
90-
CardDescription,
9187
CardContent,
88+
CardDescription,
89+
CardFooter,
90+
CardHeader,
91+
CardTitle,
9292
}

app/frontend/components/ui/collapsible.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ function CollapsibleContent({
2828
)
2929
}
3030

31-
export { Collapsible, CollapsibleTrigger, CollapsibleContent }
31+
export { Collapsible, CollapsibleContent, CollapsibleTrigger }

app/frontend/components/ui/dropdown-menu.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,18 +240,18 @@ function DropdownMenuSubContent({
240240

241241
export {
242242
DropdownMenu,
243-
DropdownMenuPortal,
244-
DropdownMenuTrigger,
243+
DropdownMenuCheckboxItem,
245244
DropdownMenuContent,
246245
DropdownMenuGroup,
247-
DropdownMenuLabel,
248246
DropdownMenuItem,
249-
DropdownMenuCheckboxItem,
247+
DropdownMenuLabel,
248+
DropdownMenuPortal,
250249
DropdownMenuRadioGroup,
251250
DropdownMenuRadioItem,
252251
DropdownMenuSeparator,
253252
DropdownMenuShortcut,
254253
DropdownMenuSub,
255-
DropdownMenuSubTrigger,
256254
DropdownMenuSubContent,
255+
DropdownMenuSubTrigger,
256+
DropdownMenuTrigger,
257257
}

app/frontend/components/ui/navigation-menu.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,12 @@ function NavigationMenuIndicator({
157157

158158
export {
159159
NavigationMenu,
160-
NavigationMenuList,
161-
NavigationMenuItem,
162160
NavigationMenuContent,
163-
NavigationMenuTrigger,
164-
NavigationMenuLink,
165161
NavigationMenuIndicator,
166-
NavigationMenuViewport,
162+
NavigationMenuItem,
163+
NavigationMenuLink,
164+
NavigationMenuList,
165+
NavigationMenuTrigger,
167166
navigationMenuTriggerStyle,
167+
NavigationMenuViewport,
168168
}

app/frontend/components/ui/sheet.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ function SheetDescription({
127127

128128
export {
129129
Sheet,
130-
SheetTrigger,
131130
SheetClose,
132131
SheetContent,
133-
SheetHeader,
132+
SheetDescription,
134133
SheetFooter,
134+
SheetHeader,
135135
SheetTitle,
136-
SheetDescription,
136+
SheetTrigger,
137137
}

app/frontend/components/ui/sidebar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
"use client"
22

33
import { Slot } from "@radix-ui/react-slot"
4-
import type { VariantProps } from "class-variance-authority"
54
import { cva } from "class-variance-authority"
5+
import type { VariantProps } from "class-variance-authority"
66
import { PanelLeftIcon } from "lucide-react"
77
import * as React from "react"
88

app/frontend/components/ui/tooltip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ function TooltipContent({
5656
)
5757
}
5858

59-
export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider }
59+
export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger }

0 commit comments

Comments
 (0)