From 09b1085feae59a36b60d087e0ecee308909216f5 Mon Sep 17 00:00:00 2001
From: Richard Gill <richard@rgill.co.uk>
Date: Mon, 1 Apr 2024 06:55:43 +0100
Subject: [PATCH] prettier

---
 .prettierrc.mjs                               |  6 ++++-
 apps/docs/astro.config.mjs                    |  6 ++---
 .../src/components/forms/waitlist-form.tsx    |  6 ++---
 apps/docs/src/components/ui/accordion.tsx     |  4 +--
 apps/docs/src/components/ui/badge.tsx         |  2 +-
 apps/docs/src/components/ui/button.tsx        |  2 +-
 apps/docs/src/components/ui/card.tsx          |  6 ++---
 apps/docs/src/components/ui/form.tsx          | 16 ++++++------
 apps/docs/src/components/ui/label.tsx         |  2 +-
 .../src/components/ui/navigation-menu.tsx     | 14 +++++------
 apps/docs/src/components/ui/scroll-area.tsx   |  2 +-
 apps/docs/src/components/ui/select.tsx        | 10 ++++----
 apps/docs/src/components/ui/sheet.tsx         |  8 +++---
 apps/docs/src/components/ui/tabs.tsx          |  4 +--
 apps/docs/src/lib/utils.ts                    |  4 +--
 apps/docs/src/pages/rss.xml.js                |  2 +-
 eslint.config.mjs                             |  8 +++---
 package.json                                  |  1 +
 pnpm-lock.yaml                                | 25 +++++++++++++++++--
 19 files changed, 77 insertions(+), 51 deletions(-)

