|
390 | 390 | integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
|
391 | 391 |
|
392 | 392 | "@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 |
| -======= |
398 | 393 | version "6.1.8"
|
399 | 394 | resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-6.1.8.tgz#7e868f89bc1e520323d405940e49cb912ede5bba"
|
400 | 395 | integrity sha512-CJBhm9pYdUS8cFVbXACWlLxZWFBTQMiM0eI6RYxng3u9oQ9gHdQ5PN89DHPrK4RISRzX62nRsteUlbBgEIdSug==
|
401 |
| ->>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6 |
402 | 396 | dependencies:
|
403 | 397 | "@types/estree" "*"
|
404 | 398 | "@types/json-schema" "*"
|
|
460 | 454 | "@types/jquery" "*"
|
461 | 455 |
|
462 | 456 | "@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 |
| -======= |
468 | 457 | version "12.12.30"
|
469 | 458 | resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.30.tgz#3501e6f09b954de9c404671cefdbcc5d9d7c45f6"
|
470 | 459 | integrity sha512-sz9MF/zk6qVr3pAnM0BSQvYIBK44tS75QC5N+VbWSE4DjCV/pJ+UzCW/F+vVnl7TkOPcuwQureKNtSSwjBTaMg==
|
471 |
| ->>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6 |
472 | 460 |
|
473 | 461 | "@types/sizzle@*":
|
474 | 462 | version "2.3.2"
|
|
500 | 488 | "@types/yargs-parser" "*"
|
501 | 489 |
|
502 | 490 | "@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 |
| -======= |
510 | 491 | version "2.23.0"
|
511 | 492 | resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.23.0.tgz#aa7133bfb7b685379d9eafe4ae9e08b9037e129d"
|
512 | 493 | integrity sha512-8iA4FvRsz8qTjR0L/nK9RcRUN3QtIHQiOm69FzV7WS3SE+7P7DyGGwh3k4UNR2JBbk+Ej2Io+jLAaqKibNhmtw==
|
513 | 494 | dependencies:
|
514 | 495 | "@typescript-eslint/experimental-utils" "2.23.0"
|
515 | 496 | eslint-utils "^1.4.3"
|
516 |
| ->>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6 |
517 | 497 | functional-red-black-tree "^1.0.1"
|
518 | 498 | regexpp "^3.0.0"
|
519 | 499 | tsutils "^3.17.1"
|
520 | 500 |
|
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 |
| -======= |
530 | 501 | "@typescript-eslint/[email protected]":
|
531 | 502 | version "2.23.0"
|
532 | 503 | resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.23.0.tgz#5d2261c8038ec1698ca4435a8da479c661dc9242"
|
533 | 504 | integrity sha512-OswxY59RcXH3NNPmq+4Kis2CYZPurRU6mG5xPcn24CjFyfdVli5mySwZz/g/xDbJXgDsYqNGq7enV0IziWGXVQ==
|
534 | 505 | dependencies:
|
535 | 506 | "@types/json-schema" "^7.0.3"
|
536 | 507 | "@typescript-eslint/typescript-estree" "2.23.0"
|
537 |
| ->>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6 |
538 | 508 | eslint-scope "^5.0.0"
|
539 |
| - eslint-utils "^2.0.0" |
540 | 509 |
|
541 | 510 | "@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 |
| -======= |
557 | 511 | version "2.23.0"
|
558 | 512 | resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.23.0.tgz#f3d4e2928ff647fe77fc2fcef1a3534fee6a3212"
|
559 | 513 | integrity sha512-k61pn/Nepk43qa1oLMiyqApC6x5eP5ddPz6VUYXCAuXxbmRLqkPYzkFRKl42ltxzB2luvejlVncrEpflgQoSUg==
|
|
567 | 521 | version "2.23.0"
|
568 | 522 | resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.23.0.tgz#d355960fab96bd550855488dcc34b9a4acac8d36"
|
569 | 523 | integrity sha512-pmf7IlmvXdlEXvE/JWNNJpEvwBV59wtJqA8MLAxMKLXNKVRC3HZBXR/SlZLPWTCcwOSg9IM7GeRSV3SIerGVqw==
|
570 |
| ->>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6 |
571 | 524 | dependencies:
|
572 | 525 | debug "^4.1.1"
|
573 | 526 | eslint-visitor-keys "^1.1.0"
|
574 | 527 | glob "^7.1.6"
|
575 | 528 | is-glob "^4.0.1"
|
576 | 529 | lodash "^4.17.15"
|
577 |
| - semver "^7.3.2" |
| 530 | + semver "^6.3.0" |
578 | 531 | tsutils "^3.17.1"
|
579 | 532 |
|
580 | 533 | abab@^2.0.0:
|
@@ -2930,22 +2883,15 @@ lodash@^4.17.13, lodash@^4.17.14:
|
2930 | 2883 | resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
|
2931 | 2884 | integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
|
2932 | 2885 |
|
2933 |
| -<<<<<<< HEAD |
2934 | 2886 | lodash@^4.17.15:
|
2935 | 2887 | version "4.17.20"
|
2936 | 2888 | resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
|
2937 | 2889 | integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
|
2938 | 2890 |
|
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 |
| -======= |
2944 | 2891 | lolex@^5.0.0:
|
2945 | 2892 | version "5.1.2"
|
2946 | 2893 | resolved "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz#953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367"
|
2947 | 2894 | integrity sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==
|
2948 |
| ->>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6 |
2949 | 2895 | dependencies:
|
2950 | 2896 | "@sinonjs/commons" "^1.7.0"
|
2951 | 2897 |
|
@@ -2981,22 +2927,10 @@ make-dir@^3.0.0:
|
2981 | 2927 | dependencies:
|
2982 | 2928 | semver "^6.0.0"
|
2983 | 2929 |
|
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 |
| -======= |
2990 | 2930 | [email protected], make-error@^1.1.1:
|
2991 | 2931 | version "1.3.6"
|
2992 | 2932 | resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
|
2993 | 2933 | 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== |
3000 | 2934 |
|
3001 | 2935 |
|
3002 | 2936 | version "1.0.11"
|
@@ -3803,26 +3737,20 @@ semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.5, semver@^5.5.0, semver@
|
3803 | 3737 | resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
|
3804 | 3738 | integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
|
3805 | 3739 |
|
3806 |
| -<<<<<<< HEAD |
3807 |
| -semver@^6.0.0, semver@^6.1.2, semver@^6.2.0: |
3808 |
| -======= |
3809 | 3740 | semver@^6.0.0, semver@^6.1.2, semver@^6.3.0:
|
3810 |
| ->>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6 |
3811 | 3741 | version "6.3.0"
|
3812 | 3742 | resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
|
3813 | 3743 | integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
|
3814 | 3744 |
|
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 |
| -======= |
3821 | 3745 | semver@^7.1.1:
|
3822 | 3746 | version "7.1.3"
|
3823 | 3747 | resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6"
|
3824 | 3748 | integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==
|
3825 |
| ->>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6 |
| 3749 | + |
| 3750 | +semver@^7.3.2: |
| 3751 | + version "7.3.2" |
| 3752 | + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" |
| 3753 | + integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== |
3826 | 3754 |
|
3827 | 3755 | set-blocking@^2.0.0:
|
3828 | 3756 | version "2.0.0"
|
@@ -4297,22 +4225,10 @@ ts-node@^8.4.1:
|
4297 | 4225 | source-map-support "^0.5.17"
|
4298 | 4226 | yn "3.1.1"
|
4299 | 4227 |
|
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 |
| -======= |
4311 | 4228 | tslib@^1.8.1, tslib@^1.9.0:
|
4312 | 4229 | version "1.11.1"
|
4313 | 4230 | resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
|
4314 | 4231 | integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
|
4315 |
| ->>>>>>> cdb749dd1a4e8b5bbb65f822fb6032ebe0b076e6 |
4316 | 4232 |
|
4317 | 4233 | tsutils@^3.17.1:
|
4318 | 4234 | version "3.17.1"
|
|
0 commit comments