Upgrading client dependancies. Upgrading to babel 6. Moving to es6 package system.

web/react/components/access_history_modal.jsx

@@ -2,11 +2,11 @@
 // See License.txt for license information.
 
 var Modal = ReactBootstrap.Modal;
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-var ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
-var AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-var LoadingScreen = require('./loading_screen.jsx');
+import LoadingScreen from './loading_screen.jsx';
-var Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
 export default class AccessHistoryModal extends React.Component {
     constructor(props) {

web/react/components/activity_log_modal.jsx

@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-const Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-const AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
 const Modal = ReactBootstrap.Modal;
-const LoadingScreen = require('./loading_screen.jsx');
+import LoadingScreen from './loading_screen.jsx';
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
 export default class ActivityLogModal extends React.Component {
     constructor(props) {

web/react/components/admin_console/admin_controller.jsx

@@ -1,25 +1,25 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AdminSidebar = require('./admin_sidebar.jsx');
+import AdminSidebar from './admin_sidebar.jsx';
-var AdminStore = require('../../stores/admin_store.jsx');
+import AdminStore from '../../stores/admin_store.jsx';
-var TeamStore = require('../../stores/team_store.jsx');
+import TeamStore from '../../stores/team_store.jsx';
-var AsyncClient = require('../../utils/async_client.jsx');
+import * as AsyncClient from '../../utils/async_client.jsx';
-var LoadingScreen = require('../loading_screen.jsx');
+import LoadingScreen from '../loading_screen.jsx';
-var Utils = require('../../utils/utils.jsx');
+import * as Utils from '../../utils/utils.jsx';
 
-var EmailSettingsTab = require('./email_settings.jsx');
+import EmailSettingsTab from './email_settings.jsx';
-var LogSettingsTab = require('./log_settings.jsx');
+import LogSettingsTab from './log_settings.jsx';
-var LogsTab = require('./logs.jsx');
+import LogsTab from './logs.jsx';
-var FileSettingsTab = require('./image_settings.jsx');
+import FileSettingsTab from './image_settings.jsx';
-var PrivacySettingsTab = require('./privacy_settings.jsx');
+import PrivacySettingsTab from './privacy_settings.jsx';
-var RateSettingsTab = require('./rate_settings.jsx');
+import RateSettingsTab from './rate_settings.jsx';
-var GitLabSettingsTab = require('./gitlab_settings.jsx');
+import GitLabSettingsTab from './gitlab_settings.jsx';
-var SqlSettingsTab = require('./sql_settings.jsx');
+import SqlSettingsTab from './sql_settings.jsx';
-var TeamSettingsTab = require('./team_settings.jsx');
+import TeamSettingsTab from './team_settings.jsx';
-var ServiceSettingsTab = require('./service_settings.jsx');
+import ServiceSettingsTab from './service_settings.jsx';
-var TeamUsersTab = require('./team_users.jsx');
+import TeamUsersTab from './team_users.jsx';
-var TeamAnalyticsTab = require('./team_analytics.jsx');
+import TeamAnalyticsTab from './team_analytics.jsx';
 
 export default class AdminController extends React.Component {
     constructor(props) {

web/react/components/admin_console/admin_navbar_dropdown.jsx

@@ -1,11 +1,11 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Utils = require('../../utils/utils.jsx');
+import * as Utils from '../../utils/utils.jsx';
-var Client = require('../../utils/client.jsx');
+import * as Client from '../../utils/client.jsx';
-var TeamStore = require('../../stores/team_store.jsx');
+import TeamStore from '../../stores/team_store.jsx';
 
-var Constants = require('../../utils/constants.jsx');
+import Constants from '../../utils/constants.jsx';
 
 function getStateFromStores() {
     return {currentTeam: TeamStore.getCurrent()};

web/react/components/admin_console/admin_sidebar.jsx

@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AdminSidebarHeader = require('./admin_sidebar_header.jsx');
+import AdminSidebarHeader from './admin_sidebar_header.jsx';
-var SelectTeamModal = require('./select_team_modal.jsx');
+import SelectTeamModal from './select_team_modal.jsx';
-var Utils = require('../../utils/utils.jsx');
+import * as Utils from '../../utils/utils.jsx';
 
 export default class AdminSidebar extends React.Component {
     constructor(props) {

web/react/components/admin_console/admin_sidebar_header.jsx

@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AdminNavbarDropdown = require('./admin_navbar_dropdown.jsx');
+import AdminNavbarDropdown from './admin_navbar_dropdown.jsx';
-var UserStore = require('../../stores/user_store.jsx');
+import UserStore from '../../stores/user_store.jsx';
-var Utils = require('../../utils/utils.jsx');
+import * as Utils from '../../utils/utils.jsx';
 
 export default class SidebarHeader extends React.Component {
     constructor(props) {

web/react/components/admin_console/email_settings.jsx

@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
+import * as Client from '../../utils/client.jsx';
-var AsyncClient = require('../../utils/async_client.jsx');
+import * as AsyncClient from '../../utils/async_client.jsx';
-var crypto = require('crypto');
+import crypto from 'crypto';
 
 export default class EmailSettings extends React.Component {
     constructor(props) {

web/react/components/admin_console/gitlab_settings.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
+import * as Client from '../../utils/client.jsx';
-var AsyncClient = require('../../utils/async_client.jsx');
+import * as AsyncClient from '../../utils/async_client.jsx';
 
 export default class GitLabSettings extends React.Component {
     constructor(props) {

web/react/components/admin_console/image_settings.jsx

@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
+import * as Client from '../../utils/client.jsx';
-var AsyncClient = require('../../utils/async_client.jsx');
+import * as AsyncClient from '../../utils/async_client.jsx';
-var crypto = require('crypto');
+import crypto from 'crypto';
 
 export default class FileSettings extends React.Component {
     constructor(props) {

web/react/components/admin_console/log_settings.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
+import * as Client from '../../utils/client.jsx';
-var AsyncClient = require('../../utils/async_client.jsx');
+import * as AsyncClient from '../../utils/async_client.jsx';
 
 export default class LogSettings extends React.Component {
     constructor(props) {

web/react/components/admin_console/logs.jsx

@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AdminStore = require('../../stores/admin_store.jsx');
+import AdminStore from '../../stores/admin_store.jsx';
-var LoadingScreen = require('../loading_screen.jsx');
+import LoadingScreen from '../loading_screen.jsx';
-var AsyncClient = require('../../utils/async_client.jsx');
+import * as AsyncClient from '../../utils/async_client.jsx';
 
 export default class Logs extends React.Component {
     constructor(props) {

web/react/components/admin_console/privacy_settings.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
+import * as Client from '../../utils/client.jsx';
-var AsyncClient = require('../../utils/async_client.jsx');
+import * as AsyncClient from '../../utils/async_client.jsx';
 
 export default class PrivacySettings extends React.Component {
     constructor(props) {

web/react/components/admin_console/rate_settings.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
+import * as Client from '../../utils/client.jsx';
-var AsyncClient = require('../../utils/async_client.jsx');
+import * as AsyncClient from '../../utils/async_client.jsx';
 
 export default class RateSettings extends React.Component {
     constructor(props) {

web/react/components/admin_console/reset_password_modal.jsx

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
+import * as Client from '../../utils/client.jsx';
 var Modal = ReactBootstrap.Modal;
 
 export default class ResetPasswordModal extends React.Component {

web/react/components/admin_console/service_settings.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
+import * as Client from '../../utils/client.jsx';
-var AsyncClient = require('../../utils/async_client.jsx');
+import * as AsyncClient from '../../utils/async_client.jsx';
 
 export default class ServiceSettings extends React.Component {
     constructor(props) {

web/react/components/admin_console/sql_settings.jsx

@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
+import * as Client from '../../utils/client.jsx';
-var AsyncClient = require('../../utils/async_client.jsx');
+import * as AsyncClient from '../../utils/async_client.jsx';
-var crypto = require('crypto');
+import crypto from 'crypto';
 
 export default class SqlSettings extends React.Component {
     constructor(props) {

web/react/components/admin_console/team_analytics.jsx

@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
+import * as Client from '../../utils/client.jsx';
-var Utils = require('../../utils/utils.jsx');
+import * as Utils from '../../utils/utils.jsx';
-var LineChart = require('./line_chart.jsx');
+import LineChart from './line_chart.jsx';
 
 export default class TeamAnalytics extends React.Component {
     constructor(props) {

web/react/components/admin_console/team_settings.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
+import * as Client from '../../utils/client.jsx';
-var AsyncClient = require('../../utils/async_client.jsx');
+import * as AsyncClient from '../../utils/async_client.jsx';
 
 export default class TeamSettings extends React.Component {
     constructor(props) {

web/react/components/admin_console/team_users.jsx

@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
+import * as Client from '../../utils/client.jsx';
-var LoadingScreen = require('../loading_screen.jsx');
+import LoadingScreen from '../loading_screen.jsx';
-var UserItem = require('./user_item.jsx');
+import UserItem from './user_item.jsx';
-var ResetPasswordModal = require('./reset_password_modal.jsx');
+import ResetPasswordModal from './reset_password_modal.jsx';
 
 export default class UserList extends React.Component {
     constructor(props) {

web/react/components/admin_console/user_item.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
+import * as Client from '../../utils/client.jsx';
-var Utils = require('../../utils/utils.jsx');
+import * as Utils from '../../utils/utils.jsx';
 
 export default class UserItem extends React.Component {
     constructor(props) {

web/react/components/authorize.jsx

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
 
 export default class Authorize extends React.Component {
     constructor(props) {

web/react/components/center_panel.jsx

@@ -1,17 +1,17 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const TutorialIntroScreens = require('./tutorial/tutorial_intro_screens.jsx');
+import TutorialIntroScreens from './tutorial/tutorial_intro_screens.jsx';
-const CreatePost = require('./create_post.jsx');
+import CreatePost from './create_post.jsx';
-const PostsViewContainer = require('./posts_view_container.jsx');
+import PostsViewContainer from './posts_view_container.jsx';
-const ChannelHeader = require('./channel_header.jsx');
+import ChannelHeader from './channel_header.jsx';
-const Navbar = require('./navbar.jsx');
+import Navbar from './navbar.jsx';
-const FileUploadOverlay = require('./file_upload_overlay.jsx');
+import FileUploadOverlay from './file_upload_overlay.jsx';
 
-const PreferenceStore = require('../stores/preference_store.jsx');
+import PreferenceStore from '../stores/preference_store.jsx';
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
 
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 const TutorialSteps = Constants.TutorialSteps;
 const Preferences = Constants.Preferences;
 

web/react/components/change_url_modal.jsx

@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 var Modal = ReactBootstrap.Modal;
-var Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
 export default class ChangeUrlModal extends React.Component {
     constructor(props) {

web/react/components/channel_header.jsx

@@ -1,28 +1,28 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const NavbarSearchBox = require('./search_bar.jsx');
+import NavbarSearchBox from './search_bar.jsx';
-const MessageWrapper = require('./message_wrapper.jsx');
+import MessageWrapper from './message_wrapper.jsx';
-const PopoverListMembers = require('./popover_list_members.jsx');
+import PopoverListMembers from './popover_list_members.jsx';
-const EditChannelPurposeModal = require('./edit_channel_purpose_modal.jsx');
+import EditChannelPurposeModal from './edit_channel_purpose_modal.jsx';
-const ChannelInfoModal = require('./channel_info_modal.jsx');
+import ChannelInfoModal from './channel_info_modal.jsx';
-const ChannelInviteModal = require('./channel_invite_modal.jsx');
+import ChannelInviteModal from './channel_invite_modal.jsx';
-const ChannelMembersModal = require('./channel_members_modal.jsx');
+import ChannelMembersModal from './channel_members_modal.jsx';
-const ChannelNotificationsModal = require('./channel_notifications_modal.jsx');
+import ChannelNotificationsModal from './channel_notifications_modal.jsx';
-const DeleteChannelModal = require('./delete_channel_modal.jsx');
+import DeleteChannelModal from './delete_channel_modal.jsx';
-const ToggleModalButton = require('./toggle_modal_button.jsx');
+import ToggleModalButton from './toggle_modal_button.jsx';
 
-const ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-const SearchStore = require('../stores/search_store.jsx');
+import SearchStore from '../stores/search_store.jsx';
-const PreferenceStore = require('../stores/preference_store.jsx');
+import PreferenceStore from '../stores/preference_store.jsx';
 
-const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-const TextFormatting = require('../utils/text_formatting.jsx');
+import * as TextFormatting from '../utils/text_formatting.jsx';
-const AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-const Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
 
 const Popover = ReactBootstrap.Popover;

web/react/components/channel_invite_modal.jsx

@@ -1,15 +1,15 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const MemberList = require('./member_list.jsx');
+import MemberList from './member_list.jsx';
-const LoadingScreen = require('./loading_screen.jsx');
+import LoadingScreen from './loading_screen.jsx';
 
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-const ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
 
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-const Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-const AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
 
 const Modal = ReactBootstrap.Modal;
 

web/react/components/channel_loader.jsx

@@ -5,14 +5,14 @@
     to the server on page load. This is to prevent other React controls from spamming
     AsyncClient with requests. */
 
-var AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-var SocketStore = require('../stores/socket_store.jsx');
+import SocketStore from '../stores/socket_store.jsx';
-var ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
-var PostStore = require('../stores/post_store.jsx');
+import PostStore from '../stores/post_store.jsx';
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
 
-var Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 
 export default class ChannelLoader extends React.Component {
     constructor(props) {

web/react/components/channel_members_modal.jsx

@@ -1,15 +1,15 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const MemberList = require('./member_list.jsx');
+import MemberList from './member_list.jsx';
-const ChannelInviteModal = require('./channel_invite_modal.jsx');
+import ChannelInviteModal from './channel_invite_modal.jsx';
 
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-const ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
 
-const AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-const Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
 const Modal = ReactBootstrap.Modal;
 

web/react/components/channel_notifications_modal.jsx

@@ -2,12 +2,12 @@
 // See License.txt for license information.
 
 var Modal = ReactBootstrap.Modal;
-var SettingItemMin = require('./setting_item_min.jsx');
+import SettingItemMin from './setting_item_min.jsx';
-var SettingItemMax = require('./setting_item_max.jsx');
+import SettingItemMax from './setting_item_max.jsx';
 
-var Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-var ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
 
 export default class ChannelNotificationsModal extends React.Component {
     constructor(props) {

web/react/components/channel_view.jsx

@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const CenterPanel = require('../components/center_panel.jsx');
+import CenterPanel from '../components/center_panel.jsx';
-const Sidebar = require('../components/sidebar.jsx');
+import Sidebar from '../components/sidebar.jsx';
-const SidebarRight = require('../components/sidebar_right.jsx');
+import SidebarRight from '../components/sidebar_right.jsx';
-const SidebarRightMenu = require('../components/sidebar_right_menu.jsx');
+import SidebarRightMenu from '../components/sidebar_right_menu.jsx';
 
 export default class ChannelView extends React.Component {
     constructor(props) {

web/react/components/command_list.jsx

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var client = require('../utils/client.jsx');
+import * as client from '../utils/client.jsx';
 
 export default class CommandList extends React.Component {
     constructor(props) {

web/react/components/create_comment.jsx

@@ -1,21 +1,21 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-const Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-const AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-const SocketStore = require('../stores/socket_store.jsx');
+import SocketStore from '../stores/socket_store.jsx';
-const ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-const PostStore = require('../stores/post_store.jsx');
+import PostStore from '../stores/post_store.jsx';
-const PreferenceStore = require('../stores/preference_store.jsx');
+import PreferenceStore from '../stores/preference_store.jsx';
-const Textbox = require('./textbox.jsx');
+import Textbox from './textbox.jsx';
-const MsgTyping = require('./msg_typing.jsx');
+import MsgTyping from './msg_typing.jsx';
-const FileUpload = require('./file_upload.jsx');
+import FileUpload from './file_upload.jsx';
-const FilePreview = require('./file_preview.jsx');
+import FilePreview from './file_preview.jsx';
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
 const KeyCodes = Constants.KeyCodes;
 

web/react/components/create_post.jsx

@@ -1,24 +1,24 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const MsgTyping = require('./msg_typing.jsx');
+import MsgTyping from './msg_typing.jsx';
-const Textbox = require('./textbox.jsx');
+import Textbox from './textbox.jsx';
-const FileUpload = require('./file_upload.jsx');
+import FileUpload from './file_upload.jsx';
-const FilePreview = require('./file_preview.jsx');
+import FilePreview from './file_preview.jsx';
-const TutorialTip = require('./tutorial/tutorial_tip.jsx');
+import TutorialTip from './tutorial/tutorial_tip.jsx';
 
-const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-const Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-const AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
-const ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
-const PostStore = require('../stores/post_store.jsx');
+import PostStore from '../stores/post_store.jsx';
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-const PreferenceStore = require('../stores/preference_store.jsx');
+import PreferenceStore from '../stores/preference_store.jsx';
-const SocketStore = require('../stores/socket_store.jsx');
+import SocketStore from '../stores/socket_store.jsx';
 
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 const Preferences = Constants.Preferences;
 const TutorialSteps = Constants.TutorialSteps;
 const ActionTypes = Constants.ActionTypes;

web/react/components/delete_channel_modal.jsx

@@ -1,11 +1,11 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-const Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
 const Modal = ReactBootstrap.Modal;
-const TeamStore = require('../stores/team_store.jsx');
+import TeamStore from '../stores/team_store.jsx';
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
 export default class DeleteChannelModal extends React.Component {
     constructor(props) {

web/react/components/delete_post_modal.jsx

@@ -1,14 +1,14 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-var PostStore = require('../stores/post_store.jsx');
+import PostStore from '../stores/post_store.jsx';
-var ModalStore = require('../stores/modal_store.jsx');
+import ModalStore from '../stores/modal_store.jsx';
 var Modal = ReactBootstrap.Modal;
-var Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-var AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 var ActionTypes = Constants.ActionTypes;
 
 export default class DeletePostModal extends React.Component {

web/react/components/docs.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const TextFormatting = require('../utils/text_formatting.jsx');
+import * as TextFormatting from '../utils/text_formatting.jsx';
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
 
 export default class Docs extends React.Component {
     constructor(props) {

web/react/components/edit_channel_modal.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-const AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
 
 export default class EditChannelModal extends React.Component {
     constructor(props) {

web/react/components/edit_channel_purpose_modal.jsx

@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-const Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
 const Modal = ReactBootstrap.Modal;
 

web/react/components/edit_post_modal.jsx

@@ -1,15 +1,15 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-var AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-var DeletePostModal = require('./delete_post_modal.jsx');
+import DeletePostModal from './delete_post_modal.jsx';
-var Textbox = require('./textbox.jsx');
+import Textbox from './textbox.jsx';
-var BrowserStore = require('../stores/browser_store.jsx');
+import BrowserStore from '../stores/browser_store.jsx';
-var PostStore = require('../stores/post_store.jsx');
+import PostStore from '../stores/post_store.jsx';
-var PreferenceStore = require('../stores/preference_store.jsx');
+import PreferenceStore from '../stores/preference_store.jsx';
 
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 var KeyCodes = Constants.KeyCodes;
 
 export default class EditPostModal extends React.Component {

web/react/components/error_bar.jsx

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var ErrorStore = require('../stores/error_store.jsx');
+import ErrorStore from '../stores/error_store.jsx';
 
 export default class ErrorBar extends React.Component {
     constructor() {

web/react/components/file_attachment.jsx

@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var utils = require('../utils/utils.jsx');
+import * as utils from '../utils/utils.jsx';
-var Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 
 export default class FileAttachment extends React.Component {
     constructor(props) {

web/react/components/file_attachment_list.jsx

@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var ViewImageModal = require('./view_image.jsx');
+import ViewImageModal from './view_image.jsx';
-var FileAttachment = require('./file_attachment.jsx');
+import FileAttachment from './file_attachment.jsx';
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 
 export default class FileAttachmentList extends React.Component {
     constructor(props) {

web/react/components/file_preview.jsx

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
 export default class FilePreview extends React.Component {
     constructor(props) {

web/react/components/file_upload.jsx

@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var client = require('../utils/client.jsx');
+import * as client from '../utils/client.jsx';
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
-var ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
-var utils = require('../utils/utils.jsx');
+import * as utils from '../utils/utils.jsx';
 
 export default class FileUpload extends React.Component {
     constructor(props) {

web/react/components/find_team.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var utils = require('../utils/utils.jsx');
+import * as utils from '../utils/utils.jsx';
-var client = require('../utils/client.jsx');
+import * as client from '../utils/client.jsx';
 
 export default class FindTeam extends React.Component {
     constructor(props) {

web/react/components/get_link_modal.jsx

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
 
 export default class GetLinkModal extends React.Component {
     constructor(props) {

web/react/components/invite_member_modal.jsx

@@ -1,14 +1,15 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var utils = require('../utils/utils.jsx');
+import * as utils from '../utils/utils.jsx';
-var ActionTypes = require('../utils/constants.jsx').ActionTypes;
+import Constants from '../utils/constants.jsx';
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+const ActionTypes = Constants.ActionTypes;
-var Client = require('../utils/client.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-var ModalStore = require('../stores/modal_store.jsx');
+import * as Client from '../utils/client.jsx';
-var UserStore = require('../stores/user_store.jsx');
+import ModalStore from '../stores/modal_store.jsx';
-var TeamStore = require('../stores/team_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-var ConfirmModal = require('./confirm_modal.jsx');
+import TeamStore from '../stores/team_store.jsx';
+import ConfirmModal from './confirm_modal.jsx';
 
 const Modal = ReactBootstrap.Modal;
 

web/react/components/login.jsx

@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-const Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-const BrowserStore = require('../stores/browser_store.jsx');
+import BrowserStore from '../stores/browser_store.jsx';
 
 export default class Login extends React.Component {
     constructor(props) {

web/react/components/member_list.jsx

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var MemberListItem = require('./member_list_item.jsx');
+import MemberListItem from './member_list_item.jsx';
 
 export default class MemberList extends React.Component {
     constructor(props) {

web/react/components/member_list_item.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
 export default class MemberListItem extends React.Component {
     constructor(props) {

web/react/components/member_list_team.jsx

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const MemberListTeamItem = require('./member_list_team_item.jsx');
+import MemberListTeamItem from './member_list_team_item.jsx';
 
 export default class MemberListTeam extends React.Component {
     render() {

web/react/components/member_list_team_item.jsx

@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-const Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-const AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
 export default class MemberListTeamItem extends React.Component {
     constructor(props) {

web/react/components/mention.jsx

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
 export default class Mention extends React.Component {
     constructor(props) {

web/react/components/mention_list.jsx

@@ -1,13 +1,13 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-var SearchStore = require('../stores/search_store.jsx');
+import SearchStore from '../stores/search_store.jsx';
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-var Mention = require('./mention.jsx');
+import Mention from './mention.jsx';
 
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
-var Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 var ActionTypes = Constants.ActionTypes;
 
 var MAX_HEIGHT_LIST = 292;

web/react/components/message_wrapper.jsx

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var TextFormatting = require('../utils/text_formatting.jsx');
+import * as TextFormatting from '../utils/text_formatting.jsx';
 
 export default class MessageWrapper extends React.Component {
     constructor(props) {

web/react/components/more_channels.jsx

@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var utils = require('../utils/utils.jsx');
+import * as utils from '../utils/utils.jsx';
-var client = require('../utils/client.jsx');
+import * as client from '../utils/client.jsx';
-var asyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-var ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
-var LoadingScreen = require('./loading_screen.jsx');
+import LoadingScreen from './loading_screen.jsx';
-var NewChannelFlow = require('./new_channel_flow.jsx');
+import NewChannelFlow from './new_channel_flow.jsx';
 
 function getStateFromStores() {
     return {
@@ -31,12 +31,12 @@ export default class MoreChannels extends React.Component {
     }
     componentDidMount() {
         ChannelStore.addMoreChangeListener(this.onListenerChange);
-        $(ReactDOM.findDOMNode(this.refs.modal)).on('shown.bs.modal', function shown() {
+        $(ReactDOM.findDOMNode(this.refs.modal)).on('shown.bs.modal', () => {
-            asyncClient.getMoreChannels(true);
+            AsyncClient.getMoreChannels(true);
         });
 
         var self = this;
-        $(ReactDOM.findDOMNode(this.refs.modal)).on('show.bs.modal', function show(e) {
+        $(ReactDOM.findDOMNode(this.refs.modal)).on('show.bs.modal', (e) => {
             var button = e.relatedTarget;
             self.setState({channelType: $(button).attr('data-channeltype')});
         });
@@ -53,15 +53,15 @@ export default class MoreChannels extends React.Component {
     handleJoin(channel, channelIndex) {
         this.setState({joiningChannel: channelIndex});
         client.joinChannel(channel.id,
-            function joinSuccess() {
+            () => {
                 $(ReactDOM.findDOMNode(this.refs.modal)).modal('hide');
-                asyncClient.getChannel(channel.id);
+                AsyncClient.getChannel(channel.id);
                 utils.switchChannel(channel);
                 this.setState({joiningChannel: -1});
-            }.bind(this),
+            },
-            function joinFail(err) {
+            (err) => {
                 this.setState({joiningChannel: -1, serverError: err.message});
-            }.bind(this)
+            }
         );
     }
     handleNewChannel() {

web/react/components/more_direct_channels.jsx

@@ -2,8 +2,8 @@
 // See License.txt for license information.
 
 const Modal = ReactBootstrap.Modal;
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
 export default class MoreDirectChannels extends React.Component {
     constructor(props) {

web/react/components/msg_typing.jsx

@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const SocketStore = require('../stores/socket_store.jsx');
+import SocketStore from '../stores/socket_store.jsx';
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
 
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 const SocketEvents = Constants.SocketEvents;
 
 export default class MsgTyping extends React.Component {

web/react/components/navbar.jsx

@@ -1,27 +1,27 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const EditChannelPurposeModal = require('./edit_channel_purpose_modal.jsx');
+import EditChannelPurposeModal from './edit_channel_purpose_modal.jsx';
-const MessageWrapper = require('./message_wrapper.jsx');
+import MessageWrapper from './message_wrapper.jsx';
-const NotifyCounts = require('./notify_counts.jsx');
+import NotifyCounts from './notify_counts.jsx';
-const ChannelMembersModal = require('./channel_members_modal.jsx');
+import ChannelMembersModal from './channel_members_modal.jsx';
-const ChannelInfoModal = require('./channel_info_modal.jsx');
+import ChannelInfoModal from './channel_info_modal.jsx';
-const ChannelInviteModal = require('./channel_invite_modal.jsx');
+import ChannelInviteModal from './channel_invite_modal.jsx';
-const ChannelNotificationsModal = require('./channel_notifications_modal.jsx');
+import ChannelNotificationsModal from './channel_notifications_modal.jsx';
-const DeleteChannelModal = require('./delete_channel_modal.jsx');
+import DeleteChannelModal from './delete_channel_modal.jsx';
-const ToggleModalButton = require('./toggle_modal_button.jsx');
+import ToggleModalButton from './toggle_modal_button.jsx';
 
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-const ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
-const TeamStore = require('../stores/team_store.jsx');
+import TeamStore from '../stores/team_store.jsx';
 
-const Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-const AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
-const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
 
 const Popover = ReactBootstrap.Popover;
 const OverlayTrigger = ReactBootstrap.OverlayTrigger;

web/react/components/navbar_dropdown.jsx

@@ -1,16 +1,16 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-var client = require('../utils/client.jsx');
+import * as client from '../utils/client.jsx';
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-var TeamStore = require('../stores/team_store.jsx');
+import TeamStore from '../stores/team_store.jsx';
 
-var AboutBuildModal = require('./about_build_modal.jsx');
+import AboutBuildModal from './about_build_modal.jsx';
-var InviteMemberModal = require('./invite_member_modal.jsx');
+import InviteMemberModal from './invite_member_modal.jsx';
-var UserSettingsModal = require('./user_settings/user_settings_modal.jsx');
+import UserSettingsModal from './user_settings/user_settings_modal.jsx';
 
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 
 function getStateFromStores() {
     const teams = [];

web/react/components/new_channel_flow.jsx

@@ -1,13 +1,13 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-var AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-var Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
 
-var NewChannelModal = require('./new_channel_modal.jsx');
+import NewChannelModal from './new_channel_modal.jsx';
-var ChangeURLModal = require('./change_url_modal.jsx');
+import ChangeURLModal from './change_url_modal.jsx';
 
 const SHOW_NEW_CHANNEL = 1;
 const SHOW_EDIT_URL = 2;

web/react/components/new_channel_modal.jsx

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 var Modal = ReactBootstrap.Modal;
 
 export default class NewChannelModal extends React.Component {

web/react/components/notify_counts.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var utils = require('../utils/utils.jsx');
+import * as utils from '../utils/utils.jsx';
-var ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
 
 function getCountsStateFromStores() {
     var count = 0;

web/react/components/password_reset.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var PasswordResetSendLink = require('./password_reset_send_link.jsx');
+import PasswordResetSendLink from './password_reset_send_link.jsx';
-var PasswordResetForm = require('./password_reset_form.jsx');
+import PasswordResetForm from './password_reset_form.jsx';
 
 export default class PasswordReset extends React.Component {
     constructor(props) {

web/react/components/password_reset_form.jsx

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var client = require('../utils/client.jsx');
+import * as client from '../utils/client.jsx';
 
 export default class PasswordResetForm extends React.Component {
     constructor(props) {

web/react/components/password_reset_send_link.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-var client = require('../utils/client.jsx');
+import * as client from '../utils/client.jsx';
 
 export default class PasswordResetSendLink extends React.Component {
     constructor(props) {

web/react/components/popover_list_members.jsx

@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
 var Popover = ReactBootstrap.Popover;
 var Overlay = ReactBootstrap.Overlay;
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
-const ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
 
 export default class PopoverListMembers extends React.Component {
     constructor(props) {

web/react/components/post.jsx

@@ -1,17 +1,17 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var PostHeader = require('./post_header.jsx');
+import PostHeader from './post_header.jsx';
-var PostBody = require('./post_body.jsx');
+import PostBody from './post_body.jsx';
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-var PostStore = require('../stores/post_store.jsx');
+import PostStore from '../stores/post_store.jsx';
-var ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
-var client = require('../utils/client.jsx');
+import * as client from '../utils/client.jsx';
-var AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
 var ActionTypes = Constants.ActionTypes;
-var utils = require('../utils/utils.jsx');
+import * as utils from '../utils/utils.jsx';
 
 export default class Post extends React.Component {
     constructor(props) {

web/react/components/post_attachment.jsx

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const TextFormatting = require('../utils/text_formatting.jsx');
+import * as TextFormatting from '../utils/text_formatting.jsx';
 
 export default class PostAttachment extends React.Component {
     constructor(props) {

web/react/components/post_attachment_list.jsx

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const PostAttachment = require('./post_attachment.jsx');
+import PostAttachment from './post_attachment.jsx';
 
 export default class PostAttachmentList extends React.Component {
     constructor(props) {

web/react/components/post_body.jsx

@@ -1,15 +1,15 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const FileAttachmentList = require('./file_attachment_list.jsx');
+import FileAttachmentList from './file_attachment_list.jsx';
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
-const TextFormatting = require('../utils/text_formatting.jsx');
+import * as TextFormatting from '../utils/text_formatting.jsx';
-const twemoji = require('twemoji');
+import twemoji from 'twemoji';
-const PostBodyAdditionalContent = require('./post_body_additional_content.jsx');
+import PostBodyAdditionalContent from './post_body_additional_content.jsx';
 
-const providers = require('./providers.json');
+import providers from './providers.json';
 
 export default class PostBody extends React.Component {
     constructor(props) {

web/react/components/post_body_additional_content.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const PostAttachmentList = require('./post_attachment_list.jsx');
+import PostAttachmentList from './post_attachment_list.jsx';
-const PostAttachmentOEmbed = require('./post_attachment_oembed.jsx');
+import PostAttachmentOEmbed from './post_attachment_oembed.jsx';
 
 export default class PostBodyAdditionalContent extends React.Component {
     constructor(props) {

web/react/components/post_deleted_modal.jsx

@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 var ActionTypes = Constants.ActionTypes;
 
 export default class PostDeletedModal extends React.Component {

web/react/components/post_header.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserProfile = require('./user_profile.jsx');
+import UserProfile from './user_profile.jsx';
-var PostInfo = require('./post_info.jsx');
+import PostInfo from './post_info.jsx';
 
 export default class PostHeader extends React.Component {
     constructor(props) {

web/react/components/post_info.jsx

@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var DeletePostModal = require('./delete_post_modal.jsx');
+import DeletePostModal from './delete_post_modal.jsx';
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-var utils = require('../utils/utils.jsx');
+import * as utils from '../utils/utils.jsx';
-var TimeSince = require('./time_since.jsx');
+import TimeSince from './time_since.jsx';
 
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 
 export default class PostInfo extends React.Component {
     constructor(props) {

web/react/components/posts_view.jsx

@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-const Post = require('./post.jsx');
+import Post from './post.jsx';
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 
 export default class PostsView extends React.Component {
     constructor(props) {

web/react/components/posts_view_container.jsx

@@ -1,19 +1,19 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const PostsView = require('./posts_view.jsx');
+import PostsView from './posts_view.jsx';
-const LoadingScreen = require('./loading_screen.jsx');
+import LoadingScreen from './loading_screen.jsx';
-const ChannelInviteModal = require('./channel_invite_modal.jsx');
+import ChannelInviteModal from './channel_invite_modal.jsx';
 
-const ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
-const PostStore = require('../stores/post_store.jsx');
+import PostStore from '../stores/post_store.jsx';
 
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-const Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-const AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
 
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
 
 import {createChannelIntroMessage} from '../utils/channel_intro_mssages.jsx';

web/react/components/register_app_modal.jsx

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
 
 export default class RegisterAppModal extends React.Component {
     constructor() {

web/react/components/removed_from_channel_modal.jsx

@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-var BrowserStore = require('../stores/browser_store.jsx');
+import BrowserStore from '../stores/browser_store.jsx';
-var utils = require('../utils/utils.jsx');
+import * as utils from '../utils/utils.jsx';
 
 export default class RemovedFromChannelModal extends React.Component {
     constructor(props) {

web/react/components/rename_channel_modal.jsx

@@ -1,11 +1,11 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-const Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-const AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-const ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 
 export default class RenameChannelModal extends React.Component {
     constructor(props) {

web/react/components/rhs_comment.jsx

@@ -1,20 +1,20 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var PostStore = require('../stores/post_store.jsx');
+import PostStore from '../stores/post_store.jsx';
-var ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
-var UserProfile = require('./user_profile.jsx');
+import UserProfile from './user_profile.jsx';
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-var Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
-var DeletePostModal = require('./delete_post_modal.jsx');
+import DeletePostModal from './delete_post_modal.jsx';
-var FileAttachmentList = require('./file_attachment_list.jsx');
+import FileAttachmentList from './file_attachment_list.jsx';
-var Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-var AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
 var ActionTypes = Constants.ActionTypes;
-var TextFormatting = require('../utils/text_formatting.jsx');
+import * as TextFormatting from '../utils/text_formatting.jsx';
-var twemoji = require('twemoji');
+import twemoji from 'twemoji';
 
 export default class RhsComment extends React.Component {
     constructor(props) {

web/react/components/rhs_header_post.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
 
 export default class RhsHeaderPost extends React.Component {

web/react/components/rhs_root_post.jsx

@@ -1,16 +1,16 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
-var UserProfile = require('./user_profile.jsx');
+import UserProfile from './user_profile.jsx';
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-var TextFormatting = require('../utils/text_formatting.jsx');
+import * as TextFormatting from '../utils/text_formatting.jsx';
-var utils = require('../utils/utils.jsx');
+import * as utils from '../utils/utils.jsx';
-var DeletePostModal = require('./delete_post_modal.jsx');
+import DeletePostModal from './delete_post_modal.jsx';
-var FileAttachmentList = require('./file_attachment_list.jsx');
+import FileAttachmentList from './file_attachment_list.jsx';
-var twemoji = require('twemoji');
+import twemoji from 'twemoji';
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
-const PostBodyAdditionalContent = require('./post_body_additional_content.jsx');
+import PostBodyAdditionalContent from './post_body_additional_content.jsx';
 
 export default class RhsRootPost extends React.Component {
     constructor(props) {

web/react/components/rhs_thread.jsx

@@ -1,17 +1,17 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var PostStore = require('../stores/post_store.jsx');
+import PostStore from '../stores/post_store.jsx';
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-var PreferenceStore = require('../stores/preference_store.jsx');
+import PreferenceStore from '../stores/preference_store.jsx';
-var Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-var SearchBox = require('./search_bar.jsx');
+import SearchBox from './search_bar.jsx';
-var CreateComment = require('./create_comment.jsx');
+import CreateComment from './create_comment.jsx';
-var RhsHeaderPost = require('./rhs_header_post.jsx');
+import RhsHeaderPost from './rhs_header_post.jsx';
-var RootPost = require('./rhs_root_post.jsx');
+import RootPost from './rhs_root_post.jsx';
-var Comment = require('./rhs_comment.jsx');
+import Comment from './rhs_comment.jsx';
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
-var FileUploadOverlay = require('./file_upload_overlay.jsx');
+import FileUploadOverlay from './file_upload_overlay.jsx';
 
 export default class RhsThread extends React.Component {
     constructor(props) {

web/react/components/search_autocomplete.jsx

@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
-const KeyCodes = require('../utils/constants.jsx').KeyCodes;
+import Constants from '../utils/constants.jsx';
+const KeyCodes = Constants.KeyCodes;
 const Popover = ReactBootstrap.Popover;
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-const Constants = require('../utils/constants.jsx');
 
 const patterns = new Map([
     ['channels', /\b(?:in|channel):\s*(\S*)$/i],

web/react/components/search_bar.jsx

@@ -1,15 +1,15 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var client = require('../utils/client.jsx');
+import * as client from '../utils/client.jsx';
-var AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-var SearchStore = require('../stores/search_store.jsx');
+import SearchStore from '../stores/search_store.jsx';
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-var utils = require('../utils/utils.jsx');
+import * as utils from '../utils/utils.jsx';
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 var ActionTypes = Constants.ActionTypes;
 var Popover = ReactBootstrap.Popover;
-var SearchAutocomplete = require('./search_autocomplete.jsx');
+import SearchAutocomplete from './search_autocomplete.jsx';
 
 export default class SearchBar extends React.Component {
     constructor() {

web/react/components/search_results.jsx

@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var SearchStore = require('../stores/search_store.jsx');
+import SearchStore from '../stores/search_store.jsx';
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-var SearchBox = require('./search_bar.jsx');
+import SearchBox from './search_bar.jsx';
-var Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-var SearchResultsHeader = require('./search_results_header.jsx');
+import SearchResultsHeader from './search_results_header.jsx';
-var SearchResultsItem = require('./search_results_item.jsx');
+import SearchResultsItem from './search_results_item.jsx';
 
 function getStateFromStores() {
     return {results: SearchStore.getSearchResults()};

web/react/components/search_results_header.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 var ActionTypes = Constants.ActionTypes;
 
 export default class SearchResultsHeader extends React.Component {

web/react/components/search_results_item.jsx

@@ -1,16 +1,16 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var SearchStore = require('../stores/search_store.jsx');
+import SearchStore from '../stores/search_store.jsx';
-var ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-var UserProfile = require('./user_profile.jsx');
+import UserProfile from './user_profile.jsx';
-var utils = require('../utils/utils.jsx');
+import * as utils from '../utils/utils.jsx';
-var client = require('../utils/client.jsx');
+import * as client from '../utils/client.jsx';
-var AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
-var TextFormatting = require('../utils/text_formatting.jsx');
+import * as TextFormatting from '../utils/text_formatting.jsx';
 var ActionTypes = Constants.ActionTypes;
 
 export default class SearchResultsItem extends React.Component {

web/react/components/sidebar.jsx

@@ -1,23 +1,23 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const NewChannelFlow = require('./new_channel_flow.jsx');
+import NewChannelFlow from './new_channel_flow.jsx';
-const MoreDirectChannels = require('./more_direct_channels.jsx');
+import MoreDirectChannels from './more_direct_channels.jsx';
-const SearchBox = require('./search_bar.jsx');
+import SearchBox from './search_bar.jsx';
-const SidebarHeader = require('./sidebar_header.jsx');
+import SidebarHeader from './sidebar_header.jsx';
-const UnreadChannelIndicator = require('./unread_channel_indicator.jsx');
+import UnreadChannelIndicator from './unread_channel_indicator.jsx';
-const TutorialTip = require('./tutorial/tutorial_tip.jsx');
+import TutorialTip from './tutorial/tutorial_tip.jsx';
 
-const ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-const TeamStore = require('../stores/team_store.jsx');
+import TeamStore from '../stores/team_store.jsx';
-const PreferenceStore = require('../stores/preference_store.jsx');
+import PreferenceStore from '../stores/preference_store.jsx';
 
-const AsyncClient = require('../utils/async_client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
-const Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 const Preferences = Constants.Preferences;
 const TutorialSteps = Constants.TutorialSteps;
 const NotificationPrefs = Constants.NotificationPrefs;

web/react/components/sidebar_header.jsx

@@ -1,14 +1,14 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const NavbarDropdown = require('./navbar_dropdown.jsx');
+import NavbarDropdown from './navbar_dropdown.jsx';
-const TutorialTip = require('./tutorial/tutorial_tip.jsx');
+import TutorialTip from './tutorial/tutorial_tip.jsx';
 
-const UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-const PreferenceStore = require('../stores/preference_store.jsx');
+import PreferenceStore from '../stores/preference_store.jsx';
 
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 const Preferences = Constants.Preferences;
 const TutorialSteps = Constants.TutorialSteps;
 

web/react/components/sidebar_right.jsx

@@ -1,11 +1,11 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var SearchResults = require('./search_results.jsx');
+import SearchResults from './search_results.jsx';
-var RhsThread = require('./rhs_thread.jsx');
+import RhsThread from './rhs_thread.jsx';
-var SearchStore = require('../stores/search_store.jsx');
+import SearchStore from '../stores/search_store.jsx';
-var PostStore = require('../stores/post_store.jsx');
+import PostStore from '../stores/post_store.jsx';
-var Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
 export default class SidebarRight extends React.Component {
     constructor(props) {

web/react/components/sidebar_right_menu.jsx

@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var InviteMemberModal = require('./invite_member_modal.jsx');
+import InviteMemberModal from './invite_member_modal.jsx';
-var UserSettingsModal = require('./user_settings/user_settings_modal.jsx');
+import UserSettingsModal from './user_settings/user_settings_modal.jsx';
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-var TeamStore = require('../stores/team_store.jsx');
+import TeamStore from '../stores/team_store.jsx';
-var client = require('../utils/client.jsx');
+import * as client from '../utils/client.jsx';
-var utils = require('../utils/utils.jsx');
+import * as utils from '../utils/utils.jsx';
 
 export default class SidebarRightMenu extends React.Component {
     componentDidMount() {

web/react/components/signup_team.jsx

@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const ChoosePage = require('./team_signup_choose_auth.jsx');
+import ChoosePage from './team_signup_choose_auth.jsx';
-const EmailSignUpPage = require('./team_signup_with_email.jsx');
+import EmailSignUpPage from './team_signup_with_email.jsx';
-const SSOSignupPage = require('./team_signup_with_sso.jsx');
+import SSOSignupPage from './team_signup_with_sso.jsx';
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 
 export default class TeamSignUp extends React.Component {
     constructor(props) {

web/react/components/signup_team_complete.jsx

@@ -1,13 +1,13 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var WelcomePage = require('./team_signup_welcome_page.jsx');
+import WelcomePage from './team_signup_welcome_page.jsx';
-var TeamDisplayNamePage = require('./team_signup_display_name_page.jsx');
+import TeamDisplayNamePage from './team_signup_display_name_page.jsx';
-var TeamURLPage = require('./team_signup_url_page.jsx');
+import TeamURLPage from './team_signup_url_page.jsx';
-var SendInivtesPage = require('./team_signup_send_invites_page.jsx');
+import SendInivtesPage from './team_signup_send_invites_page.jsx';
-var UsernamePage = require('./team_signup_username_page.jsx');
+import UsernamePage from './team_signup_username_page.jsx';
-var PasswordPage = require('./team_signup_password_page.jsx');
+import PasswordPage from './team_signup_password_page.jsx';
-var BrowserStore = require('../stores/browser_store.jsx');
+import BrowserStore from '../stores/browser_store.jsx';
 
 export default class SignupTeamComplete extends React.Component {
     constructor(props) {

web/react/components/signup_user_complete.jsx

@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-var client = require('../utils/client.jsx');
+import * as client from '../utils/client.jsx';
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-var BrowserStore = require('../stores/browser_store.jsx');
+import BrowserStore from '../stores/browser_store.jsx';
 
 export default class SignupUserComplete extends React.Component {
     constructor(props) {

web/react/components/team_export_tab.jsx

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
 
 export default class TeamExportTab extends React.Component {
     constructor(props) {

web/react/components/team_general_tab.jsx

@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const SettingItemMin = require('./setting_item_min.jsx');
+import SettingItemMin from './setting_item_min.jsx';
-const SettingItemMax = require('./setting_item_max.jsx');
+import SettingItemMax from './setting_item_max.jsx';
 
-const Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
-const TeamStore = require('../stores/team_store.jsx');
+import TeamStore from '../stores/team_store.jsx';
 
 export default class GeneralTab extends React.Component {
     constructor(props) {

web/react/components/team_import_tab.jsx

@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var utils = require('../utils/utils.jsx');
+import * as utils from '../utils/utils.jsx';
-var SettingUpload = require('./setting_upload.jsx');
+import SettingUpload from './setting_upload.jsx';
 
 export default class TeamImportTab extends React.Component {
     constructor(props) {

web/react/components/team_members.jsx

@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
-var MemberListTeam = require('./member_list_team.jsx');
+import MemberListTeam from './member_list_team.jsx';
-var utils = require('../utils/utils.jsx');
+import * as utils from '../utils/utils.jsx';
 
 function getStateFromStores() {
     var users = UserStore.getProfiles();

web/react/components/team_settings.jsx

@@ -1,11 +1,11 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var TeamStore = require('../stores/team_store.jsx');
+import TeamStore from '../stores/team_store.jsx';
-var ImportTab = require('./team_import_tab.jsx');
+import ImportTab from './team_import_tab.jsx';
-var ExportTab = require('./team_export_tab.jsx');
+import ExportTab from './team_export_tab.jsx';
-var GeneralTab = require('./team_general_tab.jsx');
+import GeneralTab from './team_general_tab.jsx';
-var Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
 export default class TeamSettings extends React.Component {
     constructor(props) {