Skip to content

Commit afa8af2

Browse files
build(deps-dev): bump eslint from 7.8.1 to 7.9.0
Bumps [eslint](https://github.com/eslint/eslint) from 7.8.1 to 7.9.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](eslint/eslint@v7.8.1...v7.9.0) Signed-off-by: dependabot-preview[bot] <[email protected]>
1 parent d7519e0 commit afa8af2

File tree

1 file changed

+11
-18
lines changed

1 file changed

+11
-18
lines changed

yarn.lock

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,15 +1202,6 @@
12021202
"@types/yargs" "^15.0.0"
12031203
chalk "^3.0.0"
12041204

1205-
<<<<<<< HEAD
1206-
"@rollup/plugin-babel@^5.2.0":
1207-
version "5.2.0"
1208-
resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.2.0.tgz#b87556d61ed108b4eaf9d18b5323965adf8d9bee"
1209-
integrity sha512-CPABsajaKjINgBQ3it+yMnfVO3ibsrMBxRzbUOUw2cL1hsZJ7aogU8mgglQm3S2hHJgjnAmxPz0Rq7DVdmHsTw==
1210-
dependencies:
1211-
"@babel/helper-module-imports" "^7.10.4"
1212-
"@rollup/pluginutils" "^3.1.0"
1213-
=======
12141205
"@nodelib/[email protected]":
12151206
version "2.1.3"
12161207
resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
@@ -1231,7 +1222,14 @@
12311222
dependencies:
12321223
"@nodelib/fs.scandir" "2.1.3"
12331224
fastq "^1.6.0"
1234-
>>>>>>> 6309ef5470b351506a8a331bf219226df1520905
1225+
1226+
"@rollup/plugin-babel@^5.2.0":
1227+
version "5.2.0"
1228+
resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.2.0.tgz#b87556d61ed108b4eaf9d18b5323965adf8d9bee"
1229+
integrity sha512-CPABsajaKjINgBQ3it+yMnfVO3ibsrMBxRzbUOUw2cL1hsZJ7aogU8mgglQm3S2hHJgjnAmxPz0Rq7DVdmHsTw==
1230+
dependencies:
1231+
"@babel/helper-module-imports" "^7.10.4"
1232+
"@rollup/pluginutils" "^3.1.0"
12351233

12361234
12371235
version "15.0.0"
@@ -1341,11 +1339,6 @@
13411339
dependencies:
13421340
"@types/node" "*"
13431341

1344-
"@types/isomorphic-fetch@^0.0.35":
1345-
version "0.0.35"
1346-
resolved "https://registry.yarnpkg.com/@types/isomorphic-fetch/-/isomorphic-fetch-0.0.35.tgz#c1c0d402daac324582b6186b91f8905340ea3361"
1347-
integrity sha512-DaZNUvLDCAnCTjgwxgiL1eQdxIKEpNLOlTNtAgnZc50bG2copGhRrFN9/PxPBuJe+tZVLCbQ7ls0xveXVRPkvw==
1348-
13491342
"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
13501343
version "2.0.3"
13511344
resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
@@ -2555,9 +2548,9 @@ eslint-visitor-keys@^2.0.0:
25552548
integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
25562549

25572550
eslint@^7.5.0:
2558-
version "7.8.1"
2559-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.8.1.tgz#e59de3573fb6a5be8ff526c791571646d124a8fa"
2560-
integrity sha512-/2rX2pfhyUG0y+A123d0ccXtMm7DV7sH1m3lk9nk2DZ2LReq39FXHueR9xZwshE5MdfSf0xunSaMWRqyIA6M1w==
2551+
version "7.9.0"
2552+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.9.0.tgz#522aeccc5c3a19017cf0cb46ebfd660a79acf337"
2553+
integrity sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA==
25612554
dependencies:
25622555
"@babel/code-frame" "^7.0.0"
25632556
"@eslint/eslintrc" "^0.1.3"

0 commit comments

Comments
 (0)