Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
V-Gira committed Jan 20, 2025
2 parents 5856203 + 00e9a79 commit 4ad40f3
Show file tree
Hide file tree
Showing 5 changed files with 869 additions and 145 deletions.
4 changes: 2 additions & 2 deletions app-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"wire-web-config-internal": "https://github.com/wireapp/wire-web-config-default#v0.32.0",
"wire-web-config-production": "https://github.com/wireapp/wire-web-config-wire#v0.31.36"
"wire-web-config-internal": "https://github.com/wireapp/wire-web-config-default#v0.32.2",
"wire-web-config-production": "https://github.com/wireapp/wire-web-config-wire#v0.32.2"
}
}
6 changes: 5 additions & 1 deletion electron/src/window/WindowUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,12 @@ export const openExternal = async (url: string, httpsOnly: boolean = false): Pro
}
};

const isBrowserWindow = (baseWindow: unknown): baseWindow is BrowserWindow => {
return baseWindow instanceof Object && 'webContents' in baseWindow;
};

export const sendToWebContents = (baseWindow: BaseWindow | undefined, channel: string, ...args: any[]) => {
if (baseWindow instanceof BrowserWindow) {
if (isBrowserWindow(baseWindow)) {
try {
baseWindow.webContents.send(channel, ...args);
} catch (error) {
Expand Down
2 changes: 1 addition & 1 deletion electron/wire.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
"privacyUrl": "https://wire.com/privacy/",
"supportUrl": "https://support.wire.com",
"updateUrl": "https://wire-app.wire.com/win/prod/",
"version": "3.38.0",
"version": "3.39.0",
"websiteUrl": "https://wire.com"
}
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@wireapp/commons": "5.4.0",
"@wireapp/protocol-messaging": "1.51.0",
"@wireapp/react-ui-kit": "9.28.1",
"@wireapp/webapp-events": "0.24.3",
"@wireapp/webapp-events": "0.28.0",
"auto-launch": "5.0.6",
"axios": "0.21.2",
"content-type": "1.0.5",
Expand Down Expand Up @@ -42,7 +42,7 @@
"@babel/preset-typescript": "7.26.0",
"@babel/register": "7.25.9",
"@electron/fuses": "1.8.0",
"@electron/osx-sign": "1.3.1",
"@electron/osx-sign": "1.3.2",
"@types/adm-zip": "0.5.7",
"@types/amplify": "1.1.28",
"@types/auto-launch": "5.0.5",
Expand All @@ -52,10 +52,10 @@
"@types/hapi__joi": "^17.1.15",
"@types/is-ci": "3.0.4",
"@types/jest": "^29.5.14",
"@types/lodash": "4.17.13",
"@types/lodash": "4.17.14",
"@types/minimist": "1.2.5",
"@types/mocha": "10.0.10",
"@types/node": "18.19.67",
"@types/node": "18.19.70",
"@types/open-graph": "0.2.5",
"@types/platform": "1.3.6",
"@types/prettier": "^2.7.3",
Expand All @@ -78,11 +78,11 @@
"babel-loader": "9.2.1",
"babel-plugin-istanbul": "6.1.1",
"commander": "12.1.0",
"core-js": "3.39.0",
"core-js": "3.40.0",
"cross-env": "7.0.3",
"css-loader": "7.1.2",
"dotenv": "16.4.7",
"electron": "33.3.0",
"electron": "34.0.0",
"electron-builder": "24.13.3",
"electron-mocha": "12.3.1",
"electron-packager": "17.1.2",
Expand All @@ -95,13 +95,13 @@
"eslint-plugin-header": "3.1.1",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jasmine": "4.2.2",
"eslint-plugin-jest": "28.9.0",
"eslint-plugin-jest": "28.11.0",
"eslint-plugin-jest-dom": "5.5.0",
"eslint-plugin-jsdoc": "48.11.0",
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-no-unsanitized": "4.0.2",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-react": "7.37.2",
"eslint-plugin-react": "7.37.4",
"eslint-plugin-react-hooks": "4.6.2",
"eslint-plugin-simple-import-sort": "12.1.1",
"eslint-plugin-testing-library": "6.5.0",
Expand All @@ -111,7 +111,7 @@
"is-ci": "3.0.1",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"lint-staged": "15.2.10",
"lint-staged": "15.3.0",
"mocha": "10.8.2",
"nock": "13.5.6",
"nyc": "15.1.0",
Expand All @@ -121,7 +121,7 @@
"sort-json": "2.0.1",
"style-loader": "4.0.0",
"ts-node": "10.9.2",
"typescript": "5.7.2",
"typescript": "5.7.3",
"webpack": "5.97.1",
"webpack-cli": "5.1.4"
},
Expand Down Expand Up @@ -203,6 +203,6 @@
"translate:upload": "ts-node -P tsconfig.bin.json ./bin/translations_upload.ts",
"translate:download": "ts-node -P tsconfig.bin.json ./bin/translations_download.ts"
},
"version": "3.38.0",
"version": "3.39.0",
"packageManager": "yarn@3.3.1"
}
Loading

0 comments on commit 4ad40f3

Please sign in to comment.