From 5fde20ace19e35f6914063ba5af3ba2bf62530ea Mon Sep 17 00:00:00 2001 From: Mastermindzh Date: Thu, 21 Apr 2022 23:58:48 +0200 Subject: [PATCH] hotfix, downgrade packaged version to 8.5.2 --- CHANGELOG.md | 6 ++ build/electron-builder.yml | 4 +- package-lock.json | 173 +++++-------------------------------- package.json | 4 +- src/main.js | 1 + src/scripts/menu.js | 4 - 6 files changed, 33 insertions(+), 159 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 370ef04..a536f36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 2.8.2 + +- Updated dependencies +- Downgraded packaged version of electron to 8.5.2, doesn't seem to like a newer build +- Fixed the annoying (and useless) terminal warning about `allowRendererProcessReuse` + ## 2.8.1 - Mar0xy fixed some build issues (thanks!) diff --git a/build/electron-builder.yml b/build/electron-builder.yml index 9d44509..0a14502 100644 --- a/build/electron-builder.yml +++ b/build/electron-builder.yml @@ -1,7 +1,7 @@ appId: com.rickvanlieshout.tidal-hifi -electronVersion: 16.0.4 +electronVersion: 8.5.2 electronDownload: - version: 16.0.4+wvcus.2 + version: 8.5.2-wvvmp mirror: https://github.com/castlabs/electron-releases/releases/download/v snap: plugs: diff --git a/package-lock.json b/package-lock.json index 127d8e4..c5c4188 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "tidal-hifi", - "version": "2.8.1", + "version": "2.8.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "tidal-hifi", - "version": "2.8.1", + "version": "2.8.2", "license": "MIT", "dependencies": { "discord-rpc": "^4.0.1", @@ -18,7 +18,7 @@ }, "devDependencies": { "@mastermindzh/prettier-config": "^1.0.0", - "electron": "git+https://github.com/castlabs/electron-releases.git#v16.0.4+wvcus", + "electron": "git+https://github.com/castlabs/electron-releases.git#15.5.2-wvvmp", "electron-builder": "^22.14.5", "electron-reload": "^1.5.0", "prettier": "^2.5.0" @@ -595,9 +595,9 @@ } }, "node_modules/async": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", + "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==", "dev": true }, "node_modules/async-exit-hook": { @@ -1995,15 +1995,6 @@ "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" }, - "node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/etag": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", @@ -2894,13 +2885,13 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, "node_modules/jake": { - "version": "10.8.2", - "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz", - "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==", + "version": "10.8.5", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz", + "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==", "dev": true, "dependencies": { - "async": "0.9.x", - "chalk": "^2.4.2", + "async": "^3.2.3", + "chalk": "^4.0.2", "filelist": "^1.0.1", "minimatch": "^3.0.4" }, @@ -2908,69 +2899,7 @@ "jake": "bin/cli.js" }, "engines": { - "node": "*" - } - }, - "node_modules/jake/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/jake/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/jake/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/jake/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "node_modules/jake/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/jake/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" + "node": ">=10" } }, "node_modules/js-yaml": { @@ -5314,9 +5243,9 @@ "optional": true }, "async": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", - "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", + "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==", "dev": true }, "async-exit-hook": { @@ -6184,7 +6113,7 @@ "electron": { "version": "git+ssh://git@github.com/castlabs/electron-releases.git#8d8957ec0fae843760a583ed7a82e5d266fde647", "dev": true, - "from": "electron@git+https://github.com/castlabs/electron-releases.git#v16.0.4+wvcus", + "from": "electron@git+https://github.com/castlabs/electron-releases.git#15.5.2-wvvmp", "requires": { "@electron/get": "^1.0.1", "@types/node": "^12.0.12", @@ -6426,12 +6355,6 @@ "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, "etag": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", @@ -7133,67 +7056,15 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, "jake": { - "version": "10.8.2", - "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz", - "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==", + "version": "10.8.5", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz", + "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==", "dev": true, "requires": { - "async": "0.9.x", - "chalk": "^2.4.2", + "async": "^3.2.3", + "chalk": "^4.0.2", "filelist": "^1.0.1", "minimatch": "^3.0.4" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } } }, "js-yaml": { @@ -8686,4 +8557,4 @@ } } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index a9b935e..29a17fc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tidal-hifi", - "version": "2.8.1", + "version": "2.8.2", "description": "Tidal on Electron with widevine(hifi) support", "main": "src/main.js", "scripts": { @@ -32,7 +32,7 @@ }, "devDependencies": { "@mastermindzh/prettier-config": "^1.0.0", - "electron": "git+https://github.com/castlabs/electron-releases.git#v16.0.4+wvcus.2", + "electron": "git+https://github.com/castlabs/electron-releases.git#15.5.2-wvvmp", "electron-builder": "^22.14.5", "electron-reload": "^1.5.0", "prettier": "^2.5.0" diff --git a/src/main.js b/src/main.js index bc3757b..a70c993 100644 --- a/src/main.js +++ b/src/main.js @@ -101,6 +101,7 @@ function addGlobalShortcuts() { // initialization and is ready to create browser windows. // Some APIs can only be used after this event occurs. app.on("ready", () => { + app.allowRendererProcessReuse = true; createWindow(); addMenu(); createSettingsWindow(); diff --git a/src/scripts/menu.js b/src/scripts/menu.js index 9d5623e..60f3a35 100644 --- a/src/scripts/menu.js +++ b/src/scripts/menu.js @@ -38,12 +38,10 @@ const mainMenu = [ }, ] : []), - // { role: 'fileMenu' } { label: "File", submenu: [settingsMenuEntry, isMac ? { role: "close" } : quitMenuEntry], }, - // { role: 'editMenu' } { label: "Edit", submenu: [ @@ -69,7 +67,6 @@ const mainMenu = [ settingsMenuEntry, ], }, - // { role: 'viewMenu' } { label: "View", submenu: [ @@ -83,7 +80,6 @@ const mainMenu = [ { role: "togglefullscreen" }, ], }, - // { role: 'windowMenu' } { label: "Window", submenu: [