{"patch":"diff --git a\/.flowconfig b\/.flowconfig\nindex 7e631856fa..94ffcb54a2 100644\n--- a\/.flowconfig\n+++ b\/.flowconfig\n@@ -1,5 +1,6 @@\n [ignore]\n \n+.*\/examples\/.*\n .*\/build\/.*\n .*\/node_modules\/y18n\/.*\n .*\/__mocks__\/.*\n@@ -20,6 +21,8 @@ module.system=haste\n esproposal.class_static_fields=enable\n esproposal.class_instance_fields=enable\n \n+experimental.strict_type_args=true\n+\n munge_underscores=false\n \n suppress_type=$FlowIssue\n@@ -31,4 +34,4 @@ suppress_comment=\\\$.\\\\|\\n\\\$*\\\\$FlowIssue\\\$(\\\\(>=0\\\\.\\\\(2[0-4]\\\\|1[0-9]\\\\|[0-9\n suppress_comment=\\\\(.\\\\|\\n\\\$*\\\\$FlowFixedInNextDeploy\n \n [version]\n-^0.24.0\n+^0.26.0\ndiff --git a\/package.json b\/package.json\nindex c8d41013c8..72adfbb428 100644\n--- a\/package.json\n+++ b\/package.json\n@@ -43,7 +43,7 @@\n \"eslint-plugin-react-internal\": \"file:eslint-rules\",\n \"fbjs\": \"^0.8.1\",\n \"fbjs-scripts\": \"^0.6.0\",\n- \"flow-bin\": \"^0.24.0\",\n+ \"flow-bin\": \"^0.26.0\",\n \"glob\": \"^6.0.1\",\n \"grunt\": \"^0.4.5\",\n \"grunt-cli\": \"^0.1.13\",\ndiff --git a\/src\/renderers\/native\/NativeMethodsMixin.js b\/src\/renderers\/native\/NativeMethodsMixin.js\nindex 0d06e11fef..9b78ed1f9d 100644\n--- a\/src\/renderers\/native\/NativeMethodsMixin.js\n+++ b\/src\/renderers\/native\/NativeMethodsMixin.js\n@@ -207,7 +207,10 @@ if (__DEV__) {\n * In the future, we should cleanup callbacks by cancelling them instead of\n * using this.\n *\/\n-var mountSafeCallback = function(context: ReactComponent, callback: ?Function): any {\n+function mountSafeCallback(\n+ context: ReactComponent,\n+ callback: ?Function\n+): any {\n return function() {\n if (!callback || (context.isMounted && !context.isMounted())) {\n return undefined;\ndiff --git a\/src\/renderers\/native\/ReactNative.js b\/src\/renderers\/native\/ReactNative.js\nindex e40c6b7576..0305ff2447 100644\n--- a\/src\/renderers\/native\/ReactNative.js\n+++ b\/src\/renderers\/native\/ReactNative.js\n@@ -28,7 +28,7 @@ var render = function(\n element: ReactElement,\n mountInto: number,\n callback?: ?(() => void)\n-): ?ReactComponent {\n+): ?ReactComponent {\n return ReactNativeMount.renderComponent(element, mountInto, callback);\n };\n \ndiff --git a\/src\/renderers\/native\/ReactNativeAttributePayload.js b\/src\/renderers\/native\/ReactNativeAttributePayload.js\nindex 54912f3546..8882f1131d 100644\n--- a\/src\/renderers\/native\/ReactNativeAttributePayload.js\n+++ b\/src\/renderers\/native\/ReactNativeAttributePayload.js\n@@ -394,9 +394,9 @@ function diffProperties(\n \/\/ default: fallthrough case when nested properties are defined\n removedKeys = null;\n removedKeyCount = 0;\n- \/\/ $FlowFixMe - We think that attributeConfig is not\n- \/\/ CustomAttributeConfiguration at this point so we assume\n- \/\/ it must be AttributeConfiguration.\n+ \/\/ We think that attributeConfig is not CustomAttributeConfiguration at\n+ \/\/ this point so we assume it must be AttributeConfiguration.\n+ \/\/ $FlowFixMe\n updatePayload = diffNestedProperty(\n updatePayload,\n prevProp,\ndiff --git a\/src\/renderers\/native\/ReactNativeMount.js b\/src\/renderers\/native\/ReactNativeMount.js\nindex 0694ec262c..8fc575d97f 100644\n--- a\/src\/renderers\/native\/ReactNativeMount.js\n+++ b\/src\/renderers\/native\/ReactNativeMount.js\n@@ -101,7 +101,7 @@ var ReactNativeMount = {\n nextElement: ReactElement,\n containerTag: number,\n callback?: ?(() => void)\n- ): ?ReactComponent {\n+ ): ?ReactComponent {\n var nextWrappedElement = new ReactElement(\n TopLevelWrapper,\n null,\n@@ -237,7 +237,7 @@ var ReactNativeMount = {\n * @see {ReactNativeMount.unmountComponentAtNode}\n *\/\n unmountComponentFromNode: function(\n- instance: ReactComponent,\n+ instance: ReactComponent,\n containerID: number\n ) {\n \/\/ Call back into native to remove all of the subviews from this container\ndiff --git a\/src\/renderers\/native\/createReactNativeComponentClass.js b\/src\/renderers\/native\/createReactNativeComponentClass.js\nindex 123e42fa78..adb0740bcf 100644\n--- a\/src\/renderers\/native\/createReactNativeComponentClass.js\n+++ b\/src\/renderers\/native\/createReactNativeComponentClass.js\n@@ -42,7 +42,7 @@ var createReactNativeComponentClass = function(\n Constructor.prototype = new ReactNativeBaseComponent(viewConfig);\n Constructor.prototype.constructor = Constructor;\n \n- return ((Constructor: any): ReactClass);\n+ return ((Constructor: any): ReactClass);\n };\n \n module.exports = createReactNativeComponentClass;\ndiff --git a\/src\/renderers\/noop\/ReactNoop.js b\/src\/renderers\/noop\/ReactNoop.js\nindex b1d63ec9d3..1b411a2f3f 100644\n--- a\/src\/renderers\/noop\/ReactNoop.js\n+++ b\/src\/renderers\/noop\/ReactNoop.js\n@@ -40,7 +40,7 @@ var NoopRenderer = ReactFiberReconciler({\n \n var ReactNoop = {\n \n- render(element : ReactElement) {\n+ render(element : ReactElement) {\n \n NoopRenderer.mountNewRoot(element);\n \ndiff --git a\/src\/renderers\/shared\/fiber\/ReactChildFiber.js b\/src\/renderers\/shared\/fiber\/ReactChildFiber.js\nindex bbb666cab0..5461d40515 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactChildFiber.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactChildFiber.js\n@@ -35,7 +35,7 @@ function createSubsequentChild(parent : Fiber, previousSibling : Fiber, newChild\n \n switch (newChildren.$$typeof) {\n case REACT_ELEMENT_TYPE: {\n- const element = (newChildren : ReactElement);\n+ const element = (newChildren : ReactElement);\n const child = ReactFiber.createFiberFromElement(element);\n previousSibling.sibling = child;\n child.parent = parent;\n@@ -80,7 +80,7 @@ function createFirstChild(parent, newChildren) {\n \n switch (newChildren.$$typeof) {\n case REACT_ELEMENT_TYPE: {\n- const element = (newChildren : ReactElement);\n+ const element = (newChildren : ReactElement);\n const child = ReactFiber.createFiberFromElement(element);\n child.parent = parent;\n return child;\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js b\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\nindex 4a13a6531b..c590e35f3e 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\n@@ -39,7 +39,7 @@ export type HostConfig = {\n type OpaqueID = {};\n \n export type Reconciler = {\n- mountNewRoot(element : ReactElement) : OpaqueID;\n+ mountNewRoot(element : ReactElement) : OpaqueID;\n };\n \n module.exports = function(config : HostConfig) : Reconciler {\n@@ -109,7 +109,7 @@ module.exports = function(config : HostConfig) : Reconciler {\n \n return {\n \n- mountNewRoot(element : ReactElement) : OpaqueID {\n+ mountNewRoot(element : ReactElement) : OpaqueID {\n \n ensureLowPriIsScheduled();\n \ndiff --git a\/src\/renderers\/shared\/fiber\/isomorphic\/ReactTypes.js b\/src\/renderers\/shared\/fiber\/isomorphic\/ReactTypes.js\nindex 4c8c69571c..643048b469 100644\n--- a\/src\/renderers\/shared\/fiber\/isomorphic\/ReactTypes.js\n+++ b\/src\/renderers\/shared\/fiber\/isomorphic\/ReactTypes.js\n@@ -14,7 +14,7 @@\n \n import type { ReactCoroutine, ReactYield } from 'ReactCoroutine';\n \n-export type ReactNode = ReactElement | ReactCoroutine | ReactYield | ReactText | ReactFragment;\n+export type ReactNode = ReactElement | ReactCoroutine | ReactYield | ReactText | ReactFragment;\n \n export type ReactFragment = ReactEmpty | Iterable;\n \ndiff --git a\/src\/renderers\/testing\/ReactTestMount.js b\/src\/renderers\/testing\/ReactTestMount.js\nindex 517d1c0839..45e6cfd290 100644\n--- a\/src\/renderers\/testing\/ReactTestMount.js\n+++ b\/src\/renderers\/testing\/ReactTestMount.js\n@@ -96,7 +96,7 @@ var ReactHostMount = {\n \n render: function(\n nextElement: ReactElement\n- ): ?ReactComponent {\n+ ): ?ReactElement {\n var nextWrappedElement = new ReactElement(\n TopLevelWrapper,\n null,\n","commit":{"revision":"d3b36d5524594a76314717e06e14f8839640ecb7","shortRevision":"d3b36d5524","authorName":"Paul O’Shannessy","authorEmail":"paul@oshannessy.com","subject":"Merge pull request #6957 from zpao\/flow026","authoredAt":"2016-06-03T13:17:15-07:00"},"files":[{"status":"M","path":".flowconfig"},{"status":"M","path":"package.json"},{"status":"M","path":"src\/renderers\/native\/NativeMethodsMixin.js"},{"status":"M","path":"src\/renderers\/native\/ReactNative.js"},{"status":"M","path":"src\/renderers\/native\/ReactNativeAttributePayload.js"},{"status":"M","path":"src\/renderers\/native\/ReactNativeMount.js"},{"status":"M","path":"src\/renderers\/native\/createReactNativeComponentClass.js"},{"status":"M","path":"src\/renderers\/noop\/ReactNoop.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactChildFiber.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiberReconciler.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/isomorphic\/ReactTypes.js"},{"status":"M","path":"src\/renderers\/testing\/ReactTestMount.js"}],"parents":["6b3f11cdd7fc6ce5335adf24c1dbfbb0b4854c14","dd093faadfb742d676699adb1b06d225fbb9fb82"],"body":"Upgrade Flow"}

dillon1000/react

Files changed