diff --git a/package-lock.json b/package-lock.json index 49f7dd8d..394ae906 100644 --- a/package-lock.json +++ b/package-lock.json @@ -104,7 +104,7 @@ }, "debug": { "version": "4.1.1", - "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz", + "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.1.1.tgz", "integrity": "sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E=", "dev": true, "requires": { @@ -122,7 +122,7 @@ }, "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", + "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz", "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=", "dev": true }, @@ -157,7 +157,7 @@ }, "@babel/helper-annotate-as-pure": { "version": "7.0.0", - "resolved": "https://registry.npm.taobao.org/@babel/helper-annotate-as-pure/download/@babel/helper-annotate-as-pure-7.0.0.tgz", + "resolved": "https://registry.npm.taobao.org/@babel/helper-annotate-as-pure/download/@babel/helper-annotate-as-pure-7.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhelper-annotate-as-pure%2Fdownload%2F%40babel%2Fhelper-annotate-as-pure-7.0.0.tgz", "integrity": "sha1-Mj053QtQ4Qx8Bsp9djjmhk2MXDI=", "dev": true, "requires": { @@ -237,7 +237,7 @@ }, "@babel/helper-member-expression-to-functions": { "version": "7.5.5", - "resolved": "https://registry.npm.taobao.org/@babel/helper-member-expression-to-functions/download/@babel/helper-member-expression-to-functions-7.5.5.tgz", + "resolved": "https://registry.npm.taobao.org/@babel/helper-member-expression-to-functions/download/@babel/helper-member-expression-to-functions-7.5.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhelper-member-expression-to-functions%2Fdownload%2F%40babel%2Fhelper-member-expression-to-functions-7.5.5.tgz", "integrity": "sha1-H7W47ERTqTxDnun+Ou6kqEt2tZA=", "dev": true, "requires": { @@ -255,7 +255,7 @@ }, "@babel/helper-module-transforms": { "version": "7.5.5", - "resolved": "https://registry.npm.taobao.org/@babel/helper-module-transforms/download/@babel/helper-module-transforms-7.5.5.tgz", + "resolved": "https://registry.npm.taobao.org/@babel/helper-module-transforms/download/@babel/helper-module-transforms-7.5.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhelper-module-transforms%2Fdownload%2F%40babel%2Fhelper-module-transforms-7.5.5.tgz", "integrity": "sha1-+E/4oJA43Lyh/UNVZhpQCTcWW0o=", "dev": true, "requires": { @@ -306,7 +306,7 @@ }, "@babel/helper-replace-supers": { "version": "7.5.5", - "resolved": "https://registry.npm.taobao.org/@babel/helper-replace-supers/download/@babel/helper-replace-supers-7.5.5.tgz", + "resolved": "https://registry.npm.taobao.org/@babel/helper-replace-supers/download/@babel/helper-replace-supers-7.5.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhelper-replace-supers%2Fdownload%2F%40babel%2Fhelper-replace-supers-7.5.5.tgz", "integrity": "sha1-+EzkPfAxIi0rrQaNJibLV5nDS8I=", "dev": true, "requires": { @@ -439,7 +439,7 @@ }, "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", + "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz", "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=", "dev": true }, @@ -481,7 +481,7 @@ }, "@babel/plugin-proposal-dynamic-import": { "version": "7.5.0", - "resolved": "https://registry.npm.taobao.org/@babel/plugin-proposal-dynamic-import/download/@babel/plugin-proposal-dynamic-import-7.5.0.tgz", + "resolved": "https://registry.npm.taobao.org/@babel/plugin-proposal-dynamic-import/download/@babel/plugin-proposal-dynamic-import-7.5.0.tgz?cache=0&sync_timestamp=1562245130508&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-proposal-dynamic-import%2Fdownload%2F%40babel%2Fplugin-proposal-dynamic-import-7.5.0.tgz", "integrity": "sha1-5TIgLbSDhyNpGxCme4zlCeOXxQY=", "dev": true, "requires": { @@ -740,7 +740,7 @@ }, "@babel/plugin-transform-modules-systemjs": { "version": "7.5.0", - "resolved": "https://registry.npm.taobao.org/@babel/plugin-transform-modules-systemjs/download/@babel/plugin-transform-modules-systemjs-7.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-transform-modules-systemjs%2Fdownload%2F%40babel%2Fplugin-transform-modules-systemjs-7.5.0.tgz", + "resolved": "https://registry.npm.taobao.org/@babel/plugin-transform-modules-systemjs/download/@babel/plugin-transform-modules-systemjs-7.5.0.tgz", "integrity": "sha1-51JmoT75QgLbKgYgl3dW9R1S0kk=", "dev": true, "requires": { @@ -1744,13 +1744,13 @@ "dev": true }, "autoprefixer": { - "version": "9.6.4", - "resolved": "https://registry.npm.taobao.org/autoprefixer/download/autoprefixer-9.6.4.tgz?cache=0&sync_timestamp=1570294713985&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fautoprefixer%2Fdownload%2Fautoprefixer-9.6.4.tgz", - "integrity": "sha1-5kU75HrzFrKSPq6u2Hhg9SrUt+s=", + "version": "9.6.5", + "resolved": "https://registry.npm.taobao.org/autoprefixer/download/autoprefixer-9.6.5.tgz?cache=0&sync_timestamp=1571040005147&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fautoprefixer%2Fdownload%2Fautoprefixer-9.6.5.tgz", + "integrity": "sha1-mPSv5+k8zPMjKHUV1CYBlhl3Xl4=", "dev": true, "requires": { "browserslist": "^4.7.0", - "caniuse-lite": "^1.0.30000998", + "caniuse-lite": "^1.0.30000999", "chalk": "^2.4.2", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", @@ -1760,7 +1760,7 @@ "dependencies": { "browserslist": { "version": "4.7.0", - "resolved": "https://registry.npm.taobao.org/browserslist/download/browserslist-4.7.0.tgz?cache=0&sync_timestamp=1567245449635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbrowserslist%2Fdownload%2Fbrowserslist-4.7.0.tgz", + "resolved": "https://registry.npm.taobao.org/browserslist/download/browserslist-4.7.0.tgz", "integrity": "sha1-nuiSJf/AfbA0CfL+5STcgidFihc=", "dev": true, "requires": { @@ -1776,15 +1776,15 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.275", - "resolved": "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.275.tgz", - "integrity": "sha1-GaOENuNCFvUYIPovQybVzhQfo28=", + "version": "1.3.282", + "resolved": "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.282.tgz?cache=0&sync_timestamp=1570911575715&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-to-chromium%2Fdownload%2Felectron-to-chromium-1.3.282.tgz", + "integrity": "sha1-FhGK6ceaMuqToXWR1bFuKNEPwI0=", "dev": true }, "node-releases": { - "version": "1.1.34", - "resolved": "https://registry.npm.taobao.org/node-releases/download/node-releases-1.1.34.tgz", - "integrity": "sha1-ztRlXuG6nDosXcusOF4ZQ0FV/UA=", + "version": "1.1.35", + "resolved": "https://registry.npm.taobao.org/node-releases/download/node-releases-1.1.35.tgz", + "integrity": "sha1-MqdKPNSXqnfyPVCfSDR1/RYOTEg=", "dev": true, "requires": { "semver": "^6.3.0" @@ -1803,7 +1803,7 @@ }, "postcss-value-parser": { "version": "4.0.2", - "resolved": "https://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-4.0.2.tgz?cache=0&sync_timestamp=1565203765685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-value-parser%2Fdownload%2Fpostcss-value-parser-4.0.2.tgz", + "resolved": "https://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-4.0.2.tgz", "integrity": "sha1-SCKCwJpCcG0fyaBptz9E7Ag5Hck=", "dev": true }, @@ -2379,7 +2379,7 @@ }, "babel-plugin-dynamic-import-node": { "version": "2.3.0", - "resolved": "https://registry.npm.taobao.org/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.0.tgz", + "resolved": "https://registry.npm.taobao.org/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.0.tgz", "integrity": "sha1-8A9Qe9qjw+P/bn5emNkKesq5b38=", "dev": true, "requires": { @@ -3241,7 +3241,7 @@ }, "camelcase-keys": { "version": "2.1.0", - "resolved": "https://registry.npm.taobao.org/camelcase-keys/download/camelcase-keys-2.1.0.tgz?cache=0&sync_timestamp=1564587881114&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcamelcase-keys%2Fdownload%2Fcamelcase-keys-2.1.0.tgz", + "resolved": "https://registry.npm.taobao.org/camelcase-keys/download/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { @@ -4036,14 +4036,14 @@ } }, "core-js": { - "version": "3.2.1", - "resolved": "https://registry.npm.taobao.org/core-js/download/core-js-3.2.1.tgz", - "integrity": "sha1-zUHzhTTabMWffbBQ/mcwfemGiwk=", + "version": "3.3.2", + "resolved": "https://registry.npm.taobao.org/core-js/download/core-js-3.3.2.tgz", + "integrity": "sha1-zULaHXsLsz7xEya+OnIZNCd860I=", "dev": true }, "core-js-compat": { "version": "3.2.1", - "resolved": "https://registry.npm.taobao.org/core-js-compat/download/core-js-compat-3.2.1.tgz?cache=0&sync_timestamp=1565612740757&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js-compat%2Fdownload%2Fcore-js-compat-3.2.1.tgz", + "resolved": "https://registry.npm.taobao.org/core-js-compat/download/core-js-compat-3.2.1.tgz", "integrity": "sha1-DL28LjhujgDTuF3IHISO/+xbgVA=", "dev": true, "requires": { @@ -4053,7 +4053,7 @@ "dependencies": { "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", + "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz", "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=", "dev": true } @@ -5066,7 +5066,7 @@ "dependencies": { "debug": { "version": "3.2.6", - "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.2.6.tgz", + "resolved": "https://registry.npm.taobao.org/debug/download/debug-3.2.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-3.2.6.tgz", "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=", "dev": true, "requires": { @@ -5075,7 +5075,7 @@ }, "fs-extra": { "version": "4.0.3", - "resolved": "https://registry.npm.taobao.org/fs-extra/download/fs-extra-4.0.3.tgz", + "resolved": "https://registry.npm.taobao.org/fs-extra/download/fs-extra-4.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffs-extra%2Fdownload%2Ffs-extra-4.0.3.tgz", "integrity": "sha1-DYUhIuW8W+tFP7Ao6cDJvzY0DJQ=", "dev": true, "requires": { @@ -5086,7 +5086,7 @@ }, "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", + "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz", "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=", "dev": true } @@ -8993,7 +8993,7 @@ }, "loud-rejection": { "version": "1.6.0", - "resolved": "https://registry.npm.taobao.org/loud-rejection/download/loud-rejection-1.6.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floud-rejection%2Fdownload%2Floud-rejection-1.6.0.tgz", + "resolved": "https://registry.npm.taobao.org/loud-rejection/download/loud-rejection-1.6.0.tgz", "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { @@ -9023,9 +9023,9 @@ "dev": true }, "lrc-file-parser": { - "version": "0.1.12", - "resolved": "https://registry.npm.taobao.org/lrc-file-parser/download/lrc-file-parser-0.1.12.tgz", - "integrity": "sha1-sM/lhxqufWctaW8C2gBXlTjUKZ0=" + "version": "0.1.14", + "resolved": "https://registry.npm.taobao.org/lrc-file-parser/download/lrc-file-parser-0.1.14.tgz", + "integrity": "sha1-FW00nV/f01XNJMp/JqYMPeDscgE=" }, "lru-cache": { "version": "4.1.5", @@ -9083,7 +9083,7 @@ }, "map-obj": { "version": "1.0.1", - "resolved": "https://registry.npm.taobao.org/map-obj/download/map-obj-1.0.1.tgz?cache=0&sync_timestamp=1560578867343&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmap-obj%2Fdownload%2Fmap-obj-1.0.1.tgz", + "resolved": "https://registry.npm.taobao.org/map-obj/download/map-obj-1.0.1.tgz", "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", "dev": true }, @@ -10784,7 +10784,7 @@ }, "pretty-bytes": { "version": "1.0.4", - "resolved": "https://registry.npm.taobao.org/pretty-bytes/download/pretty-bytes-1.0.4.tgz", + "resolved": "https://registry.npm.taobao.org/pretty-bytes/download/pretty-bytes-1.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpretty-bytes%2Fdownload%2Fpretty-bytes-1.0.4.tgz", "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=", "dev": true, "requires": { @@ -10850,7 +10850,7 @@ }, "readable-stream": { "version": "1.1.14", - "resolved": "https://registry.npm.taobao.org/readable-stream/download/readable-stream-1.1.14.tgz", + "resolved": "https://registry.npm.taobao.org/readable-stream/download/readable-stream-1.1.14.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freadable-stream%2Fdownload%2Freadable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "dev": true, "requires": { @@ -10868,7 +10868,7 @@ }, "through2": { "version": "0.2.3", - "resolved": "https://registry.npm.taobao.org/through2/download/through2-0.2.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fthrough2%2Fdownload%2Fthrough2-0.2.3.tgz", + "resolved": "https://registry.npm.taobao.org/through2/download/through2-0.2.3.tgz", "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=", "dev": true, "requires": { @@ -11316,7 +11316,7 @@ }, "read-pkg": { "version": "1.1.0", - "resolved": "https://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fread-pkg%2Fdownload%2Fread-pkg-1.1.0.tgz", + "resolved": "https://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz", "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { @@ -11350,7 +11350,7 @@ "dependencies": { "find-up": { "version": "1.1.2", - "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz", + "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffind-up%2Fdownload%2Ffind-up-1.1.2.tgz", "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { @@ -11424,7 +11424,7 @@ "dependencies": { "indent-string": { "version": "2.1.0", - "resolved": "https://registry.npm.taobao.org/indent-string/download/indent-string-2.1.0.tgz", + "resolved": "https://registry.npm.taobao.org/indent-string/download/indent-string-2.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Findent-string%2Fdownload%2Findent-string-2.1.0.tgz", "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { @@ -11435,7 +11435,7 @@ }, "regenerate": { "version": "1.4.0", - "resolved": "https://registry.npm.taobao.org/regenerate/download/regenerate-1.4.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerate%2Fdownload%2Fregenerate-1.4.0.tgz", + "resolved": "https://registry.npm.taobao.org/regenerate/download/regenerate-1.4.0.tgz", "integrity": "sha1-SoVuxLVuQHfFV1icroXnpMiGmhE=", "dev": true }, @@ -11456,7 +11456,7 @@ }, "regenerator-transform": { "version": "0.14.1", - "resolved": "https://registry.npm.taobao.org/regenerator-transform/download/regenerator-transform-0.14.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-transform%2Fdownload%2Fregenerator-transform-0.14.1.tgz", + "resolved": "https://registry.npm.taobao.org/regenerator-transform/download/regenerator-transform-0.14.1.tgz?cache=0&sync_timestamp=1563549978509&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-transform%2Fdownload%2Fregenerator-transform-0.14.1.tgz", "integrity": "sha1-Oy/OThq3cywI9mXf2zFHScfd0vs=", "dev": true, "requires": { @@ -13034,7 +13034,7 @@ }, "find-up": { "version": "4.1.0", - "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-4.1.0.tgz", + "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-4.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffind-up%2Fdownload%2Ffind-up-4.1.0.tgz", "integrity": "sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk=", "dev": true, "requires": { @@ -13142,7 +13142,7 @@ }, "webpack-sources": { "version": "1.4.3", - "resolved": "https://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&sync_timestamp=1568302837530&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz", + "resolved": "https://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz", "integrity": "sha1-7t2OwLko+/HL/plOItLYkPMwqTM=", "dev": true, "requires": { @@ -13957,9 +13957,9 @@ } }, "webpack": { - "version": "4.41.1", - "resolved": "https://registry.npm.taobao.org/webpack/download/webpack-4.41.1.tgz", - "integrity": "sha1-U4jdMEfWgNXTgqhCSf1HUOhzcv0=", + "version": "4.41.2", + "resolved": "https://registry.npm.taobao.org/webpack/download/webpack-4.41.2.tgz", + "integrity": "sha1-w07Hbao6hGjJthpQM22OMwPc504=", "dev": true, "requires": { "@webassemblyjs/ast": "1.8.5", diff --git a/package.json b/package.json index 3a087fd2..e4255b0f 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/polyfill": "^7.6.0", "@babel/preset-env": "^7.6.3", - "autoprefixer": "^9.6.4", + "autoprefixer": "^9.6.5", "babel-eslint": "^10.0.3", "babel-loader": "^8.0.6", "babel-minify-webpack-plugin": "^0.3.1", @@ -147,7 +147,7 @@ "chalk": "^2.4.2", "changelog-parser": "^2.8.0", "copy-webpack-plugin": "^5.0.4", - "core-js": "^3.2.1", + "core-js": "^3.3.2", "cos-nodejs-sdk-v5": "^2.5.12", "cross-env": "^6.0.3", "css-loader": "^3.2.0", @@ -187,7 +187,7 @@ "vue-loader": "^15.7.1", "vue-style-loader": "^4.1.2", "vue-template-compiler": "^2.6.10", - "webpack": "^4.41.1", + "webpack": "^4.41.2", "webpack-cli": "^3.3.9", "webpack-dev-server": "^3.8.2", "webpack-hot-middleware": "^2.25.0", @@ -202,7 +202,7 @@ "electron-updater": "^4.1.2", "flac-metadata": "^0.1.1", "js-htmlencode": "^0.3.0", - "lrc-file-parser": "^0.1.12", + "lrc-file-parser": "^0.1.14", "node-downloader-helper": "^1.0.10", "node-id3": "^0.1.11", "request": "^2.88.0", diff --git a/publish/changeLog.md b/publish/changeLog.md index 7e86590d..a2a4460c 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,3 +1,7 @@ +#### 新增 + +- 新增网易云源歌曲搜索 + #### 修复 - 修复QQ源歌单无法翻页Bug diff --git a/src/renderer/utils/music/wy/index.js b/src/renderer/utils/music/wy/index.js index f5457b66..d81801ce 100644 --- a/src/renderer/utils/music/wy/index.js +++ b/src/renderer/utils/music/wy/index.js @@ -2,9 +2,11 @@ import leaderboard from './leaderboard' import api_source from '../api-source' import getLyric from './lyric' import getMusicInfo from './musicInfo' +import musicSearch from './musicSearch' const wy = { leaderboard, + musicSearch, getMusicUrl(songInfo, type) { return api_source('wy').getMusicUrl(songInfo, type) }, diff --git a/src/renderer/utils/music/wy/lyric.js b/src/renderer/utils/music/wy/lyric.js index 288e2e16..9343d019 100644 --- a/src/renderer/utils/music/wy/lyric.js +++ b/src/renderer/utils/music/wy/lyric.js @@ -1,22 +1,16 @@ // https://github.com/Binaryify/NeteaseCloudMusicApi/blob/master/module/lyric.js import { httpFetch } from '../../request' -import { linuxapi } from './utils/crypto' +import { weapi } from './utils/crypto' export default songmid => { - const requestObj = httpFetch('https://music.163.com/api/linux/forward', { + const requestObj = httpFetch('http://music.163.com/weapi/song/lyric?csrf_token=', { method: 'post', headers: { 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36', Referer: 'https://music.163.com/song?id=' + songmid, origin: 'https://music.163.com', }, - form: linuxapi({ - method: 'POST', - url: 'https://music.163.com/api/song/lyric?lv=-1&kv=-1&tv=-1', - params: { - id: songmid, - }, - }), + form: weapi({ id: songmid, lv: -1, tv: -1, csrf_token: '' }), }) requestObj.promise = requestObj.promise.then(({ body }) => { // console.log(body) diff --git a/src/renderer/utils/music/wy/musicSearch.js b/src/renderer/utils/music/wy/musicSearch.js new file mode 100644 index 00000000..a7b6c487 --- /dev/null +++ b/src/renderer/utils/music/wy/musicSearch.js @@ -0,0 +1,98 @@ +import { httpFetch } from '../../request' +import { weapi } from './utils/crypto' +import { sizeFormate, formatPlayTime } from '../../index' + +let searchRequest +export default { + limit: 30, + total: 0, + page: 0, + allPage: 1, + musicSearch(str, page) { + if (searchRequest && searchRequest.cancelHttp) searchRequest.cancelHttp() + searchRequest = httpFetch('http://music.163.com/weapi/cloudsearch/get/web?csrf_token=', { + method: 'post', + form: weapi({ + s: str, + type: 1, // 1: 单曲, 10: 专辑, 100: 歌手, 1000: 歌单, 1002: 用户, 1004: MV, 1006: 歌词, 1009: 电台, 1014: 视频 + limit: this.limit, + offset: this.limit * (page - 1), + }), + }) + return searchRequest.promise.then(({ body }) => body) + }, + getSinger(singers) { + let arr = [] + singers.forEach(singer => { + arr.push(singer.name) + }) + return arr.join('、') + }, + handleResult(rawList) { + // console.log(rawList) + return rawList.map(item => { + const types = [] + const _types = {} + let size + switch (item.privilege.maxbr) { + case 999000: + size = null + types.push({ type: 'flac', size }) + _types.flac = { + size, + } + case 320000: + size = sizeFormate(item.h.size) + types.push({ type: '320k', size }) + _types['320k'] = { + size, + } + case 128000: + size = sizeFormate(item.l.size) + types.push({ type: '128k', size }) + _types['128k'] = { + size, + } + } + + types.reverse() + + return { + singer: this.getSinger(item.ar), + name: item.name, + albumName: item.al.name, + albumId: item.al.id, + source: 'wy', + interval: formatPlayTime(item.dt / 1000), + songmid: item.id, + img: item.al.picUrl, + lrc: null, + types, + _types, + typeUrl: {}, + } + }) + }, + search(str, page = 1, { limit } = {}) { + if (limit != null) this.limit = limit + return this.musicSearch(str, page).then(result => { + // console.log(JSON.stringify(result)) + if (!result || result.code !== 200) return this.search(str, page, { limit }) + let list = this.handleResult(result.result.songs) + + if (list == null) return this.search(str, page, { limit }) + + this.total = result.result.songCount + this.page = page + this.allPage = Math.ceil(this.total / this.limit) + + return Promise.resolve({ + list, + allPage: this.allPage, + limit: this.limit, + total: this.total, + source: 'wy', + }) + }) + }, +}