From 2bbedd9def2a782f370fb5280994ea0ecbf8a7c7 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 18 May 2017 09:28:18 -0400 Subject: Updating client dependencies. Switching to yarn. (#6433) * Updating client dependancies. Switching to using yarn. * Updating React * Moving pure components to using function syntax (performance gains with newer react version) * Updating client dependancies. * Ignore .yarninstall * Enabling pre-lockfile because it's the entire point of using yarn. * Removing old webpack config * Moving to new prop-types * Fixing ESLint Errors * Updating jest snapshots. * Cleaning up package.json --- webapp/components/multiselect/multiselect.jsx | 30 ++++++++++++---------- webapp/components/multiselect/multiselect_list.jsx | 16 +++++++----- 2 files changed, 25 insertions(+), 21 deletions(-) (limited to 'webapp/components/multiselect') diff --git a/webapp/components/multiselect/multiselect.jsx b/webapp/components/multiselect/multiselect.jsx index c2bf60172..e22e0ac52 100644 --- a/webapp/components/multiselect/multiselect.jsx +++ b/webapp/components/multiselect/multiselect.jsx @@ -7,6 +7,8 @@ import {localizeMessage} from 'utils/utils.jsx'; import Constants from 'utils/constants.jsx'; const KeyCodes = Constants.KeyCodes; +import PropTypes from 'prop-types'; + import React from 'react'; import ReactSelect from 'react-select'; import {FormattedMessage} from 'react-intl'; @@ -262,18 +264,18 @@ export default class MultiSelect extends React.Component { } MultiSelect.propTypes = { - options: React.PropTypes.arrayOf(React.PropTypes.object), - optionRenderer: React.PropTypes.func, - values: React.PropTypes.arrayOf(React.PropTypes.object), - valueRenderer: React.PropTypes.func, - handleInput: React.PropTypes.func, - handleDelete: React.PropTypes.func, - perPage: React.PropTypes.number, - handlePageChange: React.PropTypes.func, - handleAdd: React.PropTypes.func, - handleSubmit: React.PropTypes.func, - noteText: React.PropTypes.node, - maxValues: React.PropTypes.number, - numRemainingText: React.PropTypes.node, - buttonSubmitText: React.PropTypes.node + options: PropTypes.arrayOf(PropTypes.object), + optionRenderer: PropTypes.func, + values: PropTypes.arrayOf(PropTypes.object), + valueRenderer: PropTypes.func, + handleInput: PropTypes.func, + handleDelete: PropTypes.func, + perPage: PropTypes.number, + handlePageChange: PropTypes.func, + handleAdd: PropTypes.func, + handleSubmit: PropTypes.func, + noteText: PropTypes.node, + maxValues: PropTypes.number, + numRemainingText: PropTypes.node, + buttonSubmitText: PropTypes.node }; diff --git a/webapp/components/multiselect/multiselect_list.jsx b/webapp/components/multiselect/multiselect_list.jsx index e5faecb5a..4e5878790 100644 --- a/webapp/components/multiselect/multiselect_list.jsx +++ b/webapp/components/multiselect/multiselect_list.jsx @@ -5,6 +5,8 @@ import {cmdOrCtrlPressed} from 'utils/utils.jsx'; import Constants from 'utils/constants.jsx'; const KeyCodes = Constants.KeyCodes; +import PropTypes from 'prop-types'; + import React from 'react'; import {FormattedMessage} from 'react-intl'; @@ -159,11 +161,11 @@ MultiSelectList.defaultProps = { }; MultiSelectList.propTypes = { - options: React.PropTypes.arrayOf(React.PropTypes.object), - optionRenderer: React.PropTypes.func, - page: React.PropTypes.number, - perPage: React.PropTypes.number, - onPageChange: React.PropTypes.func, - onAdd: React.PropTypes.func, - onSelect: React.PropTypes.func + options: PropTypes.arrayOf(PropTypes.object), + optionRenderer: PropTypes.func, + page: PropTypes.number, + perPage: PropTypes.number, + onPageChange: PropTypes.func, + onAdd: PropTypes.func, + onSelect: PropTypes.func }; -- cgit v1.2.3-1-g7c22