Merge branch 'staging'

wireapp · Dec 10, 2024 · 5856203 · 5856203
2 parents 77dd845 + 2fda37a
commit 5856203
Show file tree

Hide file tree

Showing 6 changed files with 412 additions and 363 deletions.
diff --git a/app-config/package.json b/app-config/package.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "wire-web-config-internal": "https://github.com/wireapp/wire-web-config-default#v0.31.35",
+    "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"
   }
 }
diff --git a/electron/src/main.ts b/electron/src/main.ts
@@ -41,7 +41,7 @@ import minimist from 'minimist';
 import * as path from 'path';
 import {URL, pathToFileURL} from 'url';
 
-import {LogFactory} from '@wireapp/commons';
+import {DateUtil, LogFactory} from '@wireapp/commons';
 import {WebAppEvents} from '@wireapp/webapp-events';
 
 import * as ProxyAuth from './auth/ProxyAuth';
@@ -672,6 +672,7 @@ class ElectronWrapperInit {
             const colorCodeRegex = /%c(.+?)%c/gm;
             const stylingRegex = /(color:#|font-weight:)[^;]+; /gm;
             const accessTokenRegex = /access_token=[^ &]+/gm;
+            const {date, time} = DateUtil.isoFormat(new Date());
 
             contents.on('console-message', async (_event, _level, message) => {
               const webViewId = lifecycle.getWebViewId(contents);
@@ -682,7 +683,11 @@ class ElectronWrapperInit {
               const accountIndex = contents.id - 2;
 
               if (webViewId) {
-                const logFilePath = path.join(LOG_DIR, `${accountIndex}_${webViewId}`, config.logFileName);
+                const logFilePath = path.join(
+                  LOG_DIR,
+                  `${accountIndex}_${date.replaceAll('-', '_')}_${time.replaceAll(':', '_')}_${webViewId}`,
+                  config.logFileName,
+                );
                 try {
                   await LogFactory.writeMessage(
                     message.replace(colorCodeRegex, '$1').replace(stylingRegex, '').replace(accessTokenRegex, ''),

diff --git a/electron/src/menu/TrayHandler.ts b/electron/src/menu/TrayHandler.ts
@@ -100,7 +100,16 @@ export class TrayHandler {
     if (win.isFocused() || !count) {
       win.flashFrame(false);
     } else if (count > this.lastUnreadCount) {
-      win.flashFrame(true);
+      /* After an Electron API change https://github.com/electron/electron/pull/41391
+       flashFrame() leads to a constant bouncing of the dock icon on macOS.
+       By calling the dock.bounce() directly, we avoid this behavior. the "informational"
+       is optional (default), but makes it easier to read
+    */
+      if (process.platform === 'darwin') {
+        app.dock.bounce('informational');
+      } else {
+        win.flashFrame(true);
+      }
     }
   }
 

diff --git a/electron/wire.json b/electron/wire.json
@@ -20,6 +20,6 @@
   "privacyUrl": "https://wire.com/privacy/",
   "supportUrl": "https://support.wire.com",
   "updateUrl": "https://wire-app.wire.com/win/prod/",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "websiteUrl": "https://wire.com"
 }
diff --git a/package.json b/package.json
@@ -3,10 +3,10 @@
   "dependencies": {
     "@electron/remote": "2.1.2",
     "@hapi/joi": "17.1.1",
-    "@wireapp/certificate-check": "0.7.18",
-    "@wireapp/commons": "5.2.13",
-    "@wireapp/protocol-messaging": "1.50.0",
-    "@wireapp/react-ui-kit": "9.26.0",
+    "@wireapp/certificate-check": "0.7.19",
+    "@wireapp/commons": "5.4.0",
+    "@wireapp/protocol-messaging": "1.51.0",
+    "@wireapp/react-ui-kit": "9.28.1",
     "@wireapp/webapp-events": "0.24.3",
     "auto-launch": "5.0.6",
     "axios": "0.21.2",
@@ -38,12 +38,12 @@
     "@babel/plugin-proposal-class-properties": "7.18.6",
     "@babel/plugin-proposal-optional-chaining": "7.21.0",
     "@babel/preset-env": "7.26.0",
-    "@babel/preset-react": "7.25.9",
+    "@babel/preset-react": "7.26.3",
     "@babel/preset-typescript": "7.26.0",
     "@babel/register": "7.25.9",
     "@electron/fuses": "1.8.0",
     "@electron/osx-sign": "1.3.1",
-    "@types/adm-zip": "0.5.6",
+    "@types/adm-zip": "0.5.7",
     "@types/amplify": "1.1.28",
     "@types/auto-launch": "5.0.5",
     "@types/content-type": "1.1.8",
@@ -54,75 +54,75 @@
     "@types/jest": "^29.5.14",
     "@types/lodash": "4.17.13",
     "@types/minimist": "1.2.5",
-    "@types/mocha": "10.0.9",
-    "@types/node": "18.19.61",
+    "@types/mocha": "10.0.10",
+    "@types/node": "18.19.67",
     "@types/open-graph": "0.2.5",
     "@types/platform": "1.3.6",
     "@types/prettier": "^2.7.3",
-    "@types/react": "^18.3.12",
+    "@types/react": "^18.3.13",
     "@types/react-dom": "^18.3.1",
     "@types/redux-logger": "^3.0.12",
     "@types/sinon": "17.0.3",
     "@types/sort-json": "2.0.3",
     "@types/uuid": "9.0.8",
     "@typescript-eslint/eslint-plugin": "7.17.0",
     "@typescript-eslint/parser": "7.18.0",
-    "@wireapp/copy-config": "2.2.10",
-    "@wireapp/eslint-config": "3.0.19",
+    "@wireapp/copy-config": "2.2.11",
+    "@wireapp/eslint-config": "3.0.20",
     "@wireapp/prettier-config": "0.6.4",
     "adm-zip": "0.5.16",
-    "aws-sdk": "2.1691.0",
+    "aws-sdk": "2.1692.0",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.1.0",
     "babel-jest": "29.7.0",
     "babel-loader": "9.2.1",
     "babel-plugin-istanbul": "6.1.1",
     "commander": "12.1.0",
-    "core-js": "3.38.1",
+    "core-js": "3.39.0",
     "cross-env": "7.0.3",
     "css-loader": "7.1.2",
-    "dotenv": "16.4.5",
-    "electron": "33.2.0",
+    "dotenv": "16.4.7",
+    "electron": "33.3.0",
     "electron-builder": "24.13.3",
     "electron-mocha": "12.3.1",
     "electron-packager": "17.1.2",
     "electron-winstaller": "4.0.1",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-import-resolver-alias": "^1.1.2",
-    "eslint-import-resolver-typescript": "^3.6.3",
+    "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-plugin-better-styled-components": "1.1.2",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jasmine": "4.2.2",
-    "eslint-plugin-jest": "28.8.3",
-    "eslint-plugin-jest-dom": "5.4.0",
+    "eslint-plugin-jest": "28.9.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-hooks": "4.6.2",
     "eslint-plugin-simple-import-sort": "12.1.1",
-    "eslint-plugin-testing-library": "6.4.0",
+    "eslint-plugin-testing-library": "6.5.0",
     "eslint-plugin-unused-imports": "3.2.0",
     "form-data": "4.0.1",
     "husky": "4.3.8",
     "is-ci": "3.0.1",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
     "lint-staged": "15.2.10",
-    "mocha": "10.8.1",
-    "nock": "13.5.5",
+    "mocha": "10.8.2",
+    "nock": "13.5.6",
     "nyc": "15.1.0",
     "prettier": "2.8.8",
     "rimraf": "5.0.8",
     "sinon": "17.0.2",
     "sort-json": "2.0.1",
     "style-loader": "4.0.0",
     "ts-node": "10.9.2",
-    "typescript": "5.6.3",
-    "webpack": "5.95.0",
+    "typescript": "5.7.2",
+    "webpack": "5.97.1",
     "webpack-cli": "5.1.4"
   },
   "homepage": "https://wire.com",
@@ -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.37.0",
+  "version": "3.38.0",
   "packageManager": "[email protected]"
 }