Skip to content

Commit e4b18d5

Browse files
authored
Merge pull request #627 from embermap/eslint-8.14.0
Bump eslint from 7.32.0 to 8.14.0
2 parents a0c03a5 + 76007eb commit e4b18d5

3 files changed

Lines changed: 68 additions & 22 deletions

File tree

.eslintrc.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@ module.exports = {
55
server: true,
66
},
77
root: true,
8-
parser: 'babel-eslint',
8+
parser: '@babel/eslint-parser',
99
parserOptions: {
10-
ecmaVersion: 2018,
10+
ecmaVersion: 2021,
1111
sourceType: 'module',
1212
ecmaFeatures: {
1313
legacyDecorators: true,
1414
},
15+
requireConfigFile: false,
16+
babelOptions: {
17+
plugins: [['@babel/plugin-proposal-decorators', { legacy: true }]],
18+
},
1519
},
1620
plugins: ['ember'],
1721
extends: [

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,13 @@
3939
"whatwg-fetch": "^3.0.0"
4040
},
4141
"devDependencies": {
42+
"@babel/eslint-parser": "^7.17.0",
43+
"@babel/plugin-proposal-decorators": "^7.17.9",
4244
"@ember/optional-features": "^2.0.0",
4345
"@ember/test-helpers": "^2.7.0",
4446
"@embroider/test-setup": "^1.6.0",
4547
"@glimmer/component": "^1.1.2",
4648
"@glimmer/tracking": "^1.1.2",
47-
"babel-eslint": "^10.1.0",
4849
"broccoli-asset-rev": "^3.0.0",
4950
"broccoli-plugin": "^4.0.7",
5051
"broccoli-stew": "^3.0.0",

yarn.lock

Lines changed: 60 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
dependencies:
1818
"@babel/highlight" "^7.10.4"
1919

20-
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5":
20+
"@babel/code-frame@^7.14.5":
2121
version "7.15.8"
2222
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz#45990c47adadb00c03677baa89221f7cc23d2503"
2323
integrity sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==
@@ -88,6 +88,15 @@
8888
json5 "^2.2.1"
8989
semver "^6.3.0"
9090

91+
"@babel/eslint-parser@^7.17.0":
92+
version "7.17.0"
93+
resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz#eabb24ad9f0afa80e5849f8240d0e5facc2d90d6"
94+
integrity sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==
95+
dependencies:
96+
eslint-scope "^5.1.1"
97+
eslint-visitor-keys "^2.1.0"
98+
semver "^6.3.0"
99+
91100
"@babel/generator@^7.16.8":
92101
version "7.16.8"
93102
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe"
@@ -183,6 +192,19 @@
183192
"@babel/helper-replace-supers" "^7.16.7"
184193
"@babel/helper-split-export-declaration" "^7.16.7"
185194

195+
"@babel/helper-create-class-features-plugin@^7.17.9":
196+
version "7.17.9"
197+
resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz#71835d7fb9f38bd9f1378e40a4c0902fdc2ea49d"
198+
integrity sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==
199+
dependencies:
200+
"@babel/helper-annotate-as-pure" "^7.16.7"
201+
"@babel/helper-environment-visitor" "^7.16.7"
202+
"@babel/helper-function-name" "^7.17.9"
203+
"@babel/helper-member-expression-to-functions" "^7.17.7"
204+
"@babel/helper-optimise-call-expression" "^7.16.7"
205+
"@babel/helper-replace-supers" "^7.16.7"
206+
"@babel/helper-split-export-declaration" "^7.16.7"
207+
186208
"@babel/helper-create-regexp-features-plugin@^7.14.5":
187209
version "7.14.5"
188210
resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz#c7d5ac5e9cf621c26057722fb7a8a4c5889358c4"
@@ -302,6 +324,13 @@
302324
dependencies:
303325
"@babel/types" "^7.16.7"
304326

327+
"@babel/helper-member-expression-to-functions@^7.17.7":
328+
version "7.17.7"
329+
resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4"
330+
integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==
331+
dependencies:
332+
"@babel/types" "^7.17.0"
333+
305334
"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.15.4":
306335
version "7.15.4"
307336
resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f"
@@ -527,7 +556,7 @@
527556
chalk "^2.0.0"
528557
js-tokens "^4.0.0"
529558

530-
"@babel/parser@^7.12.3", "@babel/parser@^7.15.4", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
559+
"@babel/parser@^7.12.3", "@babel/parser@^7.15.4", "@babel/parser@^7.4.5":
531560
version "7.15.8"
532561
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.8.tgz#7bacdcbe71bdc3ff936d510c15dcea7cf0b99016"
533562
integrity sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==
@@ -593,6 +622,18 @@
593622
"@babel/helper-plugin-utils" "^7.16.7"
594623
"@babel/plugin-syntax-decorators" "^7.16.7"
595624

625+
"@babel/plugin-proposal-decorators@^7.17.9":
626+
version "7.17.9"
627+
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.9.tgz#67a1653be9c77ce5b6c318aa90c8287b87831619"
628+
integrity sha512-EfH2LZ/vPa2wuPwJ26j+kYRkaubf89UlwxKXtxqEm57HrgSEYDB8t4swFP+p8LcI9yiP9ZRJJjo/58hS6BnaDA==
629+
dependencies:
630+
"@babel/helper-create-class-features-plugin" "^7.17.9"
631+
"@babel/helper-plugin-utils" "^7.16.7"
632+
"@babel/helper-replace-supers" "^7.16.7"
633+
"@babel/helper-split-export-declaration" "^7.16.7"
634+
"@babel/plugin-syntax-decorators" "^7.17.0"
635+
charcodes "^0.2.0"
636+
596637
"@babel/plugin-proposal-dynamic-import@^7.16.7":
597638
version "7.16.7"
598639
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
@@ -748,6 +789,13 @@
748789
dependencies:
749790
"@babel/helper-plugin-utils" "^7.16.7"
750791

792+
"@babel/plugin-syntax-decorators@^7.17.0":
793+
version "7.17.0"
794+
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz#a2be3b2c9fe7d78bd4994e790896bc411e2f166d"
795+
integrity sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==
796+
dependencies:
797+
"@babel/helper-plugin-utils" "^7.16.7"
798+
751799
"@babel/plugin-syntax-dynamic-import@^7.8.3":
752800
version "7.8.3"
753801
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
@@ -1300,7 +1348,7 @@
13001348
"@babel/parser" "^7.16.7"
13011349
"@babel/types" "^7.16.7"
13021350

1303-
"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.16.10", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0":
1351+
"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.16.10", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.4.5":
13041352
version "7.16.10"
13051353
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz#448f940defbe95b5a8029975b051f75993e8239f"
13061354
integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==
@@ -1332,7 +1380,7 @@
13321380
debug "^4.1.0"
13331381
globals "^11.1.0"
13341382

1335-
"@babel/types@^7.1.6", "@babel/types@^7.12.1", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
1383+
"@babel/types@^7.1.6", "@babel/types@^7.12.1", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
13361384
version "7.16.8"
13371385
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1"
13381386
integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==
@@ -3279,18 +3327,6 @@ babel-core@^6.26.0, babel-core@^6.26.3:
32793327
slash "^1.0.0"
32803328
source-map "^0.5.7"
32813329

3282-
babel-eslint@^10.1.0:
3283-
version "10.1.0"
3284-
resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
3285-
integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
3286-
dependencies:
3287-
"@babel/code-frame" "^7.0.0"
3288-
"@babel/parser" "^7.7.0"
3289-
"@babel/traverse" "^7.7.0"
3290-
"@babel/types" "^7.7.0"
3291-
eslint-visitor-keys "^1.0.0"
3292-
resolve "^1.12.0"
3293-
32943330
babel-generator@^6.26.0:
32953331
version "6.26.1"
32963332
resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
@@ -5177,6 +5213,11 @@ chalk@^3.0.0:
51775213
ansi-styles "^4.1.0"
51785214
supports-color "^7.1.0"
51795215

5216+
charcodes@^0.2.0:
5217+
version "0.2.0"
5218+
resolved "https://registry.yarnpkg.com/charcodes/-/charcodes-0.2.0.tgz#5208d327e6cc05f99eb80ffc814707572d1f14e4"
5219+
integrity sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==
5220+
51805221
chardet@^0.7.0:
51815222
version "0.7.0"
51825223
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -7866,12 +7907,12 @@ eslint-utils@^3.0.0:
78667907
dependencies:
78677908
eslint-visitor-keys "^2.0.0"
78687909

7869-
eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
7910+
eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
78707911
version "1.3.0"
78717912
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
78727913
integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
78737914

7874-
eslint-visitor-keys@^2.0.0:
7915+
eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
78757916
version "2.1.0"
78767917
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
78777918
integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
@@ -13089,7 +13130,7 @@ resolve-url@^0.2.1:
1308913130
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
1309013131
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
1309113132

13092-
resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.0, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
13133+
resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.0, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
1309313134
version "1.21.0"
1309413135
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.21.0.tgz#b51adc97f3472e6a5cf4444d34bc9d6b9037591f"
1309513136
integrity sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==

0 commit comments

Comments
 (0)