dev: added tailwind merge helper function (#2844)

space/helpers/common.helper.ts

@@ -1 +1,6 @@
-export const API_BASE_URL = process.env.NEXT_PUBLIC_API_BASE_URL ? process.env.NEXT_PUBLIC_API_BASE_URL : "";
+import { clsx, type ClassValue } from "clsx";
+import { twMerge } from "tailwind-merge";
+
+export const API_BASE_URL = process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
+
+export const cn = (...inputs: ClassValue[]) => twMerge(clsx(inputs));

space/package.json

@@ -17,9 +17,9 @@
     "@emotion/styled": "^11.11.0",
     "@headlessui/react": "^1.7.13",
     "@mui/material": "^5.14.1",
-    "@plane/ui": "*",
     "@plane/lite-text-editor": "*",
     "@plane/rich-text-editor": "*",
+    "@plane/ui": "*",
     "@plane/document-editor": "*",
     "axios": "^1.3.4",
     "clsx": "^2.0.0",
@@ -36,7 +36,7 @@
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.38.0",
     "swr": "^2.2.2",
-    "tailwind-merge": "^1.14.0",
+    "tailwind-merge": "^2.0.0",
     "typescript": "4.9.5",
     "uuid": "^9.0.0"
   },
@@ -44,7 +44,7 @@
     "@types/js-cookie": "^3.0.3",
     "@types/node": "18.14.1",
     "@types/nprogress": "^0.2.0",
-    "@types/react": "18.0.28",
+    "@types/react": "18.2.35",
     "@types/react-dom": "18.0.11",
     "@types/uuid": "^9.0.1",
     "@typescript-eslint/eslint-plugin": "^5.48.2",