From 612c1298fe907190bed50a968af31c9b1c3c97f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Wei=C3=9F?= Date: Wed, 12 Oct 2022 10:22:26 +0200 Subject: [PATCH 01/66] chore: Bump application version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6e0ed6f9fc9..e3bc81bdff2 100644 --- a/package.json +++ b/package.json @@ -240,5 +240,5 @@ "translate:upload": "yarn translate:merge && ts-node ./bin/translations_upload.ts", "translate:download": "ts-node ./bin/translations_download.ts" }, - "version": "0.21.0" + "version": "0.22.0" } From 7c20eed158c84fe25d566c622e0c183ee8ebda77 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Mon, 10 Oct 2022 09:17:04 +0200 Subject: [PATCH 02/66] refactor: factorize login buttons (#13813) --- src/script/auth/page/Index.tsx | 111 +++++++++++---------------------- 1 file changed, 35 insertions(+), 76 deletions(-) diff --git a/src/script/auth/page/Index.tsx b/src/script/auth/page/Index.tsx index 99a34a73eb6..a871b7ecfc9 100644 --- a/src/script/auth/page/Index.tsx +++ b/src/script/auth/page/Index.tsx @@ -19,7 +19,7 @@ import {UrlUtil} from '@wireapp/commons'; import * as AuthSelector from '../module/selector/AuthSelector'; -import {Button, ButtonVariant, COLOR, ContainerXS, ErrorMessage, Text} from '@wireapp/react-ui-kit'; +import {Button, ButtonVariant, ContainerXS, ErrorMessage, Text} from '@wireapp/react-ui-kit'; import React, {useEffect, useState} from 'react'; import {FormattedMessage, useIntl} from 'react-intl'; import {useNavigate} from 'react-router-dom'; @@ -86,81 +86,40 @@ const Index = ({defaultSSOCode}: Props & ConnectedProps & DispatchProps) => { > {_(indexStrings.welcome, {brandName: Config.getConfig().BACKEND_NAME})} - {Config.getConfig().FEATURE.ENABLE_ACCOUNT_REGISTRATION ? ( - <> - - - {logoutReason && ( - - , - }} - /> - - )} - {(Config.getConfig().FEATURE.ENABLE_SSO || Config.getConfig().FEATURE.ENABLE_DOMAIN_DISCOVERY) && ( - - )} - - ) : ( - <> - - {(Config.getConfig().FEATURE.ENABLE_SSO || Config.getConfig().FEATURE.ENABLE_DOMAIN_DISCOVERY) && ( - - )} - {logoutReason && ( - - , - }} - /> - - )} - + {features.ENABLE_ACCOUNT_REGISTRATION && ( + + )} + + {logoutReason && ( + + , + }} + /> + + )} + {(features.ENABLE_SSO || features.ENABLE_DOMAIN_DISCOVERY) && ( + )} From 0cc81ce161df0619b02152125d424b1192fd551a Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Wed, 12 Oct 2022 12:45:10 +0200 Subject: [PATCH 03/66] chore: fix types --- src/script/auth/page/Index.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/script/auth/page/Index.tsx b/src/script/auth/page/Index.tsx index a871b7ecfc9..da59b51d395 100644 --- a/src/script/auth/page/Index.tsx +++ b/src/script/auth/page/Index.tsx @@ -65,6 +65,8 @@ const Index = ({defaultSSOCode}: Props & ConnectedProps & DispatchProps) => { navigate(ROUTE.LOGIN); } }, []); + const features = Config.getConfig().FEATURE; + return ( From e28fad1d3f57e1ab8bd055b9cc3f44a28a259800 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Oct 2022 17:13:34 +0000 Subject: [PATCH 04/66] chore(deps): Bump crowdin/github-action from 1.4.14 to 1.4.15 (#13886) Bumps [crowdin/github-action](https://github.com/crowdin/github-action) from 1.4.14 to 1.4.15. - [Release notes](https://github.com/crowdin/github-action/releases) - [Commits](https://github.com/crowdin/github-action/compare/1.4.14...1.4.15) --- updated-dependencies: - dependency-name: crowdin/github-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/sync_translations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync_translations.yml b/.github/workflows/sync_translations.yml index 8ce97b56708..3ec7de24c23 100644 --- a/.github/workflows/sync_translations.yml +++ b/.github/workflows/sync_translations.yml @@ -34,7 +34,7 @@ jobs: run: yarn translate:merge - name: Download translations - uses: crowdin/github-action@1.4.14 + uses: crowdin/github-action@1.4.15 env: GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}} CROWDIN_PROJECT_ID: 342359 From 375b5b98e2bdacddadab29c4fc06357f39275f2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Oct 2022 17:13:59 +0000 Subject: [PATCH 05/66] chore(deps): Bump amannn/action-semantic-pull-request (#13885) Bumps [amannn/action-semantic-pull-request](https://github.com/amannn/action-semantic-pull-request) from 5.0.1 to 5.0.2. - [Release notes](https://github.com/amannn/action-semantic-pull-request/releases) - [Changelog](https://github.com/amannn/action-semantic-pull-request/blob/main/CHANGELOG.md) - [Commits](https://github.com/amannn/action-semantic-pull-request/compare/v5.0.1...v5.0.2) --- updated-dependencies: - dependency-name: amannn/action-semantic-pull-request dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/semantic-commit-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/semantic-commit-lint.yml b/.github/workflows/semantic-commit-lint.yml index 567aded8e40..3c8c52b1689 100644 --- a/.github/workflows/semantic-commit-lint.yml +++ b/.github/workflows/semantic-commit-lint.yml @@ -14,7 +14,7 @@ jobs: # Please look up the latest version from # https://github.com/amannn/action-semantic-pull-request/releases - name: Run Semantic Commint Linter - uses: amannn/action-semantic-pull-request@v5.0.1 + uses: amannn/action-semantic-pull-request@v5.0.2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From 313f26c66aae2171a08fb1798a26464329e6908b Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Tue, 18 Oct 2022 12:20:53 +0200 Subject: [PATCH 06/66] chore: Upgrade @wireapp/core (#13887) This will provide better logs for MLS specific messages --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 54856a2ebb9..6479ba905e6 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.4", "@wireapp/antiscroll-2": "1.3.1", "@wireapp/avs": "8.2.16", - "@wireapp/core": "32.0.8", + "@wireapp/core": "32.1.0", "@wireapp/react-ui-kit": "8.17.0", "@wireapp/store-engine-dexie": "1.7.6", "@wireapp/store-engine-sqleet": "1.8.6", diff --git a/yarn.lock b/yarn.lock index 55f1cfbe1b4..3ad7f8b283e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4251,9 +4251,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:32.0.8": - version: 32.0.8 - resolution: "@wireapp/core@npm:32.0.8" +"@wireapp/core@npm:32.1.0": + version: 32.1.0 + resolution: "@wireapp/core@npm:32.1.0" dependencies: "@wireapp/api-client": ^20.6.8 "@wireapp/commons": ^4.4.6 @@ -4270,7 +4270,7 @@ __metadata: long: 4.0.0 protobufjs: 6.11.3 uuidjs: 4.2.8 - checksum: 16c391c63a7dc5f9755d4fd3f0e8ba0fd80a22bfd3fa3dcd21d0b1c7de9c7d72c6251f62ad1a7c3a614db6b89001f79dd699497b85f4db1815f1da9ed5a353fc + checksum: 5aaca2dc5e2b7110d108e22ae565297de28eeb0670b52015bfe4b71dc96d70e1876a05f8dbb228b1bb3fde88e342ae24abc35ca3b4995a13a983118606aaf2e4 languageName: node linkType: hard @@ -17750,7 +17750,7 @@ __metadata: "@wireapp/antiscroll-2": 1.3.1 "@wireapp/avs": 8.2.16 "@wireapp/copy-config": 1.3.6 - "@wireapp/core": 32.0.8 + "@wireapp/core": 32.1.0 "@wireapp/eslint-config": 1.12.11 "@wireapp/prettier-config": 0.4.6 "@wireapp/react-ui-kit": 8.17.0 From c91470d326ac14d9cb23a72976f681bc451a8ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Wei=C3=9F?= <77456193+aweiss-dev@users.noreply.github.com> Date: Tue, 18 Oct 2022 17:28:08 +0200 Subject: [PATCH 07/66] fix: update core to get rid of the missing messages message bug (#13892) --- package.json | 2 +- yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 6479ba905e6..3febe443e5e 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.4", "@wireapp/antiscroll-2": "1.3.1", "@wireapp/avs": "8.2.16", - "@wireapp/core": "32.1.0", + "@wireapp/core": "32.1.1", "@wireapp/react-ui-kit": "8.17.0", "@wireapp/store-engine-dexie": "1.7.6", "@wireapp/store-engine-sqleet": "1.8.6", diff --git a/yarn.lock b/yarn.lock index 3ad7f8b283e..57826e55764 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4182,9 +4182,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^20.6.8": - version: 20.6.8 - resolution: "@wireapp/api-client@npm:20.6.8" +"@wireapp/api-client@npm:^20.6.9": + version: 20.6.9 + resolution: "@wireapp/api-client@npm:20.6.9" dependencies: "@wireapp/commons": ^4.4.6 "@wireapp/priority-queue": ^1.8.6 @@ -4197,7 +4197,7 @@ __metadata: spark-md5: 3.0.1 tough-cookie: 4.0.0 ws: 7.5.3 - checksum: e01930c130baee57361e03308215b6c211cc415171d3472ca99505553f643c5cddcf8428abb5e307266393e380c6143391abb91812414bc53d84abef692ac293 + checksum: a33db1f53ba65ab6571c89be62944547cd290cf1d11985efadcce8630cd9b543a892e564f04956e181045b48467bc673a426c37ad8e61c174a89d0d1a334fe68 languageName: node linkType: hard @@ -4251,11 +4251,11 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:32.1.0": - version: 32.1.0 - resolution: "@wireapp/core@npm:32.1.0" +"@wireapp/core@npm:32.1.1": + version: 32.1.1 + resolution: "@wireapp/core@npm:32.1.1" dependencies: - "@wireapp/api-client": ^20.6.8 + "@wireapp/api-client": ^20.6.9 "@wireapp/commons": ^4.4.6 "@wireapp/core-crypto": 0.5.2 "@wireapp/cryptobox": 12.8.0 @@ -4270,7 +4270,7 @@ __metadata: long: 4.0.0 protobufjs: 6.11.3 uuidjs: 4.2.8 - checksum: 5aaca2dc5e2b7110d108e22ae565297de28eeb0670b52015bfe4b71dc96d70e1876a05f8dbb228b1bb3fde88e342ae24abc35ca3b4995a13a983118606aaf2e4 + checksum: b5c8dff2cc0e465a77193c6ab209267d481aa2fb723ca5d332c74a24bc46073cf4ca8dbd0b35c6ffb6d4e5bc28bb0108323093a65925602a1f94a783b08056ad languageName: node linkType: hard @@ -17750,7 +17750,7 @@ __metadata: "@wireapp/antiscroll-2": 1.3.1 "@wireapp/avs": 8.2.16 "@wireapp/copy-config": 1.3.6 - "@wireapp/core": 32.1.0 + "@wireapp/core": 32.1.1 "@wireapp/eslint-config": 1.12.11 "@wireapp/prettier-config": 0.4.6 "@wireapp/react-ui-kit": 8.17.0 From c4043b77ccf30be101eaa44c5652e7542c2ea7e3 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Tue, 18 Oct 2022 18:09:51 +0200 Subject: [PATCH 08/66] chore: Cleanup unused dependencies (#13893) --- Gruntfile.js | 1 - grunt/config/aws_s3.js | 40 --------------------- package.json | 1 - yarn.lock | 81 +----------------------------------------- 4 files changed, 1 insertion(+), 122 deletions(-) delete mode 100644 grunt/config/aws_s3.js diff --git a/Gruntfile.js b/Gruntfile.js index 0683cce3f7a..905a2312a4f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -56,7 +56,6 @@ module.exports = grunt => { grunt.initConfig({ dir, - aws_s3: require('./grunt/config/aws_s3'), clean: require('./grunt/config/clean'), compress: require('./grunt/config/compress'), copy: require('./grunt/config/copy'), diff --git a/grunt/config/aws_s3.js b/grunt/config/aws_s3.js deleted file mode 100644 index 5f7b895fa8d..00000000000 --- a/grunt/config/aws_s3.js +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Wire - * Copyright (C) 2018 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - */ - -// https://github.com/MathieuLoutre/grunt-aws-s3 - -module.exports = { - default: { - files: [ - { - dest: '/<%= grunt.config("aws.deploy.options.version") %>.zip', - src: '<%= dir.dist.s3 %>/ebs.zip', - stream: true, - }, - ], - options: { - bucket: 'wire-webapp', - }, - }, - options: { - accessKeyId: process.env.AWS_ACCESS_KEY_ID, - region: 'eu-central-1', - secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY, - }, -}; diff --git a/package.json b/package.json index 3febe443e5e..3df108bee39 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,6 @@ "fake-indexeddb": "4.0.0", "generate-changelog": "1.8.0", "grunt": "1.5.3", - "grunt-aws-s3": "2.0.2", "grunt-cli": "1.4.3", "grunt-contrib-clean": "2.0.1", "grunt-contrib-compress": "2.0.0", diff --git a/yarn.lock b/yarn.lock index 57826e55764..afd73190e03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5046,13 +5046,6 @@ __metadata: languageName: node linkType: hard -"async@npm:0.9.x": - version: 0.9.2 - resolution: "async@npm:0.9.2" - checksum: 87dbf129292b8a6c32a4e07f43f462498162aa86f404a7e11f978dbfdf75cfb163c26833684bb07b9d436083cd604cbbf730a57bfcbe436c6ae1ed266cdc56bb - languageName: node - linkType: hard - "async@npm:^2.6.0": version: 2.6.3 resolution: "async@npm:2.6.3" @@ -5116,16 +5109,6 @@ __metadata: languageName: node linkType: hard -"aws-sdk@npm:2.0.x": - version: 2.0.31 - resolution: "aws-sdk@npm:2.0.31" - dependencies: - xml2js: 0.2.6 - xmlbuilder: 0.4.2 - checksum: a5a266135ef0a94da9997dca1869c603433ff9ac1565a37977396fb9b5659c461e4adcd75aff835894d29bc3c54e84fcdadc8d7f677ae47b05723b62dc70a538 - languageName: node - linkType: hard - "axe-core@npm:^4.4.3": version: 4.4.3 resolution: "axe-core@npm:4.4.3" @@ -9048,21 +9031,6 @@ __metadata: languageName: node linkType: hard -"grunt-aws-s3@npm:2.0.2": - version: 2.0.2 - resolution: "grunt-aws-s3@npm:2.0.2" - dependencies: - async: 0.9.x - aws-sdk: 2.0.x - lodash: 4.17.x - mime-types: 2.0.x - progress: 1.1.x - peerDependencies: - grunt: ">=0.4.0" - checksum: 32d22fae3bd998cef28100798ea9470af60b9153538442cb577802114c3fb297c5cc3cc527ecfac6e9c8243e8c0e983232cf63f5624672ccb0eb1845f082169e - languageName: node - linkType: hard - "grunt-cli@npm:1.4.3, grunt-cli@npm:~1.4.3": version: 1.4.3 resolution: "grunt-cli@npm:1.4.3" @@ -11795,7 +11763,7 @@ __metadata: languageName: node linkType: hard -"lodash@npm:4.17.x, lodash@npm:^4.0.0, lodash@npm:^4.17.10, lodash@npm:^4.17.14, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.7.0, lodash@npm:~4.17.10, lodash@npm:~4.17.19, lodash@npm:~4.17.21": +"lodash@npm:^4.0.0, lodash@npm:^4.17.10, lodash@npm:^4.17.14, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.7.0, lodash@npm:~4.17.10, lodash@npm:~4.17.19, lodash@npm:~4.17.21": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7 @@ -12138,22 +12106,6 @@ __metadata: languageName: node linkType: hard -"mime-db@npm:~1.12.0": - version: 1.12.0 - resolution: "mime-db@npm:1.12.0" - checksum: 6506c87a45592fac34f7d92eac42209eb79c9ead06a2d2c5b863beb5de5d242c9af5d4671d99b35c24be7b85bdd17dcecd742df4fe5ede5fe20a4e35cd129648 - languageName: node - linkType: hard - -"mime-types@npm:2.0.x": - version: 2.0.14 - resolution: "mime-types@npm:2.0.14" - dependencies: - mime-db: ~1.12.0 - checksum: 635b319cc7f7a323c57abf9eb284e7cab496b2e633a1b6568c02f3e678bb07516aaefd9d0c94703b143b543408aded3a7a83ec4e4c2f50661eb1752233737d73 - languageName: node - linkType: hard - "mime-types@npm:^2.1.12": version: 2.1.35 resolution: "mime-types@npm:2.1.35" @@ -14287,13 +14239,6 @@ __metadata: languageName: node linkType: hard -"progress@npm:1.1.x": - version: 1.1.8 - resolution: "progress@npm:1.1.8" - checksum: 789c824156e03a7353b190fc63da46bc42b210250cebaa2dca447a6a740f5469f34ed30f768cdef088ca720a8c3c42dd743958e8bc6a35b2d2a1a83171ad2c56 - languageName: node - linkType: hard - "promise-inflight@npm:^1.0.1": version: 1.0.1 resolution: "promise-inflight@npm:1.0.1" @@ -15325,13 +15270,6 @@ __metadata: languageName: node linkType: hard -"sax@npm:0.4.2": - version: 0.4.2 - resolution: "sax@npm:0.4.2" - checksum: 521378fd102a787c90c9fb886d6b865fba39352b47bf949d04cef5f9a1fc8ca34fcb4aa8408bbeef161aa7e5df0d3f0e888513122a1e6196c01819441477e985 - languageName: node - linkType: hard - "sax@npm:~1.2.4": version: 1.2.4 resolution: "sax@npm:1.2.4" @@ -17792,7 +17730,6 @@ __metadata: fake-indexeddb: 4.0.0 generate-changelog: 1.8.0 grunt: 1.5.3 - grunt-aws-s3: 2.0.2 grunt-cli: 1.4.3 grunt-contrib-clean: 2.0.1 grunt-contrib-compress: 2.0.0 @@ -18194,22 +18131,6 @@ __metadata: languageName: node linkType: hard -"xml2js@npm:0.2.6": - version: 0.2.6 - resolution: "xml2js@npm:0.2.6" - dependencies: - sax: 0.4.2 - checksum: f6fc362ed0f3868ae0ec98b49346bc685903779798d029b5762b270fdeaca576c6782a151b986063255353ff2b0b9f110ad3042e295de4b2fd4c17917d27490c - languageName: node - linkType: hard - -"xmlbuilder@npm:0.4.2": - version: 0.4.2 - resolution: "xmlbuilder@npm:0.4.2" - checksum: 9300497a60ae23b871916f27a9052360e4c50548476dbbfd7eb86d75158df1f24204c54f384c2de0a35c1e801a62e0384e2d06240361eca78c9f928df59c17dc - languageName: node - linkType: hard - "xmlchars@npm:^2.2.0": version: 2.2.0 resolution: "xmlchars@npm:2.2.0" From 8006f9e295867e3afa9a2405e1811c5c784f1c44 Mon Sep 17 00:00:00 2001 From: Sebastian Willenborg Date: Wed, 19 Oct 2022 09:10:08 +0200 Subject: [PATCH 09/66] chore: replace discontinued postcss-cssnext with postcss-preset-env (#13895) --- package.json | 2 +- postcss.config.js | 2 +- yarn.lock | 1054 ++++++++++++++++++++++----------------------- 3 files changed, 513 insertions(+), 545 deletions(-) diff --git a/package.json b/package.json index 3df108bee39..74f4f42e9ce 100644 --- a/package.json +++ b/package.json @@ -148,9 +148,9 @@ "os-browserify": "0.3.0", "path-browserify": "1.0.1", "postcss": "8.4.18", - "postcss-cssnext": "3.1.1", "postcss-import": "12.0.1", "postcss-less": "6.0.0", + "postcss-preset-env": "^7.8.2", "postcss-scss": "4.0.5", "prettier": "2.7.1", "raf": "3.4.1", diff --git a/postcss.config.js b/postcss.config.js index 3a304b22ce5..45a90fe40ec 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -22,7 +22,7 @@ module.exports = { plugins: { autoprefixer: {}, cssnano: {}, - 'postcss-cssnext': {}, 'postcss-import': {}, + 'postcss-preset-env': {}, }, }; diff --git a/yarn.lock b/yarn.lock index afd73190e03..adf40c9d52d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2080,7 +2080,164 @@ __metadata: languageName: node linkType: hard -"@csstools/selector-specificity@npm:^2.0.2": +"@csstools/postcss-cascade-layers@npm:^1.1.0": + version: 1.1.1 + resolution: "@csstools/postcss-cascade-layers@npm:1.1.1" + dependencies: + "@csstools/selector-specificity": ^2.0.2 + postcss-selector-parser: ^6.0.10 + peerDependencies: + postcss: ^8.2 + checksum: 8ecd6a929e8ddee3ad0834ab5017f50a569817ba8490d152b11c705c13cf3d9701f74792f375cbd72d8f33a4eeaabb3f984f1514adf8c5a530eb91be70c14cf4 + languageName: node + linkType: hard + +"@csstools/postcss-color-function@npm:^1.1.1": + version: 1.1.1 + resolution: "@csstools/postcss-color-function@npm:1.1.1" + dependencies: + "@csstools/postcss-progressive-custom-properties": ^1.1.0 + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: 087595985ebcc2fc42013d6305185d4cdc842d87fb261185db905dc31eaa24fc23a7cc068fa3da814b3c8b98164107ddaf1b4ab24f4ff5b2a7b5fbcd4c6ceec9 + languageName: node + linkType: hard + +"@csstools/postcss-font-format-keywords@npm:^1.0.1": + version: 1.0.1 + resolution: "@csstools/postcss-font-format-keywords@npm:1.0.1" + dependencies: + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: ed8d9eab9793f0184e000709bcb155d4eb96c49a312e3ea9e549e006b74fd4aafac63cb9f9f01bec5b717a833539ff085c3f1ef7d273b97d587769ef637d50c1 + languageName: node + linkType: hard + +"@csstools/postcss-hwb-function@npm:^1.0.2": + version: 1.0.2 + resolution: "@csstools/postcss-hwb-function@npm:1.0.2" + dependencies: + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: 352ead754a692f7ed33a712c491012cab5c2f2946136a669a354237cfe8e6faca90c7389ee793cb329b9b0ddec984faa06d47e2f875933aaca417afff74ce6aa + languageName: node + linkType: hard + +"@csstools/postcss-ic-unit@npm:^1.0.1": + version: 1.0.1 + resolution: "@csstools/postcss-ic-unit@npm:1.0.1" + dependencies: + "@csstools/postcss-progressive-custom-properties": ^1.1.0 + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: 09c414c9b7762b5fbe837ff451d7a11e4890f1ed3c92edc3573f02f3d89747f6ac3f2270799b68a332bd7f5de05bb0dfffddb6323fc4020c2bea33ff58314533 + languageName: node + linkType: hard + +"@csstools/postcss-is-pseudo-class@npm:^2.0.7": + version: 2.0.7 + resolution: "@csstools/postcss-is-pseudo-class@npm:2.0.7" + dependencies: + "@csstools/selector-specificity": ^2.0.0 + postcss-selector-parser: ^6.0.10 + peerDependencies: + postcss: ^8.2 + checksum: a4494bb8e9a34826944ba6872c91c1e88268caab6d06968897f1a0cc75ca5cfc4989435961fc668a9c6842a6d17f4cda0055fa256d23e598b8bbc6f022956125 + languageName: node + linkType: hard + +"@csstools/postcss-nested-calc@npm:^1.0.0": + version: 1.0.0 + resolution: "@csstools/postcss-nested-calc@npm:1.0.0" + dependencies: + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: 53bb783dd61621c11c1e6e352f079577e2eb908de67947ceef31a178e070c06c223baae87acd5c3bd51c664515d2adc16166a129159168626111aff548583790 + languageName: node + linkType: hard + +"@csstools/postcss-normalize-display-values@npm:^1.0.1": + version: 1.0.1 + resolution: "@csstools/postcss-normalize-display-values@npm:1.0.1" + dependencies: + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: 75901daec3869ba15e0adfd50d8e2e754ec06d55ac44fbd540748476388d223d53710fb3a3cbfe6695a2bab015a489fb47d9e3914ff211736923f8deb818dc0b + languageName: node + linkType: hard + +"@csstools/postcss-oklab-function@npm:^1.1.1": + version: 1.1.1 + resolution: "@csstools/postcss-oklab-function@npm:1.1.1" + dependencies: + "@csstools/postcss-progressive-custom-properties": ^1.1.0 + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: d66b789060b37ed810450d9a7d8319a0ae14e913c091f3e0ee482b3471538762e801d5eae3d62fda2f1eb1e88c76786d2c2b06c1172166eba1cca5e2a0dc95f2 + languageName: node + linkType: hard + +"@csstools/postcss-progressive-custom-properties@npm:^1.1.0, @csstools/postcss-progressive-custom-properties@npm:^1.3.0": + version: 1.3.0 + resolution: "@csstools/postcss-progressive-custom-properties@npm:1.3.0" + dependencies: + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.3 + checksum: e281845fde5b8a80d06ec20147bd74e96a9351bebbec5e5c3a6fb37ea30a597ff84172601786a8a270662f58f708b4a3bf8d822d6318023def9773d2f6589962 + languageName: node + linkType: hard + +"@csstools/postcss-stepped-value-functions@npm:^1.0.1": + version: 1.0.1 + resolution: "@csstools/postcss-stepped-value-functions@npm:1.0.1" + dependencies: + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: 2fc88713a0d49d142010652be8139b00719e407df1173e46047284f1befd0647e1fff67f259f9f55ac3b46bba6462b21f0aa192bd10a2989c51a8ce0d25fc495 + languageName: node + linkType: hard + +"@csstools/postcss-text-decoration-shorthand@npm:^1.0.0": + version: 1.0.0 + resolution: "@csstools/postcss-text-decoration-shorthand@npm:1.0.0" + dependencies: + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: d27aaf97872c42bec9f6fde4d8bf924e89f7886f0aca8e4fc5aaf2f9083b09bb43dbbfa29124fa36fcdeb2d4d3e0459a095acf62188260cd1577e9811bb1276e + languageName: node + linkType: hard + +"@csstools/postcss-trigonometric-functions@npm:^1.0.2": + version: 1.0.2 + resolution: "@csstools/postcss-trigonometric-functions@npm:1.0.2" + dependencies: + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: f7f5b5f2492606b79a56f09e814ae8f10a2ae9e9c5fb8019f0e347a4a6c07953b2cc663fd4fa43a60e6994dfd958958f39df8ec760e2a646cfe71fe2bb119382 + languageName: node + linkType: hard + +"@csstools/postcss-unset-value@npm:^1.0.2": + version: 1.0.2 + resolution: "@csstools/postcss-unset-value@npm:1.0.2" + peerDependencies: + postcss: ^8.2 + checksum: 3facdae154d6516ffd964f7582696f406465f11cf8dead503e0afdfecc99ebc25638ab2830affce4516131aa2db004458a235e439f575b04e9ef72ad82f55835 + languageName: node + linkType: hard + +"@csstools/selector-specificity@npm:^2.0.0, @csstools/selector-specificity@npm:^2.0.2": version: 2.0.2 resolution: "@csstools/selector-specificity@npm:2.0.2" peerDependencies: @@ -5093,19 +5250,21 @@ __metadata: languageName: node linkType: hard -"autoprefixer@npm:^7.1.1": - version: 7.2.6 - resolution: "autoprefixer@npm:7.2.6" +"autoprefixer@npm:^10.4.11": + version: 10.4.12 + resolution: "autoprefixer@npm:10.4.12" dependencies: - browserslist: ^2.11.3 - caniuse-lite: ^1.0.30000805 + browserslist: ^4.21.4 + caniuse-lite: ^1.0.30001407 + fraction.js: ^4.2.0 normalize-range: ^0.1.2 - num2fraction: ^1.2.2 - postcss: ^6.0.17 - postcss-value-parser: ^3.2.3 + picocolors: ^1.0.0 + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.1.0 bin: - autoprefixer-info: ./bin/autoprefixer-info - checksum: 7ad12a58ca128d3e6b6dc5e4b3d83f2a12151216d30bcea1f1f2f8a91d2a019c58dd62fd039a6c1cf218f2ab557b03224703a4396c1b4f01b5c0818bc6ba4dd9 + autoprefixer: bin/autoprefixer + checksum: 6ae79cbacd31fb3d464ec64eb6ad2600f4f689c3080bbe62c5536d539b41b472083a2e941ef99d14aa11142370d6c16e8b05a62f077374933ed991aceb5943d2 languageName: node linkType: hard @@ -5298,30 +5457,6 @@ __metadata: languageName: node linkType: hard -"babel-runtime@npm:^6.23.0": - version: 6.26.0 - resolution: "babel-runtime@npm:6.26.0" - dependencies: - core-js: ^2.4.0 - regenerator-runtime: ^0.11.0 - checksum: 8aeade94665e67a73c1ccc10f6fd42ba0c689b980032b70929de7a6d9a12eb87ef51902733f8fefede35afea7a5c3ef7e916a64d503446c1eedc9e3284bd3d50 - languageName: node - linkType: hard - -"balanced-match@npm:0.1.0": - version: 0.1.0 - resolution: "balanced-match@npm:0.1.0" - checksum: 97e1cac3724a55a8ef249db54b8efb3c1b690735ea119a02c7ba885da86e8767453758ab7e14492ae58c7b07726fa409396f04bc2cb1a3fd36083f29ab54ddf5 - languageName: node - linkType: hard - -"balanced-match@npm:^0.4.2": - version: 0.4.2 - resolution: "balanced-match@npm:0.4.2" - checksum: 205ebb42ce8529fa8e043a808b41bfb9818d5f98a8eb76a1cd5483f8a98dd0baefc8a9d940f36b591b1316a04f56b35c32b60ac9b1f848e41e4698672cec6c1e - languageName: node - linkType: hard - "balanced-match@npm:^1.0.0": version: 1.0.2 resolution: "balanced-match@npm:1.0.2" @@ -5445,18 +5580,6 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^2.0.0, browserslist@npm:^2.11.3": - version: 2.11.3 - resolution: "browserslist@npm:2.11.3" - dependencies: - caniuse-lite: ^1.0.30000792 - electron-to-chromium: ^1.3.30 - bin: - browserslist: ./cli.js - checksum: 2ff908162669461e881bad516885b703fd594a0b7a139bf150c1952a74fe4ed8668ac46367a0d136d39a717de65e51c867316951e9fe0f92664c65b205eb9d93 - languageName: node - linkType: hard - "browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.14.5": version: 4.21.1 resolution: "browserslist@npm:4.21.1" @@ -5471,7 +5594,7 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.21.3": +"browserslist@npm:^4.21.3, browserslist@npm:^4.21.4": version: 4.21.4 resolution: "browserslist@npm:4.21.4" dependencies: @@ -5656,18 +5779,6 @@ __metadata: languageName: node linkType: hard -"caniuse-api@npm:^2.0.0": - version: 2.0.0 - resolution: "caniuse-api@npm:2.0.0" - dependencies: - browserslist: ^2.0.0 - caniuse-lite: ^1.0.0 - lodash.memoize: ^4.1.2 - lodash.uniq: ^4.5.0 - checksum: 22f4dc65b7aa646de70c778709d77e57eacc843e80a6e2f0ba5b53a9012748f35c2f430df6d234b09415446b006cd663b1a12a8cbbff933f1c58f3b91a0fe3a8 - languageName: node - linkType: hard - "caniuse-api@npm:^3.0.0": version: 3.0.0 resolution: "caniuse-api@npm:3.0.0" @@ -5680,7 +5791,7 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30000792, caniuse-lite@npm:^1.0.30000805, caniuse-lite@npm:^1.0.30001109": +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001109": version: 1.0.30001230 resolution: "caniuse-lite@npm:1.0.30001230" checksum: 7ad6bf592c272dc62e59eb05b7e8581f6e8e0b0f6cef8e687c82c8306d77dccacdbba86286a4d1e3defebdd358ddc0a236208f08ea8e7b899d7b519c1223399a @@ -5701,6 +5812,13 @@ __metadata: languageName: node linkType: hard +"caniuse-lite@npm:^1.0.30001407": + version: 1.0.30001421 + resolution: "caniuse-lite@npm:1.0.30001421" + checksum: acde5d9ea9e380bf04099d3d11a80c9a4f372af1f4094031b8dfc53f362707fd72e6b9703ca6086563cb4b64d8f0e4c30b85be3679227d32f6c511fc2b8e2e6c + languageName: node + linkType: hard + "caniuse-lite@npm:^1.0.30001420": version: 1.0.30001420 resolution: "caniuse-lite@npm:1.0.30001420" @@ -5721,7 +5839,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^2.0.0, chalk@npm:^2.0.1, chalk@npm:^2.1.0, chalk@npm:^2.3.0, chalk@npm:^2.4.1, chalk@npm:^2.4.2": +"chalk@npm:^2.0.0, chalk@npm:^2.1.0, chalk@npm:^2.3.0, chalk@npm:^2.4.1, chalk@npm:^2.4.2": version: 2.4.2 resolution: "chalk@npm:2.4.2" dependencies: @@ -5896,7 +6014,7 @@ __metadata: languageName: node linkType: hard -"clone@npm:^1.0.0, clone@npm:^1.0.2": +"clone@npm:^1.0.0": version: 1.0.4 resolution: "clone@npm:1.0.4" checksum: d06418b7335897209e77bdd430d04f882189582e67bd1f75a04565f3f07f5b3f119a9d670c943b6697d0afb100f03b866b3b8a1f91d4d02d72c4ecf2bb64b5dd @@ -5953,7 +6071,7 @@ __metadata: languageName: node linkType: hard -"color-convert@npm:^1.3.0, color-convert@npm:^1.8.2, color-convert@npm:^1.9.0, color-convert@npm:^1.9.1": +"color-convert@npm:^1.9.0, color-convert@npm:^1.9.1": version: 1.9.3 resolution: "color-convert@npm:1.9.3" dependencies: @@ -5985,25 +6103,6 @@ __metadata: languageName: node linkType: hard -"color-string@npm:^0.3.0": - version: 0.3.0 - resolution: "color-string@npm:0.3.0" - dependencies: - color-name: ^1.0.0 - checksum: cc65013a94d399ddcb81b3b4b6e0d2166cbaa77311260ff6271f215a286d3db58ab3a217bdb175f8b9dd95f9ea7ac94f71a595af6bcd3b6a02fea6e75ddaf5fb - languageName: node - linkType: hard - -"color-string@npm:^1.4.0, color-string@npm:^1.5.2": - version: 1.5.4 - resolution: "color-string@npm:1.5.4" - dependencies: - color-name: ^1.0.0 - simple-swizzle: ^0.2.2 - checksum: ae53f205d7a757ce7e1256dc4c8873675a8d3a5f136963183b94bbe725184239e0c19002177ee71488884abb7db958b1744cf83095c5b2b95d0b8937839162b7 - languageName: node - linkType: hard - "color-string@npm:^1.5.4": version: 1.9.1 resolution: "color-string@npm:1.9.1" @@ -6033,37 +6132,6 @@ __metadata: languageName: node linkType: hard -"color@npm:^0.11.0": - version: 0.11.4 - resolution: "color@npm:0.11.4" - dependencies: - clone: ^1.0.2 - color-convert: ^1.3.0 - color-string: ^0.3.0 - checksum: a6f624fd159e9311a6c1c86ac05b5b550c98e2d1e5646e032b8481e5e113127c06a84678b91c89c96b11b58c1c723dd9766b1b02cb2d441c6212a0f7cb3dad73 - languageName: node - linkType: hard - -"color@npm:^1.0.3": - version: 1.0.3 - resolution: "color@npm:1.0.3" - dependencies: - color-convert: ^1.8.2 - color-string: ^1.4.0 - checksum: 4b8264535dc518a92d7996f5e046b16bb4e4947824b955806c00101182aa1cd3e68a0718c36cfe13cce59e60ebe91087ca665bbf0883e6e9534ee4e622dbb41c - languageName: node - linkType: hard - -"color@npm:^2.0.1": - version: 2.0.1 - resolution: "color@npm:2.0.1" - dependencies: - color-convert: ^1.9.1 - color-string: ^1.5.2 - checksum: ee9217daf7316482d06237c0ec0cb7d94eee7fbcb71869c58631d8467cdcd3ffc64c69fd143c027ee7c5d793eb416dcad50a6391357c690e94e9dd969719ee28 - languageName: node - linkType: hard - "colord@npm:^2.9.3": version: 2.9.3 resolution: "colord@npm:2.9.3" @@ -6298,13 +6366,6 @@ __metadata: languageName: node linkType: hard -"core-js@npm:^2.4.0": - version: 2.6.12 - resolution: "core-js@npm:2.6.12" - checksum: 44fa9934a85f8c78d61e0c8b7b22436330471ffe59ec5076fe7f324d6e8cf7f824b14b1c81ca73608b13bdb0fef035bd820989bf059767ad6fa13123bb8bd016 - languageName: node - linkType: hard - "core-js@npm:^3.0.1": version: 3.25.1 resolution: "core-js@npm:3.25.1" @@ -6566,15 +6627,16 @@ __metadata: languageName: node linkType: hard -"css-color-function@npm:~1.3.3": - version: 1.3.3 - resolution: "css-color-function@npm:1.3.3" +"css-blank-pseudo@npm:^3.0.3": + version: 3.0.3 + resolution: "css-blank-pseudo@npm:3.0.3" dependencies: - balanced-match: 0.1.0 - color: ^0.11.0 - debug: ^3.1.0 - rgb: ~0.1.0 - checksum: 6859f7dd0064fbb53ed32db2db1878abe2e3750945148337703d143a133cb0cb2bc33c5a39cf8f5d29ed5ca8daf3b7a33e6a52a36bdcfd39f91d60f568465a09 + postcss-selector-parser: ^6.0.9 + peerDependencies: + postcss: ^8.4 + bin: + css-blank-pseudo: dist/cli.cjs + checksum: 9be0a13885a99d8ba9e1f45ea66e801d4da75b58c1c3c516a40772fa3a93ef9952b15dcac0418acbb6c89daaae0572819647701b8e553a02972826e33d4cd67f languageName: node linkType: hard @@ -6602,6 +6664,30 @@ __metadata: languageName: node linkType: hard +"css-has-pseudo@npm:^3.0.4": + version: 3.0.4 + resolution: "css-has-pseudo@npm:3.0.4" + dependencies: + postcss-selector-parser: ^6.0.9 + peerDependencies: + postcss: ^8.4 + bin: + css-has-pseudo: dist/cli.cjs + checksum: 8f165d68f6621891d9fa1d874794916a52ed8847dfbec591523ad68774650cc1eae062ba08f59514666e04aeba27be72c9b211892f3a187c5ba6e287bd4260e7 + languageName: node + linkType: hard + +"css-prefers-color-scheme@npm:^6.0.3": + version: 6.0.3 + resolution: "css-prefers-color-scheme@npm:6.0.3" + peerDependencies: + postcss: ^8.4 + bin: + css-prefers-color-scheme: dist/cli.cjs + checksum: 3a2b02f0454adda68861cdcaf6a0d11f462eadf165301cba61c5ec7c5f229ac261c5baa54c377d9b811ec5f21b30d72a02bc032cdad2415b3a566f08a0c47b3a + languageName: node + linkType: hard + "css-select-base-adapter@npm:^0.1.1": version: 0.1.1 resolution: "css-select-base-adapter@npm:0.1.1" @@ -6641,13 +6727,6 @@ __metadata: languageName: node linkType: hard -"css-unit-converter@npm:^1.1.1": - version: 1.1.2 - resolution: "css-unit-converter@npm:1.1.2" - checksum: 07888033346a5128f34dbe2f72884c966d24e9f29db24416dcde92860242490617ef9a178ac193a92f730834bbeea026cdc7027701d92ba9bbbe59db7a37eb2a - languageName: node - linkType: hard - "css-what@npm:^3.2.1": version: 3.4.2 resolution: "css-what@npm:3.4.2" @@ -6655,6 +6734,13 @@ __metadata: languageName: node linkType: hard +"cssdb@npm:^7.0.1": + version: 7.0.2 + resolution: "cssdb@npm:7.0.2" + checksum: 521957cc26d71525186e9027b01440681b510e9fe02485963eeabf5051c627b44642c3a7a2a53e1760dfab24ecdb7d8c75ee35373d8cfbb3547502960fb186c7 + languageName: node + linkType: hard + "cssesc@npm:^3.0.0": version: 3.0.0 resolution: "cssesc@npm:3.0.0" @@ -7181,13 +7267,6 @@ __metadata: languageName: node linkType: hard -"electron-to-chromium@npm:^1.3.30": - version: 1.3.637 - resolution: "electron-to-chromium@npm:1.3.637" - checksum: fb0f205c6929c774d2adac7a92ff1f8c9cfca66825f1c1b625c49056944bf5b02cd12fb73624657aadbf0bfa56ea045623b1d33bfca185e4dc3701505e7e9ab1 - languageName: node - linkType: hard - "electron-to-chromium@npm:^1.4.172": version: 1.4.177 resolution: "electron-to-chromium@npm:1.4.177" @@ -8396,13 +8475,6 @@ __metadata: languageName: node linkType: hard -"flatten@npm:^1.0.2": - version: 1.0.3 - resolution: "flatten@npm:1.0.3" - checksum: 5c57379816f1692aaa79fbc6390e0a0644e5e8442c5783ed57c6d315468eddbc53a659eaa03c9bb1e771b0f4a9bd8dd8a2620286bf21fd6538a7857321fdfb20 - languageName: node - linkType: hard - "flush-write-stream@npm:^1.0.2": version: 1.1.1 resolution: "flush-write-stream@npm:1.1.1" @@ -8460,6 +8532,13 @@ __metadata: languageName: node linkType: hard +"fraction.js@npm:^4.2.0": + version: 4.2.0 + resolution: "fraction.js@npm:4.2.0" + checksum: 8c76a6e21dedea87109d6171a0ac77afa14205794a565d71cb10d2925f629a3922da61bf45ea52dbc30bce4d8636dc0a27213a88cbd600eab047d82f9a3a94c5 + languageName: node + linkType: hard + "from@npm:~0": version: 0.1.7 resolution: "from@npm:0.1.7" @@ -10324,13 +10403,6 @@ __metadata: languageName: node linkType: hard -"isnumeric@npm:^0.2.0": - version: 0.2.0 - resolution: "isnumeric@npm:0.2.0" - checksum: bc9eb9c1377347926123e67568dc32b11950093856228cf9a29d1985aaae3775c82c437254de20a77a540f66281a4cb1337da73954eb1a6f5a0ee7d1eb6d3f64 - languageName: node - linkType: hard - "isobject@npm:^2.1.0": version: 2.1.0 resolution: "isobject@npm:2.1.0" @@ -11646,13 +11718,6 @@ __metadata: languageName: node linkType: hard -"lodash._reinterpolate@npm:^3.0.0": - version: 3.0.0 - resolution: "lodash._reinterpolate@npm:3.0.0" - checksum: 06d2d5f33169604fa5e9f27b6067ed9fb85d51a84202a656901e5ffb63b426781a601508466f039c720af111b0c685d12f1a5c14ff8df5d5f27e491e562784b2 - languageName: node - linkType: hard - "lodash.debounce@npm:^4.0.8": version: 4.0.8 resolution: "lodash.debounce@npm:4.0.8" @@ -11716,25 +11781,6 @@ __metadata: languageName: node linkType: hard -"lodash.template@npm:^4.2.4": - version: 4.5.0 - resolution: "lodash.template@npm:4.5.0" - dependencies: - lodash._reinterpolate: ^3.0.0 - lodash.templatesettings: ^4.0.0 - checksum: ca64e5f07b6646c9d3dbc0fe3aaa995cb227c4918abd1cef7a9024cd9c924f2fa389a0ec4296aa6634667e029bc81d4bbdb8efbfde11df76d66085e6c529b450 - languageName: node - linkType: hard - -"lodash.templatesettings@npm:^4.0.0": - version: 4.2.0 - resolution: "lodash.templatesettings@npm:4.2.0" - dependencies: - lodash._reinterpolate: ^3.0.0 - checksum: 863e025478b092997e11a04e9d9e735875eeff1ffcd6c61742aa8272e3c2cddc89ce795eb9726c4e74cef5991f722897ff37df7738a125895f23fc7d12a7bb59 - languageName: node - linkType: hard - "lodash.throttle@npm:^4.1.1": version: 4.1.1 resolution: "lodash.throttle@npm:4.1.1" @@ -11997,13 +12043,6 @@ __metadata: languageName: node linkType: hard -"math-expression-evaluator@npm:^1.2.14": - version: 1.3.7 - resolution: "math-expression-evaluator@npm:1.3.7" - checksum: a569227dfd72d5b35a02823f793659a0a7d5b84cca81d5ca05b645ea07a661053bb7f065bc3c0eb8c66794e356902c690b09e2c3af74ca3270dd27698c69c705 - languageName: node - linkType: hard - "mathml-tag-names@npm:^2.1.3": version: 2.1.3 resolution: "mathml-tag-names@npm:2.1.3" @@ -12828,13 +12867,6 @@ __metadata: languageName: node linkType: hard -"onecolor@npm:^3.0.4": - version: 3.1.0 - resolution: "onecolor@npm:3.1.0" - checksum: 7d2fbe56143eb1666aee6b7381073bc7372050d588be3ccaa2cfff820be6e167d727f8ee7099c5f1e2d0a771a46d917542162907e9d45eb45a85985b6ea92dde - languageName: node - linkType: hard - "onetime@npm:^5.1.0, onetime@npm:^5.1.2": version: 5.1.2 resolution: "onetime@npm:5.1.2" @@ -13339,17 +13371,6 @@ __metadata: languageName: node linkType: hard -"pixrem@npm:^4.0.0": - version: 4.0.1 - resolution: "pixrem@npm:4.0.1" - dependencies: - browserslist: ^2.0.0 - postcss: ^6.0.0 - reduce-css-calc: ^1.2.7 - checksum: 2bdcb8697b5b69657d5f779e3118249f52dc78978b9908efbe856fb1aaea1a957b35ad2766ba11bfcb883e7688cc8b167bb42e08c1a3a1793ee2808971d6f1f0 - languageName: node - linkType: hard - "pkg-dir@npm:^4.1.0, pkg-dir@npm:^4.2.0": version: 4.2.0 resolution: "pkg-dir@npm:4.2.0" @@ -13375,46 +13396,14 @@ __metadata: languageName: node linkType: hard -"pleeease-filters@npm:^4.0.0": - version: 4.0.0 - resolution: "pleeease-filters@npm:4.0.0" +"postcss-attribute-case-insensitive@npm:^5.0.2": + version: 5.0.2 + resolution: "postcss-attribute-case-insensitive@npm:5.0.2" dependencies: - onecolor: ^3.0.4 - postcss: ^6.0.1 - checksum: 112d1095924b192dbb882d2cbffb47ce00245cbf943c7a690448a702f6432d86855a4d100a658ad120ad9b8abc9928f697404297edd623cac279672e520f76c1 - languageName: node - linkType: hard - -"postcss-apply@npm:^0.8.0": - version: 0.8.0 - resolution: "postcss-apply@npm:0.8.0" - dependencies: - babel-runtime: ^6.23.0 - balanced-match: ^0.4.2 - postcss: ^6.0.0 - checksum: 1f1ca565166defb1d073b0c869d728212a95f3c91478da8b691e931a803f349b1a76b77c7ecd719814449153ffe6eaf77e289f14d9121d13fbf764ffd4bf627b - languageName: node - linkType: hard - -"postcss-attribute-case-insensitive@npm:^2.0.0": - version: 2.0.0 - resolution: "postcss-attribute-case-insensitive@npm:2.0.0" - dependencies: - postcss: ^6.0.0 - postcss-selector-parser: ^2.2.3 - checksum: 58cf5fc90ee3a3dcaef3a82b9f461be9b4159a2c942f17e7cff369c1823150643b162bbde71bbb86cfcf04e2872f07544b8f23d6a343ca4806ef95afa7b9c791 - languageName: node - linkType: hard - -"postcss-calc@npm:^6.0.0": - version: 6.0.2 - resolution: "postcss-calc@npm:6.0.2" - dependencies: - css-unit-converter: ^1.1.1 - postcss: ^7.0.2 - postcss-selector-parser: ^2.2.2 - reduce-css-calc: ^2.0.0 - checksum: 01366ca1558e9674086b01995c34aed7ba589da937597b67d29fe5f553b8b746387bc1ab0a01d507fe96f4ca3e39a0a8b7cc4b9478c415145b843b1ff559955e + postcss-selector-parser: ^6.0.10 + peerDependencies: + postcss: ^8.2 + checksum: c0b8139f37e68dba372724cba03a53c30716224f0085f98485cada99489beb7c3da9d598ffc1d81519b59d9899291712c9041c250205e6ec0b034bb2c144dcf9 languageName: node linkType: hard @@ -13429,92 +13418,47 @@ __metadata: languageName: node linkType: hard -"postcss-color-function@npm:^4.0.0": - version: 4.1.0 - resolution: "postcss-color-function@npm:4.1.0" - dependencies: - css-color-function: ~1.3.3 - postcss: ^6.0.23 - postcss-message-helpers: ^2.0.0 - postcss-value-parser: ^3.3.1 - checksum: c4dbfff69544f06e3542109c2eeeb64a4efbe2f7a0e023defcf20d2d95daeef17437abb86cae3a5caa1380e8ff440c8588f67b89034782b431f58f5f3e54a77c - languageName: node - linkType: hard - -"postcss-color-gray@npm:^4.0.0": +"postcss-clamp@npm:^4.1.0": version: 4.1.0 - resolution: "postcss-color-gray@npm:4.1.0" - dependencies: - color: ^2.0.1 - postcss: ^6.0.14 - postcss-message-helpers: ^2.0.0 - reduce-function-call: ^1.0.2 - checksum: 882c7dc13311fd7f0643bab0af4506f990aa68c276066d7c54cc0cbf997d36e32e585bfdddde43d4d80bd57241275d8a116fdf7b696b8d3c247dfb1c314bd962 - languageName: node - linkType: hard - -"postcss-color-hex-alpha@npm:^3.0.0": - version: 3.0.0 - resolution: "postcss-color-hex-alpha@npm:3.0.0" + resolution: "postcss-clamp@npm:4.1.0" dependencies: - color: ^1.0.3 - postcss: ^6.0.1 - postcss-message-helpers: ^2.0.0 - checksum: dd49bbaa90c6ebc7f73c9e9c2837060e13fc6255e333871cdca42cf5e4c55ae1bb4df1a7bf6800d528f72601e4c5c0c7e925566b7d57d2fc07d5127a34ab14de - languageName: node - linkType: hard - -"postcss-color-hsl@npm:^2.0.0": - version: 2.0.0 - resolution: "postcss-color-hsl@npm:2.0.0" - dependencies: - postcss: ^6.0.1 - postcss-value-parser: ^3.3.0 - units-css: ^0.4.0 - checksum: 73836ce7f84eeba1668e87255a32dae558f49e29aa0e6b6f16b6d9cd74ac2a67055035bf8a280418a04ce62f6b16ac1287a27b6c54e0b38f4b756cb277dc0cc1 - languageName: node - linkType: hard - -"postcss-color-hwb@npm:^3.0.0": - version: 3.0.0 - resolution: "postcss-color-hwb@npm:3.0.0" - dependencies: - color: ^1.0.3 - postcss: ^6.0.1 - postcss-message-helpers: ^2.0.0 - reduce-function-call: ^1.0.2 - checksum: f0d68b03eb3e21a37a72ce5efddda2ac61cfb44dd86066bc2035e401fc18b36855976ac654d9a54a7852cebf028a104bd3b80f822e45b75364928a846f7dee1d + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.4.6 + checksum: 118eec936b3b035dc8d75c89973408f15c5a3de3d1ee210a2b3511e3e431d9c56e6f354b509a90540241e2225ffe3caaa2fdf25919c63348ce4583a28ada642c languageName: node linkType: hard -"postcss-color-rebeccapurple@npm:^3.0.0": - version: 3.1.0 - resolution: "postcss-color-rebeccapurple@npm:3.1.0" +"postcss-color-functional-notation@npm:^4.2.4": + version: 4.2.4 + resolution: "postcss-color-functional-notation@npm:4.2.4" dependencies: - postcss: ^6.0.22 - postcss-values-parser: ^1.5.0 - checksum: b90c62245eedb735583d0d81b52a5a99f51bedde8782b1c1b0ec9cc6b86236f322dbf9476ef8608d9eb332fb51f480e5f87e87545dbb822a8b93c82f44359db2 + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: b763e164fe3577a1de96f75e4bf451585c4f80b8ce60799763a51582cc9402d76faed57324a5d5e5556d90ca7ea0ebde565acb820c95e04bee6f36a91b019831 languageName: node linkType: hard -"postcss-color-rgb@npm:^2.0.0": - version: 2.0.0 - resolution: "postcss-color-rgb@npm:2.0.0" +"postcss-color-hex-alpha@npm:^8.0.4": + version: 8.0.4 + resolution: "postcss-color-hex-alpha@npm:8.0.4" dependencies: - postcss: ^6.0.1 - postcss-value-parser: ^3.3.0 - checksum: 6f7bebbff4cb418304b536cbd3aeb78793d0ec2672a25084f8e169dd7682cc91aef60c30015907c39c937675448e401638cb706d393b45ca47d60d1b8d2e2aaf + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.4 + checksum: a2f3173a60176cf0aea3b7ebbc799b2cb08229127f0fff708fa31efa14e4ded47ca49aff549d8ed92e74ffe24adee32d5b9d557dbde0524fde5fe389bc520b4e languageName: node linkType: hard -"postcss-color-rgba-fallback@npm:^3.0.0": - version: 3.0.0 - resolution: "postcss-color-rgba-fallback@npm:3.0.0" +"postcss-color-rebeccapurple@npm:^7.1.1": + version: 7.1.1 + resolution: "postcss-color-rebeccapurple@npm:7.1.1" dependencies: - postcss: ^6.0.6 - postcss-value-parser: ^3.3.0 - rgb-hex: ^2.1.0 - checksum: 245df07d2ca94db9c03ba372648a48ff5c2817d3f8131fb0e7397176a7a51507b0e05a5c6fbcec9637b3452d074417a599f3450fffecc4f38d10e9471f83331b + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: 03482f9b8170da0fa014c41a5d88bce7b987471fb73fc456d397222a2455c89ac7f974dd6ddf40fd31907e768aad158057164b7c5f62cee63a6ecf29d47d7467 languageName: node linkType: hard @@ -13541,73 +13485,47 @@ __metadata: languageName: node linkType: hard -"postcss-cssnext@npm:3.1.1": - version: 3.1.1 - resolution: "postcss-cssnext@npm:3.1.1" - dependencies: - autoprefixer: ^7.1.1 - caniuse-api: ^2.0.0 - chalk: ^2.0.1 - pixrem: ^4.0.0 - pleeease-filters: ^4.0.0 - postcss: ^6.0.5 - postcss-apply: ^0.8.0 - postcss-attribute-case-insensitive: ^2.0.0 - postcss-calc: ^6.0.0 - postcss-color-function: ^4.0.0 - postcss-color-gray: ^4.0.0 - postcss-color-hex-alpha: ^3.0.0 - postcss-color-hsl: ^2.0.0 - postcss-color-hwb: ^3.0.0 - postcss-color-rebeccapurple: ^3.0.0 - postcss-color-rgb: ^2.0.0 - postcss-color-rgba-fallback: ^3.0.0 - postcss-custom-media: ^6.0.0 - postcss-custom-properties: ^6.1.0 - postcss-custom-selectors: ^4.0.1 - postcss-font-family-system-ui: ^3.0.0 - postcss-font-variant: ^3.0.0 - postcss-image-set-polyfill: ^0.3.5 - postcss-initial: ^2.0.0 - postcss-media-minmax: ^3.0.0 - postcss-nesting: ^4.0.1 - postcss-pseudo-class-any-link: ^4.0.0 - postcss-pseudoelements: ^5.0.0 - postcss-replace-overflow-wrap: ^2.0.0 - postcss-selector-matches: ^3.0.1 - postcss-selector-not: ^3.0.1 +"postcss-custom-media@npm:^8.0.2": + version: 8.0.2 + resolution: "postcss-custom-media@npm:8.0.2" + dependencies: + postcss-value-parser: ^4.2.0 peerDependencies: - caniuse-lite: ^1.0.30000697 - checksum: daa46343c0e086700a6c25e9261aac2f8396d3fdac1e86c02f5e3d1854737213edda4104ce6f30a7c76f3ad989326e916fc102e5607dfdd4a54f0a5f93e1b407 + postcss: ^8.3 + checksum: 887bbbacf6f8fab688123796e5dc1e8283b99f21e4c674235bd929dc8018c50df8634ea08932033ec93baaca32670ef2b87e6632863e0b4d84847375dbde9366 languageName: node linkType: hard -"postcss-custom-media@npm:^6.0.0": - version: 6.0.0 - resolution: "postcss-custom-media@npm:6.0.0" +"postcss-custom-properties@npm:^12.1.9": + version: 12.1.9 + resolution: "postcss-custom-properties@npm:12.1.9" dependencies: - postcss: ^6.0.1 - checksum: 0d616d5369a99fa7e0efa1951b7ea2b5208e2a0e8df9c9324c67cd61a8f5fc9b3b4b6d88e0175d12c1e940dc5c6a0fbd42a7a56b4ec10450dd252bd5cd8cb12c + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: db4194665bc104fd05608dd282caa6298870ffe5ca9a6733a9b48f4191fcc1225c8ce08e4c883a0e5eaa7a68daa18f3d7d71690ab74854b37bf0305976256cdf languageName: node linkType: hard -"postcss-custom-properties@npm:^6.1.0": - version: 6.3.1 - resolution: "postcss-custom-properties@npm:6.3.1" +"postcss-custom-selectors@npm:^6.0.3": + version: 6.0.3 + resolution: "postcss-custom-selectors@npm:6.0.3" dependencies: - balanced-match: ^1.0.0 - postcss: ^6.0.18 - checksum: ae7fc852259ef6d223fdcf561bcb4106bedc51abc353d259a102b7cff5066446bef01734874508604b664d7b25394fd1ca09f93a475174d299edcc02194254e3 + postcss-selector-parser: ^6.0.4 + peerDependencies: + postcss: ^8.3 + checksum: 18080d60a8a77a76d8ddff185104d65418fffd02bbf9824499f807ced7941509ba63828ab8fe3ec1d6b0d6c72a482bb90a79d79cdef58e5f4b30113cca16e69b languageName: node linkType: hard -"postcss-custom-selectors@npm:^4.0.1": - version: 4.0.1 - resolution: "postcss-custom-selectors@npm:4.0.1" +"postcss-dir-pseudo-class@npm:^6.0.5": + version: 6.0.5 + resolution: "postcss-dir-pseudo-class@npm:6.0.5" dependencies: - postcss: ^6.0.1 - postcss-selector-matches: ^3.0.0 - checksum: a3f25ae1fcdf83748f920eabab1d2ea9eda0f722cfb1b0c679577ed5231ef3b0e5125ef81b9c11ba383b5aae21de04e4e82c87c129542c1b7c9f4bd37f9edd65 + postcss-selector-parser: ^6.0.10 + peerDependencies: + postcss: ^8.2 + checksum: 7810c439d8d1a9072c00f8ab39261a1492873ad170425745bd2819c59767db2f352f906588fc2a7d814e91117900563d7e569ecd640367c7332b26b9829927ef languageName: node linkType: hard @@ -13647,31 +13565,77 @@ __metadata: languageName: node linkType: hard -"postcss-font-family-system-ui@npm:^3.0.0": - version: 3.0.0 - resolution: "postcss-font-family-system-ui@npm:3.0.0" +"postcss-double-position-gradients@npm:^3.1.2": + version: 3.1.2 + resolution: "postcss-double-position-gradients@npm:3.1.2" dependencies: - postcss: ^6.0 - checksum: 6ad35ec6e2499130181ae7962fd3bd52244ebf53d6ea97a2299d98fa3e9917cdfafa6cac1e4b146cadbd409db877d43a5ac25bd82ad0df68f374399d06866f7a + "@csstools/postcss-progressive-custom-properties": ^1.1.0 + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: ca09bf2aefddc180f1c1413f379eef30d492b8147543413f7251216f23f413c394b2ed10b7cd255e87b18e0c8efe36087ea8b9bfb26a09813f9607a0b8e538b6 languageName: node linkType: hard -"postcss-font-variant@npm:^3.0.0": - version: 3.0.0 - resolution: "postcss-font-variant@npm:3.0.0" +"postcss-env-function@npm:^4.0.6": + version: 4.0.6 + resolution: "postcss-env-function@npm:4.0.6" dependencies: - postcss: ^6.0.1 - checksum: a0b2afc64dd6e33712d0464ab50a13ff138aedf65b52b91bb7f66c16313368124ee96defcc3b988a886b367cfc1883b79c4f35804d9f3764afe79c83858a5e4e + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.4 + checksum: 645b2363cfa21be9dcce7fe4a0f172f0af70c00d6a4c1eb3d7ff7e9cfe26d569e291ec2533114d77b12d610023cd168a92d62c38f2fc969fa333b5ae2bff5ffe languageName: node linkType: hard -"postcss-image-set-polyfill@npm:^0.3.5": - version: 0.3.5 - resolution: "postcss-image-set-polyfill@npm:0.3.5" +"postcss-focus-visible@npm:^6.0.4": + version: 6.0.4 + resolution: "postcss-focus-visible@npm:6.0.4" dependencies: - postcss: ^6.0.1 - postcss-media-query-parser: ^0.2.3 - checksum: 5f003275128302b25df8c3923c1b7bf424b5f28f8e7bca867a748f9b917d2e10b26f07149e745d2af8866b0b3b3682a21069120edfeb80c8362c214bd14de0ab + postcss-selector-parser: ^6.0.9 + peerDependencies: + postcss: ^8.4 + checksum: acd010b9ddef9b86ffb5fa604c13515ba83e18bc5118dad0a1281150f412aa0ece056c2c5ac56b55e2599f53ab0f740f5ebfdc51e1f5cfe43b8130bac0096fcc + languageName: node + linkType: hard + +"postcss-focus-within@npm:^5.0.4": + version: 5.0.4 + resolution: "postcss-focus-within@npm:5.0.4" + dependencies: + postcss-selector-parser: ^6.0.9 + peerDependencies: + postcss: ^8.4 + checksum: f23d8ab757345a6deaa807d76e10c88caf4b771c38b60e1593b24aee161c503b5823620e89302226a6ae5e7afdb6ac31809241291912e4176eb594a7ddcc9521 + languageName: node + linkType: hard + +"postcss-font-variant@npm:^5.0.0": + version: 5.0.0 + resolution: "postcss-font-variant@npm:5.0.0" + peerDependencies: + postcss: ^8.1.0 + checksum: a19286589261c2bc3e20470486e1ee3b4daf34271c5020167f30856c9b30c26f23264307cb97a184d503814e1b8c5d8a1f9f64a14fd4fd9551c173dca9424695 + languageName: node + linkType: hard + +"postcss-gap-properties@npm:^3.0.5": + version: 3.0.5 + resolution: "postcss-gap-properties@npm:3.0.5" + peerDependencies: + postcss: ^8.2 + checksum: aed559d6d375203a08a006c9ae8cf5ae90d9edaec5cadd20fe65c1b8ce63c2bc8dfe752d4331880a6e24a300541cde61058be790b7bd9b5d04d470c250fbcd39 + languageName: node + linkType: hard + +"postcss-image-set-function@npm:^4.0.7": + version: 4.0.7 + resolution: "postcss-image-set-function@npm:4.0.7" + dependencies: + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: 7e509330986de14250ead1a557e8da8baaf66ebe8a40354a5dff60ab40d99a483d92aa57d52713251ca1adbf0055ef476c5702b0d0ba5f85a4f407367cdabac0 languageName: node linkType: hard @@ -13687,13 +13651,24 @@ __metadata: languageName: node linkType: hard -"postcss-initial@npm:^2.0.0": - version: 2.0.0 - resolution: "postcss-initial@npm:2.0.0" +"postcss-initial@npm:^4.0.1": + version: 4.0.1 + resolution: "postcss-initial@npm:4.0.1" + peerDependencies: + postcss: ^8.0.0 + checksum: 6956953853865de79c39d11533a2860e9f38b770bb284d0010d98a00b9469e22de344e4e5fd8208614d797030487e8918dd2f2c37d9e24d4dd59d565d4fc3e12 + languageName: node + linkType: hard + +"postcss-lab-function@npm:^4.2.1": + version: 4.2.1 + resolution: "postcss-lab-function@npm:4.2.1" dependencies: - lodash.template: ^4.2.4 - postcss: ^6.0.1 - checksum: d2686a699b02b2a6e61adee34189d25c60ef265213735c72979d0704476b339b142b964e281b1f537dd55735a19c5444813c3849d2aa13036da670b53720d042 + "@csstools/postcss-progressive-custom-properties": ^1.1.0 + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: 26ac74b430011271b5581beba69b2cd788f56375fcb64c90f6ec1577379af85f6022dc38c410ff471dac520c7ddc289160a6a16cca3c7ff76f5af7e90d31eaa3 languageName: node linkType: hard @@ -13706,12 +13681,21 @@ __metadata: languageName: node linkType: hard -"postcss-media-minmax@npm:^3.0.0": - version: 3.0.0 - resolution: "postcss-media-minmax@npm:3.0.0" - dependencies: - postcss: ^6.0.1 - checksum: 642194880af15dfdd95aa633a3ffaf54f55fdfe8e8a5ed8d7dfaffb4cf3c66117381e77c6fe0432eb4e786229369869a5070c05a5501702bce9631e8873d1fd0 +"postcss-logical@npm:^5.0.4": + version: 5.0.4 + resolution: "postcss-logical@npm:5.0.4" + peerDependencies: + postcss: ^8.4 + checksum: 17c71291ed6a03883a5aa54b9923b874c32710707d041a0f0752e6febdb09dee5d2abf4ef271978d932e4a4c948f349bb23edf633c03e3427ba15e71bfc66ac7 + languageName: node + linkType: hard + +"postcss-media-minmax@npm:^5.0.0": + version: 5.0.0 + resolution: "postcss-media-minmax@npm:5.0.0" + peerDependencies: + postcss: ^8.1.0 + checksum: 2cd7283e07a1ac1acdcc3ecbaa0e9932f8d1e7647e7aeb14d91845fcb890d60d7257ec70c825cae8d48ae80a08cc77ebc4021a0dfa32360e0cd991e2bc021607 languageName: node linkType: hard @@ -13748,13 +13732,6 @@ __metadata: languageName: node linkType: hard -"postcss-message-helpers@npm:^2.0.0": - version: 2.0.0 - resolution: "postcss-message-helpers@npm:2.0.0" - checksum: 2a2c43113eb67a0d9551e1dc135a56bc4e5f783365f396b0b7926f77968e21bf9ee5698810acec46e9635a413ae4e33eaed6c289cf2b4bc54333fcea65532a8c - languageName: node - linkType: hard - "postcss-minify-font-values@npm:^4.0.2": version: 4.0.2 resolution: "postcss-minify-font-values@npm:4.0.2" @@ -13803,12 +13780,15 @@ __metadata: languageName: node linkType: hard -"postcss-nesting@npm:^4.0.1": - version: 4.2.1 - resolution: "postcss-nesting@npm:4.2.1" +"postcss-nesting@npm:^10.2.0": + version: 10.2.0 + resolution: "postcss-nesting@npm:10.2.0" dependencies: - postcss: ^6.0.11 - checksum: 2dced3b2182d705f7ae7ee6ababdfac5c8e19657aa9b00443d4d453ff0525fbd2013f61abc038a0cfa6b5ec7deb1953f3c367d293fa7d684a2324cafa4797bf0 + "@csstools/selector-specificity": ^2.0.0 + postcss-selector-parser: ^6.0.10 + peerDependencies: + postcss: ^8.2 + checksum: 25e6e66186bd7f18bc4628cf0f43e02189268f28a449aa4a63b33b8f2c33745af99acfcd4ce2ac69319dc850e83b28dbaabcf517e3977dfe20e37fed0e032c7d languageName: node linkType: hard @@ -13911,6 +13891,13 @@ __metadata: languageName: node linkType: hard +"postcss-opacity-percentage@npm:^1.1.2": + version: 1.1.2 + resolution: "postcss-opacity-percentage@npm:1.1.2" + checksum: b582f6d4efb6a14aa09ba49869774c2f060558a68af8a0c3aa9efc0e01b35a4985e783640806a76d4e26d2ba97556f9b5e88dde91d1664a2e2c24688e4bbcf61 + languageName: node + linkType: hard + "postcss-ordered-values@npm:^4.1.2": version: 4.1.2 resolution: "postcss-ordered-values@npm:4.1.2" @@ -13922,22 +13909,104 @@ __metadata: languageName: node linkType: hard -"postcss-pseudo-class-any-link@npm:^4.0.0": - version: 4.0.0 - resolution: "postcss-pseudo-class-any-link@npm:4.0.0" +"postcss-overflow-shorthand@npm:^3.0.4": + version: 3.0.4 + resolution: "postcss-overflow-shorthand@npm:3.0.4" + dependencies: + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: 74009022491e3901263f8f5811630393480323e51f5d23ef17f3fdc7e03bf9c2502a632f3ba8fe6a468b57590f13b2fa3b17a68ef19653589e76277607696743 + languageName: node + linkType: hard + +"postcss-page-break@npm:^3.0.4": + version: 3.0.4 + resolution: "postcss-page-break@npm:3.0.4" + peerDependencies: + postcss: ^8 + checksum: a7d08c945fc691f62c77ac701e64722218b14ec5c8fc1972b8af9c21553492d40808cf95e61b9697b1dacaf7e6180636876d7fee314f079e6c9e39ac1b1edc6f + languageName: node + linkType: hard + +"postcss-place@npm:^7.0.5": + version: 7.0.5 + resolution: "postcss-place@npm:7.0.5" dependencies: - postcss: ^6.0.1 - postcss-selector-parser: ^2.2.3 - checksum: 0a44c60b48ea01edce31652e144464bf772f1c71528f0dd81f87c7fa95e485668586095ed968d7ea43d52e417bd4e7dff120b82ae1bfb48377b1a196b1b8843b + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: 903fec0c313bb7ec20f2c8f0a125866fb7804aa3186b5b2c7c2d58cb9039ff301461677a060e9db643d1aaffaf80a0ff71e900a6da16705dad6b49c804cb3c73 + languageName: node + linkType: hard + +"postcss-preset-env@npm:^7.8.2": + version: 7.8.2 + resolution: "postcss-preset-env@npm:7.8.2" + dependencies: + "@csstools/postcss-cascade-layers": ^1.1.0 + "@csstools/postcss-color-function": ^1.1.1 + "@csstools/postcss-font-format-keywords": ^1.0.1 + "@csstools/postcss-hwb-function": ^1.0.2 + "@csstools/postcss-ic-unit": ^1.0.1 + "@csstools/postcss-is-pseudo-class": ^2.0.7 + "@csstools/postcss-nested-calc": ^1.0.0 + "@csstools/postcss-normalize-display-values": ^1.0.1 + "@csstools/postcss-oklab-function": ^1.1.1 + "@csstools/postcss-progressive-custom-properties": ^1.3.0 + "@csstools/postcss-stepped-value-functions": ^1.0.1 + "@csstools/postcss-text-decoration-shorthand": ^1.0.0 + "@csstools/postcss-trigonometric-functions": ^1.0.2 + "@csstools/postcss-unset-value": ^1.0.2 + autoprefixer: ^10.4.11 + browserslist: ^4.21.3 + css-blank-pseudo: ^3.0.3 + css-has-pseudo: ^3.0.4 + css-prefers-color-scheme: ^6.0.3 + cssdb: ^7.0.1 + postcss-attribute-case-insensitive: ^5.0.2 + postcss-clamp: ^4.1.0 + postcss-color-functional-notation: ^4.2.4 + postcss-color-hex-alpha: ^8.0.4 + postcss-color-rebeccapurple: ^7.1.1 + postcss-custom-media: ^8.0.2 + postcss-custom-properties: ^12.1.9 + postcss-custom-selectors: ^6.0.3 + postcss-dir-pseudo-class: ^6.0.5 + postcss-double-position-gradients: ^3.1.2 + postcss-env-function: ^4.0.6 + postcss-focus-visible: ^6.0.4 + postcss-focus-within: ^5.0.4 + postcss-font-variant: ^5.0.0 + postcss-gap-properties: ^3.0.5 + postcss-image-set-function: ^4.0.7 + postcss-initial: ^4.0.1 + postcss-lab-function: ^4.2.1 + postcss-logical: ^5.0.4 + postcss-media-minmax: ^5.0.0 + postcss-nesting: ^10.2.0 + postcss-opacity-percentage: ^1.1.2 + postcss-overflow-shorthand: ^3.0.4 + postcss-page-break: ^3.0.4 + postcss-place: ^7.0.5 + postcss-pseudo-class-any-link: ^7.1.6 + postcss-replace-overflow-wrap: ^4.0.0 + postcss-selector-not: ^6.0.1 + postcss-value-parser: ^4.2.0 + peerDependencies: + postcss: ^8.2 + checksum: ffe86bef475f57cdacb93de79a3ebe372f2d1904a33b715dcb9e9f27980091afb750a7935dcc65ce9bbaa28f9ca34d17a650a3e82f4b8f9d197a694a1a958959 languageName: node linkType: hard -"postcss-pseudoelements@npm:^5.0.0": - version: 5.0.0 - resolution: "postcss-pseudoelements@npm:5.0.0" +"postcss-pseudo-class-any-link@npm:^7.1.6": + version: 7.1.6 + resolution: "postcss-pseudo-class-any-link@npm:7.1.6" dependencies: - postcss: ^6.0.0 - checksum: e199351e1f6284efa69c7812af76ede010f481ca15caf3689497f4e6d68952ab6f5585258a3f3b13fdcfadbf06bd3f926e9d3640ded1912a9bda47e944eae0d3 + postcss-selector-parser: ^6.0.10 + peerDependencies: + postcss: ^8.2 + checksum: 43aa18ea1ef1b168f61310856dd92f46ceb3dc60b6cf820e079ca1a849df5cc0f12a1511bdc1811a23f03d60ddcc959200c80c3f9a7b57feebe32bab226afb39 languageName: node linkType: hard @@ -13965,12 +14034,12 @@ __metadata: languageName: node linkType: hard -"postcss-replace-overflow-wrap@npm:^2.0.0": - version: 2.0.0 - resolution: "postcss-replace-overflow-wrap@npm:2.0.0" - dependencies: - postcss: ^6.0.1 - checksum: cbb1591d9c09d95a0923af382c46fdda3778cfb30fcd61b75a3202892381bfe8e152210ce34b70e1bc84ae4b9de03fbb38a50038d2d7098eb3766654b81b920e +"postcss-replace-overflow-wrap@npm:^4.0.0": + version: 4.0.0 + resolution: "postcss-replace-overflow-wrap@npm:4.0.0" + peerDependencies: + postcss: ^8.0.3 + checksum: 3ffe20b300a4c377a11c588b142740d8557e03c707474c45234c934190ac374750ddc92c7906c373471d273a20504a429c2062c21fdcaff830fb28e0a81ac1dc languageName: node linkType: hard @@ -13999,34 +14068,14 @@ __metadata: languageName: node linkType: hard -"postcss-selector-matches@npm:^3.0.0, postcss-selector-matches@npm:^3.0.1": - version: 3.0.1 - resolution: "postcss-selector-matches@npm:3.0.1" - dependencies: - balanced-match: ^0.4.2 - postcss: ^6.0.1 - checksum: dfef76b1c15c9e06661d5dd8eac94f091f0e4f3279f5001c973c2956b8f44f15a8340a19bda3b9603342b987fcaf740e619b35127d1a0aa8364ddaddb54c7c4e - languageName: node - linkType: hard - -"postcss-selector-not@npm:^3.0.1": - version: 3.0.1 - resolution: "postcss-selector-not@npm:3.0.1" - dependencies: - balanced-match: ^0.4.2 - postcss: ^6.0.1 - checksum: b1d8bdbf657a858d08bc6555b9664ed7dae987ba01ccdf0b6d4c65e95541970b986bbc2e899d8a2fcfa91f15fa9275241bde7d644dd7a557cdff418e3038cfae - languageName: node - linkType: hard - -"postcss-selector-parser@npm:^2.2.2, postcss-selector-parser@npm:^2.2.3": - version: 2.2.3 - resolution: "postcss-selector-parser@npm:2.2.3" +"postcss-selector-not@npm:^6.0.1": + version: 6.0.1 + resolution: "postcss-selector-not@npm:6.0.1" dependencies: - flatten: ^1.0.2 - indexes-of: ^1.0.1 - uniq: ^1.0.1 - checksum: ea5aba10ffb4d3f0804f1d6b46cef121bcfba9b14b78beba89f38a4520a3000384458dbc52a8453b17a56fa83414572972e897735519c52c9a218dd5e3ccf11f + postcss-selector-parser: ^6.0.10 + peerDependencies: + postcss: ^8.2 + checksum: fe523a0219e4bd34f04498534bb9e8aec3193f3585eafe4c388d086955b41201cae71fd20980ca465acade7f182029b43dbd5ca7e9d50bf34bbcaf1d19fe3ee6 languageName: node linkType: hard @@ -14041,7 +14090,7 @@ __metadata: languageName: node linkType: hard -"postcss-selector-parser@npm:^6.0.10, postcss-selector-parser@npm:^6.0.2": +"postcss-selector-parser@npm:^6.0.10, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.0.9": version: 6.0.10 resolution: "postcss-selector-parser@npm:6.0.10" dependencies: @@ -14082,7 +14131,7 @@ __metadata: languageName: node linkType: hard -"postcss-value-parser@npm:^3.0.0, postcss-value-parser@npm:^3.2.3, postcss-value-parser@npm:^3.3.0, postcss-value-parser@npm:^3.3.1": +"postcss-value-parser@npm:^3.0.0, postcss-value-parser@npm:^3.2.3": version: 3.3.1 resolution: "postcss-value-parser@npm:3.3.1" checksum: 62cd26e1cdbcf2dcc6bcedf3d9b409c9027bc57a367ae20d31dd99da4e206f730689471fd70a2abe866332af83f54dc1fa444c589e2381bf7f8054c46209ce16 @@ -14096,17 +14145,6 @@ __metadata: languageName: node linkType: hard -"postcss-values-parser@npm:^1.5.0": - version: 1.5.0 - resolution: "postcss-values-parser@npm:1.5.0" - dependencies: - flatten: ^1.0.2 - indexes-of: ^1.0.1 - uniq: ^1.0.1 - checksum: b827b69e576f7586ec6255660e0e80d84ca3f873cbc7d2978189d7052038559318f35bef946dd56bccb7f8c970ab280fe5acb921014ebb4004fb75bdfef9d328 - languageName: node - linkType: hard - "postcss@npm:8.4.18, postcss@npm:^8.4.17": version: 8.4.18 resolution: "postcss@npm:8.4.18" @@ -14118,7 +14156,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^6.0, postcss@npm:^6.0.0, postcss@npm:^6.0.1, postcss@npm:^6.0.11, postcss@npm:^6.0.14, postcss@npm:^6.0.17, postcss@npm:^6.0.18, postcss@npm:^6.0.22, postcss@npm:^6.0.23, postcss@npm:^6.0.5, postcss@npm:^6.0.6": +"postcss@npm:^6.0.11": version: 6.0.23 resolution: "postcss@npm:6.0.23" dependencies: @@ -14129,7 +14167,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^7.0.0, postcss@npm:^7.0.1, postcss@npm:^7.0.2, postcss@npm:^7.0.27, postcss@npm:^7.0.32": +"postcss@npm:^7.0.0, postcss@npm:^7.0.1, postcss@npm:^7.0.27, postcss@npm:^7.0.32": version: 7.0.35 resolution: "postcss@npm:7.0.35" dependencies: @@ -14719,36 +14757,6 @@ __metadata: languageName: node linkType: hard -"reduce-css-calc@npm:^1.2.7": - version: 1.3.0 - resolution: "reduce-css-calc@npm:1.3.0" - dependencies: - balanced-match: ^0.4.2 - math-expression-evaluator: ^1.2.14 - reduce-function-call: ^1.0.1 - checksum: 72696db02ede8772fe5ba9c47c6d451557bea0d11525f4e54b6adfcc4e540558755bb0ad454824cb6b998f0bd940eb2ef594f35b3d509dfa37934d93ece0f707 - languageName: node - linkType: hard - -"reduce-css-calc@npm:^2.0.0": - version: 2.1.8 - resolution: "reduce-css-calc@npm:2.1.8" - dependencies: - css-unit-converter: ^1.1.1 - postcss-value-parser: ^3.3.0 - checksum: 8fd27c06c4b443b84749a69a8b97d10e6ec7d142b625b41923a8807abb22b9e37e44df14e26cc606a802957be07bdce5e8ee2976a6952a7b438a7727007101e9 - languageName: node - linkType: hard - -"reduce-function-call@npm:^1.0.1, reduce-function-call@npm:^1.0.2": - version: 1.0.3 - resolution: "reduce-function-call@npm:1.0.3" - dependencies: - balanced-match: ^1.0.0 - checksum: d0169016ea22b59d55fa3206507c8f2d009574abd0f9b86552035a8405d52f6d7d5b60d084c5950d6f2884df7de42f87a6260b1b386b79ede63bfc87ea0c3ce8 - languageName: node - linkType: hard - "redux-devtools-extension@npm:2.13.9": version: 2.13.9 resolution: "redux-devtools-extension@npm:2.13.9" @@ -14810,13 +14818,6 @@ __metadata: languageName: node linkType: hard -"regenerator-runtime@npm:^0.11.0": - version: 0.11.1 - resolution: "regenerator-runtime@npm:0.11.1" - checksum: 3c97bd2c7b2b3247e6f8e2147a002eb78c995323732dad5dc70fac8d8d0b758d0295e7015b90d3d444446ae77cbd24b9f9123ec3a77018e81d8999818301b4f4 - languageName: node - linkType: hard - "regenerator-runtime@npm:^0.13.4": version: 0.13.7 resolution: "regenerator-runtime@npm:0.13.7" @@ -15128,13 +15129,6 @@ __metadata: languageName: node linkType: hard -"rgb-hex@npm:^2.1.0": - version: 2.1.0 - resolution: "rgb-hex@npm:2.1.0" - checksum: da3fccf3661d91e9feaa1c48cf130b728a598b1a5cb5b1f59a1c597f1a60e547c1dfa6790476d320281278e47f6ee218f0a3f512fb9d7e3698b132fa6a45c6ba - languageName: node - linkType: hard - "rgb-regex@npm:^1.0.1": version: 1.0.1 resolution: "rgb-regex@npm:1.0.1" @@ -15142,15 +15136,6 @@ __metadata: languageName: node linkType: hard -"rgb@npm:~0.1.0": - version: 0.1.0 - resolution: "rgb@npm:0.1.0" - bin: - rgb: ./bin/rgb - checksum: d33da6b61be7f200043dec325d2cf359cbd5d8d85ca4c3b3db47b884fbcfbba69dc2f698e97593448a51151b322d8aad3d15254eaed2fac4f6c9c095c3936289 - languageName: node - linkType: hard - "rgba-regex@npm:^1.0.0": version: 1.0.0 resolution: "rgba-regex@npm:1.0.0" @@ -17015,16 +17000,6 @@ __metadata: languageName: node linkType: hard -"units-css@npm:^0.4.0": - version: 0.4.0 - resolution: "units-css@npm:0.4.0" - dependencies: - isnumeric: ^0.2.0 - viewport-dimensions: ^0.2.0 - checksum: 9986b3f4b1cb366f9afdfd806abc5400390cbf701ac0e9c5f4fcc370b3aa099233fa8b4abfd33f59576cbeba0179a667a9b22b0e9844b1bd2ebc6a8339f4a984 - languageName: node - linkType: hard - "universalify@npm:^0.1.2": version: 0.1.2 resolution: "universalify@npm:0.1.2" @@ -17218,13 +17193,6 @@ __metadata: languageName: node linkType: hard -"viewport-dimensions@npm:^0.2.0": - version: 0.2.0 - resolution: "viewport-dimensions@npm:0.2.0" - checksum: d15424d553e210c363c0907441bd559edc7c969a4962ebcc54b8db032e01f66381fb7912c7eba1aa664fb95701cb89aabe835a14e006c1da991ccd39f44862bd - languageName: node - linkType: hard - "vinyl-fs@npm:^3.0.1": version: 3.0.3 resolution: "vinyl-fs@npm:3.0.3" @@ -17767,9 +17735,9 @@ __metadata: path-browserify: 1.0.1 platform: 1.3.6 postcss: 8.4.18 - postcss-cssnext: 3.1.1 postcss-import: 12.0.1 postcss-less: 6.0.0 + postcss-preset-env: ^7.8.2 postcss-scss: 4.0.5 prettier: 2.7.1 raf: 3.4.1 From da97b2756f7af059b19e8e2cfedb020b19b9d976 Mon Sep 17 00:00:00 2001 From: Sebastian Willenborg Date: Wed, 19 Oct 2022 09:15:03 +0200 Subject: [PATCH 10/66] fix: use hasOwnProperty instead of direct object access (#13896) This verifies that an externally controlled value can only be set to defined entries in `actions` and will otherwise return with an error. --- src/worker/sw-value-store.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/worker/sw-value-store.js b/src/worker/sw-value-store.js index 0c5d0d8e689..0530369486e 100644 --- a/src/worker/sw-value-store.js +++ b/src/worker/sw-value-store.js @@ -43,11 +43,11 @@ function keepAlive() { global.addEventListener('install', event => event.waitUntil(global.skipWaiting())); global.addEventListener('message', event => { const client = event.ports[0]; - const action = actions[event.data.action]; - if (!action) { + if (!actions.hasOwnProperty(event.data.action)) { console.error(`Action '${event.data.action}' doesn't exist in value store service worker`); return; } + const action = actions[event.data.action]; const value = action(event.data.value); client.postMessage(value); }); From 00bf48f2d6eb9b959b16699a85388e060919b23f Mon Sep 17 00:00:00 2001 From: Amir Ghezelbash Date: Wed, 19 Oct 2022 13:38:14 +0330 Subject: [PATCH 11/66] feat: Get Sender client ID from CoreCrypto to pass to AVS (FS-1045) (#13897) * feat: Get Sender client ID from CoreCrypto to pass to AVS (FS-1045) * change name * update deps --- package.json | 2 +- src/script/calling/CallingRepository.ts | 8 +- src/script/conversation/EventBuilder.ts | 1 + src/script/cryptography/CryptographyMapper.ts | 3 +- src/script/storage/record/EventRecord.ts | 1 + yarn.lock | 165 ++++++++---------- 6 files changed, 86 insertions(+), 94 deletions(-) diff --git a/package.json b/package.json index 74f4f42e9ce..0f7e5e85ac0 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.4", "@wireapp/antiscroll-2": "1.3.1", "@wireapp/avs": "8.2.16", - "@wireapp/core": "32.1.1", + "@wireapp/core": "32.1.3", "@wireapp/react-ui-kit": "8.17.0", "@wireapp/store-engine-dexie": "1.7.6", "@wireapp/store-engine-sqleet": "1.8.6", diff --git a/src/script/calling/CallingRepository.ts b/src/script/calling/CallingRepository.ts index 610aed4d22b..1ed024b1be0 100644 --- a/src/script/calling/CallingRepository.ts +++ b/src/script/calling/CallingRepository.ts @@ -573,6 +573,7 @@ export class CallingRepository { qualified_from, sender: clientId, time = new Date().toISOString(), + senderClientId: senderFullyQualifiedClientId = '', } = event; const isFederated = this.core.backendFeatures.isFederated && qualified_conversation && qualified_from; const userId = isFederated ? qualified_from : {domain: '', id: from}; @@ -619,6 +620,11 @@ export class CallingRepository { } } + let senderClientId = ''; + if (senderFullyQualifiedClientId) { + senderClientId = this.parseQualifiedId(senderFullyQualifiedClientId).id.split(':')[1]; + } + const res = this.wCall?.recvMsg( this.wUser, contentStr, @@ -627,7 +633,7 @@ export class CallingRepository { toSecond(new Date(time).getTime()), this.serializeQualifiedId(conversationId), this.serializeQualifiedId(userId), - conversationEntity?.isUsingMLSProtocol ? content.src_clientid : clientId, + conversationEntity?.isUsingMLSProtocol ? senderClientId : clientId, ); if (res !== 0) { diff --git a/src/script/conversation/EventBuilder.ts b/src/script/conversation/EventBuilder.ts index 33cb0c4811c..34fd6ce4083 100644 --- a/src/script/conversation/EventBuilder.ts +++ b/src/script/conversation/EventBuilder.ts @@ -76,6 +76,7 @@ export interface CallingEvent { sender: string; time?: string; type: CALL; + senderClientId?: string; } export interface BackendEventMessage extends Omit { diff --git a/src/script/cryptography/CryptographyMapper.ts b/src/script/cryptography/CryptographyMapper.ts index d08f407e203..45732fcb670 100644 --- a/src/script/cryptography/CryptographyMapper.ts +++ b/src/script/cryptography/CryptographyMapper.ts @@ -246,7 +246,7 @@ export class CryptographyMapper { } } - const {conversation, qualified_conversation, from, qualified_from} = event; + const {conversation, qualified_conversation, from, qualified_from, senderClientId} = event; const genericContent = { conversation, from, @@ -254,6 +254,7 @@ export class CryptographyMapper { id: genericMessage.messageId, qualified_conversation, qualified_from, + senderClientId, status: event.status, time: event.time, }; diff --git a/src/script/storage/record/EventRecord.ts b/src/script/storage/record/EventRecord.ts index a7114238390..b6eaa7289fd 100644 --- a/src/script/storage/record/EventRecord.ts +++ b/src/script/storage/record/EventRecord.ts @@ -71,4 +71,5 @@ export interface EventRecord { type: string; version?: number; waiting_button_id?: string; + senderClientId?: string; } diff --git a/yarn.lock b/yarn.lock index adf40c9d52d..cfc4adfb4ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1639,6 +1639,15 @@ __metadata: languageName: node linkType: hard +"@babel/runtime@npm:^7.15.4": + version: 7.19.4 + resolution: "@babel/runtime@npm:7.19.4" + dependencies: + regenerator-runtime: ^0.13.4 + checksum: 66b7e3c13e9ee1d2c9397ea89144f29a875edee266a0eb2d9971be51b32fdbafc85808c7a45e011e6681899bb804b4e2ee2aed6dc07108dbbd6b11b6cc2afba6 + languageName: node + linkType: hard + "@babel/runtime@npm:^7.18.3": version: 7.19.0 resolution: "@babel/runtime@npm:7.19.0" @@ -4339,22 +4348,22 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^20.6.9": - version: 20.6.9 - resolution: "@wireapp/api-client@npm:20.6.9" +"@wireapp/api-client@npm:^20.6.11": + version: 20.6.11 + resolution: "@wireapp/api-client@npm:20.6.11" dependencies: - "@wireapp/commons": ^4.4.6 - "@wireapp/priority-queue": ^1.8.6 + "@wireapp/commons": ^4.4.8 + "@wireapp/priority-queue": ^1.8.8 "@wireapp/protocol-messaging": 1.38.0 axios: 0.21.4 - axios-retry: 3.1.9 - http-status-codes: 2.1.4 + axios-retry: 3.3.1 + http-status-codes: 2.2.0 logdown: 3.3.1 reconnecting-websocket: 4.4.0 spark-md5: 3.0.1 - tough-cookie: 4.0.0 + tough-cookie: 4.1.2 ws: 7.5.3 - checksum: a33db1f53ba65ab6571c89be62944547cd290cf1d11985efadcce8630cd9b543a892e564f04956e181045b48467bc673a426c37ad8e61c174a89d0d1a334fe68 + checksum: ccc020bdf0379a53d2a5c6b4b63f5a15d9076cd32a9e8066b0721e0baa29443548c58f5f46a19beeb3395046e79ba460236d845b8761e823a916ec4dc11a6d81 languageName: node linkType: hard @@ -4372,15 +4381,15 @@ __metadata: languageName: node linkType: hard -"@wireapp/commons@npm:^4.4.6": - version: 4.4.6 - resolution: "@wireapp/commons@npm:4.4.6" +"@wireapp/commons@npm:^4.4.8": + version: 4.4.8 + resolution: "@wireapp/commons@npm:4.4.8" dependencies: ansi-regex: 5.0.1 - fs-extra: 10.0.0 + fs-extra: 10.1.0 logdown: 3.3.1 platform: 1.3.6 - checksum: 76dcebc6ba4a514c15ab27c2c048edb1043a1f1ab1652a2b1b059f8d9bd227f351d44c345445d38c37333c45751e4432cd3ab53697b3d0cab761025c834d8a55 + checksum: 8b3ea5a063dde01943bc71630fcda97733d1fb8acfd66028022b617d40e4d37b15b3a6c308c56db0efbd762b4a692d507745f72552e2de48d027e9e1bf12e08e languageName: node linkType: hard @@ -4408,26 +4417,26 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:32.1.1": - version: 32.1.1 - resolution: "@wireapp/core@npm:32.1.1" +"@wireapp/core@npm:32.1.3": + version: 32.1.3 + resolution: "@wireapp/core@npm:32.1.3" dependencies: - "@wireapp/api-client": ^20.6.9 - "@wireapp/commons": ^4.4.6 + "@wireapp/api-client": ^20.6.11 + "@wireapp/commons": ^4.4.8 "@wireapp/core-crypto": 0.5.2 "@wireapp/cryptobox": 12.8.0 - "@wireapp/promise-queue": ^1.3.0 - "@wireapp/store-engine-dexie": ^1.7.6 + "@wireapp/promise-queue": ^1.3.2 + "@wireapp/protocol-messaging": 1.38.0 + "@wireapp/store-engine-dexie": ^1.7.8 axios: ^0.27.2 - bazinga64: 5.11.6 + bazinga64: 5.11.8 hash.js: 1.1.7 - http-status-codes: 2.1.4 + http-status-codes: 2.2.0 idb: 7.0.2 logdown: 3.3.1 long: 4.0.0 - protobufjs: 6.11.3 - uuidjs: 4.2.8 - checksum: b5c8dff2cc0e465a77193c6ab209267d481aa2fb723ca5d332c74a24bc46073cf4ca8dbd0b35c6ffb6d4e5bc28bb0108323093a65925602a1f94a783b08056ad + uuidjs: 4.2.12 + checksum: e82437acd9dc9e93758c12a202643c08556e2688bcadfa8852d91a46197f3d8165b41572ddfbcdeb933bfabf11b7f0edbc84abac502041363eeba8b585384422 languageName: node linkType: hard @@ -4489,17 +4498,17 @@ __metadata: languageName: node linkType: hard -"@wireapp/priority-queue@npm:^1.8.6": - version: 1.8.6 - resolution: "@wireapp/priority-queue@npm:1.8.6" - checksum: 31b1aac485171219b4a3472e49e0d5314601242b5c74645f5a3a46671b5dcf20abd4da6665c047de752d75b8d4249b85e1dd6a68e527148dd02bcc734accc9d3 +"@wireapp/priority-queue@npm:^1.8.8": + version: 1.8.8 + resolution: "@wireapp/priority-queue@npm:1.8.8" + checksum: 79d6a5a2b8073bb09eb1a5f980c92eb695def27e9e2aff4f8b9d056c265003661bf1f49ae61cc87bed614fa8fcacadeecc5d06286c254bfe5d35562d1c4b65fe languageName: node linkType: hard -"@wireapp/promise-queue@npm:^1.3.0": - version: 1.3.0 - resolution: "@wireapp/promise-queue@npm:1.3.0" - checksum: 133d548a259ef56e4a6247b754ed149cf67de70df118c0408e4aab1b7e56fb20a089a2fafac8eb55e15ccdd0f56f405e49058a5da0f1b36e2bb66d89dbcd9eff +"@wireapp/promise-queue@npm:^1.3.2": + version: 1.3.2 + resolution: "@wireapp/promise-queue@npm:1.3.2" + checksum: 972f241f7c33def44eaaf72ec55d26ec30f60c0f4b225ff761bf46cb627081b20128a9800830c397341b0f79d9c667580dfacb737a5690b662011814333f0735 languageName: node linkType: hard @@ -4546,7 +4555,7 @@ __metadata: languageName: node linkType: hard -"@wireapp/store-engine-dexie@npm:1.7.6, @wireapp/store-engine-dexie@npm:^1.7.6": +"@wireapp/store-engine-dexie@npm:1.7.6": version: 1.7.6 resolution: "@wireapp/store-engine-dexie@npm:1.7.6" dependencies: @@ -4557,6 +4566,17 @@ __metadata: languageName: node linkType: hard +"@wireapp/store-engine-dexie@npm:^1.7.8": + version: 1.7.8 + resolution: "@wireapp/store-engine-dexie@npm:1.7.8" + dependencies: + dexie: 3.2.2 + peerDependencies: + "@wireapp/store-engine": 4.x.x + checksum: e491f17d053a548e7aaa2a143522e7fe2fabe72bc900d0136fd3648a225b6b4dd1b1eac24470852e5d4c852f44b5f29e2bf362e709526287fb91fe7333bf56b9 + languageName: node + linkType: hard + "@wireapp/store-engine-sqleet@npm:1.8.6": version: 1.8.6 resolution: "@wireapp/store-engine-sqleet@npm:1.8.6" @@ -5275,12 +5295,13 @@ __metadata: languageName: node linkType: hard -"axios-retry@npm:3.1.9": - version: 3.1.9 - resolution: "axios-retry@npm:3.1.9" +"axios-retry@npm:3.3.1": + version: 3.3.1 + resolution: "axios-retry@npm:3.3.1" dependencies: - is-retry-allowed: ^1.1.0 - checksum: 6c3418b19c2c3e4a50c1e2ef6678964283c6648f20595fbc8fec7db21a9274cf29f0af0a76308d2f3fcfe6c3e1d2956aa0cfc76e845dbcec514d1a4ba613d413 + "@babel/runtime": ^7.15.4 + is-retry-allowed: ^2.2.0 + checksum: 125c75e08048a28de5d0dfa9de9a1924185d863a4323a71472646a1d5a326f727ff59e75e1b557220da1aad7cba01222c47c26194c5940f295378668dd3b9163 languageName: node linkType: hard @@ -5501,6 +5522,13 @@ __metadata: languageName: node linkType: hard +"bazinga64@npm:5.11.8": + version: 5.11.8 + resolution: "bazinga64@npm:5.11.8" + checksum: be3126e95d5061f5995bb56a5f3a0dee2d04cf80fffab082dd3d02879fe77e764bda14ce0e3cf3395332838b60990510938f5c1b0e40c6d39f323a147da99192 + languageName: node + linkType: hard + "big.js@npm:^5.2.2": version: 5.2.2 resolution: "big.js@npm:5.2.2" @@ -8560,17 +8588,6 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:10.0.0": - version: 10.0.0 - resolution: "fs-extra@npm:10.0.0" - dependencies: - graceful-fs: ^4.2.0 - jsonfile: ^6.0.1 - universalify: ^2.0.0 - checksum: 5285a3d8f34b917cf2b66af8c231a40c1623626e9d701a20051d3337be16c6d7cac94441c8b3732d47a92a2a027886ca93c69b6a4ae6aee3c89650d2a8880c0a - languageName: node - linkType: hard - "fs-extra@npm:10.1.0, fs-extra@npm:^10.1.0": version: 10.1.0 resolution: "fs-extra@npm:10.1.0" @@ -9546,13 +9563,6 @@ __metadata: languageName: node linkType: hard -"http-status-codes@npm:2.1.4": - version: 2.1.4 - resolution: "http-status-codes@npm:2.1.4" - checksum: 44fedd7b2cfe8672e647fd03a1baf6662a62e7bf1669a866404830e98853dc0239b5cd054938e562cdd7b8228a9a7bc0e27b0eacc6a07814b1639a9c518a7220 - languageName: node - linkType: hard - "http-status-codes@npm:2.2.0": version: 2.2.0 resolution: "http-status-codes@npm:2.2.0" @@ -10228,10 +10238,10 @@ __metadata: languageName: node linkType: hard -"is-retry-allowed@npm:^1.1.0": - version: 1.2.0 - resolution: "is-retry-allowed@npm:1.2.0" - checksum: 50d700a89ae31926b1c91b3eb0104dbceeac8790d8b80d02f5c76d9a75c2056f1bb24b5268a8a018dead606bddf116b2262e5ac07401eb8b8783b266ed22558d +"is-retry-allowed@npm:^2.2.0": + version: 2.2.0 + resolution: "is-retry-allowed@npm:2.2.0" + checksum: 3d1103a9290b5d03626756a41054844633eac78bc5d3e3a95b13afeae94fa3cfbcf7f0b5520d83f75f48a25ce7b142fdbac4217dc4b0630f3ea55e866ec3a029 languageName: node linkType: hard @@ -16558,18 +16568,7 @@ __metadata: languageName: node linkType: hard -"tough-cookie@npm:4.0.0": - version: 4.0.0 - resolution: "tough-cookie@npm:4.0.0" - dependencies: - psl: ^1.1.33 - punycode: ^2.1.1 - universalify: ^0.1.2 - checksum: 0891b37eb7d17faa3479d47f0dce2e3007f2583094ad272f2670d120fbcc3df3b0b0a631ba96ecad49f9e2297d93ff8995ce0d3292d08dd7eabe162f5b224d69 - languageName: node - linkType: hard - -"tough-cookie@npm:^4.0.0": +"tough-cookie@npm:4.1.2, tough-cookie@npm:^4.0.0": version: 4.1.2 resolution: "tough-cookie@npm:4.1.2" dependencies: @@ -17000,13 +16999,6 @@ __metadata: languageName: node linkType: hard -"universalify@npm:^0.1.2": - version: 0.1.2 - resolution: "universalify@npm:0.1.2" - checksum: 40cdc60f6e61070fe658ca36016a8f4ec216b29bf04a55dce14e3710cc84c7448538ef4dad3728d0bfe29975ccd7bfb5f414c45e7b78883567fb31b246f02dff - languageName: node - linkType: hard - "universalify@npm:^0.2.0": version: 0.2.0 resolution: "universalify@npm:0.2.0" @@ -17126,15 +17118,6 @@ __metadata: languageName: node linkType: hard -"uuidjs@npm:4.2.8": - version: 4.2.8 - resolution: "uuidjs@npm:4.2.8" - bin: - uuidjs: bin/cli.js - checksum: 625092d286f4858cae1c2ee601d4f7d1ef02be41c9c821b5c6402ca0896387b34ec57359c20b3477759a77765854386c295331bb2064ba125a8e81b75b585f82 - languageName: node - linkType: hard - "v8-compile-cache-lib@npm:^3.0.1": version: 3.0.1 resolution: "v8-compile-cache-lib@npm:3.0.1" @@ -17656,7 +17639,7 @@ __metadata: "@wireapp/antiscroll-2": 1.3.1 "@wireapp/avs": 8.2.16 "@wireapp/copy-config": 1.3.6 - "@wireapp/core": 32.1.1 + "@wireapp/core": 32.1.3 "@wireapp/eslint-config": 1.12.11 "@wireapp/prettier-config": 0.4.6 "@wireapp/react-ui-kit": 8.17.0 From d06fd53fe9928a55b7fcd6be91c89875f549e296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20G=C3=B3rka?= Date: Fri, 14 Oct 2022 14:02:52 +0200 Subject: [PATCH 12/66] runfix: fix codeblock link parsing (FS-1066) (#13857) * runfix: fix codeblock link parsing * test: fix test * chore: update test name * test: add 2 test cases --- src/script/util/messageRenderer.ts | 23 --------------------- test/unit_tests/util/messageRendererSpec.js | 11 ++++++++-- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/src/script/util/messageRenderer.ts b/src/script/util/messageRenderer.ts index 36175dc07f2..f72e8d08b25 100644 --- a/src/script/util/messageRenderer.ts +++ b/src/script/util/messageRenderer.ts @@ -71,28 +71,6 @@ markdownit.renderer.rules.paragraph_open = (tokens, idx) => { }; markdownit.renderer.rules.paragraph_close = () => ''; -// https://github.com/markdown-it/markdown-it/issues/458#issuecomment-401221267 -function modifyMarkdownLinks(markdown: string): string { - const matches = markdownit.linkify.match(markdown); - if (!matches || matches.length === 0) { - return markdown; - } - const result = []; - let prevEndIndex = 0; - for (const match of matches) { - const startsWithProto = /^https?:\/\//i.test(match.raw); - const noStartBracket = match.index === 0 || markdown[match.index - 1] !== '<'; - const noEndBracket = match.lastIndex === markdown.length || markdown[match.lastIndex] !== '>'; - const shouldInsertBrackets = startsWithProto && noStartBracket && noEndBracket; - - result.push(markdown.slice(prevEndIndex, match.index)); - result.push(shouldInsertBrackets ? `<${match.raw}>` : match.raw); - prevEndIndex = match.lastIndex; - } - result.push(markdown.slice(prevEndIndex)); - return result.join(''); -} - markdownit.normalizeLinkText = text => text; export const renderMessage = (message: string, selfId: QualifiedId | null, mentionEntities: MentionEntity[] = []) => { @@ -193,7 +171,6 @@ export const renderMessage = (message: string, selfId: QualifiedId | null, menti return self.renderToken(tokens, idx, options); }; const originalTokens = markdownit.parse(mentionlessText, {}); - mentionlessText = modifyMarkdownLinks(mentionlessText); const modifiedLinksTokens = markdownit.parse(mentionlessText, {}); const fixCodeTokens = (modifiedTokens: Token[], originalTokens: Token[]) => modifiedTokens.map((modifiedToken, index) => { diff --git a/test/unit_tests/util/messageRendererSpec.js b/test/unit_tests/util/messageRendererSpec.js index 4820847b832..5d603f65669 100644 --- a/test/unit_tests/util/messageRendererSpec.js +++ b/test/unit_tests/util/messageRendererSpec.js @@ -203,12 +203,19 @@ describe('renderMessage', () => { ); }); - it('does not render a broken markdown link', () => { + it('escapes links with an xss attempt on their url', () => { expect(renderMessage(`[sometext](https://some.domain">)`)).toBe( - `[sometext](https://some.domain"><script>alert("oops")</script>)`, + `sometext`, ); }); + it('does not add a < behind URLs within tags 2', () => { + expect(renderMessage('` http://wire.com`\n`123`')).toBe(' http://wire.com
123'); + }); + it('does not add a < behind URLs within tags', () => { + expect(renderMessage('` http://wire.com`')).toBe(' http://wire.com'); + }); + it('escapes url params', () => { expect(renderMessage(`[sometext](https://some.domain?param1=a¶m2=b)`)).toBe( `sometext`, From 599e1bc78fcfdd95395180ba29a30697e8765bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20G=C3=B3rka?= Date: Thu, 20 Oct 2022 13:28:55 +0200 Subject: [PATCH 13/66] feat: add ENABLE_DEV_BACKEND_API env variable [FS-1051] (#13912) * feat: add ENABLE_DEV_BACKEND_API env variable * runfix: apply new core changes * chore: add ENABLE_DEV_BACKEND_API to localhost env file with value of true --- .env.localhost | 1 + package.json | 2 +- server/ServerConfig.ts | 1 + server/config.ts | 1 + src/script/Config.ts | 1 + src/script/auth/module/action/AuthAction.ts | 4 +- src/script/main/app.ts | 2 +- src/script/service/CoreSingleton.ts | 4 +- src/types/window.d.ts | 1 + yarn.lock | 130 ++++++++------------ 10 files changed, 65 insertions(+), 82 deletions(-) diff --git a/.env.localhost b/.env.localhost index f6d092f654f..d09dba2c6fa 100644 --- a/.env.localhost +++ b/.env.localhost @@ -10,6 +10,7 @@ CSP_EXTRA_IMG_SRC="https://*.zinfra.io, https://*.wire.com, https://*.wire.link" CSP_EXTRA_SCRIPT_SRC="http://localhost:32123, https://*.zinfra.io, https://*.wire.com, https://*.wire.link, https://api.raygun.io" ENFORCE_HTTPS="false" FEATURE_ENABLE_DEBUG="true" +ENABLE_DEV_BACKEND_API="true" #FEATURE_DEFAULT_LOGIN_TEMPORARY_CLIENT="false" #FEATURE_PERSIST_TEMPORARY_CLIENTS="false" diff --git a/package.json b/package.json index 0f7e5e85ac0..0cb22dfedf3 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.4", "@wireapp/antiscroll-2": "1.3.1", "@wireapp/avs": "8.2.16", - "@wireapp/core": "32.1.3", + "@wireapp/core": "34.0.0", "@wireapp/react-ui-kit": "8.17.0", "@wireapp/store-engine-dexie": "1.7.6", "@wireapp/store-engine-sqleet": "1.8.6", diff --git a/server/ServerConfig.ts b/server/ServerConfig.ts index f05f482179b..24eae699126 100644 --- a/server/ServerConfig.ts +++ b/server/ServerConfig.ts @@ -27,6 +27,7 @@ export interface ServerConfig { BRAND_NAME: string; CHROME_ORIGIN_TRIAL_TOKEN: string; COUNTLY_API_KEY: string; + ENABLE_DEV_BACKEND_API: boolean; ENVIRONMENT: string; FEATURE: { ALLOWED_FILE_UPLOAD_EXTENSIONS: string[]; diff --git a/server/config.ts b/server/config.ts index a9c7d78f6a2..64702a013fe 100644 --- a/server/config.ts +++ b/server/config.ts @@ -122,6 +122,7 @@ const config: ServerConfig = { BRAND_NAME: process.env.BRAND_NAME, CHROME_ORIGIN_TRIAL_TOKEN: process.env.CHROME_ORIGIN_TRIAL_TOKEN, COUNTLY_API_KEY: process.env.COUNTLY_API_KEY, + ENABLE_DEV_BACKEND_API: process.env.ENABLE_DEV_BACKEND_API == 'true', ENVIRONMENT: nodeEnvironment, FEATURE: { ALLOWED_FILE_UPLOAD_EXTENSIONS: (process.env.FEATURE_ALLOWED_FILE_UPLOAD_EXTENSIONS || '*') diff --git a/src/script/Config.ts b/src/script/Config.ts index 4129f080b2e..b564ce6848f 100644 --- a/src/script/Config.ts +++ b/src/script/Config.ts @@ -40,6 +40,7 @@ export class Configuration { readonly BACKEND_WS = env.BACKEND_WS || 'wss://prod-nginz-ssl.wire.com'; readonly BRAND_NAME = env.BRAND_NAME || 'Wire'; readonly COUNTLY_API_KEY = env.COUNTLY_API_KEY; + readonly ENABLE_DEV_BACKEND_API = env.ENABLE_DEV_BACKEND_API; readonly ENVIRONMENT = env.ENVIRONMENT || 'production'; readonly FEATURE = { ...env.FEATURE, diff --git a/src/script/auth/module/action/AuthAction.ts b/src/script/auth/module/action/AuthAction.ts index b7e063fa4f1..5b631c6f2a4 100644 --- a/src/script/auth/module/action/AuthAction.ts +++ b/src/script/auth/module/action/AuthAction.ts @@ -172,7 +172,7 @@ export class AuthAction { dispatch(AuthActionCreator.startLogin()); try { // we first init the core without initializing the client for now (this will be done later on) - await core.init(clientType, undefined, false); + await core.init(clientType, {initClient: false}); await this.persistAuthData(clientType, core, dispatch, localStorageAction); await dispatch(selfAction.fetchSelf()); await dispatch(cookieAction.setCookie(COOKIE_NAME_APP_OPENED, {appInstanceId: getConfig().APP_INSTANCE_ID})); @@ -361,7 +361,7 @@ export class AuthAction { } const clientType = persist ? ClientType.PERMANENT : ClientType.TEMPORARY; - await core.init(clientType, undefined, false); + await core.init(clientType, {initClient: false}); await this.persistAuthData(clientType, core, dispatch, localStorageAction); if (options.shouldValidateLocalClient) { diff --git a/src/script/main/app.ts b/src/script/main/app.ts index 96cecd6e679..ee47383a51b 100644 --- a/src/script/main/app.ts +++ b/src/script/main/app.ts @@ -918,7 +918,7 @@ class App { $(async () => { const config = Config.getConfig(); const apiClient = container.resolve(APIClient); - await apiClient.useVersion(config.SUPPORTED_API_VERSIONS, config.FEATURE.ENABLE_MLS); + await apiClient.useVersion(config.SUPPORTED_API_VERSIONS, config.ENABLE_DEV_BACKEND_API); const core = container.resolve(Core); enableLogging(Config.getConfig().FEATURE.ENABLE_DEBUG); diff --git a/src/script/service/CoreSingleton.ts b/src/script/service/CoreSingleton.ts index 4f2195af039..5e92f520fb8 100644 --- a/src/script/service/CoreSingleton.ts +++ b/src/script/service/CoreSingleton.ts @@ -27,7 +27,7 @@ import {Config} from '../Config'; declare global { interface Window { - secretsCrypto?: { + systemCrypto?: { decrypt: (value: Uint8Array) => Promise; encrypt: (encrypted: Uint8Array) => Promise; }; @@ -54,7 +54,7 @@ export class Core extends Account { * When in an browser context, then this secretsCrypto will be undefined and the core will then use it's internal encryption system */ keyingMaterialUpdateThreshold: Config.getConfig().FEATURE.MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD, - secretsCrypto: window.secretsCrypto, + systemCrypto: window.systemCrypto, } : undefined, nbPrekeys: 100, diff --git a/src/types/window.d.ts b/src/types/window.d.ts index 02805097cbc..80349ede9d7 100644 --- a/src/types/window.d.ts +++ b/src/types/window.d.ts @@ -50,6 +50,7 @@ declare global { BRAND_NAME: string; CHROME_ORIGIN_TRIAL_TOKEN: string; COUNTLY_API_KEY: string; + ENABLE_DEV_BACKEND_API: boolean; ENVIRONMENT: string; FEATURE: { ALLOWED_FILE_UPLOAD_EXTENSIONS: string[]; diff --git a/yarn.lock b/yarn.lock index cfc4adfb4ef..0cbcc4a52e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4348,22 +4348,22 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^20.6.11": - version: 20.6.11 - resolution: "@wireapp/api-client@npm:20.6.11" +"@wireapp/api-client@npm:^21.0.0": + version: 21.0.0 + resolution: "@wireapp/api-client@npm:21.0.0" dependencies: - "@wireapp/commons": ^4.4.8 - "@wireapp/priority-queue": ^1.8.8 - "@wireapp/protocol-messaging": 1.38.0 + "@wireapp/commons": ^4.4.10 + "@wireapp/priority-queue": ^1.8.10 + "@wireapp/protocol-messaging": 1.39.0 axios: 0.21.4 axios-retry: 3.3.1 http-status-codes: 2.2.0 logdown: 3.3.1 reconnecting-websocket: 4.4.0 - spark-md5: 3.0.1 + spark-md5: 3.0.2 tough-cookie: 4.1.2 - ws: 7.5.3 - checksum: ccc020bdf0379a53d2a5c6b4b63f5a15d9076cd32a9e8066b0721e0baa29443548c58f5f46a19beeb3395046e79ba460236d845b8761e823a916ec4dc11a6d81 + ws: 8.9.0 + checksum: 01adccb489d95bf7e6eba633286b5a2fe58c5a2c42b333f26ffb3131ffd1770363bca9b622282ba0159421e4dffc30e221bc3b397c874b90ce8222d540bb99d4 languageName: node linkType: hard @@ -4381,15 +4381,15 @@ __metadata: languageName: node linkType: hard -"@wireapp/commons@npm:^4.4.8": - version: 4.4.8 - resolution: "@wireapp/commons@npm:4.4.8" +"@wireapp/commons@npm:^4.4.10": + version: 4.4.10 + resolution: "@wireapp/commons@npm:4.4.10" dependencies: ansi-regex: 5.0.1 fs-extra: 10.1.0 logdown: 3.3.1 platform: 1.3.6 - checksum: 8b3ea5a063dde01943bc71630fcda97733d1fb8acfd66028022b617d40e4d37b15b3a6c308c56db0efbd762b4a692d507745f72552e2de48d027e9e1bf12e08e + checksum: c026b91caffbf8c2abf929abb4e62c33684a1c3bbcde7d6f6164d60a80ce7507969921965fc477145c127eff1b1e3f4d7072f9821c08b8d6cecd9a474894f169 languageName: node linkType: hard @@ -4417,26 +4417,26 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:32.1.3": - version: 32.1.3 - resolution: "@wireapp/core@npm:32.1.3" +"@wireapp/core@npm:34.0.0": + version: 34.0.0 + resolution: "@wireapp/core@npm:34.0.0" dependencies: - "@wireapp/api-client": ^20.6.11 - "@wireapp/commons": ^4.4.8 + "@wireapp/api-client": ^21.0.0 + "@wireapp/commons": ^4.4.10 "@wireapp/core-crypto": 0.5.2 "@wireapp/cryptobox": 12.8.0 - "@wireapp/promise-queue": ^1.3.2 - "@wireapp/protocol-messaging": 1.38.0 - "@wireapp/store-engine-dexie": ^1.7.8 + "@wireapp/promise-queue": ^1.3.4 + "@wireapp/protocol-messaging": 1.39.0 + "@wireapp/store-engine-dexie": ^1.7.10 axios: ^0.27.2 - bazinga64: 5.11.8 + bazinga64: 5.11.10 hash.js: 1.1.7 http-status-codes: 2.2.0 - idb: 7.0.2 + idb: 7.1.0 logdown: 3.3.1 long: 4.0.0 uuidjs: 4.2.12 - checksum: e82437acd9dc9e93758c12a202643c08556e2688bcadfa8852d91a46197f3d8165b41572ddfbcdeb933bfabf11b7f0edbc84abac502041363eeba8b585384422 + checksum: 6ad38f1c13466dce8b61d6d62199a741948a9ae00f8b2ce10780d763476ef1ffd49f5158a9a85795f7ea96cbb6dfd0cfe8d946a4c53815001b5f30468110b8d2 languageName: node linkType: hard @@ -4498,17 +4498,17 @@ __metadata: languageName: node linkType: hard -"@wireapp/priority-queue@npm:^1.8.8": - version: 1.8.8 - resolution: "@wireapp/priority-queue@npm:1.8.8" - checksum: 79d6a5a2b8073bb09eb1a5f980c92eb695def27e9e2aff4f8b9d056c265003661bf1f49ae61cc87bed614fa8fcacadeecc5d06286c254bfe5d35562d1c4b65fe +"@wireapp/priority-queue@npm:^1.8.10": + version: 1.8.10 + resolution: "@wireapp/priority-queue@npm:1.8.10" + checksum: d4c262ba5df33a43491f073b43e49157bb506ca2bee24afa1b137be89f044219265891bdec7d7404b455c68da886577d6c14b63581561b90486bf4d5c256d04e languageName: node linkType: hard -"@wireapp/promise-queue@npm:^1.3.2": - version: 1.3.2 - resolution: "@wireapp/promise-queue@npm:1.3.2" - checksum: 972f241f7c33def44eaaf72ec55d26ec30f60c0f4b225ff761bf46cb627081b20128a9800830c397341b0f79d9c667580dfacb737a5690b662011814333f0735 +"@wireapp/promise-queue@npm:^1.3.4": + version: 1.3.4 + resolution: "@wireapp/promise-queue@npm:1.3.4" + checksum: b46a6613392278075319af062273551819c1e65024cc59eae86f92fdef03e78cb2a65ff44fbb44120c8164c87e1fbfeb1da6369a808f43955cad86c6439a8731 languageName: node linkType: hard @@ -4524,12 +4524,12 @@ __metadata: languageName: node linkType: hard -"@wireapp/protocol-messaging@npm:1.38.0": - version: 1.38.0 - resolution: "@wireapp/protocol-messaging@npm:1.38.0" +"@wireapp/protocol-messaging@npm:1.39.0": + version: 1.39.0 + resolution: "@wireapp/protocol-messaging@npm:1.39.0" dependencies: protobufjs: 6.11.3 - checksum: ce9957ec0f97e92719accaf394f7a3cdb56f64dfe3950b631122b6fd4e3e89500ed6472b2e34dc6cc0c4ef4a16db2922e5d040e879477ffe3a913ab217332b9e + checksum: 2f905ff7c55905bdb467927e969d1ea6e22264e10c2262a51d2dcfe7bead0e1792a94c769f3de4f5c253c356440efa632173f6670d31db0834b2054d191940f4 languageName: node linkType: hard @@ -4566,14 +4566,14 @@ __metadata: languageName: node linkType: hard -"@wireapp/store-engine-dexie@npm:^1.7.8": - version: 1.7.8 - resolution: "@wireapp/store-engine-dexie@npm:1.7.8" +"@wireapp/store-engine-dexie@npm:^1.7.10": + version: 1.7.10 + resolution: "@wireapp/store-engine-dexie@npm:1.7.10" dependencies: dexie: 3.2.2 peerDependencies: "@wireapp/store-engine": 4.x.x - checksum: e491f17d053a548e7aaa2a143522e7fe2fabe72bc900d0136fd3648a225b6b4dd1b1eac24470852e5d4c852f44b5f29e2bf362e709526287fb91fe7333bf56b9 + checksum: 80f89cb63d35689dc13841c7695057fbdb866a36a50b87e7c61a51428c6248a5b4de19f37c0ef9cec1be174f7dd5468ff3bd6a78c90aed5cecc6ebfc2c699f57 languageName: node linkType: hard @@ -5515,6 +5515,13 @@ __metadata: languageName: node linkType: hard +"bazinga64@npm:5.11.10": + version: 5.11.10 + resolution: "bazinga64@npm:5.11.10" + checksum: c4a7b822223382e536df7589fec26ceaa9d1884bc70101c0cb0e8d89b515a7bd2ea59afc16510c75d985b4f92561af961ee7612037fd987b1752de2e59ffcb33 + languageName: node + linkType: hard + "bazinga64@npm:5.11.6": version: 5.11.6 resolution: "bazinga64@npm:5.11.6" @@ -5522,13 +5529,6 @@ __metadata: languageName: node linkType: hard -"bazinga64@npm:5.11.8": - version: 5.11.8 - resolution: "bazinga64@npm:5.11.8" - checksum: be3126e95d5061f5995bb56a5f3a0dee2d04cf80fffab082dd3d02879fe77e764bda14ce0e3cf3395332838b60990510938f5c1b0e40c6d39f323a147da99192 - languageName: node - linkType: hard - "big.js@npm:^5.2.2": version: 5.2.2 resolution: "big.js@npm:5.2.2" @@ -9679,14 +9679,7 @@ __metadata: languageName: node linkType: hard -"idb@npm:7.0.2": - version: 7.0.2 - resolution: "idb@npm:7.0.2" - checksum: 60ebe6d5c25d9d82d400fa90e769045a9a3f44dfbc3094b105f8666f025d84f2a779e5416211572fc51f6057f8e130cb1bbfaa06cfd6f196701a8fca9f0eda17 - languageName: node - linkType: hard - -"idb@npm:^7.0.1": +"idb@npm:7.1.0, idb@npm:^7.0.1": version: 7.1.0 resolution: "idb@npm:7.1.0" checksum: 1ae62bcf9f0545390b39ce82a5162720ffeb4cf461a6e64e8bb595df6a4fe94a7f73bba8412ac683e291e5614bab1c6659d961dd4175cb1fa3ee29c1c8631549 @@ -15679,10 +15672,10 @@ __metadata: languageName: node linkType: hard -"spark-md5@npm:3.0.1": - version: 3.0.1 - resolution: "spark-md5@npm:3.0.1" - checksum: 613a7f4e20929b832406ef2ed925d696d4d004455360b07ba1a829975fc12a005d745db370cb261ecc827c3dedf3b431a9337f4bab1f1954df776f41a05aaabe +"spark-md5@npm:3.0.2": + version: 3.0.2 + resolution: "spark-md5@npm:3.0.2" + checksum: 5feebff0bfabcecf56ba03af3e38fdb068272ed41fbf0a94ff9ef65b9bb9cb1dd69be3684db6542e62497b1eac3ae324c07ac4dcb606465dc36ca048177077bf languageName: node linkType: hard @@ -17639,7 +17632,7 @@ __metadata: "@wireapp/antiscroll-2": 1.3.1 "@wireapp/avs": 8.2.16 "@wireapp/copy-config": 1.3.6 - "@wireapp/core": 32.1.3 + "@wireapp/core": 34.0.0 "@wireapp/eslint-config": 1.12.11 "@wireapp/prettier-config": 0.4.6 "@wireapp/react-ui-kit": 8.17.0 @@ -18038,22 +18031,7 @@ __metadata: languageName: node linkType: hard -"ws@npm:7.5.3": - version: 7.5.3 - resolution: "ws@npm:7.5.3" - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ^5.0.2 - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - checksum: 423dc0d859fa74020f5555140905b862470a60ea1567bb9ad55a087263d7718b9c94f69678be1cee9868925c570f1e6fc79d09f90c39057bc63fa2edbb2c547b - languageName: node - linkType: hard - -"ws@npm:^8.8.0": +"ws@npm:8.9.0, ws@npm:^8.8.0": version: 8.9.0 resolution: "ws@npm:8.9.0" peerDependencies: From 84709a3a254ad8aab94a8aeb66655eebbac93bc0 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Thu, 20 Oct 2022 13:48:06 +0200 Subject: [PATCH 14/66] refactor: Move cryptobox hooks into @wireapp/core (#13905) --- package.json | 2 +- .../CryptographyRepository.test.ts | 20 +++++-- .../cryptography/CryptographyRepository.ts | 60 +++++-------------- src/script/main/app.ts | 17 +++--- test/helper/TestFactory.js | 12 +--- yarn.lock | 20 +++---- 6 files changed, 53 insertions(+), 78 deletions(-) diff --git a/package.json b/package.json index 0cb22dfedf3..7cd16db5294 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.4", "@wireapp/antiscroll-2": "1.3.1", "@wireapp/avs": "8.2.16", - "@wireapp/core": "34.0.0", + "@wireapp/core": "34.0.2", "@wireapp/react-ui-kit": "8.17.0", "@wireapp/store-engine-dexie": "1.7.6", "@wireapp/store-engine-sqleet": "1.8.6", diff --git a/src/script/cryptography/CryptographyRepository.test.ts b/src/script/cryptography/CryptographyRepository.test.ts index 7599308d751..29ae62dd0b4 100644 --- a/src/script/cryptography/CryptographyRepository.test.ts +++ b/src/script/cryptography/CryptographyRepository.test.ts @@ -18,15 +18,27 @@ */ import {TestFactory} from '../../../test/helper/TestFactory'; +import {Cryptobox} from '@wireapp/cryptobox'; +import {CryptographyRepository} from './CryptographyRepository'; +import {CryptographyService} from './CryptographyService'; +import {container} from 'tsyringe'; +import {Core} from '../service/CoreSingleton'; describe('CryptographyRepository', () => { const testFactory = new TestFactory(); + let cryptographyRepository: CryptographyRepository; beforeEach(async () => { - await testFactory.exposeCryptographyActors(false); - testFactory.cryptography_repository['core'].service = { - cryptography: {constructSessionId: jest.fn(() => 'user-id@device-id')}, + const storage = await testFactory.exposeStorageActors(); + const storeEngine = storage.storageService['engine']; + const cryptobox = new Cryptobox(storeEngine, 10); + await cryptobox.create(); + const core = container.resolve(Core); + core.service = { + cryptography: {constructSessionId: jest.fn(() => 'user-id@device-id'), cryptobox}, } as any; + const cryptographyService = new CryptographyService(); + cryptographyRepository = new CryptographyRepository(cryptographyService, core); }); describe('getRemoteFingerprint', () => { @@ -37,7 +49,7 @@ describe('CryptographyRepository', () => { id: 3, key: 'pQABAQMCoQBYIFycSfcOATSpOIkJz8ntEnFAZ+YWtzVaJ7RLeDAqGU+0A6EAoQBYIMEJnklbfFFvnFC41rmjDMqx6L0oVX5RMab3uGwBgbkaBPY=', }; - const fingerprint = await testFactory.cryptography_repository.getRemoteFingerprint(userId, clientId, preKey); + const fingerprint = await cryptographyRepository.getRemoteFingerprint(userId, clientId, preKey); // eslint-disable-next-line expect(fingerprint).toEqual('c1099e495b7c516f9c50b8d6b9a30ccab1e8bd28557e5131a6f7b86c0181b91a'); diff --git a/src/script/cryptography/CryptographyRepository.ts b/src/script/cryptography/CryptographyRepository.ts index 60887fa7c69..4f93b73db13 100644 --- a/src/script/cryptography/CryptographyRepository.ts +++ b/src/script/cryptography/CryptographyRepository.ts @@ -17,11 +17,8 @@ * */ -import ko from 'knockout'; -import {amplify} from 'amplify'; import type {QualifiedId} from '@wireapp/api-client/src/user/'; -import {Cryptobox, CryptoboxSession} from '@wireapp/cryptobox'; -import {WebAppEvents} from '@wireapp/webapp-events'; +import {CryptoboxSession} from '@wireapp/cryptobox'; import type {PreKey as BackendPreKey} from '@wireapp/api-client/src/auth/'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; @@ -29,7 +26,6 @@ import {getLogger, Logger} from 'Util/Logger'; import {base64ToArray} from 'Util/util'; import {CryptographyMapper} from './CryptographyMapper'; -import {ClientEntity} from '../client/ClientEntity'; import {UserError} from '../error/UserError'; import type {CryptographyService} from './CryptographyService'; import {container} from 'tsyringe'; @@ -47,21 +43,9 @@ export interface ClientKeys { } export class CryptographyRepository { - cryptobox?: Cryptobox; cryptographyMapper: CryptographyMapper; - currentClient?: ko.Observable; logger: Logger; - static get CONFIG() { - return { - UNKNOWN_DECRYPTION_ERROR_CODE: 999, - }; - } - - static get REMOTE_ENCRYPTION_FAILURE(): string { - return '💣'; - } - constructor( private readonly cryptographyService: CryptographyService, private readonly core = container.resolve(Core), @@ -70,29 +54,11 @@ export class CryptographyRepository { this.cryptographyMapper = new CryptographyMapper(); } - /** - * Inits the cryptography repository with the given cryptobox and for the given client - * - * @param cryptobox The cryptobox instance for handling encryption and decryption of messages - * @param client The local client of the logged user - */ - init(cryptobox: Cryptobox, client: ko.Observable): void { - this.cryptobox = cryptobox; - this.currentClient = client; - - this.cryptobox.on(Cryptobox.TOPIC.NEW_PREKEYS, async preKeys => { - const serializedPreKeys = preKeys.map(preKey => cryptobox.serialize_prekey(preKey)); - this.logger.log(`Received '${preKeys.length}' new PreKeys.`, serializedPreKeys); - - await this.cryptographyService.putClientPreKeys(client().id, serializedPreKeys); - this.logger.log(`Successfully uploaded '${serializedPreKeys.length}' PreKeys.`, serializedPreKeys); - }); - - this.cryptobox.on(Cryptobox.TOPIC.NEW_SESSION, sessionId => { - const {userId, clientId, domain} = ClientEntity.dismantleUserClientId(sessionId); - const qualifiedId = {domain, id: userId}; - amplify.publish(WebAppEvents.CLIENT.ADD, qualifiedId, {id: clientId}, true); - }); + get cryptobox() { + if (!this.core.service) { + throw new Error('Core is not initiated'); + } + return this.core.service!.cryptography.cryptobox; } /** @@ -100,7 +66,7 @@ export class CryptographyRepository { * @returns Fingerprint of local identity public key */ getLocalFingerprint(): string { - return this.cryptobox!.getIdentity().public_key.fingerprint(); + return this.cryptobox.getIdentity().public_key.fingerprint(); } /** @@ -146,16 +112,17 @@ export class CryptographyRepository { private loadSession(userId: QualifiedId, clientId: string): Promise { const sessionId = this.core.service!.cryptography.constructSessionId(userId, clientId); - return this.cryptobox!.session_load(sessionId).catch(() => { + return this.cryptobox.session_load(sessionId).catch(() => { return this.getUserPreKeyByIds(userId, clientId).then(preKey => { return this.createSessionFromPreKey(preKey, userId, clientId); }); }); } - deleteSession(userId: QualifiedId, clientId: string): Promise { + async deleteSession(userId: QualifiedId, clientId: string): Promise { const sessionId = this.core.service!.cryptography.constructSessionId(userId, clientId); - return this.cryptobox!.session_delete(sessionId); + await this.core.service!.cryptography.resetSession(sessionId); + return sessionId; } private async createSessionFromPreKey( @@ -175,10 +142,11 @@ export class CryptographyRepository { ); const sessionId = this.core.service!.cryptography.constructSessionId({domain, id: userId}, clientId); const preKeyArray = base64ToArray(preKey.key); - return await this.cryptobox!.session_from_prekey(sessionId, preKeyArray.buffer); + return await this.cryptobox.session_from_prekey(sessionId, preKeyArray.buffer); } } catch (error) { - const message = `Pre-key for user '${userId}' ('${clientId}') invalid. Skipping encryption: ${error.message}`; + const errorMessage = error instanceof Error ? error.message : error; + const message = `Pre-key for user '${userId}' ('${clientId}') invalid. Skipping encryption: ${errorMessage}`; this.logger.warn(message, error); } } diff --git a/src/script/main/app.ts b/src/script/main/app.ts index ee47383a51b..871c8a916f3 100644 --- a/src/script/main/app.ts +++ b/src/script/main/app.ts @@ -23,7 +23,7 @@ import 'core-js/full/reflect'; import ko from 'knockout'; import platform from 'platform'; import {container} from 'tsyringe'; -import {ClientType} from '@wireapp/api-client/src/client/'; +import {ClientType, ClientClassification} from '@wireapp/api-client/src/client/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import Dexie from 'dexie'; @@ -152,8 +152,8 @@ class App { storage: StorageService; }; repository: ViewModelRepositories = {} as ViewModelRepositories; - debug: DebugUtil; - util: {debug: DebugUtil}; + debug?: DebugUtil; + util?: {debug: DebugUtil}; singleInstanceHandler: SingleInstanceHandler; static get CONFIG() { @@ -381,7 +381,6 @@ class App { client: clientRepository, connection: connectionRepository, conversation: conversationRepository, - cryptography: cryptographyRepository, event: eventRepository, eventTracker: eventTrackerRepository, properties: propertiesRepository, @@ -394,7 +393,13 @@ class App { telemetry.timeStep(AppInitTimingsStep.RECEIVED_ACCESS_TOKEN); try { - await this.core.init(clientType); + await this.core.init(clientType, { + onNewClient({userId, clientId, domain}) { + const qualifiedId = {domain: domain ?? '', id: userId}; + const newClient = {class: ClientClassification.UNKNOWN, id: clientId}; + userRepository.addClientToUser(qualifiedId, newClient, true); + }, + }); } catch (error) { throw new ClientError(CLIENT_ERROR_TYPE.NO_VALID_CLIENT, 'Client has been deleted on backend'); } @@ -416,8 +421,6 @@ class App { telemetry.timeStep(AppInitTimingsStep.VALIDATED_CLIENT); telemetry.addStatistic(AppInitStatisticsValue.CLIENT_TYPE, clientEntity().type ?? 'unknown'); - await cryptographyRepository.init(this.core.service!.cryptography.cryptobox, clientEntity); - loadingView.updateProgress(10); telemetry.timeStep(AppInitTimingsStep.INITIALIZED_CRYPTOGRAPHY); diff --git a/test/helper/TestFactory.js b/test/helper/TestFactory.js index b8e26c2642f..b2abd69bd48 100644 --- a/test/helper/TestFactory.js +++ b/test/helper/TestFactory.js @@ -37,7 +37,6 @@ import {StorageRepository} from 'src/script/storage/StorageRepository'; import {ClientRepository} from 'src/script/client/ClientRepository'; import {EventTrackingRepository} from 'src/script/tracking/EventTrackingRepository'; import {ClientEntity} from 'src/script/client/ClientEntity'; -import {Cryptobox} from '@wireapp/cryptobox'; import {EventRepository} from 'src/script/event/EventRepository'; import {EventServiceNoCompound} from 'src/script/event/EventServiceNoCompound'; import {EventService} from 'src/script/event/EventService'; @@ -112,23 +111,16 @@ export class TestFactory { } /** - * @param {boolean} mockCryptobox do not initialize a full cryptobox (cryptobox initialization is a very costy operation) * @returns {Promise} The cryptography repository. */ - async exposeCryptographyActors(mockCryptobox = true) { - const storageRepository = await this.exposeStorageActors(); + async exposeCryptographyActors() { + await this.exposeStorageActors(); const currentClient = new ClientEntity(true, null); currentClient.id = entities.clients.john_doe.permanent.id; this.cryptography_service = new CryptographyService(); this.cryptography_repository = new CryptographyRepository(this.cryptography_service); - if (!mockCryptobox) { - const storeEngine = storageRepository.storageService['engine']; - this.cryptography_repository.init(new Cryptobox(storeEngine, 10), ko.observable(currentClient)); - await this.cryptography_repository.cryptobox.create(); - } - return this.cryptography_repository; } diff --git a/yarn.lock b/yarn.lock index 0cbcc4a52e7..1529713db8d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4348,9 +4348,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^21.0.0": - version: 21.0.0 - resolution: "@wireapp/api-client@npm:21.0.0" +"@wireapp/api-client@npm:^21.0.1": + version: 21.0.1 + resolution: "@wireapp/api-client@npm:21.0.1" dependencies: "@wireapp/commons": ^4.4.10 "@wireapp/priority-queue": ^1.8.10 @@ -4363,7 +4363,7 @@ __metadata: spark-md5: 3.0.2 tough-cookie: 4.1.2 ws: 8.9.0 - checksum: 01adccb489d95bf7e6eba633286b5a2fe58c5a2c42b333f26ffb3131ffd1770363bca9b622282ba0159421e4dffc30e221bc3b397c874b90ce8222d540bb99d4 + checksum: d5686e3310ea0848633b11ebc05716ee9af18580904a3515be80a6a65762cfb3741b2a3c5af41f5aea179b62de2ed0c74c4356c4732158014472ec2febff5b58 languageName: node linkType: hard @@ -4417,11 +4417,11 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:34.0.0": - version: 34.0.0 - resolution: "@wireapp/core@npm:34.0.0" +"@wireapp/core@npm:34.0.2": + version: 34.0.2 + resolution: "@wireapp/core@npm:34.0.2" dependencies: - "@wireapp/api-client": ^21.0.0 + "@wireapp/api-client": ^21.0.1 "@wireapp/commons": ^4.4.10 "@wireapp/core-crypto": 0.5.2 "@wireapp/cryptobox": 12.8.0 @@ -4436,7 +4436,7 @@ __metadata: logdown: 3.3.1 long: 4.0.0 uuidjs: 4.2.12 - checksum: 6ad38f1c13466dce8b61d6d62199a741948a9ae00f8b2ce10780d763476ef1ffd49f5158a9a85795f7ea96cbb6dfd0cfe8d946a4c53815001b5f30468110b8d2 + checksum: 04cb3911a1f4235dead7b4298fd4d8a833a4bb567e0fe4d4a958052d4a7d8617f8d58aa5024d4d44e436aa1c262d814248de473807febc6e15de433a825885d8 languageName: node linkType: hard @@ -17632,7 +17632,7 @@ __metadata: "@wireapp/antiscroll-2": 1.3.1 "@wireapp/avs": 8.2.16 "@wireapp/copy-config": 1.3.6 - "@wireapp/core": 34.0.0 + "@wireapp/core": 34.0.2 "@wireapp/eslint-config": 1.12.11 "@wireapp/prettier-config": 0.4.6 "@wireapp/react-ui-kit": 8.17.0 From 98a1140f262eb18739da4ff3cbb905069e2bbc33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20G=C3=B3rka?= Date: Thu, 20 Oct 2022 14:54:56 +0200 Subject: [PATCH 15/66] feat: activate mls for client via mls feature config [FS-1088] (#13898) * feat: always pass mlsconfig object to initialize mlsclient * feat: enable sending external proposals when mls feature flag is off * runfix: add support for broken clients by disabling mls for them * refactor: update var name * chore: bump core to use renamed systemCrypto * chore: use exact version match * chore: update lock file * refactor: rename disabling mls helper boolean * refactor: simplify supportmls logic * runfix: require feature flag to support mls for m4 * runfix: make supportMLS a function * Revert "runfix: make supportMLS a function" This reverts commit 06ba72de9bc908a35c21e83b92db9ebb5c4afbd7. * Revert "runfix: require feature flag to support mls for m4" This reverts commit a32154ed5fe7e2c91280d06f02431643d4ed0386. * runfix: add mls feature config var back to supportMLS helper --- src/script/main/app.ts | 4 ++-- src/script/service/CoreSingleton.ts | 10 +++++----- src/script/util/util.ts | 4 ++++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/script/main/app.ts b/src/script/main/app.ts index 871c8a916f3..f4072dab88d 100644 --- a/src/script/main/app.ts +++ b/src/script/main/app.ts @@ -31,7 +31,7 @@ import {Runtime} from '@wireapp/commons'; import {getLogger, Logger} from 'Util/Logger'; import {t} from 'Util/LocalizerUtil'; -import {arrayToBase64, checkIndexedDb, createRandomUuid} from 'Util/util'; +import {arrayToBase64, checkIndexedDb, createRandomUuid, supportsMLS} from 'Util/util'; import {TIME_IN_MILLIS} from 'Util/TimeUtil'; import {enableLogging} from 'Util/LoggerUtil'; import {Environment} from 'Util/Environment'; @@ -428,7 +428,7 @@ class App { const conversationEntities = await conversationRepository.getConversations(); - if (Config.getConfig().FEATURE.ENABLE_MLS) { + if (supportsMLS()) { // We send external proposal to all the MLS conversations that are in an unknown state (not established nor pendingWelcome) await mlsConversationState.getState().sendExternalToPendingJoin( conversationEntities, diff --git a/src/script/service/CoreSingleton.ts b/src/script/service/CoreSingleton.ts index 5e92f520fb8..5520034c79a 100644 --- a/src/script/service/CoreSingleton.ts +++ b/src/script/service/CoreSingleton.ts @@ -22,7 +22,7 @@ import {ClientType} from '@wireapp/api-client/src/client/'; import {container, singleton} from 'tsyringe'; import {APIClient} from './APIClientSingleton'; import {createStorageEngine, DatabaseTypes} from './StoreEngineProvider'; -import {isTemporaryClientAndNonPersistent} from 'Util/util'; +import {isTemporaryClientAndNonPersistent, supportsMLS} from 'Util/util'; import {Config} from '../Config'; declare global { @@ -45,15 +45,15 @@ export class Core extends Account { return createStorageEngine(storeName, dbType); }, - mlsConfig: Config.getConfig().FEATURE.ENABLE_MLS + mlsConfig: supportsMLS() ? { coreCrypoWasmFilePath: '/min/core-crypto.wasm', + keyingMaterialUpdateThreshold: Config.getConfig().FEATURE.MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD, /* - * When in an electron context, the window.secretsCrypto will be populated by the renderer process. + * When in an electron context, the window.systemCrypto will be populated by the renderer process. * We then give those crypto primitives to the core that will use them when encrypting MLS secrets. - * When in an browser context, then this secretsCrypto will be undefined and the core will then use it's internal encryption system + * When in a browser context, then this systemCrypto will be undefined and the core will then use it's internal encryption system */ - keyingMaterialUpdateThreshold: Config.getConfig().FEATURE.MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD, systemCrypto: window.systemCrypto, } : undefined, diff --git a/src/script/util/util.ts b/src/script/util/util.ts index 25c03fcb108..86113f57ab6 100644 --- a/src/script/util/util.ts +++ b/src/script/util/util.ts @@ -398,3 +398,7 @@ export const getSelectionPosition = (element: HTMLTextAreaElement, currentMentio return {newEnd, newStart}; }; + +// temporary hack that disables mls for old 'broken' desktop clients, see https://github.com/wireapp/wire-desktop/pull/6094 +export const supportsMLS = () => + Config.getConfig().FEATURE.ENABLE_MLS && (!Runtime.isDesktopApp() || window.systemCrypto); From a367fd0586a03f20aace8e8ad96a5fc573b41cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20G=C3=B3rka?= Date: Fri, 21 Oct 2022 13:41:57 +0200 Subject: [PATCH 16/66] runfix: fix for firefox ephemeral message progress icon (#13919) --- src/style/components/ephemeral-timer.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/style/components/ephemeral-timer.less b/src/style/components/ephemeral-timer.less index 9275c0b56eb..9847f723e81 100644 --- a/src/style/components/ephemeral-timer.less +++ b/src/style/components/ephemeral-timer.less @@ -17,7 +17,7 @@ * */ -@strokewidth: 4; +@strokewidth: 4px; @strokelength: @strokewidth * pi(); .ephemeral-timer { From 03a2969ce25081ce78d0b702402c8cced6196690 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:11:58 +0000 Subject: [PATCH 17/66] chore(deps-dev): Bump @babel/plugin-proposal-decorators (#13930) Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.19.3 to 7.19.6. - [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.19.6/packages/babel-plugin-proposal-decorators) --- updated-dependencies: - dependency-name: "@babel/plugin-proposal-decorators" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7cd16db5294..4eba093b387 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@babel/core": "7.19.3", "@babel/eslint-parser": "7.19.1", "@babel/plugin-proposal-class-properties": "7.18.6", - "@babel/plugin-proposal-decorators": "7.19.3", + "@babel/plugin-proposal-decorators": "7.19.6", "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6", "@babel/plugin-proposal-optional-chaining": "7.18.9", "@babel/plugin-syntax-dynamic-import": "7.8.3", diff --git a/yarn.lock b/yarn.lock index 1529713db8d..23a61ca3366 100644 --- a/yarn.lock +++ b/yarn.lock @@ -530,9 +530,9 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-decorators@npm:7.19.3": - version: 7.19.3 - resolution: "@babel/plugin-proposal-decorators@npm:7.19.3" +"@babel/plugin-proposal-decorators@npm:7.19.6": + version: 7.19.6 + resolution: "@babel/plugin-proposal-decorators@npm:7.19.6" dependencies: "@babel/helper-create-class-features-plugin": ^7.19.0 "@babel/helper-plugin-utils": ^7.19.0 @@ -541,7 +541,7 @@ __metadata: "@babel/plugin-syntax-decorators": ^7.19.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: d5ff9b963907e960968733a736e329d5c6fd9fe3432379cb8f34858ada9163e92d0c393603602c70126ee6b61f2fff274284b3da9f43e7f3b9f00dbc7052b747 + checksum: 69162475282507e1579232fdaae26330cfcfa7843f4a943383d76c61a5e225ea1fe08edd7c700c400694ab9b57e8b3928b757da985ac613ddfc78be5a9b61c47 languageName: node linkType: hard @@ -17587,7 +17587,7 @@ __metadata: "@babel/core": 7.19.3 "@babel/eslint-parser": 7.19.1 "@babel/plugin-proposal-class-properties": 7.18.6 - "@babel/plugin-proposal-decorators": 7.19.3 + "@babel/plugin-proposal-decorators": 7.19.6 "@babel/plugin-proposal-nullish-coalescing-operator": 7.18.6 "@babel/plugin-proposal-optional-chaining": 7.18.9 "@babel/plugin-syntax-dynamic-import": 7.8.3 From b07e724a49b142f41e292d8b78c07cf452907a29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:12:11 +0000 Subject: [PATCH 18/66] chore(deps): Bump @wireapp/core from 34.0.2 to 34.1.1 (#13926) Bumps [@wireapp/core](https://github.com/wireapp/wire-web-packages) from 34.0.2 to 34.1.1. - [Release notes](https://github.com/wireapp/wire-web-packages/releases) - [Commits](https://github.com/wireapp/wire-web-packages/compare/@wireapp/core@34.0.2...@wireapp/core@34.1.1) --- updated-dependencies: - dependency-name: "@wireapp/core" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 54 ++++++++++++++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 4eba093b387..ac54e54e9d1 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.4", "@wireapp/antiscroll-2": "1.3.1", "@wireapp/avs": "8.2.16", - "@wireapp/core": "34.0.2", + "@wireapp/core": "34.1.1", "@wireapp/react-ui-kit": "8.17.0", "@wireapp/store-engine-dexie": "1.7.6", "@wireapp/store-engine-sqleet": "1.8.6", diff --git a/yarn.lock b/yarn.lock index 23a61ca3366..2388ec27941 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4348,14 +4348,14 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^21.0.1": - version: 21.0.1 - resolution: "@wireapp/api-client@npm:21.0.1" +"@wireapp/api-client@npm:^21.0.3": + version: 21.0.3 + resolution: "@wireapp/api-client@npm:21.0.3" dependencies: "@wireapp/commons": ^4.4.10 "@wireapp/priority-queue": ^1.8.10 "@wireapp/protocol-messaging": 1.39.0 - axios: 0.21.4 + axios: ^1.1.3 axios-retry: 3.3.1 http-status-codes: 2.2.0 logdown: 3.3.1 @@ -4363,7 +4363,7 @@ __metadata: spark-md5: 3.0.2 tough-cookie: 4.1.2 ws: 8.9.0 - checksum: d5686e3310ea0848633b11ebc05716ee9af18580904a3515be80a6a65762cfb3741b2a3c5af41f5aea179b62de2ed0c74c4356c4732158014472ec2febff5b58 + checksum: 384d87635fd64255e85447ab581f1167dab6b6251cbba8ef719dd41fa408ec82533bd1c8c49d86eaafa1ecaefac15a777a25accee628afee9da6b21a83a06afb languageName: node linkType: hard @@ -4417,18 +4417,18 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:34.0.2": - version: 34.0.2 - resolution: "@wireapp/core@npm:34.0.2" +"@wireapp/core@npm:34.1.1": + version: 34.1.1 + resolution: "@wireapp/core@npm:34.1.1" dependencies: - "@wireapp/api-client": ^21.0.1 + "@wireapp/api-client": ^21.0.3 "@wireapp/commons": ^4.4.10 "@wireapp/core-crypto": 0.5.2 "@wireapp/cryptobox": 12.8.0 "@wireapp/promise-queue": ^1.3.4 "@wireapp/protocol-messaging": 1.39.0 - "@wireapp/store-engine-dexie": ^1.7.10 - axios: ^0.27.2 + "@wireapp/store-engine-dexie": ^1.7.11 + axios: ^1.1.3 bazinga64: 5.11.10 hash.js: 1.1.7 http-status-codes: 2.2.0 @@ -4436,7 +4436,7 @@ __metadata: logdown: 3.3.1 long: 4.0.0 uuidjs: 4.2.12 - checksum: 04cb3911a1f4235dead7b4298fd4d8a833a4bb567e0fe4d4a958052d4a7d8617f8d58aa5024d4d44e436aa1c262d814248de473807febc6e15de433a825885d8 + checksum: 61b4f6dd7b46711372e49eab04c8a3340d89bea030f0be500a9af04d678ae4e4b71a2d28fb60ffbe37739eac9180786743d4d29749c8fb40f0907643ef656c12 languageName: node linkType: hard @@ -4566,14 +4566,14 @@ __metadata: languageName: node linkType: hard -"@wireapp/store-engine-dexie@npm:^1.7.10": - version: 1.7.10 - resolution: "@wireapp/store-engine-dexie@npm:1.7.10" +"@wireapp/store-engine-dexie@npm:^1.7.11": + version: 1.7.11 + resolution: "@wireapp/store-engine-dexie@npm:1.7.11" dependencies: dexie: 3.2.2 peerDependencies: "@wireapp/store-engine": 4.x.x - checksum: 80f89cb63d35689dc13841c7695057fbdb866a36a50b87e7c61a51428c6248a5b4de19f37c0ef9cec1be174f7dd5468ff3bd6a78c90aed5cecc6ebfc2c699f57 + checksum: 301550cf9c94f07e74039ad04d32de12f1ad5c22f18d15f9273f3d214a1e1ffabf5fde4b08ef5a7532cacb6ec26f0cb3c894f7e7c6f966981ee11c19e41b1d6f languageName: node linkType: hard @@ -5314,13 +5314,14 @@ __metadata: languageName: node linkType: hard -"axios@npm:^0.27.2": - version: 0.27.2 - resolution: "axios@npm:0.27.2" +"axios@npm:^1.1.3": + version: 1.1.3 + resolution: "axios@npm:1.1.3" dependencies: - follow-redirects: ^1.14.9 + follow-redirects: ^1.15.0 form-data: ^4.0.0 - checksum: 38cb7540465fe8c4102850c4368053c21683af85c5fdf0ea619f9628abbcb59415d1e22ebc8a6390d2bbc9b58a9806c874f139767389c862ec9b772235f06854 + proxy-from-env: ^1.1.0 + checksum: cab3b17bf6092c9387f7023d699db093cfa23650b56c4422cd474d124b78b2e3b5a520f932c330664a58ab85b867b1c25a95cace475ef72d236888c852b84e6d languageName: node linkType: hard @@ -8523,7 +8524,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.14.9": +"follow-redirects@npm:^1.15.0": version: 1.15.2 resolution: "follow-redirects@npm:1.15.2" peerDependenciesMeta: @@ -14342,6 +14343,13 @@ __metadata: languageName: node linkType: hard +"proxy-from-env@npm:^1.1.0": + version: 1.1.0 + resolution: "proxy-from-env@npm:1.1.0" + checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4 + languageName: node + linkType: hard + "prr@npm:~1.0.1": version: 1.0.1 resolution: "prr@npm:1.0.1" @@ -17632,7 +17640,7 @@ __metadata: "@wireapp/antiscroll-2": 1.3.1 "@wireapp/avs": 8.2.16 "@wireapp/copy-config": 1.3.6 - "@wireapp/core": 34.0.2 + "@wireapp/core": 34.1.1 "@wireapp/eslint-config": 1.12.11 "@wireapp/prettier-config": 0.4.6 "@wireapp/react-ui-kit": 8.17.0 From 50d7d0d565401c464827bc5c27fc2b30fb028b23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:12:19 +0000 Subject: [PATCH 19/66] chore(deps): Bump @wireapp/store-engine-dexie from 1.7.6 to 1.7.11 (#13931) Bumps [@wireapp/store-engine-dexie](https://github.com/wireapp/wire-web-packages) from 1.7.6 to 1.7.11. - [Release notes](https://github.com/wireapp/wire-web-packages/releases) - [Commits](https://github.com/wireapp/wire-web-packages/compare/@wireapp/store-engine-dexie@1.7.6...@wireapp/store-engine-dexie@1.7.11) --- updated-dependencies: - dependency-name: "@wireapp/store-engine-dexie" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index ac54e54e9d1..abcffb0055a 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "@wireapp/avs": "8.2.16", "@wireapp/core": "34.1.1", "@wireapp/react-ui-kit": "8.17.0", - "@wireapp/store-engine-dexie": "1.7.6", + "@wireapp/store-engine-dexie": "1.7.11", "@wireapp/store-engine-sqleet": "1.8.6", "@wireapp/webapp-events": "0.14.6", "amplify": "https://github.com/wireapp/amplify#head=master", diff --git a/yarn.lock b/yarn.lock index 2388ec27941..861b2c9831a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4555,14 +4555,14 @@ __metadata: languageName: node linkType: hard -"@wireapp/store-engine-dexie@npm:1.7.6": - version: 1.7.6 - resolution: "@wireapp/store-engine-dexie@npm:1.7.6" +"@wireapp/store-engine-dexie@npm:1.7.11": + version: 1.7.11 + resolution: "@wireapp/store-engine-dexie@npm:1.7.11" dependencies: dexie: 3.2.2 peerDependencies: "@wireapp/store-engine": 4.x.x - checksum: 87fc674831f47ba9e31a86b604fa8ef321a837d2297a769291416150a019b54c8e4fedd3a9d06588030308c542c8187ff9957d256369cdcac505274c5b7260b6 + checksum: 301550cf9c94f07e74039ad04d32de12f1ad5c22f18d15f9273f3d214a1e1ffabf5fde4b08ef5a7532cacb6ec26f0cb3c894f7e7c6f966981ee11c19e41b1d6f languageName: node linkType: hard @@ -17644,7 +17644,7 @@ __metadata: "@wireapp/eslint-config": 1.12.11 "@wireapp/prettier-config": 0.4.6 "@wireapp/react-ui-kit": 8.17.0 - "@wireapp/store-engine-dexie": 1.7.6 + "@wireapp/store-engine-dexie": 1.7.11 "@wireapp/store-engine-sqleet": 1.8.6 "@wireapp/webapp-events": 0.14.6 adm-zip: 0.5.9 From 4f9bd4e3370b8ba5b3859b047b502befbee66d28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:13:25 +0000 Subject: [PATCH 20/66] chore(deps-dev): Bump jest-environment-jsdom from 29.1.2 to 29.2.1 (#13932) Bumps [jest-environment-jsdom](https://github.com/facebook/jest/tree/HEAD/packages/jest-environment-jsdom) from 29.1.2 to 29.2.1. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v29.2.1/packages/jest-environment-jsdom) --- updated-dependencies: - dependency-name: jest-environment-jsdom dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 147 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 105 insertions(+), 44 deletions(-) diff --git a/package.json b/package.json index abcffb0055a..241e2f25c5e 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "intersection-observer": "0.12.2", "jest": "29.2.0", "jest-canvas-mock": "2.4.0", - "jest-environment-jsdom": "29.1.2", + "jest-environment-jsdom": "29.2.1", "jest-jasmine2": "29.2.0", "jsdom-worker": "0.3.0", "less": "3.13.1", diff --git a/yarn.lock b/yarn.lock index 861b2c9831a..a7f714114e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2633,18 +2633,6 @@ __metadata: languageName: node linkType: hard -"@jest/environment@npm:^29.1.2": - version: 29.1.2 - resolution: "@jest/environment@npm:29.1.2" - dependencies: - "@jest/fake-timers": ^29.1.2 - "@jest/types": ^29.1.2 - "@types/node": "*" - jest-mock: ^29.1.2 - checksum: 084614290016788807753965d35afe6b06c217f8b896139f766a603dc2d38ffdcb40563cf1510fd5c1168a6eaa97cc12d5bbe878c3ad25a34c942f06b1ddff23 - languageName: node - linkType: hard - "@jest/environment@npm:^29.2.0": version: 29.2.0 resolution: "@jest/environment@npm:29.2.0" @@ -2657,6 +2645,18 @@ __metadata: languageName: node linkType: hard +"@jest/environment@npm:^29.2.1": + version: 29.2.1 + resolution: "@jest/environment@npm:29.2.1" + dependencies: + "@jest/fake-timers": ^29.2.1 + "@jest/types": ^29.2.1 + "@types/node": "*" + jest-mock: ^29.2.1 + checksum: 632d023c9e514a3d5647cbc7bc27a97113ef1647d9c7e205f90e0af359804dc7eaddfe43928b6180f2fc4914761878e671edcccacca4012e2e9f594979adbfac + languageName: node + linkType: hard + "@jest/expect-utils@npm:^29.1.2": version: 29.1.2 resolution: "@jest/expect-utils@npm:29.1.2" @@ -2685,20 +2685,6 @@ __metadata: languageName: node linkType: hard -"@jest/fake-timers@npm:^29.1.2": - version: 29.1.2 - resolution: "@jest/fake-timers@npm:29.1.2" - dependencies: - "@jest/types": ^29.1.2 - "@sinonjs/fake-timers": ^9.1.2 - "@types/node": "*" - jest-message-util: ^29.1.2 - jest-mock: ^29.1.2 - jest-util: ^29.1.2 - checksum: a5331ffdaaabeaded69b41f46ec85f8768fbfa5d3953be24111b2849a93626c851c6ebbb64ae718ab9ebea86c21083702985caeb2812f51941b111a9ead377e1 - languageName: node - linkType: hard - "@jest/fake-timers@npm:^29.2.0": version: 29.2.0 resolution: "@jest/fake-timers@npm:29.2.0" @@ -2713,6 +2699,20 @@ __metadata: languageName: node linkType: hard +"@jest/fake-timers@npm:^29.2.1": + version: 29.2.1 + resolution: "@jest/fake-timers@npm:29.2.1" + dependencies: + "@jest/types": ^29.2.1 + "@sinonjs/fake-timers": ^9.1.2 + "@types/node": "*" + jest-message-util: ^29.2.1 + jest-mock: ^29.2.1 + jest-util: ^29.2.1 + checksum: e4f42a2677b91fed6e59ca466de2247bca5767c4922b5edb67ce34d47477757599f2760c3abae3d76e65917ac60c876223ac2c9d3f06d4f2a49d4be7e076f9bb + languageName: node + linkType: hard + "@jest/globals@npm:^29.2.0": version: 29.2.0 resolution: "@jest/globals@npm:29.2.0" @@ -2857,6 +2857,20 @@ __metadata: languageName: node linkType: hard +"@jest/types@npm:^29.2.1": + version: 29.2.1 + resolution: "@jest/types@npm:29.2.1" + dependencies: + "@jest/schemas": ^29.0.0 + "@types/istanbul-lib-coverage": ^2.0.0 + "@types/istanbul-reports": ^3.0.0 + "@types/node": "*" + "@types/yargs": ^17.0.8 + chalk: ^4.0.0 + checksum: a83f20727425179aa05974aa7553c307d207fbb6b7ae5ab1e37fbb6ba9b6655f26655301fc804f2545d33f4c4a6b59d41eed1737c005d2b83fce9e14841b4150 + languageName: node + linkType: hard + "@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2": version: 0.3.2 resolution: "@jridgewell/gen-mapping@npm:0.3.2" @@ -10654,19 +10668,24 @@ __metadata: languageName: node linkType: hard -"jest-environment-jsdom@npm:29.1.2": - version: 29.1.2 - resolution: "jest-environment-jsdom@npm:29.1.2" +"jest-environment-jsdom@npm:29.2.1": + version: 29.2.1 + resolution: "jest-environment-jsdom@npm:29.2.1" dependencies: - "@jest/environment": ^29.1.2 - "@jest/fake-timers": ^29.1.2 - "@jest/types": ^29.1.2 + "@jest/environment": ^29.2.1 + "@jest/fake-timers": ^29.2.1 + "@jest/types": ^29.2.1 "@types/jsdom": ^20.0.0 "@types/node": "*" - jest-mock: ^29.1.2 - jest-util: ^29.1.2 + jest-mock: ^29.2.1 + jest-util: ^29.2.1 jsdom: ^20.0.0 - checksum: 75737ab504fe6a2ed4e4973724deca46176b80380e4e5b040c8e318af56e31d5ab9679e4a2dd1a1e2a27ca6009312f9a12309c9433d645e3ec09354f52b0e287 + peerDependencies: + canvas: ^2.5.0 + peerDependenciesMeta: + canvas: + optional: true + checksum: 7e721fefad2d3a3849e6b85dc387985b9b9e4fcc43e07627886b54e88c714ba49ab7a1b009118572ff597f75ab183d00fd934705d88e90b7c0ddf8d3d0048c9a languageName: node linkType: hard @@ -10814,14 +10833,20 @@ __metadata: languageName: node linkType: hard -"jest-mock@npm:^29.1.2": - version: 29.1.2 - resolution: "jest-mock@npm:29.1.2" +"jest-message-util@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-message-util@npm:29.2.1" dependencies: - "@jest/types": ^29.1.2 - "@types/node": "*" - jest-util: ^29.1.2 - checksum: 145817b10c79e8d1801dba8ae5c6e305f17f2497ed1eb9b54336fa7b448ffcafb2cc97b57cef650cc5b3f7d77a063d586b3d446bcd907161e2ca7e5d68184e8f + "@babel/code-frame": ^7.12.13 + "@jest/types": ^29.2.1 + "@types/stack-utils": ^2.0.0 + chalk: ^4.0.0 + graceful-fs: ^4.2.9 + micromatch: ^4.0.4 + pretty-format: ^29.2.1 + slash: ^3.0.0 + stack-utils: ^2.0.3 + checksum: 1ec1341dea7f0f04dfa9912647e5c4a092954c122becd9560e43e317407fd401745d99766048be7ee5f0b0b5ff09c84d3c853aa777af57139050efed0ad78376 languageName: node linkType: hard @@ -10836,6 +10861,17 @@ __metadata: languageName: node linkType: hard +"jest-mock@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-mock@npm:29.2.1" + dependencies: + "@jest/types": ^29.2.1 + "@types/node": "*" + jest-util: ^29.2.1 + checksum: fb28fc277ed788fec45adb8ed1e45d6c7fc02938b5db2e87bfaccc83e385f6fcabfe3433562c50a051efffa02676c07e9e7fdc90d177be67d87a6831c5fc19fe + languageName: node + linkType: hard + "jest-pnp-resolver@npm:^1.2.2": version: 1.2.2 resolution: "jest-pnp-resolver@npm:1.2.2" @@ -11001,6 +11037,20 @@ __metadata: languageName: node linkType: hard +"jest-util@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-util@npm:29.2.1" + dependencies: + "@jest/types": ^29.2.1 + "@types/node": "*" + chalk: ^4.0.0 + ci-info: ^3.2.0 + graceful-fs: ^4.2.9 + picomatch: ^2.2.3 + checksum: 781bd14a65599d24b7449877020f4da32e8cb8fbc31c4e849c589ffde58f0eec27de9f690dba182e3ca369fe651c0bb9c307de29a0927d12777677ded56bafb8 + languageName: node + linkType: hard + "jest-validate@npm:^29.2.0": version: 29.2.0 resolution: "jest-validate@npm:29.2.0" @@ -14265,6 +14315,17 @@ __metadata: languageName: node linkType: hard +"pretty-format@npm:^29.2.1": + version: 29.2.1 + resolution: "pretty-format@npm:29.2.1" + dependencies: + "@jest/schemas": ^29.0.0 + ansi-styles: ^5.0.0 + react-is: ^18.0.0 + checksum: d192cbd3dee72e9b60764629d1f098d60fddc3fc9435f44774a01dd1c5794f36a81fa6a7377a527f994317950d8fc6c5bf9c9915387c5d32f107525996e32a1c + languageName: node + linkType: hard + "printj@npm:~1.1.0": version: 1.1.2 resolution: "printj@npm:1.1.2" @@ -17698,7 +17759,7 @@ __metadata: intersection-observer: 0.12.2 jest: 29.2.0 jest-canvas-mock: 2.4.0 - jest-environment-jsdom: 29.1.2 + jest-environment-jsdom: 29.2.1 jest-jasmine2: 29.2.0 jquery: 3.6.1 jquery-mousewheel: 3.1.13 From b86deaa43af4e94c8aaaa3f265f9d379a2cc767d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:13:54 +0000 Subject: [PATCH 21/66] chore(deps): Bump react-intl from 6.2.0 to 6.2.1 (#13927) Bumps [react-intl](https://github.com/formatjs/formatjs) from 6.2.0 to 6.2.1. - [Release notes](https://github.com/formatjs/formatjs/releases) - [Commits](https://github.com/formatjs/formatjs/compare/react-intl@6.2.0...react-intl@6.2.1) --- updated-dependencies: - dependency-name: react-intl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 46 +++++++++++++++++++++++----------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 241e2f25c5e..04014545dff 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "platform": "1.3.6", "react": "18.2.0", "react-dom": "18.2.0", - "react-intl": "6.2.0", + "react-intl": "6.2.1", "react-redux": "8.0.4", "react-router": "6.4.2", "react-router-dom": "6.4.2", diff --git a/yarn.lock b/yarn.lock index a7f714114e5..741425d4d60 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2454,14 +2454,14 @@ __metadata: languageName: node linkType: hard -"@formatjs/icu-messageformat-parser@npm:2.1.9": - version: 2.1.9 - resolution: "@formatjs/icu-messageformat-parser@npm:2.1.9" +"@formatjs/icu-messageformat-parser@npm:2.1.10": + version: 2.1.10 + resolution: "@formatjs/icu-messageformat-parser@npm:2.1.10" dependencies: "@formatjs/ecma402-abstract": 1.13.0 "@formatjs/icu-skeleton-parser": 1.3.14 tslib: 2.4.0 - checksum: e683f7386f6569239a296b0c8c32131883f2a2cb5fc03b253c62e5d2ce1ae4d9f2f85641be184fcacdaef7adc4536fdb1d69f1c395e479e25c48b9a13a2db375 + checksum: a251a2be349a6daffc9856b6345189ea6ac59b8a20e2d603f5d196f5649f0c262eb714e5fb5f3eeff0c90a47bc77e6dc54fb281f659df3374dbb78116263acc3 languageName: node linkType: hard @@ -2506,23 +2506,23 @@ __metadata: languageName: node linkType: hard -"@formatjs/intl@npm:2.5.0": - version: 2.5.0 - resolution: "@formatjs/intl@npm:2.5.0" +"@formatjs/intl@npm:2.5.1": + version: 2.5.1 + resolution: "@formatjs/intl@npm:2.5.1" dependencies: "@formatjs/ecma402-abstract": 1.13.0 "@formatjs/fast-memoize": 1.2.6 - "@formatjs/icu-messageformat-parser": 2.1.9 + "@formatjs/icu-messageformat-parser": 2.1.10 "@formatjs/intl-displaynames": 6.1.4 "@formatjs/intl-listformat": 7.1.3 - intl-messageformat: 10.2.0 + intl-messageformat: 10.2.1 tslib: 2.4.0 peerDependencies: typescript: ^4.7 peerDependenciesMeta: typescript: optional: true - checksum: 2a2b690dd5c5d7b4d5981cd970c9d05beb00ec7be07d384bc574cb7af3c4cdb97d80ab5869dc4b8dd58f5ff17772a24770abeb1b16209452a12dad6c69f1e7ce + checksum: d9c8c9807fa7bd921151bd88c7e6d621692776bf16d9ec8ae42876c431d17474a6686b8042fe316d23430190fbf2a1a68682543300e843deb2b513d83a53516e languageName: node linkType: hard @@ -9854,15 +9854,15 @@ __metadata: languageName: node linkType: hard -"intl-messageformat@npm:10.2.0": - version: 10.2.0 - resolution: "intl-messageformat@npm:10.2.0" +"intl-messageformat@npm:10.2.1": + version: 10.2.1 + resolution: "intl-messageformat@npm:10.2.1" dependencies: "@formatjs/ecma402-abstract": 1.13.0 "@formatjs/fast-memoize": 1.2.6 - "@formatjs/icu-messageformat-parser": 2.1.9 + "@formatjs/icu-messageformat-parser": 2.1.10 tslib: 2.4.0 - checksum: 1f0839f0fb34434680707ce5a819bb7668f9d43e718cf9a7289bdea0a94ec4f200564e6c8176ef5c330c323f3a36abd8c4b672a62872bc277d4ace41dd8c50b9 + checksum: a2bcbe0166cbd112bba78626a5dc2970f1398e61e1d908e9083a0ef8b6ddd2ef0699904dc60ea3a1d03155b12ca17e80a3caed60e1fd25432868065e4f0032da languageName: node linkType: hard @@ -14546,19 +14546,19 @@ __metadata: languageName: node linkType: hard -"react-intl@npm:6.2.0": - version: 6.2.0 - resolution: "react-intl@npm:6.2.0" +"react-intl@npm:6.2.1": + version: 6.2.1 + resolution: "react-intl@npm:6.2.1" dependencies: "@formatjs/ecma402-abstract": 1.13.0 - "@formatjs/icu-messageformat-parser": 2.1.9 - "@formatjs/intl": 2.5.0 + "@formatjs/icu-messageformat-parser": 2.1.10 + "@formatjs/intl": 2.5.1 "@formatjs/intl-displaynames": 6.1.4 "@formatjs/intl-listformat": 7.1.3 "@types/hoist-non-react-statics": ^3.3.1 "@types/react": 16 || 17 || 18 hoist-non-react-statics: ^3.3.2 - intl-messageformat: 10.2.0 + intl-messageformat: 10.2.1 tslib: 2.4.0 peerDependencies: react: ^16.6.0 || 17 || 18 @@ -14566,7 +14566,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 24c127954f69a9abebc67af7929920e424c760ab431417a82ec427d3ef4fa216b81e5b8a67e7d2c8e67c9b0bdfb53bc40d5deefc5192efb5fb64c16bfc2d6d5c + checksum: 1b87ce7d1ab5d6796f4075422f4b59ecd26214dd7e9c3fa0821b49df244c5d0e876a010f3839cbedeca4f67a70e64b5e473d15036bf06a4bac1bdec8cbd7e5f8 languageName: node linkType: hard @@ -17788,7 +17788,7 @@ __metadata: raf: 3.4.1 react: 18.2.0 react-dom: 18.2.0 - react-intl: 6.2.0 + react-intl: 6.2.1 react-redux: 8.0.4 react-router: 6.4.2 react-router-dom: 6.4.2 From 50626d2b1905134b2026a31741177e0d7cec6d06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:14:02 +0000 Subject: [PATCH 22/66] chore(deps): Bump @wireapp/commons from 4.4.6 to 4.4.10 in /server (#13928) Bumps [@wireapp/commons](https://github.com/wireapp/wire-web-packages) from 4.4.6 to 4.4.10. - [Release notes](https://github.com/wireapp/wire-web-packages/releases) - [Commits](https://github.com/wireapp/wire-web-packages/compare/@wireapp/commons@4.4.6...@wireapp/commons@4.4.10) --- updated-dependencies: - dependency-name: "@wireapp/commons" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- server/package.json | 2 +- server/yarn.lock | 23 ++++++----------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/server/package.json b/server/package.json index 8cb6445dc47..49d3600e8d5 100644 --- a/server/package.json +++ b/server/package.json @@ -4,7 +4,7 @@ "main": "dist/index.js", "license": "GPL-3.0", "dependencies": { - "@wireapp/commons": "4.4.6", + "@wireapp/commons": "4.4.10", "dotenv": "16.0.3", "dotenv-extended": "2.9.0", "express": "4.18.2", diff --git a/server/yarn.lock b/server/yarn.lock index 6c599fbc990..ff9a90b71ea 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -1332,15 +1332,15 @@ __metadata: languageName: node linkType: hard -"@wireapp/commons@npm:4.4.6": - version: 4.4.6 - resolution: "@wireapp/commons@npm:4.4.6" +"@wireapp/commons@npm:4.4.10": + version: 4.4.10 + resolution: "@wireapp/commons@npm:4.4.10" dependencies: ansi-regex: 5.0.1 - fs-extra: 10.0.0 + fs-extra: 10.1.0 logdown: 3.3.1 platform: 1.3.6 - checksum: 76dcebc6ba4a514c15ab27c2c048edb1043a1f1ab1652a2b1b059f8d9bd227f351d44c345445d38c37333c45751e4432cd3ab53697b3d0cab761025c834d8a55 + checksum: c026b91caffbf8c2abf929abb4e62c33684a1c3bbcde7d6f6164d60a80ce7507969921965fc477145c127eff1b1e3f4d7072f9821c08b8d6cecd9a474894f169 languageName: node linkType: hard @@ -2952,17 +2952,6 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:10.0.0": - version: 10.0.0 - resolution: "fs-extra@npm:10.0.0" - dependencies: - graceful-fs: ^4.2.0 - jsonfile: ^6.0.1 - universalify: ^2.0.0 - checksum: 5285a3d8f34b917cf2b66af8c231a40c1623626e9d701a20051d3337be16c6d7cac94441c8b3732d47a92a2a027886ca93c69b6a4ae6aee3c89650d2a8880c0a - languageName: node - linkType: hard - "fs-extra@npm:10.1.0": version: 10.1.0 resolution: "fs-extra@npm:10.1.0" @@ -6717,7 +6706,7 @@ __metadata: "@types/geolite2": 2.0.0 "@types/hbs": 4.0.1 "@types/node": 12.20.55 - "@wireapp/commons": 4.4.6 + "@wireapp/commons": 4.4.10 dotenv: 16.0.3 dotenv-extended: 2.9.0 express: 4.18.2 From 1362637291ccb458fa4ad3a05aab5203b49384ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:16:12 +0000 Subject: [PATCH 23/66] chore(deps-dev): Bump eslint-plugin-jest from 27.1.2 to 27.1.3 (#13936) Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 27.1.2 to 27.1.3. - [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases) - [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v27.1.2...v27.1.3) --- updated-dependencies: - dependency-name: eslint-plugin-jest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 04014545dff..55a0f053502 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "eslint-config-prettier": "8.5.0", "eslint-plugin-babel": "5.3.1", "eslint-plugin-import": "2.26.0", - "eslint-plugin-jest": "27.1.2", + "eslint-plugin-jest": "27.1.3", "eslint-plugin-jsdoc": "39.3.6", "eslint-plugin-jsx-a11y": "6.6.1", "eslint-plugin-no-unsanitized": "4.0.1", diff --git a/yarn.lock b/yarn.lock index 741425d4d60..ef8c3e6f8dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7723,9 +7723,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-jest@npm:27.1.2": - version: 27.1.2 - resolution: "eslint-plugin-jest@npm:27.1.2" +"eslint-plugin-jest@npm:27.1.3": + version: 27.1.3 + resolution: "eslint-plugin-jest@npm:27.1.3" dependencies: "@typescript-eslint/utils": ^5.10.0 peerDependencies: @@ -7736,7 +7736,7 @@ __metadata: optional: true jest: optional: true - checksum: b09833a38e13fd83d52da789fa11c8df5533b4bb896ed633f8f2422e4eefb8d7566dbc75ef1b894e16925135541a2dcb34fec4927cb89900ae7c55dce48a1e85 + checksum: 427f39ad4bb50b4e50a1f6aba04962ee3686e25b716d3e4dff47a304c2a352a35b032fec7350b84dc6362838525d93a70f7ae0f961b182c79bf602e90ebb1a55 languageName: node linkType: hard @@ -17730,7 +17730,7 @@ __metadata: eslint-plugin-babel: 5.3.1 eslint-plugin-header: 3.1.1 eslint-plugin-import: 2.26.0 - eslint-plugin-jest: 27.1.2 + eslint-plugin-jest: 27.1.3 eslint-plugin-jsdoc: 39.3.6 eslint-plugin-jsx-a11y: 6.6.1 eslint-plugin-no-unsanitized: 4.0.1 From 73f32f92062ddcccbcab6ab9081271acd75f4ef9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:16:35 +0000 Subject: [PATCH 24/66] chore(deps-dev): Bump @wireapp/prettier-config from 0.4.6 to 0.4.7 (#13933) Bumps [@wireapp/prettier-config](https://github.com/wireapp/wire-web-packages) from 0.4.6 to 0.4.7. - [Release notes](https://github.com/wireapp/wire-web-packages/releases) - [Commits](https://github.com/wireapp/wire-web-packages/compare/@wireapp/prettier-config@0.4.6...@wireapp/prettier-config@0.4.7) --- updated-dependencies: - dependency-name: "@wireapp/prettier-config" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 55a0f053502..332feab9e48 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "@typescript-eslint/parser": "5.40.0", "@wireapp/copy-config": "1.3.6", "@wireapp/eslint-config": "1.12.11", - "@wireapp/prettier-config": "0.4.6", + "@wireapp/prettier-config": "0.4.7", "adm-zip": "0.5.9", "autoprefixer": "9.8.8", "babel-loader": "8.2.5", diff --git a/yarn.lock b/yarn.lock index ef8c3e6f8dc..fd0df215b95 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4496,10 +4496,10 @@ __metadata: languageName: node linkType: hard -"@wireapp/prettier-config@npm:0.4.6": - version: 0.4.6 - resolution: "@wireapp/prettier-config@npm:0.4.6" - checksum: ccbff9b5b14a19bfb6c47f7858db5114df31c2c52e37901b0a6202ceeb0d058ceb1464e5d5ccded95fef50035f550290e501be9b5658a78b406546649a761279 +"@wireapp/prettier-config@npm:0.4.7": + version: 0.4.7 + resolution: "@wireapp/prettier-config@npm:0.4.7" + checksum: 7b00c430417bc7ff86bf64184db2b652611a106e644c89c3373decda5a1acda51a35993f5161039da5a157d85272b19cf8ed547e5fcde45912d57012199d7ccd languageName: node linkType: hard @@ -17703,7 +17703,7 @@ __metadata: "@wireapp/copy-config": 1.3.6 "@wireapp/core": 34.1.1 "@wireapp/eslint-config": 1.12.11 - "@wireapp/prettier-config": 0.4.6 + "@wireapp/prettier-config": 0.4.7 "@wireapp/react-ui-kit": 8.17.0 "@wireapp/store-engine-dexie": 1.7.11 "@wireapp/store-engine-sqleet": 1.8.6 From 8914b3dfaa55e51289dc7f2579d36ebd6e9ba6f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:17:16 +0000 Subject: [PATCH 25/66] chore(deps-dev): Bump @babel/core from 7.19.3 to 7.19.6 (#13939) Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.19.3 to 7.19.6. - [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.19.6/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 100 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 332feab9e48..36aea494e46 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "zustand": "4.1.2" }, "devDependencies": { - "@babel/core": "7.19.3", + "@babel/core": "7.19.6", "@babel/eslint-parser": "7.19.1", "@babel/plugin-proposal-class-properties": "7.18.6", "@babel/plugin-proposal-decorators": "7.19.6", diff --git a/yarn.lock b/yarn.lock index fd0df215b95..becfa7a166d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -50,7 +50,30 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:7.19.3, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3": +"@babel/core@npm:7.19.6": + version: 7.19.6 + resolution: "@babel/core@npm:7.19.6" + dependencies: + "@ampproject/remapping": ^2.1.0 + "@babel/code-frame": ^7.18.6 + "@babel/generator": ^7.19.6 + "@babel/helper-compilation-targets": ^7.19.3 + "@babel/helper-module-transforms": ^7.19.6 + "@babel/helpers": ^7.19.4 + "@babel/parser": ^7.19.6 + "@babel/template": ^7.18.10 + "@babel/traverse": ^7.19.6 + "@babel/types": ^7.19.4 + convert-source-map: ^1.7.0 + debug: ^4.1.0 + gensync: ^1.0.0-beta.2 + json5: ^2.2.1 + semver: ^6.3.0 + checksum: 85c0bd38d0ef180aa2d23c3db6840a0baec88d2e05c30e7ffc3dfeb6b2b89d6e4864922f04997a1f4ce55f9dd469bf2e76518d5c7ae744b98516709d32769b73 + languageName: node + linkType: hard + +"@babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3": version: 7.19.3 resolution: "@babel/core@npm:7.19.3" dependencies: @@ -98,6 +121,17 @@ __metadata: languageName: node linkType: hard +"@babel/generator@npm:^7.19.6": + version: 7.19.6 + resolution: "@babel/generator@npm:7.19.6" + dependencies: + "@babel/types": ^7.19.4 + "@jridgewell/gen-mapping": ^0.3.2 + jsesc: ^2.5.1 + checksum: 734fcb1fbef182e7b8967459cb39b81edd2701dd13170c154b368d4e086842f72ef214798c5a37e67e0a695dfb34b13143277bedcd9795b3b1b83da8e1d236c6 + languageName: node + linkType: hard + "@babel/helper-annotate-as-pure@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-annotate-as-pure@npm:7.18.6" @@ -293,6 +327,22 @@ __metadata: languageName: node linkType: hard +"@babel/helper-module-transforms@npm:^7.19.6": + version: 7.19.6 + resolution: "@babel/helper-module-transforms@npm:7.19.6" + dependencies: + "@babel/helper-environment-visitor": ^7.18.9 + "@babel/helper-module-imports": ^7.18.6 + "@babel/helper-simple-access": ^7.19.4 + "@babel/helper-split-export-declaration": ^7.18.6 + "@babel/helper-validator-identifier": ^7.19.1 + "@babel/template": ^7.18.10 + "@babel/traverse": ^7.19.6 + "@babel/types": ^7.19.4 + checksum: c28692b37d4b5abacc775bcab52a74f44a493f38c58cb72b56a6c6d67a97485dd8aff6f26905abd1a924d3261a171d0214a9fb76f48d8598f1e35b8b29284792 + languageName: node + linkType: hard + "@babel/helper-optimise-call-expression@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-optimise-call-expression@npm:7.18.6" @@ -359,6 +409,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-simple-access@npm:^7.19.4": + version: 7.19.4 + resolution: "@babel/helper-simple-access@npm:7.19.4" + dependencies: + "@babel/types": ^7.19.4 + checksum: 964cb1ec36b69aabbb02f8d5ee1d680ebbb628611a6740958d9b05107ab16c0492044e430618ae42b1f8ea73e4e1bafe3750e8ebc959d6f3277d9cfbe1a94880 + languageName: node + linkType: hard + "@babel/helper-skip-transparent-expression-wrappers@npm:^7.18.9": version: 7.18.9 resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.18.9" @@ -447,6 +506,17 @@ __metadata: languageName: node linkType: hard +"@babel/helpers@npm:^7.19.4": + version: 7.19.4 + resolution: "@babel/helpers@npm:7.19.4" + dependencies: + "@babel/template": ^7.18.10 + "@babel/traverse": ^7.19.4 + "@babel/types": ^7.19.4 + checksum: e2684e9a79d45b95db05c7e14628e8dd1d91ad59433a3afd715bdf19d4683d9e9f84382bcc82316b678aa609ecfc41b07be0b9c49eed07c444f82a6b9e501186 + languageName: node + linkType: hard + "@babel/highlight@npm:^7.18.6": version: 7.18.6 resolution: "@babel/highlight@npm:7.18.6" @@ -467,6 +537,15 @@ __metadata: languageName: node linkType: hard +"@babel/parser@npm:^7.19.6": + version: 7.19.6 + resolution: "@babel/parser@npm:7.19.6" + bin: + parser: ./bin/babel-parser.js + checksum: 9a3dca4ee3acd7e4fc3b58e1e1526a11fa334acbfe437f8ebf91dfaf48e943c147ef64b1733ba0a55af57d1eccafbf4e4a4afc46a15becd921971fe2ddf309bf + languageName: node + linkType: hard + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.18.6" @@ -1686,6 +1765,24 @@ __metadata: languageName: node linkType: hard +"@babel/traverse@npm:^7.19.4, @babel/traverse@npm:^7.19.6": + version: 7.19.6 + resolution: "@babel/traverse@npm:7.19.6" + dependencies: + "@babel/code-frame": ^7.18.6 + "@babel/generator": ^7.19.6 + "@babel/helper-environment-visitor": ^7.18.9 + "@babel/helper-function-name": ^7.19.0 + "@babel/helper-hoist-variables": ^7.18.6 + "@babel/helper-split-export-declaration": ^7.18.6 + "@babel/parser": ^7.19.6 + "@babel/types": ^7.19.4 + debug: ^4.1.0 + globals: ^11.1.0 + checksum: 3fafa244f7d0b696a9d38f5da016a8f8db4b08ac60a067b299a8f54d91fb7c70c3edf06f921221d333137e65ffb64392526e68fdcf596ec91e95720037789d66 + languageName: node + linkType: hard + "@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.13, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.19.3, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": version: 7.19.3 resolution: "@babel/types@npm:7.19.3" @@ -17653,7 +17750,7 @@ __metadata: version: 0.0.0-use.local resolution: "wire-webapp@workspace:." dependencies: - "@babel/core": 7.19.3 + "@babel/core": 7.19.6 "@babel/eslint-parser": 7.19.1 "@babel/plugin-proposal-class-properties": 7.18.6 "@babel/plugin-proposal-decorators": 7.19.6 From 06f5c7a0eef1f98609849cf3780316813c53e731 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:17:33 +0000 Subject: [PATCH 26/66] chore(deps): Bump @wireapp/webapp-events from 0.14.6 to 0.14.9 (#13937) Bumps [@wireapp/webapp-events](https://github.com/wireapp/wire-web-packages) from 0.14.6 to 0.14.9. - [Release notes](https://github.com/wireapp/wire-web-packages/releases) - [Commits](https://github.com/wireapp/wire-web-packages/compare/@wireapp/webapp-events@0.14.6...@wireapp/webapp-events@0.14.9) --- updated-dependencies: - dependency-name: "@wireapp/webapp-events" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 36aea494e46..9ae9fcef0a6 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "@wireapp/react-ui-kit": "8.17.0", "@wireapp/store-engine-dexie": "1.7.11", "@wireapp/store-engine-sqleet": "1.8.6", - "@wireapp/webapp-events": "0.14.6", + "@wireapp/webapp-events": "0.14.9", "amplify": "https://github.com/wireapp/amplify#head=master", "classnames": "2.3.2", "copy-webpack-plugin": "11.0.0", diff --git a/yarn.lock b/yarn.lock index becfa7a166d..4f237e8b16a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4710,10 +4710,10 @@ __metadata: languageName: node linkType: hard -"@wireapp/webapp-events@npm:0.14.6": - version: 0.14.6 - resolution: "@wireapp/webapp-events@npm:0.14.6" - checksum: a82f774a51e8c818d67d0a93be4205ce057c599166ee84db054e491529bdb989fe584b0e4fe9a6feb720e0ac7efb328b10f09a6439e1f2f02d034eda3cbaa9dc +"@wireapp/webapp-events@npm:0.14.9": + version: 0.14.9 + resolution: "@wireapp/webapp-events@npm:0.14.9" + checksum: 9ba6c96477aae9bed6bdf4b1bfc573fa2e3c12476938e7ff527dc358beb7754a610b8bb9a11d94827f587fd362cd9e44e6fa37f004658983aa27bb94cd944cb0 languageName: node linkType: hard @@ -17804,7 +17804,7 @@ __metadata: "@wireapp/react-ui-kit": 8.17.0 "@wireapp/store-engine-dexie": 1.7.11 "@wireapp/store-engine-sqleet": 1.8.6 - "@wireapp/webapp-events": 0.14.6 + "@wireapp/webapp-events": 0.14.9 adm-zip: 0.5.9 amplify: "https://github.com/wireapp/amplify#head=master" autoprefixer: 9.8.8 From 9287a5c8dbc2afdd96608257f83f8d73e16c5e36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:18:05 +0000 Subject: [PATCH 27/66] chore(deps-dev): Bump @types/node from 18.11.0 to 18.11.3 (#13940) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.11.0 to 18.11.3. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 9ae9fcef0a6..f8c6d530b7e 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "@types/libsodium-wrappers-sumo": "0.7.5", "@types/linkify-it": "3.0.2", "@types/markdown-it": "12.2.3", - "@types/node": "^18.11.0", + "@types/node": "^18.11.3", "@types/open-graph": "0.2.2", "@types/platform": "1.3.4", "@types/react": "18.0.21", diff --git a/yarn.lock b/yarn.lock index 4f237e8b16a..ef4efe3fc3c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3782,10 +3782,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^18.11.0": - version: 18.11.0 - resolution: "@types/node@npm:18.11.0" - checksum: f27f899ab428e5732f04fadadc9203f44bdf3abf56474540ee27da90e4f2ba133faf87263cada4d2271955f92ee6a142bd50683c86290fe5070c19aac44fd654 +"@types/node@npm:^18.11.3": + version: 18.11.3 + resolution: "@types/node@npm:18.11.3" + checksum: 3a2a9142d891a90a195c296149bf64a69cc0abcc42f543be911ab22b2e0ead85ff077f90af92f0f13f6e3e5e72501469200fd753dfd1101825d4646a89d3ee47 languageName: node linkType: hard @@ -17779,7 +17779,7 @@ __metadata: "@types/libsodium-wrappers-sumo": 0.7.5 "@types/linkify-it": 3.0.2 "@types/markdown-it": 12.2.3 - "@types/node": ^18.11.0 + "@types/node": ^18.11.3 "@types/open-graph": 0.2.2 "@types/platform": 1.3.4 "@types/react": 18.0.21 From 698b9fdf8c6fb7a80297dc6117849c1caabd1001 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:18:15 +0000 Subject: [PATCH 28/66] chore(deps-dev): Bump concurrently from 7.4.0 to 7.5.0 (#13935) Bumps [concurrently](https://github.com/open-cli-tools/concurrently) from 7.4.0 to 7.5.0. - [Release notes](https://github.com/open-cli-tools/concurrently/releases) - [Commits](https://github.com/open-cli-tools/concurrently/compare/v7.4.0...v7.5.0) --- updated-dependencies: - dependency-name: concurrently dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index f8c6d530b7e..99499c7c918 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "autoprefixer": "9.8.8", "babel-loader": "8.2.5", "caniuse-lite": "^1.0.30001420", - "concurrently": "7.4.0", + "concurrently": "7.5.0", "cross-env": "7.0.3", "cspell": "6.12.0", "cssnano": "4.1.11", diff --git a/yarn.lock b/yarn.lock index ef4efe3fc3c..285ab778143 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6376,9 +6376,9 @@ __metadata: languageName: node linkType: hard -"concurrently@npm:7.4.0": - version: 7.4.0 - resolution: "concurrently@npm:7.4.0" +"concurrently@npm:7.5.0": + version: 7.5.0 + resolution: "concurrently@npm:7.5.0" dependencies: chalk: ^4.1.0 date-fns: ^2.29.1 @@ -6392,7 +6392,7 @@ __metadata: bin: conc: dist/bin/concurrently.js concurrently: dist/bin/concurrently.js - checksum: cc547866ad8d009d184ca3a7115d6636052a5f56f5429d123092d651286043d7233f6429257e30e50f509894cd12798ea831896ac18092d8135f67ffcc8ac3ea + checksum: 7886e1c8559d2699ae1b62be8aca5d56c226966e252a2b9dd6077b3c1fd5397e98ef537c040fffa1de50418bd2616746eb9dd589a31ffb9056d4758b850a865b languageName: node linkType: hard @@ -17811,7 +17811,7 @@ __metadata: babel-loader: 8.2.5 caniuse-lite: ^1.0.30001420 classnames: 2.3.2 - concurrently: 7.4.0 + concurrently: 7.5.0 copy-webpack-plugin: 11.0.0 core-js: 3.25.5 countly-sdk-web: 22.6.2 From f5a0d724ad2378e3af93dd8204d5419f8fe8ce65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:21:56 +0000 Subject: [PATCH 29/66] chore(deps-dev): Bump @typescript-eslint/parser from 5.40.0 to 5.40.1 (#13943) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.40.0 to 5.40.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.40.1/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 61 +++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 54 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 99499c7c918..073baad73e2 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "@types/underscore": "1.11.4", "@types/webpack-env": "1.18.0", "@typescript-eslint/eslint-plugin": "5.40.0", - "@typescript-eslint/parser": "5.40.0", + "@typescript-eslint/parser": "5.40.1", "@wireapp/copy-config": "1.3.6", "@wireapp/eslint-config": "1.12.11", "@wireapp/prettier-config": "0.4.7", diff --git a/yarn.lock b/yarn.lock index 285ab778143..7693a701723 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4050,20 +4050,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:5.40.0": - version: 5.40.0 - resolution: "@typescript-eslint/parser@npm:5.40.0" +"@typescript-eslint/parser@npm:5.40.1": + version: 5.40.1 + resolution: "@typescript-eslint/parser@npm:5.40.1" dependencies: - "@typescript-eslint/scope-manager": 5.40.0 - "@typescript-eslint/types": 5.40.0 - "@typescript-eslint/typescript-estree": 5.40.0 + "@typescript-eslint/scope-manager": 5.40.1 + "@typescript-eslint/types": 5.40.1 + "@typescript-eslint/typescript-estree": 5.40.1 debug: ^4.3.4 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: a8d02950dd12fcb1d19ad5f24cbfd186ca88d8a099160f93f99767896a45198a9f9bfbdd1a57c1ae50d452e6c895ae5b4d7e4623dfc87bca55a45c5ba16491f8 + checksum: 9fe410c1b14934803bb7c26de9b8de5d46ef9b6fe5dcbee1d7e111f0259659c214549b60dacdc729a3e23da835e6a44f08a9aa6bcb73ffff3c4fd5b9142358ed languageName: node linkType: hard @@ -4097,6 +4097,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/scope-manager@npm:5.40.1": + version: 5.40.1 + resolution: "@typescript-eslint/scope-manager@npm:5.40.1" + dependencies: + "@typescript-eslint/types": 5.40.1 + "@typescript-eslint/visitor-keys": 5.40.1 + checksum: 5f25b86bfd09fbf8cdfdf932eaf0b41a7594c9b4539d3c8321f882bf7b4bf486454256fdb9a5a8c4eae305419d377fa93d382f80004711d759ff77b3d565c1dc + languageName: node + linkType: hard + "@typescript-eslint/type-utils@npm:5.40.0": version: 5.40.0 resolution: "@typescript-eslint/type-utils@npm:5.40.0" @@ -4135,6 +4145,13 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/types@npm:5.40.1": + version: 5.40.1 + resolution: "@typescript-eslint/types@npm:5.40.1" + checksum: 2430c799667c820903df7ef39bc4c2762cb7654dbb8525d56f37e73f8cefb82186b80654dbbe0294c5b55affe929c641cdb90232e2749dcd7838f9e500a41549 + languageName: node + linkType: hard + "@typescript-eslint/typescript-estree@npm:5.10.1": version: 5.10.1 resolution: "@typescript-eslint/typescript-estree@npm:5.10.1" @@ -4189,6 +4206,24 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/typescript-estree@npm:5.40.1": + version: 5.40.1 + resolution: "@typescript-eslint/typescript-estree@npm:5.40.1" + dependencies: + "@typescript-eslint/types": 5.40.1 + "@typescript-eslint/visitor-keys": 5.40.1 + debug: ^4.3.4 + globby: ^11.1.0 + is-glob: ^4.0.3 + semver: ^7.3.7 + tsutils: ^3.21.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: d0426a55d24b76a3f042816dd8baaaa7a8da0158870bb08fff5a5524821c13ca196117dc269f098b8887ef75e01da1a498637153ab3c29c370ca356bfe4a1716 + languageName: node + linkType: hard + "@typescript-eslint/utils@npm:5.10.1": version: 5.10.1 resolution: "@typescript-eslint/utils@npm:5.10.1" @@ -4268,6 +4303,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:5.40.1": + version: 5.40.1 + resolution: "@typescript-eslint/visitor-keys@npm:5.40.1" + dependencies: + "@typescript-eslint/types": 5.40.1 + eslint-visitor-keys: ^3.3.0 + checksum: b5dbf1e484ba2832ca1883ee9cf7da5967f70aa5624f3fb67f13c3be90a3770b0bb96e64ccfb0c31b5d8f80794b5727e14b6c0d8c5184634a686f0ea6e798772 + languageName: node + linkType: hard + "@webassemblyjs/ast@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/ast@npm:1.11.1" @@ -17794,7 +17839,7 @@ __metadata: "@types/underscore": 1.11.4 "@types/webpack-env": 1.18.0 "@typescript-eslint/eslint-plugin": 5.40.0 - "@typescript-eslint/parser": 5.40.0 + "@typescript-eslint/parser": 5.40.1 "@wireapp/antiscroll-2": 1.3.1 "@wireapp/avs": 8.2.16 "@wireapp/copy-config": 1.3.6 From 2d4a4e10dfcf2b3e48d76507aa7982a800d6bf04 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:33:09 +0000 Subject: [PATCH 30/66] chore(deps): Bump zustand from 4.1.2 to 4.1.3 (#13946) Bumps [zustand](https://github.com/pmndrs/zustand) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/pmndrs/zustand/releases) - [Commits](https://github.com/pmndrs/zustand/compare/v4.1.2...v4.1.3) --- updated-dependencies: - dependency-name: zustand dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 23 ++++++----------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 073baad73e2..c7ac3d9cf92 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "underscore": "1.13.6", "uuidjs": "4.2.12", "webrtc-adapter": "6.4.8", - "zustand": "4.1.2" + "zustand": "4.1.3" }, "devDependencies": { "@babel/core": "7.19.6", diff --git a/yarn.lock b/yarn.lock index 7693a701723..0d1fe3108d4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4711,18 +4711,7 @@ __metadata: languageName: node linkType: hard -"@wireapp/store-engine-dexie@npm:1.7.11": - version: 1.7.11 - resolution: "@wireapp/store-engine-dexie@npm:1.7.11" - dependencies: - dexie: 3.2.2 - peerDependencies: - "@wireapp/store-engine": 4.x.x - checksum: 301550cf9c94f07e74039ad04d32de12f1ad5c22f18d15f9273f3d214a1e1ffabf5fde4b08ef5a7532cacb6ec26f0cb3c894f7e7c6f966981ee11c19e41b1d6f - languageName: node - linkType: hard - -"@wireapp/store-engine-dexie@npm:^1.7.11": +"@wireapp/store-engine-dexie@npm:1.7.11, @wireapp/store-engine-dexie@npm:^1.7.11": version: 1.7.11 resolution: "@wireapp/store-engine-dexie@npm:1.7.11" dependencies: @@ -17965,7 +17954,7 @@ __metadata: webpack-hot-middleware: 2.25.2 webrtc-adapter: 6.4.8 workbox-webpack-plugin: 6.5.4 - zustand: 4.1.2 + zustand: 4.1.3 languageName: unknown linkType: soft @@ -18405,9 +18394,9 @@ __metadata: languageName: node linkType: hard -"zustand@npm:4.1.2": - version: 4.1.2 - resolution: "zustand@npm:4.1.2" +"zustand@npm:4.1.3": + version: 4.1.3 + resolution: "zustand@npm:4.1.3" dependencies: use-sync-external-store: 1.2.0 peerDependencies: @@ -18418,6 +18407,6 @@ __metadata: optional: true react: optional: true - checksum: e7fefc5deb232082edd2abef072b92554d5effc261594d633ee55d7d4fe0e54c5b16ee8c5e628fab2e1090946d9e493865b72ad76280a413e8ff5bea6d0ca642 + checksum: e00c73723dfb87424d1c66028df18a0d700ec460c972dd397bdcd745ba424fcf588cd0ef9dfa28c17cfbf2e4c11d779bda366c539a933c4a35601b09de820332 languageName: node linkType: hard From 8e26114cd1869e36c6640993cb80993de97e4089 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:33:22 +0000 Subject: [PATCH 31/66] chore(deps-dev): Bump eslint from 8.25.0 to 8.26.0 (#13938) Bumps [eslint](https://github.com/eslint/eslint) from 8.25.0 to 8.26.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.25.0...v8.26.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 61 +++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 49 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index c7ac3d9cf92..c24107dd8e3 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "cssnano": "4.1.11", "dexie": "^3.2.2", "dotenv": "16.0.3", - "eslint": "8.25.0", + "eslint": "8.26.0", "eslint-config-prettier": "8.5.0", "eslint-plugin-babel": "5.3.1", "eslint-plugin-import": "2.26.0", diff --git a/yarn.lock b/yarn.lock index 0d1fe3108d4..7ac435abbf4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2630,14 +2630,14 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/config-array@npm:^0.10.5": - version: 0.10.5 - resolution: "@humanwhocodes/config-array@npm:0.10.5" +"@humanwhocodes/config-array@npm:^0.11.6": + version: 0.11.6 + resolution: "@humanwhocodes/config-array@npm:0.11.6" dependencies: "@humanwhocodes/object-schema": ^1.2.1 debug: ^4.1.1 minimatch: ^3.0.4 - checksum: af4fa2633c57414be22ddba0a072cc611ef9a07104542fa24bde918a0153b89b6e08ca6a20ccc9079de6079e219e2406e38414d1b662db8bb59a3ba9d6eee6e3 + checksum: 2fb7288638968dfeec27f06aef52f043726edd126ac47f24b54256902fdb35b3bf9863d4a4caf0423dccca5dd1354ca5899f3ac047b56774641ca0c4cbedb104 languageName: node linkType: hard @@ -3107,6 +3107,16 @@ __metadata: languageName: node linkType: hard +"@nodelib/fs.scandir@npm:2.1.5": + version: 2.1.5 + resolution: "@nodelib/fs.scandir@npm:2.1.5" + dependencies: + "@nodelib/fs.stat": 2.0.5 + run-parallel: ^1.1.9 + checksum: a970d595bd23c66c880e0ef1817791432dbb7acbb8d44b7e7d0e7a22f4521260d4a83f7f9fd61d44fda4610105577f8f58a60718105fb38352baed612fd79e59 + languageName: node + linkType: hard + "@nodelib/fs.stat@npm:2.0.4, @nodelib/fs.stat@npm:^2.0.2": version: 2.0.4 resolution: "@nodelib/fs.stat@npm:2.0.4" @@ -3114,6 +3124,13 @@ __metadata: languageName: node linkType: hard +"@nodelib/fs.stat@npm:2.0.5": + version: 2.0.5 + resolution: "@nodelib/fs.stat@npm:2.0.5" + checksum: 012480b5ca9d97bff9261571dbbec7bbc6033f69cc92908bc1ecfad0792361a5a1994bc48674b9ef76419d056a03efadfce5a6cf6dbc0a36559571a7a483f6f0 + languageName: node + linkType: hard + "@nodelib/fs.walk@npm:^1.2.3": version: 1.2.6 resolution: "@nodelib/fs.walk@npm:1.2.6" @@ -3124,6 +3141,16 @@ __metadata: languageName: node linkType: hard +"@nodelib/fs.walk@npm:^1.2.8": + version: 1.2.8 + resolution: "@nodelib/fs.walk@npm:1.2.8" + dependencies: + "@nodelib/fs.scandir": 2.1.5 + fastq: ^1.6.0 + checksum: 190c643f156d8f8f277bf2a6078af1ffde1fd43f498f187c2db24d35b4b4b5785c02c7dc52e356497b9a1b65b13edc996de08de0b961c32844364da02986dc53 + languageName: node + linkType: hard + "@npmcli/fs@npm:^2.1.0": version: 2.1.2 resolution: "@npmcli/fs@npm:2.1.2" @@ -8069,13 +8096,14 @@ __metadata: languageName: node linkType: hard -"eslint@npm:8.25.0": - version: 8.25.0 - resolution: "eslint@npm:8.25.0" +"eslint@npm:8.26.0": + version: 8.26.0 + resolution: "eslint@npm:8.26.0" dependencies: "@eslint/eslintrc": ^1.3.3 - "@humanwhocodes/config-array": ^0.10.5 + "@humanwhocodes/config-array": ^0.11.6 "@humanwhocodes/module-importer": ^1.0.1 + "@nodelib/fs.walk": ^1.2.8 ajv: ^6.10.0 chalk: ^4.0.0 cross-spawn: ^7.0.2 @@ -8091,14 +8119,14 @@ __metadata: fast-deep-equal: ^3.1.3 file-entry-cache: ^6.0.1 find-up: ^5.0.0 - glob-parent: ^6.0.1 + glob-parent: ^6.0.2 globals: ^13.15.0 - globby: ^11.1.0 grapheme-splitter: ^1.0.4 ignore: ^5.2.0 import-fresh: ^3.0.0 imurmurhash: ^0.1.4 is-glob: ^4.0.0 + is-path-inside: ^3.0.3 js-sdsl: ^4.1.4 js-yaml: ^4.1.0 json-stable-stringify-without-jsonify: ^1.0.1 @@ -8113,7 +8141,7 @@ __metadata: text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: 7acf2693b522b573657b53d2245b5522d3a131e4224b1cbf01e2c3579632fdbf62599284f68bc483e6e4eba23ae3643c9544744e0214a86e727cc361cedcd0fa + checksum: a2aced939ea060f77d10dcfced5cfeb940f63f383fd7ab1decadea64170ab552582e1c5909db1db641d4283178c9bc569f19b0f8900e00314a5f783e4b3f759d languageName: node linkType: hard @@ -9028,7 +9056,7 @@ __metadata: languageName: node linkType: hard -"glob-parent@npm:^6.0.1": +"glob-parent@npm:^6.0.1, glob-parent@npm:^6.0.2": version: 6.0.2 resolution: "glob-parent@npm:6.0.2" dependencies: @@ -10296,6 +10324,13 @@ __metadata: languageName: node linkType: hard +"is-path-inside@npm:^3.0.3": + version: 3.0.3 + resolution: "is-path-inside@npm:3.0.3" + checksum: abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9 + languageName: node + linkType: hard + "is-plain-obj@npm:^1.1.0": version: 1.1.0 resolution: "is-plain-obj@npm:1.1.0" @@ -17856,7 +17891,7 @@ __metadata: dexie: ^3.2.2 dexie-batch: 0.4.3 dotenv: 16.0.3 - eslint: 8.25.0 + eslint: 8.26.0 eslint-config-prettier: 8.5.0 eslint-plugin-babel: 5.3.1 eslint-plugin-header: 3.1.1 From e033c9ee9db8b18da6566e4c60b51cc052c52783 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:35:53 +0000 Subject: [PATCH 32/66] chore(deps-dev): Bump caniuse-lite from 1.0.30001420 to 1.0.30001423 (#13947) Bumps [caniuse-lite](https://github.com/browserslist/caniuse-lite) from 1.0.30001420 to 1.0.30001423. - [Release notes](https://github.com/browserslist/caniuse-lite/releases) - [Commits](https://github.com/browserslist/caniuse-lite/compare/1.0.30001420...1.0.30001423) --- updated-dependencies: - dependency-name: caniuse-lite dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index c24107dd8e3..f3c5f8f9ffc 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "adm-zip": "0.5.9", "autoprefixer": "9.8.8", "babel-loader": "8.2.5", - "caniuse-lite": "^1.0.30001420", + "caniuse-lite": "^1.0.30001423", "concurrently": "7.5.0", "cross-env": "7.0.3", "cspell": "6.12.0", diff --git a/yarn.lock b/yarn.lock index 7ac435abbf4..10cc3af65db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6020,10 +6020,10 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.30001420": - version: 1.0.30001420 - resolution: "caniuse-lite@npm:1.0.30001420" - checksum: dfa5027b2aeaba3ab1731735a46aecf62f286cdeec7f8ccb0f8cce0a3d02447e640e944d9bf5d9ea98b53fac6c2b168bb18f4c9ad598d92a2da7b05e2aea06e2 +"caniuse-lite@npm:^1.0.30001423": + version: 1.0.30001423 + resolution: "caniuse-lite@npm:1.0.30001423" + checksum: fe443f323f5dc6a858ef7d7deddb93db5e5f9a35e22970c4a65c4ef793bb696c1e2f038df572722d9edf29021e43ed16f5131faafde783563bd0d9eccf486592 languageName: node linkType: hard @@ -17878,7 +17878,7 @@ __metadata: amplify: "https://github.com/wireapp/amplify#head=master" autoprefixer: 9.8.8 babel-loader: 8.2.5 - caniuse-lite: ^1.0.30001420 + caniuse-lite: ^1.0.30001423 classnames: 2.3.2 concurrently: 7.5.0 copy-webpack-plugin: 11.0.0 From e3fde40af42bd044d21ffd6ee8f9ecffbbe88416 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:36:04 +0000 Subject: [PATCH 33/66] chore(deps-dev): Bump jest and @types/jest (#13929) Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest) and [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest). These dependencies needed to be updated together. Updates `jest` from 29.2.0 to 29.2.1 - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v29.2.1/packages/jest) Updates `@types/jest` from 29.1.2 to 29.2.0 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) --- updated-dependencies: - dependency-name: jest dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: "@types/jest" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 4 +- yarn.lock | 536 ++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 399 insertions(+), 141 deletions(-) diff --git a/package.json b/package.json index f3c5f8f9ffc..06a6c1605e6 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@types/fs-extra": "9.0.13", "@types/generate-changelog": "1.8.1", "@types/highlight.js": "10.1.0", - "@types/jest": "29.1.2", + "@types/jest": "29.2.0", "@types/js-cookie": "3.0.2", "@types/jsdom": "20.0.0", "@types/keyboardjs": "2.5.0", @@ -136,7 +136,7 @@ "husky": "7.0.4", "i18next-scanner": "4.1.0", "intersection-observer": "0.12.2", - "jest": "29.2.0", + "jest": "29.2.1", "jest-canvas-mock": "2.4.0", "jest-environment-jsdom": "29.2.1", "jest-jasmine2": "29.2.0", diff --git a/yarn.lock b/yarn.lock index 10cc3af65db..5eb651eb53f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2689,15 +2689,29 @@ __metadata: languageName: node linkType: hard -"@jest/core@npm:^29.2.0": - version: 29.2.0 - resolution: "@jest/core@npm:29.2.0" +"@jest/console@npm:^29.2.1": + version: 29.2.1 + resolution: "@jest/console@npm:29.2.1" dependencies: - "@jest/console": ^29.2.0 - "@jest/reporters": ^29.2.0 - "@jest/test-result": ^29.2.0 - "@jest/transform": ^29.2.0 - "@jest/types": ^29.2.0 + "@jest/types": ^29.2.1 + "@types/node": "*" + chalk: ^4.0.0 + jest-message-util: ^29.2.1 + jest-util: ^29.2.1 + slash: ^3.0.0 + checksum: b5f08dc60c32a0212d27782cda86dfeba6d53f24cd023e6e52257224948a17eec77db55782ba1b18e37f10b7ba2481464e6c658bafaba6f8f8f129f1e95c3496 + languageName: node + linkType: hard + +"@jest/core@npm:^29.2.1": + version: 29.2.1 + resolution: "@jest/core@npm:29.2.1" + dependencies: + "@jest/console": ^29.2.1 + "@jest/reporters": ^29.2.1 + "@jest/test-result": ^29.2.1 + "@jest/transform": ^29.2.1 + "@jest/types": ^29.2.1 "@types/node": "*" ansi-escapes: ^4.2.1 chalk: ^4.0.0 @@ -2705,20 +2719,20 @@ __metadata: exit: ^0.1.2 graceful-fs: ^4.2.9 jest-changed-files: ^29.2.0 - jest-config: ^29.2.0 - jest-haste-map: ^29.2.0 - jest-message-util: ^29.2.0 + jest-config: ^29.2.1 + jest-haste-map: ^29.2.1 + jest-message-util: ^29.2.1 jest-regex-util: ^29.2.0 - jest-resolve: ^29.2.0 - jest-resolve-dependencies: ^29.2.0 - jest-runner: ^29.2.0 - jest-runtime: ^29.2.0 - jest-snapshot: ^29.2.0 - jest-util: ^29.2.0 - jest-validate: ^29.2.0 - jest-watcher: ^29.2.0 + jest-resolve: ^29.2.1 + jest-resolve-dependencies: ^29.2.1 + jest-runner: ^29.2.1 + jest-runtime: ^29.2.1 + jest-snapshot: ^29.2.1 + jest-util: ^29.2.1 + jest-validate: ^29.2.1 + jest-watcher: ^29.2.1 micromatch: ^4.0.4 - pretty-format: ^29.2.0 + pretty-format: ^29.2.1 slash: ^3.0.0 strip-ansi: ^6.0.0 peerDependencies: @@ -2726,7 +2740,7 @@ __metadata: peerDependenciesMeta: node-notifier: optional: true - checksum: 086791e6f9b7cf3a350e407a414b876bcb37500d7b550a27ccb56f31bb15d9ebbd106aa583a08ac2771e3470cac2badfe063b1f165dde31a213135fba5a12383 + checksum: 849f9287a0d32b92c052a59de47d4b483c47f45463a94cb3156ecb869a41cc829b8ecdb1de8638b629b16b6e4cb2bd0d03e1d18590c4bfbe73b8fbbd6072d045 languageName: node linkType: hard @@ -2772,6 +2786,15 @@ __metadata: languageName: node linkType: hard +"@jest/expect-utils@npm:^29.2.1": + version: 29.2.1 + resolution: "@jest/expect-utils@npm:29.2.1" + dependencies: + jest-get-type: ^29.2.0 + checksum: 7e6e156f452330b64983f8169f2cd1f378129090d02ad097ef89dadfc78269501991d6d6daf91058ef4334fd9f5fc1a6389d887bbebfe7e4ad1ec58ea78e9f93 + languageName: node + linkType: hard + "@jest/expect@npm:^29.2.0": version: 29.2.0 resolution: "@jest/expect@npm:29.2.0" @@ -2782,6 +2805,16 @@ __metadata: languageName: node linkType: hard +"@jest/expect@npm:^29.2.1": + version: 29.2.1 + resolution: "@jest/expect@npm:29.2.1" + dependencies: + expect: ^29.2.1 + jest-snapshot: ^29.2.1 + checksum: c64b939200e88b947c4e1209fbfd3d54f0f24ad1cd1d5882e0238631a7839f96c3e513c802610b039ab2d2ed6024834c6de002b639d3afa8ad077364ef08ab75 + languageName: node + linkType: hard + "@jest/fake-timers@npm:^29.2.0": version: 29.2.0 resolution: "@jest/fake-timers@npm:29.2.0" @@ -2822,15 +2855,27 @@ __metadata: languageName: node linkType: hard -"@jest/reporters@npm:^29.2.0": - version: 29.2.0 - resolution: "@jest/reporters@npm:29.2.0" +"@jest/globals@npm:^29.2.1": + version: 29.2.1 + resolution: "@jest/globals@npm:29.2.1" + dependencies: + "@jest/environment": ^29.2.1 + "@jest/expect": ^29.2.1 + "@jest/types": ^29.2.1 + jest-mock: ^29.2.1 + checksum: 42046693669009a4ac890578e18544433effeaa760e60e3fc7360ab197ebf7b66bf7fce11f1143e43e665d1801108ae9a3588f5ec95d518ca9664e7f8098a4a3 + languageName: node + linkType: hard + +"@jest/reporters@npm:^29.2.1": + version: 29.2.1 + resolution: "@jest/reporters@npm:29.2.1" dependencies: "@bcoe/v8-coverage": ^0.2.3 - "@jest/console": ^29.2.0 - "@jest/test-result": ^29.2.0 - "@jest/transform": ^29.2.0 - "@jest/types": ^29.2.0 + "@jest/console": ^29.2.1 + "@jest/test-result": ^29.2.1 + "@jest/transform": ^29.2.1 + "@jest/types": ^29.2.1 "@jridgewell/trace-mapping": ^0.3.15 "@types/node": "*" chalk: ^4.0.0 @@ -2843,9 +2888,9 @@ __metadata: istanbul-lib-report: ^3.0.0 istanbul-lib-source-maps: ^4.0.0 istanbul-reports: ^3.1.3 - jest-message-util: ^29.2.0 - jest-util: ^29.2.0 - jest-worker: ^29.2.0 + jest-message-util: ^29.2.1 + jest-util: ^29.2.1 + jest-worker: ^29.2.1 slash: ^3.0.0 string-length: ^4.0.1 strip-ansi: ^6.0.0 @@ -2855,7 +2900,7 @@ __metadata: peerDependenciesMeta: node-notifier: optional: true - checksum: d9ab36d0dd8a81f5daa1353e20c4fb9b055864742acb196cb28563509b7b6bdffc0df0460f2a1b31362c7742d53544c83236b0bc6641c5b0177c933f55be2128 + checksum: 8f6419d67ba9c4f33ff01d8fa506538f32f4edd32df806a496c705858712405e6930b6064ac54cfe7b1c01a447d2feb46e8be69eb2e655e8b5f497e77ee79777 languageName: node linkType: hard @@ -2891,15 +2936,27 @@ __metadata: languageName: node linkType: hard -"@jest/test-sequencer@npm:^29.2.0": - version: 29.2.0 - resolution: "@jest/test-sequencer@npm:29.2.0" +"@jest/test-result@npm:^29.2.1": + version: 29.2.1 + resolution: "@jest/test-result@npm:29.2.1" dependencies: - "@jest/test-result": ^29.2.0 + "@jest/console": ^29.2.1 + "@jest/types": ^29.2.1 + "@types/istanbul-lib-coverage": ^2.0.0 + collect-v8-coverage: ^1.0.0 + checksum: 8f5f069dcfd54413559544f164950503d6cef587e3596a134a868c11e6b3fe6a99cc691732027500c962bdd22bc46685798b006a5b542359b30883e0d2489615 + languageName: node + linkType: hard + +"@jest/test-sequencer@npm:^29.2.1": + version: 29.2.1 + resolution: "@jest/test-sequencer@npm:29.2.1" + dependencies: + "@jest/test-result": ^29.2.1 graceful-fs: ^4.2.9 - jest-haste-map: ^29.2.0 + jest-haste-map: ^29.2.1 slash: ^3.0.0 - checksum: b65b8cff147d825700628d18ea93e295f07ee218be41e8e35cb2f94d0b35d639d843760afd8d0a11734a02051c3642d38bfd848670baf180da83741f966d4e66 + checksum: ff73ce30d51e3304986097a5e02f24c60bc6f8246a7b3a1d35f898bd6b9515c576c2fce98dd6a605b885c8c0fea34e135420eb6e6a6d6656b74bed8ff280fe45 languageName: node linkType: hard @@ -2926,6 +2983,29 @@ __metadata: languageName: node linkType: hard +"@jest/transform@npm:^29.2.1": + version: 29.2.1 + resolution: "@jest/transform@npm:29.2.1" + dependencies: + "@babel/core": ^7.11.6 + "@jest/types": ^29.2.1 + "@jridgewell/trace-mapping": ^0.3.15 + babel-plugin-istanbul: ^6.1.1 + chalk: ^4.0.0 + convert-source-map: ^1.4.0 + fast-json-stable-stringify: ^2.1.0 + graceful-fs: ^4.2.9 + jest-haste-map: ^29.2.1 + jest-regex-util: ^29.2.0 + jest-util: ^29.2.1 + micromatch: ^4.0.4 + pirates: ^4.0.4 + slash: ^3.0.0 + write-file-atomic: ^4.0.1 + checksum: bb50bfce34d8c648475a7d65e91787a0232cdcc0445331dba8d3d80180dff1b43d97872568be795c8f92d419b3f0e6114297349cc892fdf50e8471cb227f674a + languageName: node + linkType: hard + "@jest/types@npm:^29.1.2": version: 29.1.2 resolution: "@jest/types@npm:29.1.2" @@ -3655,13 +3735,13 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:29.1.2": - version: 29.1.2 - resolution: "@types/jest@npm:29.1.2" +"@types/jest@npm:29.2.0": + version: 29.2.0 + resolution: "@types/jest@npm:29.2.0" dependencies: expect: ^29.0.0 pretty-format: ^29.0.0 - checksum: a6761b5ac132c641740886f9c0714607255ebffb6add5989f51ea9e392fc3c5cd474e7590f12b003d5b67ce177dfbc8d3d60d0baa335c48c50deeee6b755a473 + checksum: 6779e63d8d7507b116a61b2935a200e48531849fc1ac74090212759fe17716777ca6d2c3a8d927a563e9cfa474ae91d40b1688376ae80e3a08974b3c9e9691e1 languageName: node linkType: hard @@ -5504,11 +5584,11 @@ __metadata: languageName: node linkType: hard -"babel-jest@npm:^29.2.0": - version: 29.2.0 - resolution: "babel-jest@npm:29.2.0" +"babel-jest@npm:^29.2.1": + version: 29.2.1 + resolution: "babel-jest@npm:29.2.1" dependencies: - "@jest/transform": ^29.2.0 + "@jest/transform": ^29.2.1 "@types/babel__core": ^7.1.14 babel-plugin-istanbul: ^6.1.1 babel-preset-jest: ^29.2.0 @@ -5517,7 +5597,7 @@ __metadata: slash: ^3.0.0 peerDependencies: "@babel/core": ^7.8.0 - checksum: 1629bc32829d0b6d9b7121538ef1ff8ae577432ff5be9e5102c9211163aa6d2f667a299fca4ffc1a16cd51fc3c32a6b9999afdbb3dca6ae906a01c6ab4e3f222 + checksum: c340c10d8cee4b3ef5990443627b5f70dbe2649faa1fef671c8b4fd4a9f8d559b78e5644e18de8063974cd6606033caf1afcaa52744309f6e3176c0b37c2e8f9 languageName: node linkType: hard @@ -8354,6 +8434,19 @@ __metadata: languageName: node linkType: hard +"expect@npm:^29.2.1": + version: 29.2.1 + resolution: "expect@npm:29.2.1" + dependencies: + "@jest/expect-utils": ^29.2.1 + jest-get-type: ^29.2.0 + jest-matcher-utils: ^29.2.1 + jest-message-util: ^29.2.1 + jest-util: ^29.2.1 + checksum: 0a1347b569de246b8e988a282e1b037746a64f890c89197cff891087673e0ccdc0c485c40f182659d7cc0e910dc40546719c8a00f0e2bdabcc6f627f2af49891 + languageName: node + linkType: hard + "extend-shallow@npm:^2.0.0, extend-shallow@npm:^2.0.1": version: 2.0.1 resolution: "extend-shallow@npm:2.0.1" @@ -10696,47 +10789,47 @@ __metadata: languageName: node linkType: hard -"jest-circus@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-circus@npm:29.2.0" +"jest-circus@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-circus@npm:29.2.1" dependencies: - "@jest/environment": ^29.2.0 - "@jest/expect": ^29.2.0 - "@jest/test-result": ^29.2.0 - "@jest/types": ^29.2.0 + "@jest/environment": ^29.2.1 + "@jest/expect": ^29.2.1 + "@jest/test-result": ^29.2.1 + "@jest/types": ^29.2.1 "@types/node": "*" chalk: ^4.0.0 co: ^4.6.0 dedent: ^0.7.0 is-generator-fn: ^2.0.0 - jest-each: ^29.2.0 - jest-matcher-utils: ^29.2.0 - jest-message-util: ^29.2.0 - jest-runtime: ^29.2.0 - jest-snapshot: ^29.2.0 - jest-util: ^29.2.0 + jest-each: ^29.2.1 + jest-matcher-utils: ^29.2.1 + jest-message-util: ^29.2.1 + jest-runtime: ^29.2.1 + jest-snapshot: ^29.2.1 + jest-util: ^29.2.1 p-limit: ^3.1.0 - pretty-format: ^29.2.0 + pretty-format: ^29.2.1 slash: ^3.0.0 stack-utils: ^2.0.3 - checksum: 230d420116a8d2704c0444aa1367f05d752a68b0f5306e6b6ec9f231089d99f8fed81cd7b5d951cfb6da175ab4ccac9b0bb88d81e25837649007f9bdd6e8a4b0 + checksum: 3fe8bf27a42d25e68ba869fe5ef0103acf67294c3a2e63c0895b5efaa4ed7fcb35f8c14eeab1a7e6bdee0cb46740fe24177d581976391da740b468aa81bccbbb languageName: node linkType: hard -"jest-cli@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-cli@npm:29.2.0" +"jest-cli@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-cli@npm:29.2.1" dependencies: - "@jest/core": ^29.2.0 - "@jest/test-result": ^29.2.0 - "@jest/types": ^29.2.0 + "@jest/core": ^29.2.1 + "@jest/test-result": ^29.2.1 + "@jest/types": ^29.2.1 chalk: ^4.0.0 exit: ^0.1.2 graceful-fs: ^4.2.9 import-local: ^3.0.2 - jest-config: ^29.2.0 - jest-util: ^29.2.0 - jest-validate: ^29.2.0 + jest-config: ^29.2.1 + jest-util: ^29.2.1 + jest-validate: ^29.2.1 prompts: ^2.0.1 yargs: ^17.3.1 peerDependencies: @@ -10746,34 +10839,34 @@ __metadata: optional: true bin: jest: bin/jest.js - checksum: f02b6250c52d9f0507060d4fc60362495f8511141e2984ee2d6183abd9d4e0bce099b264d37cb1df3224279564de8e9ecc12a140b0f59b5942ad6ff912a36f95 + checksum: 6f190450a6cc462fdb63617ad6fa67fc5e0daaa2ea47e41e2fcc1b16d02886b5be9228066295ba51847be0aee1317dad71648e4ad3b5373f7db0ba93eb8e50f2 languageName: node linkType: hard -"jest-config@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-config@npm:29.2.0" +"jest-config@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-config@npm:29.2.1" dependencies: "@babel/core": ^7.11.6 - "@jest/test-sequencer": ^29.2.0 - "@jest/types": ^29.2.0 - babel-jest: ^29.2.0 + "@jest/test-sequencer": ^29.2.1 + "@jest/types": ^29.2.1 + babel-jest: ^29.2.1 chalk: ^4.0.0 ci-info: ^3.2.0 deepmerge: ^4.2.2 glob: ^7.1.3 graceful-fs: ^4.2.9 - jest-circus: ^29.2.0 - jest-environment-node: ^29.2.0 + jest-circus: ^29.2.1 + jest-environment-node: ^29.2.1 jest-get-type: ^29.2.0 jest-regex-util: ^29.2.0 - jest-resolve: ^29.2.0 - jest-runner: ^29.2.0 - jest-util: ^29.2.0 - jest-validate: ^29.2.0 + jest-resolve: ^29.2.1 + jest-runner: ^29.2.1 + jest-util: ^29.2.1 + jest-validate: ^29.2.1 micromatch: ^4.0.4 parse-json: ^5.2.0 - pretty-format: ^29.2.0 + pretty-format: ^29.2.1 slash: ^3.0.0 strip-json-comments: ^3.1.1 peerDependencies: @@ -10784,7 +10877,7 @@ __metadata: optional: true ts-node: optional: true - checksum: 80d3150f7102cca3d31665529b9f3503aeebd944686e9f73b9f2da93bec8723d35f8ba9073c5ee7661dfb2acaedbd4f22dea9b995b5447677b12d7f0e5b62be1 + checksum: a2052eb47d4cd964b1bb9e34cddf608bd252d185e58376c012447afb2fe6c93d17d452a0f38ce45b0621adaec60d68e6d3538146928bb7e5e553523f805dc80d languageName: node linkType: hard @@ -10812,6 +10905,18 @@ __metadata: languageName: node linkType: hard +"jest-diff@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-diff@npm:29.2.1" + dependencies: + chalk: ^4.0.0 + diff-sequences: ^29.2.0 + jest-get-type: ^29.2.0 + pretty-format: ^29.2.1 + checksum: e3553e5bf556b786b864e3da0ef0a2cde8b260a7bb281eaf47d34aee0bf303bf557bc75416c20f9454e2e1b6ac0ae53684d5be7af5cfc010dc08805bdcb3f457 + languageName: node + linkType: hard + "jest-docblock@npm:^29.2.0": version: 29.2.0 resolution: "jest-docblock@npm:29.2.0" @@ -10834,6 +10939,19 @@ __metadata: languageName: node linkType: hard +"jest-each@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-each@npm:29.2.1" + dependencies: + "@jest/types": ^29.2.1 + chalk: ^4.0.0 + jest-get-type: ^29.2.0 + jest-util: ^29.2.1 + pretty-format: ^29.2.1 + checksum: 877bd64a08ff4245400c4d84d65a6fb87898e53498b65f53915c7e66e66bf49a4559bc5ca584a3dab57251e88815f48c1053e40c0c1017fbb7d9813f40eb25b8 + languageName: node + linkType: hard + "jest-environment-jsdom@npm:29.2.1": version: 29.2.1 resolution: "jest-environment-jsdom@npm:29.2.1" @@ -10855,17 +10973,17 @@ __metadata: languageName: node linkType: hard -"jest-environment-node@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-environment-node@npm:29.2.0" +"jest-environment-node@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-environment-node@npm:29.2.1" dependencies: - "@jest/environment": ^29.2.0 - "@jest/fake-timers": ^29.2.0 - "@jest/types": ^29.2.0 + "@jest/environment": ^29.2.1 + "@jest/fake-timers": ^29.2.1 + "@jest/types": ^29.2.1 "@types/node": "*" - jest-mock: ^29.2.0 - jest-util: ^29.2.0 - checksum: f6f35540edc0f44043c2d2b02ad39b9660b8343dbe4864c2d8aeeab0bd80bf54fa7ec0be2974d83cf8103aa83b3cf74899a8d6c65be58f75d2475307e528e954 + jest-mock: ^29.2.1 + jest-util: ^29.2.1 + checksum: fc001e4292ae7516829008c1f030ff176cce9e63d845e3b209bf0c9088d32fc464174032fd41c7cf7c9899801033991aa7bd9f661729cb5691c9179b29188888 languageName: node linkType: hard @@ -10906,6 +11024,29 @@ __metadata: languageName: node linkType: hard +"jest-haste-map@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-haste-map@npm:29.2.1" + dependencies: + "@jest/types": ^29.2.1 + "@types/graceful-fs": ^4.1.3 + "@types/node": "*" + anymatch: ^3.0.3 + fb-watchman: ^2.0.0 + fsevents: ^2.3.2 + graceful-fs: ^4.2.9 + jest-regex-util: ^29.2.0 + jest-util: ^29.2.1 + jest-worker: ^29.2.1 + micromatch: ^4.0.4 + walker: ^1.0.8 + dependenciesMeta: + fsevents: + optional: true + checksum: 1880e5dd12b83c8ffbd527b80c81bd694a9018ed003d1ecc72ed4e1a0c2be0bc2a26a96c7439c4be8954912cd01ecaea807d2739b24d2ac7dd23f5aa672d9da1 + languageName: node + linkType: hard + "jest-jasmine2@npm:29.2.0": version: 29.2.0 resolution: "jest-jasmine2@npm:29.2.0" @@ -10931,13 +11072,13 @@ __metadata: languageName: node linkType: hard -"jest-leak-detector@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-leak-detector@npm:29.2.0" +"jest-leak-detector@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-leak-detector@npm:29.2.1" dependencies: jest-get-type: ^29.2.0 - pretty-format: ^29.2.0 - checksum: 3bc6d5bf1ce0ae41fc00c4de3d741b4de97e82c245ba76737842c715f45c815a1cc16eefa47944930076f4946ef1fb2f820b1f68e5a201b02ac7313b4bf15ba7 + pretty-format: ^29.2.1 + checksum: c30107ae583c7b1a30b8ac32f98997597ac5c46c243ef69a2b4bbaf803eefe0a696c6049a75434afdd0b0adbff418081a202903fcf00d38e4f8c1fe442c0f660 languageName: node linkType: hard @@ -10965,6 +11106,18 @@ __metadata: languageName: node linkType: hard +"jest-matcher-utils@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-matcher-utils@npm:29.2.1" + dependencies: + chalk: ^4.0.0 + jest-diff: ^29.2.1 + jest-get-type: ^29.2.0 + pretty-format: ^29.2.1 + checksum: d2a2f1ca8389e6ee529dc160786d912dec6cadfb395139fa1afa0f2e175775c7cf50dfe00981baae71ee0cbcab0d7f9f2d9cf9b9665dcda1d2cc04294fbd9979 + languageName: node + linkType: hard + "jest-message-util@npm:^29.1.2": version: 29.1.2 resolution: "jest-message-util@npm:29.1.2" @@ -11057,13 +11210,13 @@ __metadata: languageName: node linkType: hard -"jest-resolve-dependencies@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-resolve-dependencies@npm:29.2.0" +"jest-resolve-dependencies@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-resolve-dependencies@npm:29.2.1" dependencies: jest-regex-util: ^29.2.0 - jest-snapshot: ^29.2.0 - checksum: 5b498bb244862d1eb02772ab5b53ed84ac025c6d4e6a96379c3c3eeb7785896f83ae2116c57418b96957fe3242ff5401087fa9a8481e94f6221f15ffe83900a1 + jest-snapshot: ^29.2.1 + checksum: d29908195298f3f3d22f4632bc6eecde89d586d8b8563539072ffbfc5e6ea8973051ef7cbc8336060fcd8b91ea2e42353e8e20958d1fa68dbd6e1c8511a68023 languageName: node linkType: hard @@ -11084,32 +11237,49 @@ __metadata: languageName: node linkType: hard -"jest-runner@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-runner@npm:29.2.0" +"jest-resolve@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-resolve@npm:29.2.1" dependencies: - "@jest/console": ^29.2.0 - "@jest/environment": ^29.2.0 - "@jest/test-result": ^29.2.0 - "@jest/transform": ^29.2.0 - "@jest/types": ^29.2.0 + chalk: ^4.0.0 + graceful-fs: ^4.2.9 + jest-haste-map: ^29.2.1 + jest-pnp-resolver: ^1.2.2 + jest-util: ^29.2.1 + jest-validate: ^29.2.1 + resolve: ^1.20.0 + resolve.exports: ^1.1.0 + slash: ^3.0.0 + checksum: d9ea07ccfa91fcbc7461a0c90bdf9b928f86c9b5de0b01a0a5f73c55aa9cf4f6f7b00439248d4babb9a021070df08be8e4716bc3c73d91311719a400c76f9c82 + languageName: node + linkType: hard + +"jest-runner@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-runner@npm:29.2.1" + dependencies: + "@jest/console": ^29.2.1 + "@jest/environment": ^29.2.1 + "@jest/test-result": ^29.2.1 + "@jest/transform": ^29.2.1 + "@jest/types": ^29.2.1 "@types/node": "*" chalk: ^4.0.0 emittery: ^0.10.2 graceful-fs: ^4.2.9 jest-docblock: ^29.2.0 - jest-environment-node: ^29.2.0 - jest-haste-map: ^29.2.0 - jest-leak-detector: ^29.2.0 - jest-message-util: ^29.2.0 - jest-resolve: ^29.2.0 - jest-runtime: ^29.2.0 - jest-util: ^29.2.0 - jest-watcher: ^29.2.0 - jest-worker: ^29.2.0 + jest-environment-node: ^29.2.1 + jest-haste-map: ^29.2.1 + jest-leak-detector: ^29.2.1 + jest-message-util: ^29.2.1 + jest-resolve: ^29.2.1 + jest-runtime: ^29.2.1 + jest-util: ^29.2.1 + jest-watcher: ^29.2.1 + jest-worker: ^29.2.1 p-limit: ^3.1.0 source-map-support: 0.5.13 - checksum: ebc49ab71e53301d5f1ae7f257e9ed0b38f6c4bd609b88a29b1d792db5b12a452dc8be3576d011d11f6d11ab1a29311173fc2c071c758db3b46cf4e2b123ab07 + checksum: 5aaa04b80eb9d2c78cf5e0ae815a2b418ec5ab24e3fa0bd5a1fa17c886a4c5e9938f5d8508f2ac24ed9dc8cf93c0742c8e538ae31833ed3dfa9fe6e2bc612fa9 languageName: node linkType: hard @@ -11143,6 +11313,36 @@ __metadata: languageName: node linkType: hard +"jest-runtime@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-runtime@npm:29.2.1" + dependencies: + "@jest/environment": ^29.2.1 + "@jest/fake-timers": ^29.2.1 + "@jest/globals": ^29.2.1 + "@jest/source-map": ^29.2.0 + "@jest/test-result": ^29.2.1 + "@jest/transform": ^29.2.1 + "@jest/types": ^29.2.1 + "@types/node": "*" + chalk: ^4.0.0 + cjs-module-lexer: ^1.0.0 + collect-v8-coverage: ^1.0.0 + glob: ^7.1.3 + graceful-fs: ^4.2.9 + jest-haste-map: ^29.2.1 + jest-message-util: ^29.2.1 + jest-mock: ^29.2.1 + jest-regex-util: ^29.2.0 + jest-resolve: ^29.2.1 + jest-snapshot: ^29.2.1 + jest-util: ^29.2.1 + slash: ^3.0.0 + strip-bom: ^4.0.0 + checksum: bfd535ece219f5a1e36758b51c498246e7aac63458a12cb85b3b2156a632d5ee802f43fdc566714fb36c12521589fe495727e9838cdae14b3369e122e44e8c2b + languageName: node + linkType: hard + "jest-snapshot@npm:^29.2.0": version: 29.2.0 resolution: "jest-snapshot@npm:29.2.0" @@ -11175,6 +11375,38 @@ __metadata: languageName: node linkType: hard +"jest-snapshot@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-snapshot@npm:29.2.1" + dependencies: + "@babel/core": ^7.11.6 + "@babel/generator": ^7.7.2 + "@babel/plugin-syntax-jsx": ^7.7.2 + "@babel/plugin-syntax-typescript": ^7.7.2 + "@babel/traverse": ^7.7.2 + "@babel/types": ^7.3.3 + "@jest/expect-utils": ^29.2.1 + "@jest/transform": ^29.2.1 + "@jest/types": ^29.2.1 + "@types/babel__traverse": ^7.0.6 + "@types/prettier": ^2.1.5 + babel-preset-current-node-syntax: ^1.0.0 + chalk: ^4.0.0 + expect: ^29.2.1 + graceful-fs: ^4.2.9 + jest-diff: ^29.2.1 + jest-get-type: ^29.2.0 + jest-haste-map: ^29.2.1 + jest-matcher-utils: ^29.2.1 + jest-message-util: ^29.2.1 + jest-util: ^29.2.1 + natural-compare: ^1.4.0 + pretty-format: ^29.2.1 + semver: ^7.3.5 + checksum: bb09952d13477f403d20c72803ea1b07e0ae7b7abb658bee0a03d3e16f75bb4c85502dbca1e3f5d8b3885063308b4a9acfdb0316339a16bfddd4907c7c79a662 + languageName: node + linkType: hard + "jest-util@npm:^29.1.2": version: 29.1.2 resolution: "jest-util@npm:29.1.2" @@ -11231,19 +11463,33 @@ __metadata: languageName: node linkType: hard -"jest-watcher@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-watcher@npm:29.2.0" +"jest-validate@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-validate@npm:29.2.1" dependencies: - "@jest/test-result": ^29.2.0 - "@jest/types": ^29.2.0 + "@jest/types": ^29.2.1 + camelcase: ^6.2.0 + chalk: ^4.0.0 + jest-get-type: ^29.2.0 + leven: ^3.1.0 + pretty-format: ^29.2.1 + checksum: 33bf2671f9c72f542ac3847b62d96c6717dabab1738c172aef46de06c98ae4c78ed1972ca39c5b1360eaebe47460a39e1d04fd0f7e724241a648d33f3b4d0466 + languageName: node + linkType: hard + +"jest-watcher@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-watcher@npm:29.2.1" + dependencies: + "@jest/test-result": ^29.2.1 + "@jest/types": ^29.2.1 "@types/node": "*" ansi-escapes: ^4.2.1 chalk: ^4.0.0 emittery: ^0.10.2 - jest-util: ^29.2.0 + jest-util: ^29.2.1 string-length: ^4.0.1 - checksum: 86a0a79edcfab8ac96eddafad55327f8d8f0367d75506af8130fcd42c301189ecb3a0749e5739e8336e9478c2df5419ac73fca2bdb6c4180ed85896f01917697 + checksum: c14224af26d1f8c4664d9731d28bb21a6959ce32c4a4ed76b21a5447eca9d635963db5e7a8dbc30df46535b5e4bad589092f47c26bfb705ed203ce80061e744f languageName: node linkType: hard @@ -11281,14 +11527,26 @@ __metadata: languageName: node linkType: hard -"jest@npm:29.2.0": - version: 29.2.0 - resolution: "jest@npm:29.2.0" +"jest-worker@npm:^29.2.1": + version: 29.2.1 + resolution: "jest-worker@npm:29.2.1" dependencies: - "@jest/core": ^29.2.0 - "@jest/types": ^29.2.0 + "@types/node": "*" + jest-util: ^29.2.1 + merge-stream: ^2.0.0 + supports-color: ^8.0.0 + checksum: 10365612fae02412376e963de9f069d854deaf5aec8ff818ce49c299cd0373256a387a2da68db8225fb0f18483f2cc9072a52d1846881d44b756b1e36bc7f4ed + languageName: node + linkType: hard + +"jest@npm:29.2.1": + version: 29.2.1 + resolution: "jest@npm:29.2.1" + dependencies: + "@jest/core": ^29.2.1 + "@jest/types": ^29.2.1 import-local: ^3.0.2 - jest-cli: ^29.2.0 + jest-cli: ^29.2.1 peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 peerDependenciesMeta: @@ -11296,7 +11554,7 @@ __metadata: optional: true bin: jest: bin/jest.js - checksum: 580dae17d49d4c8b7487a2a828db8fe84ad7cf15a8bca56e8640170936101437cc5474b7599b2f37785704aa6c98f97ebfea7494fbb81865de9c65e500b11654 + checksum: b19bf0b490b08c99ec221f9eb69302e02b8f220b080bde22032200b7638896a7d7ae2e559455859b7158e43d07454690b638dd4be5a35d33f00cc973da2da9aa languageName: node linkType: hard @@ -17841,7 +18099,7 @@ __metadata: "@types/fs-extra": 9.0.13 "@types/generate-changelog": 1.8.1 "@types/highlight.js": 10.1.0 - "@types/jest": 29.1.2 + "@types/jest": 29.2.0 "@types/js-cookie": 3.0.2 "@types/jsdom": 20.0.0 "@types/keyboardjs": 2.5.0 @@ -17923,7 +18181,7 @@ __metadata: husky: 7.0.4 i18next-scanner: 4.1.0 intersection-observer: 0.12.2 - jest: 29.2.0 + jest: 29.2.1 jest-canvas-mock: 2.4.0 jest-environment-jsdom: 29.2.1 jest-jasmine2: 29.2.0 From cd65c01001e5246936e6a6c30d702ddfaf86020e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:36:11 +0000 Subject: [PATCH 34/66] chore(deps-dev): Bump @wireapp/copy-config from 1.3.6 to 1.3.10 (#13941) Bumps [@wireapp/copy-config](https://github.com/wireapp/wire-web-packages) from 1.3.6 to 1.3.10. - [Release notes](https://github.com/wireapp/wire-web-packages/releases) - [Commits](https://github.com/wireapp/wire-web-packages/compare/@wireapp/copy-config@1.3.6...@wireapp/copy-config@1.3.10) --- updated-dependencies: - dependency-name: "@wireapp/copy-config" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 98 ++++++++++++---------------------------------------- 2 files changed, 24 insertions(+), 76 deletions(-) diff --git a/package.json b/package.json index 06a6c1605e6..f95af43138f 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "@types/webpack-env": "1.18.0", "@typescript-eslint/eslint-plugin": "5.40.0", "@typescript-eslint/parser": "5.40.1", - "@wireapp/copy-config": "1.3.6", + "@wireapp/copy-config": "1.3.10", "@wireapp/eslint-config": "1.12.11", "@wireapp/prettier-config": "0.4.7", "adm-zip": "0.5.9", diff --git a/yarn.lock b/yarn.lock index 5eb651eb53f..c72d73c97f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4656,20 +4656,19 @@ __metadata: languageName: node linkType: hard -"@wireapp/copy-config@npm:1.3.6": - version: 1.3.6 - resolution: "@wireapp/copy-config@npm:1.3.6" +"@wireapp/copy-config@npm:1.3.10": + version: 1.3.10 + resolution: "@wireapp/copy-config@npm:1.3.10" dependencies: - axios: 0.21.4 + axios: 1.1.3 copy: 0.3.2 - cosmiconfig: 7.0.0 + cosmiconfig: 7.0.1 fs-extra: 10.1.0 - jszip: 3.7.0 + jszip: 3.10.1 logdown: 3.3.1 - rimraf: 3.0.2 bin: copy-config: src/main/cli.js - checksum: d1be889c537cbfd52a15dfd54073eda79543d07ad0f8cd728c0791adcfe7fe2207ff25d190b87b41e41e9bbfe5aa442d02e38fe5355251e7af466817e44e49bc + checksum: 20a4f2d8c7605382f78aae9e15e0ab1954370d25cf8831173464d12d32f85c14a238be013b3b314000d078446f80f4403b9249ae100b842a3be0ba8e782a9de1 languageName: node linkType: hard @@ -5557,16 +5556,7 @@ __metadata: languageName: node linkType: hard -"axios@npm:0.21.4": - version: 0.21.4 - resolution: "axios@npm:0.21.4" - dependencies: - follow-redirects: ^1.14.0 - checksum: 44245f24ac971e7458f3120c92f9d66d1fc695e8b97019139de5b0cc65d9b8104647db01e5f46917728edfc0cfd88eb30fc4c55e6053eef4ace76768ce95ff3c - languageName: node - linkType: hard - -"axios@npm:^1.1.3": +"axios@npm:1.1.3, axios@npm:^1.1.3": version: 1.1.3 resolution: "axios@npm:1.1.3" dependencies: @@ -6668,16 +6658,16 @@ __metadata: languageName: node linkType: hard -"cosmiconfig@npm:7.0.0": - version: 7.0.0 - resolution: "cosmiconfig@npm:7.0.0" +"cosmiconfig@npm:7.0.1, cosmiconfig@npm:^7.0.0, cosmiconfig@npm:^7.0.1": + version: 7.0.1 + resolution: "cosmiconfig@npm:7.0.1" dependencies: "@types/parse-json": ^4.0.0 import-fresh: ^3.2.1 parse-json: ^5.0.0 path-type: ^4.0.0 yaml: ^1.10.0 - checksum: 6801feaa0249e9b9fdde5b3d70dc33b4f9c69095bec94d67e3fe08b66eac24dc7e2099f053597cfbc94b743de269aa5d2cfa7da3fde765433423b06bd122941a + checksum: 4be63e7117955fd88333d7460e4c466a90f556df6ef34efd59034d2463484e339666c41f02b523d574a797ec61f4a91918c5b89a316db2ea2f834e0d2d09465b languageName: node linkType: hard @@ -6693,19 +6683,6 @@ __metadata: languageName: node linkType: hard -"cosmiconfig@npm:^7.0.0, cosmiconfig@npm:^7.0.1": - version: 7.0.1 - resolution: "cosmiconfig@npm:7.0.1" - dependencies: - "@types/parse-json": ^4.0.0 - import-fresh: ^3.2.1 - parse-json: ^5.0.0 - path-type: ^4.0.0 - yaml: ^1.10.0 - checksum: 4be63e7117955fd88333d7460e4c466a90f556df6ef34efd59034d2463484e339666c41f02b523d574a797ec61f4a91918c5b89a316db2ea2f834e0d2d09465b - languageName: node - linkType: hard - "countly-sdk-web@npm:22.6.2": version: 22.6.2 resolution: "countly-sdk-web@npm:22.6.2" @@ -8780,16 +8757,6 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.14.0": - version: 1.14.8 - resolution: "follow-redirects@npm:1.14.8" - peerDependenciesMeta: - debug: - optional: true - checksum: 40c67899c2e3149a27e8b6498a338ff27f39fe138fde8d7f0756cb44b073ba0bfec3d52af28f20c5bdd67263d564d0d8d7b5efefd431de95c18c42f7b4aef457 - languageName: node - linkType: hard - "follow-redirects@npm:^1.15.0": version: 1.15.2 resolution: "follow-redirects@npm:1.15.2" @@ -11797,18 +11764,6 @@ __metadata: languageName: node linkType: hard -"jszip@npm:3.7.0": - version: 3.7.0 - resolution: "jszip@npm:3.7.0" - dependencies: - lie: ~3.3.0 - pako: ~1.0.2 - readable-stream: ~2.3.6 - set-immediate-shim: ~1.0.1 - checksum: 10b8c6a8406c0ac559353bb8b8946a55432ccfda27bc98e539156301ec78a26cd4e7dc4288e9863796e9f30a6924910cefa7bb12bda1338cf71e522133abb370 - languageName: node - linkType: hard - "just-extend@npm:^4.0.2": version: 4.1.1 resolution: "just-extend@npm:4.1.1" @@ -15639,25 +15594,25 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:3.0.2, rimraf@npm:^3.0.2, rimraf@npm:~3.0.2": - version: 3.0.2 - resolution: "rimraf@npm:3.0.2" +"rimraf@npm:^2.5.4, rimraf@npm:^2.6.2": + version: 2.7.1 + resolution: "rimraf@npm:2.7.1" dependencies: glob: ^7.1.3 bin: - rimraf: bin.js - checksum: 87f4164e396f0171b0a3386cc1877a817f572148ee13a7e113b238e48e8a9f2f31d009a92ec38a591ff1567d9662c6b67fd8818a2dbbaed74bc26a87a2a4a9a0 + rimraf: ./bin.js + checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd languageName: node linkType: hard -"rimraf@npm:^2.5.4, rimraf@npm:^2.6.2": - version: 2.7.1 - resolution: "rimraf@npm:2.7.1" +"rimraf@npm:^3.0.2, rimraf@npm:~3.0.2": + version: 3.0.2 + resolution: "rimraf@npm:3.0.2" dependencies: glob: ^7.1.3 bin: - rimraf: ./bin.js - checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd + rimraf: bin.js + checksum: 87f4164e396f0171b0a3386cc1877a817f572148ee13a7e113b238e48e8a9f2f31d009a92ec38a591ff1567d9662c6b67fd8818a2dbbaed74bc26a87a2a4a9a0 languageName: node linkType: hard @@ -15880,13 +15835,6 @@ __metadata: languageName: node linkType: hard -"set-immediate-shim@npm:~1.0.1": - version: 1.0.1 - resolution: "set-immediate-shim@npm:1.0.1" - checksum: 5085c84039d1e5eee73d2bf48ce765fcec76159021d0cc7b40e23bcdf62cb6d450ffb781e3c62c1118425242c48eae96df712cba0a20a437e86b0d4a15d51a11 - languageName: node - linkType: hard - "setimmediate@npm:^1.0.5": version: 1.0.5 resolution: "setimmediate@npm:1.0.5" @@ -18124,7 +18072,7 @@ __metadata: "@typescript-eslint/parser": 5.40.1 "@wireapp/antiscroll-2": 1.3.1 "@wireapp/avs": 8.2.16 - "@wireapp/copy-config": 1.3.6 + "@wireapp/copy-config": 1.3.10 "@wireapp/core": 34.1.1 "@wireapp/eslint-config": 1.12.11 "@wireapp/prettier-config": 0.4.7 From ff8d9ad403463afa667f3ea7ed7a5ae0e7e2e092 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:36:16 +0000 Subject: [PATCH 35/66] chore(deps-dev): Bump @typescript-eslint/eslint-plugin (#13948) Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.40.0 to 5.40.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.40.1/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 95 ++++++++++++++++------------------------------------ 2 files changed, 30 insertions(+), 67 deletions(-) diff --git a/package.json b/package.json index f95af43138f..567f5dce167 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "@types/uint32": "0.2.0", "@types/underscore": "1.11.4", "@types/webpack-env": "1.18.0", - "@typescript-eslint/eslint-plugin": "5.40.0", + "@typescript-eslint/eslint-plugin": "5.40.1", "@typescript-eslint/parser": "5.40.1", "@wireapp/copy-config": "1.3.10", "@wireapp/eslint-config": "1.12.11", diff --git a/yarn.lock b/yarn.lock index c72d73c97f5..3ba1676fe78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4020,6 +4020,13 @@ __metadata: languageName: node linkType: hard +"@types/semver@npm:^7.3.12": + version: 7.3.12 + resolution: "@types/semver@npm:7.3.12" + checksum: 35536b2fc5602904f21cae681f6c9498e177dab3f54ae37c92f9a1b7e43c35f18bcd81e1c98c1cf0d33ee046bb06c771e9928c1c00a401d56a03f56549252a15 + languageName: node + linkType: hard + "@types/simplebar@npm:5.3.3": version: 5.3.3 resolution: "@types/simplebar@npm:5.3.3" @@ -4124,13 +4131,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:5.40.0": - version: 5.40.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.40.0" +"@typescript-eslint/eslint-plugin@npm:5.40.1": + version: 5.40.1 + resolution: "@typescript-eslint/eslint-plugin@npm:5.40.1" dependencies: - "@typescript-eslint/scope-manager": 5.40.0 - "@typescript-eslint/type-utils": 5.40.0 - "@typescript-eslint/utils": 5.40.0 + "@typescript-eslint/scope-manager": 5.40.1 + "@typescript-eslint/type-utils": 5.40.1 + "@typescript-eslint/utils": 5.40.1 debug: ^4.3.4 ignore: ^5.2.0 regexpp: ^3.2.0 @@ -4142,7 +4149,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: ac9e8fcea3545eb33353373c5094fd0a7b79647b37066adbcbd8edcb6fc17c6a601fd0e1b8db0a39200e8238acb33d4b1b036bfe09ebb9899cfb43f6c271a8fd + checksum: 61f19bde0f1206beb20aeb28d18c1ef26a98cf4d2ead9f1d2f204cb91af31582eb5ee9422fe5f92d6aa10cebf85cd50f1b41e8cf8ce65808e2208664c3b1d66a languageName: node linkType: hard @@ -4194,16 +4201,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.40.0": - version: 5.40.0 - resolution: "@typescript-eslint/scope-manager@npm:5.40.0" - dependencies: - "@typescript-eslint/types": 5.40.0 - "@typescript-eslint/visitor-keys": 5.40.0 - checksum: 48dfb2f1a71bda5b782263e97608f1e1a2e8a89a603344af5072208be7936140af9d41483be439405c5ee379d0263555d6cc94405b187707f9ecfd7dd9821b5f - languageName: node - linkType: hard - "@typescript-eslint/scope-manager@npm:5.40.1": version: 5.40.1 resolution: "@typescript-eslint/scope-manager@npm:5.40.1" @@ -4214,12 +4211,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.40.0": - version: 5.40.0 - resolution: "@typescript-eslint/type-utils@npm:5.40.0" +"@typescript-eslint/type-utils@npm:5.40.1": + version: 5.40.1 + resolution: "@typescript-eslint/type-utils@npm:5.40.1" dependencies: - "@typescript-eslint/typescript-estree": 5.40.0 - "@typescript-eslint/utils": 5.40.0 + "@typescript-eslint/typescript-estree": 5.40.1 + "@typescript-eslint/utils": 5.40.1 debug: ^4.3.4 tsutils: ^3.21.0 peerDependencies: @@ -4227,7 +4224,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: eabe86de93b0bd4bcbfb13cace097ff7addbd992c91b80c73bbaa677ce26f1c2abd1c63fe585f2fd9c80df07d3d54bd6e4a46aebc908cef0f870f1d6955d6b8a + checksum: 6771196b8f16f4893bae70aa1371ff004b0058e8edef9b935143e2f1272e471049e9c34beb1d625fb6423db95dd377e01e938b70dd4506fbf071566e2bfb574d languageName: node linkType: hard @@ -4245,13 +4242,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.40.0": - version: 5.40.0 - resolution: "@typescript-eslint/types@npm:5.40.0" - checksum: 892ff162176a3e292b5b55090421c6d318187255f3f91be46bd5c0b38e3c25a49d9320ffb646d5709f3a2cdf350217a79e557886fdfdbdb322caec27f2b3d116 - languageName: node - linkType: hard - "@typescript-eslint/types@npm:5.40.1": version: 5.40.1 resolution: "@typescript-eslint/types@npm:5.40.1" @@ -4295,24 +4285,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.40.0": - version: 5.40.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.40.0" - dependencies: - "@typescript-eslint/types": 5.40.0 - "@typescript-eslint/visitor-keys": 5.40.0 - debug: ^4.3.4 - globby: ^11.1.0 - is-glob: ^4.0.3 - semver: ^7.3.7 - tsutils: ^3.21.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 8b67b8c4278f6bbd16ec521c847920c6f0ba57ec4bf148505c057aa160363852f50f9db73f42ee71ac3906940e8554e9c27686194a57f6554efcd82a8b0fa3e8 - languageName: node - linkType: hard - "@typescript-eslint/typescript-estree@npm:5.40.1": version: 5.40.1 resolution: "@typescript-eslint/typescript-estree@npm:5.40.1" @@ -4347,20 +4319,21 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.40.0": - version: 5.40.0 - resolution: "@typescript-eslint/utils@npm:5.40.0" +"@typescript-eslint/utils@npm:5.40.1": + version: 5.40.1 + resolution: "@typescript-eslint/utils@npm:5.40.1" dependencies: "@types/json-schema": ^7.0.9 - "@typescript-eslint/scope-manager": 5.40.0 - "@typescript-eslint/types": 5.40.0 - "@typescript-eslint/typescript-estree": 5.40.0 + "@types/semver": ^7.3.12 + "@typescript-eslint/scope-manager": 5.40.1 + "@typescript-eslint/types": 5.40.1 + "@typescript-eslint/typescript-estree": 5.40.1 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 semver: ^7.3.7 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 608e16ad510c1543de37e168ab42e9d11fdd7d38faf19fe5d60255ea8e43b9a8cebeea11bd9776eed55fe0e453c5d222bb708b930b431c5b113269c6b44788c1 + checksum: a971101bb2f4c742a1734a87e17997addb7ffa6639d472097fe098f6c5f09567b858949b97f05892aabb20f38479abecdfdd69cf740046aa601dd3fc39a44090 languageName: node linkType: hard @@ -4400,16 +4373,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.40.0": - version: 5.40.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.40.0" - dependencies: - "@typescript-eslint/types": 5.40.0 - eslint-visitor-keys: ^3.3.0 - checksum: a11787f7e6ac7018b22848028c9116d028f89782b0ee120517f0384e9db260e3001ad897512d9c3cf15ce16073ae4c1dc7f81f29d6d40dec78b5e8c8e79f344f - languageName: node - linkType: hard - "@typescript-eslint/visitor-keys@npm:5.40.1": version: 5.40.1 resolution: "@typescript-eslint/visitor-keys@npm:5.40.1" @@ -18068,7 +18031,7 @@ __metadata: "@types/uint32": 0.2.0 "@types/underscore": 1.11.4 "@types/webpack-env": 1.18.0 - "@typescript-eslint/eslint-plugin": 5.40.0 + "@typescript-eslint/eslint-plugin": 5.40.1 "@typescript-eslint/parser": 5.40.1 "@wireapp/antiscroll-2": 1.3.1 "@wireapp/avs": 8.2.16 From d3ad819b075e614bfbc54e18a4320df3ab0b2581 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:43:55 +0000 Subject: [PATCH 36/66] chore(deps): Bump @wireapp/react-ui-kit from 8.17.0 to 8.17.5 (#13949) Bumps [@wireapp/react-ui-kit](https://github.com/wireapp/wire-web-packages) from 8.17.0 to 8.17.5. - [Release notes](https://github.com/wireapp/wire-web-packages/releases) - [Commits](https://github.com/wireapp/wire-web-packages/compare/@wireapp/react-ui-kit@8.17.0...@wireapp/react-ui-kit@8.17.5) --- updated-dependencies: - dependency-name: "@wireapp/react-ui-kit" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 94 +++++++++++++++++++++++++++++++++------------------- 2 files changed, 60 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index 567f5dce167..cd347a460c6 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "@wireapp/antiscroll-2": "1.3.1", "@wireapp/avs": "8.2.16", "@wireapp/core": "34.1.1", - "@wireapp/react-ui-kit": "8.17.0", + "@wireapp/react-ui-kit": "8.17.5", "@wireapp/store-engine-dexie": "1.7.11", "@wireapp/store-engine-sqleet": "1.8.6", "@wireapp/webapp-events": "0.14.9", diff --git a/yarn.lock b/yarn.lock index 3ba1676fe78..f643b074a7a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2518,6 +2518,22 @@ __metadata: languageName: node linkType: hard +"@floating-ui/core@npm:^1.0.1": + version: 1.0.1 + resolution: "@floating-ui/core@npm:1.0.1" + checksum: c8a5f1a491788e5bebfe747e9372df2c7cbee0d8790ddf95e25149ac91ccf1a2cca8f768029826cfd3d687617c1d0f3241b97f1648bdf2a28d421f39e79c2eee + languageName: node + linkType: hard + +"@floating-ui/dom@npm:^1.0.1": + version: 1.0.3 + resolution: "@floating-ui/dom@npm:1.0.3" + dependencies: + "@floating-ui/core": ^1.0.1 + checksum: b5e275a8423b1c704b34db3cb12882d9d6e51ca4a789a0adad06b80c86003e1608cefd4e254836a31a985ea6f9458f9633967c7d54416c3dbdc8c75ce8d5b427 + languageName: node + linkType: hard + "@formatjs/cli@npm:5.1.2": version: 5.1.2 resolution: "@formatjs/cli@npm:5.1.2" @@ -3607,12 +3623,12 @@ __metadata: languageName: node linkType: hard -"@types/color@npm:3.0.2": - version: 3.0.2 - resolution: "@types/color@npm:3.0.2" +"@types/color@npm:3.0.3": + version: 3.0.3 + resolution: "@types/color@npm:3.0.3" dependencies: "@types/color-convert": "*" - checksum: ee25101a59b921a08fdb8270f82ff22db6a0bfdc4c48a8a72616a282590c14912fc6183518f7ecf3080216c243dddb88729653a34a7e30ec707f120bf1070d00 + checksum: 4a54a6eca687b1f19d393c6c44e292009e913fa2377b5b815d1cd04470131087d7a799718d9e66a970f43e6ba16e7056a5b40b49d2d0d1d0f1530aff23864528 languageName: node linkType: hard @@ -4758,16 +4774,15 @@ __metadata: languageName: node linkType: hard -"@wireapp/react-ui-kit@npm:8.17.0": - version: 8.17.0 - resolution: "@wireapp/react-ui-kit@npm:8.17.0" +"@wireapp/react-ui-kit@npm:8.17.5": + version: 8.17.5 + resolution: "@wireapp/react-ui-kit@npm:8.17.5" dependencies: - "@types/color": 3.0.2 - bazinga64: 5.11.6 - color: 3.1.3 + "@types/color": 3.0.3 + color: 4.2.3 emotion-normalize: 11.0.1 - react-select: 5.4.0 - react-transition-group: 4.4.2 + react-select: 5.5.2 + react-transition-group: 4.4.5 peerDependencies: "@emotion/react": 11.10.4 "@types/react": ^18.0.9 @@ -4776,7 +4791,7 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: f2b0ba44c0c2b5a5df82e4e4b9a60273e18bc7910a30714fe9b8152a82e3574c61e2c052cdde49cb4180ccb6623146f48afa6bce31884360222ab1cb6295d0e9 + checksum: ee35c4aaf067c1a67b958b4ebd862c3a1b570c019393001faa5a067e4dfd814605d2065c9cb512f41bbb0d13fcfcc8e6bd88c246fd7a174afa394769fcfad72e languageName: node linkType: hard @@ -6337,7 +6352,7 @@ __metadata: languageName: node linkType: hard -"color-string@npm:^1.5.4": +"color-string@npm:^1.5.4, color-string@npm:^1.9.0": version: 1.9.1 resolution: "color-string@npm:1.9.1" dependencies: @@ -6356,7 +6371,17 @@ __metadata: languageName: node linkType: hard -"color@npm:3.1.3, color@npm:^3.0.0": +"color@npm:4.2.3": + version: 4.2.3 + resolution: "color@npm:4.2.3" + dependencies: + color-convert: ^2.0.1 + color-string: ^1.9.0 + checksum: 0579629c02c631b426780038da929cca8e8d80a40158b09811a0112a107c62e10e4aad719843b791b1e658ab4e800558f2e87ca4522c8b32349d497ecb6adeb4 + languageName: node + linkType: hard + +"color@npm:^3.0.0": version: 3.1.3 resolution: "color@npm:3.1.3" dependencies: @@ -14989,36 +15014,23 @@ __metadata: languageName: node linkType: hard -"react-select@npm:5.4.0": - version: 5.4.0 - resolution: "react-select@npm:5.4.0" +"react-select@npm:5.5.2": + version: 5.5.2 + resolution: "react-select@npm:5.5.2" dependencies: "@babel/runtime": ^7.12.0 "@emotion/cache": ^11.4.0 "@emotion/react": ^11.8.1 + "@floating-ui/dom": ^1.0.1 "@types/react-transition-group": ^4.4.0 memoize-one: ^5.0.0 prop-types: ^15.6.0 react-transition-group: ^4.3.0 + use-isomorphic-layout-effect: ^1.1.2 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: da896f0f8b3c7f6250148ce9ded1ace60abb35b812be50d34cf7ba980b12ca75533c3bbfd9e722530cc0e70c17e8997c3c7e93743877d84c00b0d90e4da521e6 - languageName: node - linkType: hard - -"react-transition-group@npm:4.4.2": - version: 4.4.2 - resolution: "react-transition-group@npm:4.4.2" - dependencies: - "@babel/runtime": ^7.5.5 - dom-helpers: ^5.0.1 - loose-envify: ^1.4.0 - prop-types: ^15.6.2 - peerDependencies: - react: ">=16.6.0" - react-dom: ">=16.6.0" - checksum: b67bf5b3e86dbab72d658b9a52a3589e5960583ab28c7c66272427d8fe30d4c7de422d5046ae96bd2683cdf80cc3264b2516f5ce80cae1dbe6cf3ca6dda392c5 + checksum: 3c340052dfe9558f0ef5e8dc84f8cece6ff424c9d6c56da3f3c551c84b563f616f32a8769bbfb5582cfb6e625d817b74e6562646e6218b39b6c450b146a68345 languageName: node linkType: hard @@ -17471,6 +17483,18 @@ __metadata: languageName: node linkType: hard +"use-isomorphic-layout-effect@npm:^1.1.2": + version: 1.1.2 + resolution: "use-isomorphic-layout-effect@npm:1.1.2" + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + "@types/react": + optional: true + checksum: a6532f7fc9ae222c3725ff0308aaf1f1ddbd3c00d685ef9eee6714fd0684de5cb9741b432fbf51e61a784e2955424864f7ea9f99734a02f237b17ad3e18ea5cb + languageName: node + linkType: hard + "use-sync-external-store@npm:1.2.0, use-sync-external-store@npm:^1.0.0": version: 1.2.0 resolution: "use-sync-external-store@npm:1.2.0" @@ -18039,7 +18063,7 @@ __metadata: "@wireapp/core": 34.1.1 "@wireapp/eslint-config": 1.12.11 "@wireapp/prettier-config": 0.4.7 - "@wireapp/react-ui-kit": 8.17.0 + "@wireapp/react-ui-kit": 8.17.5 "@wireapp/store-engine-dexie": 1.7.11 "@wireapp/store-engine-sqleet": 1.8.6 "@wireapp/webapp-events": 0.14.9 From a52a60959200ef6fc9a12a8a4f029e77d56775e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:44:03 +0000 Subject: [PATCH 37/66] chore(deps): Bump @wireapp/store-engine-sqleet from 1.8.6 to 1.8.9 (#13934) Bumps [@wireapp/store-engine-sqleet](https://github.com/wireapp/wire-web-packages) from 1.8.6 to 1.8.9. - [Release notes](https://github.com/wireapp/wire-web-packages/releases) - [Commits](https://github.com/wireapp/wire-web-packages/compare/@wireapp/store-engine-sqleet@1.8.6...@wireapp/store-engine-sqleet@1.8.9) --- updated-dependencies: - dependency-name: "@wireapp/store-engine-sqleet" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index cd347a460c6..519f9b7198f 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@wireapp/core": "34.1.1", "@wireapp/react-ui-kit": "8.17.5", "@wireapp/store-engine-dexie": "1.7.11", - "@wireapp/store-engine-sqleet": "1.8.6", + "@wireapp/store-engine-sqleet": "1.8.9", "@wireapp/webapp-events": "0.14.9", "amplify": "https://github.com/wireapp/amplify#head=master", "classnames": "2.3.2", diff --git a/yarn.lock b/yarn.lock index f643b074a7a..a8c924c6eef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4806,16 +4806,16 @@ __metadata: languageName: node linkType: hard -"@wireapp/store-engine-sqleet@npm:1.8.6": - version: 1.8.6 - resolution: "@wireapp/store-engine-sqleet@npm:1.8.6" +"@wireapp/store-engine-sqleet@npm:1.8.9": + version: 1.8.9 + resolution: "@wireapp/store-engine-sqleet@npm:1.8.9" dependencies: "@wireapp/websql": 0.0.17 - bazinga64: 5.11.6 + bazinga64: 5.11.9 uint32: 0.2.1 peerDependencies: "@wireapp/store-engine": 4.x.x - checksum: 8de226b2abeff0e11864f2ca490cae53f9df3eaa3abb69253a12c1da97f6899ed9cfc599ca5cb55b05d5fdf1769785cbd6494fd49b183c0b7b56bcd036504b1d + checksum: 91d7019e0431b089b608debb790b25a6675596640829590db4295a53f1ea456b549807d612bc06b360088e00d47805090ddd1bee604a18413801131ba3bccb69 languageName: node linkType: hard @@ -5750,6 +5750,13 @@ __metadata: languageName: node linkType: hard +"bazinga64@npm:5.11.9": + version: 5.11.9 + resolution: "bazinga64@npm:5.11.9" + checksum: 786edefc18b649c02de46677b96b4de7159cee1042ef03ee9b35c0a638f29fbaba7a0bccb12ce353f15b5c8df8ffb1e944b70d561595dce1b9e7697d9119467c + languageName: node + linkType: hard + "big.js@npm:^5.2.2": version: 5.2.2 resolution: "big.js@npm:5.2.2" @@ -18065,7 +18072,7 @@ __metadata: "@wireapp/prettier-config": 0.4.7 "@wireapp/react-ui-kit": 8.17.5 "@wireapp/store-engine-dexie": 1.7.11 - "@wireapp/store-engine-sqleet": 1.8.6 + "@wireapp/store-engine-sqleet": 1.8.9 "@wireapp/webapp-events": 0.14.9 adm-zip: 0.5.9 amplify: "https://github.com/wireapp/amplify#head=master" From bcb8ef12864ebb9b113882f3927ec9ed400ffccf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:44:29 +0000 Subject: [PATCH 38/66] chore(deps-dev): Bump eslint-plugin-jsdoc from 39.3.6 to 39.3.21 (#13950) Bumps [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) from 39.3.6 to 39.3.21. - [Release notes](https://github.com/gajus/eslint-plugin-jsdoc/releases) - [Commits](https://github.com/gajus/eslint-plugin-jsdoc/compare/v39.3.6...v39.3.21) --- updated-dependencies: - dependency-name: eslint-plugin-jsdoc dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 33 ++++++++++++++++++++++----------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 519f9b7198f..7d7b110fba2 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "eslint-plugin-babel": "5.3.1", "eslint-plugin-import": "2.26.0", "eslint-plugin-jest": "27.1.3", - "eslint-plugin-jsdoc": "39.3.6", + "eslint-plugin-jsdoc": "39.3.21", "eslint-plugin-jsx-a11y": "6.6.1", "eslint-plugin-no-unsanitized": "4.0.1", "eslint-plugin-prettier": "4.2.1", diff --git a/yarn.lock b/yarn.lock index a8c924c6eef..0ec8f043eaf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2483,14 +2483,14 @@ __metadata: languageName: node linkType: hard -"@es-joy/jsdoccomment@npm:~0.31.0": - version: 0.31.0 - resolution: "@es-joy/jsdoccomment@npm:0.31.0" +"@es-joy/jsdoccomment@npm:~0.33.0": + version: 0.33.0 + resolution: "@es-joy/jsdoccomment@npm:0.33.0" dependencies: comment-parser: 1.3.1 esquery: ^1.4.0 jsdoc-type-pratt-parser: ~3.1.0 - checksum: 1691ff501559f45593e5f080d2c08dea4fadba5f48e526b9ff2943c050fbb40408f5e83968542e5b6bf47219c7573796d00bfe80dacfd1ba8187904cc475cefb + checksum: fe91f9d236fbae44b752b65d95fc6174f89f9b90b9a4cc270247f1f64ed1fe50b438f01303738677ee8c18e5746266bd65e3cba68708bf8190d503039e417f45 languageName: node linkType: hard @@ -7950,20 +7950,20 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-jsdoc@npm:39.3.6": - version: 39.3.6 - resolution: "eslint-plugin-jsdoc@npm:39.3.6" +"eslint-plugin-jsdoc@npm:39.3.21": + version: 39.3.21 + resolution: "eslint-plugin-jsdoc@npm:39.3.21" dependencies: - "@es-joy/jsdoccomment": ~0.31.0 + "@es-joy/jsdoccomment": ~0.33.0 comment-parser: 1.3.1 debug: ^4.3.4 escape-string-regexp: ^4.0.0 esquery: ^1.4.0 - semver: ^7.3.7 + semver: ^7.3.8 spdx-expression-parse: ^3.0.1 peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: 0825a5eba6cdcb250e45cd5ad488bd234da346f324a11160ad4b8c9fb3c76d8e1457d462fa91c24f11bdff5ef0013375d65c366b648202254c4bcc79eed89060 + checksum: 8116cbbdb4c7e388ae20ca86a4e6ce74a7c7d47a7638ef678975506ad9e71cac81cd864ab3a8c5756d75fafd7d7fa142754ceef51e001f9ed26713672c61ee88 languageName: node linkType: hard @@ -15783,6 +15783,17 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.3.8": + version: 7.3.8 + resolution: "semver@npm:7.3.8" + dependencies: + lru-cache: ^6.0.0 + bin: + semver: bin/semver.js + checksum: ba9c7cbbf2b7884696523450a61fee1a09930d888b7a8d7579025ad93d459b2d1949ee5bbfeb188b2be5f4ac163544c5e98491ad6152df34154feebc2cc337c1 + languageName: node + linkType: hard + "serialize-javascript@npm:^4.0.0": version: 4.0.0 resolution: "serialize-javascript@npm:4.0.0" @@ -18097,7 +18108,7 @@ __metadata: eslint-plugin-header: 3.1.1 eslint-plugin-import: 2.26.0 eslint-plugin-jest: 27.1.3 - eslint-plugin-jsdoc: 39.3.6 + eslint-plugin-jsdoc: 39.3.21 eslint-plugin-jsx-a11y: 6.6.1 eslint-plugin-no-unsanitized: 4.0.1 eslint-plugin-prettier: 4.2.1 From 6722fbff01d647fcb5d2ecb496129f2162070215 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:48:28 +0000 Subject: [PATCH 39/66] chore(deps-dev): Bump jest-jasmine2 from 29.2.0 to 29.2.1 (#13942) Bumps [jest-jasmine2](https://github.com/facebook/jest/tree/HEAD/packages/jest-jasmine2) from 29.2.0 to 29.2.1. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/commits/v29.2.1/packages/jest-jasmine2) --- updated-dependencies: - dependency-name: jest-jasmine2 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 383 +++------------------------------------------------ 2 files changed, 17 insertions(+), 368 deletions(-) diff --git a/package.json b/package.json index 7d7b110fba2..ce13b187db3 100644 --- a/package.json +++ b/package.json @@ -139,7 +139,7 @@ "jest": "29.2.1", "jest-canvas-mock": "2.4.0", "jest-environment-jsdom": "29.2.1", - "jest-jasmine2": "29.2.0", + "jest-jasmine2": "29.2.1", "jsdom-worker": "0.3.0", "less": "3.13.1", "lint-staged": "13.0.3", diff --git a/yarn.lock b/yarn.lock index 0ec8f043eaf..86a3592be58 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2691,20 +2691,6 @@ __metadata: languageName: node linkType: hard -"@jest/console@npm:^29.2.0": - version: 29.2.0 - resolution: "@jest/console@npm:29.2.0" - dependencies: - "@jest/types": ^29.2.0 - "@types/node": "*" - chalk: ^4.0.0 - jest-message-util: ^29.2.0 - jest-util: ^29.2.0 - slash: ^3.0.0 - checksum: 514b1a3c0d5a3a19cd6ecde3fe5035379398034d27e1ec876d91e58eaab18dba6d7d55b5bfec990df6b0e0e3991ef5078cb422da9b56c1223f850e4e29c85723 - languageName: node - linkType: hard - "@jest/console@npm:^29.2.1": version: 29.2.1 resolution: "@jest/console@npm:29.2.1" @@ -2760,18 +2746,6 @@ __metadata: languageName: node linkType: hard -"@jest/environment@npm:^29.2.0": - version: 29.2.0 - resolution: "@jest/environment@npm:29.2.0" - dependencies: - "@jest/fake-timers": ^29.2.0 - "@jest/types": ^29.2.0 - "@types/node": "*" - jest-mock: ^29.2.0 - checksum: 1ddac48da360d59efec1e671e9351fbe24c6ec7976b5704e9d4dfe3e31e1af0851b20b05a94cc0a03709a85e3dc9bf6ae66fde6ecc4a6d36d97623a8b0265af0 - languageName: node - linkType: hard - "@jest/environment@npm:^29.2.1": version: 29.2.1 resolution: "@jest/environment@npm:29.2.1" @@ -2793,15 +2767,6 @@ __metadata: languageName: node linkType: hard -"@jest/expect-utils@npm:^29.2.0": - version: 29.2.0 - resolution: "@jest/expect-utils@npm:29.2.0" - dependencies: - jest-get-type: ^29.2.0 - checksum: dae6df9292501e5d9380ed26f0dde04761de977aad4d3bcb386feb0055944c1c0b4794e83d1f41f974d5ff51dae0126842ff52ba7c46a59f294bb957b145acda - languageName: node - linkType: hard - "@jest/expect-utils@npm:^29.2.1": version: 29.2.1 resolution: "@jest/expect-utils@npm:29.2.1" @@ -2811,16 +2776,6 @@ __metadata: languageName: node linkType: hard -"@jest/expect@npm:^29.2.0": - version: 29.2.0 - resolution: "@jest/expect@npm:29.2.0" - dependencies: - expect: ^29.2.0 - jest-snapshot: ^29.2.0 - checksum: 55f54b937973f30355e55085102852d6c524dc300a3046582676760ca5b03d0dbec5709ce2636df865250e1a330a9b47be52a039cd3bc3288b17098a0725447b - languageName: node - linkType: hard - "@jest/expect@npm:^29.2.1": version: 29.2.1 resolution: "@jest/expect@npm:29.2.1" @@ -2831,20 +2786,6 @@ __metadata: languageName: node linkType: hard -"@jest/fake-timers@npm:^29.2.0": - version: 29.2.0 - resolution: "@jest/fake-timers@npm:29.2.0" - dependencies: - "@jest/types": ^29.2.0 - "@sinonjs/fake-timers": ^9.1.2 - "@types/node": "*" - jest-message-util: ^29.2.0 - jest-mock: ^29.2.0 - jest-util: ^29.2.0 - checksum: f1ff640365695d64440d12f92c55d40e372fa46d9974089bf2a4cbc43464d2f9e04615caecda7c074b0f0abc072e334e11611df8915b323d0010ed9c2d151bf6 - languageName: node - linkType: hard - "@jest/fake-timers@npm:^29.2.1": version: 29.2.1 resolution: "@jest/fake-timers@npm:29.2.1" @@ -2859,18 +2800,6 @@ __metadata: languageName: node linkType: hard -"@jest/globals@npm:^29.2.0": - version: 29.2.0 - resolution: "@jest/globals@npm:29.2.0" - dependencies: - "@jest/environment": ^29.2.0 - "@jest/expect": ^29.2.0 - "@jest/types": ^29.2.0 - jest-mock: ^29.2.0 - checksum: bd88c444e26c1448bbf01464ff97acdacd36be382dbc2c812e528b80808edeb474e61d58b71f5e85898ff06bec7bbfc130ecf9a6c638c3556c1d1ebb4dd6ed95 - languageName: node - linkType: hard - "@jest/globals@npm:^29.2.1": version: 29.2.1 resolution: "@jest/globals@npm:29.2.1" @@ -2940,18 +2869,6 @@ __metadata: languageName: node linkType: hard -"@jest/test-result@npm:^29.2.0": - version: 29.2.0 - resolution: "@jest/test-result@npm:29.2.0" - dependencies: - "@jest/console": ^29.2.0 - "@jest/types": ^29.2.0 - "@types/istanbul-lib-coverage": ^2.0.0 - collect-v8-coverage: ^1.0.0 - checksum: 1c4709754212ccd9c76634537c9ab3433d7fd542893d865eb355068acbfd62c0a7abe5ed96e3f4bda117c2c007075ea42c0956b4921b77c23d35d442f01b3fe8 - languageName: node - linkType: hard - "@jest/test-result@npm:^29.2.1": version: 29.2.1 resolution: "@jest/test-result@npm:29.2.1" @@ -2976,29 +2893,6 @@ __metadata: languageName: node linkType: hard -"@jest/transform@npm:^29.2.0": - version: 29.2.0 - resolution: "@jest/transform@npm:29.2.0" - dependencies: - "@babel/core": ^7.11.6 - "@jest/types": ^29.2.0 - "@jridgewell/trace-mapping": ^0.3.15 - babel-plugin-istanbul: ^6.1.1 - chalk: ^4.0.0 - convert-source-map: ^1.4.0 - fast-json-stable-stringify: ^2.1.0 - graceful-fs: ^4.2.9 - jest-haste-map: ^29.2.0 - jest-regex-util: ^29.2.0 - jest-util: ^29.2.0 - micromatch: ^4.0.4 - pirates: ^4.0.4 - slash: ^3.0.0 - write-file-atomic: ^4.0.1 - checksum: 8e3794d1b77e6d52d342a692186cd574b2a637ce255f75824a029fc82cad93623d7bc5796566c1632fb51673eea2bf5194f4aac6bbc8cf879a5c29b12dbfb32a - languageName: node - linkType: hard - "@jest/transform@npm:^29.2.1": version: 29.2.1 resolution: "@jest/transform@npm:29.2.1" @@ -3036,20 +2930,6 @@ __metadata: languageName: node linkType: hard -"@jest/types@npm:^29.2.0": - version: 29.2.0 - resolution: "@jest/types@npm:29.2.0" - dependencies: - "@jest/schemas": ^29.0.0 - "@types/istanbul-lib-coverage": ^2.0.0 - "@types/istanbul-reports": ^3.0.0 - "@types/node": "*" - "@types/yargs": ^17.0.8 - chalk: ^4.0.0 - checksum: 6b04cbb23306f16eaf4f0d158cfcb7cc905b352e2e44a0a4618c46cf3bdf7a1da64cea8fbc731a19e8a86dc5b80a75aec985cf8764b3178939b5d850ccc68b57 - languageName: node - linkType: hard - "@jest/types@npm:^29.2.1": version: 29.2.1 resolution: "@jest/types@npm:29.2.1" @@ -8393,19 +8273,6 @@ __metadata: languageName: node linkType: hard -"expect@npm:^29.2.0": - version: 29.2.0 - resolution: "expect@npm:29.2.0" - dependencies: - "@jest/expect-utils": ^29.2.0 - jest-get-type: ^29.2.0 - jest-matcher-utils: ^29.2.0 - jest-message-util: ^29.2.0 - jest-util: ^29.2.0 - checksum: 1d309c5218b514e54afb96b01141829a093ad424f7ba9e0b9fd2b1e08dfb04b39ff57d19e678105a5b7de9111d57f49d89c9c541f6f584a5735af2c31292fe11 - languageName: node - linkType: hard - "expect@npm:^29.2.1": version: 29.2.1 resolution: "expect@npm:29.2.1" @@ -10855,18 +10722,6 @@ __metadata: languageName: node linkType: hard -"jest-diff@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-diff@npm:29.2.0" - dependencies: - chalk: ^4.0.0 - diff-sequences: ^29.2.0 - jest-get-type: ^29.2.0 - pretty-format: ^29.2.0 - checksum: 149381e8ba41a699a06e01efd650403b8dd2a4bfaea16be463def32a89e3b98bb41e7679b1e9a4b907fdee193c05419ce1d9bf1d6673e612305c32a6387fce07 - languageName: node - linkType: hard - "jest-diff@npm:^29.2.1": version: 29.2.1 resolution: "jest-diff@npm:29.2.1" @@ -10888,19 +10743,6 @@ __metadata: languageName: node linkType: hard -"jest-each@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-each@npm:29.2.0" - dependencies: - "@jest/types": ^29.2.0 - chalk: ^4.0.0 - jest-get-type: ^29.2.0 - jest-util: ^29.2.0 - pretty-format: ^29.2.0 - checksum: 246e84c03e3d807a5d9cb9a515807742db09a2814fa56111035c6ec29b195d6f84c43b92774d6768f785d37c55dc58b379c274b9b0d6618b9e386aaea374de07 - languageName: node - linkType: hard - "jest-each@npm:^29.2.1": version: 29.2.1 resolution: "jest-each@npm:29.2.1" @@ -10963,29 +10805,6 @@ __metadata: languageName: node linkType: hard -"jest-haste-map@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-haste-map@npm:29.2.0" - dependencies: - "@jest/types": ^29.2.0 - "@types/graceful-fs": ^4.1.3 - "@types/node": "*" - anymatch: ^3.0.3 - fb-watchman: ^2.0.0 - fsevents: ^2.3.2 - graceful-fs: ^4.2.9 - jest-regex-util: ^29.2.0 - jest-util: ^29.2.0 - jest-worker: ^29.2.0 - micromatch: ^4.0.4 - walker: ^1.0.8 - dependenciesMeta: - fsevents: - optional: true - checksum: f7d398658e94c2289832ce9ec445baf6b1a6ccd5b0861962fcb1d4b6ebe45acfe7577f947273e945cc6652e8725131390b87a45f63c07ace64df5a256ba5a387 - languageName: node - linkType: hard - "jest-haste-map@npm:^29.2.1": version: 29.2.1 resolution: "jest-haste-map@npm:29.2.1" @@ -11009,28 +10828,28 @@ __metadata: languageName: node linkType: hard -"jest-jasmine2@npm:29.2.0": - version: 29.2.0 - resolution: "jest-jasmine2@npm:29.2.0" +"jest-jasmine2@npm:29.2.1": + version: 29.2.1 + resolution: "jest-jasmine2@npm:29.2.1" dependencies: - "@jest/environment": ^29.2.0 - "@jest/expect": ^29.2.0 + "@jest/environment": ^29.2.1 + "@jest/expect": ^29.2.1 "@jest/source-map": ^29.2.0 - "@jest/test-result": ^29.2.0 - "@jest/types": ^29.2.0 + "@jest/test-result": ^29.2.1 + "@jest/types": ^29.2.1 "@types/node": "*" chalk: ^4.0.0 co: ^4.6.0 is-generator-fn: ^2.0.0 - jest-each: ^29.2.0 - jest-matcher-utils: ^29.2.0 - jest-message-util: ^29.2.0 - jest-runtime: ^29.2.0 - jest-snapshot: ^29.2.0 - jest-util: ^29.2.0 + jest-each: ^29.2.1 + jest-matcher-utils: ^29.2.1 + jest-message-util: ^29.2.1 + jest-runtime: ^29.2.1 + jest-snapshot: ^29.2.1 + jest-util: ^29.2.1 p-limit: ^3.1.0 - pretty-format: ^29.2.0 - checksum: 79b92d6fd536a99ec7fec13f4a6aaf50d28aea645725554b93376c6c6aaab82fd78f667852b78c8bf8ee557001656a6178c41bf1b2c1f4dfacffb274abf95fa3 + pretty-format: ^29.2.1 + checksum: 91b47dc0382264155c3135f81b18582314d412c2ac9f56b2174bb76d849e1137b240f3e2c4a54463e0d159437f4c52ce3d82ac9c1673c4fcba2b75920b86c31b languageName: node linkType: hard @@ -11056,18 +10875,6 @@ __metadata: languageName: node linkType: hard -"jest-matcher-utils@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-matcher-utils@npm:29.2.0" - dependencies: - chalk: ^4.0.0 - jest-diff: ^29.2.0 - jest-get-type: ^29.2.0 - pretty-format: ^29.2.0 - checksum: 8beeb95677d6b79a7858cd4c80fd16607cae0367d02fe24054f370fc23298af44844c5fc93a723568a1e23007fff3d086d3e9a9377621182fcaf1db1b01147ca - languageName: node - linkType: hard - "jest-matcher-utils@npm:^29.2.1": version: 29.2.1 resolution: "jest-matcher-utils@npm:29.2.1" @@ -11097,23 +10904,6 @@ __metadata: languageName: node linkType: hard -"jest-message-util@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-message-util@npm:29.2.0" - dependencies: - "@babel/code-frame": ^7.12.13 - "@jest/types": ^29.2.0 - "@types/stack-utils": ^2.0.0 - chalk: ^4.0.0 - graceful-fs: ^4.2.9 - micromatch: ^4.0.4 - pretty-format: ^29.2.0 - slash: ^3.0.0 - stack-utils: ^2.0.3 - checksum: de74c6aeffbbae736f2be32ffaf238ec8944a213dca2e2f85ef845b92ca0a01496504a007fc5557e9ee8d2f1ead634962a53fe86d4483cd61ea82d6b790bdfb2 - languageName: node - linkType: hard - "jest-message-util@npm:^29.2.1": version: 29.2.1 resolution: "jest-message-util@npm:29.2.1" @@ -11131,17 +10921,6 @@ __metadata: languageName: node linkType: hard -"jest-mock@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-mock@npm:29.2.0" - dependencies: - "@jest/types": ^29.2.0 - "@types/node": "*" - jest-util: ^29.2.0 - checksum: 6c65e89860e5d1a74291c6276b1a12902189f4fa63adb226a811621725bf27487696fb366f3855b84afddbfa6cd36c7d4d0b61f5a05bbddb63ff00c8f95046a7 - languageName: node - linkType: hard - "jest-mock@npm:^29.2.1": version: 29.2.1 resolution: "jest-mock@npm:29.2.1" @@ -11182,23 +10961,6 @@ __metadata: languageName: node linkType: hard -"jest-resolve@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-resolve@npm:29.2.0" - dependencies: - chalk: ^4.0.0 - graceful-fs: ^4.2.9 - jest-haste-map: ^29.2.0 - jest-pnp-resolver: ^1.2.2 - jest-util: ^29.2.0 - jest-validate: ^29.2.0 - resolve: ^1.20.0 - resolve.exports: ^1.1.0 - slash: ^3.0.0 - checksum: abbcb395d165cc17179f2237f33306dbb344c983136f112284418d5f5d8b26646e67b8981a2cc67cfe0578506f8c23cd2ef88f26f8d91d68eb48a48d71263e82 - languageName: node - linkType: hard - "jest-resolve@npm:^29.2.1": version: 29.2.1 resolution: "jest-resolve@npm:29.2.1" @@ -11245,36 +11007,6 @@ __metadata: languageName: node linkType: hard -"jest-runtime@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-runtime@npm:29.2.0" - dependencies: - "@jest/environment": ^29.2.0 - "@jest/fake-timers": ^29.2.0 - "@jest/globals": ^29.2.0 - "@jest/source-map": ^29.2.0 - "@jest/test-result": ^29.2.0 - "@jest/transform": ^29.2.0 - "@jest/types": ^29.2.0 - "@types/node": "*" - chalk: ^4.0.0 - cjs-module-lexer: ^1.0.0 - collect-v8-coverage: ^1.0.0 - glob: ^7.1.3 - graceful-fs: ^4.2.9 - jest-haste-map: ^29.2.0 - jest-message-util: ^29.2.0 - jest-mock: ^29.2.0 - jest-regex-util: ^29.2.0 - jest-resolve: ^29.2.0 - jest-snapshot: ^29.2.0 - jest-util: ^29.2.0 - slash: ^3.0.0 - strip-bom: ^4.0.0 - checksum: a16c84ee3ce89280e4c660fcbcb2cd9556499b054f734e508cd2954236ac46733156c5cf828d6c5c4bffcc6ca544cfee1af5e9a2a8def140c38a5702e9ec73ac - languageName: node - linkType: hard - "jest-runtime@npm:^29.2.1": version: 29.2.1 resolution: "jest-runtime@npm:29.2.1" @@ -11305,38 +11037,6 @@ __metadata: languageName: node linkType: hard -"jest-snapshot@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-snapshot@npm:29.2.0" - dependencies: - "@babel/core": ^7.11.6 - "@babel/generator": ^7.7.2 - "@babel/plugin-syntax-jsx": ^7.7.2 - "@babel/plugin-syntax-typescript": ^7.7.2 - "@babel/traverse": ^7.7.2 - "@babel/types": ^7.3.3 - "@jest/expect-utils": ^29.2.0 - "@jest/transform": ^29.2.0 - "@jest/types": ^29.2.0 - "@types/babel__traverse": ^7.0.6 - "@types/prettier": ^2.1.5 - babel-preset-current-node-syntax: ^1.0.0 - chalk: ^4.0.0 - expect: ^29.2.0 - graceful-fs: ^4.2.9 - jest-diff: ^29.2.0 - jest-get-type: ^29.2.0 - jest-haste-map: ^29.2.0 - jest-matcher-utils: ^29.2.0 - jest-message-util: ^29.2.0 - jest-util: ^29.2.0 - natural-compare: ^1.4.0 - pretty-format: ^29.2.0 - semver: ^7.3.5 - checksum: 11fe8fd2e51882ae35c5d675e2bc25757f84b469c53b330194b30d03c98a033c32a6ef7c5ed5af0abf7350456e978cc5c4daa8ea87743c3038c4cbce41cc9804 - languageName: node - linkType: hard - "jest-snapshot@npm:^29.2.1": version: 29.2.1 resolution: "jest-snapshot@npm:29.2.1" @@ -11383,20 +11083,6 @@ __metadata: languageName: node linkType: hard -"jest-util@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-util@npm:29.2.0" - dependencies: - "@jest/types": ^29.2.0 - "@types/node": "*" - chalk: ^4.0.0 - ci-info: ^3.2.0 - graceful-fs: ^4.2.9 - picomatch: ^2.2.3 - checksum: c1fc26008b3199387dbd28f145f692f48b7c8e911c6a71892e579544ee62819ecc2c693f7fc5e41284119a6f742130ef5c92f485caed89eea47c5e627003ad2d - languageName: node - linkType: hard - "jest-util@npm:^29.2.1": version: 29.2.1 resolution: "jest-util@npm:29.2.1" @@ -11411,20 +11097,6 @@ __metadata: languageName: node linkType: hard -"jest-validate@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-validate@npm:29.2.0" - dependencies: - "@jest/types": ^29.2.0 - camelcase: ^6.2.0 - chalk: ^4.0.0 - jest-get-type: ^29.2.0 - leven: ^3.1.0 - pretty-format: ^29.2.0 - checksum: 41680f078bf138af49a7ae297f4e5c09e84de693e716fa854313f6e61f4b3fe34be35a8736bf7d260c498631241ffe4622e544f6c0d0ece718e8441cd45ed327 - languageName: node - linkType: hard - "jest-validate@npm:^29.2.1": version: 29.2.1 resolution: "jest-validate@npm:29.2.1" @@ -11477,18 +11149,6 @@ __metadata: languageName: node linkType: hard -"jest-worker@npm:^29.2.0": - version: 29.2.0 - resolution: "jest-worker@npm:29.2.0" - dependencies: - "@types/node": "*" - jest-util: ^29.2.0 - merge-stream: ^2.0.0 - supports-color: ^8.0.0 - checksum: 680afa2b9efd0f6548a52210d055e1d8a5de2e8602cf5547d59075a55f7d9b6d4fd3c4a8bb34e03a3815975ae4c737b6dbc2c194e12088611a19941836960374 - languageName: node - linkType: hard - "jest-worker@npm:^29.2.1": version: 29.2.1 resolution: "jest-worker@npm:29.2.1" @@ -14678,17 +14338,6 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^29.2.0": - version: 29.2.0 - resolution: "pretty-format@npm:29.2.0" - dependencies: - "@jest/schemas": ^29.0.0 - ansi-styles: ^5.0.0 - react-is: ^18.0.0 - checksum: f5ef6a848540f0881baafbcf6bf9908d2d8e2a47692bc095abbb06881ed3c780b41b08cb537b7d020fc79cec04c4a8bbd6a15cd44a3fe0693ddd235a2d0bda3a - languageName: node - linkType: hard - "pretty-format@npm:^29.2.1": version: 29.2.1 resolution: "pretty-format@npm:29.2.1" @@ -18137,7 +17786,7 @@ __metadata: jest: 29.2.1 jest-canvas-mock: 2.4.0 jest-environment-jsdom: 29.2.1 - jest-jasmine2: 29.2.0 + jest-jasmine2: 29.2.1 jquery: 3.6.1 jquery-mousewheel: 3.1.13 js-cookie: 3.0.1 From 880b9f8e4d0a3505af79acda64eb67ed4222d81e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:55:33 +0000 Subject: [PATCH 40/66] chore(deps-dev): Bump @wireapp/eslint-config from 1.12.11 to 1.12.12 (#13944) Bumps [@wireapp/eslint-config](https://github.com/wireapp/wire-web-packages) from 1.12.11 to 1.12.12. - [Release notes](https://github.com/wireapp/wire-web-packages/releases) - [Commits](https://github.com/wireapp/wire-web-packages/compare/@wireapp/eslint-config@1.12.11...@wireapp/eslint-config@1.12.12) --- updated-dependencies: - dependency-name: "@wireapp/eslint-config" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] 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, 6 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index ce13b187db3..e00cf478da4 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "@typescript-eslint/eslint-plugin": "5.40.1", "@typescript-eslint/parser": "5.40.1", "@wireapp/copy-config": "1.3.10", - "@wireapp/eslint-config": "1.12.11", + "@wireapp/eslint-config": "1.12.12", "@wireapp/prettier-config": "0.4.7", "adm-zip": "0.5.9", "autoprefixer": "9.8.8", diff --git a/yarn.lock b/yarn.lock index 86a3592be58..88cb3b7b195 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4575,9 +4575,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/eslint-config@npm:1.12.11": - version: 1.12.11 - resolution: "@wireapp/eslint-config@npm:1.12.11" +"@wireapp/eslint-config@npm:1.12.12": + version: 1.12.12 + resolution: "@wireapp/eslint-config@npm:1.12.12" peerDependencies: "@babel/eslint-parser": ">=7" "@typescript-eslint/eslint-plugin": ">=3" @@ -4592,7 +4592,7 @@ __metadata: eslint-plugin-react-hooks: ">=2" eslint-plugin-unused-imports: ">=1.1" prettier: ">=2" - checksum: c73a7e6580c7017ff1e9b7ebd10e7e7ddd3e04a4cbad69b97d7e1151d15e5545253e474781a0384f3319d0c97481bf26e398fd04506ae4b126b31cd8ce25365a + checksum: f82875e77336c66bc3a70834c0ced76f7d066939cb79fc747c0fdcb5d352e93a5c7b45e6e533b9e13aaa0c44654e88f1f76262cd5321994bb3d559ea3499e3ca languageName: node linkType: hard @@ -5623,13 +5623,6 @@ __metadata: languageName: node linkType: hard -"bazinga64@npm:5.11.6": - version: 5.11.6 - resolution: "bazinga64@npm:5.11.6" - checksum: e11a0333784cbd5bcf26c16aabe740325b231efef184865218fe6e701873c58fa6f877c48b9217e8781deac751b68dbaea1d9585e80d4c77bdd3c2ba161fef6f - languageName: node - linkType: hard - "bazinga64@npm:5.11.9": version: 5.11.9 resolution: "bazinga64@npm:5.11.9" @@ -17728,7 +17721,7 @@ __metadata: "@wireapp/avs": 8.2.16 "@wireapp/copy-config": 1.3.10 "@wireapp/core": 34.1.1 - "@wireapp/eslint-config": 1.12.11 + "@wireapp/eslint-config": 1.12.12 "@wireapp/prettier-config": 0.4.7 "@wireapp/react-ui-kit": 8.17.5 "@wireapp/store-engine-dexie": 1.7.11 From b7dbf0beabfda62b59b80373bed7ef1b49cbde34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Oct 2022 14:57:31 +0000 Subject: [PATCH 41/66] chore(deps-dev): Bump @formatjs/cli from 5.1.2 to 5.1.3 (#13945) Bumps [@formatjs/cli](https://github.com/formatjs/formatjs) from 5.1.2 to 5.1.3. - [Release notes](https://github.com/formatjs/formatjs/releases) - [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/cli@5.1.2...@formatjs/cli@5.1.3) --- updated-dependencies: - dependency-name: "@formatjs/cli" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e00cf478da4..55ce22353b0 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "@babel/preset-react": "7.18.6", "@babel/preset-typescript": "7.18.6", "@faker-js/faker": "7.6.0", - "@formatjs/cli": "5.1.2", + "@formatjs/cli": "5.1.3", "@koush/wrtc": "0.5.3", "@testing-library/react": "13.4.0", "@types/adm-zip": "0.5.0", diff --git a/yarn.lock b/yarn.lock index 88cb3b7b195..142c1214888 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2534,9 +2534,9 @@ __metadata: languageName: node linkType: hard -"@formatjs/cli@npm:5.1.2": - version: 5.1.2 - resolution: "@formatjs/cli@npm:5.1.2" +"@formatjs/cli@npm:5.1.3": + version: 5.1.3 + resolution: "@formatjs/cli@npm:5.1.3" peerDependencies: "@vue/compiler-sfc": ^3.2.34 peerDependenciesMeta: @@ -2544,7 +2544,7 @@ __metadata: optional: true bin: formatjs: bin/formatjs - checksum: d0efc3197619be3efb9fdc9b8210bac03aa9f0587a726685e35d6c7afa61504e8a277bc6bddf2430d4d5e949556f2fb6dd3f47d3a4ea12658419bc24829c6d27 + checksum: 28c38cfd4890712d5e80531bdd8ebcba80dde62da35f59fe6c24f7bb8209f94b0a26ca8c81e08e735d9f22db6a6bb2d7b279a838d6960698e5458094454dd0ce languageName: node linkType: hard @@ -17684,7 +17684,7 @@ __metadata: "@babel/preset-typescript": 7.18.6 "@emotion/react": 11.10.4 "@faker-js/faker": 7.6.0 - "@formatjs/cli": 5.1.2 + "@formatjs/cli": 5.1.3 "@koush/wrtc": 0.5.3 "@testing-library/react": 13.4.0 "@types/adm-zip": 0.5.0 From 0271d69ed8313a2ce469c6107e171d8c1420f5e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20G=C3=B3rka?= Date: Mon, 24 Oct 2022 08:45:12 +0200 Subject: [PATCH 42/66] runfix: show expand option for collections over limit [FS-1025] (#13921) * runfix: show expand option for collections over limit * test: CollectionSection component * test: fix tests * refactor: apply cr suggestions * refactor: cr changes --- .../panels/Collection/Collection.test.tsx | 8 +- .../Collection/CollectionSection.test.tsx | 82 +++++++++++++++++++ .../panels/Collection/CollectionSection.tsx | 4 +- 3 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 src/script/page/MainContent/panels/Collection/CollectionSection.test.tsx diff --git a/src/script/page/MainContent/panels/Collection/Collection.test.tsx b/src/script/page/MainContent/panels/Collection/Collection.test.tsx index 72fb35e20ad..e5d5a2994c4 100644 --- a/src/script/page/MainContent/panels/Collection/Collection.test.tsx +++ b/src/script/page/MainContent/panels/Collection/Collection.test.tsx @@ -101,6 +101,10 @@ describe('Collection', () => { }); it('displays collection details when a section is selected', async () => { + const IMAGE_COLLECTION_LENGTH = 13; + const imageMessages = new Array(IMAGE_COLLECTION_LENGTH).fill(null).map(createImageMessage); + mockConversationRepository.getEventsForCategory.mockResolvedValueOnce(imageMessages); + const {getAllByText, getByText} = render( , ); @@ -114,13 +118,13 @@ describe('Collection', () => { it('should display search results when term is typed', async () => { jest.useFakeTimers(); - const {getAllByText, queryByText, container} = render( + const {getAllByText, queryByText, getByTestId} = render( , ); await waitFor(() => getAllByText('CollectionItem')); await act(async () => { - const input: HTMLInputElement = container.querySelector('[data-uie-name=full-search-header-input]'); + const input = getByTestId('full-search-header-input'); fireEvent.change(input, {target: {value: 'term'}}); jest.advanceTimersByTime(500); await waitFor(() => expect(mockConversationRepository.searchInConversation).toHaveBeenCalled()); diff --git a/src/script/page/MainContent/panels/Collection/CollectionSection.test.tsx b/src/script/page/MainContent/panels/Collection/CollectionSection.test.tsx new file mode 100644 index 00000000000..9a7dc640ba5 --- /dev/null +++ b/src/script/page/MainContent/panels/Collection/CollectionSection.test.tsx @@ -0,0 +1,82 @@ +/* + * Wire + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + * + */ + +import {render, fireEvent} from '@testing-library/react'; + +import CollectionSection from './CollectionSection'; +import {ContentMessage} from '../../../../entity/message/ContentMessage'; +import {createRandomUuid} from 'Util/util'; + +const NUMBER_OF_ASSETS = 5; + +const messages = new Array(NUMBER_OF_ASSETS).fill(null).map(() => new ContentMessage(createRandomUuid())); + +const getDefaultProps = (limit: number) => ({ + label: 'cool collection', + limit, + messages, + onSelect: jest.fn(), + uieName: 'cool-collection', +}); + +describe('CollectionSection', () => { + it('does not show show all button when under or equal a limit', async () => { + const props = getDefaultProps(NUMBER_OF_ASSETS + 1); + const {queryByText, rerender} = render( + + + , + ); + + props.limit = NUMBER_OF_ASSETS; + expect(queryByText('collectionShowAll')).toBeNull(); + + rerender( + + + , + ); + + expect(queryByText('collectionShowAll')).toBeNull(); + }); + + it('does show show all button when over a limit', async () => { + const {getByText} = render( + + + , + ); + + expect(getByText('collectionShowAll')).toBeDefined(); + }); + + it('triggers onSelect callback on show all button click', async () => { + const props = getDefaultProps(NUMBER_OF_ASSETS - 1); + const {getByText} = render( + + + , + ); + + const button = getByText('collectionShowAll'); + fireEvent.click(button); + + expect(props.onSelect).toHaveBeenCalled(); + }); +}); diff --git a/src/script/page/MainContent/panels/Collection/CollectionSection.tsx b/src/script/page/MainContent/panels/Collection/CollectionSection.tsx index 3346874037a..86971d0b3b0 100644 --- a/src/script/page/MainContent/panels/Collection/CollectionSection.tsx +++ b/src/script/page/MainContent/panels/Collection/CollectionSection.tsx @@ -33,7 +33,7 @@ const CollectionSection: React.FC<{ if (messages.length === 0) { return null; } - const hasExtra = true || messages.length > limit; + const hasExtra = messages.length > limit; const topMessages = messages.slice(0, limit); return ( @@ -42,7 +42,7 @@ const CollectionSection: React.FC<{ {children} {label} {hasExtra && ( - From 4d573a85147128c36fcdca92f2c33eb2ed44c031 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Mon, 24 Oct 2022 10:14:17 +0200 Subject: [PATCH 43/66] chore: Upgrade @wireapp/core (#13951) --- package.json | 2 +- yarn.lock | 37 ++++++++++++++++++++++++------------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 55ce22353b0..7e922fc71db 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.4", "@wireapp/antiscroll-2": "1.3.1", "@wireapp/avs": "8.2.16", - "@wireapp/core": "34.1.1", + "@wireapp/core": "34.1.2", "@wireapp/react-ui-kit": "8.17.5", "@wireapp/store-engine-dexie": "1.7.11", "@wireapp/store-engine-sqleet": "1.8.9", diff --git a/yarn.lock b/yarn.lock index 142c1214888..c71bf91579a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4470,14 +4470,14 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^21.0.3": - version: 21.0.3 - resolution: "@wireapp/api-client@npm:21.0.3" +"@wireapp/api-client@npm:^21.0.4": + version: 21.0.4 + resolution: "@wireapp/api-client@npm:21.0.4" dependencies: "@wireapp/commons": ^4.4.10 "@wireapp/priority-queue": ^1.8.10 "@wireapp/protocol-messaging": 1.39.0 - axios: ^1.1.3 + axios: 1.1.2 axios-retry: 3.3.1 http-status-codes: 2.2.0 logdown: 3.3.1 @@ -4485,7 +4485,7 @@ __metadata: spark-md5: 3.0.2 tough-cookie: 4.1.2 ws: 8.9.0 - checksum: 384d87635fd64255e85447ab581f1167dab6b6251cbba8ef719dd41fa408ec82533bd1c8c49d86eaafa1ecaefac15a777a25accee628afee9da6b21a83a06afb + checksum: 1bf546e0f1c09495a70788e39a88d01ea1b0ce2e3ec0d0c7c9fb68710a938d2b262458a9c1dc2daf497404acd224ac9205c087fc643999e62b0030ce232051f8 languageName: node linkType: hard @@ -4538,18 +4538,18 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:34.1.1": - version: 34.1.1 - resolution: "@wireapp/core@npm:34.1.1" +"@wireapp/core@npm:34.1.2": + version: 34.1.2 + resolution: "@wireapp/core@npm:34.1.2" dependencies: - "@wireapp/api-client": ^21.0.3 + "@wireapp/api-client": ^21.0.4 "@wireapp/commons": ^4.4.10 "@wireapp/core-crypto": 0.5.2 "@wireapp/cryptobox": 12.8.0 "@wireapp/promise-queue": ^1.3.4 "@wireapp/protocol-messaging": 1.39.0 "@wireapp/store-engine-dexie": ^1.7.11 - axios: ^1.1.3 + axios: 1.1.2 bazinga64: 5.11.10 hash.js: 1.1.7 http-status-codes: 2.2.0 @@ -4557,7 +4557,7 @@ __metadata: logdown: 3.3.1 long: 4.0.0 uuidjs: 4.2.12 - checksum: 61b4f6dd7b46711372e49eab04c8a3340d89bea030f0be500a9af04d678ae4e4b71a2d28fb60ffbe37739eac9180786743d4d29749c8fb40f0907643ef656c12 + checksum: 2ed3a2170a0e2bd589edcedae4c1cb0777049f608c10cdf7b48cf002f94c785ce302fb48cb78c61c1ba142b87886dc54a0b79417fbb1c48055dbb061cffc73e0 languageName: node linkType: hard @@ -5414,7 +5414,18 @@ __metadata: languageName: node linkType: hard -"axios@npm:1.1.3, axios@npm:^1.1.3": +"axios@npm:1.1.2": + version: 1.1.2 + resolution: "axios@npm:1.1.2" + dependencies: + follow-redirects: ^1.15.0 + form-data: ^4.0.0 + proxy-from-env: ^1.1.0 + checksum: 136c25a5031aa2845fdbda3006c36888bbe351b11d1195f1f898a23c5df1430febbdb1ad034a61f27967e83762d5b5a3e851fff8a363cb4badeb883f8ff21461 + languageName: node + linkType: hard + +"axios@npm:1.1.3": version: 1.1.3 resolution: "axios@npm:1.1.3" dependencies: @@ -17720,7 +17731,7 @@ __metadata: "@wireapp/antiscroll-2": 1.3.1 "@wireapp/avs": 8.2.16 "@wireapp/copy-config": 1.3.10 - "@wireapp/core": 34.1.1 + "@wireapp/core": 34.1.2 "@wireapp/eslint-config": 1.12.12 "@wireapp/prettier-config": 0.4.7 "@wireapp/react-ui-kit": 8.17.5 From 8085493411ea69b0fa8be1af2552fcc435996aae Mon Sep 17 00:00:00 2001 From: Sebastian Willenborg Date: Mon, 24 Oct 2022 11:28:29 +0200 Subject: [PATCH 44/66] chore: bump used versions of minimatch (#13952) --- server/yarn.lock | 6 +++--- yarn.lock | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/yarn.lock b/server/yarn.lock index ff9a90b71ea..0f73bd41b44 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -4612,11 +4612,11 @@ __metadata: linkType: hard "minimatch@npm:^3.0.4": - version: 3.0.4 - resolution: "minimatch@npm:3.0.4" + version: 3.1.2 + resolution: "minimatch@npm:3.1.2" dependencies: brace-expansion: ^1.1.7 - checksum: 66ac295f8a7b59788000ea3749938b0970344c841750abd96694f80269b926ebcafad3deeb3f1da2522978b119e6ae3a5869b63b13a7859a456b3408bd18a078 + checksum: c154e566406683e7bcb746e000b84d74465b3a832c45d59912b9b55cd50dee66e5c4b1e5566dba26154040e51672f9aa450a9aef0c97cfc7336b78b7afb9540a languageName: node linkType: hard diff --git a/yarn.lock b/yarn.lock index c71bf91579a..f1e4a2bb903 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12311,11 +12311,11 @@ __metadata: linkType: hard "minimatch@npm:~3.0.2, minimatch@npm:~3.0.4": - version: 3.0.4 - resolution: "minimatch@npm:3.0.4" + version: 3.0.8 + resolution: "minimatch@npm:3.0.8" dependencies: brace-expansion: ^1.1.7 - checksum: 66ac295f8a7b59788000ea3749938b0970344c841750abd96694f80269b926ebcafad3deeb3f1da2522978b119e6ae3a5869b63b13a7859a456b3408bd18a078 + checksum: 850cca179cad715133132693e6963b0db64ab0988c4d211415b087fc23a3e46321e2c5376a01bf5623d8782aba8bdf43c571e2e902e51fdce7175c7215c29f8b languageName: node linkType: hard From 2bfdbf94d9fb8b2dce7abcb760aa47c933a52808 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 11:30:01 +0200 Subject: [PATCH 45/66] chore(deps): Bump crowdin/github-action from 1.4.15 to 1.4.16 (#13925) --- .github/workflows/sync_translations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync_translations.yml b/.github/workflows/sync_translations.yml index 3ec7de24c23..57e80756d58 100644 --- a/.github/workflows/sync_translations.yml +++ b/.github/workflows/sync_translations.yml @@ -34,7 +34,7 @@ jobs: run: yarn translate:merge - name: Download translations - uses: crowdin/github-action@1.4.15 + uses: crowdin/github-action@1.4.16 env: GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}} CROWDIN_PROJECT_ID: 342359 From 773846460c6f7670786a7d10fd74c02572e958a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 11:30:45 +0200 Subject: [PATCH 46/66] chore(deps): Bump wire-web-config-default-staging in /app-config (#13917) Bumps [wire-web-config-default-staging](https://github.com/wireapp/wire-web-config-default) from v0.31.4 to v0.31.8. - [Release notes](https://github.com/wireapp/wire-web-config-default/releases) - [Commits](https://github.com/wireapp/wire-web-config-default/compare/v0.31.4...195c8e4d84533d453ddd0e6be5f7647ae39e3956) --- updated-dependencies: - dependency-name: wire-web-config-default-staging dependency-type: direct:production ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app-config/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-config/package.json b/app-config/package.json index a7d743d1e3a..44420f3b498 100644 --- a/app-config/package.json +++ b/app-config/package.json @@ -1,6 +1,6 @@ { "dependencies": { "wire-web-config-default-master": "https://github.com/wireapp/wire-web-config-wire#v0.31.5-0", - "wire-web-config-default-staging": "https://github.com/wireapp/wire-web-config-default#v0.31.4" + "wire-web-config-default-staging": "https://github.com/wireapp/wire-web-config-default#v0.31.8" } } From e1d8d77958033d3e1d6e1720cdd3040a4d4601cc Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Mon, 24 Oct 2022 11:31:14 +0200 Subject: [PATCH 47/66] refactor: Use @wireapp/core for generating fingerprints [FS-1101] (#13918) --- .../userDevices/SelfFingerprint.tsx | 5 +- .../CryptographyRepository.test.ts | 58 ------------ .../cryptography/CryptographyRepository.ts | 89 ++----------------- .../cryptography/CryptographyService.ts | 50 ----------- src/script/main/app.ts | 3 +- .../devices/DeviceDetailsPreferences.tsx | 8 +- src/script/util/DebugUtil.ts | 4 +- test/helper/TestFactory.js | 5 +- 8 files changed, 20 insertions(+), 202 deletions(-) delete mode 100644 src/script/cryptography/CryptographyRepository.test.ts delete mode 100644 src/script/cryptography/CryptographyService.ts diff --git a/src/script/components/userDevices/SelfFingerprint.tsx b/src/script/components/userDevices/SelfFingerprint.tsx index 8025da36933..ca572ce7a29 100644 --- a/src/script/components/userDevices/SelfFingerprint.tsx +++ b/src/script/components/userDevices/SelfFingerprint.tsx @@ -42,7 +42,10 @@ const SelfFingerprint: React.FC = ({ noPadding, clientState = container.resolve(ClientState), }) => { - const fingerprintLocal = useMemo(() => cryptographyRepository.getLocalFingerprint(), []); + const fingerprintLocal = useMemo( + () => cryptographyRepository.getLocalFingerprint(), + [cryptographyRepository], + ); const {currentClient} = useKoSubscribableChildren(clientState, ['currentClient']); return ( diff --git a/src/script/cryptography/CryptographyRepository.test.ts b/src/script/cryptography/CryptographyRepository.test.ts deleted file mode 100644 index 29ae62dd0b4..00000000000 --- a/src/script/cryptography/CryptographyRepository.test.ts +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Wire - * Copyright (C) 2018 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - */ - -import {TestFactory} from '../../../test/helper/TestFactory'; -import {Cryptobox} from '@wireapp/cryptobox'; -import {CryptographyRepository} from './CryptographyRepository'; -import {CryptographyService} from './CryptographyService'; -import {container} from 'tsyringe'; -import {Core} from '../service/CoreSingleton'; - -describe('CryptographyRepository', () => { - const testFactory = new TestFactory(); - let cryptographyRepository: CryptographyRepository; - - beforeEach(async () => { - const storage = await testFactory.exposeStorageActors(); - const storeEngine = storage.storageService['engine']; - const cryptobox = new Cryptobox(storeEngine, 10); - await cryptobox.create(); - const core = container.resolve(Core); - core.service = { - cryptography: {constructSessionId: jest.fn(() => 'user-id@device-id'), cryptobox}, - } as any; - const cryptographyService = new CryptographyService(); - cryptographyRepository = new CryptographyRepository(cryptographyService, core); - }); - - describe('getRemoteFingerprint', () => { - it('generates the remote fingerprint based on a prekey', async () => { - const userId = {domain: '', id: '6f656da7-0c52-44d1-959d-ddc9fbdca244'}; - const clientId = '689ce2df236eb2be'; - const preKey = { - id: 3, - key: 'pQABAQMCoQBYIFycSfcOATSpOIkJz8ntEnFAZ+YWtzVaJ7RLeDAqGU+0A6EAoQBYIMEJnklbfFFvnFC41rmjDMqx6L0oVX5RMab3uGwBgbkaBPY=', - }; - const fingerprint = await cryptographyRepository.getRemoteFingerprint(userId, clientId, preKey); - - // eslint-disable-next-line - expect(fingerprint).toEqual('c1099e495b7c516f9c50b8d6b9a30ccab1e8bd28557e5131a6f7b86c0181b91a'); - }); - }); -}); diff --git a/src/script/cryptography/CryptographyRepository.ts b/src/script/cryptography/CryptographyRepository.ts index 4f93b73db13..f070c4ea7bc 100644 --- a/src/script/cryptography/CryptographyRepository.ts +++ b/src/script/cryptography/CryptographyRepository.ts @@ -18,16 +18,11 @@ */ import type {QualifiedId} from '@wireapp/api-client/src/user/'; -import {CryptoboxSession} from '@wireapp/cryptobox'; import type {PreKey as BackendPreKey} from '@wireapp/api-client/src/auth/'; -import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; import {getLogger, Logger} from 'Util/Logger'; -import {base64ToArray} from 'Util/util'; import {CryptographyMapper} from './CryptographyMapper'; -import {UserError} from '../error/UserError'; -import type {CryptographyService} from './CryptographyService'; import {container} from 'tsyringe'; import {Core} from '../service/CoreSingleton'; @@ -46,19 +41,16 @@ export class CryptographyRepository { cryptographyMapper: CryptographyMapper; logger: Logger; - constructor( - private readonly cryptographyService: CryptographyService, - private readonly core = container.resolve(Core), - ) { + constructor(private readonly core = container.resolve(Core)) { this.logger = getLogger('CryptographyRepository'); this.cryptographyMapper = new CryptographyMapper(); } - get cryptobox() { + get cryptographyService() { if (!this.core.service) { throw new Error('Core is not initiated'); } - return this.core.service!.cryptography.cryptobox; + return this.core.service!.cryptography; } /** @@ -66,7 +58,7 @@ export class CryptographyRepository { * @returns Fingerprint of local identity public key */ getLocalFingerprint(): string { - return this.cryptobox.getIdentity().public_key.fingerprint(); + return this.cryptographyService.getLocalFingerprint(); } /** @@ -76,78 +68,13 @@ export class CryptographyRepository { * @param preKey PreKey to initialize a session from * @returns Resolves with the remote fingerprint */ - async getRemoteFingerprint( - userId: QualifiedId, - clientId: string, - preKey?: BackendPreKey, - ): Promise { - const cryptoboxSession = preKey - ? await this.createSessionFromPreKey(preKey, userId, clientId) - : await this.loadSession(userId, clientId); - return cryptoboxSession ? cryptoboxSession.fingerprint_remote() : undefined; - } - - /** - * Get a pre-key for the given client of the user. - * - * @param userId User ID - * @param clientId Client ID - * @returns Resolves with a map of pre-keys for the requested clients - */ - private getUserPreKeyByIds(userId: QualifiedId, clientId: string): Promise { - return this.cryptographyService - .getUserPreKeyByIds(userId, clientId) - .then(response => response.prekey) - .catch(error => { - const isNotFound = error.code === HTTP_STATUS.NOT_FOUND; - if (isNotFound) { - throw new UserError(UserError.TYPE.PRE_KEY_NOT_FOUND, UserError.MESSAGE.PRE_KEY_NOT_FOUND); - } - - this.logger.error(`Failed to get pre-key from backend: ${error.message}`); - throw new UserError(UserError.TYPE.REQUEST_FAILURE, UserError.MESSAGE.REQUEST_FAILURE); - }); - } - - private loadSession(userId: QualifiedId, clientId: string): Promise { - const sessionId = this.core.service!.cryptography.constructSessionId(userId, clientId); - - return this.cryptobox.session_load(sessionId).catch(() => { - return this.getUserPreKeyByIds(userId, clientId).then(preKey => { - return this.createSessionFromPreKey(preKey, userId, clientId); - }); - }); + async getRemoteFingerprint(userId: QualifiedId, clientId: string, prekey?: BackendPreKey) { + return this.cryptographyService.getRemoteFingerprint(userId, clientId, prekey); } async deleteSession(userId: QualifiedId, clientId: string): Promise { - const sessionId = this.core.service!.cryptography.constructSessionId(userId, clientId); - await this.core.service!.cryptography.resetSession(sessionId); + const sessionId = this.cryptographyService.constructSessionId(userId, clientId); + await this.cryptographyService.resetSession(sessionId); return sessionId; } - - private async createSessionFromPreKey( - preKey: BackendPreKey, - {id: userId, domain}: QualifiedId, - clientId: string, - ): Promise { - try { - const domainText = domain ? ` on domain \'${domain}\'` : ' without domain'; - if (!preKey) { - this.logger.warn( - `No pre-key for user '${userId}' ('${clientId}'${domainText}) found. The client might have been deleted.`, - ); - } else { - this.logger.log( - `Initializing session with user '${userId}' (${clientId}${domainText}) with pre-key ID '${preKey.id}'.`, - ); - const sessionId = this.core.service!.cryptography.constructSessionId({domain, id: userId}, clientId); - const preKeyArray = base64ToArray(preKey.key); - return await this.cryptobox.session_from_prekey(sessionId, preKeyArray.buffer); - } - } catch (error) { - const errorMessage = error instanceof Error ? error.message : error; - const message = `Pre-key for user '${userId}' ('${clientId}') invalid. Skipping encryption: ${errorMessage}`; - this.logger.warn(message, error); - } - } } diff --git a/src/script/cryptography/CryptographyService.ts b/src/script/cryptography/CryptographyService.ts deleted file mode 100644 index 7abdb9a4a50..00000000000 --- a/src/script/cryptography/CryptographyService.ts +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Wire - * Copyright (C) 2018 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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. - * - */ - -import type {ClientPreKey, PreKey} from '@wireapp/api-client/src/auth/'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; -import {APIClient} from '../service/APIClientSingleton'; -import {container} from 'tsyringe'; - -export class CryptographyService { - constructor(private readonly apiClient = container.resolve(APIClient)) {} - - /** - * Gets a pre-key for a client of a user. - * @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/users/getPrekey - * - * @param userId User ID - * @param clientId Client ID - * @returns Resolves with a pre-key for given the client of the user - */ - getUserPreKeyByIds(userId: QualifiedId, clientId: string): Promise { - return this.apiClient.api.user.getClientPreKey(userId, clientId); - } - - /** - * Put pre-keys for client to be used by remote clients for session initialization. - * - * @param clientId Local client ID - * @param serializedPreKeys Additional pre-keys to be made available - * @returns Resolves once the pre-keys are accepted - */ - putClientPreKeys(clientId: string, serializedPreKeys: PreKey[]): Promise { - return this.apiClient.api.client.putClient(clientId, {prekeys: serializedPreKeys}); - } -} diff --git a/src/script/main/app.ts b/src/script/main/app.ts index f4072dab88d..11afc442ef9 100644 --- a/src/script/main/app.ts +++ b/src/script/main/app.ts @@ -109,7 +109,6 @@ import {ClientService} from '../client/ClientService'; import {ConnectionService} from '../connection/ConnectionService'; import {TeamService} from '../team/TeamService'; import {SearchService} from '../search/SearchService'; -import {CryptographyService} from '../cryptography/CryptographyService'; import {AccessTokenError, ACCESS_TOKEN_ERROR_TYPE} from '../error/AccessTokenError'; import {ClientError, CLIENT_ERROR_TYPE} from '../error/ClientError'; import {AuthError} from '../error/AuthError'; @@ -231,7 +230,7 @@ class App { repositories.serverTime = serverTimeHandler; repositories.storage = new StorageRepository(); - repositories.cryptography = new CryptographyRepository(new CryptographyService()); + repositories.cryptography = new CryptographyRepository(); repositories.client = new ClientRepository(new ClientService(), repositories.cryptography, repositories.storage); repositories.media = new MediaRepository(new PermissionRepository()); repositories.audio = new AudioRepository(repositories.media.devicesHandler); diff --git a/src/script/page/MainContent/panels/preferences/devices/DeviceDetailsPreferences.tsx b/src/script/page/MainContent/panels/preferences/devices/DeviceDetailsPreferences.tsx index 9864b9cac1f..b4239831c42 100644 --- a/src/script/page/MainContent/panels/preferences/devices/DeviceDetailsPreferences.tsx +++ b/src/script/page/MainContent/panels/preferences/devices/DeviceDetailsPreferences.tsx @@ -28,7 +28,7 @@ import {Button, ButtonVariant} from '@wireapp/react-ui-kit'; interface DevicesPreferencesProps { device: ClientEntity; - getFingerprint: (device: ClientEntity) => Promise; + getFingerprint: (device: ClientEntity) => Promise; onClose: () => void; onRemove: (device: ClientEntity) => void; onResetSession: (device: ClientEntity) => Promise; @@ -51,7 +51,7 @@ const DeviceDetailsPreferences: React.FC = ({ }) => { const {isVerified} = useKoSubscribableChildren(device.meta, ['isVerified']); const [resetState, setResetState] = useState(SessionResetState.RESET); - const [fingerprint, setFingerprint] = useState(''); + const [fingerprint, setFingerprint] = useState(); const brandName = Config.getConfig().BRAND_NAME; const resetSession = async () => { @@ -63,7 +63,7 @@ const DeviceDetailsPreferences: React.FC = ({ useEffect(() => { getFingerprint(device).then(setFingerprint); - }, []); + }, [device, getFingerprint]); return (
= ({ aria-label={t('accessibility.preferencesDeviceDetails.goBack')} /> - +
{ const qualifiedId = isQualifiedId(userId) ? userId : {domain: '', id: userId}; const sessionId = this.core.service!.cryptography.constructSessionId(qualifiedId, clientId); - const cryptobox = this.cryptographyRepository.cryptobox; + const cryptobox = this.cryptographyRepository.cryptographyService.cryptobox; const cryptoboxSession = await cryptobox.session_load(sessionId); cryptoboxSession.session.session_states = {}; @@ -249,7 +249,7 @@ export class DebugUtil { const clientId = this.clientState.currentClient().id; const userId = this.userState.self().id; const fileName = `cryptobox-${userId}-${clientId}.json`; - const cryptobox = await this.cryptographyRepository.cryptobox.serialize(); + const cryptobox = await this.cryptographyRepository.cryptographyService.cryptobox.serialize(); downloadText(JSON.stringify(cryptobox), fileName); } diff --git a/test/helper/TestFactory.js b/test/helper/TestFactory.js index b2abd69bd48..0de4b082d83 100644 --- a/test/helper/TestFactory.js +++ b/test/helper/TestFactory.js @@ -44,7 +44,6 @@ import {NotificationService} from 'src/script/event/NotificationService'; import {ConnectionService} from 'src/script/connection/ConnectionService'; import {ConnectionRepository} from 'src/script/connection/ConnectionRepository'; import {CryptographyRepository} from 'src/script/cryptography/CryptographyRepository'; -import {CryptographyService} from 'src/script/cryptography/CryptographyService'; import {TeamRepository} from 'src/script/team/TeamRepository'; import {SearchRepository} from 'src/script/search/SearchRepository'; import {ConversationService} from 'src/script/conversation/ConversationService'; @@ -117,9 +116,7 @@ export class TestFactory { await this.exposeStorageActors(); const currentClient = new ClientEntity(true, null); currentClient.id = entities.clients.john_doe.permanent.id; - this.cryptography_service = new CryptographyService(); - - this.cryptography_repository = new CryptographyRepository(this.cryptography_service); + this.cryptography_repository = new CryptographyRepository(); return this.cryptography_repository; } From 22aef7fd87f493f9bebd21a2fe971e905932df47 Mon Sep 17 00:00:00 2001 From: Sebastian Willenborg Date: Mon, 24 Oct 2022 11:37:20 +0200 Subject: [PATCH 48/66] Revert "chore(deps): Bump cakeinpanic/jira-description-action from 0.3.2 to 1.2 (#12865)" (#13953) This reverts commit 4678e30a4d6f5d390af387a3a5b57cf3fa043ba1. --- .github/workflows/jira-lint-and-link.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/jira-lint-and-link.yml b/.github/workflows/jira-lint-and-link.yml index 9fdf954745b..dd1ebd48622 100644 --- a/.github/workflows/jira-lint-and-link.yml +++ b/.github/workflows/jira-lint-and-link.yml @@ -6,10 +6,11 @@ jobs: add-jira-description: runs-on: ubuntu-latest steps: - - uses: cakeinpanic/jira-description-action@v1.2 + - uses: cakeinpanic/jira-description-action@v0.3.2 name: jira-description-action with: github-token: ${{ secrets.GITHUB_TOKEN }} jira-token: ${{ secrets.JIRA_TOKEN }} jira-base-url: https://wearezeta.atlassian.net skip-branches: '^(production-release|main|master|release\/v\d+)$' #optional + fail-when-jira-issue-not-found: false From b1fe0e25808af9a4f88ca0f8e5d2ceae9a9e8fa1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 12:02:34 +0200 Subject: [PATCH 49/66] chore(deps): Bump wire-web-config-default-master in /app-config (#13916) --- app-config/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-config/package.json b/app-config/package.json index 44420f3b498..abf74f2082f 100644 --- a/app-config/package.json +++ b/app-config/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "wire-web-config-default-master": "https://github.com/wireapp/wire-web-config-wire#v0.31.5-0", + "wire-web-config-default-master": "https://github.com/wireapp/wire-web-config-wire#v0.31.9-0", "wire-web-config-default-staging": "https://github.com/wireapp/wire-web-config-default#v0.31.8" } } From 21c5f594640e087ee876a331290550b97b47dd56 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Mon, 24 Oct 2022 13:49:11 +0200 Subject: [PATCH 50/66] chore: Add docker image generation job (#13954) --- .github/workflows/create_docker_image.yml | 45 +++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/create_docker_image.yml diff --git a/.github/workflows/create_docker_image.yml b/.github/workflows/create_docker_image.yml new file mode 100644 index 00000000000..2d3810ff187 --- /dev/null +++ b/.github/workflows/create_docker_image.yml @@ -0,0 +1,45 @@ +name: Create Docker image + +on: + workflow_dispatch: + tag: + description: 'tagname for the Docker image' + required: true + type: string + +concurrency: + group: ci-${{ github.ref }} + cancel-in-progress: true + +jobs: + test_build_deploy: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Use latest Node.js v16 + uses: actions/setup-node@v3 + with: + node-version: 16.x + + - name: Yarn cache + uses: c-hive/gha-yarn-cache@v2.1.0 + + - name: Install JS dependencies + run: yarn --immutable + + - name: Test + run: yarn test --coverage --coverage-reporters=lcov --detectOpenHandles=false + + - name: Build + run: yarn build:prod + + - name: Push Docker image + env: + DOCKER_PASSWORD: ${{secrets.WEBTEAM_QUAY_PASSWORD}} + DOCKER_USERNAME: ${{secrets.WEBTEAM_QUAY_USERNAME}} + run: yarn docker '' "${{input.tag}}" From 5407cb9b0289fe6ee270ef50cd5f8e73757b578d Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Mon, 24 Oct 2022 14:03:21 +0200 Subject: [PATCH 51/66] chore: Fix docker image creation job --- .github/workflows/create_docker_image.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/create_docker_image.yml b/.github/workflows/create_docker_image.yml index 2d3810ff187..d58321961fc 100644 --- a/.github/workflows/create_docker_image.yml +++ b/.github/workflows/create_docker_image.yml @@ -2,10 +2,11 @@ name: Create Docker image on: workflow_dispatch: - tag: - description: 'tagname for the Docker image' - required: true - type: string + inputs: + tag: + description: 'tagname for the Docker image' + required: true + type: string concurrency: group: ci-${{ github.ref }} From c07d33120fa1ab02eda5e1546050c4c44f934893 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Mon, 24 Oct 2022 14:06:50 +0200 Subject: [PATCH 52/66] chore: More docker image build fix --- .github/workflows/create_docker_image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_docker_image.yml b/.github/workflows/create_docker_image.yml index d58321961fc..f58f35d88eb 100644 --- a/.github/workflows/create_docker_image.yml +++ b/.github/workflows/create_docker_image.yml @@ -43,4 +43,4 @@ jobs: env: DOCKER_PASSWORD: ${{secrets.WEBTEAM_QUAY_PASSWORD}} DOCKER_USERNAME: ${{secrets.WEBTEAM_QUAY_USERNAME}} - run: yarn docker '' "${{input.tag}}" + run: yarn docker '' "${{inputs.tag}}" From 5fe6f661c08e533fb5da600155a17b1b31166660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20G=C3=B3rka?= Date: Mon, 24 Oct 2022 14:40:55 +0200 Subject: [PATCH 53/66] runfix: audio file previews don't match on sender and receiver side (#13958) --- src/script/cryptography/CryptographyMapper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script/cryptography/CryptographyMapper.ts b/src/script/cryptography/CryptographyMapper.ts index 45732fcb670..fb36561172a 100644 --- a/src/script/cryptography/CryptographyMapper.ts +++ b/src/script/cryptography/CryptographyMapper.ts @@ -361,7 +361,7 @@ export class CryptographyMapper { _mapAssetMetaData(original: Asset.IOriginal): MappedAssetMetaData | undefined { const audioData = original.audio; if (audioData) { - const loudnessArray = audioData.normalizedLoudness ? audioData.normalizedLoudness.buffer : new ArrayBuffer(0); + const loudnessArray = audioData.normalizedLoudness || new ArrayBuffer(0); const durationInSeconds = audioData.durationInMillis ? Number(audioData.durationInMillis) / TIME_IN_MILLIS.SECOND : 0; From 8700bb5159da6c630bc7fc63cde8ea99c2ef9f82 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Mon, 24 Oct 2022 17:59:41 +0200 Subject: [PATCH 54/66] runfix: Pass messageId when creating message edit (#13961) This allows the linkPreview system to overwrite the message in case a link preview comes in --- src/script/conversation/MessageRepository.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/script/conversation/MessageRepository.ts b/src/script/conversation/MessageRepository.ts index 25653e76c7a..60468156568 100644 --- a/src/script/conversation/MessageRepository.ts +++ b/src/script/conversation/MessageRepository.ts @@ -272,6 +272,7 @@ export class MessageRepository { conversation, {mentions, quote}, ), + messageId, ); return this.sendAndInjectMessage(editMessage, conversation, {syncTimestamp: false}); From 425c03187e499d2c82470a5607979234c7666387 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Mon, 24 Oct 2022 18:10:43 +0200 Subject: [PATCH 55/66] chore: upgrade @wireapp/core (#13962) --- package.json | 2 +- yarn.lock | 81 +++++++++++++++++++++++++++++----------------------- 2 files changed, 47 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index 7e922fc71db..c4b932deff3 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.4", "@wireapp/antiscroll-2": "1.3.1", "@wireapp/avs": "8.2.16", - "@wireapp/core": "34.1.2", + "@wireapp/core": "34.1.4", "@wireapp/react-ui-kit": "8.17.5", "@wireapp/store-engine-dexie": "1.7.11", "@wireapp/store-engine-sqleet": "1.8.9", diff --git a/yarn.lock b/yarn.lock index f1e4a2bb903..8d0661385c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4470,12 +4470,12 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^21.0.4": - version: 21.0.4 - resolution: "@wireapp/api-client@npm:21.0.4" +"@wireapp/api-client@npm:^21.0.5": + version: 21.0.5 + resolution: "@wireapp/api-client@npm:21.0.5" dependencies: - "@wireapp/commons": ^4.4.10 - "@wireapp/priority-queue": ^1.8.10 + "@wireapp/commons": ^4.5.0 + "@wireapp/priority-queue": ^1.8.11 "@wireapp/protocol-messaging": 1.39.0 axios: 1.1.2 axios-retry: 3.3.1 @@ -4485,7 +4485,7 @@ __metadata: spark-md5: 3.0.2 tough-cookie: 4.1.2 ws: 8.9.0 - checksum: 1bf546e0f1c09495a70788e39a88d01ea1b0ce2e3ec0d0c7c9fb68710a938d2b262458a9c1dc2daf497404acd224ac9205c087fc643999e62b0030ce232051f8 + checksum: 3fc618b461fdb8cd37ca6cccc40eb73d0a325cc28993002b83e77713ee2e07f31fbd4f2a8951360377625581d6e6d4d1391a11fbb9bbe6bc1c818388fa3b1430 languageName: node linkType: hard @@ -4503,15 +4503,15 @@ __metadata: languageName: node linkType: hard -"@wireapp/commons@npm:^4.4.10": - version: 4.4.10 - resolution: "@wireapp/commons@npm:4.4.10" +"@wireapp/commons@npm:^4.5.0": + version: 4.5.0 + resolution: "@wireapp/commons@npm:4.5.0" dependencies: ansi-regex: 5.0.1 fs-extra: 10.1.0 logdown: 3.3.1 platform: 1.3.6 - checksum: c026b91caffbf8c2abf929abb4e62c33684a1c3bbcde7d6f6164d60a80ce7507969921965fc477145c127eff1b1e3f4d7072f9821c08b8d6cecd9a474894f169 + checksum: 8dc0e8cd599a4e581a87bf1b4abe484b6af2bee28ff6e9bd174a2256eadd51dd509b3946e2d01ce9af4d068494bc1ff81703947639510b3752a68bc223616f69 languageName: node linkType: hard @@ -4538,26 +4538,26 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:34.1.2": - version: 34.1.2 - resolution: "@wireapp/core@npm:34.1.2" +"@wireapp/core@npm:34.1.4": + version: 34.1.4 + resolution: "@wireapp/core@npm:34.1.4" dependencies: - "@wireapp/api-client": ^21.0.4 - "@wireapp/commons": ^4.4.10 + "@wireapp/api-client": ^21.0.5 + "@wireapp/commons": ^4.5.0 "@wireapp/core-crypto": 0.5.2 "@wireapp/cryptobox": 12.8.0 - "@wireapp/promise-queue": ^1.3.4 - "@wireapp/protocol-messaging": 1.39.0 - "@wireapp/store-engine-dexie": ^1.7.11 + "@wireapp/promise-queue": ^1.3.5 + "@wireapp/protocol-messaging": ^1.39.0 + "@wireapp/store-engine-dexie": ^1.7.12 axios: 1.1.2 - bazinga64: 5.11.10 + bazinga64: 5.11.11 hash.js: 1.1.7 http-status-codes: 2.2.0 idb: 7.1.0 logdown: 3.3.1 long: 4.0.0 uuidjs: 4.2.12 - checksum: 2ed3a2170a0e2bd589edcedae4c1cb0777049f608c10cdf7b48cf002f94c785ce302fb48cb78c61c1ba142b87886dc54a0b79417fbb1c48055dbb061cffc73e0 + checksum: d6e34adf52bbc332b4693f7911baf93820f5e03ee81d006e6a0e169075bf54831ba167a99bee0f104f60b0ab526f392efd1ce88a30c798cb3ec249938381fb7a languageName: node linkType: hard @@ -4619,17 +4619,17 @@ __metadata: languageName: node linkType: hard -"@wireapp/priority-queue@npm:^1.8.10": - version: 1.8.10 - resolution: "@wireapp/priority-queue@npm:1.8.10" - checksum: d4c262ba5df33a43491f073b43e49157bb506ca2bee24afa1b137be89f044219265891bdec7d7404b455c68da886577d6c14b63581561b90486bf4d5c256d04e +"@wireapp/priority-queue@npm:^1.8.11": + version: 1.8.11 + resolution: "@wireapp/priority-queue@npm:1.8.11" + checksum: 246d9905425d463c7fb055d3a3ee1d3588e3908570cf3d73ebfaad2b92b1408f04d9a45502448ea08d1524f4be3a91805f3cbba3b80994758a74c055077aa42d languageName: node linkType: hard -"@wireapp/promise-queue@npm:^1.3.4": - version: 1.3.4 - resolution: "@wireapp/promise-queue@npm:1.3.4" - checksum: b46a6613392278075319af062273551819c1e65024cc59eae86f92fdef03e78cb2a65ff44fbb44120c8164c87e1fbfeb1da6369a808f43955cad86c6439a8731 +"@wireapp/promise-queue@npm:^1.3.5": + version: 1.3.5 + resolution: "@wireapp/promise-queue@npm:1.3.5" + checksum: 35a687cfd3a8a2e4827f762ff938dd83437ecc27175014270ab9985ce40b4ef5253aae0f8062ca0e1dd65abe5e7dac50da4281e93f037fed881a381095f978b3 languageName: node linkType: hard @@ -4645,7 +4645,7 @@ __metadata: languageName: node linkType: hard -"@wireapp/protocol-messaging@npm:1.39.0": +"@wireapp/protocol-messaging@npm:1.39.0, @wireapp/protocol-messaging@npm:^1.39.0": version: 1.39.0 resolution: "@wireapp/protocol-messaging@npm:1.39.0" dependencies: @@ -4675,7 +4675,7 @@ __metadata: languageName: node linkType: hard -"@wireapp/store-engine-dexie@npm:1.7.11, @wireapp/store-engine-dexie@npm:^1.7.11": +"@wireapp/store-engine-dexie@npm:1.7.11": version: 1.7.11 resolution: "@wireapp/store-engine-dexie@npm:1.7.11" dependencies: @@ -4686,6 +4686,17 @@ __metadata: languageName: node linkType: hard +"@wireapp/store-engine-dexie@npm:^1.7.12": + version: 1.7.12 + resolution: "@wireapp/store-engine-dexie@npm:1.7.12" + dependencies: + dexie: 3.2.2 + peerDependencies: + "@wireapp/store-engine": 4.x.x + checksum: 6b866b90cdaef7cd718970c940aedb0b25ce01bcf0bedc266a3232c8741f6835f13c3d0358bc1ea32c2a88e3dc2bf10bdc6bfcea2bc4c18da5cdcb003e831b33 + languageName: node + linkType: hard + "@wireapp/store-engine-sqleet@npm:1.8.9": version: 1.8.9 resolution: "@wireapp/store-engine-sqleet@npm:1.8.9" @@ -5627,10 +5638,10 @@ __metadata: languageName: node linkType: hard -"bazinga64@npm:5.11.10": - version: 5.11.10 - resolution: "bazinga64@npm:5.11.10" - checksum: c4a7b822223382e536df7589fec26ceaa9d1884bc70101c0cb0e8d89b515a7bd2ea59afc16510c75d985b4f92561af961ee7612037fd987b1752de2e59ffcb33 +"bazinga64@npm:5.11.11": + version: 5.11.11 + resolution: "bazinga64@npm:5.11.11" + checksum: dd490fb39e23a7332b24a1d383a2b340427ebfec2b563219b853fde6fdcdd6d66dc6dade339474cc8554626445f4306f10c9b6d0c60393f297d5d3a8b432f477 languageName: node linkType: hard @@ -17731,7 +17742,7 @@ __metadata: "@wireapp/antiscroll-2": 1.3.1 "@wireapp/avs": 8.2.16 "@wireapp/copy-config": 1.3.10 - "@wireapp/core": 34.1.2 + "@wireapp/core": 34.1.4 "@wireapp/eslint-config": 1.12.12 "@wireapp/prettier-config": 0.4.7 "@wireapp/react-ui-kit": 8.17.5 From 5045b43f7f44c4aa9319855beda550f8f8e7d81c Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Mon, 24 Oct 2022 18:49:41 +0200 Subject: [PATCH 56/66] chore: Simplify babel config (#13963) --- babel.config.js | 16 +- package.json | 4 - yarn.lock | 1141 +++-------------------------------------------- 3 files changed, 61 insertions(+), 1100 deletions(-) diff --git a/babel.config.js b/babel.config.js index aafb3a9c225..0d80c6df2fc 100644 --- a/babel.config.js +++ b/babel.config.js @@ -30,12 +30,7 @@ const presetEnvConfig = { module.exports = { env: { test: { - plugins: [ - '@babel/plugin-proposal-class-properties', - '@babel/plugin-proposal-nullish-coalescing-operator', - '@babel/plugin-proposal-optional-chaining', - '@emotion', - ], + plugins: ['@emotion'], presets: [ ['@babel/preset-react', {importSource: '@emotion/react', runtime: 'automatic'}], '@babel/preset-typescript', @@ -43,14 +38,7 @@ module.exports = { ], }, }, - plugins: [ - ['@babel/plugin-proposal-decorators', {legacy: true}], - '@babel/plugin-proposal-class-properties', - '@babel/plugin-proposal-nullish-coalescing-operator', - '@babel/plugin-proposal-optional-chaining', - '@babel/plugin-syntax-dynamic-import', - '@emotion', - ], + plugins: [['@babel/plugin-proposal-decorators', {legacy: true}], '@emotion'], presets: [ ['@babel/preset-react', {importSource: '@emotion/react', runtime: 'automatic'}], '@babel/preset-typescript', diff --git a/package.json b/package.json index c4b932deff3..5e1bc9766f6 100644 --- a/package.json +++ b/package.json @@ -52,11 +52,7 @@ "devDependencies": { "@babel/core": "7.19.6", "@babel/eslint-parser": "7.19.1", - "@babel/plugin-proposal-class-properties": "7.18.6", "@babel/plugin-proposal-decorators": "7.19.6", - "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6", - "@babel/plugin-proposal-optional-chaining": "7.18.9", - "@babel/plugin-syntax-dynamic-import": "7.8.3", "@babel/preset-env": "7.19.4", "@babel/preset-react": "7.18.6", "@babel/preset-typescript": "7.18.6", diff --git a/yarn.lock b/yarn.lock index 8d0661385c6..89edba9f6d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -36,21 +36,14 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.18.8, @babel/compat-data@npm:^7.19.3": - version: 7.19.3 - resolution: "@babel/compat-data@npm:7.19.3" - checksum: e6014cdb31f3e893a1bde6dd3ae05c8f946778318fa337b18b546ace6f9c9f7a5033fd9447070ebc8e820fa9fc7e0a30d4e354989e091900305a876b44346c8f - languageName: node - linkType: hard - -"@babel/compat-data@npm:^7.19.4": +"@babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.19.3, @babel/compat-data@npm:^7.19.4": version: 7.19.4 resolution: "@babel/compat-data@npm:7.19.4" checksum: 757fdaeb6756c2d323ff56f60fb8e670292108cda6abf762a56c0d40910ecc4d2c7e283dbdfbcee6bc28c74ad659144352609e1cb49d31e101ab13ea5ce90072 languageName: node linkType: hard -"@babel/core@npm:7.19.6": +"@babel/core@npm:7.19.6, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3": version: 7.19.6 resolution: "@babel/core@npm:7.19.6" dependencies: @@ -73,29 +66,6 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3": - version: 7.19.3 - resolution: "@babel/core@npm:7.19.3" - dependencies: - "@ampproject/remapping": ^2.1.0 - "@babel/code-frame": ^7.18.6 - "@babel/generator": ^7.19.3 - "@babel/helper-compilation-targets": ^7.19.3 - "@babel/helper-module-transforms": ^7.19.0 - "@babel/helpers": ^7.19.0 - "@babel/parser": ^7.19.3 - "@babel/template": ^7.18.10 - "@babel/traverse": ^7.19.3 - "@babel/types": ^7.19.3 - convert-source-map: ^1.7.0 - debug: ^4.1.0 - gensync: ^1.0.0-beta.2 - json5: ^2.2.1 - semver: ^6.3.0 - checksum: dd883311209ad5a2c65b227daeb7247d90a382c50f4c6ad60c5ee40927eb39c34f0690d93b775c0427794261b72fa8f9296589a2dbda0782366a9f1c6de00c08 - languageName: node - linkType: hard - "@babel/eslint-parser@npm:7.19.1": version: 7.19.1 resolution: "@babel/eslint-parser@npm:7.19.1" @@ -110,18 +80,7 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.19.3, @babel/generator@npm:^7.7.2": - version: 7.19.3 - resolution: "@babel/generator@npm:7.19.3" - dependencies: - "@babel/types": ^7.19.3 - "@jridgewell/gen-mapping": ^0.3.2 - jsesc: ^2.5.1 - checksum: b1585e398f6c37f442a2fdac964a326b348fbc8fb99a6aaf4f72bbe993adb0ca792bc0a9c65e59930b2a2e55eb5aa3aab360ceb678d3d40692eb0cda2b7b6aa6 - languageName: node - linkType: hard - -"@babel/generator@npm:^7.19.6": +"@babel/generator@npm:^7.19.6, @babel/generator@npm:^7.7.2": version: 7.19.6 resolution: "@babel/generator@npm:7.19.6" dependencies: @@ -182,19 +141,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-create-regexp-features-plugin@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-create-regexp-features-plugin@npm:7.18.6" - dependencies: - "@babel/helper-annotate-as-pure": ^7.18.6 - regexpu-core: ^5.1.0 - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 2d76e660cbfd0bfcb01ca9f177f0e9091c871a6b99f68ece6bcf4ab4a9df073485bdc2d87ecdfbde44b7f3723b26d13085d0f92082adb3ae80d31b246099f10a - languageName: node - linkType: hard - -"@babel/helper-create-regexp-features-plugin@npm:^7.19.0": +"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.19.0": version: 7.19.0 resolution: "@babel/helper-create-regexp-features-plugin@npm:7.19.0" dependencies: @@ -222,13 +169,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-environment-visitor@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-environment-visitor@npm:7.18.6" - checksum: 64fce65a26efb50d2496061ab2de669dc4c42175a8e05c82279497127e5c542538ed22b38194f6f5a4e86bed6ef5a4890aed23408480db0555728b4ca660fc9c - languageName: node - linkType: hard - "@babel/helper-environment-visitor@npm:^7.18.9": version: 7.18.9 resolution: "@babel/helper-environment-visitor@npm:7.18.9" @@ -245,27 +185,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-function-name@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-function-name@npm:7.18.6" - dependencies: - "@babel/template": ^7.18.6 - "@babel/types": ^7.18.6 - checksum: bf84c2e0699aa07c3559d4262d199d4a9d0320037c2932efe3246866c3e01ce042c9c2131b5db32ba2409a9af01fb468171052819af759babc8ca93bdc6c9aeb - languageName: node - linkType: hard - -"@babel/helper-function-name@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/helper-function-name@npm:7.18.9" - dependencies: - "@babel/template": ^7.18.6 - "@babel/types": ^7.18.9 - checksum: d04c44e0272f887c0c868651be7fc3c5690531bea10936f00d4cca3f6d5db65e76dfb49e8d553c42ae1fe1eba61ccce9f3d93ba2df50a66408c8d4c3cc61cf0c - languageName: node - linkType: hard - -"@babel/helper-function-name@npm:^7.19.0": +"@babel/helper-function-name@npm:^7.18.9, @babel/helper-function-name@npm:^7.19.0": version: 7.19.0 resolution: "@babel/helper-function-name@npm:7.19.0" dependencies: @@ -293,16 +213,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-imports@npm:^7.10.4": - version: 7.12.13 - resolution: "@babel/helper-module-imports@npm:7.12.13" - dependencies: - "@babel/types": ^7.12.13 - checksum: 5ca5eaa2658cc6738ce2810211084ec7cb2a1bbf9090d0ec1e9b9df1fd7786a0c4352f598eaafc682a722e7a0052afa73ee52d311b65544ca0e7f8597ed5242b - languageName: node - linkType: hard - -"@babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.18.6": +"@babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-module-imports@npm:7.18.6" dependencies: @@ -311,23 +222,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.19.0": - version: 7.19.0 - resolution: "@babel/helper-module-transforms@npm:7.19.0" - dependencies: - "@babel/helper-environment-visitor": ^7.18.9 - "@babel/helper-module-imports": ^7.18.6 - "@babel/helper-simple-access": ^7.18.6 - "@babel/helper-split-export-declaration": ^7.18.6 - "@babel/helper-validator-identifier": ^7.18.6 - "@babel/template": ^7.18.10 - "@babel/traverse": ^7.19.0 - "@babel/types": ^7.19.0 - checksum: 4483276c66f56cf3b5b063634092ad9438c2593725de5c143ba277dda82f1501e6d73b311c1b28036f181dbe36eaeff29f24726cde37a599d4e735af294e5359 - languageName: node - linkType: hard - -"@babel/helper-module-transforms@npm:^7.19.6": +"@babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.19.0, @babel/helper-module-transforms@npm:^7.19.6": version: 7.19.6 resolution: "@babel/helper-module-transforms@npm:7.19.6" dependencies: @@ -359,21 +254,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-remap-async-to-generator@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-remap-async-to-generator@npm:7.18.6" - dependencies: - "@babel/helper-annotate-as-pure": ^7.18.6 - "@babel/helper-environment-visitor": ^7.18.6 - "@babel/helper-wrap-function": ^7.18.6 - "@babel/types": ^7.18.6 - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 83e890624da9413c74a8084f6b5f7bfe93abad8a6e1a33464f3086e2a1336751672e6ac6d74dddd35b641d19584cc0f93d02c52a4f33385b3be5b40942fe30da - languageName: node - linkType: hard - -"@babel/helper-remap-async-to-generator@npm:^7.18.9": +"@babel/helper-remap-async-to-generator@npm:^7.18.6, @babel/helper-remap-async-to-generator@npm:^7.18.9": version: 7.18.9 resolution: "@babel/helper-remap-async-to-generator@npm:7.18.9" dependencies: @@ -400,16 +281,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-simple-access@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-simple-access@npm:7.18.6" - dependencies: - "@babel/types": ^7.18.6 - checksum: 37cd36eef199e0517845763c1e6ff6ea5e7876d6d707a6f59c9267c547a50aa0e84260ba9285d49acfaf2cfa0a74a772d92967f32ac1024c961517d40b6c16a5 - languageName: node - linkType: hard - -"@babel/helper-simple-access@npm:^7.19.4": +"@babel/helper-simple-access@npm:^7.18.6, @babel/helper-simple-access@npm:^7.19.4": version: 7.19.4 resolution: "@babel/helper-simple-access@npm:7.19.4" dependencies: @@ -436,13 +308,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-string-parser@npm:^7.18.10": - version: 7.18.10 - resolution: "@babel/helper-string-parser@npm:7.18.10" - checksum: d554a4393365b624916b5c00a4cc21c990c6617e7f3fe30be7d9731f107f12c33229a7a3db9d829bfa110d2eb9f04790745d421640e3bd245bb412dc0ea123c1 - languageName: node - linkType: hard - "@babel/helper-string-parser@npm:^7.19.4": version: 7.19.4 resolution: "@babel/helper-string-parser@npm:7.19.4" @@ -450,14 +315,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-validator-identifier@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-validator-identifier@npm:7.18.6" - checksum: e295254d616bbe26e48c196a198476ab4d42a73b90478c9842536cf910ead887f5af6b5c4df544d3052a25ccb3614866fa808dc1e3a5a4291acd444e243c0648 - languageName: node - linkType: hard - -"@babel/helper-validator-identifier@npm:^7.19.1": +"@babel/helper-validator-identifier@npm:^7.18.6, @babel/helper-validator-identifier@npm:^7.19.1": version: 7.19.1 resolution: "@babel/helper-validator-identifier@npm:7.19.1" checksum: 0eca5e86a729162af569b46c6c41a63e18b43dbe09fda1d2a3c8924f7d617116af39cac5e4cd5d431bb760b4dca3c0970e0c444789b1db42bcf1fa41fbad0a3a @@ -471,18 +329,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-wrap-function@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-wrap-function@npm:7.18.6" - dependencies: - "@babel/helper-function-name": ^7.18.6 - "@babel/template": ^7.18.6 - "@babel/traverse": ^7.18.6 - "@babel/types": ^7.18.6 - checksum: b7a4f59b302ed77407e5c2005d8677ebdeabbfa69230e15f80b5e06cc532369c1e48399ec3e67dd3341e7ab9b3f84f17a255e2c1ec4e0d42bb571a4dac5472d6 - languageName: node - linkType: hard - "@babel/helper-wrap-function@npm:^7.18.9": version: 7.18.11 resolution: "@babel/helper-wrap-function@npm:7.18.11" @@ -495,17 +341,6 @@ __metadata: languageName: node linkType: hard -"@babel/helpers@npm:^7.19.0": - version: 7.19.0 - resolution: "@babel/helpers@npm:7.19.0" - dependencies: - "@babel/template": ^7.18.10 - "@babel/traverse": ^7.19.0 - "@babel/types": ^7.19.0 - checksum: e50e78e0dbb0435075fa3f85021a6bcae529589800bca0292721afd7f7c874bea54508d6dc57eca16e5b8224f8142c6b0e32e3b0140029dc09865da747da4623 - languageName: node - linkType: hard - "@babel/helpers@npm:^7.19.4": version: 7.19.4 resolution: "@babel/helpers@npm:7.19.4" @@ -528,16 +363,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.19.3": - version: 7.19.3 - resolution: "@babel/parser@npm:7.19.3" - bin: - parser: ./bin/babel-parser.js - checksum: 854f1390328a8cea5d95ed2a8655a8976cdb41e72393845df0f86088dc777817a5e015a1a61739d312accccf1a22358fb70707a013d25596251cceba2c8985ee - languageName: node - linkType: hard - -"@babel/parser@npm:^7.19.6": +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.19.6": version: 7.19.6 resolution: "@babel/parser@npm:7.19.6" bin: @@ -584,7 +410,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-class-properties@npm:7.18.6, @babel/plugin-proposal-class-properties@npm:^7.18.6": +"@babel/plugin-proposal-class-properties@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-proposal-class-properties@npm:7.18.6" dependencies: @@ -672,7 +498,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-nullish-coalescing-operator@npm:7.18.6, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.18.6": +"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.18.6" dependencies: @@ -696,21 +522,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-object-rest-spread@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.18.9" - dependencies: - "@babel/compat-data": ^7.18.8 - "@babel/helper-compilation-targets": ^7.18.9 - "@babel/helper-plugin-utils": ^7.18.9 - "@babel/plugin-syntax-object-rest-spread": ^7.8.3 - "@babel/plugin-transform-parameters": ^7.18.8 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 66b9bae741d46edf1c96776d26dfe5d335981e57164ec2450583e3d20dfaa08a5137ffebb897e443913207789f9816bfec4ae845f38762c0196a60949eaffdba - languageName: node - linkType: hard - "@babel/plugin-proposal-object-rest-spread@npm:^7.19.4": version: 7.19.4 resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.19.4" @@ -738,7 +549,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-optional-chaining@npm:7.18.9, @babel/plugin-proposal-optional-chaining@npm:^7.18.9": +"@babel/plugin-proposal-optional-chaining@npm:^7.18.9": version: 7.18.9 resolution: "@babel/plugin-proposal-optional-chaining@npm:7.18.9" dependencies: @@ -844,7 +655,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-dynamic-import@npm:7.8.3, @babel/plugin-syntax-dynamic-import@npm:^7.8.3": +"@babel/plugin-syntax-dynamic-import@npm:^7.8.3": version: 7.8.3 resolution: "@babel/plugin-syntax-dynamic-import@npm:7.8.3" dependencies: @@ -998,7 +809,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-typescript@npm:^7.18.6": +"@babel/plugin-syntax-typescript@npm:^7.18.6, @babel/plugin-syntax-typescript@npm:^7.7.2": version: 7.18.6 resolution: "@babel/plugin-syntax-typescript@npm:7.18.6" dependencies: @@ -1009,17 +820,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-typescript@npm:^7.7.2": - version: 7.16.7 - resolution: "@babel/plugin-syntax-typescript@npm:7.16.7" - dependencies: - "@babel/helper-plugin-utils": ^7.16.7 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 661e636060609ede9a402e22603b01784c21fabb0a637e65f561c8159351fe0130bbc11fdefe31902107885e3332fc34d95eb652ac61d3f61f2d61f5da20609e - languageName: node - linkType: hard - "@babel/plugin-transform-arrow-functions@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-arrow-functions@npm:7.18.6" @@ -1055,17 +855,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-block-scoping@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-transform-block-scoping@npm:7.18.9" - dependencies: - "@babel/helper-plugin-utils": ^7.18.9 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: f8064ea431eb7aa349dc5b6be87a650f912b48cd65afde917e8644f6f840d7f9d2ce4795f2aa3955aa5b23a73d4ad38abd03386ae109b4b8702b746c6d35bda3 - languageName: node - linkType: hard - "@babel/plugin-transform-block-scoping@npm:^7.19.4": version: 7.19.4 resolution: "@babel/plugin-transform-block-scoping@npm:7.19.4" @@ -1107,17 +896,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-destructuring@npm:^7.18.13": - version: 7.18.13 - resolution: "@babel/plugin-transform-destructuring@npm:7.18.13" - dependencies: - "@babel/helper-plugin-utils": ^7.18.9 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 83e44ec93a4cfbf69376db8836d00ec803820081bf0f8b6cea73a9b3cd320b8285768d5b385744af4a27edda4b6502245c52d3ed026ea61356faf57bfe78effb - languageName: node - linkType: hard - "@babel/plugin-transform-destructuring@npm:^7.19.4": version: 7.19.4 resolution: "@babel/plugin-transform-destructuring@npm:7.19.4" @@ -1485,7 +1263,7 @@ __metadata: languageName: node linkType: hard -"@babel/preset-env@npm:7.19.4": +"@babel/preset-env@npm:7.19.4, @babel/preset-env@npm:^7.11.0": version: 7.19.4 resolution: "@babel/preset-env@npm:7.19.4" dependencies: @@ -1570,91 +1348,6 @@ __metadata: languageName: node linkType: hard -"@babel/preset-env@npm:^7.11.0": - version: 7.19.3 - resolution: "@babel/preset-env@npm:7.19.3" - dependencies: - "@babel/compat-data": ^7.19.3 - "@babel/helper-compilation-targets": ^7.19.3 - "@babel/helper-plugin-utils": ^7.19.0 - "@babel/helper-validator-option": ^7.18.6 - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.18.6 - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.18.9 - "@babel/plugin-proposal-async-generator-functions": ^7.19.1 - "@babel/plugin-proposal-class-properties": ^7.18.6 - "@babel/plugin-proposal-class-static-block": ^7.18.6 - "@babel/plugin-proposal-dynamic-import": ^7.18.6 - "@babel/plugin-proposal-export-namespace-from": ^7.18.9 - "@babel/plugin-proposal-json-strings": ^7.18.6 - "@babel/plugin-proposal-logical-assignment-operators": ^7.18.9 - "@babel/plugin-proposal-nullish-coalescing-operator": ^7.18.6 - "@babel/plugin-proposal-numeric-separator": ^7.18.6 - "@babel/plugin-proposal-object-rest-spread": ^7.18.9 - "@babel/plugin-proposal-optional-catch-binding": ^7.18.6 - "@babel/plugin-proposal-optional-chaining": ^7.18.9 - "@babel/plugin-proposal-private-methods": ^7.18.6 - "@babel/plugin-proposal-private-property-in-object": ^7.18.6 - "@babel/plugin-proposal-unicode-property-regex": ^7.18.6 - "@babel/plugin-syntax-async-generators": ^7.8.4 - "@babel/plugin-syntax-class-properties": ^7.12.13 - "@babel/plugin-syntax-class-static-block": ^7.14.5 - "@babel/plugin-syntax-dynamic-import": ^7.8.3 - "@babel/plugin-syntax-export-namespace-from": ^7.8.3 - "@babel/plugin-syntax-import-assertions": ^7.18.6 - "@babel/plugin-syntax-json-strings": ^7.8.3 - "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4 - "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3 - "@babel/plugin-syntax-numeric-separator": ^7.10.4 - "@babel/plugin-syntax-object-rest-spread": ^7.8.3 - "@babel/plugin-syntax-optional-catch-binding": ^7.8.3 - "@babel/plugin-syntax-optional-chaining": ^7.8.3 - "@babel/plugin-syntax-private-property-in-object": ^7.14.5 - "@babel/plugin-syntax-top-level-await": ^7.14.5 - "@babel/plugin-transform-arrow-functions": ^7.18.6 - "@babel/plugin-transform-async-to-generator": ^7.18.6 - "@babel/plugin-transform-block-scoped-functions": ^7.18.6 - "@babel/plugin-transform-block-scoping": ^7.18.9 - "@babel/plugin-transform-classes": ^7.19.0 - "@babel/plugin-transform-computed-properties": ^7.18.9 - "@babel/plugin-transform-destructuring": ^7.18.13 - "@babel/plugin-transform-dotall-regex": ^7.18.6 - "@babel/plugin-transform-duplicate-keys": ^7.18.9 - "@babel/plugin-transform-exponentiation-operator": ^7.18.6 - "@babel/plugin-transform-for-of": ^7.18.8 - "@babel/plugin-transform-function-name": ^7.18.9 - "@babel/plugin-transform-literals": ^7.18.9 - "@babel/plugin-transform-member-expression-literals": ^7.18.6 - "@babel/plugin-transform-modules-amd": ^7.18.6 - "@babel/plugin-transform-modules-commonjs": ^7.18.6 - "@babel/plugin-transform-modules-systemjs": ^7.19.0 - "@babel/plugin-transform-modules-umd": ^7.18.6 - "@babel/plugin-transform-named-capturing-groups-regex": ^7.19.1 - "@babel/plugin-transform-new-target": ^7.18.6 - "@babel/plugin-transform-object-super": ^7.18.6 - "@babel/plugin-transform-parameters": ^7.18.8 - "@babel/plugin-transform-property-literals": ^7.18.6 - "@babel/plugin-transform-regenerator": ^7.18.6 - "@babel/plugin-transform-reserved-words": ^7.18.6 - "@babel/plugin-transform-shorthand-properties": ^7.18.6 - "@babel/plugin-transform-spread": ^7.19.0 - "@babel/plugin-transform-sticky-regex": ^7.18.6 - "@babel/plugin-transform-template-literals": ^7.18.9 - "@babel/plugin-transform-typeof-symbol": ^7.18.9 - "@babel/plugin-transform-unicode-escapes": ^7.18.10 - "@babel/plugin-transform-unicode-regex": ^7.18.6 - "@babel/preset-modules": ^0.1.5 - "@babel/types": ^7.19.3 - babel-plugin-polyfill-corejs2: ^0.3.3 - babel-plugin-polyfill-corejs3: ^0.6.0 - babel-plugin-polyfill-regenerator: ^0.4.1 - core-js-compat: ^3.25.1 - semver: ^6.3.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: f967cf48fa54f4b87cfd6dcad0d8c6249379af55c657f7519d2e3538ebb5e3f73b465677d88a6730e569f45150a2966e14b43bd1134d434a12ca351c14381871 - languageName: node - linkType: hard - "@babel/preset-modules@npm:^0.1.5": version: 0.1.5 resolution: "@babel/preset-modules@npm:0.1.5" @@ -1709,16 +1402,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.9, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": - version: 7.18.9 - resolution: "@babel/runtime@npm:7.18.9" - dependencies: - regenerator-runtime: ^0.13.4 - checksum: 36dd736baba7164e82b3cc9d43e081f0cb2d05ff867ad39cac515d99546cee75b7f782018b02a3dcf5f2ef3d27f319faa68965fdfec49d4912c60c6002353a2e - languageName: node - linkType: hard - -"@babel/runtime@npm:^7.15.4": +"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.9, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": version: 7.19.4 resolution: "@babel/runtime@npm:7.19.4" dependencies: @@ -1727,16 +1411,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.18.3": - version: 7.19.0 - resolution: "@babel/runtime@npm:7.19.0" - dependencies: - regenerator-runtime: ^0.13.4 - checksum: fa69c351bb05e1db3ceb9a02fdcf620c234180af68cdda02152d3561015f6d55277265d3109815992f96d910f3db709458cae4f8df1c3def66f32e0867d82294 - languageName: node - linkType: hard - -"@babel/template@npm:^7.18.10, @babel/template@npm:^7.18.6, @babel/template@npm:^7.3.3": +"@babel/template@npm:^7.18.10, @babel/template@npm:^7.3.3": version: 7.18.10 resolution: "@babel/template@npm:7.18.10" dependencies: @@ -1747,25 +1422,7 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.18.11, @babel/traverse@npm:^7.18.6, @babel/traverse@npm:^7.19.0, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.19.3, @babel/traverse@npm:^7.7.2": - version: 7.19.3 - resolution: "@babel/traverse@npm:7.19.3" - dependencies: - "@babel/code-frame": ^7.18.6 - "@babel/generator": ^7.19.3 - "@babel/helper-environment-visitor": ^7.18.9 - "@babel/helper-function-name": ^7.19.0 - "@babel/helper-hoist-variables": ^7.18.6 - "@babel/helper-split-export-declaration": ^7.18.6 - "@babel/parser": ^7.19.3 - "@babel/types": ^7.19.3 - debug: ^4.1.0 - globals: ^11.1.0 - checksum: ef16c98fca7f2c347febd06737c13230ea103d619a0d6c142445bc8eff6359d2fce026f27dece02b4838f614cda8a9330bc4a576ccc6cd0ce21844d1d0205769 - languageName: node - linkType: hard - -"@babel/traverse@npm:^7.19.4, @babel/traverse@npm:^7.19.6": +"@babel/traverse@npm:^7.18.11, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.19.4, @babel/traverse@npm:^7.19.6, @babel/traverse@npm:^7.7.2": version: 7.19.6 resolution: "@babel/traverse@npm:7.19.6" dependencies: @@ -1783,18 +1440,7 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.13, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.19.3, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": - version: 7.19.3 - resolution: "@babel/types@npm:7.19.3" - dependencies: - "@babel/helper-string-parser": ^7.18.10 - "@babel/helper-validator-identifier": ^7.19.1 - to-fast-properties: ^2.0.0 - checksum: 34a5b3db3b99a1a80ec2a784c2bb0e48769a38f1526dc377a5753a3ac5e5704663c405a393117ecc7a9df9da07b01625be7c4c3fee43ae46aba23b0c40928d77 - languageName: node - linkType: hard - -"@babel/types@npm:^7.19.4": +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.19.4, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": version: 7.19.4 resolution: "@babel/types@npm:7.19.4" dependencies: @@ -2758,15 +2404,6 @@ __metadata: languageName: node linkType: hard -"@jest/expect-utils@npm:^29.1.2": - version: 29.1.2 - resolution: "@jest/expect-utils@npm:29.1.2" - dependencies: - jest-get-type: ^29.0.0 - checksum: 31c2a690b5720cc52698d144a81aac152a7e5072d92c80e2a027c79fdbd845dd53f92b45170ba71aa7304eaf487f0a5064e96c67ff1825e175466feae156ea05 - languageName: node - linkType: hard - "@jest/expect-utils@npm:^29.2.1": version: 29.2.1 resolution: "@jest/expect-utils@npm:29.2.1" @@ -2916,20 +2553,6 @@ __metadata: languageName: node linkType: hard -"@jest/types@npm:^29.1.2": - version: 29.1.2 - resolution: "@jest/types@npm:29.1.2" - dependencies: - "@jest/schemas": ^29.0.0 - "@types/istanbul-lib-coverage": ^2.0.0 - "@types/istanbul-reports": ^3.0.0 - "@types/node": "*" - "@types/yargs": ^17.0.8 - chalk: ^4.0.0 - checksum: 697fc72c37814606715fd1dcbdcb84129d8b292dc6d6d5fa9b8f2b7e8ffd297757b508913be049a4acfbe9f80b982d96e4aa9aa60c40bbc643274ca1867194f8 - languageName: node - linkType: hard - "@jest/types@npm:^29.2.1": version: 29.2.1 resolution: "@jest/types@npm:29.2.1" @@ -3073,16 +2696,6 @@ __metadata: languageName: node linkType: hard -"@nodelib/fs.scandir@npm:2.1.4": - version: 2.1.4 - resolution: "@nodelib/fs.scandir@npm:2.1.4" - dependencies: - "@nodelib/fs.stat": 2.0.4 - run-parallel: ^1.1.9 - checksum: 18c2150ab52a042bd65babe5b70106e6586dc036644131c33d253ff99e5eeef2e65858ab40161530a6f22b512a65e7c7629f0f1e0f35c00ee4c606f960d375ba - languageName: node - linkType: hard - "@nodelib/fs.scandir@npm:2.1.5": version: 2.1.5 resolution: "@nodelib/fs.scandir@npm:2.1.5" @@ -3093,31 +2706,14 @@ __metadata: languageName: node linkType: hard -"@nodelib/fs.stat@npm:2.0.4, @nodelib/fs.stat@npm:^2.0.2": - version: 2.0.4 - resolution: "@nodelib/fs.stat@npm:2.0.4" - checksum: d0d9745f878816d041a8b36faf5797d88ba961274178f0ad1f7fe0efef8118ca9bd0e43e4d0d85a9af911bd35122ec1580e626a83d7595fc4d60f2c1c70e2665 - languageName: node - linkType: hard - -"@nodelib/fs.stat@npm:2.0.5": +"@nodelib/fs.stat@npm:2.0.5, @nodelib/fs.stat@npm:^2.0.2": version: 2.0.5 resolution: "@nodelib/fs.stat@npm:2.0.5" checksum: 012480b5ca9d97bff9261571dbbec7bbc6033f69cc92908bc1ecfad0792361a5a1994bc48674b9ef76419d056a03efadfce5a6cf6dbc0a36559571a7a483f6f0 languageName: node linkType: hard -"@nodelib/fs.walk@npm:^1.2.3": - version: 1.2.6 - resolution: "@nodelib/fs.walk@npm:1.2.6" - dependencies: - "@nodelib/fs.scandir": 2.1.4 - fastq: ^1.6.0 - checksum: d156901823b3d3de368ad68047a964523e0ce5f796c0aa7712443b1f748d8e7fc24ce2c0f18d22a177e1f1c6092bca609ab5e4cb1792c41cdc8a6989bc391139 - languageName: node - linkType: hard - -"@nodelib/fs.walk@npm:^1.2.8": +"@nodelib/fs.walk@npm:^1.2.3, @nodelib/fs.walk@npm:^1.2.8": version: 1.2.8 resolution: "@nodelib/fs.walk@npm:1.2.8" dependencies: @@ -3668,28 +3264,7 @@ __metadata: languageName: node linkType: hard -"@types/json-schema@npm:*": - version: 7.0.7 - resolution: "@types/json-schema@npm:7.0.7" - checksum: ea3b409235862d28122751158f4054e729e31ad844bd7b8b23868f38c518047b1c0e8e4e7cc293e02c31a2fb8cfc8a4506c2de2a745cf78b218e064fb8898cd4 - languageName: node - linkType: hard - -"@types/json-schema@npm:^7.0.5": - version: 7.0.6 - resolution: "@types/json-schema@npm:7.0.6" - checksum: 3b1e5e049b065a41d2bc1f0c16e01dac5a4a1276bbe8b413657298f574d64a955d3b10bec9e7796fde0927f307e6fedbac1cf4da3604593c431899eea3ad0756 - languageName: node - linkType: hard - -"@types/json-schema@npm:^7.0.8": - version: 7.0.8 - resolution: "@types/json-schema@npm:7.0.8" - checksum: f1d0fe76ab1db93846f36a9179faa44b9b66f2f5f44597e46e65456a1c998f632c63b94ed347058ed1a230cbf95a9a164b4daf4d70aa3d651d5033f7856df83c - languageName: node - linkType: hard - -"@types/json-schema@npm:^7.0.9": +"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": version: 7.0.9 resolution: "@types/json-schema@npm:7.0.9" checksum: 259d0e25f11a21ba5c708f7ea47196bd396e379fddb79c76f9f4f62c945879dc21657904914313ec2754e443c5018ea8372362f323f30e0792897fdb2098a705 @@ -3771,10 +3346,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:>=13.7.0": - version: 17.0.45 - resolution: "@types/node@npm:17.0.45" - checksum: aa04366b9103b7d6cfd6b2ef64182e0eaa7d4462c3f817618486ea0422984c51fc69fd0d436eae6c9e696ddfdbec9ccaa27a917f7c2e8c75c5d57827fe3d95e8 +"@types/node@npm:*, @types/node@npm:>=13.7.0, @types/node@npm:^18.11.3": + version: 18.11.3 + resolution: "@types/node@npm:18.11.3" + checksum: 3a2a9142d891a90a195c296149bf64a69cc0abcc42f543be911ab22b2e0ead85ff077f90af92f0f13f6e3e5e72501469200fd753dfd1101825d4646a89d3ee47 languageName: node linkType: hard @@ -3785,13 +3360,6 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^18.11.3": - version: 18.11.3 - resolution: "@types/node@npm:18.11.3" - checksum: 3a2a9142d891a90a195c296149bf64a69cc0abcc42f543be911ab22b2e0ead85ff077f90af92f0f13f6e3e5e72501469200fd753dfd1101825d4646a89d3ee47 - languageName: node - linkType: hard - "@types/node@npm:~14": version: 14.18.21 resolution: "@types/node@npm:14.18.21" @@ -4087,16 +3655,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.39.0": - version: 5.39.0 - resolution: "@typescript-eslint/scope-manager@npm:5.39.0" - dependencies: - "@typescript-eslint/types": 5.39.0 - "@typescript-eslint/visitor-keys": 5.39.0 - checksum: 8d8b55eb219a23b3de64602ea23269fb1e16120ff03c58ebb7ed571372cbc591c5f4641b91ba1cf7fd02cf13f7bb906a7bd6e3db6da3543c97fcea8c61c15c07 - languageName: node - linkType: hard - "@typescript-eslint/scope-manager@npm:5.40.1": version: 5.40.1 resolution: "@typescript-eslint/scope-manager@npm:5.40.1" @@ -4131,13 +3689,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.39.0": - version: 5.39.0 - resolution: "@typescript-eslint/types@npm:5.39.0" - checksum: 5f67fe02adc87d594b6cc8ec5387d64419d4bbff701f4da51bf9929cdc50bc613df865e5a2457f13e4a637e8dfdb1fdf15fe8138f8968462de9e54ea056cc1a7 - languageName: node - linkType: hard - "@typescript-eslint/types@npm:5.40.1": version: 5.40.1 resolution: "@typescript-eslint/types@npm:5.40.1" @@ -4163,24 +3714,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.39.0": - version: 5.39.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.39.0" - dependencies: - "@typescript-eslint/types": 5.39.0 - "@typescript-eslint/visitor-keys": 5.39.0 - debug: ^4.3.4 - globby: ^11.1.0 - is-glob: ^4.0.3 - semver: ^7.3.7 - tsutils: ^3.21.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 86143dd9dd33ce65a20badbce5509ae4e77e9dfe202a6966dd416a8ce8147e5b05d12ce0b8f593ed7924797f6420d0bcd558c773042466e24386cdda24f24eb8 - languageName: node - linkType: hard - "@typescript-eslint/typescript-estree@npm:5.40.1": version: 5.40.1 resolution: "@typescript-eslint/typescript-estree@npm:5.40.1" @@ -4215,7 +3748,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.40.1": +"@typescript-eslint/utils@npm:5.40.1, @typescript-eslint/utils@npm:^5.10.0": version: 5.40.1 resolution: "@typescript-eslint/utils@npm:5.40.1" dependencies: @@ -4233,22 +3766,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:^5.10.0": - version: 5.39.0 - resolution: "@typescript-eslint/utils@npm:5.39.0" - dependencies: - "@types/json-schema": ^7.0.9 - "@typescript-eslint/scope-manager": 5.39.0 - "@typescript-eslint/types": 5.39.0 - "@typescript-eslint/typescript-estree": 5.39.0 - eslint-scope: ^5.1.1 - eslint-utils: ^3.0.0 - peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 460a883775c24ed1a328db15101d58e1207797c97d2347a6e1adb2e26ef56ac0b525a326d2dd74333daf00e2b2e3dd28d51e0d4c4c38cdade2d132d8b08917cb - languageName: node - linkType: hard - "@typescript-eslint/visitor-keys@npm:5.10.1": version: 5.10.1 resolution: "@typescript-eslint/visitor-keys@npm:5.10.1" @@ -4259,16 +3776,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.39.0": - version: 5.39.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.39.0" - dependencies: - "@typescript-eslint/types": 5.39.0 - eslint-visitor-keys: ^3.3.0 - checksum: 941e49fd1f4d2e42cd15a52a50f6f1102e2a83b173d182b5dd43ba3d7b7f0f1457d74fcaac710da4a19c28f804c78bc265d900802f4e2c7c46a608fff3204e7c - languageName: node - linkType: hard - "@typescript-eslint/visitor-keys@npm:5.40.1": version: 5.40.1 resolution: "@typescript-eslint/visitor-keys@npm:5.40.1" @@ -4881,16 +4388,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.0.4, acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.7.1": - version: 8.7.1 - resolution: "acorn@npm:8.7.1" - bin: - acorn: bin/acorn - checksum: aca0aabf98826717920ac2583fdcad0a6fbe4e583fdb6e843af2594e907455aeafe30b1e14f1757cd83ce1776773cf8296ffc3a4acf13f0bd3dfebcf1db6ae80 - languageName: node - linkType: hard - -"acorn@npm:^8.8.0": +"acorn@npm:^8.0.4, acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.7.1, acorn@npm:^8.8.0": version: 8.8.0 resolution: "acorn@npm:8.8.0" bin: @@ -5731,21 +5229,7 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.14.5": - version: 4.21.1 - resolution: "browserslist@npm:4.21.1" - dependencies: - caniuse-lite: ^1.0.30001359 - electron-to-chromium: ^1.4.172 - node-releases: ^2.0.5 - update-browserslist-db: ^1.0.4 - bin: - browserslist: cli.js - checksum: 4904a9ded0702381adc495e003e7f77970abb7f8c8b8edd9e54f026354b5a96b1bddc26e6d9a7df9f043e468ecd2fcff2c8f40fc489909a042880117c2aca8ff - languageName: node - linkType: hard - -"browserslist@npm:^4.21.3, browserslist@npm:^4.21.4": +"browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.14.5, browserslist@npm:^4.21.3, browserslist@npm:^4.21.4": version: 4.21.4 resolution: "browserslist@npm:4.21.4" dependencies: @@ -5942,35 +5426,7 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001109": - version: 1.0.30001230 - resolution: "caniuse-lite@npm:1.0.30001230" - checksum: 7ad6bf592c272dc62e59eb05b7e8581f6e8e0b0f6cef8e687c82c8306d77dccacdbba86286a4d1e3defebdd358ddc0a236208f08ea8e7b899d7b519c1223399a - languageName: node - linkType: hard - -"caniuse-lite@npm:^1.0.30001359": - version: 1.0.30001362 - resolution: "caniuse-lite@npm:1.0.30001362" - checksum: bd35704a81aa8ca12e952c2276d205109a5d10bd7d0fb767c27ee9bdbc8011c5c99a9772833701d68ed2fe7143f1744258c1cc440dd7ea4584a1354f6dac9f0a - languageName: node - linkType: hard - -"caniuse-lite@npm:^1.0.30001400": - version: 1.0.30001402 - resolution: "caniuse-lite@npm:1.0.30001402" - checksum: 6068ccccd64b357f75388cb2303cf351b686b20800571d0a845bff5c0e0d24f83df0133afbbdd8177a33eb087c93d39ecf359035a52b2feac5f182c946f706ee - languageName: node - linkType: hard - -"caniuse-lite@npm:^1.0.30001407": - version: 1.0.30001421 - resolution: "caniuse-lite@npm:1.0.30001421" - checksum: acde5d9ea9e380bf04099d3d11a80c9a4f372af1f4094031b8dfc53f362707fd72e6b9703ca6086563cb4b64d8f0e4c30b85be3679227d32f6c511fc2b8e2e6c - languageName: node - linkType: hard - -"caniuse-lite@npm:^1.0.30001423": +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001400, caniuse-lite@npm:^1.0.30001407, caniuse-lite@npm:^1.0.30001423": version: 1.0.30001423 resolution: "caniuse-lite@npm:1.0.30001423" checksum: fe443f323f5dc6a858ef7d7deddb93db5e5f9a35e22970c4a65c4ef793bb696c1e2f038df572722d9edf29021e43ed16f5131faafde783563bd0d9eccf486592 @@ -6520,34 +5976,20 @@ __metadata: languageName: node linkType: hard -"core-js@npm:3.25.5": +"core-js@npm:3.25.5, core-js@npm:^3.0.1": version: 3.25.5 resolution: "core-js@npm:3.25.5" checksum: 208b308c49bc022f90d4349d4c99802a73c9d55053976b3c529f10014c1e37845926defad8c519f2c7f71ea0acf18d2b323ab6aaee34dc85b4c4b3ced0623f3f languageName: node linkType: hard -"core-js@npm:^3.0.1": - version: 3.25.1 - resolution: "core-js@npm:3.25.1" - checksum: bfacb078e790913841e2d5008b9b6705ae56ed23f83c7f0ae08d330d874561012611089d53b71520105234ed0abba36f28d91b391514a16541a8c8d98c464239 - languageName: node - linkType: hard - -"core-util-is@npm:^1.0.3": +"core-util-is@npm:^1.0.3, core-util-is@npm:~1.0.0": version: 1.0.3 resolution: "core-util-is@npm:1.0.3" checksum: 9de8597363a8e9b9952491ebe18167e3b36e7707569eed0ebf14f8bba773611376466ae34575bca8cfe3c767890c859c74056084738f09d4e4a6f902b2ad7d99 languageName: node linkType: hard -"core-util-is@npm:~1.0.0": - version: 1.0.2 - resolution: "core-util-is@npm:1.0.2" - checksum: 7a4c925b497a2c91421e25bf76d6d8190f0b2359a9200dbeed136e63b2931d6294d3b1893eda378883ed363cd950f44a12a401384c609839ea616befb7927dab - languageName: node - linkType: hard - "cosmiconfig@npm:7.0.1, cosmiconfig@npm:^7.0.0, cosmiconfig@npm:^7.0.1": version: 7.0.1 resolution: "cosmiconfig@npm:7.0.1" @@ -7042,20 +6484,13 @@ __metadata: languageName: node linkType: hard -"date-fns@npm:2.29.3": +"date-fns@npm:2.29.3, date-fns@npm:^2.29.1": version: 2.29.3 resolution: "date-fns@npm:2.29.3" checksum: e01cf5b62af04e05dfff921bb9c9933310ed0e1ae9a81eb8653452e64dc841acf7f6e01e1a5ae5644d0337e9a7f936175fd2cb6819dc122fdd9c5e86c56be484 languageName: node linkType: hard -"date-fns@npm:^2.29.1": - version: 2.29.2 - resolution: "date-fns@npm:2.29.2" - checksum: 08bebcceb0a5dbadae4c55e6592b9d5c07dbd7833433c7e9a1d4a424300db32589b8b48e5979b32863c9b00a48d9bab6663e580c2a4f9f203d46cbf9113b5664 - languageName: node - linkType: hard - "dateformat@npm:~3.0.3": version: 3.0.3 resolution: "dateformat@npm:3.0.3" @@ -7124,14 +6559,7 @@ __metadata: languageName: node linkType: hard -"deep-is@npm:^0.1.3": - version: 0.1.3 - resolution: "deep-is@npm:0.1.3" - checksum: c15b04c3848a89880c94e25b077c19b47d9a30dd99048e70e5f95d943e7b246bee1da0c1376b56b01bc045be2cae7d9b1c856e68e47e9805634327de7c6cb6d5 - languageName: node - linkType: hard - -"deep-is@npm:~0.1.3": +"deep-is@npm:^0.1.3, deep-is@npm:~0.1.3": version: 0.1.4 resolution: "deep-is@npm:0.1.4" checksum: edb65dd0d7d1b9c40b2f50219aef30e116cedd6fc79290e740972c132c09106d2e80aa0bc8826673dd5a00222d4179c84b36a790eef63a4c4bca75a37ef90804 @@ -7145,16 +6573,7 @@ __metadata: languageName: node linkType: hard -"define-properties@npm:^1.1.3": - version: 1.1.3 - resolution: "define-properties@npm:1.1.3" - dependencies: - object-keys: ^1.0.12 - checksum: da80dba55d0cd76a5a7ab71ef6ea0ebcb7b941f803793e4e0257b384cb772038faa0c31659d244e82c4342edef841c1a1212580006a05a5068ee48223d787317 - languageName: node - linkType: hard - -"define-properties@npm:^1.1.4": +"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4": version: 1.1.4 resolution: "define-properties@npm:1.1.4" dependencies: @@ -7231,13 +6650,6 @@ __metadata: languageName: node linkType: hard -"diff-sequences@npm:^29.0.0": - version: 29.0.0 - resolution: "diff-sequences@npm:29.0.0" - checksum: 2c084a3db03ecde26f649f6f2559974e01e174451debeb301a7e17199e73423a8e8ddeb9a35ae38638c084b4fa51296a4a20fa7f44f3db0c0ba566bdc704ed3d - languageName: node - linkType: hard - "diff-sequences@npm:^29.2.0": version: 29.2.0 resolution: "diff-sequences@npm:29.2.0" @@ -7415,13 +6827,6 @@ __metadata: languageName: node linkType: hard -"electron-to-chromium@npm:^1.4.172": - version: 1.4.177 - resolution: "electron-to-chromium@npm:1.4.177" - checksum: e373df9b001c9a77a33b78ab4b8dbe6ee4175eb630c7d8dbe3671eb50be62a91c220cec71d56c2da3c532679ee692fe34715b915b900dec0962c08a983d06a86 - languageName: node - linkType: hard - "electron-to-chromium@npm:^1.4.251": version: 1.4.254 resolution: "electron-to-chromium@npm:1.4.254" @@ -7582,74 +6987,7 @@ __metadata: languageName: node linkType: hard -"es-abstract@npm:^1.17.2": - version: 1.17.7 - resolution: "es-abstract@npm:1.17.7" - dependencies: - es-to-primitive: ^1.2.1 - function-bind: ^1.1.1 - has: ^1.0.3 - has-symbols: ^1.0.1 - is-callable: ^1.2.2 - is-regex: ^1.1.1 - object-inspect: ^1.8.0 - object-keys: ^1.1.1 - object.assign: ^4.1.1 - string.prototype.trimend: ^1.0.1 - string.prototype.trimstart: ^1.0.1 - checksum: 0863830708ebbb7aa5555746278ad9825cda6c58009f006d62342131277364309793441439a33daf51e0b1d042bff4711b4d8ecda16ca64f8a113faa46d94ac2 - languageName: node - linkType: hard - -"es-abstract@npm:^1.18.0-next.1": - version: 1.18.0-next.1 - resolution: "es-abstract@npm:1.18.0-next.1" - dependencies: - es-to-primitive: ^1.2.1 - function-bind: ^1.1.1 - has: ^1.0.3 - has-symbols: ^1.0.1 - is-callable: ^1.2.2 - is-negative-zero: ^2.0.0 - is-regex: ^1.1.1 - object-inspect: ^1.8.0 - object-keys: ^1.1.1 - object.assign: ^4.1.1 - string.prototype.trimend: ^1.0.1 - string.prototype.trimstart: ^1.0.1 - checksum: 4797f1f6c8db002ad38a2cbb9d1709f9c39946fe3d26f85ae42431bb4c2aac20dcc1f8685a055aa2b7e61e320bb841b83becc340b940de31761944613d76c1a3 - languageName: node - linkType: hard - -"es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.1": - version: 1.19.1 - resolution: "es-abstract@npm:1.19.1" - dependencies: - call-bind: ^1.0.2 - es-to-primitive: ^1.2.1 - function-bind: ^1.1.1 - get-intrinsic: ^1.1.1 - get-symbol-description: ^1.0.0 - has: ^1.0.3 - has-symbols: ^1.0.2 - internal-slot: ^1.0.3 - is-callable: ^1.2.4 - is-negative-zero: ^2.0.1 - is-regex: ^1.1.4 - is-shared-array-buffer: ^1.0.1 - is-string: ^1.0.7 - is-weakref: ^1.0.1 - object-inspect: ^1.11.0 - object-keys: ^1.1.1 - object.assign: ^4.1.2 - string.prototype.trimend: ^1.0.4 - string.prototype.trimstart: ^1.0.4 - unbox-primitive: ^1.0.1 - checksum: b6be8410672c5364db3fb01eb786e30c7b4bb32b4af63d381c08840f4382c4a168e7855cd338bf59d4f1a1a1138f4d748d1fd40ec65aaa071876f9e9fbfed949 - languageName: node - linkType: hard - -"es-abstract@npm:^1.19.2, es-abstract@npm:^1.19.5": +"es-abstract@npm:^1.17.2, es-abstract@npm:^1.18.0-next.1, es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.1, es-abstract@npm:^1.19.2, es-abstract@npm:^1.19.5": version: 1.20.1 resolution: "es-abstract@npm:1.20.1" dependencies: @@ -8275,20 +7613,7 @@ __metadata: languageName: node linkType: hard -"expect@npm:^29.0.0": - version: 29.1.2 - resolution: "expect@npm:29.1.2" - dependencies: - "@jest/expect-utils": ^29.1.2 - jest-get-type: ^29.0.0 - jest-matcher-utils: ^29.1.2 - jest-message-util: ^29.1.2 - jest-util: ^29.1.2 - checksum: 578c61459e0f4b2b8f93f11f38264446aa3be1f8bf4b85eaeb56be035535877514bc15a5aaaffc714961b872fd0ea3c2bc7dfe6efd4acf0a3315ffab0597fd7a - languageName: node - linkType: hard - -"expect@npm:^29.2.1": +"expect@npm:^29.0.0, expect@npm:^29.2.1": version: 29.2.1 resolution: "expect@npm:29.2.1" dependencies: @@ -8884,18 +8209,7 @@ __metadata: languageName: node linkType: hard -"get-intrinsic@npm:^1.0.2": - version: 1.0.2 - resolution: "get-intrinsic@npm:1.0.2" - dependencies: - function-bind: ^1.1.1 - has: ^1.0.3 - has-symbols: ^1.0.1 - checksum: bed41c7426212d79982c23e9dddb7de2b6b05ca35e94e653edfed06188381ed4eae0e04adf7f4d3ea1f47f1c345b255405e8c44b1167185537a506eff5c519c8 - languageName: node - linkType: hard - -"get-intrinsic@npm:^1.1.0, get-intrinsic@npm:^1.1.1": +"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.0, get-intrinsic@npm:^1.1.1": version: 1.1.1 resolution: "get-intrinsic@npm:1.1.1" dependencies: @@ -8927,14 +8241,7 @@ __metadata: languageName: node linkType: hard -"get-stream@npm:^6.0.0": - version: 6.0.0 - resolution: "get-stream@npm:6.0.0" - checksum: 587e6a93127f9991b494a566f4971cf7a2645dfa78034818143480a80587027bdd8826cdcf80d0eff4a4a19de0d231d157280f24789fc9cc31492e1dcc1290cf - languageName: node - linkType: hard - -"get-stream@npm:^6.0.1": +"get-stream@npm:^6.0.0, get-stream@npm:^6.0.1": version: 6.0.1 resolution: "get-stream@npm:6.0.1" checksum: e04ecece32c92eebf5b8c940f51468cd53554dcbb0ea725b2748be583c9523d00128137966afce410b9b051eb2ef16d657cd2b120ca8edafcf5a65e81af63cad @@ -9217,14 +8524,7 @@ __metadata: languageName: node linkType: hard -"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.4, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.9": - version: 4.2.9 - resolution: "graceful-fs@npm:4.2.9" - checksum: 68ea4e07ff2c041ada184f9278b830375f8e0b75154e3f080af6b70f66172fabb4108d19b3863a96b53fc068a310b9b6493d86d1291acc5f3861eb4b79d26ad6 - languageName: node - linkType: hard - -"graceful-fs@npm:^4.2.6": +"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.4, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": version: 4.2.10 resolution: "graceful-fs@npm:4.2.10" checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da @@ -9441,13 +8741,6 @@ __metadata: languageName: node linkType: hard -"has-bigints@npm:^1.0.1": - version: 1.0.1 - resolution: "has-bigints@npm:1.0.1" - checksum: 44ab55868174470065d2e0f8f6def1c990d12b82162a8803c679699fa8a39f966e336f2a33c185092fe8aea7e8bf2e85f1c26add5f29d98f2318bd270096b183 - languageName: node - linkType: hard - "has-bigints@npm:^1.0.2": version: 1.0.2 resolution: "has-bigints@npm:1.0.2" @@ -9494,21 +8787,7 @@ __metadata: languageName: node linkType: hard -"has-symbols@npm:^1.0.1": - version: 1.0.1 - resolution: "has-symbols@npm:1.0.1" - checksum: 4f09be6682f9fc29855ded1101ad2a0f5d559d7d9ed68f7b68be1ea213c23991216d08d6585bf3ff6fded6f526cc506bda528d276f083602b55d232f132cfa27 - languageName: node - linkType: hard - -"has-symbols@npm:^1.0.2": - version: 1.0.2 - resolution: "has-symbols@npm:1.0.2" - checksum: 2309c426071731be792b5be43b3da6fb4ed7cbe8a9a6bcfca1862587709f01b33d575ce8f5c264c1eaad09fca2f9a8208c0a2be156232629daa2dd0c0740976b - languageName: node - linkType: hard - -"has-symbols@npm:^1.0.3": +"has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3": version: 1.0.3 resolution: "has-symbols@npm:1.0.3" checksum: a054c40c631c0d5741a8285010a0777ea0c068f99ed43e5d6eb12972da223f8af553a455132fdb0801bdcfa0e0f443c0c03a68d8555aa529b3144b446c3f2410 @@ -9681,17 +8960,7 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:^5.0.0": - version: 5.0.0 - resolution: "https-proxy-agent@npm:5.0.0" - dependencies: - agent-base: 6 - debug: 4 - checksum: 165bfb090bd26d47693597661298006841ab733d0c7383a8cb2f17373387a94c903a3ac687090aa739de05e379ab6f868bae84ab4eac288ad85c328cd1ec9e53 - languageName: node - linkType: hard - -"https-proxy-agent@npm:^5.0.1": +"https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1": version: 5.0.1 resolution: "https-proxy-agent@npm:5.0.1" dependencies: @@ -10049,14 +9318,7 @@ __metadata: languageName: node linkType: hard -"is-callable@npm:^1.1.4, is-callable@npm:^1.2.2": - version: 1.2.2 - resolution: "is-callable@npm:1.2.2" - checksum: 2bbf65bd5d39ccad3cae3954c482019466565a9b8027769a21cf2deebb25c195fb10f4974295b6118a815f6be3440bd7b7555ac742cf145f65a6a7d2484ebc3a - languageName: node - linkType: hard - -"is-callable@npm:^1.2.4": +"is-callable@npm:^1.1.4, is-callable@npm:^1.2.4": version: 1.2.4 resolution: "is-callable@npm:1.2.4" checksum: 1a28d57dc435797dae04b173b65d6d1e77d4f16276e9eff973f994eadcfdc30a017e6a597f092752a083c1103cceb56c91e3dadc6692fedb9898dfaba701575f @@ -10219,13 +9481,6 @@ __metadata: languageName: node linkType: hard -"is-negative-zero@npm:^2.0.0, is-negative-zero@npm:^2.0.1": - version: 2.0.1 - resolution: "is-negative-zero@npm:2.0.1" - checksum: a46f2e0cb5e16fdb8f2011ed488979386d7e68d381966682e3f4c98fc126efe47f26827912baca2d06a02a644aee458b9cba307fb389f6b161e759125db7a3b8 - languageName: node - linkType: hard - "is-negative-zero@npm:^2.0.2": version: 2.0.2 resolution: "is-negative-zero@npm:2.0.2" @@ -10298,15 +9553,6 @@ __metadata: languageName: node linkType: hard -"is-regex@npm:^1.1.1": - version: 1.1.1 - resolution: "is-regex@npm:1.1.1" - dependencies: - has-symbols: ^1.0.1 - checksum: af1b307612f4405883ef42dec287884a9d6dc1e504ccc6232bbaf72faf25ee556f60aa62d68abb90487b390b9b83513d429365cd59f5c4362232bfe3b95b81a2 - languageName: node - linkType: hard - "is-regex@npm:^1.1.4": version: 1.1.4 resolution: "is-regex@npm:1.1.4" @@ -10356,13 +9602,6 @@ __metadata: languageName: node linkType: hard -"is-shared-array-buffer@npm:^1.0.1": - version: 1.0.1 - resolution: "is-shared-array-buffer@npm:1.0.1" - checksum: 2ffb92533e64e2876e6cfe6906871d28400b6f1a53130fe652ec8007bc0e5044d05e7af8e31bdc992fbba520bd92938cfbeedd0f286be92f250c7c76191c4d90 - languageName: node - linkType: hard - "is-shared-array-buffer@npm:^1.0.2": version: 1.0.2 resolution: "is-shared-array-buffer@npm:1.0.2" @@ -10386,14 +9625,7 @@ __metadata: languageName: node linkType: hard -"is-string@npm:^1.0.5": - version: 1.0.5 - resolution: "is-string@npm:1.0.5" - checksum: 68d77a991f55592721cc7d5800ff95cdb2c4f242e3a98fdc939c409879f7b8f297b8352184032b6b2183994b4c457f42df8de004c58b5b43655c8b2f3e3ecc17 - languageName: node - linkType: hard - -"is-string@npm:^1.0.7": +"is-string@npm:^1.0.5, is-string@npm:^1.0.7": version: 1.0.7 resolution: "is-string@npm:1.0.7" dependencies: @@ -10457,15 +9689,6 @@ __metadata: languageName: node linkType: hard -"is-weakref@npm:^1.0.1": - version: 1.0.1 - resolution: "is-weakref@npm:1.0.1" - dependencies: - call-bind: ^1.0.0 - checksum: fdafb7b955671dd2f9658ff47c86e4025c0650fc68a3542a40e5a75898a763b1abd6b1e1f9f13207eed49541cdd76af67d73c44989ea358b201b70274cf8f6c1 - languageName: node - linkType: hard - "is-weakref@npm:^1.0.2": version: 1.0.2 resolution: "is-weakref@npm:1.0.2" @@ -10540,14 +9763,7 @@ __metadata: languageName: node linkType: hard -"istanbul-lib-coverage@npm:^3.0.0": - version: 3.0.0 - resolution: "istanbul-lib-coverage@npm:3.0.0" - checksum: ea57c2428858cc5d1e04c0e28b362950bbf6415e8ba1235cdd6f4c8dc3c57cb950db8b4e8a4f7e33abc240aa1eb816dba0d7285bdb8b70bda22bb2082492dbfc - languageName: node - linkType: hard - -"istanbul-lib-coverage@npm:^3.2.0": +"istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.2.0": version: 3.2.0 resolution: "istanbul-lib-coverage@npm:3.2.0" checksum: a2a545033b9d56da04a8571ed05c8120bf10e9bce01cf8633a3a2b0d1d83dff4ac4fe78d6d5673c27fc29b7f21a41d75f83a36be09f82a61c367b56aa73c1ff9 @@ -10725,18 +9941,6 @@ __metadata: languageName: node linkType: hard -"jest-diff@npm:^29.1.2": - version: 29.1.2 - resolution: "jest-diff@npm:29.1.2" - dependencies: - chalk: ^4.0.0 - diff-sequences: ^29.0.0 - jest-get-type: ^29.0.0 - pretty-format: ^29.1.2 - checksum: 0c9774155965f38ddeebacc1a0c3301f27f8c35935020e6088278cc37d5b1470ae8a8ade848b3e20ba066e146f79e3c52f0fb76c1b99f1574732e7c697dfb305 - languageName: node - linkType: hard - "jest-diff@npm:^29.2.1": version: 29.2.1 resolution: "jest-diff@npm:29.2.1" @@ -10806,13 +10010,6 @@ __metadata: languageName: node linkType: hard -"jest-get-type@npm:^29.0.0": - version: 29.0.0 - resolution: "jest-get-type@npm:29.0.0" - checksum: 9abdd11d69788963a92fb9d813a7b887654ecc8f3a3c8bf83166d33aaf4d57ed380e74ab8ef106f57565dd235446ca6ebc607679f0c516c4633e6d09f0540a2b - languageName: node - linkType: hard - "jest-get-type@npm:^29.2.0": version: 29.2.0 resolution: "jest-get-type@npm:29.2.0" @@ -10878,18 +10075,6 @@ __metadata: languageName: node linkType: hard -"jest-matcher-utils@npm:^29.1.2": - version: 29.1.2 - resolution: "jest-matcher-utils@npm:29.1.2" - dependencies: - chalk: ^4.0.0 - jest-diff: ^29.1.2 - jest-get-type: ^29.0.0 - pretty-format: ^29.1.2 - checksum: 648afe4349eecf33316b08cf92b85a9a61aa6d1cf9b086a619ba494842888e1d883a783616d09c07a7a63e030983d4bb902e9a6b07702dc5247282d25c4c644f - languageName: node - linkType: hard - "jest-matcher-utils@npm:^29.2.1": version: 29.2.1 resolution: "jest-matcher-utils@npm:29.2.1" @@ -10902,23 +10087,6 @@ __metadata: languageName: node linkType: hard -"jest-message-util@npm:^29.1.2": - version: 29.1.2 - resolution: "jest-message-util@npm:29.1.2" - dependencies: - "@babel/code-frame": ^7.12.13 - "@jest/types": ^29.1.2 - "@types/stack-utils": ^2.0.0 - chalk: ^4.0.0 - graceful-fs: ^4.2.9 - micromatch: ^4.0.4 - pretty-format: ^29.1.2 - slash: ^3.0.0 - stack-utils: ^2.0.3 - checksum: d1541bd7264ee048f486b01e9b7d30fef0c343576119401e6569b3b865e9f2146e30e5d0f3b3bdf34f3feee42e5137affbfbe5bebea93a661be96d1abb167f29 - languageName: node - linkType: hard - "jest-message-util@npm:^29.2.1": version: 29.2.1 resolution: "jest-message-util@npm:29.2.1" @@ -11084,20 +10252,6 @@ __metadata: languageName: node linkType: hard -"jest-util@npm:^29.1.2": - version: 29.1.2 - resolution: "jest-util@npm:29.1.2" - dependencies: - "@jest/types": ^29.1.2 - "@types/node": "*" - chalk: ^4.0.0 - ci-info: ^3.2.0 - graceful-fs: ^4.2.9 - picomatch: ^2.2.3 - checksum: 6c55464e2028032692c4801b339bc1f7418826072d75981b8f29ded6ccba8cb8e1f164eb3d12d859cb63c24a8e9be90204f0d3c4d33e530375f1e5935755b5a9 - languageName: node - linkType: hard - "jest-util@npm:^29.2.1": version: 29.2.1 resolution: "jest-util@npm:29.2.1" @@ -12234,13 +11388,6 @@ __metadata: languageName: node linkType: hard -"mime-db@npm:1.48.0": - version: 1.48.0 - resolution: "mime-db@npm:1.48.0" - checksum: d778392e474a5e78c24eef5a2894261f0ed168d2762c1ac2a115aa34c2274c9426178b92a6cc55e9edb8f13e7e9b8116380b0e61db9ff6d763e62876a65eea57 - languageName: node - linkType: hard - "mime-db@npm:1.52.0": version: 1.52.0 resolution: "mime-db@npm:1.52.0" @@ -12248,7 +11395,7 @@ __metadata: languageName: node linkType: hard -"mime-types@npm:^2.1.12": +"mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31": version: 2.1.35 resolution: "mime-types@npm:2.1.35" dependencies: @@ -12257,15 +11404,6 @@ __metadata: languageName: node linkType: hard -"mime-types@npm:^2.1.27, mime-types@npm:^2.1.31": - version: 2.1.31 - resolution: "mime-types@npm:2.1.31" - dependencies: - mime-db: 1.48.0 - checksum: eb1612aa96403823c7a2ccb1a39d58ce11477e685560186e7d369d8164260fd6fc1eeb56fa23acb6a4050583f417b2a685b69c23eb2bd8ed169fb0c6e323740a - languageName: node - linkType: hard - "mime@npm:^1.4.1": version: 1.6.0 resolution: "mime@npm:1.6.0" @@ -12399,16 +11537,7 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^3.0.0": - version: 3.1.6 - resolution: "minipass@npm:3.1.6" - dependencies: - yallist: ^4.0.0 - checksum: 57a04041413a3531a65062452cb5175f93383ef245d6f4a2961d34386eb9aa8ac11ac7f16f791f5e8bbaf1dfb1ef01596870c88e8822215db57aa591a5bb0a77 - languageName: node - linkType: hard - -"minipass@npm:^3.1.1, minipass@npm:^3.1.6": +"minipass@npm:^3.0.0, minipass@npm:^3.1.1, minipass@npm:^3.1.6": version: 3.3.5 resolution: "minipass@npm:3.3.5" dependencies: @@ -12640,13 +11769,6 @@ __metadata: languageName: node linkType: hard -"node-releases@npm:^2.0.5": - version: 2.0.5 - resolution: "node-releases@npm:2.0.5" - checksum: e85d949addd19f8827f32569d2be5751e7812ccf6cc47879d49f79b5234ff4982225e39a3929315f96370823b070640fb04d79fc0ddec8b515a969a03493a42f - languageName: node - linkType: hard - "node-releases@npm:^2.0.6": version: 2.0.6 resolution: "node-releases@npm:2.0.6" @@ -12850,21 +11972,21 @@ __metadata: languageName: node linkType: hard -"object-inspect@npm:^1.11.0, object-inspect@npm:^1.12.0, object-inspect@npm:^1.12.2, object-inspect@npm:^1.8.0, object-inspect@npm:^1.9.0": +"object-inspect@npm:^1.12.0, object-inspect@npm:^1.12.2, object-inspect@npm:^1.9.0": version: 1.12.2 resolution: "object-inspect@npm:1.12.2" checksum: a534fc1b8534284ed71f25ce3a496013b7ea030f3d1b77118f6b7b1713829262be9e6243acbcb3ef8c626e2b64186112cb7f6db74e37b2789b9c789ca23048b2 languageName: node linkType: hard -"object-keys@npm:^1.0.12, object-keys@npm:^1.1.1": +"object-keys@npm:^1.1.1": version: 1.1.1 resolution: "object-keys@npm:1.1.1" checksum: b363c5e7644b1e1b04aa507e88dcb8e3a2f52b6ffd0ea801e4c7a62d5aa559affe21c55a07fd4b1fd55fc03a33c610d73426664b20032405d7b92a1414c34d6a languageName: node linkType: hard -"object.assign@npm:^4.0.4, object.assign@npm:^4.1.0, object.assign@npm:^4.1.1, object.assign@npm:^4.1.2": +"object.assign@npm:^4.0.4, object.assign@npm:^4.1.0, object.assign@npm:^4.1.2": version: 4.1.2 resolution: "object.assign@npm:4.1.2" dependencies: @@ -13215,19 +12337,7 @@ __metadata: languageName: node linkType: hard -"parse-json@npm:^5.0.0": - version: 5.1.0 - resolution: "parse-json@npm:5.1.0" - dependencies: - "@babel/code-frame": ^7.0.0 - error-ex: ^1.3.1 - json-parse-even-better-errors: ^2.3.0 - lines-and-columns: ^1.1.6 - checksum: 0c0c299347e74b9f5720644abc5a07667e66143114e28b63967468611aad5a4c2216fc990c674f83398cd0c2a176cfd7098f79e279079fcc487dfd5f9b475517 - languageName: node - linkType: hard - -"parse-json@npm:^5.2.0": +"parse-json@npm:^5.0.0, parse-json@npm:^5.2.0": version: 5.2.0 resolution: "parse-json@npm:5.2.0" dependencies: @@ -13407,21 +12517,7 @@ __metadata: languageName: node linkType: hard -"picomatch@npm:^2.0.4, picomatch@npm:^2.2.2": - version: 2.2.2 - resolution: "picomatch@npm:2.2.2" - checksum: 897a589f94665b4fd93e075fa94893936afe3f7bbef44250f0e878a8d9d001972a79589cac2856c24f6f5aa3b0abc9c8ba00c98fae4dc22bc0117188864d4181 - languageName: node - linkType: hard - -"picomatch@npm:^2.2.3": - version: 2.2.3 - resolution: "picomatch@npm:2.2.3" - checksum: 45e2b882b5265d3a322c6b7b854c1fdc33d5083011b9730296e9ad26332824ac356529f1ce1b0c1111f08a84c02e8525ea121d17c4bbe2970ca6665e587921fa - languageName: node - linkType: hard - -"picomatch@npm:^2.3.1": +"picomatch@npm:^2.0.4, picomatch@npm:^2.2.2, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1": version: 2.3.1 resolution: "picomatch@npm:2.3.1" checksum: 050c865ce81119c4822c45d3c84f1ced46f93a0126febae20737bd05ca20589c564d6e9226977df859ed5e03dc73f02584a2b0faad36e896936238238b0446cf @@ -14248,7 +13344,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:8.4.18, postcss@npm:^8.4.17": +"postcss@npm:8.4.18, postcss@npm:^8.3.11, postcss@npm:^8.4.17": version: 8.4.18 resolution: "postcss@npm:8.4.18" dependencies: @@ -14281,17 +13377,6 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.3.11": - version: 8.4.17 - resolution: "postcss@npm:8.4.17" - dependencies: - nanoid: ^3.3.4 - picocolors: ^1.0.0 - source-map-js: ^1.0.2 - checksum: a6d9096dd711e17f7b1d18ff5dcb4fdedf3941d5a3dc8b0e4ea873b8f31972d57f73d6da9a8aed7ff389eb52190ed34f6a94f299a7f5ddc68b08a24a48f77eb9 - languageName: node - linkType: hard - "prelude-ls@npm:^1.2.1": version: 1.2.1 resolution: "prelude-ls@npm:1.2.1" @@ -14342,18 +13427,7 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^29.0.0, pretty-format@npm:^29.1.2": - version: 29.1.2 - resolution: "pretty-format@npm:29.1.2" - dependencies: - "@jest/schemas": ^29.0.0 - ansi-styles: ^5.0.0 - react-is: ^18.0.0 - checksum: b2c6e77666716e55094f29dcbd92e431a1b8cc0a06cd41ec1a3c8a10e5e56bb1f2d7b5942f1d8f6a0f69912712f3edb4c41713926d60cbb89f2a41355d49e7a4 - languageName: node - linkType: hard - -"pretty-format@npm:^29.2.1": +"pretty-format@npm:^29.0.0, pretty-format@npm:^29.2.1": version: 29.2.1 resolution: "pretty-format@npm:29.2.1" dependencies: @@ -15306,16 +14380,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:^7.0.0": - version: 7.5.5 - resolution: "rxjs@npm:7.5.5" - dependencies: - tslib: ^2.1.0 - checksum: e034f60805210cce756dd2f49664a8108780b117cf5d0e2281506e9e6387f7b4f1532d974a8c8b09314fa7a16dd2f6cff3462072a5789672b5dcb45c4173f3c6 - languageName: node - linkType: hard - -"rxjs@npm:^7.5.5": +"rxjs@npm:^7.0.0, rxjs@npm:^7.5.5": version: 7.5.6 resolution: "rxjs@npm:7.5.6" dependencies: @@ -15436,18 +14501,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7": - version: 7.3.7 - resolution: "semver@npm:7.3.7" - dependencies: - lru-cache: ^6.0.0 - bin: - semver: bin/semver.js - checksum: 2fa3e877568cd6ce769c75c211beaed1f9fce80b28338cadd9d0b6c40f2e2862bafd62c19a6cff42f3d54292b7c623277bcab8816a2b5521cf15210d43e75232 - languageName: node - linkType: hard - -"semver@npm:^7.3.8": +"semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8": version: 7.3.8 resolution: "semver@npm:7.3.8" dependencies: @@ -15542,14 +14596,7 @@ __metadata: languageName: node linkType: hard -"signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3": - version: 3.0.3 - resolution: "signal-exit@npm:3.0.3" - checksum: f0169d3f1263d06df32ca072b0bf33b34c6f8f0341a7a1621558a2444dfbe8f5fec76b35537fcc6f0bc4944bdb5336fe0bdcf41a5422c4e45a1dba3f45475e6c - languageName: node - linkType: hard - -"signal-exit@npm:^3.0.7": +"signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7": version: 3.0.7 resolution: "signal-exit@npm:3.0.7" checksum: a2f098f247adc367dffc27845853e9959b9e88b01cb301658cfe4194352d8d2bb32e18467c786a7fe15f1d44b233ea35633d076d5e737870b7139949d1ab6318 @@ -15976,26 +15023,6 @@ __metadata: languageName: node linkType: hard -"string.prototype.trimend@npm:^1.0.1": - version: 1.0.3 - resolution: "string.prototype.trimend@npm:1.0.3" - dependencies: - call-bind: ^1.0.0 - define-properties: ^1.1.3 - checksum: 6bff84b939269bae621dd2035f73a147170bab100b5f72e700b889e9e5c89422de65ca9b79feb6b0c4c5c5d9d85c7c73c3f5c3a3c7d6ffddb90d338f78c6d344 - languageName: node - linkType: hard - -"string.prototype.trimend@npm:^1.0.4": - version: 1.0.4 - resolution: "string.prototype.trimend@npm:1.0.4" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.3 - checksum: 17e5aa45c3983f582693161f972c1c1fa4bbbdf22e70e582b00c91b6575f01680dc34e83005b98e31abe4d5d29e0b21fcc24690239c106c7b2315aade6a898ac - languageName: node - linkType: hard - "string.prototype.trimend@npm:^1.0.5": version: 1.0.5 resolution: "string.prototype.trimend@npm:1.0.5" @@ -16007,26 +15034,6 @@ __metadata: languageName: node linkType: hard -"string.prototype.trimstart@npm:^1.0.1": - version: 1.0.3 - resolution: "string.prototype.trimstart@npm:1.0.3" - dependencies: - call-bind: ^1.0.0 - define-properties: ^1.1.3 - checksum: 46c49a70d9ae19ff0e83b90c86aceabfd4b048ad7d1f83eaf379d2b7e230fee9d19d774ce9f6cfbe08d0ea71bf13b7618684d619254c5c1785943df5e3a76c10 - languageName: node - linkType: hard - -"string.prototype.trimstart@npm:^1.0.4": - version: 1.0.4 - resolution: "string.prototype.trimstart@npm:1.0.4" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.3 - checksum: 3fb06818d3cccac5fa3f5f9873d984794ca0e9f6616fae6fcc745885d9efed4e17fe15f832515d9af5e16c279857fdbffdfc489ca4ed577811b017721b30302f - languageName: node - linkType: hard - "string.prototype.trimstart@npm:^1.0.5": version: 1.0.5 resolution: "string.prototype.trimstart@npm:1.0.5" @@ -16960,18 +15967,6 @@ __metadata: languageName: node linkType: hard -"unbox-primitive@npm:^1.0.1": - version: 1.0.1 - resolution: "unbox-primitive@npm:1.0.1" - dependencies: - function-bind: ^1.1.1 - has-bigints: ^1.0.1 - has-symbols: ^1.0.2 - which-boxed-primitive: ^1.0.2 - checksum: 89d950e18fb45672bc6b3c961f1e72c07beb9640c7ceed847b571ba6f7d2af570ae1a2584cfee268b9d9ea1e3293f7e33e0bc29eaeb9f8e8a0bab057ff9e6bba - languageName: node - linkType: hard - "unbox-primitive@npm:^1.0.2": version: 1.0.2 resolution: "unbox-primitive@npm:1.0.2" @@ -17118,20 +16113,6 @@ __metadata: languageName: node linkType: hard -"update-browserslist-db@npm:^1.0.4": - version: 1.0.4 - resolution: "update-browserslist-db@npm:1.0.4" - dependencies: - escalade: ^3.1.1 - picocolors: ^1.0.0 - peerDependencies: - browserslist: ">= 4.21.0" - bin: - browserslist-lint: cli.js - checksum: 7c7da28d0fc733b17e01c8fa9385ab909eadce64b8ea644e9603867dc368c2e2a6611af8247e72612b23f9e7cb87ac7c7585a05ff94e1759e9d646cbe9bf49a7 - languageName: node - linkType: hard - "update-browserslist-db@npm:^1.0.9": version: 1.0.9 resolution: "update-browserslist-db@npm:1.0.9" @@ -17696,11 +16677,7 @@ __metadata: dependencies: "@babel/core": 7.19.6 "@babel/eslint-parser": 7.19.1 - "@babel/plugin-proposal-class-properties": 7.18.6 "@babel/plugin-proposal-decorators": 7.19.6 - "@babel/plugin-proposal-nullish-coalescing-operator": 7.18.6 - "@babel/plugin-proposal-optional-chaining": 7.18.9 - "@babel/plugin-syntax-dynamic-import": 7.8.3 "@babel/preset-env": 7.19.4 "@babel/preset-react": 7.18.6 "@babel/preset-typescript": 7.18.6 From f33ade8cbee484d39c0dc46c6a0d1c1c8b377a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Wei=C3=9F?= Date: Tue, 25 Oct 2022 11:33:27 +0200 Subject: [PATCH 57/66] chore: set port to 0.0.0.0 --- server/Server.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/Server.ts b/server/Server.ts index 586fc5a40f5..4cdc1981810 100644 --- a/server/Server.ts +++ b/server/Server.ts @@ -241,9 +241,11 @@ class Server { }; this.server = https .createServer(options, this.app) - .listen(this.config.SERVER.PORT_HTTP, () => resolve(this.config.SERVER.PORT_HTTP)); + .listen(this.config.SERVER.PORT_HTTP, '0.0.0.0', () => resolve(this.config.SERVER.PORT_HTTP)); } else { - this.server = this.app.listen(this.config.SERVER.PORT_HTTP, () => resolve(this.config.SERVER.PORT_HTTP)); + this.server = this.app.listen(this.config.SERVER.PORT_HTTP, '0.0.0.0', () => + resolve(this.config.SERVER.PORT_HTTP), + ); } } else { reject('Server port not specified.'); From 1c9947bfdca1b83904b55bf0c802201cf5980cda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Wei=C3=9F?= <77456193+aweiss-dev@users.noreply.github.com> Date: Tue, 25 Oct 2022 12:06:37 +0200 Subject: [PATCH 58/66] fix: update react-ui-kit to apply font weight fix (#13967) --- package.json | 2 +- yarn.lock | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 5e1bc9766f6..023cd967a4d 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "@wireapp/antiscroll-2": "1.3.1", "@wireapp/avs": "8.2.16", "@wireapp/core": "34.1.4", - "@wireapp/react-ui-kit": "8.17.5", + "@wireapp/react-ui-kit": "8.17.8", "@wireapp/store-engine-dexie": "1.7.11", "@wireapp/store-engine-sqleet": "1.8.9", "@wireapp/webapp-events": "0.14.9", diff --git a/yarn.lock b/yarn.lock index 89edba9f6d9..203446110cc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4161,14 +4161,14 @@ __metadata: languageName: node linkType: hard -"@wireapp/react-ui-kit@npm:8.17.5": - version: 8.17.5 - resolution: "@wireapp/react-ui-kit@npm:8.17.5" +"@wireapp/react-ui-kit@npm:8.17.8": + version: 8.17.8 + resolution: "@wireapp/react-ui-kit@npm:8.17.8" dependencies: "@types/color": 3.0.3 color: 4.2.3 emotion-normalize: 11.0.1 - react-select: 5.5.2 + react-select: 5.5.4 react-transition-group: 4.4.5 peerDependencies: "@emotion/react": 11.10.4 @@ -4178,7 +4178,7 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: ee35c4aaf067c1a67b958b4ebd862c3a1b570c019393001faa5a067e4dfd814605d2065c9cb512f41bbb0d13fcfcc8e6bd88c246fd7a174afa394769fcfad72e + checksum: d124cbd8c3ac2c5a718c7806c00d214eede4f930741f007dd4192753511d77bd0c305af9b3a59f5b8f79dd799b3876f810bdf33ebfd040a800892e68598592fe languageName: node linkType: hard @@ -11337,10 +11337,10 @@ __metadata: languageName: node linkType: hard -"memoize-one@npm:^5.0.0": - version: 5.2.1 - resolution: "memoize-one@npm:5.2.1" - checksum: a3cba7b824ebcf24cdfcd234aa7f86f3ad6394b8d9be4c96ff756dafb8b51c7f71320785fbc2304f1af48a0467cbbd2a409efc9333025700ed523f254cb52e3d +"memoize-one@npm:^6.0.0": + version: 6.0.0 + resolution: "memoize-one@npm:6.0.0" + checksum: f185ea69f7cceae5d1cb596266dcffccf545e8e7b4106ec6aa93b71ab9d16460dd118ac8b12982c55f6d6322fcc1485de139df07eacffaae94888b9b3ad7675f languageName: node linkType: hard @@ -13759,23 +13759,23 @@ __metadata: languageName: node linkType: hard -"react-select@npm:5.5.2": - version: 5.5.2 - resolution: "react-select@npm:5.5.2" +"react-select@npm:5.5.4": + version: 5.5.4 + resolution: "react-select@npm:5.5.4" dependencies: "@babel/runtime": ^7.12.0 "@emotion/cache": ^11.4.0 "@emotion/react": ^11.8.1 "@floating-ui/dom": ^1.0.1 "@types/react-transition-group": ^4.4.0 - memoize-one: ^5.0.0 + memoize-one: ^6.0.0 prop-types: ^15.6.0 react-transition-group: ^4.3.0 use-isomorphic-layout-effect: ^1.1.2 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 3c340052dfe9558f0ef5e8dc84f8cece6ff424c9d6c56da3f3c551c84b563f616f32a8769bbfb5582cfb6e625d817b74e6562646e6218b39b6c450b146a68345 + checksum: 3870bef752f8242dd9fed6d3445da525623d2a022801e40999af597f36d416e5deb7db1ba690b4d5aff70d8a00b17ae9200c6001bfc7c6812c0e7b0f4de79454 languageName: node linkType: hard @@ -16722,7 +16722,7 @@ __metadata: "@wireapp/core": 34.1.4 "@wireapp/eslint-config": 1.12.12 "@wireapp/prettier-config": 0.4.7 - "@wireapp/react-ui-kit": 8.17.5 + "@wireapp/react-ui-kit": 8.17.8 "@wireapp/store-engine-dexie": 1.7.11 "@wireapp/store-engine-sqleet": 1.8.9 "@wireapp/webapp-events": 0.14.9 From 0997690987a8acc8e2afe5680106561f8e0d469e Mon Sep 17 00:00:00 2001 From: Virgile <78490891+V-Gira@users.noreply.github.com> Date: Tue, 25 Oct 2022 14:28:51 +0200 Subject: [PATCH 59/66] refactor: correct colors in dark mode [ACC-61] (#13675) * refactor: correct colors in dark mode acc-61 * remove fade on css var * add css variable to mixins --- src/style/common/mixins.less | 2 +- src/style/content/conversation/input-bar.less | 2 +- src/style/foundation/themes.less | 2 ++ src/style/foundation/warnings.less | 6 +++--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/style/common/mixins.less b/src/style/common/mixins.less index 663d37eca5c..5419e55b8c9 100644 --- a/src/style/common/mixins.less +++ b/src/style/common/mixins.less @@ -41,7 +41,7 @@ .setVariables(foreground background); .setColorFade(foreground, @foreground); .setColorFade(background, @background); - .setVariables(app-bg sidebar-bg sidebar-border-color main-color border-color app-bg-secondary conversation-list-bg-opacity); + .setVariables(app-bg sidebar-bg input-bar-bg sidebar-border-color main-color border-color app-bg-secondary conversation-list-bg-opacity); .setVariables(group-video-bg group-video-tile-bg inactive-call-button-bg inactive-call-button-border inactive-call-button-hover-bg inactive-call-button-hover-border disabled-call-button-bg disabled-call-button-border disabled-call-button-svg button-group-left-hover button-group-right-hover toggle-button-unselected-hover-border toggle-button-unselected-hover-bg); .setVariables(modal-bg modal-border-color); .setVariables(preference-account-input-bg); diff --git a/src/style/content/conversation/input-bar.less b/src/style/content/conversation/input-bar.less index 81037ea63fa..1ece74ba16c 100644 --- a/src/style/content/conversation/input-bar.less +++ b/src/style/content/conversation/input-bar.less @@ -29,7 +29,7 @@ z-index: 10; display: flex; padding-right: 8px; - background-color: var(--app-bg-secondary); + background-color: var(--input-bar-bg); &--editing { background-color: var(--text-input-editing); diff --git a/src/style/foundation/themes.less b/src/style/foundation/themes.less index 462b2577834..b1b1bd77f3d 100644 --- a/src/style/foundation/themes.less +++ b/src/style/foundation/themes.less @@ -37,6 +37,7 @@ body.theme-default { @conversation-list-bg-opacity: fade(#000, 64%); @sidebar-box-shadow: #eee; @sidebar-box-shadow-lg: rgba(0, 0, 0, 0.12); + @input-bar-bg: var(--white); // ---------------------------------------------------------------------------- // Calling @@ -130,6 +131,7 @@ body.theme-dark { @border-color: var(--gray-90); @app-bg-secondary: var(--black); @conversation-list-bg-opacity: fade(#000, 78%); + @input-bar-bg: var(--gray-100); // ---------------------------------------------------------------------------- // Calling diff --git a/src/style/foundation/warnings.less b/src/style/foundation/warnings.less index 045130831b6..68d60b0a567 100644 --- a/src/style/foundation/warnings.less +++ b/src/style/foundation/warnings.less @@ -43,13 +43,13 @@ width: 100%; justify-content: center; background-color: var(--accent-color); - color: #fff; + color: var(--app-bg-secondary); a { - color: @w-white; + color: var(--app-bg-secondary); &:hover, &:focus { - color: fade(@w-white, 80%); + color: var(--app-bg); } } } From 22b582f10782b3a160a5c6758a0e562155adefcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20G=C3=B3rka?= Date: Tue, 25 Oct 2022 15:19:19 +0200 Subject: [PATCH 60/66] runfix: enable sending the same asset multiple times in a row (#13966) * runfix: enable sending the same asset multiple times in a row * refactor: move AssetUploadButton to separate component and reset file input by rerendering * test: AssetUploadButton component test * refactor: wrap upload button with form to reset it easily after upload --- .../message-list/AssetUploadButton.test.tsx | 66 ++++++++++++++++++ .../page/message-list/AssetUploadButton.tsx | 69 +++++++++++++++++++ .../InputBarControls/ControlButtons.tsx | 23 +------ 3 files changed, 137 insertions(+), 21 deletions(-) create mode 100644 src/script/page/message-list/AssetUploadButton.test.tsx create mode 100644 src/script/page/message-list/AssetUploadButton.tsx diff --git a/src/script/page/message-list/AssetUploadButton.test.tsx b/src/script/page/message-list/AssetUploadButton.test.tsx new file mode 100644 index 00000000000..75a50f2a3f1 --- /dev/null +++ b/src/script/page/message-list/AssetUploadButton.test.tsx @@ -0,0 +1,66 @@ +/* + * Wire + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + * + */ + +import {render, fireEvent} from '@testing-library/react'; +import {AssetUploadButton} from './AssetUploadButton'; + +jest.mock('../../Config', () => ({ + Config: { + getConfig: () => ({ + ALLOWED_IMAGE_TYPES: ['image/gif', 'image/avif'], + FEATURE: {ALLOWED_FILE_UPLOAD_EXTENSIONS: ['*']}, + }), + }, +})); + +const pngFile = new File(['(⌐□_□)'], 'chucknorris.png', {type: 'image/png'}); + +describe('AssetUploadButton', () => { + it('Does call onSelectFiles with uploaded file', () => { + const onSelectFiles = jest.fn(); + + const {container} = render(); + const fileInput = container.querySelector('input[type="file"]') as HTMLInputElement; + + fireEvent.change(fileInput, { + target: {files: [pngFile]}, + }); + + expect(onSelectFiles).toHaveBeenCalledWith([pngFile]); + }); + + it('Does reset a form with input after upload', () => { + const onSelectFiles = jest.fn(); + + const {container} = render(); + + const form = container.querySelector('form'); + jest.spyOn(form!, 'reset'); + + const fileInput = container.querySelector('input[type="file"]') as HTMLInputElement; + + fireEvent.change(fileInput, { + target: {files: [pngFile]}, + }); + + expect(onSelectFiles).toHaveBeenCalledWith([pngFile]); + expect(fileInput.files?.[0].name).toEqual(pngFile.name); + expect(form!.reset).toHaveBeenCalled(); + }); +}); diff --git a/src/script/page/message-list/AssetUploadButton.tsx b/src/script/page/message-list/AssetUploadButton.tsx new file mode 100644 index 00000000000..086738c5dc5 --- /dev/null +++ b/src/script/page/message-list/AssetUploadButton.tsx @@ -0,0 +1,69 @@ +/* + * Wire + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + * + */ + +import {useRef} from 'react'; +import {Config} from '../../Config'; +import {t} from 'Util/LocalizerUtil'; +import Icon from 'Components/Icon'; + +interface AssetUploadButtonProps { + onSelectFiles: (files: File[]) => void; +} + +export const AssetUploadButton = ({onSelectFiles}: AssetUploadButtonProps) => { + const acceptedFileTypes = Config.getConfig().FEATURE.ALLOWED_FILE_UPLOAD_EXTENSIONS.join(','); + const fileRef = useRef(null!); + const formRef = useRef(null); + + const handleFileChange = (event: React.ChangeEvent) => { + const {files} = event.target; + + if (!files) { + return; + } + + onSelectFiles(Array.from(files)); + + //reset file input's value resetting form wrapper + formRef.current?.reset(); + }; + + return ( +
+ +
+ ); +}; diff --git a/src/script/page/message-list/InputBarControls/ControlButtons.tsx b/src/script/page/message-list/InputBarControls/ControlButtons.tsx index cc58803b1a2..1a88c948ecc 100644 --- a/src/script/page/message-list/InputBarControls/ControlButtons.tsx +++ b/src/script/page/message-list/InputBarControls/ControlButtons.tsx @@ -23,6 +23,7 @@ import MessageTimerButton from '../MessageTimerButton'; import {t} from 'Util/LocalizerUtil'; import {Conversation} from 'src/script/entity/Conversation'; import {Config} from '../../../Config'; +import {AssetUploadButton} from '../AssetUploadButton'; export type ControlButtonsProps = { input: string; @@ -54,10 +55,8 @@ const ControlButtons: React.FC = ({ onClickGif, }) => { const acceptedImageTypes = Config.getConfig().ALLOWED_IMAGE_TYPES.join(','); - const acceptedFileTypes = Config.getConfig().FEATURE.ALLOWED_FILE_UPLOAD_EXTENSIONS.join(','); const imageRef = useRef(null!); - const fileRef = useRef(null!); const pingTooltip = t('tooltipConversationPing'); @@ -119,25 +118,7 @@ const ControlButtons: React.FC = ({
  • - +
    • )} From 87d4b76c3a52a742e96ce22fb3e5bcb67e26087b Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Tue, 25 Oct 2022 17:15:31 +0200 Subject: [PATCH 61/66] runfix: upgrade @wireapp/core for mls client comparison fix --- package.json | 2 +- yarn.lock | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index e3bc81bdff2..3d3c2ba4448 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.4", "@wireapp/antiscroll-2": "1.3.1", "@wireapp/avs": "8.2.16", - "@wireapp/core": "32.0.3", + "@wireapp/core": "32.0.3-2", "@wireapp/react-ui-kit": "8.15.0", "@wireapp/store-engine-dexie": "1.7.6", "@wireapp/store-engine-sqleet": "1.8.6", diff --git a/yarn.lock b/yarn.lock index 05ba5ac3c5a..3f57a427f4a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2881,7 +2881,7 @@ resolved "https://registry.yarnpkg.com/@wireapp/antiscroll-2/-/antiscroll-2-1.3.1.tgz#bcb66f72c6dadc306e43235256b768ed3f89039c" integrity sha512-vWmWYAzSdyxs+xlgSPGtiNSTCM1z0nxM+jSPa/xz1/kuFKy80BrJP5xaGwNNLljBAz8ymlSPUUZlylUd0tFr1Q== -"@wireapp/api-client@^20.6.7": +"@wireapp/api-client@20.6.7": version "20.6.7" resolved "https://registry.yarnpkg.com/@wireapp/api-client/-/api-client-20.6.7.tgz#996b7f13b36a18f5cfe7ab919ba3cbffc5ff5668" integrity sha512-vZSMcfNw6EKIeo8wI3lAeBjYAoiWaSq8ySze7jPVSPgvY4BkTGIqCRw5I9g0sftX/5FeBin8lK9NP8Rog9xBEQ== @@ -2908,7 +2908,7 @@ resolved "https://registry.yarnpkg.com/@wireapp/cbor/-/cbor-4.7.3.tgz#b6ea9a487a7834fbdb9ba3941fee6c7aaf9a9d51" integrity sha512-RmD+k3EkiOqovqRX1mXplyfHS5/YKb20Wc4ucfKPvzHyfDhCmCPH1bV7jaZp87WrYWyGu0xBTfG+3USw60d0Kg== -"@wireapp/commons@^4.4.6": +"@wireapp/commons@4.4.6", "@wireapp/commons@^4.4.6": version "4.4.6" resolved "https://registry.yarnpkg.com/@wireapp/commons/-/commons-4.4.6.tgz#9418ce096f6b0c66c5a51d94dc7249057c956c70" integrity sha512-csaddG7/4tjs4tFo29uQ33q3ZsR/Au1M1uBOjzcbkVuirsFpEFUvEKfWG8l1RufQuiMU1y0n9LyL6zJJ1rEo1Q== @@ -2936,17 +2936,17 @@ resolved "https://registry.yarnpkg.com/@wireapp/core-crypto/-/core-crypto-0.5.2.tgz#73f7787529d80fee68a42881003a5bded40486d9" integrity sha512-D/lnVk/omd2xltMOpWjWkWfv/AHYzD0EepKLOqTq456coi5lwHNWja0niuFc6cBccXXrlkv3mh/ClDf2lGPvvg== -"@wireapp/core@32.0.3": - version "32.0.3" - resolved "https://registry.yarnpkg.com/@wireapp/core/-/core-32.0.3.tgz#8548e87c2d21d34f7c352f2c27a3723d0336a7dc" - integrity sha512-J/YL2GhyaltHr50CL5ty/d40D/CkyQo65xkZC4VGF/llJNStqYj0IQ+7GwmZNHnenwvTZ2hxv/4Cp2Bc+ya+LA== +"@wireapp/core@32.0.3-2": + version "32.0.3-2" + resolved "https://registry.yarnpkg.com/@wireapp/core/-/core-32.0.3-2.tgz#1e70e249dde9cbf1b0474f20e709aa567837defc" + integrity sha512-wXjmEgG2hyCuM417BUpIapDclepcs22o+giy+LuGWAG0AW2Ltkq2TWh/v0J2sUpfVs8y8/VtZhGk+X13NEl/4w== dependencies: - "@wireapp/api-client" "^20.6.7" - "@wireapp/commons" "^4.4.6" + "@wireapp/api-client" "20.6.7" + "@wireapp/commons" "4.4.6" "@wireapp/core-crypto" "0.5.2" "@wireapp/cryptobox" "12.8.0" - "@wireapp/promise-queue" "^1.3.0" - "@wireapp/store-engine-dexie" "^1.7.6" + "@wireapp/promise-queue" "1.3.0" + "@wireapp/store-engine-dexie" "1.7.6" axios "^0.27.2" bazinga64 "5.11.6" hash.js "1.1.7" @@ -2992,11 +2992,11 @@ "@types/node" "~14" "@wireapp/priority-queue@^1.8.6": - version "1.8.6" - resolved "https://registry.yarnpkg.com/@wireapp/priority-queue/-/priority-queue-1.8.6.tgz#9d1e2c27883813a4df9010d9219c45a5787ff5b6" - integrity sha512-h0r/KDf8Af92hjd8tEi41u3k8Tf4lP6I/UwJM5+yoBU56lDPZV0Ca8UNJmeUVXwaXYagAZ9TzZnkL9W0Z1eS+g== + version "1.8.11" + resolved "https://registry.yarnpkg.com/@wireapp/priority-queue/-/priority-queue-1.8.11.tgz#f141f1f5cc0d0a3808c510e155bf6d605a51c4b0" + integrity sha512-Kbc6IKJrz2xLsaf86ZezuCO+MossLqURyhVgloHpUj3lKW6cAJWh3dvZFwYIUvt6e2hAXdQifoxMMs/rc55Dmg== -"@wireapp/promise-queue@^1.3.0": +"@wireapp/promise-queue@1.3.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@wireapp/promise-queue/-/promise-queue-1.3.0.tgz#d98a11e8d28779964b3bba835ae308b9c1a77540" integrity sha512-wZsUhNTqB9Ns8u+R/lLzeDqFlgZESkWs8EajEcLpuL8q3RQakkTIRxZtSIzsyRp/+kxC28QF/BJy+GYmCLkbVA== @@ -3030,7 +3030,7 @@ react-select "5.4.0" react-transition-group "4.4.2" -"@wireapp/store-engine-dexie@1.7.6", "@wireapp/store-engine-dexie@^1.7.6": +"@wireapp/store-engine-dexie@1.7.6": version "1.7.6" resolved "https://registry.yarnpkg.com/@wireapp/store-engine-dexie/-/store-engine-dexie-1.7.6.tgz#cfd4ecb694ed057a9f2e4959a14b2e75028d7bf7" integrity sha512-D1Se/nJeIKECqdz7m7QWJ+orSpKjzTV3Y3J5DagBfw2Ju+AxOBkWOotSYtct6uyoJTdTFPicAT5qh0ebJ7Jfow== From ab428f93635f3be6407399889ba414d588eefdc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20G=C3=B3rka?= Date: Wed, 26 Oct 2022 08:18:54 +0200 Subject: [PATCH 62/66] runfix: upload same image multiple times (#13969) * runfix: wrapp image upload button with form and move it to separate file * test: add ImageUploadButton component test * refactor: organize directory structure in page folder * refactor: reorganise folder structure --- .../AccentColorPicker.test.tsx | 4 +- .../AccentColorPicker.tsx | 8 +-- src/script/page/AccentColorPicker/index.ts | 20 ++++++ .../page/{ => AppLock}/AppLock.test.tsx | 12 ++-- src/script/page/{ => AppLock}/AppLock.tsx | 14 ++-- src/script/page/AppLock/index.ts | 21 ++++++ .../panels/preferences/AccountPreferences.tsx | 2 +- .../AssetUploadButton.test.tsx | 4 +- .../AssetUploadButton.tsx | 5 +- .../message-list/AssetUploadButton/index.ts | 20 ++++++ .../ImageUploadButton.test.tsx | 66 ++++++++++++++++++ .../ImageUploadButton/ImageUploadButton.tsx | 69 +++++++++++++++++++ .../message-list/ImageUploadButton/index.ts | 20 ++++++ .../InputBarControls/ControlButtons.tsx | 30 ++------ .../MessageTimerButton.test.tsx | 6 +- .../MessageTimerButton.tsx | 10 ++- .../message-list/MessageTimerButton/index.ts | 20 ++++++ 17 files changed, 271 insertions(+), 60 deletions(-) rename src/script/page/{ => AccentColorPicker}/AccentColorPicker.test.tsx (96%) rename src/script/page/{ => AccentColorPicker}/AccentColorPicker.tsx (95%) create mode 100644 src/script/page/AccentColorPicker/index.ts rename src/script/page/{ => AppLock}/AppLock.test.tsx (95%) rename src/script/page/{ => AppLock}/AppLock.tsx (98%) create mode 100644 src/script/page/AppLock/index.ts rename src/script/page/message-list/{ => AssetUploadButton}/AssetUploadButton.test.tsx (95%) rename src/script/page/message-list/{ => AssetUploadButton}/AssetUploadButton.tsx (95%) create mode 100644 src/script/page/message-list/AssetUploadButton/index.ts create mode 100644 src/script/page/message-list/ImageUploadButton/ImageUploadButton.test.tsx create mode 100644 src/script/page/message-list/ImageUploadButton/ImageUploadButton.tsx create mode 100644 src/script/page/message-list/ImageUploadButton/index.ts rename src/script/page/message-list/{ => MessageTimerButton}/MessageTimerButton.test.tsx (97%) rename src/script/page/message-list/{ => MessageTimerButton}/MessageTimerButton.tsx (93%) create mode 100644 src/script/page/message-list/MessageTimerButton/index.ts diff --git a/src/script/page/AccentColorPicker.test.tsx b/src/script/page/AccentColorPicker/AccentColorPicker.test.tsx similarity index 96% rename from src/script/page/AccentColorPicker.test.tsx rename to src/script/page/AccentColorPicker/AccentColorPicker.test.tsx index bfe1da28563..be6a616ba11 100644 --- a/src/script/page/AccentColorPicker.test.tsx +++ b/src/script/page/AccentColorPicker/AccentColorPicker.test.tsx @@ -21,8 +21,8 @@ import {AccentColor} from '@wireapp/commons'; import {render, act} from '@testing-library/react'; -import AccentColorPicker, {AccentColorPickerProps} from './AccentColorPicker'; -import {User} from '../entity/User'; +import {AccentColorPicker, AccentColorPickerProps} from './'; +import {User} from '../../entity/User'; import ko from 'knockout'; describe('AccentColorPicker', () => { diff --git a/src/script/page/AccentColorPicker.tsx b/src/script/page/AccentColorPicker/AccentColorPicker.tsx similarity index 95% rename from src/script/page/AccentColorPicker.tsx rename to src/script/page/AccentColorPicker/AccentColorPicker.tsx index 55ba1d62188..8aefe754b89 100644 --- a/src/script/page/AccentColorPicker.tsx +++ b/src/script/page/AccentColorPicker/AccentColorPicker.tsx @@ -21,9 +21,9 @@ import React from 'react'; import {CSS_SQUARE} from 'Util/CSSMixin'; import {t} from 'Util/LocalizerUtil'; import {CSSObject} from '@emotion/serialize'; -import {User} from '../entity/User'; +import {User} from '../../entity/User'; import {useKoSubscribableChildren} from 'Util/ComponentUtil'; -import {ACCENT_ID} from '../Config'; +import {ACCENT_ID} from '../../Config'; export interface AccentColorPickerProps { doSetAccentColor: (id: number) => void; @@ -37,7 +37,7 @@ const headerStyles: CSSObject = { textAlign: 'center', }; -const AccentColorPicker: React.FunctionComponent = ({user, doSetAccentColor}) => { +export const AccentColorPicker: React.FunctionComponent = ({user, doSetAccentColor}) => { const {accent_id: accentId} = useKoSubscribableChildren(user, ['accent_id']); return ( <> @@ -142,5 +142,3 @@ const AccentColorPicker: React.FunctionComponent = ({use ); }; - -export default AccentColorPicker; diff --git a/src/script/page/AccentColorPicker/index.ts b/src/script/page/AccentColorPicker/index.ts new file mode 100644 index 00000000000..806dad7bcb7 --- /dev/null +++ b/src/script/page/AccentColorPicker/index.ts @@ -0,0 +1,20 @@ +/* + * Wire + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + * + */ + +export * from './AccentColorPicker'; diff --git a/src/script/page/AppLock.test.tsx b/src/script/page/AppLock/AppLock.test.tsx similarity index 95% rename from src/script/page/AppLock.test.tsx rename to src/script/page/AppLock/AppLock.test.tsx index 3e1a34ae4e2..6dc35865227 100644 --- a/src/script/page/AppLock.test.tsx +++ b/src/script/page/AppLock/AppLock.test.tsx @@ -23,13 +23,13 @@ import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import {FeatureStatus} from '@wireapp/api-client/src/team/feature/'; -import type {ClientRepository} from '../client/ClientRepository'; -import AppLock, {APPLOCK_STATE} from './AppLock'; -import {AppLockState} from '../user/AppLockState'; -import {AppLockRepository} from '../user/AppLockRepository'; -import {UserState} from '../user/UserState'; +import type {ClientRepository} from '../../client/ClientRepository'; +import AppLock, {APPLOCK_STATE} from './'; +import {AppLockState} from '../../user/AppLockState'; +import {AppLockRepository} from '../../user/AppLockRepository'; +import {UserState} from '../../user/UserState'; import {createRandomUuid} from 'Util/util'; -import {TeamState} from '../team/TeamState'; +import {TeamState} from '../../team/TeamState'; import {render} from '@testing-library/react'; // https://github.com/jedisct1/libsodium.js/issues/235 diff --git a/src/script/page/AppLock.tsx b/src/script/page/AppLock/AppLock.tsx similarity index 98% rename from src/script/page/AppLock.tsx rename to src/script/page/AppLock/AppLock.tsx index e0fce9a6b23..bf277e83f19 100644 --- a/src/script/page/AppLock.tsx +++ b/src/script/page/AppLock/AppLock.tsx @@ -26,15 +26,15 @@ import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; import {t} from 'Util/LocalizerUtil'; -import {ClientRepository} from '../client/ClientRepository'; -import {Config} from '../Config'; +import {ClientRepository} from '../../client/ClientRepository'; +import {Config} from '../../Config'; import ModalComponent from 'Components/ModalComponent'; -import {SIGN_OUT_REASON} from '../auth/SignOutReason'; -import {ClientState} from '../client/ClientState'; -import {AppLockState} from '../user/AppLockState'; -import {AppLockRepository} from '../user/AppLockRepository'; +import {SIGN_OUT_REASON} from '../../auth/SignOutReason'; +import {ClientState} from '../../client/ClientState'; +import {AppLockState} from '../../user/AppLockState'; +import {AppLockRepository} from '../../user/AppLockRepository'; import {registerReactComponent, useKoSubscribableChildren} from 'Util/ComponentUtil'; -import {ModalsViewModel} from '../view_model/ModalsViewModel'; +import {ModalsViewModel} from '../../view_model/ModalsViewModel'; import Icon from 'Components/Icon'; export enum APPLOCK_STATE { diff --git a/src/script/page/AppLock/index.ts b/src/script/page/AppLock/index.ts new file mode 100644 index 00000000000..ff1240abeb9 --- /dev/null +++ b/src/script/page/AppLock/index.ts @@ -0,0 +1,21 @@ +/* + * Wire + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + * + */ + +export * from './AppLock'; +export {default} from './AppLock'; diff --git a/src/script/page/MainContent/panels/preferences/AccountPreferences.tsx b/src/script/page/MainContent/panels/preferences/AccountPreferences.tsx index b209dfc6a6f..ed999b468be 100644 --- a/src/script/page/MainContent/panels/preferences/AccountPreferences.tsx +++ b/src/script/page/MainContent/panels/preferences/AccountPreferences.tsx @@ -39,7 +39,7 @@ import {RichProfileRepository} from '../../../../user/RichProfileRepository'; import type {UserRepository} from '../../../../user/UserRepository'; import {UserState} from '../../../../user/UserState'; import {modals, ModalsViewModel} from '../../../../view_model/ModalsViewModel'; -import AccentColorPicker from '../../../AccentColorPicker'; +import {AccentColorPicker} from '../../../AccentColorPicker'; import AccountInput from './accountPreferences/AccountInput'; import AccountSecuritySection from './accountPreferences/AccountSecuritySection'; import AvailabilityButtons from './accountPreferences/AvailabilityButtons'; diff --git a/src/script/page/message-list/AssetUploadButton.test.tsx b/src/script/page/message-list/AssetUploadButton/AssetUploadButton.test.tsx similarity index 95% rename from src/script/page/message-list/AssetUploadButton.test.tsx rename to src/script/page/message-list/AssetUploadButton/AssetUploadButton.test.tsx index 75a50f2a3f1..19c83adecc3 100644 --- a/src/script/page/message-list/AssetUploadButton.test.tsx +++ b/src/script/page/message-list/AssetUploadButton/AssetUploadButton.test.tsx @@ -18,9 +18,9 @@ */ import {render, fireEvent} from '@testing-library/react'; -import {AssetUploadButton} from './AssetUploadButton'; +import {AssetUploadButton} from './'; -jest.mock('../../Config', () => ({ +jest.mock('../../../Config', () => ({ Config: { getConfig: () => ({ ALLOWED_IMAGE_TYPES: ['image/gif', 'image/avif'], diff --git a/src/script/page/message-list/AssetUploadButton.tsx b/src/script/page/message-list/AssetUploadButton/AssetUploadButton.tsx similarity index 95% rename from src/script/page/message-list/AssetUploadButton.tsx rename to src/script/page/message-list/AssetUploadButton/AssetUploadButton.tsx index 086738c5dc5..5a4a8150b64 100644 --- a/src/script/page/message-list/AssetUploadButton.tsx +++ b/src/script/page/message-list/AssetUploadButton/AssetUploadButton.tsx @@ -18,7 +18,7 @@ */ import {useRef} from 'react'; -import {Config} from '../../Config'; +import {Config} from '../../../Config'; import {t} from 'Util/LocalizerUtil'; import Icon from 'Components/Icon'; @@ -28,7 +28,8 @@ interface AssetUploadButtonProps { export const AssetUploadButton = ({onSelectFiles}: AssetUploadButtonProps) => { const acceptedFileTypes = Config.getConfig().FEATURE.ALLOWED_FILE_UPLOAD_EXTENSIONS.join(','); - const fileRef = useRef(null!); + + const fileRef = useRef(null); const formRef = useRef(null); const handleFileChange = (event: React.ChangeEvent) => { diff --git a/src/script/page/message-list/AssetUploadButton/index.ts b/src/script/page/message-list/AssetUploadButton/index.ts new file mode 100644 index 00000000000..597979b1ea9 --- /dev/null +++ b/src/script/page/message-list/AssetUploadButton/index.ts @@ -0,0 +1,20 @@ +/* + * Wire + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + * + */ + +export * from './AssetUploadButton'; diff --git a/src/script/page/message-list/ImageUploadButton/ImageUploadButton.test.tsx b/src/script/page/message-list/ImageUploadButton/ImageUploadButton.test.tsx new file mode 100644 index 00000000000..5603569e672 --- /dev/null +++ b/src/script/page/message-list/ImageUploadButton/ImageUploadButton.test.tsx @@ -0,0 +1,66 @@ +/* + * Wire + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + * + */ + +import {render, fireEvent} from '@testing-library/react'; +import {ImageUploadButton} from './'; + +jest.mock('../../../Config', () => ({ + Config: { + getConfig: () => ({ + ALLOWED_IMAGE_TYPES: ['image/gif', 'image/avif'], + FEATURE: {ALLOWED_FILE_UPLOAD_EXTENSIONS: ['*']}, + }), + }, +})); + +const pngFile = new File(['(⌐□_□)'], 'chucknorris.png', {type: 'image/png'}); + +describe('ImageUploadButton', () => { + it('Does call onSelectImages with uploaded image file', () => { + const onSelectImages = jest.fn(); + + const {container} = render(); + const fileInput = container.querySelector('input[type="file"]') as HTMLInputElement; + + fireEvent.change(fileInput, { + target: {files: [pngFile]}, + }); + + expect(onSelectImages).toHaveBeenCalledWith([pngFile]); + }); + + it('Does reset a form with input after upload', () => { + const onSelectImages = jest.fn(); + + const {container} = render(); + + const form = container.querySelector('form'); + jest.spyOn(form!, 'reset'); + + const fileInput = container.querySelector('input[type="file"]') as HTMLInputElement; + + fireEvent.change(fileInput, { + target: {files: [pngFile]}, + }); + + expect(onSelectImages).toHaveBeenCalledWith([pngFile]); + expect(fileInput.files?.[0].name).toEqual(pngFile.name); + expect(form!.reset).toHaveBeenCalled(); + }); +}); diff --git a/src/script/page/message-list/ImageUploadButton/ImageUploadButton.tsx b/src/script/page/message-list/ImageUploadButton/ImageUploadButton.tsx new file mode 100644 index 00000000000..befd82f48c9 --- /dev/null +++ b/src/script/page/message-list/ImageUploadButton/ImageUploadButton.tsx @@ -0,0 +1,69 @@ +/* + * Wire + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + * + */ + +import {useRef} from 'react'; +import {t} from 'Util/LocalizerUtil'; +import Icon from 'Components/Icon'; +import {Config} from '../../../Config'; + +interface ImageUploadButtonProps { + onSelectImages: (files: File[]) => void; +} + +export const ImageUploadButton = ({onSelectImages}: ImageUploadButtonProps) => { + const acceptedImageTypes = Config.getConfig().ALLOWED_IMAGE_TYPES.join(','); + + const imageRef = useRef(null); + const formRef = useRef(null); + + const handleImageFileChange = (event: React.ChangeEvent) => { + const {files} = event.target; + + if (!files) { + return; + } + + onSelectImages(Array.from(files)); + formRef.current?.reset(); + }; + + return ( +
    + +
    + ); +}; diff --git a/src/script/page/message-list/ImageUploadButton/index.ts b/src/script/page/message-list/ImageUploadButton/index.ts new file mode 100644 index 00000000000..072686c7769 --- /dev/null +++ b/src/script/page/message-list/ImageUploadButton/index.ts @@ -0,0 +1,20 @@ +/* + * Wire + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + * + */ + +export * from './ImageUploadButton'; diff --git a/src/script/page/message-list/InputBarControls/ControlButtons.tsx b/src/script/page/message-list/InputBarControls/ControlButtons.tsx index 1a88c948ecc..a1ae54811cd 100644 --- a/src/script/page/message-list/InputBarControls/ControlButtons.tsx +++ b/src/script/page/message-list/InputBarControls/ControlButtons.tsx @@ -18,12 +18,12 @@ */ import Icon from 'Components/Icon'; -import React, {useRef} from 'react'; -import MessageTimerButton from '../MessageTimerButton'; +import React from 'react'; +import {MessageTimerButton} from '../MessageTimerButton'; import {t} from 'Util/LocalizerUtil'; import {Conversation} from 'src/script/entity/Conversation'; -import {Config} from '../../../Config'; import {AssetUploadButton} from '../AssetUploadButton'; +import {ImageUploadButton} from '../ImageUploadButton'; export type ControlButtonsProps = { input: string; @@ -54,10 +54,6 @@ const ControlButtons: React.FC = ({ onCancelEditing, onClickGif, }) => { - const acceptedImageTypes = Config.getConfig().ALLOWED_IMAGE_TYPES.join(','); - - const imageRef = useRef(null!); - const pingTooltip = t('tooltipConversationPing'); if (isEditing) { @@ -96,25 +92,7 @@ const ControlButtons: React.FC = ({
  • - +
  • diff --git a/src/script/page/message-list/MessageTimerButton.test.tsx b/src/script/page/message-list/MessageTimerButton/MessageTimerButton.test.tsx similarity index 97% rename from src/script/page/message-list/MessageTimerButton.test.tsx rename to src/script/page/message-list/MessageTimerButton/MessageTimerButton.test.tsx index f7df7b55476..8ad6ccff700 100644 --- a/src/script/page/message-list/MessageTimerButton.test.tsx +++ b/src/script/page/message-list/MessageTimerButton/MessageTimerButton.test.tsx @@ -19,9 +19,9 @@ import ko from 'knockout'; import {TIME_IN_MILLIS} from 'Util/TimeUtil'; -import MessageTimerButton from './MessageTimerButton'; -import type {Conversation} from '../../entity/Conversation'; -import * as Context from '../../ui/ContextMenu'; +import {MessageTimerButton} from './MessageTimerButton'; +import type {Conversation} from '../../../entity/Conversation'; +import * as Context from '../../../ui/ContextMenu'; import {TeamState} from 'src/script/team/TeamState'; import {render, fireEvent} from '@testing-library/react'; diff --git a/src/script/page/message-list/MessageTimerButton.tsx b/src/script/page/message-list/MessageTimerButton/MessageTimerButton.tsx similarity index 93% rename from src/script/page/message-list/MessageTimerButton.tsx rename to src/script/page/message-list/MessageTimerButton/MessageTimerButton.tsx index 16a4dd22c29..1f1195af27b 100644 --- a/src/script/page/message-list/MessageTimerButton.tsx +++ b/src/script/page/message-list/MessageTimerButton/MessageTimerButton.tsx @@ -25,11 +25,11 @@ import {formatDuration, DurationUnit} from 'Util/TimeUtil'; import Icon from 'Components/Icon'; import {useKoSubscribableChildren} from 'Util/ComponentUtil'; -import {EphemeralTimings} from '../../ephemeral/EphemeralTimings'; -import {showContextMenu} from '../../ui/ContextMenu'; -import type {Conversation} from '../../entity/Conversation'; +import {EphemeralTimings} from '../../../ephemeral/EphemeralTimings'; +import {showContextMenu} from '../../../ui/ContextMenu'; +import type {Conversation} from '../../../entity/Conversation'; import {container} from 'tsyringe'; -import {TeamState} from '../../team/TeamState'; +import {TeamState} from '../../../team/TeamState'; import {KEY} from 'Util/KeyboardUtil'; import {setContextMenuPosition} from 'Util/util'; @@ -125,5 +125,3 @@ export const MessageTimerButton: React.FC = ({ ); }; - -export default MessageTimerButton; diff --git a/src/script/page/message-list/MessageTimerButton/index.ts b/src/script/page/message-list/MessageTimerButton/index.ts new file mode 100644 index 00000000000..5363ab400f7 --- /dev/null +++ b/src/script/page/message-list/MessageTimerButton/index.ts @@ -0,0 +1,20 @@ +/* + * Wire + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + * + */ + +export * from './MessageTimerButton'; From a19a7178f69ae205ca5f53ce64f21f25fc6df499 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Wed, 26 Oct 2022 08:57:28 +0200 Subject: [PATCH 63/66] chore: Improve jest-github integration (#13970) --- jest.config.js => jest.config.ts | 6 +++++- src/script/auth/component/AccountForm.test.tsx | 7 +++++++ src/script/auth/page/EntropyContainer.test.tsx | 12 ++++-------- src/script/components/avatar/AvatarImage.test.tsx | 14 +++++--------- 4 files changed, 21 insertions(+), 18 deletions(-) rename jest.config.js => jest.config.ts (92%) diff --git a/jest.config.js b/jest.config.ts similarity index 92% rename from jest.config.js rename to jest.config.ts index 1a73aec02ba..381b7470fc0 100644 --- a/jest.config.js +++ b/jest.config.ts @@ -17,9 +17,10 @@ * */ +import type {Config} from 'jest'; process.env.TZ = 'UTC'; -module.exports = { +const config: Config = { collectCoverageFrom: ['src/script/**/*.{ts,tsx}', '!src/script/util/test/**/*.*'], moduleDirectories: ['node_modules', __dirname], // Must be in sync with tsconfig.json >> paths @@ -30,6 +31,7 @@ module.exports = { 'Util/(.*)': '/src/script/util/$1', '^react(.*)$': '/node_modules/react$1', }, + reporters: ['default', 'github-actions'], setupFilesAfterEnv: ['/setupTests.js'], testEnvironment: 'jsdom', testEnvironmentOptions: { @@ -39,3 +41,5 @@ module.exports = { testRegex: '(test|Spec)\\.[tj]sx?$', testRunner: 'jest-jasmine2', }; + +export default config; diff --git a/src/script/auth/component/AccountForm.test.tsx b/src/script/auth/component/AccountForm.test.tsx index 9f4efa78fb8..96967be5943 100644 --- a/src/script/auth/component/AccountForm.test.tsx +++ b/src/script/auth/component/AccountForm.test.tsx @@ -39,6 +39,13 @@ describe('when entering account data', () => { {}} />, mockStoreFactory()({ ...initialRootState, + authState: { + account: { + email: '', + name: '', + password: '', + }, + }, runtimeState: { hasCookieSupport: true, hasIndexedDbSupport: true, diff --git a/src/script/auth/page/EntropyContainer.test.tsx b/src/script/auth/page/EntropyContainer.test.tsx index 33829d7179e..eab319594ca 100644 --- a/src/script/auth/page/EntropyContainer.test.tsx +++ b/src/script/auth/page/EntropyContainer.test.tsx @@ -18,21 +18,17 @@ */ import {render} from '@testing-library/react'; -import {EntropyData} from '../../util/Entropy'; import {withIntl, withTheme} from '../util/test/TestUtil'; import EntropyContainer from './EntropyContainer'; require('jest-canvas-mock'); describe('EntropyContainer', () => { - const mockonSetEntropy = jest.fn().mockImplementation((a: EntropyData) => { - // eslint-disable-next-line no-console - console.log(a); - }); + const mockonSetEntropy = jest.fn().mockImplementation(); it('renders elements', () => { const {getByText, queryByText} = render(withTheme(withIntl())); - expect(getByText(/Increase your account’s security/gi)).toBeTruthy(); - expect(getByText(/move your mouse/gi)).toBeTruthy(); - expect(queryByText(/success/gi)).toBeNull(); + expect(getByText(/Increase your account’s security/i)).toBeTruthy(); + expect(getByText(/move your mouse/i)).toBeTruthy(); + expect(queryByText(/success/i)).toBeNull(); }); }); diff --git a/src/script/components/avatar/AvatarImage.test.tsx b/src/script/components/avatar/AvatarImage.test.tsx index e94d63b8afd..1754f45fbf5 100644 --- a/src/script/components/avatar/AvatarImage.test.tsx +++ b/src/script/components/avatar/AvatarImage.test.tsx @@ -17,14 +17,12 @@ * */ -import {waitFor} from '@testing-library/react'; -import {act} from 'react-dom/test-utils'; +import {waitFor, render} from '@testing-library/react'; import AvatarImage from './AvatarImage'; import {User} from '../../entity/User'; import {AssetRepository} from '../../assets/AssetRepository'; import {AVATAR_SIZE} from 'Components/Avatar'; import {AssetRemoteData} from 'src/script/assets/AssetRemoteData'; -import {render} from '@testing-library/react'; describe('AvatarImage', () => { it('fetches full avatar image for large avatars', async () => { @@ -49,7 +47,7 @@ describe('AvatarImage', () => { render(); - await act(() => waitFor(() => expect(assetRepoSpy.getObjectUrl).toHaveBeenCalledWith(resource))); + await waitFor(() => expect(assetRepoSpy.getObjectUrl).toHaveBeenCalledWith(resource)); }); it('fetches preview avatar image for low pixel ratio devices', async () => { @@ -74,7 +72,7 @@ describe('AvatarImage', () => { render(); - await act(() => waitFor(() => expect(assetRepoSpy.getObjectUrl).toHaveBeenCalledWith(resource))); + await waitFor(() => expect(assetRepoSpy.getObjectUrl).toHaveBeenCalledWith(resource)); }); it('fetches preview avatar image for small avatars', async () => { @@ -98,9 +96,7 @@ describe('AvatarImage', () => { render(); - await act(() => - waitFor(() => expect(assetRepoSpy.getObjectUrl).toHaveBeenCalledWith(participant.previewPictureResource())), - ); + await waitFor(() => expect(assetRepoSpy.getObjectUrl).toHaveBeenCalledWith(participant.previewPictureResource())); }); it('does not try to fetch non-existent avatar', async () => { @@ -120,6 +116,6 @@ describe('AvatarImage', () => { render(); - await act(() => waitFor(() => expect(assetRepoSpy.getObjectUrl).not.toHaveBeenCalled())); + await waitFor(() => expect(assetRepoSpy.getObjectUrl).not.toHaveBeenCalled()); }); }); From ad182dd2e8ca856acb459838f40e7cdef681b065 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Wed, 26 Oct 2022 12:10:29 +0200 Subject: [PATCH 64/66] fix: Upgrade @wireapp/core (#13973) --- package.json | 2 +- yarn.lock | 323 ++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 244 insertions(+), 81 deletions(-) diff --git a/package.json b/package.json index 2538e4e086c..8d8f65856b3 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "@emotion/react": "11.10.4", "@wireapp/antiscroll-2": "1.3.1", "@wireapp/avs": "8.2.16", - "@wireapp/core": "34.1.4", + "@wireapp/core": "34.1.6", "@wireapp/react-ui-kit": "8.17.8", "@wireapp/store-engine-dexie": "1.7.11", "@wireapp/store-engine-sqleet": "1.8.9", diff --git a/yarn.lock b/yarn.lock index 203446110cc..cfe448a7ab5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -363,7 +363,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.19.6": +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.19.6, @babel/parser@npm:^7.9.4": version: 7.19.6 resolution: "@babel/parser@npm:7.19.6" bin: @@ -3308,14 +3308,7 @@ __metadata: languageName: node linkType: hard -"@types/long@npm:^4.0.1": - version: 4.0.1 - resolution: "@types/long@npm:4.0.1" - checksum: ff9653c33f5000d0f131fd98a950a0343e2e33107dd067a97ac4a3b9678e1a2e39ea44772ad920f54ef6e8f107f76bc92c2584ba905a0dc4253282a4101166d0 - languageName: node - linkType: hard - -"@types/markdown-it@npm:12.2.3": +"@types/markdown-it@npm:12.2.3, @types/markdown-it@npm:^12.2.3": version: 12.2.3 resolution: "@types/markdown-it@npm:12.2.3" dependencies: @@ -3977,13 +3970,13 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^21.0.5": - version: 21.0.5 - resolution: "@wireapp/api-client@npm:21.0.5" +"@wireapp/api-client@npm:^21.0.6": + version: 21.0.6 + resolution: "@wireapp/api-client@npm:21.0.6" dependencies: - "@wireapp/commons": ^4.5.0 - "@wireapp/priority-queue": ^1.8.11 - "@wireapp/protocol-messaging": 1.39.0 + "@wireapp/commons": ^4.5.1 + "@wireapp/priority-queue": ^1.8.12 + "@wireapp/protocol-messaging": 1.42.0 axios: 1.1.2 axios-retry: 3.3.1 http-status-codes: 2.2.0 @@ -3992,7 +3985,7 @@ __metadata: spark-md5: 3.0.2 tough-cookie: 4.1.2 ws: 8.9.0 - checksum: 3fc618b461fdb8cd37ca6cccc40eb73d0a325cc28993002b83e77713ee2e07f31fbd4f2a8951360377625581d6e6d4d1391a11fbb9bbe6bc1c818388fa3b1430 + checksum: 69590a3c166c257d7a49addc91e173a3d216fd39df3ef886535cdaf59885d9551bdef984b69e26c1d79b63e357e56cdf4b8e181cc0b4342842412ce1fe87ad83 languageName: node linkType: hard @@ -4010,15 +4003,15 @@ __metadata: languageName: node linkType: hard -"@wireapp/commons@npm:^4.5.0": - version: 4.5.0 - resolution: "@wireapp/commons@npm:4.5.0" +"@wireapp/commons@npm:^4.5.1": + version: 4.5.1 + resolution: "@wireapp/commons@npm:4.5.1" dependencies: ansi-regex: 5.0.1 fs-extra: 10.1.0 logdown: 3.3.1 platform: 1.3.6 - checksum: 8dc0e8cd599a4e581a87bf1b4abe484b6af2bee28ff6e9bd174a2256eadd51dd509b3946e2d01ce9af4d068494bc1ff81703947639510b3752a68bc223616f69 + checksum: 8dd36dd93f3c8f46b1ed3887855fecacb4e0de6ffac9dcb9c9662f2af586834c696387baa043f83392851b54c60dd5287615b2446652dbb6ccbd1208f166dfcb languageName: node linkType: hard @@ -4045,26 +4038,26 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:34.1.4": - version: 34.1.4 - resolution: "@wireapp/core@npm:34.1.4" +"@wireapp/core@npm:34.1.6": + version: 34.1.6 + resolution: "@wireapp/core@npm:34.1.6" dependencies: - "@wireapp/api-client": ^21.0.5 - "@wireapp/commons": ^4.5.0 + "@wireapp/api-client": ^21.0.6 + "@wireapp/commons": ^4.5.1 "@wireapp/core-crypto": 0.5.2 "@wireapp/cryptobox": 12.8.0 - "@wireapp/promise-queue": ^1.3.5 - "@wireapp/protocol-messaging": ^1.39.0 - "@wireapp/store-engine-dexie": ^1.7.12 + "@wireapp/promise-queue": ^1.3.6 + "@wireapp/protocol-messaging": 1.42.0 + "@wireapp/store-engine-dexie": ^1.7.13 axios: 1.1.2 - bazinga64: 5.11.11 + bazinga64: 5.11.12 hash.js: 1.1.7 http-status-codes: 2.2.0 idb: 7.1.0 logdown: 3.3.1 - long: 4.0.0 + long: ^5.2.0 uuidjs: 4.2.12 - checksum: d6e34adf52bbc332b4693f7911baf93820f5e03ee81d006e6a0e169075bf54831ba167a99bee0f104f60b0ab526f392efd1ce88a30c798cb3ec249938381fb7a + checksum: 7203d43ae17f9773827c48b15b7ca677aa3f8668bdbff7a7d75edc20632329c618af4266581160bdafbb6f0c0ef421a83288718a27dc42945f59c0668c9d1cef languageName: node linkType: hard @@ -4126,17 +4119,17 @@ __metadata: languageName: node linkType: hard -"@wireapp/priority-queue@npm:^1.8.11": - version: 1.8.11 - resolution: "@wireapp/priority-queue@npm:1.8.11" - checksum: 246d9905425d463c7fb055d3a3ee1d3588e3908570cf3d73ebfaad2b92b1408f04d9a45502448ea08d1524f4be3a91805f3cbba3b80994758a74c055077aa42d +"@wireapp/priority-queue@npm:^1.8.12": + version: 1.8.12 + resolution: "@wireapp/priority-queue@npm:1.8.12" + checksum: 5c09345b72306daaa119d5e861af9ad9396effaa959c1100365806622b5238b2b77dd4c1b21cf57b10223542c5b5b0e8504c01ee33ac7ec308c100c1f6e7cb88 languageName: node linkType: hard -"@wireapp/promise-queue@npm:^1.3.5": - version: 1.3.5 - resolution: "@wireapp/promise-queue@npm:1.3.5" - checksum: 35a687cfd3a8a2e4827f762ff938dd83437ecc27175014270ab9985ce40b4ef5253aae0f8062ca0e1dd65abe5e7dac50da4281e93f037fed881a381095f978b3 +"@wireapp/promise-queue@npm:^1.3.6": + version: 1.3.6 + resolution: "@wireapp/promise-queue@npm:1.3.6" + checksum: b3a2ee42887a816c91f2f8cbbd40971c8077bc5355450e6e65da2161a8cae253b6ca6dbe255c4bfe7bddec48ca0fc46131f2da1cece952c3470adae304c75f04 languageName: node linkType: hard @@ -4152,12 +4145,15 @@ __metadata: languageName: node linkType: hard -"@wireapp/protocol-messaging@npm:1.39.0, @wireapp/protocol-messaging@npm:^1.39.0": - version: 1.39.0 - resolution: "@wireapp/protocol-messaging@npm:1.39.0" +"@wireapp/protocol-messaging@npm:1.42.0": + version: 1.42.0 + resolution: "@wireapp/protocol-messaging@npm:1.42.0" dependencies: - protobufjs: 6.11.3 - checksum: 2f905ff7c55905bdb467927e969d1ea6e22264e10c2262a51d2dcfe7bead0e1792a94c769f3de4f5c253c356440efa632173f6670d31db0834b2054d191940f4 + long: 5.2.0 + protobufjs: 7.1.2 + protobufjs-cli: 1.0.2 + typescript: 4.8.4 + checksum: 5ed5a07fdcca9ca269480ef838e5ef00dd9236e5cb7124d48732fed67065f67343c015734ace52d2d8a84ef183016b8520ad8b06386c49216904adb0b17cd72c languageName: node linkType: hard @@ -4193,14 +4189,14 @@ __metadata: languageName: node linkType: hard -"@wireapp/store-engine-dexie@npm:^1.7.12": - version: 1.7.12 - resolution: "@wireapp/store-engine-dexie@npm:1.7.12" +"@wireapp/store-engine-dexie@npm:^1.7.13": + version: 1.7.13 + resolution: "@wireapp/store-engine-dexie@npm:1.7.13" dependencies: dexie: 3.2.2 peerDependencies: "@wireapp/store-engine": 4.x.x - checksum: 6b866b90cdaef7cd718970c940aedb0b25ce01bcf0bedc266a3232c8741f6835f13c3d0358bc1ea32c2a88e3dc2bf10bdc6bfcea2bc4c18da5cdcb003e831b33 + checksum: f0e1e3e7e8a0bd67017f64577acd07962a40745ebbec69de69cd64e54420c22fea34bc8f5b1ccb239b76f2f37a0653589d8671644c902384107d5e100d27145c languageName: node linkType: hard @@ -5136,10 +5132,10 @@ __metadata: languageName: node linkType: hard -"bazinga64@npm:5.11.11": - version: 5.11.11 - resolution: "bazinga64@npm:5.11.11" - checksum: dd490fb39e23a7332b24a1d383a2b340427ebfec2b563219b853fde6fdcdd6d66dc6dade339474cc8554626445f4306f10c9b6d0c60393f297d5d3a8b432f477 +"bazinga64@npm:5.11.12": + version: 5.11.12 + resolution: "bazinga64@npm:5.11.12" + checksum: 9c2057460e0cf13754de540f5900db8132de0d37b0909ab7269e36fe126568e222dd11bbce7985d6150dcf4228b109f707a88c09fda1fc0ad58a3d47454b64e4 languageName: node linkType: hard @@ -5168,7 +5164,7 @@ __metadata: languageName: node linkType: hard -"bluebird@npm:^3.0.6, bluebird@npm:^3.4.1": +"bluebird@npm:^3.0.6, bluebird@npm:^3.4.1, bluebird@npm:^3.7.2": version: 3.7.2 resolution: "bluebird@npm:3.7.2" checksum: 869417503c722e7dc54ca46715f70e15f4d9c602a423a02c825570862d12935be59ed9c7ba34a9b31f186c017c23cac6b54e35446f8353059c101da73eac22ef @@ -5433,6 +5429,15 @@ __metadata: languageName: node linkType: hard +"catharsis@npm:^0.9.0": + version: 0.9.0 + resolution: "catharsis@npm:0.9.0" + dependencies: + lodash: ^4.17.15 + checksum: da867df1fd01823ea5a7283886ba382f6eb5b1fe5af356e00fd944a02d9b867f4ea2fc7f61416c53427f62760fdbd41614f6e8ae37686d2c3a4696871526df20 + languageName: node + linkType: hard + "chalk@npm:^1.1.1": version: 1.1.3 resolution: "chalk@npm:1.1.3" @@ -6907,7 +6912,7 @@ __metadata: languageName: node linkType: hard -"entities@npm:^2.0.0": +"entities@npm:^2.0.0, entities@npm:~2.1.0": version: 2.1.0 resolution: "entities@npm:2.1.0" checksum: a10a877e489586a3f6a691fe49bf3fc4e58f06c8e80522f08214a5150ba457e7017b447d4913a3fa041bda06ee4c92517baa4d8d75373eaa79369e9639225ffd @@ -7073,6 +7078,25 @@ __metadata: languageName: node linkType: hard +"escodegen@npm:^1.13.0": + version: 1.14.3 + resolution: "escodegen@npm:1.14.3" + dependencies: + esprima: ^4.0.1 + estraverse: ^4.2.0 + esutils: ^2.0.2 + optionator: ^0.8.1 + source-map: ~0.6.1 + dependenciesMeta: + source-map: + optional: true + bin: + escodegen: bin/escodegen.js + esgenerate: bin/esgenerate.js + checksum: 381cdc4767ecdb221206bbbab021b467bbc2a6f5c9a99c9e6353040080bdd3dfe73d7604ad89a47aca6ea7d58bc635f6bd3fbc8da9a1998e9ddfa8372362ccd0 + languageName: node + linkType: hard + "escodegen@npm:^2.0.0": version: 2.0.0 resolution: "escodegen@npm:2.0.0" @@ -7441,7 +7465,7 @@ __metadata: languageName: node linkType: hard -"espree@npm:^9.4.0": +"espree@npm:^9.0.0, espree@npm:^9.4.0": version: 9.4.0 resolution: "espree@npm:9.4.0" dependencies: @@ -7490,7 +7514,7 @@ __metadata: languageName: node linkType: hard -"estraverse@npm:^4.1.1": +"estraverse@npm:^4.1.1, estraverse@npm:^4.2.0": version: 4.3.0 resolution: "estraverse@npm:4.3.0" checksum: a6299491f9940bb246124a8d44b7b7a413a8336f5436f9837aaa9330209bd9ee8af7e91a654a3545aee9c54b3308e78ee360cef1d777d37cfef77d2fa33b5827 @@ -8348,7 +8372,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^8.0.1, glob@npm:^8.0.3": +"glob@npm:^8.0.0, glob@npm:^8.0.1, glob@npm:^8.0.3": version: 8.0.3 resolution: "glob@npm:8.0.3" dependencies: @@ -8524,7 +8548,7 @@ __metadata: languageName: node linkType: hard -"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.4, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": +"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.4, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": version: 4.2.10 resolution: "graceful-fs@npm:4.2.10" checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da @@ -10407,6 +10431,15 @@ __metadata: languageName: node linkType: hard +"js2xmlparser@npm:^4.0.2": + version: 4.0.2 + resolution: "js2xmlparser@npm:4.0.2" + dependencies: + xmlcreate: ^2.0.4 + checksum: 55e3af71dc0104941dfc3e85452230db42ff3870a5777d1ea26bc0c68743f49113a517a7b305421a932b29f10058a012a7da8f5ba07860a05a1dce9fe5b62962 + languageName: node + linkType: hard + "jsdoc-type-pratt-parser@npm:~3.1.0": version: 3.1.0 resolution: "jsdoc-type-pratt-parser@npm:3.1.0" @@ -10414,6 +10447,31 @@ __metadata: languageName: node linkType: hard +"jsdoc@npm:^3.6.3": + version: 3.6.11 + resolution: "jsdoc@npm:3.6.11" + dependencies: + "@babel/parser": ^7.9.4 + "@types/markdown-it": ^12.2.3 + bluebird: ^3.7.2 + catharsis: ^0.9.0 + escape-string-regexp: ^2.0.0 + js2xmlparser: ^4.0.2 + klaw: ^3.0.0 + markdown-it: ^12.3.2 + markdown-it-anchor: ^8.4.1 + marked: ^4.0.10 + mkdirp: ^1.0.4 + requizzle: ^0.2.3 + strip-json-comments: ^3.1.0 + taffydb: 2.6.2 + underscore: ~1.13.2 + bin: + jsdoc: jsdoc.js + checksum: 7920b5cba6200c8f56c9ac2ac5e89d06b6581dd1ce22e66976409fad8b68c16bfd8cd30fe9af58baeacc9f6bd9ba06d901ca4f5e234944f42a3c37e55e4ddcf0 + languageName: node + linkType: hard + "jsdom-worker@npm:0.3.0": version: 0.3.0 resolution: "jsdom-worker@npm:0.3.0" @@ -10625,6 +10683,15 @@ __metadata: languageName: node linkType: hard +"klaw@npm:^3.0.0": + version: 3.0.0 + resolution: "klaw@npm:3.0.0" + dependencies: + graceful-fs: ^4.1.9 + checksum: 1bf9de22392c80d28de8a2babd6f0de29fa52fcdc1654838fd35174b3641c168ec32b8b03022191e3c190efd535c31fce23f85e29cb260245571da7263ef418e + languageName: node + linkType: hard + "kleur@npm:^3.0.3": version: 3.0.3 resolution: "kleur@npm:3.0.3" @@ -10830,6 +10897,15 @@ __metadata: languageName: node linkType: hard +"linkify-it@npm:^3.0.1": + version: 3.0.3 + resolution: "linkify-it@npm:3.0.3" + dependencies: + uc.micro: ^1.0.1 + checksum: 31367a4bb70c5bbc9703246236b504b0a8e049bcd4e0de4291fa50f0ebdebf235b5eb54db6493cb0b1319357c6eeafc4324c9f4aa34b0b943d9f2e11a1268fbc + languageName: node + linkType: hard + "lint-staged@npm:13.0.3": version: 13.0.3 resolution: "lint-staged@npm:13.0.3" @@ -11066,7 +11142,7 @@ __metadata: languageName: node linkType: hard -"lodash@npm:^4.0.0, lodash@npm:^4.17.10, lodash@npm:^4.17.14, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.7.0, lodash@npm:~4.17.10, lodash@npm:~4.17.19, lodash@npm:~4.17.21": +"lodash@npm:^4.0.0, lodash@npm:^4.17.10, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.7.0, lodash@npm:~4.17.10, lodash@npm:~4.17.19, lodash@npm:~4.17.21": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7 @@ -11113,14 +11189,7 @@ __metadata: languageName: node linkType: hard -"long@npm:4.0.0, long@npm:^4.0.0": - version: 4.0.0 - resolution: "long@npm:4.0.0" - checksum: 16afbe8f749c7c849db1f4de4e2e6a31ac6e617cead3bdc4f9605cb703cd20e1e9fc1a7baba674ffcca57d660a6e5b53a9e236d7b25a295d3855cca79cc06744 - languageName: node - linkType: hard - -"long@npm:5.2.0": +"long@npm:5.2.0, long@npm:^5.0.0, long@npm:^5.2.0": version: 5.2.0 resolution: "long@npm:5.2.0" checksum: 37aa4e67b9c3eebc6d9d675adcc9d06f06059ca268922a71273de389746bf07f0ff282f9e604d17fdf84c4149099b44e936ea2b621a6c4759a216621afa97efd @@ -11268,6 +11337,16 @@ __metadata: languageName: node linkType: hard +"markdown-it-anchor@npm:^8.4.1": + version: 8.6.5 + resolution: "markdown-it-anchor@npm:8.6.5" + peerDependencies: + "@types/markdown-it": "*" + markdown-it: "*" + checksum: 9a466279e52e3c04d67f1e706f2c14df9340e64ddac6eaad22ceaeca777e381103caa942464003e98765a7555bd1ccb5055b624565cb4522a7071dce6ae93460 + languageName: node + linkType: hard + "markdown-it@npm:13.0.1": version: 13.0.1 resolution: "markdown-it@npm:13.0.1" @@ -11283,6 +11362,30 @@ __metadata: languageName: node linkType: hard +"markdown-it@npm:^12.3.2": + version: 12.3.2 + resolution: "markdown-it@npm:12.3.2" + dependencies: + argparse: ^2.0.1 + entities: ~2.1.0 + linkify-it: ^3.0.1 + mdurl: ^1.0.1 + uc.micro: ^1.0.5 + bin: + markdown-it: bin/markdown-it.js + checksum: 890555711c1c00fa03b936ca2b213001a3b9b37dea140d8445ae4130ce16628392aad24b12e2a0a9935336ca5951f2957a38f4e5309a2e38eab44e25ff32a41e + languageName: node + linkType: hard + +"marked@npm:^4.0.10": + version: 4.1.1 + resolution: "marked@npm:4.1.1" + bin: + marked: bin/marked.js + checksum: 717e3357952ee53de831bf0eb110ed075bebca2376c58bcdf7ee523ef540d45308ad6d51b2c933da0968832ea4386f31c142ca65443e77c098e84f6cce73e418 + languageName: node + linkType: hard + "matched@npm:^0.4.1": version: 0.4.4 resolution: "matched@npm:0.4.4" @@ -13492,9 +13595,32 @@ __metadata: languageName: node linkType: hard -"protobufjs@npm:6.11.3": - version: 6.11.3 - resolution: "protobufjs@npm:6.11.3" +"protobufjs-cli@npm:1.0.2": + version: 1.0.2 + resolution: "protobufjs-cli@npm:1.0.2" + dependencies: + chalk: ^4.0.0 + escodegen: ^1.13.0 + espree: ^9.0.0 + estraverse: ^5.1.0 + glob: ^8.0.0 + jsdoc: ^3.6.3 + minimist: ^1.2.0 + semver: ^7.1.2 + tmp: ^0.2.1 + uglify-js: ^3.7.7 + peerDependencies: + protobufjs: ^7.0.0 + bin: + pbjs: bin/pbjs + pbts: bin/pbts + checksum: 75dfa8bb76ea390c4f4926120439892fce6c730ec56960e85d5f03cac9c390fd7467d1254833542d722616ab4cb64a622e6de2fb7c75e7c42972878ae447b773 + languageName: node + linkType: hard + +"protobufjs@npm:7.1.2": + version: 7.1.2 + resolution: "protobufjs@npm:7.1.2" dependencies: "@protobufjs/aspromise": ^1.1.2 "@protobufjs/base64": ^1.1.2 @@ -13506,13 +13632,9 @@ __metadata: "@protobufjs/path": ^1.1.2 "@protobufjs/pool": ^1.1.0 "@protobufjs/utf8": ^1.1.0 - "@types/long": ^4.0.1 "@types/node": ">=13.7.0" - long: ^4.0.0 - bin: - pbjs: bin/pbjs - pbts: bin/pbts - checksum: 4a6ce1964167e4c45c53fd8a312d7646415c777dd31b4ba346719947b88e61654912326101f927da387d6b6473ab52a7ea4f54d6f15d63b31130ce28e2e15070 + long: ^5.0.0 + checksum: ae41669b1b0372fb1d49f506f2d1f2b0fb3dc3cece85987b17bcb544e4cef7c8d27f480486cdec324146ad0a5d22a327166a7ea864a9b3e49cc3c92a5d3f6500 languageName: node linkType: hard @@ -14139,6 +14261,15 @@ __metadata: languageName: node linkType: hard +"requizzle@npm:^0.2.3": + version: 0.2.3 + resolution: "requizzle@npm:0.2.3" + dependencies: + lodash: ^4.17.14 + checksum: b1b27c6ad16a2621d4cdb57cd44f01d302974df60f84f94b4d9d313dfe1d375e5b1a12f46010929fe508e83c40696a2105d38c1d1906c228500ac72b23a0d0c6 + languageName: node + linkType: hard + "resolve-cwd@npm:^3.0.0": version: 3.0.0 resolution: "resolve-cwd@npm:3.0.0" @@ -14325,7 +14456,7 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:^3.0.2, rimraf@npm:~3.0.2": +"rimraf@npm:^3.0.0, rimraf@npm:^3.0.2, rimraf@npm:~3.0.2": version: 3.0.2 resolution: "rimraf@npm:3.0.2" dependencies: @@ -14501,7 +14632,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8": +"semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8": version: 7.3.8 resolution: "semver@npm:7.3.8" dependencies: @@ -15428,6 +15559,13 @@ __metadata: languageName: node linkType: hard +"taffydb@npm:2.6.2": + version: 2.6.2 + resolution: "taffydb@npm:2.6.2" + checksum: 8fea9cdff71735a40320c4beeb80cb98837076cb89614bc55ac5d67561f35ebae158cfc07a193a1099b5e32746433b2c086b0cd6d56f29aa7c7678e74968335b + languageName: node + linkType: hard + "tapable@npm:^2.1.1, tapable@npm:^2.2.0": version: 2.2.0 resolution: "tapable@npm:2.2.0" @@ -15599,6 +15737,15 @@ __metadata: languageName: node linkType: hard +"tmp@npm:^0.2.1": + version: 0.2.1 + resolution: "tmp@npm:0.2.1" + dependencies: + rimraf: ^3.0.0 + checksum: 8b1214654182575124498c87ca986ac53dc76ff36e8f0e0b67139a8d221eaecfdec108c0e6ec54d76f49f1f72ab9325500b246f562b926f85bcdfca8bf35df9e + languageName: node + linkType: hard + "tmpl@npm:1.0.5": version: 1.0.5 resolution: "tmpl@npm:1.0.5" @@ -15960,6 +16107,15 @@ __metadata: languageName: node linkType: hard +"uglify-js@npm:^3.7.7": + version: 3.17.4 + resolution: "uglify-js@npm:3.17.4" + bin: + uglifyjs: bin/uglifyjs + checksum: 7b3897df38b6fc7d7d9f4dcd658599d81aa2b1fb0d074829dd4e5290f7318dbca1f4af2f45acb833b95b1fe0ed4698662ab61b87e94328eb4c0a0d3435baf924 + languageName: node + linkType: hard + "uint32@npm:0.2.1": version: 0.2.1 resolution: "uint32@npm:0.2.1" @@ -15996,7 +16152,7 @@ __metadata: languageName: node linkType: hard -"underscore@npm:1.13.6": +"underscore@npm:1.13.6, underscore@npm:~1.13.2": version: 1.13.6 resolution: "underscore@npm:1.13.6" checksum: d5cedd14a9d0d91dd38c1ce6169e4455bb931f0aaf354108e47bd46d3f2da7464d49b2171a5cf786d61963204a42d01ea1332a903b7342ad428deaafaf70ec36 @@ -16719,7 +16875,7 @@ __metadata: "@wireapp/antiscroll-2": 1.3.1 "@wireapp/avs": 8.2.16 "@wireapp/copy-config": 1.3.10 - "@wireapp/core": 34.1.4 + "@wireapp/core": 34.1.6 "@wireapp/eslint-config": 1.12.12 "@wireapp/prettier-config": 0.4.7 "@wireapp/react-ui-kit": 8.17.8 @@ -17154,6 +17310,13 @@ __metadata: languageName: node linkType: hard +"xmlcreate@npm:^2.0.4": + version: 2.0.4 + resolution: "xmlcreate@npm:2.0.4" + checksum: b8dd52668b9aea77cd1408fa85538c14bb8dcc98b4e7bb51e76696c9c115d59eba7240298d0c4fd2caf8f1a8e283ab4e5c7b9a6bcfcf23a8b48f5068b677b748 + languageName: node + linkType: hard + "xtend@npm:~4.0.0, xtend@npm:~4.0.1": version: 4.0.2 resolution: "xtend@npm:4.0.2" From 3c8bcb1ea12b52e4e070814ae6c53acffa97295a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Wei=C3=9F?= <77456193+aweiss-dev@users.noreply.github.com> Date: Wed, 26 Oct 2022 14:39:19 +0200 Subject: [PATCH 65/66] chore: update wire-web-app packages with breaking changes (#13975) * chore: update wire-web-app packages with breaking changes * chore: remove typescript linting --- package.json | 16 +- src/script/assets/AssetMapper.test.ts | 2 +- src/script/assets/AssetMapper.ts | 6 +- src/script/assets/AssetRepository.test.ts | 2 +- src/script/assets/AssetRepository.ts | 2 +- src/script/assets/AssetService.ts | 2 +- src/script/audio/AudioRepository.ts | 2 +- src/script/audio/AudioState.ts | 2 +- src/script/auth/component/ClientItem.tsx | 2 +- src/script/auth/component/ClientList.tsx | 2 +- src/script/auth/component/LoginForm.tsx | 2 +- src/script/auth/component/PhoneLoginForm.tsx | 2 +- .../auth/component/WirelessContainer.tsx | 2 +- src/script/auth/localeConfig.ts | 2 +- .../auth/module/action/AuthAction.test.ts | 2 +- src/script/auth/module/action/AuthAction.ts | 8 +- src/script/auth/module/action/ClientAction.ts | 4 +- .../module/action/ConversationAction.test.ts | 2 +- .../auth/module/action/ConversationAction.ts | 2 +- .../auth/module/action/InvitationAction.ts | 4 +- .../auth/module/action/SelfAction.test.ts | 2 +- src/script/auth/module/action/SelfAction.ts | 2 +- .../auth/module/action/WebSocketAction.ts | 10 +- .../action/creator/AuthActionCreator.ts | 4 +- .../action/creator/ClientActionCreator.ts | 2 +- .../creator/ConversationActionCreator.ts | 2 +- .../action/creator/InvitationActionCreator.ts | 2 +- .../action/creator/SelfActionCreator.ts | 2 +- src/script/auth/module/reducer/authReducer.ts | 10 +- .../auth/module/reducer/clientReducer.ts | 2 +- .../auth/module/reducer/inviteReducer.ts | 2 +- src/script/auth/module/reducer/selfReducer.ts | 2 +- .../auth/module/selector/AuthSelector.ts | 2 +- .../auth/module/selector/ClientSelector.ts | 2 +- .../auth/module/selector/SelfSelector.ts | 2 +- src/script/auth/page/CheckPassword.tsx | 4 +- src/script/auth/page/ConversationJoin.tsx | 2 +- .../auth/page/CustomEnvironmentRedirect.tsx | 2 +- src/script/auth/page/HistoryInfo.tsx | 2 +- src/script/auth/page/Index.tsx | 2 +- src/script/auth/page/Login.test.tsx | 2 +- src/script/auth/page/Login.tsx | 4 +- src/script/auth/page/Page.tsx | 2 +- src/script/auth/page/PhoneLogin.test.tsx | 2 +- src/script/auth/page/PhoneLogin.tsx | 4 +- src/script/auth/page/Root.tsx | 2 +- src/script/auth/page/SetHandle.tsx | 2 +- src/script/auth/page/SingleSignOnForm.tsx | 8 +- src/script/auth/page/VerifyPhoneCode.tsx | 2 +- src/script/auth/util/test/TestUtil.tsx | 2 +- src/script/calling/Call.ts | 2 +- src/script/calling/CallState.ts | 2 +- src/script/calling/CallingRepository.ts | 17 +- src/script/calling/Participant.ts | 2 +- src/script/client/ClientEntity.ts | 2 +- src/script/client/ClientMapper.ts | 2 +- src/script/client/ClientRepository.test.ts | 2 +- src/script/client/ClientRepository.ts | 6 +- src/script/client/ClientService.ts | 4 +- .../Message/ContentMessage/MessageQuote.tsx | 2 +- .../Message/ContentMessage/asset/index.tsx | 2 +- .../Message/ContentMessage/index.tsx | 2 +- .../components/MessagesList/Message/index.tsx | 2 +- .../GroupCreation/GroupCreationModal.tsx | 4 +- .../Modals/UserModal/UserModal.test.tsx | 2 +- .../components/Modals/UserModal/UserModal.tsx | 2 +- src/script/components/TitleBar/index.test.tsx | 2 +- src/script/components/UserDevices.tsx | 2 +- .../calling/CallingOverlayContainer.tsx | 2 +- .../components/calling/GroupVideoGrid.tsx | 2 +- .../components/calling/GroupVideoGridTile.tsx | 2 +- .../list/ConversationListCallingCell.tsx | 2 +- .../ConversationProtocolDetails.test.tsx | 2 +- .../ConversationProtocolDetails.tsx | 2 +- .../components/panel/EnrichedFields.test.tsx | 2 +- .../components/panel/EnrichedFields.tsx | 2 +- .../components/panel/UserActions.test.tsx | 2 +- src/script/components/panel/UserActions.tsx | 2 +- .../toggle/ReceiptModeToggle.test.tsx | 2 +- .../components/toggle/ReceiptModeToggle.tsx | 2 +- .../userDevices/DeviceCard.test.tsx | 2 +- .../components/userDevices/DeviceCard.tsx | 2 +- src/script/connection/ConnectionEntity.ts | 4 +- .../connection/ConnectionMapper.test.ts | 2 +- src/script/connection/ConnectionMapper.ts | 2 +- src/script/connection/ConnectionRepository.ts | 12 +- src/script/connection/ConnectionService.ts | 4 +- .../AbstractConversationEventHandler.ts | 2 +- src/script/conversation/ClientMismatchUtil.ts | 11 +- .../ConversationAccessPermission.test.ts | 2 +- .../ConversationAccessPermission.ts | 2 +- .../ConversationEphemeralHandler.ts | 2 +- .../conversation/ConversationFilter.test.ts | 4 +- .../ConversationLabelRepository.ts | 2 +- .../conversation/ConversationMapper.test.ts | 6 +- src/script/conversation/ConversationMapper.ts | 4 +- .../ConversationRepository.test.ts | 14 +- .../conversation/ConversationRepository.ts | 14 +- .../ConversationRoleRepository.test.ts | 2 +- .../ConversationRoleRepository.ts | 2 +- .../conversation/ConversationService.ts | 8 +- src/script/conversation/ConversationState.ts | 4 +- .../conversation/ConversationStateHandler.ts | 6 +- .../ConversationVerificationStateHandler.ts | 2 +- src/script/conversation/EventBuilder.test.ts | 2 +- src/script/conversation/EventBuilder.ts | 10 +- src/script/conversation/EventMapper.ts | 2 +- .../conversation/MessageRepository.test.ts | 8 +- src/script/conversation/MessageRepository.ts | 14 +- src/script/conversation/userClientsUtils.ts | 2 +- src/script/cryptography/CryptographyMapper.ts | 2 +- .../cryptography/CryptographyRepository.ts | 4 +- src/script/entity/Conversation.test.ts | 8 +- src/script/entity/Conversation.ts | 8 +- src/script/entity/User.ts | 2 +- src/script/entity/message/ContentMessage.ts | 4 +- .../message/DeleteConversationMessage.ts | 2 +- src/script/entity/message/MemberMessage.ts | 6 +- src/script/entity/message/Message.ts | 4 +- .../message/MessageTimerUpdateMessage.ts | 2 +- .../message/ReceiptModeUpdateMessage.ts | 2 +- src/script/entity/message/RenameMessage.ts | 2 +- src/script/entity/message/Text.ts | 2 +- src/script/error/BackendClientError.ts | 2 +- src/script/event/EventRepository.test.ts | 2 +- src/script/event/EventRepository.ts | 6 +- src/script/event/EventSource.ts | 2 +- src/script/event/EventTypeHandling.ts | 2 +- src/script/event/EventValidator.test.ts | 4 +- src/script/event/EventValidator.ts | 2 +- src/script/event/NotificationService.ts | 4 +- .../event/preprocessor/ReceiptsMiddleware.ts | 2 +- .../event/preprocessor/ServiceMiddleware.ts | 4 +- src/script/extension/GiphyService.ts | 2 +- src/script/guards/Protocol.ts | 2 +- .../integration/IntegrationRepository.ts | 2 +- src/script/integration/IntegrationService.ts | 2 +- src/script/integration/ServiceEntity.ts | 2 +- src/script/legal-hold/LegalHoldEvaluator.ts | 2 +- src/script/main/app.ts | 2 +- src/script/media/MediaParser.ts | 2 +- src/script/message/MentionEntity.ts | 2 +- .../mlsConversationState.test.ts | 2 +- .../notification/NotificationRepository.ts | 4 +- .../PreferenceNotificationRepository.test.ts | 2 +- .../PreferenceNotificationRepository.ts | 6 +- src/script/page/AppLock/AppLock.test.tsx | 2 +- .../Conversations/GroupedConversations.tsx | 2 +- .../LeftSidebar/panels/StartUI/PeopleTab.tsx | 2 +- .../StartUI/components/GroupList.test.tsx | 4 +- .../components/topPeople/TopContact.tsx | 2 +- .../panels/TemporatyGuestConversations.tsx | 2 +- .../panels/preferences/OptionPreferences.tsx | 2 +- .../accountPreferences/DataUsageSection.tsx | 2 +- .../accountPreferences/PrivacySection.tsx | 2 +- .../preferences/avPreferences/CallOptions.tsx | 2 +- .../devices/DevicesPreferences.tsx | 2 +- src/script/properties/PropertiesRepository.ts | 6 +- src/script/search/SearchRepository.ts | 2 +- src/script/search/SearchService.ts | 2 +- src/script/self/SelfService.ts | 6 +- src/script/service/CoreSingleton.ts | 2 +- src/script/storage/record/ClientRecord.ts | 2 +- .../storage/record/ConversationRecord.ts | 8 +- src/script/storage/record/EventRecord.ts | 4 +- src/script/strings.ts | 2 +- src/script/team/TeamMapper.ts | 6 +- src/script/team/TeamMemberEntity.ts | 4 +- src/script/team/TeamRepository.ts | 12 +- src/script/team/TeamService.ts | 14 +- src/script/team/TeamState.ts | 2 +- src/script/user/AppLockState.ts | 2 +- src/script/user/RichProfileRepository.ts | 2 +- src/script/user/UserFilter.ts | 2 +- src/script/user/UserMapper.test.ts | 2 +- src/script/user/UserMapper.ts | 4 +- src/script/user/UserPermission.ts | 2 +- src/script/user/UserRepository.ts | 14 +- src/script/user/UserService.ts | 2 +- src/script/util/DebugUtil.ts | 12 +- src/script/util/StorageUtil.ts | 2 +- src/script/util/TypePredicateUtil.test.ts | 2 +- src/script/util/TypePredicateUtil.ts | 4 +- src/script/util/messageRenderer.ts | 2 +- src/script/view_model/CallingViewModel.ts | 2 +- src/script/view_model/ContentViewModel.ts | 2 +- src/script/view_model/ThemeViewModel.ts | 2 +- .../view_model/content/EmojiInputViewModel.ts | 2 +- .../content/LegalHoldModalViewModel.ts | 2 +- .../panel/ConversationDetailsViewModel.ts | 2 +- .../panel/GroupParticipantUserViewModel.ts | 2 +- .../panel/MessageDetailsViewModel.ts | 2 +- test/helper/TestFactory.js | 2 +- test/helper/UserGenerator.ts | 4 +- test/unit_tests/audio/AudioRepositorySpec.js | 2 +- test/unit_tests/client/ClientMapperSpec.js | 2 +- .../connection/ConnectionRepositorySpec.js | 2 +- .../cryptography/CryptographyMapperSpec.js | 4 +- .../preprocessor/ServiceMiddlewareSpec.js | 2 +- .../NotificationRepositorySpec.js | 6 +- test/unit_tests/tracking/HelpersSpec.js | 2 +- test/unit_tests/user/UserRepositorySpec.js | 2 +- .../view_model/WindowTitleViewModelSpec.js | 2 +- .../panel/ConversationDetailsViewModelSpec.js | 2 +- yarn.lock | 166 ++++++++---------- 205 files changed, 419 insertions(+), 447 deletions(-) diff --git a/package.json b/package.json index 8d8f65856b3..d26859e6dfd 100644 --- a/package.json +++ b/package.json @@ -2,12 +2,12 @@ "dependencies": { "@emotion/react": "11.10.4", "@wireapp/antiscroll-2": "1.3.1", - "@wireapp/avs": "8.2.16", - "@wireapp/core": "34.1.6", - "@wireapp/react-ui-kit": "8.17.8", - "@wireapp/store-engine-dexie": "1.7.11", + "@wireapp/avs": "8.2.17", + "@wireapp/core": "35.0.0", + "@wireapp/react-ui-kit": "9.0.1", + "@wireapp/store-engine-dexie": "2.0.0", "@wireapp/store-engine-sqleet": "1.8.9", - "@wireapp/webapp-events": "0.14.9", + "@wireapp/webapp-events": "0.15.0", "amplify": "https://github.com/wireapp/amplify#head=master", "classnames": "2.3.2", "copy-webpack-plugin": "11.0.0", @@ -90,9 +90,9 @@ "@types/webpack-env": "1.18.0", "@typescript-eslint/eslint-plugin": "5.40.1", "@typescript-eslint/parser": "5.40.1", - "@wireapp/copy-config": "1.3.10", - "@wireapp/eslint-config": "1.12.12", - "@wireapp/prettier-config": "0.4.7", + "@wireapp/copy-config": "2.0.0", + "@wireapp/eslint-config": "2.0.0", + "@wireapp/prettier-config": "0.5.0", "adm-zip": "0.5.9", "autoprefixer": "9.8.8", "babel-loader": "8.2.5", diff --git a/src/script/assets/AssetMapper.test.ts b/src/script/assets/AssetMapper.test.ts index 54809c8fc4b..661f5acb36b 100644 --- a/src/script/assets/AssetMapper.test.ts +++ b/src/script/assets/AssetMapper.test.ts @@ -17,7 +17,7 @@ * */ -import {UserAsset as APIClientUserAsset, UserAssetType} from '@wireapp/api-client/src/user/'; +import {UserAsset as APIClientUserAsset, UserAssetType} from '@wireapp/api-client/lib/user/'; import * as AssetMapper from './AssetMapper'; diff --git a/src/script/assets/AssetMapper.ts b/src/script/assets/AssetMapper.ts index 4c4f1134530..3551127fcb8 100644 --- a/src/script/assets/AssetMapper.ts +++ b/src/script/assets/AssetMapper.ts @@ -17,9 +17,9 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; -import type {UserAsset as APIClientUserAsset} from '@wireapp/api-client/src/user/'; -import type {Picture as APIClientPicture} from '@wireapp/api-client/src/self/'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; +import type {UserAsset as APIClientUserAsset} from '@wireapp/api-client/lib/user/'; +import type {Picture as APIClientPicture} from '@wireapp/api-client/lib/self/'; import {AssetRemoteData} from './AssetRemoteData'; import type {User} from '../entity/User'; diff --git a/src/script/assets/AssetRepository.test.ts b/src/script/assets/AssetRepository.test.ts index 2e89dfb963e..953010d8c3d 100644 --- a/src/script/assets/AssetRepository.test.ts +++ b/src/script/assets/AssetRepository.test.ts @@ -17,7 +17,7 @@ * */ -import {AssetUploadData} from '@wireapp/api-client/src/asset/'; +import {AssetUploadData} from '@wireapp/api-client/lib/asset/'; import {createRandomUuid} from 'Util/util'; import {ValidationUtilError} from 'Util/ValidationUtil'; diff --git a/src/script/assets/AssetRepository.ts b/src/script/assets/AssetRepository.ts index d5b3444ae2f..229b3131ed0 100644 --- a/src/script/assets/AssetRepository.ts +++ b/src/script/assets/AssetRepository.ts @@ -20,7 +20,7 @@ import ko from 'knockout'; import {LegalHoldStatus} from '@wireapp/protocol-messaging'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; -import {AssetOptions, AssetRetentionPolicy} from '@wireapp/api-client/src/asset/'; +import {AssetOptions, AssetRetentionPolicy} from '@wireapp/api-client/lib/asset/'; import {singleton, container} from 'tsyringe'; import {Logger, getLogger} from 'Util/Logger'; diff --git a/src/script/assets/AssetService.ts b/src/script/assets/AssetService.ts index c43c0958026..6fa31d158c0 100644 --- a/src/script/assets/AssetService.ts +++ b/src/script/assets/AssetService.ts @@ -17,7 +17,7 @@ * */ -import {ProgressCallback} from '@wireapp/api-client/src/http/'; +import {ProgressCallback} from '@wireapp/api-client/lib/http/'; import {singleton, container} from 'tsyringe'; import {legacyAsset, assetV3, isValidApiPath} from 'Util/ValidationUtil'; diff --git a/src/script/audio/AudioRepository.ts b/src/script/audio/AudioRepository.ts index 1e249d536b5..d9dbb2330cd 100644 --- a/src/script/audio/AudioRepository.ts +++ b/src/script/audio/AudioRepository.ts @@ -17,7 +17,7 @@ * */ -import {AudioPreference, WebappProperties} from '@wireapp/api-client/src/user/data/'; +import {AudioPreference, WebappProperties} from '@wireapp/api-client/lib/user/data/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import {container} from 'tsyringe'; diff --git a/src/script/audio/AudioState.ts b/src/script/audio/AudioState.ts index cd6ae6f24b6..68e177b1ef0 100644 --- a/src/script/audio/AudioState.ts +++ b/src/script/audio/AudioState.ts @@ -19,7 +19,7 @@ import {singleton} from 'tsyringe'; import ko from 'knockout'; -import {AudioPreference} from '@wireapp/api-client/src/user/data/'; +import {AudioPreference} from '@wireapp/api-client/lib/user/data/'; @singleton() export class AudioState { diff --git a/src/script/auth/component/ClientItem.tsx b/src/script/auth/component/ClientItem.tsx index 323cda24024..bab7bbbb7cb 100644 --- a/src/script/auth/component/ClientItem.tsx +++ b/src/script/auth/component/ClientItem.tsx @@ -17,7 +17,7 @@ * */ -import {RegisteredClient} from '@wireapp/api-client/src/client/index'; +import {RegisteredClient} from '@wireapp/api-client/lib/client/index'; import { COLOR, ContainerXS, diff --git a/src/script/auth/component/ClientList.tsx b/src/script/auth/component/ClientList.tsx index d90dd5ff101..5d4af3d439f 100644 --- a/src/script/auth/component/ClientList.tsx +++ b/src/script/auth/component/ClientList.tsx @@ -17,7 +17,7 @@ * */ -import {ClientType} from '@wireapp/api-client/src/client/index'; +import {ClientType} from '@wireapp/api-client/lib/client/index'; import {ContainerXS, Loading} from '@wireapp/react-ui-kit'; import React from 'react'; import {connect} from 'react-redux'; diff --git a/src/script/auth/component/LoginForm.tsx b/src/script/auth/component/LoginForm.tsx index ed3056f681a..809f34aa126 100644 --- a/src/script/auth/component/LoginForm.tsx +++ b/src/script/auth/component/LoginForm.tsx @@ -17,7 +17,7 @@ * */ -import {LoginData} from '@wireapp/api-client/src/auth'; +import {LoginData} from '@wireapp/api-client/lib/auth'; import {Input, Loading, Button} from '@wireapp/react-ui-kit'; import React, {useRef, useState} from 'react'; import {useIntl} from 'react-intl'; diff --git a/src/script/auth/component/PhoneLoginForm.tsx b/src/script/auth/component/PhoneLoginForm.tsx index d99cd89f3a8..18be584e12b 100644 --- a/src/script/auth/component/PhoneLoginForm.tsx +++ b/src/script/auth/component/PhoneLoginForm.tsx @@ -17,7 +17,7 @@ * */ -import {LoginData} from '@wireapp/api-client/src/auth'; +import {LoginData} from '@wireapp/api-client/lib/auth'; import {ArrowIcon, Input, InputBlock, InputSubmitCombo, Loading, RoundIconButton, Select} from '@wireapp/react-ui-kit'; import React, {useRef, useState} from 'react'; import {useIntl} from 'react-intl'; diff --git a/src/script/auth/component/WirelessContainer.tsx b/src/script/auth/component/WirelessContainer.tsx index d81b5697904..bec3b669d80 100644 --- a/src/script/auth/component/WirelessContainer.tsx +++ b/src/script/auth/component/WirelessContainer.tsx @@ -22,7 +22,7 @@ import React from 'react'; import {FormattedMessage, useIntl} from 'react-intl'; import {cookiePolicyStrings, footerStrings} from '../../strings'; import {EXTERNAL_ROUTE} from '../externalRoute'; -import {SVGIcon} from '@wireapp/react-ui-kit/src/Icon/SVGIcon'; +import {SVGIcon} from '@wireapp/react-ui-kit/lib/Icon/SVGIcon'; import SVGProvider from '../util/SVGProvider'; import {Config} from '../../Config'; diff --git a/src/script/auth/localeConfig.ts b/src/script/auth/localeConfig.ts index f124bd7a0b5..44d8aa91c40 100644 --- a/src/script/auth/localeConfig.ts +++ b/src/script/auth/localeConfig.ts @@ -17,7 +17,7 @@ * */ -import {SupportedCurrency} from '@wireapp/api-client/src/team/payment/'; +import {SupportedCurrency} from '@wireapp/api-client/lib/team/payment/'; import {UrlUtil} from '@wireapp/commons'; import {QUERY_KEY} from './route'; diff --git a/src/script/auth/module/action/AuthAction.test.ts b/src/script/auth/module/action/AuthAction.test.ts index 7041b19e8ef..ac9661ef7de 100644 --- a/src/script/auth/module/action/AuthAction.test.ts +++ b/src/script/auth/module/action/AuthAction.test.ts @@ -18,7 +18,7 @@ */ import type {APIClient} from '@wireapp/api-client'; -import {ClientType} from '@wireapp/api-client/src/client/'; +import {ClientType} from '@wireapp/api-client/lib/client/'; import type {TypeUtil} from '@wireapp/commons'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; diff --git a/src/script/auth/module/action/AuthAction.ts b/src/script/auth/module/action/AuthAction.ts index 5b631c6f2a4..1e1ace3931b 100644 --- a/src/script/auth/module/action/AuthAction.ts +++ b/src/script/auth/module/action/AuthAction.ts @@ -17,15 +17,15 @@ * */ -import type {DomainData} from '@wireapp/api-client/src/account/DomainData'; -import type {LoginData, RegisterData, SendLoginCode} from '@wireapp/api-client/src/auth/'; -import {ClientType} from '@wireapp/api-client/src/client/'; +import type {DomainData} from '@wireapp/api-client/lib/account/DomainData'; +import type {LoginData, RegisterData, SendLoginCode} from '@wireapp/api-client/lib/auth/'; +import {ClientType} from '@wireapp/api-client/lib/client/'; import type {Account} from '@wireapp/core'; import type {CRUDEngine} from '@wireapp/store-engine'; import {SQLeetEngine} from '@wireapp/store-engine-sqleet'; import {LowDiskSpaceError} from '@wireapp/store-engine/src/main/engine/error/'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; -import {VerificationActionType} from '@wireapp/api-client/src/auth/VerificationActionType'; +import {VerificationActionType} from '@wireapp/api-client/lib/auth/VerificationActionType'; import {isTemporaryClientAndNonPersistent} from 'Util/util'; import {currentCurrency, currentLanguage} from '../../localeConfig'; diff --git a/src/script/auth/module/action/ClientAction.ts b/src/script/auth/module/action/ClientAction.ts index 13957444c27..998f4fdae58 100644 --- a/src/script/auth/module/action/ClientAction.ts +++ b/src/script/auth/module/action/ClientAction.ts @@ -17,8 +17,8 @@ * */ -import {ClientClassification, ClientType, RegisteredClient} from '@wireapp/api-client/src/client/'; -import type {ClientInfo} from '@wireapp/core/src/main/client/'; +import {ClientClassification, ClientType, RegisteredClient} from '@wireapp/api-client/lib/client/'; +import type {ClientInfo} from '@wireapp/core/lib/client/'; import {Runtime} from '@wireapp/commons'; import * as StringUtil from '../../util/stringUtil'; diff --git a/src/script/auth/module/action/ConversationAction.test.ts b/src/script/auth/module/action/ConversationAction.test.ts index 247f370461d..d1581b3a107 100644 --- a/src/script/auth/module/action/ConversationAction.test.ts +++ b/src/script/auth/module/action/ConversationAction.test.ts @@ -17,7 +17,7 @@ * */ -import type {ConversationEvent} from '@wireapp/api-client/src/event/'; +import type {ConversationEvent} from '@wireapp/api-client/lib/event/'; import {actionRoot} from '.'; import {mockStoreFactory} from '../../util/test/mockStoreFactory'; diff --git a/src/script/auth/module/action/ConversationAction.ts b/src/script/auth/module/action/ConversationAction.ts index c5ae58f74d6..810cb447d7b 100644 --- a/src/script/auth/module/action/ConversationAction.ts +++ b/src/script/auth/module/action/ConversationAction.ts @@ -17,7 +17,7 @@ * */ -import type {ConversationEvent} from '@wireapp/api-client/src/event/'; +import type {ConversationEvent} from '@wireapp/api-client/lib/event/'; import type {ThunkAction} from '../reducer'; import {ConversationActionCreator} from './creator/'; diff --git a/src/script/auth/module/action/InvitationAction.ts b/src/script/auth/module/action/InvitationAction.ts index d2d24ee15dc..bf30ec6b7e5 100644 --- a/src/script/auth/module/action/InvitationAction.ts +++ b/src/script/auth/module/action/InvitationAction.ts @@ -17,8 +17,8 @@ * */ -import type {NewTeamInvitation} from '@wireapp/api-client/src/team/'; -import {Role} from '@wireapp/api-client/src/team/member/'; +import type {NewTeamInvitation} from '@wireapp/api-client/lib/team/'; +import {Role} from '@wireapp/api-client/lib/team/member/'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; import type {ThunkAction} from '../reducer'; diff --git a/src/script/auth/module/action/SelfAction.test.ts b/src/script/auth/module/action/SelfAction.test.ts index 30314b0427f..062b0059e14 100644 --- a/src/script/auth/module/action/SelfAction.test.ts +++ b/src/script/auth/module/action/SelfAction.test.ts @@ -17,7 +17,7 @@ * */ -import type {Self} from '@wireapp/api-client/src/self/'; +import type {Self} from '@wireapp/api-client/lib/self/'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; import {actionRoot} from '.'; diff --git a/src/script/auth/module/action/SelfAction.ts b/src/script/auth/module/action/SelfAction.ts index ecf8ec87acc..2c0c1d26b03 100644 --- a/src/script/auth/module/action/SelfAction.ts +++ b/src/script/auth/module/action/SelfAction.ts @@ -17,7 +17,7 @@ * */ -import type {ChangePassword, ConsentType, Self} from '@wireapp/api-client/src/self/'; +import type {ChangePassword, ConsentType, Self} from '@wireapp/api-client/lib/self/'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; import {Environment} from 'Util/Environment'; diff --git a/src/script/auth/module/action/WebSocketAction.ts b/src/script/auth/module/action/WebSocketAction.ts index 20365429c5b..80125ffa061 100644 --- a/src/script/auth/module/action/WebSocketAction.ts +++ b/src/script/auth/module/action/WebSocketAction.ts @@ -17,11 +17,11 @@ * */ -import * as Events from '@wireapp/api-client/src/event/'; -import {ConnectionState, HttpClient} from '@wireapp/api-client/src/http/'; -import {PayloadBundle, PayloadBundleType} from '@wireapp/core/src/main/conversation/'; -import type {UserUpdateMessage} from '@wireapp/core/src/main/conversation/message/UserMessage'; -import {UserMapper} from '@wireapp/core/src/main/user/UserMapper'; +import * as Events from '@wireapp/api-client/lib/event/'; +import {ConnectionState, HttpClient} from '@wireapp/api-client/lib/http/'; +import {PayloadBundle, PayloadBundleType} from '@wireapp/core/lib/conversation/'; +import type {UserUpdateMessage} from '@wireapp/core/lib/conversation/message/UserMessage'; +import {UserMapper} from '@wireapp/core/lib/user/UserMapper'; import {getLogger} from 'Util/Logger'; import type {ThunkAction} from '../../module/reducer'; import * as SelfSelector from '../../module/selector/SelfSelector'; diff --git a/src/script/auth/module/action/creator/AuthActionCreator.ts b/src/script/auth/module/action/creator/AuthActionCreator.ts index b4d752086ce..70cdb3df8b7 100644 --- a/src/script/auth/module/action/creator/AuthActionCreator.ts +++ b/src/script/auth/module/action/creator/AuthActionCreator.ts @@ -17,8 +17,8 @@ * */ -import type {SSOSettings} from '@wireapp/api-client/src/account/SSOSettings'; -import type {LoginData, RegisterData} from '@wireapp/api-client/src/auth/'; +import type {SSOSettings} from '@wireapp/api-client/lib/account/SSOSettings'; +import type {LoginData, RegisterData} from '@wireapp/api-client/lib/auth/'; import type {AppAction} from '.'; import type {RegistrationDataState} from '../../reducer/authReducer'; diff --git a/src/script/auth/module/action/creator/ClientActionCreator.ts b/src/script/auth/module/action/creator/ClientActionCreator.ts index 3f15afdaeb0..132e16cdab5 100644 --- a/src/script/auth/module/action/creator/ClientActionCreator.ts +++ b/src/script/auth/module/action/creator/ClientActionCreator.ts @@ -17,7 +17,7 @@ * */ -import type {RegisteredClient} from '@wireapp/api-client/src/client/'; +import type {RegisteredClient} from '@wireapp/api-client/lib/client/'; import type {AppAction} from './'; export enum CLIENT_ACTION { diff --git a/src/script/auth/module/action/creator/ConversationActionCreator.ts b/src/script/auth/module/action/creator/ConversationActionCreator.ts index 6b99e4fbd85..723fc55ac7b 100644 --- a/src/script/auth/module/action/creator/ConversationActionCreator.ts +++ b/src/script/auth/module/action/creator/ConversationActionCreator.ts @@ -17,7 +17,7 @@ * */ -import type {ConversationEvent} from '@wireapp/api-client/src/event/'; +import type {ConversationEvent} from '@wireapp/api-client/lib/event/'; import type {AppAction} from '.'; diff --git a/src/script/auth/module/action/creator/InvitationActionCreator.ts b/src/script/auth/module/action/creator/InvitationActionCreator.ts index 06078c961c0..229d526d7e2 100644 --- a/src/script/auth/module/action/creator/InvitationActionCreator.ts +++ b/src/script/auth/module/action/creator/InvitationActionCreator.ts @@ -17,7 +17,7 @@ * */ -import type {TeamInvitation} from '@wireapp/api-client/src/team/'; +import type {TeamInvitation} from '@wireapp/api-client/lib/team/'; export enum INVITATION_ACTION { INVITE_ADD_FAILED = 'INVITE_ADD_FAILED', diff --git a/src/script/auth/module/action/creator/SelfActionCreator.ts b/src/script/auth/module/action/creator/SelfActionCreator.ts index d17dc53771c..4d8d906ee25 100644 --- a/src/script/auth/module/action/creator/SelfActionCreator.ts +++ b/src/script/auth/module/action/creator/SelfActionCreator.ts @@ -17,7 +17,7 @@ * */ -import type {Consent, Self} from '@wireapp/api-client/src/self/'; +import type {Consent, Self} from '@wireapp/api-client/lib/self/'; import type {AppAction} from '.'; diff --git a/src/script/auth/module/reducer/authReducer.ts b/src/script/auth/module/reducer/authReducer.ts index 2b77beab6fe..b6a7ea4fad9 100644 --- a/src/script/auth/module/reducer/authReducer.ts +++ b/src/script/auth/module/reducer/authReducer.ts @@ -17,11 +17,11 @@ * */ -import type {SSOSettings} from '@wireapp/api-client/src/account/SSOSettings'; -import type {LoginData} from '@wireapp/api-client/src/auth/'; -import {ClientType} from '@wireapp/api-client/src/client/'; -import type {TeamData} from '@wireapp/api-client/src/team/'; -import type {UserAsset} from '@wireapp/api-client/src/user/'; +import type {SSOSettings} from '@wireapp/api-client/lib/account/SSOSettings'; +import type {LoginData} from '@wireapp/api-client/lib/auth/'; +import {ClientType} from '@wireapp/api-client/lib/client/'; +import type {TeamData} from '@wireapp/api-client/lib/team/'; +import type {UserAsset} from '@wireapp/api-client/lib/user/'; import {Config} from '../../../Config'; import {AUTH_ACTION, AppActions, USER_ACTION} from '../action/creator/'; diff --git a/src/script/auth/module/reducer/clientReducer.ts b/src/script/auth/module/reducer/clientReducer.ts index 56231f23530..bda6dc810c8 100644 --- a/src/script/auth/module/reducer/clientReducer.ts +++ b/src/script/auth/module/reducer/clientReducer.ts @@ -17,7 +17,7 @@ * */ -import type {RegisteredClient} from '@wireapp/api-client/src/client/'; +import type {RegisteredClient} from '@wireapp/api-client/lib/client/'; import {AUTH_ACTION, AppActions, CLIENT_ACTION, NOTIFICATION_ACTION} from '../action/creator/'; diff --git a/src/script/auth/module/reducer/inviteReducer.ts b/src/script/auth/module/reducer/inviteReducer.ts index 01c035e1614..7b4bae954f6 100644 --- a/src/script/auth/module/reducer/inviteReducer.ts +++ b/src/script/auth/module/reducer/inviteReducer.ts @@ -17,7 +17,7 @@ * */ -import type {TeamInvitation} from '@wireapp/api-client/src/team/'; +import type {TeamInvitation} from '@wireapp/api-client/lib/team/'; import {INVITATION_ACTION, InvitationActions} from '../action/creator/'; diff --git a/src/script/auth/module/reducer/selfReducer.ts b/src/script/auth/module/reducer/selfReducer.ts index c14f098db44..f5903755611 100644 --- a/src/script/auth/module/reducer/selfReducer.ts +++ b/src/script/auth/module/reducer/selfReducer.ts @@ -17,7 +17,7 @@ * */ -import type {Self} from '@wireapp/api-client/src/self/'; +import type {Self} from '@wireapp/api-client/lib/self/'; import {AppActions, SELF_ACTION} from '../action/creator/'; diff --git a/src/script/auth/module/selector/AuthSelector.ts b/src/script/auth/module/selector/AuthSelector.ts index 5471cd05703..78f9f8477dc 100644 --- a/src/script/auth/module/selector/AuthSelector.ts +++ b/src/script/auth/module/selector/AuthSelector.ts @@ -17,7 +17,7 @@ * */ -import type {TeamData} from '@wireapp/api-client/src/team/'; +import type {TeamData} from '@wireapp/api-client/lib/team/'; import type {RootState} from '../reducer'; import type {RegistrationDataState} from '../reducer/authReducer'; diff --git a/src/script/auth/module/selector/ClientSelector.ts b/src/script/auth/module/selector/ClientSelector.ts index 983ce1e7b8c..bd3c6dd2c1d 100644 --- a/src/script/auth/module/selector/ClientSelector.ts +++ b/src/script/auth/module/selector/ClientSelector.ts @@ -17,7 +17,7 @@ * */ -import {ClientType, RegisteredClient} from '@wireapp/api-client/src/client/'; +import {ClientType, RegisteredClient} from '@wireapp/api-client/lib/client/'; import type {RootState} from '../reducer'; diff --git a/src/script/auth/module/selector/SelfSelector.ts b/src/script/auth/module/selector/SelfSelector.ts index dd9bf49fcf2..395de96f875 100644 --- a/src/script/auth/module/selector/SelfSelector.ts +++ b/src/script/auth/module/selector/SelfSelector.ts @@ -17,7 +17,7 @@ * */ -import type {Self} from '@wireapp/api-client/src/self/'; +import type {Self} from '@wireapp/api-client/lib/self/'; import {Config} from '../../../Config'; import type {RootState} from '../reducer'; diff --git a/src/script/auth/page/CheckPassword.tsx b/src/script/auth/page/CheckPassword.tsx index 14dc3d30426..a43d33b5636 100644 --- a/src/script/auth/page/CheckPassword.tsx +++ b/src/script/auth/page/CheckPassword.tsx @@ -17,8 +17,8 @@ * */ -import {LoginData} from '@wireapp/api-client/src/auth'; -import {BackendErrorLabel} from '@wireapp/api-client/src/http'; +import {LoginData} from '@wireapp/api-client/lib/auth'; +import {BackendErrorLabel} from '@wireapp/api-client/lib/http'; import { ArrowIcon, ContainerXS, diff --git a/src/script/auth/page/ConversationJoin.tsx b/src/script/auth/page/ConversationJoin.tsx index c257fabee63..dde507902e6 100644 --- a/src/script/auth/page/ConversationJoin.tsx +++ b/src/script/auth/page/ConversationJoin.tsx @@ -37,7 +37,7 @@ import {connect} from 'react-redux'; import {Navigate} from 'react-router-dom'; import {AnyAction, Dispatch} from 'redux'; import {noop} from 'Util/util'; -import type {RegisterData} from '@wireapp/api-client/src/auth'; +import type {RegisterData} from '@wireapp/api-client/lib/auth'; import {Config} from '../../Config'; import {conversationJoinStrings} from '../../strings'; import AppAlreadyOpen from '../component/AppAlreadyOpen'; diff --git a/src/script/auth/page/CustomEnvironmentRedirect.tsx b/src/script/auth/page/CustomEnvironmentRedirect.tsx index 28e26e2ff31..0ef27811480 100644 --- a/src/script/auth/page/CustomEnvironmentRedirect.tsx +++ b/src/script/auth/page/CustomEnvironmentRedirect.tsx @@ -18,7 +18,7 @@ */ import {ContainerXS, FlexBox, COLOR, Text} from '@wireapp/react-ui-kit'; -import {SVGIcon} from '@wireapp/react-ui-kit/src/Icon/SVGIcon'; +import {SVGIcon} from '@wireapp/react-ui-kit/lib/Icon/SVGIcon'; import {UrlUtil} from '@wireapp/commons'; import {useState, useEffect} from 'react'; import {useIntl} from 'react-intl'; diff --git a/src/script/auth/page/HistoryInfo.tsx b/src/script/auth/page/HistoryInfo.tsx index d5d1b69c0c4..eeaaa4e345f 100644 --- a/src/script/auth/page/HistoryInfo.tsx +++ b/src/script/auth/page/HistoryInfo.tsx @@ -17,7 +17,7 @@ * */ -import {ClientType} from '@wireapp/api-client/src/client'; +import {ClientType} from '@wireapp/api-client/lib/client'; import {Button, ContainerXS, H1, Link, Paragraph} from '@wireapp/react-ui-kit'; import React from 'react'; import {FormattedMessage, useIntl} from 'react-intl'; diff --git a/src/script/auth/page/Index.tsx b/src/script/auth/page/Index.tsx index 5c575c23d87..a5f4c2aa452 100644 --- a/src/script/auth/page/Index.tsx +++ b/src/script/auth/page/Index.tsx @@ -32,7 +32,7 @@ import {RootState, bindActionCreators} from '../module/reducer'; import {AnyAction, Dispatch} from 'redux'; import {connect} from 'react-redux'; import SVGProvider from '../util/SVGProvider'; -import {SVGIcon} from '@wireapp/react-ui-kit/src/Icon/SVGIcon'; +import {SVGIcon} from '@wireapp/react-ui-kit/lib/Icon/SVGIcon'; interface Props extends React.HTMLProps {} diff --git a/src/script/auth/page/Login.test.tsx b/src/script/auth/page/Login.test.tsx index 54b368c143c..ce8c1257ecb 100644 --- a/src/script/auth/page/Login.test.tsx +++ b/src/script/auth/page/Login.test.tsx @@ -26,7 +26,7 @@ import {TypeUtil} from '@wireapp/commons'; import {actionRoot} from '../module/action'; import {ROUTE} from '../route'; -import {ClientType} from '@wireapp/api-client/src/client'; +import {ClientType} from '@wireapp/api-client/lib/client'; import {BackendError} from '../module/action/BackendError'; import {fireEvent, waitFor} from '@testing-library/react'; diff --git a/src/script/auth/page/Login.tsx b/src/script/auth/page/Login.tsx index fbb0eddafe3..d29a10823dc 100644 --- a/src/script/auth/page/Login.tsx +++ b/src/script/auth/page/Login.tsx @@ -17,8 +17,8 @@ * */ -import {LoginData} from '@wireapp/api-client/src/auth'; -import {ClientType} from '@wireapp/api-client/src/client/index'; +import {LoginData} from '@wireapp/api-client/lib/auth'; +import {ClientType} from '@wireapp/api-client/lib/client/index'; import { ArrowIcon, COLOR, diff --git a/src/script/auth/page/Page.tsx b/src/script/auth/page/Page.tsx index d265f51b4db..e399848e3a7 100644 --- a/src/script/auth/page/Page.tsx +++ b/src/script/auth/page/Page.tsx @@ -17,7 +17,7 @@ * */ -import {TeamData} from '@wireapp/api-client/src/team'; +import {TeamData} from '@wireapp/api-client/lib/team'; import React from 'react'; import {connect} from 'react-redux'; import {Navigate} from 'react-router-dom'; diff --git a/src/script/auth/page/PhoneLogin.test.tsx b/src/script/auth/page/PhoneLogin.test.tsx index 20af79007fd..a8e30e723fe 100644 --- a/src/script/auth/page/PhoneLogin.test.tsx +++ b/src/script/auth/page/PhoneLogin.test.tsx @@ -17,7 +17,7 @@ * */ -import {PasswordExistsError} from '@wireapp/api-client/src/auth'; +import {PasswordExistsError} from '@wireapp/api-client/lib/auth'; import {actionRoot} from '../module/action'; import {initialRootState} from '../module/reducer'; diff --git a/src/script/auth/page/PhoneLogin.tsx b/src/script/auth/page/PhoneLogin.tsx index 5d9e7a7ad73..5cb66a85c47 100644 --- a/src/script/auth/page/PhoneLogin.tsx +++ b/src/script/auth/page/PhoneLogin.tsx @@ -22,8 +22,8 @@ import { InvalidPhoneNumberError, LoginData, PasswordExistsError, -} from '@wireapp/api-client/src/auth'; -import {ClientType} from '@wireapp/api-client/src/client/index'; +} from '@wireapp/api-client/lib/auth'; +import {ClientType} from '@wireapp/api-client/lib/client/index'; import { ArrowIcon, COLOR, diff --git a/src/script/auth/page/Root.tsx b/src/script/auth/page/Root.tsx index dbb07a6c0f2..d4e4c6889af 100644 --- a/src/script/auth/page/Root.tsx +++ b/src/script/auth/page/Root.tsx @@ -17,7 +17,7 @@ * */ -import {pathWithParams} from '@wireapp/commons/src/main/util/UrlUtil'; +import {pathWithParams} from '@wireapp/commons/lib/util/UrlUtil'; import {StyledApp, Loading, ContainerXS, THEME_ID} from '@wireapp/react-ui-kit'; import React, {useEffect} from 'react'; import {IntlProvider} from 'react-intl'; diff --git a/src/script/auth/page/SetHandle.tsx b/src/script/auth/page/SetHandle.tsx index bced2aa4ec0..123c98653cb 100644 --- a/src/script/auth/page/SetHandle.tsx +++ b/src/script/auth/page/SetHandle.tsx @@ -17,7 +17,7 @@ * */ -import {ConsentType} from '@wireapp/api-client/src/self/index'; +import {ConsentType} from '@wireapp/api-client/lib/self/index'; import { ArrowIcon, ContainerXS, diff --git a/src/script/auth/page/SingleSignOnForm.tsx b/src/script/auth/page/SingleSignOnForm.tsx index fa0a77de4e9..92585be9da9 100644 --- a/src/script/auth/page/SingleSignOnForm.tsx +++ b/src/script/auth/page/SingleSignOnForm.tsx @@ -17,11 +17,11 @@ * */ -import {ClientType} from '@wireapp/api-client/src/client/index'; -import {BackendErrorLabel} from '@wireapp/api-client/src/http'; +import {ClientType} from '@wireapp/api-client/lib/client/index'; +import {BackendErrorLabel} from '@wireapp/api-client/lib/http'; import {UrlUtil} from '@wireapp/commons'; -import {pathWithParams} from '@wireapp/commons/src/main/util/UrlUtil'; -import {PATTERN, isValidEmail} from '@wireapp/commons/src/main/util/ValidationUtil'; +import {pathWithParams} from '@wireapp/commons/lib/util/UrlUtil'; +import {PATTERN, isValidEmail} from '@wireapp/commons/lib/util/ValidationUtil'; import { ArrowIcon, Checkbox, diff --git a/src/script/auth/page/VerifyPhoneCode.tsx b/src/script/auth/page/VerifyPhoneCode.tsx index 63715fee7a0..9774a52020f 100644 --- a/src/script/auth/page/VerifyPhoneCode.tsx +++ b/src/script/auth/page/VerifyPhoneCode.tsx @@ -17,7 +17,7 @@ * */ -import {LoginData} from '@wireapp/api-client/src/auth'; +import {LoginData} from '@wireapp/api-client/lib/auth'; import {CodeInput, Column, Columns, ContainerXS, H1} from '@wireapp/react-ui-kit'; import React, {useEffect, useState} from 'react'; import {useIntl} from 'react-intl'; diff --git a/src/script/auth/util/test/TestUtil.tsx b/src/script/auth/util/test/TestUtil.tsx index c38f7faefb8..9340a571e0b 100644 --- a/src/script/auth/util/test/TestUtil.tsx +++ b/src/script/auth/util/test/TestUtil.tsx @@ -18,7 +18,7 @@ */ import {render} from '@testing-library/react'; -import {RecursivePartial} from '@wireapp/commons/src/main/util/TypeUtil'; +import {RecursivePartial} from '@wireapp/commons/lib/util/TypeUtil'; import {StyledApp, THEME_ID} from '@wireapp/react-ui-kit'; import React from 'react'; import {IntlProvider} from 'react-intl'; diff --git a/src/script/calling/Call.ts b/src/script/calling/Call.ts index d6d39401fbd..b52f11a00fa 100644 --- a/src/script/calling/Call.ts +++ b/src/script/calling/Call.ts @@ -26,7 +26,7 @@ import {CALL_MESSAGE_TYPE} from './enum/CallMessageType'; import type {Participant, ClientId} from './Participant'; import type {MediaDevicesHandler} from '../media/MediaDevicesHandler'; import {Config} from '../Config'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {matchQualifiedIds} from 'Util/QualifiedId'; import {MuteState} from './CallState'; diff --git a/src/script/calling/CallState.ts b/src/script/calling/CallState.ts index b0779cb357b..97239b9e2a0 100644 --- a/src/script/calling/CallState.ts +++ b/src/script/calling/CallState.ts @@ -25,7 +25,7 @@ import {CallViewTab} from '../view_model/CallingViewModel'; import {Config} from '../Config'; import type {ElectronDesktopCapturerSource} from '../media/MediaDevicesHandler'; import {matchQualifiedIds} from 'Util/QualifiedId'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; export enum MuteState { NOT_MUTED, diff --git a/src/script/calling/CallingRepository.ts b/src/script/calling/CallingRepository.ts index 1ed024b1be0..cdfca0f57ac 100644 --- a/src/script/calling/CallingRepository.ts +++ b/src/script/calling/CallingRepository.ts @@ -19,10 +19,10 @@ import axios from 'axios'; import {Runtime} from '@wireapp/commons'; -import type {WebappProperties} from '@wireapp/api-client/src/user/data'; -import type {QualifiedId} from '@wireapp/api-client/src/user'; -import type {CallConfigData} from '@wireapp/api-client/src/account/CallConfigData'; -import type {UserClients, QualifiedUserClients} from '@wireapp/api-client/src/conversation'; +import type {WebappProperties} from '@wireapp/api-client/lib/user/data'; +import type {QualifiedId} from '@wireapp/api-client/lib/user'; +import type {CallConfigData} from '@wireapp/api-client/lib/account/CallConfigData'; +import type {UserClients, QualifiedUserClients} from '@wireapp/api-client/lib/conversation'; import {matchQualifiedIds} from 'Util/QualifiedId'; import { CALL_TYPE, @@ -45,11 +45,8 @@ import {amplify} from 'amplify'; import ko from 'knockout'; import 'webrtc-adapter'; import {container} from 'tsyringe'; -import {isQualifiedUserClients} from '@wireapp/core/src/main/util'; -import { - flattenQualifiedUserClients, - flattenUserClients, -} from '@wireapp/core/src/main/conversation/message/UserClientsUtil'; +import {isQualifiedUserClients} from '@wireapp/core/lib/util'; +import {flattenQualifiedUserClients, flattenUserClients} from '@wireapp/core/lib/conversation/message/UserClientsUtil'; import {t} from 'Util/LocalizerUtil'; import {Logger, getLogger} from 'Util/Logger'; @@ -82,7 +79,7 @@ import {APIClient} from '../service/APIClientSingleton'; import {ConversationState} from '../conversation/ConversationState'; import {TeamState} from '../team/TeamState'; import Warnings from '../view_model/WarningsContainer'; -import {PayloadBundleState} from '@wireapp/core/src/main/conversation'; +import {PayloadBundleState} from '@wireapp/core/lib/conversation'; import {Core} from '../service/CoreSingleton'; import {LEAVE_CALL_REASON} from './enum/LeaveCallReason'; diff --git a/src/script/calling/Participant.ts b/src/script/calling/Participant.ts index 3d1de118b2d..9c6f61f9545 100644 --- a/src/script/calling/Participant.ts +++ b/src/script/calling/Participant.ts @@ -22,7 +22,7 @@ import ko from 'knockout'; import {User} from '../entity/User'; import {matchQualifiedIds} from 'Util/QualifiedId'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; export type UserId = string; export type ClientId = string; diff --git a/src/script/client/ClientEntity.ts b/src/script/client/ClientEntity.ts index 379b72fb505..f5260732ed0 100644 --- a/src/script/client/ClientEntity.ts +++ b/src/script/client/ClientEntity.ts @@ -17,7 +17,7 @@ * */ -import {ClientClassification, ClientType} from '@wireapp/api-client/src/client/'; +import {ClientClassification, ClientType} from '@wireapp/api-client/lib/client/'; import ko from 'knockout'; import {splitFingerprint} from 'Util/StringUtil'; diff --git a/src/script/client/ClientMapper.ts b/src/script/client/ClientMapper.ts index fa5b8c0cd96..3fc7d9ed0f9 100644 --- a/src/script/client/ClientMapper.ts +++ b/src/script/client/ClientMapper.ts @@ -17,7 +17,7 @@ * */ -import type {PublicClient, RegisteredClient} from '@wireapp/api-client/src/client'; +import type {PublicClient, RegisteredClient} from '@wireapp/api-client/lib/client'; import {ClientRecord} from '../storage'; import {isClientRecord} from '../util/TypePredicateUtil'; import {ClientEntity} from './ClientEntity'; diff --git a/src/script/client/ClientRepository.test.ts b/src/script/client/ClientRepository.test.ts index 2a2e35f7e2d..bfb8db0f2f8 100644 --- a/src/script/client/ClientRepository.test.ts +++ b/src/script/client/ClientRepository.test.ts @@ -17,7 +17,7 @@ * */ -import {ClientClassification, ClientType} from '@wireapp/api-client/src/client/'; +import {ClientClassification, ClientType} from '@wireapp/api-client/lib/client/'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; import {Runtime} from '@wireapp/commons'; diff --git a/src/script/client/ClientRepository.ts b/src/script/client/ClientRepository.ts index 7254d9f9048..cdfdc5c571d 100644 --- a/src/script/client/ClientRepository.ts +++ b/src/script/client/ClientRepository.ts @@ -18,9 +18,9 @@ */ import ko from 'knockout'; -import {ClientType, PublicClient, RegisteredClient, ClientCapability} from '@wireapp/api-client/src/client/'; -import {USER_EVENT, UserClientAddEvent, UserClientRemoveEvent} from '@wireapp/api-client/src/event'; -import {QualifiedId} from '@wireapp/api-client/src/user/'; +import {ClientType, PublicClient, RegisteredClient, ClientCapability} from '@wireapp/api-client/lib/client/'; +import {USER_EVENT, UserClientAddEvent, UserClientRemoveEvent} from '@wireapp/api-client/lib/event'; +import {QualifiedId} from '@wireapp/api-client/lib/user/'; import {Runtime} from '@wireapp/commons'; import {amplify} from 'amplify'; import {WebAppEvents} from '@wireapp/webapp-events'; diff --git a/src/script/client/ClientService.ts b/src/script/client/ClientService.ts index 6e0ececafec..47495f396bd 100644 --- a/src/script/client/ClientService.ts +++ b/src/script/client/ClientService.ts @@ -23,8 +23,8 @@ import type { QualifiedUserClientMap, ClientCapabilityData, PublicClient, -} from '@wireapp/api-client/src/client'; -import type {QualifiedId} from '@wireapp/api-client/src/user'; +} from '@wireapp/api-client/lib/client'; +import type {QualifiedId} from '@wireapp/api-client/lib/user'; import {container} from 'tsyringe'; import {Logger, getLogger} from 'Util/Logger'; diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageQuote.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageQuote.tsx index e47255c4673..854adbeb5e3 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/MessageQuote.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/MessageQuote.tsx @@ -25,7 +25,7 @@ import {WebAppEvents} from '@wireapp/webapp-events'; import {isBeforeToday, formatDateNumeral, formatTimeShort} from 'Util/TimeUtil'; import {includesOnlyEmojis} from 'Util/EmojiUtil'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {QuoteEntity} from '../../../../message/QuoteEntity'; import {ConversationError} from '../../../../error/ConversationError'; import type {Conversation} from '../../../../entity/Conversation'; diff --git a/src/script/components/MessagesList/Message/ContentMessage/asset/index.tsx b/src/script/components/MessagesList/Message/ContentMessage/asset/index.tsx index 126567e96e1..b974f11b0ba 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/asset/index.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/asset/index.tsx @@ -19,7 +19,7 @@ import {useKoSubscribableChildren} from 'Util/ComponentUtil'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {Asset} from 'src/script/entity/message/Asset'; import type {FileAsset} from 'src/script/entity/message/FileAsset'; import type {MediumImage} from 'src/script/entity/message/MediumImage'; diff --git a/src/script/components/MessagesList/Message/ContentMessage/index.tsx b/src/script/components/MessagesList/Message/ContentMessage/index.tsx index b20fd464fea..33479d71ba2 100644 --- a/src/script/components/MessagesList/Message/ContentMessage/index.tsx +++ b/src/script/components/MessagesList/Message/ContentMessage/index.tsx @@ -19,7 +19,7 @@ import React from 'react'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {useKoSubscribableChildren} from 'Util/ComponentUtil'; import {Conversation} from 'src/script/entity/Conversation'; diff --git a/src/script/components/MessagesList/Message/index.tsx b/src/script/components/MessagesList/Message/index.tsx index c9b1795e666..920cdeb292e 100644 --- a/src/script/components/MessagesList/Message/index.tsx +++ b/src/script/components/MessagesList/Message/index.tsx @@ -17,7 +17,7 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {Message as BaseMessage} from '../../../entity/message/Message'; import type {ContentMessage} from '../../../entity/message/ContentMessage'; diff --git a/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx b/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx index a6756a99af3..c06727c4ef7 100644 --- a/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx +++ b/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx @@ -23,8 +23,8 @@ import cx from 'classnames'; import {amplify} from 'amplify'; import {WebAppEvents} from '@wireapp/webapp-events'; import {Button, ButtonVariant, Select, StyledApp, THEME_ID} from '@wireapp/react-ui-kit'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data/ConversationReceiptModeUpdateData'; -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data/ConversationReceiptModeUpdateData'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; import {getLogger} from 'Util/Logger'; import {sortUsersByPriority} from 'Util/StringUtil'; diff --git a/src/script/components/Modals/UserModal/UserModal.test.tsx b/src/script/components/Modals/UserModal/UserModal.test.tsx index c89c197578b..300b929746f 100644 --- a/src/script/components/Modals/UserModal/UserModal.test.tsx +++ b/src/script/components/Modals/UserModal/UserModal.test.tsx @@ -17,7 +17,7 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {UserState} from 'src/script/user/UserState'; import {TeamState} from 'src/script/team/TeamState'; diff --git a/src/script/components/Modals/UserModal/UserModal.tsx b/src/script/components/Modals/UserModal/UserModal.tsx index 3318163991c..c2ddcbac304 100644 --- a/src/script/components/Modals/UserModal/UserModal.tsx +++ b/src/script/components/Modals/UserModal/UserModal.tsx @@ -20,7 +20,7 @@ import React, {useState, useEffect} from 'react'; import {container} from 'tsyringe'; import cx from 'classnames'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {replaceLink, t} from 'Util/LocalizerUtil'; diff --git a/src/script/components/TitleBar/index.test.tsx b/src/script/components/TitleBar/index.test.tsx index 3caa1c15068..a1e1cfe6e0a 100644 --- a/src/script/components/TitleBar/index.test.tsx +++ b/src/script/components/TitleBar/index.test.tsx @@ -33,7 +33,7 @@ import {Runtime} from '@wireapp/commons'; import {PanelViewModel} from '../../view_model/PanelViewModel'; import {ConversationVerificationState} from '../../conversation/ConversationVerificationState'; import {User} from '../../entity/User'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {amplify} from 'amplify'; import {ContentViewModel} from '../../view_model/ContentViewModel'; diff --git a/src/script/components/UserDevices.tsx b/src/script/components/UserDevices.tsx index 69b9abda7ed..95b4909e046 100644 --- a/src/script/components/UserDevices.tsx +++ b/src/script/components/UserDevices.tsx @@ -20,7 +20,7 @@ import ko from 'knockout'; import React, {useEffect, useMemo, useState} from 'react'; -import {ClientClassification} from '@wireapp/api-client/src/client/'; +import {ClientClassification} from '@wireapp/api-client/lib/client/'; import {partition} from 'Util/ArrayUtil'; import {registerReactComponent} from 'Util/ComponentUtil'; diff --git a/src/script/components/calling/CallingOverlayContainer.tsx b/src/script/components/calling/CallingOverlayContainer.tsx index c9c2f3461d4..92e9b982c15 100644 --- a/src/script/components/calling/CallingOverlayContainer.tsx +++ b/src/script/components/calling/CallingOverlayContainer.tsx @@ -17,7 +17,7 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {CALL_TYPE, STATE as CALL_STATE} from '@wireapp/avs'; import React, {Fragment, useEffect} from 'react'; import {container} from 'tsyringe'; diff --git a/src/script/components/calling/GroupVideoGrid.tsx b/src/script/components/calling/GroupVideoGrid.tsx index 8620a39369b..de2b6b2f7cc 100644 --- a/src/script/components/calling/GroupVideoGrid.tsx +++ b/src/script/components/calling/GroupVideoGrid.tsx @@ -28,7 +28,7 @@ import Video from './Video'; import type {Participant} from '../../calling/Participant'; import GroupVideoGridTile from './GroupVideoGridTile'; import Avatar, {AVATAR_SIZE} from 'Components/Avatar'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; export interface GroupVideoGripProps { grid: Grid; diff --git a/src/script/components/calling/GroupVideoGridTile.tsx b/src/script/components/calling/GroupVideoGridTile.tsx index 284ded239a6..1c7a0e2c8d0 100644 --- a/src/script/components/calling/GroupVideoGridTile.tsx +++ b/src/script/components/calling/GroupVideoGridTile.tsx @@ -27,7 +27,7 @@ import {useKoSubscribableChildren} from 'Util/ComponentUtil'; import Video from './Video'; import type {Participant} from '../../calling/Participant'; import Avatar, {AVATAR_SIZE} from 'Components/Avatar'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; export interface GroupVideoGridTileProps { isMaximized: boolean; diff --git a/src/script/components/list/ConversationListCallingCell.tsx b/src/script/components/list/ConversationListCallingCell.tsx index 297468aa2c9..451fdc00cce 100644 --- a/src/script/components/list/ConversationListCallingCell.tsx +++ b/src/script/components/list/ConversationListCallingCell.tsx @@ -21,7 +21,7 @@ import React, {useState, useCallback} from 'react'; import {container} from 'tsyringe'; import {CALL_TYPE, CONV_TYPE, REASON as CALL_REASON, STATE as CALL_STATE} from '@wireapp/avs'; import cx from 'classnames'; -import {DefaultConversationRoleName} from '@wireapp/api-client/src/conversation/'; +import {DefaultConversationRoleName} from '@wireapp/api-client/lib/conversation/'; import {KEY} from 'Util/KeyboardUtil'; import Avatar, {AVATAR_SIZE} from 'Components/Avatar'; diff --git a/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.test.tsx b/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.test.tsx index fdbc147f4ac..57fe0c7b566 100644 --- a/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.test.tsx +++ b/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.test.tsx @@ -17,7 +17,7 @@ * */ -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; import ConversationProtocolDetails, {Ciphersuite} from './ConversationProtocolDetails'; import {render} from '@testing-library/react'; diff --git a/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.tsx b/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.tsx index 7a22538cbb3..e05dfeffaf4 100644 --- a/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.tsx +++ b/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.tsx @@ -19,7 +19,7 @@ import {CSSObject} from '@emotion/react'; import React from 'react'; -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; import {registerReactComponent} from 'Util/ComponentUtil'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/components/panel/EnrichedFields.test.tsx b/src/script/components/panel/EnrichedFields.test.tsx index 3a38b4fb32e..95b14fb8fa8 100644 --- a/src/script/components/panel/EnrichedFields.test.tsx +++ b/src/script/components/panel/EnrichedFields.test.tsx @@ -18,7 +18,7 @@ */ import {waitFor} from '@testing-library/react'; -import type {RichInfo} from '@wireapp/api-client/src/user/'; +import type {RichInfo} from '@wireapp/api-client/lib/user/'; import {act} from 'react-dom/test-utils'; import {User} from 'src/script/entity/User'; import {RichProfileRepository} from 'src/script/user/RichProfileRepository'; diff --git a/src/script/components/panel/EnrichedFields.tsx b/src/script/components/panel/EnrichedFields.tsx index fd4fb4aff2b..490f5cb9793 100644 --- a/src/script/components/panel/EnrichedFields.tsx +++ b/src/script/components/panel/EnrichedFields.tsx @@ -17,7 +17,7 @@ * */ -import type {RichInfoField} from '@wireapp/api-client/src/user/RichInfo'; +import type {RichInfoField} from '@wireapp/api-client/lib/user/RichInfo'; import React, {useEffect, useState} from 'react'; import {container} from 'tsyringe'; diff --git a/src/script/components/panel/UserActions.test.tsx b/src/script/components/panel/UserActions.test.tsx index a161a602579..550c0c1f545 100644 --- a/src/script/components/panel/UserActions.test.tsx +++ b/src/script/components/panel/UserActions.test.tsx @@ -18,7 +18,7 @@ */ import ko from 'knockout'; -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; import {noop} from 'Util/util'; diff --git a/src/script/components/panel/UserActions.tsx b/src/script/components/panel/UserActions.tsx index 85b18c85440..42f69290628 100644 --- a/src/script/components/panel/UserActions.tsx +++ b/src/script/components/panel/UserActions.tsx @@ -33,7 +33,7 @@ import PanelActions from './PanelActions'; import {registerReactComponent, useKoSubscribableChildren} from 'Util/ComponentUtil'; import {matchQualifiedIds} from 'Util/QualifiedId'; import {ACCESS_STATE} from '../../conversation/AccessState'; -import {CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation'; +import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation'; export enum Actions { ACCEPT_REQUEST = 'UserActions.ACCEPT_REQUEST', diff --git a/src/script/components/toggle/ReceiptModeToggle.test.tsx b/src/script/components/toggle/ReceiptModeToggle.test.tsx index e57c5b294e6..70c73b31596 100644 --- a/src/script/components/toggle/ReceiptModeToggle.test.tsx +++ b/src/script/components/toggle/ReceiptModeToggle.test.tsx @@ -17,7 +17,7 @@ * */ -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; import ReceiptModeToggle from './ReceiptModeToggle'; import {render} from '@testing-library/react'; diff --git a/src/script/components/toggle/ReceiptModeToggle.tsx b/src/script/components/toggle/ReceiptModeToggle.tsx index be129989bbb..5d5b19d5c0e 100644 --- a/src/script/components/toggle/ReceiptModeToggle.tsx +++ b/src/script/components/toggle/ReceiptModeToggle.tsx @@ -18,7 +18,7 @@ */ import React, {Fragment} from 'react'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; import {registerReactComponent} from 'Util/ComponentUtil'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/components/userDevices/DeviceCard.test.tsx b/src/script/components/userDevices/DeviceCard.test.tsx index b1292c56c70..f23e615f518 100644 --- a/src/script/components/userDevices/DeviceCard.test.tsx +++ b/src/script/components/userDevices/DeviceCard.test.tsx @@ -18,7 +18,7 @@ */ import ko from 'knockout'; -import {ClientClassification} from '@wireapp/api-client/src/client/'; +import {ClientClassification} from '@wireapp/api-client/lib/client/'; import DeviceCard from './DeviceCard'; import type {ClientEntity} from '../../client/ClientEntity'; import {render} from '@testing-library/react'; diff --git a/src/script/components/userDevices/DeviceCard.tsx b/src/script/components/userDevices/DeviceCard.tsx index 754f5b7f605..6d3a284ab4b 100644 --- a/src/script/components/userDevices/DeviceCard.tsx +++ b/src/script/components/userDevices/DeviceCard.tsx @@ -19,7 +19,7 @@ import React from 'react'; import cx from 'classnames'; -import {ClientClassification} from '@wireapp/api-client/src/client'; +import {ClientClassification} from '@wireapp/api-client/lib/client'; import {t} from 'Util/LocalizerUtil'; import DeviceId from 'Components/DeviceId'; diff --git a/src/script/connection/ConnectionEntity.ts b/src/script/connection/ConnectionEntity.ts index 2dcd3efe953..228bedd774b 100644 --- a/src/script/connection/ConnectionEntity.ts +++ b/src/script/connection/ConnectionEntity.ts @@ -17,8 +17,8 @@ * */ -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import ko from 'knockout'; export class ConnectionEntity { diff --git a/src/script/connection/ConnectionMapper.test.ts b/src/script/connection/ConnectionMapper.test.ts index f1c830e0c4a..ebad58d9f1a 100644 --- a/src/script/connection/ConnectionMapper.test.ts +++ b/src/script/connection/ConnectionMapper.test.ts @@ -17,7 +17,7 @@ * */ -import {ConnectionStatus, Connection} from '@wireapp/api-client/src/connection/'; +import {ConnectionStatus, Connection} from '@wireapp/api-client/lib/connection/'; import {ConnectionMapper} from './ConnectionMapper'; describe('ConnectionMapper', () => { diff --git a/src/script/connection/ConnectionMapper.ts b/src/script/connection/ConnectionMapper.ts index 8f7a03c53a3..1d26a5d20d4 100644 --- a/src/script/connection/ConnectionMapper.ts +++ b/src/script/connection/ConnectionMapper.ts @@ -17,7 +17,7 @@ * */ -import type {Connection as ConnectionData} from '@wireapp/api-client/src/connection/'; +import type {Connection as ConnectionData} from '@wireapp/api-client/lib/connection/'; import {ConnectionEntity} from './ConnectionEntity'; /** diff --git a/src/script/connection/ConnectionRepository.ts b/src/script/connection/ConnectionRepository.ts index ee4dcd3e9ac..eeb74b8a5df 100644 --- a/src/script/connection/ConnectionRepository.ts +++ b/src/script/connection/ConnectionRepository.ts @@ -17,13 +17,13 @@ * */ -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; -import {USER_EVENT, UserConnectionEvent} from '@wireapp/api-client/src/event/'; -import type {BackendEventType} from '@wireapp/api-client/src/event/BackendEvent'; -import type {UserConnectionData} from '@wireapp/api-client/src/user/data/'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; +import {USER_EVENT, UserConnectionEvent} from '@wireapp/api-client/lib/event/'; +import type {BackendEventType} from '@wireapp/api-client/lib/event/BackendEvent'; +import type {UserConnectionData} from '@wireapp/api-client/lib/user/data/'; import {amplify} from 'amplify'; import {WebAppEvents} from '@wireapp/webapp-events'; -import {BackendErrorLabel} from '@wireapp/api-client/src/http/'; +import {BackendErrorLabel} from '@wireapp/api-client/lib/http/'; import {container} from 'tsyringe'; import {getLogger, Logger} from 'Util/Logger'; import {replaceLink, t} from 'Util/LocalizerUtil'; @@ -41,7 +41,7 @@ import {ConnectionState} from './ConnectionState'; import {ModalsViewModel} from '../view_model/ModalsViewModel'; import {Config} from '../Config'; import {matchQualifiedIds} from 'Util/QualifiedId'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; export class ConnectionRepository { private readonly connectionService: ConnectionService; diff --git a/src/script/connection/ConnectionService.ts b/src/script/connection/ConnectionService.ts index 45981624a5f..7f011052881 100644 --- a/src/script/connection/ConnectionService.ts +++ b/src/script/connection/ConnectionService.ts @@ -17,8 +17,8 @@ * */ -import type {Connection, ConnectionStatus} from '@wireapp/api-client/src/connection/'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import type {Connection, ConnectionStatus} from '@wireapp/api-client/lib/connection/'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {container} from 'tsyringe'; import {APIClient} from '../service/APIClientSingleton'; diff --git a/src/script/conversation/AbstractConversationEventHandler.ts b/src/script/conversation/AbstractConversationEventHandler.ts index b2a914cbfd2..713443ef275 100644 --- a/src/script/conversation/AbstractConversationEventHandler.ts +++ b/src/script/conversation/AbstractConversationEventHandler.ts @@ -17,7 +17,7 @@ * */ -import {ConversationEvent} from '@wireapp/api-client/src/event'; +import {ConversationEvent} from '@wireapp/api-client/lib/event'; import {ClientConversationEvent} from './EventBuilder'; import type {Conversation} from '../entity/Conversation'; diff --git a/src/script/conversation/ClientMismatchUtil.ts b/src/script/conversation/ClientMismatchUtil.ts index 0811b75a0b3..1146651f6c5 100644 --- a/src/script/conversation/ClientMismatchUtil.ts +++ b/src/script/conversation/ClientMismatchUtil.ts @@ -22,13 +22,10 @@ import type { MessageSendingStatus, UserClients, QualifiedUserClients, -} from '@wireapp/api-client/src/conversation/'; -import { - flattenQualifiedUserClients, - flattenUserClients, -} from '@wireapp/core/src/main/conversation/message/UserClientsUtil'; -import {isQualifiedUserClients} from '@wireapp/core/src/main/util'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +} from '@wireapp/api-client/lib/conversation/'; +import {flattenQualifiedUserClients, flattenUserClients} from '@wireapp/core/lib/conversation/message/UserClientsUtil'; +import {isQualifiedUserClients} from '@wireapp/core/lib/util'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {User} from '../entity/User'; import {difference, intersection} from 'underscore'; import {matchQualifiedIds} from 'Util/QualifiedId'; diff --git a/src/script/conversation/ConversationAccessPermission.test.ts b/src/script/conversation/ConversationAccessPermission.test.ts index e33d7aae985..0121d9a7fbb 100644 --- a/src/script/conversation/ConversationAccessPermission.test.ts +++ b/src/script/conversation/ConversationAccessPermission.test.ts @@ -18,7 +18,7 @@ */ /* eslint-disable sort-keys-fix/sort-keys-fix */ -import {CONVERSATION_ACCESS, ACCESS_ROLE_V2} from '@wireapp/api-client/src/conversation/'; +import {CONVERSATION_ACCESS, ACCESS_ROLE_V2} from '@wireapp/api-client/lib/conversation/'; import {ACCESS_STATE, TEAM} from './AccessState'; import { accessFromPermissions, diff --git a/src/script/conversation/ConversationAccessPermission.ts b/src/script/conversation/ConversationAccessPermission.ts index ae54bfa547f..be30a65e20c 100644 --- a/src/script/conversation/ConversationAccessPermission.ts +++ b/src/script/conversation/ConversationAccessPermission.ts @@ -18,7 +18,7 @@ */ /* eslint-disable sort-keys-fix/sort-keys-fix */ -import {CONVERSATION_ACCESS, ACCESS_ROLE_V2} from '@wireapp/api-client/src/conversation/'; +import {CONVERSATION_ACCESS, ACCESS_ROLE_V2} from '@wireapp/api-client/lib/conversation/'; import {combinePermissions, hasPermissions} from '../user/UserPermission'; import {ACCESS_STATE, TEAM} from './AccessState'; diff --git a/src/script/conversation/ConversationEphemeralHandler.ts b/src/script/conversation/ConversationEphemeralHandler.ts index e735db1adb3..8dd90c876e7 100644 --- a/src/script/conversation/ConversationEphemeralHandler.ts +++ b/src/script/conversation/ConversationEphemeralHandler.ts @@ -19,7 +19,7 @@ import ko from 'knockout'; import {Article, LinkPreview} from '@wireapp/protocol-messaging'; -import {CONVERSATION_EVENT, ConversationMessageTimerUpdateEvent} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT, ConversationMessageTimerUpdateEvent} from '@wireapp/api-client/lib/event/'; import {Logger, getLogger} from 'Util/Logger'; import {TIME_IN_MILLIS} from 'Util/TimeUtil'; diff --git a/src/script/conversation/ConversationFilter.test.ts b/src/script/conversation/ConversationFilter.test.ts index 7e42254c2bc..4697805f989 100644 --- a/src/script/conversation/ConversationFilter.test.ts +++ b/src/script/conversation/ConversationFilter.test.ts @@ -21,8 +21,8 @@ import {Conversation} from '../entity/Conversation'; import {ConversationFilter} from './ConversationFilter'; import {ConversationDatabaseData, ConversationMapper} from './ConversationMapper'; import {ConversationStatus} from './ConversationStatus'; -import {CONVERSATION_ACCESS, CONVERSATION_ACCESS_ROLE, CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation'; -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; +import {CONVERSATION_ACCESS, CONVERSATION_ACCESS_ROLE, CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; describe('ConversationFilter', () => { describe('showCallControls', () => { diff --git a/src/script/conversation/ConversationLabelRepository.ts b/src/script/conversation/ConversationLabelRepository.ts index a1632e4d9ee..2793c24d2f1 100644 --- a/src/script/conversation/ConversationLabelRepository.ts +++ b/src/script/conversation/ConversationLabelRepository.ts @@ -19,7 +19,7 @@ import {amplify} from 'amplify'; import {WebAppEvents} from '@wireapp/webapp-events'; -import {USER_EVENT} from '@wireapp/api-client/src/event/'; +import {USER_EVENT} from '@wireapp/api-client/lib/event/'; import ko from 'knockout'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/conversation/ConversationMapper.test.ts b/src/script/conversation/ConversationMapper.test.ts index 56848d57e31..5a002be4b27 100644 --- a/src/script/conversation/ConversationMapper.test.ts +++ b/src/script/conversation/ConversationMapper.test.ts @@ -25,9 +25,9 @@ import { Member as MemberBackendData, OtherMember as OtherMemberBackendData, RemoteConversations, -} from '@wireapp/api-client/src/conversation/'; +} from '@wireapp/api-client/lib/conversation/'; import {createRandomUuid} from 'Util/util'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; import {Conversation} from 'src/script/entity/Conversation'; import { ConversationDatabaseData, @@ -38,7 +38,7 @@ import {NOTIFICATION_STATE} from 'src/script/conversation/NotificationSetting'; import {ConversationStatus} from 'src/script/conversation/ConversationStatus'; import {BaseError} from 'src/script/error/BaseError'; import {entities, payload} from '../../../test/api/payloads'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; describe('ConversationMapper', () => { describe('mapConversations', () => { diff --git a/src/script/conversation/ConversationMapper.ts b/src/script/conversation/ConversationMapper.ts index 8a3e562b7f1..2b63b6ff025 100644 --- a/src/script/conversation/ConversationMapper.ts +++ b/src/script/conversation/ConversationMapper.ts @@ -29,8 +29,8 @@ import { ACCESS_ROLE_V2, CONVERSATION_TYPE, RemoteConversations, -} from '@wireapp/api-client/src/conversation'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +} from '@wireapp/api-client/lib/conversation'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {ACCESS_STATE} from './AccessState'; import {ConversationStatus} from './ConversationStatus'; import {Conversation} from '../entity/Conversation'; diff --git a/src/script/conversation/ConversationRepository.test.ts b/src/script/conversation/ConversationRepository.test.ts index 4a49d2348d5..f0d11d367a7 100644 --- a/src/script/conversation/ConversationRepository.test.ts +++ b/src/script/conversation/ConversationRepository.test.ts @@ -20,12 +20,12 @@ import ko from 'knockout'; import sinon from 'sinon'; import {amplify} from 'amplify'; -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; import {WebAppEvents} from '@wireapp/webapp-events'; -import {CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation/'; -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; -import {ClientClassification} from '@wireapp/api-client/src/client/'; +import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation/'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; +import {ClientClassification} from '@wireapp/api-client/lib/client/'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; import {createRandomUuid} from 'Util/util'; import {Conversation} from 'src/script/entity/Conversation'; @@ -36,7 +36,7 @@ import {NOTIFICATION_HANDLING_STATE} from 'src/script/event/NotificationHandling import {EventRepository} from 'src/script/event/EventRepository'; import {ClientEntity} from 'src/script/client/ClientEntity'; import {EventBuilder, DeleteEvent, MessageHiddenEvent} from 'src/script/conversation/EventBuilder'; -import {CONVERSATION_EVENT, ConversationCreateEvent, ConversationMemberJoinEvent} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT, ConversationCreateEvent, ConversationMemberJoinEvent} from '@wireapp/api-client/lib/event/'; import {ConversationStatus} from 'src/script/conversation/ConversationStatus'; import {ConversationDatabaseData, ConversationMapper} from 'src/script/conversation/ConversationMapper'; import {StorageSchemata} from 'src/script/storage/StorageSchemata'; @@ -45,7 +45,7 @@ import {Config} from 'src/script/Config'; import {ConversationError} from 'src/script/error/ConversationError'; import {EventRecord, StorageService} from '../storage'; import {ConversationRepository} from './ConversationRepository'; -import {CONVERSATION_ACCESS, CONVERSATION_ACCESS_ROLE} from '@wireapp/api-client/src/conversation'; +import {CONVERSATION_ACCESS, CONVERSATION_ACCESS_ROLE} from '@wireapp/api-client/lib/conversation'; import {escapeRegex} from 'Util/SanitizationUtil'; import {UserGenerator} from '../../../test/helper/UserGenerator'; diff --git a/src/script/conversation/ConversationRepository.ts b/src/script/conversation/ConversationRepository.ts index b56598870fe..8748e32aca6 100644 --- a/src/script/conversation/ConversationRepository.ts +++ b/src/script/conversation/ConversationRepository.ts @@ -32,7 +32,7 @@ import { ConversationEvent, ConversationReceiptModeUpdateEvent, ConversationMemberLeaveEvent, -} from '@wireapp/api-client/src/event'; +} from '@wireapp/api-client/lib/event'; import { DefaultConversationRoleName as DefaultRole, @@ -40,11 +40,11 @@ import { NewConversation, Conversation as BackendConversation, ConversationProtocol, -} from '@wireapp/api-client/src/conversation/'; +} from '@wireapp/api-client/lib/conversation/'; import {container} from 'tsyringe'; -import {ConversationReceiptModeUpdateData} from '@wireapp/api-client/src/conversation/data/'; -import {BackendErrorLabel} from '@wireapp/api-client/src/http/'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import {ConversationReceiptModeUpdateData} from '@wireapp/api-client/lib/conversation/data/'; +import {BackendErrorLabel} from '@wireapp/api-client/lib/http/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {Logger, getLogger} from 'Util/Logger'; import {TIME_IN_MILLIS} from 'Util/TimeUtil'; import {PromiseQueue} from 'Util/PromiseQueue'; @@ -118,14 +118,14 @@ import {ConversationState} from './ConversationState'; import {ConversationRecord} from '../storage/record/ConversationRecord'; import {UserFilter} from '../user/UserFilter'; import {ConversationFilter} from './ConversationFilter'; -import {ConversationMemberUpdateEvent} from '@wireapp/api-client/src/event'; +import {ConversationMemberUpdateEvent} from '@wireapp/api-client/lib/event'; import {matchQualifiedIds} from 'Util/QualifiedId'; import {ConversationVerificationState} from './ConversationVerificationState'; import {extractClientDiff} from './ClientMismatchUtil'; import {Core} from '../service/CoreSingleton'; import {updateAccessRights} from './ConversationAccessPermission'; import {ClientState} from '../client/ClientState'; -import {MLSReturnType} from '@wireapp/core/src/main/conversation'; +import {MLSReturnType} from '@wireapp/core/lib/conversation'; import {isMemberMessage} from '../guards/Message'; import {LEAVE_CALL_REASON} from '../calling/enum/LeaveCallReason'; import {mlsConversationState} from '../mls/mlsConversationState'; diff --git a/src/script/conversation/ConversationRoleRepository.test.ts b/src/script/conversation/ConversationRoleRepository.test.ts index 2fa21046458..3540877f34b 100644 --- a/src/script/conversation/ConversationRoleRepository.test.ts +++ b/src/script/conversation/ConversationRoleRepository.test.ts @@ -17,7 +17,7 @@ * */ -import {ConversationRole, DefaultConversationRoleName as DefaultRole} from '@wireapp/api-client/src/conversation/'; +import {ConversationRole, DefaultConversationRoleName as DefaultRole} from '@wireapp/api-client/lib/conversation/'; import {createRandomUuid} from 'Util/util'; diff --git a/src/script/conversation/ConversationRoleRepository.ts b/src/script/conversation/ConversationRoleRepository.ts index 96dd59bb6ee..430e9903657 100644 --- a/src/script/conversation/ConversationRoleRepository.ts +++ b/src/script/conversation/ConversationRoleRepository.ts @@ -17,7 +17,7 @@ * */ -import {DefaultConversationRoleName as DefaultRole, ConversationRole} from '@wireapp/api-client/src/conversation/'; +import {DefaultConversationRoleName as DefaultRole, ConversationRole} from '@wireapp/api-client/lib/conversation/'; import {container} from 'tsyringe'; import {Logger, getLogger} from 'Util/Logger'; diff --git a/src/script/conversation/ConversationService.ts b/src/script/conversation/ConversationService.ts index ab782878a3b..d46890e395e 100644 --- a/src/script/conversation/ConversationService.ts +++ b/src/script/conversation/ConversationService.ts @@ -24,13 +24,13 @@ import type { Conversation as BackendConversation, ConversationCode, NewOTRMessage, -} from '@wireapp/api-client/src/conversation'; +} from '@wireapp/api-client/lib/conversation'; import type { ConversationMemberUpdateData, ConversationOtherMemberUpdateData, ConversationReceiptModeUpdateData, ConversationJoinData, -} from '@wireapp/api-client/src/conversation/data'; +} from '@wireapp/api-client/lib/conversation/data'; import type { ConversationCodeDeleteEvent, ConversationCodeUpdateEvent, @@ -40,7 +40,7 @@ import type { ConversationMessageTimerUpdateEvent, ConversationReceiptModeUpdateEvent, ConversationRenameEvent, -} from '@wireapp/api-client/src/event'; +} from '@wireapp/api-client/lib/event'; import {container} from 'tsyringe'; import {Logger, getLogger} from 'Util/Logger'; @@ -53,7 +53,7 @@ import {StorageService} from '../storage'; import {StorageSchemata} from '../storage/StorageSchemata'; import {APIClient} from '../service/APIClientSingleton'; import {ConversationRecord} from '../storage/record/ConversationRecord'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; export class ConversationService { private readonly eventService: EventService; diff --git a/src/script/conversation/ConversationState.ts b/src/script/conversation/ConversationState.ts index 4e89176ce1b..e6ef820a26a 100644 --- a/src/script/conversation/ConversationState.ts +++ b/src/script/conversation/ConversationState.ts @@ -17,7 +17,7 @@ * */ -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; import {container, singleton} from 'tsyringe'; import ko from 'knockout'; @@ -27,7 +27,7 @@ import {Conversation} from '../entity/Conversation'; import {TeamState} from '../team/TeamState'; import {User} from '../entity/User'; import {UserState} from '../user/UserState'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {matchQualifiedIds} from 'Util/QualifiedId'; @singleton() diff --git a/src/script/conversation/ConversationStateHandler.ts b/src/script/conversation/ConversationStateHandler.ts index 08a94ecc9e2..2c92188cec5 100644 --- a/src/script/conversation/ConversationStateHandler.ts +++ b/src/script/conversation/ConversationStateHandler.ts @@ -17,9 +17,9 @@ * */ -import {ConversationCode} from '@wireapp/api-client/src/conversation/'; -import {ConversationAccessUpdateData, ConversationAccessV2UpdateData} from '@wireapp/api-client/src/conversation/data/'; -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {ConversationCode} from '@wireapp/api-client/lib/conversation/'; +import {ConversationAccessUpdateData, ConversationAccessV2UpdateData} from '@wireapp/api-client/lib/conversation/data/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import {amplify} from 'amplify'; import {WebAppEvents} from '@wireapp/webapp-events'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; diff --git a/src/script/conversation/ConversationVerificationStateHandler.ts b/src/script/conversation/ConversationVerificationStateHandler.ts index cb69332ff56..07eb5d07f22 100644 --- a/src/script/conversation/ConversationVerificationStateHandler.ts +++ b/src/script/conversation/ConversationVerificationStateHandler.ts @@ -25,7 +25,7 @@ import {Logger, getLogger} from 'Util/Logger'; import {ConversationVerificationState} from './ConversationVerificationState'; import {EventBuilder} from '../conversation/EventBuilder'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {EventRecord} from '../storage'; import {VerificationMessageType} from '../message/VerificationMessageType'; import type {ClientEntity} from '../client/ClientEntity'; diff --git a/src/script/conversation/EventBuilder.test.ts b/src/script/conversation/EventBuilder.test.ts index 0459a085e35..64b6467009f 100644 --- a/src/script/conversation/EventBuilder.test.ts +++ b/src/script/conversation/EventBuilder.test.ts @@ -24,7 +24,7 @@ import {Conversation} from 'src/script/entity/Conversation'; import {User} from 'src/script/entity/User'; import {ClientEvent} from 'src/script/event/Client'; import {DegradedMessageEventData, EventBuilder, GroupCreationEventData} from 'src/script/conversation/EventBuilder'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {VerificationMessageType} from 'src/script/message/VerificationMessageType'; import {SuperType} from 'src/script/message/SuperType'; import {EventRecord} from '../storage'; diff --git a/src/script/conversation/EventBuilder.ts b/src/script/conversation/EventBuilder.ts index 34fd6ce4083..77a6066592b 100644 --- a/src/script/conversation/EventBuilder.ts +++ b/src/script/conversation/EventBuilder.ts @@ -18,9 +18,9 @@ */ import type {LegalHoldStatus} from '@wireapp/protocol-messaging'; -import {MemberLeaveReason} from '@wireapp/api-client/src/conversation/data/'; -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import {MemberLeaveReason} from '@wireapp/api-client/lib/conversation/data/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import type {REASON as AVS_REASON} from '@wireapp/avs'; import {createRandomUuid} from 'Util/util'; @@ -32,8 +32,8 @@ import type {Conversation} from '../entity/Conversation'; import type {Message} from '../entity/message/Message'; import type {User} from '../entity/User'; import {AssetRecord, EventRecord} from '../storage'; -import {ReactionType} from '@wireapp/core/src/main/conversation'; -import {ConversationOtrMessageAddEvent} from '@wireapp/api-client/src/event'; +import {ReactionType} from '@wireapp/core/lib/conversation'; +import {ConversationOtrMessageAddEvent} from '@wireapp/api-client/lib/event'; import {CALL_MESSAGE_TYPE} from '../calling/enum/CallMessageType'; export interface BaseEvent { diff --git a/src/script/conversation/EventMapper.ts b/src/script/conversation/EventMapper.ts index 423d9f9cb0b..18374453e0f 100644 --- a/src/script/conversation/EventMapper.ts +++ b/src/script/conversation/EventMapper.ts @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_EVENT, ConversationEvent} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT, ConversationEvent} from '@wireapp/api-client/lib/event/'; import {LinkPreview, Mention} from '@wireapp/protocol-messaging'; import {getLogger, Logger} from 'Util/Logger'; diff --git a/src/script/conversation/MessageRepository.test.ts b/src/script/conversation/MessageRepository.test.ts index 372804b9d1a..794f623ae00 100644 --- a/src/script/conversation/MessageRepository.test.ts +++ b/src/script/conversation/MessageRepository.test.ts @@ -17,9 +17,9 @@ * */ -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; -import {CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation/'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; +import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation/'; import {LegalHoldStatus} from '@wireapp/protocol-messaging'; import {createRandomUuid} from 'Util/util'; import {Conversation} from 'src/script/entity/Conversation'; @@ -44,7 +44,7 @@ import {container} from 'tsyringe'; import {ClientEntity} from '../client/ClientEntity'; import {TeamState} from '../team/TeamState'; import {ContentMessage} from '../entity/message/ContentMessage'; -import {PayloadBundleState} from '@wireapp/core/src/main/conversation'; +import {PayloadBundleState} from '@wireapp/core/lib/conversation'; import {ConversationState} from './ConversationState'; const selfUser = new User('selfid', ''); diff --git a/src/script/conversation/MessageRepository.ts b/src/script/conversation/MessageRepository.ts index 60468156568..5105f9200b9 100644 --- a/src/script/conversation/MessageRepository.ts +++ b/src/script/conversation/MessageRepository.ts @@ -19,7 +19,7 @@ import {amplify} from 'amplify'; import {Asset, Confirmation, GenericMessage, Availability} from '@wireapp/protocol-messaging'; -import {ReactionType, MessageTargetMode, PayloadBundleState} from '@wireapp/core/src/main/conversation'; +import {ReactionType, MessageTargetMode, PayloadBundleState} from '@wireapp/core/lib/conversation'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; import { ClientMismatch, @@ -27,8 +27,8 @@ import { MessageSendingStatus, UserClients, ConversationProtocol, -} from '@wireapp/api-client/src/conversation'; -import {QualifiedId, RequestCancellationError, User as APIClientUser} from '@wireapp/api-client/src/user'; +} from '@wireapp/api-client/lib/conversation'; +import {QualifiedId, RequestCancellationError, User as APIClientUser} from '@wireapp/api-client/lib/user'; import {WebAppEvents} from '@wireapp/webapp-events'; import { AudioMetaData, @@ -39,8 +39,8 @@ import { LinkPreviewContent, TextContent, EditedTextContent, -} from '@wireapp/core/src/main/conversation/content'; -import {TextContentBuilder} from '@wireapp/core/src/main/conversation/message/TextContentBuilder'; +} from '@wireapp/core/lib/conversation/content'; +import {TextContentBuilder} from '@wireapp/core/lib/conversation/message/TextContentBuilder'; import {MessageBuilder} from '@wireapp/core'; import {container} from 'tsyringe'; @@ -92,9 +92,9 @@ import {ClientState} from '../client/ClientState'; import {UserType} from '../tracking/attribute'; import {matchQualifiedIds} from 'Util/QualifiedId'; import {Core} from '../service/CoreSingleton'; -import {OtrMessage} from '@wireapp/core/src/main/conversation/message/OtrMessage'; +import {OtrMessage} from '@wireapp/core/lib/conversation/message/OtrMessage'; import {User} from '../entity/User'; -import {isQualifiedUserClients, isUserClients} from '@wireapp/core/src/main/util'; +import {isQualifiedUserClients, isUserClients} from '@wireapp/core/lib/util'; import {PROPERTIES_TYPE} from '../properties/PropertiesType'; import {findDeletedClients} from './ClientMismatchUtil'; import {protoFromType} from '../user/AvailabilityMapper'; diff --git a/src/script/conversation/userClientsUtils.ts b/src/script/conversation/userClientsUtils.ts index ac48851e6ab..bbed430d35b 100644 --- a/src/script/conversation/userClientsUtils.ts +++ b/src/script/conversation/userClientsUtils.ts @@ -17,7 +17,7 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; type UserClientsContainer = {[userId: string]: T[]}; type QualifiedUserClientsContainer = {[domain: string]: UserClientsContainer}; diff --git a/src/script/cryptography/CryptographyMapper.ts b/src/script/cryptography/CryptographyMapper.ts index fb36561172a..edcf9d8118b 100644 --- a/src/script/cryptography/CryptographyMapper.ts +++ b/src/script/cryptography/CryptographyMapper.ts @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import { Asset, Availability, diff --git a/src/script/cryptography/CryptographyRepository.ts b/src/script/cryptography/CryptographyRepository.ts index f070c4ea7bc..0a2b9b2189f 100644 --- a/src/script/cryptography/CryptographyRepository.ts +++ b/src/script/cryptography/CryptographyRepository.ts @@ -17,8 +17,8 @@ * */ -import type {QualifiedId} from '@wireapp/api-client/src/user/'; -import type {PreKey as BackendPreKey} from '@wireapp/api-client/src/auth/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; +import type {PreKey as BackendPreKey} from '@wireapp/api-client/lib/auth/'; import {getLogger, Logger} from 'Util/Logger'; diff --git a/src/script/entity/Conversation.test.ts b/src/script/entity/Conversation.test.ts index f2d93a0f9c1..b3a54b55a2d 100644 --- a/src/script/entity/Conversation.test.ts +++ b/src/script/entity/Conversation.test.ts @@ -19,9 +19,9 @@ //@ts-check -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; -import {CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation/'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; +import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation/'; import 'src/script/localization/Localizer'; import {createRandomUuid} from 'Util/util'; @@ -1081,7 +1081,7 @@ describe('Conversation', () => { it('updates the participating user IDs with the user ID of the other party', () => { const connector_user_id = 'b43b376d-7b5a-4d77-89be-81a02892db8c'; - /** @type {import('@wireapp/api-client/src/connection/').Connection} */ + /** @type {import('@wireapp/api-client/lib/connection/').Connection} */ const payload_connection = { conversation: '15a7f358-8eba-4b8e-bcf2-61a08eb53349', from: '616cbbeb-1360-4e17-b333-e000662257bd', diff --git a/src/script/entity/Conversation.ts b/src/script/entity/Conversation.ts index aec8cf265ea..0901ea6bf40 100644 --- a/src/script/entity/Conversation.ts +++ b/src/script/entity/Conversation.ts @@ -20,8 +20,8 @@ import {amplify} from 'amplify'; import ko from 'knockout'; import {Availability, LegalHoldStatus} from '@wireapp/protocol-messaging'; -import {QualifiedId} from '@wireapp/api-client/src/user'; -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; import {Cancelable, debounce} from 'underscore'; import {WebAppEvents} from '@wireapp/webapp-events'; import { @@ -29,7 +29,7 @@ import { CONVERSATION_ACCESS, CONVERSATION_ACCESS_ROLE, CONVERSATION_TYPE, -} from '@wireapp/api-client/src/conversation/'; +} from '@wireapp/api-client/lib/conversation/'; import {getLogger, Logger} from 'Util/Logger'; import {t} from 'Util/LocalizerUtil'; import {truncate} from 'Util/StringUtil'; @@ -49,7 +49,7 @@ import type {Message} from './message/Message'; import type {SystemMessage} from './message/SystemMessage'; import {Config} from '../Config'; import type {Call} from '../calling/Call'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; import {ConversationRecord} from '../storage/record/ConversationRecord'; import {LegalHoldModalViewModel} from '../view_model/content/LegalHoldModalViewModel'; import {CallMessage} from './message/CallMessage'; diff --git a/src/script/entity/User.ts b/src/script/entity/User.ts index e45c401cd85..a7dced27b08 100644 --- a/src/script/entity/User.ts +++ b/src/script/entity/User.ts @@ -21,7 +21,7 @@ import {amplify} from 'amplify'; import ko from 'knockout'; import {WebAppEvents} from '@wireapp/webapp-events'; import {Availability} from '@wireapp/protocol-messaging'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {t} from 'Util/LocalizerUtil'; import {TIME_IN_MILLIS} from 'Util/TimeUtil'; diff --git a/src/script/entity/message/ContentMessage.ts b/src/script/entity/message/ContentMessage.ts index a66775653a1..f012a5abd36 100644 --- a/src/script/entity/message/ContentMessage.ts +++ b/src/script/entity/message/ContentMessage.ts @@ -20,7 +20,7 @@ import ko from 'knockout'; import {copyText} from 'Util/ClipboardUtil'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {t} from 'Util/LocalizerUtil'; import {formatLocale, formatTimeShort} from 'Util/TimeUtil'; import type {QuoteEntity} from '../../message/QuoteEntity'; @@ -33,7 +33,7 @@ import {Message} from './Message'; import {Text as TextAsset} from './Text'; import {AssetRepository} from '../../assets/AssetRepository'; import {UserReactionMap} from '../../storage'; -import type {ReactionType} from '@wireapp/core/src/main/conversation/ReactionType'; +import type {ReactionType} from '@wireapp/core/lib/conversation/ReactionType'; export class ContentMessage extends Message { private readonly isLikedProvisional: ko.Observable; diff --git a/src/script/entity/message/DeleteConversationMessage.ts b/src/script/entity/message/DeleteConversationMessage.ts index 89ffc92e899..92fbec53cbd 100644 --- a/src/script/entity/message/DeleteConversationMessage.ts +++ b/src/script/entity/message/DeleteConversationMessage.ts @@ -19,7 +19,7 @@ import ko from 'knockout'; -import {TEAM_EVENT} from '@wireapp/api-client/src/event/TeamEvent'; +import {TEAM_EVENT} from '@wireapp/api-client/lib/event/TeamEvent'; import {t} from 'Util/LocalizerUtil'; import {SystemMessageType} from '../../message/SystemMessageType'; import type {Conversation} from '../Conversation'; diff --git a/src/script/entity/message/MemberMessage.ts b/src/script/entity/message/MemberMessage.ts index 38006bda15f..799811c1418 100644 --- a/src/script/entity/message/MemberMessage.ts +++ b/src/script/entity/message/MemberMessage.ts @@ -17,8 +17,8 @@ * */ -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; -import {MemberLeaveReason} from '@wireapp/api-client/src/conversation/data/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; +import {MemberLeaveReason} from '@wireapp/api-client/lib/conversation/data/'; import ko from 'knockout'; import {Declension, joinNames, replaceLink, t} from 'Util/LocalizerUtil'; import {getUserName} from 'Util/SanitizationUtil'; @@ -29,7 +29,7 @@ import {SystemMessageType} from '../../message/SystemMessageType'; import {User} from '../User'; import {SystemMessage} from './SystemMessage'; import {Config} from '../../Config'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {matchQualifiedIds} from 'Util/QualifiedId'; export class MemberMessage extends SystemMessage { diff --git a/src/script/entity/message/Message.ts b/src/script/entity/message/Message.ts index 9171a3ba0e4..ace2b1968c9 100644 --- a/src/script/entity/message/Message.ts +++ b/src/script/entity/message/Message.ts @@ -19,13 +19,13 @@ import ko from 'knockout'; import type {LegalHoldStatus} from '@wireapp/protocol-messaging'; -import type {ReactionType} from '@wireapp/core/src/main/conversation/'; +import type {ReactionType} from '@wireapp/core/lib/conversation/'; import {getUserName} from 'Util/SanitizationUtil'; import {TIME_IN_MILLIS, formatDurationCaption, formatTimeShort, formatDateNumeral, fromUnixTime} from 'Util/TimeUtil'; import {t} from 'Util/LocalizerUtil'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {AssetTransferState} from '../../assets/AssetTransferState'; import {AssetType} from '../../assets/AssetType'; import {EphemeralStatusType} from '../../message/EphemeralStatusType'; diff --git a/src/script/entity/message/MessageTimerUpdateMessage.ts b/src/script/entity/message/MessageTimerUpdateMessage.ts index cfc3ff97f41..b9a039d5806 100644 --- a/src/script/entity/message/MessageTimerUpdateMessage.ts +++ b/src/script/entity/message/MessageTimerUpdateMessage.ts @@ -18,7 +18,7 @@ */ import ko from 'knockout'; -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import {t} from 'Util/LocalizerUtil'; import {formatDuration} from 'Util/TimeUtil'; diff --git a/src/script/entity/message/ReceiptModeUpdateMessage.ts b/src/script/entity/message/ReceiptModeUpdateMessage.ts index b726a472858..848aa2c92c4 100644 --- a/src/script/entity/message/ReceiptModeUpdateMessage.ts +++ b/src/script/entity/message/ReceiptModeUpdateMessage.ts @@ -18,7 +18,7 @@ */ import ko from 'knockout'; -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/entity/message/RenameMessage.ts b/src/script/entity/message/RenameMessage.ts index 9387cc9e342..52c078425f0 100644 --- a/src/script/entity/message/RenameMessage.ts +++ b/src/script/entity/message/RenameMessage.ts @@ -18,7 +18,7 @@ */ import ko from 'knockout'; -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/entity/message/Text.ts b/src/script/entity/message/Text.ts index 16515c4ea5e..c9773789073 100644 --- a/src/script/entity/message/Text.ts +++ b/src/script/entity/message/Text.ts @@ -21,7 +21,7 @@ import ko from 'knockout'; import {renderMessage} from 'Util/messageRenderer'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {AssetType} from '../../assets/AssetType'; import {containsOnlyLink} from '../../conversation/linkPreviews/helpers'; import {mediaParser} from '../../media/MediaParser'; diff --git a/src/script/error/BackendClientError.ts b/src/script/error/BackendClientError.ts index 26b5504b430..e075a8cfef6 100644 --- a/src/script/error/BackendClientError.ts +++ b/src/script/error/BackendClientError.ts @@ -17,7 +17,7 @@ * */ -import {BackendErrorLabel} from '@wireapp/api-client/src/http/'; +import {BackendErrorLabel} from '@wireapp/api-client/lib/http/'; import {BaseError} from './BaseError'; export class BackendClientError extends BaseError { diff --git a/src/script/event/EventRepository.test.ts b/src/script/event/EventRepository.test.ts index f1b40382381..5c69bcb786b 100644 --- a/src/script/event/EventRepository.test.ts +++ b/src/script/event/EventRepository.test.ts @@ -18,7 +18,7 @@ */ import {Asset as ProtobufAsset} from '@wireapp/protocol-messaging'; -import {CONVERSATION_EVENT, USER_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT, USER_EVENT} from '@wireapp/api-client/lib/event/'; import {createRandomUuid} from 'Util/util'; import {ClientEvent} from 'src/script/event/Client'; import {NOTIFICATION_HANDLING_STATE} from 'src/script/event/NotificationHandlingState'; diff --git a/src/script/event/EventRepository.ts b/src/script/event/EventRepository.ts index 4f1c30983de..0810243bd5f 100644 --- a/src/script/event/EventRepository.ts +++ b/src/script/event/EventRepository.ts @@ -21,7 +21,7 @@ import {Asset as ProtobufAsset, GenericMessage} from '@wireapp/protocol-messagin import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import ko from 'knockout'; -import {USER_EVENT, CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {USER_EVENT, CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import {container} from 'tsyringe'; import {getLogger, Logger} from 'Util/Logger'; import {TIME_IN_MILLIS} from 'Util/TimeUtil'; @@ -47,10 +47,10 @@ import {UserState} from '../user/UserState'; import {AssetData, CryptographyMapper} from '../cryptography/CryptographyMapper'; import Warnings from '../view_model/WarningsContainer'; import {Account, ConnectionState, ProcessedEventPayload} from '@wireapp/core'; -import {HandledEventPayload} from '@wireapp/core/src/main/notification'; +import {HandledEventPayload} from '@wireapp/core/lib/notification'; import {EventBuilder} from '../conversation/EventBuilder'; import {EventName} from '../tracking/EventName'; -import {PayloadBundleSource} from '@wireapp/core/src/main/conversation'; +import {PayloadBundleSource} from '@wireapp/core/lib/conversation'; export class EventRepository { logger: Logger; diff --git a/src/script/event/EventSource.ts b/src/script/event/EventSource.ts index af1632ecc32..64bbbecad0d 100644 --- a/src/script/event/EventSource.ts +++ b/src/script/event/EventSource.ts @@ -17,7 +17,7 @@ * */ -import {PayloadBundleSource} from '@wireapp/core/src/main/conversation'; +import {PayloadBundleSource} from '@wireapp/core/lib/conversation'; enum WebAppEventSource { BACKEND_RESPONSE = 'backend_response', diff --git a/src/script/event/EventTypeHandling.ts b/src/script/event/EventTypeHandling.ts index 67b7f3a6ae8..e6c27dd414e 100644 --- a/src/script/event/EventTypeHandling.ts +++ b/src/script/event/EventTypeHandling.ts @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import {ClientEvent} from './Client'; diff --git a/src/script/event/EventValidator.test.ts b/src/script/event/EventValidator.test.ts index 9efe488dfd3..5963dc911c7 100644 --- a/src/script/event/EventValidator.test.ts +++ b/src/script/event/EventValidator.test.ts @@ -17,8 +17,8 @@ * */ -import {CONVERSATION_EVENT, ConversationTypingEvent} from '@wireapp/api-client/src/event/'; -import {CONVERSATION_TYPING} from '@wireapp/api-client/src/conversation/data/'; +import {CONVERSATION_EVENT, ConversationTypingEvent} from '@wireapp/api-client/lib/event/'; +import {CONVERSATION_TYPING} from '@wireapp/api-client/lib/conversation/data/'; import {EventSource} from './EventSource'; import {EventValidation} from './EventValidation'; diff --git a/src/script/event/EventValidator.ts b/src/script/event/EventValidator.ts index d666b456fb3..82e15c44517 100644 --- a/src/script/event/EventValidator.ts +++ b/src/script/event/EventValidator.ts @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_EVENT, USER_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT, USER_EVENT} from '@wireapp/api-client/lib/event/'; import {EventSource} from './EventSource'; import {EventValidation} from './EventValidation'; diff --git a/src/script/event/NotificationService.ts b/src/script/event/NotificationService.ts index 67d29a6a221..b164481b9af 100644 --- a/src/script/event/NotificationService.ts +++ b/src/script/event/NotificationService.ts @@ -17,8 +17,8 @@ * */ -import type {NotificationList} from '@wireapp/api-client/src/notification/'; -import {DatabaseKeys} from '@wireapp/core/src/main/notification/NotificationDatabaseRepository'; +import type {NotificationList} from '@wireapp/api-client/lib/notification/'; +import {DatabaseKeys} from '@wireapp/core/lib/notification/NotificationDatabaseRepository'; import {container} from 'tsyringe'; import {StorageSchemata, StorageService} from '../storage/'; diff --git a/src/script/event/preprocessor/ReceiptsMiddleware.ts b/src/script/event/preprocessor/ReceiptsMiddleware.ts index b5374f09758..396ffe41843 100644 --- a/src/script/event/preprocessor/ReceiptsMiddleware.ts +++ b/src/script/event/preprocessor/ReceiptsMiddleware.ts @@ -18,7 +18,7 @@ */ import {container} from 'tsyringe'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; import {getLogger, Logger} from 'Util/Logger'; import {StatusType} from '../../message/StatusType'; import {ClientEvent} from '../Client'; diff --git a/src/script/event/preprocessor/ServiceMiddleware.ts b/src/script/event/preprocessor/ServiceMiddleware.ts index aa09c23b9bd..1d1d4898356 100644 --- a/src/script/event/preprocessor/ServiceMiddleware.ts +++ b/src/script/event/preprocessor/ServiceMiddleware.ts @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import {container} from 'tsyringe'; import {getLogger, Logger} from 'Util/Logger'; @@ -27,7 +27,7 @@ import type {ConversationRepository} from '../../conversation/ConversationReposi import {EventRecord} from '../../storage/record/EventRecord'; import type {UserRepository} from '../../user/UserRepository'; import {ClientEvent} from '../Client'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {QualifiedUserId} from '@wireapp/protocol-messaging'; import {matchQualifiedIds} from 'Util/QualifiedId'; diff --git a/src/script/extension/GiphyService.ts b/src/script/extension/GiphyService.ts index a4cf054f0b1..e5031f2f744 100644 --- a/src/script/extension/GiphyService.ts +++ b/src/script/extension/GiphyService.ts @@ -22,7 +22,7 @@ import type { GiphyMultipleResult, GiphyResult, GiphyTrendingOptions, -} from '@wireapp/api-client/src/giphy'; +} from '@wireapp/api-client/lib/giphy'; import {container} from 'tsyringe'; import {APIClient} from '../service/APIClientSingleton'; diff --git a/src/script/guards/Protocol.ts b/src/script/guards/Protocol.ts index 7d147185e50..4d5bf739091 100644 --- a/src/script/guards/Protocol.ts +++ b/src/script/guards/Protocol.ts @@ -17,7 +17,7 @@ * */ -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; export interface ProtocolOption { label: string; diff --git a/src/script/integration/IntegrationRepository.ts b/src/script/integration/IntegrationRepository.ts index e238f3b7d6c..0fbe4b5b328 100644 --- a/src/script/integration/IntegrationRepository.ts +++ b/src/script/integration/IntegrationRepository.ts @@ -20,7 +20,7 @@ import ko from 'knockout'; import {amplify} from 'amplify'; import {WebAppEvents} from '@wireapp/webapp-events'; -import type {ConversationMemberJoinEvent} from '@wireapp/api-client/src/event/'; +import type {ConversationMemberJoinEvent} from '@wireapp/api-client/lib/event/'; import {container} from 'tsyringe'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/integration/IntegrationService.ts b/src/script/integration/IntegrationService.ts index 98545a5d506..806d95cd3ec 100644 --- a/src/script/integration/IntegrationService.ts +++ b/src/script/integration/IntegrationService.ts @@ -17,7 +17,7 @@ * */ -import type {Provider, Service} from '@wireapp/api-client/src/team/service/'; +import type {Provider, Service} from '@wireapp/api-client/lib/team/service/'; import {container} from 'tsyringe'; import {APIClient} from '../service/APIClientSingleton'; diff --git a/src/script/integration/ServiceEntity.ts b/src/script/integration/ServiceEntity.ts index f953bbc112e..de8273cfda6 100644 --- a/src/script/integration/ServiceEntity.ts +++ b/src/script/integration/ServiceEntity.ts @@ -18,7 +18,7 @@ */ import ko from 'knockout'; -import type {UserAsset as APIClientUserAsset} from '@wireapp/api-client/src/user/'; +import type {UserAsset as APIClientUserAsset} from '@wireapp/api-client/lib/user/'; import {AssetRemoteData} from '../assets/AssetRemoteData'; diff --git a/src/script/legal-hold/LegalHoldEvaluator.ts b/src/script/legal-hold/LegalHoldEvaluator.ts index f4ced92a7c8..198bb7a88ea 100644 --- a/src/script/legal-hold/LegalHoldEvaluator.ts +++ b/src/script/legal-hold/LegalHoldEvaluator.ts @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event'; import {LegalHoldStatus} from '@wireapp/protocol-messaging'; import type {Conversation} from '../entity/Conversation'; diff --git a/src/script/main/app.ts b/src/script/main/app.ts index 11afc442ef9..997411eb0df 100644 --- a/src/script/main/app.ts +++ b/src/script/main/app.ts @@ -23,7 +23,7 @@ import 'core-js/full/reflect'; import ko from 'knockout'; import platform from 'platform'; import {container} from 'tsyringe'; -import {ClientType, ClientClassification} from '@wireapp/api-client/src/client/'; +import {ClientType, ClientClassification} from '@wireapp/api-client/lib/client/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; import Dexie from 'dexie'; diff --git a/src/script/media/MediaParser.ts b/src/script/media/MediaParser.ts index b19d3f86505..c0083258b0e 100644 --- a/src/script/media/MediaParser.ts +++ b/src/script/media/MediaParser.ts @@ -17,7 +17,7 @@ * */ -import type {WebappProperties} from '@wireapp/api-client/src/user/data/'; +import type {WebappProperties} from '@wireapp/api-client/lib/user/data/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; diff --git a/src/script/message/MentionEntity.ts b/src/script/message/MentionEntity.ts index 3f65caaf253..b70097b3cfa 100644 --- a/src/script/message/MentionEntity.ts +++ b/src/script/message/MentionEntity.ts @@ -19,7 +19,7 @@ import {Mention, IMention} from '@wireapp/protocol-messaging'; import {matchQualifiedIds} from 'Util/QualifiedId'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {isUUID} from 'Util/ValidationUtil'; diff --git a/src/script/mls/mlsConversationState/mlsConversationState.test.ts b/src/script/mls/mlsConversationState/mlsConversationState.test.ts index 10308949d64..d25af359229 100644 --- a/src/script/mls/mlsConversationState/mlsConversationState.test.ts +++ b/src/script/mls/mlsConversationState/mlsConversationState.test.ts @@ -17,7 +17,7 @@ * */ -import {ConversationProtocol} from '@wireapp/api-client/src/conversation'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation'; import {createRandomUuid} from 'Util/util'; import {Conversation} from '../../entity/Conversation'; import {mlsConversationState} from './mlsConversationState'; diff --git a/src/script/notification/NotificationRepository.ts b/src/script/notification/NotificationRepository.ts index 3741287c4c9..7424d14b03a 100644 --- a/src/script/notification/NotificationRepository.ts +++ b/src/script/notification/NotificationRepository.ts @@ -17,8 +17,8 @@ * */ -import {NotificationPreference, WebappProperties} from '@wireapp/api-client/src/user/data/'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import {NotificationPreference, WebappProperties} from '@wireapp/api-client/lib/user/data/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {Availability} from '@wireapp/protocol-messaging'; import {amplify} from 'amplify'; import ko from 'knockout'; diff --git a/src/script/notification/PreferenceNotificationRepository.test.ts b/src/script/notification/PreferenceNotificationRepository.test.ts index 2331bf43dfe..904ce9fa4b7 100644 --- a/src/script/notification/PreferenceNotificationRepository.test.ts +++ b/src/script/notification/PreferenceNotificationRepository.test.ts @@ -20,7 +20,7 @@ import ko from 'knockout'; import {amplify} from 'amplify'; import {WebAppEvents} from '@wireapp/webapp-events'; -import {USER_EVENT} from '@wireapp/api-client/src/event/'; +import {USER_EVENT} from '@wireapp/api-client/lib/event/'; import {PreferenceNotificationRepository, Notification} from 'src/script/notification/PreferenceNotificationRepository'; import {PropertiesRepository} from 'src/script/properties/PropertiesRepository'; diff --git a/src/script/notification/PreferenceNotificationRepository.ts b/src/script/notification/PreferenceNotificationRepository.ts index b05c826e389..e806bad5baf 100644 --- a/src/script/notification/PreferenceNotificationRepository.ts +++ b/src/script/notification/PreferenceNotificationRepository.ts @@ -20,9 +20,9 @@ import {amplify} from 'amplify'; import ko from 'knockout'; import {groupBy} from 'underscore'; -import {USER_EVENT, UserEvent} from '@wireapp/api-client/src/event'; -import type {QualifiedId} from '@wireapp/api-client/src/user'; -import {ClientType} from '@wireapp/api-client/src/client'; +import {USER_EVENT, UserEvent} from '@wireapp/api-client/lib/event'; +import type {QualifiedId} from '@wireapp/api-client/lib/user'; +import {ClientType} from '@wireapp/api-client/lib/client'; import {WebAppEvents} from '@wireapp/webapp-events'; import {loadValue, resetStoreValue, storeValue} from 'Util/StorageUtil'; import type {ClientEntity} from '../client/ClientEntity'; diff --git a/src/script/page/AppLock/AppLock.test.tsx b/src/script/page/AppLock/AppLock.test.tsx index 6dc35865227..df48a94889d 100644 --- a/src/script/page/AppLock/AppLock.test.tsx +++ b/src/script/page/AppLock/AppLock.test.tsx @@ -21,7 +21,7 @@ import ko from 'knockout'; import {act} from '@testing-library/react'; import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; -import {FeatureStatus} from '@wireapp/api-client/src/team/feature/'; +import {FeatureStatus} from '@wireapp/api-client/lib/team/feature/'; import type {ClientRepository} from '../../client/ClientRepository'; import AppLock, {APPLOCK_STATE} from './'; diff --git a/src/script/page/LeftSidebar/panels/Conversations/GroupedConversations.tsx b/src/script/page/LeftSidebar/panels/Conversations/GroupedConversations.tsx index c240ce98271..78c2ac3ec82 100644 --- a/src/script/page/LeftSidebar/panels/Conversations/GroupedConversations.tsx +++ b/src/script/page/LeftSidebar/panels/Conversations/GroupedConversations.tsx @@ -36,7 +36,7 @@ import {ConversationState} from '../../../../conversation/ConversationState'; import {useKoSubscribableChildren} from 'Util/ComponentUtil'; import GroupedConversationsFolder from './GroupedConversationsFolder'; import {CallState} from '../../../../calling/CallState'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {useFolderState} from './state'; const useLabels = (conversationLabelRepository: ConversationLabelRepository) => { diff --git a/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx b/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx index cf0085df8b3..e54c76c5164 100644 --- a/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx +++ b/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx @@ -19,7 +19,7 @@ import React, {useEffect, useRef, useState} from 'react'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; -import {BackendErrorLabel} from '@wireapp/api-client/src/http'; +import {BackendErrorLabel} from '@wireapp/api-client/lib/http'; import {TeamState} from '../../../../team/TeamState'; import {UserState} from '../../../../user/UserState'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/page/LeftSidebar/panels/StartUI/components/GroupList.test.tsx b/src/script/page/LeftSidebar/panels/StartUI/components/GroupList.test.tsx index bc4a5817fed..8da1eedce18 100644 --- a/src/script/page/LeftSidebar/panels/StartUI/components/GroupList.test.tsx +++ b/src/script/page/LeftSidebar/panels/StartUI/components/GroupList.test.tsx @@ -17,14 +17,14 @@ * */ -import {CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation'; +import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation'; import GroupList from './GroupList'; import {createRandomUuid, noop} from 'Util/util'; import {AssetRepository} from '../../../../../assets/AssetRepository'; import {Conversation} from '../../../../../entity/Conversation'; import {User} from '../../../../../entity/User'; import {Router} from '../../../../../router/Router'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {render, fireEvent} from '@testing-library/react'; const getGroupItemById = (container: HTMLElement, id: string) => diff --git a/src/script/page/LeftSidebar/panels/StartUI/components/topPeople/TopContact.tsx b/src/script/page/LeftSidebar/panels/StartUI/components/topPeople/TopContact.tsx index 9bc1ab2a91b..5aef75c38b3 100644 --- a/src/script/page/LeftSidebar/panels/StartUI/components/topPeople/TopContact.tsx +++ b/src/script/page/LeftSidebar/panels/StartUI/components/topPeople/TopContact.tsx @@ -22,7 +22,7 @@ import {AssetRepository} from '../../../../../../assets/AssetRepository'; import Avatar, {AVATAR_SIZE} from 'Components/Avatar'; import {useKoSubscribableChildren} from 'Util/ComponentUtil'; import {useEffect, useState} from 'react'; -import {ConnectionStatus} from '@wireapp/api-client/src/connection'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection'; import React from 'react'; import {handleKeyDown} from 'Util/KeyboardUtil'; diff --git a/src/script/page/LeftSidebar/panels/TemporatyGuestConversations.tsx b/src/script/page/LeftSidebar/panels/TemporatyGuestConversations.tsx index 2fac57d398c..5fbf7a74ae5 100644 --- a/src/script/page/LeftSidebar/panels/TemporatyGuestConversations.tsx +++ b/src/script/page/LeftSidebar/panels/TemporatyGuestConversations.tsx @@ -30,7 +30,7 @@ import {ListViewModel} from '../../../view_model/ListViewModel'; import {Config} from '../../../Config'; import {ModalsViewModel} from '../../../view_model/ModalsViewModel'; import {CallingViewModel} from '../../../view_model/CallingViewModel'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; type TemporaryGuestConversations = { callingViewModel: CallingViewModel; diff --git a/src/script/page/MainContent/panels/preferences/OptionPreferences.tsx b/src/script/page/MainContent/panels/preferences/OptionPreferences.tsx index 4c4affda5cd..993d0baae6a 100644 --- a/src/script/page/MainContent/panels/preferences/OptionPreferences.tsx +++ b/src/script/page/MainContent/panels/preferences/OptionPreferences.tsx @@ -20,7 +20,7 @@ import React, {useEffect, useState} from 'react'; import {amplify} from 'amplify'; import {container} from 'tsyringe'; -import {AudioPreference, WebappProperties, NotificationPreference} from '@wireapp/api-client/src/user/data/'; +import {AudioPreference, WebappProperties, NotificationPreference} from '@wireapp/api-client/lib/user/data/'; import {THEMES as ThemeViewModelThemes} from '../../../../view_model/ThemeViewModel'; import {WebAppEvents} from '@wireapp/webapp-events'; import {PROPERTIES_TYPE} from '../../../../properties/PropertiesType'; diff --git a/src/script/page/MainContent/panels/preferences/accountPreferences/DataUsageSection.tsx b/src/script/page/MainContent/panels/preferences/accountPreferences/DataUsageSection.tsx index 200a3ba3dd4..32d8339e241 100644 --- a/src/script/page/MainContent/panels/preferences/accountPreferences/DataUsageSection.tsx +++ b/src/script/page/MainContent/panels/preferences/accountPreferences/DataUsageSection.tsx @@ -20,7 +20,7 @@ import React, {useEffect, useState} from 'react'; import {amplify} from 'amplify'; import {container} from 'tsyringe'; -import {WebappProperties} from '@wireapp/api-client/src/user/data/'; +import {WebappProperties} from '@wireapp/api-client/lib/user/data/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/page/MainContent/panels/preferences/accountPreferences/PrivacySection.tsx b/src/script/page/MainContent/panels/preferences/accountPreferences/PrivacySection.tsx index 8bb1e3f3dc2..f3e24db97d9 100644 --- a/src/script/page/MainContent/panels/preferences/accountPreferences/PrivacySection.tsx +++ b/src/script/page/MainContent/panels/preferences/accountPreferences/PrivacySection.tsx @@ -19,7 +19,7 @@ import React from 'react'; import {AppLockState} from '../../../../../user/AppLockState'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; import {t} from 'Util/LocalizerUtil'; import {container} from 'tsyringe'; import {useKoSubscribableChildren} from 'Util/ComponentUtil'; diff --git a/src/script/page/MainContent/panels/preferences/avPreferences/CallOptions.tsx b/src/script/page/MainContent/panels/preferences/avPreferences/CallOptions.tsx index 0b98ad3422a..bd303add5f2 100644 --- a/src/script/page/MainContent/panels/preferences/avPreferences/CallOptions.tsx +++ b/src/script/page/MainContent/panels/preferences/avPreferences/CallOptions.tsx @@ -20,7 +20,7 @@ import React, {useEffect, useRef, useState} from 'react'; import {amplify} from 'amplify'; import {WebAppEvents} from '@wireapp/webapp-events'; -import type {WebappProperties} from '@wireapp/api-client/src/user/data/'; +import type {WebappProperties} from '@wireapp/api-client/lib/user/data/'; import {Checkbox, CheckboxLabel} from '@wireapp/react-ui-kit'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/page/MainContent/panels/preferences/devices/DevicesPreferences.tsx b/src/script/page/MainContent/panels/preferences/devices/DevicesPreferences.tsx index b3e5e6fb6bf..0638be09db2 100644 --- a/src/script/page/MainContent/panels/preferences/devices/DevicesPreferences.tsx +++ b/src/script/page/MainContent/panels/preferences/devices/DevicesPreferences.tsx @@ -24,7 +24,7 @@ import {UserState} from '../../../../../user/UserState'; import {ConversationState} from '../../../../../conversation/ConversationState'; import {container} from 'tsyringe'; import {useKoSubscribableChildren} from '../../../../../util/ComponentUtil'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {t} from 'Util/LocalizerUtil'; import VerifiedIcon from 'Components/VerifiedIcon'; import Icon from 'Components/Icon'; diff --git a/src/script/properties/PropertiesRepository.ts b/src/script/properties/PropertiesRepository.ts index 0fc6062a4b3..06472ec107d 100644 --- a/src/script/properties/PropertiesRepository.ts +++ b/src/script/properties/PropertiesRepository.ts @@ -20,9 +20,9 @@ import ko from 'knockout'; import {amplify} from 'amplify'; import {WebAppEvents} from '@wireapp/webapp-events'; -import {AudioPreference, NotificationPreference, WebappProperties} from '@wireapp/api-client/src/user/data/'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; -import {ConsentType} from '@wireapp/api-client/src/self/'; +import {AudioPreference, NotificationPreference, WebappProperties} from '@wireapp/api-client/lib/user/data/'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; +import {ConsentType} from '@wireapp/api-client/lib/self/'; import {Environment} from 'Util/Environment'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/search/SearchRepository.ts b/src/script/search/SearchRepository.ts index 48844cdd4f0..5b1f01d80f5 100644 --- a/src/script/search/SearchRepository.ts +++ b/src/script/search/SearchRepository.ts @@ -25,7 +25,7 @@ import {validateHandle} from '../user/UserHandleGenerator'; import type {SearchService} from './SearchService'; import type {UserRepository} from '../user/UserRepository'; import type {User} from '../entity/User'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {container} from 'tsyringe'; import {Core} from '../service/CoreSingleton'; diff --git a/src/script/search/SearchService.ts b/src/script/search/SearchService.ts index 89c7aca77ca..1d4b32eeb79 100644 --- a/src/script/search/SearchService.ts +++ b/src/script/search/SearchService.ts @@ -17,7 +17,7 @@ * */ -import type {SearchResult} from '@wireapp/api-client/src/user/'; +import type {SearchResult} from '@wireapp/api-client/lib/user/'; import {container} from 'tsyringe'; import {APIClient} from '../service/APIClientSingleton'; diff --git a/src/script/self/SelfService.ts b/src/script/self/SelfService.ts index 22aa90dc7cb..72fcfbeef90 100644 --- a/src/script/self/SelfService.ts +++ b/src/script/self/SelfService.ts @@ -17,9 +17,9 @@ * */ -import type {Consent, Self} from '@wireapp/api-client/src/self/'; -import type {UserUpdate} from '@wireapp/api-client/src/user/'; -import type {TraceState} from '@wireapp/api-client/src/http/'; +import type {Consent, Self} from '@wireapp/api-client/lib/self/'; +import type {UserUpdate} from '@wireapp/api-client/lib/user/'; +import type {TraceState} from '@wireapp/api-client/lib/http/'; import {container} from 'tsyringe'; import {APIClient} from '../service/APIClientSingleton'; diff --git a/src/script/service/CoreSingleton.ts b/src/script/service/CoreSingleton.ts index 5520034c79a..f8f2e02c9b3 100644 --- a/src/script/service/CoreSingleton.ts +++ b/src/script/service/CoreSingleton.ts @@ -18,7 +18,7 @@ */ import {Account} from '@wireapp/core'; -import {ClientType} from '@wireapp/api-client/src/client/'; +import {ClientType} from '@wireapp/api-client/lib/client/'; import {container, singleton} from 'tsyringe'; import {APIClient} from './APIClientSingleton'; import {createStorageEngine, DatabaseTypes} from './StoreEngineProvider'; diff --git a/src/script/storage/record/ClientRecord.ts b/src/script/storage/record/ClientRecord.ts index 0ac4d96c113..c799097fff2 100644 --- a/src/script/storage/record/ClientRecord.ts +++ b/src/script/storage/record/ClientRecord.ts @@ -17,7 +17,7 @@ * */ -import type {ClientClassification} from '@wireapp/api-client/src/client/'; +import type {ClientClassification} from '@wireapp/api-client/lib/client/'; export interface ClientRecord { address?: string; diff --git a/src/script/storage/record/ConversationRecord.ts b/src/script/storage/record/ConversationRecord.ts index 0f428516170..33dd7dabfc5 100644 --- a/src/script/storage/record/ConversationRecord.ts +++ b/src/script/storage/record/ConversationRecord.ts @@ -25,11 +25,11 @@ import { CONVERSATION_ACCESS, CONVERSATION_ACCESS_ROLE, CONVERSATION_TYPE, -} from '@wireapp/api-client/src/conversation'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +} from '@wireapp/api-client/lib/conversation'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {LegalHoldStatus} from '@wireapp/protocol-messaging'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; -import {ConversationProtocol} from '@wireapp/api-client/src/conversation/NewConversation'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; +import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation'; export interface ConversationRecord { access_role: CONVERSATION_ACCESS_ROLE | ACCESS_ROLE_V2[]; diff --git a/src/script/storage/record/EventRecord.ts b/src/script/storage/record/EventRecord.ts index b6eaa7289fd..4e64d98a486 100644 --- a/src/script/storage/record/EventRecord.ts +++ b/src/script/storage/record/EventRecord.ts @@ -18,8 +18,8 @@ */ import {StatusType} from '../../message/StatusType'; -import type {ReactionType} from '@wireapp/core/src/main/conversation/'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import type {ReactionType} from '@wireapp/core/lib/conversation/'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; export interface ReadReceipt { domain?: string; diff --git a/src/script/strings.ts b/src/script/strings.ts index feb2ef78de8..5517dff4ff5 100644 --- a/src/script/strings.ts +++ b/src/script/strings.ts @@ -37,7 +37,7 @@ import {BackendClientError} from './error/BackendClientError'; * */ -import {BackendErrorLabel, SyntheticErrorLabel} from '@wireapp/api-client/src/http/'; +import {BackendErrorLabel, SyntheticErrorLabel} from '@wireapp/api-client/lib/http/'; import {defineMessages} from 'react-intl'; import {BackendError} from './auth/module/action/BackendError'; diff --git a/src/script/team/TeamMapper.ts b/src/script/team/TeamMapper.ts index 0799ae5d7b2..6ebd0753ff2 100644 --- a/src/script/team/TeamMapper.ts +++ b/src/script/team/TeamMapper.ts @@ -17,9 +17,9 @@ * */ -import type {MemberData, TeamData} from '@wireapp/api-client/src/team/'; -import type {TeamUpdateData} from '@wireapp/api-client/src/team/data/'; -import type {PermissionsData} from '@wireapp/api-client/src/team/member/PermissionsData'; +import type {MemberData, TeamData} from '@wireapp/api-client/lib/team/'; +import type {TeamUpdateData} from '@wireapp/api-client/lib/team/data/'; +import type {PermissionsData} from '@wireapp/api-client/lib/team/member/PermissionsData'; import {Logger, getLogger} from 'Util/Logger'; diff --git a/src/script/team/TeamMemberEntity.ts b/src/script/team/TeamMemberEntity.ts index 257117dcec8..1f428a4aa9c 100644 --- a/src/script/team/TeamMemberEntity.ts +++ b/src/script/team/TeamMemberEntity.ts @@ -17,8 +17,8 @@ * */ -import type {PermissionsData} from '@wireapp/api-client/src/team/member/PermissionsData'; -import type {LegalHoldMemberStatus} from '@wireapp/api-client/src/team/legalhold/LegalHoldMemberStatus'; +import type {PermissionsData} from '@wireapp/api-client/lib/team/member/PermissionsData'; +import type {LegalHoldMemberStatus} from '@wireapp/api-client/lib/team/legalhold/LegalHoldMemberStatus'; export class TeamMemberEntity { permissions?: PermissionsData; diff --git a/src/script/team/TeamRepository.ts b/src/script/team/TeamRepository.ts index b85eee00664..30f5a76e27b 100644 --- a/src/script/team/TeamRepository.ts +++ b/src/script/team/TeamRepository.ts @@ -19,12 +19,12 @@ import {amplify} from 'amplify'; import {WebAppEvents} from '@wireapp/webapp-events'; -import type {ConversationRolesList} from '@wireapp/api-client/src/conversation/ConversationRole'; -import type {TeamData} from '@wireapp/api-client/src/team/team/TeamData'; +import type {ConversationRolesList} from '@wireapp/api-client/lib/conversation/ConversationRole'; +import type {TeamData} from '@wireapp/api-client/lib/team/team/TeamData'; import {Availability} from '@wireapp/protocol-messaging'; -import {TEAM_EVENT} from '@wireapp/api-client/src/event/TeamEvent'; -import type {FeatureList} from '@wireapp/api-client/src/team/feature/'; -import {FeatureStatus, FEATURE_KEY, SelfDeletingTimeout} from '@wireapp/api-client/src/team/feature/'; +import {TEAM_EVENT} from '@wireapp/api-client/lib/event/TeamEvent'; +import type {FeatureList} from '@wireapp/api-client/lib/team/feature/'; +import {FeatureStatus, FEATURE_KEY, SelfDeletingTimeout} from '@wireapp/api-client/lib/team/feature/'; import {formatDuration} from 'Util/TimeUtil'; import type { TeamConversationDeleteEvent, @@ -34,7 +34,7 @@ import type { TeamMemberLeaveEvent, TeamMemberUpdateEvent, TeamUpdateEvent, -} from '@wireapp/api-client/src/event'; +} from '@wireapp/api-client/lib/event'; import {Runtime} from '@wireapp/commons'; import {container} from 'tsyringe'; diff --git a/src/script/team/TeamService.ts b/src/script/team/TeamService.ts index b2b123497cf..8517ef12db0 100644 --- a/src/script/team/TeamService.ts +++ b/src/script/team/TeamService.ts @@ -17,13 +17,13 @@ * */ -import type {LegalHoldMemberData} from '@wireapp/api-client/src/team/legalhold/'; -import type {MemberData, Members} from '@wireapp/api-client/src/team/member/'; -import type {FeatureList} from '@wireapp/api-client/src/team/feature/'; -import type {Services} from '@wireapp/api-client/src/team/service/'; -import type {ConversationRolesList} from '@wireapp/api-client/src/conversation/ConversationRole'; -import type {TeamData} from '@wireapp/api-client/src/team/team/'; -import {FeatureStatus, FEATURE_KEY} from '@wireapp/api-client/src/team/feature/'; +import type {LegalHoldMemberData} from '@wireapp/api-client/lib/team/legalhold/'; +import type {MemberData, Members} from '@wireapp/api-client/lib/team/member/'; +import type {FeatureList} from '@wireapp/api-client/lib/team/feature/'; +import type {Services} from '@wireapp/api-client/lib/team/service/'; +import type {ConversationRolesList} from '@wireapp/api-client/lib/conversation/ConversationRole'; +import type {TeamData} from '@wireapp/api-client/lib/team/team/'; +import {FeatureStatus, FEATURE_KEY} from '@wireapp/api-client/lib/team/feature/'; import {container} from 'tsyringe'; import {APIClient} from '../service/APIClientSingleton'; diff --git a/src/script/team/TeamState.ts b/src/script/team/TeamState.ts index 148d304d4e8..b59f0857e82 100644 --- a/src/script/team/TeamState.ts +++ b/src/script/team/TeamState.ts @@ -19,7 +19,7 @@ import ko from 'knockout'; import {container, singleton} from 'tsyringe'; -import {FeatureList, FeatureStatus, SelfDeletingTimeout} from '@wireapp/api-client/src/team/feature/'; +import {FeatureList, FeatureStatus, SelfDeletingTimeout} from '@wireapp/api-client/lib/team/feature/'; import {sortUsersByPriority} from 'Util/StringUtil'; diff --git a/src/script/user/AppLockState.ts b/src/script/user/AppLockState.ts index e2d93e0195d..4e486162478 100644 --- a/src/script/user/AppLockState.ts +++ b/src/script/user/AppLockState.ts @@ -19,7 +19,7 @@ import ko from 'knockout'; import {container, singleton} from 'tsyringe'; -import {FeatureStatus} from '@wireapp/api-client/src/team/feature/'; +import {FeatureStatus} from '@wireapp/api-client/lib/team/feature/'; import {TeamState} from '../team/TeamState'; diff --git a/src/script/user/RichProfileRepository.ts b/src/script/user/RichProfileRepository.ts index c886e512a58..8c4fbfe7245 100644 --- a/src/script/user/RichProfileRepository.ts +++ b/src/script/user/RichProfileRepository.ts @@ -17,7 +17,7 @@ * */ -import type {RichInfo} from '@wireapp/api-client/src/user/'; +import type {RichInfo} from '@wireapp/api-client/lib/user/'; import {container, singleton} from 'tsyringe'; import {APIClient} from '../service/APIClientSingleton'; diff --git a/src/script/user/UserFilter.ts b/src/script/user/UserFilter.ts index fd404fea853..64063538eff 100644 --- a/src/script/user/UserFilter.ts +++ b/src/script/user/UserFilter.ts @@ -17,7 +17,7 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {matchQualifiedIds} from 'Util/QualifiedId'; import {Conversation} from '../entity/Conversation'; import {User} from '../entity/User'; diff --git a/src/script/user/UserMapper.test.ts b/src/script/user/UserMapper.test.ts index bfe4f820078..b552b2239a4 100644 --- a/src/script/user/UserMapper.test.ts +++ b/src/script/user/UserMapper.test.ts @@ -24,7 +24,7 @@ import {User} from 'src/script/entity/User'; import {UserMapper} from './UserMapper'; import {serverTimeHandler} from 'src/script/time/serverTimeHandler'; import {entities, payload} from 'test/api/payloads'; -import {UserAsset, UserAssetType} from '@wireapp/api-client/src/user'; +import {UserAsset, UserAssetType} from '@wireapp/api-client/lib/user'; describe('User Mapper', () => { const userState: any = {self: () => ({domain: 'local.test'})}; diff --git a/src/script/user/UserMapper.ts b/src/script/user/UserMapper.ts index a3db1522470..2e3f4e4a8df 100644 --- a/src/script/user/UserMapper.ts +++ b/src/script/user/UserMapper.ts @@ -17,8 +17,8 @@ * */ -import type {User as APIClientUser} from '@wireapp/api-client/src/user/'; -import type {Self as APIClientSelf} from '@wireapp/api-client/src/self/'; +import type {User as APIClientUser} from '@wireapp/api-client/lib/user/'; +import type {Self as APIClientSelf} from '@wireapp/api-client/lib/self/'; import {joaatHash} from 'Util/Crypto'; import {Logger, getLogger} from 'Util/Logger'; diff --git a/src/script/user/UserPermission.ts b/src/script/user/UserPermission.ts index 762ee2cbfc4..7af844c58d6 100644 --- a/src/script/user/UserPermission.ts +++ b/src/script/user/UserPermission.ts @@ -18,7 +18,7 @@ */ /* eslint-disable sort-keys-fix/sort-keys-fix */ -import type {PermissionsData} from '@wireapp/api-client/src/team/member/PermissionsData'; +import type {PermissionsData} from '@wireapp/api-client/lib/team/member/PermissionsData'; import {capitalizeFirstChar} from 'Util/StringUtil'; diff --git a/src/script/user/UserRepository.ts b/src/script/user/UserRepository.ts index d05b66116e0..42f0c9b8542 100644 --- a/src/script/user/UserRepository.ts +++ b/src/script/user/UserRepository.ts @@ -19,7 +19,7 @@ import {amplify} from 'amplify'; import {Availability} from '@wireapp/protocol-messaging'; -import {ConsentType, Self as APIClientSelf} from '@wireapp/api-client/src/self/'; +import {ConsentType, Self as APIClientSelf} from '@wireapp/api-client/lib/self/'; import {container} from 'tsyringe'; import {flatten} from 'underscore'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; @@ -28,18 +28,18 @@ import { UserLegalHoldRequestEvent, UserLegalHoldDisableEvent, USER_EVENT, -} from '@wireapp/api-client/src/event'; +} from '@wireapp/api-client/lib/event'; import { UserAsset as APIClientUserAsset, UserAssetType as APIClientUserAssetType, QualifiedId, -} from '@wireapp/api-client/src/user'; +} from '@wireapp/api-client/lib/user'; import {WebAppEvents} from '@wireapp/webapp-events'; import type {AccentColor} from '@wireapp/commons'; -import type {BackendError, TraceState} from '@wireapp/api-client/src/http'; -import {BackendErrorLabel} from '@wireapp/api-client/src/http'; -import type {PublicClient, AddedClient} from '@wireapp/api-client/src/client'; -import type {User as APIClientUser, QualifiedHandle} from '@wireapp/api-client/src/user'; +import type {BackendError, TraceState} from '@wireapp/api-client/lib/http'; +import {BackendErrorLabel} from '@wireapp/api-client/lib/http'; +import type {PublicClient, AddedClient} from '@wireapp/api-client/lib/client'; +import type {User as APIClientUser, QualifiedHandle} from '@wireapp/api-client/lib/user'; import {chunk, partition} from 'Util/ArrayUtil'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/user/UserService.ts b/src/script/user/UserService.ts index d523f43abc9..3c7937340fd 100644 --- a/src/script/user/UserService.ts +++ b/src/script/user/UserService.ts @@ -17,7 +17,7 @@ * */ -import type {User as APIClientUser, QualifiedHandle, QualifiedId} from '@wireapp/api-client/src/user/'; +import type {User as APIClientUser, QualifiedHandle, QualifiedId} from '@wireapp/api-client/lib/user/'; import {container} from 'tsyringe'; import {Logger, getLogger} from 'Util/Logger'; diff --git a/src/script/util/DebugUtil.ts b/src/script/util/DebugUtil.ts index ff9ca600fe5..45c1aab1684 100644 --- a/src/script/util/DebugUtil.ts +++ b/src/script/util/DebugUtil.ts @@ -23,11 +23,11 @@ import { BackendEvent, ConversationEvent, ConversationOtrMessageAddEvent, -} from '@wireapp/api-client/src/event/'; -import type {QualifiedId} from '@wireapp/api-client/src/user'; -import type {Notification} from '@wireapp/api-client/src/notification/'; -import {MemberLeaveReason} from '@wireapp/api-client/src/conversation/data/'; -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; +} from '@wireapp/api-client/lib/event/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user'; +import type {Notification} from '@wireapp/api-client/lib/notification/'; +import {MemberLeaveReason} from '@wireapp/api-client/lib/conversation/data/'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; import {util as ProteusUtil} from '@wireapp/proteus'; import Dexie from 'dexie'; import {container} from 'tsyringe'; @@ -54,7 +54,7 @@ import {UserState} from '../user/UserState'; import {ConversationState} from '../conversation/ConversationState'; import {CallState} from '../calling/CallState'; import {MessageCategory} from '../message/MessageCategory'; -import {isQualifiedId} from '@wireapp/core/src/main/util'; +import {isQualifiedId} from '@wireapp/core/lib/util'; import {Core} from '../service/CoreSingleton'; function downloadText(text: string, filename: string = 'default.txt'): number { diff --git a/src/script/util/StorageUtil.ts b/src/script/util/StorageUtil.ts index 67c46f2c79f..d81bc5a9c10 100644 --- a/src/script/util/StorageUtil.ts +++ b/src/script/util/StorageUtil.ts @@ -17,7 +17,7 @@ * */ -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {amplify} from 'amplify'; import {TIME_IN_MILLIS} from 'Util/TimeUtil'; diff --git a/src/script/util/TypePredicateUtil.test.ts b/src/script/util/TypePredicateUtil.test.ts index acd56ccaa2d..651fa00a9c9 100644 --- a/src/script/util/TypePredicateUtil.test.ts +++ b/src/script/util/TypePredicateUtil.test.ts @@ -19,7 +19,7 @@ import {isAxiosError, isBackendError, isQualifiedUserClientEntityMap} from 'Util/TypePredicateUtil'; import type {AxiosError} from 'axios'; -import {BackendError, BackendErrorLabel} from '@wireapp/api-client/src/http/'; +import {BackendError, BackendErrorLabel} from '@wireapp/api-client/lib/http/'; import {QualifiedUserClientEntityMap, UserClientEntityMap} from '../client/ClientRepository'; describe('TypePredicateUtil', () => { diff --git a/src/script/util/TypePredicateUtil.ts b/src/script/util/TypePredicateUtil.ts index e81300c807c..3c1530d35ac 100644 --- a/src/script/util/TypePredicateUtil.ts +++ b/src/script/util/TypePredicateUtil.ts @@ -17,10 +17,10 @@ * */ -import type {BackendError} from '@wireapp/api-client/src/http/'; +import type {BackendError} from '@wireapp/api-client/lib/http/'; import {AxiosError} from 'axios'; import {User} from '../entity/User'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; import {Conversation} from '../entity/Conversation'; import {ClientRecord} from '../storage/record/ClientRecord'; import {QualifiedUserClientEntityMap} from '../client/ClientRepository'; diff --git a/src/script/util/messageRenderer.ts b/src/script/util/messageRenderer.ts index f72e8d08b25..7a4fb6ac28b 100644 --- a/src/script/util/messageRenderer.ts +++ b/src/script/util/messageRenderer.ts @@ -24,7 +24,7 @@ import {escape} from 'underscore'; import {replaceInRange} from './StringUtil'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import type {MentionEntity} from '../message/MentionEntity'; interface MentionText { diff --git a/src/script/view_model/CallingViewModel.ts b/src/script/view_model/CallingViewModel.ts index 923c4633dcc..441e9606156 100644 --- a/src/script/view_model/CallingViewModel.ts +++ b/src/script/view_model/CallingViewModel.ts @@ -47,7 +47,7 @@ import {TeamState} from '../team/TeamState'; import {Config} from '../Config'; import {safeWindowOpen} from 'Util/SanitizationUtil'; import {ROLE} from '../user/UserPermission'; -import {QualifiedId} from '@wireapp/api-client/src/user'; +import {QualifiedId} from '@wireapp/api-client/lib/user'; import {PropertiesRepository} from '../properties/PropertiesRepository'; import {PROPERTIES_TYPE} from '../properties/PropertiesType'; import {LEAVE_CALL_REASON} from '../calling/enum/LeaveCallReason'; diff --git a/src/script/view_model/ContentViewModel.ts b/src/script/view_model/ContentViewModel.ts index b7b9b337956..2ef5d54ce18 100644 --- a/src/script/view_model/ContentViewModel.ts +++ b/src/script/view_model/ContentViewModel.ts @@ -18,7 +18,7 @@ */ import {WebAppEvents} from '@wireapp/webapp-events'; -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; import {getLogger, Logger} from 'Util/Logger'; import {t} from 'Util/LocalizerUtil'; diff --git a/src/script/view_model/ThemeViewModel.ts b/src/script/view_model/ThemeViewModel.ts index a8aa9cb3270..621fdbb043f 100644 --- a/src/script/view_model/ThemeViewModel.ts +++ b/src/script/view_model/ThemeViewModel.ts @@ -19,7 +19,7 @@ import {WebAppEvents} from '@wireapp/webapp-events'; import {amplify} from 'amplify'; -import type {WebappProperties} from '@wireapp/api-client/src/user/data/'; +import type {WebappProperties} from '@wireapp/api-client/lib/user/data/'; import {PROPERTIES_TYPE} from '../properties/PropertiesType'; import type {PropertiesRepository} from '../properties/PropertiesRepository'; diff --git a/src/script/view_model/content/EmojiInputViewModel.ts b/src/script/view_model/content/EmojiInputViewModel.ts index f7955f83914..56c5038f180 100644 --- a/src/script/view_model/content/EmojiInputViewModel.ts +++ b/src/script/view_model/content/EmojiInputViewModel.ts @@ -18,7 +18,7 @@ */ import {WebAppEvents} from '@wireapp/webapp-events'; -import type {WebappProperties} from '@wireapp/api-client/src/user/data/'; +import type {WebappProperties} from '@wireapp/api-client/lib/user/data/'; import {amplify} from 'amplify'; import ko from 'knockout'; import {loadValue, storeValue} from 'Util/StorageUtil'; diff --git a/src/script/view_model/content/LegalHoldModalViewModel.ts b/src/script/view_model/content/LegalHoldModalViewModel.ts index 857c2c5d618..b1341c4eea6 100644 --- a/src/script/view_model/content/LegalHoldModalViewModel.ts +++ b/src/script/view_model/content/LegalHoldModalViewModel.ts @@ -17,7 +17,7 @@ * */ -import {LegalHoldMemberStatus} from '@wireapp/api-client/src/team/legalhold/'; +import {LegalHoldMemberStatus} from '@wireapp/api-client/lib/team/legalhold/'; import {amplify} from 'amplify'; import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; import ko from 'knockout'; diff --git a/src/script/view_model/panel/ConversationDetailsViewModel.ts b/src/script/view_model/panel/ConversationDetailsViewModel.ts index a02ceddf764..01481450a46 100644 --- a/src/script/view_model/panel/ConversationDetailsViewModel.ts +++ b/src/script/view_model/panel/ConversationDetailsViewModel.ts @@ -19,7 +19,7 @@ import ko from 'knockout'; import {amplify} from 'amplify'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data/'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {container} from 'tsyringe'; diff --git a/src/script/view_model/panel/GroupParticipantUserViewModel.ts b/src/script/view_model/panel/GroupParticipantUserViewModel.ts index cfc327c651f..2a8732bcb04 100644 --- a/src/script/view_model/panel/GroupParticipantUserViewModel.ts +++ b/src/script/view_model/panel/GroupParticipantUserViewModel.ts @@ -19,7 +19,7 @@ import ko from 'knockout'; import {amplify} from 'amplify'; -import {DefaultConversationRoleName as DefaultRole} from '@wireapp/api-client/src/conversation/'; +import {DefaultConversationRoleName as DefaultRole} from '@wireapp/api-client/lib/conversation/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {container} from 'tsyringe'; diff --git a/src/script/view_model/panel/MessageDetailsViewModel.ts b/src/script/view_model/panel/MessageDetailsViewModel.ts index 766c2b389d1..adb78f44307 100644 --- a/src/script/view_model/panel/MessageDetailsViewModel.ts +++ b/src/script/view_model/panel/MessageDetailsViewModel.ts @@ -34,7 +34,7 @@ import type {ContentMessage} from '../../entity/message/ContentMessage'; import type {MemberMessage} from '../../entity/message/MemberMessage'; import type {PanelParams} from '../PanelViewModel'; import type {ReadReceipt} from '../../storage/record/EventRecord'; -import type {QualifiedId} from '@wireapp/api-client/src/user/'; +import type {QualifiedId} from '@wireapp/api-client/lib/user/'; export class MessageDetailsViewModel extends BasePanelViewModel { conversationRepository: ConversationRepository; diff --git a/test/helper/TestFactory.js b/test/helper/TestFactory.js index 0de4b082d83..217ff41606b 100644 --- a/test/helper/TestFactory.js +++ b/test/helper/TestFactory.js @@ -25,7 +25,7 @@ import 'core-js/full/reflect'; import {container} from 'tsyringe'; import ko from 'knockout'; -import {ClientClassification, ClientType} from '@wireapp/api-client/src/client/'; +import {ClientClassification, ClientType} from '@wireapp/api-client/lib/client/'; import {CallingRepository} from 'src/script/calling/CallingRepository'; import {serverTimeHandler} from 'src/script/time/serverTimeHandler'; diff --git a/test/helper/UserGenerator.ts b/test/helper/UserGenerator.ts index f3900ebc59a..07979aca1c3 100644 --- a/test/helper/UserGenerator.ts +++ b/test/helper/UserGenerator.ts @@ -18,8 +18,8 @@ */ import {faker} from '@faker-js/faker'; -import type {User as APIClientUser} from '@wireapp/api-client/src/user/'; -import {UserAssetType} from '@wireapp/api-client/src/user/'; +import type {User as APIClientUser} from '@wireapp/api-client/lib/user/'; +import {UserAssetType} from '@wireapp/api-client/lib/user/'; import type {User} from '../../src/script/entity/User'; import {serverTimeHandler} from '../../src/script/time/serverTimeHandler'; diff --git a/test/unit_tests/audio/AudioRepositorySpec.js b/test/unit_tests/audio/AudioRepositorySpec.js index 888749f0deb..8f1677ea86f 100644 --- a/test/unit_tests/audio/AudioRepositorySpec.js +++ b/test/unit_tests/audio/AudioRepositorySpec.js @@ -17,7 +17,7 @@ * */ -import {AudioPreference} from '@wireapp/api-client/src/user/data/'; +import {AudioPreference} from '@wireapp/api-client/lib/user/data/'; import {difference} from 'underscore'; import {AudioPlayingType} from 'src/script/audio/AudioPlayingType'; diff --git a/test/unit_tests/client/ClientMapperSpec.js b/test/unit_tests/client/ClientMapperSpec.js index bc177579ea2..60765c57086 100644 --- a/test/unit_tests/client/ClientMapperSpec.js +++ b/test/unit_tests/client/ClientMapperSpec.js @@ -17,7 +17,7 @@ * */ -import {ClientType} from '@wireapp/api-client/src/client/'; +import {ClientType} from '@wireapp/api-client/lib/client/'; import {ClientMapper} from 'src/script/client/ClientMapper'; import {entities, payload} from '../../api/payloads'; diff --git a/test/unit_tests/connection/ConnectionRepositorySpec.js b/test/unit_tests/connection/ConnectionRepositorySpec.js index a0f82c015dd..39aef2c9b3c 100644 --- a/test/unit_tests/connection/ConnectionRepositorySpec.js +++ b/test/unit_tests/connection/ConnectionRepositorySpec.js @@ -17,7 +17,7 @@ * */ -import {ConnectionStatus} from '@wireapp/api-client/src/connection/'; +import {ConnectionStatus} from '@wireapp/api-client/lib/connection/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {createRandomUuid} from 'Util/util'; import {Conversation} from 'src/script/entity/Conversation'; diff --git a/test/unit_tests/cryptography/CryptographyMapperSpec.js b/test/unit_tests/cryptography/CryptographyMapperSpec.js index 0e92790613d..e7bf28b14d1 100644 --- a/test/unit_tests/cryptography/CryptographyMapperSpec.js +++ b/test/unit_tests/cryptography/CryptographyMapperSpec.js @@ -35,8 +35,8 @@ import { Text, } from '@wireapp/protocol-messaging'; import {isObject} from 'underscore'; -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; -import {ReactionType} from '@wireapp/core/src/main/conversation/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; +import {ReactionType} from '@wireapp/core/lib/conversation/'; import {GENERIC_MESSAGE_TYPE} from 'src/script/cryptography/GenericMessageType'; import {CryptographyMapper} from 'src/script/cryptography/CryptographyMapper'; diff --git a/test/unit_tests/event/preprocessor/ServiceMiddlewareSpec.js b/test/unit_tests/event/preprocessor/ServiceMiddlewareSpec.js index 614e3d85366..dc1e3c2e3d4 100644 --- a/test/unit_tests/event/preprocessor/ServiceMiddlewareSpec.js +++ b/test/unit_tests/event/preprocessor/ServiceMiddlewareSpec.js @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import {Conversation} from 'src/script/entity/Conversation'; import {ClientEvent} from 'src/script/event/Client'; diff --git a/test/unit_tests/notification/NotificationRepositorySpec.js b/test/unit_tests/notification/NotificationRepositorySpec.js index 5783f0a581b..4d2ce9dfb0e 100644 --- a/test/unit_tests/notification/NotificationRepositorySpec.js +++ b/test/unit_tests/notification/NotificationRepositorySpec.js @@ -18,10 +18,10 @@ */ import {amplify} from 'amplify'; -import {CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation/'; +import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation/'; import {Availability} from '@wireapp/protocol-messaging'; -import {NotificationPreference} from '@wireapp/api-client/src/user/data/'; -import {CONVERSATION_EVENT} from '@wireapp/api-client/src/event/'; +import {NotificationPreference} from '@wireapp/api-client/lib/user/data/'; +import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/'; import {WebAppEvents} from '@wireapp/webapp-events'; import {Runtime} from '@wireapp/commons'; diff --git a/test/unit_tests/tracking/HelpersSpec.js b/test/unit_tests/tracking/HelpersSpec.js index 40f6d898be9..147bed7961a 100644 --- a/test/unit_tests/tracking/HelpersSpec.js +++ b/test/unit_tests/tracking/HelpersSpec.js @@ -18,7 +18,7 @@ */ import {createRandomUuid} from 'Util/util'; -import {CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation/'; +import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation/'; import {Conversation} from 'src/script/entity/Conversation'; import {ConversationType as ConversationTypeAttribute} from 'src/script/tracking/attribute'; diff --git a/test/unit_tests/user/UserRepositorySpec.js b/test/unit_tests/user/UserRepositorySpec.js index 5506a43f0c9..acc21ada71a 100644 --- a/test/unit_tests/user/UserRepositorySpec.js +++ b/test/unit_tests/user/UserRepositorySpec.js @@ -18,7 +18,7 @@ */ import {StatusCodes as HTTP_STATUS} from 'http-status-codes'; -import {RECEIPT_MODE} from '@wireapp/api-client/src/conversation/data'; +import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data'; import {ConsentValue} from 'src/script/user/ConsentValue'; import {PropertiesRepository} from 'src/script/properties/PropertiesRepository'; diff --git a/test/unit_tests/view_model/WindowTitleViewModelSpec.js b/test/unit_tests/view_model/WindowTitleViewModelSpec.js index a34b2fcb8f1..5e131e64074 100644 --- a/test/unit_tests/view_model/WindowTitleViewModelSpec.js +++ b/test/unit_tests/view_model/WindowTitleViewModelSpec.js @@ -19,7 +19,7 @@ import ko from 'knockout'; import {WebAppEvents} from '@wireapp/webapp-events'; -import {CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation/'; +import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation/'; import {t, setStrings} from 'Util/LocalizerUtil'; import {createRandomUuid} from 'Util/util'; diff --git a/test/unit_tests/view_model/panel/ConversationDetailsViewModelSpec.js b/test/unit_tests/view_model/panel/ConversationDetailsViewModelSpec.js index a9bdfdde37c..7c989702e2c 100644 --- a/test/unit_tests/view_model/panel/ConversationDetailsViewModelSpec.js +++ b/test/unit_tests/view_model/panel/ConversationDetailsViewModelSpec.js @@ -17,7 +17,7 @@ * */ -import {CONVERSATION_TYPE} from '@wireapp/api-client/src/conversation/'; +import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation/'; import {noop} from 'Util/util'; import {ConversationDetailsViewModel} from 'src/script/view_model/panel/ConversationDetailsViewModel'; diff --git a/yarn.lock b/yarn.lock index cfe448a7ab5..ca900944d89 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3970,12 +3970,12 @@ __metadata: languageName: node linkType: hard -"@wireapp/api-client@npm:^21.0.6": - version: 21.0.6 - resolution: "@wireapp/api-client@npm:21.0.6" +"@wireapp/api-client@npm:^22.0.0": + version: 22.0.0 + resolution: "@wireapp/api-client@npm:22.0.0" dependencies: - "@wireapp/commons": ^4.5.1 - "@wireapp/priority-queue": ^1.8.12 + "@wireapp/commons": ^5.0.0 + "@wireapp/priority-queue": ^2.0.0 "@wireapp/protocol-messaging": 1.42.0 axios: 1.1.2 axios-retry: 3.3.1 @@ -3985,14 +3985,14 @@ __metadata: spark-md5: 3.0.2 tough-cookie: 4.1.2 ws: 8.9.0 - checksum: 69590a3c166c257d7a49addc91e173a3d216fd39df3ef886535cdaf59885d9551bdef984b69e26c1d79b63e357e56cdf4b8e181cc0b4342842412ce1fe87ad83 + checksum: fd27d6e9030798e3467db535bac9f7dfce2765fa337507a3d01c03babba5b158d1c5210f38eb5abde4471084714ba41795c5d574f74331bfb39c3eef30bb1e75 languageName: node linkType: hard -"@wireapp/avs@npm:8.2.16": - version: 8.2.16 - resolution: "@wireapp/avs@npm:8.2.16" - checksum: fc5f525fa77038048e788677a6d5c720a58e0c1ac7402043ae40d56a05eced1f8913fbe79e9eebe3047c7493c3257ab0f8dc87f0c63e81aa62b4ad577bf16d07 +"@wireapp/avs@npm:8.2.17": + version: 8.2.17 + resolution: "@wireapp/avs@npm:8.2.17" + checksum: defbcfe3b4a121533d430e77f7420f59c7362e6d91f78cd42eb8afdacdf447b70abb072f049a627a5c4a3ee5a1880632a25849a306bcd7e53c238b8aca14e081 languageName: node linkType: hard @@ -4003,31 +4003,31 @@ __metadata: languageName: node linkType: hard -"@wireapp/commons@npm:^4.5.1": - version: 4.5.1 - resolution: "@wireapp/commons@npm:4.5.1" +"@wireapp/commons@npm:^5.0.0": + version: 5.0.0 + resolution: "@wireapp/commons@npm:5.0.0" dependencies: ansi-regex: 5.0.1 fs-extra: 10.1.0 logdown: 3.3.1 platform: 1.3.6 - checksum: 8dd36dd93f3c8f46b1ed3887855fecacb4e0de6ffac9dcb9c9662f2af586834c696387baa043f83392851b54c60dd5287615b2446652dbb6ccbd1208f166dfcb + checksum: 9950b0bc0709a9abae963f99aed8f9bef772fdad6fc4054abf95b660b093e20704f3db2316cdfc189d7ee8787f665dc3902049af20161d777a9eb6e86b3a2250 languageName: node linkType: hard -"@wireapp/copy-config@npm:1.3.10": - version: 1.3.10 - resolution: "@wireapp/copy-config@npm:1.3.10" +"@wireapp/copy-config@npm:2.0.0": + version: 2.0.0 + resolution: "@wireapp/copy-config@npm:2.0.0" dependencies: - axios: 1.1.3 + axios: 1.1.2 copy: 0.3.2 cosmiconfig: 7.0.1 fs-extra: 10.1.0 jszip: 3.10.1 logdown: 3.3.1 bin: - copy-config: src/main/cli.js - checksum: 20a4f2d8c7605382f78aae9e15e0ab1954370d25cf8831173464d12d32f85c14a238be013b3b314000d078446f80f4403b9249ae100b842a3be0ba8e782a9de1 + copy-config: lib/cli.js + checksum: 17cbfc5b1ca91f6ce28186adad39aa6e3b9f876092d23ad3fe04b547a6d2730c22ffc697bf43e316efac94ff6b5ae8a8e97ff2f27ef554eda49d196c4676da25 languageName: node linkType: hard @@ -4038,26 +4038,26 @@ __metadata: languageName: node linkType: hard -"@wireapp/core@npm:34.1.6": - version: 34.1.6 - resolution: "@wireapp/core@npm:34.1.6" +"@wireapp/core@npm:35.0.0": + version: 35.0.0 + resolution: "@wireapp/core@npm:35.0.0" dependencies: - "@wireapp/api-client": ^21.0.6 - "@wireapp/commons": ^4.5.1 + "@wireapp/api-client": ^22.0.0 + "@wireapp/commons": ^5.0.0 "@wireapp/core-crypto": 0.5.2 "@wireapp/cryptobox": 12.8.0 - "@wireapp/promise-queue": ^1.3.6 + "@wireapp/promise-queue": ^2.0.0 "@wireapp/protocol-messaging": 1.42.0 - "@wireapp/store-engine-dexie": ^1.7.13 + "@wireapp/store-engine-dexie": ^2.0.0 axios: 1.1.2 - bazinga64: 5.11.12 + bazinga64: 6.0.0 hash.js: 1.1.7 http-status-codes: 2.2.0 idb: 7.1.0 logdown: 3.3.1 long: ^5.2.0 uuidjs: 4.2.12 - checksum: 7203d43ae17f9773827c48b15b7ca677aa3f8668bdbff7a7d75edc20632329c618af4266581160bdafbb6f0c0ef421a83288718a27dc42945f59c0668c9d1cef + checksum: 218810278622c8bae77f918f62002595b6f8129b17621dd329e50c34dc2e325f084b2a14d72894f9520664078e270e957d37ffbe8d8bd74928a1e179d8f0c0e1 languageName: node linkType: hard @@ -4075,9 +4075,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/eslint-config@npm:1.12.12": - version: 1.12.12 - resolution: "@wireapp/eslint-config@npm:1.12.12" +"@wireapp/eslint-config@npm:2.0.0": + version: 2.0.0 + resolution: "@wireapp/eslint-config@npm:2.0.0" peerDependencies: "@babel/eslint-parser": ">=7" "@typescript-eslint/eslint-plugin": ">=3" @@ -4092,7 +4092,7 @@ __metadata: eslint-plugin-react-hooks: ">=2" eslint-plugin-unused-imports: ">=1.1" prettier: ">=2" - checksum: f82875e77336c66bc3a70834c0ced76f7d066939cb79fc747c0fdcb5d352e93a5c7b45e6e533b9e13aaa0c44654e88f1f76262cd5321994bb3d559ea3499e3ca + checksum: 8555db048f69661785f36bccf6bdad790ee98b6b85f9b5ab6d11aa945551c60eb48154c2cf2a707b12eb53a7b0cb7917441f483cd2b727c962f3c79d9668d193 languageName: node linkType: hard @@ -4103,10 +4103,10 @@ __metadata: languageName: node linkType: hard -"@wireapp/prettier-config@npm:0.4.7": - version: 0.4.7 - resolution: "@wireapp/prettier-config@npm:0.4.7" - checksum: 7b00c430417bc7ff86bf64184db2b652611a106e644c89c3373decda5a1acda51a35993f5161039da5a157d85272b19cf8ed547e5fcde45912d57012199d7ccd +"@wireapp/prettier-config@npm:0.5.0": + version: 0.5.0 + resolution: "@wireapp/prettier-config@npm:0.5.0" + checksum: dbe802cf3a5c2e862cdbe9b4aae9d4bf3ac0879d35708cc145d689e272ef6ca5d0de71bab7a04dfb82e6231a5d60e9f1912a3488564d531c2e9dfff893b51e28 languageName: node linkType: hard @@ -4119,17 +4119,17 @@ __metadata: languageName: node linkType: hard -"@wireapp/priority-queue@npm:^1.8.12": - version: 1.8.12 - resolution: "@wireapp/priority-queue@npm:1.8.12" - checksum: 5c09345b72306daaa119d5e861af9ad9396effaa959c1100365806622b5238b2b77dd4c1b21cf57b10223542c5b5b0e8504c01ee33ac7ec308c100c1f6e7cb88 +"@wireapp/priority-queue@npm:^2.0.0": + version: 2.0.0 + resolution: "@wireapp/priority-queue@npm:2.0.0" + checksum: dcb06d202a20713514ec5c52ceb0c5f20cbe1e54c834ac28ac9c165449cf57c4ebe123ea5363a868f1d8ea1b4821fe44681c1909e6376b156420fa1202230dce languageName: node linkType: hard -"@wireapp/promise-queue@npm:^1.3.6": - version: 1.3.6 - resolution: "@wireapp/promise-queue@npm:1.3.6" - checksum: b3a2ee42887a816c91f2f8cbbd40971c8077bc5355450e6e65da2161a8cae253b6ca6dbe255c4bfe7bddec48ca0fc46131f2da1cece952c3470adae304c75f04 +"@wireapp/promise-queue@npm:^2.0.0": + version: 2.0.0 + resolution: "@wireapp/promise-queue@npm:2.0.0" + checksum: fa3659af52bad83f06d5737897502ac135cb149acb2031a24ad4a32f41ce98b2a5444d3e31bf256e6872fdd51813f9d8f6c0ce020b9d4196308f290d4528f38c languageName: node linkType: hard @@ -4157,9 +4157,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/react-ui-kit@npm:8.17.8": - version: 8.17.8 - resolution: "@wireapp/react-ui-kit@npm:8.17.8" +"@wireapp/react-ui-kit@npm:9.0.1": + version: 9.0.1 + resolution: "@wireapp/react-ui-kit@npm:9.0.1" dependencies: "@types/color": 3.0.3 color: 4.2.3 @@ -4174,29 +4174,18 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: d124cbd8c3ac2c5a718c7806c00d214eede4f930741f007dd4192753511d77bd0c305af9b3a59f5b8f79dd799b3876f810bdf33ebfd040a800892e68598592fe + checksum: 36351ff5478bb724c6143f5715aad3e49f42d8e124807ffc77487c307a313aff17c8fac8c3319d55f0f551f98085c69f0629ac197ab5138147987c4836c52be1 languageName: node linkType: hard -"@wireapp/store-engine-dexie@npm:1.7.11": - version: 1.7.11 - resolution: "@wireapp/store-engine-dexie@npm:1.7.11" - dependencies: - dexie: 3.2.2 - peerDependencies: - "@wireapp/store-engine": 4.x.x - checksum: 301550cf9c94f07e74039ad04d32de12f1ad5c22f18d15f9273f3d214a1e1ffabf5fde4b08ef5a7532cacb6ec26f0cb3c894f7e7c6f966981ee11c19e41b1d6f - languageName: node - linkType: hard - -"@wireapp/store-engine-dexie@npm:^1.7.13": - version: 1.7.13 - resolution: "@wireapp/store-engine-dexie@npm:1.7.13" +"@wireapp/store-engine-dexie@npm:2.0.0, @wireapp/store-engine-dexie@npm:^2.0.0": + version: 2.0.0 + resolution: "@wireapp/store-engine-dexie@npm:2.0.0" dependencies: dexie: 3.2.2 peerDependencies: "@wireapp/store-engine": 4.x.x - checksum: f0e1e3e7e8a0bd67017f64577acd07962a40745ebbec69de69cd64e54420c22fea34bc8f5b1ccb239b76f2f37a0653589d8671644c902384107d5e100d27145c + checksum: 48f5e97c2f07b3e0a28c09b1f5edd8bb4f31e70ccecb7d211523d11a0c1479ddb16fc616e01c338a2a6404e0276535af6780fb85c4ccf9a9fc4b64f776501d85 languageName: node linkType: hard @@ -4222,10 +4211,10 @@ __metadata: languageName: node linkType: hard -"@wireapp/webapp-events@npm:0.14.9": - version: 0.14.9 - resolution: "@wireapp/webapp-events@npm:0.14.9" - checksum: 9ba6c96477aae9bed6bdf4b1bfc573fa2e3c12476938e7ff527dc358beb7754a610b8bb9a11d94827f587fd362cd9e44e6fa37f004658983aa27bb94cd944cb0 +"@wireapp/webapp-events@npm:0.15.0": + version: 0.15.0 + resolution: "@wireapp/webapp-events@npm:0.15.0" + checksum: 3209e685a29877fbedcd0fd7911f8cbe2ec2a4109e0435d5771a0370fd32c55d7fee8b5a8d3e521a13e001e6d47c845da5410386eea1fe51d4351b93a78e9484 languageName: node linkType: hard @@ -4930,17 +4919,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:1.1.3": - version: 1.1.3 - resolution: "axios@npm:1.1.3" - dependencies: - follow-redirects: ^1.15.0 - form-data: ^4.0.0 - proxy-from-env: ^1.1.0 - checksum: cab3b17bf6092c9387f7023d699db093cfa23650b56c4422cd474d124b78b2e3b5a520f932c330664a58ab85b867b1c25a95cace475ef72d236888c852b84e6d - languageName: node - linkType: hard - "axobject-query@npm:^2.2.0": version: 2.2.0 resolution: "axobject-query@npm:2.2.0" @@ -5132,13 +5110,6 @@ __metadata: languageName: node linkType: hard -"bazinga64@npm:5.11.12": - version: 5.11.12 - resolution: "bazinga64@npm:5.11.12" - checksum: 9c2057460e0cf13754de540f5900db8132de0d37b0909ab7269e36fe126568e222dd11bbce7985d6150dcf4228b109f707a88c09fda1fc0ad58a3d47454b64e4 - languageName: node - linkType: hard - "bazinga64@npm:5.11.9": version: 5.11.9 resolution: "bazinga64@npm:5.11.9" @@ -5146,6 +5117,13 @@ __metadata: languageName: node linkType: hard +"bazinga64@npm:6.0.0": + version: 6.0.0 + resolution: "bazinga64@npm:6.0.0" + checksum: 67a9c3aaa1c635a49a7dde6e60faf9aa0f973cc642daf92d372e6874ddda315ab7dccf53f744e12002b6f9000d9786036e260d2396f8309cfea09f64f8f68ce3 + languageName: node + linkType: hard + "big.js@npm:^5.2.2": version: 5.2.2 resolution: "big.js@npm:5.2.2" @@ -16873,15 +16851,15 @@ __metadata: "@typescript-eslint/eslint-plugin": 5.40.1 "@typescript-eslint/parser": 5.40.1 "@wireapp/antiscroll-2": 1.3.1 - "@wireapp/avs": 8.2.16 - "@wireapp/copy-config": 1.3.10 - "@wireapp/core": 34.1.6 - "@wireapp/eslint-config": 1.12.12 - "@wireapp/prettier-config": 0.4.7 - "@wireapp/react-ui-kit": 8.17.8 - "@wireapp/store-engine-dexie": 1.7.11 + "@wireapp/avs": 8.2.17 + "@wireapp/copy-config": 2.0.0 + "@wireapp/core": 35.0.0 + "@wireapp/eslint-config": 2.0.0 + "@wireapp/prettier-config": 0.5.0 + "@wireapp/react-ui-kit": 9.0.1 + "@wireapp/store-engine-dexie": 2.0.0 "@wireapp/store-engine-sqleet": 1.8.9 - "@wireapp/webapp-events": 0.14.9 + "@wireapp/webapp-events": 0.15.0 adm-zip: 0.5.9 amplify: "https://github.com/wireapp/amplify#head=master" autoprefixer: 9.8.8 From 9b77ee4477412ebb93b7afdda4f00073d9a4aa50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20G=C3=B3rka?= Date: Wed, 26 Oct 2022 15:53:51 +0200 Subject: [PATCH 66/66] runfix: reset audioElement media after stopping (#13978) --- src/script/audio/AudioRepository.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/script/audio/AudioRepository.ts b/src/script/audio/AudioRepository.ts index d9dbb2330cd..b64177d7644 100644 --- a/src/script/audio/AudioRepository.ts +++ b/src/script/audio/AudioRepository.ts @@ -206,6 +206,7 @@ export class AudioRepository { if (!audioElement?.paused) { this.logger.info(`Stopping sound '${audioId}'`); audioElement.pause(); + audioElement.load(); } };