Skip to content

Commit c126b26

Browse files
przemvsdependabot[bot]atomrcaweiss-devcomawill
authored
chore: merge dev to acc (#13964)
* 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](crowdin/github-action@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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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](amannn/action-semantic-pull-request@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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: Upgrade @wireapp/core (#13887) This will provide better logs for MLS specific messages * fix: update core to get rid of the missing messages message bug (#13892) * chore: Cleanup unused dependencies (#13893) * chore: replace discontinued postcss-cssnext with postcss-preset-env (#13895) * 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. * 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 * 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 * refactor: Move cryptobox hooks into @wireapp/core (#13905) * 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 06ba72d. * Revert "runfix: require feature flag to support mls for m4" This reverts commit a32154e. * runfix: add mls feature config var back to supportMLS helper * runfix: fix for firefox ephemeral message progress icon (#13919) * 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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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/[email protected]...@wireapp/[email protected]) --- updated-dependencies: - dependency-name: "@wireapp/core" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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/[email protected]...@wireapp/[email protected]) --- updated-dependencies: - dependency-name: "@wireapp/store-engine-dexie" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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/[email protected]@6.2.1) --- updated-dependencies: - dependency-name: react-intl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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/[email protected]...@wireapp/[email protected]) --- updated-dependencies: - dependency-name: "@wireapp/commons" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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](jest-community/eslint-plugin-jest@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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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/[email protected]...@wireapp/[email protected]) --- updated-dependencies: - dependency-name: "@wireapp/prettier-config" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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/[email protected]...@wireapp/[email protected]) --- updated-dependencies: - dependency-name: "@wireapp/webapp-events" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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](open-cli-tools/concurrently@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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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](pmndrs/zustand@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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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](eslint/eslint@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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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](browserslist/caniuse-lite@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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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/[email protected]...@wireapp/[email protected]) --- updated-dependencies: - dependency-name: "@wireapp/copy-config" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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/[email protected]...@wireapp/[email protected]) --- updated-dependencies: - dependency-name: "@wireapp/react-ui-kit" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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/[email protected]...@wireapp/[email protected]) --- updated-dependencies: - dependency-name: "@wireapp/store-engine-sqleet" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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](gajus/eslint-plugin-jsdoc@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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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/[email protected]...@wireapp/[email protected]) --- updated-dependencies: - dependency-name: "@wireapp/eslint-config" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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/[email protected]...@formatjs/[email protected]) --- updated-dependencies: - dependency-name: "@formatjs/cli" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 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 * chore: Upgrade @wireapp/core (#13951) * chore: bump used versions of minimatch (#13952) * chore(deps): Bump crowdin/github-action from 1.4.15 to 1.4.16 (#13925) * 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](wireapp/wire-web-config-default@v0.31.4...195c8e4) --- updated-dependencies: - dependency-name: wire-web-config-default-staging dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * refactor: Use @wireapp/core for generating fingerprints [FS-1101] (#13918) * Revert "chore(deps): Bump cakeinpanic/jira-description-action from 0.3.2 to 1.2 (#12865)" (#13953) This reverts commit 4678e30. * chore(deps): Bump wire-web-config-default-master in /app-config (#13916) * chore: Add docker image generation job (#13954) * chore: Fix docker image creation job * chore: More docker image build fix * runfix: audio file previews don't match on sender and receiver side (#13958) * runfix: Pass messageId when creating message edit (#13961) This allows the linkPreview system to overwrite the message in case a link preview comes in * chore: upgrade @wireapp/core (#13962) * chore: Simplify babel config (#13963) * build fixes * Fix collection test Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thomas Belin <[email protected]> Co-authored-by: Adrian Weiß <[email protected]> Co-authored-by: Sebastian Willenborg <[email protected]> Co-authored-by: Amir Ghezelbash <[email protected]> Co-authored-by: Patryk Górka <[email protected]> Co-authored-by: Thomas Belin <[email protected]>
1 parent d75a41f commit c126b26

34 files changed

+1531
-1564
lines changed

.env.localhost

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ CSP_EXTRA_IMG_SRC="https://*.zinfra.io, https://*.wire.com, https://*.wire.link"
1010
CSP_EXTRA_SCRIPT_SRC="http://localhost:32123, https://*.zinfra.io, https://*.wire.com, https://*.wire.link, https://api.raygun.io"
1111
ENFORCE_HTTPS="false"
1212
FEATURE_ENABLE_DEBUG="true"
13+
ENABLE_DEV_BACKEND_API="true"
1314

1415
#FEATURE_DEFAULT_LOGIN_TEMPORARY_CLIENT="false"
1516
#FEATURE_PERSIST_TEMPORARY_CLIENTS="false"
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Create Docker image
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
tag:
7+
description: 'tagname for the Docker image'
8+
required: true
9+
type: string
10+
11+
concurrency:
12+
group: ci-${{ github.ref }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
test_build_deploy:
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- name: Checkout
21+
uses: actions/checkout@v3
22+
with:
23+
fetch-depth: 0
24+
25+
- name: Use latest Node.js v16
26+
uses: actions/setup-node@v3
27+
with:
28+
node-version: 16.x
29+
30+
- name: Yarn cache
31+
uses: c-hive/[email protected]
32+
33+
- name: Install JS dependencies
34+
run: yarn --immutable
35+
36+
- name: Test
37+
run: yarn test --coverage --coverage-reporters=lcov --detectOpenHandles=false
38+
39+
- name: Build
40+
run: yarn build:prod
41+
42+
- name: Push Docker image
43+
env:
44+
DOCKER_PASSWORD: ${{secrets.WEBTEAM_QUAY_PASSWORD}}
45+
DOCKER_USERNAME: ${{secrets.WEBTEAM_QUAY_USERNAME}}
46+
run: yarn docker '' "${{inputs.tag}}"

.github/workflows/jira-lint-and-link.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ jobs:
66
add-jira-description:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: cakeinpanic/jira-description-action@v1.2
9+
- uses: cakeinpanic/jira-description-action@v0.3.2
1010
name: jira-description-action
1111
with:
1212
github-token: ${{ secrets.GITHUB_TOKEN }}
1313
jira-token: ${{ secrets.JIRA_TOKEN }}
1414
jira-base-url: https://wearezeta.atlassian.net
1515
skip-branches: '^(production-release|main|master|release\/v\d+)$' #optional
16+
fail-when-jira-issue-not-found: false

.github/workflows/sync_translations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
run: yarn translate:merge
3535

3636
- name: Download translations
37-
uses: crowdin/[email protected].15
37+
uses: crowdin/[email protected].16
3838
env:
3939
GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}}
4040
CROWDIN_PROJECT_ID: 342359

app-config/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"wire-web-config-default-master": "https://github.com/wireapp/wire-web-config-wire#v0.31.5-0",
4-
"wire-web-config-default-staging": "https://github.com/wireapp/wire-web-config-default#v0.31.4"
3+
"wire-web-config-default-master": "https://github.com/wireapp/wire-web-config-wire#v0.31.9-0",
4+
"wire-web-config-default-staging": "https://github.com/wireapp/wire-web-config-default#v0.31.8"
55
}
66
}

