From 9337fdf3474947dd307f1af97010fe96ca4f1035 Mon Sep 17 00:00:00 2001 From: Jan-Henrik Bruhn Date: Mon, 22 Dec 2025 11:07:20 +0100 Subject: [PATCH] fix: Adjust shadcn config --- components.json | 15 ++++++++------- package-lock.json | 10 ++++++++++ package.json | 1 + src/App.css | 6 ++++-- src/components/FileUpload.tsx | 2 +- src/lib/utils.ts | 6 +++--- tsconfig.electron.json | 4 ++++ tsconfig.json | 8 +++++++- 8 files changed, 38 insertions(+), 14 deletions(-) diff --git a/components.json b/components.json index 2147b0e..8508b2d 100644 --- a/components.json +++ b/components.json @@ -4,18 +4,19 @@ "rsc": false, "tsx": true, "tailwind": { - "config": "", + "config": "tailwind.config.js", "css": "src/App.css", "baseColor": "slate", "cssVariables": true, "prefix": "" }, + "iconLibrary": "lucide", "aliases": { - "components": "src/components", - "utils": "src/lib/utils", - "ui": "src/components/ui", - "lib": "src/lib", - "hooks": "src/hooks" + "components": "@/components", + "utils": "@/lib/utils", + "ui": "@/components/ui", + "lib": "@/lib", + "hooks": "@/hooks" }, - "iconLibrary": "lucide" + "registries": {} } diff --git a/package-lock.json b/package-lock.json index da4d642..dfd58c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,6 +32,7 @@ "react-konva": "^19.2.1", "tailwind-merge": "^3.4.0", "tailwindcss": "^4.1.17", + "tailwindcss-animate": "^1.0.7", "tw-animate-css": "^1.4.0", "update-electron-app": "^3.1.2", "zustand": "^5.0.9" @@ -16685,6 +16686,15 @@ "integrity": "sha512-4+Z+0yiYyEtUVCScyfHCxOYP06L5Ne+JiHhY2IjR2KWMIWhJOYZKLSGZaP5HkZ8+bY0cxfzwDE5uOmzFXyIwxw==", "license": "MIT" }, + "node_modules/tailwindcss-animate": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/tailwindcss-animate/-/tailwindcss-animate-1.0.7.tgz", + "integrity": "sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==", + "license": "MIT", + "peerDependencies": { + "tailwindcss": ">=3.0.0 || insiders" + } + }, "node_modules/tapable": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz", diff --git a/package.json b/package.json index c983a6b..8ab9aaf 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "react-konva": "^19.2.1", "tailwind-merge": "^3.4.0", "tailwindcss": "^4.1.17", + "tailwindcss-animate": "^1.0.7", "tw-animate-css": "^1.4.0", "update-electron-app": "^3.1.2", "zustand": "^5.0.9" diff --git a/src/App.css b/src/App.css index 0a97e59..562dd32 100644 --- a/src/App.css +++ b/src/App.css @@ -1,4 +1,6 @@ @import "tailwindcss"; + +@plugin "tailwindcss-animate"; @import "tw-animate-css"; /* ============================================ @@ -85,8 +87,8 @@ --accent: hsl(263.4 70% 50.4%); /* purple-600 for dark */ --accent-foreground: hsl(210 40% 98%); - --destructive: hsl(0 62.8% 30.6%); /* red-900 */ - --destructive-foreground: hsl(210 40% 98%); + --destructive: hsl(210 40% 98%); + --destructive-foreground: hsl(0 62.8% 30.6%); /* red-900 */ --success: hsl(142.1 70.6% 45.3%); /* green-500 for dark */ --success-foreground: hsl(210 40% 98%); diff --git a/src/components/FileUpload.tsx b/src/components/FileUpload.tsx index 010f815..5c05105 100644 --- a/src/components/FileUpload.tsx +++ b/src/components/FileUpload.tsx @@ -390,7 +390,7 @@ export function FileUpload() { variant="destructive" className="bg-danger-100 dark:bg-danger-900/20 border-danger-200 dark:border-danger-800" > - + Pattern too large: {boundsCheck.error} diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 365058c..bd0c391 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -1,6 +1,6 @@ -import { type ClassValue, clsx } from "clsx"; -import { twMerge } from "tailwind-merge"; +import { clsx, type ClassValue } from "clsx" +import { twMerge } from "tailwind-merge" export function cn(...inputs: ClassValue[]) { - return twMerge(clsx(inputs)); + return twMerge(clsx(inputs)) } diff --git a/tsconfig.electron.json b/tsconfig.electron.json index 4ac43e7..139ba36 100644 --- a/tsconfig.electron.json +++ b/tsconfig.electron.json @@ -1,6 +1,10 @@ { "extends": "./tsconfig.json", "compilerOptions": { + "baseUrl": ".", + "paths": { + "@/*": ["./src/*"] + }, "module": "commonjs", "outDir": "dist-electron", "types": ["node"] diff --git a/tsconfig.json b/tsconfig.json index 1ffef60..fec8c8e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,5 +3,11 @@ "references": [ { "path": "./tsconfig.app.json" }, { "path": "./tsconfig.node.json" } - ] + ], + "compilerOptions": { + "baseUrl": ".", + "paths": { + "@/*": ["./src/*"] + } + } }