M .eslintrc.js => .eslintrc.js +23 -1
@@ 32,10 32,14 @@ module.exports = {
parserOptions: {
sourceType: 'module',
ecmaFeatures: {
- experimentalObjectRestSpread: true,
jsx: true,
},
ecmaVersion: 2021,
+ requireConfigFile: false,
+ babelOptions: {
+ configFile: false,
+ presets: ['@babel/react', '@babel/env'],
+ },
},
settings: {
@@ 214,4 218,22 @@ module.exports = {
'promise/no-nesting': 'off',
'promise/no-promise-in-callback': 'off',
},
+
+ overrides: [
+ {
+ files: [
+ '*.config.js',
+ '.*rc.js',
+ 'ide-helper.js',
+ ],
+
+ env: {
+ commonjs: true,
+ },
+
+ parserOptions: {
+ sourceType: 'script',
+ },
+ },
+ ],
};
M .github/workflows/test-ruby.yml => .github/workflows/test-ruby.yml +1 -1
@@ 40,7 40,7 @@ jobs:
ruby-version: .ruby-version
bundler-cache: true
- - run: yarn install --frozen-lockfile
+ - run: yarn --frozen-lockfile --production
- name: Precompile assets
# Previously had set this, but it's not supported
# export NODE_OPTIONS=--openssl-legacy-provider
M .rubocop.yml => .rubocop.yml +40 -1
@@ 59,10 59,49 @@ Metrics/BlockNesting:
Exclude:
- 'lib/mastodon/*_cli.rb'
+# Reason: Some Excluded files would be candidates for refactoring but not currently addressed
+# https://docs.rubocop.org/rubocop/cops_metrics.html#metricsclasslength
Metrics/ClassLength:
- CountAsOne: [array, heredoc]
+ CountAsOne: ['array', 'hash', 'heredoc', 'method_call']
Exclude:
- 'lib/mastodon/*_cli.rb'
+ - 'app/controllers/admin/accounts_controller.rb'
+ - 'app/controllers/api/base_controller.rb'
+ - 'app/controllers/api/v1/admin/accounts_controller.rb'
+ - 'app/controllers/application_controller.rb'
+ - 'app/controllers/auth/registrations_controller.rb'
+ - 'app/controllers/auth/sessions_controller.rb'
+ - 'app/lib/activitypub/activity.rb'
+ - 'app/lib/activitypub/activity/create.rb'
+ - 'app/lib/activitypub/tag_manager.rb'
+ - 'app/lib/feed_manager.rb'
+ - 'app/lib/link_details_extractor.rb'
+ - 'app/lib/request.rb'
+ - 'app/lib/text_formatter.rb'
+ - 'app/lib/user_settings_decorator.rb'
+ - 'app/mailers/user_mailer.rb'
+ - 'app/models/account.rb'
+ - 'app/models/admin/account_action.rb'
+ - 'app/models/form/account_batch.rb'
+ - 'app/models/media_attachment.rb'
+ - 'app/models/status.rb'
+ - 'app/models/tag.rb'
+ - 'app/models/user.rb'
+ - 'app/serializers/activitypub/actor_serializer.rb'
+ - 'app/serializers/activitypub/note_serializer.rb'
+ - 'app/serializers/rest/status_serializer.rb'
+ - 'app/services/account_search_service.rb'
+ - 'app/services/activitypub/process_account_service.rb'
+ - 'app/services/activitypub/process_status_update_service.rb'
+ - 'app/services/backup_service.rb'
+ - 'app/services/delete_account_service.rb'
+ - 'app/services/fan_out_on_write_service.rb'
+ - 'app/services/fetch_link_card_service.rb'
+ - 'app/services/import_service.rb'
+ - 'app/services/notify_service.rb'
+ - 'app/services/post_status_service.rb'
+ - 'app/services/update_status_service.rb'
+ - 'lib/paperclip/color_extractor.rb'
Metrics/CyclomaticComplexity:
Exclude:
M .rubocop_todo.yml => .rubocop_todo.yml +0 -4
@@ 243,10 243,6 @@ Metrics/BlockNesting:
Exclude:
- 'lib/tasks/mastodon.rake'
-# Configuration parameters: CountComments, CountAsOne.
-Metrics/ClassLength:
- Max: 375
-
# Configuration parameters: AllowedMethods, AllowedPatterns.
Metrics/CyclomaticComplexity:
Max: 25
M Dockerfile => Dockerfile +1 -1
@@ 37,7 37,7 @@ RUN apt-get update && \
bundle config set --local without 'development test' && \
bundle config set silence_root_warning true && \
bundle install -j"$(nproc)" && \
- yarn install --pure-lockfile --network-timeout 600000 && \
+ yarn install --pure-lockfile --production --network-timeout 600000 && \
yarn cache clean
FROM node:${NODE_VERSION}
M app/javascript/flavours/glitch/base_polyfills.js => app/javascript/flavours/glitch/base_polyfills.js +0 -5
@@ 4,7 4,6 @@ import 'es6-symbol/implement';
import includes from 'array-includes';
import assign from 'object-assign';
import values from 'object.values';
-import isNaN from 'is-nan';
import { decode as decodeBase64 } from './utils/base64';
import promiseFinally from 'promise.prototype.finally';
@@ 20,10 19,6 @@ if (!Object.values) {
values.shim();
}
-if (!Number.isNaN) {
- Number.isNaN = isNaN;
-}
-
promiseFinally.shim();
if (!HTMLCanvasElement.prototype.toBlob) {
M app/javascript/flavours/glitch/components/account.jsx => app/javascript/flavours/glitch/components/account.jsx +2 -1
@@ 23,7 23,6 @@ const messages = defineMessages({
block: { id: 'account.block', defaultMessage: 'Block @{name}' },
});
-export default @injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
@@ 184,3 183,5 @@ class Account extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Account);
M app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx => app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx +2 -1
@@ 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);
M app/javascript/flavours/glitch/components/column_header.jsx => app/javascript/flavours/glitch/components/column_header.jsx +2 -1
@@ 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 = {
@@ 218,3 217,5 @@ class ColumnHeader extends React.PureComponent {
}
}
+
+export default injectIntl(ColumnHeader);
M app/javascript/flavours/glitch/components/dismissable_banner.jsx => app/javascript/flavours/glitch/components/dismissable_banner.jsx +2 -1
@@ 8,7 8,6 @@ const messages = defineMessages({
dismiss: { id: 'dismissable_banner.dismiss', defaultMessage: 'Dismiss' },
});
-export default @injectIntl
class DismissableBanner extends React.PureComponent {
static propTypes = {
@@ 49,3 48,5 @@ class DismissableBanner extends React.PureComponent {
}
}
+
+export default injectIntl(DismissableBanner);
M app/javascript/flavours/glitch/components/domain.jsx => app/javascript/flavours/glitch/components/domain.jsx +2 -1
@@ 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);
M app/javascript/flavours/glitch/components/edited_timestamp/index.jsx => app/javascript/flavours/glitch/components/edited_timestamp/index.jsx +2 -2
@@ 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));
M app/javascript/flavours/glitch/components/inline_account.jsx => app/javascript/flavours/glitch/components/inline_account.jsx +2 -1
@@ 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);
M app/javascript/flavours/glitch/components/load_gap.jsx => app/javascript/flavours/glitch/components/load_gap.jsx +2 -1
@@ 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);
M app/javascript/flavours/glitch/components/media_gallery.jsx => app/javascript/flavours/glitch/components/media_gallery.jsx +2 -1
@@ 244,7 244,6 @@ class Item extends React.PureComponent {
}
-export default @injectIntl
class MediaGallery extends React.PureComponent {
static propTypes = {
@@ 406,3 405,5 @@ class MediaGallery extends React.PureComponent {
}
}
+
+export default injectIntl(MediaGallery);
M app/javascript/flavours/glitch/components/navigation_portal.jsx => app/javascript/flavours/glitch/components/navigation_portal.jsx +2 -1
@@ 15,7 15,6 @@ const DefaultNavigation = () => (
</>
);
-export default @withRouter
class NavigationPortal extends React.PureComponent {
render () {
@@ 33,3 32,5 @@ class NavigationPortal extends React.PureComponent {
}
}
+
+export default withRouter(NavigationPortal);
M app/javascript/flavours/glitch/components/notification_purge_buttons.jsx => app/javascript/flavours/glitch/components/notification_purge_buttons.jsx +2 -1
@@ 19,7 19,6 @@ const messages = defineMessages({
btnApply : { id: 'notification_purge.btn_apply', defaultMessage: 'Clear\nselected' },
});
-export default @injectIntl
class NotificationPurgeButtons extends ImmutablePureComponent {
static propTypes = {
@@ 57,3 56,5 @@ class NotificationPurgeButtons extends ImmutablePureComponent {
}
}
+
+export default injectIntl(NotificationPurgeButtons);
M app/javascript/flavours/glitch/components/picture_in_picture_placeholder.jsx => app/javascript/flavours/glitch/components/picture_in_picture_placeholder.jsx +2 -1
@@ 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);
M app/javascript/flavours/glitch/components/poll.jsx => app/javascript/flavours/glitch/components/poll.jsx +2 -1
@@ 31,7 31,6 @@ const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
return obj;
}, {});
-export default @injectIntl
class Poll extends ImmutablePureComponent {
static contextTypes = {
@@ 234,3 233,5 @@ class Poll extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Poll);
M app/javascript/flavours/glitch/components/relative_timestamp.jsx => app/javascript/flavours/glitch/components/relative_timestamp.jsx +2 -1
@@ 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);
M app/javascript/flavours/glitch/components/scrollable_list.jsx => app/javascript/flavours/glitch/components/scrollable_list.jsx +2 -1
@@ 20,7 20,6 @@ const mapStateToProps = (state, { scrollKey }) => {
};
};
-export default @connect(mapStateToProps, null, null, { forwardRef: true })
class ScrollableList extends PureComponent {
static contextTypes = {
@@ 352,3 351,5 @@ class ScrollableList extends PureComponent {
}
}
+
+export default connect(mapStateToProps, null, null, { forwardRef: true })(ScrollableList);
M app/javascript/flavours/glitch/components/server_banner.jsx => app/javascript/flavours/glitch/components/server_banner.jsx +2 -2
@@ 18,8 18,6 @@ const mapStateToProps = state => ({
server: state.getIn(['server', 'server']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class ServerBanner extends React.PureComponent {
static propTypes = {
@@ 91,3 89,5 @@ class ServerBanner extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(ServerBanner));
M app/javascript/flavours/glitch/components/status.jsx => app/javascript/flavours/glitch/components/status.jsx +2 -1
@@ 56,7 56,6 @@ export const defaultMediaVisibility = (status, settings) => {
return (displayMedia !== 'hide_all' && !status.get('sensitive') || displayMedia === 'show_all');
};
-export default @injectIntl
class Status extends ImmutablePureComponent {
static contextTypes = {
@@ 830,3 829,5 @@ class Status extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Status);
M app/javascript/flavours/glitch/components/status_action_bar.jsx => app/javascript/flavours/glitch/components/status_action_bar.jsx +2 -1
@@ 46,7 46,6 @@ const messages = defineMessages({
openOriginalPage: { id: 'account.open_original_page', defaultMessage: 'Open original page' },
});
-export default @injectIntl
class StatusActionBar extends ImmutablePureComponent {
static contextTypes = {
@@ 339,3 338,5 @@ class StatusActionBar extends ImmutablePureComponent {
}
}
+
+export default injectIntl(StatusActionBar);
M app/javascript/flavours/glitch/components/status_content.jsx => app/javascript/flavours/glitch/components/status_content.jsx +2 -2
@@ 104,8 104,6 @@ const mapStateToProps = state => ({
languages: state.getIn(['server', 'translationLanguages', 'items']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class StatusContent extends React.PureComponent {
static contextTypes = {
@@ 468,3 466,5 @@ class StatusContent extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(StatusContent));
M app/javascript/flavours/glitch/components/status_icons.jsx => app/javascript/flavours/glitch/components/status_icons.jsx +2 -1
@@ 40,7 40,6 @@ LanguageIcon.propTypes = {
language: PropTypes.string.isRequired,
};
-export default @injectIntl
class StatusIcons extends React.PureComponent {
static propTypes = {
@@ 143,3 142,5 @@ class StatusIcons extends React.PureComponent {
}
}
+
+export default injectIntl(StatusIcons);
M app/javascript/flavours/glitch/components/status_visibility_icon.jsx => app/javascript/flavours/glitch/components/status_visibility_icon.jsx +2 -1
@@ 12,7 12,6 @@ const messages = defineMessages({
direct: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
});
-export default @injectIntl
class VisibilityIcon extends ImmutablePureComponent {
static propTypes = {
@@ 49,3 48,5 @@ class VisibilityIcon extends ImmutablePureComponent {
}
}
+
+export default injectIntl(VisibilityIcon);
M app/javascript/flavours/glitch/features/about/index.jsx => app/javascript/flavours/glitch/features/about/index.jsx +2 -2
@@ 80,8 80,6 @@ class Section extends React.PureComponent {
}
-export default @connect(mapStateToProps)
-@injectIntl
class About extends React.PureComponent {
static propTypes = {
@@ 218,3 216,5 @@ class About extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(About));
M app/javascript/flavours/glitch/features/account/components/account_note.jsx => app/javascript/flavours/glitch/features/account/components/account_note.jsx +2 -1
@@ 10,7 10,6 @@ const messages = defineMessages({
placeholder: { id: 'account_note.glitch_placeholder', defaultMessage: 'No comment provided' },
});
-export default @injectIntl
class Header extends ImmutablePureComponent {
static propTypes = {
@@ 102,3 101,5 @@ class Header extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Header);
M app/javascript/flavours/glitch/features/account/components/action_bar.jsx => app/javascript/flavours/glitch/features/account/components/action_bar.jsx +2 -1
@@ 8,7 8,6 @@ import { me, isStaff } from 'flavours/glitch/initial_state';
import { profileLink, accountAdminLink } from 'flavours/glitch/utils/backend_links';
import Icon from 'flavours/glitch/components/icon';
-export default @injectIntl
class ActionBar extends React.PureComponent {
static propTypes = {
@@ 83,3 82,5 @@ class ActionBar extends React.PureComponent {
}
}
+
+export default injectIntl(ActionBar);
M app/javascript/flavours/glitch/features/account/components/featured_tags.jsx => app/javascript/flavours/glitch/features/account/components/featured_tags.jsx +2 -1
@@ 10,7 10,6 @@ const messages = defineMessages({
empty: { id: 'account.featured_tags.last_status_never', defaultMessage: 'No posts' },
});
-export default @injectIntl
class FeaturedTags extends ImmutablePureComponent {
static contextTypes = {
@@ 51,3 50,5 @@ class FeaturedTags extends ImmutablePureComponent {
}
}
+
+export default injectIntl(FeaturedTags);
M => +2 -1
@@ 76,7 76,6 @@ const dateFormatOptions = {
minute: '2-digit',
};
export default @injectIntl
class Header extends ImmutablePureComponent {
static contextTypes = {
@@ 403,3 402,5 @@ class Header extends ImmutablePureComponent {
}
}
export default injectIntl(Header);
M app/javascript/flavours/glitch/features/account/components/profile_column_header.jsx => app/javascript/flavours/glitch/features/account/components/profile_column_header.jsx +2 -1
@@ 7,7 7,6 @@ const messages = defineMessages({
profile: { id: 'column_header.profile', defaultMessage: 'Profile' },
});
-export default @injectIntl
class ProfileColumnHeader extends React.PureComponent {
static propTypes = {
@@ 31,3 30,5 @@ class ProfileColumnHeader extends React.PureComponent {
}
}
+
+export default injectIntl(ProfileColumnHeader);
M app/javascript/flavours/glitch/features/account/navigation.jsx => app/javascript/flavours/glitch/features/account/navigation.jsx +2 -1
@@ 19,7 19,6 @@ const mapStateToProps = (state, { match: { params: { acct } } }) => {
};
};
-export default @connect(mapStateToProps)
class AccountNavigation extends React.PureComponent {
static propTypes = {
@@ 50,3 49,5 @@ class AccountNavigation extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(AccountNavigation);
M app/javascript/flavours/glitch/features/account_gallery/index.jsx => app/javascript/flavours/glitch/features/account_gallery/index.jsx +2 -1
@@ 58,7 58,6 @@ class LoadMoreMedia extends ImmutablePureComponent {
}
-export default @connect(mapStateToProps)
class AccountGallery extends ImmutablePureComponent {
static propTypes = {
@@ 223,3 222,5 @@ class AccountGallery extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(AccountGallery);
M app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.jsx => app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.jsx +2 -1
@@ 14,7 14,6 @@ const mapDispatchToProps = (dispatch, { accountId }) => ({
});
-export default @connect(() => {}, mapDispatchToProps)
class LimitedAccountHint extends React.PureComponent {
static propTypes = {
@@ 34,3 33,5 @@ class LimitedAccountHint extends React.PureComponent {
}
}
+
+export default connect(() => {}, mapDispatchToProps)(LimitedAccountHint);
M app/javascript/flavours/glitch/features/account_timeline/index.jsx => app/javascript/flavours/glitch/features/account_timeline/index.jsx +2 -1
@@ 62,7 62,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired,
};
-export default @connect(mapStateToProps)
class AccountTimeline extends ImmutablePureComponent {
static propTypes = {
@@ 207,3 206,5 @@ class AccountTimeline extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(AccountTimeline);
M app/javascript/flavours/glitch/features/audio/index.jsx => app/javascript/flavours/glitch/features/audio/index.jsx +2 -1
@@ 22,7 22,6 @@ const messages = defineMessages({
const TICK_SIZE = 10;
const PADDING = 180;
-export default @injectIntl
class Audio extends React.PureComponent {
static propTypes = {
@@ 575,3 574,5 @@ class Audio extends React.PureComponent {
}
}
+
+export default injectIntl(Audio);
M app/javascript/flavours/glitch/features/blocks/index.jsx => app/javascript/flavours/glitch/features/blocks/index.jsx +2 -2
@@ 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));
M app/javascript/flavours/glitch/features/bookmarked_statuses/index.jsx => app/javascript/flavours/glitch/features/bookmarked_statuses/index.jsx +2 -2
@@ 22,8 22,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'bookmarks', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Bookmarks extends ImmutablePureComponent {
static propTypes = {
@@ 106,3 104,5 @@ class Bookmarks extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Bookmarks));
M app/javascript/flavours/glitch/features/closed_registrations_modal/index.jsx => app/javascript/flavours/glitch/features/closed_registrations_modal/index.jsx +2 -1
@@ 9,7 9,6 @@ const mapStateToProps = state => ({
message: state.getIn(['server', 'server', 'registrations', 'message']),
});
-export default @connect(mapStateToProps)
class ClosedRegistrationsModal extends ImmutablePureComponent {
componentDidMount () {
@@ 73,3 72,5 @@ class ClosedRegistrationsModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(ClosedRegistrationsModal);
M app/javascript/flavours/glitch/features/community_timeline/components/column_settings.jsx => app/javascript/flavours/glitch/features/community_timeline/components/column_settings.jsx +2 -1
@@ 10,7 10,6 @@ const messages = defineMessages({
settings: { id: 'home.settings', defaultMessage: 'Column settings' },
});
-export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
@@ 39,3 38,5 @@ class ColumnSettings extends React.PureComponent {
}
}
+
+export default injectIntl(ColumnSettings);
M => +2 -2
@@ 32,8 32,6 @@ const mapStateToProps = (state, { columnId }) => {
};
};
export default @connect(mapStateToProps)
@injectIntl
class CommunityTimeline extends React.PureComponent {
static defaultProps = {
@@ 162,3 160,5 @@ class CommunityTimeline extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(CommunityTimeline));
M app/javascript/flavours/glitch/features/compose/components/action_bar.jsx => app/javascript/flavours/glitch/features/compose/components/action_bar.jsx +2 -1
@@ 21,7 21,6 @@ const messages = defineMessages({
bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
});
-export default @injectIntl
class ActionBar extends React.PureComponent {
static propTypes = {
@@ 66,3 65,5 @@ class ActionBar extends React.PureComponent {
}
}
+
+export default injectIntl(ActionBar);
M app/javascript/flavours/glitch/features/compose/components/compose_form.jsx => app/javascript/flavours/glitch/features/compose/components/compose_form.jsx +2 -1
@@ 32,7 32,6 @@ const messages = defineMessages({
spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
});
-export default @injectIntl
class ComposeForm extends ImmutablePureComponent {
static contextTypes = {
@@ 389,3 388,5 @@ class ComposeForm extends ImmutablePureComponent {
}
}
+
+export default injectIntl(ComposeForm);
M app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx => app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx +5 -3
@@ 145,8 145,7 @@ class ModifierPicker extends React.PureComponent {
}
-@injectIntl
-class EmojiPickerMenu extends React.PureComponent {
+class EmojiPickerMenuImpl extends React.PureComponent {
static propTypes = {
custom_emojis: ImmutablePropTypes.list,
@@ 307,7 306,8 @@ class EmojiPickerMenu extends React.PureComponent {
}
-export default @injectIntl
+const EmojiPickerMenu = injectIntl(EmojiPickerMenuImpl);
+
class EmojiPickerDropdown extends React.PureComponent {
static propTypes = {
@@ 411,3 411,5 @@ class EmojiPickerDropdown extends React.PureComponent {
}
}
+
+export default injectIntl(EmojiPickerDropdown);
M => +2 -1
@@ 45,7 45,6 @@ const messages = defineMessages({
},
});
export default @injectIntl
class Header extends ImmutablePureComponent {
static propTypes = {
@@ 134,3 133,5 @@ class Header extends ImmutablePureComponent {
}
}
export default injectIntl(Header);
M app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx => app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx +2 -1
@@ 237,7 237,6 @@ class LanguageDropdownMenu extends React.PureComponent {
}
-export default @injectIntl
class LanguageDropdown extends React.PureComponent {
static propTypes = {
@@ 325,3 324,5 @@ class LanguageDropdown extends React.PureComponent {
}
}
+
+export default injectIntl(LanguageDropdown);
M app/javascript/flavours/glitch/features/compose/components/options.jsx => app/javascript/flavours/glitch/features/compose/components/options.jsx +9 -3
@@ 83,8 83,11 @@ const messages = defineMessages({
},
});
-@connect((state, { name }) => ({ checked: state.getIn(['compose', 'advanced_options', name]) }))
-class ToggleOption extends ImmutablePureComponent {
+const mapStateToProps = (state, { name }) => ({
+ checked: state.getIn(['compose', 'advanced_options', name]),
+});
+
+class ToggleOptionImpl extends ImmutablePureComponent {
static propTypes = {
name: PropTypes.string.isRequired,
@@ 113,7 116,8 @@ class ToggleOption extends ImmutablePureComponent {
}
-export default @injectIntl
+const ToggleOption = connect(mapStateToProps)(ToggleOptionImpl);
+
class ComposerOptions extends ImmutablePureComponent {
static propTypes = {
@@ 315,3 319,5 @@ class ComposerOptions extends ImmutablePureComponent {
}
}
+
+export default injectIntl(ComposerOptions);
M app/javascript/flavours/glitch/features/compose/components/poll_form.jsx => app/javascript/flavours/glitch/features/compose/components/poll_form.jsx +5 -4
@@ 21,8 21,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,
@@ 92,8 91,8 @@ class Option extends React.PureComponent {
}
-export default
-@injectIntl
+const Option = injectIntl(OptionIntl);
+
class PollForm extends ImmutablePureComponent {
static propTypes = {
@@ 168,3 167,5 @@ class PollForm extends ImmutablePureComponent {
}
}
+
+export default injectIntl(PollForm);
M app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx => app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx +2 -1
@@ 16,7 16,6 @@ const messages = defineMessages({
change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
});
-export default @injectIntl
class PrivacyDropdown extends React.PureComponent {
static propTypes = {
@@ 86,3 85,5 @@ class PrivacyDropdown extends React.PureComponent {
}
}
+
+export default injectIntl(PrivacyDropdown);
M app/javascript/flavours/glitch/features/compose/components/publisher.jsx => app/javascript/flavours/glitch/features/compose/components/publisher.jsx +2 -1
@@ 26,7 26,6 @@ const messages = defineMessages({
saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
});
-export default @injectIntl
class Publisher extends ImmutablePureComponent {
static propTypes = {
@@ 97,3 96,5 @@ class Publisher extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Publisher);
M app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx => app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx +2 -1
@@ 19,7 19,6 @@ const messages = defineMessages({
});
-export default @injectIntl
class ReplyIndicator extends ImmutablePureComponent {
static propTypes = {
@@ 80,3 79,5 @@ class ReplyIndicator extends ImmutablePureComponent {
}
}
+
+export default injectIntl(ReplyIndicator);
M app/javascript/flavours/glitch/features/compose/components/search.jsx => app/javascript/flavours/glitch/features/compose/components/search.jsx +2 -1
@@ 45,7 45,6 @@ class SearchPopout extends React.PureComponent {
}
// The component.
-export default @injectIntl
class Search extends React.PureComponent {
static contextTypes = {
@@ 166,3 165,5 @@ class Search extends React.PureComponent {
}
}
+
+export default injectIntl(Search);
M app/javascript/flavours/glitch/features/compose/components/search_results.jsx => app/javascript/flavours/glitch/features/compose/components/search_results.jsx +2 -1
@@ 14,7 14,6 @@ const messages = defineMessages({
dismissSuggestion: { id: 'suggestions.dismiss', defaultMessage: 'Dismiss suggestion' },
});
-export default @injectIntl
class SearchResults extends ImmutablePureComponent {
static propTypes = {
@@ 139,3 138,5 @@ class SearchResults extends ImmutablePureComponent {
}
}
+
+export default injectIntl(SearchResults);
M app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx => app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx +2 -1
@@ 27,7 27,6 @@ const iconMap = [
['threaded_mode', 'comments', messages.threadedMode],
];
-export default @injectIntl
class TextareaIcons extends ImmutablePureComponent {
static propTypes = {
@@ 58,3 57,5 @@ class TextareaIcons extends ImmutablePureComponent {
}
}
+
+export default injectIntl(TextareaIcons);
M app/javascript/flavours/glitch/features/compose/index.jsx => app/javascript/flavours/glitch/features/compose/index.jsx +2 -2
@@ 39,8 39,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class Compose extends React.PureComponent {
static propTypes = {
@@ 114,3 112,5 @@ class Compose extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Compose));
M app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx => app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx +2 -1
@@ 10,7 10,6 @@ const messages = defineMessages({
settings: { id: 'home.settings', defaultMessage: 'Column settings' },
});
-export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
@@ 40,3 39,5 @@ class ColumnSettings extends React.PureComponent {
}
}
+
+export default injectIntl(ColumnSettings);
M app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx => app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx +2 -1
@@ 24,7 24,6 @@ const messages = defineMessages({
unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
});
-export default @injectIntl
class Conversation extends ImmutablePureComponent {
static contextTypes = {
@@ 230,3 229,5 @@ class Conversation extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Conversation);
M app/javascript/flavours/glitch/features/direct_timeline/index.jsx => app/javascript/flavours/glitch/features/direct_timeline/index.jsx +2 -2
@@ 22,8 22,6 @@ const mapStateToProps = state => ({
conversationsMode: state.getIn(['settings', 'direct', 'conversations']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class DirectTimeline extends React.PureComponent {
static propTypes = {
@@ 154,3 152,5 @@ class DirectTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(DirectTimeline));
M app/javascript/flavours/glitch/features/directory/components/account_card.jsx => app/javascript/flavours/glitch/features/directory/components/account_card.jsx +2 -3
@@ 93,9 93,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
});
-export default
-@injectIntl
-@connect(makeMapStateToProps, mapDispatchToProps)
class AccountCard extends ImmutablePureComponent {
static propTypes = {
@@ 246,3 243,5 @@ class AccountCard extends ImmutablePureComponent {
}
}
+
+export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(AccountCard));
M app/javascript/flavours/glitch/features/directory/index.jsx => app/javascript/flavours/glitch/features/directory/index.jsx +2 -2
@@ 29,8 29,6 @@ const mapStateToProps = state => ({
domain: state.getIn(['meta', 'domain']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Directory extends React.PureComponent {
static contextTypes = {
@@ 176,3 174,5 @@ class Directory extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Directory));
M app/javascript/flavours/glitch/features/domain_blocks/index.jsx => app/javascript/flavours/glitch/features/domain_blocks/index.jsx +2 -2
@@ 23,8 23,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['domain_lists', 'blocks', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Blocks extends ImmutablePureComponent {
static propTypes = {
@@ 81,3 79,5 @@ class Blocks extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Blocks));
M app/javascript/flavours/glitch/features/explore/index.jsx => app/javascript/flavours/glitch/features/explore/index.jsx +2 -2
@@ 24,8 24,6 @@ const mapStateToProps = state => ({
isSearching: state.getIn(['search', 'submitted']) || !showTrends,
});
-export default @connect(mapStateToProps)
-@injectIntl
class Explore extends React.PureComponent {
static contextTypes = {
@@ 105,3 103,5 @@ class Explore extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Explore));
M app/javascript/flavours/glitch/features/explore/links.jsx => app/javascript/flavours/glitch/features/explore/links.jsx +2 -1
@@ 13,7 13,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['trends', 'links', 'isLoading']),
});
-export default @connect(mapStateToProps)
class Links extends React.PureComponent {
static propTypes = {
@@ 68,3 67,5 @@ class Links extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Links);
M app/javascript/flavours/glitch/features/explore/results.jsx => app/javascript/flavours/glitch/features/explore/results.jsx +2 -2
@@ 42,8 42,6 @@ const renderStatuses = (results, onLoadMore) => appendLoadMore('statuses', resul
<Status key={`status-${item}`} id={item} />
)), onLoadMore);
-export default @connect(mapStateToProps)
-@injectIntl
class Results extends React.PureComponent {
static propTypes = {
@@ 124,3 122,5 @@ class Results extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Results));
M app/javascript/flavours/glitch/features/explore/statuses.jsx => app/javascript/flavours/glitch/features/explore/statuses.jsx +2 -1
@@ 14,7 14,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'trending', 'next']),
});
-export default @connect(mapStateToProps)
class Statuses extends React.PureComponent {
static propTypes = {
@@ 62,3 61,5 @@ class Statuses extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Statuses);
M app/javascript/flavours/glitch/features/explore/suggestions.jsx => app/javascript/flavours/glitch/features/explore/suggestions.jsx +2 -1
@@ 12,7 12,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['suggestions', 'isLoading']),
});
-export default @connect(mapStateToProps)
class Suggestions extends React.PureComponent {
static propTypes = {
@@ 54,3 53,5 @@ class Suggestions extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Suggestions);
M app/javascript/flavours/glitch/features/explore/tags.jsx => app/javascript/flavours/glitch/features/explore/tags.jsx +2 -1
@@ 13,7 13,6 @@ const mapStateToProps = state => ({
isLoadingHashtags: state.getIn(['trends', 'tags', 'isLoading']),
});
-export default @connect(mapStateToProps)
class Tags extends React.PureComponent {
static propTypes = {
@@ 60,3 59,5 @@ class Tags extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Tags);
M app/javascript/flavours/glitch/features/favourited_statuses/index.jsx => app/javascript/flavours/glitch/features/favourited_statuses/index.jsx +2 -2
@@ 22,8 22,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'favourites', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Favourites extends ImmutablePureComponent {
static propTypes = {
@@ 106,3 104,5 @@ class Favourites extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Favourites));
M app/javascript/flavours/glitch/features/favourites/index.jsx => app/javascript/flavours/glitch/features/favourites/index.jsx +2 -2
@@ 22,8 22,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 = {
@@ 101,3 99,5 @@ class Favourites extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Favourites));
M app/javascript/flavours/glitch/features/filters/added_to_filter.jsx => app/javascript/flavours/glitch/features/filters/added_to_filter.jsx +2 -1
@@ 10,7 10,6 @@ const mapStateToProps = (state, { filterId }) => ({
filter: state.getIn(['filters', filterId]),
});
-export default @connect(mapStateToProps)
class AddedToFilter extends React.PureComponent {
static propTypes = {
@@ 100,3 99,5 @@ class AddedToFilter extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(AddedToFilter);
M app/javascript/flavours/glitch/features/filters/select_filter.jsx => app/javascript/flavours/glitch/features/filters/select_filter.jsx +2 -2
@@ 22,8 22,6 @@ const mapStateToProps = (state, { contextType }) => ({
]),
});
-export default @connect(mapStateToProps)
-@injectIntl
class SelectFilter extends React.PureComponent {
static propTypes = {
@@ 190,3 188,5 @@ class SelectFilter extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(SelectFilter));
M app/javascript/flavours/glitch/features/follow_recommendations/components/account.jsx => app/javascript/flavours/glitch/features/follow_recommendations/components/account.jsx +2 -2
@@ 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));
M app/javascript/flavours/glitch/features/follow_recommendations/index.jsx => app/javascript/flavours/glitch/features/follow_recommendations/index.jsx +2 -1
@@ 19,7 19,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['suggestions', 'isLoading']),
});
-export default @connect(mapStateToProps)
class FollowRecommendations extends ImmutablePureComponent {
static contextTypes = {
@@ 114,3 113,5 @@ class FollowRecommendations extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(FollowRecommendations);
M app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx => app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx +2 -1
@@ 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);
M app/javascript/flavours/glitch/features/follow_requests/index.jsx => app/javascript/flavours/glitch/features/follow_requests/index.jsx +2 -2
@@ 25,8 25,6 @@ const mapStateToProps = state => ({
domain: state.getIn(['meta', 'domain']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class FollowRequests extends ImmutablePureComponent {
static propTypes = {
@@ 90,3 88,5 @@ class FollowRequests extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(FollowRequests));
M app/javascript/flavours/glitch/features/followed_tags/index.jsx => app/javascript/flavours/glitch/features/followed_tags/index.jsx +2 -2
@@ 22,8 22,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['followed_tags', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class FollowedTags extends ImmutablePureComponent {
static propTypes = {
@@ 87,3 85,5 @@ class FollowedTags extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(FollowedTags));
M app/javascript/flavours/glitch/features/followers/index.jsx => app/javascript/flavours/glitch/features/followers/index.jsx +2 -1
@@ 53,7 53,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired,
};
-export default @connect(mapStateToProps)
class Followers extends ImmutablePureComponent {
static propTypes = {
@@ 172,3 171,5 @@ class Followers extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(Followers);
M app/javascript/flavours/glitch/features/following/index.jsx => app/javascript/flavours/glitch/features/following/index.jsx +2 -1
@@ 53,7 53,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired,
};
-export default @connect(mapStateToProps)
class Following extends ImmutablePureComponent {
static propTypes = {
@@ 172,3 171,5 @@ class Following extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(Following);
M app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx => app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx +2 -1
@@ 355,7 355,6 @@ class Announcement extends ImmutablePureComponent {
}
-export default @injectIntl
class Announcements extends ImmutablePureComponent {
static propTypes = {
@@ 447,3 446,5 @@ class Announcements extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Announcements);
M app/javascript/flavours/glitch/features/getting_started/index.jsx => app/javascript/flavours/glitch/features/getting_started/index.jsx +2 -2
@@ 79,8 79,6 @@ const badgeDisplay = (number, limit) => {
const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2);
-export default @connect(makeMapStateToProps, mapDispatchToProps)
- @injectIntl
class GettingStarted extends ImmutablePureComponent {
static contextTypes = {
@@ 202,3 200,5 @@ class GettingStarted extends ImmutablePureComponent {
}
}
+
+export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(GettingStarted));
M app/javascript/flavours/glitch/features/getting_started_misc/index.jsx => app/javascript/flavours/glitch/features/getting_started_misc/index.jsx +3 -3
@@ 22,9 22,7 @@ const messages = defineMessages({
featured_users: { id: 'navigation_bar.featured_users', defaultMessage: 'Featured users' },
});
-export default @connect()
-@injectIntl
-class gettingStartedMisc extends ImmutablePureComponent {
+class GettingStartedMisc extends ImmutablePureComponent {
static contextTypes = {
router: PropTypes.object.isRequired,
@@ 68,3 66,5 @@ class gettingStartedMisc extends ImmutablePureComponent {
}
}
+
+export default connect()(injectIntl(GettingStartedMisc));
M app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx => app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx +2 -1
@@ 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);
M app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx => app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx +2 -2
@@ 26,8 26,6 @@ const mapStateToProps = (state, props) => ({
tag: state.getIn(['tags', props.params.id]),
});
-export default @connect(mapStateToProps)
-@injectIntl
class HashtagTimeline extends React.PureComponent {
disconnects = [];
@@ 235,3 233,5 @@ class HashtagTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(HashtagTimeline));
M app/javascript/flavours/glitch/features/home_timeline/components/column_settings.jsx => app/javascript/flavours/glitch/features/home_timeline/components/column_settings.jsx +2 -1
@@ 10,7 10,6 @@ const messages = defineMessages({
settings: { id: 'home.settings', defaultMessage: 'Column settings' },
});
-export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
@@ 48,3 47,5 @@ class ColumnSettings extends React.PureComponent {
}
}
+
+export default injectIntl(ColumnSettings);
M app/javascript/flavours/glitch/features/home_timeline/index.jsx => app/javascript/flavours/glitch/features/home_timeline/index.jsx +2 -2
@@ 31,8 31,6 @@ const mapStateToProps = state => ({
regex: state.getIn(['settings', 'home', 'regex', 'body']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class HomeTimeline extends React.PureComponent {
static contextTypes = {
@@ 176,3 174,5 @@ class HomeTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(HomeTimeline));
M app/javascript/flavours/glitch/features/interaction_modal/index.jsx => app/javascript/flavours/glitch/features/interaction_modal/index.jsx +2 -1
@@ 74,7 74,6 @@ class Copypaste extends React.PureComponent {
}
-export default @connect(mapStateToProps, mapDispatchToProps)
class InteractionModal extends React.PureComponent {
static propTypes = {
@@ 159,3 158,5 @@ class InteractionModal extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(InteractionModal);
M app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx => app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx +2 -2
@@ 15,8 15,6 @@ const mapStateToProps = state => ({
collapseEnabled: state.getIn(['local_settings', 'collapsed', 'enabled']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class KeyboardShortcuts extends ImmutablePureComponent {
static propTypes = {
@@ 147,3 145,5 @@ class KeyboardShortcuts extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(KeyboardShortcuts));
M app/javascript/flavours/glitch/features/list_adder/components/account.jsx => app/javascript/flavours/glitch/features/list_adder/components/account.jsx +2 -2
@@ 18,8 18,6 @@ const makeMapStateToProps = () => {
};
-export default @connect(makeMapStateToProps)
-@injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
@@ 41,3 39,5 @@ class Account extends ImmutablePureComponent {
}
}
+
+export default connect(makeMapStateToProps)(injectIntl(Account));
M app/javascript/flavours/glitch/features/list_adder/components/list.jsx => app/javascript/flavours/glitch/features/list_adder/components/list.jsx +3 -3
@@ 13,7 13,7 @@ const messages = defineMessages({
add: { id: 'lists.account.add', defaultMessage: 'Add to list' },
});
-const MapStateToProps = (state, { listId, added }) => ({
+const mapStateToProps = (state, { listId, added }) => ({
list: state.get('lists').get(listId),
added: typeof added === 'undefined' ? state.getIn(['listAdder', 'lists', 'items']).includes(listId) : added,
});
@@ 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));
M app/javascript/flavours/glitch/features/list_adder/index.jsx => app/javascript/flavours/glitch/features/list_adder/index.jsx +2 -2
@@ 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));
M app/javascript/flavours/glitch/features/list_editor/components/edit_list_form.jsx => app/javascript/flavours/glitch/features/list_editor/components/edit_list_form.jsx +2 -2
@@ 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));
M app/javascript/flavours/glitch/features/list_editor/index.jsx => app/javascript/flavours/glitch/features/list_editor/index.jsx +2 -2
@@ 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));
M app/javascript/flavours/glitch/features/list_timeline/index.jsx => app/javascript/flavours/glitch/features/list_timeline/index.jsx +2 -2
@@ 31,8 31,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 = {
@@ 222,3 220,5 @@ class ListTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(ListTimeline));
M app/javascript/flavours/glitch/features/lists/components/new_list_form.jsx => app/javascript/flavours/glitch/features/lists/components/new_list_form.jsx +2 -2
@@ 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));
M app/javascript/flavours/glitch/features/lists/index.jsx => app/javascript/flavours/glitch/features/lists/index.jsx +2 -2
@@ 32,8 32,6 @@ const mapStateToProps = state => ({
lists: getOrderedLists(state),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Lists extends ImmutablePureComponent {
static propTypes = {
@@ 87,3 85,5 @@ class Lists extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Lists));
M app/javascript/flavours/glitch/features/local_settings/navigation/index.jsx => app/javascript/flavours/glitch/features/local_settings/navigation/index.jsx +2 -1
@@ 19,7 19,6 @@ const messages = defineMessages({
close: { id: 'settings.close', defaultMessage: 'Close' },
});
-export default @injectIntl
class LocalSettingsNavigation extends React.PureComponent {
static propTypes = {
@@ 90,3 89,5 @@ class LocalSettingsNavigation extends React.PureComponent {
}
}
+
+export default injectIntl(LocalSettingsNavigation);
M app/javascript/flavours/glitch/features/local_settings/page/index.jsx => app/javascript/flavours/glitch/features/local_settings/page/index.jsx +2 -1
@@ 31,7 31,6 @@ const messages = defineMessages({
pop_in_right: { id: 'settings.pop_in_right', defaultMessage: 'Right' },
});
-export default @injectIntl
class LocalSettingsPage extends React.PureComponent {
static propTypes = {
@@ 513,3 512,5 @@ class LocalSettingsPage extends React.PureComponent {
}
}
+
+export default injectIntl(LocalSettingsPage);
M app/javascript/flavours/glitch/features/mutes/index.jsx => app/javascript/flavours/glitch/features/mutes/index.jsx +2 -2
@@ 23,8 23,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['user_lists', 'mutes', 'isLoading'], true),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Mutes extends ImmutablePureComponent {
static propTypes = {
@@ 82,3 80,5 @@ class Mutes extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Mutes));
M app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx => app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx +2 -1
@@ 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);
M app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx => app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx +2 -1
@@ 17,7 17,6 @@ const messages = defineMessages({
reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
});
-export default @injectIntl
class FollowRequest extends ImmutablePureComponent {
static propTypes = {
@@ 130,3 129,5 @@ class FollowRequest extends ImmutablePureComponent {
}
}
+
+export default injectIntl(FollowRequest);
M app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx => app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx +2 -2
@@ 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));
M app/javascript/flavours/glitch/features/notifications/components/overlay.jsx => app/javascript/flavours/glitch/features/notifications/components/overlay.jsx +2 -1
@@ 15,7 15,6 @@ const messages = defineMessages({
markForDeletion: { id: 'notification.markForDeletion', defaultMessage: 'Mark for deletion' },
});
-export default @injectIntl
class NotificationOverlay extends ImmutablePureComponent {
static propTypes = {
@@ 56,3 55,5 @@ class NotificationOverlay extends ImmutablePureComponent {
}
}
+
+export default injectIntl(NotificationOverlay);
M app/javascript/flavours/glitch/features/notifications/components/report.jsx => app/javascript/flavours/glitch/features/notifications/components/report.jsx +2 -1
@@ 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);
M app/javascript/flavours/glitch/features/notifications/index.jsx => app/javascript/flavours/glitch/features/notifications/index.jsx +2 -2
@@ 92,8 92,6 @@ const mapDispatchToProps = dispatch => ({
dispatch,
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class Notifications extends React.PureComponent {
static contextTypes = {
@@ 380,3 378,5 @@ class Notifications extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Notifications));
M => +2 -2
@@ 38,8 38,6 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
export default @connect(makeMapStateToProps)
@injectIntl
class Footer extends ImmutablePureComponent {
static contextTypes = {
@@ 215,3 213,5 @@ class Footer extends ImmutablePureComponent {
}
}
export default connect(makeMapStateToProps)(injectIntl(Footer));
M => +2 -2
@@ 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));
M app/javascript/flavours/glitch/features/picture_in_picture/index.jsx => app/javascript/flavours/glitch/features/picture_in_picture/index.jsx +2 -1
@@ 13,7 13,6 @@ const mapStateToProps = state => ({
left: state.getIn(['local_settings', 'media', 'pop_in_position']) === 'left',
});
-export default @connect(mapStateToProps)
class PictureInPicture extends React.Component {
static propTypes = {
@@ 86,3 85,5 @@ class PictureInPicture extends React.Component {
}
}
+
+export default connect(mapStateToProps)(PictureInPicture);
M app/javascript/flavours/glitch/features/pinned_accounts_editor/index.jsx => app/javascript/flavours/glitch/features/pinned_accounts_editor/index.jsx +2 -2
@@ 21,8 21,6 @@ const mapDispatchToProps = dispatch => ({
onReset: () => dispatch(resetPinnedAccountsEditor()),
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class PinnedAccountsEditor extends ImmutablePureComponent {
static propTypes = {
@@ 76,3 74,5 @@ class PinnedAccountsEditor extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(PinnedAccountsEditor));
M app/javascript/flavours/glitch/features/pinned_statuses/index.jsx => app/javascript/flavours/glitch/features/pinned_statuses/index.jsx +2 -2
@@ 19,8 19,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'pins', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class PinnedStatuses extends ImmutablePureComponent {
static propTypes = {
@@ 63,3 61,5 @@ class PinnedStatuses extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(PinnedStatuses));
M app/javascript/flavours/glitch/features/privacy_policy/index.jsx => app/javascript/flavours/glitch/features/privacy_policy/index.jsx +2 -1
@@ 10,7 10,6 @@ const messages = defineMessages({
title: { id: 'privacy_policy.title', defaultMessage: 'Privacy Policy' },
});
-export default @injectIntl
class PrivacyPolicy extends React.PureComponent {
static propTypes = {
@@ 59,3 58,5 @@ class PrivacyPolicy extends React.PureComponent {
}
}
+
+export default injectIntl(PrivacyPolicy);
M app/javascript/flavours/glitch/features/public_timeline/components/column_settings.jsx => app/javascript/flavours/glitch/features/public_timeline/components/column_settings.jsx +2 -1
@@ 9,7 9,6 @@ const messages = defineMessages({
filter_regex: { id: 'home.column_settings.filter_regex', defaultMessage: 'Filter out by regular expressions' },
});
-export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
@@ 40,3 39,5 @@ class ColumnSettings extends React.PureComponent {
}
}
+
+export default injectIntl(ColumnSettings);
M app/javascript/flavours/glitch/features/public_timeline/index.jsx => app/javascript/flavours/glitch/features/public_timeline/index.jsx +2 -2
@@ 35,8 35,6 @@ const mapStateToProps = (state, { columnId }) => {
};
};
-export default @connect(mapStateToProps)
-@injectIntl
class PublicTimeline extends React.PureComponent {
static defaultProps = {
@@ 166,3 164,5 @@ class PublicTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(PublicTimeline));
M app/javascript/flavours/glitch/features/reblogs/index.jsx => app/javascript/flavours/glitch/features/reblogs/index.jsx +2 -2
@@ 22,8 22,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 = {
@@ 102,3 100,5 @@ class Reblogs extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Reblogs));
M app/javascript/flavours/glitch/features/report/category.jsx => app/javascript/flavours/glitch/features/report/category.jsx +2 -2
@@ 24,8 24,6 @@ const mapStateToProps = state => ({
rules: state.getIn(['server', 'server', 'rules'], ImmutableList()),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Category extends React.PureComponent {
static propTypes = {
@@ 102,3 100,5 @@ class Category extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Category));
M => +2 -1
@@ 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);
M app/javascript/flavours/glitch/features/report/rules.jsx => app/javascript/flavours/glitch/features/report/rules.jsx +2 -1
@@ 10,7 10,6 @@ const mapStateToProps = state => ({
rules: state.getIn(['server', 'server', '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);
M app/javascript/flavours/glitch/features/report/statuses.jsx => app/javascript/flavours/glitch/features/report/statuses.jsx +2 -1
@@ 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);
M app/javascript/flavours/glitch/features/report/thanks.jsx => app/javascript/flavours/glitch/features/report/thanks.jsx +2 -1
@@ 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);
M app/javascript/flavours/glitch/features/status/components/action_bar.jsx => app/javascript/flavours/glitch/features/status/components/action_bar.jsx +2 -1
@@ 39,7 39,6 @@ const messages = defineMessages({
openOriginalPage: { id: 'account.open_original_page', defaultMessage: 'Open original page' },
});
-export default @injectIntl
class ActionBar extends React.PureComponent {
static contextTypes = {
@@ 228,3 227,5 @@ class ActionBar extends React.PureComponent {
}
}
+
+export default injectIntl(ActionBar);
M app/javascript/flavours/glitch/features/status/components/detailed_status.jsx => app/javascript/flavours/glitch/features/status/components/detailed_status.jsx +2 -1
@@ 21,7 21,6 @@ import AnimatedNumber from 'flavours/glitch/components/animated_number';
import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_picture_placeholder';
import EditedTimestamp from 'flavours/glitch/components/edited_timestamp';
-export default @injectIntl
class DetailedStatus extends ImmutablePureComponent {
static contextTypes = {
@@ 336,3 335,5 @@ class DetailedStatus extends ImmutablePureComponent {
}
}
+
+export default injectIntl(DetailedStatus);
M app/javascript/flavours/glitch/features/status/index.jsx => app/javascript/flavours/glitch/features/status/index.jsx +2 -2
@@ 171,8 171,6 @@ const titleFromStatus = status => {
return `${prefix}: "${truncate(text, 30)}"`;
};
-export default @injectIntl
-@connect(makeMapStateToProps)
class Status extends ImmutablePureComponent {
static contextTypes = {
@@ 724,3 722,5 @@ class Status extends ImmutablePureComponent {
}
}
+
+export default injectIntl(connect(makeMapStateToProps)(Status));
M app/javascript/flavours/glitch/features/subscribed_languages_modal/index.jsx => app/javascript/flavours/glitch/features/subscribed_languages_modal/index.jsx +2 -2
@@ 36,8 36,6 @@ const mapDispatchToProps = (dispatch, { accountId }) => ({
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class SubscribedLanguagesModal extends ImmutablePureComponent {
static propTypes = {
@@ 123,3 121,5 @@ class SubscribedLanguagesModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(SubscribedLanguagesModal));
M app/javascript/flavours/glitch/features/ui/components/audio_modal.jsx => app/javascript/flavours/glitch/features/ui/components/audio_modal.jsx +2 -1
@@ 11,7 11,6 @@ const mapStateToProps = (state, { statusId }) => ({
accountStaticAvatar: state.getIn(['accounts', state.getIn(['statuses', statusId, 'account']), 'avatar_static']),
});
-export default @connect(mapStateToProps, null, null, { forwardRef: true })
class AudioModal extends ImmutablePureComponent {
static propTypes = {
@@ 59,3 58,5 @@ class AudioModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, null, null, { forwardRef: true })(AudioModal);
M app/javascript/flavours/glitch/features/ui/components/block_modal.jsx => app/javascript/flavours/glitch/features/ui/components/block_modal.jsx +2 -2
@@ 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));
M app/javascript/flavours/glitch/features/ui/components/boost_modal.jsx => app/javascript/flavours/glitch/features/ui/components/boost_modal.jsx +2 -2
@@ 35,8 35,6 @@ const mapDispatchToProps = dispatch => {
};
};
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class BoostModal extends ImmutablePureComponent {
static contextTypes = {
@@ 137,3 135,5 @@ class BoostModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(BoostModal));
M app/javascript/flavours/glitch/features/ui/components/bundle_column_error.jsx => app/javascript/flavours/glitch/features/ui/components/bundle_column_error.jsx +2 -1
@@ 92,7 92,6 @@ class CopyButton extends React.PureComponent {
}
-export default @injectIntl
class BundleColumnError extends React.PureComponent {
static propTypes = {
@@ 160,3 159,5 @@ class BundleColumnError extends React.PureComponent {
}
}
+
+export default injectIntl(BundleColumnError);
M app/javascript/flavours/glitch/features/ui/components/compare_history_modal.jsx => app/javascript/flavours/glitch/features/ui/components/compare_history_modal.jsx +2 -1
@@ 24,7 24,6 @@ const mapDispatchToProps = dispatch => ({
});
-export default @connect(mapStateToProps, mapDispatchToProps)
class CompareHistoryModal extends React.PureComponent {
static propTypes = {
@@ 100,3 99,5 @@ class CompareHistoryModal extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(CompareHistoryModal);
M app/javascript/flavours/glitch/features/ui/components/compose_panel.jsx => app/javascript/flavours/glitch/features/ui/components/compose_panel.jsx +2 -1
@@ 8,7 8,6 @@ import LinkFooter from './link_footer';
import ServerBanner from 'flavours/glitch/components/server_banner';
import { mountCompose, unmountCompose } from 'flavours/glitch/actions/compose';
-export default @connect()
class ComposePanel extends React.PureComponent {
static contextTypes = {
@@ 56,3 55,5 @@ class ComposePanel extends React.PureComponent {
}
}
+
+export default connect()(ComposePanel);
M app/javascript/flavours/glitch/features/ui/components/confirmation_modal.jsx => app/javascript/flavours/glitch/features/ui/components/confirmation_modal.jsx +2 -1
@@ 3,7 3,6 @@ import PropTypes from 'prop-types';
import { injectIntl, FormattedMessage } from 'react-intl';
import Button from 'flavours/glitch/components/button';
-export default @injectIntl
class ConfirmationModal extends React.PureComponent {
static propTypes = {
@@ 86,3 85,5 @@ class ConfirmationModal extends React.PureComponent {
}
}
+
+export default injectIntl(ConfirmationModal);
M app/javascript/flavours/glitch/features/ui/components/deprecated_settings_modal.jsx => app/javascript/flavours/glitch/features/ui/components/deprecated_settings_modal.jsx +2 -1
@@ 13,7 13,6 @@ const messages = defineMessages({
user_setting_disable_swiping: { id: 'settings.swipe_to_change_columns', defaultMessage: 'Allow swiping to change columns (Mobile only)' },
});
-export default @injectIntl
class DeprecatedSettingsModal extends React.PureComponent {
static propTypes = {
@@ 84,3 83,5 @@ class DeprecatedSettingsModal extends React.PureComponent {
}
}
+
+export default injectIntl(DeprecatedSettingsModal);
M app/javascript/flavours/glitch/features/ui/components/disabled_account_banner.jsx => app/javascript/flavours/glitch/features/ui/components/disabled_account_banner.jsx +2 -2
@@ 28,8 28,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
});
-export default @injectIntl
-@connect(mapStateToProps, mapDispatchToProps)
class DisabledAccountBanner extends React.PureComponent {
static propTypes = {
@@ 90,3 88,5 @@ class DisabledAccountBanner extends React.PureComponent {
}
}
+
+export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(DisabledAccountBanner));
M app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx => app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx +2 -1
@@ 145,7 145,6 @@ const mapDispatchToProps = dispatch => ({
* - Ctrl + left mouse button: pick background
* - Right mouse button: pick background
*/
-export default @connect(mapStateToProps, mapDispatchToProps)
class DoodleModal extends ImmutablePureComponent {
static propTypes = {
@@ 612,3 611,5 @@ class DoodleModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(DoodleModal);
M app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx => app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx +2 -1
@@ 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);
M app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx => app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx +2 -1
@@ 17,7 17,6 @@ const messages = defineMessages({
favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
});
-export default @injectIntl
class FavouriteModal extends ImmutablePureComponent {
static contextTypes = {
@@ 99,3 98,5 @@ class FavouriteModal extends ImmutablePureComponent {
}
}
+
+export default injectIntl(FavouriteModal);
M app/javascript/flavours/glitch/features/ui/components/filter_modal.jsx => app/javascript/flavours/glitch/features/ui/components/filter_modal.jsx +2 -2
@@ 13,8 13,6 @@ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
-export default @connect(undefined)
-@injectIntl
class FilterModal extends ImmutablePureComponent {
static propTypes = {
@@ 132,3 130,5 @@ class FilterModal extends ImmutablePureComponent {
}
}
+
+export default connect(injectIntl(FilterModal));
M app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx => app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx +4 -2
@@ 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 = {
@@ 416,3 414,7 @@ class FocalPointModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps, null, {
+ forwardRef: true,
+})(injectIntl(FocalPointModal, { withRef: true }));
M app/javascript/flavours/glitch/features/ui/components/follow_requests_column_link.jsx => app/javascript/flavours/glitch/features/ui/components/follow_requests_column_link.jsx +2 -2
@@ 15,8 15,6 @@ const mapStateToProps = state => ({
count: state.getIn(['user_lists', 'follow_requests', 'items'], ImmutableList()).size,
});
-export default @injectIntl
-@connect(mapStateToProps)
class FollowRequestsColumnLink extends React.Component {
static propTypes = {
@@ 49,3 47,5 @@ class FollowRequestsColumnLink extends React.Component {
}
}
+
+export default injectIntl(connect(mapStateToProps)(FollowRequestsColumnLink));
M => +2 -2
@@ 23,8 23,6 @@ const mapDispatchToProps = (dispatch) => ({
},
});
export default @withRouter
@connect(null, mapDispatchToProps)
class Header extends React.PureComponent {
static contextTypes = {
@@ 86,3 84,5 @@ class Header extends React.PureComponent {
}
}
export default withRouter(connect(null, mapDispatchToProps)(Header));
M app/javascript/flavours/glitch/features/ui/components/image_modal.jsx => app/javascript/flavours/glitch/features/ui/components/image_modal.jsx +2 -1
@@ 9,7 9,6 @@ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
-export default @injectIntl
class ImageModal extends React.PureComponent {
static propTypes = {
@@ 57,3 56,5 @@ class ImageModal extends React.PureComponent {
}
}
+
+export default injectIntl(ImageModal);
M => +2 -2
@@ 24,8 24,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
});
export default @injectIntl
@connect(null, mapDispatchToProps)
class LinkFooter extends React.PureComponent {
static contextTypes = {
@@ 100,3 98,5 @@ class LinkFooter extends React.PureComponent {
}
}
export default injectIntl(connect(null, mapDispatchToProps)(LinkFooter));
M app/javascript/flavours/glitch/features/ui/components/list_panel.jsx => app/javascript/flavours/glitch/features/ui/components/list_panel.jsx +2 -2
@@ 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));
M app/javascript/flavours/glitch/features/ui/components/media_modal.jsx => app/javascript/flavours/glitch/features/ui/components/media_modal.jsx +2 -2
@@ 25,8 25,6 @@ const mapStateToProps = (state, { statusId }) => ({
language: state.getIn(['statuses', statusId, 'language']),
});
-export default @connect(mapStateToProps, null, null, { forwardRef: true })
-@injectIntl
class MediaModal extends ImmutablePureComponent {
static contextTypes = {
@@ 259,3 257,5 @@ class MediaModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, null, null, { forwardRef: true })(injectIntl(MediaModal));
M app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx => app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx +2 -2
@@ 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));
M app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx => app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx +2 -1
@@ 29,7 29,6 @@ const messages = defineMessages({
app_settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' },
});
-export default @injectIntl
class NavigationPanel extends React.Component {
static contextTypes = {
@@ 102,3 101,5 @@ class NavigationPanel extends React.Component {
}
}
+
+export default injectIntl(NavigationPanel);
M app/javascript/flavours/glitch/features/ui/components/onboarding_modal.jsx => app/javascript/flavours/glitch/features/ui/components/onboarding_modal.jsx +2 -2
@@ 170,8 170,6 @@ const mapStateToProps = state => ({
domain: state.getIn(['meta', 'domain']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class OnboardingModal extends React.PureComponent {
static propTypes = {
@@ 319,3 317,5 @@ class OnboardingModal extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(OnboardingModal));
M app/javascript/flavours/glitch/features/ui/components/report_modal.jsx => app/javascript/flavours/glitch/features/ui/components/report_modal.jsx +2 -2
@@ 31,8 31,6 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
-export default @connect(makeMapStateToProps)
-@injectIntl
class ReportModal extends ImmutablePureComponent {
static propTypes = {
@@ 219,3 217,5 @@ class ReportModal extends ImmutablePureComponent {
}
}
+
+export default connect(makeMapStateToProps)(injectIntl(ReportModal));
M app/javascript/flavours/glitch/features/ui/components/video_modal.jsx => app/javascript/flavours/glitch/features/ui/components/video_modal.jsx +2 -1
@@ 11,7 11,6 @@ const mapStateToProps = (state, { statusId }) => ({
language: state.getIn(['statuses', statusId, 'language']),
});
-export default @connect(mapStateToProps, null, null, { forwardRef: true })
class VideoModal extends ImmutablePureComponent {
static contextTypes = {
@@ 72,3 71,5 @@ class VideoModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, null, null, { forwardRef: true })(VideoModal);
M app/javascript/flavours/glitch/features/ui/components/zoomable_image.jsx => app/javascript/flavours/glitch/features/ui/components/zoomable_image.jsx +2 -1
@@ 91,7 91,6 @@ const normalizeWheel = event => {
};
};
-export default @injectIntl
class ZoomableImage extends React.PureComponent {
static propTypes = {
@@ 451,3 450,5 @@ class ZoomableImage extends React.PureComponent {
}
}
+
+export default injectIntl(ZoomableImage);
M app/javascript/flavours/glitch/features/ui/index.jsx => app/javascript/flavours/glitch/features/ui/index.jsx +2 -3
@@ 244,9 244,6 @@ class SwitchingColumnsArea extends React.PureComponent {
}
-export default @connect(mapStateToProps)
-@injectIntl
-@withRouter
class UI extends React.Component {
static contextTypes = {
@@ 683,3 680,5 @@ class UI extends React.Component {
}
}
+
+export default connect(mapStateToProps)(injectIntl(withRouter(UI)));
M app/javascript/flavours/glitch/features/video/index.jsx => app/javascript/flavours/glitch/features/video/index.jsx +2 -1
@@ 93,7 93,6 @@ export const fileNameFromURL = str => {
return pathname.slice(index + 1);
};
-export default @injectIntl
class Video extends React.PureComponent {
static propTypes = {
@@ 673,3 672,5 @@ class Video extends React.PureComponent {
}
}
+
+export default injectIntl(Video);
M app/javascript/flavours/glitch/load_polyfills.js => app/javascript/flavours/glitch/load_polyfills.js +0 -1
@@ 15,7 15,6 @@ function loadPolyfills() {
Array.prototype.includes &&
HTMLCanvasElement.prototype.toBlob &&
window.Intl &&
- Number.isNaN &&
Object.assign &&
Object.values &&
window.Symbol &&
M app/javascript/mastodon/base_polyfills.js => app/javascript/mastodon/base_polyfills.js +0 -5
@@ 4,7 4,6 @@ import 'es6-symbol/implement';
import includes from 'array-includes';
import assign from 'object-assign';
import values from 'object.values';
-import isNaN from 'is-nan';
import { decode as decodeBase64 } from './utils/base64';
import promiseFinally from 'promise.prototype.finally';
@@ 20,10 19,6 @@ if (!Object.values) {
values.shim();
}
-if (!Number.isNaN) {
- Number.isNaN = isNaN;
-}
-
promiseFinally.shim();
if (!HTMLCanvasElement.prototype.toBlob) {
M app/javascript/mastodon/components/account.jsx => app/javascript/mastodon/components/account.jsx +2 -1
@@ 23,7 23,6 @@ const messages = defineMessages({
block: { id: 'account.block', defaultMessage: 'Block @{name}' },
});
-export default @injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
@@ 155,3 154,5 @@ class Account extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Account);
M app/javascript/mastodon/components/admin/ReportReasonSelector.jsx => app/javascript/mastodon/components/admin/ReportReasonSelector.jsx +2 -1
@@ 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);
M app/javascript/mastodon/components/column_header.jsx => app/javascript/mastodon/components/column_header.jsx +2 -1
@@ 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 = {
@@ 209,3 208,5 @@ class ColumnHeader extends React.PureComponent {
}
}
+
+export default injectIntl(ColumnHeader);
M app/javascript/mastodon/components/dismissable_banner.jsx => app/javascript/mastodon/components/dismissable_banner.jsx +2 -1
@@ 8,7 8,6 @@ const messages = defineMessages({
dismiss: { id: 'dismissable_banner.dismiss', defaultMessage: 'Dismiss' },
});
-export default @injectIntl
class DismissableBanner extends React.PureComponent {
static propTypes = {
@@ 49,3 48,5 @@ class DismissableBanner extends React.PureComponent {
}
}
+
+export default injectIntl(DismissableBanner);
M app/javascript/mastodon/components/domain.jsx => app/javascript/mastodon/components/domain.jsx +2 -1
@@ 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);
M app/javascript/mastodon/components/edited_timestamp/index.jsx => app/javascript/mastodon/components/edited_timestamp/index.jsx +2 -2
@@ 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));
M app/javascript/mastodon/components/inline_account.jsx => app/javascript/mastodon/components/inline_account.jsx +2 -1
@@ 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);
M app/javascript/mastodon/components/load_gap.jsx => app/javascript/mastodon/components/load_gap.jsx +2 -1
@@ 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);
M app/javascript/mastodon/components/media_gallery.jsx => app/javascript/mastodon/components/media_gallery.jsx +2 -1
@@ 223,7 223,6 @@ class Item extends React.PureComponent {
}
-export default @injectIntl
class MediaGallery extends React.PureComponent {
static propTypes = {
@@ 369,3 368,5 @@ class MediaGallery extends React.PureComponent {
}
}
+
+export default injectIntl(MediaGallery);
M app/javascript/mastodon/components/navigation_portal.jsx => app/javascript/mastodon/components/navigation_portal.jsx +1 -1
@@ 15,7 15,6 @@ const DefaultNavigation = () => (
</>
);
-export default @withRouter
class NavigationPortal extends React.PureComponent {
render () {
@@ 33,3 32,4 @@ class NavigationPortal extends React.PureComponent {
}
}
+export default withRouter(NavigationPortal);
M app/javascript/mastodon/components/picture_in_picture_placeholder.jsx => app/javascript/mastodon/components/picture_in_picture_placeholder.jsx +2 -1
@@ 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);
M app/javascript/mastodon/components/poll.jsx => app/javascript/mastodon/components/poll.jsx +2 -1
@@ 31,7 31,6 @@ const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
return obj;
}, {});
-export default @injectIntl
class Poll extends ImmutablePureComponent {
static contextTypes = {
@@ 234,3 233,5 @@ class Poll extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Poll);
M app/javascript/mastodon/components/relative_timestamp.jsx => app/javascript/mastodon/components/relative_timestamp.jsx +2 -1
@@ 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);
M app/javascript/mastodon/components/scrollable_list.jsx => app/javascript/mastodon/components/scrollable_list.jsx +2 -1
@@ 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);
M app/javascript/mastodon/components/server_banner.jsx => app/javascript/mastodon/components/server_banner.jsx +2 -2
@@ 18,8 18,6 @@ const mapStateToProps = state => ({
server: state.getIn(['server', 'server']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class ServerBanner extends React.PureComponent {
static propTypes = {
@@ 91,3 89,5 @@ class ServerBanner extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(ServerBanner));
M app/javascript/mastodon/components/status.jsx => app/javascript/mastodon/components/status.jsx +2 -1
@@ 59,7 59,6 @@ const messages = defineMessages({
edited: { id: 'status.edited', defaultMessage: 'Edited {date}' },
});
-export default @injectIntl
class Status extends ImmutablePureComponent {
static contextTypes = {
@@ 549,3 548,5 @@ class Status extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Status);
M app/javascript/mastodon/components/status_action_bar.jsx => app/javascript/mastodon/components/status_action_bar.jsx +2 -2
@@ 53,8 53,6 @@ const mapStateToProps = (state, { status }) => ({
relationship: state.getIn(['relationships', status.getIn(['account', 'id'])]),
});
-export default @connect(mapStateToProps)
-@injectIntl
class StatusActionBar extends ImmutablePureComponent {
static contextTypes = {
@@ 385,3 383,5 @@ class StatusActionBar extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(StatusActionBar));
M app/javascript/mastodon/components/status_content.jsx => app/javascript/mastodon/components/status_content.jsx +2 -2
@@ 52,8 52,6 @@ const mapStateToProps = state => ({
languages: state.getIn(['server', 'translationLanguages', 'items']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class StatusContent extends React.PureComponent {
static contextTypes = {
@@ 311,3 309,5 @@ class StatusContent extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(StatusContent));
M app/javascript/mastodon/features/about/index.jsx => app/javascript/mastodon/features/about/index.jsx +2 -2
@@ 80,8 80,6 @@ class Section extends React.PureComponent {
}
-export default @connect(mapStateToProps)
-@injectIntl
class About extends React.PureComponent {
static propTypes = {
@@ 217,3 215,5 @@ class About extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(About));
M app/javascript/mastodon/features/account/components/account_note.jsx => app/javascript/mastodon/features/account/components/account_note.jsx +2 -1
@@ 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);
M app/javascript/mastodon/features/account/components/featured_tags.jsx => app/javascript/mastodon/features/account/components/featured_tags.jsx +2 -1
@@ 10,7 10,6 @@ const messages = defineMessages({
empty: { id: 'account.featured_tags.last_status_never', defaultMessage: 'No posts' },
});
-export default @injectIntl
class FeaturedTags extends ImmutablePureComponent {
static contextTypes = {
@@ 50,3 49,5 @@ class FeaturedTags extends ImmutablePureComponent {
}
}
+
+export default injectIntl(FeaturedTags);
M => +2 -1
@@ 76,7 76,6 @@ const dateFormatOptions = {
minute: '2-digit',
};
export default @injectIntl
class Header extends ImmutablePureComponent {
static contextTypes = {
@@ 419,3 418,5 @@ class Header extends ImmutablePureComponent {
}
}
export default injectIntl(Header);
M app/javascript/mastodon/features/account/navigation.jsx => app/javascript/mastodon/features/account/navigation.jsx +2 -1
@@ 19,7 19,6 @@ const mapStateToProps = (state, { match: { params: { acct } } }) => {
};
};
-export default @connect(mapStateToProps)
class AccountNavigation extends React.PureComponent {
static propTypes = {
@@ 50,3 49,5 @@ class AccountNavigation extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(AccountNavigation);
M app/javascript/mastodon/features/account_gallery/components/media_item.jsx => app/javascript/mastodon/features/account_gallery/components/media_item.jsx +1 -1
@@ 74,7 74,7 @@ export default class MediaItem extends ImmutablePureComponent {
if (['audio', 'video'].includes(attachment.get('type'))) {
content = (
<img
- src={attachment.get('preview_url') || attachment.getIn(['account', 'avatar_static'])}
+ src={attachment.get('preview_url') || status.getIn(['account', 'avatar_static'])}
alt={attachment.get('description')}
lang={status.get('language')}
onLoad={this.handleImageLoad}
M app/javascript/mastodon/features/account_gallery/index.jsx => app/javascript/mastodon/features/account_gallery/index.jsx +2 -1
@@ 60,7 60,6 @@ class LoadMoreMedia extends ImmutablePureComponent {
}
-export default @connect(mapStateToProps)
class AccountGallery extends ImmutablePureComponent {
static propTypes = {
@@ 226,3 225,5 @@ class AccountGallery extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(AccountGallery);
M app/javascript/mastodon/features/account_timeline/components/limited_account_hint.jsx => app/javascript/mastodon/features/account_timeline/components/limited_account_hint.jsx +2 -1
@@ 14,7 14,6 @@ const mapDispatchToProps = (dispatch, { accountId }) => ({
});
-export default @connect(() => {}, mapDispatchToProps)
class LimitedAccountHint extends React.PureComponent {
static propTypes = {
@@ 34,3 33,5 @@ class LimitedAccountHint extends React.PureComponent {
}
}
+
+export default connect(() => {}, mapDispatchToProps)(LimitedAccountHint);
M app/javascript/mastodon/features/account_timeline/index.jsx => app/javascript/mastodon/features/account_timeline/index.jsx +2 -1
@@ 64,7 64,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired,
};
-export default @connect(mapStateToProps)
class AccountTimeline extends ImmutablePureComponent {
static propTypes = {
@@ 206,3 205,5 @@ class AccountTimeline extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(AccountTimeline);
M app/javascript/mastodon/features/audio/index.jsx => app/javascript/mastodon/features/audio/index.jsx +2 -1
@@ 22,7 22,6 @@ const messages = defineMessages({
const TICK_SIZE = 10;
const PADDING = 180;
-export default @injectIntl
class Audio extends React.PureComponent {
static propTypes = {
@@ 569,3 568,5 @@ class Audio extends React.PureComponent {
}
}
+
+export default injectIntl(Audio);
M app/javascript/mastodon/features/blocks/index.jsx => app/javascript/mastodon/features/blocks/index.jsx +2 -2
@@ 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));
M app/javascript/mastodon/features/bookmarked_statuses/index.jsx => app/javascript/mastodon/features/bookmarked_statuses/index.jsx +2 -2
@@ 22,8 22,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'bookmarks', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Bookmarks extends ImmutablePureComponent {
static propTypes = {
@@ 106,3 104,5 @@ class Bookmarks extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Bookmarks));
M app/javascript/mastodon/features/closed_registrations_modal/index.jsx => app/javascript/mastodon/features/closed_registrations_modal/index.jsx +2 -1
@@ 9,7 9,6 @@ const mapStateToProps = state => ({
message: state.getIn(['server', 'server', 'registrations', 'message']),
});
-export default @connect(mapStateToProps)
class ClosedRegistrationsModal extends ImmutablePureComponent {
componentDidMount () {
@@ 73,3 72,5 @@ class ClosedRegistrationsModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(ClosedRegistrationsModal);
M app/javascript/mastodon/features/community_timeline/components/column_settings.jsx => app/javascript/mastodon/features/community_timeline/components/column_settings.jsx +2 -1
@@ 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);
M => +2 -2
@@ 30,8 30,6 @@ const mapStateToProps = (state, { columnId }) => {
};
};
export default @connect(mapStateToProps)
@injectIntl
class CommunityTimeline extends React.PureComponent {
static contextTypes = {
@@ 158,3 156,5 @@ class CommunityTimeline extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(CommunityTimeline));
M app/javascript/mastodon/features/compose/components/action_bar.jsx => app/javascript/mastodon/features/compose/components/action_bar.jsx +2 -1
@@ 20,7 20,6 @@ const messages = defineMessages({
bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
});
-export default @injectIntl
class ActionBar extends React.PureComponent {
static propTypes = {
@@ 65,3 64,5 @@ class ActionBar extends React.PureComponent {
}
}
+
+export default injectIntl(ActionBar);
M app/javascript/mastodon/features/compose/components/compose_form.jsx => app/javascript/mastodon/features/compose/components/compose_form.jsx +2 -1
@@ 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 = {
@@ 300,3 299,5 @@ class ComposeForm extends ImmutablePureComponent {
}
}
+
+export default injectIntl(ComposeForm);
M app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx => app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx +5 -3
@@ 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,
@@ 305,7 304,8 @@ class EmojiPickerMenu extends React.PureComponent {
}
-export default @injectIntl
+const EmojiPickerMenu = injectIntl(EmojiPickerMenuImpl);
+
class EmojiPickerDropdown extends React.PureComponent {
static propTypes = {
@@ 409,3 409,5 @@ class EmojiPickerDropdown extends React.PureComponent {
}
}
+
+export default injectIntl(EmojiPickerDropdown);
M app/javascript/mastodon/features/compose/components/language_dropdown.jsx => app/javascript/mastodon/features/compose/components/language_dropdown.jsx +2 -1
@@ 237,7 237,6 @@ class LanguageDropdownMenu extends React.PureComponent {
}
-export default @injectIntl
class LanguageDropdown extends React.PureComponent {
static propTypes = {
@@ 325,3 324,5 @@ class LanguageDropdown extends React.PureComponent {
}
}
+
+export default injectIntl(LanguageDropdown);
M app/javascript/mastodon/features/compose/components/poll_button.jsx => app/javascript/mastodon/features/compose/components/poll_button.jsx +2 -2
@@ 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);
M app/javascript/mastodon/features/compose/components/poll_form.jsx => app/javascript/mastodon/features/compose/components/poll_form.jsx +5 -4
@@ 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,
@@ 113,8 112,8 @@ class Option extends React.PureComponent {
}
-export default
-@injectIntl
+const Option = injectIntl(OptionIntl);
+
class PollForm extends ImmutablePureComponent {
static propTypes = {
@@ 180,3 179,5 @@ class PollForm extends ImmutablePureComponent {
}
}
+
+export default injectIntl(PollForm);
M app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx => app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx +2 -1
@@ 132,7 132,6 @@ class PrivacyDropdownMenu extends React.PureComponent {
}
-export default @injectIntl
class PrivacyDropdown extends React.PureComponent {
static propTypes = {
@@ 285,3 284,5 @@ class PrivacyDropdown extends React.PureComponent {
}
}
+
+export default injectIntl(PrivacyDropdown);
M app/javascript/mastodon/features/compose/components/reply_indicator.jsx => app/javascript/mastodon/features/compose/components/reply_indicator.jsx +2 -1
@@ 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);
M app/javascript/mastodon/features/compose/components/search.jsx => app/javascript/mastodon/features/compose/components/search.jsx +2 -1
@@ 32,7 32,6 @@ class SearchPopout extends React.PureComponent {
}
-export default @injectIntl
class Search extends React.PureComponent {
static contextTypes = {
@@ 145,3 144,5 @@ class Search extends React.PureComponent {
}
}
+
+export default injectIntl(Search);
M app/javascript/mastodon/features/compose/components/search_results.jsx => app/javascript/mastodon/features/compose/components/search_results.jsx +2 -1
@@ 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);
M app/javascript/mastodon/features/compose/components/upload_button.jsx => app/javascript/mastodon/features/compose/components/upload_button.jsx +2 -2
@@ 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));
M app/javascript/mastodon/features/compose/index.jsx => app/javascript/mastodon/features/compose/index.jsx +2 -2
@@ 38,8 38,6 @@ const mapStateToProps = (state, ownProps) => ({
showSearch: ownProps.multiColumn ? state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']) : false,
});
-export default @connect(mapStateToProps)
-@injectIntl
class Compose extends React.PureComponent {
static propTypes = {
@@ 148,3 146,5 @@ class Compose extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Compose));
M app/javascript/mastodon/features/direct_timeline/components/conversation.jsx => app/javascript/mastodon/features/direct_timeline/components/conversation.jsx +2 -1
@@ 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);
M app/javascript/mastodon/features/direct_timeline/index.jsx => app/javascript/mastodon/features/direct_timeline/index.jsx +2 -2
@@ 14,8 14,6 @@ const messages = defineMessages({
title: { id: 'column.direct', defaultMessage: 'Direct messages' },
});
-export default @connect()
-@injectIntl
class DirectTimeline extends React.PureComponent {
static propTypes = {
@@ 105,3 103,5 @@ class DirectTimeline extends React.PureComponent {
}
}
+
+export default connect()(injectIntl(DirectTimeline));
M app/javascript/mastodon/features/directory/components/account_card.jsx => app/javascript/mastodon/features/directory/components/account_card.jsx +2 -3
@@ 91,9 91,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
});
-export default
-@injectIntl
-@connect(makeMapStateToProps, mapDispatchToProps)
class AccountCard extends ImmutablePureComponent {
static propTypes = {
@@ 233,3 230,5 @@ class AccountCard extends ImmutablePureComponent {
}
}
+
+export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(AccountCard));
M app/javascript/mastodon/features/directory/index.jsx => app/javascript/mastodon/features/directory/index.jsx +2 -2
@@ 29,8 29,6 @@ const mapStateToProps = state => ({
domain: state.getIn(['meta', 'domain']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Directory extends React.PureComponent {
static contextTypes = {
@@ 176,3 174,5 @@ class Directory extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Directory));
M app/javascript/mastodon/features/domain_blocks/index.jsx => app/javascript/mastodon/features/domain_blocks/index.jsx +2 -2
@@ 23,8 23,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['domain_lists', 'blocks', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Blocks extends ImmutablePureComponent {
static propTypes = {
@@ 81,3 79,5 @@ class Blocks extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Blocks));
M app/javascript/mastodon/features/explore/index.jsx => app/javascript/mastodon/features/explore/index.jsx +2 -2
@@ 24,8 24,6 @@ const mapStateToProps = state => ({
isSearching: state.getIn(['search', 'submitted']) || !showTrends,
});
-export default @connect(mapStateToProps)
-@injectIntl
class Explore extends React.PureComponent {
static contextTypes = {
@@ 105,3 103,5 @@ class Explore extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Explore));
M app/javascript/mastodon/features/explore/links.jsx => app/javascript/mastodon/features/explore/links.jsx +2 -1
@@ 13,7 13,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['trends', 'links', 'isLoading']),
});
-export default @connect(mapStateToProps)
class Links extends React.PureComponent {
static propTypes = {
@@ 68,3 67,5 @@ class Links extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Links);
M app/javascript/mastodon/features/explore/results.jsx => app/javascript/mastodon/features/explore/results.jsx +2 -2
@@ 42,8 42,6 @@ const renderStatuses = (results, onLoadMore) => appendLoadMore('statuses', resul
<Status key={`status-${item}`} id={item} />
)), onLoadMore);
-export default @connect(mapStateToProps)
-@injectIntl
class Results extends React.PureComponent {
static propTypes = {
@@ 124,3 122,5 @@ class Results extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Results));
M app/javascript/mastodon/features/explore/statuses.jsx => app/javascript/mastodon/features/explore/statuses.jsx +2 -1
@@ 14,7 14,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'trending', 'next']),
});
-export default @connect(mapStateToProps)
class Statuses extends React.PureComponent {
static propTypes = {
@@ 62,3 61,5 @@ class Statuses extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Statuses);
M app/javascript/mastodon/features/explore/suggestions.jsx => app/javascript/mastodon/features/explore/suggestions.jsx +2 -1
@@ 12,7 12,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['suggestions', 'isLoading']),
});
-export default @connect(mapStateToProps)
class Suggestions extends React.PureComponent {
static propTypes = {
@@ 49,3 48,5 @@ class Suggestions extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Suggestions);
M app/javascript/mastodon/features/explore/tags.jsx => app/javascript/mastodon/features/explore/tags.jsx +2 -1
@@ 13,7 13,6 @@ const mapStateToProps = state => ({
isLoadingHashtags: state.getIn(['trends', 'tags', 'isLoading']),
});
-export default @connect(mapStateToProps)
class Tags extends React.PureComponent {
static propTypes = {
@@ 60,3 59,5 @@ class Tags extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Tags);
M app/javascript/mastodon/features/favourited_statuses/index.jsx => app/javascript/mastodon/features/favourited_statuses/index.jsx +2 -2
@@ 22,8 22,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'favourites', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Favourites extends ImmutablePureComponent {
static propTypes = {
@@ 106,3 104,5 @@ class Favourites extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Favourites));
M app/javascript/mastodon/features/favourites/index.jsx => app/javascript/mastodon/features/favourites/index.jsx +2 -2
@@ 21,8 21,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 = {
@@ 90,3 88,5 @@ class Favourites extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Favourites));
M app/javascript/mastodon/features/filters/added_to_filter.jsx => app/javascript/mastodon/features/filters/added_to_filter.jsx +2 -1
@@ 10,7 10,6 @@ const mapStateToProps = (state, { filterId }) => ({
filter: state.getIn(['filters', filterId]),
});
-export default @connect(mapStateToProps)
class AddedToFilter extends React.PureComponent {
static propTypes = {
@@ 100,3 99,5 @@ class AddedToFilter extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(AddedToFilter);
M app/javascript/mastodon/features/filters/select_filter.jsx => app/javascript/mastodon/features/filters/select_filter.jsx +2 -2
@@ 22,8 22,6 @@ const mapStateToProps = (state, { contextType }) => ({
]),
});
-export default @connect(mapStateToProps)
-@injectIntl
class SelectFilter extends React.PureComponent {
static propTypes = {
@@ 190,3 188,5 @@ class SelectFilter extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(SelectFilter));
M app/javascript/mastodon/features/follow_recommendations/components/account.jsx => app/javascript/mastodon/features/follow_recommendations/components/account.jsx +2 -2
@@ 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));
M app/javascript/mastodon/features/follow_recommendations/index.jsx => app/javascript/mastodon/features/follow_recommendations/index.jsx +2 -1
@@ 19,7 19,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['suggestions', 'isLoading']),
});
-export default @connect(mapStateToProps)
class FollowRecommendations extends ImmutablePureComponent {
static contextTypes = {
@@ 114,3 113,5 @@ class FollowRecommendations extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(FollowRecommendations);
M app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx => app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx +2 -1
@@ 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);
M app/javascript/mastodon/features/follow_requests/index.jsx => app/javascript/mastodon/features/follow_requests/index.jsx +2 -2
@@ 25,8 25,6 @@ const mapStateToProps = state => ({
domain: state.getIn(['meta', 'domain']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class FollowRequests extends ImmutablePureComponent {
static propTypes = {
@@ 89,3 87,5 @@ class FollowRequests extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(FollowRequests));
M app/javascript/mastodon/features/followed_tags/index.jsx => app/javascript/mastodon/features/followed_tags/index.jsx +2 -2
@@ 22,8 22,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['followed_tags', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class FollowedTags extends ImmutablePureComponent {
static propTypes = {
@@ 87,3 85,5 @@ class FollowedTags extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(FollowedTags));
M app/javascript/mastodon/features/followers/index.jsx => app/javascript/mastodon/features/followers/index.jsx +2 -1
@@ 54,7 54,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired,
};
-export default @connect(mapStateToProps)
class Followers extends ImmutablePureComponent {
static propTypes = {
@@ 168,3 167,5 @@ class Followers extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(Followers);
M app/javascript/mastodon/features/following/index.jsx => app/javascript/mastodon/features/following/index.jsx +2 -1
@@ 54,7 54,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired,
};
-export default @connect(mapStateToProps)
class Following extends ImmutablePureComponent {
static propTypes = {
@@ 168,3 167,5 @@ class Following extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(Following);
M app/javascript/mastodon/features/getting_started/components/announcements.jsx => app/javascript/mastodon/features/getting_started/components/announcements.jsx +2 -1
@@ 355,7 355,6 @@ class Announcement extends ImmutablePureComponent {
}
-export default @injectIntl
class Announcements extends ImmutablePureComponent {
static propTypes = {
@@ 447,3 446,5 @@ class Announcements extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Announcements);
M app/javascript/mastodon/features/getting_started/index.jsx => app/javascript/mastodon/features/getting_started/index.jsx +2 -2
@@ 58,8 58,6 @@ const badgeDisplay = (number, limit) => {
}
};
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class GettingStarted extends ImmutablePureComponent {
static contextTypes = {
@@ 153,3 151,5 @@ class GettingStarted extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(GettingStarted));
M app/javascript/mastodon/features/hashtag_timeline/components/column_settings.jsx => app/javascript/mastodon/features/hashtag_timeline/components/column_settings.jsx +2 -1
@@ 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);
M app/javascript/mastodon/features/hashtag_timeline/index.jsx => app/javascript/mastodon/features/hashtag_timeline/index.jsx +2 -2
@@ 26,8 26,6 @@ const mapStateToProps = (state, props) => ({
tag: state.getIn(['tags', props.params.id]),
});
-export default @connect(mapStateToProps)
-@injectIntl
class HashtagTimeline extends React.PureComponent {
disconnects = [];
@@ 235,3 233,5 @@ class HashtagTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(HashtagTimeline));
M app/javascript/mastodon/features/home_timeline/components/column_settings.jsx => app/javascript/mastodon/features/home_timeline/components/column_settings.jsx +2 -1
@@ 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);
M app/javascript/mastodon/features/home_timeline/index.jsx => app/javascript/mastodon/features/home_timeline/index.jsx +2 -2
@@ 30,8 30,6 @@ const mapStateToProps = state => ({
showAnnouncements: state.getIn(['announcements', 'show']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class HomeTimeline extends React.PureComponent {
static contextTypes = {
@@ 174,3 172,5 @@ class HomeTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(HomeTimeline));
M app/javascript/mastodon/features/interaction_modal/index.jsx => app/javascript/mastodon/features/interaction_modal/index.jsx +2 -1
@@ 74,7 74,6 @@ class Copypaste extends React.PureComponent {
}
-export default @connect(mapStateToProps, mapDispatchToProps)
class InteractionModal extends React.PureComponent {
static propTypes = {
@@ 159,3 158,5 @@ class InteractionModal extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(InteractionModal);
M app/javascript/mastodon/features/keyboard_shortcuts/index.jsx => app/javascript/mastodon/features/keyboard_shortcuts/index.jsx +2 -1
@@ 10,7 10,6 @@ const messages = defineMessages({
heading: { id: 'keyboard_shortcuts.heading', defaultMessage: 'Keyboard Shortcuts' },
});
-export default @injectIntl
class KeyboardShortcuts extends ImmutablePureComponent {
static propTypes = {
@@ 174,3 173,5 @@ class KeyboardShortcuts extends ImmutablePureComponent {
}
}
+
+export default injectIntl(KeyboardShortcuts);
M app/javascript/mastodon/features/list_adder/components/account.jsx => app/javascript/mastodon/features/list_adder/components/account.jsx +2 -3
@@ 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));
M app/javascript/mastodon/features/list_adder/components/list.jsx => app/javascript/mastodon/features/list_adder/components/list.jsx +2 -2
@@ 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));
M app/javascript/mastodon/features/list_adder/index.jsx => app/javascript/mastodon/features/list_adder/index.jsx +2 -2
@@ 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));
M app/javascript/mastodon/features/list_editor/components/account.jsx => app/javascript/mastodon/features/list_editor/components/account.jsx +2 -2
@@ 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));
M app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx => app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx +2 -2
@@ 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));
M app/javascript/mastodon/features/list_editor/components/search.jsx => app/javascript/mastodon/features/list_editor/components/search.jsx +2 -2
@@ 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));
M app/javascript/mastodon/features/list_editor/index.jsx => app/javascript/mastodon/features/list_editor/index.jsx +2 -2
@@ 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));
M app/javascript/mastodon/features/list_timeline/index.jsx => app/javascript/mastodon/features/list_timeline/index.jsx +2 -2
@@ 31,8 31,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 = {
@@ 219,3 217,5 @@ class ListTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(ListTimeline));
M app/javascript/mastodon/features/lists/components/new_list_form.jsx => app/javascript/mastodon/features/lists/components/new_list_form.jsx +2 -2
@@ 20,8 20,6 @@ const mapDispatchToProps = dispatch => ({
onSubmit: () => dispatch(submitListEditor(true)),
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class NewListForm extends React.PureComponent {
static propTypes = {
@@ 75,3 73,5 @@ class NewListForm extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(NewListForm));
M app/javascript/mastodon/features/lists/index.jsx => app/javascript/mastodon/features/lists/index.jsx +2 -2
@@ 32,8 32,6 @@ const mapStateToProps = state => ({
lists: getOrderedLists(state),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Lists extends ImmutablePureComponent {
static propTypes = {
@@ 87,3 85,5 @@ class Lists extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Lists));
M app/javascript/mastodon/features/mutes/index.jsx => app/javascript/mastodon/features/mutes/index.jsx +2 -2
@@ 23,8 23,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['user_lists', 'mutes', 'isLoading'], true),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Mutes extends ImmutablePureComponent {
static propTypes = {
@@ 82,3 80,5 @@ class Mutes extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Mutes));
M app/javascript/mastodon/features/notifications/components/filter_bar.jsx => app/javascript/mastodon/features/notifications/components/filter_bar.jsx +2 -1
@@ 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);
M app/javascript/mastodon/features/notifications/components/follow_request.jsx => app/javascript/mastodon/features/notifications/components/follow_request.jsx +5 -4
@@ 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);
M app/javascript/mastodon/features/notifications/components/notification.jsx => app/javascript/mastodon/features/notifications/components/notification.jsx +2 -1
@@ 33,7 33,6 @@ const notificationForScreenReader = (intl, message, timestamp) => {
return output.join(', ');
};
-export default @injectIntl
class Notification extends ImmutablePureComponent {
static contextTypes = {
@@ 447,3 446,5 @@ class Notification extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Notification);
M app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx => app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx +2 -2
@@ 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));
M app/javascript/mastodon/features/notifications/components/report.jsx => app/javascript/mastodon/features/notifications/components/report.jsx +2 -1
@@ 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);
M app/javascript/mastodon/features/notifications/index.jsx => app/javascript/mastodon/features/notifications/index.jsx +2 -2
@@ 67,8 67,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 contextTypes = {
@@ 288,3 286,5 @@ class Notifications extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Notifications));
M => +2 -2
@@ 37,8 37,6 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
export default @connect(makeMapStateToProps)
@injectIntl
class Footer extends ImmutablePureComponent {
static contextTypes = {
@@ 190,3 188,5 @@ class Footer extends ImmutablePureComponent {
}
}
export default connect(makeMapStateToProps)(injectIntl(Footer));
M => +2 -2
@@ 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));
M app/javascript/mastodon/features/picture_in_picture/index.jsx => app/javascript/mastodon/features/picture_in_picture/index.jsx +2 -1
@@ 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);
M app/javascript/mastodon/features/pinned_statuses/index.jsx => app/javascript/mastodon/features/pinned_statuses/index.jsx +2 -2
@@ 19,8 19,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'pins', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class PinnedStatuses extends ImmutablePureComponent {
static propTypes = {
@@ 63,3 61,5 @@ class PinnedStatuses extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(PinnedStatuses));
M app/javascript/mastodon/features/privacy_policy/index.jsx => app/javascript/mastodon/features/privacy_policy/index.jsx +2 -1
@@ 10,7 10,6 @@ const messages = defineMessages({
title: { id: 'privacy_policy.title', defaultMessage: 'Privacy Policy' },
});
-export default @injectIntl
class PrivacyPolicy extends React.PureComponent {
static propTypes = {
@@ 59,3 58,5 @@ class PrivacyPolicy extends React.PureComponent {
}
}
+
+export default injectIntl(PrivacyPolicy);
M app/javascript/mastodon/features/public_timeline/components/column_settings.jsx => app/javascript/mastodon/features/public_timeline/components/column_settings.jsx +2 -1
@@ 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);
M app/javascript/mastodon/features/public_timeline/index.jsx => app/javascript/mastodon/features/public_timeline/index.jsx +2 -2
@@ 31,8 31,6 @@ const mapStateToProps = (state, { columnId }) => {
};
};
-export default @connect(mapStateToProps)
-@injectIntl
class PublicTimeline extends React.PureComponent {
static contextTypes = {
@@ 160,3 158,5 @@ class PublicTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(PublicTimeline));
M app/javascript/mastodon/features/reblogs/index.jsx => app/javascript/mastodon/features/reblogs/index.jsx +2 -2
@@ 21,8 21,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 = {
@@ 90,3 88,5 @@ class Reblogs extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Reblogs));
M app/javascript/mastodon/features/report/category.jsx => app/javascript/mastodon/features/report/category.jsx +2 -2
@@ 24,8 24,6 @@ const mapStateToProps = state => ({
rules: state.getIn(['server', 'server', 'rules'], ImmutableList()),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Category extends React.PureComponent {
static propTypes = {
@@ 104,3 102,5 @@ class Category extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Category));
M => +2 -1
@@ 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);
M app/javascript/mastodon/features/report/components/status_check_box.jsx => app/javascript/mastodon/features/report/components/status_check_box.jsx +2 -1
@@ 17,7 17,6 @@ const messages = defineMessages({
direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
});
-export default @injectIntl
class StatusCheckBox extends React.PureComponent {
static propTypes = {
@@ 80,3 79,5 @@ class StatusCheckBox extends React.PureComponent {
}
}
+
+export default injectIntl(StatusCheckBox);
M app/javascript/mastodon/features/report/rules.jsx => app/javascript/mastodon/features/report/rules.jsx +2 -1
@@ 10,7 10,6 @@ const mapStateToProps = state => ({
rules: state.getIn(['server', 'server', '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);
M app/javascript/mastodon/features/report/statuses.jsx => app/javascript/mastodon/features/report/statuses.jsx +2 -1
@@ 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);
M app/javascript/mastodon/features/report/thanks.jsx => app/javascript/mastodon/features/report/thanks.jsx +2 -1
@@ 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);
M app/javascript/mastodon/features/status/components/action_bar.jsx => app/javascript/mastodon/features/status/components/action_bar.jsx +2 -2
@@ 47,8 47,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 = {
@@ 298,3 296,5 @@ class ActionBar extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(ActionBar));
M app/javascript/mastodon/features/status/components/detailed_status.jsx => app/javascript/mastodon/features/status/components/detailed_status.jsx +2 -1
@@ 25,7 25,6 @@ const messages = defineMessages({
direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
});
-export default @injectIntl
class DetailedStatus extends ImmutablePureComponent {
static contextTypes = {
@@ 289,3 288,5 @@ class DetailedStatus extends ImmutablePureComponent {
}
}
+
+export default injectIntl(DetailedStatus);
M app/javascript/mastodon/features/status/index.jsx => app/javascript/mastodon/features/status/index.jsx +2 -2
@@ 176,8 176,6 @@ const titleFromStatus = status => {
return `${prefix}: "${truncate(text, 30)}"`;
};
-export default @injectIntl
-@connect(makeMapStateToProps)
class Status extends ImmutablePureComponent {
static contextTypes = {
@@ 684,3 682,5 @@ class Status extends ImmutablePureComponent {
}
}
+
+export default injectIntl(connect(makeMapStateToProps)(Status));
M app/javascript/mastodon/features/subscribed_languages_modal/index.jsx => app/javascript/mastodon/features/subscribed_languages_modal/index.jsx +2 -2
@@ 36,8 36,6 @@ const mapDispatchToProps = (dispatch, { accountId }) => ({
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class SubscribedLanguagesModal extends ImmutablePureComponent {
static propTypes = {
@@ 123,3 121,5 @@ class SubscribedLanguagesModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(SubscribedLanguagesModal));
M app/javascript/mastodon/features/ui/components/audio_modal.jsx => app/javascript/mastodon/features/ui/components/audio_modal.jsx +2 -1
@@ 11,7 11,6 @@ const mapStateToProps = (state, { statusId }) => ({
accountStaticAvatar: state.getIn(['accounts', state.getIn(['statuses', statusId, 'account']), 'avatar_static']),
});
-export default @connect(mapStateToProps, null, null, { forwardRef: true })
class AudioModal extends ImmutablePureComponent {
static propTypes = {
@@ 55,3 54,5 @@ class AudioModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, null, null, { forwardRef: true })(AudioModal);
M app/javascript/mastodon/features/ui/components/block_modal.jsx => app/javascript/mastodon/features/ui/components/block_modal.jsx +2 -2
@@ 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));
M app/javascript/mastodon/features/ui/components/boost_modal.jsx => app/javascript/mastodon/features/ui/components/boost_modal.jsx +2 -2
@@ 38,8 38,6 @@ const mapDispatchToProps = dispatch => {
};
};
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class BoostModal extends ImmutablePureComponent {
static contextTypes = {
@@ 140,3 138,5 @@ class BoostModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(BoostModal));
M app/javascript/mastodon/features/ui/components/bundle_column_error.jsx => app/javascript/mastodon/features/ui/components/bundle_column_error.jsx +2 -1
@@ 92,7 92,6 @@ class CopyButton extends React.PureComponent {
}
-export default @injectIntl
class BundleColumnError extends React.PureComponent {
static propTypes = {
@@ 160,3 159,5 @@ class BundleColumnError extends React.PureComponent {
}
}
+
+export default injectIntl(BundleColumnError);
M app/javascript/mastodon/features/ui/components/compare_history_modal.jsx => app/javascript/mastodon/features/ui/components/compare_history_modal.jsx +2 -1
@@ 24,7 24,6 @@ const mapDispatchToProps = dispatch => ({
});
-export default @connect(mapStateToProps, mapDispatchToProps)
class CompareHistoryModal extends React.PureComponent {
static propTypes = {
@@ 100,3 99,5 @@ class CompareHistoryModal extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(CompareHistoryModal);
M app/javascript/mastodon/features/ui/components/compose_panel.jsx => app/javascript/mastodon/features/ui/components/compose_panel.jsx +2 -1
@@ 8,7 8,6 @@ import LinkFooter from './link_footer';
import ServerBanner from 'mastodon/components/server_banner';
import { changeComposing, mountCompose, unmountCompose } from 'mastodon/actions/compose';
-export default @connect()
class ComposePanel extends React.PureComponent {
static contextTypes = {
@@ 66,3 65,5 @@ class ComposePanel extends React.PureComponent {
}
}
+
+export default connect()(ComposePanel);
M app/javascript/mastodon/features/ui/components/confirmation_modal.jsx => app/javascript/mastodon/features/ui/components/confirmation_modal.jsx +2 -1
@@ 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);
M app/javascript/mastodon/features/ui/components/disabled_account_banner.jsx => app/javascript/mastodon/features/ui/components/disabled_account_banner.jsx +2 -2
@@ 28,8 28,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
});
-export default @injectIntl
-@connect(mapStateToProps, mapDispatchToProps)
class DisabledAccountBanner extends React.PureComponent {
static propTypes = {
@@ 90,3 88,5 @@ class DisabledAccountBanner extends React.PureComponent {
}
}
+
+export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(DisabledAccountBanner));
M app/javascript/mastodon/features/ui/components/embed_modal.jsx => app/javascript/mastodon/features/ui/components/embed_modal.jsx +2 -1
@@ 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);
M app/javascript/mastodon/features/ui/components/filter_modal.jsx => app/javascript/mastodon/features/ui/components/filter_modal.jsx +2 -2
@@ 13,8 13,6 @@ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
-export default @connect(undefined)
-@injectIntl
class FilterModal extends ImmutablePureComponent {
static propTypes = {
@@ 132,3 130,5 @@ class FilterModal extends ImmutablePureComponent {
}
}
+
+export default connect(injectIntl(FilterModal));
M app/javascript/mastodon/features/ui/components/focal_point_modal.jsx => app/javascript/mastodon/features/ui/components/focal_point_modal.jsx +4 -2
@@ 100,8 100,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 = {
@@ 428,3 426,7 @@ class FocalPointModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps, null, {
+ forwardRef: true,
+})(injectIntl(FocalPointModal, { withRef: true }));
M app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx => app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx +2 -2
@@ 15,8 15,6 @@ const mapStateToProps = state => ({
count: state.getIn(['user_lists', 'follow_requests', 'items'], ImmutableList()).size,
});
-export default @injectIntl
-@connect(mapStateToProps)
class FollowRequestsColumnLink extends React.Component {
static propTypes = {
@@ 49,3 47,5 @@ class FollowRequestsColumnLink extends React.Component {
}
}
+
+export default injectIntl(connect(mapStateToProps)(FollowRequestsColumnLink));
M => +2 -2
@@ 22,8 22,6 @@ const mapDispatchToProps = (dispatch) => ({
},
});
export default @withRouter
@connect(null, mapDispatchToProps)
class Header extends React.PureComponent {
static contextTypes = {
@@ 85,3 83,5 @@ class Header extends React.PureComponent {
}
}
export default withRouter(connect(null, mapDispatchToProps)(Header));
M app/javascript/mastodon/features/ui/components/image_modal.jsx => app/javascript/mastodon/features/ui/components/image_modal.jsx +2 -1
@@ 9,7 9,6 @@ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
-export default @injectIntl
class ImageModal extends React.PureComponent {
static propTypes = {
@@ 57,3 56,5 @@ class ImageModal extends React.PureComponent {
}
}
+
+export default injectIntl(ImageModal);
M => +2 -2
@@ 24,8 24,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
});
export default @injectIntl
@connect(null, mapDispatchToProps)
class LinkFooter extends React.PureComponent {
static contextTypes = {
@@ 100,3 98,5 @@ class LinkFooter extends React.PureComponent {
}
}
export default injectIntl(connect(null, mapDispatchToProps)(LinkFooter));
M app/javascript/mastodon/features/ui/components/list_panel.jsx => app/javascript/mastodon/features/ui/components/list_panel.jsx +2 -2
@@ 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));
M app/javascript/mastodon/features/ui/components/media_modal.jsx => app/javascript/mastodon/features/ui/components/media_modal.jsx +2 -2
@@ 25,8 25,6 @@ const mapStateToProps = (state, { statusId }) => ({
language: state.getIn(['statuses', statusId, 'language']),
});
-export default @connect(mapStateToProps, null, null, { forwardRef: true })
-@injectIntl
class MediaModal extends ImmutablePureComponent {
static propTypes = {
@@ 257,3 255,5 @@ class MediaModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, null, null, { forwardRef: true })(injectIntl(MediaModal));
M app/javascript/mastodon/features/ui/components/mute_modal.jsx => app/javascript/mastodon/features/ui/components/mute_modal.jsx +2 -2
@@ 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));
M app/javascript/mastodon/features/ui/components/navigation_panel.jsx => app/javascript/mastodon/features/ui/components/navigation_panel.jsx +2 -1
@@ 28,7 28,6 @@ const messages = defineMessages({
search: { id: 'navigation_bar.search', defaultMessage: 'Search' },
});
-export default @injectIntl
class NavigationPanel extends React.Component {
static contextTypes = {
@@ 105,3 104,5 @@ class NavigationPanel extends React.Component {
}
}
+
+export default injectIntl(NavigationPanel);
M app/javascript/mastodon/features/ui/components/report_modal.jsx => app/javascript/mastodon/features/ui/components/report_modal.jsx +2 -2
@@ 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));
M app/javascript/mastodon/features/ui/components/video_modal.jsx => app/javascript/mastodon/features/ui/components/video_modal.jsx +2 -1
@@ 11,7 11,6 @@ const mapStateToProps = (state, { statusId }) => ({
language: state.getIn(['statuses', statusId, 'language']),
});
-export default @connect(mapStateToProps, null, null, { forwardRef: true })
class VideoModal extends ImmutablePureComponent {
static propTypes = {
@@ 68,3 67,5 @@ class VideoModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, null, null, { forwardRef: true })(VideoModal);
M app/javascript/mastodon/features/ui/components/zoomable_image.jsx => app/javascript/mastodon/features/ui/components/zoomable_image.jsx +2 -1
@@ 91,7 91,6 @@ const normalizeWheel = event => {
};
};
-export default @injectIntl
class ZoomableImage extends React.PureComponent {
static propTypes = {
@@ 451,3 450,5 @@ class ZoomableImage extends React.PureComponent {
}
}
+
+export default injectIntl(ZoomableImage);
M app/javascript/mastodon/features/ui/index.jsx => app/javascript/mastodon/features/ui/index.jsx +2 -3
@@ 229,9 229,6 @@ class SwitchingColumnsArea extends React.PureComponent {
}
-export default @connect(mapStateToProps)
-@injectIntl
-@withRouter
class UI extends React.PureComponent {
static contextTypes = {
@@ 588,3 585,5 @@ class UI extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(withRouter(UI)));
M app/javascript/mastodon/features/video/index.jsx => app/javascript/mastodon/features/video/index.jsx +2 -1
@@ 94,7 94,6 @@ export const fileNameFromURL = str => {
return pathname.slice(index + 1);
};
-export default @injectIntl
class Video extends React.PureComponent {
static propTypes = {
@@ 655,3 654,5 @@ class Video extends React.PureComponent {
}
}
+
+export default injectIntl(Video);
M app/javascript/mastodon/load_polyfills.js => app/javascript/mastodon/load_polyfills.js +0 -1
@@ 15,7 15,6 @@ function loadPolyfills() {
Array.prototype.includes &&
HTMLCanvasElement.prototype.toBlob &&
window.Intl &&
- Number.isNaN &&
Object.assign &&
Object.values &&
window.Symbol &&
M app/javascript/mastodon/selectors/index.js => app/javascript/mastodon/selectors/index.js +2 -2
@@ 121,8 121,8 @@ export const getAccountGallery = createSelector([
let medias = ImmutableList();
statusIds.forEach(statusId => {
- const status = statuses.get(statusId);
- medias = medias.concat(status.get('media_attachments').map(media => media.set('status', status).set('account', account)));
+ const status = statuses.get(statusId).set('account', account);
+ medias = medias.concat(status.get('media_attachments').map(media => media.set('status', status)));
});
return medias;
M babel.config.js => babel.config.js +0 -1
@@ 17,7 17,6 @@ module.exports = (api) => {
['@babel/env', envOptions],
],
plugins: [
- ['@babel/proposal-decorators', { legacy: true }],
['react-intl', { messagesDir: './build/messages' }],
'preval',
],
M package.json => package.json +0 -2
@@ 25,7 25,6 @@
"private": true,
"dependencies": {
"@babel/core": "^7.21.3",
- "@babel/plugin-proposal-decorators": "^7.21.0",
"@babel/plugin-transform-react-inline-elements": "^7.21.0",
"@babel/plugin-transform-runtime": "^7.21.0",
"@babel/preset-env": "^7.20.2",
@@ 72,7 71,6 @@
"intl": "^1.2.5",
"intl-messageformat": "^2.2.0",
"intl-relativeformat": "^6.4.3",
- "is-nan": "^1.3.2",
"js-yaml": "^4.1.0",
"jsdom": "^21.1.1",
"lodash": "^4.17.21",
M yarn.lock => yarn.lock +97 -36
@@ 24,7 24,7 @@
jsonpointer "^5.0.0"
leven "^3.1.0"
-"@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==
@@ 71,7 71,16 @@
eslint-visitor-keys "^2.1.0"
semver "^6.3.0"
-"@babel/generator@^7.21.3", "@babel/generator@^7.7.2":
+"@babel/generator@^7.17.10":
+ version "7.18.6"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.6.tgz#9ab2d46d3cbf631f0e80f72e72874a04c3fc12a9"
+ integrity sha512-AIwwoOS8axIC5MZbhNHRLKi3D+DMpvDf9XUcu3pIVAfOHFT45f4AoDAltRbHIQomCipkCZxrNkfpOEHhJz/VKw==
+ dependencies:
+ "@babel/types" "^7.18.6"
+ "@jridgewell/gen-mapping" "^0.3.0"
+ jsesc "^2.5.1"
+
+"@babel/generator@^7.21.3":
version "7.21.3"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.3.tgz#232359d0874b392df04045d72ce2fd9bb5045fce"
integrity sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==
@@ 81,6 90,15 @@
"@jridgewell/trace-mapping" "^0.3.17"
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"
@@ 115,7 133,7 @@
lru-cache "^5.1.1"
semver "^6.3.0"
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0":
+"@babel/helper-create-class-features-plugin@^7.18.6":
version "7.21.0"
resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.0.tgz#64f49ecb0020532f19b1d014b03bccaa1ab85fb9"
integrity sha512-Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ==
@@ 149,6 167,11 @@
resolve "^1.14.2"
semver "^6.1.2"
+"@babel/helper-environment-visitor@^7.16.7":
+ 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==
+
"@babel/helper-environment-visitor@^7.18.9":
version "7.18.9"
resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
@@ 161,6 184,14 @@
dependencies:
"@babel/types" "^7.18.6"
+"@babel/helper-function-name@^7.17.9":
+ 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==
+ dependencies:
+ "@babel/template" "^7.18.6"
+ "@babel/types" "^7.18.6"
+
"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0":
version "7.19.0"
resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
@@ 177,7 208,7 @@
"@babel/template" "^7.20.7"
"@babel/types" "^7.21.0"
-"@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==
@@ 274,7 305,7 @@
dependencies:
"@babel/types" "^7.20.0"
-"@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==
@@ 286,7 317,12 @@
resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
-"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
+"@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==
+
+"@babel/helper-validator-identifier@^7.19.1":
version "7.19.1"
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
@@ 324,7 360,17 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.3":
+"@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":
+ 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==
+
+"@babel/parser@^7.20.7", "@babel/parser@^7.21.3":
version "7.21.3"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.3.tgz#1d285d67a19162ff9daa358d4cb41d50c06220b3"
integrity sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==
@@ 372,17 418,6 @@
"@babel/helper-plugin-utils" "^7.18.6"
"@babel/plugin-syntax-class-static-block" "^7.14.5"
-"@babel/plugin-proposal-decorators@^7.21.0":
- version "7.21.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.21.0.tgz#70e0c89fdcd7465c97593edb8f628ba6e4199d63"
- integrity sha512-MfgX49uRrFUTL/HvWtmx3zmpyzMMr4MTj3d527MLlr/4RTT9G/ytFFP7qet2uM2Ve03b+BkpWUpK+lRXnQ+v9w==
- dependencies:
- "@babel/helper-create-class-features-plugin" "^7.21.0"
- "@babel/helper-plugin-utils" "^7.20.2"
- "@babel/helper-replace-supers" "^7.20.7"
- "@babel/helper-split-export-declaration" "^7.18.6"
- "@babel/plugin-syntax-decorators" "^7.21.0"
-
"@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"
@@ 513,13 548,6 @@
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-syntax-decorators@^7.21.0":
- version "7.21.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.21.0.tgz#d2b3f31c3e86fa86e16bb540b7660c55bd7d0e78"
- integrity sha512-tIoPpGBR8UuM4++ccWN3gifhVvQu7ZizuR1fklhRJrd5ewgbkUS+0KVFeWWxELtn18NTLoW32XV7zyOgIAiz+w==
- dependencies:
- "@babel/helper-plugin-utils" "^7.20.2"
-
"@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"
@@ 1054,7 1082,7 @@
dependencies:
regenerator-runtime "^0.13.11"
-"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3":
+"@babel/template@^7.18.10", "@babel/template@^7.20.7":
version "7.20.7"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
@@ 1063,7 1091,16 @@
"@babel/parser" "^7.20.7"
"@babel/types" "^7.20.7"
-"@babel/traverse@^7.18.10", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.3", "@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.18.10", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.3":
version "7.21.3"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.3.tgz#4747c5e7903d224be71f90788b06798331896f67"
integrity sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==
@@ 1079,7 1116,39 @@
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+"@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/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==
+ dependencies:
+ "@babel/helper-validator-identifier" "^7.18.6"
+ to-fast-properties "^2.0.0"
+
+"@babel/types@^7.18.10", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.3":
version "7.21.3"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.3.tgz#4865a5357ce40f64e3400b0f3b737dc6d4f64d05"
integrity sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==
@@ 6118,14 6187,6 @@ is-module@^1.0.0:
resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
-is-nan@^1.3.2:
- version "1.3.2"
- resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
- integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
- dependencies:
- call-bind "^1.0.0"
- define-properties "^1.1.3"
-
is-negative-zero@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"