Skip to content

Commit

Permalink
Merge pull request #14866 from wireapp/rc/2023-03-21
Browse files Browse the repository at this point in the history
chore: RC 2023-03-21
  • Loading branch information
arjita-mitra authored Mar 21, 2023
2 parents 1449738 + 85f2299 commit b016609
Show file tree
Hide file tree
Showing 130 changed files with 3,158 additions and 2,700 deletions.
1 change: 1 addition & 0 deletions .env.localhost
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ ENABLE_DEV_BACKEND_API="true"
#FEATURE_APPLOCK_UNFOCUS_TIMEOUT="30"
#FEATURE_APPLOCK_SCHEDULED_TIMEOUT="30"
#FEATURE_ENABLE_MLS="true"
#FEATURE_USE_CORE_CRYPTO="true"

# staging
BACKEND_REST="https://staging-nginz-https.zinfra.io"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jobs:
name: Label PR based on title
runs-on: ubuntu-latest
steps:
- uses: srvaroa/labeler@v1.3
- uses: srvaroa/labeler@v1.4
env:
GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}}
2 changes: 1 addition & 1 deletion .github/workflows/sync_translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
run: yarn translate:merge

- name: Download translations
uses: crowdin/[email protected].0
uses: crowdin/[email protected].1
env:
GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}}
CROWDIN_PROJECT_ID: 342359
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Wire™

