From f5bf5ebb82e3af420dcd23d602b1be6cc86838e1 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 3 May 2017 02:04:16 +0200
Subject: Replace sprockets/browserify with Webpack (#2617)

* Replace browserify with webpack

* Add react-intl-translations-manager

* Do not minify in development, add offline-plugin for ServiceWorker background cache updates

* Adjust tests and dependencies

* Fix production deployments

* Fix tests

* More optimizations

* Improve travis cache for npm stuff

* Re-run travis

* Add back support for custom.scss as before

* Remove offline-plugin and babili

* Fix issue with Immutable.List().unshift(...values) not working as expected

* Make travis load schema instead of running all migrations in sequence

* Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of
React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in
<UI />

* Add react definitions to places that use JSX

* Add Procfile.dev for running rails, webpack and streaming API at the same time
---
 .../report/components/status_check_box.jsx         |  39 -------
 .../containers/status_check_box_container.jsx      |  19 ---
 .../components/features/report/index.jsx           | 130 ---------------------
 3 files changed, 188 deletions(-)
 delete mode 100644 app/assets/javascripts/components/features/report/components/status_check_box.jsx
 delete mode 100644 app/assets/javascripts/components/features/report/containers/status_check_box_container.jsx
 delete mode 100644 app/assets/javascripts/components/features/report/index.jsx

(limited to 'app/assets/javascripts/components/features/report')

diff --git a/app/assets/javascripts/components/features/report/components/status_check_box.jsx b/app/assets/javascripts/components/features/report/components/status_check_box.jsx
deleted file mode 100644
index bc866616a..000000000
--- a/app/assets/javascripts/components/features/report/components/status_check_box.jsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import emojify from '../../../emoji';
-import Toggle from 'react-toggle';
-
-class StatusCheckBox extends React.PureComponent {
-
-  render () {
-    const { status, checked, onToggle, disabled } = this.props;
-    const content = { __html: emojify(status.get('content')) };
-
-    if (status.get('reblog')) {
-      return null;
-    }
-
-    return (
-      <div className='status-check-box'>
-        <div
-          className='status__content'
-          dangerouslySetInnerHTML={content}
-        />
-
-        <div className='status-check-box-toggle'>
-          <Toggle checked={checked} onChange={onToggle} disabled={disabled} />
-        </div>
-      </div>
-    );
-  }
-
-}
-
-StatusCheckBox.propTypes = {
-  status: ImmutablePropTypes.map.isRequired,
-  checked: PropTypes.bool,
-  onToggle: PropTypes.func.isRequired,
-  disabled: PropTypes.bool
-};
-
-export default StatusCheckBox;
diff --git a/app/assets/javascripts/components/features/report/containers/status_check_box_container.jsx b/app/assets/javascripts/components/features/report/containers/status_check_box_container.jsx
deleted file mode 100644
index 67ce9d9f3..000000000
--- a/app/assets/javascripts/components/features/report/containers/status_check_box_container.jsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { connect } from 'react-redux';
-import StatusCheckBox from '../components/status_check_box';
-import { toggleStatusReport } from '../../../actions/reports';
-import Immutable from 'immutable';
-
-const mapStateToProps = (state, { id }) => ({
-  status: state.getIn(['statuses', id]),
-  checked: state.getIn(['reports', 'new', 'status_ids'], Immutable.Set()).includes(id)
-});
-
-const mapDispatchToProps = (dispatch, { id }) => ({
-
-  onToggle (e) {
-    dispatch(toggleStatusReport(id, e.target.checked));
-  }
-
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(StatusCheckBox);
diff --git a/app/assets/javascripts/components/features/report/index.jsx b/app/assets/javascripts/components/features/report/index.jsx
deleted file mode 100644
index 6e3cfcb2a..000000000
--- a/app/assets/javascripts/components/features/report/index.jsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import { connect } from 'react-redux';
-import { cancelReport, changeReportComment, submitReport } from '../../actions/reports';
-import { fetchAccountTimeline } from '../../actions/accounts';
-import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import Column from '../ui/components/column';
-import Button from '../../components/button';
-import { makeGetAccount } from '../../selectors';
-import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
-import StatusCheckBox from './containers/status_check_box_container';
-import Immutable from 'immutable';
-import ColumnBackButtonSlim from '../../components/column_back_button_slim';
-
-const messages = defineMessages({
-  heading: { id: 'report.heading', defaultMessage: 'New report' },
-  placeholder: { id: 'report.placeholder', defaultMessage: 'Additional comments' },
-  submit: { id: 'report.submit', defaultMessage: 'Submit' }
-});
-
-const makeMapStateToProps = () => {
-  const getAccount = makeGetAccount();
-
-  const mapStateToProps = state => {
-    const accountId = state.getIn(['reports', 'new', 'account_id']);
-
-    return {
-      isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']),
-      account: getAccount(state, accountId),
-      comment: state.getIn(['reports', 'new', 'comment']),
-      statusIds: Immutable.OrderedSet(state.getIn(['timelines', 'accounts_timelines', accountId, 'items'])).union(state.getIn(['reports', 'new', 'status_ids']))
-    };
-  };
-
-  return mapStateToProps;
-};
-
-class Report extends React.PureComponent {
-
-  constructor (props, context) {
-    super(props, context);
-    this.handleCommentChange = this.handleCommentChange.bind(this);
-    this.handleSubmit = this.handleSubmit.bind(this);
-  }
-
-  componentWillMount () {
-    if (!this.props.account) {
-      this.context.router.replace('/');
-    }
-  }
-
-  componentDidMount () {
-    if (!this.props.account) {
-      return;
-    }
-
-    this.props.dispatch(fetchAccountTimeline(this.props.account.get('id')));
-  }
-
-  componentWillReceiveProps (nextProps) {
-    if (this.props.account !== nextProps.account && nextProps.account) {
-      this.props.dispatch(fetchAccountTimeline(nextProps.account.get('id')));
-    }
-  }
-
-  handleCommentChange (e) {
-    this.props.dispatch(changeReportComment(e.target.value));
-  }
-
-  handleSubmit () {
-    this.props.dispatch(submitReport());
-    this.context.router.replace('/');
-  }
-
-  render () {
-    const { account, comment, intl, statusIds, isSubmitting } = this.props;
-
-    if (!account) {
-      return null;
-    }
-
-    return (
-      <Column heading={intl.formatMessage(messages.heading)} icon='flag'>
-        <ColumnBackButtonSlim />
-
-        <div className='report scrollable'>
-          <div className='report__target'>
-            <FormattedMessage id='report.target' defaultMessage='Reporting' />
-            <strong>{account.get('acct')}</strong>
-          </div>
-
-          <div className='scrollable report__statuses'>
-            <div>
-              {statusIds.map(statusId => <StatusCheckBox id={statusId} key={statusId} disabled={isSubmitting} />)}
-            </div>
-          </div>
-
-          <div className='report__textarea-wrapper'>
-            <textarea
-              className='report__textarea'
-              placeholder={intl.formatMessage(messages.placeholder)}
-              value={comment}
-              onChange={this.handleCommentChange}
-              disabled={isSubmitting}
-            />
-
-            <div className='report__submit'>
-              <div className='report__submit-button'><Button disabled={isSubmitting} text={intl.formatMessage(messages.submit)} onClick={this.handleSubmit} /></div>
-            </div>
-          </div>
-        </div>
-      </Column>
-    );
-  }
-
-}
-
-Report.contextTypes = {
-  router: PropTypes.object
-};
-
-Report.propTypes = {
-  isSubmitting: PropTypes.bool,
-  account: ImmutablePropTypes.map,
-  statusIds: ImmutablePropTypes.orderedSet.isRequired,
-  comment: PropTypes.string.isRequired,
-  dispatch: PropTypes.func.isRequired,
-  intl: PropTypes.object.isRequired
-};
-
-export default connect(makeMapStateToProps)(injectIntl(Report));
-- 
cgit