remove tw merge

Author: Brendonovich

apps/web/package.json

@@ -77,7 +77,6 @@
 		"solid-sonner": "^0.2.6",
 		"stripe": "^15.3.0",
 		"superjson": "^2.2.1",
-		"tailwind-merge": "^2.3.0",
 		"tailwindcss": "^3.4.3",
 		"ts-pattern": "^5.1.1",
 		"vinxi": "=0.3.10",

apps/web/src/lib/utils.ts

@@ -1,4 +1,3 @@
-import { twMerge } from "tailwind-merge";
 import type { ClassValue } from "clsx";
 import { clsx } from "clsx";
 import type { CreateQueryResult } from "@tanstack/solid-query";
@@ -8,7 +7,7 @@ import { useNavigate } from "@solidjs/router";
 import { trpc } from "./trpc";
 
 export function cn(...inputs: ClassValue[]) {
-	return twMerge(clsx(inputs));
+	return clsx(inputs);
 }
 
 export function createNotFoundRedirect<T>(props: {

packages/ui/package.json

@@ -24,7 +24,6 @@
 		"class-variance-authority": "^0.7.0",
 		"clsx": "^2.1.0",
 		"solid-js": "^1.8.16",
-		"tailwind-merge": "^2.3.0",
 		"zod": "^3.22.5"
 	},
 	"devDependencies": {

packages/ui/src/lib/index.ts

@@ -1,8 +1,7 @@
 import { type ClassValue, clsx } from "clsx";
-import { twMerge } from "tailwind-merge";
 
 export function cn(...inputs: ClassValue[]) {
-	return twMerge(clsx(inputs));
+	return clsx(inputs);
 }
 
 export * from "./contentEditable";