Merge pull request #18280 from wireapp/2024-11-06-staging-bump

chore: RC 2024-11-06

.env.localhost

@@ -5,7 +5,7 @@ APP_BASE="https://local.zinfra.io:8081"
 
 FORCED_CONFIG_URL="https://github.com/wireapp/wire-web-config-wire"
 
-CSP_EXTRA_CONNECT_SRC="http://localhost:32123, ws://localhost:32123, https://*.zinfra.io, https://*.wire.link, https://*.wire.com, https://api.raygun.io, wss://*.zinfra.io, wss://*.wire.link, wss://prod-nginz-ssl.wire.com, https://wire.count.ly, https://balderdash.hogwash.work:9000, https://balderdash.hogwash.work:5556, https://accounts.google.com, https://oauth2.googleapis.com/token"
+CSP_EXTRA_CONNECT_SRC="http://localhost:4570, http://localhost:32123, ws://localhost:32123, https://*.zinfra.io, https://*.wire.link, https://*.wire.com, https://api.raygun.io, wss://*.zinfra.io, wss://*.wire.link, wss://prod-nginz-ssl.wire.com, https://wire.count.ly, https://balderdash.hogwash.work:9000, https://balderdash.hogwash.work:5556, https://accounts.google.com, https://oauth2.googleapis.com/token"
 CSP_EXTRA_IMG_SRC="https://*.zinfra.io, https://*.wire.com, https://*.wire.link"
 CSP_EXTRA_SCRIPT_SRC="http://localhost:32123, https://*.zinfra.io, https://*.wire.com, https://*.wire.link, https://api.raygun.io"
 ENFORCE_HTTPS="false"
@@ -30,3 +30,7 @@ BACKEND_WS="wss://staging-nginz-ssl.zinfra.io"
 # BACKEND_REST="https://prod-nginz-https.wire.com"
 # BACKEND_WS="wss://prod-nginz-ssl.wire.com"
 
+# Use these vars if you are running a local backend. (Rare)
+# BACKEND_REST="http://localhost:8080"
+# BACKEND_WS="ws://localhost:8080"
+# APP_BASE="http://localhost:8081"

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +1,20 @@
 ## Description
 
+<!-- Uncomment this section if your PR has UI changes -->
+<!--
 ## Screenshots/Screencast (for UI changes)
+-->
 
 ## Checklist
 
+- [ ] mentions the JIRA issue in the PR name (Ex. [WPB-423])
 - [ ] PR has been self reviewed by the author;
 - [ ] Hard-to-understand areas of the code have been commented;
 - [ ] If it is a core feature, unit tests have been added;
 
-### Important details for the reviewers
-
-(Delete this section if unnecessary)
+<!-- Uncomment this section if it is necessary to understand the PR -->
+<!-- ## Important Details for the Reviewers
 
 - use (x) data
 - can be reviewed commit-by-commit
-- be sure to look at ...
+- be sure to look at ... -->

.github/dependabot.yml

@@ -35,6 +35,10 @@ updates:
 
     ignore:
       - dependency-name: '@wireapp/avs'
+      # Wait until we have next release with wasm folder
+      - dependency-name: '@mediapipe/tasks-vision'
+        versions:
+          - '0.10.16'
 
   # Server dependencies
   - package-ecosystem: npm

.github/workflows/cherry-pick-release-to-dev.yml

@@ -1,17 +1,20 @@
-# This job will automatically create a cherry pick PR from any release/* branch to the dev branch
+# This job will automatically create a cherry-pick PR from any release/* or master branch to the dev branch.
+# This job will not run if the push/PR is from the dev branch itself.
 # It allows the dev branch to stay up-to-date with fixes made to specific release branches
 name: Cherry pick to dev
 on:
   push:
     branches:
