Skip to content

Commit

Permalink
feat: Migrate to shadcn cli and update dependencies (magicuidesign#337)
Browse files Browse the repository at this point in the history
* feat: mvp shadcn cli working

* fix: update conf files

* fix: lint and prettier

* fix: lint and prettier
  • Loading branch information
dillionverma authored Sep 27, 2024
1 parent c779f74 commit 7b591e3
Show file tree
Hide file tree
Showing 329 changed files with 13,071 additions and 2,815 deletions.
19 changes: 2 additions & 17 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,18 @@
"extends": [
"next/core-web-vitals",
"prettier",
"plugin:@next/next/recommended",
"plugin:tailwindcss/recommended"
],
"plugins": ["tailwindcss"],
"rules": {
"tailwindcss/no-contradicting-classname":"off",
"react/no-unescaped-entities": "off",
"@next/next/no-page-custom-font": "off",
"@next/next/no-html-link-for-pages": "off",
"tailwindcss/no-custom-classname": "off",
"tailwindcss/classnames-order": "off",
"no-multiple-empty-lines": [
"error",
{
"max": 1
}
],
"semi": "error",
"no-var": "error"
// "react/display-name": [false, {
// "ignoreTranspilerName": false, "checkContextObjects": false
// }]
"tailwindcss/classnames-order": "error"
},
"settings": {
"tailwindcss": {
"callees": ["cn", "cva"],
"config": "tailwind.config.ts"
"config": "tailwind.config.cjs"
},
"next": {
"rootDir": ["app/*/"]
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,3 @@ yarn-error.log*
next-env.d.ts

.contentlayer
.react-email
.turbo
33 changes: 33 additions & 0 deletions .prettier.config.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/** @type {import('prettier').Config} */
module.exports = {
endOfLine: "lf",
semi: false,
singleQuote: false,
tabWidth: 2,
trailingComma: "es5",
importOrder: [
"^(react/(.*)$)|^(react$)",
"^(next/(.*)$)|^(next$)",
"<THIRD_PARTY_MODULES>",
"",
"^types$",
"^@/types/(.*)$",
"^@/config/(.*)$",
"^@/lib/(.*)$",
"^@/hooks/(.*)$",
"^@/components/ui/(.*)$",
"^@/components/(.*)$",
"^@/registry/(.*)$",
"^@/styles/(.*)$",
"^@/app/(.*)$",
"",
"^[./]",
],
importOrderSeparation: false,
importOrderSortSpecifiers: true,
importOrderBuiltinModulesToTop: true,
importOrderParserPlugins: ["typescript", "jsx", "decorators-legacy"],
importOrderMergeDuplicateImports: true,
importOrderCombineTypeAndValueImports: true,
plugins: ["@ianvs/prettier-plugin-sort-imports"],
};
31 changes: 0 additions & 31 deletions .prettierrc

This file was deleted.

Loading

0 comments on commit 7b591e3

Please sign in to comment.