From 1e190da61b045dda09e7449a3ef36239f09ad82d Mon Sep 17 00:00:00 2001 From: Benny Neugebauer Date: Thu, 11 Mar 2021 09:59:49 +0100 Subject: [PATCH 01/31] docs: Add Compare Views --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 88311c479ac..ef57f6cf270 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,11 @@ yarn test | 3 (Internal release) | [staging](https://github.com/wireapp/wire-desktop/tree/staging) | merge (don't squash) from [dev](https://github.com/wireapp/wire-desktop/tree/dev) | x.y+1 (e.g. 3.18) | | 4 (Production release) | [main](https://github.com/wireapp/wire-desktop/tree/main) | merge (don't squash) from [staging](https://github.com/wireapp/wire-desktop/tree/staging) | x.y (e.g. 3.17) | +**Compare Views** + +1. Updates from "dev" to "staging" (changelog): https://github.com/wireapp/wire-desktop/compare/staging...dev +1. Updates from "staging" to "main" (changelog): https://github.com/wireapp/wire-desktop/compare/main...staging + ### Tasks ```shell From 4b5954726972332772bb2cc3cfc501c9867eeb46 Mon Sep 17 00:00:00 2001 From: Florian Imdahl Date: Mon, 15 Mar 2021 13:19:38 +0100 Subject: [PATCH 02/31] docs: Make Node.js >= 10 mandatory. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ef57f6cf270..1b81a30970f 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Cross platform desktop app, wrapping the [wire-webapp](https://github.com/wireap ### Prerequisites -- [Node.js](https://nodejs.org/) +- [Node.js](https://nodejs.org/) >= 10 - Git ### Clone From e0d95f73f632661a4ad9fd5a171da4f980d79849 Mon Sep 17 00:00:00 2001 From: Florian Keller Date: Mon, 22 Mar 2021 10:32:58 +0100 Subject: [PATCH 03/31] chore: Use crowdin/github-action@1.1.0 --- .github/workflows/download_translations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/download_translations.yml b/.github/workflows/download_translations.yml index 95c94893517..5880ee50aa7 100644 --- a/.github/workflows/download_translations.yml +++ b/.github/workflows/download_translations.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v2 - name: Download translations - uses: crowdin/github-action@1.0.9 + uses: crowdin/github-action@1.1.0 env: GITHUB_TOKEN: ${{ secrets.OTTO_THE_BOT_GH_TOKEN }} CROWDIN_PROJECT_ID: 342373 From 19e0512c658d0c584a910a1408b0118de0674e1b Mon Sep 17 00:00:00 2001 From: Florian Keller Date: Mon, 22 Mar 2021 10:39:39 +0100 Subject: [PATCH 04/31] chore: Use styfle/cancel-workflow-action@0.8.0 --- .github/workflows/build_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 97e1c32850e..537f846d40b 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.5.0 + uses: styfle/cancel-workflow-action@0.8.0 with: access_token: ${{ secrets.OTTO_THE_BOT_GH_TOKEN }} - name: Checkout repository From b85704856acfd979840728f1099e735714a98420 Mon Sep 17 00:00:00 2001 From: Otto the Bot Date: Mon, 22 Mar 2021 11:40:39 +0200 Subject: [PATCH 05/31] chore: Update translations (#4854) Co-authored-by: Crowdin Bot --- electron/locale/ja-JP.json | 6 +++--- electron/locale/si-LK.json | 4 ++-- electron/locale/uk-UA.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/electron/locale/ja-JP.json b/electron/locale/ja-JP.json index a9dd17475d1..de9a89e497c 100644 --- a/electron/locale/ja-JP.json +++ b/electron/locale/ja-JP.json @@ -67,7 +67,7 @@ "menuVideoCall": "ビデオ通話", "menuView": "ビュー", "menuWindow": "ウィンドウ", - "noInternet": "No Internet", + "noInternet": "インターネットに接続されていません", "proxyPromptHeadline": "プロキシ認証のためにユーザー名とパスワードが必要です。", "proxyPromptPassword": "パスワード", "proxyPromptTitle": "プロキシ認証", @@ -89,8 +89,8 @@ "wrapperManageTeam": "チームを管理する", "wrapperRemoveAccount": "アカウントを削除", "menuEnableSpellChecking": "スペルチェックを有効にする", - "menuCopyPicture": "Copy Picture", - "menuActualSize": "Actual Size", + "menuCopyPicture": "画像をコピー", + "menuActualSize": "元のサイズ", "menuZoomIn": "ズームイン", "menuZoomOut": "ズームアウト", "wrapperAddAccountErrorTitlePlural": "{{maximumAccounts}} accounts already active", diff --git a/electron/locale/si-LK.json b/electron/locale/si-LK.json index 69334a31597..76969941593 100644 --- a/electron/locale/si-LK.json +++ b/electron/locale/si-LK.json @@ -56,7 +56,7 @@ "menuServices": "සේවාවන්", "menuSettings": "සැකසුම්", "menuShowAll": "සියල්ල පෙන්වන්න", - "menuShowHide": "මෙනුව පෙන්වන්න", + "menuShowHide": "Show Menu", "menuSignOut": "නික්මෙන්න", "menuStart": "ආරම්භ කරන්න", "menuStartup": "ආරම්භයේදී {brandName} දියත් කරන්න", @@ -101,5 +101,5 @@ "promptCancel": "අවලංගු කරන්න", "promptWarning": "අවවාදයයි!", "promptError": "දෝෂය", - "urlBlockedPromptText": "අනාරක්ෂිත වෙබ් ලිපිනයක් (URL) අවහිර කර ඇත. ඔබට තවමත් එය විවෘත කිරීමට අවශ්‍ය නම්, එය පිටපත් කර සුදුසු මෘදුකාංගයක් හරහා විවෘත කරන්න." + "urlBlockedPromptText": "අනාරක්ෂිත ඒ.ස.නි. (URL) අවහිර කර ඇත. ඔබට තවමත් එය විවෘත කිරීමට අවශ්‍ය නම්, එය පිටපත් කර සුදුසු මෘදුකාංගයක් හරහා විවෘත කරන්න." } diff --git a/electron/locale/uk-UA.json b/electron/locale/uk-UA.json index d4cc2f102e1..e2cbdcb587d 100644 --- a/electron/locale/uk-UA.json +++ b/electron/locale/uk-UA.json @@ -67,7 +67,7 @@ "menuVideoCall": "Відеодзвінок", "menuView": "Вигляд", "menuWindow": "Вікно", - "noInternet": "No Internet", + "noInternet": "Відсутнє підключення до інтернету", "proxyPromptHeadline": "Проксі-сервер вимагає аутентифікацію з ім'ям користувача і паролем.", "proxyPromptPassword": "Пароль", "proxyPromptTitle": "Аутентифікація на проксі-сервері", From 89e9014fe36d67f0f0868a784b6c067095e960e9 Mon Sep 17 00:00:00 2001 From: Florian Keller Date: Mon, 22 Mar 2021 15:48:26 +0100 Subject: [PATCH 06/31] chore: Use GitHub token for canceling previous runs --- .github/workflows/build_test.yml | 2 +- .github/workflows/download_translations.yml | 4 ++-- .github/workflows/label.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 537f846d40b..ccda2cdd3cf 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -14,7 +14,7 @@ jobs: - name: Cancel Previous Runs uses: styfle/cancel-workflow-action@0.8.0 with: - access_token: ${{ secrets.OTTO_THE_BOT_GH_TOKEN }} + access_token: ${{github.token}} - name: Checkout repository uses: actions/checkout@v2 with: diff --git a/.github/workflows/download_translations.yml b/.github/workflows/download_translations.yml index 5880ee50aa7..b6650318ee5 100644 --- a/.github/workflows/download_translations.yml +++ b/.github/workflows/download_translations.yml @@ -15,7 +15,7 @@ jobs: - name: Download translations uses: crowdin/github-action@1.1.0 env: - GITHUB_TOKEN: ${{ secrets.OTTO_THE_BOT_GH_TOKEN }} + GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}} CROWDIN_PROJECT_ID: 342373 with: upload_sources: false @@ -28,7 +28,7 @@ jobs: localization_branch_name: 'chore/update-translations' create_pull_request: true pull_request_title: 'chore: Update translations' - token: ${{ secrets.CROWDIN_TOKEN }} + token: ${{secrets.CROWDIN_TOKEN}} source: '/electron/locale/en-US.json' translation: '/electron/locale/%locale%.json' base_path: '.' diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index e1909eb39a9..af578429766 100644 --- a/.github/workflows/label.yml +++ b/.github/workflows/label.yml @@ -11,4 +11,4 @@ jobs: steps: - uses: srvaroa/labeler@v0.3 env: - GITHUB_TOKEN: ${{secrets.GH_TOKEN}} + GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}} From 80fb36d75b0bc100caae0278dcd31bb5174fb9f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:01:29 +0100 Subject: [PATCH 07/31] build(deps-dev): bump eslint-plugin-jsdoc from 32.2.0 to 32.3.0 (#4878) Bumps [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) from 32.2.0 to 32.3.0. - [Release notes](https://github.com/gajus/eslint-plugin-jsdoc/releases) - [Commits](https://github.com/gajus/eslint-plugin-jsdoc/compare/v32.2.0...v32.3.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index aac1dae5d71..e64a1c0d961 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "eslint-config-prettier": "8.1.0", "eslint-plugin-import": "2.22.1", "eslint-plugin-jasmine": "4.1.2", - "eslint-plugin-jsdoc": "32.2.0", + "eslint-plugin-jsdoc": "32.3.0", "eslint-plugin-no-unsanitized": "3.1.4", "eslint-plugin-prettier": "3.3.1", "eslint-plugin-react": "7.22.0", diff --git a/yarn.lock b/yarn.lock index 7948a2d2028..4a072ceb5f0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4453,10 +4453,10 @@ eslint-plugin-jasmine@4.1.2: resolved "https://registry.npmjs.org/eslint-plugin-jasmine/-/eslint-plugin-jasmine-4.1.2.tgz#50cc20d603b02b37727f8d174d4b83b9b8ef25a5" integrity sha512-Jr52EBi6Ql5WVDvRCKBID9kRD6/CaObvCWmgHpqobczX2Mzt8/QMu9vpgx6q/O5jyQ9CIGrKaEbPuEfHRf8guw== -eslint-plugin-jsdoc@32.2.0: - version "32.2.0" - resolved "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.2.0.tgz#d848ea8475a9be63d8d261bd7fa01cf2a2bb32d5" - integrity sha512-ikeVeF3JVmzjcmGd04OZK0rXjgiw46TWtNX+OhyF2jQlw3w1CAU1vyAyLv8PZcIjp7WxP4N20Vg1CI9bp/52dw== +eslint-plugin-jsdoc@32.3.0: + version "32.3.0" + resolved "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.0.tgz#7c9fa5da8c72bd6ad7d97bbf8dee8bc29bec3f9e" + integrity sha512-zyx7kajDK+tqS1bHuY5sapkad8P8KT0vdd/lE55j47VPG2MeenSYuIY/M/Pvmzq5g0+3JB+P3BJGUXmHxtuKPQ== dependencies: comment-parser "1.1.2" debug "^4.3.1" From f752636dfe154d13b17b6f2de349019ad2478a0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:23:40 +0100 Subject: [PATCH 08/31] build(deps-dev): bump commander from 7.1.0 to 7.2.0 (#4877) Bumps [commander](https://github.com/tj/commander.js) from 7.1.0 to 7.2.0. - [Release notes](https://github.com/tj/commander.js/releases) - [Changelog](https://github.com/tj/commander.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/tj/commander.js/compare/v7.1.0...v7.2.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e64a1c0d961..8aa515fa8c0 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "babel-jest": "26.6.3", "babel-loader": "8.2.2", "babel-plugin-istanbul": "6.0.0", - "commander": "7.1.0", + "commander": "7.2.0", "core-js": "3.9.1", "cross-env": "7.0.3", "cspell": "5.3.4", diff --git a/yarn.lock b/yarn.lock index 4a072ceb5f0..42cc51aaa5f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3394,10 +3394,10 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -commander@7.1.0, commander@^7.0.0, commander@^7.1.0: - version "7.1.0" - resolved "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff" - integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg== +commander@7.2.0, commander@^7.0.0, commander@^7.1.0: + version "7.2.0" + resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== commander@^2.20.0: version "2.20.3" From 3b52d26649b373f738824b490e8b5e7ee2116807 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:23:46 +0100 Subject: [PATCH 09/31] build(deps-dev): bump cspell from 5.3.4 to 5.3.9 (#4876) Bumps [cspell](https://github.com/streetsidesoftware/cspell) from 5.3.4 to 5.3.9. - [Release notes](https://github.com/streetsidesoftware/cspell/releases) - [Changelog](https://github.com/streetsidesoftware/cspell/blob/master/CHANGELOG.md) - [Commits](https://github.com/streetsidesoftware/cspell/compare/v5.3.4...v5.3.9) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 192 +++++++++++++++++++++++++-------------------------- 2 files changed, 97 insertions(+), 97 deletions(-) diff --git a/package.json b/package.json index 8aa515fa8c0..2fa41b9bb8d 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "commander": "7.2.0", "core-js": "3.9.1", "cross-env": "7.0.3", - "cspell": "5.3.4", + "cspell": "5.3.9", "css-loader": "5.1.1", "dotenv": "8.2.0", "electron": "10.4.0", diff --git a/yarn.lock b/yarn.lock index 42cc51aaa5f..8d13652b844 100644 --- a/yarn.lock +++ b/yarn.lock @@ -988,24 +988,24 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@cspell/cspell-bundled-dicts@^5.3.4": - version "5.3.4" - resolved "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.3.4.tgz#8fa6c783788fec59c042290b5fedce64cbca6d55" - integrity sha512-Gx3ceqTxocxhSF/jgb6GkAQMHiycO7+R9c9KXwgk+HYG7Qs6NWYc4bcChn07d19x8wuM4a++gA65FxUh7lC+Yg== - dependencies: - "@cspell/dict-ada" "^1.1.1" - "@cspell/dict-aws" "^1.0.13" - "@cspell/dict-bash" "^1.0.11" +"@cspell/cspell-bundled-dicts@^5.3.8": + version "5.3.8" + resolved "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.3.8.tgz#4b29e2e081355032c02b53b2083cdb8e107219b1" + integrity sha512-cKQrpCtoiJxly8o/84BHUtEyTqY4doNLGASe2gXnoQi0Pmxrp+evtPsDxeDBqpceEsP205KuyzfeAHYYgVer1w== + dependencies: + "@cspell/dict-ada" "^1.1.2" + "@cspell/dict-aws" "^1.0.14" + "@cspell/dict-bash" "^1.0.12" "@cspell/dict-companies" "^1.0.36" - "@cspell/dict-cpp" "^1.1.37" + "@cspell/dict-cpp" "^1.1.38" "@cspell/dict-cryptocurrencies" "^1.0.10" - "@cspell/dict-csharp" "^1.0.10" - "@cspell/dict-css" "^1.0.10" - "@cspell/dict-django" "^1.0.25" - "@cspell/dict-dotnet" "^1.0.24" - "@cspell/dict-elixir" "^1.0.23" - "@cspell/dict-en-gb" "^1.1.27" - "@cspell/dict-en_us" "^1.2.39" + "@cspell/dict-csharp" "^1.0.11" + "@cspell/dict-css" "^1.0.11" + "@cspell/dict-django" "^1.0.26" + "@cspell/dict-dotnet" "^1.0.25" + "@cspell/dict-elixir" "^1.0.24" + "@cspell/dict-en-gb" "^1.1.28" + "@cspell/dict-en_us" "^1.2.40" "@cspell/dict-filetypes" "^1.1.5" "@cspell/dict-fonts" "^1.0.14" "@cspell/dict-fullstack" "^1.0.36" @@ -1014,7 +1014,7 @@ "@cspell/dict-html" "^1.1.6" "@cspell/dict-html-symbol-entities" "^1.0.23" "@cspell/dict-java" "^1.0.22" - "@cspell/dict-latex" "^1.0.23" + "@cspell/dict-latex" "^1.0.25" "@cspell/dict-lorem-ipsum" "^1.0.22" "@cspell/dict-lua" "^1.0.16" "@cspell/dict-node" "^1.0.10" @@ -1028,75 +1028,75 @@ "@cspell/dict-software-terms" "^1.0.26" "@cspell/dict-typescript" "^1.0.16" -"@cspell/cspell-types@^5.3.4": - version "5.3.4" - resolved "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-5.3.4.tgz#20aafa6debdd58fa825ebf4159016f3f57106be2" - integrity sha512-dM5sblEPqgrCUc53FSzJxrObEqYzVg70iqGMcGrawXy3wk5BiiO7caXWaRuhe0Wy5ooytI5nJK3oRELS8A501g== +"@cspell/cspell-types@^5.3.8": + version "5.3.8" + resolved "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-5.3.8.tgz#75573a145c71f54f09a3f12eab5527b7c0ae0388" + integrity sha512-vljVDP03VRIwtc7ckAZQAwLfmRC2XGfAXRR3pUR9KN8s2bB+PQftJbbJqhqtgOiNiG42Qd9CeTadwWJnDC40XQ== -"@cspell/dict-ada@^1.1.1": - version "1.1.1" - resolved "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-1.1.1.tgz#52b636f1728100a493dcc83e82035c371898f39c" - integrity sha512-/tpeKe182ymfKutyVcF3YHVNYnoZPdri3vsUU1v7iyA0WzTu9djb6B78r3QTQVCeizAruBsbSogxMPHBquF/zA== +"@cspell/dict-ada@^1.1.2": + version "1.1.2" + resolved "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-1.1.2.tgz#89556226c1d5f856ce1f7afa85543b04fa477092" + integrity sha512-UDrcYcKIVyXDz5mInJabRNQpJoehjBFvja5W+GQyu9pGcx3BS3cAU8mWENstGR0Qc/iFTxB010qwF8F3cHA/aA== -"@cspell/dict-aws@^1.0.13": - version "1.0.13" - resolved "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-1.0.13.tgz#5961c9764a2f731e488debee1c70fd488ee59727" - integrity sha512-9rq8BS5p418THq12PIkLQmGhg4kQ8tMH8vyB7gTF2lOrA+xMwV5HjZAepoYiJCxDQI5GAQJZlAaBi5DRG3AN2A== +"@cspell/dict-aws@^1.0.14": + version "1.0.14" + resolved "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-1.0.14.tgz#beddede1053ce3622400e36c65da9fd2954e939d" + integrity sha512-K21CfB4ZpKYwwDQiPfic2zJA/uxkbsd4IQGejEvDAhE3z8wBs6g6BwwqdVO767M9NgZqc021yAVpr79N5pWe3w== -"@cspell/dict-bash@^1.0.11": - version "1.0.11" - resolved "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-1.0.11.tgz#5ba56250e467d2c2ed3f2795081f4934af0c9afc" - integrity sha512-DTOugbPacEFIav5s+VniByouu4apD1SKS5inwiBndw0TH3Pkm4MFTPUwfT1y7Ki4HEIyfRI2ughig2045SBqRw== +"@cspell/dict-bash@^1.0.12": + version "1.0.12" + resolved "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-1.0.12.tgz#fdf828c520dfd274f1cee6a4a90a0f6d86a703ac" + integrity sha512-BOMHVW/m281mqUSJkZ3oiJiUUItLd7QdzpMjm428V9yBYFwIdbds1CeatS7C6kgpI2eBE4RXmy1Hjk/lR63Jew== "@cspell/dict-companies@^1.0.36": version "1.0.36" resolved "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-1.0.36.tgz#c85bcc1f23ac991c56dd25eea5623078aaa513c2" integrity sha512-Bk9mMJs9spzrtLxZsxBZIK6ukD9REfQYpuTBNJk/IiTViHVQ6ertHAgw1vRVtJAMxViv8dMLNtDyTpEXeaYm7w== -"@cspell/dict-cpp@^1.1.37": - version "1.1.37" - resolved "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-1.1.37.tgz#79b33a42ebc0d7bed19bd8d07559e95c8668a70a" - integrity sha512-1X48pxiOdAw5Q7zj0k8/L5B1YY2W0k4go4CB5rcsuGRzsWXsdnKXHQTeMTAw7epIe4lj+Ef9oWaU+ODQpDZOCQ== +"@cspell/dict-cpp@^1.1.38": + version "1.1.38" + resolved "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-1.1.38.tgz#a5723f0827be36463894c12dcf42bd1ff1e27003" + integrity sha512-QqVMxVNYX9XtxzflpJ/888GSyjPU5VeotltsHql1BeEPxhyV27ud9bRKDrBGzCijCK/+MvCxiMZGDpYZqHTjXw== "@cspell/dict-cryptocurrencies@^1.0.10": version "1.0.10" resolved "https://registry.npmjs.org/@cspell/dict-cryptocurrencies/-/dict-cryptocurrencies-1.0.10.tgz#04426fdfee8752818b375686d34a154b2fb40c7d" integrity sha512-47ABvDJOkaST/rXipNMfNvneHUzASvmL6K/CbOFpYKfsd0x23Jc9k1yaOC7JAm82XSC/8a7+3Yu+Fk2jVJNnsA== -"@cspell/dict-csharp@^1.0.10": - version "1.0.10" - resolved "https://registry.npmjs.org/@cspell/dict-csharp/-/dict-csharp-1.0.10.tgz#3806ff6646764f720ac02a0eb65d6b97b99811fe" - integrity sha512-jAl4HeRTwbN2+tEqL8cjM7GLXSJr9Jde3k8CqfxKME7qwVRCoBW6RkhyDHfEyaQ1LomDhnr35uiHEVrw7xCHMw== +"@cspell/dict-csharp@^1.0.11": + version "1.0.11" + resolved "https://registry.npmjs.org/@cspell/dict-csharp/-/dict-csharp-1.0.11.tgz#cacdf477a31ca8326c2c91bee0b42b9f6b3c4a7c" + integrity sha512-nub+ZCiTgmT87O+swI+FIAzNwaZPWUGckJU4GN402wBq420V+F4ZFqNV7dVALJrGaWH7LvADRtJxi6cZVHJKeA== -"@cspell/dict-css@^1.0.10": - version "1.0.10" - resolved "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-1.0.10.tgz#80ef4e89ec83a8386a69d9770b76184a2c26370e" - integrity sha512-QQbh+GBAyTVU8Wlf1xZPxZQQ3uRzb1lYE5RjE7hnRTSc4HtWYcb2+6XpO51QDl/dRhCmP3vEHzFF/swzHRa5hw== +"@cspell/dict-css@^1.0.11": + version "1.0.11" + resolved "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-1.0.11.tgz#09119e9035137ba98c26c62402237faf3be9ac95" + integrity sha512-2Or5oF5ojaXYD8QbO4Z+QdaNXSp+ZyNLJdeyKfejbxLvpL5feSNB0oYtTNrweFPTAvJKQ4DJsdEXy0/s31haRg== + +"@cspell/dict-django@^1.0.26": + version "1.0.26" + resolved "https://registry.npmjs.org/@cspell/dict-django/-/dict-django-1.0.26.tgz#b97ce0112fbe8c3c3ada0387c68971b5e27483ab" + integrity sha512-mn9bd7Et1L2zuibc08GVHTiD2Go3/hdjyX5KLukXDklBkq06r+tb0OtKtf1zKodtFDTIaYekGADhNhA6AnKLkg== -"@cspell/dict-django@^1.0.25": +"@cspell/dict-dotnet@^1.0.25": version "1.0.25" - resolved "https://registry.npmjs.org/@cspell/dict-django/-/dict-django-1.0.25.tgz#7f821e781b2ae35bc12491a663ca506185f6d008" - integrity sha512-kQfZhvjAodb5CNgryYoEKlUaHA+IVGhZIpON5ZJBuxrPUZ4SyklACPXKxDyXnKAibrERoi4zNL6pBbsljEL03w== + resolved "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-1.0.25.tgz#7e7ad82b730d4fa10af5d2383c452d69d23e2aaa" + integrity sha512-3BFhdquYqqjeI8Jm1dYepZKGEg+fKFhw7UfPkVdx13C4ETo5VlsS4FAblC0pCY21pDU3QgRZOGL1Bj+KWCGp/w== -"@cspell/dict-dotnet@^1.0.24": +"@cspell/dict-elixir@^1.0.24": version "1.0.24" - resolved "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-1.0.24.tgz#432a1f3bf6920860de86a6e7101639c1b4e348be" - integrity sha512-TxmMSh2T7C+DzF0rGTwVWFGCwqiwqLpyKar37kJt62bhadbxFKv+XxkLjOLVmgoqhA17BXM813hIjjZrICj4jg== + resolved "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-1.0.24.tgz#fc5c15b9f66b8aa5e25c98f54103c796fec70aba" + integrity sha512-pEX6GYlEx4Teusw/m+XmqoXzcHOqpcn1ZX4H33ONqR81XdPwbaKorBr1IG23Ic76IhwrFlOqs48tcnxrHYpFnA== -"@cspell/dict-elixir@^1.0.23": - version "1.0.23" - resolved "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-1.0.23.tgz#1d341626467a2ca109b72c5368645af1f12417a4" - integrity sha512-UKDgNSZ36o31IX4NjCF/lCuOAoLEEsjSB2KwMD2ucT66MSFEPLk1womGY+iWblISeeBmB9EehfL1hjgoRwGlUw== - -"@cspell/dict-en-gb@^1.1.27": - version "1.1.27" - resolved "https://registry.npmjs.org/@cspell/dict-en-gb/-/dict-en-gb-1.1.27.tgz#5c567fcc0f737e9ac8dc8fa76eb39928a6a2b35b" - integrity sha512-0tY939q0vzmsUotKQe/i8mDGqiiw4V3Kv/nkTvxFfVQAd6JRfpWBKlMbVV5Oy37nQkQiwkDLY4v90AbyqOvG8Q== +"@cspell/dict-en-gb@^1.1.28": + version "1.1.28" + resolved "https://registry.npmjs.org/@cspell/dict-en-gb/-/dict-en-gb-1.1.28.tgz#7abe6498aea15a87c502eefbf6f1850ccc1f54a2" + integrity sha512-noOH+iv4xFpPxu1agiQgp5LhY/KA0Ir28y1xnC2QTtLvlIid7vIvgixBOz4Zi0P7lo/mPmMjQY+x7//2EKFDgQ== -"@cspell/dict-en_us@^1.2.39": - version "1.2.39" - resolved "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-1.2.39.tgz#44e30abee9a20ec3cbddd2c91f21de7e3b4ca4ea" - integrity sha512-rMn5pIm3bl+t3Qxdf3WMkLZ2kzs/FDHSCDR9ha+JOtCJ1yrJTLdlZvokGDLwMScztbgooEvabsN8AUqPutOSog== +"@cspell/dict-en_us@^1.2.40": + version "1.2.40" + resolved "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-1.2.40.tgz#03e7c7458f9685e09a19fc23f964a9d3dbe52ecd" + integrity sha512-e8leCvGAWPWQIw0SoozgEAiMt2YM12rafOuW4aQwgTJD++vp32a9RrnVL8olBfWaA57rRWWndbMSmPTrsO9mpg== "@cspell/dict-filetypes@^1.1.5": version "1.1.5" @@ -1138,10 +1138,10 @@ resolved "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-1.0.22.tgz#30e660803922755c314fb61e9c8cd58a1f4bd47e" integrity sha512-CVAJ29dx1XwwutgsMgaj5eCl1Nc7X7qFhWL2KkAdu78A/NUIaS+1I9KS0hHhdZx/wLke9dH8TR7NyPQGpGxeAw== -"@cspell/dict-latex@^1.0.23": - version "1.0.23" - resolved "https://registry.npmjs.org/@cspell/dict-latex/-/dict-latex-1.0.23.tgz#bb216e676c66b931bdfd1c8cb93e9625b5b66d45" - integrity sha512-xn9VvX5+q9xxELiOl5o8W/0nKympOc9i6Bq6PqX3fxhVWV4xURT18sp14OI9dNXxOSm5TRzL96vgLYvK/FYQVw== +"@cspell/dict-latex@^1.0.25": + version "1.0.25" + resolved "https://registry.npmjs.org/@cspell/dict-latex/-/dict-latex-1.0.25.tgz#6ecf5b8b8fdf46cb8a0f070052dd687e25089e59" + integrity sha512-cEgg91Migqcp1SdVV7dUeMxbPDhxdNo6Fgq2eygAXQjIOFK520FFvh/qxyBvW90qdZbIRoU2AJpchyHfGuwZFA== "@cspell/dict-lorem-ipsum@^1.0.22": version "1.0.22" @@ -3630,59 +3630,59 @@ crypto-random-string@^2.0.0: resolved "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -cspell-glob@^5.3.4: - version "5.3.4" - resolved "https://registry.npmjs.org/cspell-glob/-/cspell-glob-5.3.4.tgz#656188388467f8be7e115924e7b43ba85c234fa4" - integrity sha512-SrtfNUP7CqFstTzuRscGI5IFYu1j3ay5a9ioFTx2CoaFqp2BXqFpE8z9NE6Lao+7z7Fg4hiPgvsCd1gn3J/P8A== +cspell-glob@^5.3.8: + version "5.3.8" + resolved "https://registry.npmjs.org/cspell-glob/-/cspell-glob-5.3.8.tgz#0fd8d73c02cbaf683e2063b1afe8a1d5b85757ff" + integrity sha512-dOFotRP+QogT6WdcLHLRrqT/nFKvtZn4rXjBgJ5DI16CB2IEXTk+AqGUn/VIpQI7a64p/yNF5RccQZ11LfhW1w== dependencies: micromatch "^4.0.2" -cspell-io@^5.3.4: - version "5.3.4" - resolved "https://registry.npmjs.org/cspell-io/-/cspell-io-5.3.4.tgz#b468ae8d92de863a5aad5d6d4a542e4ebe63b63d" - integrity sha512-1IHuU8Y4zxGj/nyH6DawKwQevRNYiSjPqoLjqyJFeMtd3Nix0mVHf0UxotPiHhuZkuuMgQkxA4EeavGDS5jOng== +cspell-io@^5.3.8: + version "5.3.8" + resolved "https://registry.npmjs.org/cspell-io/-/cspell-io-5.3.8.tgz#ff7a901d9bd0b16acd6b62528fff1693164c5dbc" + integrity sha512-+Xw0AWSHPtvns/keYi5iXG7vhrgU8Ebn4Cz78c150T9cKI8Rj0sJxwGa1C/5tNpiNz6YfKOnkpv1Ge+hZ4B9FA== dependencies: iconv-lite "^0.6.2" iterable-to-stream "^1.0.1" -cspell-lib@^5.3.4: - version "5.3.4" - resolved "https://registry.npmjs.org/cspell-lib/-/cspell-lib-5.3.4.tgz#039b4ddd3bfbb24038ef362590ab2b3a2dc8c89c" - integrity sha512-uA35jAW3CAqJeRZhQdAmhDfoHVCK0kBQcXEAerWO1z4xDThE/JRAJEKMAXirVIQufOu9X2btjQZse9ubg0p7sQ== +cspell-lib@^5.3.9: + version "5.3.9" + resolved "https://registry.npmjs.org/cspell-lib/-/cspell-lib-5.3.9.tgz#dedf781f0027cc8034da4b0a86ec33c41ae33b56" + integrity sha512-Y9BoIQILIN5rQ9Hkz9nNU06zwRklOzTSGPK/zZaXqOo3Ynht5Ecxomoi08Az/MRthD8nwxXPJnSh6fY3ah0UJg== dependencies: - "@cspell/cspell-bundled-dicts" "^5.3.4" - "@cspell/cspell-types" "^5.3.4" + "@cspell/cspell-bundled-dicts" "^5.3.8" + "@cspell/cspell-types" "^5.3.8" comment-json "^4.1.0" configstore "^5.0.1" cosmiconfig "^7.0.0" - cspell-glob "^5.3.4" - cspell-io "^5.3.4" - cspell-trie-lib "^5.3.4" + cspell-glob "^5.3.8" + cspell-io "^5.3.8" + cspell-trie-lib "^5.3.8" fs-extra "^9.1.0" gensequence "^3.1.1" resolve-from "^5.0.0" resolve-global "^1.0.0" vscode-uri "^3.0.2" -cspell-trie-lib@^5.3.4: - version "5.3.4" - resolved "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-5.3.4.tgz#5e10424a265d6362810e2fd0ad64e4e214f46367" - integrity sha512-WaMGBIdbmOwle7pSmrOMQqfY4ndbNIGiQvpU0xuTWAzvcL/sCzgfqiDt7sI8Mr8vnSGnAphRn0xLlNqXzAgn1Q== +cspell-trie-lib@^5.3.8: + version "5.3.8" + resolved "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-5.3.8.tgz#d6112351aaca5367fe3a17c2e78349e7100fdf53" + integrity sha512-LcgtDyGEEJ0a1YM9HipqSNDFFyFMpV+aOwZixBeTH5x3RIgPkeKTSdGe5x03DFzM7XMyMAbSo6717TSwuQXydQ== dependencies: fs-extra "^9.1.0" gensequence "^3.1.1" -cspell@5.3.4: - version "5.3.4" - resolved "https://registry.npmjs.org/cspell/-/cspell-5.3.4.tgz#1d79d3bde38a91adcda9fde4b2aa553746ff2f51" - integrity sha512-AXiZzeXXBVZIwRsD30bloqOaJEjTF3e/nzXCLHUq3Eyqiy1ySWMnOMm3OXQ1nI7nkjYpx5+Pdx7cDlH0wFrKYQ== +cspell@5.3.9: + version "5.3.9" + resolved "https://registry.npmjs.org/cspell/-/cspell-5.3.9.tgz#9bda30ed30611ff1a22b3435ac75f89ffcce1827" + integrity sha512-NFV7gWLIDx7RoFj1iC4sXbMVRJqWNJj0OhhTFo4nA+ktblFLeiIb1J3SnVSrtwgM3wHP3b+pkuwHSBUTK5pj6w== dependencies: - "@cspell/cspell-types" "^5.3.4" + "@cspell/cspell-types" "^5.3.8" chalk "^4.1.0" commander "^7.1.0" comment-json "^4.1.0" - cspell-glob "^5.3.4" - cspell-lib "^5.3.4" + cspell-glob "^5.3.8" + cspell-lib "^5.3.9" fs-extra "^9.1.0" get-stdin "^8.0.0" glob "^7.1.6" From c4f2faabac1c4d763f6e78bf173ad0ac5b2858b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:23:51 +0100 Subject: [PATCH 10/31] build(deps-dev): bump @types/mocha from 8.2.1 to 8.2.2 (#4875) Bumps [@types/mocha](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/mocha) from 8.2.1 to 8.2.2. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/mocha) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2fa41b9bb8d..2828a62b2a1 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@types/is-ci": "2.0.0", "@types/lodash": "4.14.168", "@types/minimist": "1.2.1", - "@types/mocha": "8.2.1", + "@types/mocha": "8.2.2", "@types/node": "~12", "@types/open-graph": "0.2.1", "@types/sinon": "9.0.10", diff --git a/yarn.lock b/yarn.lock index 8d13652b844..addde96e94c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1878,10 +1878,10 @@ resolved "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256" integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg== -"@types/mocha@8.2.1": - version "8.2.1" - resolved "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.1.tgz#f3f3ae4590c5386fc7c543aae9b78d4cf30ffee9" - integrity sha512-NysN+bNqj6E0Hv4CTGWSlPzMW6vTKjDpOteycDkV4IWBsO+PU48JonrPzV9ODjiI2XrjmA05KInLgF5ivZ/YGQ== +"@types/mocha@8.2.2": + version "8.2.2" + resolved "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.2.tgz#91daa226eb8c2ff261e6a8cbf8c7304641e095e0" + integrity sha512-Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw== "@types/node@*", "@types/node@~14": version "14.14.20" From 0109ea0ba1f515af2594cba5510d62ea4b413fbe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:23:58 +0100 Subject: [PATCH 11/31] build(deps-dev): bump aws-sdk from 2.853.0 to 2.868.0 (#4874) Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.853.0 to 2.868.0. - [Release notes](https://github.com/aws/aws-sdk-js/releases) - [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js/compare/v2.853.0...v2.868.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2828a62b2a1..639ff2ea348 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "@wireapp/eslint-config": "1.8.0", "@wireapp/prettier-config": "0.3.0", "adm-zip": "0.5.3", - "aws-sdk": "2.853.0", + "aws-sdk": "2.868.0", "babel-core": "7.0.0-bridge.0", "babel-eslint": "10.1.0", "babel-jest": "26.6.3", diff --git a/yarn.lock b/yarn.lock index addde96e94c..95288e3251e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2688,10 +2688,10 @@ auto-launch@5.0.5: untildify "^3.0.2" winreg "1.2.4" -aws-sdk@2.853.0: - version "2.853.0" - resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.853.0.tgz#4428565e7c5d81ab0dec685ee48d9044e04da3e9" - integrity sha512-3cifeifeMHKtpvQ6OcrA9j34BEdvWmLlSGzZU/mZf9nYcV+22PPXjwpVhPh9BvfC2S77upKNbMgnkv4u50aQKw== +aws-sdk@2.868.0: + version "2.868.0" + resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.868.0.tgz#2c31f5d788e4487ac29f51498e46cc91b0d1de6a" + integrity sha512-ZayPsA/ycaAXqqa2oDyf8iUpl1WOLODZS8ZdvYj77L5owMQm0XC7yqiD+WHj9nToUECF9VAD+AKQMIN6695tVQ== dependencies: buffer "4.9.2" events "1.1.1" From d9e4763b8d23e1e67dc7be6b35ff0c6b3a9fbf9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:24:04 +0100 Subject: [PATCH 12/31] build(deps-dev): bump electron from 10.4.0 to 10.4.1 (#4872) Bumps [electron](https://github.com/electron/electron) from 10.4.0 to 10.4.1. - [Release notes](https://github.com/electron/electron/releases) - [Changelog](https://github.com/electron/electron/blob/master/docs/breaking-changes.md) - [Commits](https://github.com/electron/electron/compare/v10.4.0...v10.4.1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 639ff2ea348..79145d4a450 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "cspell": "5.3.9", "css-loader": "5.1.1", "dotenv": "8.2.0", - "electron": "10.4.0", + "electron": "10.4.1", "electron-builder": "20.44.4", "electron-mocha": "10.0.0", "electron-osx-sign": "0.5.0", diff --git a/yarn.lock b/yarn.lock index 95288e3251e..cb37205ac79 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4208,10 +4208,10 @@ electron-winstaller@4.0.1: lodash.template "^4.2.2" temp "^0.9.0" -electron@10.4.0: - version "10.4.0" - resolved "https://registry.npmjs.org/electron/-/electron-10.4.0.tgz#018385914474b56110a5a43087a53c114b67c08d" - integrity sha512-qK8OOCWuNvEFWThmjkukkqDwIpBqULlDuMXVC9MC/2P4UaWJEjIYvBmBuTyxtFcKoE3kWvcWyeRDUuvzVxxXjA== +electron@10.4.1: + version "10.4.1" + resolved "https://registry.npmjs.org/electron/-/electron-10.4.1.tgz#b5adddb07660fb7985d6458f0431efcb511ca9dd" + integrity sha512-XbdTXW23CjcgH4GOVQV43ckwyZuHL6KJ/orEOP7HqHWLy1xwcs3wVD+RqxFTXkG5eIZB+CP7xcU69rPPskxR4Q== dependencies: "@electron/get" "^1.0.1" "@types/node" "^12.0.12" From 55b0593aa2891f27895f943907f349913287ed2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:24:27 +0100 Subject: [PATCH 13/31] build(deps-dev): bump @types/node from 12.20.4 to 12.20.6 (#4870) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 12.20.4 to 12.20.6. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index cb37205ac79..55cda743425 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1889,9 +1889,9 @@ integrity sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A== "@types/node@^12.0.12", "@types/node@~12": - version "12.20.4" - resolved "https://registry.npmjs.org/@types/node/-/node-12.20.4.tgz#73687043dd00fcb6962c60fbf499553a24d6bdf2" - integrity sha512-xRCgeE0Q4pT5UZ189TJ3SpYuX/QGl6QIAOAIeDSbAVAd2gX1NxSZup4jNVK7cxIeP8KDSbJgcckun495isP1jQ== + version "12.20.6" + resolved "https://registry.npmjs.org/@types/node/-/node-12.20.6.tgz#7b73cce37352936e628c5ba40326193443cfba25" + integrity sha512-sRVq8d+ApGslmkE9e3i+D3gFGk7aZHAT+G4cIpIEdLJYPsWiSPwcAnJEjddLQQDqV3Ra2jOclX/Sv6YrvGYiWA== "@types/node@^13.7.0": version "13.13.34" From 479efe428a043f7fdeb64cc1612fd8c44bf815d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:24:35 +0100 Subject: [PATCH 14/31] build(deps-dev): bump @babel/preset-env from 7.13.9 to 7.13.10 (#4863) Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.13.9 to 7.13.10. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.13.10/packages/babel-preset-env) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 79145d4a450..5a0b3a33579 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "@babel/core": "7.13.8", "@babel/plugin-proposal-class-properties": "7.13.0", "@babel/plugin-proposal-optional-chaining": "7.13.8", - "@babel/preset-env": "7.13.9", + "@babel/preset-env": "7.13.10", "@babel/preset-react": "7.12.13", "@babel/preset-typescript": "7.13.0", "@babel/register": "7.13.8", diff --git a/yarn.lock b/yarn.lock index 55cda743425..ddfbe7e57d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -79,10 +79,10 @@ "@babel/helper-explode-assignable-expression" "^7.12.13" "@babel/types" "^7.12.13" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.8": - version "7.13.8" - resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz#02bdb22783439afb11b2f009814bdd88384bd468" - integrity sha512-pBljUGC1y3xKLn1nrx2eAhurLMA8OqBtBP/JwG4U8skN7kf8/aqwwxpV1N6T0e7r6+7uNitIa/fUxPFagSXp3A== +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.10", "@babel/helper-compilation-targets@^7.13.8": + version "7.13.10" + resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz#1310a1678cb8427c07a753750da4f8ce442bdd0c" + integrity sha512-/Xju7Qg1GQO4mHZ/Kcs6Au7gfafgZnwm+a7sy/ow/tV1sHeraRUHbjdat8/UvDor4Tez+siGKDk6zIKtCPKVJA== dependencies: "@babel/compat-data" "^7.13.8" "@babel/helper-validator-option" "^7.12.17" @@ -819,13 +819,13 @@ "@babel/helper-create-regexp-features-plugin" "^7.12.13" "@babel/helper-plugin-utils" "^7.12.13" -"@babel/preset-env@7.13.9": - version "7.13.9" - resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.9.tgz#3ee5f233316b10d066d7f379c6d1e13a96853654" - integrity sha512-mcsHUlh2rIhViqMG823JpscLMesRt3QbMsv1+jhopXEb3W2wXvQ9QoiOlZI9ZbR3XqPtaFpZwEZKYqGJnGMZTQ== +"@babel/preset-env@7.13.10": + version "7.13.10" + resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.10.tgz#b5cde31d5fe77ab2a6ab3d453b59041a1b3a5252" + integrity sha512-nOsTScuoRghRtUsRr/c69d042ysfPHcu+KOB4A9aAO9eJYqrkat+LF8G1yp1HD18QiwixT2CisZTr/0b3YZPXQ== dependencies: "@babel/compat-data" "^7.13.8" - "@babel/helper-compilation-targets" "^7.13.8" + "@babel/helper-compilation-targets" "^7.13.10" "@babel/helper-plugin-utils" "^7.13.0" "@babel/helper-validator-option" "^7.12.17" "@babel/plugin-proposal-async-generator-functions" "^7.13.8" From ce67c5230b50995a88111224457cb10b0655fb4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:24:56 +0100 Subject: [PATCH 15/31] build(deps-dev): bump webpack from 5.24.2 to 5.27.2 (#4880) Bumps [webpack](https://github.com/webpack/webpack) from 5.24.2 to 5.27.2. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.24.2...v5.27.2) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 5a0b3a33579..f0c8558d410 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "style-loader": "2.0.0", "ts-node": "9.1.1", "typescript": "4.2.2", - "webpack": "5.24.2", + "webpack": "5.27.2", "webpack-cli": "4.5.0" }, "homepage": "https://wire.com", diff --git a/yarn.lock b/yarn.lock index ddfbe7e57d1..8e2adb09443 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10062,10 +10062,10 @@ webpack-sources@^2.1.1: source-list-map "^2.0.1" source-map "^0.6.1" -webpack@5.24.2: - version "5.24.2" - resolved "https://registry.npmjs.org/webpack/-/webpack-5.24.2.tgz#33790dad631e8b639f4246d762e257720875fe54" - integrity sha512-uxxKYEY4kMNjP+D2Y+8aw5Vd7ar4pMuKCNemxV26ysr1nk0YDiQTylg9U3VZIdkmI0YHa0uC8ABxL+uGxGWWJg== +webpack@5.27.2: + version "5.27.2" + resolved "https://registry.npmjs.org/webpack/-/webpack-5.27.2.tgz#44442219e1469ebe00292703b848580faae03f07" + integrity sha512-brNF3N/EdvMzkaZ/Xzb8sqPn5Si3iw6meqCnmNFtcnkorZsFZCBFMa2ElpIMjx6sKWYsnUpBO2dnX+7xgj+mjg== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.46" From 3fde7d9d862273a2aa634f1056eb312d3ae0fcc9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:25:24 +0100 Subject: [PATCH 16/31] build(deps-dev): bump mocha from 8.3.0 to 8.3.2 (#4862) Bumps [mocha](https://github.com/mochajs/mocha) from 8.3.0 to 8.3.2. - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) - [Commits](https://github.com/mochajs/mocha/compare/v8.3.0...v8.3.2) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f0c8558d410..1a2c350bf0e 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "is-ci": "3.0.0", "jest": "26.6.3", "lint-staged": "10.5.4", - "mocha": "8.3.0", + "mocha": "8.3.2", "nock": "13.0.9", "nyc": "15.1.0", "prettier": "2.2.1", diff --git a/yarn.lock b/yarn.lock index 8e2adb09443..9aba018a161 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7320,10 +7320,10 @@ mkdirp@^0.5.1: dependencies: minimist "^1.2.5" -mocha@8.3.0, mocha@^8.2.1: - version "8.3.0" - resolved "https://registry.npmjs.org/mocha/-/mocha-8.3.0.tgz#a83a7432d382ae1ca29686062d7fdc2c36f63fe5" - integrity sha512-TQqyC89V1J/Vxx0DhJIXlq9gbbL9XFNdeLQ1+JsnZsVaSOV1z3tWfw0qZmQJGQRIfkvZcs7snQnZnOCKoldq1Q== +mocha@8.3.2, mocha@^8.2.1: + version "8.3.2" + resolved "https://registry.npmjs.org/mocha/-/mocha-8.3.2.tgz#53406f195fa86fbdebe71f8b1c6fb23221d69fcc" + integrity sha512-UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg== dependencies: "@ungap/promise-all-settled" "1.1.2" ansi-colors "4.1.1" From 3a0b9ac656332c9723c551f7513d9a3fa03ee4e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:25:32 +0100 Subject: [PATCH 17/31] build(deps): bump @wireapp/webapp-events from 0.9.0 to 0.10.0 (#4861) Bumps [@wireapp/webapp-events](https://github.com/wireapp/wire-web-packages) from 0.9.0 to 0.10.0. - [Release notes](https://github.com/wireapp/wire-web-packages/releases) - [Commits](https://github.com/wireapp/wire-web-packages/compare/@wireapp/webapp-events@0.9.0...@wireapp/webapp-events@0.10.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1a2c350bf0e..d9c86cf85be 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@wireapp/commons": "4.1.2", "@wireapp/protocol-messaging": "1.29.0", "@wireapp/react-ui-kit": "7.44.2", - "@wireapp/webapp-events": "0.9.0", + "@wireapp/webapp-events": "0.10.0", "auto-launch": "5.0.5", "axios": "0.21.1", "content-type": "1.0.4", diff --git a/yarn.lock b/yarn.lock index 9aba018a161..890b6f63b8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2309,10 +2309,10 @@ emotion-theming "10.0.27" react-transition-group "4.4.1" -"@wireapp/webapp-events@0.9.0": - version "0.9.0" - resolved "https://registry.npmjs.org/@wireapp/webapp-events/-/webapp-events-0.9.0.tgz#c81710043b17491c120ea6c48b356f56a1e7cea2" - integrity sha512-6SUVBaZpbk+y+3Cj3EcoMxRmiw/Uggj5pDDggXojkZIHbJ/28quYpq1UlhAGuUaXxsHDKA58IgiU9KnTGr5cBA== +"@wireapp/webapp-events@0.10.0": + version "0.10.0" + resolved "https://registry.npmjs.org/@wireapp/webapp-events/-/webapp-events-0.10.0.tgz#8b3bcad9b165d8817e2a0cca61bdd2b692f195f2" + integrity sha512-Hfx6JdKvATL7q7mTy0cw9DJgHyAUbIYkjpX2xFHMsNH1d7iy5Qyb5wU4+uTL6/VKTcyFhX+Ok6R3PYMPfPcu5w== "@xtuc/ieee754@^1.2.0": version "1.2.0" From 524ee9f72916762968c4aa5c08e11471682d389f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:25:38 +0100 Subject: [PATCH 18/31] build(deps-dev): bump eslint from 7.21.0 to 7.22.0 (#4860) Bumps [eslint](https://github.com/eslint/eslint) from 7.21.0 to 7.22.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v7.21.0...v7.22.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 26 +++++++++++++++++++------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index d9c86cf85be..777612d4dae 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "electron-osx-sign": "0.5.0", "electron-packager": "15.2.0", "electron-winstaller": "4.0.1", - "eslint": "7.21.0", + "eslint": "7.22.0", "eslint-config-prettier": "8.1.0", "eslint-plugin-import": "2.22.1", "eslint-plugin-jasmine": "4.1.2", diff --git a/yarn.lock b/yarn.lock index 890b6f63b8a..a2010ae04b3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4546,10 +4546,10 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== -eslint@7.21.0: - version "7.21.0" - resolved "https://registry.npmjs.org/eslint/-/eslint-7.21.0.tgz#4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83" - integrity sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg== +eslint@7.22.0: + version "7.22.0" + resolved "https://registry.npmjs.org/eslint/-/eslint-7.22.0.tgz#07ecc61052fec63661a2cab6bd507127c07adc6f" + integrity sha512-3VawOtjSJUQiiqac8MQc+w457iGLfuNGLFn8JmF051tTKbh5/x/0vlcEj8OgDCaw7Ysa2Jn8paGshV7x2abKXg== dependencies: "@babel/code-frame" "7.12.11" "@eslint/eslintrc" "^0.4.0" @@ -4568,7 +4568,7 @@ eslint@7.21.0: file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" glob-parent "^5.0.0" - globals "^12.1.0" + globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -4576,7 +4576,7 @@ eslint@7.21.0: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.20" + lodash "^4.17.21" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" @@ -5379,6 +5379,13 @@ globals@^12.1.0: dependencies: type-fest "^0.8.1" +globals@^13.6.0: + version "13.7.0" + resolved "https://registry.npmjs.org/globals/-/globals-13.7.0.tgz#aed3bcefd80ad3ec0f0be2cf0c895110c0591795" + integrity sha512-Aipsz6ZKRxa/xQkZhNg0qIWXT6x6rD46f6x/PCnBomlttdIyAPak4YD9jTmKpZ72uROSMU87qJtcgpgHaVchiA== + dependencies: + type-fest "^0.20.2" + globalthis@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.0.tgz#c5fb98213a9b4595f59cf3e7074f141b4169daae" @@ -7075,7 +7082,7 @@ lodash.templatesettings@^4.0.0: dependencies: lodash._reinterpolate "^3.0.0" -lodash@4.17.21, lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20: +lodash@4.17.21, lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: version "4.17.21" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -9740,6 +9747,11 @@ type-fest@^0.11.0: resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + type-fest@^0.3.0: version "0.3.1" resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1" From e5c76e535f52ab8b21220efac2642177b5420354 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:25:45 +0100 Subject: [PATCH 19/31] build(deps-dev): bump @babel/core from 7.13.8 to 7.13.10 (#4859) Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.13.8 to 7.13.10. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.13.10/packages/babel-core) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 777612d4dae..86c7b3902b9 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ }, "description": "The most secure collaboration platform.", "devDependencies": { - "@babel/core": "7.13.8", + "@babel/core": "7.13.10", "@babel/plugin-proposal-class-properties": "7.13.0", "@babel/plugin-proposal-optional-chaining": "7.13.8", "@babel/preset-env": "7.13.10", diff --git a/yarn.lock b/yarn.lock index a2010ae04b3..2315a1d599c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -26,17 +26,17 @@ resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.8.tgz#5b783b9808f15cef71547f1b691f34f8ff6003a6" integrity sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog== -"@babel/core@7.13.8", "@babel/core@^7.1.0", "@babel/core@^7.7.5": - version "7.13.8" - resolved "https://registry.npmjs.org/@babel/core/-/core-7.13.8.tgz#c191d9c5871788a591d69ea1dc03e5843a3680fb" - integrity sha512-oYapIySGw1zGhEFRd6lzWNLWFX2s5dA/jm+Pw/+59ZdXtjyIuwlXbrId22Md0rgZVop+aVoqow2riXhBLNyuQg== +"@babel/core@7.13.10", "@babel/core@^7.1.0", "@babel/core@^7.7.5": + version "7.13.10" + resolved "https://registry.npmjs.org/@babel/core/-/core-7.13.10.tgz#07de050bbd8193fcd8a3c27918c0890613a94559" + integrity sha512-bfIYcT0BdKeAZrovpMqX2Mx5NrgAckGbwT982AkdS5GNfn3KMGiprlBAtmBcFZRUmpaufS6WZFP8trvx8ptFDw== dependencies: "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.13.0" - "@babel/helper-compilation-targets" "^7.13.8" + "@babel/generator" "^7.13.9" + "@babel/helper-compilation-targets" "^7.13.10" "@babel/helper-module-transforms" "^7.13.0" - "@babel/helpers" "^7.13.0" - "@babel/parser" "^7.13.4" + "@babel/helpers" "^7.13.10" + "@babel/parser" "^7.13.10" "@babel/template" "^7.12.13" "@babel/traverse" "^7.13.0" "@babel/types" "^7.13.0" @@ -48,10 +48,10 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.13.0": - version "7.13.0" - resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.13.0.tgz#bd00d4394ca22f220390c56a0b5b85568ec1ec0c" - integrity sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw== +"@babel/generator@^7.13.0", "@babel/generator@^7.13.9": + version "7.13.9" + resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39" + integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw== dependencies: "@babel/types" "^7.13.0" jsesc "^2.5.1" @@ -276,10 +276,10 @@ "@babel/traverse" "^7.13.0" "@babel/types" "^7.13.0" -"@babel/helpers@^7.13.0": - version "7.13.0" - resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.0.tgz#7647ae57377b4f0408bf4f8a7af01c42e41badc0" - integrity sha512-aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ== +"@babel/helpers@^7.13.10": + version "7.13.10" + resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8" + integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ== dependencies: "@babel/template" "^7.12.13" "@babel/traverse" "^7.13.0" @@ -303,10 +303,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.0", "@babel/parser@^7.13.4", "@babel/parser@^7.7.0", "@babel/parser@^7.7.5": - version "7.13.4" - resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.13.4.tgz#340211b0da94a351a6f10e63671fa727333d13ab" - integrity sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.0", "@babel/parser@^7.13.10", "@babel/parser@^7.7.0", "@babel/parser@^7.7.5": + version "7.13.11" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.13.11.tgz#f93ebfc99d21c1772afbbaa153f47e7ce2f50b88" + integrity sha512-PhuoqeHoO9fc4ffMEVk4qb/w/s2iOSWohvbHxLtxui0eBg3Lg5gN1U8wp1V1u61hOWkPQJJyJzGH6Y+grwkq8Q== "@babel/plugin-proposal-async-generator-functions@^7.13.8": version "7.13.8" From 2d9d4375a16e8cf8ce855e5c2901d1a8bbbcd66e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:26:06 +0100 Subject: [PATCH 20/31] build(deps-dev): bump @types/is-ci from 2.0.0 to 3.0.0 (#4849) Bumps [@types/is-ci](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/is-ci) from 2.0.0 to 3.0.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/is-ci) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 17 ++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 86c7b3902b9..28e91e8ad54 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@types/auto-launch": "5.0.1", "@types/content-type": "1.1.3", "@types/fs-extra": "9.0.7", - "@types/is-ci": "2.0.0", + "@types/is-ci": "3.0.0", "@types/lodash": "4.14.168", "@types/minimist": "1.2.1", "@types/mocha": "8.2.2", diff --git a/yarn.lock b/yarn.lock index 2315a1d599c..eaa7f6b8187 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1721,11 +1721,6 @@ dependencies: "@types/node" "*" -"@types/ci-info@*": - version "2.0.0" - resolved "https://registry.npmjs.org/@types/ci-info/-/ci-info-2.0.0.tgz#51848cc0f5c30c064f4b25f7f688bf35825b3971" - integrity sha512-5R2/MHILQLDCzTuhs1j4Qqq8AaKUf7Ma4KSSkCtc12+fMs47zfa34qhto9goxpyX00tQK1zxB885VCiawZ5Qhg== - "@types/color-convert@*": version "1.9.0" resolved "https://registry.npmjs.org/@types/color-convert/-/color-convert-1.9.0.tgz#bfa8203e41e7c65471e9841d7e306a7cd8b5172d" @@ -1810,12 +1805,12 @@ dependencies: "@types/node" "*" -"@types/is-ci@2.0.0": - version "2.0.0" - resolved "https://registry.npmjs.org/@types/is-ci/-/is-ci-2.0.0.tgz#e2b81d0f9275861649d501dbc39a480fbf311459" - integrity sha512-J8ytIdkALbTrqcJ6OZiEv0B9skfyok/zCDj1q06GGCDa1rlHnPobUBT0BYR1vku2oZVwVEgCurtXqCASAfjCiQ== +"@types/is-ci@3.0.0": + version "3.0.0" + resolved "https://registry.npmjs.org/@types/is-ci/-/is-ci-3.0.0.tgz#7e8910af6857601315592436f030aaa3ed9783c3" + integrity sha512-Q0Op0hdWbYd1iahB+IFNQcWXFq4O0Q5MwQP7uN0souuQ4rPg1vEYcnIOfr1gY+M+6rc8FGoRaBO1mOOvL29sEQ== dependencies: - "@types/ci-info" "*" + ci-info "^3.1.0" "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.1" @@ -3221,7 +3216,7 @@ ci-info@^2.0.0: resolved "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== -ci-info@^3.1.1: +ci-info@^3.1.0, ci-info@^3.1.1: version "3.1.1" resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.1.1.tgz#9a32fcefdf7bcdb6f0a7e1c0f8098ec57897b80a" integrity sha512-kdRWLBIJwdsYJWYJFtAFFYxybguqeF91qpZaggjG5Nf8QKdizFG2hjqvaTXbxFIcYbSaD74KpAXv6BSm17DHEQ== From f4599a18f74fa5effb8a42457b07b0f4ee9ac7cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:26:12 +0100 Subject: [PATCH 21/31] build(deps-dev): bump @types/sinon from 9.0.10 to 9.0.11 (#4851) Bumps [@types/sinon](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/sinon) from 9.0.10 to 9.0.11. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/sinon) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 28e91e8ad54..d3c7fa51e85 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "@types/mocha": "8.2.2", "@types/node": "~12", "@types/open-graph": "0.2.1", - "@types/sinon": "9.0.10", + "@types/sinon": "9.0.11", "@types/sort-json": "2.0.0", "@typescript-eslint/eslint-plugin": "4.0.0", "@typescript-eslint/parser": "3.10.1", diff --git a/yarn.lock b/yarn.lock index eaa7f6b8187..522e58e9f72 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1920,10 +1920,10 @@ resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.0.0.tgz#dc85454b953178cc6043df5208b9e949b54a3bc4" integrity sha512-/rM+sWiuOZ5dvuVzV37sUuklsbg+JPOP8d+nNFlo2ZtfpzPiPvh1/gc8liWOLBqe+sR+ZM7guPaIcTt6UZTo7Q== -"@types/sinon@9.0.10": - version "9.0.10" - resolved "https://registry.npmjs.org/@types/sinon/-/sinon-9.0.10.tgz#7fb9bcb6794262482859cab66d59132fca18fcf7" - integrity sha512-/faDC0erR06wMdybwI/uR8wEKV/E83T0k4sepIpB7gXuy2gzx2xiOjmztq6a2Y6rIGJ04D+6UU0VBmWy+4HEMA== +"@types/sinon@9.0.11": + version "9.0.11" + resolved "https://registry.npmjs.org/@types/sinon/-/sinon-9.0.11.tgz#7af202dda5253a847b511c929d8b6dda170562eb" + integrity sha512-PwP4UY33SeeVKodNE37ZlOsR9cReypbMJOhZ7BVE0lB+Hix3efCOxiJWiE5Ia+yL9Cn2Ch72EjFTRze8RZsNtg== dependencies: "@types/sinonjs__fake-timers" "*" From a1a47da0b2d3acb5561f841784691bbbbc89db35 Mon Sep 17 00:00:00 2001 From: Florian Keller Date: Mon, 22 Mar 2021 16:32:59 +0100 Subject: [PATCH 22/31] chore: Bump xmldom to 0.1.31 --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 522e58e9f72..fcddace15f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10267,9 +10267,9 @@ xmlchars@^2.2.0: integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== xmldom@0.1.x: - version "0.1.27" - resolved "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9" - integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk= + version "0.1.31" + resolved "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff" + integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ== xtend@~4.0.1: version "4.0.2" From 22d687f4d911be7a1ab4665d89c8c75a458f8e15 Mon Sep 17 00:00:00 2001 From: Florian Imdahl Date: Mon, 22 Mar 2021 16:35:54 +0100 Subject: [PATCH 23/31] fix: Disable hardware acceleration if unsupported (SQCORE-32) (#4879) --- electron/src/main.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/electron/src/main.ts b/electron/src/main.ts index cf072cea450..e7ee2df0f66 100644 --- a/electron/src/main.ts +++ b/electron/src/main.ts @@ -136,6 +136,24 @@ Object.entries(config).forEach(([key, value]) => { // Squirrel setup app.setAppUserModelId(`com.squirrel.wire.${config.name.toLowerCase()}`); +try { + logger.info('GPUFeatureStatus:', app.getGPUFeatureStatus()); + const has2dCanvas = app.getGPUFeatureStatus()?.['2d_canvas']?.startsWith('enabled'); + + if (!has2dCanvas) { + /* + * If the 2D canvas is unavailable, and we rely on hardware acceleartion, + * Electron can't render anything and will only display a white screen. Thus + * we disable hardware acceleration completely. + */ + logger.warn('2D canvas unavailable, disabling hardware acceleration'); + app.disableHardwareAcceleration(); + } +} catch (error) { + logger.warn(`Can't read GPUFeatureStatus, disabling hardware acceleration`); + app.disableHardwareAcceleration(); +} + // IPC events const bindIpcEvents = (): void => { ipcMain.on(EVENT_TYPE.ACTION.SAVE_PICTURE, (_event, bytes: Uint8Array, timestamp?: string) => { From 40cbfccf061fb0d95623397943edda06d7014994 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:36:46 +0100 Subject: [PATCH 24/31] build(deps-dev): bump css-loader from 5.1.1 to 5.1.3 (#4871) Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 5.1.1 to 5.1.3. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v5.1.1...v5.1.3) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 25 +++++++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index d3c7fa51e85..6f37c78e449 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "core-js": "3.9.1", "cross-env": "7.0.3", "cspell": "5.3.9", - "css-loader": "5.1.1", + "css-loader": "5.1.3", "dotenv": "8.2.0", "electron": "10.4.1", "electron-builder": "20.44.4", diff --git a/yarn.lock b/yarn.lock index fcddace15f6..9e3bc068552 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3382,6 +3382,11 @@ colorette@^1.2.1: resolved "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== +colorette@^1.2.2: + version "1.2.2" + resolved "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" + integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== + combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -3683,16 +3688,16 @@ cspell@5.3.9: glob "^7.1.6" strip-ansi "^6.0.0" -css-loader@5.1.1: - version "5.1.1" - resolved "https://registry.npmjs.org/css-loader/-/css-loader-5.1.1.tgz#9362d444a0f7c08c148a109596715c904e252879" - integrity sha512-5FfhpjwtuRgxqmusDidowqmLlcb+1HgnEDMsi2JhiUrZUcoc+cqw+mUtMIF/+OfeMYaaFCLYp1TaIt9H6I/fKA== +css-loader@5.1.3: + version "5.1.3" + resolved "https://registry.npmjs.org/css-loader/-/css-loader-5.1.3.tgz#87f6fc96816b20debe3cf682f85c7e56a963d0d1" + integrity sha512-CoPZvyh8sLiGARK3gqczpfdedbM74klGWurF2CsNZ2lhNaXdLIUks+3Mfax3WBeRuHoglU+m7KG/+7gY6G4aag== dependencies: camelcase "^6.2.0" cssesc "^3.0.0" icss-utils "^5.1.0" loader-utils "^2.0.0" - postcss "^8.2.6" + postcss "^8.2.8" postcss-modules-extract-imports "^3.0.0" postcss-modules-local-by-default "^4.0.0" postcss-modules-scope "^3.0.0" @@ -8099,12 +8104,12 @@ postcss-value-parser@^4.1.0: resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== -postcss@^8.2.6: - version "8.2.6" - resolved "https://registry.npmjs.org/postcss/-/postcss-8.2.6.tgz#5d69a974543b45f87e464bc4c3e392a97d6be9fe" - integrity sha512-xpB8qYxgPuly166AGlpRjUdEYtmOWx2iCwGmrv4vqZL9YPVviDVPZPRXxnXr6xPZOdxQ9lp3ZBFCRgWJ7LE3Sg== +postcss@^8.2.8: + version "8.2.8" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.2.8.tgz#0b90f9382efda424c4f0f69a2ead6f6830d08ece" + integrity sha512-1F0Xb2T21xET7oQV9eKuctbM9S7BC0fetoHCc4H13z0PT6haiRLP4T0ZY4XWh7iLP0usgqykT6p9B2RtOf4FPw== dependencies: - colorette "^1.2.1" + colorette "^1.2.2" nanoid "^3.1.20" source-map "^0.6.1" From 2eaf7f4ec0b390d1bc46fb7c1dacbc7ba23f4f6b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:36:53 +0100 Subject: [PATCH 25/31] build(deps-dev): bump nock from 13.0.9 to 13.0.11 (#4852) Bumps [nock](https://github.com/nock/nock) from 13.0.9 to 13.0.11. - [Release notes](https://github.com/nock/nock/releases) - [Changelog](https://github.com/nock/nock/blob/main/CHANGELOG.md) - [Commits](https://github.com/nock/nock/compare/v13.0.9...v13.0.11) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 6f37c78e449..d27bc15b56f 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "jest": "26.6.3", "lint-staged": "10.5.4", "mocha": "8.3.2", - "nock": "13.0.9", + "nock": "13.0.11", "nyc": "15.1.0", "prettier": "2.2.1", "rimraf": "3.0.2", diff --git a/yarn.lock b/yarn.lock index 9e3bc068552..0ca08c9971d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7426,10 +7426,10 @@ nise@^4.0.4: just-extend "^4.0.2" path-to-regexp "^1.7.0" -nock@13.0.9: - version "13.0.9" - resolved "https://registry.npmjs.org/nock/-/nock-13.0.9.tgz#32b9f6408a71991b25f044109cac92ee556c8539" - integrity sha512-SoGx/J0SsZPOdBFrBC9PP6NwaEgOBQIRPbsOsO9q+OwOPWc5eT6wALSxn3ZNE4Fv2ImIUXM4Hv/07rjq/uWDew== +nock@13.0.11: + version "13.0.11" + resolved "https://registry.npmjs.org/nock/-/nock-13.0.11.tgz#ba733252e720897ca50033205c39db0c7470f331" + integrity sha512-sKZltNkkWblkqqPAsjYW0bm3s9DcHRPiMOyKO/PkfJ+ANHZ2+LA2PLe22r4lLrKgXaiSaDQwW3qGsJFtIpQIeQ== dependencies: debug "^4.1.0" json-stringify-safe "^5.0.1" From 4d23170983f9f4ee63a94ce9ba7553a31b0409e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:36:58 +0100 Subject: [PATCH 26/31] build(deps-dev): bump typescript from 4.2.2 to 4.2.3 (#4847) Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.2.2 to 4.2.3. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v4.2.2...v4.2.3) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d27bc15b56f..10ab1579b4f 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "sort-json": "2.0.0", "style-loader": "2.0.0", "ts-node": "9.1.1", - "typescript": "4.2.2", + "typescript": "4.2.3", "webpack": "5.27.2", "webpack-cli": "4.5.0" }, diff --git a/yarn.lock b/yarn.lock index 0ca08c9971d..124821b2830 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9779,10 +9779,10 @@ typedarray@^0.0.6: resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@4.2.2: - version "4.2.2" - resolved "https://registry.npmjs.org/typescript/-/typescript-4.2.2.tgz#1450f020618f872db0ea17317d16d8da8ddb8c4c" - integrity sha512-tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ== +typescript@4.2.3: + version "4.2.3" + resolved "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3" + integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw== unc-path-regex@^0.1.0: version "0.1.2" From aa0ac03bf8c40e2c7121ad0171961b521949978a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Mar 2021 16:37:15 +0100 Subject: [PATCH 27/31] build(deps-dev): bump adm-zip from 0.5.3 to 0.5.4 (#4864) Bumps [adm-zip](https://github.com/cthackers/adm-zip) from 0.5.3 to 0.5.4. - [Release notes](https://github.com/cthackers/adm-zip/releases) - [Changelog](https://github.com/cthackers/adm-zip/blob/master/history.md) - [Commits](https://github.com/cthackers/adm-zip/compare/v0.5.3...v0.5.4) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 10ab1579b4f..ac867b2856e 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "@wireapp/copy-config": "1.1.13", "@wireapp/eslint-config": "1.8.0", "@wireapp/prettier-config": "0.3.0", - "adm-zip": "0.5.3", + "adm-zip": "0.5.4", "aws-sdk": "2.868.0", "babel-core": "7.0.0-bridge.0", "babel-eslint": "10.1.0", diff --git a/yarn.lock b/yarn.lock index 124821b2830..00b8d9377e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2352,10 +2352,10 @@ acorn@^8.0.4: resolved "https://registry.npmjs.org/acorn/-/acorn-8.0.4.tgz#7a3ae4191466a6984eee0fe3407a4f3aa9db8354" integrity sha512-XNP0PqF1XD19ZlLKvB7cMmnZswW4C/03pRHgirB30uSJTaS3A3V1/P4sS3HPvFmjoriPCJQs+JDSbm4bL1TxGQ== -adm-zip@0.5.3: - version "0.5.3" - resolved "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.3.tgz#f5ac6b2507f4418e2691c0feb6f130b4b90d7643" - integrity sha512-zsoTXEwRNCxBzRHLENFLuecCcwzzXiEhWo1r3GP68iwi8Q/hW2RrqgeY1nfJ/AhNQNWnZq/4v0TbfMsUkI+TYw== +adm-zip@0.5.4: + version "0.5.4" + resolved "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.4.tgz#af1f08c92cf9aa21b525231bce340fbdc39bd265" + integrity sha512-GMQg1a1cAegh+/EgWbz+XHZrwB467iB/IgtToldvxs7Xa5Br8mPmvCeRfY/Un2fLzrlIPt6Yu7Cej+8Ut9TGPg== aggregate-error@^3.0.0: version "3.0.1" From 6f843c36230e29b0dbceb0587421942325a35548 Mon Sep 17 00:00:00 2001 From: Otto the Bot Date: Tue, 23 Mar 2021 09:05:45 +0200 Subject: [PATCH 28/31] chore: Update translations (#4881) Co-authored-by: Crowdin Bot --- electron/locale/de-DE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron/locale/de-DE.json b/electron/locale/de-DE.json index 6301527e804..39e502efb45 100644 --- a/electron/locale/de-DE.json +++ b/electron/locale/de-DE.json @@ -88,7 +88,7 @@ "wrapperLogOut": "Abmelden", "wrapperManageTeam": "Team verwalten", "wrapperRemoveAccount": "Konto entfernen", - "menuEnableSpellChecking": "Rechtschreibprüfung Aktivieren", + "menuEnableSpellChecking": "Rechtschreibprüfung aktivieren", "menuCopyPicture": "Bild kopieren", "menuActualSize": "Originalgröße", "menuZoomIn": "Vergrößern", From da2543c45598c2272b532f6db10400bb91ccea6a Mon Sep 17 00:00:00 2001 From: Florian Imdahl Date: Tue, 23 Mar 2021 11:06:31 +0100 Subject: [PATCH 29/31] feat: Check for dark mode on startup (SQCORE-550) (#4306) --- electron/src/preload/preload-webview.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/electron/src/preload/preload-webview.ts b/electron/src/preload/preload-webview.ts index dc30eb4ed4b..9b286d3979c 100644 --- a/electron/src/preload/preload-webview.ts +++ b/electron/src/preload/preload-webview.ts @@ -42,12 +42,15 @@ const nativeTheme = remote.nativeTheme; const logger = getLogger(path.basename(__filename)); function subscribeToThemeChange(): void { - if (WebAppEvents.PROPERTIES.UPDATE.INTERFACE) { - nativeTheme.on('updated', () => { - const shouldUseDarkMode = nativeTheme.shouldUseDarkColors; - window.amplify.publish(WebAppEvents.PROPERTIES.UPDATE.INTERFACE.USE_DARK_MODE, shouldUseDarkMode); - }); - } + const updateWebAppTheme = (): void => { + if (WebAppEvents.PROPERTIES.UPDATE.INTERFACE) { + const useDarkMode = nativeTheme.shouldUseDarkColors; + window.amplify.publish(WebAppEvents.PROPERTIES.UPDATE.INTERFACE.USE_DARK_MODE, useDarkMode); + } + }; + + updateWebAppTheme(); + nativeTheme.on('updated', () => updateWebAppTheme()); } webFrame.setZoomFactor(1.0); From 3fee0a784f0792eb8a5fafa32c186ea4853c4729 Mon Sep 17 00:00:00 2001 From: Florian Imdahl Date: Tue, 23 Mar 2021 11:07:15 +0100 Subject: [PATCH 30/31] feat: Save zoom setting in configuration (#4285) --- electron/src/lib/eventType.ts | 4 +--- electron/src/main.ts | 3 +++ electron/src/menu/system.ts | 18 ++++++++--------- electron/src/preload/preload-app.ts | 20 ------------------- electron/src/settings/SettingsType.ts | 1 + electron/src/window/WindowUtil.ts | 28 +++++++++++++++++++++++++++ 6 files changed, 42 insertions(+), 32 deletions(-) diff --git a/electron/src/lib/eventType.ts b/electron/src/lib/eventType.ts index fe47c27dc4a..ba127dbb1ec 100644 --- a/electron/src/lib/eventType.ts +++ b/electron/src/lib/eventType.ts @@ -90,10 +90,8 @@ export const EVENT_TYPE = { NAVIGATE_WEBVIEW: 'EVENT_TYPE.WRAPPER.NAVIGATE_WEBVIEW', RELAUNCH: 'EVENT_TYPE.WRAPPER.RELAUNCH', RELOAD: 'EVENT_TYPE.WRAPPER.RELOAD', + SET_ZOOM_LEVEL: 'EVENT_TYPE.WRAPPER.SET_ZOOM_LEVEL', UPDATE: 'EVENT_TYPE.WRAPPER.UPDATE', UPDATE_AVAILABLE: 'EVENT_TYPE.WRAPPER.UPDATE_AVAILABLE', - ZOOM_IN: 'EVENT_TYPE.WRAPPER.ZOOM_IN', - ZOOM_OUT: 'EVENT_TYPE.WRAPPER.ZOOM_OUT', - ZOOM_RESET: 'EVENT_TYPE.WRAPPER.ZOOM_RESET', }, }; diff --git a/electron/src/main.ts b/electron/src/main.ts index e7ee2df0f66..ab2066c5631 100644 --- a/electron/src/main.ts +++ b/electron/src/main.ts @@ -210,6 +210,7 @@ const initWindowStateKeeper = (): windowStateKeeper.State => { // App Windows const showMainWindow = async (mainWindowState: windowStateKeeper.State): Promise => { const showMenuBar = settings.restore(SettingsType.SHOW_MENU_BAR, true); + const zoomFactor = settings.restore(SettingsType.ZOOM_FACTOR, 1.0); const options: BrowserWindowConstructorOptions = { autoHideMenuBar: !showMenuBar, @@ -333,6 +334,8 @@ const showMainWindow = async (mainWindowState: windowStateKeeper.State): Promise } }); + main.webContents.setZoomFactor(zoomFactor); + const mainURL = new URL(fileUrl(INDEX_HTML)); mainURL.searchParams.set('env', encodeURIComponent(webappURL.href)); mainURL.searchParams.set('focus', String(!startHidden)); diff --git a/electron/src/menu/system.ts b/electron/src/menu/system.ts index e1f088cdc0e..d3c71c6e5b5 100644 --- a/electron/src/menu/system.ts +++ b/electron/src/menu/system.ts @@ -33,7 +33,7 @@ import {SettingsType} from '../settings/SettingsType'; import {WindowManager} from '../window/WindowManager'; import {downloadLogs} from '../lib/download'; import {zipFiles, createFile} from '../lib/zip'; -import * as WindowUtil from '../window/WindowUtil'; +import {ZOOM_DIRECTION, openExternal, zoomWindow} from '../window/WindowUtil'; const launchCmd = process.env.APPIMAGE || process.execPath; @@ -250,19 +250,19 @@ const windowTemplate: MenuItemConstructorOptions = { accelerator: 'CmdOrCtrl+0', // we are using a manual implementation for all zoom actions (and not roles) // since the native behavior would be to only zoom into the webview, not the whole page. - click: (_menuItem, browserWindow) => browserWindow?.webContents.send(EVENT_TYPE.WRAPPER.ZOOM_RESET), + click: (_menuItem, browserWindow) => zoomWindow(ZOOM_DIRECTION.RESET, browserWindow), label: locale.getText('menuActualSize'), }, { // `Ctrl+Plus` does not actually trigger `+` while `Ctrl+=` does. // See https://github.com/electron/electron/issues/1507#issuecomment-118424331. accelerator: 'CmdOrCtrl+=', - click: (_menuItem, browserWindow) => browserWindow?.webContents.send(EVENT_TYPE.WRAPPER.ZOOM_IN), + click: (_menuItem, browserWindow) => zoomWindow(ZOOM_DIRECTION.IN, browserWindow), label: locale.getText('menuZoomIn'), }, { accelerator: 'CmdOrCtrl+-', - click: (_menuItem, browserWindow) => browserWindow?.webContents.send(EVENT_TYPE.WRAPPER.ZOOM_OUT), + click: (_menuItem, browserWindow) => zoomWindow(ZOOM_DIRECTION.OUT, browserWindow), label: locale.getText('menuZoomOut'), }, ], @@ -283,23 +283,23 @@ const helpTemplate: MenuItemConstructorOptions = { role: 'help', submenu: [ { - click: () => WindowUtil.openExternal(config.legalUrl, true), + click: () => openExternal(config.legalUrl, true), label: locale.getText('menuLegal'), }, { - click: () => WindowUtil.openExternal(config.privacyUrl, true), + click: () => openExternal(config.privacyUrl, true), label: locale.getText('menuPrivacy'), }, { - click: () => WindowUtil.openExternal(config.licensesUrl, true), + click: () => openExternal(config.licensesUrl, true), label: locale.getText('menuLicense'), }, { - click: () => WindowUtil.openExternal(config.supportUrl, true), + click: () => openExternal(config.supportUrl, true), label: locale.getText('menuSupport'), }, { - click: () => WindowUtil.openExternal(EnvironmentUtil.web.getWebsiteUrl(), true), + click: () => openExternal(EnvironmentUtil.web.getWebsiteUrl(), true), label: locale.getText('menuAppURL'), }, downloadLogsTemplate, diff --git a/electron/src/preload/preload-app.ts b/electron/src/preload/preload-app.ts index 1cbb118a9c5..c1a7d2d0388 100644 --- a/electron/src/preload/preload-app.ts +++ b/electron/src/preload/preload-app.ts @@ -28,7 +28,6 @@ import {AutomatedSingleSignOn} from '../sso/AutomatedSingleSignOn'; const logger = getLogger(path.basename(__filename)); -webFrame.setZoomFactor(1.0); webFrame.setVisualZoomLevelLimits(1, 1); window.locStrings = locale.LANGUAGES[locale.getCurrent()]; @@ -73,25 +72,6 @@ const subscribeToMainProcessEvents = (): void => { ipcRenderer.on(EVENT_TYPE.ACTION.SWITCH_ACCOUNT, (event, accountIndex: number) => { window.dispatchEvent(new CustomEvent(EVENT_TYPE.ACTION.SWITCH_ACCOUNT, {detail: {accountIndex}})); }); - - ipcRenderer.on(EVENT_TYPE.WRAPPER.ZOOM_IN, () => { - logger.info(`Received event "${EVENT_TYPE.WRAPPER.ZOOM_IN}", zooming in ...`); - const currentZoomFactor = webFrame.getZoomFactor(); - const newZoomFactor = Math.min(currentZoomFactor + 0.1, 2.0); - webFrame.setZoomFactor(newZoomFactor); - }); - - ipcRenderer.on(EVENT_TYPE.WRAPPER.ZOOM_OUT, () => { - logger.info(`Received event "${EVENT_TYPE.WRAPPER.ZOOM_OUT}", zooming out ...`); - const currentZoomFactor = webFrame.getZoomFactor(); - const newZoomFactor = Math.max(currentZoomFactor - 0.1, 0.5); - webFrame.setZoomFactor(newZoomFactor); - }); - - ipcRenderer.on(EVENT_TYPE.WRAPPER.ZOOM_RESET, () => { - logger.info(`Received event "${EVENT_TYPE.WRAPPER.ZOOM_RESET}", resetting zoom ...`); - webFrame.setZoomFactor(1.0); - }); }; const setupIpcInterface = (): void => { diff --git a/electron/src/settings/SettingsType.ts b/electron/src/settings/SettingsType.ts index 386806b51cd..5c121a7f490 100644 --- a/electron/src/settings/SettingsType.ts +++ b/electron/src/settings/SettingsType.ts @@ -26,4 +26,5 @@ export enum SettingsType { LOCALE = 'locale', SHOW_MENU_BAR = 'showMenu', WINDOW_BOUNDS = 'bounds', + ZOOM_FACTOR = 'zoomFactor', } diff --git a/electron/src/window/WindowUtil.ts b/electron/src/window/WindowUtil.ts index bb7f5128c9b..1e96268e80e 100644 --- a/electron/src/window/WindowUtil.ts +++ b/electron/src/window/WindowUtil.ts @@ -25,6 +25,8 @@ import {getLogger} from '../logging/getLogger'; import {showWarningDialog} from '../lib/showDialog'; import * as locale from '../locale/locale'; import {config} from '../settings/config'; +import {settings} from '../settings/ConfigurationPersistence'; +import {SettingsType} from '../settings/SettingsType'; const logger = getLogger(path.basename(__filename)); @@ -35,6 +37,12 @@ interface Rectangle { y: number; } +export enum ZOOM_DIRECTION { + IN = 'IN', + OUT = 'OUT', + RESET = 'RESET', +} + export const pointInRectangle = (point: [number, number], rectangle: Rectangle): boolean => { const [xCoordinate, yCoordinate] = point; const xInRange = xCoordinate >= rectangle.x && xCoordinate <= rectangle.x + rectangle.width; @@ -77,3 +85,23 @@ export const openExternal = async (url: string, httpsOnly: boolean = false): Pro logger.error(error); } }; + +export const zoomWindow = (direction: ZOOM_DIRECTION, browserWindow?: BrowserWindow): void => { + let newZoomFactor = 1.0; + + switch (direction) { + case ZOOM_DIRECTION.IN: { + const currentZoomFactor = browserWindow?.webContents.getZoomFactor() || 1.0; + newZoomFactor = Math.min(currentZoomFactor + 0.1, 2.0); + break; + } + case ZOOM_DIRECTION.OUT: { + const currentZoomFactor = browserWindow?.webContents.getZoomFactor() || 1.0; + newZoomFactor = Math.max(currentZoomFactor - 0.1, 0.5); + break; + } + } + + browserWindow?.webContents.setZoomFactor(newZoomFactor); + settings.save(SettingsType.ZOOM_FACTOR, newZoomFactor); +}; From caebc59623b4959ae06f3ec1b77fc459a0b55000 Mon Sep 17 00:00:00 2001 From: Florian Keller Date: Tue, 23 Mar 2021 11:31:17 +0100 Subject: [PATCH 31/31] chore: bump version to 3.24.0 --- electron/wire.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/electron/wire.json b/electron/wire.json index 237f89789d6..89465039713 100644 --- a/electron/wire.json +++ b/electron/wire.json @@ -20,6 +20,6 @@ "privacyUrl": "https://wire.com/privacy/", "supportUrl": "https://support.wire.com", "updateUrl": "https://wire-app.wire.com/win/prod/", - "version": "3.23.0", + "version": "3.24.0", "websiteUrl": "https://wire.com" } diff --git a/package.json b/package.json index ac867b2856e..4c50d90f606 100644 --- a/package.json +++ b/package.json @@ -179,5 +179,5 @@ "translate:upload": "ts-node -P tsconfig.bin.json ./bin/translations_upload.ts", "translate:download": "ts-node -P tsconfig.bin.json ./bin/translations_download.ts" }, - "version": "3.23.0" + "version": "3.24.0" }