diff --git a/.electron-vue/build.js b/.electron-vue/build.js index c42ea75..bdfb5af 100644 --- a/.electron-vue/build.js +++ b/.electron-vue/build.js @@ -12,7 +12,7 @@ const Multispinner = require('multispinner') const mainConfig = require('./webpack.main.config') const rendererConfig = require('./webpack.renderer.config') -const webConfig = require('./webpack.web.config') +// const webConfig = require('./webpack.web.config') const doneLog = chalk.bgGreen.white(' DONE ') + ' ' const errorLog = chalk.bgRed.white(' ERROR ') + ' ' @@ -98,20 +98,20 @@ function pack (config) { }) } -function web () { - del.sync(['dist/web/*', '!.gitkeep']) - webConfig.mode = 'production' - webpack(webConfig, (err, stats) => { - if (err || stats.hasErrors()) console.log(err) +// function web () { +// del.sync(['dist/web/*', '!.gitkeep']) +// webConfig.mode = 'production' +// webpack(webConfig, (err, stats) => { +// if (err || stats.hasErrors()) console.log(err) - console.log(stats.toString({ - chunks: false, - colors: true - })) +// console.log(stats.toString({ +// chunks: false, +// colors: true +// })) - process.exit() - }) -} +// process.exit() +// }) +// } function greeting () { const cols = process.stdout.columns diff --git a/package.json b/package.json index 3545bb9..b3726d3 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "del": "^3.0.0", "devtron": "^1.4.0", "electron": "4.0.0", - "electron-builder": "^19.19.1", + "electron-builder": "^20.38.4", "electron-debug": "^1.4.0", "electron-devtools-installer": "^2.2.0", "eslint": "^4.4.1", diff --git a/yarn.lock b/yarn.lock index adc7141..136e6aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,9 +2,9 @@ # yarn lockfile v1 -"7zip-bin@~3.0.0": - version "3.0.0" - resolved "http://registry.npm.taobao.org/7zip-bin/download/7zip-bin-3.0.0.tgz#17416dc542f41511b26a9667b92847d75ef150fe" +"7zip-bin@~4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-4.1.0.tgz#33eff662a5c39c0c2061170cc003c5120743fff0" "7zip@0.0.6": version "0.0.6" @@ -249,11 +249,11 @@ ajv-keywords@^2.1.0: version "2.1.1" resolved "http://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762" -ajv-keywords@^3.1.0: +ajv-keywords@^3.1.0, ajv-keywords@^3.2.0: version "3.2.0" resolved "http://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a" -ajv@^5.2.3, ajv@^5.3.0, ajv@^5.5.0: +ajv@^5.2.3, ajv@^5.3.0: version "5.5.2" resolved "http://registry.npm.taobao.org/ajv/download/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" dependencies: @@ -349,6 +349,39 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" +app-builder-bin@2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-2.6.1.tgz#aa97f82d341dfa6f1269d78955482d619cc613ed" + +app-builder-lib@20.38.4, app-builder-lib@~20.38.3: + version "20.38.4" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-20.38.4.tgz#71a515d01f4f2bd48a67495804f659a46c35303c" + dependencies: + "7zip-bin" "~4.1.0" + app-builder-bin "2.6.1" + async-exit-hook "^2.0.1" + bluebird-lst "^1.0.6" + builder-util "9.6.1" + builder-util-runtime "8.1.0" + chromium-pickle-js "^0.2.0" + debug "^4.1.0" + ejs "^2.6.1" + electron-osx-sign "0.4.11" + electron-publish "20.38.3" + fs-extra-p "^7.0.0" + hosted-git-info "^2.7.1" + is-ci "^2.0.0" + isbinaryfile "^3.0.3" + js-yaml "^3.12.0" + lazy-val "^1.0.3" + minimatch "^3.0.4" + normalize-package-data "^2.4.0" + plist "^3.0.1" + read-config-file "3.2.0" + sanitize-filename "^1.6.1" + semver "^5.6.0" + temp-file "^3.3.2" + aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "http://registry.npm.taobao.org/aproba/download/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -454,13 +487,6 @@ asap@~2.0.3: version "2.0.6" resolved "http://registry.npm.taobao.org/asap/download/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" -asar-integrity@0.2.4: - version "0.2.4" - resolved "http://registry.npm.taobao.org/asar-integrity/download/asar-integrity-0.2.4.tgz#b7867c9720e08c461d12bc42f005c239af701733" - dependencies: - bluebird-lst "^1.0.5" - fs-extra-p "^4.5.0" - asn1.js@^4.0.0: version "4.10.1" resolved "http://registry.npm.taobao.org/asn1.js/download/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0" @@ -1394,11 +1420,7 @@ base64-arraybuffer@0.1.5: version "0.1.5" resolved "http://registry.npm.taobao.org/base64-arraybuffer/download/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8" -base64-js@1.2.0: - version "1.2.0" - resolved "http://registry.npm.taobao.org/base64-js/download/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1" - -base64-js@^1.0.2: +base64-js@^1.0.2, base64-js@^1.2.3: version "1.3.0" resolved "http://registry.npm.taobao.org/base64-js/download/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3" @@ -1457,7 +1479,7 @@ blob@0.0.4: version "0.0.4" resolved "http://registry.npm.taobao.org/blob/download/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921" -bluebird-lst@^1.0.5, bluebird-lst@^1.0.6: +bluebird-lst@^1.0.6: version "1.0.6" resolved "http://registry.npm.taobao.org/bluebird-lst/download/bluebird-lst-1.0.6.tgz#89bc4de0a357373605c8781f293f7b06d454f869" dependencies: @@ -1674,63 +1696,31 @@ buffer@^5.1.0: base64-js "^1.0.2" ieee754 "^1.1.4" -builder-util-runtime@4.0.4: - version "4.0.4" - resolved "http://registry.npm.taobao.org/builder-util-runtime/download/builder-util-runtime-4.0.4.tgz#c92c352097006a07f3324ea200fa815440cba198" +builder-util-runtime@8.1.0, builder-util-runtime@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.1.0.tgz#dd7fca995d48ceee7580b4851ca057566c94601e" dependencies: - bluebird-lst "^1.0.5" - debug "^3.1.0" - fs-extra-p "^4.5.0" + bluebird-lst "^1.0.6" + debug "^4.1.0" + fs-extra-p "^7.0.0" sax "^1.2.4" -builder-util-runtime@^4.0.4, builder-util-runtime@^4.0.5: - version "4.4.1" - resolved "http://registry.npm.taobao.org/builder-util-runtime/download/builder-util-runtime-4.4.1.tgz#2770d03241e51fde46acacc7ed3ed8a9f45f02cb" +builder-util@9.6.1, builder-util@~9.6.0: + version "9.6.1" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-9.6.1.tgz#4625620b1535fe40dcacb178d24fe56d0d7c8957" dependencies: - bluebird-lst "^1.0.5" - debug "^3.1.0" - fs-extra-p "^4.6.1" - sax "^1.2.4" - -builder-util@4.2.4: - version "4.2.4" - resolved "http://registry.npm.taobao.org/builder-util/download/builder-util-4.2.4.tgz#ab0b460e6d62d8f24ecfe9435d9335851be3ea1a" - dependencies: - "7zip-bin" "~3.0.0" - bluebird-lst "^1.0.5" - builder-util-runtime "^4.0.4" - chalk "^2.3.0" - debug "^3.1.0" - fs-extra-p "^4.5.0" - ini "^1.3.5" - is-ci "^1.1.0" - js-yaml "^3.10.0" - lazy-val "^1.0.3" - semver "^5.5.0" - source-map-support "^0.5.3" + "7zip-bin" "~4.1.0" + app-builder-bin "2.6.1" + bluebird-lst "^1.0.6" + builder-util-runtime "^8.1.0" + chalk "^2.4.1" + debug "^4.1.0" + fs-extra-p "^7.0.0" + is-ci "^2.0.0" + js-yaml "^3.12.0" + source-map-support "^0.5.9" stat-mode "^0.2.2" - temp-file "^3.1.1" - tunnel-agent "^0.6.0" - -builder-util@^4.2.2: - version "4.2.5" - resolved "http://registry.npm.taobao.org/builder-util/download/builder-util-4.2.5.tgz#babc190e2f2c3681497632b5cc274f1543aa9264" - dependencies: - "7zip-bin" "~3.0.0" - bluebird-lst "^1.0.5" - builder-util-runtime "^4.0.5" - chalk "^2.3.0" - debug "^3.1.0" - fs-extra-p "^4.5.0" - ini "^1.3.5" - is-ci "^1.1.0" - js-yaml "^3.10.0" - lazy-val "^1.0.3" - semver "^5.5.0" - source-map-support "^0.5.3" - stat-mode "^0.2.2" - temp-file "^3.1.1" - tunnel-agent "^0.6.0" + temp-file "^3.3.2" builtin-modules@^1.0.0: version "1.1.1" @@ -1903,7 +1893,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1: +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2, chalk@^2.4.1: version "2.4.1" resolved "http://registry.npm.taobao.org/chalk/download/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" dependencies: @@ -2008,6 +1998,10 @@ ci-info@^1.5.0: version "1.6.0" resolved "http://registry.npm.taobao.org/ci-info/download/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" resolved "http://registry.npm.taobao.org/cipher-base/download/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" @@ -2692,7 +2686,7 @@ debug@^3.0.0, debug@^3.1.0, debug@^3.2.5: dependencies: ms "^2.1.1" -decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: +decamelize@^1.0.0, decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" resolved "http://registry.npm.taobao.org/decamelize/download/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -2867,16 +2861,18 @@ dir-glob@^2.0.0: arrify "^1.0.1" path-type "^3.0.0" -dmg-builder@3.1.4: - version "3.1.4" - resolved "http://registry.npm.taobao.org/dmg-builder/download/dmg-builder-3.1.4.tgz#57c53a2b5a1e28526a837430b6ecc7110cadcf63" +dmg-builder@6.5.3: + version "6.5.3" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-6.5.3.tgz#95afe3deab33fd874f68d299bc71b481e94f5312" dependencies: - bluebird-lst "^1.0.5" - builder-util "^4.2.2" - fs-extra-p "^4.5.0" - iconv-lite "^0.4.19" - js-yaml "^3.10.0" + app-builder-lib "~20.38.3" + bluebird-lst "^1.0.6" + builder-util "~9.6.0" + fs-extra-p "^7.0.0" + iconv-lite "^0.4.24" + js-yaml "^3.12.0" parse-color "^1.0.0" + sanitize-filename "^1.6.1" dns-equal@^1.0.0: version "1.0.0" @@ -2990,13 +2986,13 @@ dot-prop@^4.1.0, dot-prop@^4.1.1: dependencies: is-obj "^1.0.0" -dotenv-expand@^4.0.1: +dotenv-expand@^4.2.0: version "4.2.0" - resolved "http://registry.npm.taobao.org/dotenv-expand/download/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275" + resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz#def1f1ca5d6059d24a766e587942c21106ce1275" -dotenv@^4.0.0: - version "4.0.0" - resolved "http://registry.npm.taobao.org/dotenv/download/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d" +dotenv@^6.1.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064" duplexer3@^0.1.4: version "0.1.4" @@ -3022,61 +3018,31 @@ ee-first@1.1.1, ee-first@~1.1.1: version "1.1.1" resolved "http://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" -ejs@^2.5.7: +ejs@^2.6.1: version "2.6.1" - resolved "http://registry.npm.taobao.org/ejs/download/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" ejs@~2.5.6: version "2.5.9" resolved "http://registry.npm.taobao.org/ejs/download/ejs-2.5.9.tgz#7ba254582a560d267437109a68354112475b0ce5" -electron-builder-lib@19.56.2: - version "19.56.2" - resolved "http://registry.npm.taobao.org/electron-builder-lib/download/electron-builder-lib-19.56.2.tgz#9e4ef3a1a5fa21d3fd490561261ae639bb263da3" +electron-builder@^20.38.4: + version "20.38.4" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.38.4.tgz#67727529ffb87e7fdd78b3a84ea0d6c22bf04ec2" dependencies: - "7zip-bin" "~3.0.0" - asar-integrity "0.2.4" - async-exit-hook "^2.0.1" - bluebird-lst "^1.0.5" - builder-util "4.2.4" - builder-util-runtime "4.0.4" - chromium-pickle-js "^0.2.0" - debug "^3.1.0" - dmg-builder "3.1.4" - ejs "^2.5.7" - electron-osx-sign "0.4.8" - electron-publish "19.56.0" - fs-extra-p "^4.5.0" - hosted-git-info "^2.5.0" - is-ci "^1.1.0" - isbinaryfile "^3.0.2" - js-yaml "^3.10.0" + app-builder-lib "20.38.4" + bluebird-lst "^1.0.6" + builder-util "9.6.1" + builder-util-runtime "8.1.0" + chalk "^2.4.1" + dmg-builder "6.5.3" + fs-extra-p "^7.0.0" + is-ci "^2.0.0" lazy-val "^1.0.3" - minimatch "^3.0.4" - normalize-package-data "^2.4.0" - plist "^2.1.0" - read-config-file "2.1.1" + read-config-file "3.2.0" sanitize-filename "^1.6.1" - semver "^5.5.0" - temp-file "^3.1.1" - -electron-builder@^19.19.1: - version "19.56.2" - resolved "http://registry.npm.taobao.org/electron-builder/download/electron-builder-19.56.2.tgz#11c0c4544c4d82f1f1a2837e7f349a67457f1d99" - dependencies: - bluebird-lst "^1.0.5" - builder-util "4.2.4" - builder-util-runtime "4.0.4" - chalk "^2.3.0" - electron-builder-lib "19.56.2" - electron-download-tf "4.3.4" - fs-extra-p "^4.5.0" - is-ci "^1.1.0" - lazy-val "^1.0.3" - read-config-file "2.1.1" - sanitize-filename "^1.6.1" - update-notifier "^2.3.0" - yargs "^11.0.0" + update-notifier "^2.5.0" + yargs "^12.0.5" electron-chromedriver@~1.8.0: version "1.8.0" @@ -3101,20 +3067,6 @@ electron-devtools-installer@^2.2.0: rimraf "^2.5.2" semver "^5.3.0" -electron-download-tf@4.3.4: - version "4.3.4" - resolved "http://registry.npm.taobao.org/electron-download-tf/download/electron-download-tf-4.3.4.tgz#b03740b2885aa2ad3f8784fae74df427f66d5165" - dependencies: - debug "^3.0.0" - env-paths "^1.0.0" - fs-extra "^4.0.1" - minimist "^1.2.0" - nugget "^2.0.1" - path-exists "^3.0.0" - rc "^1.2.1" - semver "^5.4.1" - sumchecker "^2.0.2" - electron-download@^4.1.0: version "4.1.1" resolved "http://registry.npm.taobao.org/electron-download/download/electron-download-4.1.1.tgz#02e69556705cc456e520f9e035556ed5a015ebe8" @@ -3146,27 +3098,28 @@ electron-localshortcut@^3.0.0: keyboardevent-from-electron-accelerator "^1.1.0" keyboardevents-areequal "^0.2.1" -electron-osx-sign@0.4.8: - version "0.4.8" - resolved "http://registry.npm.taobao.org/electron-osx-sign/download/electron-osx-sign-0.4.8.tgz#f0b9fadded9e1e54ec35fa89877b5c6c34c7bc40" +electron-osx-sign@0.4.11: + version "0.4.11" + resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.11.tgz#8377732fe7b207969f264b67582ee47029ce092f" dependencies: bluebird "^3.5.0" compare-version "^0.1.2" debug "^2.6.8" isbinaryfile "^3.0.2" minimist "^1.2.0" - plist "^2.1.0" + plist "^3.0.1" -electron-publish@19.56.0: - version "19.56.0" - resolved "http://registry.npm.taobao.org/electron-publish/download/electron-publish-19.56.0.tgz#1a0446e69b3085a905c0abdf16125c1c97d108d9" +electron-publish@20.38.3: + version "20.38.3" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.38.3.tgz#7c162904f728ba2bbf2640bc3620b65ce1061ce3" dependencies: - bluebird-lst "^1.0.5" - builder-util "^4.2.2" - builder-util-runtime "^4.0.4" - chalk "^2.3.0" - fs-extra-p "^4.5.0" - mime "^2.2.0" + bluebird-lst "^1.0.6" + builder-util "~9.6.0" + builder-util-runtime "^8.1.0" + chalk "^2.4.1" + fs-extra-p "^7.0.0" + lazy-val "^1.0.3" + mime "^2.4.0" electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.47: version "1.3.96" @@ -3949,13 +3902,6 @@ fs-constants@^1.0.0: version "1.0.0" resolved "http://registry.npm.taobao.org/fs-constants/download/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" -fs-extra-p@^4.5.0, fs-extra-p@^4.6.1: - version "4.6.1" - resolved "http://registry.npm.taobao.org/fs-extra-p/download/fs-extra-p-4.6.1.tgz#6156e0cc98097f415fcd17029578fc41c78b5092" - dependencies: - bluebird-lst "^1.0.5" - fs-extra "^6.0.1" - fs-extra-p@^7.0.0: version "7.0.0" resolved "http://registry.npm.taobao.org/fs-extra-p/download/fs-extra-p-7.0.0.tgz#da9a72df71dc77fb938162025a5fc658713c98ab" @@ -4354,7 +4300,7 @@ home-or-tmp@^2.0.0: os-homedir "^1.0.0" os-tmpdir "^1.0.1" -hosted-git-info@^2.1.4, hosted-git-info@^2.5.0: +hosted-git-info@^2.1.4, hosted-git-info@^2.7.1: version "2.7.1" resolved "http://registry.npm.taobao.org/hosted-git-info/download/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047" @@ -4493,7 +4439,7 @@ iconv-lite@0.4.23: dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@^0.4.15, iconv-lite@^0.4.17, iconv-lite@^0.4.19, iconv-lite@^0.4.24, iconv-lite@^0.4.4: +iconv-lite@^0.4.15, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4: version "0.4.24" resolved "http://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" dependencies: @@ -4575,7 +4521,7 @@ inherits@2.0.1: version "2.0.1" resolved "http://registry.npm.taobao.org/inherits/download/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" -ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: +ini@^1.3.4, ini@~1.3.0: version "1.3.5" resolved "http://registry.npm.taobao.org/ini/download/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" @@ -4639,10 +4585,6 @@ invariant@^2.2.2: dependencies: loose-envify "^1.0.0" -invert-kv@^1.0.0: - version "1.0.0" - resolved "http://registry.npm.taobao.org/invert-kv/download/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - invert-kv@^2.0.0: version "2.0.0" resolved "http://registry.npm.taobao.org/invert-kv/download/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" @@ -4703,12 +4645,18 @@ is-callable@^1.1.3, is-callable@^1.1.4: version "1.1.4" resolved "http://registry.npm.taobao.org/is-callable/download/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" -is-ci@^1.0.10, is-ci@^1.1.0: +is-ci@^1.0.10: version "1.2.1" resolved "http://registry.npm.taobao.org/is-ci/download/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" dependencies: ci-info "^1.5.0" +is-ci@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + dependencies: + ci-info "^2.0.0" + is-data-descriptor@^0.1.4: version "0.1.4" resolved "http://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" @@ -4953,7 +4901,7 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "http://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" -isbinaryfile@^3.0.0, isbinaryfile@^3.0.2: +isbinaryfile@^3.0.0, isbinaryfile@^3.0.2, isbinaryfile@^3.0.3: version "3.0.3" resolved "http://registry.npm.taobao.org/isbinaryfile/download/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" dependencies: @@ -5032,13 +4980,20 @@ js-tokens@^3.0.2: version "3.0.2" resolved "http://registry.npm.taobao.org/js-tokens/download/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" -js-yaml@3.x, js-yaml@^3.10.0, js-yaml@^3.9.1: +js-yaml@3.x, js-yaml@^3.9.1: version "3.12.0" resolved "http://registry.npm.taobao.org/js-yaml/download/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1" dependencies: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^3.12.0: + version "3.12.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600" + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + js-yaml@~3.7.0: version "3.7.0" resolved "http://registry.npm.taobao.org/js-yaml/download/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80" @@ -5096,6 +5051,12 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" +json5@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850" + dependencies: + minimist "^1.2.0" + jsonfile@^4.0.0: version "4.0.0" resolved "http://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -5269,12 +5230,6 @@ lazystream@^1.0.0: dependencies: readable-stream "^2.0.5" -lcid@^1.0.0: - version "1.0.0" - resolved "http://registry.npm.taobao.org/lcid/download/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - dependencies: - invert-kv "^1.0.0" - lcid@^2.0.0: version "2.0.0" resolved "http://registry.npm.taobao.org/lcid/download/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" @@ -5654,12 +5609,6 @@ melody.css@^1.0.2: version "1.0.3" resolved "http://registry.npm.taobao.org/melody.css/download/melody.css-1.0.3.tgz#8c07f8b18e48c979a31c01ba830e98a7325c2b1c" -mem@^1.1.0: - version "1.1.0" - resolved "http://registry.npm.taobao.org/mem/download/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" - dependencies: - mimic-fn "^1.0.0" - mem@^4.0.0: version "4.0.0" resolved "http://registry.npm.taobao.org/mem/download/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf" @@ -5769,7 +5718,7 @@ mime@^1.3.4, mime@^1.5.0: version "1.6.0" resolved "http://registry.npm.taobao.org/mime/download/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" -mime@^2.0.3, mime@^2.2.0, mime@^2.3.1: +mime@^2.0.3, mime@^2.3.1, mime@^2.4.0: version "2.4.0" resolved "http://registry.npm.taobao.org/mime/download/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6" @@ -6288,14 +6237,6 @@ os-homedir@^1.0.0: version "1.0.2" resolved "http://registry.npm.taobao.org/os-homedir/download/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" -os-locale@^2.0.0: - version "2.1.0" - resolved "http://registry.npm.taobao.org/os-locale/download/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" - dependencies: - execa "^0.7.0" - lcid "^1.0.0" - mem "^1.1.0" - os-locale@^3.0.0: version "3.0.1" resolved "http://registry.npm.taobao.org/os-locale/download/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620" @@ -6614,12 +6555,12 @@ pkg-dir@^3.0.0: dependencies: find-up "^3.0.0" -plist@^2.1.0: - version "2.1.0" - resolved "http://registry.npm.taobao.org/plist/download/plist-2.1.0.tgz#57ccdb7a0821df21831217a3cad54e3e146a1025" +plist@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c" dependencies: - base64-js "1.2.0" - xmlbuilder "8.2.2" + base64-js "^1.2.3" + xmlbuilder "^9.0.7" xmldom "0.1.x" pluralize@^7.0.0: @@ -7226,18 +7167,18 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.1, rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -read-config-file@2.1.1: - version "2.1.1" - resolved "http://registry.npm.taobao.org/read-config-file/download/read-config-file-2.1.1.tgz#bd6c2b93e97a82a35f71a3c9eb43161e16692054" +read-config-file@3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-3.2.0.tgz#50a2756a9a128ab9dcbe087e2724c512e3d0ccd1" dependencies: - ajv "^5.5.0" - ajv-keywords "^2.1.0" - bluebird-lst "^1.0.5" - dotenv "^4.0.0" - dotenv-expand "^4.0.1" - fs-extra-p "^4.5.0" - js-yaml "^3.10.0" - json5 "^0.5.1" + ajv "^6.5.5" + ajv-keywords "^3.2.0" + bluebird-lst "^1.0.6" + dotenv "^6.1.0" + dotenv-expand "^4.2.0" + fs-extra-p "^7.0.0" + js-yaml "^3.12.0" + json5 "^2.1.0" lazy-val "^1.0.3" read-pkg-up@^1.0.1: @@ -7926,7 +7867,14 @@ source-map-support@^0.4.15: dependencies: source-map "^0.5.6" -source-map-support@^0.5.3, source-map-support@~0.5.6: +source-map-support@^0.5.9: + version "0.5.10" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c" + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-support@~0.5.6: version "0.5.9" resolved "http://registry.npm.taobao.org/source-map-support/download/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f" dependencies: @@ -8324,9 +8272,9 @@ tar@^4: safe-buffer "^5.1.2" yallist "^3.0.2" -temp-file@^3.1.1: +temp-file@^3.3.2: version "3.3.2" - resolved "http://registry.npm.taobao.org/temp-file/download/temp-file-3.3.2.tgz#69b6daf1bbe23231d0a5d03844e3d96f3f531aaa" + resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.2.tgz#69b6daf1bbe23231d0a5d03844e3d96f3f531aaa" dependencies: async-exit-hook "^2.0.1" bluebird-lst "^1.0.6" @@ -8640,9 +8588,9 @@ upath@^1.0.5: version "1.1.0" resolved "http://registry.npm.taobao.org/upath/download/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd" -update-notifier@^2.3.0: +update-notifier@^2.5.0: version "2.5.0" - resolved "http://registry.npm.taobao.org/update-notifier/download/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6" dependencies: boxen "^1.2.1" chalk "^2.0.1" @@ -9182,9 +9130,9 @@ xml-char-classes@^1.0.0: version "1.0.0" resolved "http://registry.npm.taobao.org/xml-char-classes/download/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d" -xmlbuilder@8.2.2: - version "8.2.2" - resolved "http://registry.npm.taobao.org/xmlbuilder/download/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773" +xmlbuilder@^9.0.7: + version "9.0.7" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" xmldom@0.1.x: version "0.1.27" @@ -9208,10 +9156,6 @@ xtend@~2.1.1: dependencies: object-keys "~0.4.0" -y18n@^3.2.1: - version "3.2.1" - resolved "http://registry.npm.taobao.org/y18n/download/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" - "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0: version "4.0.0" resolved "http://registry.npm.taobao.org/y18n/download/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" @@ -9237,12 +9181,6 @@ yargs-parser@^11.1.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^9.0.2: - version "9.0.2" - resolved "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077" - dependencies: - camelcase "^4.1.0" - yargs@12.0.2: version "12.0.2" resolved "http://registry.npm.taobao.org/yargs/download/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc" @@ -9260,24 +9198,7 @@ yargs@12.0.2: y18n "^3.2.1 || ^4.0.0" yargs-parser "^10.1.0" -yargs@^11.0.0: - version "11.1.0" - resolved "http://registry.npm.taobao.org/yargs/download/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77" - dependencies: - cliui "^4.0.0" - decamelize "^1.1.1" - find-up "^2.1.0" - get-caller-file "^1.0.1" - os-locale "^2.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^9.0.2" - -yargs@^12.0.2: +yargs@^12.0.2, yargs@^12.0.5: version "12.0.5" resolved "http://registry.npm.taobao.org/yargs/download/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" dependencies: