Skip to content

Commit a418cbf

Browse files
authored
Merge branch 'master' into fix-reactversion-migration
2 parents ade71d3 + f030dce commit a418cbf

2 files changed

Lines changed: 55 additions & 16 deletions

File tree

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
"add": "^2.0.6",
1111
"axios": "^1.13.2",
1212
"compression": "^1.8.0",
13-
"concurrently": "^8.2.1",
13+
"concurrently": "^9.2.1",
1414
"cookie-parser": "^1.4.7",
1515
"cookie-signature": "^1.1.0",
16-
"core-js": "^3.19.0",
16+
"core-js": "^3.47.0",
1717
"deep-object-diff": "^1.1.0",
1818
"deepmerge": "^4.3.1",
1919
"dompurify": "^3.0.6",
20-
"duration-formatter": "^1.0.7",
20+
"duration-formatter": "^1.1.1",
2121
"express": "^5.2.1",
2222
"fs-extra": "^11.3.3",
2323
"history": "^5.2.0",
@@ -27,7 +27,7 @@
2727
"lodash": "^4.17.21",
2828
"marked": "^17.0.1",
2929
"morgan": "^1.10.0",
30-
"node-plop": "^0.32.0",
30+
"node-plop": "^0.32.3",
3131
"nodemon": "^3.1.11",
3232
"pretty-bytes": "^7.0.0",
3333
"prop-types": "^15.7.2",
@@ -112,7 +112,7 @@
112112
"supertest": "^7.1.4",
113113
"terser-webpack-plugin": "^5.3.16",
114114
"ttag-cli": "^1.11.2",
115-
"typescript": "^5.4.5",
115+
"typescript": "^5.9.3",
116116
"webpack": "^5.99.6",
117117
"webpack-bundle-analyzer": "^5.1.0",
118118
"webpack-cli": "^6.0.1",

yarn.lock

Lines changed: 50 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4248,15 +4248,12 @@ concurrently@^8.2.1:
42484248
resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-8.2.2.tgz#353141985c198cfa5e4a3ef90082c336b5851784"
42494249
integrity sha512-1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg==
42504250
dependencies:
4251-
chalk "^4.1.2"
4252-
date-fns "^2.30.0"
4253-
lodash "^4.17.21"
4254-
rxjs "^7.8.1"
4255-
shell-quote "^1.8.1"
4256-
spawn-command "0.0.2"
4257-
supports-color "^8.1.1"
4258-
tree-kill "^1.2.2"
4259-
yargs "^17.7.2"
4251+
chalk "4.1.2"
4252+
rxjs "7.8.2"
4253+
shell-quote "1.8.3"
4254+
supports-color "8.1.1"
4255+
tree-kill "1.2.2"
4256+
yargs "17.7.2"
42604257

42614258
confusing-browser-globals@^1.0.10:
42624259
version "1.0.11"
@@ -4380,6 +4377,11 @@ core-js@^3.19.0, core-js@^3.30.2:
43804377
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.47.0.tgz#436ef07650e191afeb84c24481b298bd60eb4a17"
43814378
integrity sha512-c3Q2VVkGAUyupsjRnaNX6u8Dq2vAdzm9iuPj5FW0fRxzlxgq9Q39MDq10IvmQSpLgHQNyQzQmOo6bgGHmH3NNg==
43824379

4380+
core-js@^3.47.0:
4381+
version "3.47.0"
4382+
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.47.0.tgz#436ef07650e191afeb84c24481b298bd60eb4a17"
4383+
integrity sha512-c3Q2VVkGAUyupsjRnaNX6u8Dq2vAdzm9iuPj5FW0fRxzlxgq9Q39MDq10IvmQSpLgHQNyQzQmOo6bgGHmH3NNg==
4384+
43834385
core-util-is@~1.0.0:
43844386
version "1.0.3"
43854387
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
@@ -4868,6 +4870,11 @@ dlv@^1.1.3:
48684870
resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
48694871
integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
48704872

4873+
dlv@^1.1.3:
4874+
version "1.1.3"
4875+
resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
4876+
integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
4877+
48714878
dns-packet@^5.2.2:
48724879
version "5.6.1"
48734880
resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.1.tgz#ae888ad425a9d1478a0674256ab866de1012cf2f"
@@ -7861,7 +7868,12 @@ lodash.uniq@^4.5.0:
78617868
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
78627869
integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
78637870

7864-
lodash@^4.17.14, lodash@^4.17.20, lodash@^4.17.21:
7871+
lodash@^4.17.14, lodash@^4.17.20:
7872+
version "4.17.21"
7873+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
7874+
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
7875+
7876+
lodash@^4.17.21:
78657877
version "4.17.21"
78667878
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
78677879
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -9861,6 +9873,13 @@ run-parallel@^1.1.9:
98619873
dependencies:
98629874
queue-microtask "^1.2.2"
98639875

9876+
rxjs@7.8.2:
9877+
version "7.8.2"
9878+
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.2.tgz#955bc473ed8af11a002a2be52071bf475638607b"
9879+
integrity sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==
9880+
dependencies:
9881+
tslib "^2.1.0"
9882+
98649883
rxjs@^7.2.0, rxjs@^7.5.5, rxjs@^7.8.1:
98659884
version "7.8.2"
98669885
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.2.tgz#955bc473ed8af11a002a2be52071bf475638607b"
@@ -10596,6 +10615,13 @@ supertest@^7.1.4:
1059610615
methods "^1.1.2"
1059710616
superagent "^10.2.3"
1059810617

10618+
supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.1:
10619+
version "8.1.1"
10620+
resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"
10621+
integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
10622+
dependencies:
10623+
has-flag "^4.0.0"
10624+
1059910625
supports-color@^2.0.0:
1060010626
version "2.0.0"
1060110627
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -10876,7 +10902,7 @@ tree-dump@^1.0.3, tree-dump@^1.1.0:
1087610902
resolved "https://registry.yarnpkg.com/tree-dump/-/tree-dump-1.1.0.tgz#ab29129169dc46004414f5a9d4a3c6e89f13e8a4"
1087710903
integrity sha512-rMuvhU4MCDbcbnleZTFezWsaZXRFemSqAM+7jPnzUl1fo9w3YEKOxAeui0fz3OI4EU4hf23iyA7uQRVko+UaBA==
1087810904

10879-
tree-kill@^1.2.2:
10905+
tree-kill@1.2.2:
1088010906
version "1.2.2"
1088110907
resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
1088210908
integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
@@ -11732,6 +11758,19 @@ yargs-parser@^21.1.1:
1173211758
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
1173311759
integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
1173411760

11761+
yargs@17.7.2, yargs@^17.7.2:
11762+
version "17.7.2"
11763+
resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz"
11764+
integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
11765+
dependencies:
11766+
cliui "^8.0.1"
11767+
escalade "^3.1.1"
11768+
get-caller-file "^2.0.5"
11769+
require-directory "^2.1.1"
11770+
string-width "^4.2.3"
11771+
y18n "^5.0.5"
11772+
yargs-parser "^21.1.1"
11773+
1173511774
yargs@^15.4.1:
1173611775
version "15.4.1"
1173711776
resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"

0 commit comments

Comments
 (0)