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/claim/claim_controller.jsx          | 6 ++++--
 webapp/components/claim/components/email_to_ldap.jsx  | 4 +++-
 webapp/components/claim/components/email_to_oauth.jsx | 6 ++++--
 webapp/components/claim/components/ldap_to_email.jsx  | 4 +++-
 webapp/components/claim/components/oauth_to_email.jsx | 6 ++++--
 5 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'webapp/components/claim')

diff --git a/webapp/components/claim/claim_controller.jsx b/webapp/components/claim/claim_controller.jsx
index cc92343fd..ccf4fb64b 100644
--- a/webapp/components/claim/claim_controller.jsx
+++ b/webapp/components/claim/claim_controller.jsx
@@ -1,3 +1,5 @@
+import PropTypes from 'prop-types';
+
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
@@ -54,6 +56,6 @@ export default class ClaimController extends React.Component {
 ClaimController.defaultProps = {
 };
 ClaimController.propTypes = {
-    location: React.PropTypes.object.isRequired,
-    children: React.PropTypes.node
+    location: PropTypes.object.isRequired,
+    children: PropTypes.node
 };
diff --git a/webapp/components/claim/components/email_to_ldap.jsx b/webapp/components/claim/components/email_to_ldap.jsx
index deb7835c2..ab65e7dc6 100644
--- a/webapp/components/claim/components/email_to_ldap.jsx
+++ b/webapp/components/claim/components/email_to_ldap.jsx
@@ -8,6 +8,8 @@ import * as Utils from 'utils/utils.jsx';
 import {checkMfa} from 'actions/user_actions.jsx';
 import {emailToLdap} from 'actions/admin_actions.jsx';
 
+import PropTypes from 'prop-types';
+
 import React from 'react';
 import {FormattedMessage} from 'react-intl';
 
@@ -253,5 +255,5 @@ export default class EmailToLDAP extends React.Component {
 EmailToLDAP.defaultProps = {
 };
 EmailToLDAP.propTypes = {
-    email: React.PropTypes.string
+    email: PropTypes.string
 };
diff --git a/webapp/components/claim/components/email_to_oauth.jsx b/webapp/components/claim/components/email_to_oauth.jsx
index ea2fcb92e..27504e6f3 100644
--- a/webapp/components/claim/components/email_to_oauth.jsx
+++ b/webapp/components/claim/components/email_to_oauth.jsx
@@ -9,6 +9,8 @@ import Constants from 'utils/constants.jsx';
 import {checkMfa} from 'actions/user_actions.jsx';
 import {emailToOAuth} from 'actions/admin_actions.jsx';
 
+import PropTypes from 'prop-types';
+
 import React from 'react';
 import ReactDOM from 'react-dom';
 import {FormattedMessage} from 'react-intl';
@@ -171,6 +173,6 @@ export default class EmailToOAuth extends React.Component {
 EmailToOAuth.defaultProps = {
 };
 EmailToOAuth.propTypes = {
-    newType: React.PropTypes.string,
-    email: React.PropTypes.string
+    newType: PropTypes.string,
+    email: PropTypes.string
 };
diff --git a/webapp/components/claim/components/ldap_to_email.jsx b/webapp/components/claim/components/ldap_to_email.jsx
index 5e2ca26a1..ad7b0658b 100644
--- a/webapp/components/claim/components/ldap_to_email.jsx
+++ b/webapp/components/claim/components/ldap_to_email.jsx
@@ -7,6 +7,8 @@ import * as Utils from 'utils/utils.jsx';
 
 import {checkMfa, switchFromLdapToEmail} from 'actions/user_actions.jsx';
 
+import PropTypes from 'prop-types';
+
 import React from 'react';
 import {FormattedMessage} from 'react-intl';
 
@@ -240,5 +242,5 @@ export default class LDAPToEmail extends React.Component {
 LDAPToEmail.defaultProps = {
 };
 LDAPToEmail.propTypes = {
-    email: React.PropTypes.string
+    email: PropTypes.string
 };
diff --git a/webapp/components/claim/components/oauth_to_email.jsx b/webapp/components/claim/components/oauth_to_email.jsx
index 6959f413c..5304de6e5 100644
--- a/webapp/components/claim/components/oauth_to_email.jsx
+++ b/webapp/components/claim/components/oauth_to_email.jsx
@@ -4,6 +4,8 @@
 import * as Utils from 'utils/utils.jsx';
 import Constants from 'utils/constants.jsx';
 
+import PropTypes from 'prop-types';
+
 import React from 'react';
 import ReactDOM from 'react-dom';
 import {FormattedMessage} from 'react-intl';
@@ -139,6 +141,6 @@ export default class OAuthToEmail extends React.Component {
 OAuthToEmail.defaultProps = {
 };
 OAuthToEmail.propTypes = {
-    currentType: React.PropTypes.string,
-    email: React.PropTypes.string
+    currentType: PropTypes.string,
+    email: PropTypes.string
 };
-- 
cgit v1.2.3-1-g7c22