diff --git a/src/addons/link/__tests__/ReactLinkPropTypes-test.js b/src/addons/link/__tests__/ReactLinkPropTypes-test.js index 560b94e0c6..0ca43c4e23 100644 --- a/src/addons/link/__tests__/ReactLinkPropTypes-test.js +++ b/src/addons/link/__tests__/ReactLinkPropTypes-test.js @@ -14,7 +14,6 @@ var emptyFunction = require('emptyFunction'); var LinkPropTypes = require('ReactLink').PropTypes; var React = require('React'); -var ReactPropTypeLocations = require('ReactPropTypeLocations'); var ReactPropTypesSecret = require('ReactPropTypesSecret'); var invalidMessage = 'Invalid prop `testProp` supplied to `testComponent`.'; @@ -27,7 +26,7 @@ function typeCheckFail(declaration, value, message) { props, 'testProp', 'testComponent', - ReactPropTypeLocations.prop, + 'prop', null, ReactPropTypesSecret ); @@ -41,7 +40,7 @@ function typeCheckPass(declaration, value) { props, 'testProp', 'testComponent', - ReactPropTypeLocations.prop, + 'prop', null, ReactPropTypesSecret ); diff --git a/src/isomorphic/classic/class/ReactClass.js b/src/isomorphic/classic/class/ReactClass.js index 5e7def2cb7..4c5e1315f1 100644 --- a/src/isomorphic/classic/class/ReactClass.js +++ b/src/isomorphic/classic/class/ReactClass.js @@ -13,7 +13,6 @@ var ReactComponent = require('ReactComponent'); var ReactElement = require('ReactElement'); -var ReactPropTypeLocations = require('ReactPropTypeLocations'); var ReactPropTypeLocationNames = require('ReactPropTypeLocationNames'); var ReactNoopUpdateQueue = require('ReactNoopUpdateQueue'); @@ -23,6 +22,8 @@ var keyMirror = require('keyMirror'); var keyOf = require('keyOf'); var warning = require('warning'); +import type { ReactPropTypeLocations } from 'ReactPropTypeLocations'; + var MIXINS_KEY = keyOf({mixins: null}); /** @@ -327,7 +328,7 @@ var RESERVED_SPEC_KEYS = { validateTypeDef( Constructor, childContextTypes, - ReactPropTypeLocations.childContext + 'childContext' ); } Constructor.childContextTypes = Object.assign( @@ -341,7 +342,7 @@ var RESERVED_SPEC_KEYS = { validateTypeDef( Constructor, contextTypes, - ReactPropTypeLocations.context + 'context' ); } Constructor.contextTypes = Object.assign( @@ -369,7 +370,7 @@ var RESERVED_SPEC_KEYS = { validateTypeDef( Constructor, propTypes, - ReactPropTypeLocations.prop + 'prop' ); } Constructor.propTypes = Object.assign( @@ -384,7 +385,11 @@ var RESERVED_SPEC_KEYS = { autobind: function() {}, // noop }; -function validateTypeDef(Constructor, typeDef, location) { +function validateTypeDef( + Constructor, + typeDef, + location: ReactPropTypeLocations, +) { for (var propName in typeDef) { if (typeDef.hasOwnProperty(propName)) { // use a warning instead of an invariant so components diff --git a/src/isomorphic/classic/element/ReactElementValidator.js b/src/isomorphic/classic/element/ReactElementValidator.js index dabf2cb1b2..8c30884017 100644 --- a/src/isomorphic/classic/element/ReactElementValidator.js +++ b/src/isomorphic/classic/element/ReactElementValidator.js @@ -21,7 +21,6 @@ var ReactCurrentOwner = require('ReactCurrentOwner'); var ReactComponentTreeHook = require('ReactComponentTreeHook'); var ReactElement = require('ReactElement'); -var ReactPropTypeLocations = require('ReactPropTypeLocations'); var checkReactTypeSpec = require('checkReactTypeSpec'); @@ -166,7 +165,7 @@ function validatePropTypes(element) { checkReactTypeSpec( componentClass.propTypes, element.props, - ReactPropTypeLocations.prop, + 'prop', name, element, null diff --git a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js index 20b4f486b1..5b7607c192 100644 --- a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js +++ b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js @@ -14,7 +14,6 @@ var PropTypes; var React; var ReactFragment; -var ReactPropTypeLocations; var ReactTestUtils; var ReactPropTypesSecret; @@ -27,7 +26,7 @@ function typeCheckFail(declaration, value, message) { props, 'testProp', 'testComponent', - ReactPropTypeLocations.prop, + 'prop', null, ReactPropTypesSecret ); @@ -45,7 +44,7 @@ function typeCheckFailRequiredValues(declaration) { props1, 'testProp', 'testComponent', - ReactPropTypeLocations.prop, + 'prop', null, ReactPropTypesSecret ); @@ -56,7 +55,7 @@ function typeCheckFailRequiredValues(declaration) { props2, 'testProp', 'testComponent', - ReactPropTypeLocations.prop, + 'prop', null, ReactPropTypesSecret ); @@ -67,7 +66,7 @@ function typeCheckFailRequiredValues(declaration) { props3, 'testProp', 'testComponent', - ReactPropTypeLocations.prop, + 'prop', null, ReactPropTypesSecret ); @@ -81,7 +80,7 @@ function typeCheckPass(declaration, value) { props, 'testProp', 'testComponent', - ReactPropTypeLocations.prop, + 'prop', null, ReactPropTypesSecret ); @@ -112,7 +111,6 @@ describe('ReactPropTypes', function() { PropTypes = require('ReactPropTypes'); React = require('React'); ReactFragment = require('ReactFragment'); - ReactPropTypeLocations = require('ReactPropTypeLocations'); ReactTestUtils = require('ReactTestUtils'); ReactPropTypesSecret = require('ReactPropTypesSecret'); }); diff --git a/src/renderers/dom/client/wrappers/LinkedValueUtils.js b/src/renderers/dom/client/wrappers/LinkedValueUtils.js index 22a10279d5..94f16aa3eb 100644 --- a/src/renderers/dom/client/wrappers/LinkedValueUtils.js +++ b/src/renderers/dom/client/wrappers/LinkedValueUtils.js @@ -12,7 +12,6 @@ 'use strict'; var React = require('React'); -var ReactPropTypeLocations = require('ReactPropTypeLocations'); var ReactPropTypesSecret = require('ReactPropTypesSecret'); var invariant = require('invariant'); @@ -110,7 +109,7 @@ var LinkedValueUtils = { props, propName, tagName, - ReactPropTypeLocations.prop, + 'prop', null, ReactPropTypesSecret ); diff --git a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js index 13db6d1bed..31e61361c0 100644 --- a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js +++ b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js @@ -21,7 +21,6 @@ var ReactNodeTypes = require('ReactNodeTypes'); var ReactReconciler = require('ReactReconciler'); if (__DEV__) { - var ReactPropTypeLocations = require('ReactPropTypeLocations'); var checkReactTypeSpec = require('checkReactTypeSpec'); } @@ -31,6 +30,8 @@ var shallowEqual = require('shallowEqual'); var shouldUpdateReactComponent = require('shouldUpdateReactComponent'); var warning = require('warning'); +import type { ReactPropTypeLocations } from 'ReactPropTypeLocations'; + var CompositeTypes = { ImpureClass: 0, PureClass: 1, @@ -617,7 +618,7 @@ var ReactCompositeComponentMixin = { this._checkContextTypes( Component.contextTypes, maskedContext, - ReactPropTypeLocations.context + 'context' ); } } @@ -658,7 +659,7 @@ var ReactCompositeComponentMixin = { this._checkContextTypes( Component.childContextTypes, childContext, - ReactPropTypeLocations.childContext + 'childContext' ); } for (var name in childContext) { @@ -682,7 +683,11 @@ var ReactCompositeComponentMixin = { * @param {string} location e.g. "prop", "context", "child context" * @private */ - _checkContextTypes: function(typeSpecs, values, location) { + _checkContextTypes: function( + typeSpecs, + values, + location: ReactPropTypeLocations, + ) { if (__DEV__) { checkReactTypeSpec( typeSpecs, diff --git a/src/shared/types/ReactPropTypeLocationNames.js b/src/shared/types/ReactPropTypeLocationNames.js index bf573e943e..85e9851dca 100644 --- a/src/shared/types/ReactPropTypeLocationNames.js +++ b/src/shared/types/ReactPropTypeLocationNames.js @@ -12,14 +12,18 @@ 'use strict'; +import type { ReactPropTypeLocations } from 'ReactPropTypeLocations'; + +type NamesType = {[key: ReactPropTypeLocations]: string}; + var ReactPropTypeLocationNames = {}; if (__DEV__) { - ReactPropTypeLocationNames = { + ReactPropTypeLocationNames = ({ prop: 'prop', context: 'context', childContext: 'child context', - }; + }: NamesType); } module.exports = ReactPropTypeLocationNames; diff --git a/src/shared/types/ReactPropTypeLocations.js b/src/shared/types/ReactPropTypeLocations.js index ade51f6d5d..a2cb905e19 100644 --- a/src/shared/types/ReactPropTypeLocations.js +++ b/src/shared/types/ReactPropTypeLocations.js @@ -12,12 +12,7 @@ 'use strict'; -var keyMirror = require('keyMirror'); - -var ReactPropTypeLocations = keyMirror({ - prop: null, - context: null, - childContext: null, -}); - -module.exports = ReactPropTypeLocations; +export type ReactPropTypeLocations = + 'prop' | + 'context' | + 'childContext'; diff --git a/src/shared/types/checkReactTypeSpec.js b/src/shared/types/checkReactTypeSpec.js index 6375153bd1..06c2904a7a 100644 --- a/src/shared/types/checkReactTypeSpec.js +++ b/src/shared/types/checkReactTypeSpec.js @@ -17,6 +17,8 @@ var ReactPropTypesSecret = require('ReactPropTypesSecret'); var invariant = require('invariant'); var warning = require('warning'); +import type { ReactPropTypeLocations } from 'ReactPropTypeLocations'; + var ReactComponentTreeHook; if ( @@ -46,7 +48,14 @@ var loggedTypeFailures = {}; * @param {?number} debugID The React component instance that is being type-checked * @private */ -function checkReactTypeSpec(typeSpecs, values, location, componentName, element, debugID) { +function checkReactTypeSpec( + typeSpecs, + values, + location: ReactPropTypeLocations, + componentName, + element, + debugID, +) { for (var typeSpecName in typeSpecs) { if (typeSpecs.hasOwnProperty(typeSpecName)) { var error;