install tailwind-merge, prettier, clsx

uzh-bf · Nov 26, 2024 · acb6769 · acb6769
1 parent 1ea104b
commit acb6769
Show file tree

Hide file tree

Showing 5 changed files with 561 additions and 81 deletions.
diff --git a/packages/tc-web/.prettierignore b/packages/tc-web/.prettierignore
@@ -0,0 +1,4 @@
+.stencil/
+docs/
+loader/
+node_modules/
diff --git a/packages/tc-web/.prettierrc.mjs b/packages/tc-web/.prettierrc.mjs
@@ -0,0 +1,6 @@
+export default {
+  semi: false,
+  singleQuote: true,
+  trailingComma: 'es5',
+  plugins: ['prettier-plugin-organize-imports', 'prettier-plugin-tailwindcss'],
+}
diff --git a/packages/tc-web/package.json b/packages/tc-web/package.json
@@ -17,6 +17,7 @@
   "scripts": {
     "build": "stencil build --docs",
     "dev": "stencil build --dev --watch --serve",
+    "format": "prettier write .",
     "test": "stencil test --spec --e2e",
     "test.watch": "stencil test --spec --e2e --watchAll",
     "generate": "stencil generate"
@@ -26,12 +27,17 @@
     "@stencil/postcss": "2.1.0",
     "@stencil/sass": "2.0.0",
     "@tailwindcss/aspect-ratio": "0.4.2",
-    "@tailwindcss/typography": "0.5.12",
     "@tailwindcss/forms": "0.5.3",
+    "@tailwindcss/typography": "0.5.12",
     "autoprefixer": "10.4.13",
+    "clsx": "2.1.1",
     "cssnano": "5.1.14",
     "ionicons": "7.4.0",
+    "prettier": "3.4.0",
+    "prettier-plugin-organize-imports": "4.0.0",
+    "prettier-plugin-tailwindcss": "0.6.5",
     "stencil-tailwind-plugin": "1.8.0",
+    "tailwind-merge": "1.12.0",
     "tailwindcss": "3.4.15",
     "typescript": "5.7.2"
   },

diff --git a/packages/tc-web/src/util/util.tsx b/packages/tc-web/src/util/util.tsx
@@ -1,3 +1,6 @@
+import { clsx, type ClassValue } from "clsx";
+import { twMerge } from "tailwind-merge";
+
 export function parseTags(tagsJson: string): string[] {
   try {
     return JSON.parse(tagsJson);
@@ -6,3 +9,7 @@ export function parseTags(tagsJson: string): string[] {
     return []; // Return empty array in case of error
   }
 }
+
+export function cn(...inputs: ClassValue[]) {
+  return twMerge(clsx(inputs));
+}