From 8ed4b8f57925b5fd8b3ff4ce974d4d64ff674207 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Wed, 25 Oct 2023 10:00:21 +0200 Subject: [PATCH 01/27] runfix: Restore ability to use custom webapp url from settings.json (#7208) --- electron/src/runtime/EnvironmentUtil.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/electron/src/runtime/EnvironmentUtil.ts b/electron/src/runtime/EnvironmentUtil.ts index a54429c9349..4594bba8a1f 100644 --- a/electron/src/runtime/EnvironmentUtil.ts +++ b/electron/src/runtime/EnvironmentUtil.ts @@ -24,7 +24,8 @@ import {settings} from '../settings/ConfigurationPersistence'; import {SettingsType} from '../settings/SettingsType'; const argv = minimist(process.argv.slice(1)); -const customWebappUrl: string | undefined = argv[config.ARGUMENT.ENV]; +const webappUrlSetting = settings.restore(SettingsType.CUSTOM_WEBAPP_URL); +const customWebappUrl: string | undefined = argv[config.ARGUMENT.ENV] || webappUrlSetting; const isProdEnvironment = !!customWebappUrl; export enum ServerType { From 7f04af1b64994b7a9692092b5ac9e6600ecfc696 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Thu, 9 Nov 2023 10:59:07 +0100 Subject: [PATCH 02/27] chore: upgrade version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7d6b55cd1bc..3390bb7a3b7 100644 --- a/package.json +++ b/package.json @@ -200,6 +200,6 @@ "translate:upload": "ts-node -P tsconfig.bin.json ./bin/translations_upload.ts", "translate:download": "ts-node -P tsconfig.bin.json ./bin/translations_download.ts" }, - "version": "3.33.0", + "version": "3.34.0", "packageManager": "yarn@3.3.1" } From 3702392ada2ea6bf0fb48e4268b7fee82792a071 Mon Sep 17 00:00:00 2001 From: Thomas Belin Date: Thu, 9 Nov 2023 10:59:07 +0100 Subject: [PATCH 03/27] chore: upgrade version --- electron/wire.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron/wire.json b/electron/wire.json index c05bad312bf..bd8191b0ec2 100644 --- a/electron/wire.json +++ b/electron/wire.json @@ -20,6 +20,6 @@ "privacyUrl": "https://wire.com/privacy/", "supportUrl": "https://support.wire.com", "updateUrl": "https://wire-app.wire.com/win/prod/", - "version": "3.33.0", + "version": "3.34.0", "websiteUrl": "https://wire.com" } From 0fa232febcb2dcc1a485ce790af5965ee63ad35b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 04:25:04 +0000 Subject: [PATCH 04/27] build(deps-dev): bump @typescript-eslint/parser from 6.19.0 to 6.19.1 (#7477) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 6.19.0 to 6.19.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/v6.19.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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 66 ++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 01d38b75862..1ece114caf9 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "@types/sinon": "17.0.3", "@types/sort-json": "2.0.3", "@typescript-eslint/eslint-plugin": "6.19.0", - "@typescript-eslint/parser": "6.19.0", + "@typescript-eslint/parser": "6.19.1", "@wireapp/copy-config": "1.3.6", "@wireapp/eslint-config": "3.0.5", "@wireapp/prettier-config": "0.6.3", diff --git a/yarn.lock b/yarn.lock index 94d85c4220d..a6900d17c16 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3797,21 +3797,21 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:6.19.0": - version: 6.19.0 - resolution: "@typescript-eslint/parser@npm:6.19.0" - dependencies: - "@typescript-eslint/scope-manager": 6.19.0 - "@typescript-eslint/types": 6.19.0 - "@typescript-eslint/typescript-estree": 6.19.0 - "@typescript-eslint/visitor-keys": 6.19.0 +"@typescript-eslint/parser@npm:6.19.1": + version: 6.19.1 + resolution: "@typescript-eslint/parser@npm:6.19.1" + dependencies: + "@typescript-eslint/scope-manager": 6.19.1 + "@typescript-eslint/types": 6.19.1 + "@typescript-eslint/typescript-estree": 6.19.1 + "@typescript-eslint/visitor-keys": 6.19.1 debug: ^4.3.4 peerDependencies: eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 0ac91ff83fdf693de4494b45be79f25803ea6ca3ee717e4f96785b7ffc1da0180adb0426b61bc6eff5666c8ef9ea58c50efbd4351ef9018c0050116cbd74a62b + checksum: cd29619da08a2d9b7123ba4d8240989c747f8e0d5672179d8b147e413ee1334d1fa48570b0c37cf0ae4e26a275fd2d268cbe702c6fed639d3331abbb3292570a languageName: node linkType: hard @@ -3853,6 +3853,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/scope-manager@npm:6.19.1": + version: 6.19.1 + resolution: "@typescript-eslint/scope-manager@npm:6.19.1" + dependencies: + "@typescript-eslint/types": 6.19.1 + "@typescript-eslint/visitor-keys": 6.19.1 + checksum: 848cdebc16a3803e8a6d6035a7067605309a652bb2425f475f755b5ace4d80d2c17c8c8901f0f4759556da8d0a5b71024d472b85c3f3c70d0e6dcfe2a972ef35 + languageName: node + linkType: hard + "@typescript-eslint/scope-manager@npm:6.7.4": version: 6.7.4 resolution: "@typescript-eslint/scope-manager@npm:6.7.4" @@ -3911,6 +3921,13 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/types@npm:6.19.1": + version: 6.19.1 + resolution: "@typescript-eslint/types@npm:6.19.1" + checksum: 598ce222b59c20432d06f60703d0c2dd16d9b2151569c192852136c57b8188e3ef6ef9fddaa2c136c9a756fcc7d873c0e29ec41cfd340564842287ef7b4571cd + languageName: node + linkType: hard + "@typescript-eslint/types@npm:6.7.4": version: 6.7.4 resolution: "@typescript-eslint/types@npm:6.7.4" @@ -3955,6 +3972,25 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/typescript-estree@npm:6.19.1": + version: 6.19.1 + resolution: "@typescript-eslint/typescript-estree@npm:6.19.1" + dependencies: + "@typescript-eslint/types": 6.19.1 + "@typescript-eslint/visitor-keys": 6.19.1 + debug: ^4.3.4 + globby: ^11.1.0 + is-glob: ^4.0.3 + minimatch: 9.0.3 + semver: ^7.5.4 + ts-api-utils: ^1.0.1 + peerDependenciesMeta: + typescript: + optional: true + checksum: fb71a14aeee0468780219c5b8d39075f85d360b04ccd0ee88f4f0a615d2c232a6d3016e36d8c6eda2d9dfda86b4f4cc2c3d7582940fb29d33c7cf305e124d4e2 + languageName: node + linkType: hard + "@typescript-eslint/typescript-estree@npm:6.7.4": version: 6.7.4 resolution: "@typescript-eslint/typescript-estree@npm:6.7.4" @@ -4045,6 +4081,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:6.19.1": + version: 6.19.1 + resolution: "@typescript-eslint/visitor-keys@npm:6.19.1" + dependencies: + "@typescript-eslint/types": 6.19.1 + eslint-visitor-keys: ^3.4.1 + checksum: bdf057a42e776970a89cdd568e493e3ea7ec085544d8f318d33084da63c3395ad2c0fb9cef9f61ceeca41f5dab54ab064b7078fe596889005e412ec74d2d1ae4 + languageName: node + linkType: hard + "@typescript-eslint/visitor-keys@npm:6.7.4": version: 6.7.4 resolution: "@typescript-eslint/visitor-keys@npm:6.7.4" @@ -16273,7 +16319,7 @@ __metadata: "@types/sinon": 17.0.3 "@types/sort-json": 2.0.3 "@typescript-eslint/eslint-plugin": 6.19.0 - "@typescript-eslint/parser": 6.19.0 + "@typescript-eslint/parser": 6.19.1 "@wireapp/certificate-check": 0.7.8 "@wireapp/commons": 5.2.4 "@wireapp/copy-config": 1.3.6 From be4ec69cc5f5790475edf4c520b299f528c4533d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 04:30:15 +0000 Subject: [PATCH 05/27] build(deps-dev): bump aws-sdk from 2.1540.0 to 2.1541.0 (#7478) Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1540.0 to 2.1541.0. - [Release notes](https://github.com/aws/aws-sdk-js/releases) - [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1540.0...v2.1541.0) --- updated-dependencies: - dependency-name: aws-sdk dependency-type: direct:development update-type: version-update:semver-minor ... 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 1ece114caf9..b54ba620d50 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "@wireapp/eslint-config": "3.0.5", "@wireapp/prettier-config": "0.6.3", "adm-zip": "0.5.10", - "aws-sdk": "2.1540.0", + "aws-sdk": "2.1541.0", "babel-core": "7.0.0-bridge.0", "babel-eslint": "10.1.0", "babel-jest": "29.7.0", diff --git a/yarn.lock b/yarn.lock index a6900d17c16..0c87d5717cc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5119,9 +5119,9 @@ __metadata: languageName: node linkType: hard -"aws-sdk@npm:2.1540.0": - version: 2.1540.0 - resolution: "aws-sdk@npm:2.1540.0" +"aws-sdk@npm:2.1541.0": + version: 2.1541.0 + resolution: "aws-sdk@npm:2.1541.0" dependencies: buffer: 4.9.2 events: 1.1.1 @@ -5133,7 +5133,7 @@ __metadata: util: ^0.12.4 uuid: 8.0.0 xml2js: 0.5.0 - checksum: b8d239020f83666abbc066e29ad9286ef0a40d80f74ecd716681272dac40a259f2c45244483ce2047dc1cab681e7ab94b7e0095e3fcc2d05291f40da55cdf105 + checksum: 7cf0264012f95e696bb89503e76c368887582aa31d16fb7578fc8f8ec6cb07c786ed2bf3eda6edb1ec0a165875f9cea447b70e0fb7699de36aaba1e742886d16 languageName: node linkType: hard @@ -16330,7 +16330,7 @@ __metadata: "@wireapp/webapp-events": 0.20.1 adm-zip: 0.5.10 auto-launch: 5.0.6 - aws-sdk: 2.1540.0 + aws-sdk: 2.1541.0 axios: 0.21.2 babel-core: 7.0.0-bridge.0 babel-eslint: 10.1.0 From b1f0f4a996bbce60dd23b7c31b140a5311b77656 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 04:33:31 +0000 Subject: [PATCH 06/27] build(deps-dev): bump @typescript-eslint/eslint-plugin (#7479) Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.19.0 to 6.19.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/v6.19.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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 90 +++++++++++++--------------------------------------- 2 files changed, 23 insertions(+), 69 deletions(-) diff --git a/package.json b/package.json index b54ba620d50..4558cccec97 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "@types/redux-logger": "^3.0.12", "@types/sinon": "17.0.3", "@types/sort-json": "2.0.3", - "@typescript-eslint/eslint-plugin": "6.19.0", + "@typescript-eslint/eslint-plugin": "6.19.1", "@typescript-eslint/parser": "6.19.1", "@wireapp/copy-config": "1.3.6", "@wireapp/eslint-config": "3.0.5", diff --git a/yarn.lock b/yarn.lock index 0c87d5717cc..ab95dd200b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3747,15 +3747,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:6.19.0": - version: 6.19.0 - resolution: "@typescript-eslint/eslint-plugin@npm:6.19.0" +"@typescript-eslint/eslint-plugin@npm:6.19.1": + version: 6.19.1 + resolution: "@typescript-eslint/eslint-plugin@npm:6.19.1" dependencies: "@eslint-community/regexpp": ^4.5.1 - "@typescript-eslint/scope-manager": 6.19.0 - "@typescript-eslint/type-utils": 6.19.0 - "@typescript-eslint/utils": 6.19.0 - "@typescript-eslint/visitor-keys": 6.19.0 + "@typescript-eslint/scope-manager": 6.19.1 + "@typescript-eslint/type-utils": 6.19.1 + "@typescript-eslint/utils": 6.19.1 + "@typescript-eslint/visitor-keys": 6.19.1 debug: ^4.3.4 graphemer: ^1.4.0 ignore: ^5.2.4 @@ -3768,7 +3768,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 9880567d52d4e6559e2343caeed68f856d593b42816b8f705cd98d5a5b46cc620e3bebaaf08bbc982061bba18e5be94d6c539c0c816e8772ddabba0ad4e9363e + checksum: ad04000cd6c15d864ff92655baa3aec99bb0ccf4714fedd145fedde60a27590a5feafe480beb2f0f3864b416098bde1e9431bada7480eb7ca4efad891e1d2f6f languageName: node linkType: hard @@ -3843,16 +3843,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:6.19.0": - version: 6.19.0 - resolution: "@typescript-eslint/scope-manager@npm:6.19.0" - dependencies: - "@typescript-eslint/types": 6.19.0 - "@typescript-eslint/visitor-keys": 6.19.0 - checksum: 47d9d1b70cd64f9d1bb717090850e0ff1a34e453c28b43fd0cecaea4db05cacebd60f5da55b35c4b3cc01491f02e9de358f82a0822b27c00e80e3d1a27de32d1 - languageName: node - linkType: hard - "@typescript-eslint/scope-manager@npm:6.19.1": version: 6.19.1 resolution: "@typescript-eslint/scope-manager@npm:6.19.1" @@ -3873,12 +3863,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:6.19.0": - version: 6.19.0 - resolution: "@typescript-eslint/type-utils@npm:6.19.0" +"@typescript-eslint/type-utils@npm:6.19.1": + version: 6.19.1 + resolution: "@typescript-eslint/type-utils@npm:6.19.1" dependencies: - "@typescript-eslint/typescript-estree": 6.19.0 - "@typescript-eslint/utils": 6.19.0 + "@typescript-eslint/typescript-estree": 6.19.1 + "@typescript-eslint/utils": 6.19.1 debug: ^4.3.4 ts-api-utils: ^1.0.1 peerDependencies: @@ -3886,7 +3876,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: a88f022617be636f43429a7c7c5cd2e0e29955e96d4a9fed7d03467dc4a432b1240a71009d62213604ddb3522be9694e6b78882ee805687cda107021d1ddb203 + checksum: eab1a30f8d85f7c6e2545de5963fbec2f3bb91913d59623069b4b0db372a671ab048c7018376fc853c3af06ea39417f3e7b27dd665027dd812347a5e64cecd77 languageName: node linkType: hard @@ -3914,13 +3904,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:6.19.0": - version: 6.19.0 - resolution: "@typescript-eslint/types@npm:6.19.0" - checksum: 1371b5ba41c1d2879b3c2823ab01a30cf034e476ef53ff2a7f9e9a4a0056dfbbfecd3143031b05430aa6c749233cacbd01b72cea38a9ece1c6cf95a5cd43da6a - languageName: node - linkType: hard - "@typescript-eslint/types@npm:6.19.1": version: 6.19.1 resolution: "@typescript-eslint/types@npm:6.19.1" @@ -3953,25 +3936,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:6.19.0": - version: 6.19.0 - resolution: "@typescript-eslint/typescript-estree@npm:6.19.0" - dependencies: - "@typescript-eslint/types": 6.19.0 - "@typescript-eslint/visitor-keys": 6.19.0 - debug: ^4.3.4 - globby: ^11.1.0 - is-glob: ^4.0.3 - minimatch: 9.0.3 - semver: ^7.5.4 - ts-api-utils: ^1.0.1 - peerDependenciesMeta: - typescript: - optional: true - checksum: 919f9588840cdab7e0ef6471f4c35d602523b142b2cffeabe9171d6ce65eb7f41614d0cb17e008e0d8e796374821ab053ced35b84642c3b1d491987362f2fdb5 - languageName: node - linkType: hard - "@typescript-eslint/typescript-estree@npm:6.19.1": version: 6.19.1 resolution: "@typescript-eslint/typescript-estree@npm:6.19.1" @@ -4009,20 +3973,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:6.19.0": - version: 6.19.0 - resolution: "@typescript-eslint/utils@npm:6.19.0" +"@typescript-eslint/utils@npm:6.19.1": + version: 6.19.1 + resolution: "@typescript-eslint/utils@npm:6.19.1" dependencies: "@eslint-community/eslint-utils": ^4.4.0 "@types/json-schema": ^7.0.12 "@types/semver": ^7.5.0 - "@typescript-eslint/scope-manager": 6.19.0 - "@typescript-eslint/types": 6.19.0 - "@typescript-eslint/typescript-estree": 6.19.0 + "@typescript-eslint/scope-manager": 6.19.1 + "@typescript-eslint/types": 6.19.1 + "@typescript-eslint/typescript-estree": 6.19.1 semver: ^7.5.4 peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: 05a26251a526232b08850b6c3327637213ef989453e353f3a8255433b74893a70d5c38369c528b762e853b7586d7830d728b372494e65f37770ecb05a88112d4 + checksum: fe72e75c3ea17a85772b83f148555ea94ff5d55d13586f3fc038833197a74f8071e14c2bbf1781c40eec20005f052f4be2513a725eea82a15da3cb9af3046c70 languageName: node linkType: hard @@ -4071,16 +4035,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:6.19.0": - version: 6.19.0 - resolution: "@typescript-eslint/visitor-keys@npm:6.19.0" - dependencies: - "@typescript-eslint/types": 6.19.0 - eslint-visitor-keys: ^3.4.1 - checksum: 35b11143e1b55ecf01e0f513085df2cc83d0781f4a8354dc10f6ec3356f66b91a1ed8abadb6fb66af1c1746f9c874eabc8b5636882466e229cda5d6a39aada08 - languageName: node - linkType: hard - "@typescript-eslint/visitor-keys@npm:6.19.1": version: 6.19.1 resolution: "@typescript-eslint/visitor-keys@npm:6.19.1" @@ -16318,7 +16272,7 @@ __metadata: "@types/redux-logger": ^3.0.12 "@types/sinon": 17.0.3 "@types/sort-json": 2.0.3 - "@typescript-eslint/eslint-plugin": 6.19.0 + "@typescript-eslint/eslint-plugin": 6.19.1 "@typescript-eslint/parser": 6.19.1 "@wireapp/certificate-check": 0.7.8 "@wireapp/commons": 5.2.4 From bd9f6383b677f7c3675516b76dfe5ea74e29d763 Mon Sep 17 00:00:00 2001 From: Timothy LeBon Date: Tue, 23 Jan 2024 12:03:48 +0100 Subject: [PATCH 07/27] feat: download location (#7394) * feat: initial implementation * feat: set download location on event * feat: update translations and finish feature * chore: remove mac restart fix --- electron/src/lib/eventType.ts | 1 + electron/src/locale/ar-SA.json | 3 + electron/src/locale/bn-BD.json | 3 + electron/src/locale/ca-ES.json | 3 + electron/src/locale/cs-CZ.json | 3 + electron/src/locale/da-DK.json | 3 + electron/src/locale/de-DE.json | 3 + electron/src/locale/el-GR.json | 3 + electron/src/locale/en-US.json | 3 + electron/src/locale/es-ES.json | 3 + electron/src/locale/et-EE.json | 3 + electron/src/locale/fa-IR.json | 3 + electron/src/locale/fi-FI.json | 3 + electron/src/locale/fr-FR.json | 3 + electron/src/locale/ga-IE.json | 3 + electron/src/locale/he-IL.json | 3 + electron/src/locale/hi-IN.json | 3 + electron/src/locale/hr-HR.json | 3 + electron/src/locale/hu-HU.json | 3 + electron/src/locale/id-ID.json | 3 + electron/src/locale/is-IS.json | 3 + electron/src/locale/it-IT.json | 3 + electron/src/locale/ja-JP.json | 3 + electron/src/locale/lt-LT.json | 3 + electron/src/locale/lv-LV.json | 3 + electron/src/locale/ms-MY.json | 3 + electron/src/locale/nl-NL.json | 3 + electron/src/locale/no-NO.json | 3 + electron/src/locale/pl-PL.json | 3 + electron/src/locale/pt-BR.json | 3 + electron/src/locale/pt-PT.json | 3 + electron/src/locale/ro-RO.json | 3 + electron/src/locale/ru-RU.json | 3 + electron/src/locale/si-LK.json | 3 + electron/src/locale/sk-SK.json | 3 + electron/src/locale/sl-SI.json | 3 + electron/src/locale/sr-SP.json | 3 + electron/src/locale/sv-SE.json | 3 + electron/src/locale/th-TH.json | 3 + electron/src/locale/tr-TR.json | 3 + electron/src/locale/uk-UA.json | 3 + electron/src/locale/uz-UZ.json | 3 + electron/src/locale/vi-VN.json | 3 + electron/src/locale/zh-CN.json | 3 + electron/src/locale/zh-HK.json | 3 + electron/src/locale/zh-TW.json | 3 + electron/src/main.ts | 32 +++++++++ electron/src/menu/system.ts | 5 +- electron/src/preload/preload-webview.ts | 6 ++ electron/src/settings/SettingsType.ts | 2 + electron/src/settings/config.ts | 1 + package.json | 1 + yarn.lock | 91 ++++++++++++++++++++++++- 53 files changed, 269 insertions(+), 5 deletions(-) diff --git a/electron/src/lib/eventType.ts b/electron/src/lib/eventType.ts index 5c38a4f6640..c1e57eeb4bf 100644 --- a/electron/src/lib/eventType.ts +++ b/electron/src/lib/eventType.ts @@ -32,6 +32,7 @@ export const EVENT_TYPE = { }, ACTION: { CHANGE_ENVIRONMENT: 'EVENT_TYPE.ACTION.CHANGE_ENVIRONMENT', + CHANGE_DOWNLOAD_LOCATION: 'EVENT_TYPE.ACTION.CHANGE_DOWNLOAD_LOCATION', CREATE_SSO_ACCOUNT: 'EVENT_TYPE.ACTION.CREATE_SSO_ACCOUNT', CREATE_SSO_ACCOUNT_RESPONSE: 'EVENT_TYPE.ACTION.CREATE_SSO_ACCOUNT_RESPONSE', DECRYPT: 'EVENT_TYPE.ACTION.DECRYPT', diff --git a/electron/src/locale/ar-SA.json b/electron/src/locale/ar-SA.json index 44bbdbb54f6..3fe4eafd165 100644 --- a/electron/src/locale/ar-SA.json +++ b/electron/src/locale/ar-SA.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "عن {brandName}", "menuAddPeople": "إضافة أشخاص...", "menuAppURL": "موقع الويب لـ {brandName}", diff --git a/electron/src/locale/bn-BD.json b/electron/src/locale/bn-BD.json index 2ca7696a663..51169f6a0c2 100644 --- a/electron/src/locale/bn-BD.json +++ b/electron/src/locale/bn-BD.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "About {brandName}", "menuAddPeople": "Add People...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/ca-ES.json b/electron/src/locale/ca-ES.json index 2ca7696a663..51169f6a0c2 100644 --- a/electron/src/locale/ca-ES.json +++ b/electron/src/locale/ca-ES.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "About {brandName}", "menuAddPeople": "Add People...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/cs-CZ.json b/electron/src/locale/cs-CZ.json index 90c15883d40..a98be6ab1e3 100644 --- a/electron/src/locale/cs-CZ.json +++ b/electron/src/locale/cs-CZ.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "O aplikaci {brandName}", "menuAddPeople": "Přidat kontakty...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/da-DK.json b/electron/src/locale/da-DK.json index 5c7de86451d..df1ff09c411 100644 --- a/electron/src/locale/da-DK.json +++ b/electron/src/locale/da-DK.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "Om {brandName}", "menuAddPeople": "Tilføj personer...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/de-DE.json b/electron/src/locale/de-DE.json index 92e18c0bd28..168c8c0c0e8 100644 --- a/electron/src/locale/de-DE.json +++ b/electron/src/locale/de-DE.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Verbinden", "changeEnvironmentModalText": "Diese Aktion verbindet die App mit einem benutzerdefinierten Server \"{url}\"", "changeEnvironmentModalTitle": "Mit Server verbinden", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "Über {brandName}", "menuAddPeople": "Kontakte hinzufügen...", "menuAppURL": "{brandName}-Webseite", diff --git a/electron/src/locale/el-GR.json b/electron/src/locale/el-GR.json index 96a812b5536..fa3a757f77f 100644 --- a/electron/src/locale/el-GR.json +++ b/electron/src/locale/el-GR.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "Σχετικά με το {brandName}", "menuAddPeople": "Προσθήκη ατόμων...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/en-US.json b/electron/src/locale/en-US.json index 2ca7696a663..51169f6a0c2 100644 --- a/electron/src/locale/en-US.json +++ b/electron/src/locale/en-US.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "About {brandName}", "menuAddPeople": "Add People...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/es-ES.json b/electron/src/locale/es-ES.json index 59c240b8bf7..469ce2f380a 100644 --- a/electron/src/locale/es-ES.json +++ b/electron/src/locale/es-ES.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "Acerca de {brandName}", "menuAddPeople": "Agregar personas...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/et-EE.json b/electron/src/locale/et-EE.json index 297410016ee..2c074067e62 100644 --- a/electron/src/locale/et-EE.json +++ b/electron/src/locale/et-EE.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "Teave {brandName} kohta", "menuAddPeople": "Lisa inimesi...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/fa-IR.json b/electron/src/locale/fa-IR.json index 069021d7dd5..35a90ca8d87 100644 --- a/electron/src/locale/fa-IR.json +++ b/electron/src/locale/fa-IR.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "اتصال", "changeEnvironmentModalText": "این عملیات برنامه را به یک سرور سفارشی به آدرس \"{url}\" وصل می‌کند", "changeEnvironmentModalTitle": "اتصال به سرور", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "درباره {brandName}", "menuAddPeople": "اضافه‌کردن افراد...", "menuAppURL": "وبسایت {brandName}", diff --git a/electron/src/locale/fi-FI.json b/electron/src/locale/fi-FI.json index dec207281a1..651b46eddc3 100644 --- a/electron/src/locale/fi-FI.json +++ b/electron/src/locale/fi-FI.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Yhdistä", "changeEnvironmentModalText": "Tämä toiminto yhdistää sovelluksen kustomoituun palvelimeen \"{url}\"", "changeEnvironmentModalTitle": "Yhdistä palvelimeen", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "Tietoja {brandName}stä", "menuAddPeople": "Lisää ihmisiä...", "menuAppURL": "{brandName} verkkosivu", diff --git a/electron/src/locale/fr-FR.json b/electron/src/locale/fr-FR.json index 41ddf0276c1..5796d374bd6 100644 --- a/electron/src/locale/fr-FR.json +++ b/electron/src/locale/fr-FR.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Se connecter", "changeEnvironmentModalText": "Cette action va connecter l’application au serveur personnalisé « {url} »", "changeEnvironmentModalTitle": "Se connecter au serveur", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "A propos de {brandName}", "menuAddPeople": "Ajouter des contacts...", "menuAppURL": "Site Web de {brandName}", diff --git a/electron/src/locale/ga-IE.json b/electron/src/locale/ga-IE.json index 2ca7696a663..51169f6a0c2 100644 --- a/electron/src/locale/ga-IE.json +++ b/electron/src/locale/ga-IE.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "About {brandName}", "menuAddPeople": "Add People...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/he-IL.json b/electron/src/locale/he-IL.json index 2ca7696a663..51169f6a0c2 100644 --- a/electron/src/locale/he-IL.json +++ b/electron/src/locale/he-IL.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "About {brandName}", "menuAddPeople": "Add People...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/hi-IN.json b/electron/src/locale/hi-IN.json index f21a794ab96..4c6e7c103ca 100644 --- a/electron/src/locale/hi-IN.json +++ b/electron/src/locale/hi-IN.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "{brandName} के बारे में", "menuAddPeople": "Add People...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/hr-HR.json b/electron/src/locale/hr-HR.json index c8bb091fe4d..a1959d8d8ea 100644 --- a/electron/src/locale/hr-HR.json +++ b/electron/src/locale/hr-HR.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "O {brandName}", "menuAddPeople": "Dodaj kontakte...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/hu-HU.json b/electron/src/locale/hu-HU.json index 3b77e857bfe..ea557ee7858 100644 --- a/electron/src/locale/hu-HU.json +++ b/electron/src/locale/hu-HU.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Csatlakozás a szerverhez", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "A {brandName} névjegye", "menuAddPeople": "Partner felvétele...", "menuAppURL": "{brandName} weblap", diff --git a/electron/src/locale/id-ID.json b/electron/src/locale/id-ID.json index a7f0a4b68a5..ec1af46c9c6 100644 --- a/electron/src/locale/id-ID.json +++ b/electron/src/locale/id-ID.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "Tentang {brandName}", "menuAddPeople": "Tambah orang...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/is-IS.json b/electron/src/locale/is-IS.json index 2ca7696a663..51169f6a0c2 100644 --- a/electron/src/locale/is-IS.json +++ b/electron/src/locale/is-IS.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "About {brandName}", "menuAddPeople": "Add People...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/it-IT.json b/electron/src/locale/it-IT.json index 3540ba6f20f..f00def31c1a 100644 --- a/electron/src/locale/it-IT.json +++ b/electron/src/locale/it-IT.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connetti", "changeEnvironmentModalText": "Questa azione collegherà l'app a un server personalizzato \"{url}\"", "changeEnvironmentModalTitle": "Connetti al server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "A proposito di {brandName}", "menuAddPeople": "Aggiungi persone...", "menuAppURL": "{brandName} Sito Web", diff --git a/electron/src/locale/ja-JP.json b/electron/src/locale/ja-JP.json index d717ea336fc..c5b65caaac3 100644 --- a/electron/src/locale/ja-JP.json +++ b/electron/src/locale/ja-JP.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "接続", "changeEnvironmentModalText": "このアクションは、アプリをカスタムサーバー\"{url}\"に接続します", "changeEnvironmentModalTitle": "サーバーに接続", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "{brandName}について", "menuAddPeople": "友達を追加", "menuAppURL": "{brandName} のWeb サイト", diff --git a/electron/src/locale/lt-LT.json b/electron/src/locale/lt-LT.json index 4746bdeff00..ac791c29340 100644 --- a/electron/src/locale/lt-LT.json +++ b/electron/src/locale/lt-LT.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Prisijungti", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Prisijungti prie serverio", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "Apie {brandName}", "menuAddPeople": "Pridėti žmones...", "menuAppURL": "{brandName} internetinė svetainė", diff --git a/electron/src/locale/lv-LV.json b/electron/src/locale/lv-LV.json index dde992fad8d..23e50be4d92 100644 --- a/electron/src/locale/lv-LV.json +++ b/electron/src/locale/lv-LV.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "Par {brandName}", "menuAddPeople": "Pievienot Personas...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/ms-MY.json b/electron/src/locale/ms-MY.json index 2ca7696a663..51169f6a0c2 100644 --- a/electron/src/locale/ms-MY.json +++ b/electron/src/locale/ms-MY.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "About {brandName}", "menuAddPeople": "Add People...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/nl-NL.json b/electron/src/locale/nl-NL.json index da719f57b77..ef877746ad2 100644 --- a/electron/src/locale/nl-NL.json +++ b/electron/src/locale/nl-NL.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Verbinden", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Verbinden met server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "Over {brandName}", "menuAddPeople": "Deelnemers toevoegen...", "menuAppURL": "{brandName} website", diff --git a/electron/src/locale/no-NO.json b/electron/src/locale/no-NO.json index bb5c57406a1..a9cd29f8a4c 100644 --- a/electron/src/locale/no-NO.json +++ b/electron/src/locale/no-NO.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Koble til", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "Om {brandName}", "menuAddPeople": "Legg til kontakter ...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/pl-PL.json b/electron/src/locale/pl-PL.json index 24311969c97..6453ab3bc6a 100644 --- a/electron/src/locale/pl-PL.json +++ b/electron/src/locale/pl-PL.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Połącz", "changeEnvironmentModalText": "Ta akcja pozwoli na połączenie tej aplikacji z niestandardowym serwerem \"{url}\"", "changeEnvironmentModalTitle": "Połącz z serwerem", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "O {brandName}", "menuAddPeople": "Dodaj osoby...", "menuAppURL": "Strona internetowa {brandName}", diff --git a/electron/src/locale/pt-BR.json b/electron/src/locale/pt-BR.json index a5e44aa45e0..8b8eac7dfc4 100644 --- a/electron/src/locale/pt-BR.json +++ b/electron/src/locale/pt-BR.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Conectar", "changeEnvironmentModalText": "Esta ação conectará o aplicativo a um servidor personalizado \"{url}\"", "changeEnvironmentModalTitle": "Conectar ao servidor", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "Sobre o {brandName}", "menuAddPeople": "Adicionar Pessoas...", "menuAppURL": "Site do {brandName}", diff --git a/electron/src/locale/pt-PT.json b/electron/src/locale/pt-PT.json index 8b24ccde7e1..8405c6788b3 100644 --- a/electron/src/locale/pt-PT.json +++ b/electron/src/locale/pt-PT.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "Sobre o {brandName}", "menuAddPeople": "Adicionar Pessoas...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/ro-RO.json b/electron/src/locale/ro-RO.json index 757eb02ddcd..74f559cf957 100644 --- a/electron/src/locale/ro-RO.json +++ b/electron/src/locale/ro-RO.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "Despre {brandName}", "menuAddPeople": "Adaugă persoane...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/ru-RU.json b/electron/src/locale/ru-RU.json index 9fea30c5efa..995aa09944c 100644 --- a/electron/src/locale/ru-RU.json +++ b/electron/src/locale/ru-RU.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Подключиться", "changeEnvironmentModalText": "Это действие подключит приложение к пользовательскому серверу \"{url}\"", "changeEnvironmentModalTitle": "Подключиться к серверу", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "О {brandName}", "menuAddPeople": "Добавить участников...", "menuAppURL": "Сайт {brandName}", diff --git a/electron/src/locale/si-LK.json b/electron/src/locale/si-LK.json index 3f01eb98ac1..6404848c605 100644 --- a/electron/src/locale/si-LK.json +++ b/electron/src/locale/si-LK.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "සම්බන්ධ වන්න", "changeEnvironmentModalText": "මෙම ක්‍රියාමාර්ගය යෙදුම \"{url}\" අභිරුචි සේවාදායකයට සම්බන්ධ කරනු ඇත", "changeEnvironmentModalTitle": "සේවාදායකයට සම්බන්ධ වන්න", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "{brandName} පිළිබඳව ", "menuAddPeople": "මිනිසුන් එකතු කරන්න...", "menuAppURL": "{brandName} වියමන අඩවිය", diff --git a/electron/src/locale/sk-SK.json b/electron/src/locale/sk-SK.json index a77d228ac42..7c4e192f16d 100644 --- a/electron/src/locale/sk-SK.json +++ b/electron/src/locale/sk-SK.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "O aplikácii", "menuAddPeople": "Pridať ľudí...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/sl-SI.json b/electron/src/locale/sl-SI.json index 41a76b1c397..526f7104cf8 100644 --- a/electron/src/locale/sl-SI.json +++ b/electron/src/locale/sl-SI.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "O aplikaciji {brandName}", "menuAddPeople": "Dodaj osebe...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/sr-SP.json b/electron/src/locale/sr-SP.json index 03b69dab526..a86613cbdd5 100644 --- a/electron/src/locale/sr-SP.json +++ b/electron/src/locale/sr-SP.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "О Вајеру", "menuAddPeople": "Додај особе...", "menuAppURL": "{brandName} веб сајт", diff --git a/electron/src/locale/sv-SE.json b/electron/src/locale/sv-SE.json index 7f038e0c6b7..178279042a3 100644 --- a/electron/src/locale/sv-SE.json +++ b/electron/src/locale/sv-SE.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "Om {brandName}", "menuAddPeople": "Lägg till personer...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/th-TH.json b/electron/src/locale/th-TH.json index 2ca7696a663..51169f6a0c2 100644 --- a/electron/src/locale/th-TH.json +++ b/electron/src/locale/th-TH.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "About {brandName}", "menuAddPeople": "Add People...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/tr-TR.json b/electron/src/locale/tr-TR.json index 1a899be798a..14a3418a5a4 100644 --- a/electron/src/locale/tr-TR.json +++ b/electron/src/locale/tr-TR.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Bağlan", "changeEnvironmentModalText": "\"{url}\" sunucusuna bağlanacaksınız.", "changeEnvironmentModalTitle": "Sunucuya bağlan", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "{brandName} Hakkında", "menuAddPeople": "İnsanları Ekle...", "menuAppURL": "{brandName} Web sitesi", diff --git a/electron/src/locale/uk-UA.json b/electron/src/locale/uk-UA.json index c2a189e9fd3..6b9d8d85705 100644 --- a/electron/src/locale/uk-UA.json +++ b/electron/src/locale/uk-UA.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Підключити", "changeEnvironmentModalText": "Ця дія підключить додаток до користувацького сервера \"{url}\"", "changeEnvironmentModalTitle": "Підключення до сервера", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "Про {brandName}", "menuAddPeople": "Додати учасників...", "menuAppURL": "Веб-сторінка {brandName}", diff --git a/electron/src/locale/uz-UZ.json b/electron/src/locale/uz-UZ.json index 2ca7696a663..51169f6a0c2 100644 --- a/electron/src/locale/uz-UZ.json +++ b/electron/src/locale/uz-UZ.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "About {brandName}", "menuAddPeople": "Add People...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/vi-VN.json b/electron/src/locale/vi-VN.json index 2ca7696a663..51169f6a0c2 100644 --- a/electron/src/locale/vi-VN.json +++ b/electron/src/locale/vi-VN.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "Connect", "changeEnvironmentModalText": "This action will connect the app to a custom server \"{url}\"", "changeEnvironmentModalTitle": "Connect to server", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: \n {path}", + "enforcedDownloadButton": "OK", "menuAbout": "About {brandName}", "menuAddPeople": "Add People...", "menuAppURL": "{brandName} Website", diff --git a/electron/src/locale/zh-CN.json b/electron/src/locale/zh-CN.json index 03b777e2156..e21f1d0d280 100644 --- a/electron/src/locale/zh-CN.json +++ b/electron/src/locale/zh-CN.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "添加好友", "changeEnvironmentModalText": "该操作会将应用程序连接至自定义服务器\"{url}\"", "changeEnvironmentModalTitle": "连接到服务器", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "关于{brandName}", "menuAddPeople": "关于联系人", "menuAppURL": "{brandName} 网站", diff --git a/electron/src/locale/zh-HK.json b/electron/src/locale/zh-HK.json index 96df1b1b8cc..5c81b7f3c12 100644 --- a/electron/src/locale/zh-HK.json +++ b/electron/src/locale/zh-HK.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "連線", "changeEnvironmentModalText": "該行動會將軟體連線至自定義伺服器\"{url}\"", "changeEnvironmentModalTitle": "連線到伺服器", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "關於{brandName}", "menuAddPeople": "新增連絡人", "menuAppURL": "{brandName} 網站", diff --git a/electron/src/locale/zh-TW.json b/electron/src/locale/zh-TW.json index 91023b2b5e5..17c7a997cfc 100644 --- a/electron/src/locale/zh-TW.json +++ b/electron/src/locale/zh-TW.json @@ -17,6 +17,9 @@ "changeEnvironmentModalConfirm": "連接", "changeEnvironmentModalText": "該行動會將軟體連接至自定義伺服器\"{url}\"", "changeEnvironmentModalTitle": "連線到伺服器", + "enforcedDownloadComplete": "Download completed", + "enforcedDownloadMessage": "The file was downloaded. You’ll find the file in the following folder on your computer: {path}", + "enforcedDownloadButton": "OK", "menuAbout": "關於{brandName}", "menuAddPeople": "新增連絡人", "menuAppURL": "{brandName} 網站", diff --git a/electron/src/main.ts b/electron/src/main.ts index 71e593a2b97..3bb427c06cc 100644 --- a/electron/src/main.ts +++ b/electron/src/main.ts @@ -20,6 +20,7 @@ import * as remoteMain from '@electron/remote/main'; import { app, + dialog, BrowserWindow, BrowserWindowConstructorOptions, Event as ElectronEvent, @@ -30,6 +31,7 @@ import { safeStorage, HandlerDetails, } from 'electron'; +import electronDl from 'electron-dl'; import windowStateKeeper from 'electron-window-state'; import fs from 'fs-extra'; import {getProxySettings} from 'get-proxy-settings'; @@ -80,6 +82,8 @@ const LOG_FILE = path.join(LOG_DIR, 'electron.log'); const PRELOAD_JS = path.join(APP_PATH, 'dist/preload/preload-app.js'); const PRELOAD_RENDERER_JS = path.join(APP_PATH, 'dist/preload/preload-webview.js'); const WRAPPER_CSS = path.join(APP_PATH, 'css/wrapper.css'); +const ICON = path.join(APP_PATH, 'img/download-dialog/logo@2x.png'); + const WINDOW_SIZE = { DEFAULT_HEIGHT: 768, DEFAULT_WIDTH: 1024, @@ -98,6 +102,25 @@ const fileBasedProxyConfig = settings.restore(SettingsType.P const logger = getLogger(path.basename(__filename)); const currentLocale = locale.getCurrent(); const startHidden = Boolean(argv[config.ARGUMENT.STARTUP] || argv[config.ARGUMENT.HIDDEN]); +const customDownloadPath = settings.restore(SettingsType.DOWNLOAD_PATH); + +if (customDownloadPath) { + electronDl({ + directory: customDownloadPath, + saveAs: false, + onCompleted: () => { + dialog.showMessageBox({ + type: 'none', + icon: ICON, + title: locale.getText('enforcedDownloadComplete'), + message: locale.getText('enforcedDownloadMessage', { + path: customDownloadPath ?? app.getPath('downloads'), + }), + buttons: [locale.getText('enforcedDownloadButton')], + }); + }, + }); +} if (argv[config.ARGUMENT.VERSION]) { console.info(config.version); @@ -186,6 +209,15 @@ const bindIpcEvents = (): void => { ipcMain.on(EVENT_TYPE.ABOUT.SHOW, () => AboutWindow.showWindow()); ipcMain.handle(EVENT_TYPE.ACTION.GET_OG_DATA, (_event, url) => getOpenGraphDataAsync(url)); + + ipcMain.on(EVENT_TYPE.ACTION.CHANGE_DOWNLOAD_LOCATION, (_event, downloadPath?: string) => { + if (downloadPath) { + fs.ensureDirSync(downloadPath); + } + //save the downloadPath locally + settings.save(SettingsType.DOWNLOAD_PATH, downloadPath); + settings.persistToFile(); + }); }; const checkConfigV0FullScreen = (mainWindowState: windowStateKeeper.State): void => { diff --git a/electron/src/menu/system.ts b/electron/src/menu/system.ts index eeffb2b1e47..2c9e629560f 100644 --- a/electron/src/menu/system.ts +++ b/electron/src/menu/system.ts @@ -381,10 +381,7 @@ const processMenu = (template: Iterable, language: l const showRestartMessageBox = async () => { const {response} = await dialog.showMessageBox({ - buttons: [ - locale.getText('restartLater'), - EnvironmentUtil.platform.IS_MAC_OS ? locale.getText('menuQuit') : locale.getText('restartNow'), - ], + buttons: [locale.getText('restartLater'), locale.getText('restartNow')], message: locale.getText('restartLocale'), title: locale.getText('restartNeeded'), type: 'info', diff --git a/electron/src/preload/preload-webview.ts b/electron/src/preload/preload-webview.ts index 765563129c7..7e7df2a17a3 100644 --- a/electron/src/preload/preload-webview.ts +++ b/electron/src/preload/preload-webview.ts @@ -130,6 +130,12 @@ const subscribeToWebappEvents = (): void => { ipcRenderer.sendToHost(EVENT_TYPE.ACCOUNT.UPDATE_INFO, info); }); + window.amplify.subscribe(WebAppEvents.TEAM.DOWNLOAD_PATH_UPDATE, (downloadPath?: string) => { + logger.info(`Received amplify event ${WebAppEvents.TEAM.DOWNLOAD_PATH_UPDATE}:`, `"${downloadPath}",`); + logger.info('forwarding last event ...'); + ipcRenderer.send(EVENT_TYPE.ACTION.CHANGE_DOWNLOAD_LOCATION, downloadPath); + }); + window.addEventListener(WebAppEvents.LIFECYCLE.CHANGE_ENVIRONMENT, event => { const data = (event as CustomEvent).detail; if (data) { diff --git a/electron/src/settings/SettingsType.ts b/electron/src/settings/SettingsType.ts index 7ab4745af67..e4ff2cf32c0 100644 --- a/electron/src/settings/SettingsType.ts +++ b/electron/src/settings/SettingsType.ts @@ -36,6 +36,8 @@ export enum SettingsType { AUTO_LAUNCH = 'shouldAutoLaunch', /** Custom web app URL to use in on-premise deployments. The "env" setting must be set to "CUSTOM" to use this. */ CUSTOM_WEBAPP_URL = 'customWebAppURL', + /** Custom download path for the app. */ + DOWNLOAD_PATH = 'downloadPath', /** Enable spell checker in desktop app? */ ENABLE_SPELL_CHECKING = 'enableSpellChecking', /** Which cloud environment ("PRODUCTION", "INTERNAL", "AVS", ...) to use when loading the webapp? */ diff --git a/electron/src/settings/config.ts b/electron/src/settings/config.ts index 6686f71a5ca..26f40ed6346 100644 --- a/electron/src/settings/config.ts +++ b/electron/src/settings/config.ts @@ -62,6 +62,7 @@ enum ARGUMENT { STARTUP = 'startup', USER_DATA_DIR = 'user_data_dir', VERSION = 'version', + DLPATH = 'dlpath', } export const config = { diff --git a/package.json b/package.json index 4558cccec97..45284f82019 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "auto-launch": "5.0.6", "axios": "0.21.2", "content-type": "1.0.5", + "electron-dl": "^3.5.1", "electron-window-state": "5.0.3", "fs-extra": "10.1.0", "get-proxy-settings": "0.1.13", diff --git a/yarn.lock b/yarn.lock index ab95dd200b2..ebb06319f67 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6912,6 +6912,17 @@ __metadata: languageName: node linkType: hard +"electron-dl@npm:^3.5.1": + version: 3.5.1 + resolution: "electron-dl@npm:3.5.1" + dependencies: + ext-name: ^5.0.0 + pupa: ^2.0.1 + unused-filename: ^2.1.0 + checksum: 3d176b2005bfafce5ce5e1f4a8c445dbe5efac4db41153296d59e026cacc8a5c538ed9c40c856a781dac2b1aef6a5c6e59a76aa316138ed1e07a082e0b36d449 + languageName: node + linkType: hard + "electron-mocha@npm:12.2.0": version: 12.2.0 resolution: "electron-mocha@npm:12.2.0" @@ -7422,6 +7433,13 @@ __metadata: languageName: node linkType: hard +"escape-goat@npm:^2.0.0": + version: 2.1.1 + resolution: "escape-goat@npm:2.1.1" + checksum: ce05c70c20dd7007b60d2d644b625da5412325fdb57acf671ba06cb2ab3cd6789e2087026921a05b665b0a03fadee2955e7fc0b9a67da15a6551a980b260eba7 + languageName: node + linkType: hard + "escape-string-regexp@npm:4.0.0, escape-string-regexp@npm:^4.0.0": version: 4.0.0 resolution: "escape-string-regexp@npm:4.0.0" @@ -8238,6 +8256,25 @@ __metadata: languageName: node linkType: hard +"ext-list@npm:^2.0.0": + version: 2.2.2 + resolution: "ext-list@npm:2.2.2" + dependencies: + mime-db: ^1.28.0 + checksum: 9b2426bea312e674eeced62c5f18407ab9a8653bbdfbde36492331c7973dab7fbf9e11d6c38605786168b42da333910314988097ca06eee61f1b9b57efae3f18 + languageName: node + linkType: hard + +"ext-name@npm:^5.0.0": + version: 5.0.0 + resolution: "ext-name@npm:5.0.0" + dependencies: + ext-list: ^2.0.0 + sort-keys-length: ^1.0.0 + checksum: f598269bd5de4295540ea7d6f8f6a01d82a7508f148b7700a05628ef6121648d26e6e5e942049e953b3051863df6b54bd8fe951e7877f185e34ace5d44370b33 + 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" @@ -9991,6 +10028,13 @@ __metadata: languageName: node linkType: hard +"is-plain-obj@npm:^1.0.0": + version: 1.1.0 + resolution: "is-plain-obj@npm:1.1.0" + checksum: 0ee04807797aad50859652a7467481816cbb57e5cc97d813a7dcd8915da8195dc68c436010bf39d195226cde6a2d352f4b815f16f26b7bf486a5754290629931 + languageName: node + linkType: hard + "is-plain-obj@npm:^2.1.0": version: 2.1.0 resolution: "is-plain-obj@npm:2.1.0" @@ -11918,7 +11962,7 @@ __metadata: languageName: node linkType: hard -"mime-db@npm:1.52.0": +"mime-db@npm:1.52.0, mime-db@npm:^1.28.0": version: 1.52.0 resolution: "mime-db@npm:1.52.0" checksum: 0d99a03585f8b39d68182803b12ac601d9c01abfa28ec56204fa330bc9f3d1c5e14beb049bafadb3dbdf646dfb94b87e24d4ec7b31b7279ef906a8ea9b6a513f @@ -12157,6 +12201,13 @@ __metadata: languageName: node linkType: hard +"modify-filename@npm:^1.1.0": + version: 1.1.0 + resolution: "modify-filename@npm:1.1.0" + checksum: a1d104cf99ade063c05c79e4db47ef6263a116386568d7661ae4a00a390da72d5944070a64dba09867231a8eb6cbab57498ada99cb4b5ae0fded10831995079b + languageName: node + linkType: hard + "ms@npm:2.0.0": version: 2.0.0 resolution: "ms@npm:2.0.0" @@ -13392,6 +13443,15 @@ __metadata: languageName: node linkType: hard +"pupa@npm:^2.0.1": + version: 2.1.1 + resolution: "pupa@npm:2.1.1" + dependencies: + escape-goat: ^2.0.0 + checksum: 49529e50372ffdb0cccf0efa0f3b3cb0a2c77805d0d9cc2725bd2a0f6bb414631e61c93a38561b26be1259550b7bb6c2cb92315aa09c8bf93f3bdcb49f2b2fb7 + languageName: node + linkType: hard + "pure-rand@npm:^6.0.0": version: 6.0.2 resolution: "pure-rand@npm:6.0.2" @@ -14547,6 +14607,24 @@ __metadata: languageName: node linkType: hard +"sort-keys-length@npm:^1.0.0": + version: 1.0.1 + resolution: "sort-keys-length@npm:1.0.1" + dependencies: + sort-keys: ^1.0.0 + checksum: f9acac5fb31580a9e3d43b419dc86a1b75e85b79036a084d95dd4d1062b621c9589906588ac31e370a0dd381be46d8dbe900efa306d087ca9c912d7a59b5a590 + languageName: node + linkType: hard + +"sort-keys@npm:^1.0.0": + version: 1.1.2 + resolution: "sort-keys@npm:1.1.2" + dependencies: + is-plain-obj: ^1.0.0 + checksum: 5963fd191a2a185a5ec86f06e47721e8e04713eda43bb04ae60d2a8afb21241553dd5bc9d863ed2bd7c3d541b609b0c8d0e58836b1a3eb6764c09c094bcc8b00 + languageName: node + linkType: hard + "source-map-js@npm:^1.0.2": version: 1.0.2 resolution: "source-map-js@npm:1.0.2" @@ -15744,6 +15822,16 @@ __metadata: languageName: node linkType: hard +"unused-filename@npm:^2.1.0": + version: 2.1.0 + resolution: "unused-filename@npm:2.1.0" + dependencies: + modify-filename: ^1.1.0 + path-exists: ^4.0.0 + checksum: 66fb62b5043a6a87dc30960778ba3d836fb45fef9b7e29a842fce12f25ffc5936e350dc281b79a73ff5498c515504538e72b529993759178156398fcdb8491a5 + languageName: node + linkType: hard + "update-browserslist-db@npm:^1.0.10, update-browserslist-db@npm:^1.0.11": version: 1.0.11 resolution: "update-browserslist-db@npm:1.0.11" @@ -16299,6 +16387,7 @@ __metadata: dotenv: 16.3.2 electron: 27.2.4 electron-builder: 24.9.1 + electron-dl: ^3.5.1 electron-mocha: 12.2.0 electron-packager: 17.1.2 electron-window-state: 5.0.3 From e812afa285be35bcb7fc6d394806ff92ee1293a0 Mon Sep 17 00:00:00 2001 From: Timothy Le Bon Date: Tue, 23 Jan 2024 12:06:58 +0100 Subject: [PATCH 08/27] chore: issue with button text --- electron/src/menu/system.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/electron/src/menu/system.ts b/electron/src/menu/system.ts index 2c9e629560f..eeffb2b1e47 100644 --- a/electron/src/menu/system.ts +++ b/electron/src/menu/system.ts @@ -381,7 +381,10 @@ const processMenu = (template: Iterable, language: l const showRestartMessageBox = async () => { const {response} = await dialog.showMessageBox({ - buttons: [locale.getText('restartLater'), locale.getText('restartNow')], + buttons: [ + locale.getText('restartLater'), + EnvironmentUtil.platform.IS_MAC_OS ? locale.getText('menuQuit') : locale.getText('restartNow'), + ], message: locale.getText('restartLocale'), title: locale.getText('restartNeeded'), type: 'info', From 0808e5fe4d18306310e9da12cc7329713d45bbe4 Mon Sep 17 00:00:00 2001 From: Virgile <78490891+V-Gira@users.noreply.github.com> Date: Tue, 23 Jan 2024 13:36:45 +0100 Subject: [PATCH 09/27] fix: make the release and information url configurable by end user (WPB-5579) (#7480) --- bin/build-tools/lib/Config.ts | 2 ++ bin/build-tools/lib/commonConfig.ts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/bin/build-tools/lib/Config.ts b/bin/build-tools/lib/Config.ts index 5f583b8b51b..9b78be4c954 100644 --- a/bin/build-tools/lib/Config.ts +++ b/bin/build-tools/lib/Config.ts @@ -18,6 +18,8 @@ */ export interface CommonConfig { + aboutReleasesUrl: string; + aboutUpdatesUrl: string; adminUrl: string; appBase: string; buildDir: string; diff --git a/bin/build-tools/lib/commonConfig.ts b/bin/build-tools/lib/commonConfig.ts index 133f87d8012..add4afda7f7 100644 --- a/bin/build-tools/lib/commonConfig.ts +++ b/bin/build-tools/lib/commonConfig.ts @@ -53,6 +53,8 @@ export async function getCommonConfig(envFile: string, wireJson: string): Promis const commonConfig: CommonConfig = { ...defaultConfig, + aboutReleasesUrl: process.env.URL_ABOUT_RELEASES || defaultConfig.aboutReleasesUrl, + aboutUpdatesUrl: process.env.URL_ABOUT_UPDATES || defaultConfig.aboutUpdatesUrl, adminUrl: process.env.URL_ADMIN || defaultConfig.adminUrl, appBase: process.env.APP_BASE || defaultConfig.appBase, buildDir: defaultConfig.buildDir || 'wrap/build', From 0fde83665897988ae4ed25ace72c203eee7c76f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 04:19:11 +0000 Subject: [PATCH 10/27] build(deps-dev): bump dotenv from 16.3.2 to 16.4.0 (#7481) Bumps [dotenv](https://github.com/motdotla/dotenv) from 16.3.2 to 16.4.0. - [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md) - [Commits](https://github.com/motdotla/dotenv/compare/v16.3.2...v16.4.0) --- updated-dependencies: - dependency-name: dotenv dependency-type: direct:development update-type: version-update:semver-minor ... 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 45284f82019..a7f003e67b5 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "core-js": "3.35.1", "cross-env": "7.0.3", "css-loader": "6.9.1", - "dotenv": "16.3.2", + "dotenv": "16.4.0", "electron": "27.2.4", "electron-builder": "24.9.1", "electron-mocha": "12.2.0", diff --git a/yarn.lock b/yarn.lock index ebb06319f67..144dada4b95 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6848,10 +6848,10 @@ __metadata: languageName: node linkType: hard -"dotenv@npm:16.3.2": - version: 16.3.2 - resolution: "dotenv@npm:16.3.2" - checksum: 917b27eeb654b95846484009326b1c52af7a7c25f7b09e2939ed49de8f98cb9895dcc04f13a39cdb078d247985e21147311ccb5bfbf2fd151afb20fa8f96de15 +"dotenv@npm:16.4.0": + version: 16.4.0 + resolution: "dotenv@npm:16.4.0" + checksum: f39dccc0eb25345675045d91762b8c92fc853402a8b25ba02723a7e27da58cefe0593771bbea97781df09300514eedb393b6c8f7bfa547fd9f7b69f0c965cbdb languageName: node linkType: hard @@ -16384,7 +16384,7 @@ __metadata: core-js: 3.35.1 cross-env: 7.0.3 css-loader: 6.9.1 - dotenv: 16.3.2 + dotenv: 16.4.0 electron: 27.2.4 electron-builder: 24.9.1 electron-dl: ^3.5.1 From 0d91902b87a9219286b3f0d2da112f9d27f718d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 04:23:30 +0000 Subject: [PATCH 11/27] build(deps-dev): bump aws-sdk from 2.1541.0 to 2.1542.0 (#7482) Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1541.0 to 2.1542.0. - [Release notes](https://github.com/aws/aws-sdk-js/releases) - [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1541.0...v2.1542.0) --- updated-dependencies: - dependency-name: aws-sdk dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index a7f003e67b5..2696d6322c0 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "@wireapp/eslint-config": "3.0.5", "@wireapp/prettier-config": "0.6.3", "adm-zip": "0.5.10", - "aws-sdk": "2.1541.0", + "aws-sdk": "2.1542.0", "babel-core": "7.0.0-bridge.0", "babel-eslint": "10.1.0", "babel-jest": "29.7.0", diff --git a/yarn.lock b/yarn.lock index 144dada4b95..b3120274e7b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5073,9 +5073,9 @@ __metadata: languageName: node linkType: hard -"aws-sdk@npm:2.1541.0": - version: 2.1541.0 - resolution: "aws-sdk@npm:2.1541.0" +"aws-sdk@npm:2.1542.0": + version: 2.1542.0 + resolution: "aws-sdk@npm:2.1542.0" dependencies: buffer: 4.9.2 events: 1.1.1 @@ -5086,8 +5086,8 @@ __metadata: url: 0.10.3 util: ^0.12.4 uuid: 8.0.0 - xml2js: 0.5.0 - checksum: 7cf0264012f95e696bb89503e76c368887582aa31d16fb7578fc8f8ec6cb07c786ed2bf3eda6edb1ec0a165875f9cea447b70e0fb7699de36aaba1e742886d16 + xml2js: 0.6.2 + checksum: 224176b3ea28ace16f640eb337193de85103386be40786161a603c4624c8becbe79ec269bd25492946fff66887e0016fc78309ff39a6e7a0f3a23aac475ef0d7 languageName: node linkType: hard @@ -16372,7 +16372,7 @@ __metadata: "@wireapp/webapp-events": 0.20.1 adm-zip: 0.5.10 auto-launch: 5.0.6 - aws-sdk: 2.1541.0 + aws-sdk: 2.1542.0 axios: 0.21.2 babel-core: 7.0.0-bridge.0 babel-eslint: 10.1.0 @@ -16558,13 +16558,13 @@ __metadata: languageName: node linkType: hard -"xml2js@npm:0.5.0": - version: 0.5.0 - resolution: "xml2js@npm:0.5.0" +"xml2js@npm:0.6.2": + version: 0.6.2 + resolution: "xml2js@npm:0.6.2" dependencies: sax: ">=0.6.0" xmlbuilder: ~11.0.0 - checksum: 1aa71d62e5bc2d89138e3929b9ea46459157727759cbc62ef99484b778641c0cd21fb637696c052d901a22f82d092a3e740a16b4ce218e81ac59b933535124ea + checksum: 458a83806193008edff44562c0bdb982801d61ee7867ae58fd35fab781e69e17f40dfeb8fc05391a4648c9c54012066d3955fe5d993ffbe4dc63399023f32ac2 languageName: node linkType: hard From 4caca15ae3ef4174283523351d328b2d8d82824d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 04:30:21 +0000 Subject: [PATCH 12/27] build(deps): bump @wireapp/react-ui-kit from 9.12.7 to 9.12.8 (#7483) Bumps [@wireapp/react-ui-kit](https://github.com/wireapp/wire-web-packages) from 9.12.7 to 9.12.8. - [Commits](https://github.com/wireapp/wire-web-packages/compare/@wireapp/react-ui-kit@9.12.7...@wireapp/react-ui-kit@9.12.8) --- updated-dependencies: - dependency-name: "@wireapp/react-ui-kit" dependency-type: direct:production update-type: version-update:semver-patch ... 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 2696d6322c0..6418f8d23a3 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@wireapp/certificate-check": "0.7.8", "@wireapp/commons": "5.2.4", "@wireapp/protocol-messaging": "1.44.0", - "@wireapp/react-ui-kit": "9.12.7", + "@wireapp/react-ui-kit": "9.12.8", "@wireapp/webapp-events": "0.20.1", "auto-launch": "5.0.6", "axios": "0.21.2", diff --git a/yarn.lock b/yarn.lock index b3120274e7b..72ddbdf3ff9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4338,9 +4338,9 @@ __metadata: languageName: node linkType: hard -"@wireapp/react-ui-kit@npm:9.12.7": - version: 9.12.7 - resolution: "@wireapp/react-ui-kit@npm:9.12.7" +"@wireapp/react-ui-kit@npm:9.12.8": + version: 9.12.8 + resolution: "@wireapp/react-ui-kit@npm:9.12.8" dependencies: "@types/color": 3.0.6 color: 4.2.3 @@ -4355,7 +4355,7 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: e31a97b6380decd1705dd2b3603a9e59b6e9a7f0e193c718ace0f58dde634aedc6ede11d7574ca37e4e9c6440c80c81fc7a6321bd7d03e751fa788a89b7b4eae + checksum: eaab4ee5abbc36b1b5a50511b7b7824c9f7f717b2b852a35fac148ecb505f1f2a3ad910ecfd3b54c16de04b0fd7284ef60442a957e78da7a25f20a466c6b7fa5 languageName: node linkType: hard @@ -16368,7 +16368,7 @@ __metadata: "@wireapp/eslint-config": 3.0.5 "@wireapp/prettier-config": 0.6.3 "@wireapp/protocol-messaging": 1.44.0 - "@wireapp/react-ui-kit": 9.12.7 + "@wireapp/react-ui-kit": 9.12.8 "@wireapp/webapp-events": 0.20.1 adm-zip: 0.5.10 auto-launch: 5.0.6 From 30378c346dda434d0cbe9d9e51c5195520c8dd23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 04:14:49 +0000 Subject: [PATCH 13/27] build(deps-dev): bump dotenv from 16.4.0 to 16.4.1 (#7486) Bumps [dotenv](https://github.com/motdotla/dotenv) from 16.4.0 to 16.4.1. - [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md) - [Commits](https://github.com/motdotla/dotenv/compare/v16.4.0...v16.4.1) --- updated-dependencies: - dependency-name: dotenv dependency-type: direct:development update-type: version-update:semver-patch ... 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 6418f8d23a3..174fd4e98bf 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "core-js": "3.35.1", "cross-env": "7.0.3", "css-loader": "6.9.1", - "dotenv": "16.4.0", + "dotenv": "16.4.1", "electron": "27.2.4", "electron-builder": "24.9.1", "electron-mocha": "12.2.0", diff --git a/yarn.lock b/yarn.lock index 72ddbdf3ff9..f4949e2ee2a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6848,10 +6848,10 @@ __metadata: languageName: node linkType: hard -"dotenv@npm:16.4.0": - version: 16.4.0 - resolution: "dotenv@npm:16.4.0" - checksum: f39dccc0eb25345675045d91762b8c92fc853402a8b25ba02723a7e27da58cefe0593771bbea97781df09300514eedb393b6c8f7bfa547fd9f7b69f0c965cbdb +"dotenv@npm:16.4.1": + version: 16.4.1 + resolution: "dotenv@npm:16.4.1" + checksum: a343f0a1d156deef8c60034f797969867af4dbccfacedd4ac15fad04547e7ffe0553b58fc3b27a5837950f0d977e38e9234943fbcec4aeced4e3d044309a76ab languageName: node linkType: hard @@ -16384,7 +16384,7 @@ __metadata: core-js: 3.35.1 cross-env: 7.0.3 css-loader: 6.9.1 - dotenv: 16.4.0 + dotenv: 16.4.1 electron: 27.2.4 electron-builder: 24.9.1 electron-dl: ^3.5.1 From c0966517e0b7b1f6046ad1daf069792b8c17c1b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 04:17:06 +0000 Subject: [PATCH 14/27] build(deps-dev): bump aws-sdk from 2.1542.0 to 2.1543.0 (#7487) Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1542.0 to 2.1543.0. - [Release notes](https://github.com/aws/aws-sdk-js/releases) - [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1542.0...v2.1543.0) --- updated-dependencies: - dependency-name: aws-sdk dependency-type: direct:development update-type: version-update:semver-minor ... 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 174fd4e98bf..b81b0bb9fd6 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "@wireapp/eslint-config": "3.0.5", "@wireapp/prettier-config": "0.6.3", "adm-zip": "0.5.10", - "aws-sdk": "2.1542.0", + "aws-sdk": "2.1543.0", "babel-core": "7.0.0-bridge.0", "babel-eslint": "10.1.0", "babel-jest": "29.7.0", diff --git a/yarn.lock b/yarn.lock index f4949e2ee2a..bddd850c73a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5073,9 +5073,9 @@ __metadata: languageName: node linkType: hard -"aws-sdk@npm:2.1542.0": - version: 2.1542.0 - resolution: "aws-sdk@npm:2.1542.0" +"aws-sdk@npm:2.1543.0": + version: 2.1543.0 + resolution: "aws-sdk@npm:2.1543.0" dependencies: buffer: 4.9.2 events: 1.1.1 @@ -5087,7 +5087,7 @@ __metadata: util: ^0.12.4 uuid: 8.0.0 xml2js: 0.6.2 - checksum: 224176b3ea28ace16f640eb337193de85103386be40786161a603c4624c8becbe79ec269bd25492946fff66887e0016fc78309ff39a6e7a0f3a23aac475ef0d7 + checksum: 265ade5fe6ad199ba1c29ae368a7f9d7a8d829e02330a6d12a358a3e306e1ea14a17cd26ea91ea2fc51fd2c37742410246c07273d5aa4d083ed1e4864314675a languageName: node linkType: hard @@ -16372,7 +16372,7 @@ __metadata: "@wireapp/webapp-events": 0.20.1 adm-zip: 0.5.10 auto-launch: 5.0.6 - aws-sdk: 2.1542.0 + aws-sdk: 2.1543.0 axios: 0.21.2 babel-core: 7.0.0-bridge.0 babel-eslint: 10.1.0 From 298e195ca39387d3b8d5b1a79fcdea3d22bfe698 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 04:17:45 +0000 Subject: [PATCH 15/27] build(deps-dev): bump webpack from 5.89.0 to 5.90.0 (#7488) Bumps [webpack](https://github.com/webpack/webpack) from 5.89.0 to 5.90.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.89.0...v5.90.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 106 ++++++++++++++++++++++++++++++++------------------- 2 files changed, 67 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index b81b0bb9fd6..25097583e86 100644 --- a/package.json +++ b/package.json @@ -121,7 +121,7 @@ "style-loader": "3.3.4", "ts-node": "10.9.2", "typescript": "5.3.3", - "webpack": "5.89.0", + "webpack": "5.90.0", "webpack-cli": "5.1.4" }, "homepage": "https://wire.com", diff --git a/yarn.lock b/yarn.lock index bddd850c73a..761b68948a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2782,13 +2782,13 @@ __metadata: languageName: node linkType: hard -"@jridgewell/source-map@npm:^0.3.2": - version: 0.3.3 - resolution: "@jridgewell/source-map@npm:0.3.3" +"@jridgewell/source-map@npm:^0.3.3": + version: 0.3.5 + resolution: "@jridgewell/source-map@npm:0.3.5" dependencies: "@jridgewell/gen-mapping": ^0.3.0 "@jridgewell/trace-mapping": ^0.3.9 - checksum: ae1302146339667da5cd6541260ecbef46ae06819a60f88da8f58b3e64682f787c09359933d050dea5d2173ea7fa40f40dd4d4e7a8d325c5892cccd99aaf8959 + checksum: 1ad4dec0bdafbade57920a50acec6634f88a0eb735851e0dda906fa9894e7f0549c492678aad1a10f8e144bfe87f238307bf2a914a1bc85b7781d345417e9f6f languageName: node linkType: hard @@ -2836,6 +2836,16 @@ __metadata: languageName: node linkType: hard +"@jridgewell/trace-mapping@npm:^0.3.20": + version: 0.3.22 + resolution: "@jridgewell/trace-mapping@npm:0.3.22" + dependencies: + "@jridgewell/resolve-uri": ^3.1.0 + "@jridgewell/sourcemap-codec": ^1.4.14 + checksum: ac7dd2cfe0b479aa1b81776d40d789243131cc792dc8b6b6a028c70fcd6171958ae1a71bf67b618ffe3c0c3feead9870c095ee46a5e30319410d92976b28f498 + languageName: node + linkType: hard + "@malept/cross-spawn-promise@npm:^1.1.0": version: 1.1.1 resolution: "@malept/cross-spawn-promise@npm:1.1.1" @@ -3285,13 +3295,20 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:*, @types/estree@npm:^1.0.0": +"@types/estree@npm:*": version: 1.0.1 resolution: "@types/estree@npm:1.0.1" checksum: e9aa175eacb797216fafce4d41e8202c7a75555bc55232dee0f9903d7171f8f19f0ae7d5191bb1a88cb90e65468be508c0df850a9fb81b4433b293a5a749899d languageName: node linkType: hard +"@types/estree@npm:^1.0.5": + version: 1.0.5 + resolution: "@types/estree@npm:1.0.5" + checksum: dd8b5bed28e6213b7acd0fb665a84e693554d850b0df423ac8076cc3ad5823a6bc26b0251d080bdc545af83179ede51dd3f6fa78cad2c46ed1f29624ddf3e41a + languageName: node + linkType: hard + "@types/fs-extra@npm:9.0.11": version: 9.0.11 resolution: "@types/fs-extra@npm:9.0.11" @@ -4436,7 +4453,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.1.0, acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.7.1, acorn@npm:^8.8.0, acorn@npm:^8.8.1": +"acorn@npm:^8.1.0, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.0, acorn@npm:^8.8.1": version: 8.8.2 resolution: "acorn@npm:8.8.2" bin: @@ -4445,6 +4462,15 @@ __metadata: languageName: node linkType: hard +"acorn@npm:^8.8.2": + version: 8.11.3 + resolution: "acorn@npm:8.11.3" + bin: + acorn: bin/acorn + checksum: 76d8e7d559512566b43ab4aadc374f11f563f0a9e21626dd59cb2888444e9445923ae9f3699972767f18af61df89cd89f5eaaf772d1327b055b45cb829b4a88c + languageName: node + linkType: hard + "acorn@npm:^8.9.0": version: 8.10.0 resolution: "acorn@npm:8.10.0" @@ -5420,20 +5446,6 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.14.5, browserslist@npm:^4.21.3": - version: 4.21.5 - resolution: "browserslist@npm:4.21.5" - dependencies: - caniuse-lite: ^1.0.30001449 - electron-to-chromium: ^1.4.284 - node-releases: ^2.0.8 - update-browserslist-db: ^1.0.10 - bin: - browserslist: cli.js - checksum: 9755986b22e73a6a1497fd8797aedd88e04270be33ce66ed5d85a1c8a798292a65e222b0f251bafa1c2522261e237d73b08b58689d4920a607e5a53d56dc4706 - languageName: node - linkType: hard - "browserslist@npm:^4.21.10, browserslist@npm:^4.21.9": version: 4.21.10 resolution: "browserslist@npm:4.21.10" @@ -5448,6 +5460,20 @@ __metadata: languageName: node linkType: hard +"browserslist@npm:^4.21.3": + version: 4.21.5 + resolution: "browserslist@npm:4.21.5" + dependencies: + caniuse-lite: ^1.0.30001449 + electron-to-chromium: ^1.4.284 + node-releases: ^2.0.8 + update-browserslist-db: ^1.0.10 + bin: + browserslist: cli.js + checksum: 9755986b22e73a6a1497fd8797aedd88e04270be33ce66ed5d85a1c8a798292a65e222b0f251bafa1c2522261e237d73b08b58689d4920a607e5a53d56dc4706 + languageName: node + linkType: hard + "browserslist@npm:^4.22.2": version: 4.22.2 resolution: "browserslist@npm:4.22.2" @@ -15176,15 +15202,15 @@ __metadata: languageName: node linkType: hard -"terser-webpack-plugin@npm:^5.3.7": - version: 5.3.7 - resolution: "terser-webpack-plugin@npm:5.3.7" +"terser-webpack-plugin@npm:^5.3.10": + version: 5.3.10 + resolution: "terser-webpack-plugin@npm:5.3.10" dependencies: - "@jridgewell/trace-mapping": ^0.3.17 + "@jridgewell/trace-mapping": ^0.3.20 jest-worker: ^27.4.5 schema-utils: ^3.1.1 serialize-javascript: ^6.0.1 - terser: ^5.16.5 + terser: ^5.26.0 peerDependencies: webpack: ^5.1.0 peerDependenciesMeta: @@ -15194,21 +15220,21 @@ __metadata: optional: true uglify-js: optional: true - checksum: 095e699fdeeb553cdf2c6f75f983949271b396d9c201d7ae9fc633c45c1c1ad14c7257ef9d51ccc62213dd3e97f875870ba31550f6d4f1b6674f2615562da7f7 + checksum: bd6e7596cf815f3353e2a53e79cbdec959a1b0276f5e5d4e63e9d7c3c5bb5306df567729da287d1c7b39d79093e56863c569c42c6c24cc34c76aa313bd2cbcea languageName: node linkType: hard -"terser@npm:^5.16.5": - version: 5.17.1 - resolution: "terser@npm:5.17.1" +"terser@npm:^5.26.0": + version: 5.27.0 + resolution: "terser@npm:5.27.0" dependencies: - "@jridgewell/source-map": ^0.3.2 - acorn: ^8.5.0 + "@jridgewell/source-map": ^0.3.3 + acorn: ^8.8.2 commander: ^2.20.0 source-map-support: ~0.5.20 bin: terser: bin/terser - checksum: 69b0e80e3c4084db2819de4d6ae8a2ba79f2fcd7ed6df40fe4b602ec7bfd8e889cc63c7d5268f30990ffecbf6eeda18f857adad9386fe2c2331b398d58ed855c + checksum: c165052cfea061e8512e9b9ba42a098c2ff6382886ae122b040fd5b6153443070cc2dcb4862269f1669c09c716763e856125a355ff984aa72be525d6fffd8729 languageName: node linkType: hard @@ -16118,18 +16144,18 @@ __metadata: languageName: node linkType: hard -"webpack@npm:5.89.0": - version: 5.89.0 - resolution: "webpack@npm:5.89.0" +"webpack@npm:5.90.0": + version: 5.90.0 + resolution: "webpack@npm:5.90.0" dependencies: "@types/eslint-scope": ^3.7.3 - "@types/estree": ^1.0.0 + "@types/estree": ^1.0.5 "@webassemblyjs/ast": ^1.11.5 "@webassemblyjs/wasm-edit": ^1.11.5 "@webassemblyjs/wasm-parser": ^1.11.5 acorn: ^8.7.1 acorn-import-assertions: ^1.9.0 - browserslist: ^4.14.5 + browserslist: ^4.21.10 chrome-trace-event: ^1.0.2 enhanced-resolve: ^5.15.0 es-module-lexer: ^1.2.1 @@ -16143,7 +16169,7 @@ __metadata: neo-async: ^2.6.2 schema-utils: ^3.2.0 tapable: ^2.1.1 - terser-webpack-plugin: ^5.3.7 + terser-webpack-plugin: ^5.3.10 watchpack: ^2.4.0 webpack-sources: ^3.2.3 peerDependenciesMeta: @@ -16151,7 +16177,7 @@ __metadata: optional: true bin: webpack: bin/webpack.js - checksum: 43fe0dbc30e168a685ef5a86759d5016a705f6563b39a240aa00826a80637d4a3deeb8062e709d6a4b05c63e796278244c84b04174704dc4a37bedb0f565c5ed + checksum: 178a0e7e9e5b26264a19dd5fe554a3508a8afafc9cce972bfd4452b5128d0db1b37832f5e615be1cff1934f24da0de967929f199be2b3fe283ca1951f98ea3fe languageName: node linkType: hard @@ -16444,7 +16470,7 @@ __metadata: ts-node: 10.9.2 typescript: 5.3.3 uuidjs: 4.2.12 - webpack: 5.89.0 + webpack: 5.90.0 webpack-cli: 5.1.4 languageName: unknown linkType: soft From 4b822dd94aeadd8558a765140bc2b673fafc3ba4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 04:19:48 +0000 Subject: [PATCH 16/27] build(deps-dev): bump @types/node from 18.19.8 to 18.19.9 (#7491) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.19.8 to 18.19.9. - [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] 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 25097583e86..11ac7ad5eed 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "@types/lodash": "4.14.202", "@types/minimist": "1.2.5", "@types/mocha": "10.0.6", - "@types/node": "18.19.8", + "@types/node": "18.19.9", "@types/open-graph": "0.2.5", "@types/platform": "1.3.6", "@types/prettier": "^2.7.3", diff --git a/yarn.lock b/yarn.lock index 761b68948a3..066f4ca5629 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3530,12 +3530,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:18.19.8": - version: 18.19.8 - resolution: "@types/node@npm:18.19.8" +"@types/node@npm:18.19.9": + version: 18.19.9 + resolution: "@types/node@npm:18.19.9" dependencies: undici-types: ~5.26.4 - checksum: fa291495d6157a9d9393b4c3bdbf1ce12a8f661dc9da6a4fa19bcdb19af1c62bb8dbf7fb66ae135f29cd788b618e9845b83e9c47edcf39f0953a8561fdacd9a3 + checksum: 8ffd4043ada193cf32d4c13eb850e8c510d4c96504c62fdc5326b3bb2c7ddc2c81892c351b2c0c403c29df3ab13c864a370f0282daf6d3380ba3c2001728a643 languageName: node linkType: hard @@ -16377,7 +16377,7 @@ __metadata: "@types/lodash": 4.14.202 "@types/minimist": 1.2.5 "@types/mocha": 10.0.6 - "@types/node": 18.19.8 + "@types/node": 18.19.9 "@types/open-graph": 0.2.5 "@types/platform": 1.3.6 "@types/prettier": ^2.7.3 From 5c6728914d882d8df0cbd6acf4f370bd63904634 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 04:20:51 +0000 Subject: [PATCH 17/27] build(deps): bump @electron/remote from 2.1.1 to 2.1.2 (#7492) Bumps [@electron/remote](https://github.com/electron/remote) from 2.1.1 to 2.1.2. - [Release notes](https://github.com/electron/remote/releases) - [Changelog](https://github.com/electron/remote/blob/main/.releaserc.json) - [Commits](https://github.com/electron/remote/compare/v2.1.1...v2.1.2) --- updated-dependencies: - dependency-name: "@electron/remote" dependency-type: direct:production update-type: version-update:semver-patch ... 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 11ac7ad5eed..8de2c9b03b0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "author": "Wire Swiss ", "dependencies": { - "@electron/remote": "2.1.1", + "@electron/remote": "2.1.2", "@hapi/joi": "17.1.1", "@wireapp/certificate-check": "0.7.8", "@wireapp/commons": "5.2.4", diff --git a/yarn.lock b/yarn.lock index 066f4ca5629..5803727fb3a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2103,12 +2103,12 @@ __metadata: languageName: node linkType: hard -"@electron/remote@npm:2.1.1": - version: 2.1.1 - resolution: "@electron/remote@npm:2.1.1" +"@electron/remote@npm:2.1.2": + version: 2.1.2 + resolution: "@electron/remote@npm:2.1.2" peerDependencies: electron: ">= 13.0.0" - checksum: 816796f9371b398d1ce6ef30cc7499553a9c85c46807fcf1367dd3e907e485a24c0c1a9dfd9b28dbaec830969fafd592dedcff7c20b7179d74a933cde7494c64 + checksum: 24d49aa494b12f1f791b322850f4e29ac69ec57b318d01f1b9e216807886ba1c3dcf9dc1508a18b8daf3ea3c58f8131e1dcf863ba246cfe3554c8ec872a50d10 languageName: node linkType: hard @@ -16363,7 +16363,7 @@ __metadata: "@babel/register": 7.23.7 "@electron/fuses": 1.7.0 "@electron/osx-sign": 1.0.5 - "@electron/remote": 2.1.1 + "@electron/remote": 2.1.2 "@hapi/joi": 17.1.1 "@types/adm-zip": 0.5.5 "@types/amplify": 1.1.28 From 1eae1758dedde3c3c59ce9024f1852e2177eb21b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 04:21:13 +0000 Subject: [PATCH 18/27] build(deps-dev): bump electron from 27.2.4 to 27.3.0 (#7490) Bumps [electron](https://github.com/electron/electron) from 27.2.4 to 27.3.0. - [Release notes](https://github.com/electron/electron/releases) - [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md) - [Commits](https://github.com/electron/electron/compare/v27.2.4...v27.3.0) --- updated-dependencies: - dependency-name: electron dependency-type: direct:development update-type: version-update:semver-minor ... 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 8de2c9b03b0..90fa74809bf 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "cross-env": "7.0.3", "css-loader": "6.9.1", "dotenv": "16.4.1", - "electron": "27.2.4", + "electron": "27.3.0", "electron-builder": "24.9.1", "electron-mocha": "12.2.0", "electron-packager": "17.1.2", diff --git a/yarn.lock b/yarn.lock index 5803727fb3a..016fc1c0f85 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7061,16 +7061,16 @@ __metadata: languageName: node linkType: hard -"electron@npm:27.2.4": - version: 27.2.4 - resolution: "electron@npm:27.2.4" +"electron@npm:27.3.0": + version: 27.3.0 + resolution: "electron@npm:27.3.0" dependencies: "@electron/get": ^2.0.0 "@types/node": ^18.11.18 extract-zip: ^2.0.1 bin: electron: cli.js - checksum: 7e770075b56c20d629d27d735688dbfc2e6780ac4b4e5702f64fbce462ade7babe1b8a52b96617b9100d637b48b8ef42b9542580bf617190fbac77427a37f8ce + checksum: 6fd716d66532d3aab36a53b3da3933657144a99a4cd07e33eae74f64f988288af04a3e56ebe13d37e212031c130d2b968fe751a78aac128a0ff9a6016760c4a5 languageName: node linkType: hard @@ -16411,7 +16411,7 @@ __metadata: cross-env: 7.0.3 css-loader: 6.9.1 dotenv: 16.4.1 - electron: 27.2.4 + electron: 27.3.0 electron-builder: 24.9.1 electron-dl: ^3.5.1 electron-mocha: 12.2.0 From c060a942d6864194018430173a6073b3d10ba47e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 04:49:09 +0000 Subject: [PATCH 19/27] build(deps-dev): bump @babel/core from 7.23.7 to 7.23.9 (#7493) Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.23.7 to 7.23.9. - [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.23.9/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 76 +++++++++++++++++++++++++++++++++------------------- 2 files changed, 50 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 90fa74809bf..b57827f2055 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ }, "description": "The most secure collaboration platform.", "devDependencies": { - "@babel/core": "7.23.7", + "@babel/core": "7.23.9", "@babel/helper-string-parser": "7.23.4", "@babel/plugin-proposal-class-properties": "7.18.6", "@babel/plugin-proposal-optional-chaining": "7.21.0", diff --git a/yarn.lock b/yarn.lock index 016fc1c0f85..15f52b01b19 100644 --- a/yarn.lock +++ b/yarn.lock @@ -86,26 +86,26 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:7.23.7": - version: 7.23.7 - resolution: "@babel/core@npm:7.23.7" +"@babel/core@npm:7.23.9": + version: 7.23.9 + resolution: "@babel/core@npm:7.23.9" dependencies: "@ampproject/remapping": ^2.2.0 "@babel/code-frame": ^7.23.5 "@babel/generator": ^7.23.6 "@babel/helper-compilation-targets": ^7.23.6 "@babel/helper-module-transforms": ^7.23.3 - "@babel/helpers": ^7.23.7 - "@babel/parser": ^7.23.6 - "@babel/template": ^7.22.15 - "@babel/traverse": ^7.23.7 - "@babel/types": ^7.23.6 + "@babel/helpers": ^7.23.9 + "@babel/parser": ^7.23.9 + "@babel/template": ^7.23.9 + "@babel/traverse": ^7.23.9 + "@babel/types": ^7.23.9 convert-source-map: ^2.0.0 debug: ^4.1.0 gensync: ^1.0.0-beta.2 json5: ^2.2.3 semver: ^6.3.1 - checksum: 32d5bf73372a47429afaae9adb0af39e47bcea6a831c4b5dcbb4791380cda6949cb8cb1a2fea8b60bb1ebe189209c80e333903df1fa8e9dcb04798c0ce5bf59e + checksum: 634a511f74db52a5f5a283c1121f25e2227b006c095b84a02a40a9213842489cd82dc7d61cdc74e10b5bcd9bb0a4e28bab47635b54c7e2256d47ab57356e2a76 languageName: node linkType: hard @@ -639,14 +639,14 @@ __metadata: languageName: node linkType: hard -"@babel/helpers@npm:^7.23.7": - version: 7.23.7 - resolution: "@babel/helpers@npm:7.23.7" +"@babel/helpers@npm:^7.23.9": + version: 7.23.9 + resolution: "@babel/helpers@npm:7.23.9" dependencies: - "@babel/template": ^7.22.15 - "@babel/traverse": ^7.23.7 - "@babel/types": ^7.23.6 - checksum: 4f3bdf35fb54ff79107c6020ba1e36a38213a15b05ca0fa06c553b65f566e185fba6339fb3344be04593ebc244ed0bbb0c6087e73effe0d053a30bcd2db3a013 + "@babel/template": ^7.23.9 + "@babel/traverse": ^7.23.9 + "@babel/types": ^7.23.9 + checksum: 2678231192c0471dbc2fc403fb19456cc46b1afefcfebf6bc0f48b2e938fdb0fef2e0fe90c8c8ae1f021dae5012b700372e4b5d15867f1d7764616532e4a6324 languageName: node linkType: hard @@ -710,12 +710,12 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.23.6": - version: 7.23.6 - resolution: "@babel/parser@npm:7.23.6" +"@babel/parser@npm:^7.23.9": + version: 7.23.9 + resolution: "@babel/parser@npm:7.23.9" bin: parser: ./bin/babel-parser.js - checksum: 140801c43731a6c41fd193f5c02bc71fd647a0360ca616b23d2db8be4b9739b9f951a03fc7c2db4f9b9214f4b27c1074db0f18bc3fa653783082d5af7c8860d5 + checksum: e7cd4960ac8671774e13803349da88d512f9292d7baa952173260d3e8f15620a28a3701f14f709d769209022f9e7b79965256b8be204fc550cfe783cdcabe7c7 languageName: node linkType: hard @@ -1906,6 +1906,17 @@ __metadata: languageName: node linkType: hard +"@babel/template@npm:^7.23.9": + version: 7.23.9 + resolution: "@babel/template@npm:7.23.9" + dependencies: + "@babel/code-frame": ^7.23.5 + "@babel/parser": ^7.23.9 + "@babel/types": ^7.23.9 + checksum: 6e67414c0f7125d7ecaf20c11fab88085fa98a96c3ef10da0a61e962e04fdf3a18a496a66047005ddd1bb682a7cc7842d556d1db2f3f3f6ccfca97d5e445d342 + languageName: node + linkType: hard + "@babel/traverse@npm:^7.21.5, @babel/traverse@npm:^7.7.0": version: 7.23.2 resolution: "@babel/traverse@npm:7.23.2" @@ -1924,9 +1935,9 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.23.7": - version: 7.23.7 - resolution: "@babel/traverse@npm:7.23.7" +"@babel/traverse@npm:^7.23.9": + version: 7.23.9 + resolution: "@babel/traverse@npm:7.23.9" dependencies: "@babel/code-frame": ^7.23.5 "@babel/generator": ^7.23.6 @@ -1934,11 +1945,11 @@ __metadata: "@babel/helper-function-name": ^7.23.0 "@babel/helper-hoist-variables": ^7.22.5 "@babel/helper-split-export-declaration": ^7.22.6 - "@babel/parser": ^7.23.6 - "@babel/types": ^7.23.6 + "@babel/parser": ^7.23.9 + "@babel/types": ^7.23.9 debug: ^4.3.1 globals: ^11.1.0 - checksum: d4a7afb922361f710efc97b1e25ec343fab8b2a4ddc81ca84f9a153f22d4482112cba8f263774be8d297918b6c4767c7a98988ab4e53ac73686c986711dd002e + checksum: a932f7aa850e158c00c97aad22f639d48c72805c687290f6a73e30c5c4957c07f5d28310c9bf59648e2980fe6c9d16adeb2ff92a9ca0f97fa75739c1328fc6c3 languageName: node linkType: hard @@ -1986,6 +1997,17 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.23.9": + version: 7.23.9 + resolution: "@babel/types@npm:7.23.9" + dependencies: + "@babel/helper-string-parser": ^7.23.4 + "@babel/helper-validator-identifier": ^7.22.20 + to-fast-properties: ^2.0.0 + checksum: 0a9b008e9bfc89beb8c185e620fa0f8ed6c771f1e1b2e01e1596870969096fec7793898a1d64a035176abf1dd13e2668ee30bf699f2d92c210a8128f4b151e65 + languageName: node + linkType: hard + "@bcoe/v8-coverage@npm:^0.2.3": version: 0.2.3 resolution: "@bcoe/v8-coverage@npm:0.2.3" @@ -16353,7 +16375,7 @@ __metadata: version: 0.0.0-use.local resolution: "wire-desktop@workspace:." dependencies: - "@babel/core": 7.23.7 + "@babel/core": 7.23.9 "@babel/helper-string-parser": 7.23.4 "@babel/plugin-proposal-class-properties": 7.18.6 "@babel/plugin-proposal-optional-chaining": 7.21.0 From 021dbc9dbfc5f892670c2f72d5dd3f0ab8c90d43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 04:55:00 +0000 Subject: [PATCH 20/27] build(deps-dev): bump @types/node from 18.19.9 to 18.19.10 (#7495) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.19.9 to 18.19.10. - [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] 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 b57827f2055..786b65e0b01 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "@types/lodash": "4.14.202", "@types/minimist": "1.2.5", "@types/mocha": "10.0.6", - "@types/node": "18.19.9", + "@types/node": "18.19.10", "@types/open-graph": "0.2.5", "@types/platform": "1.3.6", "@types/prettier": "^2.7.3", diff --git a/yarn.lock b/yarn.lock index 15f52b01b19..c39afa692ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3552,12 +3552,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:18.19.9": - version: 18.19.9 - resolution: "@types/node@npm:18.19.9" +"@types/node@npm:18.19.10": + version: 18.19.10 + resolution: "@types/node@npm:18.19.10" dependencies: undici-types: ~5.26.4 - checksum: 8ffd4043ada193cf32d4c13eb850e8c510d4c96504c62fdc5326b3bb2c7ddc2c81892c351b2c0c403c29df3ab13c864a370f0282daf6d3380ba3c2001728a643 + checksum: eea429c1fe8d25702c1e860f5c4ac053db3c52a5884646f458513b622a507660a6c88c717ee4f106e63c82f4ec6cafbf999e3f3f1d3083f7a40b4f715e03332b languageName: node linkType: hard @@ -16399,7 +16399,7 @@ __metadata: "@types/lodash": 4.14.202 "@types/minimist": 1.2.5 "@types/mocha": 10.0.6 - "@types/node": 18.19.9 + "@types/node": 18.19.10 "@types/open-graph": 0.2.5 "@types/platform": 1.3.6 "@types/prettier": ^2.7.3 From bef44697667d7267904f18984ee52ac3d8e87470 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 05:00:38 +0000 Subject: [PATCH 21/27] build(deps-dev): bump aws-sdk from 2.1543.0 to 2.1544.0 (#7498) Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1543.0 to 2.1544.0. - [Release notes](https://github.com/aws/aws-sdk-js/releases) - [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1543.0...v2.1544.0) --- updated-dependencies: - dependency-name: aws-sdk dependency-type: direct:development update-type: version-update:semver-minor ... 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 786b65e0b01..6ec5f56c57e 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "@wireapp/eslint-config": "3.0.5", "@wireapp/prettier-config": "0.6.3", "adm-zip": "0.5.10", - "aws-sdk": "2.1543.0", + "aws-sdk": "2.1544.0", "babel-core": "7.0.0-bridge.0", "babel-eslint": "10.1.0", "babel-jest": "29.7.0", diff --git a/yarn.lock b/yarn.lock index c39afa692ba..c5255d88c94 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5121,9 +5121,9 @@ __metadata: languageName: node linkType: hard -"aws-sdk@npm:2.1543.0": - version: 2.1543.0 - resolution: "aws-sdk@npm:2.1543.0" +"aws-sdk@npm:2.1544.0": + version: 2.1544.0 + resolution: "aws-sdk@npm:2.1544.0" dependencies: buffer: 4.9.2 events: 1.1.1 @@ -5135,7 +5135,7 @@ __metadata: util: ^0.12.4 uuid: 8.0.0 xml2js: 0.6.2 - checksum: 265ade5fe6ad199ba1c29ae368a7f9d7a8d829e02330a6d12a358a3e306e1ea14a17cd26ea91ea2fc51fd2c37742410246c07273d5aa4d083ed1e4864314675a + checksum: 6bd4074a16392904c2658d352fa9a33d07a62d0b4b3c78c996fc96ee011dfab0e68478b089abe97ec9cee272c6b495d19a6b20d55663894d2c5946e4efde6517 languageName: node linkType: hard @@ -16420,7 +16420,7 @@ __metadata: "@wireapp/webapp-events": 0.20.1 adm-zip: 0.5.10 auto-launch: 5.0.6 - aws-sdk: 2.1543.0 + aws-sdk: 2.1544.0 axios: 0.21.2 babel-core: 7.0.0-bridge.0 babel-eslint: 10.1.0 From 46d076a54ea431c155ded5f9c378c6638f175901 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 05:03:59 +0000 Subject: [PATCH 22/27] build(deps-dev): bump @babel/preset-env from 7.23.8 to 7.23.9 (#7499) Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.23.8 to 7.23.9. - [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.23.9/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/preset-env" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 84 ++++++++++++++++++++++++++-------------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/package.json b/package.json index 6ec5f56c57e..0587c7ee3c6 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@babel/helper-string-parser": "7.23.4", "@babel/plugin-proposal-class-properties": "7.18.6", "@babel/plugin-proposal-optional-chaining": "7.21.0", - "@babel/preset-env": "7.23.8", + "@babel/preset-env": "7.23.9", "@babel/preset-react": "7.23.3", "@babel/preset-typescript": "7.23.3", "@babel/register": "7.23.7", diff --git a/yarn.lock b/yarn.lock index c5255d88c94..c5b8e723f81 100644 --- a/yarn.lock +++ b/yarn.lock @@ -300,9 +300,9 @@ __metadata: languageName: node linkType: hard -"@babel/helper-define-polyfill-provider@npm:^0.4.4": - version: 0.4.4 - resolution: "@babel/helper-define-polyfill-provider@npm:0.4.4" +"@babel/helper-define-polyfill-provider@npm:^0.5.0": + version: 0.5.0 + resolution: "@babel/helper-define-polyfill-provider@npm:0.5.0" dependencies: "@babel/helper-compilation-targets": ^7.22.6 "@babel/helper-plugin-utils": ^7.22.5 @@ -311,7 +311,7 @@ __metadata: resolve: ^1.14.2 peerDependencies: "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 - checksum: 2453cdd79f18a4cb8653d8a7e06b2eb0d8e31bae0d35070fc5abadbddca246a36d82b758064b421cca49b48d0e696d331d54520ba8582c1d61fb706d6d831817 + checksum: d24626b819d3875cb65189d761004e9230f2b3fb60542525c4785616f4b2366741369235a864b744f54beb26d625ae4b0af0c9bb3306b61bf4fccb61e0620020 languageName: node linkType: hard @@ -1065,9 +1065,9 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-async-generator-functions@npm:^7.23.7": - version: 7.23.7 - resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.7" +"@babel/plugin-transform-async-generator-functions@npm:^7.23.9": + version: 7.23.9 + resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.9" dependencies: "@babel/helper-environment-visitor": ^7.22.20 "@babel/helper-plugin-utils": ^7.22.5 @@ -1075,7 +1075,7 @@ __metadata: "@babel/plugin-syntax-async-generators": ^7.8.4 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: b1f66b23423933c27336b1161ac92efef46683321caea97e2255a666f992979376f47a5559f64188d3831fa66a4b24c2a7a40838cc0e9737e90eebe20e8e6372 + checksum: d402494087a6b803803eb5ab46b837aab100a04c4c5148e38bfa943ea1bbfc1ecfb340f1ced68972564312d3580f550c125f452372e77607a558fbbaf98c31c0 languageName: node linkType: hard @@ -1335,9 +1335,9 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-modules-systemjs@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-modules-systemjs@npm:7.23.3" +"@babel/plugin-transform-modules-systemjs@npm:^7.23.9": + version: 7.23.9 + resolution: "@babel/plugin-transform-modules-systemjs@npm:7.23.9" dependencies: "@babel/helper-hoist-variables": ^7.22.5 "@babel/helper-module-transforms": ^7.23.3 @@ -1345,7 +1345,7 @@ __metadata: "@babel/helper-validator-identifier": ^7.22.20 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 0d2fdd993c785aecac9e0850cd5ed7f7d448f0fbb42992a950cc0590167144df25d82af5aac9a5c99ef913d2286782afa44e577af30c10901c5ee8984910fa1f + checksum: cec6abeae6be66fd1a5940c482fe9ff94b689c71fcf4147e179119e4accd09d17d476e36528bc9cb4ab0ec6728fedf48b1c49d0551ea707fb192575d8eac9167 languageName: node linkType: hard @@ -1710,9 +1710,9 @@ __metadata: languageName: node linkType: hard -"@babel/preset-env@npm:7.23.8": - version: 7.23.8 - resolution: "@babel/preset-env@npm:7.23.8" +"@babel/preset-env@npm:7.23.9": + version: 7.23.9 + resolution: "@babel/preset-env@npm:7.23.9" dependencies: "@babel/compat-data": ^7.23.5 "@babel/helper-compilation-targets": ^7.23.6 @@ -1741,7 +1741,7 @@ __metadata: "@babel/plugin-syntax-top-level-await": ^7.14.5 "@babel/plugin-syntax-unicode-sets-regex": ^7.18.6 "@babel/plugin-transform-arrow-functions": ^7.23.3 - "@babel/plugin-transform-async-generator-functions": ^7.23.7 + "@babel/plugin-transform-async-generator-functions": ^7.23.9 "@babel/plugin-transform-async-to-generator": ^7.23.3 "@babel/plugin-transform-block-scoped-functions": ^7.23.3 "@babel/plugin-transform-block-scoping": ^7.23.4 @@ -1763,7 +1763,7 @@ __metadata: "@babel/plugin-transform-member-expression-literals": ^7.23.3 "@babel/plugin-transform-modules-amd": ^7.23.3 "@babel/plugin-transform-modules-commonjs": ^7.23.3 - "@babel/plugin-transform-modules-systemjs": ^7.23.3 + "@babel/plugin-transform-modules-systemjs": ^7.23.9 "@babel/plugin-transform-modules-umd": ^7.23.3 "@babel/plugin-transform-named-capturing-groups-regex": ^7.22.5 "@babel/plugin-transform-new-target": ^7.23.3 @@ -1789,14 +1789,14 @@ __metadata: "@babel/plugin-transform-unicode-regex": ^7.23.3 "@babel/plugin-transform-unicode-sets-regex": ^7.23.3 "@babel/preset-modules": 0.1.6-no-external-plugins - babel-plugin-polyfill-corejs2: ^0.4.7 - babel-plugin-polyfill-corejs3: ^0.8.7 - babel-plugin-polyfill-regenerator: ^0.5.4 + babel-plugin-polyfill-corejs2: ^0.4.8 + babel-plugin-polyfill-corejs3: ^0.9.0 + babel-plugin-polyfill-regenerator: ^0.5.5 core-js-compat: ^3.31.0 semver: ^6.3.1 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: b850f99fc4aed4ba22c7d9207bd2bbc7a729b49ea6f2c2c36e819fe209e309b96fba336096e555b46f791b39f7cdd5ac41246b556283d435a99106eb825a209f + checksum: 23a48468ba820c68ba34ea2c1dbc62fd2ff9cf858cfb69e159cabb0c85c72dc4c2266ce20ca84318d8742de050cb061e7c66902fbfddbcb09246afd248847933 languageName: node linkType: hard @@ -5287,39 +5287,39 @@ __metadata: languageName: node linkType: hard -"babel-plugin-polyfill-corejs2@npm:^0.4.7": - version: 0.4.7 - resolution: "babel-plugin-polyfill-corejs2@npm:0.4.7" +"babel-plugin-polyfill-corejs2@npm:^0.4.8": + version: 0.4.8 + resolution: "babel-plugin-polyfill-corejs2@npm:0.4.8" dependencies: "@babel/compat-data": ^7.22.6 - "@babel/helper-define-polyfill-provider": ^0.4.4 + "@babel/helper-define-polyfill-provider": ^0.5.0 semver: ^6.3.1 peerDependencies: "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 - checksum: b3c84ce44d00211c919a94f76453fb2065861612f3e44862eb7acf854e325c738a7441ad82690deba2b6fddfa2ad2cf2c46960f46fab2e3b17c6ed4fd2d73b38 + checksum: 22857b87268b354e095452199464accba5fd8f690558a2f24b0954807ca2494b96da8d5c13507955802427582015160bce26a66893acf6da5dafbed8b336cf79 languageName: node linkType: hard -"babel-plugin-polyfill-corejs3@npm:^0.8.7": - version: 0.8.7 - resolution: "babel-plugin-polyfill-corejs3@npm:0.8.7" +"babel-plugin-polyfill-corejs3@npm:^0.9.0": + version: 0.9.0 + resolution: "babel-plugin-polyfill-corejs3@npm:0.9.0" dependencies: - "@babel/helper-define-polyfill-provider": ^0.4.4 - core-js-compat: ^3.33.1 + "@babel/helper-define-polyfill-provider": ^0.5.0 + core-js-compat: ^3.34.0 peerDependencies: "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 - checksum: 51bc215ab0c062bbb2225d912f69f8a6705d1837c8e01f9651307b5b937804287c1d73ebd8015689efcc02c3c21f37688b9ee6f5997635619b7a9cc4b7d9908d + checksum: 65bbf59fc0145c7a264822777403632008dce00015b4b5c7ec359125ef4faf9e8f494ae5123d2992104feb6f19a3cff85631992862e48b6d7bd64eb7e755ee1f languageName: node linkType: hard -"babel-plugin-polyfill-regenerator@npm:^0.5.4": - version: 0.5.4 - resolution: "babel-plugin-polyfill-regenerator@npm:0.5.4" +"babel-plugin-polyfill-regenerator@npm:^0.5.5": + version: 0.5.5 + resolution: "babel-plugin-polyfill-regenerator@npm:0.5.5" dependencies: - "@babel/helper-define-polyfill-provider": ^0.4.4 + "@babel/helper-define-polyfill-provider": ^0.5.0 peerDependencies: "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 - checksum: 461b735c6c0eca3c7b4434d14bfa98c2ab80f00e2bdc1c69eb46d1d300092a9786d76bbd3ee55e26d2d1a2380c14592d8d638e271dfd2a2b78a9eacffa3645d1 + checksum: 3a9b4828673b23cd648dcfb571eadcd9d3fadfca0361d0a7c6feeb5a30474e92faaa49f067a6e1c05e49b6a09812879992028ff3ef3446229ff132d6e1de7eb6 languageName: node linkType: hard @@ -6205,12 +6205,12 @@ __metadata: languageName: node linkType: hard -"core-js-compat@npm:^3.33.1": - version: 3.35.0 - resolution: "core-js-compat@npm:3.35.0" +"core-js-compat@npm:^3.34.0": + version: 3.35.1 + resolution: "core-js-compat@npm:3.35.1" dependencies: browserslist: ^4.22.2 - checksum: 64c41ce6870aa9130b9d0cb8f00c05204094f46db7e345d520ec2e38f8b6e1d51e921d4974ceb880948f19c0a79e5639e55be0e56f88ea20e32e9a6274da7f82 + checksum: 4c1a7076d31fa489eec5c46eb11c7127703f9756b5fed1eab9bf27b7f0f151247886d3fa488911078bd2801a5dfa12a9ea2ecb7a4e61dfa460b2c291805f503b languageName: node linkType: hard @@ -16379,7 +16379,7 @@ __metadata: "@babel/helper-string-parser": 7.23.4 "@babel/plugin-proposal-class-properties": 7.18.6 "@babel/plugin-proposal-optional-chaining": 7.21.0 - "@babel/preset-env": 7.23.8 + "@babel/preset-env": 7.23.9 "@babel/preset-react": 7.23.3 "@babel/preset-typescript": 7.23.3 "@babel/register": 7.23.7 From a9dfd7ec365bdd04c45263f3ee50e6f1bd504199 Mon Sep 17 00:00:00 2001 From: Timothy LeBon Date: Fri, 26 Jan 2024 12:52:51 +0100 Subject: [PATCH 23/27] Feat: Windows download location updates (#7484) * chore: add dev env option to dev menu * feat: update to use relative path * chore: missing one dl-path location * chore: remove dev option * chore: add var for appPath --- electron/src/main.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/electron/src/main.ts b/electron/src/main.ts index 3bb427c06cc..432d7519709 100644 --- a/electron/src/main.ts +++ b/electron/src/main.ts @@ -103,10 +103,11 @@ const logger = getLogger(path.basename(__filename)); const currentLocale = locale.getCurrent(); const startHidden = Boolean(argv[config.ARGUMENT.STARTUP] || argv[config.ARGUMENT.HIDDEN]); const customDownloadPath = settings.restore(SettingsType.DOWNLOAD_PATH); +const appHomePath = (path: string) => `${app.getPath('home')}\\${path}`; if (customDownloadPath) { electronDl({ - directory: customDownloadPath, + directory: appHomePath(customDownloadPath), saveAs: false, onCompleted: () => { dialog.showMessageBox({ @@ -114,7 +115,7 @@ if (customDownloadPath) { icon: ICON, title: locale.getText('enforcedDownloadComplete'), message: locale.getText('enforcedDownloadMessage', { - path: customDownloadPath ?? app.getPath('downloads'), + path: appHomePath(customDownloadPath) ?? app.getPath('downloads'), }), buttons: [locale.getText('enforcedDownloadButton')], }); @@ -211,12 +212,12 @@ const bindIpcEvents = (): void => { ipcMain.handle(EVENT_TYPE.ACTION.GET_OG_DATA, (_event, url) => getOpenGraphDataAsync(url)); ipcMain.on(EVENT_TYPE.ACTION.CHANGE_DOWNLOAD_LOCATION, (_event, downloadPath?: string) => { - if (downloadPath) { - fs.ensureDirSync(downloadPath); + if (downloadPath && EnvironmentUtil.platform.IS_WINDOWS) { + fs.ensureDirSync(appHomePath(downloadPath)); + //save the downloadPath locally + settings.save(SettingsType.DOWNLOAD_PATH, downloadPath); + settings.persistToFile(); } - //save the downloadPath locally - settings.save(SettingsType.DOWNLOAD_PATH, downloadPath); - settings.persistToFile(); }); }; From 35f3e2473886a27488242170204238289e8afc5e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 05:01:17 +0000 Subject: [PATCH 24/27] build(deps-dev): bump nock from 13.5.0 to 13.5.1 (#7500) Bumps [nock](https://github.com/nock/nock) from 13.5.0 to 13.5.1. - [Release notes](https://github.com/nock/nock/releases) - [Changelog](https://github.com/nock/nock/blob/main/CHANGELOG.md) - [Commits](https://github.com/nock/nock/compare/v13.5.0...v13.5.1) --- updated-dependencies: - dependency-name: nock dependency-type: direct:development update-type: version-update:semver-patch ... 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 0587c7ee3c6..353dcc10d8f 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "jest-environment-jsdom": "29.7.0", "lint-staged": "15.2.0", "mocha": "10.2.0", - "nock": "13.5.0", + "nock": "13.5.1", "nyc": "15.1.0", "prettier": "2.8.8", "rimraf": "5.0.5", diff --git a/yarn.lock b/yarn.lock index c5b8e723f81..8ab9f792581 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12329,14 +12329,14 @@ __metadata: languageName: node linkType: hard -"nock@npm:13.5.0": - version: 13.5.0 - resolution: "nock@npm:13.5.0" +"nock@npm:13.5.1": + version: 13.5.1 + resolution: "nock@npm:13.5.1" dependencies: debug: ^4.1.0 json-stringify-safe: ^5.0.1 propagate: ^2.0.0 - checksum: b50d680da3287859f81626b426234ed81a43aae16455efd259a3044f4a6139677d97c7001f532def6b308e7c3ecf7517925f2a34b3aaf80ee2ced920cfce2799 + checksum: d7e33e92ef1af2c2302af411e4f9c98d53aefb3b6729de487e051281d1547e910ccd1aeb6d251fa1af70046cc28aa6f3a43c1964eff94cb75fb470bd84ffe081 languageName: node linkType: hard @@ -16475,7 +16475,7 @@ __metadata: logdown: 3.3.1 minimist: 1.2.8 mocha: 10.2.0 - nock: 13.5.0 + nock: 13.5.1 nyc: 15.1.0 open-graph: 0.2.6 prettier: 2.8.8 From 9b0d80f187adc35c5e93f58c7a3b554c2f2aec02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 05:03:10 +0000 Subject: [PATCH 25/27] build(deps-dev): bump aws-sdk from 2.1544.0 to 2.1545.0 (#7501) Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1544.0 to 2.1545.0. - [Release notes](https://github.com/aws/aws-sdk-js/releases) - [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1544.0...v2.1545.0) --- updated-dependencies: - dependency-name: aws-sdk dependency-type: direct:development update-type: version-update:semver-minor ... 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 353dcc10d8f..a6d657021b7 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "@wireapp/eslint-config": "3.0.5", "@wireapp/prettier-config": "0.6.3", "adm-zip": "0.5.10", - "aws-sdk": "2.1544.0", + "aws-sdk": "2.1545.0", "babel-core": "7.0.0-bridge.0", "babel-eslint": "10.1.0", "babel-jest": "29.7.0", diff --git a/yarn.lock b/yarn.lock index 8ab9f792581..6901d21efe9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5121,9 +5121,9 @@ __metadata: languageName: node linkType: hard -"aws-sdk@npm:2.1544.0": - version: 2.1544.0 - resolution: "aws-sdk@npm:2.1544.0" +"aws-sdk@npm:2.1545.0": + version: 2.1545.0 + resolution: "aws-sdk@npm:2.1545.0" dependencies: buffer: 4.9.2 events: 1.1.1 @@ -5135,7 +5135,7 @@ __metadata: util: ^0.12.4 uuid: 8.0.0 xml2js: 0.6.2 - checksum: 6bd4074a16392904c2658d352fa9a33d07a62d0b4b3c78c996fc96ee011dfab0e68478b089abe97ec9cee272c6b495d19a6b20d55663894d2c5946e4efde6517 + checksum: 9686d97046898834c902ca832da48ef85996254799ebf79249d1386f958227b06093edceea2124162e94c480b35f8200ed89247c05c1fc1d8fbf2958240aba8f languageName: node linkType: hard @@ -16420,7 +16420,7 @@ __metadata: "@wireapp/webapp-events": 0.20.1 adm-zip: 0.5.10 auto-launch: 5.0.6 - aws-sdk: 2.1544.0 + aws-sdk: 2.1545.0 axios: 0.21.2 babel-core: 7.0.0-bridge.0 babel-eslint: 10.1.0 From e646f3c010b16a2c2173814238c53385cca07564 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 14:55:38 +0100 Subject: [PATCH 26/27] build(deps-dev): bump eslint-plugin-jsdoc from 46.9.1 to 48.0.4 (#7497) Bumps [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) from 46.9.1 to 48.0.4. - [Release notes](https://github.com/gajus/eslint-plugin-jsdoc/releases) - [Changelog](https://github.com/gajus/eslint-plugin-jsdoc/blob/main/.releaserc) - [Commits](https://github.com/gajus/eslint-plugin-jsdoc/compare/v46.9.1...v48.0.4) --- updated-dependencies: - dependency-name: eslint-plugin-jsdoc dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index a6d657021b7..89276868f71 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "eslint-plugin-jasmine": "4.1.3", "eslint-plugin-jest": "27.6.3", "eslint-plugin-jest-dom": "5.1.0", - "eslint-plugin-jsdoc": "46.9.1", + "eslint-plugin-jsdoc": "48.0.4", "eslint-plugin-jsx-a11y": "6.8.0", "eslint-plugin-no-unsanitized": "4.0.2", "eslint-plugin-prettier": "4.2.1", diff --git a/yarn.lock b/yarn.lock index 6901d21efe9..aacd84cd107 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7762,9 +7762,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-jsdoc@npm:46.9.1": - version: 46.9.1 - resolution: "eslint-plugin-jsdoc@npm:46.9.1" +"eslint-plugin-jsdoc@npm:48.0.4": + version: 48.0.4 + resolution: "eslint-plugin-jsdoc@npm:48.0.4" dependencies: "@es-joy/jsdoccomment": ~0.41.0 are-docs-informative: ^0.0.2 @@ -7776,8 +7776,8 @@ __metadata: semver: ^7.5.4 spdx-expression-parse: ^4.0.0 peerDependencies: - eslint: ^7.0.0 || ^8.0.0 - checksum: c1307398f9cf79ad1479b7f2c08ffc150d2b4f9747880f6a0de2f34dc1b04ec34d01acbd69d0ed1a4d1e435dba6683bd1446b3ff89a2074e9c739e15d22c228f + eslint: ^7.0.0 || ^8.0.0 || ^9.0.0 + checksum: 9a1e8d74278338276c6a5a1b8fe252cfa7339f5fbe674f3c28dcc8270f190caa58fff3b87c4749bd5f3eb5ac6cc4d7cd6d1459f9827cfca93701b67e098c8626 languageName: node linkType: hard @@ -16450,7 +16450,7 @@ __metadata: eslint-plugin-jasmine: 4.1.3 eslint-plugin-jest: 27.6.3 eslint-plugin-jest-dom: 5.1.0 - eslint-plugin-jsdoc: 46.9.1 + eslint-plugin-jsdoc: 48.0.4 eslint-plugin-jsx-a11y: 6.8.0 eslint-plugin-no-unsanitized: 4.0.2 eslint-plugin-prettier: 4.2.1 From 749490c2de95a3e2036e405e68066b450ee96b5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 15:01:46 +0100 Subject: [PATCH 27/27] build(deps): bump fs-extra and @types/fs-extra (#7327) Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) and [@types/fs-extra](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/fs-extra). These dependencies needed to be updated together. Updates `fs-extra` from 10.1.0 to 11.2.0 - [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md) - [Commits](https://github.com/jprichardson/node-fs-extra/compare/10.1.0...11.2.0) Updates `@types/fs-extra` from 9.0.11 to 11.0.4 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/fs-extra) --- updated-dependencies: - dependency-name: fs-extra dependency-type: direct:production update-type: version-update:semver-major - dependency-name: "@types/fs-extra" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 4 ++-- yarn.lock | 33 +++++++++++++++++++++++++++------ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 89276868f71..32124dff52f 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "content-type": "1.0.5", "electron-dl": "^3.5.1", "electron-window-state": "5.0.3", - "fs-extra": "10.1.0", + "fs-extra": "11.2.0", "get-proxy-settings": "0.1.13", "globby": "11.1", "iconv-lite": "0.6.3", @@ -48,7 +48,7 @@ "@types/auto-launch": "5.0.5", "@types/content-type": "1.1.8", "@types/eslint": "^8.56.2", - "@types/fs-extra": "9.0.11", + "@types/fs-extra": "11.0.4", "@types/hapi__joi": "^17.1.14", "@types/is-ci": "3.0.4", "@types/jest": "^29.5.11", diff --git a/yarn.lock b/yarn.lock index aacd84cd107..c35546bb105 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3331,12 +3331,13 @@ __metadata: languageName: node linkType: hard -"@types/fs-extra@npm:9.0.11": - version: 9.0.11 - resolution: "@types/fs-extra@npm:9.0.11" +"@types/fs-extra@npm:11.0.4": + version: 11.0.4 + resolution: "@types/fs-extra@npm:11.0.4" dependencies: + "@types/jsonfile": "*" "@types/node": "*" - checksum: 54619e50583a45d63e1d061dc5ca09b53424dd8ec01edfc282b6d5733d4fc40bcf3e66a2704a13ed4d3bf36f261b6fa27c180fd2f86114f6bc30c3eb245f453e + checksum: 242cb84157631f057f76495c8220707541882c00a00195b603d937fb55e471afecebcb089bab50233ed3a59c69fd68bf65c1f69dd7fafe2347e139cc15b9b0e5 languageName: node linkType: hard @@ -3477,6 +3478,15 @@ __metadata: languageName: node linkType: hard +"@types/jsonfile@npm:*": + version: 6.1.4 + resolution: "@types/jsonfile@npm:6.1.4" + dependencies: + "@types/node": "*" + checksum: 309fda20eb5f1cf68f2df28931afdf189c5e7e6bec64ac783ce737bb98908d57f6f58757ad5da9be37b815645a6f914e2d4f3ac66c574b8fe1ba6616284d0e97 + languageName: node + linkType: hard + "@types/keyv@npm:^3.1.4": version: 3.1.4 resolution: "@types/keyv@npm:3.1.4" @@ -8804,6 +8814,17 @@ __metadata: languageName: node linkType: hard +"fs-extra@npm:11.2.0": + version: 11.2.0 + resolution: "fs-extra@npm:11.2.0" + dependencies: + graceful-fs: ^4.2.0 + jsonfile: ^6.0.1 + universalify: ^2.0.0 + checksum: b12e42fa40ba47104202f57b8480dd098aa931c2724565e5e70779ab87605665594e76ee5fb00545f772ab9ace167fe06d2ab009c416dc8c842c5ae6df7aa7e8 + languageName: node + linkType: hard + "fs-extra@npm:^11.1.0": version: 11.1.1 resolution: "fs-extra@npm:11.1.1" @@ -16392,7 +16413,7 @@ __metadata: "@types/auto-launch": 5.0.5 "@types/content-type": 1.1.8 "@types/eslint": ^8.56.2 - "@types/fs-extra": 9.0.11 + "@types/fs-extra": 11.0.4 "@types/hapi__joi": ^17.1.14 "@types/is-ci": 3.0.4 "@types/jest": ^29.5.11 @@ -16460,7 +16481,7 @@ __metadata: eslint-plugin-testing-library: 6.2.0 eslint-plugin-unused-imports: 3.0.0 form-data: 4.0.0 - fs-extra: 10.1.0 + fs-extra: 11.2.0 get-proxy-settings: 0.1.13 globby: 11.1 husky: 4.3.8