diff --git a/.eslintrc.json b/.eslintrc.json index 6eebcc94..e19846d8 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -3,7 +3,7 @@ "es6": true, "node": true }, - "extends": ["eslint:recommended"], + "extends": ["eslint:recommended", "prettier"], "rules": { "indent": [ "error", @@ -16,7 +16,7 @@ "quotes": ["error", "single"], "semi": ["error", "always"], "comma-dangle": 0, - "no-trailing-spaces": "warn" + "no-trailing-spaces": "error" }, "parserOptions": { "ecmaVersion": 2020 diff --git a/package.json b/package.json index b0610a63..abb9071c 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,7 @@ }, "devDependencies": { "eslint": "^8.13.0", + "eslint-config-prettier": "^8.5.0", "prettier": "2.6.2" }, "engines": { diff --git a/yarn.lock b/yarn.lock index eab9528a..cd250d1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -494,6 +494,11 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== +eslint-config-prettier@^8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" + integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q== + eslint-scope@^7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"