Skip to content

Commit 32dec22

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/trim-off-newlines-1.0.3
2 parents b16a8b1 + 09bb147 commit 32dec22

File tree

2 files changed

+63
-27
lines changed

2 files changed

+63
-27
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"express": "^4.17.3",
4949
"form-data": "^4.0.0",
5050
"lodash": "^4.17.21",
51-
"node-fetch": "^2.6.1",
51+
"node-fetch": "^2.6.7",
5252
"pluralize": "^8.0.0",
5353
"utility-types": "^3.10.0"
5454
},

yarn.lock

Lines changed: 62 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2318,9 +2318,9 @@ async-limiter@~1.0.0:
23182318
integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
23192319

23202320
async@^2.6.2:
2321-
version "2.6.3"
2322-
resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
2323-
integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
2321+
version "2.6.4"
2322+
resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
2323+
integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
23242324
dependencies:
23252325
lodash "^4.17.14"
23262326

@@ -2484,9 +2484,9 @@ babel-preset-jest@^28.1.3:
24842484
babel-preset-current-node-syntax "^1.0.0"
24852485

24862486
balanced-match@^1.0.0:
2487-
version "1.0.0"
2488-
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
2489-
integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
2487+
version "1.0.2"
2488+
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
2489+
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
24902490

24912491
base64-js@^1.3.1:
24922492
version "1.5.1"
@@ -3111,7 +3111,7 @@ compression@^1.7.4:
31113111
31123112
version "0.0.1"
31133113
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
3114-
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
3114+
integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
31153115

31163116
concat-stream@^2.0.0:
31173117
version "2.0.0"
@@ -4668,7 +4668,7 @@ fs-readdir-recursive@^1.1.0:
46684668
fs.realpath@^1.0.0:
46694669
version "1.0.0"
46704670
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
4671-
integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
4671+
integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
46724672

46734673
fsevents@^1.2.7:
46744674
version "1.2.12"
@@ -4818,14 +4818,14 @@ glob-to-regexp@^0.4.0:
48184818
integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
48194819

48204820
glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
4821-
version "7.1.7"
4822-
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
4823-
integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
4821+
version "7.2.3"
4822+
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
4823+
integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
48244824
dependencies:
48254825
fs.realpath "^1.0.0"
48264826
inflight "^1.0.4"
48274827
inherits "2"
4828-
minimatch "^3.0.4"
4828+
minimatch "^3.1.1"
48294829
once "^1.3.0"
48304830
path-is-absolute "^1.0.0"
48314831

@@ -5284,7 +5284,7 @@ indent-string@^4.0.0:
52845284
inflight@^1.0.4:
52855285
version "1.0.6"
52865286
resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
5287-
integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
5287+
integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
52885288
dependencies:
52895289
once "^1.3.0"
52905290
wrappy "1"
@@ -5502,6 +5502,13 @@ is-core-module@^2.5.0, is-core-module@^2.8.1:
55025502
dependencies:
55035503
has "^1.0.3"
55045504

5505+
is-core-module@^2.9.0:
5506+
version "2.10.0"
5507+
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
5508+
integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
5509+
dependencies:
5510+
has "^1.0.3"
5511+
55055512
is-data-descriptor@^0.1.4:
55065513
version "0.1.4"
55075514
resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -7028,7 +7035,7 @@ [email protected]:
70287035
dependencies:
70297036
brace-expansion "^1.1.7"
70307037

7031-
minimatch@^3.0.4, minimatch@^3.1.2:
7038+
minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
70327039
version "3.1.2"
70337040
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
70347041
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -7171,10 +7178,12 @@ no-case@^2.2.0, no-case@^2.3.2:
71717178
dependencies:
71727179
lower-case "^1.1.1"
71737180

7174-
node-fetch@^2.6.1:
7175-
version "2.6.1"
7176-
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
7177-
integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
7181+
node-fetch@^2.6.1, node-fetch@^2.6.7:
7182+
version "2.6.7"
7183+
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
7184+
integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
7185+
dependencies:
7186+
whatwg-url "^5.0.0"
71787187

71797188
node-forge@^0.10.0:
71807189
version "0.10.0"
@@ -7387,7 +7396,7 @@ on-headers@~1.0.2:
73877396
once@^1.3.0, once@^1.3.1, once@^1.4.0:
73887397
version "1.4.0"
73897398
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
7390-
integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
7399+
integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
73917400
dependencies:
73927401
wrappy "1"
73937402

@@ -7722,7 +7731,7 @@ path-exists@^5.0.0:
77227731
path-is-absolute@^1.0.0:
77237732
version "1.0.1"
77247733
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
7725-
integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
7734+
integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
77267735

77277736
path-is-inside@^1.0.2:
77287737
version "1.0.2"
@@ -8175,7 +8184,7 @@ readdirp@~3.5.0:
81758184
rechoir@^0.6.2:
81768185
version "0.6.2"
81778186
resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
8178-
integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
8187+
integrity sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==
81798188
dependencies:
81808189
resolve "^1.1.6"
81818190

@@ -8353,7 +8362,16 @@ resolve.exports@^1.1.0:
83538362
resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
83548363
integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
83558364

8356-
resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0:
8365+
resolve@^1.1.6:
8366+
version "1.22.1"
8367+
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
8368+
integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
8369+
dependencies:
8370+
is-core-module "^2.9.0"
8371+
path-parse "^1.0.7"
8372+
supports-preserve-symlinks-flag "^1.0.0"
8373+
8374+
resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0:
83578375
version "1.22.0"
83588376
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
83598377
integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -8646,9 +8664,9 @@ [email protected]:
86468664
integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
86478665

86488666
shelljs@^0.8.3:
8649-
version "0.8.4"
8650-
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
8651-
integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
8667+
version "0.8.5"
8668+
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c"
8669+
integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==
86528670
dependencies:
86538671
glob "^7.0.0"
86548672
interpret "^1.0.0"
@@ -9392,6 +9410,11 @@ tr46@^2.0.2:
93929410
dependencies:
93939411
punycode "^2.1.1"
93949412

9413+
tr46@~0.0.3:
9414+
version "0.0.3"
9415+
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
9416+
integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
9417+
93959418
trim-newlines@^1.0.0:
93969419
version "1.0.0"
93979420
resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@@ -9769,6 +9792,11 @@ wcwidth@^1.0.1:
97699792
dependencies:
97709793
defaults "^1.0.3"
97719794

9795+
webidl-conversions@^3.0.0:
9796+
version "3.0.1"
9797+
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
9798+
integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
9799+
97729800
webidl-conversions@^4.0.2:
97739801
version "4.0.2"
97749802
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
@@ -9899,6 +9927,14 @@ whatwg-mimetype@^2.3.0:
98999927
resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
99009928
integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
99019929

9930+
whatwg-url@^5.0.0:
9931+
version "5.0.0"
9932+
resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
9933+
integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
9934+
dependencies:
9935+
tr46 "~0.0.3"
9936+
webidl-conversions "^3.0.0"
9937+
99029938
whatwg-url@^6.5.0:
99039939
version "6.5.0"
99049940
resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
@@ -10002,7 +10038,7 @@ wrap-ansi@^7.0.0:
1000210038
wrappy@1:
1000310039
version "1.0.2"
1000410040
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
10005-
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
10041+
integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
1000610042

1000710043
write-file-atomic@^3.0.0:
1000810044
version "3.0.3"

0 commit comments

Comments
 (0)