Skip to content

Commit 03e58dc

Browse files
committed
ESLint: Add prettier plugin
1 parent f821bc1 commit 03e58dc

File tree

3 files changed

+115
-26
lines changed

3 files changed

+115
-26
lines changed

.eslintrc.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ module.exports = {
1111
},
1212
},
1313
plugins: ['ember'],
14-
extends: ['eslint:recommended', 'plugin:ember/recommended'],
14+
extends: [
15+
'eslint:recommended',
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
18+
],
1519
env: {
1620
browser: true,
1721
},

package.json

+2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,10 @@
7979
"ember-template-lint": "^2.13.0",
8080
"ember-try": "^1.4.0",
8181
"eslint": "^7.21.0",
82+
"eslint-config-prettier": "^8.3.0",
8283
"eslint-plugin-ember": "^8.9.1",
8384
"eslint-plugin-node": "^11.1.0",
85+
"eslint-plugin-prettier": "^4.0.0",
8486
"fixturify": "^1.2.0",
8587
"istanbul": "^0.4.3",
8688
"loader.js": "^4.7.0",

yarn.lock

+108-25
Original file line numberDiff line numberDiff line change
@@ -1074,15 +1074,15 @@
10741074
lodash "^4.17.20"
10751075
resolve "^1.17.0"
10761076

1077-
"@eslint/eslintrc@^0.4.0":
1078-
version "0.4.0"
1079-
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547"
1080-
integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==
1077+
"@eslint/eslintrc@^0.4.3":
1078+
version "0.4.3"
1079+
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
1080+
integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
10811081
dependencies:
10821082
ajv "^6.12.4"
10831083
debug "^4.1.1"
10841084
espree "^7.3.0"
1085-
globals "^12.1.0"
1085+
globals "^13.9.0"
10861086
ignore "^4.0.6"
10871087
import-fresh "^3.2.1"
10881088
js-yaml "^3.13.1"
@@ -1239,6 +1239,20 @@
12391239
"@glimmer/interfaces" "^0.42.2"
12401240
"@glimmer/util" "^0.42.2"
12411241

1242+
"@humanwhocodes/config-array@^0.5.0":
1243+
version "0.5.0"
1244+
resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
1245+
integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
1246+
dependencies:
1247+
"@humanwhocodes/object-schema" "^1.2.0"
1248+
debug "^4.1.1"
1249+
minimatch "^3.0.4"
1250+
1251+
"@humanwhocodes/object-schema@^1.2.0":
1252+
version "1.2.0"
1253+
resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf"
1254+
integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==
1255+
12421256
"@iarna/toml@2.2.5":
12431257
version "2.2.5"
12441258
resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c"
@@ -2108,10 +2122,10 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4:
21082122
json-schema-traverse "^0.4.1"
21092123
uri-js "^4.2.2"
21102124

2111-
ajv@^7.0.2:
2112-
version "7.1.0"
2113-
resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.1.0.tgz#f982ea7933dc7f1012eae9eec5a86687d805421b"
2114-
integrity sha512-svS9uILze/cXbH0z2myCK2Brqprx/+JJYK5pHicT/GQiBfzzhUVAIT6MwqJg8y4xV/zoGsUeuPuwtoiKSGE15g==
2125+
ajv@^8.0.1:
2126+
version "8.6.3"
2127+
resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764"
2128+
integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==
21152129
dependencies:
21162130
fast-deep-equal "^3.1.1"
21172131
json-schema-traverse "^1.0.0"
@@ -2187,6 +2201,11 @@ ansi-regex@^5.0.0:
21872201
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
21882202
integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
21892203

2204+
ansi-regex@^5.0.1:
2205+
version "5.0.1"
2206+
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
2207+
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
2208+
21902209
ansi-styles@^2.2.1:
21912210
version "2.2.1"
21922211
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -6975,6 +6994,11 @@ escodegen@^1.14.1:
69756994
optionalDependencies:
69766995
source-map "~0.6.1"
69776996

