From 6b9d1260ea9734e79f1ed07d88b1623c3c1bd449 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Sat, 11 Nov 2023 10:06:37 -0500 Subject: [PATCH] Move stylistic eslint rules to prettier --- .eslintrc.json | 14 +++++--------- .prettierrc.json | 4 ++++ package.json | 1 + 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 862129f45..b848ff71f 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,18 +1,14 @@ { "env": { - "es2021": true, - "node": true + "es2021": true, + "node": true }, - "extends": "eslint:recommended", + "extends": ["eslint:recommended", "prettier"], "parserOptions": { - "ecmaVersion": "latest", - "sourceType": "module" + "ecmaVersion": "latest", + "sourceType": "module" }, "rules": { - "indent": ["error", "tab"], - "linebreak-style": ["error", "unix"], - "quotes": ["error", "double"], - "semi": ["error", "always"], "no-async-promise-executor": "warn", "no-prototype-builtins": "warn" } diff --git a/.prettierrc.json b/.prettierrc.json index a8299141c..4aa4e3a7b 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,4 +1,8 @@ { + "useTabs": true, + "singleQuote": false, + "semi": true, + "endOfLine": "lf", "arrowParens": "always", "printWidth": 100 } diff --git a/package.json b/package.json index ac57fede7..be78d2522 100755 --- a/package.json +++ b/package.json @@ -82,6 +82,7 @@ "ava": "^5.3.1", "c8": "^8.0.1", "eslint": "^8.53.0", + "eslint-config-prettier": "^9.0.0", "husky": "^8.0.3", "js-yaml": "^4.1.0", "jsdoc": "^4.0.2",