babel.config.js

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,15 @@ const presetEnvConfig = {
3030
module.exports = {
3131
env: {
3232
test: {
33-
plugins: [
34-
'@babel/plugin-proposal-class-properties',
35-
'@babel/plugin-proposal-nullish-coalescing-operator',
36-
'@babel/plugin-proposal-optional-chaining',
37-
'@emotion',
38-
],
33+
plugins: ['@emotion'],
3934
presets: [
4035
['@babel/preset-react', {importSource: '@emotion/react', runtime: 'automatic'}],
4136
'@babel/preset-typescript',
4237
['@babel/preset-env', {...presetEnvConfig, modules: 'commonjs'}],
4338
],
4439
},
4540
},
46-
plugins: [
47-
['@babel/plugin-proposal-decorators', {legacy: true}],
48-
'@babel/plugin-proposal-class-properties',
49-
'@babel/plugin-proposal-nullish-coalescing-operator',
50-
'@babel/plugin-proposal-optional-chaining',
51-
'@babel/plugin-syntax-dynamic-import',
52-
'@emotion',
53-
],
41+
plugins: [['@babel/plugin-proposal-decorators', {legacy: true}], '@emotion'],
5442
presets: [
5543
['@babel/preset-react', {importSource: '@emotion/react', runtime: 'automatic'}],
5644
'@babel/preset-typescript',

package.json

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"dependencies": {
33
"@emotion/react": "11.10.4",
44
"@wireapp/avs": "8.2.16",
5-
"@wireapp/core": "32.1.1",
6-
"@wireapp/react-ui-kit": "8.17.0",
7-
"@wireapp/store-engine-dexie": "1.7.6",
8-
"@wireapp/store-engine-sqleet": "1.8.6",
9-
"@wireapp/webapp-events": "0.14.6",
5+
"@wireapp/core": "34.1.4",
6+
"@wireapp/react-ui-kit": "8.17.5",
7+
"@wireapp/store-engine-dexie": "1.7.11",
8+
"@wireapp/store-engine-sqleet": "1.8.9",
9+
"@wireapp/webapp-events": "0.14.9",
1010
"amplify": "https://github.com/wireapp/amplify#head=master",
1111
"classnames": "2.3.2",
1212
"copy-webpack-plugin": "11.0.0",
@@ -30,7 +30,7 @@
3030
"platform": "1.3.6",
3131
"react": "18.2.0",
3232
"react-dom": "18.2.0",
33-
"react-intl": "6.2.0",
33+
"react-intl": "6.2.1",
3434
"react-redux": "8.0.4",
3535
"react-router": "6.4.2",
3636
"react-router-dom": "6.4.2",
@@ -46,21 +46,17 @@
4646
"underscore": "1.13.6",
4747
"uuidjs": "4.2.12",
4848
"webrtc-adapter": "6.4.8",
49-
"zustand": "4.1.2"
49+
"zustand": "4.1.3"
5050
},
5151
"devDependencies": {
52-
"@babel/core": "7.19.3",
52+
"@babel/core": "7.19.6",
5353
"@babel/eslint-parser": "7.19.1",
54-
"@babel/plugin-proposal-class-properties": "7.18.6",
55-
"@babel/plugin-proposal-decorators": "7.19.3",
56-
"@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
57-
"@babel/plugin-proposal-optional-chaining": "7.18.9",
58-
"@babel/plugin-syntax-dynamic-import": "7.8.3",
54+
"@babel/plugin-proposal-decorators": "7.19.6",
5955
"@babel/preset-env": "7.19.4",
6056
"@babel/preset-react": "7.18.6",
6157
"@babel/preset-typescript": "7.18.6",
6258
"@faker-js/faker": "7.6.0",
63-
"@formatjs/cli": "5.1.2",
59+
"@formatjs/cli": "5.1.3",
6460
"@koush/wrtc": "0.5.3",
6561
"@testing-library/react": "13.4.0",
6662
"@types/adm-zip": "0.5.0",
@@ -70,14 +66,14 @@
7066
"@types/fs-extra": "9.0.13",
7167
"@types/generate-changelog": "1.8.1",
7268
"@types/highlight.js": "10.1.0",
73-
"@types/jest": "29.1.2",
69+
"@types/jest": "29.2.0",
7470
"@types/js-cookie": "3.0.2",
7571
"@types/jsdom": "20.0.0",
7672
"@types/keyboardjs": "2.5.0",
7773
"@types/libsodium-wrappers-sumo": "0.7.5",
7874
"@types/linkify-it": "3.0.2",
7975
"@types/markdown-it": "12.2.3",
80-
"@types/node": "^18.11.0",
76+
"@types/node": "^18.11.3",
8177
"@types/open-graph": "0.2.2",
8278
"@types/platform": "1.3.4",
8379
"@types/react": "18.0.21",
@@ -91,29 +87,29 @@
9187
"@types/uint32": "0.2.0",
9288
"@types/underscore": "1.11.4",
9389
"@types/webpack-env": "1.18.0",
94-
"@typescript-eslint/eslint-plugin": "5.40.0",
95-
"@typescript-eslint/parser": "5.40.0",
96-
"@wireapp/copy-config": "1.3.6",
97-
"@wireapp/eslint-config": "1.12.11",
98-
"@wireapp/prettier-config": "0.4.6",
90+
"@typescript-eslint/eslint-plugin": "5.40.1",
91+
"@typescript-eslint/parser": "5.40.1",
92+
"@wireapp/copy-config": "1.3.10",
93+
"@wireapp/eslint-config": "1.12.12",
94+
"@wireapp/prettier-config": "0.4.7",
9995
"adm-zip": "0.5.9",
10096
"autoprefixer": "9.8.8",
10197
"babel-loader": "8.2.5",
102-
"caniuse-lite": "^1.0.30001420",
103-
"concurrently": "7.4.0",
98+
"caniuse-lite": "^1.0.30001423",
99+
"concurrently": "7.5.0",
104100
"cross-env": "7.0.3",
105101
"cspell": "6.12.0",
106102
"cssnano": "4.1.11",
107103
"dexie": "^3.2.2",
108104
"dotenv": "16.0.3",
109105
"dpdm": "3.10.0",
110-
"eslint": "8.25.0",
106+
"eslint": "8.26.0",
111107
"eslint-config-prettier": "8.5.0",
112108
"eslint-import-resolver-alias": "1.1.2",
113109
"eslint-plugin-babel": "5.3.1",
114110
"eslint-plugin-import": "2.26.0",
115-
"eslint-plugin-jest": "27.1.2",
116-
"eslint-plugin-jsdoc": "39.3.6",
111+
"eslint-plugin-jest": "27.1.3",
112+
"eslint-plugin-jsdoc": "39.3.21",
117113
"eslint-plugin-jsx-a11y": "6.6.1",
118114
"eslint-plugin-no-unsanitized": "4.0.1",
119115
"eslint-plugin-prettier": "4.2.1",
@@ -138,10 +134,10 @@
138134
"husky": "7.0.4",
139135
"i18next-scanner": "4.1.0",
140136
"intersection-observer": "0.12.2",
141-
"jest": "29.2.0",
137+
"jest": "29.2.1",
142138
"jest-canvas-mock": "2.4.0",
143-
"jest-environment-jsdom": "29.1.2",
144-
"jest-jasmine2": "29.2.0",
139+
"jest-environment-jsdom": "29.2.1",
140+
"jest-jasmine2": "29.2.1",
145141
"jsdom-worker": "0.3.0",
146142
"less": "3.13.1",
147143
"lint-staged": "13.0.3",

server/ServerConfig.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export interface ServerConfig {
2727
BRAND_NAME: string;
2828
CHROME_ORIGIN_TRIAL_TOKEN: string;
2929
COUNTLY_API_KEY: string;
30+
ENABLE_DEV_BACKEND_API: boolean;
3031
ENVIRONMENT: string;
3132
FEATURE: {
3233
ALLOWED_FILE_UPLOAD_EXTENSIONS: string[];

server/config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ const config: ServerConfig = {
123123
BRAND_NAME: process.env.BRAND_NAME,
124124
CHROME_ORIGIN_TRIAL_TOKEN: process.env.CHROME_ORIGIN_TRIAL_TOKEN,
125125
COUNTLY_API_KEY: process.env.COUNTLY_API_KEY,
126+
ENABLE_DEV_BACKEND_API: process.env.ENABLE_DEV_BACKEND_API == 'true',
126127
ENVIRONMENT: nodeEnvironment,
127128
FEATURE: {
128129
ALLOWED_FILE_UPLOAD_EXTENSIONS: (process.env.FEATURE_ALLOWED_FILE_UPLOAD_EXTENSIONS || '*')

server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"main": "dist/index.js",
55
"license": "GPL-3.0",
66
"dependencies": {
7-
"@wireapp/commons": "4.4.6",
7+
"@wireapp/commons": "4.4.10",
88
"dotenv": "16.0.3",
99
"dotenv-extended": "2.9.0",
1010
"express": "4.18.2",

server/yarn.lock

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1332,15 +1332,15 @@ __metadata:
13321332
languageName: node
13331333
linkType: hard
13341334

1335-
"@wireapp/commons@npm:4.4.6":
1336-
version: 4.4.6
1337-
resolution: "@wireapp/commons@npm:4.4.6"
1335+
"@wireapp/commons@npm:4.4.10":
1336+
version: 4.4.10
1337+
resolution: "@wireapp/commons@npm:4.4.10"
13381338
dependencies:
13391339
ansi-regex: 5.0.1
1340-
fs-extra: 10.0.0
1340+
fs-extra: 10.1.0
13411341
logdown: 3.3.1
13421342
platform: 1.3.6
1343-
checksum: 76dcebc6ba4a514c15ab27c2c048edb1043a1f1ab1652a2b1b059f8d9bd227f351d44c345445d38c37333c45751e4432cd3ab53697b3d0cab761025c834d8a55
1343+
checksum: c026b91caffbf8c2abf929abb4e62c33684a1c3bbcde7d6f6164d60a80ce7507969921965fc477145c127eff1b1e3f4d7072f9821c08b8d6cecd9a474894f169
13441344
languageName: node
13451345
linkType: hard
13461346

@@ -2952,17 +2952,6 @@ __metadata:
29522952
languageName: node
29532953
linkType: hard
29542954

2955-
"fs-extra@npm:10.0.0":
2956-
version: 10.0.0
2957-
resolution: "fs-extra@npm:10.0.0"
2958-
dependencies:
2959-
graceful-fs: ^4.2.0
2960-
jsonfile: ^6.0.1
2961-
universalify: ^2.0.0
2962-
checksum: 5285a3d8f34b917cf2b66af8c231a40c1623626e9d701a20051d3337be16c6d7cac94441c8b3732d47a92a2a027886ca93c69b6a4ae6aee3c89650d2a8880c0a
2963-
languageName: node
2964-
linkType: hard
2965-
29662955
"fs-extra@npm:10.1.0":
29672956
version: 10.1.0
29682957
resolution: "fs-extra@npm:10.1.0"
@@ -4623,11 +4612,11 @@ __metadata:
46234612
linkType: hard
46244613

46254614
"minimatch@npm:^3.0.4":
4626-
version: 3.0.4
4627-
resolution: "minimatch@npm:3.0.4"
4615+
version: 3.1.2
4616+
resolution: "minimatch@npm:3.1.2"
46284617
dependencies:
46294618
brace-expansion: ^1.1.7
4630-
checksum: 66ac295f8a7b59788000ea3749938b0970344c841750abd96694f80269b926ebcafad3deeb3f1da2522978b119e6ae3a5869b63b13a7859a456b3408bd18a078
4619+
checksum: c154e566406683e7bcb746e000b84d74465b3a832c45d59912b9b55cd50dee66e5c4b1e5566dba26154040e51672f9aa450a9aef0c97cfc7336b78b7afb9540a
46314620
languageName: node
46324621
linkType: hard
46334622

@@ -6717,7 +6706,7 @@ __metadata:
67176706
"@types/geolite2": 2.0.0
67186707
"@types/hbs": 4.0.1
67196708
"@types/node": 12.20.55
6720-
"@wireapp/commons": 4.4.6
6709+
"@wireapp/commons": 4.4.10
67216710
dotenv: 16.0.3
67226711
dotenv-extended: 2.9.0
67236712
express: 4.18.2

src/script/Config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export class Configuration {
4040
readonly BACKEND_WS = env.BACKEND_WS || 'wss://prod-nginz-ssl.wire.com';
4141
readonly BRAND_NAME = env.BRAND_NAME || 'Wire';
4242
readonly COUNTLY_API_KEY = env.COUNTLY_API_KEY;
43+
readonly ENABLE_DEV_BACKEND_API = env.ENABLE_DEV_BACKEND_API;
4344
readonly ENVIRONMENT = env.ENVIRONMENT || 'production';
4445
readonly FEATURE = {
4546
...env.FEATURE,

src/script/auth/module/action/AuthAction.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ export class AuthAction {
174174
dispatch(AuthActionCreator.startLogin());
175175
try {
176176
// we first init the core without initializing the client for now (this will be done later on)
177-
await core.init(clientType, undefined, false);
177+
await core.init(clientType, {initClient: false});
178178
await this.persistAuthData(clientType, core, dispatch, localStorageAction);
179179
await dispatch(selfAction.fetchSelf());
180180
await dispatch(cookieAction.setCookie(COOKIE_NAME_APP_OPENED, {appInstanceId: getConfig().APP_INSTANCE_ID}));
@@ -363,7 +363,7 @@ export class AuthAction {
363363
}
364364
const clientType = persist ? ClientType.PERMANENT : ClientType.TEMPORARY;
365365

366-
await core.init(clientType, undefined, false);
366+
await core.init(clientType, {initClient: false});
367367
await this.persistAuthData(clientType, core, dispatch, localStorageAction);
368368

369369
if (options.shouldValidateLocalClient) {

src/script/calling/CallingRepository.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@ export class CallingRepository {
572572
qualified_from,
573573
sender: clientId,
574574
time = new Date().toISOString(),
575+
senderClientId: senderFullyQualifiedClientId = '',
575576
} = event;
576577
const isFederated = this.core.backendFeatures.isFederated && qualified_conversation && qualified_from;
577578
const userId = isFederated ? qualified_from : {domain: '', id: from};
@@ -619,6 +620,11 @@ export class CallingRepository {
619620
}
620621
}
621622

623+
let senderClientId = '';
624+
if (senderFullyQualifiedClientId) {
625+
senderClientId = this.parseQualifiedId(senderFullyQualifiedClientId).id.split(':')[1];
626+
}
627+
622628
const res = this.wCall?.recvMsg(
623629
this.wUser,
624630
contentStr,
@@ -627,7 +633,7 @@ export class CallingRepository {
627633
toSecond(new Date(time).getTime()),
628634
this.serializeQualifiedId(conversationId),
629635
this.serializeQualifiedId(userId),
630-
conversationEntity?.isUsingMLSProtocol ? content.src_clientid : clientId,
636+
conversationEntity?.isUsingMLSProtocol ? senderClientId : clientId,
631637
);
632638

633639
if (res !== 0) {

src/script/components/userDevices/SelfFingerprint.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ const SelfFingerprint: React.FC<SelfFingerprintProps> = ({
4444
noPadding,
4545
clientState = container.resolve(ClientState),
4646
}) => {
47-
const fingerprintLocal = useMemo<string>(() => cryptographyRepository.getLocalFingerprint(), []);
47+
const fingerprintLocal = useMemo<string>(
48+
() => cryptographyRepository.getLocalFingerprint(),
49+
[cryptographyRepository],
50+
);
4851
const {currentClient} = useKoSubscribableChildren(clientState, ['currentClient']);
4952

5053
return (

0 commit comments

Comments
 (0)