6997+
eslint-config-prettier@^8.3.0:
6998+
version "8.3.0"
6999+
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
7000+
integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==
7001+
69787002
eslint-plugin-ember@^8.9.1:
69797003
version "8.14.0"
69807004
resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-8.14.0.tgz#fc4c5119b5a1c87604a7bf920ca397783b96b7be"
@@ -7005,6 +7029,13 @@ eslint-plugin-node@^11.1.0:
70057029
resolve "^1.10.1"
70067030
semver "^6.1.0"
70077031

7032+
eslint-plugin-prettier@^4.0.0:
7033+
version "4.0.0"
7034+
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz#8b99d1e4b8b24a762472b4567992023619cb98e0"
7035+
integrity sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==
7036+
dependencies:
7037+
prettier-linter-helpers "^1.0.0"
7038+
70087039
eslint-scope@^4.0.3:
70097040
version "4.0.3"
70107041
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
@@ -7089,36 +7120,39 @@ eslint@^6.6.0:
70897120
v8-compile-cache "^2.0.3"
70907121

70917122
eslint@^7.21.0:
7092-
version "7.21.0"
7093-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz#4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83"
7094-
integrity sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg==
7123+
version "7.32.0"
7124+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
7125+
integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
70957126
dependencies:
70967127
"@babel/code-frame" "7.12.11"
7097-
"@eslint/eslintrc" "^0.4.0"
7128+
"@eslint/eslintrc" "^0.4.3"
7129+
"@humanwhocodes/config-array" "^0.5.0"
70987130
ajv "^6.10.0"
70997131
chalk "^4.0.0"
71007132
cross-spawn "^7.0.2"
71017133
debug "^4.0.1"
71027134
doctrine "^3.0.0"
71037135
enquirer "^2.3.5"
7136+
escape-string-regexp "^4.0.0"
71047137
eslint-scope "^5.1.1"
71057138
eslint-utils "^2.1.0"
71067139
eslint-visitor-keys "^2.0.0"
71077140
espree "^7.3.1"
71087141
esquery "^1.4.0"
71097142
esutils "^2.0.2"
7143+
fast-deep-equal "^3.1.3"
71107144
file-entry-cache "^6.0.1"
71117145
functional-red-black-tree "^1.0.1"
7112-
glob-parent "^5.0.0"
7113-
globals "^12.1.0"
7146+
glob-parent "^5.1.2"
7147+
globals "^13.6.0"
71147148
ignore "^4.0.6"
71157149
import-fresh "^3.0.0"
71167150
imurmurhash "^0.1.4"
71177151
is-glob "^4.0.0"
71187152
js-yaml "^3.13.1"
71197153
json-stable-stringify-without-jsonify "^1.0.1"
71207154
levn "^0.4.1"
7121-
lodash "^4.17.20"
7155+
lodash.merge "^4.6.2"
71227156
minimatch "^3.0.4"
71237157
natural-compare "^1.4.0"
71247158
optionator "^0.9.1"
@@ -7127,7 +7161,7 @@ eslint@^7.21.0:
71277161
semver "^7.2.1"
71287162
strip-ansi "^6.0.0"
71297163
strip-json-comments "^3.1.0"
7130-
table "^6.0.4"
7164+
table "^6.0.9"
71317165
text-table "^0.2.0"
71327166
v8-compile-cache "^2.0.3"
71337167

@@ -7452,11 +7486,16 @@ extsprintf@^1.2.0:
74527486
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
74537487
integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
74547488

7455-
fast-deep-equal@^3.1.1:
7489+
fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
74567490
version "3.1.3"
74577491
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
74587492
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
74597493

7494+
fast-diff@^1.1.2:
7495+
version "1.2.0"
7496+
resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
7497+
integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
7498+
74607499
fast-glob@^3.0.3, fast-glob@^3.1.1:
74617500
version "3.2.2"
74627501
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz#ade1a9d91148965d4bf7c51f72e1ca662d32e63d"
@@ -8228,6 +8267,13 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
82288267
dependencies:
82298268
is-glob "^4.0.1"
82308269

