diff options
Diffstat (limited to 'webapp/components')
48 files changed, 48 insertions, 48 deletions
diff --git a/webapp/components/admin_console/admin_navbar_dropdown.jsx b/webapp/components/admin_console/admin_navbar_dropdown.jsx index 65a76a517..0bac263ef 100644 --- a/webapp/components/admin_console/admin_navbar_dropdown.jsx +++ b/webapp/components/admin_console/admin_navbar_dropdown.jsx @@ -10,7 +10,7 @@ import * as GlobalActions from 'actions/global_actions.jsx'; import {FormattedMessage} from 'react-intl'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; import React from 'react'; diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx index 565279e72..cb98c8ab1 100644 --- a/webapp/components/admin_console/admin_sidebar.jsx +++ b/webapp/components/admin_console/admin_sidebar.jsx @@ -11,7 +11,7 @@ import * as Utils from 'utils/utils.jsx'; import AdminSidebarHeader from './admin_sidebar_header.jsx'; import AdminSidebarTeam from './admin_sidebar_team.jsx'; import {FormattedMessage} from 'react-intl'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; import {OverlayTrigger, Tooltip} from 'react-bootstrap'; import SelectTeamModal from './select_team_modal.jsx'; import AdminSidebarCategory from './admin_sidebar_category.jsx'; diff --git a/webapp/components/admin_console/admin_sidebar_category.jsx b/webapp/components/admin_console/admin_sidebar_category.jsx index 9f56d626b..1cf96f979 100644 --- a/webapp/components/admin_console/admin_sidebar_category.jsx +++ b/webapp/components/admin_console/admin_sidebar_category.jsx @@ -3,7 +3,7 @@ import React from 'react'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; export default class AdminSidebarCategory extends React.Component { static get propTypes() { diff --git a/webapp/components/admin_console/admin_sidebar_section.jsx b/webapp/components/admin_console/admin_sidebar_section.jsx index 56e520629..a958150b5 100644 --- a/webapp/components/admin_console/admin_sidebar_section.jsx +++ b/webapp/components/admin_console/admin_sidebar_section.jsx @@ -3,7 +3,7 @@ import React from 'react'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; export default class AdminSidebarSection extends React.Component { static get propTypes() { diff --git a/webapp/components/admin_console/user_item.jsx b/webapp/components/admin_console/user_item.jsx index a337f2304..62de50f0f 100644 --- a/webapp/components/admin_console/user_item.jsx +++ b/webapp/components/admin_console/user_item.jsx @@ -10,7 +10,7 @@ import TeamStore from 'stores/team_store.jsx'; import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; import React from 'react'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; export default class UserItem extends React.Component { constructor(props) { diff --git a/webapp/components/backstage/add_command.jsx b/webapp/components/backstage/add_command.jsx index c817764aa..91af0416b 100644 --- a/webapp/components/backstage/add_command.jsx +++ b/webapp/components/backstage/add_command.jsx @@ -9,7 +9,7 @@ import * as Utils from 'utils/utils.jsx'; import BackstageHeader from './backstage_header.jsx'; import {FormattedMessage} from 'react-intl'; import FormError from 'components/form_error.jsx'; -import {browserHistory, Link} from 'react-router'; +import {browserHistory, Link} from 'react-router/es6'; import SpinnerButton from 'components/spinner_button.jsx'; import Constants from 'utils/constants.jsx'; diff --git a/webapp/components/backstage/add_incoming_webhook.jsx b/webapp/components/backstage/add_incoming_webhook.jsx index f698f2b13..528f03377 100644 --- a/webapp/components/backstage/add_incoming_webhook.jsx +++ b/webapp/components/backstage/add_incoming_webhook.jsx @@ -10,7 +10,7 @@ import BackstageHeader from './backstage_header.jsx'; import ChannelSelect from 'components/channel_select.jsx'; import {FormattedMessage} from 'react-intl'; import FormError from 'components/form_error.jsx'; -import {browserHistory, Link} from 'react-router'; +import {browserHistory, Link} from 'react-router/es6'; import SpinnerButton from 'components/spinner_button.jsx'; export default class AddIncomingWebhook extends React.Component { diff --git a/webapp/components/backstage/add_outgoing_webhook.jsx b/webapp/components/backstage/add_outgoing_webhook.jsx index d48be3ac4..5f9d96249 100644 --- a/webapp/components/backstage/add_outgoing_webhook.jsx +++ b/webapp/components/backstage/add_outgoing_webhook.jsx @@ -10,7 +10,7 @@ import BackstageHeader from './backstage_header.jsx'; import ChannelSelect from 'components/channel_select.jsx'; import {FormattedMessage} from 'react-intl'; import FormError from 'components/form_error.jsx'; -import {browserHistory, Link} from 'react-router'; +import {browserHistory, Link} from 'react-router/es6'; import SpinnerButton from 'components/spinner_button.jsx'; export default class AddOutgoingWebhook extends React.Component { diff --git a/webapp/components/backstage/backstage_category.jsx b/webapp/components/backstage/backstage_category.jsx index 8e6c8541b..1d4b11ca3 100644 --- a/webapp/components/backstage/backstage_category.jsx +++ b/webapp/components/backstage/backstage_category.jsx @@ -3,7 +3,7 @@ import React from 'react'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; export default class BackstageCategory extends React.Component { static get propTypes() { diff --git a/webapp/components/backstage/backstage_navbar.jsx b/webapp/components/backstage/backstage_navbar.jsx index 8352296b7..26ab44c87 100644 --- a/webapp/components/backstage/backstage_navbar.jsx +++ b/webapp/components/backstage/backstage_navbar.jsx @@ -8,7 +8,7 @@ import React from 'react'; import TeamStore from 'stores/team_store.jsx'; import {FormattedMessage} from 'react-intl'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; export default class BackstageNavbar extends React.Component { constructor(props) { diff --git a/webapp/components/backstage/backstage_section.jsx b/webapp/components/backstage/backstage_section.jsx index 120e956b0..c8b63af18 100644 --- a/webapp/components/backstage/backstage_section.jsx +++ b/webapp/components/backstage/backstage_section.jsx @@ -3,7 +3,7 @@ import React from 'react'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; export default class BackstageSection extends React.Component { static get propTypes() { diff --git a/webapp/components/backstage/installed_integrations.jsx b/webapp/components/backstage/installed_integrations.jsx index cff0611d7..f6de8bc11 100644 --- a/webapp/components/backstage/installed_integrations.jsx +++ b/webapp/components/backstage/installed_integrations.jsx @@ -5,7 +5,7 @@ import React from 'react'; import * as Utils from 'utils/utils.jsx'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; import LoadingScreen from 'components/loading_screen.jsx'; export default class InstalledIntegrations extends React.Component { diff --git a/webapp/components/backstage/integration_option.jsx b/webapp/components/backstage/integration_option.jsx index dd7cc0c4c..483e6a888 100644 --- a/webapp/components/backstage/integration_option.jsx +++ b/webapp/components/backstage/integration_option.jsx @@ -3,7 +3,7 @@ import React from 'react'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; export default class IntegrationOption extends React.Component { static get propTypes() { diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx index 181d37ca2..70a4b1bfe 100644 --- a/webapp/components/channel_header.jsx +++ b/webapp/components/channel_header.jsx @@ -31,7 +31,7 @@ import Client from 'utils/web_client.jsx'; import Constants from 'utils/constants.jsx'; import {FormattedMessage} from 'react-intl'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; const ActionTypes = Constants.ActionTypes; diff --git a/webapp/components/claim/claim_controller.jsx b/webapp/components/claim/claim_controller.jsx index dbb944bb9..581438ce9 100644 --- a/webapp/components/claim/claim_controller.jsx +++ b/webapp/components/claim/claim_controller.jsx @@ -3,7 +3,7 @@ import React from 'react'; import {FormattedMessage} from 'react-intl'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; import logoImage from 'images/logo.png'; diff --git a/webapp/components/claim/components/oauth_to_email.jsx b/webapp/components/claim/components/oauth_to_email.jsx index ba01a8adf..17ca12264 100644 --- a/webapp/components/claim/components/oauth_to_email.jsx +++ b/webapp/components/claim/components/oauth_to_email.jsx @@ -7,7 +7,7 @@ import Client from 'utils/web_client.jsx'; import React from 'react'; import ReactDOM from 'react-dom'; import {FormattedMessage} from 'react-intl'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; export default class OAuthToEmail extends React.Component { constructor(props) { diff --git a/webapp/components/create_post.jsx b/webapp/components/create_post.jsx index caf58c744..eedae8571 100644 --- a/webapp/components/create_post.jsx +++ b/webapp/components/create_post.jsx @@ -24,7 +24,7 @@ import PreferenceStore from 'stores/preference_store.jsx'; import Constants from 'utils/constants.jsx'; import {intlShape, injectIntl, defineMessages, FormattedHTMLMessage} from 'react-intl'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; const Preferences = Constants.Preferences; const TutorialSteps = Constants.TutorialSteps; diff --git a/webapp/components/create_team/components/display_name.jsx b/webapp/components/create_team/components/display_name.jsx index e6dcd221a..a4d47477a 100644 --- a/webapp/components/create_team/components/display_name.jsx +++ b/webapp/components/create_team/components/display_name.jsx @@ -10,7 +10,7 @@ import logoImage from 'images/logo.png'; import React from 'react'; import ReactDOM from 'react-dom'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; import {FormattedMessage} from 'react-intl'; export default class TeamSignupDisplayNamePage extends React.Component { diff --git a/webapp/components/create_team/create_team_controller.jsx b/webapp/components/create_team/create_team_controller.jsx index ad2a008bd..47df82a57 100644 --- a/webapp/components/create_team/create_team_controller.jsx +++ b/webapp/components/create_team/create_team_controller.jsx @@ -4,7 +4,7 @@ import ErrorBar from 'components/error_bar.jsx'; import {FormattedMessage} from 'react-intl'; -import {browserHistory, Link} from 'react-router'; +import {browserHistory, Link} from 'react-router/es6'; import React from 'react'; diff --git a/webapp/components/delete_channel_modal.jsx b/webapp/components/delete_channel_modal.jsx index b2870cd50..925fa163c 100644 --- a/webapp/components/delete_channel_modal.jsx +++ b/webapp/components/delete_channel_modal.jsx @@ -9,7 +9,7 @@ import Constants from 'utils/constants.jsx'; import {FormattedMessage} from 'react-intl'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; import React from 'react'; diff --git a/webapp/components/do_verify_email.jsx b/webapp/components/do_verify_email.jsx index 193205266..c54d32b56 100644 --- a/webapp/components/do_verify_email.jsx +++ b/webapp/components/do_verify_email.jsx @@ -5,7 +5,7 @@ import {FormattedMessage} from 'react-intl'; import Client from 'utils/web_client.jsx'; import LoadingScreen from './loading_screen.jsx'; -import {browserHistory, Link} from 'react-router'; +import {browserHistory, Link} from 'react-router/es6'; import React from 'react'; diff --git a/webapp/components/error_page.jsx b/webapp/components/error_page.jsx index 53f0fce82..f498c4e8e 100644 --- a/webapp/components/error_page.jsx +++ b/webapp/components/error_page.jsx @@ -4,7 +4,7 @@ import $ from 'jquery'; import React from 'react'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; import * as Utils from 'utils/utils.jsx'; diff --git a/webapp/components/file_info_preview.jsx b/webapp/components/file_info_preview.jsx index fe4e76f91..b3d16b6a6 100644 --- a/webapp/components/file_info_preview.jsx +++ b/webapp/components/file_info_preview.jsx @@ -5,7 +5,7 @@ import * as Utils from 'utils/utils.jsx'; import {defineMessages} from 'react-intl'; import React from 'react'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; const holders = defineMessages({ type: { diff --git a/webapp/components/logged_in.jsx b/webapp/components/logged_in.jsx index dce92dd64..6752b56cd 100644 --- a/webapp/components/logged_in.jsx +++ b/webapp/components/logged_in.jsx @@ -11,7 +11,7 @@ import * as Utils from 'utils/utils.jsx'; import * as Websockets from 'actions/websocket_actions.jsx'; import Constants from 'utils/constants.jsx'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; const CLIENT_STATUS_INTERVAL = 30000; const BACKSPACE_CHAR = 8; diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx index ab8b49392..653908654 100644 --- a/webapp/components/login/login_controller.jsx +++ b/webapp/components/login/login_controller.jsx @@ -16,7 +16,7 @@ import * as Utils from 'utils/utils.jsx'; import Constants from 'utils/constants.jsx'; import {FormattedMessage} from 'react-intl'; -import {browserHistory, Link} from 'react-router'; +import {browserHistory, Link} from 'react-router/es6'; import React from 'react'; import logoImage from 'images/logo.png'; diff --git a/webapp/components/more_channels.jsx b/webapp/components/more_channels.jsx index b0847bd73..54a06d0ae 100644 --- a/webapp/components/more_channels.jsx +++ b/webapp/components/more_channels.jsx @@ -12,7 +12,7 @@ import * as AsyncClient from 'utils/async_client.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; import {FormattedMessage} from 'react-intl'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; import React from 'react'; import ReactDOM from 'react-dom'; diff --git a/webapp/components/more_direct_channels.jsx b/webapp/components/more_direct_channels.jsx index de61bcf98..aaa49571e 100644 --- a/webapp/components/more_direct_channels.jsx +++ b/webapp/components/more_direct_channels.jsx @@ -9,7 +9,7 @@ import * as Utils from 'utils/utils.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; import {FormattedMessage} from 'react-intl'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; import SpinnerButton from 'components/spinner_button.jsx'; import LoadingScreen from 'components/loading_screen.jsx'; diff --git a/webapp/components/navbar.jsx b/webapp/components/navbar.jsx index 32682bc78..1942022bb 100644 --- a/webapp/components/navbar.jsx +++ b/webapp/components/navbar.jsx @@ -33,7 +33,7 @@ import {FormattedMessage} from 'react-intl'; import {Popover, OverlayTrigger} from 'react-bootstrap'; -import {Link, browserHistory} from 'react-router'; +import {Link, browserHistory} from 'react-router/es6'; import React from 'react'; diff --git a/webapp/components/navbar_dropdown.jsx b/webapp/components/navbar_dropdown.jsx index 6065f3474..9d6d7fb22 100644 --- a/webapp/components/navbar_dropdown.jsx +++ b/webapp/components/navbar_dropdown.jsx @@ -16,7 +16,7 @@ import UserSettingsModal from './user_settings/user_settings_modal.jsx'; import Constants from 'utils/constants.jsx'; import {FormattedMessage} from 'react-intl'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; import React from 'react'; diff --git a/webapp/components/needs_team.jsx b/webapp/components/needs_team.jsx index 955758237..5aabcb55c 100644 --- a/webapp/components/needs_team.jsx +++ b/webapp/components/needs_team.jsx @@ -5,7 +5,7 @@ import React from 'react'; import $ from 'jquery'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; import * as Utils from 'utils/utils.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; import TeamStore from 'stores/team_store.jsx'; diff --git a/webapp/components/new_channel_flow.jsx b/webapp/components/new_channel_flow.jsx index 7019da4aa..db06cf0be 100644 --- a/webapp/components/new_channel_flow.jsx +++ b/webapp/components/new_channel_flow.jsx @@ -9,7 +9,7 @@ import NewChannelModal from './new_channel_modal.jsx'; import ChangeURLModal from './change_url_modal.jsx'; import {intlShape, injectIntl, defineMessages} from 'react-intl'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; import Constants from 'utils/constants.jsx'; diff --git a/webapp/components/password_reset_form.jsx b/webapp/components/password_reset_form.jsx index eeea265d8..05bf29eae 100644 --- a/webapp/components/password_reset_form.jsx +++ b/webapp/components/password_reset_form.jsx @@ -7,7 +7,7 @@ import * as Utils from 'utils/utils.jsx'; import Constants from 'utils/constants.jsx'; import {FormattedMessage} from 'react-intl'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; import React from 'react'; diff --git a/webapp/components/password_reset_send_link.jsx b/webapp/components/password_reset_send_link.jsx index 65d9439bd..48179e162 100644 --- a/webapp/components/password_reset_send_link.jsx +++ b/webapp/components/password_reset_send_link.jsx @@ -9,7 +9,7 @@ import client from 'utils/web_client.jsx'; import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; import React from 'react'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; class PasswordResetSendLink extends React.Component { constructor(props) { diff --git a/webapp/components/permalink_view.jsx b/webapp/components/permalink_view.jsx index 8f443bc05..55e250d04 100644 --- a/webapp/components/permalink_view.jsx +++ b/webapp/components/permalink_view.jsx @@ -10,7 +10,7 @@ import PostFocusViewController from 'components/post_view/post_focus_view_contro import ChannelStore from 'stores/channel_store.jsx'; import TeamStore from 'stores/team_store.jsx'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; import {FormattedMessage} from 'react-intl'; export default class PermalinkView extends React.Component { diff --git a/webapp/components/popover_list_members.jsx b/webapp/components/popover_list_members.jsx index d85b1114b..28e45d5d6 100644 --- a/webapp/components/popover_list_members.jsx +++ b/webapp/components/popover_list_members.jsx @@ -10,7 +10,7 @@ import Constants from 'utils/constants.jsx'; import Client from 'utils/web_client.jsx'; import {FormattedMessage} from 'react-intl'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; import React from 'react'; diff --git a/webapp/components/removed_from_channel_modal.jsx b/webapp/components/removed_from_channel_modal.jsx index 2199dbbec..3164e4e3f 100644 --- a/webapp/components/removed_from_channel_modal.jsx +++ b/webapp/components/removed_from_channel_modal.jsx @@ -9,7 +9,7 @@ import BrowserStore from 'stores/browser_store.jsx'; import * as Utils from 'utils/utils.jsx'; import {FormattedMessage} from 'react-intl'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; import React from 'react'; diff --git a/webapp/components/root.jsx b/webapp/components/root.jsx index abaa05bb5..977652e99 100644 --- a/webapp/components/root.jsx +++ b/webapp/components/root.jsx @@ -14,7 +14,7 @@ import React from 'react'; import FastClick from 'fastclick'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; import UserStore from 'stores/user_store.jsx'; export default class Root extends React.Component { diff --git a/webapp/components/search_results_item.jsx b/webapp/components/search_results_item.jsx index 3fff4ea33..2f453bc84 100644 --- a/webapp/components/search_results_item.jsx +++ b/webapp/components/search_results_item.jsx @@ -16,7 +16,7 @@ const ActionTypes = Constants.ActionTypes; import {FormattedMessage, FormattedDate} from 'react-intl'; import React from 'react'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; export default class SearchResultsItem extends React.Component { constructor(props) { diff --git a/webapp/components/select_team/select_team.jsx b/webapp/components/select_team/select_team.jsx index a04961d5b..3b1cf829a 100644 --- a/webapp/components/select_team/select_team.jsx +++ b/webapp/components/select_team/select_team.jsx @@ -9,7 +9,7 @@ import LoadingScreen from 'components/loading_screen.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; import {FormattedMessage} from 'react-intl'; diff --git a/webapp/components/should_verify_email.jsx b/webapp/components/should_verify_email.jsx index a95101ba1..18a936b13 100644 --- a/webapp/components/should_verify_email.jsx +++ b/webapp/components/should_verify_email.jsx @@ -5,7 +5,7 @@ import {FormattedMessage} from 'react-intl'; import Client from 'utils/web_client.jsx'; import React from 'react'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; export default class ShouldVerifyEmail extends React.Component { constructor(props) { diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx index f6c2a1a5a..4f678274d 100644 --- a/webapp/components/sidebar.jsx +++ b/webapp/components/sidebar.jsx @@ -30,7 +30,7 @@ import {Tooltip, OverlayTrigger} from 'react-bootstrap'; import loadingGif from 'images/load.gif'; import React from 'react'; -import {browserHistory, Link} from 'react-router'; +import {browserHistory, Link} from 'react-router/es6'; import favicon from 'images/favicon/favicon-16x16.png'; import redFavicon from 'images/favicon/redfavicon-16x16.png'; diff --git a/webapp/components/sidebar_right_menu.jsx b/webapp/components/sidebar_right_menu.jsx index e3a7bee7c..622b80337 100644 --- a/webapp/components/sidebar_right_menu.jsx +++ b/webapp/components/sidebar_right_menu.jsx @@ -20,7 +20,7 @@ const Preferences = Constants.Preferences; const TutorialSteps = Constants.TutorialSteps; import {FormattedMessage} from 'react-intl'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; import {createMenuTip} from 'components/tutorial/tutorial_tip.jsx'; import React from 'react'; diff --git a/webapp/components/signup_team_complete/components/signup_team_complete.jsx b/webapp/components/signup_team_complete/components/signup_team_complete.jsx index 00fdafe5f..78c591375 100644 --- a/webapp/components/signup_team_complete/components/signup_team_complete.jsx +++ b/webapp/components/signup_team_complete/components/signup_team_complete.jsx @@ -6,7 +6,7 @@ import BrowserStore from 'stores/browser_store.jsx'; import {FormattedMessage} from 'react-intl'; import React from 'react'; -import {Link, browserHistory} from 'react-router'; +import {Link, browserHistory} from 'react-router/es6'; export default class SignupTeamComplete extends React.Component { constructor(props) { diff --git a/webapp/components/signup_user_complete.jsx b/webapp/components/signup_user_complete.jsx index 74eaebfa9..c7ddfc91b 100644 --- a/webapp/components/signup_user_complete.jsx +++ b/webapp/components/signup_user_complete.jsx @@ -17,7 +17,7 @@ import Constants from 'utils/constants.jsx'; import React from 'react'; import ReactDOM from 'react-dom'; import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; -import {browserHistory, Link} from 'react-router'; +import {browserHistory, Link} from 'react-router/es6'; import logoImage from 'images/logo.png'; diff --git a/webapp/components/team_export_tab.jsx b/webapp/components/team_export_tab.jsx index 37f886aab..15c131489 100644 --- a/webapp/components/team_export_tab.jsx +++ b/webapp/components/team_export_tab.jsx @@ -6,7 +6,7 @@ import Client from 'utils/web_client.jsx'; import {FormattedMessage} from 'react-intl'; import React from 'react'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; export default class TeamExportTab extends React.Component { constructor(props) { diff --git a/webapp/components/team_members_dropdown.jsx b/webapp/components/team_members_dropdown.jsx index b65b9e050..2b40da9cf 100644 --- a/webapp/components/team_members_dropdown.jsx +++ b/webapp/components/team_members_dropdown.jsx @@ -12,7 +12,7 @@ import TeamStore from 'stores/team_store.jsx'; import {FormattedMessage} from 'react-intl'; import React from 'react'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; export default class TeamMembersDropdown extends React.Component { constructor(props) { diff --git a/webapp/components/tutorial/tutorial_intro_screens.jsx b/webapp/components/tutorial/tutorial_intro_screens.jsx index af1ac4760..3928b7f20 100644 --- a/webapp/components/tutorial/tutorial_intro_screens.jsx +++ b/webapp/components/tutorial/tutorial_intro_screens.jsx @@ -10,7 +10,7 @@ import * as GlobalActions from 'actions/global_actions.jsx'; import Constants from 'utils/constants.jsx'; import {FormattedMessage, FormattedHTMLMessage} from 'react-intl'; -import {browserHistory} from 'react-router'; +import {browserHistory} from 'react-router/es6'; const Preferences = Constants.Preferences; diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx index 4cf28715b..af7aeb3c6 100644 --- a/webapp/components/user_settings/user_settings_security.jsx +++ b/webapp/components/user_settings/user_settings_security.jsx @@ -17,7 +17,7 @@ import * as Utils from 'utils/utils.jsx'; import Constants from 'utils/constants.jsx'; import {intlShape, injectIntl, defineMessages, FormattedMessage, FormattedHTMLMessage, FormattedTime, FormattedDate} from 'react-intl'; -import {Link} from 'react-router'; +import {Link} from 'react-router/es6'; const holders = defineMessages({ currentPasswordError: { |