Skip to content

Commit d597c59

Browse files
authored
Merge pull request #5 from mfbx9da4/dependabot/npm_and_yarn/dot-prop-4.2.1
Bump dot-prop from 4.2.0 to 4.2.1
2 parents cefb37a + 552cd2c commit d597c59

File tree

1 file changed

+8
-91
lines changed

1 file changed

+8
-91
lines changed

yarn.lock

Lines changed: 8 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -390,15 +390,9 @@
390390
integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
391391

392392
"@types/eslint@^6.1.1":
393-
<<<<<<< HEAD
394-
version "6.8.1"
395-
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-6.8.1.tgz#e26f365a5dda12445d1d5a17eb70efd7c844a3d8"
396-
integrity sha512-eutiEpQ4SN7kdF8QVDPyiSSy7ZFM+werJVw6/mRxLGbG4oet6/p81WFjSIcuY9PzM+dsu25Yh5EAUmQ9aJC1gg==
397-
=======
398393
version "6.1.8"
399394
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-6.1.8.tgz#7e868f89bc1e520323d405940e49cb912ede5bba"
400395
integrity sha512-CJBhm9pYdUS8cFVbXACWlLxZWFBTQMiM0eI6RYxng3u9oQ9gHdQ5PN89DHPrK4RISRzX62nRsteUlbBgEIdSug==
401-
>>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6
402396
dependencies:
403397
"@types/estree" "*"
404398
"@types/json-schema" "*"
@@ -460,15 +454,9 @@
460454
"@types/jquery" "*"
461455

462456
"@types/node@^12.7.8":
463-
<<<<<<< HEAD
464-
version "12.19.3"
465-
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.3.tgz#a6e252973214079155f749e8bef99cc80af182fa"
466-
integrity sha512-8Jduo8wvvwDzEVJCOvS/G6sgilOLvvhn1eMmK3TW8/T217O7u1jdrK6ImKLv80tVryaPSVeKu6sjDEiFjd4/eg==
467-
=======
468457
version "12.12.30"
469458
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.30.tgz#3501e6f09b954de9c404671cefdbcc5d9d7c45f6"
470459
integrity sha512-sz9MF/zk6qVr3pAnM0BSQvYIBK44tS75QC5N+VbWSE4DjCV/pJ+UzCW/F+vVnl7TkOPcuwQureKNtSSwjBTaMg==
471-
>>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6
472460

473461
"@types/sizzle@*":
474462
version "2.3.2"
@@ -500,60 +488,27 @@
500488
"@types/yargs-parser" "*"
501489

502490
"@typescript-eslint/eslint-plugin@^2.3.1":
503-
<<<<<<< HEAD
504-
version "2.34.0"
505-
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz#6f8ce8a46c7dea4a6f1d171d2bb8fbae6dac2be9"
506-
integrity sha512-4zY3Z88rEE99+CNvTbXSyovv2z9PNOVffTWD2W8QF5s2prBQtwN2zadqERcrHpcR7O/+KMI3fcTAmUUhK/iQcQ==
507-
dependencies:
508-
"@typescript-eslint/experimental-utils" "2.34.0"
509-
=======
510491
version "2.23.0"
511492
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.23.0.tgz#aa7133bfb7b685379d9eafe4ae9e08b9037e129d"
512493
integrity sha512-8iA4FvRsz8qTjR0L/nK9RcRUN3QtIHQiOm69FzV7WS3SE+7P7DyGGwh3k4UNR2JBbk+Ej2Io+jLAaqKibNhmtw==
513494
dependencies:
514495
"@typescript-eslint/experimental-utils" "2.23.0"
515496
eslint-utils "^1.4.3"
516-
>>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6
517497
functional-red-black-tree "^1.0.1"
518498
regexpp "^3.0.0"
519499
tsutils "^3.17.1"
520500

521-
<<<<<<< HEAD
522-
"@typescript-eslint/[email protected]":
523-
version "2.34.0"
524-
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f"
525-
integrity sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA==
526-
dependencies:
527-
"@types/json-schema" "^7.0.3"
528-
"@typescript-eslint/typescript-estree" "2.34.0"
529-
=======
530501
"@typescript-eslint/[email protected]":
531502
version "2.23.0"
532503
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.23.0.tgz#5d2261c8038ec1698ca4435a8da479c661dc9242"
533504
integrity sha512-OswxY59RcXH3NNPmq+4Kis2CYZPurRU6mG5xPcn24CjFyfdVli5mySwZz/g/xDbJXgDsYqNGq7enV0IziWGXVQ==
534505
dependencies:
535506
"@types/json-schema" "^7.0.3"
536507
"@typescript-eslint/typescript-estree" "2.23.0"
537-
>>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6
538508
eslint-scope "^5.0.0"
539509
eslint-utils "^2.0.0"
540510

