Skip to content

Commit d151556

Browse files
authored
Merge pull request #223 from elwayman02/eslint-upgrade
Upgrade eslint & eslint-plugin-ember
2 parents fd25a47 + 507ab4e commit d151556

File tree

3 files changed

+54
-48
lines changed

3 files changed

+54
-48
lines changed

.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = {
1515
],
1616
extends: [
1717
'eslint:recommended',
18-
'plugin:ember/octane'
18+
'plugin:ember/recommended'
1919
],
2020
env: {
2121
browser: true

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
"ember-source-channel-url": "^3.0.0",
6363
"ember-template-lint": "^2.14.0",
6464
"ember-try": "^1.4.0",
65-
"eslint": "^7.14.0",
66-
"eslint-plugin-ember": "^9.6.0",
65+
"eslint": "^7.15.0",
66+
"eslint-plugin-ember": "^10.0.2",
6767
"eslint-plugin-node": "^11.1.0",
6868
"loader.js": "^4.7.0",
6969
"npm-run-all": "^4.1.5",

yarn.lock

+51-45
Original file line numberDiff line numberDiff line change
@@ -1264,10 +1264,10 @@
12641264
resolve "^1.8.1"
12651265
semver "^7.3.2"
12661266

1267-
"@eslint/eslintrc@^0.2.1":
1268-
version "0.2.1"
1269-
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c"
1270-
integrity sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==
1267+
"@eslint/eslintrc@^0.2.2":
1268+
version "0.2.2"
1269+
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76"
1270+
integrity sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==
12711271
dependencies:
12721272
ajv "^6.12.4"
12731273
debug "^4.1.1"
@@ -2224,6 +2224,11 @@ acorn-jsx@^5.2.0:
22242224
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
22252225
integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
22262226

2227+
acorn-jsx@^5.3.1:
2228+
version "5.3.1"
2229+
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
2230+
integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
2231+
22272232
acorn-node@^1.6.1:
22282233
version "1.8.2"
22292234
resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8"
@@ -7326,10 +7331,10 @@ escodegen@^1.14.1:
73267331
optionalDependencies:
73277332
source-map "~0.6.1"
73287333

7329-
eslint-plugin-ember@^9.6.0:
7330-
version "9.6.0"
7331-
resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-9.6.0.tgz#607669732094081922660c3be5fc29f3caa3ee51"
7332-
integrity sha512-MNSXffxPhIiYaVc4eisRPeNoRb19W/2pHWiXwETlhQI9w/2VCyXLKY7c/8gtOCcjuEw4Xd5NiCMqxcNmyq5UzQ==
7334+
eslint-plugin-ember@^10.0.2:
7335+
version "10.0.2"
7336+
resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-10.0.2.tgz#5e81c6baf75ca62fce424c0a422e494cee2d4421"
7337+
integrity sha512-GKZhLsnvODkAhORlsnT24D451Kl47ykMoqYKktZJR2Q3+3kklcU0Bj8xkqKJj/HVhsBH80FD74yTiYZKavSqFg==
73337338
dependencies:
73347339
"@ember-data/rfc395-data" "^0.0.4"
73357340
css-tree "^1.0.0-alpha.39"
@@ -7390,13 +7395,13 @@ eslint-visitor-keys@^2.0.0:
73907395
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
73917396
integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
73927397

7393-
eslint@^7.14.0:
7394-
version "7.14.0"
7395-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.14.0.tgz#2d2cac1d28174c510a97b377f122a5507958e344"
7396-
integrity sha512-5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==
7398+
eslint@^7.15.0:
7399+
version "7.15.0"
7400+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.15.0.tgz#eb155fb8ed0865fcf5d903f76be2e5b6cd7e0bc7"
7401+
integrity sha512-Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA==
73977402
dependencies:
73987403
"@babel/code-frame" "^7.0.0"
7399-
"@eslint/eslintrc" "^0.2.1"
7404+
"@eslint/eslintrc" "^0.2.2"
74007405
ajv "^6.10.0"
74017406
chalk "^4.0.0"
74027407
cross-spawn "^7.0.2"
@@ -7406,10 +7411,10 @@ eslint@^7.14.0:
74067411
eslint-scope "^5.1.1"
74077412
eslint-utils "^2.1.0"
74087413
eslint-visitor-keys "^2.0.0"
7409-
espree "^7.3.0"
7414+
espree "^7.3.1"
74107415
esquery "^1.2.0"
74117416
esutils "^2.0.2"
7412-
file-entry-cache "^5.0.1"
7417+
file-entry-cache "^6.0.0"
74137418
functional-red-black-tree "^1.0.1"
74147419
glob-parent "^5.0.0"
74157420
globals "^12.1.0"
@@ -7447,6 +7452,15 @@ espree@^7.3.0:
74477452
acorn-jsx "^5.2.0"
74487453
eslint-visitor-keys "^1.3.0"
74497454

7455+
espree@^7.3.1:
7456+
version "7.3.1"
7457+
resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
7458+
integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
7459+
dependencies:
7460+
acorn "^7.4.0"
7461+
acorn-jsx "^5.3.1"
7462+
eslint-visitor-keys "^1.3.0"
7463+
74507464
esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
74517465
version "4.0.1"
74527466
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
@@ -7834,12 +7848,12 @@ figures@^3.0.0:
78347848
dependencies:
78357849
escape-string-regexp "^1.0.5"
78367850

7837-
file-entry-cache@^5.0.1:
7838-
version "5.0.1"
7839-
resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
7840-
integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
7851+
file-entry-cache@^6.0.0:
7852+
version "6.0.0"
7853+
resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a"
7854+
integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==
78417855
dependencies:
7842-
flat-cache "^2.0.1"
7856+
flat-cache "^3.0.4"
78437857

78447858
file-uri-to-path@1.0.0:
78457859
version "1.0.0"
@@ -8014,24 +8028,23 @@ fixturify@^2.1.0:
80148028
matcher-collection "^2.0.1"
80158029
walk-sync "^2.0.2"
80168030

8017-
flat-cache@^2.0.1:
8018-
version "2.0.1"
8019-
resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
8020-
integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
8031+
flat-cache@^3.0.4:
8032+
version "3.0.4"
8033+
resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
8034+
integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
80218035
dependencies:
8022-
flatted "^2.0.0"
8023-
rimraf "2.6.3"
8024-
write "1.0.3"
8036+
flatted "^3.1.0"
8037+
rimraf "^3.0.2"
80258038

80268039
flat@^5.0.2:
80278040
version "5.0.2"
80288041
resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
80298042
integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
80308043

8031-
flatted@^2.0.0:
8032-
version "2.0.1"
8033-
resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
8034-
integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
8044+
flatted@^3.1.0:
8045+
version "3.1.0"
8046+
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"
8047+
integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==
80358048

80368049
flush-write-stream@^1.0.0:
80378050
version "1.1.1"
@@ -12811,13 +12824,6 @@ reusify@^1.0.4:
1281112824
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
1281212825
integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
1281312826

12814-
rimraf@2.6.3, rimraf@~2.6.2:
12815-
version "2.6.3"
12816-
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
12817-
integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
12818-
dependencies:
12819-
glob "^7.1.3"
12820-
1282112827
rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.1, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1:
1282212828
version "2.7.1"
1282312829
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -12832,6 +12838,13 @@ rimraf@^3.0.0, rimraf@^3.0.1, rimraf@^3.0.2:
1283212838
dependencies:
1283312839
glob "^7.1.3"
1283412840

12841+
rimraf@~2.6.2:
12842+
version "2.6.3"
12843+
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
12844+
integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
12845+
dependencies:
12846+
glob "^7.1.3"
12847+
1283512848
ripemd160@^2.0.0, ripemd160@^2.0.1:
1283612849
version "2.0.2"
1283712850
resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -14965,13 +14978,6 @@ write-file-atomic@^3.0.0:
1496514978
signal-exit "^3.0.2"
1496614979
typedarray-to-buffer "^3.1.5"
1496714980

14968-
write@1.0.3:
14969-
version "1.0.3"
14970-
resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
14971-
integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
14972-
dependencies:
14973-
mkdirp "^0.5.1"
14974-
1497514981
ws@^7.0.0, ws@^7.1.2:
1497614982
version "7.2.1"
1497714983
resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.1.tgz#03ed52423cd744084b2cf42ed197c8b65a936b8e"

0 commit comments

Comments
 (0)