Skip to content

Commit

Permalink
Merge pull request #14510 from wireapp/RC-2023-01-17
Browse files Browse the repository at this point in the history
chore: RC-2023-01-17
  • Loading branch information
V-Gira authored Jan 17, 2023
2 parents cb11a61 + 0dc596c commit 2b60665
Show file tree
Hide file tree
Showing 303 changed files with 4,999 additions and 4,454 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@typescript-eslint/ban-ts-comment": "off",
"@typescript-eslint/no-var-requires": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-floating-promises": "off",
"@typescript-eslint/no-floating-promises": "warn",
"@typescript-eslint/typedef": "off",
"no-dupe-class-members": "off",
"no-undef": "off",
Expand Down
65 changes: 65 additions & 0 deletions .github/workflows/deploy-to-test-env.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: Deploys to testing environments

on:
workflow_dispatch:
inputs:
env:
description: 'The environment the branch should be deployed to'
required: true
type: choice
options:
- wire-webapp-qa
- wire-webapp-edge

concurrency:
group: ci-${{ github.ref }}
cancel-in-progress: true

jobs:
deploy:
runs-on: ubuntu-latest

env:
DEPLOYMENT_RECOVERY_TIMEOUT_SECONDS: 150
AWS_APPLICATION_NAME: Webapp
AWS_BUILD_ZIP_PATH: server/dist/s3/ebs.zip

steps:
- name: Print environment variables
run: |
echo -e "branch = ${{github.ref_name}}"
echo -e "env = ${{inputs.env}}"
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Use latest Node.js v16
uses: actions/setup-node@v3
with:
node-version: 16.x

- name: Yarn cache
uses: c-hive/gha-yarn-cache@v2.1.0

- name: Install JS dependencies
run: yarn --immutable

- name: Build
run: yarn build:prod

- name: Deploy to Elastic Beanstalk
uses: einaregilsson/beanstalk-deploy@v21
with:
application_name: ${{env.AWS_APPLICATION_NAME}}
aws_access_key: ${{secrets.WEBTEAM_AWS_ACCESS_KEY_ID}}
aws_secret_key: ${{secrets.WEBTEAM_AWS_SECRET_ACCESS_KEY}}
deployment_package: ${{env.AWS_BUILD_ZIP_PATH}}
environment_name: ${{inputs.env}}
region: eu-central-1
use_existing_version_if_available: true
version_description: ${{github.sha}}
version_label: ${{github.run_id}}
wait_for_deployment: false
wait_for_environment_recovery: ${{env.DEPLOYMENT_RECOVERY_TIMEOUT_SECONDS}}
2 changes: 1 addition & 1 deletion .github/workflows/test_build_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ jobs:

# Stage 1: https://wire-webapp-edge.zinfra.io/
- name: Deploy edge build to Elastic Beanstalk
if: env.BRANCH_NAME == 'dev'
if: env.BRANCH_NAME == 'edge'
uses: einaregilsson/beanstalk-deploy@v21
with:
application_name: ${{env.AWS_APPLICATION_NAME}}
Expand Down
2 changes: 1 addition & 1 deletion app-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"wire-web-config-default-master": "https://github.com/wireapp/wire-web-config-wire#v0.31.9-0",
"wire-web-config-default-staging": "https://github.com/wireapp/wire-web-config-default#v0.31.8"
"wire-web-config-default-staging": "https://github.com/wireapp/wire-web-config-default#v0.31.10"
}
}
88 changes: 44 additions & 44 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
"dependencies": {
"@emotion/react": "11.10.5",
"@types/eslint": "^8.4.10",
"@wireapp/avs": "8.2.17",
"@wireapp/core": "37.3.0",
"@wireapp/react-ui-kit": "9.2.3",
"@wireapp/store-engine-dexie": "2.0.3",
"@wireapp/avs": "8.2.30",
"@wireapp/core": "38.5.2",
"@wireapp/lru-cache": "3.8.1",
"@wireapp/react-ui-kit": "9.3.3",
"@wireapp/store-engine-dexie": "2.0.4",
"@wireapp/store-engine-sqleet": "1.8.9",
"@wireapp/webapp-events": "0.16.0",
"amplify": "https://github.com/wireapp/amplify#head=master",
"beautiful-react-hooks": "^3.11.2",
"beautiful-react-hooks": "^3.12.2",
"classnames": "2.3.2",
"copy-webpack-plugin": "11.0.0",
"core-js": "3.25.5",
Expand All @@ -18,11 +19,12 @@
"dexie-batch": "0.4.3",
"highlight.js": "11.7.0",
"http-status-codes": "2.2.0",
"jquery": "3.6.1",
"jquery": "3.6.3",
"js-cookie": "3.0.1",
"jszip": "3.10.1",
"keyboardjs": "2.7.0",
"knockout": "3.5.1",
"libsodium-wrappers": "^0.7.10",
"linkify-it": "4.0.1",
"long": "5.2.1",
"markdown-it": "13.0.1",
Expand All @@ -32,8 +34,8 @@
"react-dom": "18.2.0",
"react-intl": "6.2.5",
"react-redux": "8.0.5",
"react-router": "6.4.5",
"react-router-dom": "6.4.5",
"react-router": "6.6.2",
"react-router-dom": "6.6.2",
"react-transition-group": "4.4.5",
"redux": "4.2.0",
"redux-logdown": "1.0.4",
Expand All @@ -43,20 +45,20 @@
"tsyringe": "4.7.0",
"uint32": "0.2.1",
"underscore": "1.13.6",
"uuidjs": "4.2.12",
"uuidjs": "4.2.13",
"webrtc-adapter": "6.4.8",
"zustand": "4.1.5"
"zustand": "4.3.2"
},
"devDependencies": {
"@babel/core": "7.20.5",
"@babel/core": "7.20.12",
"@babel/eslint-parser": "7.19.1",
"@babel/plugin-proposal-decorators": "7.20.5",
"@babel/plugin-proposal-decorators": "7.20.7",
"@babel/preset-env": "7.20.2",
"@babel/preset-react": "7.18.6",
"@babel/preset-typescript": "7.18.6",
"@emotion/eslint-plugin": "^11.10.0",
"@faker-js/faker": "7.6.0",
"@formatjs/cli": "5.1.7",
"@formatjs/cli": "5.1.12",
"@koush/wrtc": "0.5.3",
"@testing-library/react": "13.4.0",
"@types/adm-zip": "0.5.0",
Expand All @@ -67,21 +69,21 @@
"@types/fs-extra": "9.0.13",
"@types/generate-changelog": "1.8.1",
"@types/highlight.js": "10.1.0",
"@types/jest": "29.2.4",
"@types/jest": "29.2.5",
"@types/jquery": "^3",
"@types/js-cookie": "3.0.2",
"@types/jsdom": "20.0.1",
"@types/keyboardjs": "2.5.0",
"@types/libsodium-wrappers-sumo": "0.7.5",
"@types/libsodium-wrappers": "^0",
"@types/linkify-it": "3.0.2",
"@types/markdown-it": "12.2.3",
"@types/node": "^18.11.13",
"@types/node": "^18.11.18",
"@types/open-graph": "0.2.2",
"@types/platform": "1.3.4",
"@types/prettier": "^2.7.1",
"@types/prettier": "^2.7.2",
"@types/react": "18.0.26",
"@types/react-dom": "18.0.9",
"@types/react-redux": "7.1.24",
"@types/react-dom": "18.0.10",
"@types/react-redux": "7.1.25",
"@types/react-transition-group": "4.4.5",
"@types/redux-mock-store": "1.0.3",
"@types/seedrandom": "^3",
Expand All @@ -90,39 +92,39 @@
"@types/uint32": "0.2.0",
"@types/underscore": "1.11.4",
"@types/webpack-env": "1.18.0",
"@typescript-eslint/eslint-plugin": "^5.46.0",
"@typescript-eslint/parser": "^5.46.0",
"@wireapp/copy-config": "2.0.4",
"@wireapp/eslint-config": "2.1.0",
"@typescript-eslint/eslint-plugin": "^5.48.1",
"@typescript-eslint/parser": "^5.48.1",
"@wireapp/copy-config": "2.0.5",
"@wireapp/eslint-config": "2.1.1",
"@wireapp/prettier-config": "0.5.2",
"@wireapp/store-engine": "^5.0.3",
"adm-zip": "0.5.9",
"adm-zip": "0.5.10",
"archiver": "^5.3.1",
"autoprefixer": "^10.4.13",
"babel-loader": "9.1.0",
"caniuse-lite": "^1.0.30001439",
"babel-loader": "9.1.2",
"caniuse-lite": "^1.0.30001445",
"cross-env": "7.0.3",
"cspell": "6.17.0",
"css-loader": "^6.7.2",
"cspell": "6.18.1",
"css-loader": "^6.7.3",
"cssnano": "^5.1.14",
"dexie": "^3.2.2",
"dotenv": "16.0.3",
"dpdm": "3.10.0",
"eslint": "^8.29.0",
"eslint-config-prettier": "^8.5.0",
"eslint": "^8.32.0",
"eslint-config-prettier": "^8.6.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-import-resolver-typescript": "^3.5.2",
"eslint-import-resolver-typescript": "^3.5.3",
"eslint-plugin-babel": "5.3.1",
"eslint-plugin-better-styled-components": "^1.1.2",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jest": "^27.1.6",
"eslint-plugin-import": "^2.27.4",
"eslint-plugin-jest": "^27.2.1",
"eslint-plugin-jest-dom": "^4.0.3",
"eslint-plugin-jsdoc": "^39.6.4",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-no-unsanitized": "^4.0.2",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.31.11",
"eslint-plugin-react": "^7.32.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-simple-import-sort": "^8.0.0",
"eslint-plugin-sort-keys-fix": "1.1.2",
Expand All @@ -143,32 +145,32 @@
"less": "3.13.1",
"less-loader": "^11.1.0",
"lint-staged": "13.1.0",
"node-fetch": "2.6.7",
"node-fetch": "2.6.8",
"os-browserify": "0.3.0",
"path-browserify": "1.0.1",
"postcss": "8.4.19",
"postcss": "8.4.21",
"postcss-import": "^15.1.0",
"postcss-less": "6.0.0",
"postcss-loader": "^7.0.2",
"postcss-preset-env": "^7.8.3",
"postcss-scss": "4.0.6",
"prettier": "^2.8.1",
"prettier": "^2.8.3",
"raf": "3.4.1",
"redux-devtools-extension": "2.13.9",
"redux-mock-store": "1.5.4",
"seedrandom": "^3.0.5",
"simple-git": "3.15.1",
"sinon": "15.0.0",
"sinon": "15.0.1",
"snabbdom": "3.5.1",
"style-loader": "^3.3.1",
"stylelint": "14.16.0",
"stylelint": "14.16.1",
"stylelint-config-idiomatic-order": "9.0.0",
"stylelint-config-prettier": "9.0.4",
"svg-inline-loader": "0.8.2",
"terser-webpack-plugin": "5.3.6",
"text-encoding": "0.7.0",
"ts-node": "10.9.1",
"tsc-watch": "5.0.3",
"tsc-watch": "6.0.0",
"typescript": "^4.9.4",
"webpack": "5.75.0",
"webpack-cli": "5.0.1",
Expand Down Expand Up @@ -217,9 +219,7 @@
"lint:other": "yarn prettier --list-different && yarn stylelint",
"lint:code": "eslint -c .eslintrc.json --ext .js,.ts,.tsx .",
"lint:spelling": "cspell -c .cspell.json 'src/script/**/*.{js,ts,tsx,md}' src/i18n/en-US.json",
"check:circular-dependencies": "yarn check:circular-dependencies:app && yarn check:circular-dependencies:auth",
"check:circular-dependencies:app": "dpdm -T ./src/script/main/app.ts",
"check:circular-dependencies:auth": "dpdm -T ./src/script/auth/main.tsx",
"check:circular-dependencies": "dpdm --no-warning --no-tree -T ./src/script/auth/main.tsx ./src/script/main/app.ts",
"postinstall": "yarn configure && cd server && yarn && cd .. && husky install",
"prettier": "prettier --ignore-path .prettierignore \"**/*.{json,md,yml}\"",
"release:staging": "git checkout dev && git pull && ts-node ./bin/release_tag.ts staging",
Expand Down
4 changes: 2 additions & 2 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
"pm2": "5.2.2"
},
"devDependencies": {
"@types/express": "4.17.14",
"@types/express": "4.17.15",
"@types/express-sitemap-xml": "1.1.1",
"@types/express-useragent": "1.0.2",
"@types/fs-extra": "9.0.13",
"@types/geolite2": "2.0.0",
"@types/hbs": "4.0.1",
"@types/jest": "^29.2.4",
"@types/jest": "^29.2.5",
"@types/node": "12.20.55",
"jest": "29.3.1",
"rimraf": "3.0.2",
Expand Down
Loading

0 comments on commit 2b60665

Please sign in to comment.