Skip to content

Commit

Permalink
chore: RC 2022-12-13 (#14315)
Browse files Browse the repository at this point in the history
  • Loading branch information
PatrykBuniX authored Dec 13, 2022
1 parent 89c9222 commit 6b2f2bf
Show file tree
Hide file tree
Showing 331 changed files with 6,694 additions and 5,446 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/test_build_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:
# https://wire-webapp-avs.zinfra.io/
- name: Deploy avs build to Elastic Beanstalk
if: env.BRANCH_NAME == 'avs'
uses: einaregilsson/beanstalk-deploy@v20
uses: einaregilsson/beanstalk-deploy@v21
with:
application_name: ${{env.AWS_APPLICATION_NAME}}
aws_access_key: ${{secrets.WEBTEAM_AWS_ACCESS_KEY_ID}}
Expand All @@ -131,7 +131,7 @@ jobs:
# Stage 1: https://wire-webapp-edge.zinfra.io/
- name: Deploy edge build to Elastic Beanstalk
if: env.BRANCH_NAME == 'dev'
uses: einaregilsson/beanstalk-deploy@v20
uses: einaregilsson/beanstalk-deploy@v21
with:
application_name: ${{env.AWS_APPLICATION_NAME}}
aws_access_key: ${{secrets.WEBTEAM_AWS_ACCESS_KEY_ID}}
Expand All @@ -148,7 +148,7 @@ jobs:
# Stage 2: https://wire-webapp-dev.zinfra.io/
- name: Deploy dev build to Elastic Beanstalk
if: env.BRANCH_NAME == 'dev'
uses: einaregilsson/beanstalk-deploy@v20
uses: einaregilsson/beanstalk-deploy@v21
with:
application_name: ${{env.AWS_APPLICATION_NAME}}
aws_access_key: ${{secrets.WEBTEAM_AWS_ACCESS_KEY_ID}}
Expand All @@ -165,7 +165,7 @@ jobs:
# Stage 3: https://wire-webapp-staging.zinfra.io/
- name: Deploy staging build to Elastic Beanstalk
if: contains(env.TAG, 'staging')
uses: einaregilsson/beanstalk-deploy@v20
uses: einaregilsson/beanstalk-deploy@v21
with:
application_name: ${{env.AWS_APPLICATION_NAME}}
aws_access_key: ${{secrets.WEBTEAM_AWS_ACCESS_KEY_ID}}
Expand All @@ -182,7 +182,7 @@ jobs:
# Stage 4: https://wire-webapp-master.zinfra.io/
- name: Deploy master build to Elastic Beanstalk
if: env.BRANCH_NAME == 'master'
uses: einaregilsson/beanstalk-deploy@v20
uses: einaregilsson/beanstalk-deploy@v21
with:
application_name: ${{env.AWS_APPLICATION_NAME}}
aws_access_key: ${{secrets.WEBTEAM_AWS_ACCESS_KEY_ID}}
Expand All @@ -199,7 +199,7 @@ jobs:
# Stage 5: https://app.wire.com/
- name: Deploy production build to Elastic Beanstalk
if: contains(env.TAG, 'production')
uses: einaregilsson/beanstalk-deploy@v20
uses: einaregilsson/beanstalk-deploy@v21
with:
application_name: ${{env.AWS_APPLICATION_NAME}}
aws_access_key: ${{secrets.WEBTEAM_AWS_ACCESS_KEY_ID}}
Expand All @@ -216,7 +216,7 @@ jobs:
# Stage 6: https://mobile.wire.com
- name: Deploy mobile build to Elastic Beanstalk
if: env.BRANCH_NAME == 'mobile'
uses: einaregilsson/beanstalk-deploy@v20
uses: einaregilsson/beanstalk-deploy@v21
with:
application_name: ${{env.AWS_APPLICATION_NAME}}
aws_access_key: ${{secrets.WEBTEAM_AWS_ACCESS_KEY_ID}}
Expand All @@ -233,7 +233,7 @@ jobs:
# Stage 7: https://wire-webapp-qa.zinfra.io/
- name: Deploy acc build to Elastic Beanstalk
if: env.BRANCH_NAME == 'acc'
uses: einaregilsson/beanstalk-deploy@v20
uses: einaregilsson/beanstalk-deploy@v21
with:
application_name: ${{env.AWS_APPLICATION_NAME}}
aws_access_key: ${{secrets.WEBTEAM_AWS_ACCESS_KEY_ID}}
Expand Down
96 changes: 49 additions & 47 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
"dependencies": {
"@emotion/react": "11.10.5",
"@types/eslint": "^8.4.10",
"@wireapp/antiscroll-2": "1.3.1",
"@wireapp/avs": "8.2.17",
"@wireapp/core": "37.0.3",
"@wireapp/react-ui-kit": "9.0.2",
"@wireapp/core": "37.3.0",
"@wireapp/react-ui-kit": "9.2.3",
"@wireapp/store-engine-dexie": "2.0.3",
"@wireapp/store-engine-sqleet": "1.8.9",
"@wireapp/webapp-events": "0.15.2",
"@wireapp/webapp-events": "0.16.0",
"amplify": "https://github.com/wireapp/amplify#head=master",
"beautiful-react-hooks": "^3.11.2",
"classnames": "2.3.2",
"copy-webpack-plugin": "11.0.0",
"core-js": "3.25.5",
"countly-sdk-web": "22.6.2",
"countly-sdk-web": "22.6.4",
"date-fns": "2.29.3",
"dexie-batch": "0.4.3",
"highlight.js": "11.6.0",
"highlight.js": "11.7.0",
"http-status-codes": "2.2.0",
"jquery": "3.6.1",
"js-cookie": "3.0.1",
Expand All @@ -30,10 +30,10 @@
"platform": "1.3.6",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-intl": "6.2.1",
"react-intl": "6.2.5",
"react-redux": "8.0.5",
"react-router": "6.4.3",
"react-router-dom": "6.4.3",
"react-router": "6.4.5",
"react-router-dom": "6.4.5",
"react-transition-group": "4.4.5",
"redux": "4.2.0",
"redux-logdown": "1.0.4",
Expand All @@ -45,18 +45,18 @@
"underscore": "1.13.6",
"uuidjs": "4.2.12",
"webrtc-adapter": "6.4.8",
"zustand": "4.1.4"
"zustand": "4.1.5"
},
"devDependencies": {
"@babel/core": "7.20.2",
"@babel/core": "7.20.5",
"@babel/eslint-parser": "7.19.1",
"@babel/plugin-proposal-decorators": "7.20.2",
"@babel/plugin-proposal-decorators": "7.20.5",
"@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.3",
"@formatjs/cli": "5.1.7",
"@koush/wrtc": "0.5.3",
"@testing-library/react": "13.4.0",
"@types/adm-zip": "0.5.0",
Expand All @@ -67,111 +67,113 @@
"@types/fs-extra": "9.0.13",
"@types/generate-changelog": "1.8.1",
"@types/highlight.js": "10.1.0",
"@types/jest": "29.2.2",
"@types/jest": "29.2.4",
"@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/linkify-it": "3.0.2",
"@types/markdown-it": "12.2.3",
"@types/node": "^18.11.9",
"@types/node": "^18.11.13",
"@types/open-graph": "0.2.2",
"@types/platform": "1.3.4",
"@types/prettier": "^2.7.1",
"@types/react": "18.0.21",
"@types/react-dom": "18.0.8",
"@types/react": "18.0.26",
"@types/react-dom": "18.0.9",
"@types/react-redux": "7.1.24",
"@types/react-transition-group": "4.4.5",
"@types/redux-mock-store": "1.0.3",
"@types/seedrandom": "^3",
"@types/sinon": "10.0.13",
"@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.42.1",
"@typescript-eslint/parser": "^5.42.1",
"@wireapp/copy-config": "2.0.3",
"@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",
"@wireapp/prettier-config": "0.5.2",
"@wireapp/store-engine": "^5.0.3",
"adm-zip": "0.5.9",
"archiver": "^5.3.1",
"autoprefixer": "^10.4.13",
"babel-loader": "9.1.0",
"caniuse-lite": "^1.0.30001431",
"caniuse-lite": "^1.0.30001439",
"cross-env": "7.0.3",
"cspell": "6.14.2",
"css-loader": "^6.7.1",
"cspell": "6.17.0",
"css-loader": "^6.7.2",
"cssnano": "^5.1.14",
"dexie": "^3.2.2",
"dotenv": "16.0.3",
"dpdm": "3.10.0",
"eslint": "^8.27.0",
"eslint": "^8.29.0",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-import-resolver-typescript": "^3.5.2",
"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.4",
"eslint-plugin-jest-dom": "^4.0.2",
"eslint-plugin-jsdoc": "^39.6.2",
"eslint-plugin-jest": "^27.1.6",
"eslint-plugin-jest-dom": "^4.0.3",
"eslint-plugin-jsdoc": "^39.6.4",
"eslint-plugin-jsx-a11y": "^6.6.1",
"eslint-plugin-no-unsanitized": "^4.0.1",
"eslint-plugin-no-unsanitized": "^4.0.2",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.31.10",
"eslint-plugin-react": "^7.31.11",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-simple-import-sort": "^8.0.0",
"eslint-plugin-sort-keys-fix": "1.1.2",
"eslint-plugin-testing-library": "^5.9.1",
"eslint-plugin-typescript-sort-keys": "2.1.0",
"eslint-plugin-unused-imports": "^2.0.0",
"fake-indexeddb": "4.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.0",
"intersection-observer": "0.12.2",
"jest": "29.2.2",
"jest": "29.3.1",
"jest-canvas-mock": "2.4.0",
"jest-environment-jsdom": "29.2.2",
"jest-environment-jsdom": "29.3.1",
"jest-jasmine2": "29.3.1",
"jsdom-worker": "0.3.0",
"less": "3.13.1",
"less-loader": "^11.1.0",
"lint-staged": "13.0.3",
"lint-staged": "13.1.0",
"node-fetch": "2.6.7",
"os-browserify": "0.3.0",
"path-browserify": "1.0.1",
"postcss": "8.4.19",
"postcss-import": "^15.0.0",
"postcss-import": "^15.1.0",
"postcss-less": "6.0.0",
"postcss-loader": "^7.0.1",
"postcss-preset-env": "^7.8.2",
"postcss-scss": "4.0.5",
"prettier": "^2.7.1",
"postcss-loader": "^7.0.2",
"postcss-preset-env": "^7.8.3",
"postcss-scss": "4.0.6",
"prettier": "^2.8.1",
"raf": "3.4.1",
"redux-devtools-extension": "2.13.9",
"redux-mock-store": "1.5.4",
"simple-git": "3.14.1",
"sinon": "14.0.2",
"seedrandom": "^3.0.5",
"simple-git": "3.15.1",
"sinon": "15.0.0",
"snabbdom": "3.5.1",
"style-loader": "^3.3.1",
"stylelint": "14.15.0",
"stylelint": "14.16.0",
"stylelint-config-idiomatic-order": "9.0.0",
"stylelint-config-prettier": "9.0.3",
"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",
"typescript": "^4.8.4",
"webpack": "5.74.0",
"webpack-cli": "4.10.0",
"webpack-dev-middleware": "5.3.3",
"webpack-hot-middleware": "2.25.2",
"typescript": "^4.9.4",
"webpack": "5.75.0",
"webpack-cli": "5.0.1",
"webpack-dev-middleware": "6.0.1",
"webpack-hot-middleware": "2.25.3",
"workbox-webpack-plugin": "6.5.4"
},
"engines": {
Expand Down
20 changes: 8 additions & 12 deletions src/style/components/context-menu.less → server/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Wire
* Copyright (C) 2018 Wire Swiss GmbH
* Copyright (C) 2022 Wire Swiss GmbH
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -17,14 +17,10 @@
*
*/

context-menu {
cursor: pointer;

.bubble {
min-height: initial;
}

.bubble-menu {
font-family: @font-family-base;
}
}
module.exports = {
env: {
test: {
presets: ['@babel/preset-typescript', ['@babel/preset-env', {modules: 'commonjs'}]],
},
},
};
3 changes: 1 addition & 2 deletions server/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
*/

module.exports = {
moduleDirectories: ['node_modules', './'],
preset: 'ts-jest',
moduleDirectories: ['node_modules', __dirname],
testEnvironment: 'node',
testPathIgnorePatterns: ['<rootDir>/dist'],
testRegex: '(test|Spec)\\.[tj]sx?$',
Expand Down
13 changes: 6 additions & 7 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
"main": "dist/index.js",
"license": "GPL-3.0",
"dependencies": {
"@wireapp/commons": "5.0.0",
"@wireapp/commons": "5.0.4",
"dotenv": "16.0.3",
"dotenv-extended": "2.9.0",
"express": "4.18.2",
"express-sitemap-xml": "3.0.1",
"express-useragent": "1.0.15",
"fs-extra": "10.1.0",
"fs-extra": "11.1.0",
"geolite2": "1.3.0",
"hbs": "4.2.0",
"helmet": "6.0.0",
"helmet": "6.0.1",
"http-status-codes": "2.2.0",
"logdown": "3.3.1",
"maxmind": "4.3.8",
Expand All @@ -28,12 +28,11 @@
"@types/fs-extra": "9.0.13",
"@types/geolite2": "2.0.0",
"@types/hbs": "4.0.1",
"@types/jest": "^29.2.4",
"@types/node": "12.20.55",
"jest": "27.5.1",
"jest": "29.3.1",
"rimraf": "3.0.2",
"ts-jest": "29.0.3",
"ts-node": "10.9.1",
"typescript": "4.8.4"
"typescript": "4.9.4"
},
"scripts": {
"build": "yarn clean && tsc && yarn copy-assets && yarn create-commit-sha && yarn create-version-file",
Expand Down
2 changes: 1 addition & 1 deletion server/routes/error/ErrorRoutes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const logger = logdown('@wireapp/wire-webapp/routes/error/errorRoutes', {
markdown: false,
});

const InternalErrorRoute = (): express.ErrorRequestHandler => (err, req, res) => {
const InternalErrorRoute = (): express.ErrorRequestHandler => (err, req, res, next) => {
logger.error(`[${formatDate()}] ${err.stack}`);
const error = {
code: HTTP_STATUS.INTERNAL_SERVER_ERROR,
Expand Down
Loading

0 comments on commit 6b2f2bf

Please sign in to comment.