From 2aadc61af9ff70aa93a99e28a07334c86a1f7479 Mon Sep 17 00:00:00 2001 From: Pierre Date: Mon, 25 Sep 2023 22:09:46 +0200 Subject: [PATCH 1/3] Downgrade electron to v25.8.2 (#126) --- package.json | 2 +- pnpm-lock.yaml | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index df71c43..8484be5 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@typescript-eslint/parser": "^6.2.1", "@vencord/types": "^0.1.2", "dotenv": "^16.3.1", - "electron": "^26.2.2", + "electron": "^25.8.2", "electron-builder": "^24.6.3", "esbuild": "^0.18.17", "eslint": "^8.46.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ba88bed..4437c6f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,8 +32,8 @@ devDependencies: specifier: ^16.3.1 version: 16.3.1 electron: - specifier: ^26.2.2 - version: 26.2.2 + specifier: ^25.8.2 + version: 25.8.2 electron-builder: specifier: ^24.6.3 version: 24.6.3 @@ -1245,6 +1245,7 @@ packages: /boolean@3.2.0: resolution: {integrity: sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==} + requiresBuild: true dev: true optional: true @@ -1637,6 +1638,7 @@ packages: /detect-node@2.1.0: resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==} + requiresBuild: true dev: true optional: true @@ -1764,8 +1766,8 @@ packages: - supports-color dev: true - /electron@26.2.2: - resolution: {integrity: sha512-Ihb3Zt4XYnHF52DYSq17ySkgFqJV4OT0VnfhUYZASAql7Vembz3VsAq7mB3OALBHXltAW34P8BxTIwTqZaMS3g==} + /electron@25.8.2: + resolution: {integrity: sha512-AM1ra6b16EQuO1bJtiA8ZiWqqFLLgVfxD56ykiy+EA5C63Hkx8OmIbe+5JAsLiTwRVvBZ4oCAj6wa2qT+iq8ww==} engines: {node: '>= 12.20.55'} hasBin: true requiresBuild: true @@ -1863,6 +1865,7 @@ packages: /es6-error@4.1.1: resolution: {integrity: sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==} + requiresBuild: true dev: true optional: true @@ -3058,6 +3061,7 @@ packages: /json-stringify-safe@5.0.1: resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==} + requiresBuild: true dev: true optional: true @@ -3172,6 +3176,7 @@ packages: /matcher@3.0.0: resolution: {integrity: sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==} engines: {node: '>=10'} + requiresBuild: true dependencies: escape-string-regexp: 4.0.0 dev: true @@ -3680,6 +3685,7 @@ packages: /roarr@2.15.4: resolution: {integrity: sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==} engines: {node: '>=8.0'} + requiresBuild: true dependencies: boolean: 3.2.0 detect-node: 2.1.0 @@ -3743,6 +3749,7 @@ packages: /semver-compare@1.0.0: resolution: {integrity: sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==} + requiresBuild: true dev: true optional: true @@ -3762,6 +3769,7 @@ packages: /serialize-error@7.0.1: resolution: {integrity: sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==} engines: {node: '>=10'} + requiresBuild: true dependencies: type-fest: 0.13.1 dev: true @@ -3889,6 +3897,7 @@ packages: /sprintf-js@1.1.2: resolution: {integrity: sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==} + requiresBuild: true dev: true optional: true @@ -4115,6 +4124,7 @@ packages: /type-fest@0.13.1: resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==} engines: {node: '>=10'} + requiresBuild: true dev: true optional: true From d5f63da939c1e59efd6dae76b074706c8ba592a5 Mon Sep 17 00:00:00 2001 From: V Date: Mon, 25 Sep 2023 22:11:53 +0200 Subject: [PATCH 2/3] bump to v0.3.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8484be5..d2598d7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "VencordDesktop", - "version": "0.3.1", + "version": "0.3.2", "private": true, "description": "", "keywords": [], From ef064eba3dfb7db005727bafd9a7c55d6ab43a41 Mon Sep 17 00:00:00 2001 From: Lewis Crichton Date: Mon, 25 Sep 2023 23:00:17 +0100 Subject: [PATCH 3/3] ci: switch to vedantmgoyal2009/winget-releaser (#103) Co-authored-by: V --- .github/workflows/winget-submission.yml | 28 ++++++------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/.github/workflows/winget-submission.yml b/.github/workflows/winget-submission.yml index 160635f..211a91f 100644 --- a/.github/workflows/winget-submission.yml +++ b/.github/workflows/winget-submission.yml @@ -1,33 +1,17 @@ -# Based on Microsoft/DevHome Winget CI, modified for use in Vencord/Vesktop. -# -# Copyright (c) Microsoft Corporation and Contributors -# Licensed under the MIT license. - name: Submit to Winget Community Repo on: - workflow_dispatch: release: types: [published] jobs: winget: name: Publish winget package - runs-on: windows-latest - env: - WINGET_PAT: ${{ secrets.WINGET_PAT }} + runs-on: ubuntu-latest steps: - name: Submit package to Winget Community Repo - run: | - - $packageId = "Vencord.Vesktop" - - # Fetching latest release from GitHub - $github = Invoke-RestMethod -uri "https://api.github.com/repos/vencord/vesktop/releases" - $targetRelease = $github | Select-Object -First 1 - $installerUrl = $targetRelease | Select-Object -ExpandProperty assets -First 1 | Where-Object -Property name -match 'Vesktop-Setup.*?exe' | Select-Object -ExpandProperty browser_download_url - $packageVersion = $targetRelease.tag_name.Trim("v") - - # Update package using wingetcreate - Invoke-WebRequest https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe - .\wingetcreate.exe update $packageId --version $packageVersion --urls "$installerUrl" --submit --token $env:WINGET_PAT + uses: vedantmgoyal2009/winget-releaser@52ef3f3028ed79a9606d7678d0a88d295bc0c690 # v2 + with: + identifier: Vencord.Vesktop + token: ${{ secrets.WINGET_PAT }} + installers-regex: '\.exe$'