Merge pull request #3 from cnpem/feat-shadcn-cli

update shadcn cli usage
cnpem · Sep 10, 2024 · cdb6f51 · cdb6f51
2 parents 0e8cc88 + 5aa4f46
commit cdb6f51
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 17 deletions.
diff --git a/.changeset/hot-peaches-run.md b/.changeset/hot-peaches-run.md
@@ -0,0 +1,5 @@
+---
+"@sophys-web/ui": minor
+---
+
+Update to new shadcn-cli
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "clean": "turbo clean",
     "format": "prettier --write \"**/*.{ts,tsx,md}\"",
     "format:check": "prettier --check \"**/*.{ts,tsx,md}\"",
-    "ui-add": "turbo run ui-add"
+    "ui-add": "pnpm dlx shadcn@latest add -c packages/ui"
   },
   "devDependencies": {
     "@sophys-web/typescript-config": "workspace:*",

diff --git a/packages/ui/components.json b/packages/ui/components.json
@@ -11,8 +11,10 @@
     "prefix": ""
   },
   "aliases": {
-    "components": "src/",
-    "utils": "@sophys-web/ui",
-    "ui": "src/"
+    "components": "@/src/",
+    "utils": "@/src/lib/utils",
+    "ui": "@/src/",
+    "hooks": "@/src/hooks",
+    "lib": "@/src/lib"
   }
 }
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -18,8 +18,7 @@
     "clean": "rm -rf dist .turbo node_modules",
     "lint": "eslint src/",
     "dev": "tailwindcss -i ./src/styles.css -o ./dist/index.css --watch",
-    "type-check": "tsc --noEmit",
-    "ui-add": "pnpm dlx shadcn-ui add"
+    "type-check": "tsc --noEmit"
   },
   "peerDependencies": {
     "react": "^18.3.1"

diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts
@@ -1,6 +1 @@
-import { type ClassValue, clsx } from "clsx";
-import { twMerge } from "tailwind-merge";
-
-export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs));
-}
+export { cn } from "./lib/utils";
diff --git a/packages/ui/src/lib/utils.ts b/packages/ui/src/lib/utils.ts
@@ -0,0 +1,6 @@
+import { type ClassValue, clsx } from "clsx";
+import { twMerge } from "tailwind-merge";
+
+export function cn(...inputs: ClassValue[]) {
+  return twMerge(clsx(inputs));
+}
diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json
@@ -1,5 +1,11 @@
 {
   "extends": "@sophys-web/typescript-config/react-library.json",
   "include": ["."],
-  "exclude": ["dist", "build", "node_modules"]
+  "exclude": ["dist", "build", "node_modules"],
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./*"]
+    }
+  }
 }
diff --git a/turbo.json b/turbo.json
@@ -14,10 +14,6 @@
     },
     "clean": {
       "cache": false
-    },
-    "ui-add": {
-      "cache": false,
-      "interactive": true
     }
   },
   "globalEnv": ["AUTH_SECRET", "PORT"],