From 29212d85c2b1a9dd74849f9b576dc1191afbd34a Mon Sep 17 00:00:00 2001 From: fengweiqiang-coder Date: Tue, 22 Mar 2022 16:54:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E6=9C=AA=E6=BF=80=E6=B4=BB=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E8=B7=B3=E8=BD=AC=E5=88=B0imKeySetting?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=8C=E7=82=B9=E5=87=BB=E4=B8=8B=E4=B8=80?= =?UTF-8?q?=E6=AD=A5=E7=BB=91=E5=AE=9A=E7=A0=81=E4=BC=9A=E6=B6=88=E5=A4=B1?= =?UTF-8?q?=E3=80=82=202.imKeySetting=E7=95=8C=E9=9D=A2=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=EF=BC=8C=E6=98=BE=E7=A4=BA=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E6=8C=89=E9=92=AE=203.=E5=A4=9A=E5=8F=B0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=BB=91=E5=AE=9A=E4=B9=8B=E5=90=8E=E5=8D=87=E7=BA=A7?= =?UTF-8?q?COS=E5=87=BA=E7=8E=B0=E7=BB=91=E5=AE=9A=E5=A4=B1=E8=B4=A5=204.?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=8EimKeySetting=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E8=BF=9B=E5=85=A5Manager=EF=BC=8C=E7=82=B9=E5=87=BBDApp?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E5=8D=A1=E6=AD=BB=E7=9A=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=205.=E8=A7=A3=E5=86=B3mac=20electron=E6=89=93=E5=8C=85?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 8 +- src/api/devicemanagerapi.js | 4 +- src/renderer/views/connectDevice.vue | 5 +- src/renderer/views/imKeySetting.vue | 36 +- src/worker/worker.js | 2 +- yarn.lock | 736 +++++++++++++++++++-------- 6 files changed, 566 insertions(+), 225 deletions(-) diff --git a/package.json b/package.json index fd1bf60..0a6d439 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "imKeyManager", - "version": "2.0.0-beta", + "version": "2.0.1-beta", "author": "imkey ", "description": "imKey Manager @2020", "license": "MIT", @@ -160,11 +160,11 @@ "del": "^6.0.0", "devtron": "^1.4.0", "electron": "^11.3.0", - "electron-builder": "22.9.1", + "electron-builder": "22.14.5", "electron-debug": "^3.2.0", - "electron-devtools-installer": "^3.1.1", + "electron-devtools-installer": "^3.2.0", "electron-download": "^4.1.1", - "electron-notarize": "^1.0.0", + "electron-notarize": "^1.1.1", "eslint": "^7.21.0", "eslint-config-standard": "^16.0.2", "eslint-friendly-formatter": "^4.0.1", diff --git a/src/api/devicemanagerapi.js b/src/api/devicemanagerapi.js index 49fd267..a3f47f0 100644 --- a/src/api/devicemanagerapi.js +++ b/src/api/devicemanagerapi.js @@ -397,7 +397,7 @@ export function importBindCode(bindCode) { const response = getUserPath(); if (response.isSuccess) { //存储路径 - const bindCodePath = response.result + "bindCode.json" + const bindCodePath = response.result +getSeid().result+ "bindCode.json" //加密绑定码 const enBindCode ={ bindCode:crypto.encryptData(bindCode.toUpperCase(), process.env.bindCode_encryptionKey) @@ -422,7 +422,7 @@ export function exportBindCode() { const response = getUserPath(); if (response.isSuccess) { //存储路径 - const bindCodePath = response.result + "bindCode.json" + const bindCodePath = response.result +getSeid().result+ "bindCode.json" try { const data = fs.readFileSync(bindCodePath, 'utf-8') const dataString = data.toString()// 将二进制的数据转换为字符串 diff --git a/src/renderer/views/connectDevice.vue b/src/renderer/views/connectDevice.vue index 00fec86..3491d15 100644 --- a/src/renderer/views/connectDevice.vue +++ b/src/renderer/views/connectDevice.vue @@ -427,9 +427,10 @@ export default { this.$router.push('imKeySetting') } } else { + this.$router.push('imKeySetting') // 错误界面 - this.errorInfo = response - this.changeState(4) + // this.errorInfo = response + // this.changeState(4) this.$sa.track('im_landing_connect$error', { name: 'landingConnectError', message: '检查是否创建wallet失败：' + response }) } }) diff --git a/src/renderer/views/imKeySetting.vue b/src/renderer/views/imKeySetting.vue index f010435..61134dd 100644 --- a/src/renderer/views/imKeySetting.vue +++ b/src/renderer/views/imKeySetting.vue @@ -182,8 +182,8 @@

{{$t('m.imKeyManager.done_setting_select_next')}}

- - + +
@@ -371,9 +371,17 @@ export default { this.$ipcRenderer.send('connectDevice') this.$ipcRenderer.on('connectDevice', (connectResult) => { if (connectResult.isSuccess) { - // 去首页 - this.$router.push('/home/welcomeHome') - this.$sa.track('im_onboarding_complete$finish', { name: 'onboardingCompleteClick', to: 'im_homepage' }) + // 读取ETH和DOT和KSM的地址 + this.$ipcRenderer.send('genWalletAddress', { filePath: this.userPath }) + this.$ipcRenderer.on('genWalletAddress', (result) => { + const response = result.result + if (result.isSuccess) { + this.$store.state.WalletAddress = response + // 去首页 + this.$router.push('/home/welcomeHome') + this.$sa.track('im_onboarding_complete$finish', { name: 'onboardingCompleteClick', to: 'im_homepage' }) + } + }) } else { console.log('none') } @@ -399,15 +407,15 @@ export default { // 连接设备， // 检查是否激活，如果未激活，就激活。 // 检查是否绑定，如果未绑定，就再imkey上显示绑定码 - this.$ipcRenderer.send('connectDevice') - this.$ipcRenderer.on('connectDevice', (connectResult) => { - if (connectResult.isSuccess) { - this.active = active - this.page = page - } else { - // 检查绑定失败 - } - }) + // this.$ipcRenderer.send('connectDevice') + // this.$ipcRenderer.on('connectDevice', (connectResult) => { + // if (connectResult.isSuccess) { + this.active = active + this.page = page + // } else { + // // 检查绑定失败 + // } + // }) } if (page === 3 && isNext === true) { // 连接设备， diff --git a/src/worker/worker.js b/src/worker/worker.js index 7da1f69..4f1c7b9 100644 --- a/src/worker/worker.js +++ b/src/worker/worker.js @@ -365,7 +365,7 @@ ipcRenderer.on('message-from-main', (event, arg) => { } if (coinNameArr[i] === 'NERVOS') { // response = walletApi.registerCKBAddress({ - // path: "m/44'/1279'/0'/0/0" + // path: "m/44'/309'/0'/0/0" // }) // if (!response.isSuccess) { // response = { diff --git a/yarn.lock b/yarn.lock index cd0ae2a..26701aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"7zip-bin@~5.0.3": - version "5.0.3" - resolved "https://registry.npm.taobao.org/7zip-bin/download/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f" - integrity sha1-vFtVMuyv2SOmHy+wl+OxCMAQaj8= +"7zip-bin@~5.1.1": + version "5.1.1" + resolved "https://registry.nlark.com/7zip-bin/download/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" + integrity sha1-knTsdGBlL5xjLFmt3yTvsWhO+HY= "@babel/code-frame@7.12.11": version "7.12.11" @@ -902,6 +902,17 @@ resolved "https://registry.npm.taobao.org/@electron/remote/download/@electron/remote-1.0.4.tgz#f1c8cf3560bab762b462bfae9991919cced8bc33" integrity sha1-8cjPNWC6t2K0Yr+umZGRnM7YvDM= +"@electron/universal@1.0.5": + version "1.0.5" + resolved "https://registry.npmmirror.com/@electron/universal/download/@electron/universal-1.0.5.tgz#b812340e4ef21da2b3ee77b2b4d35c9b86defe37" + integrity sha1-uBI0Dk7yHaKz7neytNNcm4be/jc= + dependencies: + "@malept/cross-spawn-promise" "^1.1.0" + asar "^3.0.3" + debug "^4.3.1" + dir-compare "^2.4.0" + fs-extra "^9.0.1" + "@eslint/eslintrc@^0.4.0": version "0.4.0" resolved "https://registry.npm.taobao.org/@eslint/eslintrc/download/@eslint/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547" @@ -1112,6 +1123,23 @@ resolved "https://registry.npm.taobao.org/@istanbuljs/schema/download/@istanbuljs/schema-0.1.3.tgz?cache=0&sync_timestamp=1613227697745&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40istanbuljs%2Fschema%2Fdownload%2F%40istanbuljs%2Fschema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha1-5F44TkuOwWvOL9kDr3hFD2v37Jg= +"@malept/cross-spawn-promise@^1.1.0": + version "1.1.1" + resolved "https://registry.npmmirror.com/@malept/cross-spawn-promise/download/@malept/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" + integrity sha1-UEryAK9rmOGYvOdovBcwxpNq4B0= + dependencies: + cross-spawn "^7.0.1" + +"@malept/flatpak-bundler@^0.4.0": + version "0.4.0" + resolved "https://registry.nlark.com/@malept/flatpak-bundler/download/@malept/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" + integrity sha1-6KMsMKldIMKxu2NcxYCYGgY4mFg= + dependencies: + debug "^4.1.1" + fs-extra "^9.0.0" + lodash "^4.17.15" + tmp-promise "^3.0.2" + "@nodelib/fs.scandir@2.1.4": version "2.1.4" resolved "https://registry.npm.taobao.org/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.4.tgz?cache=0&sync_timestamp=1609074440839&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40nodelib%2Ffs.scandir%2Fdownload%2F%40nodelib%2Ffs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" @@ -1794,10 +1822,12 @@ resolved "https://registry.npm.taobao.org/@types/cors/download/@types/cors-2.8.10.tgz#61cc8469849e5bcdd0c7044122265c39cec10cf4" integrity sha1-YcyEaYSeW83QxwRBIiZcOc7BDPQ= -"@types/debug@^4.1.5": - version "4.1.5" - resolved "https://registry.npm.taobao.org/@types/debug/download/@types/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" - integrity sha1-sU76iFK3do2JiQZhPCP2iHE+As0= +"@types/debug@^4.1.6": + version "4.1.7" + resolved "https://registry.npmmirror.com/@types/debug/download/@types/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" + integrity sha1-fMDqdhUJEkcJuLLRCQ2PbBeq24I= + dependencies: + "@types/ms" "*" "@types/eslint-scope@^3.7.0": version "3.7.0" @@ -1820,10 +1850,10 @@ resolved "https://registry.npm.taobao.org/@types/estree/download/@types/estree-0.0.46.tgz?cache=0&sync_timestamp=1613378414725&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Festree%2Fdownload%2F%40types%2Festree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe" integrity sha1-D7a/u+q9ejCIBQSZM2nEvx3qsf4= -"@types/fs-extra@^9.0.1": - version "9.0.8" - resolved "https://registry.npm.taobao.org/@types/fs-extra/download/@types/fs-extra-9.0.8.tgz#32c3c07ddf8caa5020f84b5f65a48470519f78ba" - integrity sha1-MsPAfd+MqlAg+EtfZaSEcFGfeLo= +"@types/fs-extra@^9.0.11": + version "9.0.13" + resolved "https://registry.npmmirror.com/@types/fs-extra/download/@types/fs-extra-9.0.13.tgz?cache=0&sync_timestamp=1637265615958&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Ffs-extra%2Fdownload%2F%40types%2Ffs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" + integrity sha1-dZT7rgT+fxkYzos9IT90/0SsH0U= dependencies: "@types/node" "*" @@ -1867,6 +1897,11 @@ resolved "https://registry.npm.taobao.org/@types/minimatch/download/@types/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha1-PcoOPzOyAPx9ETnAzZbBJoyt/Z0= +"@types/ms@*": + version "0.7.31" + resolved "https://registry.npmmirror.com/@types/ms/download/@types/ms-0.7.31.tgz?cache=0&sync_timestamp=1637268125428&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fms%2Fdownload%2F%40types%2Fms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" + integrity sha1-MbfKZAcSij0rvCf+LSGzRTl/YZc= + "@types/node-fetch@^2.5.8": version "2.5.8" resolved "https://registry.npm.taobao.org/@types/node-fetch/download/@types/node-fetch-2.5.8.tgz?cache=0&sync_timestamp=1613379565798&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode-fetch%2Fdownload%2F%40types%2Fnode-fetch-2.5.8.tgz#e199c835d234c7eb0846f6618012e558544ee2fb" @@ -1892,6 +1927,14 @@ dependencies: "@types/node" "*" +"@types/plist@^3.0.1": + version "3.0.2" + resolved "https://registry.npmmirror.com/@types/plist/download/@types/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01" + integrity sha1-YbNye7oPXEYv4zNUJTSgw+GcywE= + dependencies: + "@types/node" "*" + xmlbuilder ">=11.0.1" + "@types/puppeteer-core@^5.4.0": version "5.4.0" resolved "https://registry.npm.taobao.org/@types/puppeteer-core/download/@types/puppeteer-core-5.4.0.tgz?cache=0&sync_timestamp=1613617385478&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fpuppeteer-core%2Fdownload%2F%40types%2Fpuppeteer-core-5.4.0.tgz#880a7917b4ede95cbfe2d5e81a558cfcb072c0fb" @@ -1933,6 +1976,11 @@ "@types/cookiejar" "*" "@types/node" "*" +"@types/verror@^1.10.3": + version "1.10.5" + resolved "https://registry.npmmirror.com/@types/verror/download/@types/verror-1.10.5.tgz#2a1413aded46e67a1fe2386800e291123ed75eb1" + integrity sha1-KhQTre1G5nof4jhoAOKREj7XXrE= + "@types/websocket@^1.0.1", "@types/websocket@^1.0.2": version "1.0.2" resolved "https://registry.npm.taobao.org/@types/websocket/download/@types/websocket-1.0.2.tgz?cache=0&sync_timestamp=1615126115054&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fwebsocket%2Fdownload%2F%40types%2Fwebsocket-1.0.2.tgz#d2855c6a312b7da73ed16ba6781815bf30c6187a" @@ -1950,10 +1998,10 @@ resolved "https://registry.npm.taobao.org/@types/yargs-parser/download/@types/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9" integrity sha1-3T5mmboyN/A0jNCF5GmHgCBIQvk= -"@types/yargs@^15.0.5": - version "15.0.13" - resolved "https://registry.npm.taobao.org/@types/yargs/download/@types/yargs-15.0.13.tgz?cache=0&sync_timestamp=1613385096565&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fyargs%2Fdownload%2F%40types%2Fyargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc" - integrity sha1-NPf+yLOJ1/PB/QgCaldj4HLTxtw= +"@types/yargs@^17.0.1": + version "17.0.8" + resolved "https://registry.npmmirror.com/@types/yargs/download/@types/yargs-17.0.8.tgz#d23a3476fd3da8a0ea44b5494ca7fa677b9dad4c" + integrity sha512-wDeUwiUmem9FzsyysEwRukaEdDNcwbROvQ9QGRKaLI6t+IltNzbn4/i4asmB10auvZGQCzSQ6t0GSczEThlUXw== dependencies: "@types/yargs-parser" "*" @@ -2331,6 +2379,11 @@ ansi-regex@^5.0.0: resolved "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" integrity sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U= +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-5.0.1.tgz?cache=0&sync_timestamp=1631634988487&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-regex%2Fdownload%2Fansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha1-CCyyyJyf6GWaMRpTvWpNxTAdswQ= + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -2371,38 +2424,41 @@ anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" -app-builder-bin@3.5.10: - version "3.5.10" - resolved "https://registry.npm.taobao.org/app-builder-bin/download/app-builder-bin-3.5.10.tgz#4a7f9999fccc0c435b6284ae1366bc76a17c4a7d" - integrity sha1-Sn+ZmfzMDENbYoSuE2a8dqF8Sn0= +app-builder-bin@3.7.1: + version "3.7.1" + resolved "https://registry.nlark.com/app-builder-bin/download/app-builder-bin-3.7.1.tgz?cache=0&sync_timestamp=1631623559481&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fapp-builder-bin%2Fdownload%2Fapp-builder-bin-3.7.1.tgz#cb0825c5e12efc85b196ac3ed9c89f076c61040e" + integrity sha1-ywglxeEu/IWxlqw+2cifB2xhBA4= -app-builder-lib@22.9.1: - version "22.9.1" - resolved "https://registry.npm.taobao.org/app-builder-lib/download/app-builder-lib-22.9.1.tgz#ccb8f1a02b628514a5dfab9401fa2a976689415c" - integrity sha1-zLjxoCtihRSl36uUAfoql2aJQVw= +app-builder-lib@22.14.5: + version "22.14.5" + resolved "https://registry.npmmirror.com/app-builder-lib/download/app-builder-lib-22.14.5.tgz#a61a50b132b858e98fdc70b6b88994ae99b4f96d" + integrity sha1-phpQsTK4WOmP3HC2uImUrpm0+W0= dependencies: - "7zip-bin" "~5.0.3" + "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" + "@electron/universal" "1.0.5" + "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.9.1" - builder-util-runtime "8.7.2" + builder-util "22.14.5" + builder-util-runtime "8.9.1" chromium-pickle-js "^0.2.0" - debug "^4.3.0" - ejs "^3.1.5" - electron-publish "22.9.1" - fs-extra "^9.0.1" - hosted-git-info "^3.0.5" - is-ci "^2.0.0" - isbinaryfile "^4.0.6" - js-yaml "^3.14.0" - lazy-val "^1.0.4" + debug "^4.3.2" + ejs "^3.1.6" + electron-osx-sign "^0.5.0" + electron-publish "22.14.5" + form-data "^4.0.0" + fs-extra "^10.0.0" + hosted-git-info "^4.0.2" + is-ci "^3.0.0" + isbinaryfile "^4.0.8" + js-yaml "^4.1.0" + lazy-val "^1.0.5" minimatch "^3.0.4" - normalize-package-data "^2.5.0" - read-config-file "6.0.0" + read-config-file "6.2.0" sanitize-filename "^1.6.3" - semver "^7.3.2" - temp-file "^3.3.7" + semver "^7.3.5" + temp-file "^3.4.0" aproba@^1.0.3: version "1.2.0" @@ -2540,6 +2596,18 @@ arraybuffer.slice@~0.0.7: resolved "https://registry.npm.taobao.org/arraybuffer.slice/download/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" integrity sha1-O7xCdd1YTMGxCAm4nU6LY6aednU= +asar@^3.0.3: + version "3.1.0" + resolved "https://registry.nlark.com/asar/download/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473" + integrity sha1-cLBQlEn+PazMY76008fS4k08ZHM= + dependencies: + chromium-pickle-js "^0.2.0" + commander "^5.0.0" + glob "^7.1.6" + minimatch "^3.0.4" + optionalDependencies: + "@types/glob" "^7.1.1" + asn1.js@^5.2.0: version "5.4.1" resolved "https://registry.npm.taobao.org/asn1.js/download/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" @@ -3245,19 +3313,19 @@ boolean@^3.0.1: resolved "https://registry.npm.taobao.org/boolean/download/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570" integrity sha1-3xuqGLaisOcIQEdeHZPsj+dbJXA= -boxen@^4.2.0: - version "4.2.0" - resolved "https://registry.npm.taobao.org/boxen/download/boxen-4.2.0.tgz?cache=0&sync_timestamp=1609220907521&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fboxen%2Fdownload%2Fboxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64" - integrity sha1-5BG2I1fW1tNlh8isPV2XTaoHDmQ= +boxen@^5.0.0: + version "5.1.2" + resolved "https://registry.npmmirror.com/boxen/download/boxen-5.1.2.tgz?cache=0&sync_timestamp=1634028640223&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fboxen%2Fdownload%2Fboxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" + integrity sha1-eIy2hvyDwfSG36ikDGj8K4MdK1A= dependencies: ansi-align "^3.0.0" - camelcase "^5.3.1" - chalk "^3.0.0" - cli-boxes "^2.2.0" - string-width "^4.1.0" - term-size "^2.1.0" - type-fest "^0.8.1" + camelcase "^6.2.0" + chalk "^4.1.0" + cli-boxes "^2.2.1" + string-width "^4.2.2" + type-fest "^0.20.2" widest-line "^3.1.0" + wrap-ansi "^7.0.0" brace-expansion@^1.1.7: version "1.1.11" @@ -3381,11 +3449,34 @@ bs58check@^2.1.2: create-hash "^1.1.0" safe-buffer "^5.1.2" +buffer-alloc-unsafe@^1.1.0: + version "1.1.0" + resolved "https://registry.nlark.com/buffer-alloc-unsafe/download/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" + integrity sha1-vX3CauKXLQ7aJTvgYdupkjScGfA= + +buffer-alloc@^1.2.0: + version "1.2.0" + resolved "https://registry.npmmirror.com/buffer-alloc/download/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" + integrity sha1-iQ3ZDZI6hz4I4Q5f1RpX5bfM4Ow= + dependencies: + buffer-alloc-unsafe "^1.1.0" + buffer-fill "^1.0.0" + buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.npm.taobao.org/buffer-crc32/download/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= +buffer-equal@1.0.0: + version "1.0.0" + resolved "https://registry.nlark.com/buffer-equal/download/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" + integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74= + +buffer-fill@^1.0.0: + version "1.0.0" + resolved "https://registry.nlark.com/buffer-fill/download/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" + integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= + buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.npm.taobao.org/buffer-from/download/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" @@ -3406,7 +3497,7 @@ buffer-xor@^1.0.3: resolved "https://registry.npm.taobao.org/buffer-xor/download/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= -buffer@^5.0.5, buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0: +buffer@^5.0.5, buffer@^5.1.0, buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0: version "5.7.1" resolved "https://registry.npm.taobao.org/buffer/download/buffer-5.7.1.tgz?cache=0&sync_timestamp=1606098073225&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuffer%2Fdownload%2Fbuffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" integrity sha1-umLnwTEzBTWCGXFghRqPZI6Z7tA= @@ -3421,14 +3512,6 @@ bufferutil@^4.0.1, bufferutil@^4.0.3: dependencies: node-gyp-build "^4.2.0" -builder-util-runtime@8.7.2: - version "8.7.2" - resolved "https://registry.npm.taobao.org/builder-util-runtime/download/builder-util-runtime-8.7.2.tgz#d93afc71428a12789b437e13850e1fa7da956d72" - integrity sha1-2Tr8cUKKEnibQ34ThQ4fp9qVbXI= - dependencies: - debug "^4.1.1" - sax "^1.2.4" - builder-util-runtime@8.7.3: version "8.7.3" resolved "https://registry.npm.taobao.org/builder-util-runtime/download/builder-util-runtime-8.7.3.tgz#0aaafa52d25295c939496f62231ca9ff06c30e40" @@ -3437,25 +3520,34 @@ builder-util-runtime@8.7.3: debug "^4.3.2" sax "^1.2.4" -builder-util@22.9.1: - version "22.9.1" - resolved "https://registry.npm.taobao.org/builder-util/download/builder-util-22.9.1.tgz#b7087a5cde477f90d718ca5d7fafb6ae261b16af" - integrity sha1-twh6XN5Hf5DXGMpdf6+2riYbFq8= +builder-util-runtime@8.9.1: + version "8.9.1" + resolved "https://registry.npmmirror.com/builder-util-runtime/download/builder-util-runtime-8.9.1.tgz#25f066b3fbc20b3e6236a9b956b1ebb0e33ff66a" + integrity sha1-JfBms/vCCz5iNqm5VrHrsOM/9mo= + dependencies: + debug "^4.3.2" + sax "^1.2.4" + +builder-util@22.14.5: + version "22.14.5" + resolved "https://registry.npmmirror.com/builder-util/download/builder-util-22.14.5.tgz#42a18608d2a566c0846e91266464776c8bfb0cc9" + integrity sha1-QqGGCNKlZsCEbpEmZGR3bIv7DMk= dependencies: - "7zip-bin" "~5.0.3" - "@types/debug" "^4.1.5" - "@types/fs-extra" "^9.0.1" - app-builder-bin "3.5.10" + "7zip-bin" "~5.1.1" + "@types/debug" "^4.1.6" + "@types/fs-extra" "^9.0.11" + app-builder-bin "3.7.1" bluebird-lst "^1.0.9" - builder-util-runtime "8.7.2" - chalk "^4.1.0" - debug "^4.3.0" - fs-extra "^9.0.1" - is-ci "^2.0.0" - js-yaml "^3.14.0" + builder-util-runtime "8.9.1" + chalk "^4.1.1" + cross-spawn "^7.0.3" + debug "^4.3.2" + fs-extra "^10.0.0" + is-ci "^3.0.0" + js-yaml "^4.1.0" source-map-support "^0.5.19" stat-mode "^1.0.0" - temp-file "^3.3.7" + temp-file "^3.4.0" bytes@3.0.0: version "3.0.0" @@ -3659,14 +3751,6 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^3.0.0: - version "3.0.0" - resolved "https://registry.npm.taobao.org/chalk/download/chalk-3.0.0.tgz?cache=0&sync_timestamp=1592843133653&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha1-P3PCv1JlkfV0zEksUeJFY0n4ROQ= - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - chalk@^4.0.0, chalk@^4.1.0: version "4.1.0" resolved "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz?cache=0&sync_timestamp=1592843133653&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" @@ -3675,6 +3759,14 @@ chalk@^4.0.0, chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chalk@^4.1.1: + version "4.1.2" + resolved "https://registry.npmmirror.com/chalk/download/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + change-case@2.3.x: version "2.3.1" resolved "https://registry.npm.taobao.org/change-case/download/change-case-2.3.1.tgz#2c4fde3f063bb41d00cd68e0d5a09db61cbe894f" @@ -3799,6 +3891,11 @@ ci-info@^2.0.0: resolved "https://registry.npm.taobao.org/ci-info/download/ci-info-2.0.0.tgz?cache=0&sync_timestamp=1613629407328&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fci-info%2Fdownload%2Fci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha1-Z6npZL4xpR4V5QENWObxKDQAL0Y= +ci-info@^3.2.0: + version "3.3.0" + resolved "https://registry.npmmirror.com/ci-info/download/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" + integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw== + cids@^0.7.1: version "0.7.5" resolved "https://registry.npm.taobao.org/cids/download/cids-0.7.5.tgz#60a08138a99bfb69b6be4ceb63bfef7a396b28b2" @@ -3861,9 +3958,9 @@ clean-stack@^2.0.0: resolved "https://registry.npm.taobao.org/clean-stack/download/clean-stack-2.2.0.tgz?cache=0&sync_timestamp=1605702392322&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fclean-stack%2Fdownload%2Fclean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha1-7oRy27Ep5yezHooQpCfe6d/kAIs= -cli-boxes@^2.2.0: +cli-boxes@^2.2.1: version "2.2.1" - resolved "https://registry.npm.taobao.org/cli-boxes/download/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" + resolved "https://registry.nlark.com/cli-boxes/download/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha1-3dUDXSUJT84iDpyrQKRYQKRAMY8= cli-cursor@^1.0.2: @@ -3873,6 +3970,14 @@ cli-cursor@^1.0.2: dependencies: restore-cursor "^1.0.1" +cli-truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.npmmirror.com/cli-truncate/download/cli-truncate-2.1.0.tgz?cache=0&sync_timestamp=1633786428528&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcli-truncate%2Fdownload%2Fcli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" + integrity sha1-w54ovwXtzeW+O5iZKiLe7Vork8c= + dependencies: + slice-ansi "^3.0.0" + string-width "^4.2.0" + cli@0.6.x: version "0.6.6" resolved "https://registry.npm.taobao.org/cli/download/cli-0.6.6.tgz#02ad44a380abf27adac5e6f0cdd7b043d74c53e3" @@ -3997,6 +4102,11 @@ colors@0.6.2: resolved "https://registry.npm.taobao.org/colors/download/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc" integrity sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w= +colors@1.0.3: + version "1.0.3" + resolved "https://registry.npmmirror.com/colors/download/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" + integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw== + colors@^1.1.2, colors@^1.2.1, colors@^1.4.0: version "1.4.0" resolved "https://registry.npm.taobao.org/colors/download/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" @@ -4046,10 +4156,10 @@ commander@2.8.x: dependencies: graceful-readlink ">= 1.0.0" -commander@2.9.x, commander@~2.9.0: +commander@2.9.0, commander@2.9.x, commander@~2.9.0: version "2.9.0" - resolved "https://registry.npm.taobao.org/commander/download/commander-2.9.0.tgz?cache=0&sync_timestamp=1613374024216&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" - integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q= + resolved "https://registry.npmmirror.com/commander/download/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" + integrity sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A== dependencies: graceful-readlink ">= 1.0.0" @@ -4063,6 +4173,11 @@ commander@^4.1.1: resolved "https://registry.npm.taobao.org/commander/download/commander-4.1.1.tgz?cache=0&sync_timestamp=1613374024216&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha1-n9YCvZNilOnp70aj9NaWQESxgGg= +commander@^5.0.0: + version "5.1.0" + resolved "https://registry.npmmirror.com/commander/download/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" + integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== + commander@^7.0.0: version "7.1.0" resolved "https://registry.npm.taobao.org/commander/download/commander-7.1.0.tgz?cache=0&sync_timestamp=1613374024216&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff" @@ -4080,6 +4195,11 @@ commondir@^1.0.1: resolved "https://registry.npm.taobao.org/commondir/download/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= +compare-version@^0.1.2: + version "0.1.2" + resolved "https://registry.npmmirror.com/compare-version/download/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" + integrity sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA= + component-bind@1.0.0: version "1.0.0" resolved "https://registry.npm.taobao.org/component-bind/download/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1" @@ -4375,6 +4495,13 @@ crc32-stream@^4.0.1: crc-32 "^1.2.0" readable-stream "^3.4.0" +crc@^3.8.0: + version "3.8.0" + resolved "https://registry.npmmirror.com/crc/download/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" + integrity sha1-rWAmnCyFb4wpnixMwN5FVpFAVsY= + dependencies: + buffer "^5.1.0" + create-ecdh@^4.0.0: version "4.0.4" resolved "https://registry.npm.taobao.org/create-ecdh/download/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" @@ -4559,7 +4686,7 @@ de-indent@^1.0.2: resolved "https://registry.npm.taobao.org/de-indent/download/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0= -debug@*, debug@4, debug@4.3.1, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.0, debug@~4.3.1: +debug@*, debug@4, debug@4.3.1, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@~4.3.1: version "4.3.1" resolved "https://registry.npm.taobao.org/debug/download/debug-4.3.1.tgz?cache=0&sync_timestamp=1607566512593&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha1-8NIpxQXgxtjEmsVT0bE9wYP2su4= @@ -4580,6 +4707,13 @@ debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: dependencies: ms "^2.1.1" +debug@^4.3.1: + version "4.3.3" + resolved "https://registry.npmmirror.com/debug/download/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== + dependencies: + ms "2.1.2" + debug@^4.3.2: version "4.3.2" resolved "https://registry.npm.taobao.org/debug/download/debug-4.3.2.tgz?cache=0&sync_timestamp=1607566512593&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" @@ -4854,6 +4988,16 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" +dir-compare@^2.4.0: + version "2.4.0" + resolved "https://registry.npmmirror.com/dir-compare/download/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631" + integrity sha1-eFxB3F9kWzQ0Ok6vxQt5usfxFjE= + dependencies: + buffer-equal "1.0.0" + colors "1.0.3" + commander "2.9.0" + minimatch "3.0.4" + dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.npm.taobao.org/dir-glob/download/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -4861,17 +5005,33 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -dmg-builder@22.9.1: - version "22.9.1" - resolved "https://registry.npm.taobao.org/dmg-builder/download/dmg-builder-22.9.1.tgz#64647224f37ee47fc9bd01947c21cc010a30511f" - integrity sha1-ZGRyJPN+5H/JvQGUfCHMAQowUR8= +dmg-builder@22.14.5: + version "22.14.5" + resolved "https://registry.npmmirror.com/dmg-builder/download/dmg-builder-22.14.5.tgz#137c0b55e639badcc0b119eb060e6fa4ed61d948" + integrity sha1-E3wLVeY5utzAsRnrBg5vpO1h2Ug= dependencies: - app-builder-lib "22.9.1" - builder-util "22.9.1" - fs-extra "^9.0.1" + app-builder-lib "22.14.5" + builder-util "22.14.5" + builder-util-runtime "8.9.1" + fs-extra "^10.0.0" iconv-lite "^0.6.2" - js-yaml "^3.14.0" - sanitize-filename "^1.6.3" + js-yaml "^4.1.0" + optionalDependencies: + dmg-license "^1.0.9" + +dmg-license@^1.0.9: + version "1.0.10" + resolved "https://registry.npmmirror.com/dmg-license/download/dmg-license-1.0.10.tgz#89f52afae25d827fce8d818c13aff30af1c16bcc" + integrity sha512-SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A== + dependencies: + "@types/plist" "^3.0.1" + "@types/verror" "^1.10.3" + ajv "^6.10.0" + crc "^3.8.0" + iconv-corefoundation "^1.1.7" + plist "^3.0.4" + smart-buffer "^4.0.2" + verror "^1.10.0" dns-equal@^1.0.0: version "1.0.0" @@ -5048,6 +5208,11 @@ dotenv@^8.2.0: resolved "https://registry.npm.taobao.org/dotenv/download/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" integrity sha1-l+YZJZradQ7qPk6j4mvO6lQksWo= +dotenv@^9.0.2: + version "9.0.2" + resolved "https://registry.npmmirror.com/dotenv/download/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" + integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== + duplexer3@^0.1.4: version "0.1.4" resolved "https://registry.npm.taobao.org/duplexer3/download/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" @@ -5074,32 +5239,30 @@ ee-first@1.1.1: resolved "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -ejs@^3.1.5: +ejs@^3.1.6: version "3.1.6" - resolved "https://registry.npm.taobao.org/ejs/download/ejs-3.1.6.tgz?cache=0&sync_timestamp=1612643435705&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fejs%2Fdownload%2Fejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" - integrity sha1-W/0KBol0O7UmizVQzO7rvBcCgio= + resolved "https://registry.npmmirror.com/ejs/download/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" + integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== dependencies: jake "^10.6.1" -electron-builder@22.9.1: - version "22.9.1" - resolved "https://registry.npm.taobao.org/electron-builder/download/electron-builder-22.9.1.tgz?cache=0&sync_timestamp=1614627014243&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-builder%2Fdownload%2Felectron-builder-22.9.1.tgz#a2962db6f2757bc01d02489f38fafe0809f68f60" - integrity sha1-opYttvJ1e8AdAkifOPr+CAn2j2A= - dependencies: - "@types/yargs" "^15.0.5" - app-builder-lib "22.9.1" - bluebird-lst "^1.0.9" - builder-util "22.9.1" - builder-util-runtime "8.7.2" - chalk "^4.1.0" - dmg-builder "22.9.1" - fs-extra "^9.0.1" - is-ci "^2.0.0" - lazy-val "^1.0.4" - read-config-file "6.0.0" - sanitize-filename "^1.6.3" - update-notifier "^4.1.1" - yargs "^16.0.3" +electron-builder@22.14.5: + version "22.14.5" + resolved "https://registry.npmmirror.com/electron-builder/download/electron-builder-22.14.5.tgz#3a25547bd4fe3728d4704da80956a794c5c31496" + integrity sha512-N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg== + dependencies: + "@types/yargs" "^17.0.1" + app-builder-lib "22.14.5" + builder-util "22.14.5" + builder-util-runtime "8.9.1" + chalk "^4.1.1" + dmg-builder "22.14.5" + fs-extra "^10.0.0" + is-ci "^3.0.0" + lazy-val "^1.0.5" + read-config-file "6.2.0" + update-notifier "^5.1.0" + yargs "^17.0.1" electron-chromedriver@^12.0.0: version "12.0.0" @@ -5117,13 +5280,14 @@ electron-debug@^3.2.0: electron-is-dev "^1.1.0" electron-localshortcut "^3.1.0" -electron-devtools-installer@^3.1.1: - version "3.1.1" - resolved "https://registry.npm.taobao.org/electron-devtools-installer/download/electron-devtools-installer-3.1.1.tgz#7b56c8c86475c5e4e10de6917d150c53c9ceb55e" - integrity sha1-e1bIyGR1xeThDeaRfRUMU8nOtV4= +electron-devtools-installer@^3.2.0: + version "3.2.0" + resolved "https://registry.nlark.com/electron-devtools-installer/download/electron-devtools-installer-3.2.0.tgz#acc48d24eb7033fe5af284a19667e73b78d406d0" + integrity sha1-rMSNJOtwM/5a8oShlmfnO3jUBtA= dependencies: rimraf "^3.0.2" semver "^7.2.1" + tslib "^2.1.0" unzip-crx-3 "^0.2.0" electron-download@^4.1.1: @@ -5161,27 +5325,38 @@ electron-localshortcut@^3.1.0, electron-localshortcut@^3.2.1: keyboardevent-from-electron-accelerator "^2.0.0" keyboardevents-areequal "^0.2.1" -electron-notarize@^1.0.0: - version "1.0.0" - resolved "https://registry.npm.taobao.org/electron-notarize/download/electron-notarize-1.0.0.tgz#bc925b1ccc3f79e58e029e8c4706572b01a9fd8f" - integrity sha1-vJJbHMw/eeWOAp6MRwZXKwGp/Y8= +electron-notarize@^1.1.1: + version "1.1.1" + resolved "https://registry.npmmirror.com/electron-notarize/download/electron-notarize-1.1.1.tgz#3ed274b36158c1beb1dbef14e7faf5927e028629" + integrity sha1-PtJ0s2FYwb6x2+8U5/r1kn4Chik= dependencies: debug "^4.1.1" fs-extra "^9.0.1" -electron-publish@22.9.1: - version "22.9.1" - resolved "https://registry.npm.taobao.org/electron-publish/download/electron-publish-22.9.1.tgz?cache=0&sync_timestamp=1613632836879&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-publish%2Fdownload%2Felectron-publish-22.9.1.tgz#7cc76ac4cc53efd29ee31c1e5facb9724329068e" - integrity sha1-fMdqxMxT79Ke4xweX6y5ckMpBo4= +electron-osx-sign@^0.5.0: + version "0.5.0" + resolved "https://registry.npmmirror.com/electron-osx-sign/download/electron-osx-sign-0.5.0.tgz#fc258c5e896859904bbe3d01da06902c04b51c3a" + integrity sha1-/CWMXoloWZBLvj0B2gaQLAS1HDo= dependencies: - "@types/fs-extra" "^9.0.1" - bluebird-lst "^1.0.9" - builder-util "22.9.1" - builder-util-runtime "8.7.2" - chalk "^4.1.0" - fs-extra "^9.0.1" - lazy-val "^1.0.4" - mime "^2.4.6" + bluebird "^3.5.0" + compare-version "^0.1.2" + debug "^2.6.8" + isbinaryfile "^3.0.2" + minimist "^1.2.0" + plist "^3.0.1" + +electron-publish@22.14.5: + version "22.14.5" + resolved "https://registry.npmmirror.com/electron-publish/download/electron-publish-22.14.5.tgz#34bcdce671f0e651330db20040d6919c77c94bd6" + integrity sha1-NLzc5nHw5lEzDbIAQNaRnHfJS9Y= + dependencies: + "@types/fs-extra" "^9.0.11" + builder-util "22.14.5" + builder-util-runtime "8.9.1" + chalk "^4.1.1" + fs-extra "^10.0.0" + lazy-val "^1.0.5" + mime "^2.5.2" electron-store@^2.0.0: version "2.0.0" @@ -6326,6 +6501,15 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.nlark.com/form-data/download/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha1-k5Gdrq82HuUpWEubMWZNwSyfpFI= + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + form-data@~2.3.2: version "2.3.3" resolved "https://registry.npm.taobao.org/form-data/download/form-data-2.3.3.tgz?cache=0&sync_timestamp=1613411617006&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fform-data%2Fdownload%2Fform-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -6377,6 +6561,15 @@ fs-cp@^1.2.0: mkdirp-then "^1.0.0" mz "^2.0.0" +fs-extra@^10.0.0: + version "10.0.0" + resolved "https://registry.nlark.com/fs-extra/download/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1" + integrity sha1-n/YbZV3eU/s0qC34S7IUzoAuF8E= + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs-extra@^4.0.1, fs-extra@^4.0.2: version "4.0.3" resolved "https://registry.npm.taobao.org/fs-extra/download/fs-extra-4.0.3.tgz?cache=0&sync_timestamp=1611075413359&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffs-extra%2Fdownload%2Ffs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" @@ -6395,7 +6588,7 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^9.0.1, fs-extra@^9.1.0: +fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0: version "9.1.0" resolved "https://registry.npm.taobao.org/fs-extra/download/fs-extra-9.1.0.tgz?cache=0&sync_timestamp=1611075413359&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffs-extra%2Fdownload%2Ffs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" integrity sha1-WVRGDHZKjaIJS6NVS/g55rmnyG0= @@ -6608,12 +6801,12 @@ global-agent@^2.0.2: semver "^7.3.2" serialize-error "^7.0.1" -global-dirs@^2.0.1: - version "2.1.0" - resolved "https://registry.npm.taobao.org/global-dirs/download/global-dirs-2.1.0.tgz?cache=0&sync_timestamp=1610454797588&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobal-dirs%2Fdownload%2Fglobal-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d" - integrity sha1-6QRqScgG/wTWwYJeGWyPAJHo300= +global-dirs@^3.0.0: + version "3.0.0" + resolved "https://registry.nlark.com/global-dirs/download/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" + integrity sha1-cKdv6E6jFas3sfVXbL3n1I73JoY= dependencies: - ini "1.3.7" + ini "2.0.0" global-tunnel-ng@^2.7.1: version "2.7.1" @@ -6952,10 +7145,10 @@ hosted-git-info@^2.1.4: resolved "https://registry.npm.taobao.org/hosted-git-info/download/hosted-git-info-2.8.8.tgz?cache=0&sync_timestamp=1615314865782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhosted-git-info%2Fdownload%2Fhosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" integrity sha1-dTm9S8Hg4KiVgVouAmJCCxKFhIg= -hosted-git-info@^3.0.5: - version "3.0.8" - resolved "https://registry.npm.taobao.org/hosted-git-info/download/hosted-git-info-3.0.8.tgz?cache=0&sync_timestamp=1615314865782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhosted-git-info%2Fdownload%2Fhosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d" - integrity sha1-bjXUzIevLF+Bbky5zjULqHo/Nw0= +hosted-git-info@^4.0.2: + version "4.1.0" + resolved "https://registry.npmmirror.com/hosted-git-info/download/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" + integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== dependencies: lru-cache "^6.0.0" @@ -7175,6 +7368,14 @@ humanize-plus@^1.8.1: resolved "https://registry.npm.taobao.org/humanize-plus/download/humanize-plus-1.8.2.tgz#a65b34459ad6367adbb3707a82a3c9f916167030" integrity sha1-pls0RZrWNnrbs3B6gqPJ+RYWcDA= +iconv-corefoundation@^1.1.7: + version "1.1.7" + resolved "https://registry.npmmirror.com/iconv-corefoundation/download/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" + integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ== + dependencies: + cli-truncate "^2.1.0" + node-addon-api "^1.6.3" + iconv-lite@0.4.24, iconv-lite@^0.4.4: version "0.4.24" resolved "https://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -7300,10 +7501,10 @@ inherits@2.0.3: resolved "https://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@1.3.7: - version "1.3.7" - resolved "https://registry.npm.taobao.org/ini/download/ini-1.3.7.tgz?cache=0&sync_timestamp=1607907810942&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fini%2Fdownload%2Fini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" - integrity sha1-oJNj4ZEZcuoW16iFEAXYTPCamoQ= +ini@2.0.0: + version "2.0.0" + resolved "https://registry.nlark.com/ini/download/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" + integrity sha1-5f1Vbs3VcmvpePoQAYYurLCpS8U= ini@^1.3.4, ini@~1.3.0: version "1.3.8" @@ -7443,6 +7644,13 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" +is-ci@^3.0.0: + version "3.0.1" + resolved "https://registry.npmmirror.com/is-ci/download/is-ci-3.0.1.tgz?cache=0&sync_timestamp=1635261090481&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-ci%2Fdownload%2Fis-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" + integrity sha1-227L7RvWWcQ9rA9FZh52dBA9GGc= + dependencies: + ci-info "^3.2.0" + is-core-module@^2.2.0: version "2.2.0" resolved "https://registry.npm.taobao.org/is-core-module/download/is-core-module-2.2.0.tgz?cache=0&sync_timestamp=1606411666495&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-core-module%2Fdownload%2Fis-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" @@ -7565,13 +7773,13 @@ is-hex-prefixed@1.0.0: resolved "https://registry.npm.taobao.org/is-hex-prefixed/download/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554" integrity sha1-fY035q135dEnFIkTxXPggtd39VQ= -is-installed-globally@^0.3.1: - version "0.3.2" - resolved "https://registry.npm.taobao.org/is-installed-globally/download/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141" - integrity sha1-/T76ee5nDRGHIzGC1bCh3QAxMUE= +is-installed-globally@^0.4.0: + version "0.4.0" + resolved "https://registry.nlark.com/is-installed-globally/download/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" + integrity sha1-mg/UB5ScMPhutpWe8beZTtC3tSA= dependencies: - global-dirs "^2.0.1" - is-path-inside "^3.0.1" + global-dirs "^3.0.0" + is-path-inside "^3.0.2" is-ip@^2.0.0: version "2.0.0" @@ -7599,10 +7807,10 @@ is-negative-zero@^2.0.1: resolved "https://registry.npm.taobao.org/is-negative-zero/download/is-negative-zero-2.0.1.tgz?cache=0&sync_timestamp=1607123422635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-negative-zero%2Fdownload%2Fis-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" integrity sha1-PedGwY3aIxkkGlNnWQjY92bxHCQ= -is-npm@^4.0.0: - version "4.0.0" - resolved "https://registry.npm.taobao.org/is-npm/download/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d" - integrity sha1-yQ3YOAaW34enptgjwg0LErvjyE0= +is-npm@^5.0.0: + version "5.0.0" + resolved "https://registry.nlark.com/is-npm/download/is-npm-5.0.0.tgz?cache=0&sync_timestamp=1631993007323&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-npm%2Fdownload%2Fis-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" + integrity sha1-Q+jWXMVuG2f41HJiz2ZwmRk/Rag= is-number-object@^1.0.4: version "1.0.4" @@ -7665,7 +7873,7 @@ is-path-inside@^2.1.0: dependencies: path-is-inside "^1.0.2" -is-path-inside@^3.0.1, is-path-inside@^3.0.2: +is-path-inside@^3.0.2: version "3.0.3" resolved "https://registry.npm.taobao.org/is-path-inside/download/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha1-0jE2LlOgf/Kw4Op/7QSRYf/RYoM= @@ -7792,11 +8000,23 @@ isarray@2.0.1: resolved "https://registry.npm.taobao.org/isarray/download/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e" integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= +isbinaryfile@^3.0.2: + version "3.0.3" + resolved "https://registry.nlark.com/isbinaryfile/download/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" + integrity sha1-XW3vPt6/boyoyunDAYOoBLX4voA= + dependencies: + buffer-alloc "^1.2.0" + isbinaryfile@^4.0.6: version "4.0.6" resolved "https://registry.npm.taobao.org/isbinaryfile/download/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b" integrity sha1-7ctisiTitHEIMLZ0mMjk5aTSYQs= +isbinaryfile@^4.0.8: + version "4.0.8" + resolved "https://registry.nlark.com/isbinaryfile/download/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf" + integrity sha1-XTS5SGW9SUZjPsx4oCb8dsWxH88= + isexe@^2.0.0: version "2.0.0" resolved "https://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -7924,7 +8144,7 @@ js-yaml@4.0.0, js-yaml@^4.0.0: dependencies: argparse "^2.0.1" -js-yaml@^3.13.1, js-yaml@^3.14.0: +js-yaml@^3.13.1: version "3.14.1" resolved "https://registry.npm.taobao.org/js-yaml/download/js-yaml-3.14.1.tgz?cache=0&sync_timestamp=1609680068452&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjs-yaml%2Fdownload%2Fjs-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha1-2ugS/bOCX6MGYJqHFzg8UMNqBTc= @@ -7932,6 +8152,13 @@ js-yaml@^3.13.1, js-yaml@^3.14.0: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^4.1.0: + version "4.1.0" + resolved "https://registry.npmmirror.com/js-yaml/download/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.npm.taobao.org/jsbn/download/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -8009,7 +8236,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2: +json5@^2.1.2, json5@^2.2.0: version "2.2.0" resolved "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz?cache=0&sync_timestamp=1612146079519&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson5%2Fdownload%2Fjson5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" integrity sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM= @@ -8224,9 +8451,9 @@ kuler@^2.0.0: resolved "https://registry.npm.taobao.org/kuler/download/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" integrity sha1-4sVwo4ADiPtEQH6FFTHB1nCwYbM= -latest-version@^5.0.0: +latest-version@^5.1.0: version "5.1.0" - resolved "https://registry.npm.taobao.org/latest-version/download/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + resolved "https://registry.nlark.com/latest-version/download/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" integrity sha1-EZ3+kI/jjRXfpD7NE/oS7Igy+s4= dependencies: package-json "^6.3.0" @@ -8241,6 +8468,11 @@ lazy-val@^1.0.4: resolved "https://registry.npm.taobao.org/lazy-val/download/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65" integrity sha1-iCY2pyRcLP5uCk47psXWihN+XGU= +lazy-val@^1.0.5: + version "1.0.5" + resolved "https://registry.nlark.com/lazy-val/download/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" + integrity sha1-bPO59bwxzufuPjacCDK3WD3Nkj0= + lazyrequire@^1.2.1: version "1.3.0" resolved "https://registry.npm.taobao.org/lazyrequire/download/lazyrequire-1.3.0.tgz#ced45dcda9d5d457dd327b2bde13348872dcb05f" @@ -8904,11 +9136,16 @@ mime@1.6.0, mime@^1.4.1: resolved "https://registry.npm.taobao.org/mime/download/mime-1.6.0.tgz?cache=0&sync_timestamp=1613584754851&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmime%2Fdownload%2Fmime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE= -mime@^2.4.4, mime@^2.4.5, mime@^2.4.6: +mime@^2.4.4, mime@^2.4.5: version "2.5.2" resolved "https://registry.npm.taobao.org/mime/download/mime-2.5.2.tgz?cache=0&sync_timestamp=1613584754851&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmime%2Fdownload%2Fmime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" integrity sha1-bj3GzCuVEGQ4MOXxnVy3U9pe6r4= +mime@^2.5.2: + version "2.6.0" + resolved "https://registry.npmmirror.com/mime/download/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" + integrity sha1-oqaCqVzU0MsdYlfij4PafjWAA2c= + mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" @@ -9299,6 +9536,11 @@ no-case@^3.0.4: lower-case "^2.0.2" tslib "^2.0.3" +node-addon-api@^1.6.3: + version "1.7.2" + resolved "https://registry.npmmirror.com/node-addon-api/download/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" + integrity sha1-PfMLlXILU8JOWZSLSVMrZiRE9U0= + node-addon-api@^2.0.0: version "2.0.2" resolved "https://registry.npm.taobao.org/node-addon-api/download/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32" @@ -9395,7 +9637,7 @@ nopt@^5.0.0: dependencies: abbrev "1" -normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0: +normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.npm.taobao.org/normalize-package-data/download/normalize-package-data-2.5.0.tgz?cache=0&sync_timestamp=1615315190379&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnormalize-package-data%2Fdownload%2Fnormalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" integrity sha1-5m2xg4sgDB38IzIl0SyzZSDiNKg= @@ -10090,6 +10332,14 @@ pkg-up@^2.0.0: dependencies: find-up "^2.1.0" +plist@^3.0.1, plist@^3.0.4: + version "3.0.4" + resolved "https://registry.nlark.com/plist/download/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe" + integrity sha1-pi34N+Ou0rs7c1iZ1RDE8YYBnL4= + dependencies: + base64-js "^1.5.1" + xmlbuilder "^9.0.7" + polyfills-db@3: version "3.0.0" resolved "https://registry.npm.taobao.org/polyfills-db/download/polyfills-db-3.0.0.tgz#d0ca988679deea4bf6d03921bd6245062b01afbb" @@ -10333,9 +10583,9 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha1-tYsBCsQMIsVldhbI0sLALHv0eew= -pupa@^2.0.1: +pupa@^2.1.1: version "2.1.1" - resolved "https://registry.npm.taobao.org/pupa/download/pupa-2.1.1.tgz?cache=0&sync_timestamp=1603649494952&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpupa%2Fdownload%2Fpupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" + resolved "https://registry.nlark.com/pupa/download/pupa-2.1.1.tgz?cache=0&sync_timestamp=1631543874044&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpupa%2Fdownload%2Fpupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" integrity sha1-9ej9SvwsXZeCj6pSNUnth0SiDWI= dependencies: escape-goat "^2.0.0" @@ -10457,15 +10707,15 @@ rc@^1.2.1, rc@^1.2.8: minimist "^1.2.0" strip-json-comments "~2.0.1" -read-config-file@6.0.0: - version "6.0.0" - resolved "https://registry.npm.taobao.org/read-config-file/download/read-config-file-6.0.0.tgz#224b5dca6a5bdc1fb19e63f89f342680efdb9299" - integrity sha1-Iktdympb3B+xnmP4nzQmgO/bkpk= +read-config-file@6.2.0: + version "6.2.0" + resolved "https://registry.nlark.com/read-config-file/download/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" + integrity sha1-cVNgcjMLzWK6gU+RRYsSrdn8et4= dependencies: - dotenv "^8.2.0" + dotenv "^9.0.2" dotenv-expand "^5.1.0" - js-yaml "^3.13.1" - json5 "^2.1.2" + js-yaml "^4.1.0" + json5 "^2.2.0" lazy-val "^1.0.4" read-pkg-up@^1.0.1: @@ -11152,6 +11402,13 @@ semver@^7.2.1, semver@^7.3.2, semver@^7.3.4: dependencies: lru-cache "^6.0.0" +semver@^7.3.5: + version "7.3.5" + resolved "https://registry.nlark.com/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1624607961409&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha1-C2Ich5NI2JmOSw5L6Us/EuYBjvc= + dependencies: + lru-cache "^6.0.0" + send@0.17.1: version "0.17.1" resolved "https://registry.npm.taobao.org/send/download/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -11421,6 +11678,15 @@ slave@^1.2.2: is-generator "1" native-or-bluebird "1" +slice-ansi@^3.0.0: + version "3.0.0" + resolved "https://registry.nlark.com/slice-ansi/download/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" + integrity sha1-Md3BCTCht+C2ewjJbC9Jt3p4l4c= + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + slice-ansi@^4.0.0: version "4.0.0" resolved "https://registry.npm.taobao.org/slice-ansi/download/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" @@ -11430,6 +11696,11 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" +smart-buffer@^4.0.2: + version "4.2.0" + resolved "https://registry.nlark.com/smart-buffer/download/smart-buffer-4.2.0.tgz?cache=0&sync_timestamp=1628317494807&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsmart-buffer%2Fdownload%2Fsmart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha1-bh1x+k8YwF99D/IW3RakgdDo2a4= + snake-case@^1.1.0: version "1.1.2" resolved "https://registry.npm.taobao.org/snake-case/download/snake-case-1.1.2.tgz#0c2f25e305158d9a18d3d977066187fef8a5a66a" @@ -11839,6 +12110,15 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.npmmirror.com/string-width/download/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha1-JpxxF9J7Ba0uU2gwqOyJXvnG0BA= + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string.prototype.trimend@^1.0.4: version "1.0.4" resolved "https://registry.npm.taobao.org/string.prototype.trimend/download/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" @@ -11902,6 +12182,13 @@ strip-ansi@^6.0.0: dependencies: ansi-regex "^5.0.0" +strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha1-nibGPTD1NEPpSJSVshBdN7Z6hdk= + dependencies: + ansi-regex "^5.0.1" + strip-bom@^2.0.0: version "2.0.0" resolved "https://registry.npm.taobao.org/strip-bom/download/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" @@ -12105,24 +12392,19 @@ tar@^6.0.2: mkdirp "^1.0.3" yallist "^4.0.0" -temp-file@^3.3.7: - version "3.3.7" - resolved "https://registry.npm.taobao.org/temp-file/download/temp-file-3.3.7.tgz#686885d635f872748e384e871855958470aeb18a" - integrity sha1-aGiF1jX4cnSOOE6HGFWVhHCusYo= +temp-file@^3.4.0: + version "3.4.0" + resolved "https://registry.nlark.com/temp-file/download/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" + integrity sha1-dm6iiRHGg5lsJI7xog7qBNUWUsc= dependencies: async-exit-hook "^2.0.1" - fs-extra "^8.1.0" + fs-extra "^10.0.0" temp-path@^1.0.0: version "1.0.0" resolved "https://registry.npm.taobao.org/temp-path/download/temp-path-1.0.0.tgz#24b1543973ab442896d9ad367dd9cbdbfafe918b" integrity sha1-JLFUOXOrRCiW2a02fdnL2/r+kYs= -term-size@^2.1.0: - version "2.2.1" - resolved "https://registry.npm.taobao.org/term-size/download/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54" - integrity sha1-KmpUhAQywvtjIP6g9BVTHpAYn1Q= - terser-webpack-plugin@^5.1.1: version "5.1.1" resolved "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-5.1.1.tgz?cache=0&sync_timestamp=1610194172880&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-5.1.1.tgz#7effadee06f7ecfa093dbbd3e9ab23f5f3ed8673" @@ -12235,6 +12517,13 @@ title-case@^2.1.0: no-case "^2.2.0" upper-case "^1.0.3" +tmp-promise@^3.0.2: + version "3.0.3" + resolved "https://registry.npmmirror.com/tmp-promise/download/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" + integrity sha1-YKGhzJjJiGdPy/0jtuM2e96sTOc= + dependencies: + tmp "^0.2.0" + tmp@0.0.x: version "0.0.33" resolved "https://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -12242,9 +12531,9 @@ tmp@0.0.x: dependencies: os-tmpdir "~1.0.2" -tmp@0.2.1: +tmp@0.2.1, tmp@^0.2.0: version "0.2.1" - resolved "https://registry.npm.taobao.org/tmp/download/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + resolved "https://registry.nlark.com/tmp/download/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" integrity sha1-hFf8MDfc9HGcJRNnoa9lAO4czxQ= dependencies: rimraf "^3.0.0" @@ -12368,6 +12657,11 @@ tslib@^2.0.3: resolved "https://registry.npm.taobao.org/tslib/download/tslib-2.1.0.tgz?cache=0&sync_timestamp=1609887438976&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" integrity sha1-2mCGDxwuyqVwOrfTm8Bba/mIuXo= +tslib@^2.1.0: + version "2.3.1" + resolved "https://registry.npmmirror.com/tslib/download/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== + tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.npm.taobao.org/tunnel-agent/download/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" @@ -12602,22 +12896,23 @@ upath@^1.1.1: resolved "https://registry.npm.taobao.org/upath/download/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" integrity sha1-j2bbzVWog6za5ECK+LA1pQRMGJQ= -update-notifier@^4.1.1: - version "4.1.3" - resolved "https://registry.npm.taobao.org/update-notifier/download/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3" - integrity sha1-vobuE+jOSPtQBD/3IFe1vVmOHqM= +update-notifier@^5.1.0: + version "5.1.0" + resolved "https://registry.nlark.com/update-notifier/download/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" + integrity sha1-SrDXx/NqIx3XMWz3cpMT8CFNmtk= dependencies: - boxen "^4.2.0" - chalk "^3.0.0" + boxen "^5.0.0" + chalk "^4.1.0" configstore "^5.0.1" has-yarn "^2.1.0" import-lazy "^2.1.0" is-ci "^2.0.0" - is-installed-globally "^0.3.1" - is-npm "^4.0.0" + is-installed-globally "^0.4.0" + is-npm "^5.0.0" is-yarn-global "^0.3.0" - latest-version "^5.0.0" - pupa "^2.0.1" + latest-version "^5.1.0" + pupa "^2.1.1" + semver "^7.3.4" semver-diff "^3.1.1" xdg-basedir "^4.0.0" @@ -12798,6 +13093,15 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" +verror@^1.10.0: + version "1.10.1" + resolved "https://registry.npmmirror.com/verror/download/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb" + integrity sha1-S/Ce7M9FY7EJ7Us9RYOAyXKwzes= + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + void-elements@^2.0.0: version "2.0.1" resolved "https://registry.npm.taobao.org/void-elements/download/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" @@ -13604,6 +13908,16 @@ xml-char-classes@^1.0.0: resolved "https://registry.npm.taobao.org/xml-char-classes/download/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d" integrity sha1-ZGV4SKIP/F31g6Qq2KJ3tFErvE0= +xmlbuilder@>=11.0.1: + version "15.1.1" + resolved "https://registry.nlark.com/xmlbuilder/download/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" + integrity sha1-nc3OSe6mbY0QtCyulKecPI0MLsU= + +xmlbuilder@^9.0.7: + version "9.0.7" + resolved "https://registry.nlark.com/xmlbuilder/download/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= + xmlhttprequest-ssl@~1.5.4: version "1.5.5" resolved "https://registry.npm.taobao.org/xmlhttprequest-ssl/download/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e" @@ -13681,6 +13995,11 @@ yargs-parser@^20.2.2: resolved "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-20.2.6.tgz#69f920addf61aafc0b8b89002f5d66e28f2d8b20" integrity sha1-afkgrd9hqvwLi4kAL11m4o8tiyA= +yargs-parser@^21.0.0: + version "21.0.0" + resolved "https://registry.npmmirror.com/yargs-parser/download/yargs-parser-21.0.0.tgz?cache=0&sync_timestamp=1637031074828&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fyargs-parser%2Fdownload%2Fyargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55" + integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA== + yargs-unparser@2.0.0: version "2.0.0" resolved "https://registry.npm.taobao.org/yargs-unparser/download/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" @@ -13691,7 +14010,7 @@ yargs-unparser@2.0.0: flat "^5.0.2" is-plain-obj "^2.1.0" -yargs@16.2.0, yargs@^16.0.3, yargs@^16.1.1, yargs@^16.2.0: +yargs@16.2.0, yargs@^16.1.1, yargs@^16.2.0: version "16.2.0" resolved "https://registry.npm.taobao.org/yargs/download/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha1-HIK/D2tqZur85+8w43b0mhJHf2Y= @@ -13720,6 +14039,19 @@ yargs@^13.3.2: y18n "^4.0.0" yargs-parser "^13.1.2" +yargs@^17.0.1: + version "17.3.1" + resolved "https://registry.npmmirror.com/yargs/download/yargs-17.3.1.tgz#da56b28f32e2fd45aefb402ed9c26f42be4c07b9" + integrity sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.0.0" + yargs@~3.10.0: version "3.10.0" resolved "https://registry.npm.taobao.org/yargs/download/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" From 54f9008204bb2ff86bef2ba7d6ebb95274ce4e5f Mon Sep 17 00:00:00 2001 From: wofwq Date: Wed, 6 Apr 2022 19:10:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=B8=AA?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=8D=E5=90=8C=E8=AE=BE=E5=A4=87=E7=9A=84?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=A0=81=E6=96=87=E4=BB=B6=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E6=A3=80=E6=9F=A5=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E7=BB=91=E5=AE=9A=E4=B9=8B=E5=90=8E=EF=BC=8C=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E6=A3=80=E6=9F=A5=E7=9B=B8=E5=BA=94=E7=9A=84=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E7=A0=81=E6=96=87=E4=BB=B6=E6=98=AF=E5=90=A6=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=B8=8D=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=94=A8=E6=88=B7=E8=BE=93=E5=85=A5=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/devicemanagerapi.js | 23 +++++++++++++++++++++++ src/renderer/views/connectDevice.vue | 14 +++++++++++--- src/worker/worker.js | 4 ++++ 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/src/api/devicemanagerapi.js b/src/api/devicemanagerapi.js index a3f47f0..2008169 100644 --- a/src/api/devicemanagerapi.js +++ b/src/api/devicemanagerapi.js @@ -442,6 +442,29 @@ export function exportBindCode() { } } + +export function isExistBindCodeFile() { + const response = getUserPath(); + if (response.isSuccess) { + //存储路径 + const bindCodePath = response.result +getSeid().result+ "bindCode.json" + try { + return { + isSuccess: true, + //返回是否存在当前设备的绑定码文件 + result: fs.existsSync(bindCodePath) + } + } catch (error) { + console.log(error) + return { + isSuccess: false, + result: error + } + } + } + +} + // module.exports = { // connect, // getSeid, diff --git a/src/renderer/views/connectDevice.vue b/src/renderer/views/connectDevice.vue index 3491d15..4d5c635 100644 --- a/src/renderer/views/connectDevice.vue +++ b/src/renderer/views/connectDevice.vue @@ -377,9 +377,17 @@ export default { // 跳转到绑定界面 this.$router.push('imKeySetting') } else if (response === constants.BIND_STATUS_STRING_BOUND_THIS) { - // 成功绑定 继续 - this.checkDeviceBindingCode = 3 - this.checkIsCreateWallet() + this.$ipcRenderer.send('isExistBindCodeFile') + this.$ipcRenderer.on('isExistBindCodeFile', (isExistBindCodeFileResult) => { + if (isExistBindCodeFileResult.result) { + // 成功绑定 继续 + this.checkDeviceBindingCode = 3 + this.checkIsCreateWallet() + } else { + // 弹出绑定码输入框，输入绑定码，输入完成后，检查是否创建钱包,重新保存绑定码 + this.changeState(7) + } + }) } else { this.errorInfo = response this.changeState(4) diff --git a/src/worker/worker.js b/src/worker/worker.js index 4f1c7b9..d1462eb 100644 --- a/src/worker/worker.js +++ b/src/worker/worker.js @@ -189,6 +189,10 @@ ipcRenderer.on('message-from-main', (event, arg) => { response = deviceManger.exportBindCode() handleType = 'exportBindCode' } + if (arg.type === 'isExistBindCodeFile') { + response = deviceManger.isExistBindCodeFile() + handleType = 'isExistBindCodeFile' + } if (arg.type === 'genWalletAddress') { const coinAddressArray = [] try {