Merge branch 'main' into dependabot/npm_and_yarn/prisma-6.16.2

Author: initstring

package-lock.json

@@ -41,7 +41,6 @@
     "@trpc/client": "^11.0.0",
     "@trpc/react-query": "^11.0.0",
     "@trpc/server": "^11.0.0",
-    "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "dotenv": "^16.6.1",
     "html-to-image": "^1.11.13",
@@ -82,7 +81,7 @@
     "tailwindcss": "^4.1.13",
     "tsx": "^4.20.5",
     "typescript": "^5.8.2",
-    "typescript-eslint": "^8.27.0",
+    "typescript-eslint": "^8.44.1",
     "vitest": "^3.2.4"
   },
   "ct3aMetadata": {

package.json

@@ -1,31 +1,32 @@
 import * as React from "react";
-import { cva, type VariantProps } from "class-variance-authority";
+
 import { cn } from "@/lib/utils";
 
-const badgeVariants = cva(
-  "inline-flex items-center rounded-md border px-2 py-0.5 text-xs font-medium transition-colors",
-  {
-    variants: {
-      variant: {
-        default: "border-transparent bg-white/10 text-[var(--color-text-primary)]",
-        secondary: "border-transparent bg-[var(--color-surface-elevated)] text-[var(--color-text-secondary)]",
-        outline: "border-[var(--color-border)] text-[var(--color-text-secondary)]",
-        glass: "glass text-[var(--color-text-primary)]",
-        success: "border-transparent bg-[var(--status-success-bg)] text-[var(--status-success-fg)]",
-        warning: "border-transparent bg-[var(--status-warn-bg)] text-[var(--status-warn-fg)]",
-        error: "border-transparent bg-[var(--status-error-bg)] text-[var(--status-error-fg)]",
-        info: "border-transparent bg-[var(--status-info-bg)] text-[var(--status-info-fg)]",
-      },
-    },
-    defaultVariants: {
-      variant: "default",
-    },
-  }
-);
-
-export interface BadgeProps
-  extends React.HTMLAttributes<HTMLDivElement>,
-    VariantProps<typeof badgeVariants> {}
+const badgeBaseClasses =
+  "inline-flex items-center rounded-md border px-2 py-0.5 text-xs font-medium transition-colors";
+
+const badgeVariantClasses = {
+  default: "border-transparent bg-white/10 text-[var(--color-text-primary)]",
+  secondary:
+    "border-transparent bg-[var(--color-surface-elevated)] text-[var(--color-text-secondary)]",
+  outline: "border-[var(--color-border)] text-[var(--color-text-secondary)]",
+  glass: "glass text-[var(--color-text-primary)]",
+  success:
+    "border-transparent bg-[var(--status-success-bg)] text-[var(--status-success-fg)]",
+  warning:
+    "border-transparent bg-[var(--status-warn-bg)] text-[var(--status-warn-fg)]",
+  error: "border-transparent bg-[var(--status-error-bg)] text-[var(--status-error-fg)]",
+  info: "border-transparent bg-[var(--status-info-bg)] text-[var(--status-info-fg)]",
+} as const;
+
+type BadgeVariant = keyof typeof badgeVariantClasses;
+
+const badgeVariants = ({ variant }: { variant?: BadgeVariant } = {}) =>
+  cn(badgeBaseClasses, badgeVariantClasses[variant ?? "default"]);
+
+export interface BadgeProps extends React.HTMLAttributes<HTMLDivElement> {
+  variant?: BadgeVariant;
+}
 
 function Badge({ className, variant, ...props }: BadgeProps) {
   return (