diff --git a/.eslintrc.js b/.eslintrc.js
index e4ada6fe0d16237998c30dab3bee48aa83cf7c94..fd110564ea9f69547d3aa56b1cf54545218be1b3 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -24,10 +24,14 @@ module.exports = {
parserOptions: {
sourceType: 'module',
ecmaFeatures: {
- experimentalObjectRestSpread: true,
jsx: true,
},
ecmaVersion: 2021,
+ requireConfigFile: false,
+ babelOptions: {
+ configFile: false,
+ presets: ['@babel/react', '@babel/env'],
+ },
},
settings: {
@@ -211,4 +215,18 @@ module.exports = {
},
],
},
+
+ overrides: [
+ {
+ files: ['*.config.js', '.eslintrc.js', 'ide-helper.js'],
+
+ env: {
+ commonjs: true,
+ },
+
+ parserOptions: {
+ sourceType: 'script',
+ },
+ },
+ ],
};
diff --git a/app/javascript/mastodon/components/account.js b/app/javascript/mastodon/components/account.js
index af9f119c82c173e352fab211c77ab2951d76b3ef..5fe94ebf8bc882b6a13bbfaa32d0283dbb5e6b8d 100644
--- a/app/javascript/mastodon/components/account.js
+++ b/app/javascript/mastodon/components/account.js
@@ -22,7 +22,6 @@ const messages = defineMessages({
block: { id: 'account.block', defaultMessage: 'Block @{name}' },
});
-export default @injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
@@ -140,3 +139,5 @@ class Account extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Account);
diff --git a/app/javascript/mastodon/components/admin/ReportReasonSelector.js b/app/javascript/mastodon/components/admin/ReportReasonSelector.js
index 1f91d25175a02bf78039848f6db206bc19f42a20..58a861fde6b4cac78d2404b9b85dfd561c46f620 100644
--- a/app/javascript/mastodon/components/admin/ReportReasonSelector.js
+++ b/app/javascript/mastodon/components/admin/ReportReasonSelector.js
@@ -84,7 +84,6 @@ class Rule extends React.PureComponent {
}
-export default @injectIntl
class ReportReasonSelector extends React.PureComponent {
static propTypes = {
@@ -157,3 +156,5 @@ class ReportReasonSelector extends React.PureComponent {
}
}
+
+export default injectIntl(ReportReasonSelector);
diff --git a/app/javascript/mastodon/components/column_header.js b/app/javascript/mastodon/components/column_header.js
index cbbc490a83b9d7cedaffc477420590b9fd2ba0db..ae13cb8bfd617f8ab1c92ba598abdc8647e3dfb1 100644
--- a/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@@ -12,7 +12,6 @@ const messages = defineMessages({
moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
});
-export default @injectIntl
class ColumnHeader extends React.PureComponent {
static contextTypes = {
@@ -213,3 +212,5 @@ class ColumnHeader extends React.PureComponent {
}
}
+
+export default injectIntl(ColumnHeader);
diff --git a/app/javascript/mastodon/components/domain.js b/app/javascript/mastodon/components/domain.js
index 697065d874d1f6f58c2c1a6c6a6ed9a144ac608c..364d7f3b1dbf0d19283fca4f841b481731caf535 100644
--- a/app/javascript/mastodon/components/domain.js
+++ b/app/javascript/mastodon/components/domain.js
@@ -8,7 +8,6 @@ const messages = defineMessages({
unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
});
-export default @injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
@@ -40,3 +39,5 @@ class Account extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Account);
diff --git a/app/javascript/mastodon/components/edited_timestamp/index.js b/app/javascript/mastodon/components/edited_timestamp/index.js
index bebf938865bc9837211dd17560ef44a7a2651490..65e1a8ed54b32d82a8f0c089f38639169f73ba03 100644
--- a/app/javascript/mastodon/components/edited_timestamp/index.js
+++ b/app/javascript/mastodon/components/edited_timestamp/index.js
@@ -16,8 +16,6 @@ const mapDispatchToProps = (dispatch, { statusId }) => ({
});
-export default @connect(null, mapDispatchToProps)
-@injectIntl
class EditedTimestamp extends React.PureComponent {
static propTypes = {
@@ -68,3 +66,5 @@ class EditedTimestamp extends React.PureComponent {
}
}
+
+export default connect(null, mapDispatchToProps)(injectIntl(EditedTimestamp));
diff --git a/app/javascript/mastodon/components/inline_account.js b/app/javascript/mastodon/components/inline_account.js
index a1b4955904b0011ed75e9138e343d28115978984..31dc63f93fda5adefac7b11efa723d20c580f2dc 100644
--- a/app/javascript/mastodon/components/inline_account.js
+++ b/app/javascript/mastodon/components/inline_account.js
@@ -14,7 +14,6 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
-export default @connect(makeMapStateToProps)
class InlineAccount extends React.PureComponent {
static propTypes = {
@@ -32,3 +31,5 @@ class InlineAccount extends React.PureComponent {
}
}
+
+export default connect(makeMapStateToProps)(InlineAccount);
diff --git a/app/javascript/mastodon/components/load_gap.js b/app/javascript/mastodon/components/load_gap.js
index a44d55d09354131b37d557310fb03dbb8f300027..8c2d517e739f8f7b7c99e0fb15fb231d480f0a16 100644
--- a/app/javascript/mastodon/components/load_gap.js
+++ b/app/javascript/mastodon/components/load_gap.js
@@ -7,7 +7,6 @@ const messages = defineMessages({
load_more: { id: 'status.load_more', defaultMessage: 'Load more' },
});
-export default @injectIntl
class LoadGap extends React.PureComponent {
static propTypes = {
@@ -32,3 +31,5 @@ class LoadGap extends React.PureComponent {
}
}
+
+export default injectIntl(LoadGap);
diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js
index 2e7ce2e608f92803912e7115bd7b5b4b71c9a8f4..948f9a9ddb31c7cc6c3bb4b94741548a923b32b9 100644
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -220,7 +220,6 @@ class Item extends React.PureComponent {
}
-export default @injectIntl
class MediaGallery extends React.PureComponent {
static propTypes = {
@@ -366,3 +365,5 @@ class MediaGallery extends React.PureComponent {
}
}
+
+export default injectIntl(MediaGallery);
diff --git a/app/javascript/mastodon/components/picture_in_picture_placeholder.js b/app/javascript/mastodon/components/picture_in_picture_placeholder.js
index 19d15c18b16e379250a7193a7f04f2b0b444d2cf..dbc131891307605f335ea1fd5ce314fb8ee063dc 100644
--- a/app/javascript/mastodon/components/picture_in_picture_placeholder.js
+++ b/app/javascript/mastodon/components/picture_in_picture_placeholder.js
@@ -6,7 +6,6 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import { FormattedMessage } from 'react-intl';
-export default @connect()
class PictureInPicturePlaceholder extends React.PureComponent {
static propTypes = {
@@ -67,3 +66,5 @@ class PictureInPicturePlaceholder extends React.PureComponent {
}
}
+
+export default connect()(PictureInPicturePlaceholder);
diff --git a/app/javascript/mastodon/components/poll.js b/app/javascript/mastodon/components/poll.js
index 85aa28816ca2bcecc2784bc2f3727e0986426ac2..a748cb0769969423acafb7c46d132327a644a62e 100644
--- a/app/javascript/mastodon/components/poll.js
+++ b/app/javascript/mastodon/components/poll.js
@@ -31,7 +31,6 @@ const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
return obj;
}, {});
-export default @injectIntl
class Poll extends ImmutablePureComponent {
static propTypes = {
@@ -227,3 +226,5 @@ class Poll extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Poll);
diff --git a/app/javascript/mastodon/components/relative_timestamp.js b/app/javascript/mastodon/components/relative_timestamp.js
index 51248033927e5fb70462d4812c5cbef4dff815a6..e6c3e088058daf36cd374c7257787f9fe241667b 100644
--- a/app/javascript/mastodon/components/relative_timestamp.js
+++ b/app/javascript/mastodon/components/relative_timestamp.js
@@ -121,7 +121,6 @@ const timeRemainingString = (intl, date, now, timeGiven = true) => {
return relativeTime;
};
-export default @injectIntl
class RelativeTimestamp extends React.Component {
static propTypes = {
@@ -197,3 +196,5 @@ class RelativeTimestamp extends React.Component {
}
}
+
+export default injectIntl(RelativeTimestamp);
diff --git a/app/javascript/mastodon/components/scrollable_list.js b/app/javascript/mastodon/components/scrollable_list.js
index 91d04bf4d8e933957929de7d5d88d4da77e4c67e..a66bce7a3c250a79717bdb60c65a10f18f0b816c 100644
--- a/app/javascript/mastodon/components/scrollable_list.js
+++ b/app/javascript/mastodon/components/scrollable_list.js
@@ -20,7 +20,6 @@ const mapStateToProps = (state, { scrollKey }) => {
};
};
-export default @connect(mapStateToProps, null, null, { forwardRef: true })
class ScrollableList extends PureComponent {
static contextTypes = {
@@ -365,3 +364,5 @@ class ScrollableList extends PureComponent {
}
}
+
+export default connect(mapStateToProps, null, null, { forwardRef: true })(ScrollableList);
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 4ca3928242694d94ef9d315bd76dce46ccd02714..bf5f379d2374fc37ebb5dc52c160b84e37b41803 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -59,7 +59,6 @@ const messages = defineMessages({
edited: { id: 'status.edited', defaultMessage: 'Edited {date}' },
});
-export default @injectIntl
class Status extends ImmutablePureComponent {
static contextTypes = {
@@ -519,3 +518,5 @@ class Status extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Status);
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index ab8755be04c4659b1bd63c7cc315950da02824e0..8f430f385595fd90747dbd49b273c250083cfcff 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -49,8 +49,6 @@ const mapStateToProps = (state, { status }) => ({
relationship: state.getIn(['relationships', status.getIn(['account', 'id'])]),
});
-export default @connect(mapStateToProps)
-@injectIntl
class StatusActionBar extends ImmutablePureComponent {
static contextTypes = {
@@ -371,3 +369,5 @@ class StatusActionBar extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(StatusActionBar));
diff --git a/app/javascript/mastodon/features/account/components/account_note.js b/app/javascript/mastodon/features/account/components/account_note.js
index 1787ce1abc34efbbc3f7122b6a3887e47b992a37..6b014dc1265e8d01554259c5b13f5d14e73537fd 100644
--- a/app/javascript/mastodon/features/account/components/account_note.js
+++ b/app/javascript/mastodon/features/account/components/account_note.js
@@ -43,7 +43,6 @@ class InlineAlert extends React.PureComponent {
}
-export default @injectIntl
class AccountNote extends ImmutablePureComponent {
static propTypes = {
@@ -168,3 +167,5 @@ class AccountNote extends ImmutablePureComponent {
}
}
+
+export default injectIntl(AccountNote);
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
index 8e6b9f0634ea4c84b886406cd101d8af72e60e86..b34d1e9abccc013652a8e94bb4a3e38dfc00e62e 100644
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -61,7 +61,6 @@ const dateFormatOptions = {
minute: '2-digit',
};
-export default @injectIntl
class Header extends ImmutablePureComponent {
static propTypes = {
@@ -354,3 +353,5 @@ class Header extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Header);
diff --git a/app/javascript/mastodon/features/account_gallery/index.js b/app/javascript/mastodon/features/account_gallery/index.js
index cc0bfa9baa359e27383b7b970c214429d8487bc5..f114c9f3f7f5a2192e3dd83744b166cb07dea4f3 100644
--- a/app/javascript/mastodon/features/account_gallery/index.js
+++ b/app/javascript/mastodon/features/account_gallery/index.js
@@ -59,7 +59,6 @@ class LoadMoreMedia extends ImmutablePureComponent {
}
-export default @connect(mapStateToProps)
class AccountGallery extends ImmutablePureComponent {
static propTypes = {
@@ -225,3 +224,5 @@ class AccountGallery extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(AccountGallery);
diff --git a/app/javascript/mastodon/features/account_timeline/components/limited_account_hint.js b/app/javascript/mastodon/features/account_timeline/components/limited_account_hint.js
index 6b025596ca566f8c8ba3f4ae9c6793d402636213..4c67adfcd40d3f7a8ba6fd594a89668f97721e8f 100644
--- a/app/javascript/mastodon/features/account_timeline/components/limited_account_hint.js
+++ b/app/javascript/mastodon/features/account_timeline/components/limited_account_hint.js
@@ -13,7 +13,6 @@ const mapDispatchToProps = (dispatch, { accountId }) => ({
});
-export default @connect(() => {}, mapDispatchToProps)
class LimitedAccountHint extends React.PureComponent {
static propTypes = {
@@ -33,3 +32,5 @@ class LimitedAccountHint extends React.PureComponent {
}
}
+
+export default connect(() => {}, mapDispatchToProps)(LimitedAccountHint);
diff --git a/app/javascript/mastodon/features/account_timeline/index.js b/app/javascript/mastodon/features/account_timeline/index.js
index 5b592c5a76ceea9198f2cec1e0ab45d1af1ce977..78886ddb8773b105c8ffa07a5ca5816dfd1d688c 100644
--- a/app/javascript/mastodon/features/account_timeline/index.js
+++ b/app/javascript/mastodon/features/account_timeline/index.js
@@ -55,7 +55,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired,
};
-export default @connect(mapStateToProps)
class AccountTimeline extends ImmutablePureComponent {
static propTypes = {
@@ -192,3 +191,5 @@ class AccountTimeline extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(AccountTimeline);
diff --git a/app/javascript/mastodon/features/audio/index.js b/app/javascript/mastodon/features/audio/index.js
index c47f55dd1ea8a42b1cbadec17c3062c585d9a5ce..9d31e84b3f695462cf7342860040bc88af2e6ea9 100644
--- a/app/javascript/mastodon/features/audio/index.js
+++ b/app/javascript/mastodon/features/audio/index.js
@@ -20,7 +20,6 @@ const messages = defineMessages({
const TICK_SIZE = 10;
const PADDING = 180;
-export default @injectIntl
class Audio extends React.PureComponent {
static propTypes = {
@@ -519,3 +518,5 @@ class Audio extends React.PureComponent {
}
}
+
+export default injectIntl(Audio);
diff --git a/app/javascript/mastodon/features/blocks/index.js b/app/javascript/mastodon/features/blocks/index.js
index e00f2b60e0f3c4538acd6942c438d09355dde8c8..38616ba84454773a7b6c20ba0f8fdb3dff6ff676 100644
--- a/app/javascript/mastodon/features/blocks/index.js
+++ b/app/javascript/mastodon/features/blocks/index.js
@@ -22,8 +22,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['user_lists', 'blocks', 'isLoading'], true),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Blocks extends ImmutablePureComponent {
static propTypes = {
@@ -77,3 +75,5 @@ class Blocks extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Blocks));
diff --git a/app/javascript/mastodon/features/bookmarked_statuses/index.js b/app/javascript/mastodon/features/bookmarked_statuses/index.js
index 8f41b0f9514fd5c409c7f2169cd53f769d9223f3..9b6b722658e049aebcf86455f50957a1601c60d5 100644
--- a/app/javascript/mastodon/features/bookmarked_statuses/index.js
+++ b/app/javascript/mastodon/features/bookmarked_statuses/index.js
@@ -21,8 +21,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'bookmarks', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Bookmarks extends ImmutablePureComponent {
static propTypes = {
@@ -100,3 +98,5 @@ class Bookmarks extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Bookmarks));
diff --git a/app/javascript/mastodon/features/community_timeline/components/column_settings.js b/app/javascript/mastodon/features/community_timeline/components/column_settings.js
index 0cb6db8836b9bda09fcd78e3f89c80b789170322..d6181919ab7e15306d273defd3515edab2950281 100644
--- a/app/javascript/mastodon/features/community_timeline/components/column_settings.js
+++ b/app/javascript/mastodon/features/community_timeline/components/column_settings.js
@@ -4,7 +4,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { injectIntl, FormattedMessage } from 'react-intl';
import SettingToggle from '../../notifications/components/setting_toggle';
-export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
@@ -27,3 +26,5 @@ class ColumnSettings extends React.PureComponent {
}
}
+
+export default injectIntl(ColumnSettings);
diff --git a/app/javascript/mastodon/features/community_timeline/index.js b/app/javascript/mastodon/features/community_timeline/index.js
index 30f77604867c251c924cb1ffe6e1231314cc46cd..227d268bfa0ade4418736b3abbe83cd378760b81 100644
--- a/app/javascript/mastodon/features/community_timeline/index.js
+++ b/app/javascript/mastodon/features/community_timeline/index.js
@@ -27,8 +27,6 @@ const mapStateToProps = (state, { columnId }) => {
};
};
-export default @connect(mapStateToProps)
-@injectIntl
class CommunityTimeline extends React.PureComponent {
static contextTypes = {
@@ -133,3 +131,5 @@ class CommunityTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(CommunityTimeline));
diff --git a/app/javascript/mastodon/features/compose/components/action_bar.js b/app/javascript/mastodon/features/compose/components/action_bar.js
index 4ff0b7b94b6120d46c7dd36c96a6077df6e53bcc..3f30a7c2824ec3f55400ee128a0cbfd9a1ae2be8 100644
--- a/app/javascript/mastodon/features/compose/components/action_bar.js
+++ b/app/javascript/mastodon/features/compose/components/action_bar.js
@@ -19,7 +19,6 @@ const messages = defineMessages({
bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
});
-export default @injectIntl
class ActionBar extends React.PureComponent {
static propTypes = {
@@ -63,3 +62,5 @@ class ActionBar extends React.PureComponent {
}
}
+
+export default injectIntl(ActionBar);
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index cd10d0edabef742469ccf4623b3c612c5319b19b..3afccda18fd3d1d397ab3fdab74ce9a9b404f24f 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -32,7 +32,6 @@ const messages = defineMessages({
saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
});
-export default @injectIntl
class ComposeForm extends ImmutablePureComponent {
static contextTypes = {
@@ -287,3 +286,5 @@ class ComposeForm extends ImmutablePureComponent {
}
}
+
+export default injectIntl(ComposeForm);
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index f433e4de9faa6a7b0787a5a7605c5242b77e9a42..a071362c51a2beb40dd1226a35b7a14c1b39e14b 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -144,8 +144,7 @@ class ModifierPicker extends React.PureComponent {
}
-@injectIntl
-class EmojiPickerMenu extends React.PureComponent {
+class EmojiPickerMenuImpl extends React.PureComponent {
static propTypes = {
custom_emojis: ImmutablePropTypes.list,
@@ -308,7 +307,8 @@ class EmojiPickerMenu extends React.PureComponent {
}
-export default @injectIntl
+const EmojiPickerMenu = injectIntl(EmojiPickerMenuImpl);
+
class EmojiPickerDropdown extends React.PureComponent {
static propTypes = {
@@ -410,3 +410,5 @@ class EmojiPickerDropdown extends React.PureComponent {
}
}
+
+export default injectIntl(EmojiPickerDropdown);
diff --git a/app/javascript/mastodon/features/compose/components/language_dropdown.js b/app/javascript/mastodon/features/compose/components/language_dropdown.js
index d76490c775f89b6b5e704105a4f2811680a3a562..e0b9ab02d16f0b9bb69d1b4872fd09068c71db6a 100644
--- a/app/javascript/mastodon/features/compose/components/language_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/language_dropdown.js
@@ -256,7 +256,6 @@ class LanguageDropdownMenu extends React.PureComponent {
}
-export default @injectIntl
class LanguageDropdown extends React.PureComponent {
static propTypes = {
@@ -330,3 +329,5 @@ class LanguageDropdown extends React.PureComponent {
}
}
+
+export default injectIntl(LanguageDropdown);
diff --git a/app/javascript/mastodon/features/compose/components/poll_button.js b/app/javascript/mastodon/features/compose/components/poll_button.js
index 76f96bfa41ef0e3dae4e990c24e78f01ac9529b3..fcb167235ec444e0c4d7008f6cf7df4f4a1c8c46 100644
--- a/app/javascript/mastodon/features/compose/components/poll_button.js
+++ b/app/javascript/mastodon/features/compose/components/poll_button.js
@@ -13,8 +13,6 @@ const iconStyle = {
lineHeight: '27px',
};
-export default
-@injectIntl
class PollButton extends React.PureComponent {
static propTypes = {
@@ -53,3 +51,5 @@ class PollButton extends React.PureComponent {
}
}
+
+export default injectIntl(PollButton);
diff --git a/app/javascript/mastodon/features/compose/components/poll_form.js b/app/javascript/mastodon/features/compose/components/poll_form.js
index db49f90eb4cb957524101bd840d2e989c4747784..128d7811b2954816cfd3b9e8130870bc85858f00 100644
--- a/app/javascript/mastodon/features/compose/components/poll_form.js
+++ b/app/javascript/mastodon/features/compose/components/poll_form.js
@@ -20,8 +20,7 @@ const messages = defineMessages({
days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
});
-@injectIntl
-class Option extends React.PureComponent {
+class OptionIntl extends React.PureComponent {
static propTypes = {
title: PropTypes.string.isRequired,
@@ -110,8 +109,8 @@ class Option extends React.PureComponent {
}
-export default
-@injectIntl
+const Option = injectIntl(OptionIntl);
+
class PollForm extends ImmutablePureComponent {
static propTypes = {
@@ -175,3 +174,5 @@ class PollForm extends ImmutablePureComponent {
}
}
+
+export default injectIntl(PollForm);
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
index 1f0e998d36f89be17dceabeed7012f9076948a3c..6ece9c14b4180aa5d204d9ba1d2aca3b2795f352 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
@@ -148,7 +148,6 @@ class PrivacyDropdownMenu extends React.PureComponent {
}
-export default @injectIntl
class PrivacyDropdown extends React.PureComponent {
static propTypes = {
@@ -286,3 +285,5 @@ class PrivacyDropdown extends React.PureComponent {
}
}
+
+export default injectIntl(PrivacyDropdown);
diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.js b/app/javascript/mastodon/features/compose/components/reply_indicator.js
index 863defb768f416ef7fde6e85445428f02f4be6cf..216130309aa23fb1725fbd50e403944e6118ea09 100644
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.js
@@ -12,7 +12,6 @@ const messages = defineMessages({
cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
});
-export default @injectIntl
class ReplyIndicator extends ImmutablePureComponent {
static contextTypes = {
@@ -69,3 +68,5 @@ class ReplyIndicator extends ImmutablePureComponent {
}
}
+
+export default injectIntl(ReplyIndicator);
diff --git a/app/javascript/mastodon/features/compose/components/search.js b/app/javascript/mastodon/features/compose/components/search.js
index 3e36a922be674fe738746941d38b4b7d9ce0d6de..523a97d1a399d343da42168dcb7bc089ec42982f 100644
--- a/app/javascript/mastodon/features/compose/components/search.js
+++ b/app/javascript/mastodon/features/compose/components/search.js
@@ -44,7 +44,6 @@ class SearchPopout extends React.PureComponent {
}
-export default @injectIntl
class Search extends React.PureComponent {
static contextTypes = {
@@ -148,3 +147,5 @@ class Search extends React.PureComponent {
}
}
+
+export default injectIntl(Search);
diff --git a/app/javascript/mastodon/features/compose/components/search_results.js b/app/javascript/mastodon/features/compose/components/search_results.js
index e2493a6c6ab8fb909799f84ce35ef83e3d118bb9..8746672e79dd30a01795a901ccbf19446fa1f825 100644
--- a/app/javascript/mastodon/features/compose/components/search_results.js
+++ b/app/javascript/mastodon/features/compose/components/search_results.js
@@ -14,7 +14,6 @@ const messages = defineMessages({
dismissSuggestion: { id: 'suggestions.dismiss', defaultMessage: 'Dismiss suggestion' },
});
-export default @injectIntl
class SearchResults extends ImmutablePureComponent {
static propTypes = {
@@ -138,3 +137,5 @@ class SearchResults extends ImmutablePureComponent {
}
}
+
+export default injectIntl(SearchResults);
diff --git a/app/javascript/mastodon/features/compose/components/upload_button.js b/app/javascript/mastodon/features/compose/components/upload_button.js
index 9cb36167a86893b7c761a3714b2955e42afa9e62..757f434d99663c5e3557f9e86e82a6e0a3450c3f 100644
--- a/app/javascript/mastodon/features/compose/components/upload_button.js
+++ b/app/javascript/mastodon/features/compose/components/upload_button.js
@@ -23,8 +23,6 @@ const iconStyle = {
lineHeight: '27px',
};
-export default @connect(makeMapStateToProps)
-@injectIntl
class UploadButton extends ImmutablePureComponent {
static propTypes = {
@@ -81,3 +79,5 @@ class UploadButton extends ImmutablePureComponent {
}
}
+
+export default connect(makeMapStateToProps)(injectIntl(UploadButton));
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index 711a5590460c28da44a507270684b205a340116d..ebc87a5dc6febed4e61afc79dabc537aa74ad1d9 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -36,8 +36,6 @@ const mapStateToProps = (state, ownProps) => ({
showSearch: ownProps.multiColumn ? state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']) : ownProps.isSearchPage,
});
-export default @connect(mapStateToProps)
-@injectIntl
class Compose extends React.PureComponent {
static propTypes = {
@@ -147,3 +145,5 @@ class Compose extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Compose));
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.js b/app/javascript/mastodon/features/direct_timeline/components/conversation.js
index 77ff2ce7b3b3df5479b0e6f8dcc947038d70a4af..a3164ee4649af16e5a1da346965011a78277d3f9 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.js
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.js
@@ -24,7 +24,6 @@ const messages = defineMessages({
unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
});
-export default @injectIntl
class Conversation extends ImmutablePureComponent {
static contextTypes = {
@@ -198,3 +197,5 @@ class Conversation extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Conversation);
diff --git a/app/javascript/mastodon/features/direct_timeline/index.js b/app/javascript/mastodon/features/direct_timeline/index.js
index debb2d721c8ab91aa79222146b661649a34a8385..4c219ac85b96bb6d76237bd577215e91fd8b2b21 100644
--- a/app/javascript/mastodon/features/direct_timeline/index.js
+++ b/app/javascript/mastodon/features/direct_timeline/index.js
@@ -13,8 +13,6 @@ const messages = defineMessages({
title: { id: 'column.direct', defaultMessage: 'Direct messages' },
});
-export default @connect()
-@injectIntl
class DirectTimeline extends React.PureComponent {
static propTypes = {
@@ -99,3 +97,5 @@ class DirectTimeline extends React.PureComponent {
}
}
+
+export default connect()(injectIntl(DirectTimeline));
diff --git a/app/javascript/mastodon/features/directory/components/account_card.js b/app/javascript/mastodon/features/directory/components/account_card.js
index 27ba4e7f4050fed49a14adba5e10ee1dd6f697d3..d9944a7483c2208ff81a255407d08e65ee874a39 100644
--- a/app/javascript/mastodon/features/directory/components/account_card.js
+++ b/app/javascript/mastodon/features/directory/components/account_card.js
@@ -83,9 +83,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
});
-export default
-@injectIntl
-@connect(makeMapStateToProps, mapDispatchToProps)
class AccountCard extends ImmutablePureComponent {
static propTypes = {
@@ -225,3 +222,5 @@ class AccountCard extends ImmutablePureComponent {
}
}
+
+export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(AccountCard));
diff --git a/app/javascript/mastodon/features/directory/index.js b/app/javascript/mastodon/features/directory/index.js
index 94d7d1a9c544751bec7733e29a191b36ef9422e4..36759d721cada866246ba5c8765923ba75f21ffc 100644
--- a/app/javascript/mastodon/features/directory/index.js
+++ b/app/javascript/mastodon/features/directory/index.js
@@ -28,8 +28,6 @@ const mapStateToProps = state => ({
domain: state.getIn(['meta', 'domain']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Directory extends React.PureComponent {
static contextTypes = {
@@ -170,3 +168,5 @@ class Directory extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Directory));
diff --git a/app/javascript/mastodon/features/domain_blocks/index.js b/app/javascript/mastodon/features/domain_blocks/index.js
index edb80aef4100f2b07f7a4de8c56beeb21762c681..5f13e0b1e346a406805452914b143b241f4b4ea6 100644
--- a/app/javascript/mastodon/features/domain_blocks/index.js
+++ b/app/javascript/mastodon/features/domain_blocks/index.js
@@ -22,8 +22,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['domain_lists', 'blocks', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Blocks extends ImmutablePureComponent {
static propTypes = {
@@ -75,3 +73,5 @@ class Blocks extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Blocks));
diff --git a/app/javascript/mastodon/features/explore/index.js b/app/javascript/mastodon/features/explore/index.js
index 8082f2d99cb54af7f020a608f6c8e43390a4c89f..49a48744f5af1c0fa27ec01c0798455398221594 100644
--- a/app/javascript/mastodon/features/explore/index.js
+++ b/app/javascript/mastodon/features/explore/index.js
@@ -22,8 +22,6 @@ const mapStateToProps = state => ({
isSearching: state.getIn(['search', 'submitted']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Explore extends React.PureComponent {
static contextTypes = {
@@ -89,3 +87,5 @@ class Explore extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Explore));
diff --git a/app/javascript/mastodon/features/explore/links.js b/app/javascript/mastodon/features/explore/links.js
index 6649fb6e47143a083a2de714735a42574d0bf189..43f6ea4b098c8b68013da9fab1e6ea161b93aae7 100644
--- a/app/javascript/mastodon/features/explore/links.js
+++ b/app/javascript/mastodon/features/explore/links.js
@@ -11,7 +11,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['trends', 'links', 'isLoading']),
});
-export default @connect(mapStateToProps)
class Links extends React.PureComponent {
static propTypes = {
@@ -46,3 +45,5 @@ class Links extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Links);
diff --git a/app/javascript/mastodon/features/explore/results.js b/app/javascript/mastodon/features/explore/results.js
index 1286020f54c04f09610dad8d5658f5ae20462a5f..7311dd450d36eaa342b84f997b8e6dcf263ceb54 100644
--- a/app/javascript/mastodon/features/explore/results.js
+++ b/app/javascript/mastodon/features/explore/results.js
@@ -36,7 +36,6 @@ const renderStatuses = (results, onLoadMore) => appendLoadMore('statuses', resul
<Status key={`status-${item}`} id={item} />
)), onLoadMore);
-export default @connect(mapStateToProps)
class Results extends React.PureComponent {
static propTypes = {
@@ -111,3 +110,5 @@ class Results extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Results);
diff --git a/app/javascript/mastodon/features/explore/statuses.js b/app/javascript/mastodon/features/explore/statuses.js
index 33e5b4179649f1034853ad1221c6c0dadf8a2198..6b63b566255c56a7d308fd5ce96005e9877134d0 100644
--- a/app/javascript/mastodon/features/explore/statuses.js
+++ b/app/javascript/mastodon/features/explore/statuses.js
@@ -13,7 +13,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'trending', 'next']),
});
-export default @connect(mapStateToProps)
class Statuses extends React.PureComponent {
static propTypes = {
@@ -55,3 +54,5 @@ class Statuses extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Statuses);
diff --git a/app/javascript/mastodon/features/explore/suggestions.js b/app/javascript/mastodon/features/explore/suggestions.js
index 0c6a7ef8a3b791d04f4e176c50d26e62bc8fe7be..78ac50f0b408d1f373dde40ce4831ec528b4e4c3 100644
--- a/app/javascript/mastodon/features/explore/suggestions.js
+++ b/app/javascript/mastodon/features/explore/suggestions.js
@@ -11,7 +11,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['suggestions', 'isLoading']),
});
-export default @connect(mapStateToProps)
class Suggestions extends React.PureComponent {
static propTypes = {
@@ -38,3 +37,5 @@ class Suggestions extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Suggestions);
diff --git a/app/javascript/mastodon/features/explore/tags.js b/app/javascript/mastodon/features/explore/tags.js
index c0ad9fc6ec928d38fb5e917e548632ace52e4efd..88247a963b9aba56bc70c9250864ed69248ae701 100644
--- a/app/javascript/mastodon/features/explore/tags.js
+++ b/app/javascript/mastodon/features/explore/tags.js
@@ -11,7 +11,6 @@ const mapStateToProps = state => ({
isLoadingHashtags: state.getIn(['trends', 'tags', 'isLoading']),
});
-export default @connect(mapStateToProps)
class Tags extends React.PureComponent {
static propTypes = {
@@ -38,3 +37,5 @@ class Tags extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Tags);
diff --git a/app/javascript/mastodon/features/favourited_statuses/index.js b/app/javascript/mastodon/features/favourited_statuses/index.js
index 73631946a7b6ab2115286bf4d98a3457ad76022d..921b02510465daf72262b1630b9f730bc09a5d86 100644
--- a/app/javascript/mastodon/features/favourited_statuses/index.js
+++ b/app/javascript/mastodon/features/favourited_statuses/index.js
@@ -21,8 +21,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'favourites', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Favourites extends ImmutablePureComponent {
static propTypes = {
@@ -100,3 +98,5 @@ class Favourites extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Favourites));
diff --git a/app/javascript/mastodon/features/favourites/index.js b/app/javascript/mastodon/features/favourites/index.js
index f060068a49b385826561109cec90dbf35224ec2a..01fb11764db1db0d5ff2e987350e6b903f4f9cca 100644
--- a/app/javascript/mastodon/features/favourites/index.js
+++ b/app/javascript/mastodon/features/favourites/index.js
@@ -20,8 +20,6 @@ const mapStateToProps = (state, props) => ({
accountIds: state.getIn(['user_lists', 'favourited_by', props.params.statusId]),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Favourites extends ImmutablePureComponent {
static propTypes = {
@@ -85,3 +83,5 @@ class Favourites extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Favourites));
diff --git a/app/javascript/mastodon/features/follow_recommendations/components/account.js b/app/javascript/mastodon/features/follow_recommendations/components/account.js
index ffc0ab00cc21de88e4e22a0ce10cbaecfcb734d5..8779826dd791ab50d137d96eb9bf6e8b8ff6f22a 100644
--- a/app/javascript/mastodon/features/follow_recommendations/components/account.js
+++ b/app/javascript/mastodon/features/follow_recommendations/components/account.js
@@ -32,8 +32,6 @@ const getFirstSentence = str => {
return arr[0];
};
-export default @connect(makeMapStateToProps)
-@injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
@@ -83,3 +81,5 @@ class Account extends ImmutablePureComponent {
}
}
+
+export default connect(makeMapStateToProps)(injectIntl(Account));
diff --git a/app/javascript/mastodon/features/follow_recommendations/index.js b/app/javascript/mastodon/features/follow_recommendations/index.js
index b5a71aef5b3fffffb49459dd1d31856d1786d51d..1f6314ea2305f362889a4df265efae3426e00bea 100644
--- a/app/javascript/mastodon/features/follow_recommendations/index.js
+++ b/app/javascript/mastodon/features/follow_recommendations/index.js
@@ -19,7 +19,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['suggestions', 'isLoading']),
});
-export default @connect(mapStateToProps)
class FollowRecommendations extends ImmutablePureComponent {
static contextTypes = {
@@ -107,3 +106,5 @@ class FollowRecommendations extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(FollowRecommendations);
diff --git a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
index 263a7ae1626332a1e0eee19c49f2502d7bc4d30a..68c488f9b141f61e3ea60c388eeedcc3761e747d 100644
--- a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
+++ b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
@@ -13,7 +13,6 @@ const messages = defineMessages({
reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
});
-export default @injectIntl
class AccountAuthorize extends ImmutablePureComponent {
static propTypes = {
@@ -47,3 +46,5 @@ class AccountAuthorize extends ImmutablePureComponent {
}
}
+
+export default injectIntl(AccountAuthorize);
diff --git a/app/javascript/mastodon/features/follow_requests/index.js b/app/javascript/mastodon/features/follow_requests/index.js
index 1f9b635bb781854293cb41aa1e4bf364837723a2..99e0649995e9297003895b06d79357c5eaf220d6 100644
--- a/app/javascript/mastodon/features/follow_requests/index.js
+++ b/app/javascript/mastodon/features/follow_requests/index.js
@@ -25,8 +25,6 @@ const mapStateToProps = state => ({
domain: state.getIn(['meta', 'domain']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class FollowRequests extends ImmutablePureComponent {
static propTypes = {
@@ -92,3 +90,5 @@ class FollowRequests extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(FollowRequests));
diff --git a/app/javascript/mastodon/features/followers/index.js b/app/javascript/mastodon/features/followers/index.js
index 5b7f402f8d9f8d4e9f45e5e22c014527055e545f..4e4f259c1de7f941237fc6a5290e382995235256 100644
--- a/app/javascript/mastodon/features/followers/index.js
+++ b/app/javascript/mastodon/features/followers/index.js
@@ -53,7 +53,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired,
};
-export default @connect(mapStateToProps)
class Followers extends ImmutablePureComponent {
static propTypes = {
@@ -167,3 +166,5 @@ class Followers extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(Followers);
diff --git a/app/javascript/mastodon/features/following/index.js b/app/javascript/mastodon/features/following/index.js
index 143082d760a0862cf409a6f061dda5816d8f4f1a..62eb0c846c995596380e49e1983e786c114e3ea6 100644
--- a/app/javascript/mastodon/features/following/index.js
+++ b/app/javascript/mastodon/features/following/index.js
@@ -53,7 +53,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired,
};
-export default @connect(mapStateToProps)
class Following extends ImmutablePureComponent {
static propTypes = {
@@ -167,3 +166,5 @@ class Following extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(Following);
diff --git a/app/javascript/mastodon/features/getting_started/components/announcements.js b/app/javascript/mastodon/features/getting_started/components/announcements.js
index 24db8cedec6073e6ec147196d892f4811441b64a..93b16894a6fd6d1d219042484667d424278f4aaa 100644
--- a/app/javascript/mastodon/features/getting_started/components/announcements.js
+++ b/app/javascript/mastodon/features/getting_started/components/announcements.js
@@ -356,7 +356,6 @@ class Announcement extends ImmutablePureComponent {
}
-export default @injectIntl
class Announcements extends ImmutablePureComponent {
static propTypes = {
@@ -448,3 +447,5 @@ class Announcements extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Announcements);
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index 65cee7498b764211683c4644ee440fc0e9e4a368..9f71801eda0998fb4d58f99bae8868dbad09f7bf 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -60,8 +60,6 @@ const badgeDisplay = (number, limit) => {
const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2);
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class GettingStarted extends ImmutablePureComponent {
static contextTypes = {
@@ -180,3 +178,5 @@ class GettingStarted extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(GettingStarted));
diff --git a/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js b/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js
index ede8907e50bd6156b9267dcd2fd6ae79aa5f504e..3666686e8792a48ad58815c413e0db4b56ddf921 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js
+++ b/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js
@@ -12,7 +12,6 @@ const messages = defineMessages({
noOptions: { id: 'hashtag.column_settings.select.no_options_message', defaultMessage: 'No suggestions found' },
});
-export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
@@ -131,3 +130,5 @@ class ColumnSettings extends React.PureComponent {
}
}
+
+export default injectIntl(ColumnSettings);
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.js b/app/javascript/mastodon/features/hashtag_timeline/index.js
index 6a808eb306c4827358ed8bf4c2c1dace12d36e87..8f173b9f6bc8f0efa3660ad60db44833e65b79bb 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.js
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.js
@@ -15,7 +15,6 @@ const mapStateToProps = (state, props) => ({
hasUnread: state.getIn(['timelines', `hashtag:${props.params.id}${props.params.local ? ':local' : ''}`, 'unread']) > 0,
});
-export default @connect(mapStateToProps)
class HashtagTimeline extends React.PureComponent {
disconnects = [];
@@ -162,3 +161,5 @@ class HashtagTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(HashtagTimeline);
diff --git a/app/javascript/mastodon/features/home_timeline/components/column_settings.js b/app/javascript/mastodon/features/home_timeline/components/column_settings.js
index 455e218817cfe717b0b484a980d405300fc05ab0..bd15390c0b9eeeecf785a80be05447572fe896f9 100644
--- a/app/javascript/mastodon/features/home_timeline/components/column_settings.js
+++ b/app/javascript/mastodon/features/home_timeline/components/column_settings.js
@@ -4,7 +4,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { injectIntl, FormattedMessage } from 'react-intl';
import SettingToggle from '../../notifications/components/setting_toggle';
-export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
@@ -32,3 +31,5 @@ class ColumnSettings extends React.PureComponent {
}
}
+
+export default injectIntl(ColumnSettings);
diff --git a/app/javascript/mastodon/features/home_timeline/index.js b/app/javascript/mastodon/features/home_timeline/index.js
index dc440f2fe00a9f0081f60f57cb483844753f87d0..937c899f3d2fc73ba617ae85800409cd71b30739 100644
--- a/app/javascript/mastodon/features/home_timeline/index.js
+++ b/app/javascript/mastodon/features/home_timeline/index.js
@@ -28,8 +28,6 @@ const mapStateToProps = state => ({
showAnnouncements: state.getIn(['announcements', 'show']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class HomeTimeline extends React.PureComponent {
static propTypes = {
@@ -160,3 +158,5 @@ class HomeTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(HomeTimeline));
diff --git a/app/javascript/mastodon/features/keyboard_shortcuts/index.js b/app/javascript/mastodon/features/keyboard_shortcuts/index.js
index 8f1631d8295d6dd06cb52fe4c433c906845a1e19..732719c3646d6eec5510dba9ce4f2fccaaa0a859 100644
--- a/app/javascript/mastodon/features/keyboard_shortcuts/index.js
+++ b/app/javascript/mastodon/features/keyboard_shortcuts/index.js
@@ -9,7 +9,6 @@ const messages = defineMessages({
heading: { id: 'keyboard_shortcuts.heading', defaultMessage: 'Keyboard Shortcuts' },
});
-export default @injectIntl
class KeyboardShortcuts extends ImmutablePureComponent {
static propTypes = {
@@ -164,3 +163,5 @@ class KeyboardShortcuts extends ImmutablePureComponent {
}
}
+
+export default injectIntl(KeyboardShortcuts);
diff --git a/app/javascript/mastodon/features/list_adder/components/account.js b/app/javascript/mastodon/features/list_adder/components/account.js
index 1369aac0742c437a48cc2f2bf69b0d2bc5d38c13..786af3bb1cc765d3865274482906a84049c1423a 100644
--- a/app/javascript/mastodon/features/list_adder/components/account.js
+++ b/app/javascript/mastodon/features/list_adder/components/account.js
@@ -17,9 +17,6 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
-
-export default @connect(makeMapStateToProps)
-@injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
@@ -41,3 +38,5 @@ class Account extends ImmutablePureComponent {
}
}
+
+export default connect(makeMapStateToProps)(injectIntl(Account));
diff --git a/app/javascript/mastodon/features/list_adder/components/list.js b/app/javascript/mastodon/features/list_adder/components/list.js
index 60c8958a73762981bf3c1271f213d455f7f65543..34ccf8451d81ad81852b69d97d4a8c166419ad64 100644
--- a/app/javascript/mastodon/features/list_adder/components/list.js
+++ b/app/javascript/mastodon/features/list_adder/components/list.js
@@ -23,8 +23,6 @@ const mapDispatchToProps = (dispatch, { listId }) => ({
onAdd: () => dispatch(addToListAdder(listId)),
});
-export default @connect(MapStateToProps, mapDispatchToProps)
-@injectIntl
class List extends ImmutablePureComponent {
static propTypes = {
@@ -67,3 +65,5 @@ class List extends ImmutablePureComponent {
}
}
+
+export default connect(MapStateToProps, mapDispatchToProps)(injectIntl(List));
diff --git a/app/javascript/mastodon/features/list_adder/index.js b/app/javascript/mastodon/features/list_adder/index.js
index cb8a15e8c7def8d12f008e462b53f882f18e7710..45d5589f96eb3aaafcab79994593a55747d4fbe5 100644
--- a/app/javascript/mastodon/features/list_adder/index.js
+++ b/app/javascript/mastodon/features/list_adder/index.js
@@ -28,8 +28,6 @@ const mapDispatchToProps = dispatch => ({
onReset: () => dispatch(resetListAdder()),
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class ListAdder extends ImmutablePureComponent {
static propTypes = {
@@ -71,3 +69,5 @@ class ListAdder extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListAdder));
diff --git a/app/javascript/mastodon/features/list_editor/components/account.js b/app/javascript/mastodon/features/list_editor/components/account.js
index 48085af43d1e7e4c89be728ed637fa56425cf38d..86209bb3cbaf788170849a2da830760581fb7681 100644
--- a/app/javascript/mastodon/features/list_editor/components/account.js
+++ b/app/javascript/mastodon/features/list_editor/components/account.js
@@ -31,8 +31,6 @@ const mapDispatchToProps = (dispatch, { accountId }) => ({
onAdd: () => dispatch(addToListEditor(accountId)),
});
-export default @connect(makeMapStateToProps, mapDispatchToProps)
-@injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
@@ -75,3 +73,5 @@ class Account extends ImmutablePureComponent {
}
}
+
+export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(Account));
diff --git a/app/javascript/mastodon/features/list_editor/components/edit_list_form.js b/app/javascript/mastodon/features/list_editor/components/edit_list_form.js
index 3ccab12a800c7891ffde4ceeb3ba1f12b2d2cb6c..61aad1badada96b607f689fb282f88eb24ff7c97 100644
--- a/app/javascript/mastodon/features/list_editor/components/edit_list_form.js
+++ b/app/javascript/mastodon/features/list_editor/components/edit_list_form.js
@@ -19,8 +19,6 @@ const mapDispatchToProps = dispatch => ({
onSubmit: () => dispatch(submitListEditor(false)),
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class ListForm extends React.PureComponent {
static propTypes = {
@@ -68,3 +66,5 @@ class ListForm extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListForm));
diff --git a/app/javascript/mastodon/features/list_editor/components/search.js b/app/javascript/mastodon/features/list_editor/components/search.js
index e3f069bb8072ba83ebccbe0378d473668a28bc0d..0bac2fc5cd71eed701fe033eb7a0de63810c5276 100644
--- a/app/javascript/mastodon/features/list_editor/components/search.js
+++ b/app/javascript/mastodon/features/list_editor/components/search.js
@@ -20,8 +20,6 @@ const mapDispatchToProps = dispatch => ({
onChange: value => dispatch(changeListSuggestions(value)),
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class Search extends React.PureComponent {
static propTypes = {
@@ -74,3 +72,5 @@ class Search extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Search));
diff --git a/app/javascript/mastodon/features/list_editor/index.js b/app/javascript/mastodon/features/list_editor/index.js
index 48466604a7d2176e1649fdcc4a45726063826e99..65cebbdc83ccd7cef5853399eb56d477eb37c4f4 100644
--- a/app/javascript/mastodon/features/list_editor/index.js
+++ b/app/javascript/mastodon/features/list_editor/index.js
@@ -22,8 +22,6 @@ const mapDispatchToProps = dispatch => ({
onReset: () => dispatch(resetListEditor()),
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class ListEditor extends ImmutablePureComponent {
static propTypes = {
@@ -77,3 +75,5 @@ class ListEditor extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListEditor));
diff --git a/app/javascript/mastodon/features/list_timeline/index.js b/app/javascript/mastodon/features/list_timeline/index.js
index 8010274f88025465a59e9c144e9e3e742e7c08b9..a62551320c1a7a4d366004aa8161ac23e9d9c746 100644
--- a/app/javascript/mastodon/features/list_timeline/index.js
+++ b/app/javascript/mastodon/features/list_timeline/index.js
@@ -30,8 +30,6 @@ const mapStateToProps = (state, props) => ({
hasUnread: state.getIn(['timelines', `list:${props.params.id}`, 'unread']) > 0,
});
-export default @connect(mapStateToProps)
-@injectIntl
class ListTimeline extends React.PureComponent {
static contextTypes = {
@@ -213,3 +211,5 @@ class ListTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(ListTimeline));
diff --git a/app/javascript/mastodon/features/lists/components/new_list_form.js b/app/javascript/mastodon/features/lists/components/new_list_form.js
index 7faf50be81c4842f3458faad47b6f3391591fa1b..8c8d93bb16d7d631e4844e6bf41c4703057f2185 100644
--- a/app/javascript/mastodon/features/lists/components/new_list_form.js
+++ b/app/javascript/mastodon/features/lists/components/new_list_form.js
@@ -20,8 +20,6 @@ const mapDispatchToProps = dispatch => ({
onSubmit: () => dispatch(submitListEditor(true)),
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class NewListForm extends React.PureComponent {
static propTypes = {
@@ -76,3 +74,5 @@ class NewListForm extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(NewListForm));
diff --git a/app/javascript/mastodon/features/lists/index.js b/app/javascript/mastodon/features/lists/index.js
index 809d79d99810f93e4c2bc044756ecf27ee6a0423..039076cfc85fe87b0de54e5de6e30574f9b7984c 100644
--- a/app/javascript/mastodon/features/lists/index.js
+++ b/app/javascript/mastodon/features/lists/index.js
@@ -31,8 +31,6 @@ const mapStateToProps = state => ({
lists: getOrderedLists(state),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Lists extends ImmutablePureComponent {
static propTypes = {
@@ -81,3 +79,5 @@ class Lists extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Lists));
diff --git a/app/javascript/mastodon/features/mutes/index.js b/app/javascript/mastodon/features/mutes/index.js
index c21433cc4144650a5bd848cbb07398869a75d4f6..bbabeb45bf20739da873f04fd7ac14b0c0ebbb9c 100644
--- a/app/javascript/mastodon/features/mutes/index.js
+++ b/app/javascript/mastodon/features/mutes/index.js
@@ -22,8 +22,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['user_lists', 'mutes', 'isLoading'], true),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Mutes extends ImmutablePureComponent {
static propTypes = {
@@ -77,3 +75,5 @@ class Mutes extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Mutes));
diff --git a/app/javascript/mastodon/features/notifications/components/filter_bar.js b/app/javascript/mastodon/features/notifications/components/filter_bar.js
index 368eb0b7e6c0fa5afcfd730c23dc2757e5ba988e..88e95cf48f7e27d3b7f87b94d0b45dd08f0324ee 100644
--- a/app/javascript/mastodon/features/notifications/components/filter_bar.js
+++ b/app/javascript/mastodon/features/notifications/components/filter_bar.js
@@ -12,7 +12,6 @@ const tooltips = defineMessages({
statuses: { id: 'notifications.filter.statuses', defaultMessage: 'Updates from people you follow' },
});
-export default @injectIntl
class FilterBar extends React.PureComponent {
static propTypes = {
@@ -108,3 +107,5 @@ class FilterBar extends React.PureComponent {
}
}
+
+export default injectIntl(FilterBar);
diff --git a/app/javascript/mastodon/features/notifications/components/follow_request.js b/app/javascript/mastodon/features/notifications/components/follow_request.js
index 9ef3fde7eb060bb2853839d0a87aa22509df266c..c72bf61ab4a94cb9c65dbcf33827959d2e4b4e37 100644
--- a/app/javascript/mastodon/features/notifications/components/follow_request.js
+++ b/app/javascript/mastodon/features/notifications/components/follow_request.js
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react';
+import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import Avatar from 'mastodon/components/avatar';
@@ -13,7 +13,6 @@ const messages = defineMessages({
reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
});
-export default @injectIntl
class FollowRequest extends ImmutablePureComponent {
static propTypes = {
@@ -32,10 +31,10 @@ class FollowRequest extends ImmutablePureComponent {
if (hidden) {
return (
- <Fragment>
+ <React.Fragment>
{account.get('display_name')}
{account.get('username')}
- </Fragment>
+ </React.Fragment>
);
}
@@ -57,3 +56,5 @@ class FollowRequest extends ImmutablePureComponent {
}
}
+
+export default injectIntl(FollowRequest);
diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js
index 0af71418c4c3d5be0d649ac5af47238bccb2bfa5..ea4a77a5578f1d07e15cea73b229d063d943d7fa 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.js
+++ b/app/javascript/mastodon/features/notifications/components/notification.js
@@ -33,7 +33,6 @@ const notificationForScreenReader = (intl, message, timestamp) => {
return output.join(', ');
};
-export default @injectIntl
class Notification extends ImmutablePureComponent {
static contextTypes = {
@@ -428,3 +427,5 @@ class Notification extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Notification);
diff --git a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.js b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.js
index df9b7fb1b82561e44161d1446f21b80ba42873d4..1b86ec1034739720573d550cb1419d7bc47a450f 100644
--- a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.js
+++ b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.js
@@ -12,8 +12,6 @@ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
-export default @connect()
-@injectIntl
class NotificationsPermissionBanner extends React.PureComponent {
static propTypes = {
@@ -46,3 +44,5 @@ class NotificationsPermissionBanner extends React.PureComponent {
}
}
+
+export default connect()(injectIntl(NotificationsPermissionBanner));
diff --git a/app/javascript/mastodon/features/notifications/components/report.js b/app/javascript/mastodon/features/notifications/components/report.js
index 3ce3eb9d32f5fab803f16c4e9db8152514185af2..4663b235976e7fbe48762c877556062198423781 100644
--- a/app/javascript/mastodon/features/notifications/components/report.js
+++ b/app/javascript/mastodon/features/notifications/components/report.js
@@ -13,7 +13,6 @@ const messages = defineMessages({
violation: { id: 'report_notification.categories.violation', defaultMessage: 'Rule violation' },
});
-export default @injectIntl
class Report extends ImmutablePureComponent {
static propTypes = {
@@ -60,3 +59,5 @@ class Report extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Report);
diff --git a/app/javascript/mastodon/features/notifications/index.js b/app/javascript/mastodon/features/notifications/index.js
index a6a277d7ed9e2b0124408ca633c6abe917e789b9..0ee94b68639022cb3b11567fa489a2df9b2e8414 100644
--- a/app/javascript/mastodon/features/notifications/index.js
+++ b/app/javascript/mastodon/features/notifications/index.js
@@ -65,8 +65,6 @@ const mapStateToProps = state => ({
needsNotificationPermission: state.getIn(['settings', 'notifications', 'alerts']).includes(true) && state.getIn(['notifications', 'browserSupport']) && state.getIn(['notifications', 'browserPermission']) === 'default' && !state.getIn(['settings', 'notifications', 'dismissPermissionBanner']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Notifications extends React.PureComponent {
static propTypes = {
@@ -269,3 +267,5 @@ class Notifications extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Notifications));
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.js b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
index 0cb42b25aac6527097f662217b28d20b5ee64654..061e3e25123fbacdfd9484e3baff71345fdd8688 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.js
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.js
@@ -37,8 +37,6 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
-export default @connect(makeMapStateToProps)
-@injectIntl
class Footer extends ImmutablePureComponent {
static contextTypes = {
@@ -162,3 +160,5 @@ class Footer extends ImmutablePureComponent {
}
}
+
+export default connect(makeMapStateToProps)(injectIntl(Footer));
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/header.js b/app/javascript/mastodon/features/picture_in_picture/components/header.js
index e05d8c62e906c9b8c9bc5269b558dd88d34d92fb..100f9db7ac2fcd1034d1e35307b248eeba68b11e 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/header.js
+++ b/app/javascript/mastodon/features/picture_in_picture/components/header.js
@@ -17,8 +17,6 @@ const mapStateToProps = (state, { accountId }) => ({
account: state.getIn(['accounts', accountId]),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Header extends ImmutablePureComponent {
static propTypes = {
@@ -45,3 +43,5 @@ class Header extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Header));
diff --git a/app/javascript/mastodon/features/picture_in_picture/index.js b/app/javascript/mastodon/features/picture_in_picture/index.js
index 1e59fbcd3376c46589d8ff2421dcd463e0c7313a..97e4d4180e68a8ea0e9b9ba49051fd273f42faff 100644
--- a/app/javascript/mastodon/features/picture_in_picture/index.js
+++ b/app/javascript/mastodon/features/picture_in_picture/index.js
@@ -11,7 +11,6 @@ const mapStateToProps = state => ({
...state.get('picture_in_picture'),
});
-export default @connect(mapStateToProps)
class PictureInPicture extends React.Component {
static propTypes = {
@@ -83,3 +82,5 @@ class PictureInPicture extends React.Component {
}
}
+
+export default connect(mapStateToProps)(PictureInPicture);
diff --git a/app/javascript/mastodon/features/pinned_statuses/index.js b/app/javascript/mastodon/features/pinned_statuses/index.js
index 67b13f10aa7bfd3f1aa553980beffaa66fcbc23d..bde12c30af6638f0200dfa21a3457372f5c7291e 100644
--- a/app/javascript/mastodon/features/pinned_statuses/index.js
+++ b/app/javascript/mastodon/features/pinned_statuses/index.js
@@ -18,8 +18,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'pins', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class PinnedStatuses extends ImmutablePureComponent {
static propTypes = {
@@ -59,3 +57,5 @@ class PinnedStatuses extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(PinnedStatuses));
diff --git a/app/javascript/mastodon/features/public_timeline/components/column_settings.js b/app/javascript/mastodon/features/public_timeline/components/column_settings.js
index 756b6fe06da1749a4b54e7ae8b115cf646810587..bf8a8323e0010a3b1cb907c41340aa392c431d68 100644
--- a/app/javascript/mastodon/features/public_timeline/components/column_settings.js
+++ b/app/javascript/mastodon/features/public_timeline/components/column_settings.js
@@ -4,7 +4,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { injectIntl, FormattedMessage } from 'react-intl';
import SettingToggle from '../../notifications/components/setting_toggle';
-export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
@@ -28,3 +27,5 @@ class ColumnSettings extends React.PureComponent {
}
}
+
+export default injectIntl(ColumnSettings);
diff --git a/app/javascript/mastodon/features/public_timeline/index.js b/app/javascript/mastodon/features/public_timeline/index.js
index b1d5518af556254a78be93ca975f4ad6c764ca57..272901c351b98e6c731ed63a52b7392f5354659b 100644
--- a/app/javascript/mastodon/features/public_timeline/index.js
+++ b/app/javascript/mastodon/features/public_timeline/index.js
@@ -29,8 +29,6 @@ const mapStateToProps = (state, { columnId }) => {
};
};
-export default @connect(mapStateToProps)
-@injectIntl
class PublicTimeline extends React.PureComponent {
static contextTypes = {
@@ -136,3 +134,5 @@ class PublicTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(PublicTimeline));
diff --git a/app/javascript/mastodon/features/reblogs/index.js b/app/javascript/mastodon/features/reblogs/index.js
index 7704a049f41198213834c5aed33c35d48b10e0e4..0e82d9aabb9116df2e48ccf1d15d6570c671f681 100644
--- a/app/javascript/mastodon/features/reblogs/index.js
+++ b/app/javascript/mastodon/features/reblogs/index.js
@@ -20,8 +20,6 @@ const mapStateToProps = (state, props) => ({
accountIds: state.getIn(['user_lists', 'reblogged_by', props.params.statusId]),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Reblogs extends ImmutablePureComponent {
static propTypes = {
@@ -85,3 +83,5 @@ class Reblogs extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Reblogs));
diff --git a/app/javascript/mastodon/features/report/category.js b/app/javascript/mastodon/features/report/category.js
index 9215b3f51edfdc83bbbd5b5917bf368d85626bd8..8d70f3188001d641b6bd60f52f9bc5edbfa4efce 100644
--- a/app/javascript/mastodon/features/report/category.js
+++ b/app/javascript/mastodon/features/report/category.js
@@ -23,8 +23,6 @@ const mapStateToProps = state => ({
rules: state.get('rules'),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Category extends React.PureComponent {
static propTypes = {
@@ -103,3 +101,5 @@ class Category extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Category));
diff --git a/app/javascript/mastodon/features/report/comment.js b/app/javascript/mastodon/features/report/comment.js
index cde1564158024434eef9506f5c1d8914514b4231..ab29f6c22732a41325ef62fa59f456d62d2a1af5 100644
--- a/app/javascript/mastodon/features/report/comment.js
+++ b/app/javascript/mastodon/features/report/comment.js
@@ -8,7 +8,6 @@ const messages = defineMessages({
placeholder: { id: 'report.placeholder', defaultMessage: 'Type or paste additional comments' },
});
-export default @injectIntl
class Comment extends React.PureComponent {
static propTypes = {
@@ -81,3 +80,5 @@ class Comment extends React.PureComponent {
}
}
+
+export default injectIntl(Comment);
diff --git a/app/javascript/mastodon/features/report/rules.js b/app/javascript/mastodon/features/report/rules.js
index f2db0d9e4cc42ce354b5f69bf927c59f553288d8..e6551e81156ad8d12daa35b8d30582d74c9356fe 100644
--- a/app/javascript/mastodon/features/report/rules.js
+++ b/app/javascript/mastodon/features/report/rules.js
@@ -10,7 +10,6 @@ const mapStateToProps = state => ({
rules: state.get('rules'),
});
-export default @connect(mapStateToProps)
class Rules extends React.PureComponent {
static propTypes = {
@@ -62,3 +61,5 @@ class Rules extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Rules);
diff --git a/app/javascript/mastodon/features/report/statuses.js b/app/javascript/mastodon/features/report/statuses.js
index d5d86034fb5a9296845caa94f4c4b575b269194c..87163aeb89d2f6d5f931995bb2d241359cd8293c 100644
--- a/app/javascript/mastodon/features/report/statuses.js
+++ b/app/javascript/mastodon/features/report/statuses.js
@@ -13,7 +13,6 @@ const mapStateToProps = (state, { accountId }) => ({
isLoading: state.getIn(['timelines', `account:${accountId}:with_replies`, 'isLoading']),
});
-export default @connect(mapStateToProps)
class Statuses extends React.PureComponent {
static propTypes = {
@@ -59,3 +58,5 @@ class Statuses extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Statuses);
diff --git a/app/javascript/mastodon/features/report/thanks.js b/app/javascript/mastodon/features/report/thanks.js
index d169b1e329472e7278471eba4b3cc685f535bd5b..4e5b6e8648faa0565997b5d3c0901291cd258cb0 100644
--- a/app/javascript/mastodon/features/report/thanks.js
+++ b/app/javascript/mastodon/features/report/thanks.js
@@ -12,7 +12,6 @@ import {
const mapStateToProps = () => ({});
-export default @connect(mapStateToProps)
class Thanks extends React.PureComponent {
static propTypes = {
@@ -82,3 +81,5 @@ class Thanks extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Thanks);
diff --git a/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js b/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js
index d3d8a6507e6d19701386a3e20b4dacae89f603dc..f1ab60630ce8f4e4e0efde78898856751b966ad5 100644
--- a/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js
+++ b/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js
@@ -15,7 +15,6 @@ const mapStateToProps = (state, { hashtag }) => ({
hasMore: state.getIn(['timelines', `hashtag:${hashtag}`, 'hasMore'], false),
});
-export default @connect(mapStateToProps)
class HashtagTimeline extends React.PureComponent {
static propTypes = {
@@ -88,3 +87,5 @@ class HashtagTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(HashtagTimeline);
diff --git a/app/javascript/mastodon/features/standalone/public_timeline/index.js b/app/javascript/mastodon/features/standalone/public_timeline/index.js
index 19b0b14be6a35d2decfb9f4f89825672b397f222..83d2ef624aba4d84670f7da56e2c6ec73807a870 100644
--- a/app/javascript/mastodon/features/standalone/public_timeline/index.js
+++ b/app/javascript/mastodon/features/standalone/public_timeline/index.js
@@ -19,7 +19,6 @@ const mapStateToProps = (state, { local }) => {
};
};
-export default @connect(mapStateToProps)
class PublicTimeline extends React.PureComponent {
static propTypes = {
@@ -97,3 +96,5 @@ class PublicTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(PublicTimeline);
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index edaff959e6cd5d5f735136abd933f0f95f741922..780b6f120ac4f8e5161cacb556a701402b5ef784 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -44,8 +44,6 @@ const mapStateToProps = (state, { status }) => ({
relationship: state.getIn(['relationships', status.getIn(['account', 'id'])]),
});
-export default @connect(mapStateToProps)
-@injectIntl
class ActionBar extends React.PureComponent {
static contextTypes = {
@@ -295,3 +293,5 @@ class ActionBar extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(ActionBar));
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 13bce1b831f1e1ea301d3be1499d9edeaeec89d5..d9875db085ee8f2bca945210338fa082b6822460 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -25,7 +25,6 @@ const messages = defineMessages({
direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
});
-export default @injectIntl
class DetailedStatus extends ImmutablePureComponent {
static contextTypes = {
@@ -271,3 +270,5 @@ class DetailedStatus extends ImmutablePureComponent {
}
}
+
+export default injectIntl(DetailedStatus);
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index 4d7f24834e42d9fdd3d737ef7443b71b0c4ef301..fa188bbffe72ba25942a2f42baa940ec68dfb521 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -154,8 +154,6 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
-export default @injectIntl
-@connect(makeMapStateToProps)
class Status extends ImmutablePureComponent {
static contextTypes = {
@@ -597,3 +595,5 @@ class Status extends ImmutablePureComponent {
}
}
+
+export default injectIntl(connect(makeMapStateToProps)(Status));
diff --git a/app/javascript/mastodon/features/ui/components/audio_modal.js b/app/javascript/mastodon/features/ui/components/audio_modal.js
index c46fefce89d17bb9448dc07f9e27013eb3dc09ec..2c10568608bd0d9a74154cc482dd87a883310935 100644
--- a/app/javascript/mastodon/features/ui/components/audio_modal.js
+++ b/app/javascript/mastodon/features/ui/components/audio_modal.js
@@ -10,7 +10,6 @@ const mapStateToProps = (state, { statusId }) => ({
accountStaticAvatar: state.getIn(['accounts', state.getIn(['statuses', statusId, 'account']), 'avatar_static']),
});
-export default @connect(mapStateToProps)
class AudioModal extends ImmutablePureComponent {
static propTypes = {
@@ -52,3 +51,5 @@ class AudioModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(AudioModal);
diff --git a/app/javascript/mastodon/features/ui/components/block_modal.js b/app/javascript/mastodon/features/ui/components/block_modal.js
index a07baeaa64a450768dc2ede4e01744550a3d3a2e..7b3e66e9f7ee7cf8645c438f8a1796ad6f5028f7 100644
--- a/app/javascript/mastodon/features/ui/components/block_modal.js
+++ b/app/javascript/mastodon/features/ui/components/block_modal.js
@@ -36,8 +36,6 @@ const mapDispatchToProps = dispatch => {
};
};
-export default @connect(makeMapStateToProps, mapDispatchToProps)
-@injectIntl
class BlockModal extends React.PureComponent {
static propTypes = {
@@ -101,3 +99,5 @@ class BlockModal extends React.PureComponent {
}
}
+
+export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(BlockModal));
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.js b/app/javascript/mastodon/features/ui/components/boost_modal.js
index ab87ee4276918786b8e2ce276988741dfd003646..a28c3690728e8ff1caacdbbdef7f0e4eb370a395 100644
--- a/app/javascript/mastodon/features/ui/components/boost_modal.js
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.js
@@ -38,8 +38,6 @@ const mapDispatchToProps = dispatch => {
};
};
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class BoostModal extends ImmutablePureComponent {
static contextTypes = {
@@ -141,3 +139,5 @@ class BoostModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(BoostModal));
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index 68017a5f1ef8a64f6215317c129228ee052f67a4..ca5b012eb3c746153b079f6e741ffa3f4ba563df 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -55,7 +55,6 @@ const messages = defineMessages({
const shouldHideFAB = path => path.match(/^\/statuses\/|^\/@[^/]+\/\d+|^\/publish|^\/explore|^\/getting-started|^\/start/);
-export default @(component => injectIntl(component, { withRef: true }))
class ColumnsArea extends ImmutablePureComponent {
static contextTypes = {
@@ -269,3 +268,5 @@ class ColumnsArea extends ImmutablePureComponent {
}
}
+
+export default injectIntl(ColumnsArea, { withRef: true });
diff --git a/app/javascript/mastodon/features/ui/components/compare_history_modal.js b/app/javascript/mastodon/features/ui/components/compare_history_modal.js
index ecccc8f7df586b31d043c5896d814bbeb06fde5a..7afd600e7683f3f0f9ec1347d972558a6e822b25 100644
--- a/app/javascript/mastodon/features/ui/components/compare_history_modal.js
+++ b/app/javascript/mastodon/features/ui/components/compare_history_modal.js
@@ -23,7 +23,6 @@ const mapDispatchToProps = dispatch => ({
});
-export default @connect(mapStateToProps, mapDispatchToProps)
class CompareHistoryModal extends React.PureComponent {
static propTypes = {
@@ -97,3 +96,5 @@ class CompareHistoryModal extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(CompareHistoryModal);
diff --git a/app/javascript/mastodon/features/ui/components/compose_panel.js b/app/javascript/mastodon/features/ui/components/compose_panel.js
index 3d0c48c7a9687c759106c83a8d918940d78e12da..fdca3744182b5381954d2e2c6093924b3c481f33 100644
--- a/app/javascript/mastodon/features/ui/components/compose_panel.js
+++ b/app/javascript/mastodon/features/ui/components/compose_panel.js
@@ -7,7 +7,6 @@ import NavigationContainer from 'mastodon/features/compose/containers/navigation
import LinkFooter from './link_footer';
import { changeComposing } from 'mastodon/actions/compose';
-export default @connect()
class ComposePanel extends React.PureComponent {
static propTypes = {
@@ -34,3 +33,5 @@ class ComposePanel extends React.PureComponent {
}
}
+
+export default connect()(ComposePanel);
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modal.js b/app/javascript/mastodon/features/ui/components/confirmation_modal.js
index 65d97ca1610c95178e8a303c9b1f9289a87f828f..0c1571a41a0f29a99ec677340741a82aed966858 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modal.js
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modal.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
import { injectIntl, FormattedMessage } from 'react-intl';
import Button from '../../../components/button';
-export default @injectIntl
class ConfirmationModal extends React.PureComponent {
static propTypes = {
@@ -68,3 +67,5 @@ class ConfirmationModal extends React.PureComponent {
}
}
+
+export default injectIntl(ConfirmationModal);
diff --git a/app/javascript/mastodon/features/ui/components/document_title.js b/app/javascript/mastodon/features/ui/components/document_title.js
index cd081b20c7e2c7c2ad30659ae3ce2d38cfe0b355..7fa3d6827b5b7088be2c2192e7cb866b49788c82 100644
--- a/app/javascript/mastodon/features/ui/components/document_title.js
+++ b/app/javascript/mastodon/features/ui/components/document_title.js
@@ -7,7 +7,6 @@ const mapStateToProps = state => ({
unread: state.getIn(['missed_updates', 'unread']),
});
-export default @connect(mapStateToProps)
class DocumentTitle extends PureComponent {
static propTypes = {
@@ -39,3 +38,5 @@ class DocumentTitle extends PureComponent {
}
}
+
+export default connect(mapStateToProps)(DocumentTitle);
diff --git a/app/javascript/mastodon/features/ui/components/embed_modal.js b/app/javascript/mastodon/features/ui/components/embed_modal.js
index 4679c9650fdc439bc3a2f49eea90e7ed8ba5f7b1..e2dcd71fc5720c884a8d573cccca8a18491166df 100644
--- a/app/javascript/mastodon/features/ui/components/embed_modal.js
+++ b/app/javascript/mastodon/features/ui/components/embed_modal.js
@@ -9,7 +9,6 @@ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
-export default @injectIntl
class EmbedModal extends ImmutablePureComponent {
static propTypes = {
@@ -95,3 +94,5 @@ class EmbedModal extends ImmutablePureComponent {
}
}
+
+export default injectIntl(EmbedModal);
diff --git a/app/javascript/mastodon/features/ui/components/focal_point_modal.js b/app/javascript/mastodon/features/ui/components/focal_point_modal.js
index a2e6b3d16b291e7e365576fd9ae59a58e81cddda..9e13bdee6d4438f25052a372b773763b4d750c18 100644
--- a/app/javascript/mastodon/features/ui/components/focal_point_modal.js
+++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.js
@@ -99,8 +99,6 @@ class ImageLoader extends React.PureComponent {
}
-export default @connect(mapStateToProps, mapDispatchToProps, null, { forwardRef: true })
-@(component => injectIntl(component, { withRef: true }))
class FocalPointModal extends ImmutablePureComponent {
static propTypes = {
@@ -415,3 +413,7 @@ class FocalPointModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps, null, {
+ forwardRef: true,
+})(injectIntl(FocalPointModal, { withRef: true }));
diff --git a/app/javascript/mastodon/features/ui/components/follow_requests_nav_link.js b/app/javascript/mastodon/features/ui/components/follow_requests_nav_link.js
index 950ed7b273ce8aa2cef373a90b6e5cbce72ef00b..713138b36d379033b5113b3d422a7c3f709e1b0f 100644
--- a/app/javascript/mastodon/features/ui/components/follow_requests_nav_link.js
+++ b/app/javascript/mastodon/features/ui/components/follow_requests_nav_link.js
@@ -11,8 +11,6 @@ const mapStateToProps = state => ({
count: state.getIn(['user_lists', 'follow_requests', 'items'], ImmutableList()).size,
});
-export default @withRouter
-@connect(mapStateToProps)
class FollowRequestsNavLink extends React.Component {
static propTypes = {
@@ -37,3 +35,5 @@ class FollowRequestsNavLink extends React.Component {
}
}
+
+export default withRouter(connect(mapStateToProps)(FollowRequestsNavLink));
diff --git a/app/javascript/mastodon/features/ui/components/link_footer.js b/app/javascript/mastodon/features/ui/components/link_footer.js
index edf1104c4ed626645b3e5a10d628300e0b37ef4b..052abb6b3071f4354e9389fd429b1ee676fcd4e5 100644
--- a/app/javascript/mastodon/features/ui/components/link_footer.js
+++ b/app/javascript/mastodon/features/ui/components/link_footer.js
@@ -23,8 +23,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
});
-export default @injectIntl
-@connect(null, mapDispatchToProps)
class LinkFooter extends React.PureComponent {
static propTypes = {
@@ -71,4 +69,6 @@ class LinkFooter extends React.PureComponent {
);
}
-};
+}
+
+export default injectIntl(connect(null, mapDispatchToProps)(LinkFooter));
diff --git a/app/javascript/mastodon/features/ui/components/list_panel.js b/app/javascript/mastodon/features/ui/components/list_panel.js
index 411f62508ed02f430ca30b43854c63666502442b..277d54a348e76153b0f7266eaa4aa944dbdb6153 100644
--- a/app/javascript/mastodon/features/ui/components/list_panel.js
+++ b/app/javascript/mastodon/features/ui/components/list_panel.js
@@ -20,8 +20,6 @@ const mapStateToProps = state => ({
lists: getOrderedLists(state),
});
-export default @withRouter
-@connect(mapStateToProps)
class ListPanel extends ImmutablePureComponent {
static propTypes = {
@@ -53,3 +51,5 @@ class ListPanel extends ImmutablePureComponent {
}
}
+
+export default withRouter(connect(mapStateToProps)(ListPanel));
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js
index ae937d1cdf90cec13593698d4946256cfb2bdd84..a8e80cc41c148b4ac9e37139b9d4cd582a449f61 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.js
+++ b/app/javascript/mastodon/features/ui/components/media_modal.js
@@ -20,7 +20,6 @@ const messages = defineMessages({
next: { id: 'lightbox.next', defaultMessage: 'Next' },
});
-export default @injectIntl
class MediaModal extends ImmutablePureComponent {
static propTypes = {
@@ -248,3 +247,5 @@ class MediaModal extends ImmutablePureComponent {
}
}
+
+export default injectIntl(MediaModal);
diff --git a/app/javascript/mastodon/features/ui/components/mute_modal.js b/app/javascript/mastodon/features/ui/components/mute_modal.js
index d8d8e68c384dbc22233721cd1361581a901f4166..8f08bc5b9673996496311af6712b0052c5e9fa3b 100644
--- a/app/javascript/mastodon/features/ui/components/mute_modal.js
+++ b/app/javascript/mastodon/features/ui/components/mute_modal.js
@@ -43,8 +43,6 @@ const mapDispatchToProps = dispatch => {
};
};
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class MuteModal extends React.PureComponent {
static propTypes = {
@@ -138,3 +136,5 @@ class MuteModal extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(MuteModal));
diff --git a/app/javascript/mastodon/features/ui/components/report_modal.js b/app/javascript/mastodon/features/ui/components/report_modal.js
index 744dd248b5891d7220bdc22692237f1fb1fab1dd..ded0442baa13312ffb20bdd12eef9208fec1a584 100644
--- a/app/javascript/mastodon/features/ui/components/report_modal.js
+++ b/app/javascript/mastodon/features/ui/components/report_modal.js
@@ -30,8 +30,6 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
-export default @connect(makeMapStateToProps)
-@injectIntl
class ReportModal extends ImmutablePureComponent {
static propTypes = {
@@ -217,3 +215,5 @@ class ReportModal extends ImmutablePureComponent {
}
}
+
+export default connect(makeMapStateToProps)(injectIntl(ReportModal));
diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js
index 55668cab6a238247a64a9d5f678de0f5da4d8ff8..32a6d5a5f7339c7312e06c046dd12ea9c23b4ba5 100644
--- a/app/javascript/mastodon/features/ui/components/tabs_bar.js
+++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js
@@ -24,8 +24,6 @@ export function getLink (index) {
return links[index].props.to;
}
-export default @injectIntl
-@withRouter
class TabsBar extends React.PureComponent {
static propTypes = {
@@ -84,3 +82,5 @@ class TabsBar extends React.PureComponent {
}
}
+
+export default injectIntl(withRouter(TabsBar));
diff --git a/app/javascript/mastodon/features/ui/components/zoomable_image.js b/app/javascript/mastodon/features/ui/components/zoomable_image.js
index 1cf263cb9003d5b081e141145b7105de1b62108c..520ca7f0f7c1d1acec0b526cdcdabeb41e6efd43 100644
--- a/app/javascript/mastodon/features/ui/components/zoomable_image.js
+++ b/app/javascript/mastodon/features/ui/components/zoomable_image.js
@@ -91,7 +91,6 @@ const normalizeWheel = event => {
};
};
-export default @injectIntl
class ZoomableImage extends React.PureComponent {
static propTypes = {
@@ -448,3 +447,5 @@ class ZoomableImage extends React.PureComponent {
}
}
+
+export default injectIntl(ZoomableImage);
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index 9a901f12a652fb08ab8e008deccd8cdc2aa102ab..189c0ed86560e13149b6e357744c7a4051cb5e58 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -201,9 +201,6 @@ class SwitchingColumnsArea extends React.PureComponent {
}
-export default @connect(mapStateToProps)
-@injectIntl
-@withRouter
class UI extends React.PureComponent {
static contextTypes = {
@@ -553,3 +550,5 @@ class UI extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(withRouter(UI)));
diff --git a/app/javascript/mastodon/features/video/index.js b/app/javascript/mastodon/features/video/index.js
index 4f90e955fe740c7aca139d408ef65dae9f656230..20ffc84669f7dd4427ec6ed1fb09c48a6a6d62a8 100644
--- a/app/javascript/mastodon/features/video/index.js
+++ b/app/javascript/mastodon/features/video/index.js
@@ -94,7 +94,6 @@ export const fileNameFromURL = str => {
return pathname.slice(index + 1);
};
-export default @injectIntl
class Video extends React.PureComponent {
static propTypes = {
@@ -652,3 +651,5 @@ class Video extends React.PureComponent {
}
}
+
+export default injectIntl(Video);
diff --git a/babel.config.js b/babel.config.js
index b040cc159604de0b9e535bd02cf94a39001b2113..3ff98802c73f3fe2ced5198d4d8342364be5be61 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -17,7 +17,6 @@ module.exports = (api) => {
['@babel/env', envOptions],
],
plugins: [
- ['@babel/proposal-decorators', { legacy: true }],
['react-intl', { messagesDir: './build/messages' }],
'preval',
],
diff --git a/package.json b/package.json
index c263538e969f9e4fc062309e63078e7f7f4606b8..eee0458ddde481853c9d7622ea6a989c5a97c85c 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,6 @@
"private": true,
"dependencies": {
"@babel/core": "^7.18.6",
- "@babel/plugin-proposal-decorators": "^7.18.6",
"@babel/plugin-transform-react-inline-elements": "^7.18.6",
"@babel/plugin-transform-runtime": "^7.18.6",
"@babel/preset-env": "^7.18.6",
diff --git a/yarn.lock b/yarn.lock
index 12b02d95c9eb2e706ed188f2b7373d217f4aca70..d022eb8e370bb66b9bc388ea72dac69f7a20e5ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,7 +16,7 @@
dependencies:
"@babel/highlight" "^7.10.4"
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.18.6":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
@@ -58,7 +58,7 @@
eslint-visitor-keys "^2.1.0"
semver "^6.3.0"
-"@babel/generator@^7.18.6", "@babel/generator@^7.7.2":
+"@babel/generator@^7.17.10", "@babel/generator@^7.18.6":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.6.tgz#9ab2d46d3cbf631f0e80f72e72874a04c3fc12a9"
integrity sha512-AIwwoOS8axIC5MZbhNHRLKi3D+DMpvDf9XUcu3pIVAfOHFT45f4AoDAltRbHIQomCipkCZxrNkfpOEHhJz/VKw==
@@ -67,6 +67,15 @@
"@jridgewell/gen-mapping" "^0.3.0"
jsesc "^2.5.1"
+"@babel/generator@^7.7.2":
+ version "7.17.10"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.10.tgz#c281fa35b0c349bbe9d02916f4ae08fc85ed7189"
+ integrity sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==
+ dependencies:
+ "@babel/types" "^7.17.10"
+ "@jridgewell/gen-mapping" "^0.1.0"
+ jsesc "^2.5.1"
+
"@babel/helper-annotate-as-pure@^7.18.6":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
@@ -135,7 +144,7 @@
resolve "^1.14.2"
semver "^6.1.2"
-"@babel/helper-environment-visitor@^7.18.6":
+"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.6":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.6.tgz#b7eee2b5b9d70602e59d1a6cad7dd24de7ca6cd7"
integrity sha512-8n6gSfn2baOY+qlp+VSzsosjCVGFqWKmDF0cCWOybh52Dw3SEyoWR1KrhMJASjLwIEkkAufZ0xvr+SxLHSpy2Q==
@@ -147,7 +156,7 @@
dependencies:
"@babel/types" "^7.18.6"
-"@babel/helper-function-name@^7.18.6":
+"@babel/helper-function-name@^7.17.9", "@babel/helper-function-name@^7.18.6":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.6.tgz#8334fecb0afba66e6d87a7e8c6bb7fed79926b83"
integrity sha512-0mWMxV1aC97dhjCah5U5Ua7668r5ZmSC2DLfH2EZnf9c3/dHZKiFa5pRLMH5tjSl471tY6496ZWk/kjNONBxhw==
@@ -155,7 +164,7 @@
"@babel/template" "^7.18.6"
"@babel/types" "^7.18.6"
-"@babel/helper-hoist-variables@^7.18.6":
+"@babel/helper-hoist-variables@^7.16.7", "@babel/helper-hoist-variables@^7.18.6":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
@@ -237,7 +246,7 @@
dependencies:
"@babel/types" "^7.18.6"
-"@babel/helper-split-export-declaration@^7.18.6":
+"@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.18.6":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
@@ -249,7 +258,7 @@
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
-"@babel/helper-validator-identifier@^7.18.6":
+"@babel/helper-validator-identifier@^7.16.7", "@babel/helper-validator-identifier@^7.18.6":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
@@ -296,7 +305,12 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.6":
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7":
+ version "7.17.10"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.10.tgz#873b16db82a8909e0fbd7f115772f4b739f6ce78"
+ integrity sha512-n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ==
+
+"@babel/parser@^7.17.10", "@babel/parser@^7.18.6":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.6.tgz#845338edecad65ebffef058d3be851f1d28a63bc"
integrity sha512-uQVSa9jJUe/G/304lXspfWVpKpK4euFLgGiMQFOCpM/bgcAdeoHwi/OQz23O9GK2osz26ZiXRRV9aV+Yl1O8tw==
@@ -344,17 +358,6 @@
"@babel/helper-plugin-utils" "^7.18.6"
"@babel/plugin-syntax-class-static-block" "^7.14.5"
-"@babel/plugin-proposal-decorators@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.6.tgz#68e9fd0f022b944f84a8824bb28bfaee724d2595"
- integrity sha512-gAdhsjaYmiZVxx5vTMiRfj31nB7LhwBJFMSLzeDxc7X4tKLixup0+k9ughn0RcpBrv9E3PBaXJW7jF5TCihAOg==
- dependencies:
- "@babel/helper-create-class-features-plugin" "^7.18.6"
- "@babel/helper-plugin-utils" "^7.18.6"
- "@babel/helper-replace-supers" "^7.18.6"
- "@babel/helper-split-export-declaration" "^7.18.6"
- "@babel/plugin-syntax-decorators" "^7.18.6"
-
"@babel/plugin-proposal-dynamic-import@^7.18.6":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
@@ -485,13 +488,6 @@
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-syntax-decorators@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.18.6.tgz#2e45af22835d0b0f8665da2bfd4463649ce5dbc1"
- integrity sha512-fqyLgjcxf/1yhyZ6A+yo1u9gJ7eleFQod2lkaUsF9DQ7sbbY3Ligym3L0+I2c0WmqNKDpoD9UTb1AKP3qRMOAQ==
- dependencies:
- "@babel/helper-plugin-utils" "^7.18.6"
-
"@babel/plugin-syntax-dynamic-import@^7.8.3":
version "7.8.3"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
@@ -1035,7 +1031,7 @@
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/template@^7.18.6", "@babel/template@^7.3.3":
+"@babel/template@^7.18.6":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.6.tgz#1283f4993e00b929d6e2d3c72fdc9168a2977a31"
integrity sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==
@@ -1044,7 +1040,32 @@
"@babel/parser" "^7.18.6"
"@babel/types" "^7.18.6"
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.18.6", "@babel/traverse@^7.7.2":
+"@babel/template@^7.3.3":
+ version "7.16.7"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
+ integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
+ dependencies:
+ "@babel/code-frame" "^7.16.7"
+ "@babel/parser" "^7.16.7"
+ "@babel/types" "^7.16.7"
+
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.7.2":
+ version "7.17.10"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.10.tgz#1ee1a5ac39f4eac844e6cf855b35520e5eb6f8b5"
+ integrity sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==
+ dependencies:
+ "@babel/code-frame" "^7.16.7"
+ "@babel/generator" "^7.17.10"
+ "@babel/helper-environment-visitor" "^7.16.7"
+ "@babel/helper-function-name" "^7.17.9"
+ "@babel/helper-hoist-variables" "^7.16.7"
+ "@babel/helper-split-export-declaration" "^7.16.7"
+ "@babel/parser" "^7.17.10"
+ "@babel/types" "^7.17.10"
+ debug "^4.1.0"
+ globals "^11.1.0"
+
+"@babel/traverse@^7.18.6":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.6.tgz#a228562d2f46e89258efa4ddd0416942e2fd671d"
integrity sha512-zS/OKyqmD7lslOtFqbscH6gMLFYOfG1YPqCKfAW5KrTeolKqvB8UelR49Fpr6y93kYkW2Ik00mT1LOGiAGvizw==
@@ -1060,7 +1081,15 @@
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.18.6", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.16.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+ version "7.17.10"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.10.tgz#d35d7b4467e439fcf06d195f8100e0fea7fc82c4"
+ integrity sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==
+ dependencies:
+ "@babel/helper-validator-identifier" "^7.16.7"
+ to-fast-properties "^2.0.0"
+
+"@babel/types@^7.17.10", "@babel/types@^7.18.6":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.6.tgz#5d781dd10a3f0c9f1f931bd19de5eb26ec31acf0"
integrity sha512-NdBNzPDwed30fZdDQtVR7ZgaO4UKjuaQFH9VArS+HMnurlOY0JWN+4ROlu/iapMFwjRQU4pOG4StZfDmulEwGA==
@@ -1447,6 +1476,14 @@
"@types/yargs" "^17.0.8"
chalk "^4.0.0"
+"@jridgewell/gen-mapping@^0.1.0":
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
+ integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
+ dependencies:
+ "@jridgewell/set-array" "^1.0.0"
+ "@jridgewell/sourcemap-codec" "^1.4.10"
+
"@jridgewell/gen-mapping@^0.3.0":
version "0.3.1"
resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9"