541511
"@typescript-eslint/parser@^2.3.1":
542-
<<<<<<< HEAD
543-
version "2.34.0"
544-
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.34.0.tgz#50252630ca319685420e9a39ca05fe185a256bc8"
545-
integrity sha512-03ilO0ucSD0EPTw2X4PntSIRFtDPWjrVq7C3/Z3VQHRC7+13YB55rcJI3Jt+YgeHbjUdJPcPa7b23rXCBokuyA==
546-
dependencies:
547-
"@types/eslint-visitor-keys" "^1.0.0"
548-
"@typescript-eslint/experimental-utils" "2.34.0"
549-
"@typescript-eslint/typescript-estree" "2.34.0"
550-
eslint-visitor-keys "^1.1.0"
551-
552-
"@typescript-eslint/[email protected]":
553-
version "2.34.0"
554-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5"
555-
integrity sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==
556-
=======
557512
version "2.23.0"
558513
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.23.0.tgz#f3d4e2928ff647fe77fc2fcef1a3534fee6a3212"
559514
integrity sha512-k61pn/Nepk43qa1oLMiyqApC6x5eP5ddPz6VUYXCAuXxbmRLqkPYzkFRKl42ltxzB2luvejlVncrEpflgQoSUg==
@@ -567,7 +522,6 @@
567522
version "2.23.0"
568523
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.23.0.tgz#d355960fab96bd550855488dcc34b9a4acac8d36"
569524
integrity sha512-pmf7IlmvXdlEXvE/JWNNJpEvwBV59wtJqA8MLAxMKLXNKVRC3HZBXR/SlZLPWTCcwOSg9IM7GeRSV3SIerGVqw==
570-
>>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6
571525
dependencies:
572526
debug "^4.1.1"
573527
eslint-visitor-keys "^1.1.0"
@@ -1353,9 +1307,9 @@ domexception@^1.0.1:
13531307
webidl-conversions "^4.0.2"
13541308

13551309
dot-prop@^4.1.0:
1356-
version "4.2.0"
1357-
resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
1358-
integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
1310+
version "4.2.1"
1311+
resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"
1312+
integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==
13591313
dependencies:
13601314
is-obj "^1.0.0"
13611315

@@ -2930,22 +2884,15 @@ lodash@^4.17.13, lodash@^4.17.14:
29302884
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
29312885
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
29322886

2933-
<<<<<<< HEAD
29342887
lodash@^4.17.15:
29352888
version "4.17.20"
29362889
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
29372890
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
29382891

2939-
loose-envify@^1.0.0:
2940-
version "1.4.0"
2941-
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
2942-
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
2943-
=======
29442892
lolex@^5.0.0:
29452893
version "5.1.2"
29462894
resolved "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz#953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367"
29472895
integrity sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==
2948-
>>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6
29492896
dependencies:
29502897
"@sinonjs/commons" "^1.7.0"
29512898

@@ -2981,22 +2928,10 @@ make-dir@^3.0.0:
29812928
dependencies:
29822929
semver "^6.0.0"
29832930

2984-
<<<<<<< HEAD
2985-
2986-
version "1.3.5"
2987-
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
2988-
integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
2989-
=======
29902931
[email protected], make-error@^1.1.1:
29912932
version "1.3.6"
29922933
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
29932934
integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
2994-
>>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6
2995-
2996-
make-error@^1.1.1:
2997-
version "1.3.6"
2998-
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
2999-
integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
30002935

30012936
30022937
version "1.0.11"
@@ -3803,26 +3738,20 @@ semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@
38033738
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
38043739
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
38053740

3806-
<<<<<<< HEAD
3807-
semver@^6.0.0, semver@^6.1.2, semver@^6.2.0:
3808-
=======
38093741
semver@^6.0.0, semver@^6.1.2, semver@^6.3.0:
3810-
>>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6
38113742
version "6.3.0"
38123743
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
38133744
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
38143745

3815-
<<<<<<< HEAD
3816-
semver@^7.3.2:
3817-
version "7.3.2"
3818-
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
3819-
integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
3820-
=======
38213746
semver@^7.1.1:
38223747
version "7.1.3"
38233748
resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6"
38243749
integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==
3825-
>>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6
3750+
3751+
semver@^7.3.2:
3752+
version "7.3.2"
3753+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
3754+
integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
38263755

38273756
set-blocking@^2.0.0:
38283757
version "2.0.0"
@@ -4297,22 +4226,10 @@ ts-node@^8.4.1:
42974226
source-map-support "^0.5.17"
42984227
yn "3.1.1"
42994228

4300-
<<<<<<< HEAD
4301-
tslib@^1.8.1:
4302-
version "1.14.1"
4303-
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
4304-
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
4305-
4306-
tslib@^1.9.0:
4307-
version "1.10.0"
4308-
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
4309-
integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
4310-
=======
43114229
tslib@^1.8.1, tslib@^1.9.0:
43124230
version "1.11.1"
43134231
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
43144232
integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
4315-
>>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6
43164233

43174234
tsutils@^3.17.1:
43184235
version "3.17.1"

0 commit comments

Comments
 (0)