diff --git a/.flowconfig b/.flowconfig index bad57bc52f6..c3375a68bc5 100644 --- a/.flowconfig +++ b/.flowconfig @@ -28,10 +28,10 @@ suppress_type=$FlowFixMe suppress_type=$FixMe suppress_type=$FlowExpectedError -suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-1]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*www[a-z,_]*\\)?)\\) -suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-1]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*www[a-z,_]*\\)?)\\)?:? #[0-9]+ +suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-3]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*www[a-z,_]*\\)?)\\) +suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-3]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*www[a-z,_]*\\)?)\\)?:? #[0-9]+ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError [version] -^0.31.0 +^0.33.0 diff --git a/package.json b/package.json index 0629a56ede3..ecca7d937e4 100644 --- a/package.json +++ b/package.json @@ -43,9 +43,9 @@ "eslint": "1.10.3", "eslint-plugin-react": "4.1.0", "eslint-plugin-react-internal": "file:eslint-rules", - "fbjs": "^0.8.4", + "fbjs": "^0.8.5", "fbjs-scripts": "^0.6.0", - "flow-bin": "^0.31.0", + "flow-bin": "^0.33.0", "glob": "^6.0.1", "grunt": "^0.4.5", "grunt-cli": "^0.1.13", diff --git a/src/renderers/dom/client/eventPlugins/SimpleEventPlugin.js b/src/renderers/dom/client/eventPlugins/SimpleEventPlugin.js index 5b30244cc64..e48578eb6ae 100644 --- a/src/renderers/dom/client/eventPlugins/SimpleEventPlugin.js +++ b/src/renderers/dom/client/eventPlugins/SimpleEventPlugin.js @@ -156,7 +156,7 @@ function isInteractive(tag) { ); } -function shouldPreventMouseEvent(inst) { +function shouldPreventMouseEvent(inst?: SyntheticEvent) { if (inst) { var disabled = inst._currentElement && inst._currentElement.props.disabled; diff --git a/src/renderers/native/NativeMethodsMixin.js b/src/renderers/native/NativeMethodsMixin.js index 13df0f73b92..61f6b3e84bf 100644 --- a/src/renderers/native/NativeMethodsMixin.js +++ b/src/renderers/native/NativeMethodsMixin.js @@ -212,6 +212,7 @@ function mountSafeCallback( callback: ?Function ): any { return function() { + // $FlowFixMe(>=0.33.0) if (!callback || (context.isMounted && !context.isMounted())) { return undefined; } diff --git a/src/renderers/shared/ReactDebugTool.js b/src/renderers/shared/ReactDebugTool.js index 0f596124600..f7edbfbc745 100644 --- a/src/renderers/shared/ReactDebugTool.js +++ b/src/renderers/shared/ReactDebugTool.js @@ -239,7 +239,6 @@ function resumeCurrentLifeCycleTimer() { var lastMarkTimeStamp = 0; var canUsePerformanceMeasure: boolean = -// $FlowFixMe https://github.com/facebook/flow/issues/2345 typeof performance !== 'undefined' && typeof performance.mark === 'function' && typeof performance.clearMarks === 'function' && diff --git a/src/renderers/shared/fiber/ReactFiberBeginWork.js b/src/renderers/shared/fiber/ReactFiberBeginWork.js index 3d6266227c6..d135dfc9c6d 100644 --- a/src/renderers/shared/fiber/ReactFiberBeginWork.js +++ b/src/renderers/shared/fiber/ReactFiberBeginWork.js @@ -382,6 +382,7 @@ module.exports = function(config : HostConfig, getSchedu return null; case HostComponent: if (workInProgress.stateNode && config.beginUpdate) { + // $FlowFixMe(>=0.33.0) config.beginUpdate(workInProgress.stateNode); } return updateHostComponent(current, workInProgress); diff --git a/src/renderers/shared/utils/ReactErrorUtils.js b/src/renderers/shared/utils/ReactErrorUtils.js index 25bed212bb8..1295908b822 100644 --- a/src/renderers/shared/utils/ReactErrorUtils.js +++ b/src/renderers/shared/utils/ReactErrorUtils.js @@ -77,7 +77,6 @@ if (__DEV__) { var evtType = `react-${name}`; fakeNode.addEventListener(evtType, boundFunc, false); var evt = document.createEvent('Event'); - // $FlowFixMe https://github.com/facebook/flow/issues/2336 evt.initEvent(evtType, false, false); fakeNode.dispatchEvent(evt); fakeNode.removeEventListener(evtType, boundFunc, false);