Move “export” before decorators

As this is what upstream does. See also https://github.com/tc39/proposal-decorators/issues/69
2024-11-28 11:00:26 -05:00 · 2019-09-09 15:16:08 +02:00 · 2019-09-09 15:16:08 +02:00 · f2b307af25
commit f2b307af25
parent 0014a32c19
59 changed files with 118 additions and 118 deletions
--- a/app/javascript/flavours/glitch/components/account.js
+++ b/app/javascript/flavours/glitch/components/account.js
@ -19,8 +19,8 @@ const messages = defineMessages({
  unmute_notifications: { id: 'account.unmute_notifications', defaultMessage: 'You are currently muting notifications from @{name}. Click to unmute notifications' },
 });

-@injectIntl
-export default class Account extends ImmutablePureComponent {
+export default @injectIntl
+class Account extends ImmutablePureComponent {

  static propTypes = {
    account: ImmutablePropTypes.map.isRequired,
--- a/app/javascript/flavours/glitch/components/column_header.js
+++ b/app/javascript/flavours/glitch/components/column_header.js
@ -14,8 +14,8 @@ const messages = defineMessages({
  enterNotifCleaning : { id: 'notification_purge.start', defaultMessage: 'Enter notification cleaning mode' },
 });

-@injectIntl
-export default class ColumnHeader extends React.PureComponent {
+export default @injectIntl
+class ColumnHeader extends React.PureComponent {

  static contextTypes = {
    router: PropTypes.object,
--- a/app/javascript/flavours/glitch/components/domain.js
+++ b/app/javascript/flavours/glitch/components/domain.js
@ -8,8 +8,8 @@ const messages = defineMessages({
  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
 });

-@injectIntl
-export default class Account extends ImmutablePureComponent {
+export default @injectIntl
+class Account extends ImmutablePureComponent {

  static propTypes = {
    domain: PropTypes.string,
--- a/app/javascript/flavours/glitch/components/load_gap.js
+++ b/app/javascript/flavours/glitch/components/load_gap.js
@ -6,8 +6,8 @@ const messages = defineMessages({
  load_more: { id: 'status.load_more', defaultMessage: 'Load more' },
 });

-@injectIntl
-export default class LoadGap extends React.PureComponent {
+export default @injectIntl
+class LoadGap extends React.PureComponent {

  static propTypes = {
    disabled: PropTypes.bool,
--- a/app/javascript/flavours/glitch/components/media_gallery.js
+++ b/app/javascript/flavours/glitch/components/media_gallery.js
@ -254,8 +254,8 @@ class Item extends React.PureComponent {

 }

-@injectIntl
-export default class MediaGallery extends React.PureComponent {
+export default @injectIntl
+class MediaGallery extends React.PureComponent {

  static propTypes = {
    sensitive: PropTypes.bool,
--- a/app/javascript/flavours/glitch/components/notification_purge_buttons.js
+++ b/app/javascript/flavours/glitch/components/notification_purge_buttons.js
@ -18,8 +18,8 @@ const messages = defineMessages({
  btnApply : { id: 'notification_purge.btn_apply', defaultMessage: 'Clear\nselected' },
 });

-@injectIntl
-export default class NotificationPurgeButtons extends ImmutablePureComponent {
+export default @injectIntl
+class NotificationPurgeButtons extends ImmutablePureComponent {

  static propTypes = {
    onDeleteMarked : PropTypes.func.isRequired,
--- a/app/javascript/flavours/glitch/components/status_action_bar.js
+++ b/app/javascript/flavours/glitch/components/status_action_bar.js
@ -48,8 +48,8 @@ const obfuscatedCount = count => {
  }
 };

-@injectIntl
-export default class StatusActionBar extends ImmutablePureComponent {
+export default @injectIntl
+class StatusActionBar extends ImmutablePureComponent {

  static contextTypes = {
    router: PropTypes.object,
--- a/app/javascript/flavours/glitch/components/status_icons.js
+++ b/app/javascript/flavours/glitch/components/status_icons.js
@ -21,8 +21,8 @@ const messages = defineMessages({
  localOnly: { id: 'status.local_only', defaultMessage: 'Only visible from your instance' },
 });

-@injectIntl
-export default class StatusIcons extends React.PureComponent {
+export default @injectIntl
+class StatusIcons extends React.PureComponent {

  static propTypes = {
    status: ImmutablePropTypes.map.isRequired,
--- a/app/javascript/flavours/glitch/components/status_visibility_icon.js
+++ b/app/javascript/flavours/glitch/components/status_visibility_icon.js
@ -11,8 +11,8 @@ const messages = defineMessages({
  direct: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
 });

-@injectIntl
-export default class VisibilityIcon extends ImmutablePureComponent {
+export default @injectIntl
+class VisibilityIcon extends ImmutablePureComponent {

  static propTypes = {
    visibility: PropTypes.string,
--- a/app/javascript/flavours/glitch/features/account/components/action_bar.js
+++ b/app/javascript/flavours/glitch/features/account/components/action_bar.js
@ -8,8 +8,8 @@ import { me, isStaff } from 'flavours/glitch/util/initial_state';
 import { profileLink, accountAdminLink } from 'flavours/glitch/util/backend_links';
 import Icon from 'flavours/glitch/components/icon';

-@injectIntl
-export default class ActionBar extends React.PureComponent {
+export default @injectIntl
+class ActionBar extends React.PureComponent {

  static propTypes = {
    account: ImmutablePropTypes.map.isRequired,
--- a/app/javascript/flavours/glitch/features/account_gallery/index.js
+++ b/app/javascript/flavours/glitch/features/account_gallery/index.js
@ -45,8 +45,8 @@ class LoadMoreMedia extends ImmutablePureComponent {

 }

-@connect(mapStateToProps)
-export default class AccountGallery extends ImmutablePureComponent {
+export default @connect(mapStateToProps)
+class AccountGallery extends ImmutablePureComponent {

  static propTypes = {
    params: PropTypes.object.isRequired,
--- a/app/javascript/flavours/glitch/features/account_timeline/index.js
+++ b/app/javascript/flavours/glitch/features/account_timeline/index.js
@ -27,8 +27,8 @@ const mapStateToProps = (state, { params: { accountId }, withReplies = false })
  };
 };

-@connect(mapStateToProps)
-export default class AccountTimeline extends ImmutablePureComponent {
+export default @connect(mapStateToProps)
+class AccountTimeline extends ImmutablePureComponent {

  static propTypes = {
    params: PropTypes.object.isRequired,
--- a/app/javascript/flavours/glitch/features/blocks/index.js
+++ b/app/javascript/flavours/glitch/features/blocks/index.js
@ -21,9 +21,9 @@ const mapStateToProps = state => ({
  hasMore: !!state.getIn(['user_lists', 'blocks', 'next']),
 });

-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
@injectIntl
-export default class Blocks extends ImmutablePureComponent {
+class Blocks extends ImmutablePureComponent {

  static propTypes = {
    params: PropTypes.object.isRequired,
--- a/app/javascript/flavours/glitch/features/bookmarked_statuses/index.js
+++ b/app/javascript/flavours/glitch/features/bookmarked_statuses/index.js
@ -21,9 +21,9 @@ const mapStateToProps = state => ({
  hasMore: !!state.getIn(['status_lists', 'bookmarks', 'next']),
 });

-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
@injectIntl
-export default class Bookmarks extends ImmutablePureComponent {
+class Bookmarks extends ImmutablePureComponent {

  static propTypes = {
    dispatch: PropTypes.func.isRequired,
--- a/app/javascript/flavours/glitch/features/community_timeline/components/column_settings.js
+++ b/app/javascript/flavours/glitch/features/community_timeline/components/column_settings.js
@ -10,8 +10,8 @@ const messages = defineMessages({
  settings: { id: 'home.settings', defaultMessage: 'Column settings' },
 });

-@injectIntl
-export default class ColumnSettings extends React.PureComponent {
+export default @injectIntl
+class ColumnSettings extends React.PureComponent {

  static propTypes = {
    settings: ImmutablePropTypes.map.isRequired,
--- a/app/javascript/flavours/glitch/features/community_timeline/index.js
+++ b/app/javascript/flavours/glitch/features/community_timeline/index.js
@ -25,9 +25,9 @@ const mapStateToProps = (state, { onlyMedia, columnId }) => {
  };
 };

-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
@injectIntl
-export default class CommunityTimeline extends React.PureComponent {
+class CommunityTimeline extends React.PureComponent {

  static defaultProps = {
    onlyMedia: false,
--- a/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js
+++ b/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js
@ -9,8 +9,8 @@ const messages = defineMessages({
  settings: { id: 'home.settings', defaultMessage: 'Column settings' },
 });

-@injectIntl
-export default class ColumnSettings extends React.PureComponent {
+export default @injectIntl
+class ColumnSettings extends React.PureComponent {

  static propTypes = {
    settings: ImmutablePropTypes.map.isRequired,
--- a/app/javascript/flavours/glitch/features/direct_timeline/index.js
+++ b/app/javascript/flavours/glitch/features/direct_timeline/index.js
@ -22,9 +22,9 @@ const mapStateToProps = state => ({
  conversationsMode: state.getIn(['settings', 'direct', 'conversations']),
 });

-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
@injectIntl
-export default class DirectTimeline extends React.PureComponent {
+class DirectTimeline extends React.PureComponent {

  static propTypes = {
    dispatch: PropTypes.func.isRequired,
--- a/app/javascript/flavours/glitch/features/domain_blocks/index.js
+++ b/app/javascript/flavours/glitch/features/domain_blocks/index.js
@ -22,9 +22,9 @@ const mapStateToProps = state => ({
  hasMore: !!state.getIn(['domain_lists', 'blocks', 'next']),
 });

-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
@injectIntl
-export default class Blocks extends ImmutablePureComponent {
+class Blocks extends ImmutablePureComponent {

  static propTypes = {
    params: PropTypes.object.isRequired,
--- a/app/javascript/flavours/glitch/features/emoji_picker/index.js
+++ b/app/javascript/flavours/glitch/features/emoji_picker/index.js
@ -361,9 +361,9 @@ class EmojiPickerMenu extends React.PureComponent {

 }

-@connect(mapStateToProps, mapDispatchToProps)
+export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
-export default class EmojiPickerDropdown extends React.PureComponent {
+class EmojiPickerDropdown extends React.PureComponent {

  static propTypes = {
    custom_emojis: ImmutablePropTypes.list,
--- a/app/javascript/flavours/glitch/features/favourited_statuses/index.js
+++ b/app/javascript/flavours/glitch/features/favourited_statuses/index.js
@ -21,9 +21,9 @@ const mapStateToProps = state => ({
  hasMore: !!state.getIn(['status_lists', 'favourites', 'next']),
 });

-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
@injectIntl
-export default class Favourites extends ImmutablePureComponent {
+class Favourites extends ImmutablePureComponent {

  static propTypes = {
    dispatch: PropTypes.func.isRequired,
--- a/app/javascript/flavours/glitch/features/favourites/index.js
+++ b/app/javascript/flavours/glitch/features/favourites/index.js
@ -19,9 +19,9 @@ const mapStateToProps = (state, props) => ({
  accountIds: state.getIn(['user_lists', 'favourited_by', props.params.statusId]),
 });

-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
@injectIntl
-export default class Favourites extends ImmutablePureComponent {
+class Favourites extends ImmutablePureComponent {

  static propTypes = {
    params: PropTypes.object.isRequired,
--- a/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.js
+++ b/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.js
@ -13,8 +13,8 @@ const messages = defineMessages({
  reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
 });

-@injectIntl
-export default class AccountAuthorize extends ImmutablePureComponent {
+export default @injectIntl
+class AccountAuthorize extends ImmutablePureComponent {

  static propTypes = {
    account: ImmutablePropTypes.map.isRequired,
--- a/app/javascript/flavours/glitch/features/follow_requests/index.js
+++ b/app/javascript/flavours/glitch/features/follow_requests/index.js
@ -21,9 +21,9 @@ const mapStateToProps = state => ({
  hasMore: !!state.getIn(['user_lists', 'follow_requests', 'next']),
 });

-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
@injectIntl
-export default class FollowRequests extends ImmutablePureComponent {
+class FollowRequests extends ImmutablePureComponent {

  static propTypes = {
    params: PropTypes.object.isRequired,
--- a/app/javascript/flavours/glitch/features/followers/index.js
+++ b/app/javascript/flavours/glitch/features/followers/index.js
@ -24,8 +24,8 @@ const mapStateToProps = (state, props) => ({
  hasMore: !!state.getIn(['user_lists', 'followers', props.params.accountId, 'next']),
 });

-@connect(mapStateToProps)
-export default class Followers extends ImmutablePureComponent {
+export default @connect(mapStateToProps)
+class Followers extends ImmutablePureComponent {

  static propTypes = {
    params: PropTypes.object.isRequired,
--- a/app/javascript/flavours/glitch/features/following/index.js
+++ b/app/javascript/flavours/glitch/features/following/index.js
@ -24,8 +24,8 @@ const mapStateToProps = (state, props) => ({
  hasMore: !!state.getIn(['user_lists', 'following', props.params.accountId, 'next']),
 });

-@connect(mapStateToProps)
-export default class Following extends ImmutablePureComponent {
+export default @connect(mapStateToProps)
+class Following extends ImmutablePureComponent {

  static propTypes = {
    params: PropTypes.object.isRequired,
--- a/app/javascript/flavours/glitch/features/getting_started_misc/index.js
+++ b/app/javascript/flavours/glitch/features/getting_started_misc/index.js
@ -24,9 +24,9 @@ const messages = defineMessages({
  featured_users: { id: 'navigation_bar.featured_users', defaultMessage: 'Featured users' },
 });

-@connect()
+export default @connect()
@injectIntl
-export default class gettingStartedMisc extends ImmutablePureComponent {
+class gettingStartedMisc extends ImmutablePureComponent {

  static propTypes = {
    intl: PropTypes.object.isRequired,
--- a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js
+++ b/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js
@ -10,8 +10,8 @@ const messages = defineMessages({
  noOptions: { id: 'hashtag.column_settings.select.no_options_message', defaultMessage: 'No suggestions found' },
 });

-@injectIntl
-export default class ColumnSettings extends React.PureComponent {
+export default @injectIntl
+class ColumnSettings extends React.PureComponent {

  static propTypes = {
    settings: ImmutablePropTypes.map.isRequired,
--- a/app/javascript/flavours/glitch/features/hashtag_timeline/index.js
+++ b/app/javascript/flavours/glitch/features/hashtag_timeline/index.js
@ -15,8 +15,8 @@ const mapStateToProps = (state, props) => ({
  hasUnread: state.getIn(['timelines', `hashtag:${props.params.id}`, 'unread']) > 0,
 });

-@connect(mapStateToProps)
-export default class HashtagTimeline extends React.PureComponent {
+export default @connect(mapStateToProps)
+class HashtagTimeline extends React.PureComponent {

  disconnects = [];

--- a/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.js
+++ b/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.js
@ -10,8 +10,8 @@ const messages = defineMessages({
  settings: { id: 'home.settings', defaultMessage: 'Column settings' },
 });

-@injectIntl
-export default class ColumnSettings extends React.PureComponent {
+export default @injectIntl
+class ColumnSettings extends React.PureComponent {

  static propTypes = {
    settings: ImmutablePropTypes.map.isRequired,
--- a/app/javascript/flavours/glitch/features/home_timeline/index.js
+++ b/app/javascript/flavours/glitch/features/home_timeline/index.js
@ -19,9 +19,9 @@ const mapStateToProps = state => ({
  isPartial: state.getIn(['timelines', 'home', 'isPartial']),
 });

-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
@injectIntl
-export default class HomeTimeline extends React.PureComponent {
+class HomeTimeline extends React.PureComponent {

  static propTypes = {
    dispatch: PropTypes.func.isRequired,
--- a/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.js
+++ b/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.js
@ -14,9 +14,9 @@ const mapStateToProps = state => ({
  collapseEnabled: state.getIn(['local_settings', 'collapsed', 'enabled']),
 });

-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
@injectIntl
-export default class KeyboardShortcuts extends ImmutablePureComponent {
+class KeyboardShortcuts extends ImmutablePureComponent {

  static propTypes = {
    intl: PropTypes.object.isRequired,
--- a/app/javascript/flavours/glitch/features/list_editor/components/edit_list_form.js
+++ b/app/javascript/flavours/glitch/features/list_editor/components/edit_list_form.js
@ -19,9 +19,9 @@ const mapDispatchToProps = dispatch => ({
  onSubmit: () => dispatch(submitListEditor(false)),
 });

-@connect(mapStateToProps, mapDispatchToProps)
+export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
-export default class ListForm extends React.PureComponent {
+class ListForm extends React.PureComponent {

  static propTypes = {
    value: PropTypes.string.isRequired,
--- a/app/javascript/flavours/glitch/features/list_editor/index.js
+++ b/app/javascript/flavours/glitch/features/list_editor/index.js
@ -22,9 +22,9 @@ const mapDispatchToProps = dispatch => ({
  onReset: () => dispatch(resetListEditor()),
 });

-@connect(mapStateToProps, mapDispatchToProps)
+export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
-export default class ListEditor extends ImmutablePureComponent {
+class ListEditor extends ImmutablePureComponent {

  static propTypes = {
    listId: PropTypes.string.isRequired,
--- a/app/javascript/flavours/glitch/features/list_timeline/index.js
+++ b/app/javascript/flavours/glitch/features/list_timeline/index.js
@ -27,9 +27,9 @@ const mapStateToProps = (state, props) => ({
  hasUnread: state.getIn(['timelines', `list:${props.params.id}`, 'unread']) > 0,
 });

-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
@injectIntl
-export default class ListTimeline extends React.PureComponent {
+class ListTimeline extends React.PureComponent {

  static contextTypes = {
    router: PropTypes.object,
--- a/app/javascript/flavours/glitch/features/lists/components/new_list_form.js
+++ b/app/javascript/flavours/glitch/features/lists/components/new_list_form.js
@ -20,9 +20,9 @@ const mapDispatchToProps = dispatch => ({
  onSubmit: () => dispatch(submitListEditor(true)),
 });

-@connect(mapStateToProps, mapDispatchToProps)
+export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
-export default class NewListForm extends React.PureComponent {
+class NewListForm extends React.PureComponent {

  static propTypes = {
    value: PropTypes.string.isRequired,
--- a/app/javascript/flavours/glitch/features/lists/index.js
+++ b/app/javascript/flavours/glitch/features/lists/index.js
@ -31,9 +31,9 @@ const mapStateToProps = state => ({
  lists: getOrderedLists(state),
 });

-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
@injectIntl
-export default class Lists extends ImmutablePureComponent {
+class Lists extends ImmutablePureComponent {

  static propTypes = {
    params: PropTypes.object.isRequired,
--- a/app/javascript/flavours/glitch/features/local_settings/navigation/index.js
+++ b/app/javascript/flavours/glitch/features/local_settings/navigation/index.js
@ -20,8 +20,8 @@ const messages = defineMessages({
  close: { id: 'settings.close', defaultMessage: 'Close' },
 });

-@injectIntl
-export default class LocalSettingsNavigation extends React.PureComponent {
+export default @injectIntl
+class LocalSettingsNavigation extends React.PureComponent {

  static propTypes = {
    index      : PropTypes.number,
--- a/app/javascript/flavours/glitch/features/local_settings/page/index.js
+++ b/app/javascript/flavours/glitch/features/local_settings/page/index.js
@ -30,8 +30,8 @@ const messages = defineMessages({
  rewrite_mentions_username: { id: 'settings.rewrite_mentions_username', defaultMessage:  'Rewrite with username' },
 });

-@injectIntl
-export default class LocalSettingsPage extends React.PureComponent {
+export default @injectIntl
+class LocalSettingsPage extends React.PureComponent {

  static propTypes = {
    index    : PropTypes.number,
--- a/app/javascript/flavours/glitch/features/mutes/index.js
+++ b/app/javascript/flavours/glitch/features/mutes/index.js
@ -21,9 +21,9 @@ const mapStateToProps = state => ({
  hasMore: !!state.getIn(['user_lists', 'mutes', 'next']),
 });

-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
@injectIntl
-export default class Mutes extends ImmutablePureComponent {
+class Mutes extends ImmutablePureComponent {

  static propTypes = {
    params: PropTypes.object.isRequired,
--- a/app/javascript/flavours/glitch/features/notifications/components/overlay.js
+++ b/app/javascript/flavours/glitch/features/notifications/components/overlay.js
@ -14,8 +14,8 @@ const messages = defineMessages({
  markForDeletion: { id: 'notification.markForDeletion', defaultMessage: 'Mark for deletion' },
 });

-@injectIntl
-export default class NotificationOverlay extends ImmutablePureComponent {
+export default @injectIntl
+class NotificationOverlay extends ImmutablePureComponent {

  static propTypes = {
    notification    : ImmutablePropTypes.map.isRequired,
--- a/app/javascript/flavours/glitch/features/notifications/index.js
+++ b/app/javascript/flavours/glitch/features/notifications/index.js
@ -67,9 +67,9 @@ const mapDispatchToProps = dispatch => ({
  dispatch,
 });

-@connect(mapStateToProps, mapDispatchToProps)
+export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
-export default class Notifications extends React.PureComponent {
+class Notifications extends React.PureComponent {

  static propTypes = {
    columnId: PropTypes.string,
--- a/app/javascript/flavours/glitch/features/pinned_accounts_editor/index.js
+++ b/app/javascript/flavours/glitch/features/pinned_accounts_editor/index.js
@ -21,9 +21,9 @@ const mapDispatchToProps = dispatch => ({
  onReset: () => dispatch(resetPinnedAccountsEditor()),
 });

-@connect(mapStateToProps, mapDispatchToProps)
+export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
-export default class PinnedAccountsEditor extends ImmutablePureComponent {
+class PinnedAccountsEditor extends ImmutablePureComponent {

  static propTypes = {
    onClose: PropTypes.func.isRequired,
--- a/app/javascript/flavours/glitch/features/pinned_statuses/index.js
+++ b/app/javascript/flavours/glitch/features/pinned_statuses/index.js
@ -18,9 +18,9 @@ const mapStateToProps = state => ({
  hasMore: !!state.getIn(['status_lists', 'pins', 'next']),
 });

-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
@injectIntl
-export default class PinnedStatuses extends ImmutablePureComponent {
+class PinnedStatuses extends ImmutablePureComponent {

  static propTypes = {
    dispatch: PropTypes.func.isRequired,
--- a/app/javascript/flavours/glitch/features/public_timeline/index.js
+++ b/app/javascript/flavours/glitch/features/public_timeline/index.js
@ -25,9 +25,9 @@ const mapStateToProps = (state, { onlyMedia, columnId }) => {
  };
 };

-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
@injectIntl
-export default class PublicTimeline extends React.PureComponent {
+class PublicTimeline extends React.PureComponent {

  static defaultProps = {
    onlyMedia: false,
--- a/app/javascript/flavours/glitch/features/reblogs/index.js
+++ b/app/javascript/flavours/glitch/features/reblogs/index.js
@ -19,9 +19,9 @@ const mapStateToProps = (state, props) => ({
  accountIds: state.getIn(['user_lists', 'reblogged_by', props.params.statusId]),
 });

-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
@injectIntl
-export default class Reblogs extends ImmutablePureComponent {
+class Reblogs extends ImmutablePureComponent {

  static propTypes = {
    params: PropTypes.object.isRequired,
--- a/app/javascript/flavours/glitch/features/status/components/action_bar.js
+++ b/app/javascript/flavours/glitch/features/status/components/action_bar.js
@ -32,8 +32,8 @@ const messages = defineMessages({
  copy: { id: 'status.copy', defaultMessage: 'Copy link to status' },
 });

-@injectIntl
-export default class ActionBar extends React.PureComponent {
+export default @injectIntl
+class ActionBar extends React.PureComponent {

  static contextTypes = {
    router: PropTypes.object,
--- a/app/javascript/flavours/glitch/features/status/index.js
+++ b/app/javascript/flavours/glitch/features/status/index.js
@ -139,9 +139,9 @@ const makeMapStateToProps = () => {
  return mapStateToProps;
 };

-@injectIntl
+export default @injectIntl
@connect(makeMapStateToProps)
-export default class Status extends ImmutablePureComponent {
+class Status extends ImmutablePureComponent {

  static contextTypes = {
    router: PropTypes.object,
--- a/app/javascript/flavours/glitch/features/ui/components/boost_modal.js
+++ b/app/javascript/flavours/glitch/features/ui/components/boost_modal.js
@ -15,8 +15,8 @@ const messages = defineMessages({
  reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
 });

-@injectIntl
-export default class BoostModal extends ImmutablePureComponent {
+export default @injectIntl
+class BoostModal extends ImmutablePureComponent {

  static contextTypes = {
    router: PropTypes.object,
--- a/app/javascript/flavours/glitch/features/ui/components/confirmation_modal.js
+++ b/app/javascript/flavours/glitch/features/ui/components/confirmation_modal.js
@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import { injectIntl, FormattedMessage } from 'react-intl';
 import Button from 'flavours/glitch/components/button';

-@injectIntl
-export default class ConfirmationModal extends React.PureComponent {
+export default @injectIntl
+class ConfirmationModal extends React.PureComponent {

  static propTypes = {
    message: PropTypes.node.isRequired,
--- a/app/javascript/flavours/glitch/features/ui/components/doodle_modal.js
+++ b/app/javascript/flavours/glitch/features/ui/components/doodle_modal.js
@ -145,8 +145,8 @@ const mapDispatchToProps = dispatch => ({
 * - Ctrl + left mouse button: pick background
 * - Right mouse button: pick background
 */
-@connect(mapStateToProps, mapDispatchToProps)
-export default class DoodleModal extends ImmutablePureComponent {
+export default @connect(mapStateToProps, mapDispatchToProps)
+class DoodleModal extends ImmutablePureComponent {

  static propTypes = {
    options: ImmutablePropTypes.map,
--- a/app/javascript/flavours/glitch/features/ui/components/embed_modal.js
+++ b/app/javascript/flavours/glitch/features/ui/components/embed_modal.js
@ -4,8 +4,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { FormattedMessage, injectIntl } from 'react-intl';
 import api from 'flavours/glitch/util/api';

-@injectIntl
-export default class EmbedModal extends ImmutablePureComponent {
+export default @injectIntl
+class EmbedModal extends ImmutablePureComponent {

  static propTypes = {
    url: PropTypes.string.isRequired,
--- a/app/javascript/flavours/glitch/features/ui/components/favourite_modal.js
+++ b/app/javascript/flavours/glitch/features/ui/components/favourite_modal.js
@ -13,8 +13,8 @@ const messages = defineMessages({
  favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
 });

-@injectIntl
-export default class FavouriteModal extends ImmutablePureComponent {
+export default @injectIntl
+class FavouriteModal extends ImmutablePureComponent {

  static contextTypes = {
    router: PropTypes.object,
--- a/app/javascript/flavours/glitch/features/ui/components/media_modal.js
+++ b/app/javascript/flavours/glitch/features/ui/components/media_modal.js
@ -16,8 +16,8 @@ const messages = defineMessages({
  next: { id: 'lightbox.next', defaultMessage: 'Next' },
 });

-@injectIntl
-export default class MediaModal extends ImmutablePureComponent {
+export default @injectIntl
+class MediaModal extends ImmutablePureComponent {

  static contextTypes = {
    router: PropTypes.object,
--- a/app/javascript/flavours/glitch/features/ui/components/mute_modal.js
+++ b/app/javascript/flavours/glitch/features/ui/components/mute_modal.js
@ -33,9 +33,9 @@ const mapDispatchToProps = dispatch => {
  };
 };

-@connect(mapStateToProps, mapDispatchToProps)
+export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
-export default class MuteModal extends React.PureComponent {
+class MuteModal extends React.PureComponent {

  static propTypes = {
    isSubmitting: PropTypes.bool.isRequired,
--- a/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js
+++ b/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js
@ -159,9 +159,9 @@ const mapStateToProps = state => ({
  domain: state.getIn(['meta', 'domain']),
 });

-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
@injectIntl
-export default class OnboardingModal extends React.PureComponent {
+class OnboardingModal extends React.PureComponent {

  static propTypes = {
    onClose: PropTypes.func.isRequired,
--- a/app/javascript/flavours/glitch/features/ui/components/report_modal.js
+++ b/app/javascript/flavours/glitch/features/ui/components/report_modal.js
@ -37,9 +37,9 @@ const makeMapStateToProps = () => {
  return mapStateToProps;
 };

-@connect(makeMapStateToProps)
+export default @connect(makeMapStateToProps)
@injectIntl
-export default class ReportModal extends ImmutablePureComponent {
+class ReportModal extends ImmutablePureComponent {

  static propTypes = {
    isSubmitting: PropTypes.bool,
--- a/app/javascript/flavours/glitch/features/ui/components/tabs_bar.js
+++ b/app/javascript/flavours/glitch/features/ui/components/tabs_bar.js
@ -24,9 +24,9 @@ export function getLink (index) {
  return links[index].props.to;
 }

-@injectIntl
+export default @injectIntl
@withRouter
-export default class TabsBar extends React.PureComponent {
+class TabsBar extends React.PureComponent {

  static propTypes = {
    intl: PropTypes.object.isRequired,
--- a/app/javascript/flavours/glitch/features/video/index.js
+++ b/app/javascript/flavours/glitch/features/video/index.js
@ -84,8 +84,8 @@ export const getPointerPosition = (el, event) => {
  return position;
 };

-@injectIntl
-export default class Video extends React.PureComponent {
+export default @injectIntl
+class Video extends React.PureComponent {

  static propTypes = {
    preview: PropTypes.string,