From a0910e910ef81eaeaf7006adedd0b2315e229aeb Mon Sep 17 00:00:00 2001 From: Sergei Chestakov Date: Mon, 1 Jan 2024 20:09:10 -0500 Subject: [PATCH 1/2] Upgrade Electron to 28.1.0 (#145) --- package.json | 2 +- pnpm-lock.yaml | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 80de2e9..85d8305 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@typescript-eslint/parser": "^4.33.0", "cpy": "^9.0.1", "cross-env": "^7.0.3", - "electron": "^26.4.1", + "electron": "^28.1.0", "electron-winstaller": "^5.1.0", "esbuild": "^0.18.6", "eslint": "^8.47.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 148862d..f9f00f1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,8 +56,8 @@ devDependencies: specifier: ^7.0.3 version: 7.0.3 electron: - specifier: ^26.4.1 - version: 26.6.1 + specifier: ^28.1.0 + version: 28.1.0 electron-winstaller: specifier: ^5.1.0 version: 5.2.1 @@ -2189,8 +2189,8 @@ packages: - supports-color dev: true - /electron@26.6.1: - resolution: {integrity: sha512-4Vz9u0Jt/khPa/en2l8Jv6SWEfsK/ieWYtchl5j0clbNSjdeTucnEFOhz9B9WwsAmfQjxBnpuMZpmdBuyxq+wg==} + /electron@28.1.0: + resolution: {integrity: sha512-82Y7o4PSWPn1o/aVwYPsgmBw6Gyf2lVHpaBu3Ef8LrLWXxytg7ZRZr/RtDqEMOzQp3+mcuy3huH84MyjdmP50Q==} engines: {node: '>= 12.20.55'} hasBin: true requiresBuild: true @@ -2227,6 +2227,7 @@ packages: /end-of-stream@1.4.4: resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==} + requiresBuild: true dependencies: once: 1.4.0 dev: true From a3dc4fb99caacaf1ad1b1f3f705f288d2cad567c Mon Sep 17 00:00:00 2001 From: Sergei Chestakov Date: Mon, 1 Jan 2024 20:20:19 -0500 Subject: [PATCH 2/2] Update Node version in build and publish steps (#146) * Update Node version in build and publish steps * Bump Electron Forge deps * Revert "Bump Electron Forge deps" This reverts commit 9a57cc492afa6ed134c069e0ecacac6ebf61a9df. --- .github/workflows/build.yml | 2 +- .github/workflows/publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3460e3d..596bbb6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 18.x + node-version: 20.10.x cache: pnpm - name: Install run: pnpm install diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index bf21511..79be395 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -32,7 +32,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 18.x + node-version: 20.10.x cache: pnpm - name: Install run: pnpm install