diff --git a/.prettierrc.mjs b/.prettierrc.mjs
index b3030b20..4b48e391 100644
--- a/.prettierrc.mjs
+++ b/.prettierrc.mjs
@@ -1,6 +1,10 @@
 /** @type {import("prettier").Config} */
 export default {
-  plugins: ["prettier-plugin-astro", "prettier-plugin-tailwindcss"],
+  plugins: [
+    "prettier-plugin-astro",
+    "prettier-plugin-tailwindcss",
+    "prettier-plugin-organize-imports",
+  ],
   overrides: [
     {
       files: "*.astro",
diff --git a/apps/docs/astro.config.mjs b/apps/docs/astro.config.mjs
index 668ed06d..74a2aa57 100644
--- a/apps/docs/astro.config.mjs
+++ b/apps/docs/astro.config.mjs
@@ -1,12 +1,12 @@
 import db from "@astrojs/db";
-import icon from "astro-icon";
 import mdx from "@astrojs/mdx";
 import react from "@astrojs/react";
 import sitemap from "@astrojs/sitemap";
 import tailwind from "@astrojs/tailwind";
-import simpleStackForm from "simple-stack-form";
-import { defineConfig } from "astro/config";
 import vercel from "@astrojs/vercel/serverless";
+import icon from "astro-icon";
+import { defineConfig } from "astro/config";
+import simpleStackForm from "simple-stack-form";
 
 // https://astro.build/config
 export default defineConfig({
diff --git a/apps/docs/src/components/forms/waitlist-form.tsx b/apps/docs/src/components/forms/waitlist-form.tsx
index 58216fae..2fa6bac0 100644
--- a/apps/docs/src/components/forms/waitlist-form.tsx
+++ b/apps/docs/src/components/forms/waitlist-form.tsx
@@ -1,6 +1,3 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useForm } from "react-hook-form";
-import { z } from "zod";
 import { Button } from "@/components/ui/button";
 import {
   Form,
@@ -12,7 +9,10 @@ import {
   FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useForm } from "react-hook-form";
 import { toast } from "sonner";
+import { z } from "zod";
 
 const formSchema = z.object({
   email: z.string().email({
diff --git a/apps/docs/src/components/ui/accordion.tsx b/apps/docs/src/components/ui/accordion.tsx
index b74ebb68..b8e5ddb4 100644
--- a/apps/docs/src/components/ui/accordion.tsx
+++ b/apps/docs/src/components/ui/accordion.tsx
@@ -1,6 +1,6 @@
-import * as React from "react";
 import * as AccordionPrimitive from "@radix-ui/react-accordion";
 import { ChevronDown } from "lucide-react";
+import * as React from "react";
 
 import { cn } from "@/lib/utils";
 
@@ -55,4 +55,4 @@ const AccordionContent = React.forwardRef<
 ));
 AccordionContent.displayName = AccordionPrimitive.Content.displayName;
 
-export { Accordion, AccordionItem, AccordionTrigger, AccordionContent };
+export { Accordion, AccordionContent, AccordionItem, AccordionTrigger };
diff --git a/apps/docs/src/components/ui/badge.tsx b/apps/docs/src/components/ui/badge.tsx
index 0343c4fb..b3517d26 100644
--- a/apps/docs/src/components/ui/badge.tsx
+++ b/apps/docs/src/components/ui/badge.tsx
@@ -1,5 +1,5 @@
-import * as React from "react";
 import { cva, type VariantProps } from "class-variance-authority";
+import * as React from "react";
 
 import { cn } from "@/lib/utils";
 
diff --git a/apps/docs/src/components/ui/button.tsx b/apps/docs/src/components/ui/button.tsx
index a72d47b8..129066bd 100644
--- a/apps/docs/src/components/ui/button.tsx
+++ b/apps/docs/src/components/ui/button.tsx
@@ -1,6 +1,6 @@
-import * as React from "react";
 import { Slot } from "@radix-ui/react-slot";
 import { cva, type VariantProps } from "class-variance-authority";
+import * as React from "react";
 
 import { cn } from "@/lib/utils";
 
diff --git a/apps/docs/src/components/ui/card.tsx b/apps/docs/src/components/ui/card.tsx
index f4e57996..8dee7c95 100644
--- a/apps/docs/src/components/ui/card.tsx
+++ b/apps/docs/src/components/ui/card.tsx
@@ -78,9 +78,9 @@ CardFooter.displayName = "CardFooter";
 
 export {
   Card,
-  CardHeader,
+  CardContent,
+  CardDescription,
   CardFooter,
+  CardHeader,
   CardTitle,
-  CardDescription,
-  CardContent,
 };
diff --git a/apps/docs/src/components/ui/form.tsx b/apps/docs/src/components/ui/form.tsx
index fe823ee8..c3d8d01d 100644
--- a/apps/docs/src/components/ui/form.tsx
+++ b/apps/docs/src/components/ui/form.tsx
@@ -1,17 +1,17 @@
-import * as React from "react";
 import * as LabelPrimitive from "@radix-ui/react-label";
 import { Slot } from "@radix-ui/react-slot";
+import * as React from "react";
 import {
   Controller,
+  FormProvider,
+  useFormContext,
   type ControllerProps,
   type FieldPath,
   type FieldValues,
-  FormProvider,
-  useFormContext,
 } from "react-hook-form";
 
-import { cn } from "@/lib/utils";
 import { Label } from "@/components/ui/label";
+import { cn } from "@/lib/utils";
 
 const Form = FormProvider;
 
@@ -166,12 +166,12 @@ const FormMessage = React.forwardRef<
 FormMessage.displayName = "FormMessage";
 
 export {
-  useFormField,
   Form,
-  FormItem,
-  FormLabel,
   FormControl,
   FormDescription,
-  FormMessage,
   FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  useFormField,
 };
diff --git a/apps/docs/src/components/ui/label.tsx b/apps/docs/src/components/ui/label.tsx
index 44912aff..1d9c5a2c 100644
--- a/apps/docs/src/components/ui/label.tsx
+++ b/apps/docs/src/components/ui/label.tsx
@@ -1,6 +1,6 @@
-import * as React from "react";
 import * as LabelPrimitive from "@radix-ui/react-label";
 import { cva, type VariantProps } from "class-variance-authority";
+import * as React from "react";
 
 import { cn } from "@/lib/utils";
 
diff --git a/apps/docs/src/components/ui/navigation-menu.tsx b/apps/docs/src/components/ui/navigation-menu.tsx
index 08d1a46b..5a798df1 100644
--- a/apps/docs/src/components/ui/navigation-menu.tsx
+++ b/apps/docs/src/components/ui/navigation-menu.tsx
@@ -1,7 +1,7 @@
-import * as React from "react";
 import * as NavigationMenuPrimitive from "@radix-ui/react-navigation-menu";
 import { cva } from "class-variance-authority";
 import { ChevronDown } from "lucide-react";
+import * as React from "react";
 
 import { cn } from "@/lib/utils";
 
@@ -104,7 +104,7 @@ const NavigationMenuIndicator = React.forwardRef<
   <NavigationMenuPrimitive.Indicator
     ref={ref}
     className={cn(
-      " top-full z-[1] flex h-1.5 items-end justify-center overflow-hidden",
+      "top-fullflex z-[1]   h-1.5 items-end justify-center overflow-hidden",
       className,
     )}
     {...props}
@@ -116,13 +116,13 @@ NavigationMenuIndicator.displayName =
   NavigationMenuPrimitive.Indicator.displayName;
 
 export {
-  navigationMenuTriggerStyle,
   NavigationMenu,
-  NavigationMenuList,
-  NavigationMenuItem,
   NavigationMenuContent,
-  NavigationMenuTrigger,
-  NavigationMenuLink,
   NavigationMenuIndicator,
+  NavigationMenuItem,
+  NavigationMenuLink,
+  NavigationMenuList,
+  NavigationMenuTrigger,
   NavigationMenuViewport,
+  navigationMenuTriggerStyle,
 };
diff --git a/apps/docs/src/components/ui/scroll-area.tsx b/apps/docs/src/components/ui/scroll-area.tsx
index 32875740..ef360433 100644
--- a/apps/docs/src/components/ui/scroll-area.tsx
+++ b/apps/docs/src/components/ui/scroll-area.tsx
@@ -1,5 +1,5 @@
-import * as React from "react";
 import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area";
+import * as React from "react";
 
 import { cn } from "@/lib/utils";
 
diff --git a/apps/docs/src/components/ui/select.tsx b/apps/docs/src/components/ui/select.tsx
index a15ca7ea..97a0d4ff 100644
--- a/apps/docs/src/components/ui/select.tsx
+++ b/apps/docs/src/components/ui/select.tsx
@@ -1,6 +1,6 @@
-import * as React from "react";
 import * as SelectPrimitive from "@radix-ui/react-select";
 import { Check, ChevronDown } from "lucide-react";
+import * as React from "react";
 
 import { cn } from "@/lib/utils";
 
@@ -109,11 +109,11 @@ SelectSeparator.displayName = SelectPrimitive.Separator.displayName;
 
 export {
   Select,
-  SelectGroup,
-  SelectValue,
-  SelectTrigger,
   SelectContent,
-  SelectLabel,
+  SelectGroup,
   SelectItem,
+  SelectLabel,
   SelectSeparator,
+  SelectTrigger,
+  SelectValue,
 };
diff --git a/apps/docs/src/components/ui/sheet.tsx b/apps/docs/src/components/ui/sheet.tsx
index bbd2a4c0..e3edd5c0 100644
--- a/apps/docs/src/components/ui/sheet.tsx
+++ b/apps/docs/src/components/ui/sheet.tsx
@@ -1,7 +1,7 @@
-import * as React from "react";
 import * as SheetPrimitive from "@radix-ui/react-dialog";
 import { cva, type VariantProps } from "class-variance-authority";
 import { X } from "lucide-react";
+import * as React from "react";
 
 import { cn } from "@/lib/utils";
 
@@ -129,11 +129,11 @@ SheetDescription.displayName = SheetPrimitive.Description.displayName;
 
 export {
   Sheet,
-  SheetTrigger,
   SheetClose,
   SheetContent,
-  SheetHeader,
+  SheetDescription,
   SheetFooter,
+  SheetHeader,
   SheetTitle,
-  SheetDescription,
+  SheetTrigger,
 };
diff --git a/apps/docs/src/components/ui/tabs.tsx b/apps/docs/src/components/ui/tabs.tsx
index ae8e1135..314b533e 100644
--- a/apps/docs/src/components/ui/tabs.tsx
+++ b/apps/docs/src/components/ui/tabs.tsx
@@ -1,5 +1,5 @@
-import * as React from "react";
 import * as TabsPrimitive from "@radix-ui/react-tabs";
+import * as React from "react";
 
 import { cn } from "@/lib/utils";
 
@@ -50,4 +50,4 @@ const TabsContent = React.forwardRef<
 ));
 TabsContent.displayName = TabsPrimitive.Content.displayName;
 
-export { Tabs, TabsList, TabsTrigger, TabsContent };
+export { Tabs, TabsContent, TabsList, TabsTrigger };
diff --git a/apps/docs/src/lib/utils.ts b/apps/docs/src/lib/utils.ts
index 35ae41c4..0bb02837 100644
--- a/apps/docs/src/lib/utils.ts
+++ b/apps/docs/src/lib/utils.ts
@@ -1,6 +1,6 @@
-import { type ClassValue, clsx } from "clsx";
-import { twMerge } from "tailwind-merge";
+import { clsx, type ClassValue } from "clsx";
 import { format } from "date-fns";
+import { twMerge } from "tailwind-merge";
 
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs));
diff --git a/apps/docs/src/pages/rss.xml.js b/apps/docs/src/pages/rss.xml.js
index 7eac59f1..4b18f5ef 100644
--- a/apps/docs/src/pages/rss.xml.js
+++ b/apps/docs/src/pages/rss.xml.js
@@ -1,6 +1,6 @@
+import { siteConfig } from "@/config/site";
 import rss from "@astrojs/rss";
 import { getCollection } from "astro:content";
-import { siteConfig } from "@/config/site";
 
 export async function get(context) {
   const posts = await getCollection("blog");
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 5b092bfc..1f0d3dfc 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -1,9 +1,9 @@
-import reactRecommended from "eslint-plugin-react/configs/recommended.js";
-import globals from "globals";
-import typescriptParser from "@typescript-eslint/parser";
-import typescriptPlugin from "@typescript-eslint/eslint-plugin";
 import js from "@eslint/js";
+import typescriptPlugin from "@typescript-eslint/eslint-plugin";
+import typescriptParser from "@typescript-eslint/parser";
 import eslintPluginAstro from "eslint-plugin-astro";
+import reactRecommended from "eslint-plugin-react/configs/recommended.js";
+import globals from "globals";
 
 const astroRecommended = eslintPluginAstro.configs["flat/recommended"];
 
diff --git a/package.json b/package.json
index d358b1ee..13e99171 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "nx": "18.2.1",
     "prettier": "^3.2.5",
     "prettier-plugin-astro": "^0.13.0",
+    "prettier-plugin-organize-imports": "^3.2.4",
     "prettier-plugin-tailwindcss": "^0.5.13",
     "typescript": "^5.4.3"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b3f98c51..7fa14da2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -41,9 +41,12 @@ importers:
       prettier-plugin-astro:
         specifier: ^0.13.0
         version: 0.13.0
+      prettier-plugin-organize-imports:
+        specifier: ^3.2.4
+        version: 3.2.4(prettier@3.2.5)(typescript@5.4.3)
       prettier-plugin-tailwindcss:
         specifier: ^0.5.13
-        version: 0.5.13(prettier-plugin-astro@0.13.0)(prettier@3.2.5)
+        version: 0.5.13(prettier-plugin-astro@0.13.0)(prettier-plugin-organize-imports@3.2.4)(prettier@3.2.5)
       typescript:
         specifier: ^5.4.3
         version: 5.4.3
@@ -7517,7 +7520,24 @@ packages:
       sass-formatter: 0.7.9
     dev: true
 
-  /prettier-plugin-tailwindcss@0.5.13(prettier-plugin-astro@0.13.0)(prettier@3.2.5):
+  /prettier-plugin-organize-imports@3.2.4(prettier@3.2.5)(typescript@5.4.3):
+    resolution: {integrity: sha512-6m8WBhIp0dfwu0SkgfOxJqh+HpdyfqSSLfKKRZSFbDuEQXDDndb8fTpRWkUrX/uBenkex3MgnVk0J3b3Y5byog==}
+    peerDependencies:
+      '@volar/vue-language-plugin-pug': ^1.0.4
+      '@volar/vue-typescript': ^1.0.4
+      prettier: '>=2.0'
+      typescript: '>=2.9'
+    peerDependenciesMeta:
+      '@volar/vue-language-plugin-pug':
+        optional: true
+      '@volar/vue-typescript':
+        optional: true
+    dependencies:
+      prettier: 3.2.5
+      typescript: 5.4.3
+    dev: true
+
+  /prettier-plugin-tailwindcss@0.5.13(prettier-plugin-astro@0.13.0)(prettier-plugin-organize-imports@3.2.4)(prettier@3.2.5):
     resolution: {integrity: sha512-2tPWHCFNC+WRjAC4SIWQNSOdcL1NNkydXim8w7TDqlZi+/ulZYz2OouAI6qMtkggnPt7lGamboj6LcTMwcCvoQ==}
     engines: {node: '>=14.21.3'}
     peerDependencies:
@@ -7571,6 +7591,7 @@ packages:
     dependencies:
       prettier: 3.2.5
       prettier-plugin-astro: 0.13.0
+      prettier-plugin-organize-imports: 3.2.4(prettier@3.2.5)(typescript@5.4.3)
     dev: true
 
   /prettier@3.2.5: