From 96cba224931fbdae6f2fffd878e002a9201a809a Mon Sep 17 00:00:00 2001 From: toyobayashi Date: Tue, 24 Jul 2018 23:08:48 +0800 Subject: [PATCH] [renderer] get card from game server --- app/.npmrc | 2 +- app/package-lock.json | 1926 ++++++++++++------------- app/package.json | 31 +- app/script/packager.config.ts | 5 +- app/script/packager.ts | 25 +- app/script/webpack.config.ts | 135 +- app/script/webpack.ts | 58 +- app/src/ts/@types/vue.d.ts | 2 +- app/src/ts/main.ts | 6 +- app/src/ts/main/ipc.ts | 7 +- app/src/ts/main/on-manifest-search.ts | 10 + app/src/ts/main/on-master-read.ts | 8 +- app/src/ts/renderer/mishiro-idol.ts | 70 +- app/src/ts/renderer/mishiro-update.ts | 44 +- app/src/ts/renderer/vue-global.ts | 4 +- app/src/ts/renderer/win.ts | 30 + dist/mishiro-x64.nsi | 2 +- dist/mishiro.nsi | 2 +- 18 files changed, 1242 insertions(+), 1125 deletions(-) create mode 100644 app/src/ts/main/on-manifest-search.ts create mode 100644 app/src/ts/renderer/win.ts diff --git a/app/.npmrc b/app/.npmrc index ea18b70..efa7f05 100644 --- a/app/.npmrc +++ b/app/.npmrc @@ -1,4 +1,4 @@ build_from_source = true runtime = "electron" -target = "2.0.2" +target = "2.0.5" dist_url = "https://atom.io/download/electron" diff --git a/app/package-lock.json b/app/package-lock.json index fed57ab..ee640ff 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "mishiro", - "version": "1.3.5", + "version": "1.3.6-pre", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -120,6 +120,15 @@ } } }, + "@types/webpack-node-externals": { + "version": "1.6.3", + "resolved": "http://registry.npm.taobao.org/@types/webpack-node-externals/download/@types/webpack-node-externals-1.6.3.tgz", + "integrity": "sha1-pw7Ks4M5qyGdAJBoDJjElzqQrwE=", + "dev": true, + "requires": { + "@types/webpack": "4.4.3" + } + }, "@vue/component-compiler-utils": { "version": "1.2.1", "resolved": "http://registry.npm.taobao.org/@vue/component-compiler-utils/download/@vue/component-compiler-utils-1.2.1.tgz", @@ -221,14 +230,14 @@ } }, "@webassemblyjs/ast": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/ast/download/@webassemblyjs/ast-1.5.12.tgz", - "integrity": "sha1-qay8s/JTM8Tt+h/fMYaxzPZOZmQ=", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/ast/download/@webassemblyjs/ast-1.5.13.tgz", + "integrity": "sha1-gRVaVwvVgDow7DFDa8LJwO3jjyU=", "dev": true, "requires": { - "@webassemblyjs/helper-module-context": "1.5.12", - "@webassemblyjs/helper-wasm-bytecode": "1.5.12", - "@webassemblyjs/wast-parser": "1.5.12", + "@webassemblyjs/helper-module-context": "1.5.13", + "@webassemblyjs/helper-wasm-bytecode": "1.5.13", + "@webassemblyjs/wast-parser": "1.5.13", "debug": "3.1.0", "mamacro": "0.0.3" }, @@ -245,21 +254,21 @@ } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.5.12.tgz", - "integrity": "sha1-DzYET/6WUkaM565aCHFqTu/5zZw=", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.5.13.tgz", + "integrity": "sha1-Kc4LqpdBH3DozOaM6cD52Bmk4pg=", "dev": true }, "@webassemblyjs/helper-api-error": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.5.12.tgz", - "integrity": "sha1-BUZoM/8vnYlToaMndG4dES6mKq8=", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.5.13.tgz", + "integrity": "sha1-5JsFHWfuGaVuKbmqi9lJtbREKlk=", "dev": true }, "@webassemblyjs/helper-buffer": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.5.12.tgz", - "integrity": "sha1-Hw3lqqvv74muwxT3+XAAnNFZxz0=", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.5.13.tgz", + "integrity": "sha1-hzuwobRkSSMRN8EmLd/QVpUZWh4=", "dev": true, "requires": { "debug": "3.1.0" @@ -277,24 +286,24 @@ } }, "@webassemblyjs/helper-code-frame": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-code-frame/download/@webassemblyjs/helper-code-frame-1.5.12.tgz", - "integrity": "sha1-PNwZUwk3YNHA8Mr3RczWK9tmJ8c=", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-code-frame/download/@webassemblyjs/helper-code-frame-1.5.13.tgz", + "integrity": "sha1-G9IYG2oL4U4ATw/p9aZg0mU2K1g=", "dev": true, "requires": { - "@webassemblyjs/wast-printer": "1.5.12" + "@webassemblyjs/wast-printer": "1.5.13" } }, "@webassemblyjs/helper-fsm": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-fsm/download/@webassemblyjs/helper-fsm-1.5.12.tgz", - "integrity": "sha1-a8FEKwN/jjDy5XuYfO5cgG3RUCc=", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-fsm/download/@webassemblyjs/helper-fsm-1.5.13.tgz", + "integrity": "sha1-zfPZ0zAF1UOlxeWtqr9nn/qNuSQ=", "dev": true }, "@webassemblyjs/helper-module-context": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-module-context/download/@webassemblyjs/helper-module-context-1.5.12.tgz", - "integrity": "sha1-tViMp4szuKDadfmrjHaaNwe6qGE=", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-module-context/download/@webassemblyjs/helper-module-context-1.5.13.tgz", + "integrity": "sha1-3Cnd+1HtZXZVKG+UpdctikiRR8U=", "dev": true, "requires": { "debug": "3.1.0", @@ -313,21 +322,21 @@ } }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.5.12.tgz", - "integrity": "sha1-0So4WduIKkSIkahmoF0L5jeFthY=", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.5.13.tgz", + "integrity": "sha1-AyRYF/CnYjguYXMxRvV3Pe8Vp0c=", "dev": true }, "@webassemblyjs/helper-wasm-section": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-wasm-section/download/@webassemblyjs/helper-wasm-section-1.5.12.tgz", - "integrity": "sha1-/5/hUH02itQ355adJejBaT2sGIQ=", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/helper-wasm-section/download/@webassemblyjs/helper-wasm-section-1.5.13.tgz", + "integrity": "sha1-78dvRKENMHO1hLQ8OKF53xc9XH0=", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.12", - "@webassemblyjs/helper-buffer": "1.5.12", - "@webassemblyjs/helper-wasm-bytecode": "1.5.12", - "@webassemblyjs/wasm-gen": "1.5.12", + "@webassemblyjs/ast": "1.5.13", + "@webassemblyjs/helper-buffer": "1.5.13", + "@webassemblyjs/helper-wasm-bytecode": "1.5.13", + "@webassemblyjs/wasm-gen": "1.5.13", "debug": "3.1.0" }, "dependencies": { @@ -343,43 +352,51 @@ } }, "@webassemblyjs/ieee754": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/ieee754/download/@webassemblyjs/ieee754-1.5.12.tgz", - "integrity": "sha1-7pV0vFWIiPEwl84+eQDf8jTqGaQ=", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/ieee754/download/@webassemblyjs/ieee754-1.5.13.tgz", + "integrity": "sha1-Vz6XyMEuTuuzFspf3gID3dkLA2Q=", "dev": true, "requires": { "ieee754": "1.1.12" } }, "@webassemblyjs/leb128": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/leb128/download/@webassemblyjs/leb128-1.5.12.tgz", - "integrity": "sha1-AwjuxlJ2XuVn2KX6EItPCyW0WOE=", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/leb128/download/@webassemblyjs/leb128-1.5.13.tgz", + "integrity": "sha1-q1Lrq5zsKDwcGJesHagzoEo/TO4=", "dev": true, "requires": { - "leb": "0.3.0" + "long": "4.0.0" + }, + "dependencies": { + "long": { + "version": "4.0.0", + "resolved": "http://registry.npm.taobao.org/long/download/long-4.0.0.tgz", + "integrity": "sha1-mntxz7fTYaGU6lVSQckvdGjVvyg=", + "dev": true + } } }, "@webassemblyjs/utf8": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.5.12.tgz", - "integrity": "sha1-1ZFiIu8xS/YNaAbtWsBFmJv9ks4=", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.5.13.tgz", + "integrity": "sha1-a1PSzYYc+U+pnB8Sd53eaS+8JGk=", "dev": true }, "@webassemblyjs/wasm-edit": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.5.12.tgz", - "integrity": "sha1-ghyTWOZEoWbyyRDlrxtGznlaF6o=", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.5.12", - "@webassemblyjs/helper-buffer": "1.5.12", - "@webassemblyjs/helper-wasm-bytecode": "1.5.12", - "@webassemblyjs/helper-wasm-section": "1.5.12", - "@webassemblyjs/wasm-gen": "1.5.12", - "@webassemblyjs/wasm-opt": "1.5.12", - "@webassemblyjs/wasm-parser": "1.5.12", - "@webassemblyjs/wast-printer": "1.5.12", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.5.13.tgz", + "integrity": "sha1-yc71ZkwkXPEbOzpzEQyRVYMXJKg=", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.5.13", + "@webassemblyjs/helper-buffer": "1.5.13", + "@webassemblyjs/helper-wasm-bytecode": "1.5.13", + "@webassemblyjs/helper-wasm-section": "1.5.13", + "@webassemblyjs/wasm-gen": "1.5.13", + "@webassemblyjs/wasm-opt": "1.5.13", + "@webassemblyjs/wasm-parser": "1.5.13", + "@webassemblyjs/wast-printer": "1.5.13", "debug": "3.1.0" }, "dependencies": { @@ -395,28 +412,28 @@ } }, "@webassemblyjs/wasm-gen": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-gen/download/@webassemblyjs/wasm-gen-1.5.12.tgz", - "integrity": "sha1-C3zP25PauQLMAlEBTi4YuuMTm8s=", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-gen/download/@webassemblyjs/wasm-gen-1.5.13.tgz", + "integrity": "sha1-jm6hE8S0MvpmVAGJ55sW16FAcA4=", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.12", - "@webassemblyjs/helper-wasm-bytecode": "1.5.12", - "@webassemblyjs/ieee754": "1.5.12", - "@webassemblyjs/leb128": "1.5.12", - "@webassemblyjs/utf8": "1.5.12" + "@webassemblyjs/ast": "1.5.13", + "@webassemblyjs/helper-wasm-bytecode": "1.5.13", + "@webassemblyjs/ieee754": "1.5.13", + "@webassemblyjs/leb128": "1.5.13", + "@webassemblyjs/utf8": "1.5.13" } }, "@webassemblyjs/wasm-opt": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-opt/download/@webassemblyjs/wasm-opt-1.5.12.tgz", - "integrity": "sha1-vXWKi8Zw9YX/GuhfhAlangIpy8k=", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-opt/download/@webassemblyjs/wasm-opt-1.5.13.tgz", + "integrity": "sha1-FHqtdxen7kIRw2shpfTDDd3zMTg=", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.12", - "@webassemblyjs/helper-buffer": "1.5.12", - "@webassemblyjs/wasm-gen": "1.5.12", - "@webassemblyjs/wasm-parser": "1.5.12", + "@webassemblyjs/ast": "1.5.13", + "@webassemblyjs/helper-buffer": "1.5.13", + "@webassemblyjs/wasm-gen": "1.5.13", + "@webassemblyjs/wasm-parser": "1.5.13", "debug": "3.1.0" }, "dependencies": { @@ -432,56 +449,54 @@ } }, "@webassemblyjs/wasm-parser": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-parser/download/@webassemblyjs/wasm-parser-1.5.12.tgz", - "integrity": "sha1-exC0OI7PmL16IucCqmLsL0bQx14=", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wasm-parser/download/@webassemblyjs/wasm-parser-1.5.13.tgz", + "integrity": "sha1-b0ZRbFuyOQT731gAkjPC3YpUxy8=", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.12", - "@webassemblyjs/helper-api-error": "1.5.12", - "@webassemblyjs/helper-wasm-bytecode": "1.5.12", - "@webassemblyjs/ieee754": "1.5.12", - "@webassemblyjs/leb128": "1.5.12", - "@webassemblyjs/utf8": "1.5.12" + "@webassemblyjs/ast": "1.5.13", + "@webassemblyjs/helper-api-error": "1.5.13", + "@webassemblyjs/helper-wasm-bytecode": "1.5.13", + "@webassemblyjs/ieee754": "1.5.13", + "@webassemblyjs/leb128": "1.5.13", + "@webassemblyjs/utf8": "1.5.13" } }, "@webassemblyjs/wast-parser": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wast-parser/download/@webassemblyjs/wast-parser-1.5.12.tgz", - "integrity": "sha1-nPWuYA7K4GQEN7XU3l3WtgiNDYs=", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wast-parser/download/@webassemblyjs/wast-parser-1.5.13.tgz", + "integrity": "sha1-VyenBdOXrmo66Z1/VGCs8uxkbuo=", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.12", - "@webassemblyjs/floating-point-hex-parser": "1.5.12", - "@webassemblyjs/helper-api-error": "1.5.12", - "@webassemblyjs/helper-code-frame": "1.5.12", - "@webassemblyjs/helper-fsm": "1.5.12", + "@webassemblyjs/ast": "1.5.13", + "@webassemblyjs/floating-point-hex-parser": "1.5.13", + "@webassemblyjs/helper-api-error": "1.5.13", + "@webassemblyjs/helper-code-frame": "1.5.13", + "@webassemblyjs/helper-fsm": "1.5.13", "long": "3.2.0", "mamacro": "0.0.3" } }, "@webassemblyjs/wast-printer": { - "version": "1.5.12", - "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wast-printer/download/@webassemblyjs/wast-printer-1.5.12.tgz", - "integrity": "sha1-Vjyk0Bsi0hZAskY9xePX99naxSA=", + "version": "1.5.13", + "resolved": "http://registry.npm.taobao.org/@webassemblyjs/wast-printer/download/@webassemblyjs/wast-printer-1.5.13.tgz", + "integrity": "sha1-uzTVKMFLT1eefsEeeT7FCtfNfJU=", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.12", - "@webassemblyjs/wast-parser": "1.5.12", + "@webassemblyjs/ast": "1.5.13", + "@webassemblyjs/wast-parser": "1.5.13", "long": "3.2.0" } }, "abbrev": { "version": "1.1.1", "resolved": "http://registry.npm.taobao.org/abbrev/download/abbrev-1.1.1.tgz", - "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=", - "dev": true + "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=" }, "acb": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/acb/-/acb-1.2.1.tgz", - "integrity": "sha512-qq4dcb+TuQoQH7xrUclbphk3OwKSP2KBrflY5P1c+v0i5FC3fANxh+OYjsg5XSdMLBLYLZ8rxCnuw5UsgX8jow==", - "dev": true, + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/acb/-/acb-1.2.2.tgz", + "integrity": "sha512-Ghkjjzu7e7AUNfOKR2LikOofYoXRT55OuiPqX+B/aQH9T915UyifK04vPAJWrEsE/6snkbowUslP6q+rImh3cQ==", "requires": { "columnify": "1.5.4", "commander": "2.16.0", @@ -491,8 +506,25 @@ "commander": { "version": "2.16.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz", - "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==", - "dev": true + "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==" + }, + "fs-extra": { + "version": "6.0.1", + "resolved": "http://registry.npm.taobao.org/fs-extra/download/fs-extra-6.0.1.tgz", + "integrity": "sha1-irwSj3lG4xATXdyTuYvdtBDno0s=", + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "http://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "requires": { + "graceful-fs": "4.1.11" + } } } }, @@ -515,7 +547,6 @@ "version": "5.5.2", "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "dev": true, "requires": { "co": "4.6.0", "fast-deep-equal": "1.0.0", @@ -538,8 +569,7 @@ "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "ansi-styles": { "version": "2.2.1", @@ -560,8 +590,50 @@ "aproba": { "version": "1.2.0", "resolved": "http://registry.npm.taobao.org/aproba/download/aproba-1.2.0.tgz", - "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo=", - "dev": true + "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo=" + }, + "are-we-there-yet": { + "version": "1.1.5", + "resolved": "http://registry.npm.taobao.org/are-we-there-yet/download/are-we-there-yet-1.1.5.tgz", + "integrity": "sha1-SzXClE8GKov82mZBB2A1D+nd/CE=", + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.3.6" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "process-nextick-args": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.0.tgz", + "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=" + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "http://registry.npm.taobao.org/readable-stream/download/readable-stream-2.3.6.tgz", + "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.1", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "http://registry.npm.taobao.org/string_decoder/download/string_decoder-1.1.1.tgz", + "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=", + "requires": { + "safe-buffer": "5.1.1" + } + } + } }, "argparse": { "version": "1.0.9", @@ -651,8 +723,7 @@ "asn1": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=", - "dev": true + "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" }, "asn1.js": { "version": "4.10.1", @@ -667,7 +738,7 @@ }, "assert": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", + "resolved": "http://registry.npm.taobao.org/assert/download/assert-1.4.1.tgz", "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=", "dev": true, "requires": { @@ -694,8 +765,7 @@ "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" }, "assign-symbols": { "version": "1.0.0", @@ -705,15 +775,14 @@ }, "async-each": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/async-each/download/async-each-1.0.1.tgz", "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", "dev": true }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "atob": { "version": "2.1.0", @@ -744,14 +813,12 @@ "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, "aws4": { "version": "1.7.0", "resolved": "http://registry.npm.taobao.org/aws4/download/aws4-1.7.0.tgz", - "integrity": "sha1-1NDpudv8p3vwjusKikcVUP454ok=", - "dev": true + "integrity": "sha1-1NDpudv8p3vwjusKikcVUP454ok=" }, "babel-code-frame": { "version": "6.26.0", @@ -841,7 +908,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", - "dev": true, "optional": true, "requires": { "tweetnacl": "0.14.5" @@ -853,6 +919,11 @@ "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", "dev": true }, + "bignumber.js": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.4.0.tgz", + "integrity": "sha1-g4qZLan51zfg9LLbC+YrsJ3Qxeg=" + }, "binary": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz", @@ -865,15 +936,14 @@ }, "binary-extensions": { "version": "1.11.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", + "resolved": "http://registry.npm.taobao.org/binary-extensions/download/binary-extensions-1.11.0.tgz", "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", "dev": true }, "bindings": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz", - "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==", - "dev": true + "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==" }, "bluebird": { "version": "3.5.1", @@ -881,6 +951,11 @@ "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", "dev": true }, + "bmp-js": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/bmp-js/-/bmp-js-0.0.3.tgz", + "integrity": "sha1-ZBE+nHzxICs3btYHvzBibr5XsYo=" + }, "bn.js": { "version": "4.11.8", "resolved": "http://registry.npm.taobao.org/bn.js/download/bn.js-4.11.8.tgz", @@ -891,7 +966,6 @@ "version": "1.1.8", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "dev": true, "requires": { "balanced-match": "1.0.0", "concat-map": "0.0.1" @@ -900,8 +974,7 @@ "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" } } }, @@ -936,7 +1009,7 @@ }, "brorand": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/brorand/download/brorand-1.1.0.tgz", "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", "dev": true }, @@ -961,24 +1034,33 @@ "dev": true, "requires": { "browserify-aes": "1.2.0", - "browserify-des": "1.0.1", + "browserify-des": "1.0.2", "evp_bytestokey": "1.0.3" } }, "browserify-des": { - "version": "1.0.1", - "resolved": "http://registry.npm.taobao.org/browserify-des/download/browserify-des-1.0.1.tgz", - "integrity": "sha1-M0MSTbbXrVPiaogmMYcSvchFD5w=", + "version": "1.0.2", + "resolved": "http://registry.npm.taobao.org/browserify-des/download/browserify-des-1.0.2.tgz", + "integrity": "sha1-OvTx9Zg5QDVy8cZiBDdfen9wPpw=", "dev": true, "requires": { "cipher-base": "1.0.4", "des.js": "1.0.0", - "inherits": "2.0.3" + "inherits": "2.0.3", + "safe-buffer": "5.1.2" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "http://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz", + "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=", + "dev": true + } } }, "browserify-rsa": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/browserify-rsa/download/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { @@ -988,7 +1070,7 @@ }, "browserify-sign": { "version": "4.0.4", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", + "resolved": "http://registry.npm.taobao.org/browserify-sign/download/browserify-sign-4.0.4.tgz", "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", "dev": true, "requires": { @@ -1022,7 +1104,7 @@ }, "buffer": { "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "resolved": "http://registry.npm.taobao.org/buffer/download/buffer-4.9.1.tgz", "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "dev": true, "requires": { @@ -1033,7 +1115,7 @@ "dependencies": { "isarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true } @@ -1043,7 +1125,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", - "dev": true, "requires": { "buffer-alloc-unsafe": "1.1.0", "buffer-fill": "1.0.0" @@ -1052,8 +1133,7 @@ "buffer-alloc-unsafe": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", - "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", - "dev": true + "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==" }, "buffer-crc32": { "version": "0.2.13", @@ -1061,21 +1141,24 @@ "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", "dev": true }, + "buffer-equal": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz", + "integrity": "sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=" + }, "buffer-fill": { "version": "1.0.0", "resolved": "http://registry.npm.taobao.org/buffer-fill/download/buffer-fill-1.0.0.tgz", - "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", - "dev": true + "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=" }, "buffer-from": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz", - "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==", - "dev": true + "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==" }, "buffer-xor": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", + "resolved": "http://registry.npm.taobao.org/buffer-xor/download/buffer-xor-1.0.3.tgz", "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", "dev": true }, @@ -1093,7 +1176,7 @@ }, "builtin-status-codes": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/builtin-status-codes/download/builtin-status-codes-3.0.0.tgz", "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", "dev": true }, @@ -1180,8 +1263,7 @@ "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "chainsaw": { "version": "0.1.0", @@ -1229,8 +1311,7 @@ "chownr": { "version": "1.0.1", "resolved": "http://registry.npm.taobao.org/chownr/download/chownr-1.0.1.tgz", - "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", - "dev": true + "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=" }, "chrome-trace-event": { "version": "1.0.0", @@ -1292,14 +1373,12 @@ "clone": { "version": "1.0.3", "resolved": "http://registry.npm.taobao.org/clone/download/clone-1.0.3.tgz", - "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", - "dev": true + "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=" }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", - "dev": true + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" }, "coa": { "version": "1.0.4", @@ -1313,8 +1392,7 @@ "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "collection-visit": { "version": "1.0.0", @@ -1382,7 +1460,6 @@ "version": "1.5.4", "resolved": "http://registry.npm.taobao.org/columnify/download/columnify-1.5.4.tgz", "integrity": "sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs=", - "dev": true, "requires": { "strip-ansi": "3.0.1", "wcwidth": "1.0.1" @@ -1392,7 +1469,6 @@ "version": "1.0.6", "resolved": "http://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.6.tgz", "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", - "dev": true, "requires": { "delayed-stream": "1.0.0" } @@ -1424,8 +1500,7 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "concat-stream": { "version": "1.6.0", @@ -1472,13 +1547,18 @@ }, "console-browserify": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/console-browserify/download/console-browserify-1.1.0.tgz", "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", "dev": true, "requires": { "date-now": "0.1.4" } }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + }, "consolidate": { "version": "0.15.1", "resolved": "http://registry.npm.taobao.org/consolidate/download/consolidate-0.15.1.tgz", @@ -1490,7 +1570,7 @@ }, "constants-browserify": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/constants-browserify/download/constants-browserify-1.0.0.tgz", "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", "dev": true }, @@ -1517,8 +1597,7 @@ "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "create-ecdh": { "version": "4.0.3", @@ -1717,14 +1796,13 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, "requires": { "assert-plus": "1.0.0" } }, "date-now": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", + "resolved": "http://registry.npm.taobao.org/date-now/download/date-now-0.1.4.tgz", "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", "dev": true }, @@ -1738,7 +1816,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "requires": { "ms": "2.0.0" } @@ -1774,7 +1851,6 @@ "version": "1.0.3", "resolved": "http://registry.npm.taobao.org/defaults/download/defaults-1.0.3.tgz", "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "dev": true, "requires": { "clone": "1.0.3" } @@ -1835,12 +1911,16 @@ "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, "des.js": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/des.js/download/des.js-1.0.0.tgz", "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", "dev": true, "requires": { @@ -1848,6 +1928,11 @@ "minimalistic-assert": "1.0.1" } }, + "detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" + }, "diff": { "version": "3.5.0", "resolved": "http://registry.npm.taobao.org/diff/download/diff-3.5.0.tgz", @@ -1865,6 +1950,11 @@ "randombytes": "2.0.6" } }, + "dom-walk": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz", + "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=" + }, "domain-browser": { "version": "1.2.0", "resolved": "http://registry.npm.taobao.org/domain-browser/download/domain-browser-1.2.0.tgz", @@ -1928,27 +2018,26 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", - "dev": true, "optional": true, "requires": { "jsbn": "0.1.1" } }, "electron": { - "version": "2.0.2", - "resolved": "http://registry.npm.taobao.org/electron/download/electron-2.0.2.tgz", - "integrity": "sha1-t34F+DQZzF7JIaLSHzW1Xkv8PWg=", + "version": "2.0.5", + "resolved": "http://registry.npm.taobao.org/electron/download/electron-2.0.5.tgz", + "integrity": "sha1-YEXbAR4lRwYqNujF2oTUmC9DT8A=", "dev": true, "requires": { - "@types/node": "8.10.19", + "@types/node": "8.10.21", "electron-download": "3.3.0", "extract-zip": "1.6.6" }, "dependencies": { "@types/node": { - "version": "8.10.19", - "resolved": "http://registry.npm.taobao.org/@types/node/download/@types/node-8.10.19.tgz", - "integrity": "sha1-ZrW2MlwEjL9FEreoiw55wu6Z09I=", + "version": "8.10.21", + "resolved": "http://registry.npm.taobao.org/@types/node/download/@types/node-8.10.21.tgz", + "integrity": "sha1-ErPyNZsnqgWkXYhsi6HrjRp34oU=", "dev": true } } @@ -2161,13 +2250,13 @@ }, "elliptic": { "version": "6.4.0", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", + "resolved": "http://registry.npm.taobao.org/elliptic/download/elliptic-6.4.0.tgz", "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=", "dev": true, "requires": { "bn.js": "4.11.8", "brorand": "1.1.0", - "hash.js": "1.1.4", + "hash.js": "1.1.5", "hmac-drbg": "1.0.1", "inherits": "2.0.3", "minimalistic-assert": "1.0.1", @@ -2237,9 +2326,9 @@ "dev": true }, "eslint-scope": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz", - "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=", + "version": "4.0.0", + "resolved": "http://registry.npm.taobao.org/eslint-scope/download/eslint-scope-4.0.0.tgz", + "integrity": "sha1-UL8wcekzi83EMzF5Sgy1M/ATYXI=", "dev": true, "requires": { "esrecurse": "4.2.1", @@ -2263,7 +2352,7 @@ }, "estraverse": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/estraverse/download/estraverse-4.2.0.tgz", "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", "dev": true }, @@ -2276,12 +2365,11 @@ "event-lite": { "version": "0.1.1", "resolved": "http://registry.npm.taobao.org/event-lite/download/event-lite-0.1.1.tgz", - "integrity": "sha1-R88IqNN9C2lM23s7F7UfqsZXYIY=", - "dev": true + "integrity": "sha1-R88IqNN9C2lM23s7F7UfqsZXYIY=" }, "events": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/events/download/events-1.1.1.tgz", "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", "dev": true }, @@ -2295,6 +2383,11 @@ "safe-buffer": "5.1.1" } }, + "exif-parser": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/exif-parser/-/exif-parser-0.1.12.tgz", + "integrity": "sha1-WKnS1ywCwfbwKg70qRZicrd2CSI=" + }, "expand-brackets": { "version": "2.1.4", "resolved": "http://registry.npm.taobao.org/expand-brackets/download/expand-brackets-2.1.4.tgz", @@ -2333,8 +2426,7 @@ "extend": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", - "dev": true + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" }, "extend-shallow": { "version": "3.0.2", @@ -2454,20 +2546,17 @@ "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, "fast-deep-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", - "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=", - "dev": true + "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=" }, "fast-json-stable-stringify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", - "dev": true + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" }, "fastparse": { "version": "1.1.1", @@ -2484,6 +2573,11 @@ "pend": "1.2.0" } }, + "file-type": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", + "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" + }, "fill-range": { "version": "4.0.0", "resolved": "http://registry.npm.taobao.org/fill-range/download/fill-range-4.0.0.tgz", @@ -2637,6 +2731,14 @@ } } }, + "for-each": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "requires": { + "is-callable": "1.1.4" + } + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -2646,14 +2748,12 @@ "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, "form-data": { "version": "2.3.2", "resolved": "http://registry.npm.taobao.org/form-data/download/form-data-2.3.2.tgz", "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", - "dev": true, "requires": { "asynckit": "0.4.0", "combined-stream": "1.0.6", @@ -2712,10 +2812,9 @@ } }, "fs-extra": { - "version": "6.0.1", - "resolved": "http://registry.npm.taobao.org/fs-extra/download/fs-extra-6.0.1.tgz", - "integrity": "sha1-irwSj3lG4xATXdyTuYvdtBDno0s=", - "dev": true, + "version": "7.0.0", + "resolved": "http://registry.npm.taobao.org/fs-extra/download/fs-extra-7.0.0.tgz", + "integrity": "sha1-jMP0fOB+97NZOhG5+yRffjTAQdY=", "requires": { "graceful-fs": "4.1.11", "jsonfile": "4.0.0", @@ -2726,13 +2825,20 @@ "version": "4.0.0", "resolved": "http://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, "requires": { "graceful-fs": "4.1.11" } } } }, + "fs-minipass": { + "version": "1.2.5", + "resolved": "http://registry.npm.taobao.org/fs-minipass/download/fs-minipass-1.2.5.tgz", + "integrity": "sha1-BsJ3IYRU7CiN93raVKA7hwKqy50=", + "requires": { + "minipass": "2.3.3" + } + }, "fs-write-stream-atomic": { "version": "1.0.10", "resolved": "http://registry.npm.taobao.org/fs-write-stream-atomic/download/fs-write-stream-atomic-1.0.10.tgz", @@ -2748,8 +2854,7 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { "version": "1.2.4", @@ -3335,6 +3440,21 @@ } } }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "requires": { + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.3" + } + }, "get-package-info": { "version": "1.0.0", "resolved": "http://registry.npm.taobao.org/get-package-info/download/get-package-info-1.0.0.tgz", @@ -3422,7 +3542,6 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, "requires": { "assert-plus": "1.0.0" } @@ -3431,7 +3550,6 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "dev": true, "requires": { "fs.realpath": "1.0.0", "inflight": "1.0.6", @@ -3462,23 +3580,36 @@ } } }, + "global": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz", + "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=", + "requires": { + "min-document": "2.19.0", + "process": "0.5.2" + }, + "dependencies": { + "process": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz", + "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=" + } + } + }, "graceful-fs": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" }, "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" }, "har-validator": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", - "dev": true, "requires": { "ajv": "5.5.2", "har-schema": "2.0.0" @@ -3508,6 +3639,11 @@ "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", "dev": true }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + }, "has-value": { "version": "1.0.0", "resolved": "http://registry.npm.taobao.org/has-value/download/has-value-1.0.0.tgz", @@ -3557,9 +3693,9 @@ "dev": true }, "hash.js": { - "version": "1.1.4", - "resolved": "http://registry.npm.taobao.org/hash.js/download/hash.js-1.1.4.tgz", - "integrity": "sha1-i1Dh811RvQHl7Z7OTb41Scz6Cjw=", + "version": "1.1.5", + "resolved": "http://registry.npm.taobao.org/hash.js/download/hash.js-1.1.5.tgz", + "integrity": "sha1-44q0uF37HgxA/pJlwOm1SFTCOBI=", "dev": true, "requires": { "inherits": "2.0.3", @@ -3569,8 +3705,7 @@ "hca-decoder": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hca-decoder/-/hca-decoder-1.0.1.tgz", - "integrity": "sha512-1L3WCADCEqoAHFIUaOfS5cFi2xpd2QVDQj4S2OHOCFGWvfgc3w1nNtw74x4wXk/jw/pwcw0hjC+5HnrN7aOBlg==", - "dev": true + "integrity": "sha512-1L3WCADCEqoAHFIUaOfS5cFi2xpd2QVDQj4S2OHOCFGWvfgc3w1nNtw74x4wXk/jw/pwcw0hjC+5HnrN7aOBlg==" }, "he": { "version": "1.1.1", @@ -3580,11 +3715,11 @@ }, "hmac-drbg": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/hmac-drbg/download/hmac-drbg-1.0.1.tgz", "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", "dev": true, "requires": { - "hash.js": "1.1.4", + "hash.js": "1.1.5", "minimalistic-assert": "1.0.1", "minimalistic-crypto-utils": "1.0.1" } @@ -3611,7 +3746,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, "requires": { "assert-plus": "1.0.0", "jsprim": "1.4.1", @@ -3620,10 +3754,18 @@ }, "https-browserify": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/https-browserify/download/https-browserify-1.0.0.tgz", "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", "dev": true }, + "iconv-lite": { + "version": "0.4.23", + "resolved": "http://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.23.tgz", + "integrity": "sha1-KXhx9jvlB63Pv8pxXQzQ7thOmmM=", + "requires": { + "safer-buffer": "2.1.2" + } + }, "icss-replace-symbols": { "version": "1.1.0", "resolved": "http://registry.npm.taobao.org/icss-replace-symbols/download/icss-replace-symbols-1.1.0.tgz", @@ -3696,8 +3838,7 @@ "ieee754": { "version": "1.1.12", "resolved": "http://registry.npm.taobao.org/ieee754/download/ieee754-1.1.12.tgz", - "integrity": "sha1-UL8k5bnIu5ivSWTJQc2wkY2ntgs=", - "dev": true + "integrity": "sha1-UL8k5bnIu5ivSWTJQc2wkY2ntgs=" }, "iferr": { "version": "0.1.5", @@ -3705,6 +3846,14 @@ "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=", "dev": true }, + "ignore-walk": { + "version": "3.0.1", + "resolved": "http://registry.npm.taobao.org/ignore-walk/download/ignore-walk-3.0.1.tgz", + "integrity": "sha1-qD5i59JyrA47VRqqgoMaGbafgvg=", + "requires": { + "minimatch": "3.0.4" + } + }, "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -3728,7 +3877,7 @@ }, "indexof": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/indexof/download/indexof-0.0.1.tgz", "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", "dev": true }, @@ -3736,7 +3885,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, "requires": { "once": "1.4.0", "wrappy": "1.0.2" @@ -3745,20 +3893,22 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "ini": { "version": "1.3.5", "resolved": "http://registry.npm.taobao.org/ini/download/ini-1.3.5.tgz", - "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc=", - "dev": true + "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc=" }, "int64-buffer": { "version": "0.1.10", "resolved": "http://registry.npm.taobao.org/int64-buffer/download/int64-buffer-0.1.10.tgz", - "integrity": "sha1-J3siiofZWtd30HwTgyAiQGpHNCM=", - "dev": true + "integrity": "sha1-J3siiofZWtd30HwTgyAiQGpHNCM=" + }, + "ip-regex": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz", + "integrity": "sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=" }, "is-absolute-url": { "version": "2.1.0", @@ -3783,7 +3933,7 @@ }, "is-binary-path": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/is-binary-path/download/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { @@ -3805,6 +3955,11 @@ "builtin-modules": "1.1.1" } }, + "is-callable": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", + "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==" + }, "is-data-descriptor": { "version": "0.1.4", "resolved": "http://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz", @@ -3858,11 +4013,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, "requires": { "number-is-nan": "1.0.1" } }, + "is-function": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz", + "integrity": "sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=" + }, "is-glob": { "version": "4.0.0", "resolved": "http://registry.npm.taobao.org/is-glob/download/is-glob-4.0.0.tgz", @@ -3931,8 +4090,7 @@ "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, "is-utf8": { "version": "0.2.1", @@ -3949,8 +4107,7 @@ "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" }, "isbinaryfile": { "version": "3.0.2", @@ -3973,8 +4130,42 @@ "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "jimp": { + "version": "0.2.28", + "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.2.28.tgz", + "integrity": "sha1-3VKak3GQ9ClXp5N9Gsw6d2KZbqI=", + "requires": { + "bignumber.js": "2.4.0", + "bmp-js": "0.0.3", + "es6-promise": "3.3.1", + "exif-parser": "0.1.12", + "file-type": "3.9.0", + "jpeg-js": "0.2.0", + "load-bmfont": "1.3.0", + "mime": "1.6.0", + "mkdirp": "0.5.1", + "pixelmatch": "4.0.2", + "pngjs": "3.3.3", + "read-chunk": "1.0.1", + "request": "2.87.0", + "stream-to-buffer": "0.1.0", + "tinycolor2": "1.4.1", + "url-regex": "3.2.0" + }, + "dependencies": { + "es6-promise": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", + "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=" + } + } + }, + "jpeg-js": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.2.0.tgz", + "integrity": "sha1-U+RI7J0mPmgyZkZ+lELSxaLvVII=" }, "js-base64": { "version": "2.4.3", @@ -4002,7 +4193,6 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true, "optional": true }, "jsesc": { @@ -4020,20 +4210,17 @@ "json-schema": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, "json-schema-traverse": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", - "dev": true + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" }, "json5": { "version": "0.5.1", @@ -4054,7 +4241,6 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -4084,7 +4270,6 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/lame/-/lame-1.2.4.tgz", "integrity": "sha1-VGgBUU4t6MoMie7yIogMjcZxJIU=", - "dev": true, "requires": { "bindings": "1.3.0", "debug": "2.6.9", @@ -4126,11 +4311,19 @@ } } }, - "leb": { - "version": "0.3.0", - "resolved": "http://registry.npm.taobao.org/leb/download/leb-0.3.0.tgz", - "integrity": "sha1-Mr7p+tFoMo1q6oUi2DP0GA7tHaM=", - "dev": true + "load-bmfont": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.3.0.tgz", + "integrity": "sha1-u358cQ3mvK/LE8s7jIHgwBMey8k=", + "requires": { + "buffer-equal": "0.0.1", + "mime": "1.6.0", + "parse-bmfont-ascii": "1.0.6", + "parse-bmfont-binary": "1.0.6", + "parse-bmfont-xml": "1.1.3", + "xhr": "2.5.0", + "xtend": "4.0.1" + } }, "load-json-file": { "version": "1.1.0", @@ -4147,7 +4340,7 @@ }, "loader-runner": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/loader-runner/download/loader-runner-2.3.0.tgz", "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=", "dev": true }, @@ -4305,7 +4498,7 @@ }, "md5.js": { "version": "1.3.4", - "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", + "resolved": "http://registry.npm.taobao.org/md5.js/download/md5.js-1.3.4.tgz", "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=", "dev": true, "requires": { @@ -4443,21 +4636,32 @@ "brorand": "1.1.0" } }, + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + }, "mime-db": { "version": "1.33.0", "resolved": "http://registry.npm.taobao.org/mime-db/download/mime-db-1.33.0.tgz", - "integrity": "sha1-o0kgUKXLm2NFBUHjnZeI0icng9s=", - "dev": true + "integrity": "sha1-o0kgUKXLm2NFBUHjnZeI0icng9s=" }, "mime-types": { "version": "2.1.18", "resolved": "http://registry.npm.taobao.org/mime-types/download/mime-types-2.1.18.tgz", "integrity": "sha1-bzI/YKg9ERRvgx/xH9ZuL+VQO7g=", - "dev": true, "requires": { "mime-db": "1.33.0" } }, + "min-document": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", + "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", + "requires": { + "dom-walk": "0.1.1" + } + }, "mini-css-extract-plugin": { "version": "0.4.0", "resolved": "http://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.4.0.tgz", @@ -4494,7 +4698,7 @@ }, "minimalistic-crypto-utils": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/minimalistic-crypto-utils/download/minimalistic-crypto-utils-1.0.1.tgz", "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", "dev": true }, @@ -4502,7 +4706,6 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, "requires": { "brace-expansion": "1.1.8" } @@ -4510,22 +4713,70 @@ "minimist": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + }, + "minipass": { + "version": "2.3.3", + "resolved": "http://registry.npm.taobao.org/minipass/download/minipass-2.3.3.tgz", + "integrity": "sha1-p9zIt7gz9dNodZzOVE3MtV9Q8jM=", + "requires": { + "safe-buffer": "5.1.2", + "yallist": "3.0.2" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "http://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz", + "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=" + }, + "yallist": { + "version": "3.0.2", + "resolved": "http://registry.npm.taobao.org/yallist/download/yallist-3.0.2.tgz", + "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=" + } + } + }, + "minizlib": { + "version": "1.1.0", + "resolved": "http://registry.npm.taobao.org/minizlib/download/minizlib-1.1.0.tgz", + "integrity": "sha1-EeE2WM5GvDpwomeqxYNZ0eDCnOs=", + "requires": { + "minipass": "2.3.3" + } }, "mishiro-core": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mishiro-core/-/mishiro-core-1.0.1.tgz", - "integrity": "sha512-hQB8210N+OYz/hhYU75E6Fj4EBObpKuUYWNQr5+CD8dF9gWMozhib77jDiPxVHcjKWQJzqXf76CDBus/3cS70Q==", - "dev": true, + "version": "1.1.0", + "resolved": "http://registry.npm.taobao.org/mishiro-core/download/mishiro-core-1.1.0.tgz", + "integrity": "sha1-voqJoFD1aF2lNoIFt2CWhgz/tv0=", "requires": { - "acb": "1.2.1", + "acb": "1.2.2", "fs-extra": "6.0.1", "hca-decoder": "1.0.1", + "jimp": "0.2.28", "lame": "1.2.4", "msgpack-lite": "0.1.26", "rijndael-js": "1.0.0", "wav": "1.0.2" + }, + "dependencies": { + "fs-extra": { + "version": "6.0.1", + "resolved": "http://registry.npm.taobao.org/fs-extra/download/fs-extra-6.0.1.tgz", + "integrity": "sha1-irwSj3lG4xATXdyTuYvdtBDno0s=", + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "http://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "requires": { + "graceful-fs": "4.1.11" + } + } } }, "mississippi": { @@ -4629,7 +4880,6 @@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, "requires": { "minimist": "0.0.8" } @@ -4683,14 +4933,12 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "msgpack-lite": { "version": "0.1.26", "resolved": "http://registry.npm.taobao.org/msgpack-lite/download/msgpack-lite-0.1.26.tgz", "integrity": "sha1-3TxQsm8FnyXn7e42REGDWOKprYk=", - "dev": true, "requires": { "event-lite": "0.1.1", "ieee754": "1.1.12", @@ -4701,16 +4949,14 @@ "isarray": { "version": "1.0.0", "resolved": "http://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" } } }, "nan": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", - "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", - "dev": true + "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" }, "nanomatch": { "version": "1.2.9", @@ -4740,13 +4986,14 @@ } } }, - "native-addon-loader": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/native-addon-loader/-/native-addon-loader-1.1.0.tgz", - "integrity": "sha512-0ezvpciCpekRmXWkE6eRwJIxiEnLdGui5bGR2OZg4B9WpUhbmNneRs5g6NZfRm2tn4Xj63opzAziPBmcznDFlA==", - "dev": true, + "needle": { + "version": "2.2.1", + "resolved": "http://registry.npm.taobao.org/needle/download/needle-2.2.1.tgz", + "integrity": "sha1-teMlvTqujCZ4kC+ilvcpRV0dOn0=", "requires": { - "loader-utils": "1.1.0" + "debug": "2.6.9", + "iconv-lite": "0.4.23", + "sax": "1.2.4" } }, "neo-async": { @@ -4788,7 +5035,7 @@ "dependencies": { "isarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, @@ -4824,6 +5071,34 @@ } } }, + "node-pre-gyp": { + "version": "0.10.3", + "resolved": "http://registry.npm.taobao.org/node-pre-gyp/download/node-pre-gyp-0.10.3.tgz", + "integrity": "sha1-MHAEBxav3HeHR7YbaIe/eIgLgPw=", + "requires": { + "detect-libc": "1.0.3", + "mkdirp": "0.5.1", + "needle": "2.2.1", + "nopt": "4.0.1", + "npm-packlist": "1.1.10", + "npmlog": "4.1.2", + "rc": "1.2.7", + "rimraf": "2.6.2", + "semver": "5.4.1", + "tar": "4.4.4" + }, + "dependencies": { + "nopt": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", + "requires": { + "abbrev": "1.1.1", + "osenv": "0.1.5" + } + } + } + }, "nodeify": { "version": "1.0.1", "resolved": "http://registry.npm.taobao.org/nodeify/download/nodeify-1.0.1.tgz", @@ -4865,7 +5140,7 @@ }, "normalize-path": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "resolved": "http://registry.npm.taobao.org/normalize-path/download/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { @@ -4890,6 +5165,31 @@ "sort-keys": "1.1.2" } }, + "npm-bundled": { + "version": "1.0.3", + "resolved": "http://registry.npm.taobao.org/npm-bundled/download/npm-bundled-1.0.3.tgz", + "integrity": "sha1-fnFwPZc68zcKlZG6/jpjrKC+Iwg=" + }, + "npm-packlist": { + "version": "1.1.10", + "resolved": "http://registry.npm.taobao.org/npm-packlist/download/npm-packlist-1.1.10.tgz", + "integrity": "sha1-EDnbnphXJ+Rk3wZvTPCrbvhcOYo=", + "requires": { + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.3" + } + }, + "npmlog": { + "version": "4.1.2", + "resolved": "http://registry.npm.taobao.org/npmlog/download/npmlog-4.1.2.tgz", + "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=", + "requires": { + "are-we-there-yet": "1.1.5", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, "nugget": { "version": "2.0.1", "resolved": "http://registry.npm.taobao.org/nugget/download/nugget-2.0.1.tgz", @@ -4922,20 +5222,17 @@ "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, "oauth-sign": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", - "dev": true + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "object-copy": { "version": "0.1.0", @@ -4987,7 +5284,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "requires": { "wrappy": "1.0.2" } @@ -5004,15 +5300,28 @@ }, "os-browserify": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", + "resolved": "http://registry.npm.taobao.org/os-browserify/download/os-browserify-0.3.0.tgz", "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", "dev": true }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + }, + "osenv": { + "version": "0.1.5", + "resolved": "http://registry.npm.taobao.org/osenv/download/osenv-0.1.5.tgz", + "integrity": "sha1-hc36+uso6Gd/QW4odZK18/SepBA=", + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } }, "p-limit": { "version": "1.1.0", @@ -5100,6 +5409,34 @@ "author-regex": "1.0.0" } }, + "parse-bmfont-ascii": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz", + "integrity": "sha1-Eaw8P/WPfCAgqyJ2kHkQjU36AoU=" + }, + "parse-bmfont-binary": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz", + "integrity": "sha1-0Di0dtPp3Z2x4RoLDlOiJ5K2kAY=" + }, + "parse-bmfont-xml": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.3.tgz", + "integrity": "sha1-1rZqNxr9OcUAfZ8O6yYqTyzOe3w=", + "requires": { + "xml-parse-from-string": "1.0.1", + "xml2js": "0.4.19" + } + }, + "parse-headers": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.1.tgz", + "integrity": "sha1-aug6eqJanZtwCswoaYzR8e1+lTY=", + "requires": { + "for-each": "0.3.3", + "trim": "0.0.1" + } + }, "parse-json": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", @@ -5117,7 +5454,7 @@ }, "path-browserify": { "version": "0.0.0", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/path-browserify/download/path-browserify-0.0.0.tgz", "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", "dev": true }, @@ -5139,8 +5476,7 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-parse": { "version": "1.0.5", @@ -5181,8 +5517,7 @@ "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "pify": { "version": "2.3.0", @@ -5205,6 +5540,14 @@ "pinkie": "2.0.4" } }, + "pixelmatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/pixelmatch/-/pixelmatch-4.0.2.tgz", + "integrity": "sha1-j0fc7FARtHe2fbA8JDvB8wheiFQ=", + "requires": { + "pngjs": "3.3.3" + } + }, "plist": { "version": "2.1.0", "resolved": "http://registry.npm.taobao.org/plist/download/plist-2.1.0.tgz", @@ -5224,6 +5567,11 @@ } } }, + "pngjs": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.3.3.tgz", + "integrity": "sha512-1n3Z4p3IOxArEs1VRXnZ/RXdfEniAUS9jb68g58FIXMNkPJeZd+Qh4Uq7/e0LVxAQGos1eIUrqrt4FpjdnEd+Q==" + }, "posix-character-classes": { "version": "0.1.1", "resolved": "http://registry.npm.taobao.org/posix-character-classes/download/posix-character-classes-0.1.1.tgz", @@ -5810,7 +6158,7 @@ }, "process": { "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "resolved": "http://registry.npm.taobao.org/process/download/process-0.11.10.tgz", "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", "dev": true }, @@ -5902,8 +6250,7 @@ "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, "q": { "version": "1.5.1", @@ -5914,8 +6261,7 @@ "qs": { "version": "6.5.2", "resolved": "http://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz", - "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY=", - "dev": true + "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY=" }, "query-string": { "version": "4.3.4", @@ -5929,13 +6275,13 @@ }, "querystring": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "resolved": "http://registry.npm.taobao.org/querystring/download/querystring-0.2.0.tgz", "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", "dev": true }, "querystring-es3": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", + "resolved": "http://registry.npm.taobao.org/querystring-es3/download/querystring-es3-0.2.1.tgz", "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", "dev": true }, @@ -5962,7 +6308,6 @@ "version": "1.2.7", "resolved": "http://registry.npm.taobao.org/rc/download/rc-1.2.7.tgz", "integrity": "sha1-ihDKMNWI0ARkNgNyuJDQbazQIpc=", - "dev": true, "requires": { "deep-extend": "0.5.1", "ini": "1.3.5", @@ -5973,17 +6318,20 @@ "deep-extend": { "version": "0.5.1", "resolved": "http://registry.npm.taobao.org/deep-extend/download/deep-extend-0.5.1.tgz", - "integrity": "sha1-uJSp3ZDTAj+/HFWjlPuFjrIGbx8=", - "dev": true + "integrity": "sha1-uJSp3ZDTAj+/HFWjlPuFjrIGbx8=" }, "minimist": { "version": "1.2.0", "resolved": "http://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" } } }, + "read-chunk": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-1.0.1.tgz", + "integrity": "sha1-X2jKswfmY/GZk1J9m1icrORmEZQ=" + }, "read-pkg": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", @@ -6009,7 +6357,6 @@ "version": "1.1.14", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "dev": true, "requires": { "core-util-is": "1.0.2", "inherits": "2.0.3", @@ -6019,7 +6366,7 @@ }, "readdirp": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/readdirp/download/readdirp-2.1.0.tgz", "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", "dev": true, "requires": { @@ -6031,7 +6378,7 @@ "dependencies": { "isarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, @@ -6097,11 +6444,6 @@ "balanced-match": "0.4.2" } }, - "reflect-metadata": { - "version": "0.1.12", - "resolved": "http://registry.npm.taobao.org/reflect-metadata/download/reflect-metadata-0.1.12.tgz", - "integrity": "sha1-MRvwxrY814LyKKgavhRqK/qcVvI=" - }, "regenerate": { "version": "1.3.3", "resolved": "http://registry.npm.taobao.org/regenerate/download/regenerate-1.3.3.tgz", @@ -6146,7 +6488,7 @@ }, "remove-trailing-separator": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "resolved": "http://registry.npm.taobao.org/remove-trailing-separator/download/remove-trailing-separator-1.1.0.tgz", "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", "dev": true }, @@ -6175,7 +6517,6 @@ "version": "2.87.0", "resolved": "http://registry.npm.taobao.org/request/download/request-2.87.0.tgz", "integrity": "sha1-MvACNc0I1IK00NaNuTqCnA7VdW4=", - "dev": true, "requires": { "aws-sign2": "0.7.0", "aws4": "1.7.0", @@ -6223,14 +6564,12 @@ "rijndael-js": { "version": "1.0.0", "resolved": "http://registry.npm.taobao.org/rijndael-js/download/rijndael-js-1.0.0.tgz", - "integrity": "sha1-jrAsgIL7ZjyhQZckpZg7MYN5T4s=", - "dev": true + "integrity": "sha1-jrAsgIL7ZjyhQZckpZg7MYN5T4s=" }, "rimraf": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", - "dev": true, "requires": { "glob": "7.1.2" } @@ -6257,8 +6596,7 @@ "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" }, "safe-regex": { "version": "1.1.0", @@ -6272,8 +6610,7 @@ "safer-buffer": { "version": "2.1.2", "resolved": "http://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz", - "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=", - "dev": true + "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=" }, "sanitize-filename": { "version": "1.6.1", @@ -6287,8 +6624,7 @@ "sax": { "version": "1.2.4", "resolved": "http://registry.npm.taobao.org/sax/download/sax-1.2.4.tgz", - "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=", - "dev": true + "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=" }, "schema-utils": { "version": "0.4.5", @@ -6323,8 +6659,7 @@ "semver": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", - "dev": true + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" }, "serialize-javascript": { "version": "1.4.0", @@ -6332,9 +6667,14 @@ "integrity": "sha1-fJWFFNtqwkQ6irwGLcn3iGp/YAU=", "dev": true }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, "set-immediate-shim": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/set-immediate-shim/download/set-immediate-shim-1.0.1.tgz", "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", "dev": true }, @@ -6363,7 +6703,7 @@ }, "setimmediate": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "resolved": "http://registry.npm.taobao.org/setimmediate/download/setimmediate-1.0.5.tgz", "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", "dev": true }, @@ -6395,8 +6735,7 @@ "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "dev": true + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, "single-line-log": { "version": "1.1.2", @@ -6592,616 +6931,148 @@ "dev": true }, "sqlite3": { - "version": "4.0.0", - "resolved": "http://registry.npm.taobao.org/sqlite3/download/sqlite3-4.0.0.tgz", - "integrity": "sha1-zA4JOrUYc/UNnfxBJvy+8V1IZXA=", + "version": "4.0.2", + "resolved": "http://registry.npm.taobao.org/sqlite3/download/sqlite3-4.0.2.tgz", + "integrity": "sha1-G762iwPq1dSZ5Co6GxQAZHkcWmQ=", + "requires": { + "nan": "2.10.0", + "node-pre-gyp": "0.10.3", + "request": "2.87.0" + } + }, + "sshpk": { + "version": "1.14.2", + "resolved": "http://registry.npm.taobao.org/sshpk/download/sshpk-1.14.2.tgz", + "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "safer-buffer": "2.1.2", + "tweetnacl": "0.14.5" + } + }, + "ssri": { + "version": "5.3.0", + "resolved": "http://registry.npm.taobao.org/ssri/download/ssri-5.3.0.tgz", + "integrity": "sha1-ujhyycbTOgcEp9cf8EXl7EiZnQY=", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "static-extend": { + "version": "0.1.2", + "resolved": "http://registry.npm.taobao.org/static-extend/download/static-extend-0.1.2.tgz", + "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "dev": true, "requires": { - "nan": "2.9.2", - "node-pre-gyp": "0.9.0" + "define-property": "0.2.5", + "object-copy": "0.1.0" }, "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "dev": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, + "define-property": { + "version": "0.2.5", + "resolved": "http://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + } + } + }, + "stream-browserify": { + "version": "2.0.1", + "resolved": "http://registry.npm.taobao.org/stream-browserify/download/stream-browserify-2.0.1.tgz", + "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.6" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "http://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, - "aproba": { - "version": "1.2.0", - "bundled": true, + "process-nextick-args": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.0.tgz", + "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=", "dev": true }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, + "readable-stream": { + "version": "2.3.6", + "resolved": "http://registry.npm.taobao.org/readable-stream/download/readable-stream-2.3.6.tgz", + "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=", "dev": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.5" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.1", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, + "string_decoder": { + "version": "1.1.1", + "resolved": "http://registry.npm.taobao.org/string_decoder/download/string_decoder-1.1.1.tgz", + "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=", "dev": true, "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" + "safe-buffer": "5.1.1" } - }, - "chownr": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, + } + } + }, + "stream-each": { + "version": "1.2.2", + "resolved": "http://registry.npm.taobao.org/stream-each/download/stream-each-1.2.2.tgz", + "integrity": "sha1-joxGP5HaiZF3h2WHP+TZYNj2Fr0=", + "dev": true, + "requires": { + "end-of-stream": "1.4.0", + "stream-shift": "1.0.0" + } + }, + "stream-http": { + "version": "2.8.3", + "resolved": "http://registry.npm.taobao.org/stream-http/download/stream-http-2.8.3.tgz", + "integrity": "sha1-stJCRpKIpaJ+xP6JM6z2I95lFPw=", + "dev": true, + "requires": { + "builtin-status-codes": "3.0.0", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "to-arraybuffer": "1.0.1", + "xtend": "4.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "http://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, + "process-nextick-args": { + "version": "2.0.0", + "resolved": "http://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.0.tgz", + "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=", "dev": true }, - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.4.2", - "bundled": true, - "dev": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "dev": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "dev": true, - "requires": { - "minipass": "2.2.1" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true - }, - "iconv-lite": { - "version": "0.4.19", - "bundled": true, - "dev": true - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "minimatch": "3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "1.1.11" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "minipass": { - "version": "2.2.1", - "bundled": true, - "dev": true, - "requires": { - "yallist": "3.0.2" - } - }, - "minizlib": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "minipass": "2.2.1" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "nan": { - "version": "2.9.2", - "resolved": "http://registry.npm.taobao.org/nan/download/nan-2.9.2.tgz", - "integrity": "sha1-9WTXX1+PNqbZRWzKemxP5IireGY=", - "dev": true - }, - "needle": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.19", - "sax": "1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.9.0", - "bundled": true, - "dev": true, - "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.6", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.0" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" - } - }, - "npm-bundled": { - "version": "1.0.3", - "bundled": true, - "dev": true - }, - "npm-packlist": { - "version": "1.1.10", - "bundled": true, - "dev": true, - "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "dev": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "rc": { - "version": "1.2.6", - "bundled": true, - "dev": true, - "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true - } - } - }, - "readable-stream": { - "version": "2.3.5", - "bundled": true, - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "dev": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.1.1", - "bundled": true, - "dev": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "dev": true - }, - "semver": { - "version": "5.5.0", - "bundled": true, - "dev": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "string_decoder": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true - }, - "tar": { - "version": "4.4.0", - "bundled": true, - "dev": true, - "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.1", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "yallist": "3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "yallist": { - "version": "3.0.2", - "bundled": true, - "dev": true - } - } - }, - "sshpk": { - "version": "1.14.2", - "resolved": "http://registry.npm.taobao.org/sshpk/download/sshpk-1.14.2.tgz", - "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", - "dev": true, - "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "safer-buffer": "2.1.2", - "tweetnacl": "0.14.5" - } - }, - "ssri": { - "version": "5.3.0", - "resolved": "http://registry.npm.taobao.org/ssri/download/ssri-5.3.0.tgz", - "integrity": "sha1-ujhyycbTOgcEp9cf8EXl7EiZnQY=", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "static-extend": { - "version": "0.1.2", - "resolved": "http://registry.npm.taobao.org/static-extend/download/static-extend-0.1.2.tgz", - "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", - "dev": true, - "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "http://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - } - } - }, - "stream-browserify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", - "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "process-nextick-args": { - "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.0.tgz", - "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=", - "dev": true - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "http://registry.npm.taobao.org/readable-stream/download/readable-stream-2.3.6.tgz", - "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "http://registry.npm.taobao.org/string_decoder/download/string_decoder-1.1.1.tgz", - "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - } - } - }, - "stream-each": { - "version": "1.2.2", - "resolved": "http://registry.npm.taobao.org/stream-each/download/stream-each-1.2.2.tgz", - "integrity": "sha1-joxGP5HaiZF3h2WHP+TZYNj2Fr0=", - "dev": true, - "requires": { - "end-of-stream": "1.4.0", - "stream-shift": "1.0.0" - } - }, - "stream-http": { - "version": "2.8.3", - "resolved": "http://registry.npm.taobao.org/stream-http/download/stream-http-2.8.3.tgz", - "integrity": "sha1-stJCRpKIpaJ+xP6JM6z2I95lFPw=", - "dev": true, - "requires": { - "builtin-status-codes": "3.0.0", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "to-arraybuffer": "1.0.1", - "xtend": "4.0.1" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "process-nextick-args": { - "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.0.tgz", - "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=", - "dev": true - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "http://registry.npm.taobao.org/readable-stream/download/readable-stream-2.3.6.tgz", - "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=", + "readable-stream": { + "version": "2.3.6", + "resolved": "http://registry.npm.taobao.org/readable-stream/download/readable-stream-2.3.6.tgz", + "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=", "dev": true, "requires": { "core-util-is": "1.0.2", @@ -7228,7 +7099,6 @@ "version": "0.3.1", "resolved": "http://registry.npm.taobao.org/stream-parser/download/stream-parser-0.3.1.tgz", "integrity": "sha1-FhhUhpRCACGhGC/wrxkRwSl2F3M=", - "dev": true, "requires": { "debug": "2.6.9" } @@ -7239,6 +7109,19 @@ "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", "dev": true }, + "stream-to": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/stream-to/-/stream-to-0.2.2.tgz", + "integrity": "sha1-hDBgmNhf25kLn6MAsbPM9V6O8B0=" + }, + "stream-to-buffer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/stream-to-buffer/-/stream-to-buffer-0.1.0.tgz", + "integrity": "sha1-JnmdkDqyAlyb1VCsRxcbAPjdgKk=", + "requires": { + "stream-to": "0.2.2" + } + }, "strict-uri-encode": { "version": "1.1.0", "resolved": "http://registry.npm.taobao.org/strict-uri-encode/download/strict-uri-encode-1.1.0.tgz", @@ -7249,7 +7132,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, "requires": { "code-point-at": "1.1.0", "is-fullwidth-code-point": "1.0.0", @@ -7259,14 +7141,12 @@ "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" }, "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, "requires": { "ansi-regex": "2.1.1" } @@ -7292,8 +7172,7 @@ "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" }, "sumchecker": { "version": "1.3.1", @@ -7332,6 +7211,32 @@ "integrity": "sha1-y7Y52QAu7ZxrWXXrIFmNeTbx+fI=", "dev": true }, + "tar": { + "version": "4.4.4", + "resolved": "http://registry.npm.taobao.org/tar/download/tar-4.4.4.tgz", + "integrity": "sha1-7IQJ+un2ZaQ1XMO0CH0IICMruM0=", + "requires": { + "chownr": "1.0.1", + "fs-minipass": "1.2.5", + "minipass": "2.3.3", + "minizlib": "1.1.0", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.2", + "yallist": "3.0.2" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "http://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz", + "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=" + }, + "yallist": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz", + "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=" + } + } + }, "throttleit": { "version": "0.0.2", "resolved": "http://registry.npm.taobao.org/throttleit/download/throttleit-0.0.2.tgz", @@ -7368,9 +7273,14 @@ "setimmediate": "1.0.5" } }, + "tinycolor2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz", + "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=" + }, "to-arraybuffer": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", + "resolved": "http://registry.npm.taobao.org/to-arraybuffer/download/to-arraybuffer-1.0.1.tgz", "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", "dev": true }, @@ -7429,7 +7339,6 @@ "version": "2.3.4", "resolved": "http://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.3.4.tgz", "integrity": "sha1-7GDO44rGdQY//JelwYlwV47oNlU=", - "dev": true, "requires": { "punycode": "1.4.1" } @@ -7440,6 +7349,11 @@ "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=", "dev": true }, + "trim": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz", + "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=" + }, "trim-newlines": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", @@ -7697,7 +7611,7 @@ }, "tty-browserify": { "version": "0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "resolved": "http://registry.npm.taobao.org/tty-browserify/download/tty-browserify-0.0.0.tgz", "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, @@ -7705,7 +7619,6 @@ "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, "requires": { "safe-buffer": "5.1.1" } @@ -7714,7 +7627,6 @@ "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true, "optional": true }, "typedarray": { @@ -7858,8 +7770,7 @@ "universalify": { "version": "0.1.1", "resolved": "http://registry.npm.taobao.org/universalify/download/universalify-0.1.1.tgz", - "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=", - "dev": true + "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=" }, "unset-value": { "version": "1.0.0", @@ -7938,7 +7849,7 @@ }, "url": { "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "resolved": "http://registry.npm.taobao.org/url/download/url-0.11.0.tgz", "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", "dev": true, "requires": { @@ -7948,12 +7859,20 @@ "dependencies": { "punycode": { "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "resolved": "http://registry.npm.taobao.org/punycode/download/punycode-1.3.2.tgz", "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", "dev": true } } }, + "url-regex": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/url-regex/-/url-regex-3.2.0.tgz", + "integrity": "sha1-260eDJ4p4QXdCx8J9oYvf9tIJyQ=", + "requires": { + "ip-regex": "1.0.3" + } + }, "use": { "version": "3.1.0", "resolved": "http://registry.npm.taobao.org/use/download/use-3.1.0.tgz", @@ -7989,14 +7908,12 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "uuid": { "version": "3.3.0", "resolved": "http://registry.npm.taobao.org/uuid/download/uuid-3.3.0.tgz", - "integrity": "sha1-sjcUeASIHXuG9Ap/+PWQ8Vw33jI=", - "dev": true + "integrity": "sha1-sjcUeASIHXuG9Ap/+PWQ8Vw33jI=" }, "validate-npm-package-license": { "version": "3.0.1", @@ -8018,7 +7935,6 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, "requires": { "assert-plus": "1.0.0", "core-util-is": "1.0.2", @@ -8027,7 +7943,7 @@ }, "vm-browserify": { "version": "0.0.4", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", + "resolved": "http://registry.npm.taobao.org/vm-browserify/download/vm-browserify-0.0.4.tgz", "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", "dev": true, "requires": { @@ -8037,12 +7953,14 @@ "vue": { "version": "2.5.16", "resolved": "http://registry.npm.taobao.org/vue/download/vue-2.5.16.tgz", - "integrity": "sha1-B+23XoQSqu7YceuvqZ9GclhKAIU=" + "integrity": "sha1-B+23XoQSqu7YceuvqZ9GclhKAIU=", + "dev": true }, "vue-class-component": { "version": "6.2.0", "resolved": "http://registry.npm.taobao.org/vue-class-component/download/vue-class-component-6.2.0.tgz", - "integrity": "sha1-etsdqpqGjHXzD5fzP08blK7mIIk=" + "integrity": "sha1-etsdqpqGjHXzD5fzP08blK7mIIk=", + "dev": true }, "vue-hot-reload-api": { "version": "2.3.0", @@ -8053,7 +7971,8 @@ "vue-i18n": { "version": "7.6.0", "resolved": "http://registry.npm.taobao.org/vue-i18n/download/vue-i18n-7.6.0.tgz", - "integrity": "sha1-h0WAd1b2ylCQ/YVinpyrmbHG5EI=" + "integrity": "sha1-h0WAd1b2ylCQ/YVinpyrmbHG5EI=", + "dev": true }, "vue-loader": { "version": "15.0.9", @@ -8069,11 +7988,11 @@ } }, "vue-property-decorator": { - "version": "6.0.0", - "resolved": "http://registry.npm.taobao.org/vue-property-decorator/download/vue-property-decorator-6.0.0.tgz", - "integrity": "sha1-u2UbKTVC4x2w0k829LAlDvCNhRU=", + "version": "7.0.0", + "resolved": "http://registry.npm.taobao.org/vue-property-decorator/download/vue-property-decorator-7.0.0.tgz", + "integrity": "sha1-RvU910HrhsOvCRuwSSQAxFDuvxk=", + "dev": true, "requires": { - "reflect-metadata": "0.1.12", "vue-class-component": "6.2.0" } }, @@ -8118,7 +8037,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wav/-/wav-1.0.2.tgz", "integrity": "sha512-viHtz3cDd/Tcr/HbNqzQCofKdF6kWUymH9LGDdskfWFoIy/HJ+RTihgjEcHfnsy1PO4e9B+y4HwgTwMrByquhg==", - "dev": true, "requires": { "buffer-alloc": "1.2.0", "buffer-from": "1.1.0", @@ -8131,29 +8049,28 @@ "version": "1.0.1", "resolved": "http://registry.npm.taobao.org/wcwidth/download/wcwidth-1.0.1.tgz", "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", - "dev": true, "requires": { "defaults": "1.0.3" } }, "webpack": { - "version": "4.12.2", - "resolved": "http://registry.npm.taobao.org/webpack/download/webpack-4.12.2.tgz", - "integrity": "sha1-0rhBjrQM7cvywfWQXSOplUYBHOk=", + "version": "4.16.2", + "resolved": "http://registry.npm.taobao.org/webpack/download/webpack-4.16.2.tgz", + "integrity": "sha1-w+Dnca3JRYLgVD3RjXQ2BmBR6IU=", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.12", - "@webassemblyjs/helper-module-context": "1.5.12", - "@webassemblyjs/wasm-edit": "1.5.12", - "@webassemblyjs/wasm-opt": "1.5.12", - "@webassemblyjs/wasm-parser": "1.5.12", + "@webassemblyjs/ast": "1.5.13", + "@webassemblyjs/helper-module-context": "1.5.13", + "@webassemblyjs/wasm-edit": "1.5.13", + "@webassemblyjs/wasm-opt": "1.5.13", + "@webassemblyjs/wasm-parser": "1.5.13", "acorn": "5.7.1", "acorn-dynamic-import": "3.0.0", - "ajv": "6.5.1", + "ajv": "6.5.2", "ajv-keywords": "3.2.0", "chrome-trace-event": "1.0.0", - "enhanced-resolve": "4.0.0", - "eslint-scope": "3.7.1", + "enhanced-resolve": "4.1.0", + "eslint-scope": "4.0.0", "json-parse-better-errors": "1.0.2", "loader-runner": "2.3.0", "loader-utils": "1.1.0", @@ -8170,9 +8087,9 @@ }, "dependencies": { "ajv": { - "version": "6.5.1", - "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.5.1.tgz", - "integrity": "sha1-iOvBJjxxM5N9EIuAxVcuZOHZMi0=", + "version": "6.5.2", + "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.5.2.tgz", + "integrity": "sha1-Z4SV+bgvfMpr4kjdkvWb/14fQ2A=", "dev": true, "requires": { "fast-deep-equal": "2.0.1", @@ -8181,6 +8098,17 @@ "uri-js": "4.2.2" } }, + "enhanced-resolve": { + "version": "4.1.0", + "resolved": "http://registry.npm.taobao.org/enhanced-resolve/download/enhanced-resolve-4.1.0.tgz", + "integrity": "sha1-Qcfgv9/nSsH/4eV61qXGyfN0Kn8=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "memory-fs": "0.4.1", + "tapable": "1.0.0" + } + }, "fast-deep-equal": { "version": "2.0.1", "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", @@ -8210,6 +8138,12 @@ } } }, + "webpack-node-externals": { + "version": "1.7.2", + "resolved": "http://registry.npm.taobao.org/webpack-node-externals/download/webpack-node-externals-1.7.2.tgz", + "integrity": "sha1-bh7nmsZ8BwQCunAO8DOpuNUqxOM=", + "dev": true + }, "webpack-sources": { "version": "1.1.0", "resolved": "http://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.1.0.tgz", @@ -8243,6 +8177,14 @@ "isexe": "2.0.0" } }, + "wide-align": { + "version": "1.1.3", + "resolved": "http://registry.npm.taobao.org/wide-align/download/wide-align-1.1.3.tgz", + "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=", + "requires": { + "string-width": "1.0.2" + } + }, "worker-farm": { "version": "1.5.2", "resolved": "http://registry.npm.taobao.org/worker-farm/download/worker-farm-1.5.2.tgz", @@ -8264,8 +8206,39 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "xhr": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz", + "integrity": "sha512-4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ==", + "requires": { + "global": "4.3.2", + "is-function": "1.0.1", + "parse-headers": "2.0.1", + "xtend": "4.0.1" + } + }, + "xml-parse-from-string": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz", + "integrity": "sha1-qQKekp09vN7RafPG4oI42VpdWig=" + }, + "xml2js": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", + "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", + "requires": { + "sax": "1.2.4", + "xmlbuilder": "9.0.7" + }, + "dependencies": { + "xmlbuilder": { + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=" + } + } }, "xmlbuilder": { "version": "8.2.2", @@ -8282,8 +8255,7 @@ "xtend": { "version": "4.0.1", "resolved": "http://registry.npm.taobao.org/xtend/download/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", - "dev": true + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" }, "yallist": { "version": "2.1.2", diff --git a/app/package.json b/app/package.json index 9eb4821..9a02f07 100644 --- a/app/package.json +++ b/app/package.json @@ -1,19 +1,14 @@ { "name": "mishiro", - "version": "1.3.5", + "version": "1.3.6", "description": "mishiro", "main": "./public/mishiro.main.js", "scripts": { - "clr": "ts-node -P ./script/tsconfig.json ./script/pre-install.ts", - "install32": "npm run clr&&npm install --target_arch=ia32 --arch=ia32", - "install64": "npm run clr&&npm install --target_arch=x64 --arch=x64", - "install": "ts-node -P ./script/tsconfig.json ./script/after-npm-install.ts", "start": "electron . --enable-logging", - "dll": "ts-node -P ./script/tsconfig.json ./script/webpack.ts dll", "dev": "ts-node -P ./script/tsconfig.json ./script/webpack.ts webpack", "prod": "cross-env NODE_ENV=production ts-node -P ./script/tsconfig.json ./script/webpack.ts webpack", - "pkg32": "npm run install32&&cross-env NODE_ENV=production ts-node -P ./script/tsconfig.json ./script/packager.ts ia32", - "pkg64": "npm run install64&&cross-env NODE_ENV=production ts-node -P ./script/tsconfig.json ./script/packager.ts x64", + "pkg32": "cross-env NODE_ENV=production ts-node -P ./script/tsconfig.json ./script/packager.ts ia32", + "pkg64": "cross-env NODE_ENV=production ts-node -P ./script/tsconfig.json ./script/packager.ts x64", "count": "ts-node -P ./script/tsconfig.json ./script/source-count.ts", "dlc": "ts-node -P ./script/tsconfig.json ./script/release-download-count.ts" }, @@ -43,32 +38,32 @@ "@types/sqlite3": "^3.1.3", "@types/uglifyjs-webpack-plugin": "^1.1.0", "@types/webpack": "^4.4.3", + "@types/webpack-node-externals": "^1.6.3", "cross-env": "^5.1.6", "css-loader": "^0.28.11", - "electron": "2.0.2", + "electron": "2.0.5", "electron-packager": "^12.0.2", - "fs-extra": "^6.0.1", "mini-css-extract-plugin": "^0.4.0", - "mishiro-core": "^1.0.1", - "native-addon-loader": "^1.1.0", "optimize-css-assets-webpack-plugin": "^4.0.0", - "sqlite3": "^4.0.0", "ts-loader": "^4.2.0", "ts-node": "^5.0.1", "tslint": "^5.9.1", "tslint-config-standard": "^7.0.0", "typescript": "^2.9.2", "uglifyjs-webpack-plugin": "^1.2.4", + "vue": "^2.5.16", + "vue-i18n": "^7.4.2", "vue-loader": "^15.0.9", + "vue-property-decorator": "^7.0.0", "vue-template-compiler": "^2.5.16", - "webpack": "^4.12.2", + "webpack": "^4.16.2", + "webpack-node-externals": "^1.7.2", "zauz": "^1.0.0" }, "dependencies": { + "fs-extra": "^7.0.0", "marked": "^0.3.14", - "vue": "^2.5.16", - "vue-class-component": "^6.2.0", - "vue-i18n": "^7.4.2", - "vue-property-decorator": "^6.0.0" + "mishiro-core": "^1.1.0", + "sqlite3": "^4.0.2" } } diff --git a/app/script/packager.config.ts b/app/script/packager.config.ts index d3e0f04..6a0397f 100644 --- a/app/script/packager.config.ts +++ b/app/script/packager.config.ts @@ -6,7 +6,7 @@ import pkg from '../package.json' if (process.argv.slice(2)[0] !== 'ia32' && process.argv.slice(2)[0] !== 'x64') { throw new Error('ARCH requrie "ia32" or "x64"') } -const arch = process.argv.slice(2)[0] as packageManager.arch +export const arch = process.argv.slice(2)[0] as packageManager.arch export const productionPackage = { name: pkg.name, @@ -14,7 +14,8 @@ export const productionPackage = { main: pkg.main, author: pkg.author, repository: pkg.repository, - license: pkg.license + license: pkg.license, + dependencies: pkg.dependencies } export const packagerOptions: packageManager.Options = { diff --git a/app/script/packager.ts b/app/script/packager.ts index fff823d..6b04632 100644 --- a/app/script/packager.ts +++ b/app/script/packager.ts @@ -1,11 +1,21 @@ import packager from 'electron-packager' import path from 'path' import fs from 'fs-extra' +import { exec } from 'child_process' import pkg from '../package.json' import { prod } from './webpack' import { ilog, wlog, elog } from './rainbow' -import { zip } from 'zauz' -import { productionPackage, packagerOptions } from './packager.config' +// import { zip } from 'zauz' +import { productionPackage, packagerOptions, arch } from './packager.config' + +function _exec (cmd: string, opt: any) { + return new Promise((resolve, reject) => { + exec(cmd, opt, (err) => { + if (err) return reject(err) + resolve() + }) + }) +} function bundleProductionCode () { ilog(`[${new Date().toLocaleString()}] Bundle production code...`) @@ -41,10 +51,10 @@ async function rename (appPath: string) { return newPath } -function zipApp (p: string) { +/* function zipApp (p: string) { ilog(`[${new Date().toLocaleString()}] Zip ${p}`) return zip(p, p + '.zip') -} +} */ async function main () { const start = new Date().getTime() @@ -53,10 +63,11 @@ async function main () { const [appPath] = await packageApp() const root = process.platform === 'darwin' ? path.join(appPath, 'Electron.app/Contents/Resources/app') : path.join(appPath, 'resources/app') await writePackageJson(root) + await _exec(`npm install --production --arch=${arch} --target_arch=${arch} --build-from-source --runtime=electron --target=2.0.5 --dist-url=https://atom.io/download/electron`, { cwd: root }) await copyExtra(root) - const newPath = await rename(appPath) - const size = await zipApp(newPath) - ilog(`[${new Date().toLocaleString()}] Size: ${size} Bytes`) + await rename(appPath) + // const size = await zipApp(newPath) + // ilog(`[${new Date().toLocaleString()}] Size: ${size} Bytes`) return (new Date().getTime() - start) / 1000 } diff --git a/app/script/webpack.config.ts b/app/script/webpack.config.ts index 3352736..28eaebc 100644 --- a/app/script/webpack.config.ts +++ b/app/script/webpack.config.ts @@ -4,8 +4,9 @@ import OptimizeCSSAssetsPlugin from 'optimize-css-assets-webpack-plugin' import UglifyJSPlugin from 'uglifyjs-webpack-plugin' import { VueLoaderPlugin } from 'vue-loader' import path from 'path' -import fs from 'fs-extra' -import pkg from '../package.json' +// import fs from 'fs-extra' +import webpackNodeExternals from 'webpack-node-externals' +// import pkg from '../package.json' export const mode = process.env.NODE_ENV === 'production' ? 'production' : 'development' const uglify = new UglifyJSPlugin({ @@ -21,7 +22,7 @@ const uglify = new UglifyJSPlugin({ } }) -export const dll: webpack.Configuration = { +/* export const dll: webpack.Configuration = { mode, target: 'electron-renderer', entry: { @@ -46,7 +47,7 @@ export const dll: webpack.Configuration = { optimization: { minimizer: [uglify] } -} +} */ export const main: webpack.Configuration = { mode, @@ -73,6 +74,7 @@ export const main: webpack.Configuration = { } }] }, + externals: [webpackNodeExternals()], resolve: { extensions: ['.ts', '.js', '.json', '.node'] }, @@ -83,64 +85,75 @@ export const main: webpack.Configuration = { export const manifest: any = path.join(__dirname, 'manifest.json') -export function renderer (manifestPath: string): webpack.Configuration { - const manifestJson = fs.readJsonSync(manifestPath) - console.log('Global variable name: ' + manifestJson.name) - return { - mode, - target: 'electron-renderer', - entry: { - 'mishiro.renderer': path.join(__dirname, '../src/ts/renderer.ts'), - 'mishiro.live': path.join(__dirname, '../src/ts/renderer-game.ts') - }, - output: { - path: path.join(__dirname, '../public'), - filename: '[name].js' - }, - node: { - __dirname: false, - __filename: false - }, - module: { - rules: [{ - test: /\.vue$/, - exclude: /node_modules/, - loader: 'vue-loader' - }, { - test: /\.css$/, - exclude: /node_modules/, - use: [ - MiniCssExtractPlugin.loader, - { loader: 'css-loader', options: { url: false } } - ] - }, { - test: /\.ts$/, - exclude: /node_modules/, - loader: 'ts-loader', - options: { - appendTsSuffixTo: [/\.vue$/] - } - }] - }, - resolve: { - extensions: ['.ts', '.js', '.vue', '.css'] - }, - plugins: [ - new MiniCssExtractPlugin({ - filename: '[name].css', - chunkFilename: '[id].css' - }), - new webpack.DllReferencePlugin({ - manifest: manifestJson, - context: __dirname - }), - new VueLoaderPlugin() - ], - optimization: { - minimizer: [ - uglify, - new OptimizeCSSAssetsPlugin({}) +export const renderer: webpack.Configuration = { + // const manifestJson = fs.readJsonSync(manifestPath) + // console.log('Global variable name: ' + manifestJson.name) + mode, + target: 'electron-renderer', + entry: { + 'mishiro.renderer': path.join(__dirname, '../src/ts/renderer.ts'), + 'mishiro.live': path.join(__dirname, '../src/ts/renderer-game.ts') + }, + output: { + path: path.join(__dirname, '../public'), + filename: '[name].js' + }, + node: { + __dirname: false, + __filename: false + }, + module: { + rules: [{ + test: /\.vue$/, + exclude: /node_modules/, + loader: 'vue-loader' + }, { + test: /\.css$/, + exclude: /node_modules/, + use: [ + MiniCssExtractPlugin.loader, + { loader: 'css-loader', options: { url: false } } ] + }, { + test: /\.ts$/, + exclude: /node_modules/, + loader: 'ts-loader', + options: { + appendTsSuffixTo: [/\.vue$/] + } + }] + }, + resolve: { + extensions: ['.ts', '.js', '.vue', '.css'] + }, + externals: [webpackNodeExternals({ + whitelist: [/vue/] + })], + plugins: [ + new MiniCssExtractPlugin({ + filename: '[name].css', + chunkFilename: '[id].css' + }), + /* new webpack.DllReferencePlugin({ + manifest: manifestJson, + context: __dirname + }), */ + new VueLoaderPlugin() + ], + optimization: { + minimizer: [ + uglify, + new OptimizeCSSAssetsPlugin({}) + ], + splitChunks: { + cacheGroups: { + commons: { + test: /[\\/]node_modules[\\/]/, + name: 'dll', + chunks: 'all' + } + } } } + } diff --git a/app/script/webpack.ts b/app/script/webpack.ts index 6182939..3cc28df 100644 --- a/app/script/webpack.ts +++ b/app/script/webpack.ts @@ -1,11 +1,11 @@ import webpack from 'webpack' -import path from 'path' -import fs from 'fs-extra' -import { main, renderer, dll, mode, manifest } from './webpack.config' +// import path from 'path' +// import fs from 'fs-extra' +import { main, renderer, mode } from './webpack.config' const arg: string | undefined = process.argv.slice(2)[0] if (arg === 'dll') { - checkAndBundleDll() + // checkAndBundleDll() } else if (arg === 'webpack') { if (mode === 'production') prod() else dev() @@ -16,38 +16,36 @@ export function dev () { webpackWatch() function webpackWatch () { - checkAndBundleDll(() => { - const mainCompiler = webpack(main) - const rendererCompiler = webpack(renderer(manifest)) - const watchOptions = { - aggregateTimeout: 300, - poll: undefined - } + const mainCompiler = webpack(main) + const rendererCompiler = webpack(renderer) + const watchOptions = { + aggregateTimeout: 300, + poll: undefined + } - mainCompiler.watch(watchOptions, watchHandler()) - rendererCompiler.watch(watchOptions, watchHandler()) + mainCompiler.watch(watchOptions, watchHandler()) + rendererCompiler.watch(watchOptions, watchHandler()) - function watchHandler () { - return (err: Error, stats: webpack.Stats) => { - if (err) { - console.log(err) - return - } - console.log(stats.toString({ - colors: true, - children: false, - entrypoints: false, - modules: false - }) + '\n') + function watchHandler () { + return (err: Error, stats: webpack.Stats) => { + if (err) { + console.log(err) + return } + console.log(stats.toString({ + colors: true, + children: false, + entrypoints: false, + modules: false + }) + '\n') } - }) + } } } export function prod (callback?: Function): Promise { return new Promise((resolve, reject) => { - checkAndBundleDll(() => webpack([main, renderer(manifest)], (err, stats: any) => { + webpack([main, renderer], (err, stats: any) => { if (err) { console.log(err) reject(err) @@ -62,11 +60,11 @@ export function prod (callback?: Function): Promise { }) + '\n') } resolve() - })) + }) }) } -export function checkAndBundleDll (callback?: Function) { +/* export function checkAndBundleDll (callback?: Function) { const dllContent = getDllBundle() if (dllContent) { if (mode === 'production') { @@ -102,4 +100,4 @@ export function checkAndBundleDll (callback?: Function) { if (!fs.existsSync(dllFile)) return null return fs.readFileSync(dllFile, 'utf8') } -} +} */ diff --git a/app/src/ts/@types/vue.d.ts b/app/src/ts/@types/vue.d.ts index a008f74..bb1d5aa 100644 --- a/app/src/ts/@types/vue.d.ts +++ b/app/src/ts/@types/vue.d.ts @@ -22,7 +22,7 @@ declare module 'vue/types/vue' { // getDbUrl: (hash: string) => string // getCardUrl: (id: string | number) => string getIconUrl: (id: string | number) => string - + mainWindowId: number // Downloader: typeof Downloader } } diff --git a/app/src/ts/main.ts b/app/src/ts/main.ts index 24d277b..cbc0601 100644 --- a/app/src/ts/main.ts +++ b/app/src/ts/main.ts @@ -1,4 +1,4 @@ -import { app, BrowserWindow, ipcMain } from 'electron' +import { app, BrowserWindow, ipcMain, Event } from 'electron' import * as url from 'url' import getPath from './common/get-path' import './main/core' @@ -52,3 +52,7 @@ app.on('activate', function () { ipcMain.on('flash', () => { mainWindow && mainWindow.flashFrame(true) }) + +ipcMain.on('mainWindowId', (event: Event) => { + event.returnValue = mainWindow && mainWindow.id +}) diff --git a/app/src/ts/main/ipc.ts b/app/src/ts/main/ipc.ts index e94c587..a037f8f 100644 --- a/app/src/ts/main/ipc.ts +++ b/app/src/ts/main/ipc.ts @@ -3,6 +3,7 @@ import { ipcMain, Event } from 'electron' import onManifestRead from './on-manifest-read' import onMasterRead from './on-master-read' import onManifestQuery from './on-manifest-query' +import onManifestSearch from './on-manifest-search' import onAcb from './on-acb' import onVoiceDecode from './on-voice-decode' import onGame from './on-game' @@ -18,6 +19,10 @@ export default function () { onManifestQuery(event, queryString, manifests) }) + ipcMain.on('searchManifest', (event: Event, queryString: string) => { + onManifestSearch(event, queryString, manifests) + }) + ipcMain.on('readManifest', async (event: Event, manifestFile: string, resVer: number) => { let obj = await onManifestRead(event, manifestFile, resVer) manifests = obj.manifests @@ -25,7 +30,7 @@ export default function () { }) ipcMain.on('readMaster', (event: Event, masterFile: string) => { - onMasterRead(event, masterFile, manifestData, configurer.getConfig()) + onMasterRead(event, masterFile, manifestData, configurer.getConfig(), manifests) }) ipcMain.on('acb', (event: Event, acbPath: string, arg: string = '') => { diff --git a/app/src/ts/main/on-manifest-search.ts b/app/src/ts/main/on-manifest-search.ts new file mode 100644 index 0000000..1f4df64 --- /dev/null +++ b/app/src/ts/main/on-manifest-search.ts @@ -0,0 +1,10 @@ +import { Event } from 'electron' +export default function (event: Event, queryString: string, manifests: any[]) { + let manifestArr = [] + for (let i = 0; i < manifests.length; i++) { + if (manifests[i].name.indexOf(queryString) !== -1) { + manifestArr.push(manifests[i]) + } + } + event.returnValue = manifestArr +} diff --git a/app/src/ts/main/on-master-read.ts b/app/src/ts/main/on-master-read.ts index 1c72b3d..c0a6b01 100644 --- a/app/src/ts/main/on-master-read.ts +++ b/app/src/ts/main/on-master-read.ts @@ -10,7 +10,7 @@ import resolveGachaAvailable from './resolve-gacha-available' import resolveUserLevel from './resolve-user-level' import { openSqlite } from './sqlite3' -export default async function (event: Event, masterFile: string, manifestData: any, config: MishiroConfig) { +export default async function (event: Event, masterFile: string, manifestData: any, config: MishiroConfig, manifests: { name: string; hash: string; [x: string]: any }[]) { const timeOffset = (9 - (-(new Date().getTimezoneOffset() / 60))) * 60 * 60 * 1000 const now = new Date().getTime() @@ -63,6 +63,10 @@ export default async function (event: Event, masterFile: string, manifestData: a userLevel = resolveUserLevel(userLevel) + let gachaIcon: { name: string; hash: string; [x: string]: any }[] = gachaAvailable.map((o: any) => { + return manifests.filter(m => m.name === `card_${o.reward_id}_m.unity3d`)[0] + }) + event.sender.send('readMaster', { eventAll, eventData, @@ -75,6 +79,7 @@ export default async function (event: Event, masterFile: string, manifestData: a gachaData, gachaAvailable, gachaNow, + gachaIcon, userLevel, timeOffset }) @@ -92,6 +97,7 @@ export interface MasterData { gachaData: any[] gachaAvailable: any[] gachaNow: any + gachaIcon: { name: string; hash: string; [x: string]: any }[] userLevel: any[] timeOffset: number } diff --git a/app/src/ts/renderer/mishiro-idol.ts b/app/src/ts/renderer/mishiro-idol.ts index 2f3f220..9462472 100644 --- a/app/src/ts/renderer/mishiro-idol.ts +++ b/app/src/ts/renderer/mishiro-idol.ts @@ -9,6 +9,7 @@ import { ipcRenderer, shell, Event } from 'electron' import { MasterData } from '../main/on-master-read' import { Vue, Component, Prop } from 'vue-property-decorator' import { ProgressInfo } from 'mishiro-core' +import win from './win' @Component({ components: { @@ -278,9 +279,9 @@ export default class extends Vue { if (Number(card.rarity) > 4) { if (!fs.existsSync(cardDir(`bg_${card.id}.png`))) { try { - let result = await this.downloadCard(card.id) - this.imgProgress = 0 - if (result) { + let result = await this.downloadCard(card.id, 'idolSelect') + if (result && result !== 'await ipc') { + this.imgProgress = 0 this.event.$emit('idolSelect', card.id) } } catch (errorPath) { @@ -341,7 +342,7 @@ export default class extends Vue { 'v', hash, voiceDir(`card_${id}`, `card_${id}.acb`), - prog => { this.imgProgress = prog.loading / 4 } + prog => { this.imgProgress = 25 + prog.loading / 4 } ) // if (cardDl) { this.imgProgress = 50 @@ -377,19 +378,42 @@ export default class extends Vue { this.event.$emit('alert', this.$t('home.errorTitle'), this.$t('idol.noVoice')) } } - async downloadCard (id: number | string, progressing?: (prog: ProgressInfo) => void) { + async downloadCard (id: number | string, data?: any, progressing?: (prog: ProgressInfo) => void) { + let downloadResult: string = '' - // downloadResult = await this.dler.downloadOne( - // this.getCardUrl(id), - // cardDir(`bg_${id}.png`), - // (progressing || (prog => { this.imgProgress = prog.loading })) - // ) - downloadResult = await this.dler.downloadSpread( - id.toString(), - cardDir(`bg_${id}.png`), - (progressing || (prog => { this.imgProgress = prog.loading })) - ) - return downloadResult + + try { + if (!fs.existsSync(cardDir(`bg_${id}.png`))) { + let hash: string = ipcRenderer.sendSync('searchManifest', `card_bg_${id}.unity3d`)[0].hash + downloadResult = await this.dler.downloadAsset( + hash, + cardDir(`card_bg_${id}`), + (progressing || (prog => { this.imgProgress = prog.loading })) + ) + if (downloadResult) { + this.imgProgress = 99.99 + fs.removeSync(cardDir(`card_bg_${id}`)) + if (win) win.webContents.send('texture2d', cardDir(`card_bg_${id}.unity3d`), { data, id, asset: cardDir(`card_bg_${id}.unity3d`) }, this.mainWindowId) + return 'await ipc' + // await this.core.util.unpackTexture2D(cardDir(`card_bg_${id}.unity3d`)) + } else { + throw new Error('downloadAsset() failed') + } + } + return cardDir(`card_bg_${id}`) + } catch (_err) { + // downloadResult = await this.dler.downloadOne( + // this.getCardUrl(id), + // cardDir(`bg_${id}.png`), + // (progressing || (prog => { this.imgProgress = prog.loading })) + // ) + downloadResult = await this.dler.downloadSpread( + id.toString(), + cardDir(`bg_${id}.png`), + (progressing || (prog => { this.imgProgress = prog.loading })) + ) + return downloadResult + } } toggle (practice: string) { switch (practice) { @@ -461,6 +485,20 @@ export default class extends Vue { ipcRenderer.on('singleHca', (_event: Event, cur: number, total: number) => { this.imgProgress = 50 + 50 * cur / total }) + ipcRenderer.on('texture2d', (_event: Event, err: Error | null, _pngs: string[] | null, data: any) => { + this.imgProgress = 0 + if (err) { + this.event.$emit('alert', this.$t('home.errorTitle'), err && err.message) + return + } + + if (data.data) { + this.event.$emit(data.data, data.id) + if (data.data === 'eventBgReady') { + this.event.$emit('_eventBgReady') + } + } + }) }) } } diff --git a/app/src/ts/renderer/mishiro-update.ts b/app/src/ts/renderer/mishiro-update.ts index b46c602..000aa15 100644 --- a/app/src/ts/renderer/mishiro-update.ts +++ b/app/src/ts/renderer/mishiro-update.ts @@ -7,9 +7,10 @@ import ProgressBar from '../../vue/component/ProgressBar.vue' import check from './check' import { ipcRenderer, Event } from 'electron' -import getPath, { manifestPath, masterPath, bgmDir } from '../common/get-path' +import getPath, { manifestPath, masterPath, bgmDir, iconDir } from '../common/get-path' import MishiroIdol from './mishiro-idol' import ThePlayer from './the-player' +import win from './win' @Component({ components: { @@ -119,6 +120,24 @@ export default class extends Vue { }) } + getGachaIcon (icons: { name: string; hash: string; [x: string]: any }[]) { + return new Promise(async (resolve, _reject) => { + for (let i = 0; i < icons.length; i++) { + let cacheName = iconDir(path.parse(icons[i].name).name) + this.text = icons[i].name + '　' + i + '/' + icons.length + this.loading = 100 * i / icons.length + if (!fs.existsSync(cacheName + '.png')) { + let asset = await this.dler.downloadAsset(icons[i].hash, cacheName) + if (asset) { + fs.removeSync(cacheName) + if (win) win.webContents.send('texture2d', asset, { data: null }, this.mainWindowId) + } + } + } + resolve() + }) + } + mounted () { this.$nextTick(() => { this.text = this.$t('update.check') as string @@ -210,13 +229,23 @@ export default class extends Vue { let downloadCard = new MishiroIdol().downloadCard + const tmpawait = () => new Promise((resolve) => { + this.event.$once('_eventBgReady', () => { + resolve() + }) + }) + + let getBackgroundResult: string = '' + const getBackground = async (id: string | number) => { try { - let result = await downloadCard.call(this, id, (prog: ProgressInfo) => { + getBackgroundResult = await downloadCard.call(this, id, 'eventBgReady', (prog: ProgressInfo) => { this.text = prog.name || '' this.loading = prog.loading }) - if (result) { + + this.loading = 99.99 + if (getBackgroundResult && getBackgroundResult !== 'await ipc') { this.event.$emit('eventBgReady', id) } } catch (err) { @@ -232,9 +261,12 @@ export default class extends Vue { await getBackground(Number(cardId[0]) + 1) } } + + if (getBackgroundResult === 'await ipc') await tmpawait() + if (masterData.eventHappening) this.event.$emit('eventRewardCard', cardId) - let iconId = [] + /* let iconId = [] for (let index = 0; index < masterData.gachaAvailable.length; index++) { iconId.push(masterData.gachaAvailable[index].reward_id) } @@ -245,7 +277,9 @@ export default class extends Vue { this.loading = 100 * downloader.index / iconTask.length }, prog => { this.loading = 100 * downloader.index / iconTask.length + prog.loading / iconTask.length - }) + }) */ + + await this.getGachaIcon(masterData.gachaIcon) // console.log(failedList) this.emitReady() }) diff --git a/app/src/ts/renderer/vue-global.ts b/app/src/ts/renderer/vue-global.ts index 12411b5..2cc399a 100644 --- a/app/src/ts/renderer/vue-global.ts +++ b/app/src/ts/renderer/vue-global.ts @@ -1,4 +1,4 @@ -import { remote } from 'electron' +import { remote, ipcRenderer } from 'electron' import { iconDir/* , cardDir */ } from '../common/get-path' // import Downloader from './downloader' import { PluginFunction } from 'Vue' @@ -52,7 +52,7 @@ const install: PluginFunction = function (Vue) { // Vue.prototype.getDbUrl = getDbUrl // Vue.prototype.getCardUrl = getCardUrl Vue.prototype.getIconUrl = getIconUrl - + Vue.prototype.mainWindowId = ipcRenderer.sendSync('mainWindowId') // 全局类 // Vue.prototype.Downloader = Downloader } diff --git a/app/src/ts/renderer/win.ts b/app/src/ts/renderer/win.ts new file mode 100644 index 0000000..f26486e --- /dev/null +++ b/app/src/ts/renderer/win.ts @@ -0,0 +1,30 @@ +import { remote, BrowserWindow } from 'electron' + +let win: BrowserWindow | null = new remote.BrowserWindow({ width: 346, height: 346, show: false, parent: remote.BrowserWindow.getFocusedWindow() }) + +win.loadURL(`data:text/html, + +`) + +window.addEventListener('beforeunload', () => { + if (win) win.close() + win = null +}) + +export default win diff --git a/dist/mishiro-x64.nsi b/dist/mishiro-x64.nsi index e597a8b..a979fc3 100644 --- a/dist/mishiro-x64.nsi +++ b/dist/mishiro-x64.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "mishiro" -!define PRODUCT_VERSION "1.3.4" +!define PRODUCT_VERSION "1.3.6" !define PRODUCT_PUBLISHER "Toyobayashi" !define PRODUCT_WEB_SITE "https://github.com/toyobayashi/mishiro" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" diff --git a/dist/mishiro.nsi b/dist/mishiro.nsi index ec8def0..eb06f6c 100644 --- a/dist/mishiro.nsi +++ b/dist/mishiro.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "mishiro" -!define PRODUCT_VERSION "1.3.4" +!define PRODUCT_VERSION "1.3.6" !define PRODUCT_PUBLISHER "Toyobayashi" !define PRODUCT_WEB_SITE "https://github.com/toyobayashi/mishiro" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"