Skip to content

Commit 2fda37a

Browse files
committed
Merge branch 'dev' into staging
2 parents 5f4320c + 2381ecc commit 2fda37a

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

app-config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"wire-web-config-internal": "https://github.com/wireapp/wire-web-config-default#v0.31.36",
3+
"wire-web-config-internal": "https://github.com/wireapp/wire-web-config-default#v0.32.0",
44
"wire-web-config-production": "https://github.com/wireapp/wire-web-config-wire#v0.31.36"
55
}
66
}

electron/wire.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
"privacyUrl": "https://wire.com/privacy/",
2121
"supportUrl": "https://support.wire.com",
2222
"updateUrl": "https://wire-app.wire.com/win/prod/",
23-
"version": "3.37.0",
23+
"version": "3.38.0",
2424
"websiteUrl": "https://wire.com"
2525
}

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"@wireapp/certificate-check": "0.7.19",
77
"@wireapp/commons": "5.4.0",
88
"@wireapp/protocol-messaging": "1.51.0",
9-
"@wireapp/react-ui-kit": "9.28.0",
9+
"@wireapp/react-ui-kit": "9.28.1",
1010
"@wireapp/webapp-events": "0.24.3",
1111
"auto-launch": "5.0.6",
1212
"axios": "0.21.2",
@@ -67,7 +67,7 @@
6767
"@types/uuid": "9.0.8",
6868
"@typescript-eslint/eslint-plugin": "7.17.0",
6969
"@typescript-eslint/parser": "7.18.0",
70-
"@wireapp/copy-config": "2.2.10",
70+
"@wireapp/copy-config": "2.2.11",
7171
"@wireapp/eslint-config": "3.0.20",
7272
"@wireapp/prettier-config": "0.6.4",
7373
"adm-zip": "0.5.16",
@@ -82,7 +82,7 @@
8282
"cross-env": "7.0.3",
8383
"css-loader": "7.1.2",
8484
"dotenv": "16.4.7",
85-
"electron": "33.2.1",
85+
"electron": "33.3.0",
8686
"electron-builder": "24.13.3",
8787
"electron-mocha": "12.3.1",
8888
"electron-packager": "17.1.2",
@@ -122,7 +122,7 @@
122122
"style-loader": "4.0.0",
123123
"ts-node": "10.9.2",
124124
"typescript": "5.7.2",
125-
"webpack": "5.97.0",
125+
"webpack": "5.97.1",
126126
"webpack-cli": "5.1.4"
127127
},
128128
"homepage": "https://wire.com",
@@ -203,6 +203,6 @@
203203
"translate:upload": "ts-node -P tsconfig.bin.json ./bin/translations_upload.ts",
204204
"translate:download": "ts-node -P tsconfig.bin.json ./bin/translations_download.ts"
205205
},
206-
"version": "3.37.0",
206+
"version": "3.38.0",
207207
"packageManager": "[email protected]"
208208
}

yarn.lock

+28-28
Original file line numberDiff line numberDiff line change
@@ -4569,11 +4569,11 @@ __metadata:
45694569
languageName: node
45704570
linkType: hard
45714571

4572-
"@wireapp/copy-config@npm:2.2.10":
4573-
version: 2.2.10
4574-
resolution: "@wireapp/copy-config@npm:2.2.10"
4572+
"@wireapp/copy-config@npm:2.2.11":
4573+
version: 2.2.11
4574+
resolution: "@wireapp/copy-config@npm:2.2.11"
45754575
dependencies:
4576-
axios: 1.7.7
4576+
axios: 1.7.9
45774577
copy: 0.3.2
45784578
cosmiconfig: 9.0.0
45794579
fs-extra: 11.2.0
@@ -4582,7 +4582,7 @@ __metadata:
45824582
rimraf: 6.0.1
45834583
bin:
45844584
copy-config: lib/cli.js
4585-
checksum: f2f314ebdefa52b67e333e35a59f288d0bee5bc307811ddf32d752408797e6e9531a4fadac3524f679b351ff22677f3cc51a581f3a2c247fb9b4af048c2c3953
4585+
checksum: 2a8fc29b0ae9225b973958e908ff2e958875bb32d3d60ebef86f511988c5bde2d6310c16e8078b0bbf510f96d3531566aa4853abfa1f32fb9be4545669f64446
45864586
languageName: node
45874587
linkType: hard
45884588

