From 9539083f7e3a3bfc3f15fb40fc648177347068d7 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Mon, 16 Dec 2019 21:04:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=8D=E7=BA=A7electron=E5=88=B07.1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 433 +++++++----------- package.json | 6 +- publish/changeLog.md | 4 + src/renderer/App.vue | 1 + .../components/material/VersionModal.vue | 2 +- 5 files changed, 168 insertions(+), 278 deletions(-) diff --git a/package-lock.json b/package-lock.json index 15baa25d..9bc3a977 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "lx-music-desktop", - "version": "0.12.1", + "version": "0.13.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2092,8 +2092,8 @@ }, "@electron/get": { "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.7.2.tgz", - "integrity": "sha512-LSE4LZGMjGS9TloDx0yO44D2UTbaeKRk+QjlhWLiQlikV6J4spgDCjb6z4YIcqmPAwNzlNCnWF4dubytwI+ATA==", + "resolved": "https://registry.npm.taobao.org/@electron/get/download/@electron/get-1.7.2.tgz", + "integrity": "sha1-KGQ2qftW/xofzfDoATH9ZfTR4P0=", "dev": true, "requires": { "debug": "^4.1.1", @@ -2108,8 +2108,8 @@ "dependencies": { "debug": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz", + "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=", "dev": true, "requires": { "ms": "^2.1.1" @@ -2117,14 +2117,14 @@ }, "env-paths": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz", - "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==", + "resolved": "https://registry.npm.taobao.org/env-paths/download/env-paths-2.2.0.tgz", + "integrity": "sha1-zcpVfcAJFSkX1hZuL+vh8DloXkM=", "dev": true }, "ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "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 } } @@ -2589,29 +2589,29 @@ } }, "app-builder-bin": { - "version": "3.4.4", - "resolved": "https://registry.npm.taobao.org/app-builder-bin/download/app-builder-bin-3.4.4.tgz", - "integrity": "sha1-byRO23vV5ILe/Ecu8MFWkrVp8hE=", + "version": "3.4.3", + "resolved": "https://registry.npm.taobao.org/app-builder-bin/download/app-builder-bin-3.4.3.tgz", + "integrity": "sha1-WKdBk+uILwKb5rfwzT8MaAWSems=", "dev": true }, "app-builder-lib": { - "version": "22.1.0", - "resolved": "https://registry.npm.taobao.org/app-builder-lib/download/app-builder-lib-22.1.0.tgz?cache=0&sync_timestamp=1571815937090&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fapp-builder-lib%2Fdownload%2Fapp-builder-lib-22.1.0.tgz", - "integrity": "sha1-bfhp2IJAbzS0sCyrTD3beSbkIOw=", + "version": "21.2.0", + "resolved": "https://registry.npm.taobao.org/app-builder-lib/download/app-builder-lib-21.2.0.tgz?cache=0&sync_timestamp=1574846006557&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fapp-builder-lib%2Fdownload%2Fapp-builder-lib-21.2.0.tgz", + "integrity": "sha1-+h0WBGAUMeLDR2hX6bm2HTOtJsw=", "dev": true, "requires": { "7zip-bin": "~5.0.3", "@develar/schema-utils": "~2.1.0", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.9", - "builder-util": "22.1.0", - "builder-util-runtime": "8.4.0", + "builder-util": "21.2.0", + "builder-util-runtime": "8.3.0", "chromium-pickle-js": "^0.2.0", "debug": "^4.1.1", - "ejs": "^2.7.1", - "electron-publish": "22.1.0", + "ejs": "^2.6.2", + "electron-publish": "21.2.0", "fs-extra": "^8.1.0", - "hosted-git-info": "^3.0.0", + "hosted-git-info": "^2.7.1", "is-ci": "^2.0.0", "isbinaryfile": "^4.0.2", "js-yaml": "^3.13.1", @@ -2619,11 +2619,21 @@ "minimatch": "^3.0.4", "normalize-package-data": "^2.5.0", "read-config-file": "5.0.0", - "sanitize-filename": "^1.6.3", + "sanitize-filename": "^1.6.2", "semver": "^6.3.0", "temp-file": "^3.3.4" }, "dependencies": { + "builder-util-runtime": { + "version": "8.3.0", + "resolved": "https://registry.npm.taobao.org/builder-util-runtime/download/builder-util-runtime-8.3.0.tgz?cache=0&sync_timestamp=1574846206242&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuilder-util-runtime%2Fdownload%2Fbuilder-util-runtime-8.3.0.tgz", + "integrity": "sha1-9frJE5r2+s9Coh++TTrr7Yj9oz4=", + "dev": true, + "requires": { + "debug": "^4.1.1", + "sax": "^1.2.4" + } + }, "debug": { "version": "4.1.1", "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz", @@ -2633,39 +2643,12 @@ "ms": "^2.1.1" } }, - "hosted-git-info": { - "version": "3.0.2", - "resolved": "https://registry.npm.taobao.org/hosted-git-info/download/hosted-git-info-3.0.2.tgz?cache=0&sync_timestamp=1570493686863&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhosted-git-info%2Fdownload%2Fhosted-git-info-3.0.2.tgz", - "integrity": "sha1-i3470RS1m1F4b4ut4POd3IAnWpc=", - "dev": true, - "requires": { - "lru-cache": "^5.1.1" - } - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-5.1.1.tgz", - "integrity": "sha1-HaJ+ZxAnGUdpXa9oSOhH8B2EuSA=", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, "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 }, - "sanitize-filename": { - "version": "1.6.3", - "resolved": "https://registry.npm.taobao.org/sanitize-filename/download/sanitize-filename-1.6.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsanitize-filename%2Fdownload%2Fsanitize-filename-1.6.3.tgz", - "integrity": "sha1-dV69dSBFkxl34wsgJdNA18kJA3g=", - "dev": true, - "requires": { - "truncate-utf8-bytes": "^1.0.0" - } - }, "semver": { "version": "6.3.0", "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1565627380363&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz", @@ -4027,8 +4010,8 @@ }, "boolean": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.0.tgz", - "integrity": "sha512-OElxJ1lUSinuoUnkpOgLmxp0DC4ytEhODEL6QJU0NpxE/mI4rUSh8h1P1Wkvfi3xQEBcxXR2gBIPNYNuaFcAbQ==", + "resolved": "https://registry.npm.taobao.org/boolean/download/boolean-3.0.0.tgz", + "integrity": "sha1-+reNWQfbrmIWq0bTJzO7e3a5nnY=", "dev": true, "optional": true }, @@ -4233,16 +4216,16 @@ "dev": true }, "builder-util": { - "version": "22.1.0", - "resolved": "https://registry.npm.taobao.org/builder-util/download/builder-util-22.1.0.tgz?cache=0&sync_timestamp=1571815936283&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuilder-util%2Fdownload%2Fbuilder-util-22.1.0.tgz", - "integrity": "sha1-KzMUXQU3eOlTidWu5lklbr2xwso=", + "version": "21.2.0", + "resolved": "https://registry.npm.taobao.org/builder-util/download/builder-util-21.2.0.tgz?cache=0&sync_timestamp=1574846005968&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuilder-util%2Fdownload%2Fbuilder-util-21.2.0.tgz", + "integrity": "sha1-q6chGQ5OhBAJ2ftLiPETDtYWUi8=", "dev": true, "requires": { "7zip-bin": "~5.0.3", - "@types/debug": "^4.1.5", - "app-builder-bin": "3.4.4", + "@types/debug": "^4.1.4", + "app-builder-bin": "3.4.3", "bluebird-lst": "^1.0.9", - "builder-util-runtime": "8.4.0", + "builder-util-runtime": "8.3.0", "chalk": "^2.4.2", "debug": "^4.1.1", "fs-extra": "^8.1.0", @@ -4253,6 +4236,16 @@ "temp-file": "^3.3.4" }, "dependencies": { + "builder-util-runtime": { + "version": "8.3.0", + "resolved": "https://registry.npm.taobao.org/builder-util-runtime/download/builder-util-runtime-8.3.0.tgz?cache=0&sync_timestamp=1574846206242&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuilder-util-runtime%2Fdownload%2Fbuilder-util-runtime-8.3.0.tgz", + "integrity": "sha1-9frJE5r2+s9Coh++TTrr7Yj9oz4=", + "dev": true, + "requires": { + "debug": "^4.1.1", + "sax": "^1.2.4" + } + }, "chalk": { "version": "2.4.2", "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1573282918610&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz", @@ -4292,7 +4285,7 @@ }, "builder-util-runtime": { "version": "8.4.0", - "resolved": "https://registry.npm.taobao.org/builder-util-runtime/download/builder-util-runtime-8.4.0.tgz", + "resolved": "https://registry.npm.taobao.org/builder-util-runtime/download/builder-util-runtime-8.4.0.tgz?cache=0&sync_timestamp=1574846206242&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuilder-util-runtime%2Fdownload%2Fbuilder-util-runtime-8.4.0.tgz", "integrity": "sha1-MWP//AeOa4891bbrEqg0VXNZBoI=", "requires": { "debug": "^4.1.1", @@ -5129,8 +5122,8 @@ }, "config-chain": { "version": "1.1.12", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", - "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", + "resolved": "https://registry.npm.taobao.org/config-chain/download/config-chain-1.1.12.tgz", + "integrity": "sha1-D96NCRIA616AjK8l/mGMAvSOTvo=", "dev": true, "optional": true, "requires": { @@ -6118,123 +6111,6 @@ "sanitize-filename": "^1.6.2" }, "dependencies": { - "app-builder-bin": { - "version": "3.4.3", - "resolved": "https://registry.npm.taobao.org/app-builder-bin/download/app-builder-bin-3.4.3.tgz", - "integrity": "sha1-WKdBk+uILwKb5rfwzT8MaAWSems=", - "dev": true - }, - "app-builder-lib": { - "version": "21.2.0", - "resolved": "https://registry.npm.taobao.org/app-builder-lib/download/app-builder-lib-21.2.0.tgz?cache=0&sync_timestamp=1571815937090&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fapp-builder-lib%2Fdownload%2Fapp-builder-lib-21.2.0.tgz", - "integrity": "sha1-+h0WBGAUMeLDR2hX6bm2HTOtJsw=", - "dev": true, - "requires": { - "7zip-bin": "~5.0.3", - "@develar/schema-utils": "~2.1.0", - "async-exit-hook": "^2.0.1", - "bluebird-lst": "^1.0.9", - "builder-util": "21.2.0", - "builder-util-runtime": "8.3.0", - "chromium-pickle-js": "^0.2.0", - "debug": "^4.1.1", - "ejs": "^2.6.2", - "electron-publish": "21.2.0", - "fs-extra": "^8.1.0", - "hosted-git-info": "^2.7.1", - "is-ci": "^2.0.0", - "isbinaryfile": "^4.0.2", - "js-yaml": "^3.13.1", - "lazy-val": "^1.0.4", - "minimatch": "^3.0.4", - "normalize-package-data": "^2.5.0", - "read-config-file": "5.0.0", - "sanitize-filename": "^1.6.2", - "semver": "^6.3.0", - "temp-file": "^3.3.4" - } - }, - "builder-util": { - "version": "21.2.0", - "resolved": "https://registry.npm.taobao.org/builder-util/download/builder-util-21.2.0.tgz?cache=0&sync_timestamp=1571815936283&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuilder-util%2Fdownload%2Fbuilder-util-21.2.0.tgz", - "integrity": "sha1-q6chGQ5OhBAJ2ftLiPETDtYWUi8=", - "dev": true, - "requires": { - "7zip-bin": "~5.0.3", - "@types/debug": "^4.1.4", - "app-builder-bin": "3.4.3", - "bluebird-lst": "^1.0.9", - "builder-util-runtime": "8.3.0", - "chalk": "^2.4.2", - "debug": "^4.1.1", - "fs-extra": "^8.1.0", - "is-ci": "^2.0.0", - "js-yaml": "^3.13.1", - "source-map-support": "^0.5.13", - "stat-mode": "^0.3.0", - "temp-file": "^3.3.4" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1573282918610&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz", - "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - } - } - }, - "builder-util-runtime": { - "version": "8.3.0", - "resolved": "https://registry.npm.taobao.org/builder-util-runtime/download/builder-util-runtime-8.3.0.tgz", - "integrity": "sha1-9frJE5r2+s9Coh++TTrr7Yj9oz4=", - "dev": true, - "requires": { - "debug": "^4.1.1", - "sax": "^1.2.4" - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz", - "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "electron-publish": { - "version": "21.2.0", - "resolved": "https://registry.npm.taobao.org/electron-publish/download/electron-publish-21.2.0.tgz?cache=0&sync_timestamp=1571815937929&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-publish%2Fdownload%2Felectron-publish-21.2.0.tgz", - "integrity": "sha1-zCJctGqmLnS4mfL3KZs5bJgCOH0=", - "dev": true, - "requires": { - "bluebird-lst": "^1.0.9", - "builder-util": "~21.2.0", - "builder-util-runtime": "8.3.0", - "chalk": "^2.4.2", - "fs-extra": "^8.1.0", - "lazy-val": "^1.0.4", - "mime": "^2.4.4" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1573282918610&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz", - "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - } - } - }, "iconv-lite": { "version": "0.5.0", "resolved": "https://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.5.0.tgz", @@ -6243,27 +6119,6 @@ "requires": { "safer-buffer": ">= 2.1.2 < 3" } - }, - "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 - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1565627380363&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz", - "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz", - "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } } } }, @@ -6429,15 +6284,15 @@ "dev": true }, "ejs": { - "version": "2.7.1", - "resolved": "https://registry.npm.taobao.org/ejs/download/ejs-2.7.1.tgz?cache=0&sync_timestamp=1567453332151&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fejs%2Fdownload%2Fejs-2.7.1.tgz", - "integrity": "sha1-W1q1f3GLedSsqSVEV6/s02+oAig=", + "version": "2.7.4", + "resolved": "https://registry.npm.taobao.org/ejs/download/ejs-2.7.4.tgz", + "integrity": "sha1-SGYSh1c9zFPjZsehrlLDoSDuybo=", "dev": true }, "electron": { - "version": "7.1.5", - "resolved": "https://registry.npmjs.org/electron/-/electron-7.1.5.tgz", - "integrity": "sha512-jagsvNz6Axu2Lsp5PqDgkcR+4BwoPP9YyLgMu9lhpFNRNKpNgfsEqUbtNolkFN/TtmWjxGO+iioWRrGqZHmJ8w==", + "version": "7.1.2", + "resolved": "https://registry.npm.taobao.org/electron/download/electron-7.1.2.tgz", + "integrity": "sha1-0XJrnlCynpf18StS/rIluofgZA8=", "dev": true, "requires": { "@electron/get": "^1.0.1", @@ -6446,32 +6301,32 @@ }, "dependencies": { "@types/node": { - "version": "12.12.17", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.17.tgz", - "integrity": "sha512-Is+l3mcHvs47sKy+afn2O1rV4ldZFU7W8101cNlOd+MRbjM4Onida8jSZnJdTe/0Pcf25g9BNIUsuugmE6puHA==", + "version": "12.12.18", + "resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-12.12.18.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-12.12.18.tgz", + "integrity": "sha1-jRZjR5fWPCr1vGR86Hn43iC1ZGk=", "dev": true } } }, "electron-builder": { - "version": "22.1.0", - "resolved": "https://registry.npm.taobao.org/electron-builder/download/electron-builder-22.1.0.tgz", - "integrity": "sha1-ZbI0EePDmoO1J0PtGJgLl/gxTVA=", + "version": "21.2.0", + "resolved": "https://registry.npm.taobao.org/electron-builder/download/electron-builder-21.2.0.tgz?cache=0&sync_timestamp=1574846001575&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-builder%2Fdownload%2Felectron-builder-21.2.0.tgz", + "integrity": "sha1-to7E3vcT/AuGAmVM6EL5ckMvUMU=", "dev": true, "requires": { - "app-builder-lib": "22.1.0", + "app-builder-lib": "21.2.0", "bluebird-lst": "^1.0.9", - "builder-util": "22.1.0", - "builder-util-runtime": "8.4.0", + "builder-util": "21.2.0", + "builder-util-runtime": "8.3.0", "chalk": "^2.4.2", "dmg-builder": "21.2.0", "fs-extra": "^8.1.0", "is-ci": "^2.0.0", "lazy-val": "^1.0.4", "read-config-file": "5.0.0", - "sanitize-filename": "^1.6.3", + "sanitize-filename": "^1.6.2", "update-notifier": "^3.0.1", - "yargs": "^14.0.0" + "yargs": "^13.3.0" }, "dependencies": { "ansi-regex": { @@ -6480,6 +6335,16 @@ "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc=", "dev": true }, + "builder-util-runtime": { + "version": "8.3.0", + "resolved": "https://registry.npm.taobao.org/builder-util-runtime/download/builder-util-runtime-8.3.0.tgz?cache=0&sync_timestamp=1574846206242&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuilder-util-runtime%2Fdownload%2Fbuilder-util-runtime-8.3.0.tgz", + "integrity": "sha1-9frJE5r2+s9Coh++TTrr7Yj9oz4=", + "dev": true, + "requires": { + "debug": "^4.1.1", + "sax": "^1.2.4" + } + }, "chalk": { "version": "2.4.2", "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1573282918610&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz", @@ -6502,15 +6367,21 @@ "wrap-ansi": "^5.1.0" } }, - "sanitize-filename": { - "version": "1.6.3", - "resolved": "https://registry.npm.taobao.org/sanitize-filename/download/sanitize-filename-1.6.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsanitize-filename%2Fdownload%2Fsanitize-filename-1.6.3.tgz", - "integrity": "sha1-dV69dSBFkxl34wsgJdNA18kJA3g=", + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz", + "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=", "dev": true, "requires": { - "truncate-utf8-bytes": "^1.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 + }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz", @@ -6530,13 +6401,12 @@ } }, "yargs": { - "version": "14.2.0", - "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-14.2.0.tgz", - "integrity": "sha1-8RapJCxO2GaHkLQHWbSQbCdudsM=", + "version": "13.3.0", + "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-13.3.0.tgz", + "integrity": "sha1-TGV6VeB+Xyz5R/ijZlZ8BKDe3IM=", "dev": true, "requires": { "cliui": "^5.0.0", - "decamelize": "^1.2.0", "find-up": "^3.0.0", "get-caller-file": "^2.0.1", "require-directory": "^2.1.1", @@ -6545,17 +6415,7 @@ "string-width": "^3.0.0", "which-module": "^2.0.0", "y18n": "^4.0.0", - "yargs-parser": "^15.0.0" - } - }, - "yargs-parser": { - "version": "15.0.0", - "resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-15.0.0.tgz", - "integrity": "sha1-zdepdJDsg2GV9Z8/Tb5eqej3Xwg=", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" + "yargs-parser": "^13.1.1" } } } @@ -6623,20 +6483,30 @@ "integrity": "sha1-kxXkpea+XioViQmFay0stNdgzW0=" }, "electron-publish": { - "version": "22.1.0", - "resolved": "https://registry.npm.taobao.org/electron-publish/download/electron-publish-22.1.0.tgz?cache=0&sync_timestamp=1571815937929&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-publish%2Fdownload%2Felectron-publish-22.1.0.tgz", - "integrity": "sha1-cw7jgB5HrNuxyB7X/E68azDSqKo=", + "version": "21.2.0", + "resolved": "https://registry.npm.taobao.org/electron-publish/download/electron-publish-21.2.0.tgz", + "integrity": "sha1-zCJctGqmLnS4mfL3KZs5bJgCOH0=", "dev": true, "requires": { "bluebird-lst": "^1.0.9", - "builder-util": "~22.1.0", - "builder-util-runtime": "8.4.0", + "builder-util": "~21.2.0", + "builder-util-runtime": "8.3.0", "chalk": "^2.4.2", "fs-extra": "^8.1.0", "lazy-val": "^1.0.4", "mime": "^2.4.4" }, "dependencies": { + "builder-util-runtime": { + "version": "8.3.0", + "resolved": "https://registry.npm.taobao.org/builder-util-runtime/download/builder-util-runtime-8.3.0.tgz?cache=0&sync_timestamp=1574846206242&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuilder-util-runtime%2Fdownload%2Fbuilder-util-runtime-8.3.0.tgz", + "integrity": "sha1-9frJE5r2+s9Coh++TTrr7Yj9oz4=", + "dev": true, + "requires": { + "debug": "^4.1.1", + "sax": "^1.2.4" + } + }, "chalk": { "version": "2.4.2", "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1573282918610&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz", @@ -6648,6 +6518,21 @@ "supports-color": "^5.3.0" } }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz", + "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=", + "dev": true, + "requires": { + "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 + }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz", @@ -6814,8 +6699,8 @@ }, "es6-error": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "resolved": "https://registry.npm.taobao.org/es6-error/download/es6-error-4.1.1.tgz", + "integrity": "sha1-njr0B0Wd7tR+mpH5uIWoTrBcVh0=", "dev": true, "optional": true }, @@ -8730,8 +8615,8 @@ }, "global-agent": { "version": "2.1.7", - "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.7.tgz", - "integrity": "sha512-ooK7eqGYZku+LgnbfH/Iv0RJ74XfhrBZDlke1QSzcBt0bw1PmJcnRADPAQuFE+R45pKKDTynAr25SBasY2kvow==", + "resolved": "https://registry.npm.taobao.org/global-agent/download/global-agent-2.1.7.tgz", + "integrity": "sha1-Ete8KwfNhi0Pp2sPGyxIzV/88VA=", "dev": true, "optional": true, "requires": { @@ -8746,8 +8631,8 @@ "dependencies": { "semver": { "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz", + "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=", "dev": true, "optional": true } @@ -8805,8 +8690,8 @@ }, "global-tunnel-ng": { "version": "2.7.1", - "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz", - "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==", + "resolved": "https://registry.npm.taobao.org/global-tunnel-ng/download/global-tunnel-ng-2.7.1.tgz", + "integrity": "sha1-0DtRAt/eOmmRT17n2GdhyjXVfY8=", "dev": true, "optional": true, "requires": { @@ -8824,8 +8709,8 @@ }, "globalthis": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.0.tgz", - "integrity": "sha512-vcCAZTJ3r5Qcu5l8/2oyVdoFwxKgfYnMTR2vwWeux/NAVZK3PwcMaWkdUIn4GJbmKuRK7xcvDsLuK+CKcXyodg==", + "resolved": "https://registry.npm.taobao.org/globalthis/download/globalthis-1.0.0.tgz", + "integrity": "sha1-xfuYITqbRZX1nPPnB08UG0Fp2q4=", "dev": true, "optional": true, "requires": { @@ -10703,8 +10588,8 @@ }, "matcher": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/matcher/-/matcher-2.1.0.tgz", - "integrity": "sha512-o+nZr+vtJtgPNklyeUKkkH42OsK8WAfdgaJE2FNxcjLPg+5QbeEoT6vRj8Xq/iv18JlQ9cmKsEu0b94ixWf1YQ==", + "resolved": "https://registry.npm.taobao.org/matcher/download/matcher-2.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmatcher%2Fdownload%2Fmatcher-2.1.0.tgz", + "integrity": "sha1-ZOEEHBW5k+I7eG+TMgp0dL+DPCg=", "dev": true, "optional": true, "requires": { @@ -10713,8 +10598,8 @@ "dependencies": { "escape-string-regexp": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "resolved": "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-2.0.0.tgz", + "integrity": "sha1-owME6Z2qMuI7L9IPUbq9B8/8o0Q=", "dev": true, "optional": true } @@ -11272,8 +11157,8 @@ }, "npm-conf": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", - "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", + "resolved": "https://registry.npm.taobao.org/npm-conf/download/npm-conf-1.1.3.tgz", + "integrity": "sha1-JWzEe9DiGMJZxOlVC/QTvCGSr/k=", "dev": true, "optional": true, "requires": { @@ -13346,8 +13231,8 @@ }, "roarr": { "version": "2.14.6", - "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.14.6.tgz", - "integrity": "sha512-qjbw0BEesKA+3XFBPt+KVe1PC/Z6ShfJ4wPlx2XifqH5h2Lj8/KQT5XJTsy3n1Es5kai+BwKALaECW3F70B1cg==", + "resolved": "https://registry.npm.taobao.org/roarr/download/roarr-2.14.6.tgz", + "integrity": "sha1-zr6K1+y/0Vv6N7AtrPAICd1jORI=", "dev": true, "optional": true, "requires": { @@ -13361,8 +13246,8 @@ "dependencies": { "sprintf-js": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", - "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", + "resolved": "https://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsprintf-js%2Fdownload%2Fsprintf-js-1.1.2.tgz", + "integrity": "sha1-2hdlJiv4wPVxdJ8q1sJjACB65nM=", "dev": true, "optional": true } @@ -13529,8 +13414,8 @@ }, "serialize-error": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-5.0.0.tgz", - "integrity": "sha512-/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA==", + "resolved": "https://registry.npm.taobao.org/serialize-error/download/serialize-error-5.0.0.tgz", + "integrity": "sha1-p+u82wOl1xpu2EYf/g/Boa/tYqw=", "dev": true, "optional": true, "requires": { @@ -13539,8 +13424,8 @@ "dependencies": { "type-fest": { "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "resolved": "https://registry.npm.taobao.org/type-fest/download/type-fest-0.8.1.tgz", + "integrity": "sha1-CeJJ696FHTseSNJ8EFREZn8XuD0=", "dev": true, "optional": true } @@ -14415,8 +14300,8 @@ }, "sumchecker": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", - "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", + "resolved": "https://registry.npm.taobao.org/sumchecker/download/sumchecker-3.0.1.tgz", + "integrity": "sha1-Y3fplnlauwttNI6bPh37JDRajkI=", "dev": true, "requires": { "debug": "^4.1.0" @@ -14424,8 +14309,8 @@ "dependencies": { "debug": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz", + "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=", "dev": true, "requires": { "ms": "^2.1.1" @@ -14433,8 +14318,8 @@ }, "ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "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 } } @@ -14532,9 +14417,9 @@ "dev": true }, "temp-file": { - "version": "3.3.4", - "resolved": "https://registry.npm.taobao.org/temp-file/download/temp-file-3.3.4.tgz", - "integrity": "sha1-c6+GjNfLdACkTkuwPmU7IoDOKHg=", + "version": "3.3.6", + "resolved": "https://registry.npm.taobao.org/temp-file/download/temp-file-3.3.6.tgz?cache=0&sync_timestamp=1574846001408&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftemp-file%2Fdownload%2Ftemp-file-3.3.6.tgz", + "integrity": "sha1-vXoZUTOL+TtZOAtJjsGATVt2xEk=", "dev": true, "requires": { "async-exit-hook": "^2.0.1", @@ -14960,8 +14845,8 @@ }, "tunnel": { "version": "0.0.6", - "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", - "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", + "resolved": "https://registry.npm.taobao.org/tunnel/download/tunnel-0.0.6.tgz", + "integrity": "sha1-cvExSzSlsZLbASMk3yzFh8pH+Sw=", "dev": true, "optional": true }, diff --git a/package.json b/package.json index 72d5a977..afb8c8d7 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "lint:fix": "eslint --ext .js,.vue -f ./node_modules/eslint-formatter-friendly --fix src" }, "browserslist": [ - "Electron >= 7.1.3" + "Electron >= 7.1.2" ], "engines": { "node": ">= 12" @@ -157,8 +157,8 @@ "cross-env": "^6.0.3", "css-loader": "^3.3.2", "del": "^5.1.0", - "electron": "^7.1.5", - "electron-builder": "^22.1.0", + "electron": "^7.1.2", + "electron-builder": "^21.2.0", "electron-debug": "^3.0.1", "electron-devtools-installer": "^2.2.4", "eslint": "^6.7.2", diff --git a/publish/changeLog.md b/publish/changeLog.md index a698c41c..d2faf4a4 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,3 +1,7 @@ ### 修复 - 修复全局更新弹窗无法遮盖搜索框的问题 + +### 其他 + +- 由于electron 7.1.3 - 7.1.5 的自动更新功能存在Bug，现降级到7.1.2 diff --git a/src/renderer/App.vue b/src/renderer/App.vue index 25183ce5..9aa6e215 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -209,6 +209,7 @@ export default { this.setNewVersion(body) return body })).catch(() => { + if (this.version.newVersion) return this.version.newVersion this.setVersionModalVisible({ isUnknow: true }) let result = { version: '0.0.0', diff --git a/src/renderer/components/material/VersionModal.vue b/src/renderer/components/material/VersionModal.vue index 1a02b88b..191fa5b6 100644 --- a/src/renderer/components/material/VersionModal.vue +++ b/src/renderer/components/material/VersionModal.vue @@ -256,7 +256,7 @@ export default { padding-top: 10px; font-size: 12px; color: @color-theme; - line-height: 1.2; + line-height: 1.25; p { font-size: 12px;