-      - release/*
+      - 'release/*'
+      - 'master'
 
 permissions:
   pull-requests: write
   contents: write
 
 jobs:
   cherry_pick:
+    if: github.event.pull_request.head.ref != 'dev'
     runs-on: ubuntu-latest
     steps:
       - name: checkout

.github/workflows/ci.yml

@@ -37,7 +37,7 @@ jobs:
         run: yarn test --coverage --coverage-reporters=lcov --detectOpenHandles=false
 
       - name: Monitor coverage
-        uses: codecov/codecov-action@v4.5.0
+        uses: codecov/codecov-action@v4.6.0
         with:
           fail_ci_if_error: false
           files: ./coverage/lcov.info

.github/workflows/deploy-to-test-env.yml

@@ -8,7 +8,6 @@ on:
         required: true
         type: choice
         options:
-          - wire-webapp-main
           - wire-webapp-qa
           - wire-webapp-mls
 
@@ -28,8 +27,10 @@ jobs:
     steps:
       - name: Print environment variables
         run: |
-          echo -e "branch = ${{github.ref_name}}"
-          echo -e "env = ${{inputs.env}}"
+          echo -e "branch = ${GITHUB_REF_NAME}"
+          echo -e "env = ${ENV}"
+        env:
+          ENV: ${{ inputs.env }}
 
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/label.yml

@@ -9,6 +9,6 @@ jobs:
     name: Label PR based on title
     runs-on: ubuntu-latest
     steps:
-      - uses: srvaroa/labeler@v1.4
+      - uses: srvaroa/labeler@v1.11
         env:
           GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}}

.github/workflows/pull_translations.yml

@@ -28,7 +28,7 @@ jobs:
         run: yarn --immutable
 
       - name: Sync translations
-        uses: crowdin/github-action@v2.1.0
+        uses: crowdin/github-action@v2.3.0
         env:
           GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}}
           GITHUB_ACTOR: otto-the-bot

.github/workflows/sync_translations.yml

@@ -37,7 +37,7 @@ jobs:
         run: yarn translate:merge
 
       - name: Download translations
-        uses: crowdin/github-action@v2.1.0
+        uses: crowdin/github-action@v2.3.0
         env:
           GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}}
           CROWDIN_PROJECT_ID: 342359

.husky/pre-commit

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-yarn lint-staged
+yarn lint-staged

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22-alpine
+FROM node:23-alpine
 
 # For some extra dependencies...
 RUN apk add --no-cache dumb-init git bash

app-config/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "wire-web-config-default-master": "https://github.com/wireapp/wire-web-config-wire#v0.31.29-0",
-    "wire-web-config-default-staging": "https://github.com/wireapp/wire-web-config-default#v0.31.28"
+    "wire-web-config-default-master": "https://github.com/wireapp/wire-web-config-wire#v0.31.36",
+    "wire-web-config-default-staging": "https://github.com/wireapp/wire-web-config-default#v0.31.35"
   }
 }

bin/release_tag.ts

@@ -36,10 +36,12 @@ const filename = path.basename(__filename);
 const stage = process.argv[2];
 const usageText = `Usage: ${filename} [-h|--help] <staging|production> <commitId>`;
 
+const exec = (command: string): string => execSync(command, {stdio: 'pipe'}).toString().trim();
+
 let commitId = process.argv[3];
 let target = '';
 let commitMessage = '';
-let branch = '';
+let branch = exec('git rev-parse --abbrev-ref HEAD');
 const isDryRun = process.argv.includes('--dry-run');
 
 const logger = logdown(filename, {
@@ -48,8 +50,6 @@ const logger = logdown(filename, {
 });
 logger.state.isEnabled = true;
 
-const exec = (command: string): string => execSync(command, {stdio: 'pipe'}).toString().trim();
-
 if (isDryRun) {
   logger.info('Note: Dry run enabled.');
 }
@@ -61,12 +61,10 @@ switch (stage) {
     process.exit();
   }
   case DeploymentStage.PRODUCTION: {
-    branch = 'master';
     target = stage;
     break;
   }
   case DeploymentStage.STAGING: {
-    branch = 'dev';
     target = stage;
     break;
   }
@@ -117,6 +115,15 @@ const ask = (questionToAsk: string): Promise<string> => {
 };
 
 (async () => {
+  if (branch !== 'master' && target === DeploymentStage.PRODUCTION) {
+    const answer = await ask(
+      `⚠️  You are about to release a commit from branch "${branch}" to production. ARE YOU SURE?? [yes/no] `,
+    );
+    if (answer !== 'yes') {
+      logger.info('Aborting.');
+      process.exit();
+    }
+  }
   const answer = await ask(
     `ℹ️  The commit "${commitMessage}" will be released with tag "${tagName}". Continue? [yes/no] `,
   );

jest.config.ts

@@ -26,6 +26,7 @@ const config: Config = {
   // Must be in sync with tsconfig.json >> paths
   moduleNameMapper: {
     'Components/(.*)': '<rootDir>/src/script/components/$1',
+    'Hooks/(.*)': '<rootDir>/src/script/hooks/$1',
     'I18n/(.*)': '<rootDir>/src/i18n/$1',
     'Resource/(.*)': '<rootDir>/resource/$1',
     'Util/(.*)': '<rootDir>/src/script/util/$1',