Skip to content

Commit b57f447

Browse files
committed
disable eslint formatting rules that conflict with prettier
1 parent 54e2453 commit b57f447

File tree

3 files changed

+11
-23
lines changed

3 files changed

+11
-23
lines changed

.eslintrc.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"extends": [
44
"eslint:recommended",
55
"plugin:@typescript-eslint/eslint-recommended",
6-
"plugin:@typescript-eslint/recommended"
6+
"plugin:@typescript-eslint/recommended",
7+
"prettier"
78
],
89
"rules": {
910
"@typescript-eslint/interface-name-prefix": [
10-
"error", { "prefixWithI": "always" }
11-
],
12-
"@typescript-eslint/no-unused-vars": [
13-
"warn", { "args": "none" }
11+
"error",
12+
{ "prefixWithI": "always" }
1413
],
14+
"@typescript-eslint/no-unused-vars": ["warn", { "args": "none" }],
1515
"@typescript-eslint/no-use-before-define": "off",
1616
"@typescript-eslint/camelcase": "off",
1717
"@typescript-eslint/no-explicit-any": "off",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"@typescript-eslint/eslint-plugin": "^2.14.0",
3434
"@typescript-eslint/parser": "^2.14.0",
3535
"eslint": "^6.5.0",
36-
"eslint-plugin-prettier": "^3.1.2",
36+
"eslint-config-prettier": "^6.9.0",
3737
"husky": "^2.3.0",
3838
"lerna": "^3.20.2",
3939
"lint-staged": "^9.5.0",

yarn.lock

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4131,12 +4131,12 @@ [email protected]:
41314131
optionalDependencies:
41324132
source-map "~0.2.0"
41334133

4134-
eslint-plugin-prettier@^3.1.2:
4135-
version "3.1.2"
4136-
resolved "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz#432e5a667666ab84ce72f945c72f77d996a5c9ba"
4137-
integrity sha512-GlolCC9y3XZfv3RQfwGew7NnuFDKsfI4lbvRK+PIIo23SFH+LemGs4cKwzAaRa+Mdb+lQO/STaIayno8T5sJJA==
4134+
eslint-config-prettier@^6.9.0:
4135+
version "6.9.0"
4136+
resolved "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.9.0.tgz#430d24822e82f7deb1e22a435bfa3999fae4ad64"
4137+
integrity sha512-k4E14HBtcLv0uqThaI6I/n1LEqROp8XaPu6SO9Z32u5NlGRC07Enu1Bh2KEFw4FNHbekH8yzbIU9kUGxbiGmCA==
41384138
dependencies:
4139-
prettier-linter-helpers "^1.0.0"
4139+
get-stdin "^6.0.0"
41404140

41414141
eslint-scope@^4.0.3:
41424142
version "4.0.3"
@@ -4396,11 +4396,6 @@ fast-deep-equal@^2.0.1:
43964396
resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
43974397
integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
43984398

4399-
fast-diff@^1.1.2:
4400-
version "1.2.0"
4401-
resolved "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
4402-
integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
4403-
44044399
fast-glob@^2.2.6:
44054400
version "2.2.7"
44064401
resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
@@ -8298,13 +8293,6 @@ prepend-http@^2.0.0:
82988293
resolved "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
82998294
integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
83008295

8301-
prettier-linter-helpers@^1.0.0:
8302-
version "1.0.0"
8303-
resolved "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
8304-
integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
8305-
dependencies:
8306-
fast-diff "^1.1.2"
8307-
83088296
prettier@^1.19.1:
83098297
version "1.19.1"
83108298
resolved "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"

0 commit comments

Comments
 (0)