Skip to content

Commit 8323345

Browse files
Merge branch 'main' into dependabot/npm_and_yarn/types/nodemailer-6.4.4
2 parents 5c0d52c + c96fc1d commit 8323345

File tree

2 files changed

+79
-77
lines changed

2 files changed

+79
-77
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"module-alias": "^2.2.2",
4646
"pg": "^8.7.1",
4747
"pino": "^6.13.3",
48-
"pino-pretty": "^4.7.1",
48+
"pino-pretty": "^7.0.1",
4949
"swagger-ui-express": "^4.1.6",
5050
"typeorm": "^0.2.37",
5151
"uuid": "^8.3.2"
@@ -58,14 +58,14 @@
5858
"@types/jest": "^27.0.1",
5959
"@types/jsonwebtoken": "^8.5.5",
6060
"@types/module-alias": "^2.0.1",
61-
"@types/node": "^14.14.25",
61+
"@types/node": "^16.10.2",
6262
"@types/nodemailer": "^6.4.4",
6363
"@types/pino": "^6.3.11",
6464
"@types/supertest": "^2.0.11",
6565
"@types/swagger-ui-express": "^4.1.3",
6666
"@types/uuid": "^8.3.0",
6767
"@typescript-eslint/eslint-plugin": "^4.31.0",
68-
"@typescript-eslint/parser": "^4.14.2",
68+
"@typescript-eslint/parser": "^4.32.0",
6969
"coveralls": "^3.1.1",
7070
"eslint": "^7.32.0",
7171
"eslint-config-standard": "^16.0.2",

yarn.lock

Lines changed: 76 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -337,11 +337,6 @@
337337
minimatch "^3.0.4"
338338
strip-json-comments "^3.1.1"
339339

340-
"@hapi/bourne@^2.0.0":
341-
version "2.0.0"
342-
resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-2.0.0.tgz#5bb2193eb685c0007540ca61d166d4e1edaf918d"
343-
integrity sha512-WEezM1FWztfbzqIUbsDzFRVMxSoLy3HugVcux6KDDtTqzPsLE8NDRHfXvev66aH1i2oOKKar3/XDjbvh/OUBdg==
344-
345340
"@humanwhocodes/config-array@^0.5.0":
346341
version "0.5.0"
347342
resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
@@ -868,15 +863,10 @@
868863
resolved "https://registry.yarnpkg.com/@types/module-alias/-/module-alias-2.0.1.tgz#e5893236ce922152d57c5f3f978f764f4deeb45f"
869864
integrity sha512-DN/CCT1HQG6HquBNJdLkvV+4v5l/oEuwOHUPLxI+Eub0NED+lk0YUfba04WGH90EINiUrNgClkNnwGmbICeWMQ==
870865

871-
"@types/node@*":
872-
version "15.12.2"
873-
resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.2.tgz#1f2b42c4be7156ff4a6f914b2fb03d05fa84e38d"
874-
integrity sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww==
875-
876-
"@types/node@^14.14.25":
877-
version "14.17.3"
878-
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.3.tgz#6d327abaa4be34a74e421ed6409a0ae2f47f4c3d"
879-
integrity sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw==
866+
"@types/node@*", "@types/node@^16.10.2":
867+
version "16.10.2"
868+
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.10.2.tgz#5764ca9aa94470adb4e1185fe2e9f19458992b2e"
869+
integrity sha512-zCclL4/rx+W5SQTzFs9wyvvyCwoK9QtBpratqz2IYJ3O8Umrn0m3nsTv0wQBk9sRGpvUe9CwPDrQFB10f1FIjQ==
880870

881871
"@types/nodemailer@^6.4.4":
882872
version "6.4.4"
@@ -1041,24 +1031,16 @@
10411031
eslint-scope "^5.1.1"
10421032
eslint-utils "^3.0.0"
10431033

1044-
"@typescript-eslint/parser@^4.14.2":
1045-
version "4.27.0"
1046-
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.27.0.tgz#85447e573364bce4c46c7f64abaa4985aadf5a94"
1047-
integrity sha512-XpbxL+M+gClmJcJ5kHnUpBGmlGdgNvy6cehgR6ufyxkEJMGP25tZKCaKyC0W/JVpuhU3VU1RBn7SYUPKSMqQvQ==
1034+
"@typescript-eslint/parser@^4.32.0":
1035+
version "4.32.0"
1036+
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.32.0.tgz#751ecca0e2fecd3d44484a9b3049ffc1871616e5"
1037+
integrity sha512-lhtYqQ2iEPV5JqV7K+uOVlPePjClj4dOw7K4/Z1F2yvjIUvyr13yJnDzkK6uon4BjHYuHy3EG0c2Z9jEhFk56w==
10481038
dependencies:
1049-
"@typescript-eslint/scope-manager" "4.27.0"
1050-
"@typescript-eslint/types" "4.27.0"
1051-
"@typescript-eslint/typescript-estree" "4.27.0"
1039+
"@typescript-eslint/scope-manager" "4.32.0"
1040+
"@typescript-eslint/types" "4.32.0"
1041+
"@typescript-eslint/typescript-estree" "4.32.0"
10521042
debug "^4.3.1"
10531043

