diff --git a/.eslintrc b/.eslintrc.json similarity index 72% rename from .eslintrc rename to .eslintrc.json index d73d92de19..8c5c6aa48f 100644 --- a/.eslintrc +++ b/.eslintrc.json @@ -4,36 +4,35 @@ "plugins": ["@typescript-eslint", "tailwindcss"], "extends": [ "eslint:recommended", + "next/core-web-vitals", "next/typescript", - "plugin:react/recommended", "plugin:tailwindcss/recommended", - "next/core-web-vitals", - "plugin:prettier/recommended", + "plugin:prettier/recommended" ], "rules": { "@typescript-eslint/no-unused-expressions": [ "error", { "allowShortCircuit": true, - "allowTernary": true, - }, + "allowTernary": true + } ], "quotes": ["error", "double"], "no-console": "warn", "tailwindcss/no-arbitrary-value": "error", - "tailwindcss/classnames-order": "off", + "tailwindcss/classnames-order": "error", "tailwindcss/no-custom-classname": [ "error", { - "whitelist": ["g\\-yt.+", "prose-.+", "text-3xl/9", "legend", "dark"], - }, + "whitelist": ["g\\-yt.+", "prose-.+", "text-3xl/9", "legend", "dark"] + } ], "prettier/prettier": [ "error", { - "endOfLine": "auto", - }, - ], + "endOfLine": "auto" + } + ] }, - "reportUnusedDisableDirectives": true, + "reportUnusedDisableDirectives": true } diff --git a/.prettierrc b/.prettierrc index 40a6371f94..4e2de380e3 100644 --- a/.prettierrc +++ b/.prettierrc @@ -3,5 +3,6 @@ "singleQuote": false, "tabWidth": 2, "trailingComma": "es5", - "tailwindConfig": "./tailwind.config.js" + "tailwindConfig": "./tailwind.config.js", + "plugins": ["prettier-plugin-tailwindcss"] } diff --git a/components/consulting/index/pageCard.tsx b/components/consulting/index/pageCard.tsx index 1a6a32d05d..cabfd58e38 100644 --- a/components/consulting/index/pageCard.tsx +++ b/components/consulting/index/pageCard.tsx @@ -17,7 +17,7 @@ export const PageCard = ({ page, category, pageIndex }) => {