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/webrtc/webrtc_controller.jsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'webapp/components/webrtc/webrtc_controller.jsx')

diff --git a/webapp/components/webrtc/webrtc_controller.jsx b/webapp/components/webrtc/webrtc_controller.jsx
index 02c064026..b9a44468e 100644
--- a/webapp/components/webrtc/webrtc_controller.jsx
+++ b/webapp/components/webrtc/webrtc_controller.jsx
@@ -19,6 +19,8 @@ import * as WebrtcActions from 'actions/webrtc_actions.jsx';
 import * as Utils from 'utils/utils.jsx';
 import {Constants, UserStatuses, WebrtcActionTypes} from 'utils/constants.jsx';
 
+import PropTypes from 'prop-types';
+
 import React from 'react';
 import {FormattedMessage} from 'react-intl';
 
@@ -1235,9 +1237,9 @@ export default class WebrtcController extends React.Component {
 }
 
 WebrtcController.propTypes = {
-    currentUser: React.PropTypes.object,
-    userId: React.PropTypes.string.isRequired,
-    isCaller: React.PropTypes.bool.isRequired,
-    expanded: React.PropTypes.bool.isRequired,
-    toggleSize: React.PropTypes.func
+    currentUser: PropTypes.object,
+    userId: PropTypes.string.isRequired,
+    isCaller: PropTypes.bool.isRequired,
+    expanded: PropTypes.bool.isRequired,
+    toggleSize: PropTypes.func
 };
-- 
cgit v1.2.3-1-g7c22