From de0161c56061bd0b97d928c8a449c90a16f8f710 Mon Sep 17 00:00:00 2001 From: Hunlongyu Date: Mon, 19 Oct 2020 11:28:52 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=8E=20=E5=8D=87=E7=BA=A7=E4=BE=9D?= =?UTF-8?q?=E8=B5=96,=20=E4=BF=AE=E5=A4=8Delement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 22 +++---- src/components/EditSites.vue | 3 - src/main.js | 1 + yarn.lock | 123 +++++++++++++++++------------------ 4 files changed, 72 insertions(+), 77 deletions(-) diff --git a/package.json b/package.json index 5dc2e95..3677275 100644 --- a/package.json +++ b/package.json @@ -17,30 +17,30 @@ }, "main": "background.js", "dependencies": { - "axios": "^0.19.2", + "axios": "^0.20.0", "cheerio": "^1.0.0-rc.3", "child_process": "^1.0.2", "core-js": "^3.6.5", "cors": "^2.8.5", - "dexie": "^3.0.1", + "dexie": "^3.0.2", "electron-localshortcut": "^3.2.1", "element-ui": "^2.13.2", "express": "^4.17.1", "fast-xml-parser": "^3.17.4", - "html2canvas": "^1.0.0-rc.5", + "html2canvas": "^1.0.0-rc.7", "iptv-playlist-parser": "^0.5.0", "m3u": "0.0.2", - "modern-normalize": "^0.6.0", + "modern-normalize": "^1.0.0", "mousetrap": "^1.6.5", "qrcode.vue": "^1.7.0", "randomstring": "^1.1.5", - "vue": "^2.6.11", + "vue": "^2.6.12", "vue-infinite-loading": "^2.4.5", - "vue-waterfall-plugin": "^1.0.7", - "vuedraggable": "^2.24.1", - "vuex": "^3.4.0", - "xgplayer": "^2.9.10", - "xgplayer-hls.js": "^2.2.3" + "vue-waterfall-plugin": "^1.1.0", + "vuedraggable": "^2.24.2", + "vuex": "^3.5.1", + "xgplayer": "^2.12.2", + "xgplayer-hls.js": "^2.2.5" }, "devDependencies": { "@vue/cli-plugin-babel": "~4.4.0", @@ -61,6 +61,6 @@ "sass": "^1.26.5", "sass-loader": "^8.0.2", "vue-cli-plugin-electron-builder": "2.0.0-rc.4", - "vue-template-compiler": "^2.6.11" + "vue-template-compiler": "^2.6.12" } } diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue index 2abe502..fb20f17 100644 --- a/src/components/EditSites.vue +++ b/src/components/EditSites.vue @@ -61,10 +61,7 @@ import { sites } from '../lib/dexie' import { remote } from 'electron' import { sites as defaultSites } from '../lib/dexie/initData' import fs from 'fs' -import Vue from 'vue' -import ElementUI from 'element-ui' import Sortable from 'sortablejs' -Vue.use(ElementUI) export default { name: 'editSites', diff --git a/src/main.js b/src/main.js index f886e79..768e73d 100644 --- a/src/main.js +++ b/src/main.js @@ -3,6 +3,7 @@ import App from './App.vue' import store from './store' import 'modern-normalize' import Register from './components/register' +import './lib/element/index' Register.registerComponents() Vue.config.productionTip = false diff --git a/yarn.lock b/yarn.lock index f5ad2b9..ddb7516 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1809,12 +1809,12 @@ aws4@^1.8.0: resolved "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2" integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA== -axios@^0.19.2: - version "0.19.2" - resolved "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27" - integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA== +axios@^0.20.0: + version "0.20.0" + resolved "https://registry.npm.taobao.org/axios/download/axios-0.20.0.tgz#057ba30f04884694993a8cd07fa394cff11c50bd" + integrity sha1-BXujDwSIRpSZOozQf6OUz/EcUL0= dependencies: - follow-redirects "1.5.10" + follow-redirects "^1.10.0" babel-eslint@^10.1.0: version "10.1.0" @@ -3175,10 +3175,10 @@ d@1, d@^1.0.1: es5-ext "^0.10.50" type "^1.0.1" -danmu.js@^0.2.17: - version "0.2.18" - resolved "https://registry.npmjs.org/danmu.js/-/danmu.js-0.2.18.tgz#fd688e7df50367a8a68630d1a189a0132c08dd9c" - integrity sha512-ALfB4o0eQoK5pceEQCwyHmmg2wcxOOGqOflxodVtuc9Prq9Fyb2MAiyrfA+q/4WV1E4CnjoCep/8YHKy1X9IQg== +danmu.js@0.2.23: + version "0.2.23" + resolved "https://registry.npm.taobao.org/danmu.js/download/danmu.js-0.2.23.tgz#339b512152ed5a8253829be007c5be5bd3821856" + integrity sha1-M5tRIVLtWoJTgpvgB8W+W9OCGFY= dependencies: event-emitter "^0.3.5" @@ -3201,13 +3201,6 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@=3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== - dependencies: - ms "2.0.0" - debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" @@ -3382,10 +3375,10 @@ detect-node@^2.0.4: resolved "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw== -dexie@^3.0.1: - version "3.0.1" - resolved "https://registry.npmjs.org/dexie/-/dexie-3.0.1.tgz#faafeb94be0d5e18b25d700546a2c05725511cfc" - integrity sha512-/s4KzlaerQnCad/uY1ZNdFckTrbdMVhLlziYQzz62Ff9Ick1lHGomvTXNfwh4ApEZATyXRyVk5F6/y8UU84B0w== +dexie@^3.0.2: + version "3.0.2" + resolved "https://registry.npm.taobao.org/dexie/download/dexie-3.0.2.tgz#4b979904d739e0530b68352005f175a82633a075" + integrity sha1-S5eZBNc54FMLaDUgBfF1qCYzoHU= diffie-hellman@^5.0.0: version "5.0.3" @@ -4121,6 +4114,11 @@ eventemitter3@^4.0.0: resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384" integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ== +eventemitter3@^4.0.7: + version "4.0.7" + resolved "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + integrity sha1-Lem2j2Uo1WRO9cWVJqG0oHMGFp8= + events@^3.0.0: version "3.1.0" resolved "https://registry.npmjs.org/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" @@ -4528,18 +4526,16 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@1.5.10: - version "1.5.10" - resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" - integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ== - dependencies: - debug "=3.1.0" - follow-redirects@^1.0.0: version "1.12.1" resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.12.1.tgz#de54a6205311b93d60398ebc01cf7015682312b6" integrity sha512-tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg== +follow-redirects@^1.10.0: + version "1.13.0" + resolved "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" + integrity sha1-tC6Nk6Kn7qXtiGM2dtZZe8jjhNs= + for-in@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -5081,10 +5077,10 @@ html-webpack-plugin@^3.2.0: toposort "^1.0.0" util.promisify "1.0.0" -html2canvas@^1.0.0-rc.5: - version "1.0.0-rc.5" - resolved "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-rc.5.tgz#4ee3cac9f6e20a0fa0c2f35a6f99c960ae7ec4c1" - integrity sha512-DtNqPxJNXPoTajs+lVQzGS1SULRI4GQaROeU5R41xH8acffHukxRh/NBVcTBsfCkJSkLq91rih5TpbEwUP9yWA== +html2canvas@^1.0.0-rc.7: + version "1.0.0-rc.7" + resolved "https://registry.npm.taobao.org/html2canvas/download/html2canvas-1.0.0-rc.7.tgz#70c159ce0e63954a91169531894d08ad5627ac98" + integrity sha1-cMFZzg5jlUqRFpUxiU0IrVYnrJg= dependencies: css-line-break "1.1.1" @@ -6440,10 +6436,10 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -modern-normalize@^0.6.0: - version "0.6.0" - resolved "https://registry.npmjs.org/modern-normalize/-/modern-normalize-0.6.0.tgz#21a469988edfc7c9020348e7a3b5b3583a1c9406" - integrity sha512-gzvL1uFLV4EErHhaKoqTcrx52/sea6AIcMFWz/GBCuFrDBp485wSgyX5M+MZsj+grfcuqYLQGfHjDRrCvvwZLw== +modern-normalize@^1.0.0: + version "1.0.0" + resolved "https://registry.npm.taobao.org/modern-normalize/download/modern-normalize-1.0.0.tgz#539d84a1e141338b01b346f3e27396d0ed17601e" + integrity sha1-U52EoeFBM4sBs0bz4nOW0O0XYB4= mousetrap@^1.6.5: version "1.6.5" @@ -9687,10 +9683,10 @@ vue-style-loader@^4.1.0, vue-style-loader@^4.1.2: hash-sum "^1.0.2" loader-utils "^1.0.2" -vue-template-compiler@^2.6.11: - version "2.6.11" - resolved "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz#c04704ef8f498b153130018993e56309d4698080" - integrity sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA== +vue-template-compiler@^2.6.12: + version "2.6.12" + resolved "https://registry.npm.taobao.org/vue-template-compiler/download/vue-template-compiler-2.6.12.tgz?cache=0&sync_timestamp=1602239010008&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-template-compiler%2Fdownload%2Fvue-template-compiler-2.6.12.tgz#947ed7196744c8a5285ebe1233fe960437fcc57e" + integrity sha1-lH7XGWdEyKUoXr4SM/6WBDf8xX4= dependencies: de-indent "^1.0.2" he "^1.1.0" @@ -9700,27 +9696,27 @@ vue-template-es2015-compiler@^1.9.0: resolved "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== -vue-waterfall-plugin@^1.0.7: - version "1.0.7" - resolved "https://registry.npmjs.org/vue-waterfall-plugin/-/vue-waterfall-plugin-1.0.7.tgz#bd351e8d3015b9ce71320e00a88443929d63465f" - integrity sha512-60JlBvrQbIOapGwc9AW9cXV064uzIEV1bjzc1ApNGt+MI4PI0Xs9aDvFgRMsGdynV9UlsLNtplX0bRwJ1syT9A== +vue-waterfall-plugin@^1.1.0: + version "1.1.0" + resolved "https://registry.npm.taobao.org/vue-waterfall-plugin/download/vue-waterfall-plugin-1.1.0.tgz#a4d87c74b72f1e36de5bbbadf1d645eb549ed592" + integrity sha1-pNh8dLcvHjbeW7ut8dZF61Se1ZI= -vue@^2.6.11: - version "2.6.11" - resolved "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5" - integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ== +vue@^2.6.12: + version "2.6.12" + resolved "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz?cache=0&sync_timestamp=1602778254831&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123" + integrity sha1-9evU+mvShpQD4pqJau1JBEVskSM= -vuedraggable@^2.24.1: - version "2.24.1" - resolved "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-2.24.1.tgz#304abd7644dde05c1f199a227bf9e9107f56197a" - integrity sha512-G1fxO1oshx+WLdieSGl6jSJdlHOQFga1FpjuUpgXldbpKNzxpjsGn4xYNnRHVrOAqm8aG5FfpdQlh5LHesxCeA== +vuedraggable@^2.24.2: + version "2.24.2" + resolved "https://registry.npm.taobao.org/vuedraggable/download/vuedraggable-2.24.2.tgz#cd98faec99905238469e9b4d235fba5a59fb7da2" + integrity sha1-zZj67JmQUjhGnptNI1+6Wln7faI= dependencies: sortablejs "^1.10.1" -vuex@^3.4.0: +vuex@^3.5.1: version "3.5.1" - resolved "https://registry.npmjs.org/vuex/-/vuex-3.5.1.tgz#f1b8dcea649bc25254cf4f4358081dbf5da18b3d" - integrity sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw== + resolved "https://registry.npm.taobao.org/vuex/download/vuex-3.5.1.tgz#f1b8dcea649bc25254cf4f4358081dbf5da18b3d" + integrity sha1-8bjc6mSbwlJUz09DWAgdv12hiz0= watchpack-chokidar2@^2.0.0: version "2.0.0" @@ -9994,22 +9990,23 @@ xdg-basedir@^4.0.0: resolved "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== -xgplayer-hls.js@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/xgplayer-hls.js/-/xgplayer-hls.js-2.2.3.tgz#bf538911145346c447528d609fc95dd267a24d81" - integrity sha512-CFsZanBHHRbqTmqYCFFONk76oWwJwbn+8LK/XkwBBrUrqGPQPmrXfjelGjKDDGfZ+w3xReC1nGom3IpN+lLoaQ== +xgplayer-hls.js@^2.2.5: + version "2.2.5" + resolved "https://registry.npm.taobao.org/xgplayer-hls.js/download/xgplayer-hls.js-2.2.5.tgz?cache=0&sync_timestamp=1600935842683&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxgplayer-hls.js%2Fdownload%2Fxgplayer-hls.js-2.2.5.tgz#8f90980cf2b6b4610b5449a3a55a4e7d87335cc8" + integrity sha1-j5CYDPK2tGELVEmjpVpOfYczXMg= dependencies: deepmerge "2.0.1" event-emitter "^0.3.5" + eventemitter3 "^4.0.7" -xgplayer@^2.9.10: - version "2.9.10" - resolved "https://registry.yarnpkg.com/xgplayer/-/xgplayer-2.9.10.tgz#4e79b889621f829b773c118ab93da55f829d4490" - integrity sha512-5a7Xm0AY8qPRXZFxrPRErjzCERsENaskQ8Fq5Sy4ht13TMzYp0VIRREU7XF8efpJGcPsOOuFlCiMrqSpYEIAUA== +xgplayer@^2.12.2: + version "2.12.2" + resolved "https://registry.npm.taobao.org/xgplayer/download/xgplayer-2.12.2.tgz#72111cfbb21f97cbe454b0f5d17e85f720892b2a" + integrity sha1-chEc+7Ifl8vkVLD10X6F9yCJKyo= dependencies: chalk "^2.3.2" commander "^2.15.1" - danmu.js "^0.2.17" + danmu.js "0.2.23" deepmerge "^1.5.0" downloadjs "1.4.7" draggabilly "^2.2.0"