@@ -4640,9 +4640,9 @@ __metadata:
46404640
languageName: node
46414641
linkType: hard
46424642

4643-
"@wireapp/react-ui-kit@npm:9.28.0":
4644-
version: 9.28.0
4645-
resolution: "@wireapp/react-ui-kit@npm:9.28.0"
4643+
"@wireapp/react-ui-kit@npm:9.28.1":
4644+
version: 9.28.1
4645+
resolution: "@wireapp/react-ui-kit@npm:9.28.1"
46464646
dependencies:
46474647
"@types/color": 3.0.6
46484648
color: 4.2.3
@@ -4657,7 +4657,7 @@ __metadata:
46574657
peerDependenciesMeta:
46584658
"@types/react":
46594659
optional: true
4660-
checksum: ae8f6193ef51f5e0da1f330b7e4e70419889465415e824c4fe65e4ca886924b9927fa2e7cf593eb6a64431692a8d11c7a6c0be700d5141a5e6bbbd886bf3e989
4660+
checksum: 585de9347e931c6a934e6088da6c694286e80b15d8ce10aa86d70a9fe88eaac4a4d9141c9cab487b2ae38c69b0682cd057bbe3dbd18acabc80644c554e3a120d
46614661
languageName: node
46624662
linkType: hard
46634663

@@ -5525,14 +5525,14 @@ __metadata:
55255525
languageName: node
55265526
linkType: hard
55275527

5528-
"axios@npm:1.7.7":
5529-
version: 1.7.7
5530-
resolution: "axios@npm:1.7.7"
5528+
"axios@npm:1.7.9":
5529+
version: 1.7.9
5530+
resolution: "axios@npm:1.7.9"
55315531
dependencies:
55325532
follow-redirects: ^1.15.6
55335533
form-data: ^4.0.0
55345534
proxy-from-env: ^1.1.0
5535-
checksum: 882d4fe0ec694a07c7f5c1f68205eb6dc5a62aecdb632cc7a4a3d0985188ce3030e0b277e1a8260ac3f194d314ae342117660a151fabffdc5081ca0b5a8b47fe
5535+
checksum: cb8ce291818effda09240cb60f114d5625909b345e10f389a945320e06acf0bc949d0f8422d25720f5dd421362abee302c99f5e97edec4c156c8939814b23d19
55365536
languageName: node
55375537
linkType: hard
55385538

@@ -7559,16 +7559,16 @@ __metadata:
75597559
languageName: node
75607560
linkType: hard
75617561

7562-
"electron@npm:33.2.1":
7563-
version: 33.2.1
7564-
resolution: "electron@npm:33.2.1"
7562+
"electron@npm:33.3.0":
7563+
version: 33.3.0
7564+
resolution: "electron@npm:33.3.0"
75657565
dependencies:
75667566
"@electron/get": ^2.0.0
75677567
"@types/node": ^20.9.0
75687568
extract-zip: ^2.0.1
75697569
bin:
75707570
electron: cli.js
7571-
checksum: c5b7d5fe56f831da5d14be9d24d0a29fdb392d5b4e593b31200a9c01e6260d87bba1216c4cc17297b2f4838e0893428464b9e2ca71c3eaff499dbff1981c0670
7571+
checksum: d121a50bc3d5ce186ad98433df9b60c96ec93924dbf7f68777a3c03b40ef39729badf20689ecc4b513e80ecfab0773bdf991fd7686958072f0cb7dcadce3cf8a
75727572
languageName: node
75737573
linkType: hard
75747574

