Skip to content

Commit 2242744

Browse files
authored
Merge branch 'development' into dependabot/npm_and_yarn/eslint-7.2.0
2 parents c2d4788 + 71488a7 commit 2242744

File tree

2 files changed

+12
-60
lines changed

2 files changed

+12
-60
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"eslint-plugin-tsdoc": "^0.2.4",
7878
"husky": "^4.2.5",
7979
"jest": "^26.0.1",
80-
"lint-staged": "^10.2.2",
80+
"lint-staged": "^10.2.10",
8181
"nodemon": "^2.0.3",
8282
"prettier": "^1.19.1",
8383
"rimraf": "^3.0.2",

yarn.lock

Lines changed: 11 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1867,13 +1867,6 @@
18671867
resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
18681868
integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
18691869

1870-
"@samverschueren/stream-to-observable@^0.3.0":
1871-
version "0.3.0"
1872-
resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
1873-
integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==
1874-
dependencies:
1875-
any-observable "^0.3.0"
1876-
18771870
"@sindresorhus/is@^0.14.0":
18781871
version "0.14.0"
18791872
resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -2787,11 +2780,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
27872780
"@types/color-name" "^1.1.1"
27882781
color-convert "^2.0.1"
27892782

2790-
any-observable@^0.3.0:
2791-
version "0.3.0"
2792-
resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
2793-
integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
2794-
27952783
anymatch@^1.3.0:
27962784
version "1.3.2"
27972785
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@@ -3983,11 +3971,6 @@ [email protected]:
39833971
resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
39843972
integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
39853973

3986-
clone@^1.0.2:
3987-
version "1.0.4"
3988-
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
3989-
integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
3990-
39913974
co@^4.6.0:
39923975
version "4.6.0"
39933976
resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -4781,13 +4764,6 @@ deepmerge@^4.2.2:
47814764
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
47824765
integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
47834766

4784-
defaults@^1.0.3:
4785-
version "1.0.3"
4786-
resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
4787-
integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
4788-
dependencies:
4789-
clone "^1.0.2"
4790-
47914767
defer-to-connect@^1.0.1:
47924768
version "1.1.3"
47934769
resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
@@ -5089,11 +5065,6 @@ electron-to-chromium@^1.3.413:
50895065
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.454.tgz#9bf7db2cfa90b48a64a1f13111d667bacfcae618"
50905066
integrity sha512-2ODSCBwHsdB8T6csLaAbXIMYtrhu8oN1c5gS+/C2OqdfF35aXhDsnu8p+d7crbOpVXZnUza8I/Xl31mzkfnxGg==
50915067

5092-
elegant-spinner@^2.0.0:
5093-
version "2.0.0"
5094-
resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-2.0.0.tgz#f236378985ecd16da75488d166be4b688fd5af94"
5095-
integrity sha512-5YRYHhvhYzV/FC4AiMdeSIg3jAYGq9xFvbhZMpPlJoBsfYgrw2DSCYeXfat6tYBu45PWiyRr3+flaCPPmviPaA==
5096-
50975068
elliptic@^6.0.0, elliptic@^6.5.2:
50985069
version "6.5.2"
50995070
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
@@ -8419,45 +8390,40 @@ lines-and-columns@^1.1.6:
84198390
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
84208391
integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
84218392

8422-
lint-staged@^10.2.2:
8423-
version "10.2.7"
8424-
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.2.7.tgz#6e47860af3d86a6a01849cbf8ba80f7754aae6eb"
8425-
integrity sha512-srod2bTpF8riaLz+Bgr6v0mI/nSntE8M9jbh4WwAhoosx0G7RKEUIG7mI5Nu5SMbTF9o8GROPgK0Lhf5cDnUUw==
8393+
lint-staged@^10.2.10:
8394+
version "10.2.10"
8395+
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.2.10.tgz#f0f78bf8786bbe90e1775a0dc540f7f12b6a79b2"
8396+
integrity sha512-dgelFaNH6puUGAcU+OVMgbfpKSerNYsPSn6+nlbRDjovL0KigpsVpCu0PFZG6BJxX8gnHJqaZlR9krZamQsb0w==
84268397
dependencies:
84278398
chalk "^4.0.0"
84288399
cli-truncate "2.1.0"
84298400
commander "^5.1.0"
84308401
cosmiconfig "^6.0.0"
84318402
debug "^4.1.1"
84328403
dedent "^0.7.0"
8404+
enquirer "^2.3.5"
84338405
execa "^4.0.1"
8434-
listr2 "^2.0.2"
8406+
listr2 "^2.1.0"
84358407
log-symbols "^4.0.0"
84368408
micromatch "^4.0.2"
84378409
normalize-path "^3.0.0"
84388410
please-upgrade-node "^3.2.0"
84398411
string-argv "0.3.1"
84408412
stringify-object "^3.3.0"
84418413