1054-
"@typescript-eslint/scope-manager@4.27.0":
1055-
version "4.27.0"
1056-
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.27.0.tgz#b0b1de2b35aaf7f532e89c8e81d0fa298cae327d"
1057-
integrity sha512-DY73jK6SEH6UDdzc6maF19AHQJBFVRf6fgAXHPXCGEmpqD4vYgPEzqpFz1lf/daSbOcMpPPj9tyXXDPW2XReAw==
1058-
dependencies:
1059-
"@typescript-eslint/types" "4.27.0"
1060-
"@typescript-eslint/visitor-keys" "4.27.0"
1061-
10621044
"@typescript-eslint/scope-manager@4.31.0":
10631045
version "4.31.0"
10641046
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.31.0.tgz#9be33aed4e9901db753803ba233b70d79a87fc3e"
@@ -1067,28 +1049,23 @@
10671049
"@typescript-eslint/types" "4.31.0"
10681050
"@typescript-eslint/visitor-keys" "4.31.0"
10691051

1070-
"@typescript-eslint/types@4.27.0":
1071-
version "4.27.0"
1072-
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.27.0.tgz#712b408519ed699baff69086bc59cd2fc13df8d8"
1073-
integrity sha512-I4ps3SCPFCKclRcvnsVA/7sWzh7naaM/b4pBO2hVxnM3wrU51Lveybdw5WoIktU/V4KfXrTt94V9b065b/0+wA==
1052+
"@typescript-eslint/scope-manager@4.32.0":
1053+
version "4.32.0"
1054+
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.32.0.tgz#e03c8668f8b954072b3f944d5b799c0c9225a7d5"
1055+
integrity sha512-DK+fMSHdM216C0OM/KR1lHXjP1CNtVIhJ54kQxfOE6x8UGFAjha8cXgDMBEIYS2XCYjjCtvTkjQYwL3uvGOo0w==
1056+
dependencies:
1057+
"@typescript-eslint/types" "4.32.0"
1058+
"@typescript-eslint/visitor-keys" "4.32.0"
10741059

10751060
"@typescript-eslint/types@4.31.0":
10761061
version "4.31.0"
10771062
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.31.0.tgz#9a7c86fcc1620189567dc4e46cad7efa07ee8dce"
10781063
integrity sha512-9XR5q9mk7DCXgXLS7REIVs+BaAswfdHhx91XqlJklmqWpTALGjygWVIb/UnLh4NWhfwhR5wNe1yTyCInxVhLqQ==
10791064

1080-
"@typescript-eslint/typescript-estree@4.27.0":
1081-
version "4.27.0"
1082-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.27.0.tgz#189a7b9f1d0717d5cccdcc17247692dedf7a09da"
1083-
integrity sha512-KH03GUsUj41sRLLEy2JHstnezgpS5VNhrJouRdmh6yNdQ+yl8w5LrSwBkExM+jWwCJa7Ct2c8yl8NdtNRyQO6g==
1084-
dependencies:
1085-
"@typescript-eslint/types" "4.27.0"
1086-
"@typescript-eslint/visitor-keys" "4.27.0"
1087-
debug "^4.3.1"
1088-
globby "^11.0.3"
1089-
is-glob "^4.0.1"
1090-
semver "^7.3.5"
1091-
tsutils "^3.21.0"
1065+
"@typescript-eslint/types@4.32.0":
1066+
version "4.32.0"
1067+
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.32.0.tgz#52c633c18da47aee09449144bf59565ab36df00d"
1068+
integrity sha512-LE7Z7BAv0E2UvqzogssGf1x7GPpUalgG07nGCBYb1oK4mFsOiFC/VrSMKbZQzFJdN2JL5XYmsx7C7FX9p9ns0w==
10921069

10931070
"@typescript-eslint/typescript-estree@4.31.0":
10941071
version "4.31.0"
@@ -1103,13 +1080,18 @@
11031080
semver "^7.3.5"
11041081
tsutils "^3.21.0"
11051082

