summaryrefslogtreecommitdiffstats
path: root/webapp/components/emoji
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-05-18 09:28:18 -0400
committerGitHub <noreply@github.com>2017-05-18 09:28:18 -0400
commit2bbedd9def2a782f370fb5280994ea0ecbf8a7c7 (patch)
treec97936580a81c561aa9884d1c414c54bd49d401a /webapp/components/emoji
parent63e599c43b66f0dd95f7f07c783c40fdaf89e3fb (diff)
downloadchat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.tar.gz
chat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.tar.bz2
chat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.zip
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
Diffstat (limited to 'webapp/components/emoji')
-rw-r--r--webapp/components/emoji/components/add_emoji.jsx8
-rw-r--r--webapp/components/emoji/components/delete_emoji_modal.jsx3
-rw-r--r--webapp/components/emoji/components/emoji_list.jsx6
-rw-r--r--webapp/components/emoji/components/emoji_list_item.jsx10
4 files changed, 17 insertions, 10 deletions
diff --git a/webapp/components/emoji/components/add_emoji.jsx b/webapp/components/emoji/components/add_emoji.jsx
index fc02be3be..2387ecfff 100644
--- a/webapp/components/emoji/components/add_emoji.jsx
+++ b/webapp/components/emoji/components/add_emoji.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.
@@ -14,12 +16,12 @@ import SpinnerButton from 'components/spinner_button.jsx';
export default class AddEmoji extends React.Component {
static propTypes = {
- team: React.PropTypes.object,
- user: React.PropTypes.object
+ team: PropTypes.object,
+ user: PropTypes.object
};
static contextTypes = {
- router: React.PropTypes.object.isRequired
+ router: PropTypes.object.isRequired
};
constructor(props) {
diff --git a/webapp/components/emoji/components/delete_emoji_modal.jsx b/webapp/components/emoji/components/delete_emoji_modal.jsx
index 77afd4c01..8b8ad7725 100644
--- a/webapp/components/emoji/components/delete_emoji_modal.jsx
+++ b/webapp/components/emoji/components/delete_emoji_modal.jsx
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
import React from 'react';
import {FormattedMessage} from 'react-intl';
@@ -45,5 +46,5 @@ export default class DeleteEmoji extends DeleteModalTrigger {
}
DeleteEmoji.propTypes = {
- onDelete: React.PropTypes.func.isRequired
+ onDelete: PropTypes.func.isRequired
};
diff --git a/webapp/components/emoji/components/emoji_list.jsx b/webapp/components/emoji/components/emoji_list.jsx
index 14ce819b4..f03638601 100644
--- a/webapp/components/emoji/components/emoji_list.jsx
+++ b/webapp/components/emoji/components/emoji_list.jsx
@@ -12,6 +12,8 @@ import {loadEmoji} from 'actions/emoji_actions.jsx';
import * as AsyncClient from 'utils/async_client.jsx';
import * as Utils from 'utils/utils.jsx';
+import PropTypes from 'prop-types';
+
import React from 'react';
import {Link} from 'react-router';
import {FormattedMessage} from 'react-intl';
@@ -19,8 +21,8 @@ import {FormattedMessage} from 'react-intl';
export default class EmojiList extends React.Component {
static get propTypes() {
return {
- team: React.PropTypes.object,
- user: React.PropTypes.object
+ team: PropTypes.object,
+ user: PropTypes.object
};
}
diff --git a/webapp/components/emoji/components/emoji_list_item.jsx b/webapp/components/emoji/components/emoji_list_item.jsx
index e8eaec7a0..84f52bc7c 100644
--- a/webapp/components/emoji/components/emoji_list_item.jsx
+++ b/webapp/components/emoji/components/emoji_list_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.
@@ -13,10 +15,10 @@ import {FormattedMessage} from 'react-intl';
export default class EmojiListItem extends React.Component {
static get propTypes() {
return {
- emoji: React.PropTypes.object.isRequired,
- onDelete: React.PropTypes.func.isRequired,
- filter: React.PropTypes.string,
- creator: React.PropTypes.object.isRequired
+ emoji: PropTypes.object.isRequired,
+ onDelete: PropTypes.func.isRequired,
+ filter: PropTypes.string,
+ creator: PropTypes.object.isRequired
};
}