[![We are hiring](https://github.com/wireapp/wire/blob/master/assets/header-small.png?raw=true)](https://wire.softgarden.io/job/616102)
[![We are hiring](https://github.com/wireapp/wire/blob/master/assets/header-small.png?raw=true)](https://wire.softgarden.io/en/vacancies)

This repository is part of the source code of Wire. You can find more information at [wire.com](https://wire.com) or by contacting [email protected].

Expand Down
66 changes: 33 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"dependencies": {
"@emotion/react": "11.10.6",
"@types/eslint": "8.4.10",
"@wireapp/avs": "9.0.23",
"@wireapp/core": "38.15.0",
"@wireapp/avs": "9.1.13",
"@wireapp/core": "39.2.7",
"@wireapp/lru-cache": "3.8.1",
"@wireapp/react-ui-kit": "9.3.8",
"@wireapp/store-engine-dexie": "2.0.4",
"@wireapp/react-ui-kit": "9.4.1",
"@wireapp/store-engine-dexie": "2.0.5",
"@wireapp/store-engine-sqleet": "1.8.9",
"@wireapp/webapp-events": "0.16.0",
"amplify": "https://github.com/wireapp/amplify#head=master",
Expand All @@ -19,7 +19,7 @@
"dexie-batch": "0.4.3",
"highlight.js": "11.7.0",
"http-status-codes": "2.2.0",
"jquery": "3.6.3",
"jquery": "3.6.4",
"js-cookie": "3.0.1",
"jszip": "3.10.1",
"keyboardjs": "2.7.0",
Expand All @@ -32,10 +32,10 @@
"platform": "1.3.6",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-intl": "6.2.10",
"react-intl": "6.3.1",
"react-redux": "8.0.5",
"react-router": "6.8.1",
"react-router-dom": "6.8.1",
"react-router": "6.9.0",
"react-router-dom": "6.9.0",
"react-transition-group": "4.4.5",
"redux": "4.2.1",
"redux-logdown": "1.0.4",
Expand All @@ -47,11 +47,11 @@
"underscore": "1.13.6",
"uuidjs": "4.2.13",
"webrtc-adapter": "6.4.8",
"zustand": "4.3.3"
"zustand": "4.3.6"
},
"devDependencies": {
"@babel/core": "7.21.0",
"@babel/eslint-parser": "7.19.1",
"@babel/core": "7.21.3",
"@babel/eslint-parser": "7.21.3",
"@babel/plugin-proposal-decorators": "7.21.0",
"@babel/preset-env": "7.20.2",
"@babel/preset-react": "7.18.6",
Expand All @@ -68,19 +68,19 @@
"@types/fs-extra": "11.0.1",
"@types/generate-changelog": "1.8.1",
"@types/highlight.js": "10.1.0",
"@types/jest": "29.4.0",
"@types/jest": "29.5.0",
"@types/jquery": "^3",
"@types/js-cookie": "3.0.3",
"@types/jsdom": "21.1.0",
"@types/keyboardjs": "2.5.0",
"@types/libsodium-wrappers": "^0",
"@types/linkify-it": "3.0.2",
"@types/markdown-it": "12.2.3",
"@types/node": "^18.14.1",
"@types/node": "^18.15.3",
"@types/open-graph": "0.2.2",
"@types/platform": "1.3.4",
"@types/prettier": "^2.7.2",
"@types/react": "18.0.27",
"@types/react": "18.0.28",
"@types/react-dom": "18.0.11",
"@types/react-redux": "7.1.25",
"@types/react-transition-group": "4.4.5",
Expand All @@ -91,26 +91,26 @@
"@types/uint32": "0.2.0",
"@types/underscore": "1.11.4",
"@types/webpack-env": "1.18.0",
"@typescript-eslint/eslint-plugin": "^5.53.0",
"@typescript-eslint/parser": "^5.53.0",
"@wireapp/copy-config": "2.0.9",
"@typescript-eslint/eslint-plugin": "^5.55.0",
"@typescript-eslint/parser": "^5.55.0",
"@wireapp/copy-config": "2.0.10",
"@wireapp/eslint-config": "2.1.1",
"@wireapp/prettier-config": "0.5.2",
"@wireapp/store-engine": "^5.0.3",
"adm-zip": "0.5.10",
"archiver": "^5.3.1",
"autoprefixer": "^10.4.13",
"babel-loader": "9.1.2",
"caniuse-lite": "^1.0.30001458",
"caniuse-lite": "^1.0.30001468",
"cross-env": "7.0.3",
"cspell": "6.27.0",
"cspell": "6.30.2",
"css-loader": "^6.7.3",
"cssnano": "^5.1.14",
"dexie": "^3.2.2",
"dexie": "3.2.3",
"dotenv": "16.0.3",
"dpdm": "3.12.0",
"eslint": "^8.34.0",
"eslint-config-prettier": "^8.6.0",
"eslint-config-prettier": "^8.7.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-import-resolver-typescript": "^3.5.3",
"eslint-plugin-babel": "5.3.1",
Expand All @@ -128,50 +128,50 @@
"eslint-plugin-simple-import-sort": "^8.0.0",
"eslint-plugin-sort-keys-fix": "1.1.2",
"eslint-plugin-testing-library": "^5.10.2",
"eslint-plugin-typescript-sort-keys": "2.1.0",
"eslint-plugin-typescript-sort-keys": "2.3.0",
"eslint-plugin-unused-imports": "^2.0.0",
"fake-indexeddb": "4.0.1",
"generate-changelog": "1.8.0",
"html-webpack-plugin": "^5.5.0",
"husky": "7.0.4",
"i18next-scanner": "4.1.1",
"i18next-scanner": "4.2.0",
"intersection-observer": "0.12.2",
"jest": "29.4.3",
"jest": "29.5.0",
"jest-canvas-mock": "2.4.0",
"jest-environment-jsdom": "29.4.3",
"jest-jasmine2": "29.4.3",
"jest-environment-jsdom": "29.5.0",
"jest-jasmine2": "29.5.0",
"jsdom-worker": "0.3.0",
"less": "3.13.1",
"less-loader": "^11.1.0",
"lint-staged": "13.1.2",
"lint-staged": "13.2.0",
"node-fetch": "2.6.9",
"os-browserify": "0.3.0",
"path-browserify": "1.0.1",
"postcss": "8.4.21",
"postcss-import": "^15.1.0",
"postcss-less": "6.0.0",
"postcss-loader": "^7.0.2",
"postcss-loader": "^7.1.0",
"postcss-preset-env": "^8.0.1",
"postcss-scss": "4.0.6",
"prettier": "^2.8.4",
"raf": "3.4.1",
"redux-devtools-extension": "2.13.9",
"redux-mock-store": "1.5.4",
"seedrandom": "^3.0.5",
"simple-git": "3.16.1",
"sinon": "15.0.1",
"simple-git": "3.17.0",
"sinon": "15.0.2",
"snabbdom": "3.5.1",
"style-loader": "^3.3.1",
"style-loader": "^3.3.2",
"stylelint": "14.16.1",
"stylelint-config-idiomatic-order": "9.0.0",
"stylelint-config-prettier": "9.0.5",
"svg-inline-loader": "0.8.2",
"terser-webpack-plugin": "5.3.6",
"terser-webpack-plugin": "5.3.7",
"text-encoding": "0.7.0",
"ts-node": "10.9.1",
"tsc-watch": "6.0.0",
"typescript": "^4.9.5",
"webpack": "5.75.0",
"webpack": "5.76.2",
"webpack-cli": "5.0.1",
"webpack-dev-middleware": "6.0.1",
"webpack-hot-middleware": "2.25.3",
Expand Down
1 change: 1 addition & 0 deletions server/ServerConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export interface ServerConfig {
MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD: number;
PERSIST_TEMPORARY_CLIENTS: boolean;
SHOW_LOADING_INFORMATION: boolean;
USE_CORE_CRYPTO: boolean;
};
MAX_GROUP_PARTICIPANTS: number;
MAX_VIDEO_PARTICIPANTS: number;
Expand Down
1 change: 1 addition & 0 deletions server/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ const config: ServerConfig = {
Number(process.env.FEATURE_MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD),
PERSIST_TEMPORARY_CLIENTS: process.env.FEATURE_PERSIST_TEMPORARY_CLIENTS != 'false',
SHOW_LOADING_INFORMATION: process.env.FEATURE_SHOW_LOADING_INFORMATION == 'true',
USE_CORE_CRYPTO: process.env.FEATURE_USE_CORE_CRYPTO == 'true',
},
MAX_GROUP_PARTICIPANTS: (process.env.MAX_GROUP_PARTICIPANTS && Number(process.env.MAX_GROUP_PARTICIPANTS)) || 500,
MAX_VIDEO_PARTICIPANTS: (process.env.MAX_VIDEO_PARTICIPANTS && Number(process.env.MAX_VIDEO_PARTICIPANTS)) || 4,
Expand Down
8 changes: 4 additions & 4 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"maxmind": "4.3.8",
"nocache": "3.0.4",
"opn": "6.0.0",
"pm2": "5.2.2"
"pm2": "5.3.0"
},
"devDependencies": {
"@types/express": "4.17.17",
Expand All @@ -28,10 +28,10 @@
"@types/fs-extra": "11.0.1",
"@types/geolite2": "2.0.0",
"@types/hbs": "4.0.1",
"@types/jest": "^29.4.0",
"@types/jest": "^29.5.0",
"@types/node": "18.11.18",
"jest": "29.4.3",
"rimraf": "4.1.2",
"jest": "29.5.0",
"rimraf": "4.4.0",
"typescript": "4.9.5"
},
"scripts": {
Expand Down
Loading

0 comments on commit b016609

Please sign in to comment.