Skip to content

Commit 4ad40f3

Browse files
committed
Merge branch 'staging'
2 parents 5856203 + 00e9a79 commit 4ad40f3

File tree

5 files changed

+869
-145
lines changed

5 files changed

+869
-145
lines changed

app-config/package.json

+2-2
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.32.0",
4-
"wire-web-config-production": "https://github.com/wireapp/wire-web-config-wire#v0.31.36"
3+
"wire-web-config-internal": "https://github.com/wireapp/wire-web-config-default#v0.32.2",
4+
"wire-web-config-production": "https://github.com/wireapp/wire-web-config-wire#v0.32.2"
55
}
66
}

electron/src/window/WindowUtil.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,12 @@ export const openExternal = async (url: string, httpsOnly: boolean = false): Pro
7979
}
8080
};
8181

82+
const isBrowserWindow = (baseWindow: unknown): baseWindow is BrowserWindow => {
83+
return baseWindow instanceof Object && 'webContents' in baseWindow;
84+
};
85+
8286
export const sendToWebContents = (baseWindow: BaseWindow | undefined, channel: string, ...args: any[]) => {
83-
if (baseWindow instanceof BrowserWindow) {
87+
if (isBrowserWindow(baseWindow)) {
8488
try {
8589
baseWindow.webContents.send(channel, ...args);
8690
} catch (error) {

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.38.0",
23+
"version": "3.39.0",
2424
"websiteUrl": "https://wire.com"
2525
}

package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"@wireapp/commons": "5.4.0",
88
"@wireapp/protocol-messaging": "1.51.0",
99
"@wireapp/react-ui-kit": "9.28.1",
10-
"@wireapp/webapp-events": "0.24.3",
10+
"@wireapp/webapp-events": "0.28.0",
1111
"auto-launch": "5.0.6",
1212
"axios": "0.21.2",
1313
"content-type": "1.0.5",
@@ -42,7 +42,7 @@
4242
"@babel/preset-typescript": "7.26.0",
4343
"@babel/register": "7.25.9",
4444
"@electron/fuses": "1.8.0",
45-
"@electron/osx-sign": "1.3.1",
45+
"@electron/osx-sign": "1.3.2",
4646
"@types/adm-zip": "0.5.7",
4747
"@types/amplify": "1.1.28",
4848
"@types/auto-launch": "5.0.5",
@@ -52,10 +52,10 @@
5252
"@types/hapi__joi": "^17.1.15",
5353
"@types/is-ci": "3.0.4",
5454
"@types/jest": "^29.5.14",
55-
"@types/lodash": "4.17.13",
55+
"@types/lodash": "4.17.14",
5656
"@types/minimist": "1.2.5",
5757
"@types/mocha": "10.0.10",
58-
"@types/node": "18.19.67",
58+
"@types/node": "18.19.70",
5959
"@types/open-graph": "0.2.5",
6060
"@types/platform": "1.3.6",
6161
"@types/prettier": "^2.7.3",
@@ -78,11 +78,11 @@
7878
"babel-loader": "9.2.1",
7979
"babel-plugin-istanbul": "6.1.1",
8080
"commander": "12.1.0",
81-
"core-js": "3.39.0",
81+
"core-js": "3.40.0",
8282
"cross-env": "7.0.3",
8383
"css-loader": "7.1.2",
8484
"dotenv": "16.4.7",
85-
"electron": "33.3.0",
85+
"electron": "34.0.0",
8686
"electron-builder": "24.13.3",
8787
"electron-mocha": "12.3.1",
8888
"electron-packager": "17.1.2",
@@ -95,13 +95,13 @@
9595
"eslint-plugin-header": "3.1.1",
9696
"eslint-plugin-import": "^2.31.0",
9797
"eslint-plugin-jasmine": "4.2.2",
98-
"eslint-plugin-jest": "28.9.0",
98+
"eslint-plugin-jest": "28.11.0",
9999
"eslint-plugin-jest-dom": "5.5.0",
100100
"eslint-plugin-jsdoc": "48.11.0",
101101
"eslint-plugin-jsx-a11y": "6.10.2",
102102
"eslint-plugin-no-unsanitized": "4.0.2",
103103
"eslint-plugin-prettier": "4.2.1",
104-
"eslint-plugin-react": "7.37.2",
104+
"eslint-plugin-react": "7.37.4",
105105
"eslint-plugin-react-hooks": "4.6.2",
106106
"eslint-plugin-simple-import-sort": "12.1.1",
107107
"eslint-plugin-testing-library": "6.5.0",
@@ -111,7 +111,7 @@
111111
"is-ci": "3.0.1",
112112
"jest": "29.7.0",
113113
"jest-environment-jsdom": "29.7.0",
114-
"lint-staged": "15.2.10",
114+
"lint-staged": "15.3.0",
115115
"mocha": "10.8.2",
116116
"nock": "13.5.6",
117117
"nyc": "15.1.0",
@@ -121,7 +121,7 @@
121121
"sort-json": "2.0.1",
122122
"style-loader": "4.0.0",
123123
"ts-node": "10.9.2",
124-
"typescript": "5.7.2",
124+
"typescript": "5.7.3",
125125
"webpack": "5.97.1",
126126
"webpack-cli": "5.1.4"
127127
},
@@ -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.38.0",
206+
"version": "3.39.0",
207207
"packageManager": "[email protected]"
208208
}

0 commit comments

Comments
 (0)