From 984eef8f9e75fbd8e4e0ffeb90e201bdc1923dc0 Mon Sep 17 00:00:00 2001 From: Stephy Ma Date: Wed, 14 Nov 2018 23:01:53 -0800 Subject: [PATCH] Revert D12994045: Flow v0.86.0 in xplat/js [3/n] Differential Revision: D12994045 Original commit changeset: 04552bf081ba fbshipit-source-id: 062b367b88a966a6efc895c99e9911f0ec0fe8ff --- .flowconfig | 2 +- .flowconfig.android | 2 +- .../Animated/src/nodes/AnimatedInterpolation.js | 3 +++ Libraries/Components/ScrollView/ScrollView.js | 4 ++-- Libraries/ReactNative/UIManagerStatTracker.js | 12 ------------ local-cli/templates/HelloWorld/_flowconfig | 2 +- package.json | 2 +- yarn.lock | 8 ++++---- 8 files changed, 13 insertions(+), 22 deletions(-) diff --git a/.flowconfig b/.flowconfig index 41bc5c577..bee33ca3d 100644 --- a/.flowconfig +++ b/.flowconfig @@ -101,4 +101,4 @@ untyped-import untyped-type-import [version] -^0.86.0 +^0.85.0 diff --git a/.flowconfig.android b/.flowconfig.android index 4f106740f..0a3ce6b35 100644 --- a/.flowconfig.android +++ b/.flowconfig.android @@ -101,4 +101,4 @@ untyped-import untyped-type-import [version] -^0.86.0 +^0.85.0 diff --git a/Libraries/Animated/src/nodes/AnimatedInterpolation.js b/Libraries/Animated/src/nodes/AnimatedInterpolation.js index cc73ead39..d314e0780 100644 --- a/Libraries/Animated/src/nodes/AnimatedInterpolation.js +++ b/Libraries/Animated/src/nodes/AnimatedInterpolation.js @@ -349,6 +349,9 @@ class AnimatedInterpolation extends AnimatedWithChildren { __transformDataType(range: Array) { // Change the string array type to number array // So we can reuse the same logic in iOS and Android platform + /* $FlowFixMe(>=0.70.0 site=react_native_fb) This comment suppresses an + * error found when Flow v0.70 was deployed. To see the error delete this + * comment and run Flow. */ return range.map(function(value) { if (typeof value !== 'string') { return value; diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js index f1c222526..fd0986f0f 100644 --- a/Libraries/Components/ScrollView/ScrollView.js +++ b/Libraries/Components/ScrollView/ScrollView.js @@ -396,8 +396,8 @@ export type Props = $ReadOnly<{| * - `false`, deprecated, use 'never' instead * - `true`, deprecated, use 'always' instead */ - /* $FlowFixMe(>=0.86.0 site=react_native_fb) This comment suppresses an error - * found when Flow v0.86 was deployed. To see the error, delete this comment + /* $FlowFixMe(>=0.85.0 site=react_native_fb) This comment suppresses an error + * found when Flow v0.85 was deployed. To see the error, delete this comment * and run Flow. */ keyboardShouldPersistTaps?: ?('always' | 'never' | 'handled' | false | true), /** diff --git a/Libraries/ReactNative/UIManagerStatTracker.js b/Libraries/ReactNative/UIManagerStatTracker.js index 0543afdbd..78e3e0b14 100644 --- a/Libraries/ReactNative/UIManagerStatTracker.js +++ b/Libraries/ReactNative/UIManagerStatTracker.js @@ -33,18 +33,12 @@ const UIManagerStatTracker = { const createViewOrig = UIManager.createView; UIManager.createView = function(tag, className, rootTag, props) { incStat('createView', 1); - /* $FlowFixMe(>=0.86.0 site=react_native_fb) This comment suppresses an - * error found when Flow v0.86 was deployed. To see the error, delete - * this comment and run Flow. */ incStat('setProp', Object.keys(props || []).length); createViewOrig(tag, className, rootTag, props); }; const updateViewOrig = UIManager.updateView; UIManager.updateView = function(tag, className, props) { incStat('updateView', 1); - /* $FlowFixMe(>=0.86.0 site=react_native_fb) This comment suppresses an - * error found when Flow v0.86 was deployed. To see the error, delete - * this comment and run Flow. */ incStat('setProp', Object.keys(props || []).length); updateViewOrig(tag, className, props); }; @@ -58,13 +52,7 @@ const UIManagerStatTracker = { remove, ) { incStat('manageChildren', 1); - /* $FlowFixMe(>=0.86.0 site=react_native_fb) This comment suppresses an - * error found when Flow v0.86 was deployed. To see the error, delete - * this comment and run Flow. */ incStat('move', Object.keys(moveFrom || []).length); - /* $FlowFixMe(>=0.86.0 site=react_native_fb) This comment suppresses an - * error found when Flow v0.86 was deployed. To see the error, delete - * this comment and run Flow. */ incStat('remove', Object.keys(remove || []).length); manageChildrenOrig(tag, moveFrom, moveTo, addTags, addIndices, remove); }; diff --git a/local-cli/templates/HelloWorld/_flowconfig b/local-cli/templates/HelloWorld/_flowconfig index 9bded78be..f3eb74de6 100644 --- a/local-cli/templates/HelloWorld/_flowconfig +++ b/local-cli/templates/HelloWorld/_flowconfig @@ -67,4 +67,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError [version] -^0.86.0 +^0.85.0 diff --git a/package.json b/package.json index 61edf7456..934e2bc30 100644 --- a/package.json +++ b/package.json @@ -219,7 +219,7 @@ "eslint-plugin-prettier": "2.6.0", "eslint-plugin-react": "7.8.2", "eslint-plugin-react-native": "3.5.0", - "flow-bin": "^0.86.0", + "flow-bin": "^0.85.0", "jest": "24.0.0-alpha.6", "jest-junit": "5.2.0", "prettier": "1.13.6", diff --git a/yarn.lock b/yarn.lock index 869f2b54c..42ee42ecb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2586,10 +2586,10 @@ flat-cache@^1.2.1: graceful-fs "^4.1.2" write "^0.2.1" -flow-bin@^0.86.0: - version "0.86.0" - resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.86.0.tgz#153a28722b4dc13b7200c74b644dd4d9f4969a11" - integrity sha512-ulRvFH3ewGIYwg+qPk/OJXoe3Nhqi0RyR0wqgK0b1NzUDEC6O99zU39MBTickXvlrr6iwRO6Wm4lVGeDmnzbew== +flow-bin@^0.85.0: + version "0.85.0" + resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.85.0.tgz#a3ca80748a35a071d5bbb2fcd61d64d977fc53a6" + integrity sha512-ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ== for-in@^1.0.1, for-in@^1.0.2: version "1.0.2"