From fa03fb0f3dc7b38ca5e59cecd5c8abb645a3b11b Mon Sep 17 00:00:00 2001 From: "XPS\\Micro" Date: Fri, 30 Jan 2026 23:28:11 +0100 Subject: [PATCH] Fix user-template-next: add baseUrl and include lib/utils.ts --- .gitignore | 1 + user-template-next/src/lib/utils.ts | 6 ++++++ user-template-next/tsconfig.json | 1 + 3 files changed, 8 insertions(+) create mode 100644 user-template-next/src/lib/utils.ts diff --git a/.gitignore b/.gitignore index ae1db17..bdc7031 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ eggs/ .eggs/ lib/ !frontend/src/lib/ +!user-template-next/src/lib/ lib64/ parts/ sdist/ diff --git a/user-template-next/src/lib/utils.ts b/user-template-next/src/lib/utils.ts new file mode 100644 index 0000000..a5ef193 --- /dev/null +++ b/user-template-next/src/lib/utils.ts @@ -0,0 +1,6 @@ +import { clsx, type ClassValue } from "clsx"; +import { twMerge } from "tailwind-merge"; + +export function cn(...inputs: ClassValue[]) { + return twMerge(clsx(inputs)); +} diff --git a/user-template-next/tsconfig.json b/user-template-next/tsconfig.json index 7b28589..c33416d 100644 --- a/user-template-next/tsconfig.json +++ b/user-template-next/tsconfig.json @@ -17,6 +17,7 @@ "name": "next" } ], + "baseUrl": ".", "paths": { "@/*": ["./src/*"] }