@@ -13321,11 +13321,11 @@ __metadata:
1332113321
linkType: hard
1332213322

1332313323
"nanoid@npm:^3.3.7":
13324-
version: 3.3.7
13325-
resolution: "nanoid@npm:3.3.7"
13324+
version: 3.3.8
13325+
resolution: "nanoid@npm:3.3.8"
1332613326
bin:
1332713327
nanoid: bin/nanoid.cjs
13328-
checksum: d36c427e530713e4ac6567d488b489a36582ef89da1d6d4e3b87eded11eb10d7042a877958c6f104929809b2ab0bafa17652b076cdf84324aa75b30b722204f2
13328+
checksum: dfe0adbc0c77e9655b550c333075f51bb28cfc7568afbf3237249904f9c86c9aaaed1f113f0fddddba75673ee31c758c30c43d4414f014a52a7a626efc5958c9
1332913329
languageName: node
1333013330
linkType: hard
1333113331

@@ -17625,9 +17625,9 @@ __metadata:
1762517625
languageName: node
1762617626
linkType: hard
1762717627

17628-
"webpack@npm:5.97.0":
17629-
version: 5.97.0
17630-
resolution: "webpack@npm:5.97.0"
17628+
"webpack@npm:5.97.1":
17629+
version: 5.97.1
17630+
resolution: "webpack@npm:5.97.1"
1763117631
dependencies:
1763217632
"@types/eslint-scope": ^3.7.7
1763317633
"@types/estree": ^1.0.6
@@ -17657,7 +17657,7 @@ __metadata:
1765717657
optional: true
1765817658
bin:
1765917659
webpack: bin/webpack.js
17660-
checksum: 07ca08bd8b39080e548e05aca559b887f200bf057f8b9116907eaf22697e943a30cf7fbe9f884615906c30ea8cd911e49608afc481157a190327087ecb996a96
17660+
checksum: 649065e2258b495ae41a4088be804b4be2ec07d280aa514ebef43da79caf96fa973d26a08826c3902b5676a098d9b37c589f16be7b4da17b68b08b6c76441196
1766117661
languageName: node
1766217662
linkType: hard
1766317663

@@ -17897,11 +17897,11 @@ __metadata:
1789717897
"@typescript-eslint/parser": 7.18.0
1789817898
"@wireapp/certificate-check": 0.7.19
1789917899
"@wireapp/commons": 5.4.0
17900-
"@wireapp/copy-config": 2.2.10
17900+
"@wireapp/copy-config": 2.2.11
1790117901
"@wireapp/eslint-config": 3.0.20
1790217902
"@wireapp/prettier-config": 0.6.4
1790317903
"@wireapp/protocol-messaging": 1.51.0
17904-
"@wireapp/react-ui-kit": 9.28.0
17904+
"@wireapp/react-ui-kit": 9.28.1
1790517905
"@wireapp/webapp-events": 0.24.3
1790617906
adm-zip: 0.5.16
1790717907
auto-launch: 5.0.6
@@ -17918,7 +17918,7 @@ __metadata:
1791817918
cross-env: 7.0.3
1791917919
css-loader: 7.1.2
1792017920
dotenv: 16.4.7
17921-
electron: 33.2.1
17921+
electron: 33.3.0
1792217922
electron-builder: 24.13.3
1792317923
electron-dl: ^3.5.2
1792417924
electron-mocha: 12.3.1
@@ -17977,7 +17977,7 @@ __metadata:
1797717977
ts-node: 10.9.2
1797817978
typescript: 5.7.2
1797917979
uuid: 9.0.1
17980-
webpack: 5.97.0
17980+
webpack: 5.97.1
1798117981
webpack-cli: 5.1.4
1798217982
languageName: unknown
1798317983
linkType: soft

0 commit comments

Comments
 (0)