From 2e973f4ca4266c0f13573fefb9158dd8772411f4 Mon Sep 17 00:00:00 2001 From: Evan You Date: Wed, 27 Sep 2017 17:32:44 -0400 Subject: [PATCH] build: bump flow version --- package-lock.json | 93 ++++++++++++++++---------------------------- package.json | 2 +- src/core/util/env.js | 5 ++- 3 files changed, 38 insertions(+), 62 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6b5f0267552..86fb1f633af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,16 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "JSONStream": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz", + "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=", + "dev": true, + "requires": { + "jsonparse": "1.3.1", + "through": "2.3.8" + } + }, "abbrev": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", @@ -2080,8 +2090,8 @@ "integrity": "sha512-8od6g684Fhi5Vpp4ABRv/RBsW1AY6wSHbJHEK6FGTv+8jvAAnlABniZu/FVmX9TcirkHepaEsa1QGkRvbg0CKw==", "dev": true, "requires": { - "is-text-path": "1.0.1", "JSONStream": "1.3.1", + "is-text-path": "1.0.1", "lodash": "4.17.4", "meow": "3.7.0", "split2": "2.1.1", @@ -3402,9 +3412,9 @@ } }, "flow-bin": { - "version": "0.48.0", - "resolved": "https://registry.npmjs.org/flow-bin/-/flow-bin-0.48.0.tgz", - "integrity": "sha1-ctB1FDUkNY24kBUl48eE3BOnx+4=", + "version": "0.54.1", + "resolved": "https://registry.npmjs.org/flow-bin/-/flow-bin-0.54.1.tgz", + "integrity": "sha1-cQG8zPAG3AZScUqK7wxyB4p2BRA=", "dev": true }, "flow-remove-types-no-whitespace": { @@ -4261,14 +4271,6 @@ } } }, - "string_decoder": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, "string-width": { "version": "1.0.2", "bundled": true, @@ -4279,6 +4281,14 @@ "strip-ansi": "3.0.1" } }, + "string_decoder": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "5.0.1" + } + }, "stringstream": { "version": "0.0.5", "bundled": true, @@ -5470,15 +5480,6 @@ "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", "dev": true }, - "jsonp": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/jsonp/-/jsonp-0.2.1.tgz", - "integrity": "sha1-pltPoPEL2nGaBUQep7lMVfPhW64=", - "dev": true, - "requires": { - "debug": "2.6.8" - } - }, "jsonparse": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", @@ -5491,16 +5492,6 @@ "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", "dev": true }, - "JSONStream": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz", - "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=", - "dev": true, - "requires": { - "jsonparse": "1.3.1", - "through": "2.3.8" - } - }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", @@ -8307,15 +8298,6 @@ "xtend": "4.0.1" } }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -8327,6 +8309,15 @@ "strip-ansi": "3.0.1" } }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", @@ -9153,21 +9144,11 @@ } }, "weex-js-runtime": { - "version": "0.20.9", - "resolved": "https://registry.npmjs.org/weex-js-runtime/-/weex-js-runtime-0.20.9.tgz", - "integrity": "sha512-O6L0nVIfxAEwWanJa6x+DkBZE/7jXSk+eVgRvOVC4Vxj55TQTni8Qq2YTBWjy2dk36+FXWiXNgTcnRcae9z5aA==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/weex-js-runtime/-/weex-js-runtime-0.22.0.tgz", + "integrity": "sha512-NF/QvX9Ms30V/Il76+Jj+ETb+VaSkj8JKWU/HLwXvn/sgy9Z2GvPmJjsf7/Y/xaXgyW0QejN4g5JtHPPTPOUOw==", "dev": true }, - "weex-vdom-tester": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/weex-vdom-tester/-/weex-vdom-tester-0.2.0.tgz", - "integrity": "sha1-MnOraamcV8klojC0s9C2u666Ih4=", - "dev": true, - "requires": { - "jsonp": "0.2.1", - "xhr2": "0.1.4" - } - }, "which": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", @@ -9242,12 +9223,6 @@ "integrity": "sha1-OS2LotDxw00e4tYw8V0O+2jhBIo=", "dev": true }, - "xhr2": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.1.4.tgz", - "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8=", - "dev": true - }, "xmlhttprequest-ssl": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz", diff --git a/package.json b/package.json index 04546c1e0ba..679f85b53a8 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "eslint-plugin-jasmine": "^2.2.0", "eslint-plugin-vue-libs": "^1.2.0", "file-loader": "^0.11.2", - "flow-bin": "^0.48.0", + "flow-bin": "^0.54.0", "hash-sum": "^1.0.2", "he": "^1.1.1", "http-server": "^0.10.0", diff --git a/src/core/util/env.js b/src/core/util/env.js index 5609a247848..0f886150e88 100644 --- a/src/core/util/env.js +++ b/src/core/util/env.js @@ -86,7 +86,7 @@ export const nextTick = (function () { // UIWebView in iOS >= 9.3.3 when triggered in touch event handlers. It // completely stops working after triggering a few times... so, if native // Promise is available, we will use it: - /* istanbul ignore if */ + /* istanbul ignore if */ // $flow-disable-line if (typeof Promise !== 'undefined' && isNative(Promise)) { var p = Promise.resolve() var logError = err => { console.error(err) } @@ -141,6 +141,7 @@ export const nextTick = (function () { pending = true timerFunc() } + // $flow-disable-line if (!cb && typeof Promise !== 'undefined') { return new Promise((resolve, reject) => { _resolve = resolve @@ -150,7 +151,7 @@ export const nextTick = (function () { })() let _Set -/* istanbul ignore if */ +/* istanbul ignore if */ // $flow-disable-line if (typeof Set !== 'undefined' && isNative(Set)) { // use native Set when available. _Set = Set