1106-
"@typescript-eslint/visitor-keys@4.27.0":
1107-
version "4.27.0"
1108-
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.27.0.tgz#f56138b993ec822793e7ebcfac6ffdce0a60cb81"
1109-
integrity sha512-es0GRYNZp0ieckZ938cEANfEhsfHrzuLrePukLKtY3/KPXcq1Xd555Mno9/GOgXhKzn0QfkDLVgqWO3dGY80bg==
1083+
"@typescript-eslint/typescript-estree@4.32.0":
1084+
version "4.32.0"
1085+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.32.0.tgz#db00ccc41ccedc8d7367ea3f50c6994b8efa9f3b"
1086+
integrity sha512-tRYCgJ3g1UjMw1cGG8Yn1KzOzNlQ6u1h9AmEtPhb5V5a1TmiHWcRyF/Ic+91M4f43QeChyYlVTcf3DvDTZR9vw==
11101087
dependencies:
1111-
"@typescript-eslint/types" "4.27.0"
1112-
eslint-visitor-keys "^2.0.0"
1088+
"@typescript-eslint/types" "4.32.0"
1089+
"@typescript-eslint/visitor-keys" "4.32.0"
1090+
debug "^4.3.1"
1091+
globby "^11.0.3"
1092+
is-glob "^4.0.1"
1093+
semver "^7.3.5"
1094+
tsutils "^3.21.0"
11131095

11141096
"@typescript-eslint/visitor-keys@4.31.0":
11151097
version "4.31.0"
@@ -1119,6 +1101,14 @@
11191101
"@typescript-eslint/types" "4.31.0"
11201102
eslint-visitor-keys "^2.0.0"
11211103

1104+
"@typescript-eslint/visitor-keys@4.32.0":
1105+
version "4.32.0"
1106+
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.32.0.tgz#455ba8b51242f2722a497ffae29313f33b14cb7f"
1107+
integrity sha512-e7NE0qz8W+atzv3Cy9qaQ7BTLwWsm084Z0c4nIO2l3Bp6u9WIgdqCgyPyV5oSPDMIW3b20H59OOCmVk3jw3Ptw==
1108+
dependencies:
1109+
"@typescript-eslint/types" "4.32.0"
1110+
eslint-visitor-keys "^2.0.0"
1111+
11221112
abab@^2.0.3, abab@^2.0.5:
11231113
version "2.0.5"
11241114
resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
@@ -1895,6 +1885,11 @@ colorette@^1.2.2:
18951885
resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
18961886
integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
18971887

1888+
colorette@^2.0.0:
1889+
version "2.0.12"
1890+
resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.12.tgz#7938ab254e7bb1bba29b0fd1b4cc168889ca4d74"
1891+
integrity sha512-lHID0PU+NtFzeNCwTL6JzUKdb6kDpyEjrwTD1H0cDZswTbsjLh2wTV2Eo2sNZLc0oSg0a5W1AI4Nj7bX4iIdjA==
1892+
18981893
combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
18991894
version "1.0.8"
19001895
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -4083,15 +4078,10 @@ jest@^26.6.3:
40834078
import-local "^3.0.2"
40844079
jest-cli "^26.6.3"
40854080

4086-
jmespath@^0.15.0:
4087-
version "0.15.0"
4088-
resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
4089-
integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=
4090-
4091-
joycon@^2.2.5:
4092-
version "2.2.5"
4093-
resolved "https://registry.yarnpkg.com/joycon/-/joycon-2.2.5.tgz#8d4cf4cbb2544d7b7583c216fcdfec19f6be1615"
4094-
integrity sha512-YqvUxoOcVPnCp0VU1/56f+iKSdvIRJYPznH22BdXV3xMk75SFXhWeJkZ8C9XxUWt1b5x2X1SxuFygW1U0FmkEQ==
4081+
joycon@^3.0.0:
4082+
version "3.0.1"
4083+
resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.0.1.tgz#9074c9b08ccf37a6726ff74a18485f85efcaddaf"
4084+
integrity sha512-SJcJNBg32dGgxhPtM0wQqxqV0ax9k/9TaUskGDSJkSFSQOEWWvQ3zzWdGQRIUry2j1zA5+ReH13t0Mf3StuVZA==
40954085

40964086
js-tokens@^4.0.0:
40974087
version "4.0.0"
@@ -5328,22 +5318,29 @@ pinkie@^2.0.0:
53285318
resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
53295319
integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
53305320

