Commit 882f814e authored by Yamagishi Kazutoshi's avatar Yamagishi Kazutoshi Committed by GitHub
Browse files

Remove legacy decorators syntax

parent f804c009
Showing with 57 additions and 22 deletions
+57 -22
...@@ -24,10 +24,14 @@ module.exports = { ...@@ -24,10 +24,14 @@ module.exports = {
parserOptions: { parserOptions: {
sourceType: 'module', sourceType: 'module',
ecmaFeatures: { ecmaFeatures: {
experimentalObjectRestSpread: true,
jsx: true, jsx: true,
}, },
ecmaVersion: 2021, ecmaVersion: 2021,
requireConfigFile: false,
babelOptions: {
configFile: false,
presets: ['@babel/react', '@babel/env'],
},
}, },
settings: { settings: {
...@@ -211,4 +215,18 @@ module.exports = { ...@@ -211,4 +215,18 @@ module.exports = {
}, },
], ],
}, },
overrides: [
{
files: ['*.config.js', '.eslintrc.js', 'ide-helper.js'],
env: {
commonjs: true,
},
parserOptions: {
sourceType: 'script',
},
},
],
}; };
...@@ -22,7 +22,6 @@ const messages = defineMessages({ ...@@ -22,7 +22,6 @@ const messages = defineMessages({
block: { id: 'account.block', defaultMessage: 'Block @{name}' }, block: { id: 'account.block', defaultMessage: 'Block @{name}' },
}); });
export default @injectIntl
class Account extends ImmutablePureComponent { class Account extends ImmutablePureComponent {
static propTypes = { static propTypes = {
...@@ -140,3 +139,5 @@ class Account extends ImmutablePureComponent { ...@@ -140,3 +139,5 @@ class Account extends ImmutablePureComponent {
} }
} }
export default injectIntl(Account);
...@@ -84,7 +84,6 @@ class Rule extends React.PureComponent { ...@@ -84,7 +84,6 @@ class Rule extends React.PureComponent {
} }
export default @injectIntl
class ReportReasonSelector extends React.PureComponent { class ReportReasonSelector extends React.PureComponent {
static propTypes = { static propTypes = {
...@@ -157,3 +156,5 @@ class ReportReasonSelector extends React.PureComponent { ...@@ -157,3 +156,5 @@ class ReportReasonSelector extends React.PureComponent {
} }
} }
export default injectIntl(ReportReasonSelector);
...@@ -12,7 +12,6 @@ const messages = defineMessages({ ...@@ -12,7 +12,6 @@ const messages = defineMessages({
moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' }, moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
}); });
export default @injectIntl
class ColumnHeader extends React.PureComponent { class ColumnHeader extends React.PureComponent {
static contextTypes = { static contextTypes = {
...@@ -213,3 +212,5 @@ class ColumnHeader extends React.PureComponent { ...@@ -213,3 +212,5 @@ class ColumnHeader extends React.PureComponent {
} }
} }
export default injectIntl(ColumnHeader);
...@@ -8,7 +8,6 @@ const messages = defineMessages({ ...@@ -8,7 +8,6 @@ const messages = defineMessages({
unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' }, unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
}); });
export default @injectIntl
class Account extends ImmutablePureComponent { class Account extends ImmutablePureComponent {
static propTypes = { static propTypes = {
...@@ -40,3 +39,5 @@ class Account extends ImmutablePureComponent { ...@@ -40,3 +39,5 @@ class Account extends ImmutablePureComponent {
} }
} }
export default injectIntl(Account);
...@@ -16,8 +16,6 @@ const mapDispatchToProps = (dispatch, { statusId }) => ({ ...@@ -16,8 +16,6 @@ const mapDispatchToProps = (dispatch, { statusId }) => ({
}); });
export default @connect(null, mapDispatchToProps)
@injectIntl
class EditedTimestamp extends React.PureComponent { class EditedTimestamp extends React.PureComponent {
static propTypes = { static propTypes = {
...@@ -68,3 +66,5 @@ class EditedTimestamp extends React.PureComponent { ...@@ -68,3 +66,5 @@ class EditedTimestamp extends React.PureComponent {
} }
} }
export default connect(null, mapDispatchToProps)(injectIntl(EditedTimestamp));
...@@ -14,7 +14,6 @@ const makeMapStateToProps = () => { ...@@ -14,7 +14,6 @@ const makeMapStateToProps = () => {
return mapStateToProps; return mapStateToProps;
}; };
export default @connect(makeMapStateToProps)
class InlineAccount extends React.PureComponent { class InlineAccount extends React.PureComponent {
static propTypes = { static propTypes = {
...@@ -32,3 +31,5 @@ class InlineAccount extends React.PureComponent { ...@@ -32,3 +31,5 @@ class InlineAccount extends React.PureComponent {
} }
} }
export default connect(makeMapStateToProps)(InlineAccount);
...@@ -7,7 +7,6 @@ const messages = defineMessages({ ...@@ -7,7 +7,6 @@ const messages = defineMessages({
load_more: { id: 'status.load_more', defaultMessage: 'Load more' }, load_more: { id: 'status.load_more', defaultMessage: 'Load more' },
}); });
export default @injectIntl
class LoadGap extends React.PureComponent { class LoadGap extends React.PureComponent {
static propTypes = { static propTypes = {
...@@ -32,3 +31,5 @@ class LoadGap extends React.PureComponent { ...@@ -32,3 +31,5 @@ class LoadGap extends React.PureComponent {
} }
} }
export default injectIntl(LoadGap);
...@@ -220,7 +220,6 @@ class Item extends React.PureComponent { ...@@ -220,7 +220,6 @@ class Item extends React.PureComponent {
} }
export default @injectIntl
class MediaGallery extends React.PureComponent { class MediaGallery extends React.PureComponent {
static propTypes = { static propTypes = {
...@@ -366,3 +365,5 @@ class MediaGallery extends React.PureComponent { ...@@ -366,3 +365,5 @@ class MediaGallery extends React.PureComponent {
} }
} }
export default injectIntl(MediaGallery);
...@@ -6,7 +6,6 @@ import { connect } from 'react-redux'; ...@@ -6,7 +6,6 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash'; import { debounce } from 'lodash';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
export default @connect()
class PictureInPicturePlaceholder extends React.PureComponent { class PictureInPicturePlaceholder extends React.PureComponent {
static propTypes = { static propTypes = {
...@@ -67,3 +66,5 @@ class PictureInPicturePlaceholder extends React.PureComponent { ...@@ -67,3 +66,5 @@ class PictureInPicturePlaceholder extends React.PureComponent {
} }
} }
export default connect()(PictureInPicturePlaceholder);
...@@ -31,7 +31,6 @@ const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => { ...@@ -31,7 +31,6 @@ const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
return obj; return obj;
}, {}); }, {});
export default @injectIntl
class Poll extends ImmutablePureComponent { class Poll extends ImmutablePureComponent {
static propTypes = { static propTypes = {
...@@ -227,3 +226,5 @@ class Poll extends ImmutablePureComponent { ...@@ -227,3 +226,5 @@ class Poll extends ImmutablePureComponent {
} }
} }
export default injectIntl(Poll);
...@@ -121,7 +121,6 @@ const timeRemainingString = (intl, date, now, timeGiven = true) => { ...@@ -121,7 +121,6 @@ const timeRemainingString = (intl, date, now, timeGiven = true) => {
return relativeTime; return relativeTime;
}; };
export default @injectIntl
class RelativeTimestamp extends React.Component { class RelativeTimestamp extends React.Component {
static propTypes = { static propTypes = {
...@@ -197,3 +196,5 @@ class RelativeTimestamp extends React.Component { ...@@ -197,3 +196,5 @@ class RelativeTimestamp extends React.Component {
} }
} }
export default injectIntl(RelativeTimestamp);
...@@ -20,7 +20,6 @@ const mapStateToProps = (state, { scrollKey }) => { ...@@ -20,7 +20,6 @@ const mapStateToProps = (state, { scrollKey }) => {
}; };
}; };
export default @connect(mapStateToProps, null, null, { forwardRef: true })
class ScrollableList extends PureComponent { class ScrollableList extends PureComponent {
static contextTypes = { static contextTypes = {
...@@ -365,3 +364,5 @@ class ScrollableList extends PureComponent { ...@@ -365,3 +364,5 @@ class ScrollableList extends PureComponent {
} }
} }
export default connect(mapStateToProps, null, null, { forwardRef: true })(ScrollableList);
...@@ -59,7 +59,6 @@ const messages = defineMessages({ ...@@ -59,7 +59,6 @@ const messages = defineMessages({
edited: { id: 'status.edited', defaultMessage: 'Edited {date}' }, edited: { id: 'status.edited', defaultMessage: 'Edited {date}' },
}); });
export default @injectIntl
class Status extends ImmutablePureComponent { class Status extends ImmutablePureComponent {
static contextTypes = { static contextTypes = {
...@@ -519,3 +518,5 @@ class Status extends ImmutablePureComponent { ...@@ -519,3 +518,5 @@ class Status extends ImmutablePureComponent {
} }
} }
export default injectIntl(Status);
...@@ -49,8 +49,6 @@ const mapStateToProps = (state, { status }) => ({ ...@@ -49,8 +49,6 @@ const mapStateToProps = (state, { status }) => ({
relationship: state.getIn(['relationships', status.getIn(['account', 'id'])]), relationship: state.getIn(['relationships', status.getIn(['account', 'id'])]),
}); });
export default @connect(mapStateToProps)
@injectIntl
class StatusActionBar extends ImmutablePureComponent { class StatusActionBar extends ImmutablePureComponent {
static contextTypes = { static contextTypes = {
...@@ -371,3 +369,5 @@ class StatusActionBar extends ImmutablePureComponent { ...@@ -371,3 +369,5 @@ class StatusActionBar extends ImmutablePureComponent {
} }
} }
export default connect(mapStateToProps)(injectIntl(StatusActionBar));
...@@ -43,7 +43,6 @@ class InlineAlert extends React.PureComponent { ...@@ -43,7 +43,6 @@ class InlineAlert extends React.PureComponent {
} }
export default @injectIntl
class AccountNote extends ImmutablePureComponent { class AccountNote extends ImmutablePureComponent {
static propTypes = { static propTypes = {
...@@ -168,3 +167,5 @@ class AccountNote extends ImmutablePureComponent { ...@@ -168,3 +167,5 @@ class AccountNote extends ImmutablePureComponent {
} }
} }
export default injectIntl(AccountNote);
...@@ -61,7 +61,6 @@ const dateFormatOptions = { ...@@ -61,7 +61,6 @@ const dateFormatOptions = {
minute: '2-digit', minute: '2-digit',
}; };
export default @injectIntl
class Header extends ImmutablePureComponent { class Header extends ImmutablePureComponent {
static propTypes = { static propTypes = {
...@@ -354,3 +353,5 @@ class Header extends ImmutablePureComponent { ...@@ -354,3 +353,5 @@ class Header extends ImmutablePureComponent {
} }
} }
export default injectIntl(Header);
...@@ -59,7 +59,6 @@ class LoadMoreMedia extends ImmutablePureComponent { ...@@ -59,7 +59,6 @@ class LoadMoreMedia extends ImmutablePureComponent {
} }
export default @connect(mapStateToProps)
class AccountGallery extends ImmutablePureComponent { class AccountGallery extends ImmutablePureComponent {
static propTypes = { static propTypes = {
...@@ -225,3 +224,5 @@ class AccountGallery extends ImmutablePureComponent { ...@@ -225,3 +224,5 @@ class AccountGallery extends ImmutablePureComponent {
} }
} }
export default connect(mapStateToProps)(AccountGallery);
...@@ -13,7 +13,6 @@ const mapDispatchToProps = (dispatch, { accountId }) => ({ ...@@ -13,7 +13,6 @@ const mapDispatchToProps = (dispatch, { accountId }) => ({
}); });
export default @connect(() => {}, mapDispatchToProps)
class LimitedAccountHint extends React.PureComponent { class LimitedAccountHint extends React.PureComponent {
static propTypes = { static propTypes = {
...@@ -33,3 +32,5 @@ class LimitedAccountHint extends React.PureComponent { ...@@ -33,3 +32,5 @@ class LimitedAccountHint extends React.PureComponent {
} }
} }
export default connect(() => {}, mapDispatchToProps)(LimitedAccountHint);
...@@ -55,7 +55,6 @@ RemoteHint.propTypes = { ...@@ -55,7 +55,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired, url: PropTypes.string.isRequired,
}; };
export default @connect(mapStateToProps)
class AccountTimeline extends ImmutablePureComponent { class AccountTimeline extends ImmutablePureComponent {
static propTypes = { static propTypes = {
...@@ -192,3 +191,5 @@ class AccountTimeline extends ImmutablePureComponent { ...@@ -192,3 +191,5 @@ class AccountTimeline extends ImmutablePureComponent {
} }
} }
export default connect(mapStateToProps)(AccountTimeline);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment