From a2168da9997984a1252cd66d2da1417c36ce3c14 Mon Sep 17 00:00:00 2001 From: Daniel Scalzi Date: Thu, 14 Oct 2021 23:55:31 -0400 Subject: [PATCH] Update eletron to v15, target node 16 to match. --- .github/workflows/build.yml | 2 +- .nvmrc | 2 +- README.md | 2 +- index.js | 3 --- package-lock.json | 8 ++++---- package.json | 4 ++-- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 48078b007d..bbd00849a7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v1 with: - node-version: 14 + node-version: 16 - name: Build/release Electron app uses: samuelmeuli/action-electron-builder@v1 diff --git a/.nvmrc b/.nvmrc index da2d3988d7..19c7bdba7b 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -14 \ No newline at end of file +16 \ No newline at end of file diff --git a/README.md b/README.md index c8c4bd92c9..4d7d6204ad 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ This section details the setup of a basic developmentment environment. **System Requirements** -* [Node.js][nodejs] v14 +* [Node.js][nodejs] v16 --- diff --git a/index.js b/index.js index 29538b6fc7..08d6be35a1 100644 --- a/index.js +++ b/index.js @@ -88,9 +88,6 @@ ipcMain.on('distributionIndexDone', (event, res) => { // https://electronjs.org/docs/tutorial/offscreen-rendering app.disableHardwareAcceleration() -// https://github.com/electron/electron/issues/18397 -app.allowRendererProcessReuse = true - // Keep a global reference of the window object, if you don't, the window will // be closed automatically when the JavaScript object is garbage collected. let win diff --git a/package-lock.json b/package-lock.json index 6205802236..9a3e84d9ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1282,12 +1282,12 @@ } }, "electron": { - "version": "13.5.2", - "resolved": "https://registry.npmjs.org/electron/-/electron-13.5.2.tgz", - "integrity": "sha512-CPakwDpy5m8dL0383F5uJboQcVtn9bT/+6/wdDKo8LuTUO9aER1TF41v7feZgZW2c+UwoGPWa814ElSQ3qta2A==", + "version": "15.2.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-15.2.0.tgz", + "integrity": "sha512-kg0JdlsVbJgD/hO/A7o9VH8U44pQWkIsyt/sALxH6g8CiHQxMujLn2JfB2gyUfHXPT7m8vD4Z+CurS2KodEsWw==", "dev": true, "requires": { - "@electron/get": "^1.0.1", + "@electron/get": "^1.13.0", "@types/node": "^14.6.2", "extract-zip": "^1.0.3" } diff --git a/package.json b/package.json index 07fe36293f..7592deed09 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "lint": "eslint --config .eslintrc.json ." }, "engines": { - "node": "14.x.x" + "node": "16.x.x" }, "dependencies": { "@electron/remote": "^2.0.1", @@ -40,7 +40,7 @@ "winreg": "^1.2.4" }, "devDependencies": { - "electron": "^13.5.2", + "electron": "^15.2.0", "electron-builder": "^22.13.1", "eslint": "^8.0.1" },