1
mirror of https://github.com/jakejarvis/jarv.is.git synced 2025-04-27 08:58:30 -04:00

merge prettier and eslint configs

This commit is contained in:
Jake Jarvis 2022-03-21 12:09:09 -04:00
parent 17776213e9
commit 6b6bc5497e
Signed by: jake
GPG Key ID: 2B0C9CF251E69A39
3 changed files with 24 additions and 11 deletions

View File

@ -13,6 +13,15 @@ module.exports = {
"@typescript-eslint/ban-ts-comment": "off", "@typescript-eslint/ban-ts-comment": "off",
"@typescript-eslint/no-explicit-any": "warn", "@typescript-eslint/no-explicit-any": "warn",
"@typescript-eslint/no-var-requires": "off", "@typescript-eslint/no-var-requires": "off",
"prettier/prettier": [
"error",
{
// normal .prettierrc config:
singleQuote: false,
tabWidth: 2,
printWidth: 120,
},
],
}, },
overrides: [ overrides: [
{ {
@ -20,7 +29,17 @@ module.exports = {
extends: ["plugin:mdx/recommended"], extends: ["plugin:mdx/recommended"],
rules: { rules: {
"react/jsx-no-undef": "off", "react/jsx-no-undef": "off",
"prettier/prettier": [
"error",
{
// normal .prettierrc config:
singleQuote: false,
tabWidth: 2,
printWidth: 120,
},
],
}, },
}, },
], ],
ignorePatterns: ["README.md"],
}; };

View File

@ -1,5 +0,0 @@
{
"printWidth": 120,
"tabWidth": 2,
"singleQuote": false
}

View File

@ -27,8 +27,8 @@
"@octokit/graphql": "^4.8.0", "@octokit/graphql": "^4.8.0",
"@primer/octicons": "^17.0.0", "@primer/octicons": "^17.0.0",
"@react-spring/web": "^9.4.4", "@react-spring/web": "^9.4.4",
"@sentry/node": "^6.18.2", "@sentry/node": "^6.19.0",
"@sentry/tracing": "^6.18.2", "@sentry/tracing": "^6.19.0",
"@stitches/react": "^1.2.7", "@stitches/react": "^1.2.7",
"copy-to-clipboard": "^3.3.1", "copy-to-clipboard": "^3.3.1",
"date-fns": "^2.28.0", "date-fns": "^2.28.0",
@ -45,7 +45,7 @@
"next-compose-plugins": "^2.2.1", "next-compose-plugins": "^2.2.1",
"next-mdx-remote": "^4.0.0", "next-mdx-remote": "^4.0.0",
"next-seo": "^5.1.0", "next-seo": "^5.1.0",
"next-sitemap": "^2.5.10", "next-sitemap": "^2.5.12",
"next-transpile-modules": "^9.0.0", "next-transpile-modules": "^9.0.0",
"node-fetch": "^3.2.3", "node-fetch": "^3.2.3",
"p-retry": "^5.1.0", "p-retry": "^5.1.0",
@ -87,7 +87,7 @@
"eslint": "~8.11.0", "eslint": "~8.11.0",
"eslint-config-next": "12.1.1-canary.15", "eslint-config-next": "12.1.1-canary.15",
"eslint-config-prettier": "~8.5.0", "eslint-config-prettier": "~8.5.0",
"eslint-plugin-mdx": "~1.16.0", "eslint-plugin-mdx": "~1.17.0",
"eslint-plugin-prettier": "~4.0.0", "eslint-plugin-prettier": "~4.0.0",
"lint-staged": "^12.3.7", "lint-staged": "^12.3.7",
"prettier": "^2.6.0", "prettier": "^2.6.0",
@ -100,8 +100,7 @@
}, },
"lint-staged": { "lint-staged": {
"*.{js,jsx,ts,tsx,md,mdx}": [ "*.{js,jsx,ts,tsx,md,mdx}": [
"eslint", "eslint"
"prettier --check"
] ]
}, },
"packageManager": "yarn@1.22.18", "packageManager": "yarn@1.22.18",