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 --- .../emoji_picker/components/emoji_picker_category.jsx | 10 ++++++---- .../emoji_picker/components/emoji_picker_item.jsx | 14 ++++++++------ .../emoji_picker/components/emoji_picker_preview.jsx | 4 +++- webapp/components/emoji_picker/emoji_picker.jsx | 12 +++++++----- webapp/components/emoji_picker/emoji_picker_container.jsx | 4 +++- 5 files changed, 27 insertions(+), 17 deletions(-) (limited to 'webapp/components/emoji_picker') diff --git a/webapp/components/emoji_picker/components/emoji_picker_category.jsx b/webapp/components/emoji_picker/components/emoji_picker_category.jsx index 21c59baea..579aaed28 100644 --- a/webapp/components/emoji_picker/components/emoji_picker_category.jsx +++ b/webapp/components/emoji_picker/components/emoji_picker_category.jsx @@ -1,3 +1,5 @@ +import PropTypes from 'prop-types'; + // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // See License.txt for license information. @@ -5,10 +7,10 @@ import React from 'react'; export default class EmojiPickerCategory extends React.Component { static propTypes = { - category: React.PropTypes.string.isRequired, - icon: React.PropTypes.node.isRequired, - onCategoryClick: React.PropTypes.func.isRequired, - selected: React.PropTypes.bool.isRequired + category: PropTypes.string.isRequired, + icon: PropTypes.node.isRequired, + onCategoryClick: PropTypes.func.isRequired, + selected: PropTypes.bool.isRequired } constructor(props) { diff --git a/webapp/components/emoji_picker/components/emoji_picker_item.jsx b/webapp/components/emoji_picker/components/emoji_picker_item.jsx index dee08e638..3321bf761 100644 --- a/webapp/components/emoji_picker/components/emoji_picker_item.jsx +++ b/webapp/components/emoji_picker/components/emoji_picker_item.jsx @@ -1,3 +1,5 @@ +import PropTypes from 'prop-types'; + // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // See License.txt for license information. @@ -7,12 +9,12 @@ import EmojiStore from 'stores/emoji_store.jsx'; export default class EmojiPickerItem extends React.Component { static propTypes = { - emoji: React.PropTypes.object.isRequired, - onItemOver: React.PropTypes.func.isRequired, - onItemOut: React.PropTypes.func.isRequired, - onItemClick: React.PropTypes.func.isRequired, - onItemUnmount: React.PropTypes.func.isRequired, - category: React.PropTypes.string.isRequired + emoji: PropTypes.object.isRequired, + onItemOver: PropTypes.func.isRequired, + onItemOut: PropTypes.func.isRequired, + onItemClick: PropTypes.func.isRequired, + onItemUnmount: PropTypes.func.isRequired, + category: PropTypes.string.isRequired } constructor(props) { diff --git a/webapp/components/emoji_picker/components/emoji_picker_preview.jsx b/webapp/components/emoji_picker/components/emoji_picker_preview.jsx index ccff96e28..914844551 100644 --- a/webapp/components/emoji_picker/components/emoji_picker_preview.jsx +++ b/webapp/components/emoji_picker/components/emoji_picker_preview.jsx @@ -1,3 +1,5 @@ +import PropTypes from 'prop-types'; + // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // See License.txt for license information. @@ -9,7 +11,7 @@ import {FormattedMessage} from 'react-intl'; export default class EmojiPickerPreview extends React.Component { static propTypes = { - emoji: React.PropTypes.object + emoji: PropTypes.object } render() { diff --git a/webapp/components/emoji_picker/emoji_picker.jsx b/webapp/components/emoji_picker/emoji_picker.jsx index b4e67df29..e9cddce34 100644 --- a/webapp/components/emoji_picker/emoji_picker.jsx +++ b/webapp/components/emoji_picker/emoji_picker.jsx @@ -1,3 +1,5 @@ +import PropTypes from 'prop-types'; + // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // See License.txt for license information. @@ -30,11 +32,11 @@ const CATEGORIES = [ class EmojiPicker extends React.Component { static propTypes = { - customEmojis: React.PropTypes.object, - onEmojiClick: React.PropTypes.func.isRequired, - pickerLocation: React.PropTypes.string.isRequired, - emojiOffset: React.PropTypes.number, - outsideClick: React.PropTypes.func + customEmojis: PropTypes.object, + onEmojiClick: PropTypes.func.isRequired, + pickerLocation: PropTypes.string.isRequired, + emojiOffset: PropTypes.number, + outsideClick: PropTypes.func } constructor(props) { diff --git a/webapp/components/emoji_picker/emoji_picker_container.jsx b/webapp/components/emoji_picker/emoji_picker_container.jsx index d352539ab..ab24afcc4 100644 --- a/webapp/components/emoji_picker/emoji_picker_container.jsx +++ b/webapp/components/emoji_picker/emoji_picker_container.jsx @@ -1,3 +1,5 @@ +import PropTypes from 'prop-types'; + // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // See License.txt for license information. @@ -9,7 +11,7 @@ import EmojiPicker from './emoji_picker.jsx'; export default class EmojiPickerContainer extends React.Component { static propTypes = { - onEmojiClick: React.PropTypes.func.isRequred + onEmojiClick: PropTypes.func.isRequred } constructor(props) { -- cgit v1.2.3-1-g7c22