8442-
listr2@^2.0.2:
8443-
version "2.0.4"
8444-
resolved "https://registry.yarnpkg.com/listr2/-/listr2-2.0.4.tgz#b39100b0a227ec5659dcf76ddc516211fc168d61"
8445-
integrity sha512-oJaAcplPsa72rKW0eg4P4LbEJjhH+UO2I8uqR/I2wzHrVg16ohSfUy0SlcHS21zfYXxtsUpL8YXGHjyfWMR0cg==
8414+
listr2@^2.1.0:
8415+
version "2.1.7"
8416+
resolved "https://registry.yarnpkg.com/listr2/-/listr2-2.1.7.tgz#8107c12c699bac778f1567739298052d8ebb9c27"
8417+
integrity sha512-XCC1sWLkBFFIMIRwG/LedgHUzN2XLEo02ZqXn6fwuP0GlXGE5BCuL6EAbQFb4vZB+++YEonzEXDPWQe+jCoF6Q==
84468418
dependencies:
8447-
"@samverschueren/stream-to-observable" "^0.3.0"
84488419
chalk "^4.0.0"
8449-
cli-cursor "^3.1.0"
84508420
cli-truncate "^2.1.0"
8451-
elegant-spinner "^2.0.0"
8452-
enquirer "^2.3.5"
84538421
figures "^3.2.0"
84548422
indent-string "^4.0.0"
84558423
log-update "^4.0.0"
84568424
p-map "^4.0.0"
8457-
pad "^3.2.0"
84588425
rxjs "^6.5.5"
84598426
through "^2.3.8"
8460-
uuid "^7.0.2"
84618427

84628428
load-json-file@^2.0.0:
84638429
version "2.0.0"
@@ -9739,13 +9705,6 @@ package-json@^6.3.0:
97399705
registry-url "^5.0.0"
97409706
semver "^6.2.0"
97419707

9742-
pad@^3.2.0:
9743-
version "3.2.0"
9744-
resolved "https://registry.yarnpkg.com/pad/-/pad-3.2.0.tgz#be7a1d1cb6757049b4ad5b70e71977158fea95d1"
9745-
integrity sha512-2u0TrjcGbOjBTJpyewEl4hBO3OeX5wWue7eIFPzQTg6wFSvoaHcBTTUY5m+n0hd04gmTCPuY0kCpVIVuw5etwg==
9746-
dependencies:
9747-
wcwidth "^1.0.1"
9748-
97499708
pako@~1.0.5:
97509709
version "1.0.11"
97519710
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
@@ -13303,7 +13262,7 @@ uuid@^3.3.2:
1330313262
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
1330413263
integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
1330513264

13306-
uuid@^7.0.0, uuid@^7.0.2, uuid@^7.0.3:
13265+
uuid@^7.0.0, uuid@^7.0.3:
1330713266
version "7.0.3"
1330813267
resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
1330913268
integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
@@ -13589,13 +13548,6 @@ watchpack@^1.6.1:
1358913548
chokidar "^3.4.0"
1359013549
watchpack-chokidar2 "^2.0.0"
1359113550

13592-
wcwidth@^1.0.1:
13593-
version "1.0.1"
13594-
resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
13595-
integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
13596-
dependencies:
13597-
defaults "^1.0.3"
13598-
1359913551
webfontloader@^1.6.28:
1360013552
version "1.6.28"
1360113553
resolved "https://registry.yarnpkg.com/webfontloader/-/webfontloader-1.6.28.tgz#db786129253cb6e8eae54c2fb05f870af6675bae"

0 commit comments

Comments
 (0)