8270+
glob-parent@^5.1.2:
8271+
version "5.1.2"
8272+
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
8273+
integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
8274+
dependencies:
8275+
is-glob "^4.0.1"
8276+
82318277
glob@7.1.6, glob@^7.0.0, glob@^7.0.4, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
82328278
version "7.1.6"
82338279
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
@@ -8297,6 +8343,13 @@ globals@^12.1.0:
82978343
dependencies:
82988344
type-fest "^0.8.1"
82998345

8346+
globals@^13.6.0, globals@^13.9.0:
8347+
version "13.11.0"
8348+
resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7"
8349+
integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==
8350+
dependencies:
8351+
type-fest "^0.20.2"
8352+
83008353
globals@^9.18.0:
83018354
version "9.18.0"
83028355
resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
@@ -10374,6 +10427,11 @@ lodash.toarray@^4.4.0:
1037410427
resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
1037510428
integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE=
1037610429

10430+
lodash.truncate@^4.4.2:
10431+
version "4.4.2"
10432+
resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
10433+
integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
10434+
1037710435
lodash.uniq@^4.2.0, lodash.uniq@^4.5.0:
1037810436
version "4.5.0"
1037910437
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -12144,6 +12202,13 @@ prepend-http@^2.0.0:
1214412202
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
1214512203
integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
1214612204

12205+
prettier-linter-helpers@^1.0.0:
12206+
version "1.0.0"
12207+
resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
12208+
integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
12209+
dependencies:
12210+
fast-diff "^1.1.2"
12211+
1214712212
prettier@^2.4.1:
1214812213
version "2.4.1"
1214912214
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c"
@@ -13870,6 +13935,15 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
1387013935
is-fullwidth-code-point "^3.0.0"
1387113936
strip-ansi "^6.0.0"
1387213937

13938+
string-width@^4.2.3:
13939+
version "4.2.3"
13940+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
13941+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
13942+
dependencies:
13943+
emoji-regex "^8.0.0"
13944+
is-fullwidth-code-point "^3.0.0"
13945+
strip-ansi "^6.0.1"
13946+
1387313947
string.prototype.matchall@^4.0.4:
1387413948
version "4.0.5"
1387513949
resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz#59370644e1db7e4c0c045277690cf7b01203c4da"
@@ -13968,6 +14042,13 @@ strip-ansi@^6.0.0:
1396814042
dependencies:
1396914043
ansi-regex "^5.0.0"
1397014044

14045+
strip-ansi@^6.0.1:
14046+
version "6.0.1"
14047+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
14048+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
14049+
dependencies:
14050+
ansi-regex "^5.0.1"
14051+
1397114052
strip-bom@^3.0.0:
1397214053
version "3.0.0"
1397314054
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -14116,15 +14197,17 @@ table@^5.2.3:
1411614197
slice-ansi "^2.1.0"
1411714198
string-width "^3.0.0"
1411814199

14119-
table@^6.0.4:
14120-
version "6.0.7"
14121-
resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"
14122-
integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==
14200+
table@^6.0.9:
14201+
version "6.7.2"
14202+
resolved "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz#a8d39b9f5966693ca8b0feba270a78722cbaf3b0"
14203+
integrity sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==
1412314204
dependencies:
14124-
ajv "^7.0.2"
14125-
lodash "^4.17.20"
14205+
ajv "^8.0.1"
14206+
lodash.clonedeep "^4.5.0"
14207+
lodash.truncate "^4.4.2"
1412614208
slice-ansi "^4.0.0"
14127-
string-width "^4.2.0"
14209+
string-width "^4.2.3"
14210+
strip-ansi "^6.0.1"
1412814211

1412914212
tailwindcss@^1.2.0:
1413014213
version "1.9.6"

0 commit comments

Comments
 (0)