Merge remote-tracking branch 'upstream/dev' into feature-176-create-a…

…ccordion-component
hngprojects · Jul 21, 2024 · caeadf8 · caeadf8
2 parents 740cc0e + 8630ff7
commit caeadf8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/app/components/ui/accordion.tsx b/app/components/ui/accordion.tsx
@@ -3,13 +3,17 @@
 import * as AccordionPrimitive from "@radix-ui/react-accordion";
 import { cn } from "app/lib/utils/cn";
 import { ChevronDown } from "lucide-react";
-import * as React from "react";
+import {
+  forwardRef,
+  type ComponentPropsWithoutRef,
+  type ElementRef,
+} from "react";
 
 const Accordion = AccordionPrimitive.Root;
 
-const AccordionItem = React.forwardRef<
-  React.ElementRef<typeof AccordionPrimitive.Item>,
-  React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Item>
+const AccordionItem = forwardRef<
+  ElementRef<typeof AccordionPrimitive.Item>,
+  ComponentPropsWithoutRef<typeof AccordionPrimitive.Item>
 >(({ className, ...properties }, reference) => (
   <AccordionPrimitive.Item
     ref={reference}
@@ -19,9 +23,9 @@ const AccordionItem = React.forwardRef<
 ));
 AccordionItem.displayName = "AccordionItem";
 
-const AccordionTrigger = React.forwardRef<
-  React.ElementRef<typeof AccordionPrimitive.Trigger>,
-  React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Trigger>
+const AccordionTrigger = forwardRef<
+  ElementRef<typeof AccordionPrimitive.Trigger>,
+  ComponentPropsWithoutRef<typeof AccordionPrimitive.Trigger>
 >(({ className, children, ...properties }, reference) => (
   <AccordionPrimitive.Header className="flex">
     <AccordionPrimitive.Trigger
@@ -39,9 +43,9 @@ const AccordionTrigger = React.forwardRef<
 ));
 AccordionTrigger.displayName = AccordionPrimitive.Trigger.displayName;
 
-const AccordionContent = React.forwardRef<
-  React.ElementRef<typeof AccordionPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Content>
+const AccordionContent = forwardRef<
+  ElementRef<typeof AccordionPrimitive.Content>,
+  ComponentPropsWithoutRef<typeof AccordionPrimitive.Content>
 >(({ className, children, ...properties }, reference) => (
   <AccordionPrimitive.Content
     ref={reference}

diff --git a/app/styles/global.css b/app/styles/global.css
@@ -1,9 +1,9 @@
+@import url("https://fonts.googleapis.com/css2?family=Inter:[email protected]&display=swap");
+
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
 
-@import url("https://fonts.googleapis.com/css2?family=Inter:[email protected]&display=swap");
-
 body {
   font-family: "Inter", sans-serif;
 }

diff --git a/package.json b/package.json
@@ -29,6 +29,7 @@
     "@radix-ui/react-tabs": "^1.1.0",
     "@react-email/components": "^0.0.21",
     "@remix-run/css-bundle": "^2.10.3",
+    "@remix-run/node": "^2.10.3",
     "@remix-run/react": "^2.10.3",
     "@remix-run/serve": "^2.10.3",
     "class-variance-authority": "^0.7.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml