Skip to content

Commit

Permalink
Merge pull request #15392 from wireapp/rc-2023-06-26
Browse files Browse the repository at this point in the history
chore: RC-2023-06-26
  • Loading branch information
V-Gira authored Jun 27, 2023
2 parents 1b2370b + 630ffc7 commit a9b67c6
Show file tree
Hide file tree
Showing 109 changed files with 2,623 additions and 1,269 deletions.
4 changes: 2 additions & 2 deletions .elasticbeanstalk/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
branch-defaults:
dev:
environment: wire-webapp-dev
environment: wire-webapp-dev-al2
master:
environment: wire-webapp-master
environment: wire-webapp-master-al2
deploy:
artifact: server/dist/s3/ebs.zip
global:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/[email protected].0
uses: dependabot/[email protected].1
with:
github-token: '${{secrets.WEBTEAM_AUTOMERGE_TOKEN}}'

Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/deploy-to-test-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ on:
required: true
type: choice
options:
- wire-webapp-qa
- wire-webapp-edge
- wire-webapp-qa-al2-migration
- wire-webapp-edge-al2
- wire-webapp-mls-al2

concurrency:
group: ci-${{ github.ref }}
Expand Down
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/github-action@v1.8.1
uses: crowdin/github-action@v1.11.0
env:
GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}}
CROWDIN_PROJECT_ID: 342359
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test_build_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ jobs:
key: '${{github.ref}}'
map: |
{
"edge": { "dev_env": "wire-webapp-edge" },
"dev": { "dev_env": "wire-webapp-dev" },
"master": { "dev_env": "wire-webapp-master" }
"edge": { "dev_env": "wire-webapp-edge-al2" },
"dev": { "dev_env": "wire-webapp-dev-al2" },
"master": { "dev_env": "wire-webapp-master-al2" }
}
- uses: kanga333/variable-mapper@master
Expand All @@ -104,8 +104,8 @@ jobs:
key: '${{env.TAG}}'
map: |
{
"production": { "prod_env": "wire-webapp-prod" },
"staging": { "prod_env": "wire-webapp-staging" }
"production": { "prod_env": "wire-webapp-prod-al2" },
"staging": { "prod_env": "wire-webapp-staging-al2" }
}
- name: Build
Expand Down
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: npm run start:prod
5 changes: 4 additions & 1 deletion bin/zip.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,12 @@ const S3_PATH = path.resolve(ROOT_PATH, 'server/dist/s3');

archive.file(path.join(SERVER_PATH, 'package.json'), {name: 'package.json'});
archive.file(path.join(ROOT_PATH, '.env.defaults'), {name: '.env.defaults'});
archive.file(path.join(ROOT_PATH, 'Procfile'), {name: 'Procfile'});
archive.directory(DIST_PATH, false);

fs.mkdirSync(S3_PATH);
if (!fs.existsSync(S3_PATH)) {
fs.mkdirSync(S3_PATH);
}
const output = fs.createWriteStream(path.join(S3_PATH, 'ebs.zip'));

archive.pipe(output);
Expand Down
86 changes: 43 additions & 43 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"dependencies": {
"@datadog/browser-logs": "^4.42.2",
"@datadog/browser-rum": "^4.42.2",
"@emotion/react": "11.11.0",
"@datadog/browser-logs": "^4.43.0",
"@datadog/browser-rum": "^4.43.0",
"@emotion/react": "11.11.1",
"@types/eslint": "8.37.0",
"@wireapp/avs": "9.2.13",
"@wireapp/core": "40.2.7",
"@wireapp/avs": "9.2.15",
"@wireapp/core": "40.5.5",
"@wireapp/lru-cache": "3.8.1",
"@wireapp/react-ui-kit": "9.7.1",
"@wireapp/react-ui-kit": "9.7.5",
"@wireapp/store-engine-dexie": "2.1.1",
"@wireapp/store-engine-sqleet": "1.8.9",
"@wireapp/webapp-events": "0.17.0",
Expand Down Expand Up @@ -35,11 +35,11 @@
"platform": "1.3.6",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-error-boundary": "4.0.4",
"react-intl": "6.4.2",
"react-redux": "8.0.5",
"react-router": "6.11.2",
"react-router-dom": "6.11.2",
"react-error-boundary": "4.0.10",
"react-intl": "6.4.4",
"react-redux": "8.1.1",
"react-router": "6.14.0",
"react-router-dom": "6.14.0",
"react-transition-group": "4.4.5",
"redux": "4.2.1",
"redux-logdown": "1.0.4",
Expand All @@ -54,15 +54,15 @@
"zustand": "4.3.8"
},
"devDependencies": {
"@babel/core": "7.21.8",
"@babel/eslint-parser": "7.21.8",
"@babel/plugin-proposal-decorators": "7.21.0",
"@babel/preset-env": "7.21.5",
"@babel/preset-react": "7.18.6",
"@babel/preset-typescript": "7.21.5",
"@babel/core": "7.22.5",
"@babel/eslint-parser": "7.22.5",
"@babel/plugin-proposal-decorators": "7.22.5",
"@babel/preset-env": "7.22.5",
"@babel/preset-react": "7.22.5",
"@babel/preset-typescript": "7.22.5",
"@emotion/eslint-plugin": "^11.11.0",
"@faker-js/faker": "7.6.0",
"@formatjs/cli": "6.1.1",
"@formatjs/cli": "6.1.3",
"@koush/wrtc": "0.5.3",
"@testing-library/react": "13.4.0",
"@types/adm-zip": "0.5.0",
Expand All @@ -72,7 +72,7 @@
"@types/fs-extra": "11.0.1",
"@types/generate-changelog": "1.8.1",
"@types/highlight.js": "10.1.0",
"@types/jest": "29.5.1",
"@types/jest": "29.5.2",
"@types/jquery": "^3",
"@types/js-cookie": "3.0.3",
"@types/jsdom": "21.1.1",
Expand All @@ -83,37 +83,37 @@
"@types/node": "^18.16.3",
"@types/open-graph": "0.2.2",
"@types/platform": "1.3.4",
"@types/prettier": "^2.7.2",
"@types/prettier": "^2.7.3",
"@types/react": "18.0.28",
"@types/react-dom": "18.2.4",
"@types/react-dom": "18.2.6",
"@types/react-redux": "7.1.25",
"@types/react-transition-group": "4.4.6",
"@types/redux-mock-store": "1.0.3",
"@types/seedrandom": "^3",
"@types/sinon": "10.0.15",
"@types/speakingurl": "13.0.3",
"@types/uint32": "0.2.0",
"@types/underscore": "1.11.4",
"@types/webpack-env": "1.18.0",
"@typescript-eslint/eslint-plugin": "^5.59.6",
"@typescript-eslint/parser": "^5.59.6",
"@wireapp/copy-config": "2.1.0",
"@wireapp/eslint-config": "2.2.1",
"@types/underscore": "1.11.5",
"@types/webpack-env": "1.18.1",
"@typescript-eslint/eslint-plugin": "^5.60.0",
"@typescript-eslint/parser": "^5.60.0",
"@wireapp/copy-config": "2.1.1",
"@wireapp/eslint-config": "2.2.2",
"@wireapp/prettier-config": "0.6.0",
"@wireapp/store-engine": "^5.1.1",
"adm-zip": "0.5.10",
"archiver": "^5.3.1",
"autoprefixer": "^10.4.13",
"babel-loader": "9.1.2",
"babel-plugin-transform-import-meta": "^2.2.0",
"caniuse-lite": "^1.0.30001488",
"caniuse-lite": "^1.0.30001507",
"cross-env": "7.0.3",
"cspell": "6.31.1",
"css-loader": "^6.7.4",
"css-loader": "^6.8.1",
"cssnano": "^5.1.14",
"dexie": "3.2.3",
"dotenv": "16.0.3",
"dpdm": "3.13.0",
"dotenv": "16.3.1",
"dpdm": "3.13.1",
"eslint": "^8.41.0",
"eslint-config-prettier": "^8.8.0",
"eslint-import-resolver-alias": "^1.1.2",
Expand All @@ -122,7 +122,7 @@
"eslint-plugin-better-styled-components": "^1.1.2",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jest": "^27.2.1",
"eslint-plugin-jest": "^27.2.2",
"eslint-plugin-jest-dom": "^4.0.3",
"eslint-plugin-jsdoc": "^39.8.0",
"eslint-plugin-jsx-a11y": "^6.7.1",
Expand All @@ -137,7 +137,7 @@
"eslint-plugin-unused-imports": "^2.0.0",
"fake-indexeddb": "4.0.1",
"generate-changelog": "1.8.0",
"html-webpack-plugin": "^5.5.1",
"html-webpack-plugin": "^5.5.3",
"husky": "7.0.4",
"i18next-scanner": "4.2.0",
"intersection-observer": "0.12.2",
Expand All @@ -147,24 +147,24 @@
"jest-jasmine2": "29.5.0",
"jsdom-worker": "0.3.0",
"less": "3.13.1",
"less-loader": "^11.1.0",
"less-loader": "^11.1.3",
"lint-staged": "13.2.2",
"node-fetch": "2.6.11",
"os-browserify": "0.3.0",
"path-browserify": "1.0.1",
"postcss": "8.4.23",
"postcss": "8.4.24",
"postcss-import": "^15.1.0",
"postcss-less": "6.0.0",
"postcss-loader": "^7.3.0",
"postcss-preset-env": "^8.4.1",
"postcss-loader": "^7.3.3",
"postcss-preset-env": "^8.5.1",
"postcss-scss": "4.0.6",
"prettier": "^2.8.8",
"raf": "3.4.1",
"redux-devtools-extension": "2.13.9",
"redux-mock-store": "1.5.4",
"seedrandom": "^3.0.5",
"simple-git": "3.18.0",
"sinon": "15.1.0",
"simple-git": "3.19.0",
"sinon": "15.2.0",
"snabbdom": "3.5.1",
"style-loader": "^3.3.3",
"stylelint": "14.16.1",
Expand All @@ -176,11 +176,11 @@
"ts-node": "10.9.1",
"tsc-watch": "6.0.4",
"typescript": "5.0.4",
"webpack": "5.83.1",
"webpack-cli": "5.1.1",
"webpack": "5.88.0",
"webpack-cli": "5.1.4",
"webpack-dev-middleware": "6.1.1",
"webpack-hot-middleware": "2.25.3",
"workbox-webpack-plugin": "6.5.4"
"webpack-hot-middleware": "2.25.4",
"workbox-webpack-plugin": "6.6.1"
},
"engines": {
"yarn": ">= 1.0.0",
Expand Down
6 changes: 2 additions & 4 deletions server/.ebextensions/00-environment.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
option_settings:
aws:elasticbeanstalk:container:nodejs:
GzipCompression: true
NodeCommand: "npm run start:prod"
ProxyServer: nginx
aws:elasticbeanstalk:environment:proxy:
ProxyServer: nginx
7 changes: 7 additions & 0 deletions server/.platform/nginx/conf.d/proxy.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
large_client_header_buffers 4 32k;
fastcgi_buffers 16 32k;
fastcgi_buffer_size 32k;
proxy_buffer_size 128k;
proxy_buffers 4 256k;
proxy_busy_buffers_size 256k;
server_tokens off;
2 changes: 1 addition & 1 deletion server/config/client.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export function generateConfig(params: ConfigGeneratorParams, env: Env) {
MICROPHONE_ACCESS_DENIED: env.URL_SUPPORT_MICROPHONE_ACCESS_DENIED,
PRIVACY_VERIFY_FINGERPRINT: env.URL_SUPPORT_PRIVACY_VERIFY_FINGERPRINT,
SCREEN_ACCESS_DENIED: env.URL_SUPPORT_SCREEN_ACCESS_DENIED,
USER_ADD_FAILURE: env.URL_SUPPORT_USER_ADD_FAILURE,
OFFLINE_BACKEND: env.URL_SUPPORT_OFFLINE_BACKEND,
},
TEAMS_BASE: env.URL_TEAMS_BASE,
TEAMS_CREATE: env.URL_TEAMS_CREATE,
Expand Down
2 changes: 1 addition & 1 deletion server/config/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ export type Env = {

URL_SUPPORT_SCREEN_ACCESS_DENIED: string;

URL_SUPPORT_USER_ADD_FAILURE: string;
URL_SUPPORT_OFFLINE_BACKEND: string;

URL_WHATS_NEW: string;

Expand Down
6 changes: 3 additions & 3 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-3.0",
"dependencies": {
"@wireapp/commons": "5.1.0",
"dotenv": "16.0.3",
"dotenv": "16.3.1",
"dotenv-extended": "2.9.0",
"express": "4.18.2",
"express-sitemap-xml": "3.0.1",
Expand All @@ -28,11 +28,11 @@
"@types/fs-extra": "11.0.1",
"@types/geolite2": "2.0.0",
"@types/hbs": "4.0.1",
"@types/jest": "^29.5.1",
"@types/jest": "^29.5.2",
"@types/node": "18.11.18",
"jest": "29.5.0",
"rimraf": "4.4.1",
"typescript": "5.0.4"
"typescript": "5.1.3"
},
"scripts": {
"build": "yarn clean && tsc && yarn generate-version-file && yarn copy-assets",
Expand Down
Loading

0 comments on commit a9b67c6

Please sign in to comment.