Merge branch 'main' into dependabot/npm_and_yarn/mcp/qs-6.14.1

nannany · web-flow · commit c7ce3405a5f3 · 2025-12-31T21:05:55.000+09:00
diff --git a/ui/src/components/ui/button.tsx b/ui/src/components/ui/button.tsx
@@ -35,7 +35,8 @@ const buttonVariants = cva(
 );
 
 export interface ButtonProps
-  extends React.ButtonHTMLAttributes<HTMLButtonElement>,
+  extends
+    React.ButtonHTMLAttributes<HTMLButtonElement>,
     VariantProps<typeof buttonVariants> {
   asChild?: boolean;
 }
diff --git a/ui/src/components/ui/textarea.tsx b/ui/src/components/ui/textarea.tsx
@@ -2,8 +2,7 @@ import * as React from "react";
 
 import { cn } from "@/lib/utils";
 
-export interface TextareaProps
-  extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
+export interface TextareaProps extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
 
 const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
   ({ className, ...props }, ref) => {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ const buttonVariants = cva(`
`35`	`35`	`);`
`36`	`36`
`37`	`37`	`export interface ButtonProps`
`38`		`- extends React.ButtonHTMLAttributes<HTMLButtonElement>,`
	`38`	`+ extends`
	`39`	`+ React.ButtonHTMLAttributes<HTMLButtonElement>,`
`39`	`40`	`VariantProps<typeof buttonVariants> {`
`40`	`41`	`asChild?: boolean;`
`41`	`42`	`}`