From 2bbedd9def2a782f370fb5280994ea0ecbf8a7c7 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
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/emoji/components/add_emoji.jsx          |  8 +++++---
 webapp/components/emoji/components/delete_emoji_modal.jsx |  3 ++-
 webapp/components/emoji/components/emoji_list.jsx         |  6 ++++--
 webapp/components/emoji/components/emoji_list_item.jsx    | 10 ++++++----
 4 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'webapp/components/emoji')

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
         };
     }
 
-- 
cgit v1.2.3-1-g7c22