Skip to content

Commit a60d292

Browse files
EnricoSchwEnricoSchw
authored
Merge pull request #18853 from wireapp/v/merge-dev-simulcast
chore: merge dev into feat/simulcast
2 parents 121a624 + bee486d commit a60d292

127 files changed

Lines changed: 5239 additions & 1319 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: yarn test --coverage --coverage-reporters=lcov --detectOpenHandles=false
3838

3939
- name: Monitor coverage
40-
uses: codecov/codecov-action@v5.3.1
40+
uses: codecov/codecov-action@v5.4.0
4141
with:
4242
fail_ci_if_error: false
4343
files: ./coverage/lcov.info

‎Jenkinsfile‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pipeline {
3333

3434
environment {
3535
CREDENTIALS = credentials('GITHUB_TOKEN_WEB')
36-
WIRE_BOT_SECRET = credentials('JENKINSBOT_WEBAPP_DEV')
36+
// WIRE_BOT_SECRET = credentials('JENKINSBOT_WEBAPP_DEV')
3737
webappApplicationPath = 'https://wire-webapp-precommit.zinfra.io/'
3838
}
3939

@@ -144,11 +144,11 @@ pipeline {
144144
${commitMsg}
145145
**Reason:** ${e}
146146
${reason}"""
147-
wireSend secret: env.WIRE_BOT_SECRET, message: errorMessage
147+
// wireSend secret: env.WIRE_BOT_SECRET, message: errorMessage
148148
}
149149
def successMessage = """✅ **Deployment successful on** ${webappApplicationPath}
150150
${commitMsg}"""
151-
wireSend secret: env.WIRE_BOT_SECRET, message: successMessage
151+
// wireSend secret: env.WIRE_BOT_SECRET, message: successMessage
152152
}
153153
}
154154
}
@@ -160,14 +160,14 @@ pipeline {
160160
}
161161
}
162162

163-
post {
164-
success {
165-
wireSend secret: env.WIRE_BOT_SECRET, message: "✅ **Build finished for branch '$env.webappApplicationPath'**"
166-
}
167-
failure {
168-
script {
169-
wireSend(secret: env.WIRE_BOT_SECRET, message: "❌ **$BRANCH_NAME**\n[$CHANGE_TITLE](${CHANGE_URL})\nBuild aborted or failed! See [Github Actions](${env.GITHUB_ACTION_URL})")
170-
}
171-
}
172-
}
163+
// post {
164+
// success {
165+
// wireSend secret: env.WIRE_BOT_SECRET, message: "✅ **Build finished for branch '$env.webappApplicationPath'**"
166+
// }
167+
// failure {
168+
// script {
169+
// wireSend(secret: env.WIRE_BOT_SECRET, message: "❌ **$BRANCH_NAME**\n[$CHANGE_TITLE](${CHANGE_URL})\nBuild aborted or failed! See [Github Actions](${env.GITHUB_ACTION_URL})")
170+
// }
171+
// }
172+
// }
173173
}

‎app-config/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"wire-web-config-default-master": "https://github.com/wireapp/wire-web-config-wire#v0.32.5",
4-
"wire-web-config-default-staging": "https://github.com/wireapp/wire-web-config-default#v0.32.5"
3+
"wire-web-config-default-master": "https://github.com/wireapp/wire-web-config-wire#v0.33.0",
4+
"wire-web-config-default-staging": "https://github.com/wireapp/wire-web-config-default#v0.33.0"
55
}
66
}

‎package.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@
44
"@datadog/browser-rum": "5.35.1",
55
"@emotion/react": "11.11.4",
66
"@formkit/auto-animate": "0.8.2",
7-
"@lexical/code": "0.25.0",
8-
"@lexical/history": "0.25.0",
9-
"@lexical/list": "0.25.0",
10-
"@lexical/markdown": "0.25.0",
11-
"@lexical/react": "0.25.0",
12-
"@lexical/rich-text": "0.25.0",
7+
"@lexical/code": "0.27.1",
8+
"@lexical/history": "0.27.1",
9+
"@lexical/list": "0.27.1",
10+
"@lexical/markdown": "0.27.1",
11+
"@lexical/react": "0.27.1",
12+
"@lexical/rich-text": "0.27.1",
1313
"@mediapipe/tasks-vision": "0.10.21",
14-
"@tanstack/react-virtual": "^3.13.0",
14+
"@tanstack/react-virtual": "^3.13.2",
1515
"@wireapp/avs": "10.0.7",
1616
"@wireapp/avs-debugger": "0.0.7",
17-
"@wireapp/commons": "5.4.1",
18-
"@wireapp/core": "46.19.1",
19-
"@wireapp/react-ui-kit": "9.37.0",
17+
"@wireapp/commons": "5.4.2",
18+
"@wireapp/core": "46.19.10",
19+
"@wireapp/react-ui-kit": "9.40.0",
2020
"@wireapp/store-engine-dexie": "2.1.15",
2121
"@wireapp/telemetry": "0.3.1",
2222
"@wireapp/webapp-events": "0.28.0",
2323
"amplify": "https://github.com/wireapp/amplify#head=master",
2424
"beautiful-react-hooks": "5.0.2",
2525
"classnames": "2.5.1",
26-
"copy-webpack-plugin": "12.0.2",
27-
"core-js": "3.40.0",
26+
"copy-webpack-plugin": "13.0.0",
27+
"core-js": "3.41.0",
2828
"date-fns": "4.1.0",
2929
"dexie-batch": "0.4.3",
3030
"dexie-encrypted": "2.0.0",
@@ -35,7 +35,7 @@
3535
"jszip": "3.10.1",
3636
"keyboardjs": "2.7.0",
3737
"knockout": "3.5.1",
38-
"lexical": "0.25.0",
38+
"lexical": "0.27.1",
3939
"libsodium-wrappers": "0.7.15",
4040
"linkify-it": "5.0.0",
4141
"long": "5.3.1",
@@ -47,7 +47,7 @@
4747
"prismjs": "^1.29.0",
4848
"react": "18.3.1",
4949
"react-dom": "18.3.1",
50-
"react-dropzone": "14.3.5",
50+
"react-dropzone": "14.3.8",
5151
"react-error-boundary": "5.0.0",
5252
"react-intl": "7.1.6",
5353
"react-pdf": "9.2.1",
@@ -58,7 +58,7 @@
5858
"redux": "5.0.1",
5959
"redux-logdown": "1.0.4",
6060
"redux-thunk": "3.1.0",
61-
"sonner": "^1.7.4",
61+
"sonner": "^2.0.1",
6262
"speakingurl": "14.0.1",
6363
"switch-path": "1.2.0",
6464
"tsyringe": "4.8.0",
@@ -76,7 +76,7 @@
7676
"@babel/preset-react": "7.26.3",
7777
"@babel/preset-typescript": "7.26.0",
7878
"@emotion/eslint-plugin": "11.11.0",
79-
"@faker-js/faker": "9.5.0",
79+
"@faker-js/faker": "9.6.0",
8080
"@formatjs/cli": "6.6.1",
8181
"@roamhq/wrtc": "0.8.0",
8282
"@testing-library/dom": "^10.4.0",
@@ -113,8 +113,8 @@
113113
"@wireapp/prettier-config": "0.6.4",
114114
"@wireapp/store-engine": "5.1.11",
115115
"archiver": "7.0.1",
116-
"autoprefixer": "10.4.20",
117-
"babel-loader": "9.2.1",
116+
"autoprefixer": "10.4.21",
117+
"babel-loader": "10.0.0",
118118
"babel-plugin-transform-import-meta": "2.3.2",
119119
"cross-env": "7.0.3",
120120
"css-loader": "7.1.2",
@@ -141,11 +141,11 @@
141141
"lint-staged": "15.4.3",
142142
"os-browserify": "0.3.0",
143143
"path-browserify": "1.0.1",
144-
"postcss": "8.5.2",
144+
"postcss": "8.5.3",
145145
"postcss-import": "16.1.0",
146146
"postcss-less": "6.0.0",
147147
"postcss-loader": "8.1.1",
148-
"postcss-preset-env": "10.1.4",
148+
"postcss-preset-env": "10.1.5",
149149
"postcss-scss": "4.0.9",
150150
"prettier": "3.3.2",
151151
"raw-loader": "4.0.2",
@@ -154,7 +154,7 @@
154154
"simple-git": "3.27.0",
155155
"sinon": "18.0.0",
156156
"style-loader": "4.0.0",
157-
"stylelint": "16.14.1",
157+
"stylelint": "16.15.0",
158158
"stylelint-config-idiomatic-order": "10.0.0",
159159
"svg-inline-loader": "0.8.2",
160160
"text-encoding": "0.7.0",

‎server/config/client.config.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ export function generateConfig(params: ConfigGeneratorParams, env: Env) {
3030
BACKEND_REST: urls.api ?? '',
3131
BACKEND_WS: urls.ws ?? '',
3232
BRAND_NAME: env.BRAND_NAME,
33+
CELLS_PYDIO_API_KEY: env.CELLS_PYDIO_API_KEY,
34+
CELLS_PYDIO_SEGMENT: env.CELLS_PYDIO_SEGMENT,
35+
CELLS_PYDIO_URL: env.CELLS_PYDIO_URL,
36+
CELLS_S3_API_KEY: env.CELLS_S3_API_KEY,
37+
CELLS_S3_BUCKET: env.CELLS_S3_BUCKET,
38+
CELLS_S3_REGION: env.CELLS_S3_REGION,
39+
CELLS_S3_ENDPOINT: env.CELLS_S3_ENDPOINT,
3340
COUNTLY_API_KEY: env.COUNTLY_API_KEY,
3441
COUNTLY_ENABLE_LOGGING: env.COUNTLY_ENABLE_LOGGING == 'true',
3542
COUNTLY_FORCE_REPORTING: env.COUNTLY_FORCE_REPORTING == 'true',
@@ -45,6 +52,7 @@ export function generateConfig(params: ConfigGeneratorParams, env: Env) {
4552
APPLOCK_SCHEDULED_TIMEOUT: env.FEATURE_APPLOCK_SCHEDULED_TIMEOUT
4653
? Number(env.FEATURE_APPLOCK_SCHEDULED_TIMEOUT)
4754
: null,
55+
ENABLE_CELLS: env.FEATURE_ENABLE_CELLS == 'true',
4856
CHECK_CONSENT: env.FEATURE_CHECK_CONSENT != 'false',
4957
CONFERENCE_AUTO_MUTE: env.FEATURE_CONFERENCE_AUTO_MUTE == 'true',
5058
ENABLE_IN_CALL_REACTIONS: env.FEATURE_ENABLE_IN_CALL_REACTIONS == 'true',
@@ -115,6 +123,7 @@ export function generateConfig(params: ConfigGeneratorParams, env: Env) {
115123
LEGAL_HOLD_BLOCK: env.URL_SUPPORT_LEGAL_HOLD_BLOCK,
116124
MICROPHONE_ACCESS_DENIED: env.URL_SUPPORT_MICROPHONE_ACCESS_DENIED,
117125
MLS_LEARN_MORE: env.URL_SUPPORT_MLS_LEARN_MORE,
126+
MLS_MIGRATION_FROM_PROTEUS: env.URL_SUPPORT_MLS_MIGRATION_FROM_PROTEUS,
118127
NON_FEDERATING_INFO: env.URL_SUPPORT_NON_FEDERATING_INFO,
119128
OAUTH_LEARN_MORE: env.URL_SUPPORT_OAUTH_LEARN_MORE,
120129
OFFLINE_BACKEND: env.URL_SUPPORT_OFFLINE_BACKEND,

‎server/config/env.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ export type Env = {
4646
/** Specifies the name of the application, e.g. Webapp */
4747
APP_NAME: string;
4848

49+
/** Specifies configuration for Cells */
50+
FEATURE_ENABLE_CELLS: string;
51+
CELLS_PYDIO_API_KEY: string;
52+
CELLS_PYDIO_SEGMENT: string;
53+
CELLS_PYDIO_URL: string;
54+
CELLS_S3_API_KEY: string;
55+
CELLS_S3_BUCKET: string;
56+
CELLS_S3_REGION: string;
57+
CELLS_S3_ENDPOINT: string;
58+
4959
/** Specifies the name of the backend, e.g. Wire */
5060
BACKEND_NAME: string;
5161

@@ -289,6 +299,8 @@ export type Env = {
289299

290300
URL_SUPPORT_MLS_LEARN_MORE: string;
291301

302+
URL_SUPPORT_MLS_MIGRATION_FROM_PROTEUS: string;
303+
292304
URL_SUPPORT_MICROPHONE_ACCESS_DENIED: string;
293305

294306
URL_SUPPORT_PRIVACY_VERIFY_FINGERPRINT: string;

‎server/config/server.config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const ROBOTS_ALLOW_FILE = path.join(ROBOTS_DIR, 'robots.txt');
3030
const ROBOTS_DISALLOW_FILE = path.join(ROBOTS_DIR, 'robots-disallow.txt');
3131

3232
const defaultCSP = {
33-
connectSrc: ["'self'", 'blob:', 'data:', 'https://*.giphy.com'],
33+
connectSrc: ["'self'", 'blob:', 'data:', 'https://*.giphy.com', 'https://service.zeta.pydiocells.com'],
3434
defaultSrc: ["'self'"],
3535
fontSrc: ["'self'", 'data:'],
3636
frameSrc: [

‎server/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"main": "dist/index.js",
55
"license": "GPL-3.0",
66
"dependencies": {
7-
"@wireapp/commons": "5.4.1",
7+
"@wireapp/commons": "5.4.2",
88
"dotenv": "16.4.7",
99
"dotenv-extended": "2.9.0",
1010
"express": "4.21.2",

‎server/yarn.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1127,15 +1127,15 @@ __metadata:
11271127
languageName: node
11281128
linkType: hard
11291129

1130-
"@wireapp/commons@npm:5.4.1":
1131-
version: 5.4.1
1132-
resolution: "@wireapp/commons@npm:5.4.1"
1130+
"@wireapp/commons@npm:5.4.2":
1131+
version: 5.4.2
1132+
resolution: "@wireapp/commons@npm:5.4.2"
11331133
dependencies:
11341134
ansi-regex: "npm:5.0.1"
11351135
fs-extra: "npm:11.3.0"
11361136
logdown: "npm:3.3.1"
11371137
platform: "npm:1.3.6"
1138-
checksum: 10/461810900b6252b1a040b8d5b4c68748f170a98b7372cdc43e0f640357d49664149034f267ef2e8ed7fc610a84176aaca12fddbb61eb4c0d534a823e519bb0fe
1138+
checksum: 10/730b304d2b9027431b984045316208f6cdd5597209c2d09e297a184e4d9793347e33cb3508bbeed22b1970adf39ff861e9ebe36bd036e89391135e5e1320d779
11391139
languageName: node
11401140
linkType: hard
11411141

@@ -5677,7 +5677,7 @@ __metadata:
56775677
"@types/hbs": "npm:4.0.4"
56785678
"@types/jest": "npm:^29.5.14"
56795679
"@types/node": "npm:22.5.5"
5680-
"@wireapp/commons": "npm:5.4.1"
5680+
"@wireapp/commons": "npm:5.4.2"
56815681
dotenv: "npm:16.4.7"
56825682
dotenv-extended: "npm:2.9.0"
56835683
express: "npm:4.21.2"

‎setupTests.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,7 @@ Object.defineProperty(document, 'elementFromPoint', {
6969

7070
const testLib = require('@testing-library/react');
7171
testLib.configure({testIdAttribute: 'data-uie-name'});
72+
73+
jest.mock('@formkit/auto-animate/react', () => ({
74+
useAutoAnimate: () => [null, () => {}],
75+
}));

0 commit comments

Comments
 (0)