5331-
pino-pretty@^4.7.1:
5332-
version "4.8.0"
5333-
resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-4.8.0.tgz#f2f3055bf222456217b14ffb04d8be0a0cc17fce"
5334-
integrity sha512-mhQfHG4rw5ZFpWL44m0Utjo4GC2+HMfdNvxyA8lLw0sIqn6fCf7uQe6dPckUcW/obly+OQHD7B/MTso6LNizYw==
5321+
pino-abstract-transport@^0.3.0:
5322+
version "0.3.0"
5323+
resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-0.3.0.tgz#9925d826a1b6e9a667ca43d14981d82240edd794"
5324+
integrity sha512-jsd59/ruahIoIU4xAdFtvk3lS9rwsDNJ7Vi0K34ATh1PEOD796SPqvydMaRk296CeTROyBG0SNCwsshN6QhxVg==
5325+
dependencies:
5326+
split2 "^3.2.2"
5327+
5328+
pino-pretty@^7.0.1:
5329+
version "7.0.1"
5330+
resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-7.0.1.tgz#1e5cf4f7ddacc5b45f5308f3adf4fedb02a3ec95"
5331+
integrity sha512-GMcNSmkZkwZseMOkaQWgmkGBPPhSuVwDZMf85i3sbkD/rZldoYyLSyU22YcXvYoLc3usX25GLA1VN6zvzQx7MQ==
53355332
dependencies:
5336-
"@hapi/bourne" "^2.0.0"
53375333
args "^5.0.1"
5338-
chalk "^4.0.0"
5334+
colorette "^2.0.0"
53395335
dateformat "^4.5.1"
53405336
fast-safe-stringify "^2.0.7"
5341-
jmespath "^0.15.0"
5342-
joycon "^2.2.5"
5337+
joycon "^3.0.0"
5338+
pino-abstract-transport "^0.3.0"
53435339
pump "^3.0.0"
53445340
readable-stream "^3.6.0"
53455341
rfdc "^1.3.0"
5346-
split2 "^3.1.1"
5342+
secure-json-parse "^2.4.0"
5343+
sonic-boom "^2.2.0"
53475344
strip-json-comments "^3.1.1"
53485345

53495346
pino-std-serializers@^3.1.0:
@@ -5868,6 +5865,11 @@ saxes@^5.0.1:
58685865
dependencies:
58695866
xmlchars "^2.2.0"
58705867

5868+
secure-json-parse@^2.4.0:
5869+
version "2.4.0"
5870+
resolved "https://registry.yarnpkg.com/secure-json-parse/-/secure-json-parse-2.4.0.tgz#5aaeaaef85c7a417f76271a4f5b0cc3315ddca85"
5871+
integrity sha512-Q5Z/97nbON5t/L/sH6mY2EacfjVGwrCcSi5D3btRO2GZ8pf1K1UN7Z9H5J57hjVU2Qzxr1xO+FmBhOvEkzCMmg==
5872+
58715873
semver-compare@^1.0.0:
58725874
version "1.0.0"
58735875
resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
@@ -6061,10 +6063,10 @@ sonic-boom@^1.0.2:
60616063
atomic-sleep "^1.0.0"
60626064
flatstr "^1.0.12"
60636065

6064-
sonic-boom@^2.1.0:
6065-
version "2.1.0"
6066-
resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-2.1.0.tgz#07b7b181b078aeb5f202019769e4088c70c4f0eb"
6067-
integrity sha512-x2j9LXx27EDlyZEC32gBM+scNVMdPutU7FIKV2BOTKCnPrp7bY5BsplCMQ4shYYR3IhDSIrEXoqb6GlS+z7KyQ==
6066+
sonic-boom@^2.1.0, sonic-boom@^2.2.0:
6067+
version "2.3.0"
6068+
resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-2.3.0.tgz#b1622bbd29111ed12be94a644ea6b586b6daea70"
6069+
integrity sha512-lEPaw654/4/rCJHz/TNzV4GIthqCq4inO+O3aFhbdOvR1bE+2//sVkcS+xlqPdb8gdjQCEE0hE9BuvnVixbnWQ==
60686070
dependencies:
60696071
atomic-sleep "^1.0.0"
60706072

@@ -6140,7 +6142,7 @@ split-string@^3.0.1, split-string@^3.0.2:
61406142
dependencies:
61416143
extend-shallow "^3.0.0"
61426144

6143-
split2@^3.1.1:
6145+
split2@^3.1.1, split2@^3.2.2:
61446146
version "3.2.2"
61456147
resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f"
61466148
integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==

0 commit comments

Comments
 (0)