Merge branch 'develop' of https://github.com/cukCS/FE into fix/#27/color-chip

Author: KongMezu

package.json

@@ -18,7 +18,8 @@
     "react": "19.1.0",
     "react-dom": "19.1.0",
     "react-hook-form": "^7.64.0",
-    "svgo": "^4.0.0"
+    "svgo": "^4.0.0",
+    "tailwind-merge": "^3.3.1"
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3",
@@ -32,6 +33,7 @@
     "postcss": "^8.5.6",
     "svg-sprite-loader": "^6.0.11",
     "tailwindcss": "4.1.14",
-    "typescript": "^5"
+    "typescript": "^5",
+    "class-variance-authority": "^0.7.1"
   }
 }

pnpm-lock.yaml

@@ -0,0 +1 @@
+export * from './utils';

src/shared/lib/index.ts

@@ -0,0 +1,73 @@
+import { type ClassValue, clsx } from 'clsx';
+import { extendTailwindMerge } from 'tailwind-merge';
+
+const twMerge = extendTailwindMerge({
+  extend: {
+    theme: {
+      text: [
+        'text-display-lg',
+        'text-display-md',
+        'text-display-sm',
+        'text-headline-lg',
+        'text-headline-md',
+        'text-headline-sm',
+        'text-title-lg',
+        'text-title-md',
+        'text-title-sm',
+        'text-label-lg',
+        'text-label-md',
+        'text-label-sm',
+        'text-body-lg',
+        'text-body-md',
+        'text-body-sm',
+        'text-display-serif',
+        'text-headline-lg-serif',
+        'text-headline-md-serif',
+        'text-headline-sm-serif',
+        'text-label-serif',
+      ],
+
+      color: [
+        'mint-50',
+        'mint-100',
+        'mint-200',
+        'mint-300',
+        'mint-400',
+        'mint-500',
+        'mint-600',
+        'mint-700',
+        'mint-800',
+        'mint-900',
+        'pink-50',
+        'pink-100',
+        'pink-200',
+        'pink-300',
+        'pink-400',
+        'pink-500',
+        'pink-600',
+        'pink-700',
+        'pink-800',
+        'pink-900',
+        'gray-50',
+        'gray-100',
+        'gray-200',
+        'gray-300',
+        'gray-400',
+        'gray-500',
+        'gray-600',
+        'gray-700',
+        'gray-800',
+        'gray-900',
+        'blue-400',
+        'red-300',
+        'red-400',
+        'background',
+        'foreground',
+      ],
+    },
+  },
+});
+
+export const cn = (...inputs: ClassValue[]) => {
+  return twMerge(clsx(inputs));
+};