From 2ed7e27d8939b1a7cb8274d221d311002503f4a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 Oct 2022 15:45:21 +0000 Subject: [PATCH 01/10] Update typescript requirement from ^4.7.3 to ^4.8.4 Updates the requirements on [typescript](https://github.com/Microsoft/TypeScript) to permit the latest version. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v4.7.3...v4.8.4) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 229954d..71fbf93 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "electron-builder": "^23.0.3", "husky": "^8.0.1", "prettier": "^2.7.0", - "typescript": "^4.7.3" + "typescript": "^4.8.4" }, "dependencies": { "@pyke/vibe": "^0.3.0", From 698e03f0e0c73608b9200bbba9191cb02994102f Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Sat, 8 Oct 2022 18:11:34 +0200 Subject: [PATCH 02/10] Fix build script --- .github/workflows/dev.yml | 6 +++--- .github/workflows/stable.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index bec4964..e6769c6 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -23,7 +23,7 @@ jobs: run: npm i -g pnpm - name: Install Node dependencies - run: pnpm install + run: pnpm install -g cargo-cp-artifact && pnpm install - name: Install Electron-Builder run: pnpm install -g electron-builder @@ -60,7 +60,7 @@ jobs: run: npm i -g pnpm - name: Install Node dependencies - run: pnpm install + run: pnpm install -g cargo-cp-artifact && pnpm install - name: Install Electron-Builder run: pnpm install -g electron-builder @@ -97,7 +97,7 @@ jobs: run: pnpm install - name: Install Electron-Builder - run: pnpm install -g electron-builder + run: pnpm install -g cargo-cp-artifact && pnpm install - name: Replace the version number run: (Get-Content src/utils.ts) -replace "\d\.\d\.\d", "DEV" | Out-File src/utils.ts diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml index 60e19dc..8a39bd5 100644 --- a/.github/workflows/stable.yml +++ b/.github/workflows/stable.yml @@ -23,7 +23,7 @@ jobs: run: npm i -g pnpm - name: Install Node dependencies - run: pnpm install + run: pnpm install -g cargo-cp-artifact && pnpm install - name: Install Electron-Builder run: pnpm install -g electron-builder @@ -58,7 +58,7 @@ jobs: run: npm i -g pnpm - name: Install Node dependencies - run: pnpm install + run: pnpm install -g cargo-cp-artifact && pnpm install - name: Install Electron-Builder run: pnpm install -g electron-builder @@ -93,7 +93,7 @@ jobs: run: npm i -g pnpm - name: Install Node dependencies - run: pnpm install + run: pnpm install -g cargo-cp-artifact && pnpm install - name: Install Electron-Builder run: pnpm install -g electron-builder From df013093f214eb4dcbc52d2df533a0ac79a24078 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Sat, 8 Oct 2022 18:14:25 +0200 Subject: [PATCH 03/10] pnpm setup --- .github/workflows/dev.yml | 6 +++--- .github/workflows/stable.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index e6769c6..e305db9 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v2 - name: Install pnpm - run: npm i -g pnpm + run: npm i -g pnpm && pnpm setup - name: Install Node dependencies run: pnpm install -g cargo-cp-artifact && pnpm install @@ -57,7 +57,7 @@ jobs: uses: actions/checkout@v2 - name: Install pnpm - run: npm i -g pnpm + run: npm i -g pnpm && pnpm setup - name: Install Node dependencies run: pnpm install -g cargo-cp-artifact && pnpm install @@ -91,7 +91,7 @@ jobs: uses: actions/checkout@v2 - name: Install pnpm - run: npm i -g pnpm + run: npm i -g pnpm && pnpm setup - name: Install Node dependencies run: pnpm install diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml index 8a39bd5..a46266e 100644 --- a/.github/workflows/stable.yml +++ b/.github/workflows/stable.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v2 - name: Install pnpm - run: npm i -g pnpm + run: npm i -g pnpm && pnpm setup - name: Install Node dependencies run: pnpm install -g cargo-cp-artifact && pnpm install @@ -55,7 +55,7 @@ jobs: uses: actions/checkout@v2 - name: Install pnpm - run: npm i -g pnpm + run: npm i -g pnpm && pnpm setup - name: Install Node dependencies run: pnpm install -g cargo-cp-artifact && pnpm install @@ -90,7 +90,7 @@ jobs: uses: actions/checkout@v2 - name: Install pnpm - run: npm i -g pnpm + run: npm i -g pnpm && pnpm setup - name: Install Node dependencies run: pnpm install -g cargo-cp-artifact && pnpm install From 30367157243c186e37e6aba130c413b809ef4538 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Sat, 8 Oct 2022 18:24:42 +0200 Subject: [PATCH 04/10] Setup pnpm with right env --- .github/workflows/dev.yml | 9 ++++++--- .github/workflows/stable.yml | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index e305db9..9c8d99a 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -19,8 +19,11 @@ jobs: - name: Checkout code uses: actions/checkout@v2 + - name: Install bash + run: sudo apt install -y bash + - name: Install pnpm - run: npm i -g pnpm && pnpm setup + run: npm i -g pnpm && /bin/bash pnpm setup - name: Install Node dependencies run: pnpm install -g cargo-cp-artifact && pnpm install @@ -57,7 +60,7 @@ jobs: uses: actions/checkout@v2 - name: Install pnpm - run: npm i -g pnpm && pnpm setup + run: npm i -g pnpm && pnpm setup && source /Users/runner/.bashrc - name: Install Node dependencies run: pnpm install -g cargo-cp-artifact && pnpm install @@ -91,7 +94,7 @@ jobs: uses: actions/checkout@v2 - name: Install pnpm - run: npm i -g pnpm && pnpm setup + run: npm i -g pnpm && pnpm setup && powershell - name: Install Node dependencies run: pnpm install diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml index a46266e..8b3f10f 100644 --- a/.github/workflows/stable.yml +++ b/.github/workflows/stable.yml @@ -55,7 +55,7 @@ jobs: uses: actions/checkout@v2 - name: Install pnpm - run: npm i -g pnpm && pnpm setup + run: npm i -g pnpm && pnpm setup && source /Users/runner/.bashrc - name: Install Node dependencies run: pnpm install -g cargo-cp-artifact && pnpm install From ce83747af7d980d4e8359b8c4e70319972820084 Mon Sep 17 00:00:00 2001 From: David Chiron Date: Mon, 10 Oct 2022 18:38:08 +0000 Subject: [PATCH 05/10] Translated using Weblate (French) Currently translated at 60.0% (33 of 55 strings) Translation: ArmCord/ArmCord Translate-URL: https://hosted.weblate.org/projects/armcord/armcord/fr/ --- assets/lang/fr-FR.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/assets/lang/fr-FR.json b/assets/lang/fr-FR.json index 4907bdd..f02d4b0 100644 --- a/assets/lang/fr-FR.json +++ b/assets/lang/fr-FR.json @@ -12,18 +12,18 @@ "setup_question4": "Sélectionnez le mod client que vous souhaitez installer :", "setup_question4_clientmodnotice": "Pourquoi pas tous ? Le fait d'avoir plusieurs clients mods en même temps peut causer des problèmes. Si vous voulez vraiment le faire, consultez notre Discord.", "loading_screen_offline": "Vous semblez être hors ligne. Veuillez vous connecter à internet et réessayer.", - "setup_offline": "Vous semblez être hors ligne. Veuillez vous connecter à internet et redémarrer l'installateur ArmCord.", + "setup_offline": "Vous semblez être hors ligne. Veuillez vous connecter à internet et redémarrer ArmCord.", "settings-tray": "Minimiser dans la zone de notification", - "settings-channel": "Canaux Discord :", + "settings-channel": "Canal Discord", "settings-mod": "Modification client :", - "settings-save": "Sauvegarder les paramètres", + "settings-save": "Sauvegarder les Paramètres", "settings-updater": "Vérifier les mises à jour", "settings-theme": "Thème ArmCord", "settings-theme-default": "Default", "settings-theme-native": "Native", "settings-patches": "Correctifs automatiques", "settings-invitewebsocket": "Lien discord.gg", - "settings-prfmMode": "Mode performance :", + "settings-prfmMode": "Le mode Performance est une fonction expérimentale qui peut augmenter la réactivité et la performance de\n ArmCord ou... la diminuer. Veuillez essayer chaque option et voir laquelle vous correspond le plus.", "settings-prfmMode-performance": "Performance", "settings-prfmMode-battery": "Batterie", "settings-none": "Aucun", @@ -31,8 +31,8 @@ "settings-theme-desc1": "Les \"thèmes\" d'ArmCord gèrent le comportement et l'apparence des applications.", "settings-channel-desc4": "public test build. Receives features earlier than stable but is a bit older than Canary.", "settings-altPaste": "Alternative Paste", - "settings-storageFolder": "Open storage folder", - "settings-theme-desc2": "voilà à quoi ressemble ArmCord quand vous le lancez pour la première fois. Cela inclu une reconstitution de la barre de titre de Discord, ainsi que le style spécifique de ArmCord administré sur Discord", + "settings-storageFolder": "Ouvrir le dossier de stockage", + "settings-theme-desc2": "voilà à quoi ressemble ArmCord quand vous le lancez pour la première fois. Cela inclut une reconstitution de\n la barre de titre de Discord, ainsi que les styles spécifiques de ArmCord administrés sur Discord.", "settings-theme-desc3": "uses native titlebar of OS you're currently running (e.g Windows 7/10). Functions more\n similar to actual Discord app on Linux.", "settings-csp-desc": "ArmCord CSP is our system that manages loading custom content loading into the Discord app. Stuff like\n client mods and themes depend on it. Disable if you want to get rid of mods and custom styles.", "settings-tray-desc": "When disabled, ArmCord will close like any other window when closed, otherwise it'll sit back and relax\n in your system tray for later.", @@ -50,8 +50,8 @@ "settings-mod-desc4": "heavily work in progress, doesn't have a working UI.", "settings-trayIcon": "Tray icon", "settings-trayIcon-desc": "Set the icon which will appear in tray menu.", - "settings-advanced": "️Advanced user zone", + "settings-advanced": "Zone d'utilisateur avancé", "settings-pluginsFolder": "Open plugins folder", - "settings-themesFolder": "Open themes folder", - "settings-restart": "Restart App" + "settings-themesFolder": "Ouvrir le dossier des thèmes", + "settings-restart": "Redémarrer l'Application" } From 320326edfeaff46a5eb0852e69327bc8ba77fd4b Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Tue, 11 Oct 2022 20:45:24 +0200 Subject: [PATCH 06/10] Fix pnpm install --- .github/workflows/dev.yml | 40 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 9c8d99a..c01a839 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -12,18 +12,16 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/setup-node@v3 - with: - node-version: '18' - - name: Checkout code uses: actions/checkout@v2 - - name: Install bash - run: sudo apt install -y bash + - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json - - name: Install pnpm - run: npm i -g pnpm && /bin/bash pnpm setup + - name: Use Node.js 18 + uses: actions/setup-node@v2 + with: + node-version: 18 + cache: "pnpm" - name: Install Node dependencies run: pnpm install -g cargo-cp-artifact && pnpm install @@ -52,15 +50,16 @@ jobs: runs-on: macos-latest steps: - - uses: actions/setup-node@v3 - with: - node-version: '18' - - name: Checkout code uses: actions/checkout@v2 - - name: Install pnpm - run: npm i -g pnpm && pnpm setup && source /Users/runner/.bashrc + - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json + + - name: Use Node.js 18 + uses: actions/setup-node@v2 + with: + node-version: 18 + cache: "pnpm" - name: Install Node dependencies run: pnpm install -g cargo-cp-artifact && pnpm install @@ -86,15 +85,16 @@ jobs: runs-on: windows-latest steps: - - uses: actions/setup-node@v3 - with: - node-version: '18' - - name: Checkout code uses: actions/checkout@v2 - - name: Install pnpm - run: npm i -g pnpm && pnpm setup && powershell + - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json + + - name: Use Node.js 18 + uses: actions/setup-node@v2 + with: + node-version: 18 + cache: "pnpm" - name: Install Node dependencies run: pnpm install From 636bd8264c6e0b4ca2f72a7a01f769a96d6c86e0 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Tue, 11 Oct 2022 20:50:41 +0200 Subject: [PATCH 07/10] Specify pnpm version --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 229954d..a653849 100644 --- a/package.json +++ b/package.json @@ -72,5 +72,6 @@ "AppImage" ] } - } + }, + "packageManager": "pnpm@7.13.4" } From 80cbc82d093405be4f329e6491af5780723ca07f Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Tue, 11 Oct 2022 20:58:13 +0200 Subject: [PATCH 08/10] Fix Windows build script --- .github/workflows/dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index c01a839..0c540d3 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -97,10 +97,10 @@ jobs: cache: "pnpm" - name: Install Node dependencies - run: pnpm install + run: pnpm install -g cargo-cp-artifact && pnpm install - name: Install Electron-Builder - run: pnpm install -g cargo-cp-artifact && pnpm install + run: pnpm install -g electron-builder - name: Replace the version number run: (Get-Content src/utils.ts) -replace "\d\.\d\.\d", "DEV" | Out-File src/utils.ts From 537ddaf758fe9e768aec01a1e67ee3b9d3054839 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Tue, 11 Oct 2022 21:05:20 +0200 Subject: [PATCH 09/10] Update Vibe --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a653849..8ddec2f 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "typescript": "^4.7.3" }, "dependencies": { - "@pyke/vibe": "^0.3.0", + "@pyke/vibe": "^0.3.1", "electron-context-menu": "github:ArmCord/electron-context-menu", "os-locale": "^6.0.2", "v8-compile-cache": "^2.3.0", From 016fd28dc02753ded465079d1a6161f30ddeccca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Oct 2022 19:06:39 +0000 Subject: [PATCH 10/10] Update typescript requirement from ^4.7.3 to ^4.8.4 Updates the requirements on [typescript](https://github.com/Microsoft/TypeScript) to permit the latest version. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v4.7.3...v4.8.4) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8ddec2f..12e6a46 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "electron-builder": "^23.0.3", "husky": "^8.0.1", "prettier": "^2.7.0", - "typescript": "^4.7.3" + "typescript": "^4.8.4" }, "dependencies": { "@pyke/vibe": "^0.3.1",