Skip to content

Commit

Permalink
Adding webpack code splitting (mattermost#3377)
Browse files Browse the repository at this point in the history
  • Loading branch information
crspeller committed Jun 22, 2016
1 parent ca4a746 commit c45c6fb
Show file tree
Hide file tree
Showing 65 changed files with 740 additions and 614 deletions.
2 changes: 1 addition & 1 deletion actions/channel_actions.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.

import {browserHistory} from 'react-router';
import {browserHistory} from 'react-router/es6';
import * as Utils from 'utils/utils.jsx';
import TeamStore from 'stores/team_store.jsx';
import UserStore from 'stores/user_store.jsx';
Expand Down
2 changes: 1 addition & 1 deletion actions/global_actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import * as I18n from 'i18n/i18n.jsx';

import {trackPage} from 'actions/analytics_actions.jsx';

import {browserHistory} from 'react-router';
import {browserHistory} from 'react-router/es6';

import en from 'i18n/en.json';

Expand Down
2 changes: 1 addition & 1 deletion actions/team_actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import * as AsyncClient from 'utils/async_client.jsx';
import Client from 'utils/web_client.jsx';
import AppDispatcher from 'dispatcher/app_dispatcher.jsx';

import {browserHistory} from 'react-router';
import {browserHistory} from 'react-router/es6';

export function checkIfTeamExists(teamName, onSuccess, onError) {
Client.findTeamByName(teamName, onSuccess, onError);
Expand Down
2 changes: 1 addition & 1 deletion actions/websocket_actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import * as GlobalActions from 'actions/global_actions.jsx';
import Constants from 'utils/constants.jsx';
const SocketEvents = Constants.SocketEvents;

import {browserHistory} from 'react-router';
import {browserHistory} from 'react-router/es6';

const MAX_WEBSOCKET_FAILS = 7;
const WEBSOCKET_RETRY_TIME = 3000;
Expand Down
2 changes: 1 addition & 1 deletion components/admin_console/admin_navbar_dropdown.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion components/admin_console/admin_sidebar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion components/admin_console/admin_sidebar_category.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion components/admin_console/admin_sidebar_section.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion components/admin_console/user_item.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion components/backstage/add_command.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion components/backstage/add_incoming_webhook.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion components/backstage/add_outgoing_webhook.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion components/backstage/backstage_category.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion components/backstage/backstage_navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion components/backstage/backstage_section.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion components/backstage/installed_integrations.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion components/backstage/integration_option.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion components/channel_header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion components/claim/claim_controller.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion components/claim/components/oauth_to_email.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion components/create_post.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion components/create_team/components/display_name.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion components/create_team/create_team_controller.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion components/delete_channel_modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion components/do_verify_email.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion components/error_page.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion components/file_info_preview.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion components/logged_in.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion components/login/login_controller.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion components/more_channels.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion components/more_direct_channels.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion components/navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion components/navbar_dropdown.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion components/needs_team.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion components/new_channel_flow.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion components/password_reset_form.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion components/password_reset_send_link.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion components/permalink_view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion components/popover_list_members.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion components/removed_from_channel_modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion components/root.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion components/search_results_item.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion components/select_team/select_team.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion components/should_verify_email.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading

0 comments on commit c45c6fb

Please sign in to comment.