Skip to content

Commit 0e4b7af

Browse files
Merge pull request #296 from emberjs/dependabot/npm_and_yarn/eslint-7.25.0
2 parents b468cc9 + ca9a479 commit 0e4b7af

File tree

2 files changed

+31
-25
lines changed

2 files changed

+31
-25
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"broccoli-test-helper": "^2.0.0",
3636
"ember-cli": "~3.23.0",
3737
"ember-cli-dependency-checker": "^3.2.0",
38-
"eslint": "^7.19.0",
38+
"eslint": "^7.25.0",
3939
"eslint-config-prettier": "^6.15.0",
4040
"eslint-plugin-node": "^11.1.0",
4141
"eslint-plugin-prettier": "^3.4.0",

yarn.lock

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# yarn lockfile v1
33

44

5-
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11":
5+
"@babel/code-frame@7.12.11", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11":
66
version "7.12.11"
77
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
88
integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
@@ -241,10 +241,10 @@
241241
exec-sh "^0.3.2"
242242
minimist "^1.2.0"
243243

244-
"@eslint/eslintrc@^0.3.0":
245-
version "0.3.0"
246-
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz#d736d6963d7003b6514e6324bec9c602ac340318"
247-
integrity sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg==
244+
"@eslint/eslintrc@^0.4.0":
245+
version "0.4.0"
246+
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547"
247+
integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==
248248
dependencies:
249249
ajv "^6.12.4"
250250
debug "^4.1.1"
@@ -253,7 +253,6 @@
253253
ignore "^4.0.6"
254254
import-fresh "^3.2.1"
255255
js-yaml "^3.13.1"
256-
lodash "^4.17.20"
257256
minimatch "^3.0.4"
258257
strip-json-comments "^3.1.1"
259258

@@ -2766,13 +2765,13 @@ eslint-visitor-keys@^2.0.0:
27662765
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
27672766
integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
27682767

2769-
eslint@^7.19.0:
2770-
version "7.19.0"
2771-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.19.0.tgz#6719621b196b5fad72e43387981314e5d0dc3f41"
2772-
integrity sha512-CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg==
2768+
eslint@^7.25.0:
2769+
version "7.25.0"
2770+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67"
2771+
integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==
27732772
dependencies:
2774-
"@babel/code-frame" "^7.0.0"
2775-
"@eslint/eslintrc" "^0.3.0"
2773+
"@babel/code-frame" "7.12.11"
2774+
"@eslint/eslintrc" "^0.4.0"
27762775
ajv "^6.10.0"
27772776
chalk "^4.0.0"
27782777
cross-spawn "^7.0.2"
@@ -2783,20 +2782,20 @@ eslint@^7.19.0:
27832782
eslint-utils "^2.1.0"
27842783
eslint-visitor-keys "^2.0.0"
27852784
espree "^7.3.1"
2786-
esquery "^1.2.0"
2785+
esquery "^1.4.0"
27872786
esutils "^2.0.2"
2788-
file-entry-cache "^6.0.0"
2787+
file-entry-cache "^6.0.1"
27892788
functional-red-black-tree "^1.0.1"
27902789
glob-parent "^5.0.0"
2791-
globals "^12.1.0"
2790+
globals "^13.6.0"
27922791
ignore "^4.0.6"
27932792
import-fresh "^3.0.0"
27942793
imurmurhash "^0.1.4"
27952794
is-glob "^4.0.0"
27962795
js-yaml "^3.13.1"
27972796
json-stable-stringify-without-jsonify "^1.0.1"
27982797
levn "^0.4.1"
2799-
lodash "^4.17.20"
2798+
lodash "^4.17.21"
28002799
minimatch "^3.0.4"
28012800
natural-compare "^1.4.0"
28022801
optionator "^0.9.1"
@@ -2833,10 +2832,10 @@ esprima@~3.0.0:
28332832
resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
28342833
integrity sha1-U88kes2ncxPlUcOqLnM0LT+099k=
28352834

2836-
esquery@^1.2.0:
2837-
version "1.3.1"
2838-
resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
2839-
integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
2835+
esquery@^1.4.0:
2836+
version "1.4.0"
2837+
resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
2838+
integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
28402839
dependencies:
28412840
estraverse "^5.1.0"
28422841

@@ -3137,10 +3136,10 @@ figures@^3.0.0:
31373136
dependencies:
31383137
escape-string-regexp "^1.0.5"
31393138

3140-
file-entry-cache@^6.0.0:
3141-
version "6.0.0"
3142-
resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a"
3143-
integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==
3139+
file-entry-cache@^6.0.1:
3140+
version "6.0.1"
3141+
resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
3142+
integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
31443143
dependencies:
31453144
flat-cache "^3.0.4"
31463145

@@ -3653,6 +3652,13 @@ globals@^12.1.0:
36533652
dependencies:
36543653
type-fest "^0.8.1"
36553654

3655+
globals@^13.6.0:
3656+
version "13.8.0"
3657+
resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3"
3658+
integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==
3659+
dependencies:
3660+
type-fest "^0.20.2"
3661+
36563662
globalyzer@0.1.0:
36573663
version "0.1.0"
36583664
resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465"

0 commit comments

Comments
 (0)