From b811227c41afa5ab503509405520d882b8b75796 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Mon, 10 Feb 2020 17:25:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0electron=E5=88=B0=208.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- package-lock.json | 152 ++++++++++++++++++++----------------------- package.json | 14 ++-- publish/changeLog.md | 2 +- src/main/index.js | 7 +- 5 files changed, 82 insertions(+), 97 deletions(-) diff --git a/README.md b/README.md index 113017a7..bce60092 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ 所用技术栈： -- Electron 7 +- Electron 8 - Vue 2 已支持的平台： @@ -81,7 +81,7 @@ npm run pack ### 免责声明 本项目**不开发或者破解直接获取音频数据**的功能，所有音频数据均来自**第三方接口**！
-本软件仅用于**测试 `electron 7` 在各种系统上的兼容性**及用于**对比各大音乐平台歌单、排行榜等数据列表的差异性**，使用本软件产生的**任何涉及版权相关的数据**请于**24小时内删除**。
+本软件仅用于**测试 `electron 8` 在各种系统上的兼容性**及用于**对比各大音乐平台歌单、排行榜等数据列表的差异性**，使用本软件产生的**任何涉及版权相关的数据**请于**24小时内删除**。
本软件仅用于学习交流使用，禁止用于商业用途，使用本软件所造成的的后果由使用者承担！
若对此有疑问请 mail to: lyswhut@qq.com diff --git a/package-lock.json b/package-lock.json index fd04c4a7..07684a90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "lx-music-desktop", - "version": "0.13.0", + "version": "0.15.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -3207,9 +3207,9 @@ }, "dependencies": { "es-abstract": { - "version": "1.17.2", - "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.17.2.tgz?cache=0&sync_timestamp=1579119394563&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fes-abstract%2Fdownload%2Fes-abstract-1.17.2.tgz", - "integrity": "sha1-llsQr1ZZe2MdoVhywXpAXobB/UY=", + "version": "1.17.4", + "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.17.4.tgz?cache=0&sync_timestamp=1579624493239&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fes-abstract%2Fdownload%2Fes-abstract-1.17.4.tgz", + "integrity": "sha1-467fGXBrIOfCWUw1/A1XYFp54YQ=", "dev": true, "requires": { "es-to-primitive": "^1.2.1", @@ -3291,9 +3291,9 @@ }, "dependencies": { "es-abstract": { - "version": "1.17.2", - "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.17.2.tgz?cache=0&sync_timestamp=1579119394563&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fes-abstract%2Fdownload%2Fes-abstract-1.17.2.tgz", - "integrity": "sha1-llsQr1ZZe2MdoVhywXpAXobB/UY=", + "version": "1.17.4", + "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.17.4.tgz?cache=0&sync_timestamp=1579624493239&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fes-abstract%2Fdownload%2Fes-abstract-1.17.4.tgz", + "integrity": "sha1-467fGXBrIOfCWUw1/A1XYFp54YQ=", "dev": true, "requires": { "es-to-primitive": "^1.2.1", @@ -5046,9 +5046,9 @@ } }, "cfonts": { - "version": "2.4.8", - "resolved": "https://registry.npm.taobao.org/cfonts/download/cfonts-2.4.8.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcfonts%2Fdownload%2Fcfonts-2.4.8.tgz", - "integrity": "sha1-Q/lWt80/QUgODqSVqjMOZS/7HVY=", + "version": "2.6.1", + "resolved": "https://registry.npm.taobao.org/cfonts/download/cfonts-2.6.1.tgz", + "integrity": "sha1-uErzJQD/JxsKY0HeQ6I9RkrRun8=", "dev": true, "requires": { "chalk": "^3.0.0", @@ -6677,9 +6677,9 @@ "dev": true }, "electron": { - "version": "7.1.11", - "resolved": "https://registry.npm.taobao.org/electron/download/electron-7.1.11.tgz?cache=0&sync_timestamp=1580373892913&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron%2Fdownload%2Felectron-7.1.11.tgz", - "integrity": "sha1-OpXjWASvCD1YtZBROv6l4ikMS2Y=", + "version": "8.0.0", + "resolved": "https://registry.npm.taobao.org/electron/download/electron-8.0.0.tgz?cache=0&sync_timestamp=1580775148211&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron%2Fdownload%2Felectron-8.0.0.tgz", + "integrity": "sha1-tfEFzaaYXKLySW3hXkSyu7DI5PQ=", "dev": true, "requires": { "@electron/get": "^1.0.1", @@ -6966,9 +6966,9 @@ } }, "electron-log": { - "version": "4.0.4", - "resolved": "https://registry.npm.taobao.org/electron-log/download/electron-log-4.0.4.tgz", - "integrity": "sha1-qA2u+i+a2/5ayIgGz8UnDAOrVdI=" + "version": "4.0.6", + "resolved": "https://registry.npm.taobao.org/electron-log/download/electron-log-4.0.6.tgz", + "integrity": "sha1-fUJECCpvWuODjz+kzXJx+N1hC/E=" }, "electron-publish": { "version": "22.3.2", @@ -7411,9 +7411,9 @@ }, "dependencies": { "resolve": { - "version": "1.14.2", - "resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.14.2.tgz", - "integrity": "sha1-2/MdD6mLHymqUWl4O5wpDLhl/qI=", + "version": "1.15.1", + "resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.15.1.tgz", + "integrity": "sha1-J73N7/6vLWJEuVuw+fS0ZTRR8+g=", "dev": true, "requires": { "path-parse": "^1.0.6" @@ -7547,9 +7547,9 @@ } }, "eslint-plugin-import": { - "version": "2.20.0", - "resolved": "https://registry.npm.taobao.org/eslint-plugin-import/download/eslint-plugin-import-2.20.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-plugin-import%2Fdownload%2Feslint-plugin-import-2.20.0.tgz", - "integrity": "sha1-10mnJj+2wpmA3vjpYNOApqpq7Ko=", + "version": "2.20.1", + "resolved": "https://registry.npm.taobao.org/eslint-plugin-import/download/eslint-plugin-import-2.20.1.tgz", + "integrity": "sha1-gCQjGW3LEdnOhDWl/AKm07RpObM=", "dev": true, "requires": { "array-includes": "^3.0.3", @@ -7577,9 +7577,9 @@ } }, "resolve": { - "version": "1.14.2", - "resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.14.2.tgz", - "integrity": "sha1-2/MdD6mLHymqUWl4O5wpDLhl/qI=", + "version": "1.15.1", + "resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.15.1.tgz", + "integrity": "sha1-J73N7/6vLWJEuVuw+fS0ZTRR8+g=", "dev": true, "requires": { "path-parse": "^1.0.6" @@ -8313,22 +8313,28 @@ } }, "follow-redirects": { - "version": "1.5.10", - "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.5.10.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.5.10.tgz", - "integrity": "sha1-e3qfmuov3/NnhqlP9kPtB/T/Xio=", + "version": "1.10.0", + "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.10.0.tgz?cache=0&sync_timestamp=1580082237027&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.10.0.tgz", + "integrity": "sha1-AfUmOu6SHGpU+5Fmfwj0FVzhaes=", "dev": true, "requires": { - "debug": "=3.1.0" + "debug": "^3.0.0" }, "dependencies": { "debug": { - "version": "3.1.0", - "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz", - "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", + "version": "3.2.6", + "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.2.6.tgz", + "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "^2.1.1" } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.1.2.tgz", + "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=", + "dev": true } } }, @@ -9127,25 +9133,25 @@ } }, "global-agent": { - "version": "2.1.7", - "resolved": "https://registry.npm.taobao.org/global-agent/download/global-agent-2.1.7.tgz", - "integrity": "sha1-Ete8KwfNhi0Pp2sPGyxIzV/88VA=", + "version": "2.1.8", + "resolved": "https://registry.npm.taobao.org/global-agent/download/global-agent-2.1.8.tgz", + "integrity": "sha1-mdFTZissBMvBGZ/7wIGjqmVqxQ8=", "dev": true, "optional": true, "requires": { "boolean": "^3.0.0", - "core-js": "^3.4.1", + "core-js": "^3.6.4", "es6-error": "^4.1.1", - "matcher": "^2.0.0", - "roarr": "^2.14.5", - "semver": "^6.3.0", + "matcher": "^2.1.0", + "roarr": "^2.15.2", + "semver": "^7.1.2", "serialize-error": "^5.0.0" }, "dependencies": { "semver": { - "version": "6.3.0", - "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1580434257623&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz", - "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=", + "version": "7.1.2", + "resolved": "https://registry.npm.taobao.org/semver/download/semver-7.1.2.tgz?cache=0&sync_timestamp=1580434257623&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-7.1.2.tgz", + "integrity": "sha1-hHuuW85oxdCIiYJPAmZxmbcOPYc=", "dev": true, "optional": true } @@ -10577,9 +10583,9 @@ } }, "less": { - "version": "3.10.3", - "resolved": "https://registry.npm.taobao.org/less/download/less-3.10.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fless%2Fdownload%2Fless-3.10.3.tgz", - "integrity": "sha1-QXoJddXu7MUs/0vPo8CdNXgeZ5I=", + "version": "3.11.0", + "resolved": "https://registry.npm.taobao.org/less/download/less-3.11.0.tgz?cache=0&sync_timestamp=1581285998790&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fless%2Fdownload%2Fless-3.11.0.tgz", + "integrity": "sha1-zjtgENTs8AcQ1aaJFSB951QbTXM=", "dev": true, "requires": { "clone": "^2.1.2", @@ -10595,7 +10601,7 @@ "dependencies": { "mime": { "version": "1.6.0", - "resolved": "https://registry.npm.taobao.org/mime/download/mime-1.6.0.tgz", + "resolved": "https://registry.npm.taobao.org/mime/download/mime-1.6.0.tgz?cache=0&sync_timestamp=1560034758817&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmime%2Fdownload%2Fmime-1.6.0.tgz", "integrity": "sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE=", "dev": true, "optional": true @@ -13450,9 +13456,9 @@ }, "dependencies": { "es-abstract": { - "version": "1.17.0", - "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.17.0.tgz?cache=0&sync_timestamp=1576883946566&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fes-abstract%2Fdownload%2Fes-abstract-1.17.0.tgz", - "integrity": "sha1-9CpRfQA2pVkduyxGNZHci7UDCbE=", + "version": "1.17.4", + "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.17.4.tgz?cache=0&sync_timestamp=1579624493239&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fes-abstract%2Fdownload%2Fes-abstract-1.17.4.tgz", + "integrity": "sha1-467fGXBrIOfCWUw1/A1XYFp54YQ=", "dev": true, "requires": { "es-to-primitive": "^1.2.1", @@ -13499,26 +13505,6 @@ "requires": { "has": "^1.0.3" } - }, - "string.prototype.trimleft": { - "version": "2.1.1", - "resolved": "https://registry.npm.taobao.org/string.prototype.trimleft/download/string.prototype.trimleft-2.1.1.tgz?cache=0&sync_timestamp=1576706744979&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring.prototype.trimleft%2Fdownload%2Fstring.prototype.trimleft-2.1.1.tgz", - "integrity": "sha1-m9uKxqvW1gKxek7TIYcNL43O/HQ=", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "function-bind": "^1.1.1" - } - }, - "string.prototype.trimright": { - "version": "2.1.1", - "resolved": "https://registry.npm.taobao.org/string.prototype.trimright/download/string.prototype.trimright-2.1.1.tgz?cache=0&sync_timestamp=1576706745939&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring.prototype.trimright%2Fdownload%2Fstring.prototype.trimright-2.1.1.tgz", - "integrity": "sha1-RAMUsVmWyGbOigNBiU1FGGIAxdk=", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "function-bind": "^1.1.1" - } } } }, @@ -13799,9 +13785,9 @@ } }, "rimraf": { - "version": "3.0.1", - "resolved": "https://registry.npm.taobao.org/rimraf/download/rimraf-3.0.1.tgz", - "integrity": "sha1-SNPUy0bIDTiKsmzWGxtGaumuIlo=", + "version": "3.0.2", + "resolved": "https://registry.npm.taobao.org/rimraf/download/rimraf-3.0.2.tgz?cache=0&sync_timestamp=1581229865753&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frimraf%2Fdownload%2Frimraf-3.0.2.tgz", + "integrity": "sha1-8aVAK6YiCtUswSgrrBrjqkn9Bho=", "dev": true, "requires": { "glob": "^7.1.3" @@ -13818,15 +13804,15 @@ } }, "roarr": { - "version": "2.14.6", - "resolved": "https://registry.npm.taobao.org/roarr/download/roarr-2.14.6.tgz", - "integrity": "sha1-zr6K1+y/0Vv6N7AtrPAICd1jORI=", + "version": "2.15.2", + "resolved": "https://registry.npm.taobao.org/roarr/download/roarr-2.15.2.tgz", + "integrity": "sha1-NPYimuPIwSFnxK5g9Y/nXnmh45Q=", "dev": true, "optional": true, "requires": { "boolean": "^3.0.0", "detect-node": "^2.0.4", - "globalthis": "^1.0.0", + "globalthis": "^1.0.1", "json-stringify-safe": "^5.0.1", "semver-compare": "^1.0.0", "sprintf-js": "^1.1.2" @@ -14503,9 +14489,9 @@ "dev": true }, "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npm.taobao.org/readable-stream/download/readable-stream-3.4.0.tgz?cache=0&sync_timestamp=1578244501372&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freadable-stream%2Fdownload%2Freadable-stream-3.4.0.tgz", - "integrity": "sha1-pRwmdUZY4KPCHb9ZFjvUW6b0R/w=", + "version": "3.5.0", + "resolved": "https://registry.npm.taobao.org/readable-stream/download/readable-stream-3.5.0.tgz", + "integrity": "sha1-Rl1w5tEIf2Fi0HnNC123++v9FgY=", "dev": true, "requires": { "inherits": "^2.0.3", @@ -16212,9 +16198,9 @@ } }, "webpack-dev-server": { - "version": "3.10.1", - "resolved": "https://registry.npm.taobao.org/webpack-dev-server/download/webpack-dev-server-3.10.1.tgz?cache=0&sync_timestamp=1576754522893&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-dev-server%2Fdownload%2Fwebpack-dev-server-3.10.1.tgz", - "integrity": "sha1-H/PlzM+OCJeqP1kJxlTmI/abHA4=", + "version": "3.10.3", + "resolved": "https://registry.npm.taobao.org/webpack-dev-server/download/webpack-dev-server-3.10.3.tgz", + "integrity": "sha1-81lFA2gT5X71gsJCDve0cOFNOvA=", "dev": true, "requires": { "ansi-html": "0.0.7", diff --git a/package.json b/package.json index 54456f2d..68b3cc04 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "babel-minify-webpack-plugin": "^0.3.1", "babel-preset-minify": "^0.5.1", "browserslist": "^4.8.6", - "cfonts": "^2.4.8", + "cfonts": "^2.6.1", "chalk": "^3.0.0", "changelog-parser": "^2.8.0", "copy-webpack-plugin": "^5.1.1", @@ -158,7 +158,7 @@ "cross-env": "^7.0.0", "css-loader": "^3.4.2", "del": "^5.1.0", - "electron": "^7.1.11", + "electron": "^8.0.0", "electron-builder": "^22.3.2", "electron-debug": "^3.0.1", "electron-devtools-installer": "^2.2.4", @@ -167,14 +167,14 @@ "eslint-formatter-friendly": "^7.0.0", "eslint-loader": "^3.0.3", "eslint-plugin-html": "^6.0.0", - "eslint-plugin-import": "^2.20.0", + "eslint-plugin-import": "^2.20.1", "eslint-plugin-node": "^11.0.0", "eslint-plugin-promise": "^4.2.1", "eslint-plugin-standard": "^4.0.1", "file-loader": "^5.0.2", "friendly-errors-webpack-plugin": "^1.7.0", "html-webpack-plugin": "^3.2.0", - "less": "^3.10.3", + "less": "^3.11.0", "less-loader": "^5.0.0", "markdown-it": "^10.0.0", "mini-css-extract-plugin": "^0.9.0", @@ -185,7 +185,7 @@ "pug-loader": "^2.4.0", "pug-plain-loader": "^1.0.0", "raw-loader": "^4.0.0", - "rimraf": "^3.0.1", + "rimraf": "^3.0.2", "stylus": "^0.54.7", "stylus-loader": "^3.0.2", "terser-webpack-plugin": "^2.3.4", @@ -195,14 +195,14 @@ "vue-template-compiler": "^2.6.11", "webpack": "^4.41.5", "webpack-cli": "^3.3.10", - "webpack-dev-server": "^3.10.1", + "webpack-dev-server": "^3.10.3", "webpack-hot-middleware": "^2.25.0", "webpack-merge": "^4.2.2" }, "dependencies": { "crypto-js": "^3.1.9-1", "dnscache": "^1.0.2", - "electron-log": "^4.0.4", + "electron-log": "^4.0.6", "electron-store": "^5.1.0", "electron-updater": "^4.2.0", "flac-metadata": "^0.1.1", diff --git a/publish/changeLog.md b/publish/changeLog.md index 1785a81a..6671c80a 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -18,4 +18,4 @@ ### 其他 -- 更新electron到 7.1.11 +- 更新electron到 8.0.0 diff --git a/src/main/index.js b/src/main/index.js index 811f1c2f..e0489097 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -15,6 +15,9 @@ app.on('second-instance', (event, argv, cwd) => { } }) +// https://github.com/electron/electron/issues/18397 +app.allowRendererProcessReuse = true + const { getWindowSizeInfo, parseEnv } = require('./utils') global.envParams = parseEnv() @@ -26,10 +29,6 @@ const { isLinux, isMac } = require('../common/utils') const isDev = process.env.NODE_ENV !== 'production' -/** - * Set `__static` path to static files in production - * https://simulatedgreg.gitbooks.io/electron-vue/content/en/using-static-assets.html - */ let mainWindow let winURL