Skip to content

Commit

Permalink
Merge pull request #34 from Myongji-Graduate/radix-shadcn/#33
Browse files Browse the repository at this point in the history
shadcn/#33
  • Loading branch information
yougyung authored Feb 23, 2024
2 parents 02ee334 + 22f2be8 commit dca4946
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 4 deletions.
6 changes: 6 additions & 0 deletions app/utils/shadcn/utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { twMerge } from 'tailwind-merge';
import { type ClassValue, clsx } from 'clsx';

export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs));
}
18 changes: 18 additions & 0 deletions components.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "default",
"rsc": true,
"tsx": true,
"tailwind": {
"config": "tailwind.config.ts",
"css": "app/globals.css",
"baseColor": "slate",
"cssVariables": false,
"prefix": ""
},
"aliases": {
"components": "@/app/ui/view/shadcn",
"ui": "@/app/ui/view/shadcn",
"utils": "@/app/utils/shadcn/utils"
}
}
20 changes: 19 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.0",
"express": "^4.18.2",
"lucide-react": "^0.336.0",
"next": "14.1.0",
"react": "^18",
"react-dom": "^18",
"tailwind-merge": "^2.2.1"
"tailwind-merge": "^2.2.1",
"tailwindcss-animate": "^1.0.7"
},
"devDependencies": {
"@storybook/addon-essentials": "^7.6.15",
Expand All @@ -40,7 +42,6 @@
"@storybook/nextjs": "^7.6.15",
"@storybook/react": "^7.6.15",
"@storybook/test": "^7.6.15",
"chromatic": "^10.9.4",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.2.1",
"@testing-library/user-event": "^14.5.2",
Expand All @@ -50,6 +51,7 @@
"@types/react": "^18",
"@types/react-dom": "^18",
"autoprefixer": "^10.0.1",
"chromatic": "^10.9.4",
"concurrently": "^8.2.2",
"cross-env": "^7.0.3",
"eslint": "^8",
Expand Down
2 changes: 1 addition & 1 deletion tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@ const config: Config = {
},
},
},
plugins: [headlessui],
plugins: [headlessui, require('tailwindcss-animate')],
};
export default config;

0 comments on commit dca4946

Please sign in to comment.