M .eslintrc.js => .eslintrc.js +4 -1
@@ 43,7 43,7 @@ module.exports = {
version: 'detect',
},
'import/extensions': [
- '.js',
+ '.js', '.jsx',
],
'import/ignore': [
'node_modules',
@@ 52,6 52,7 @@ module.exports = {
'import/resolver': {
node: {
paths: ['app/javascript'],
+ extensions: ['.js', '.jsx'],
},
},
},
@@ 111,6 112,7 @@ module.exports = {
semi: 'error',
'valid-typeof': 'error',
+ 'react/jsx-filename-extension': ['error', { 'allow': 'as-needed' }],
'react/jsx-boolean-value': 'error',
'react/jsx-closing-bracket-location': ['error', 'line-aligned'],
'react/jsx-curly-spacing': 'error',
@@ 185,6 187,7 @@ module.exports = {
'always',
{
js: 'never',
+ jsx: 'never',
},
],
'import/newline-after-import': 'error',
M .github/workflows/lint-js.yml => .github/workflows/lint-js.yml +2 -0
@@ 10,6 10,7 @@ on:
- '.prettier*'
- '.eslint*'
- '**/*.js'
+ - '**/*.jsx'
- '.github/workflows/lint-js.yml'
pull_request:
@@ 20,6 21,7 @@ on:
- '.prettier*'
- '.eslint*'
- '**/*.js'
+ - '**/*.jsx'
- '.github/workflows/lint-js.yml'
jobs:
M .github/workflows/test-js.yml => .github/workflows/test-js.yml +2 -0
@@ 8,6 8,7 @@ on:
- 'yarn.lock'
- '.nvmrc'
- '**/*.js'
+ - '**/*.jsx'
- '**/*.snap'
- '.github/workflows/test-js.yml'
@@ 17,6 18,7 @@ on:
- 'yarn.lock'
- '.nvmrc'
- '**/*.js'
+ - '**/*.jsx'
- '**/*.snap'
- '.github/workflows/test-js.yml'
R app/javascript/mastodon/components/__tests__/__snapshots__/autosuggest_emoji-test.js.snap => app/javascript/mastodon/components/__tests__/__snapshots__/autosuggest_emoji-test.jsx.snap +0 -0
R app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.js.snap => app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.jsx.snap +0 -0
R app/javascript/mastodon/components/__tests__/__snapshots__/avatar_overlay-test.js.snap => app/javascript/mastodon/components/__tests__/__snapshots__/avatar_overlay-test.jsx.snap +0 -0
R app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap => app/javascript/mastodon/components/__tests__/__snapshots__/button-test.jsx.snap +0 -0
R app/javascript/mastodon/components/__tests__/__snapshots__/display_name-test.js.snap => app/javascript/mastodon/components/__tests__/__snapshots__/display_name-test.jsx.snap +0 -0
R app/javascript/mastodon/components/__tests__/autosuggest_emoji-test.js => app/javascript/mastodon/components/__tests__/autosuggest_emoji-test.jsx +0 -0
R app/javascript/mastodon/components/__tests__/avatar-test.js => app/javascript/mastodon/components/__tests__/avatar-test.jsx +0 -0
R app/javascript/mastodon/components/__tests__/avatar_overlay-test.js => app/javascript/mastodon/components/__tests__/avatar_overlay-test.jsx +0 -0
R app/javascript/mastodon/components/__tests__/button-test.js => app/javascript/mastodon/components/__tests__/button-test.jsx +0 -0
R app/javascript/mastodon/components/__tests__/display_name-test.js => app/javascript/mastodon/components/__tests__/display_name-test.jsx +0 -0
R app/javascript/mastodon/components/account.js => app/javascript/mastodon/components/account.jsx +0 -0
R app/javascript/mastodon/components/admin/Counter.js => app/javascript/mastodon/components/admin/Counter.jsx +0 -0
R app/javascript/mastodon/components/admin/Dimension.js => app/javascript/mastodon/components/admin/Dimension.jsx +0 -0
R app/javascript/mastodon/components/admin/ReportReasonSelector.js => app/javascript/mastodon/components/admin/ReportReasonSelector.jsx +0 -0
R app/javascript/mastodon/components/admin/Retention.js => app/javascript/mastodon/components/admin/Retention.jsx +0 -0
R app/javascript/mastodon/components/admin/Trends.js => app/javascript/mastodon/components/admin/Trends.jsx +0 -0
R app/javascript/mastodon/components/animated_number.js => app/javascript/mastodon/components/animated_number.jsx +0 -0
R app/javascript/mastodon/components/attachment_list.js => app/javascript/mastodon/components/attachment_list.jsx +0 -0
R app/javascript/mastodon/components/autosuggest_emoji.js => app/javascript/mastodon/components/autosuggest_emoji.jsx +0 -0
R app/javascript/mastodon/components/autosuggest_hashtag.js => app/javascript/mastodon/components/autosuggest_hashtag.jsx +0 -0
R app/javascript/mastodon/components/autosuggest_input.js => app/javascript/mastodon/components/autosuggest_input.jsx +0 -0
R app/javascript/mastodon/components/autosuggest_textarea.js => app/javascript/mastodon/components/autosuggest_textarea.jsx +0 -0
R app/javascript/mastodon/components/avatar.js => app/javascript/mastodon/components/avatar.jsx +0 -0
R app/javascript/mastodon/components/avatar_composite.js => app/javascript/mastodon/components/avatar_composite.jsx +0 -0
R app/javascript/mastodon/components/avatar_overlay.js => app/javascript/mastodon/components/avatar_overlay.jsx +0 -0
R app/javascript/mastodon/components/blurhash.js => app/javascript/mastodon/components/blurhash.jsx +0 -0
R app/javascript/mastodon/components/button.js => app/javascript/mastodon/components/button.jsx +0 -0
R app/javascript/mastodon/components/check.js => app/javascript/mastodon/components/check.jsx +0 -0
R app/javascript/mastodon/components/column.js => app/javascript/mastodon/components/column.jsx +0 -0
R app/javascript/mastodon/components/column_back_button.js => app/javascript/mastodon/components/column_back_button.jsx +0 -0
R app/javascript/mastodon/components/column_back_button_slim.js => app/javascript/mastodon/components/column_back_button_slim.jsx +0 -0
R app/javascript/mastodon/components/column_header.js => app/javascript/mastodon/components/column_header.jsx +0 -0
R app/javascript/mastodon/components/common_counter.js => app/javascript/mastodon/components/common_counter.jsx +0 -0
R app/javascript/mastodon/components/dismissable_banner.js => app/javascript/mastodon/components/dismissable_banner.jsx +0 -0
R app/javascript/mastodon/components/display_name.js => app/javascript/mastodon/components/display_name.jsx +0 -0
R app/javascript/mastodon/components/domain.js => app/javascript/mastodon/components/domain.jsx +0 -0
R => +0 -0
R app/javascript/mastodon/components/edited_timestamp/index.js => app/javascript/mastodon/components/edited_timestamp/index.jsx +0 -0
R app/javascript/mastodon/components/error_boundary.js => app/javascript/mastodon/components/error_boundary.jsx +0 -0
R app/javascript/mastodon/components/gifv.js => app/javascript/mastodon/components/gifv.jsx +0 -0
R app/javascript/mastodon/components/hashtag.js => app/javascript/mastodon/components/hashtag.jsx +0 -0
R app/javascript/mastodon/components/icon.js => app/javascript/mastodon/components/icon.jsx +0 -0
R app/javascript/mastodon/components/icon_button.js => app/javascript/mastodon/components/icon_button.jsx +0 -0
R app/javascript/mastodon/components/icon_with_badge.js => app/javascript/mastodon/components/icon_with_badge.jsx +0 -0
R app/javascript/mastodon/components/image.js => app/javascript/mastodon/components/image.jsx +0 -0
R app/javascript/mastodon/components/inline_account.js => app/javascript/mastodon/components/inline_account.jsx +0 -0
R app/javascript/mastodon/components/intersection_observer_article.js => app/javascript/mastodon/components/intersection_observer_article.jsx +0 -0
R app/javascript/mastodon/components/load_gap.js => app/javascript/mastodon/components/load_gap.jsx +0 -0
R app/javascript/mastodon/components/load_more.js => app/javascript/mastodon/components/load_more.jsx +0 -0
R app/javascript/mastodon/components/load_pending.js => app/javascript/mastodon/components/load_pending.jsx +0 -0
R app/javascript/mastodon/components/loading_indicator.js => app/javascript/mastodon/components/loading_indicator.jsx +0 -0
R app/javascript/mastodon/components/logo.js => app/javascript/mastodon/components/logo.jsx +0 -0
R app/javascript/mastodon/components/media_attachments.js => app/javascript/mastodon/components/media_attachments.jsx +0 -0
R app/javascript/mastodon/components/media_gallery.js => app/javascript/mastodon/components/media_gallery.jsx +0 -0
R app/javascript/mastodon/components/missing_indicator.js => app/javascript/mastodon/components/missing_indicator.jsx +0 -0
R app/javascript/mastodon/components/modal_root.js => app/javascript/mastodon/components/modal_root.jsx +0 -0
R app/javascript/mastodon/components/navigation_portal.js => app/javascript/mastodon/components/navigation_portal.jsx +0 -0
R app/javascript/mastodon/components/not_signed_in_indicator.js => app/javascript/mastodon/components/not_signed_in_indicator.jsx +0 -0
R app/javascript/mastodon/components/picture_in_picture_placeholder.js => app/javascript/mastodon/components/picture_in_picture_placeholder.jsx +0 -0
R app/javascript/mastodon/components/poll.js => app/javascript/mastodon/components/poll.jsx +0 -0
R app/javascript/mastodon/components/radio_button.js => app/javascript/mastodon/components/radio_button.jsx +0 -0
R app/javascript/mastodon/components/regeneration_indicator.js => app/javascript/mastodon/components/regeneration_indicator.jsx +0 -0
R app/javascript/mastodon/components/relative_timestamp.js => app/javascript/mastodon/components/relative_timestamp.jsx +0 -0
R app/javascript/mastodon/components/scrollable_list.js => app/javascript/mastodon/components/scrollable_list.jsx +0 -0
R app/javascript/mastodon/components/server_banner.js => app/javascript/mastodon/components/server_banner.jsx +0 -0
R app/javascript/mastodon/components/short_number.js => app/javascript/mastodon/components/short_number.jsx +0 -0
R app/javascript/mastodon/components/skeleton.js => app/javascript/mastodon/components/skeleton.jsx +0 -0
R app/javascript/mastodon/components/status.js => app/javascript/mastodon/components/status.jsx +0 -0
R app/javascript/mastodon/components/status_action_bar.js => app/javascript/mastodon/components/status_action_bar.jsx +0 -0
R app/javascript/mastodon/components/status_content.js => app/javascript/mastodon/components/status_content.jsx +0 -0
R app/javascript/mastodon/components/status_list.js => app/javascript/mastodon/components/status_list.jsx +0 -0
R app/javascript/mastodon/components/timeline_hint.js => app/javascript/mastodon/components/timeline_hint.jsx +0 -0
R app/javascript/mastodon/containers/account_container.js => app/javascript/mastodon/containers/account_container.jsx +0 -0
R app/javascript/mastodon/containers/admin_component.js => app/javascript/mastodon/containers/admin_component.jsx +0 -0
R app/javascript/mastodon/containers/compose_container.js => app/javascript/mastodon/containers/compose_container.jsx +0 -0
R app/javascript/mastodon/containers/domain_container.js => app/javascript/mastodon/containers/domain_container.jsx +0 -0
R app/javascript/mastodon/containers/mastodon.js => app/javascript/mastodon/containers/mastodon.jsx +0 -0
R app/javascript/mastodon/containers/media_container.js => app/javascript/mastodon/containers/media_container.jsx +0 -0
R app/javascript/mastodon/containers/status_container.js => app/javascript/mastodon/containers/status_container.jsx +0 -0
R app/javascript/mastodon/features/about/index.js => app/javascript/mastodon/features/about/index.jsx +0 -0
R app/javascript/mastodon/features/account/components/account_note.js => app/javascript/mastodon/features/account/components/account_note.jsx +0 -0
R app/javascript/mastodon/features/account/components/featured_tags.js => app/javascript/mastodon/features/account/components/featured_tags.jsx +0 -0
R app/javascript/mastodon/features/account/components/follow_request_note.js => app/javascript/mastodon/features/account/components/follow_request_note.jsx +0 -0
R => +0 -0
R app/javascript/mastodon/features/account/navigation.js => app/javascript/mastodon/features/account/navigation.jsx +0 -0
R app/javascript/mastodon/features/account_gallery/components/media_item.js => app/javascript/mastodon/features/account_gallery/components/media_item.jsx +0 -0
R app/javascript/mastodon/features/account_gallery/index.js => app/javascript/mastodon/features/account_gallery/index.jsx +0 -0
R => +0 -0
R app/javascript/mastodon/features/account_timeline/components/limited_account_hint.js => app/javascript/mastodon/features/account_timeline/components/limited_account_hint.jsx +0 -0
R app/javascript/mastodon/features/account_timeline/components/moved_note.js => app/javascript/mastodon/features/account_timeline/components/moved_note.jsx +0 -0
R => +0 -0
R app/javascript/mastodon/features/account_timeline/index.js => app/javascript/mastodon/features/account_timeline/index.jsx +0 -0
R app/javascript/mastodon/features/audio/index.js => app/javascript/mastodon/features/audio/index.jsx +0 -0
R app/javascript/mastodon/features/blocks/index.js => app/javascript/mastodon/features/blocks/index.jsx +0 -0
R app/javascript/mastodon/features/bookmarked_statuses/index.js => app/javascript/mastodon/features/bookmarked_statuses/index.jsx +0 -0
R app/javascript/mastodon/features/closed_registrations_modal/index.js => app/javascript/mastodon/features/closed_registrations_modal/index.jsx +0 -0
R app/javascript/mastodon/features/community_timeline/components/column_settings.js => app/javascript/mastodon/features/community_timeline/components/column_settings.jsx +0 -0
R => +0 -0
R app/javascript/mastodon/features/compose/components/action_bar.js => app/javascript/mastodon/features/compose/components/action_bar.jsx +0 -0
R app/javascript/mastodon/features/compose/components/autosuggest_account.js => app/javascript/mastodon/features/compose/components/autosuggest_account.jsx +0 -0
R app/javascript/mastodon/features/compose/components/character_counter.js => app/javascript/mastodon/features/compose/components/character_counter.jsx +0 -0
R app/javascript/mastodon/features/compose/components/compose_form.js => app/javascript/mastodon/features/compose/components/compose_form.jsx +0 -0
R app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js => app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx +0 -0
R app/javascript/mastodon/features/compose/components/language_dropdown.js => app/javascript/mastodon/features/compose/components/language_dropdown.jsx +0 -0
R app/javascript/mastodon/features/compose/components/navigation_bar.js => app/javascript/mastodon/features/compose/components/navigation_bar.jsx +0 -0
R app/javascript/mastodon/features/compose/components/poll_button.js => app/javascript/mastodon/features/compose/components/poll_button.jsx +0 -0
R app/javascript/mastodon/features/compose/components/poll_form.js => app/javascript/mastodon/features/compose/components/poll_form.jsx +0 -0
R app/javascript/mastodon/features/compose/components/privacy_dropdown.js => app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx +0 -0
R app/javascript/mastodon/features/compose/components/reply_indicator.js => app/javascript/mastodon/features/compose/components/reply_indicator.jsx +0 -0
R app/javascript/mastodon/features/compose/components/search.js => app/javascript/mastodon/features/compose/components/search.jsx +0 -0
R app/javascript/mastodon/features/compose/components/search_results.js => app/javascript/mastodon/features/compose/components/search_results.jsx +0 -0
R app/javascript/mastodon/features/compose/components/text_icon_button.js => app/javascript/mastodon/features/compose/components/text_icon_button.jsx +0 -0
R app/javascript/mastodon/features/compose/components/upload.js => app/javascript/mastodon/features/compose/components/upload.jsx +0 -0
R app/javascript/mastodon/features/compose/components/upload_button.js => app/javascript/mastodon/features/compose/components/upload_button.jsx +0 -0
R app/javascript/mastodon/features/compose/components/upload_form.js => app/javascript/mastodon/features/compose/components/upload_form.jsx +0 -0
R app/javascript/mastodon/features/compose/components/upload_progress.js => app/javascript/mastodon/features/compose/components/upload_progress.jsx +0 -0
R app/javascript/mastodon/features/compose/components/warning.js => app/javascript/mastodon/features/compose/components/warning.jsx +0 -0
R app/javascript/mastodon/features/compose/containers/sensitive_button_container.js => app/javascript/mastodon/features/compose/containers/sensitive_button_container.jsx +0 -0
R app/javascript/mastodon/features/compose/containers/warning_container.js => app/javascript/mastodon/features/compose/containers/warning_container.jsx +0 -0
R app/javascript/mastodon/features/compose/index.js => app/javascript/mastodon/features/compose/index.jsx +0 -0
R app/javascript/mastodon/features/direct_timeline/components/conversation.js => app/javascript/mastodon/features/direct_timeline/components/conversation.jsx +0 -0
R app/javascript/mastodon/features/direct_timeline/components/conversations_list.js => app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx +0 -0
R app/javascript/mastodon/features/direct_timeline/index.js => app/javascript/mastodon/features/direct_timeline/index.jsx +0 -0
R app/javascript/mastodon/features/directory/components/account_card.js => app/javascript/mastodon/features/directory/components/account_card.jsx +0 -0
R app/javascript/mastodon/features/directory/index.js => app/javascript/mastodon/features/directory/index.jsx +0 -0
R app/javascript/mastodon/features/domain_blocks/index.js => app/javascript/mastodon/features/domain_blocks/index.jsx +0 -0
R app/javascript/mastodon/features/explore/components/story.js => app/javascript/mastodon/features/explore/components/story.jsx +0 -0
R app/javascript/mastodon/features/explore/index.js => app/javascript/mastodon/features/explore/index.jsx +0 -0
R app/javascript/mastodon/features/explore/links.js => app/javascript/mastodon/features/explore/links.jsx +0 -0
R app/javascript/mastodon/features/explore/results.js => app/javascript/mastodon/features/explore/results.jsx +0 -0
R app/javascript/mastodon/features/explore/statuses.js => app/javascript/mastodon/features/explore/statuses.jsx +0 -0
R app/javascript/mastodon/features/explore/suggestions.js => app/javascript/mastodon/features/explore/suggestions.jsx +0 -0
R app/javascript/mastodon/features/explore/tags.js => app/javascript/mastodon/features/explore/tags.jsx +0 -0
R app/javascript/mastodon/features/favourited_statuses/index.js => app/javascript/mastodon/features/favourited_statuses/index.jsx +0 -0
R app/javascript/mastodon/features/favourites/index.js => app/javascript/mastodon/features/favourites/index.jsx +0 -0
R app/javascript/mastodon/features/filters/added_to_filter.js => app/javascript/mastodon/features/filters/added_to_filter.jsx +0 -0
R app/javascript/mastodon/features/filters/select_filter.js => app/javascript/mastodon/features/filters/select_filter.jsx +0 -0
R app/javascript/mastodon/features/follow_recommendations/components/account.js => app/javascript/mastodon/features/follow_recommendations/components/account.jsx +0 -0
R app/javascript/mastodon/features/follow_recommendations/index.js => app/javascript/mastodon/features/follow_recommendations/index.jsx +0 -0
R app/javascript/mastodon/features/follow_requests/components/account_authorize.js => app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx +0 -0
R app/javascript/mastodon/features/follow_requests/index.js => app/javascript/mastodon/features/follow_requests/index.jsx +0 -0
R app/javascript/mastodon/features/followed_tags/index.js => app/javascript/mastodon/features/followed_tags/index.jsx +0 -0
R app/javascript/mastodon/features/followers/index.js => app/javascript/mastodon/features/followers/index.jsx +0 -0
R app/javascript/mastodon/features/following/index.js => app/javascript/mastodon/features/following/index.jsx +0 -0
R app/javascript/mastodon/features/generic_not_found/index.js => app/javascript/mastodon/features/generic_not_found/index.jsx +0 -0
R app/javascript/mastodon/features/getting_started/components/announcements.js => app/javascript/mastodon/features/getting_started/components/announcements.jsx +0 -0
R app/javascript/mastodon/features/getting_started/components/trends.js => app/javascript/mastodon/features/getting_started/components/trends.jsx +0 -0
R app/javascript/mastodon/features/getting_started/index.js => app/javascript/mastodon/features/getting_started/index.jsx +0 -0
R app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js => app/javascript/mastodon/features/hashtag_timeline/components/column_settings.jsx +0 -0
R app/javascript/mastodon/features/hashtag_timeline/index.js => app/javascript/mastodon/features/hashtag_timeline/index.jsx +0 -0
R app/javascript/mastodon/features/home_timeline/components/column_settings.js => app/javascript/mastodon/features/home_timeline/components/column_settings.jsx +0 -0
R app/javascript/mastodon/features/home_timeline/index.js => app/javascript/mastodon/features/home_timeline/index.jsx +0 -0
R app/javascript/mastodon/features/interaction_modal/index.js => app/javascript/mastodon/features/interaction_modal/index.jsx +0 -0
R app/javascript/mastodon/features/keyboard_shortcuts/index.js => app/javascript/mastodon/features/keyboard_shortcuts/index.jsx +0 -0
R app/javascript/mastodon/features/list_adder/components/account.js => app/javascript/mastodon/features/list_adder/components/account.jsx +0 -0
R app/javascript/mastodon/features/list_adder/components/list.js => app/javascript/mastodon/features/list_adder/components/list.jsx +0 -0
R app/javascript/mastodon/features/list_adder/index.js => app/javascript/mastodon/features/list_adder/index.jsx +0 -0
R app/javascript/mastodon/features/list_editor/components/account.js => app/javascript/mastodon/features/list_editor/components/account.jsx +0 -0
R app/javascript/mastodon/features/list_editor/components/edit_list_form.js => app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx +0 -0
R app/javascript/mastodon/features/list_editor/components/search.js => app/javascript/mastodon/features/list_editor/components/search.jsx +0 -0
R app/javascript/mastodon/features/list_editor/index.js => app/javascript/mastodon/features/list_editor/index.jsx +0 -0
R app/javascript/mastodon/features/list_timeline/index.js => app/javascript/mastodon/features/list_timeline/index.jsx +0 -0
R app/javascript/mastodon/features/lists/components/new_list_form.js => app/javascript/mastodon/features/lists/components/new_list_form.jsx +0 -0
R app/javascript/mastodon/features/lists/index.js => app/javascript/mastodon/features/lists/index.jsx +0 -0
R app/javascript/mastodon/features/mutes/index.js => app/javascript/mastodon/features/mutes/index.jsx +0 -0
R app/javascript/mastodon/features/notifications/components/clear_column_button.js => app/javascript/mastodon/features/notifications/components/clear_column_button.jsx +0 -0
R app/javascript/mastodon/features/notifications/components/column_settings.js => app/javascript/mastodon/features/notifications/components/column_settings.jsx +0 -0
R app/javascript/mastodon/features/notifications/components/filter_bar.js => app/javascript/mastodon/features/notifications/components/filter_bar.jsx +0 -0
R app/javascript/mastodon/features/notifications/components/follow_request.js => app/javascript/mastodon/features/notifications/components/follow_request.jsx +0 -0
R app/javascript/mastodon/features/notifications/components/grant_permission_button.js => app/javascript/mastodon/features/notifications/components/grant_permission_button.jsx +0 -0
R app/javascript/mastodon/features/notifications/components/notification.js => app/javascript/mastodon/features/notifications/components/notification.jsx +0 -0
R app/javascript/mastodon/features/notifications/components/notifications_permission_banner.js => app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx +0 -0
R app/javascript/mastodon/features/notifications/components/report.js => app/javascript/mastodon/features/notifications/components/report.jsx +0 -0
R app/javascript/mastodon/features/notifications/components/setting_toggle.js => app/javascript/mastodon/features/notifications/components/setting_toggle.jsx +0 -0
R app/javascript/mastodon/features/notifications/index.js => app/javascript/mastodon/features/notifications/index.jsx +0 -0
R => +0 -0
R => +0 -0
R app/javascript/mastodon/features/picture_in_picture/index.js => app/javascript/mastodon/features/picture_in_picture/index.jsx +0 -0
R app/javascript/mastodon/features/pinned_statuses/index.js => app/javascript/mastodon/features/pinned_statuses/index.jsx +0 -0
R app/javascript/mastodon/features/privacy_policy/index.js => app/javascript/mastodon/features/privacy_policy/index.jsx +0 -0
R app/javascript/mastodon/features/public_timeline/components/column_settings.js => app/javascript/mastodon/features/public_timeline/components/column_settings.jsx +0 -0
R app/javascript/mastodon/features/public_timeline/index.js => app/javascript/mastodon/features/public_timeline/index.jsx +0 -0
R app/javascript/mastodon/features/reblogs/index.js => app/javascript/mastodon/features/reblogs/index.jsx +0 -0
R app/javascript/mastodon/features/report/category.js => app/javascript/mastodon/features/report/category.jsx +0 -0
R => +0 -0
R app/javascript/mastodon/features/report/components/option.js => app/javascript/mastodon/features/report/components/option.jsx +0 -0
R app/javascript/mastodon/features/report/components/status_check_box.js => app/javascript/mastodon/features/report/components/status_check_box.jsx +0 -0
R app/javascript/mastodon/features/report/rules.js => app/javascript/mastodon/features/report/rules.jsx +0 -0
R app/javascript/mastodon/features/report/statuses.js => app/javascript/mastodon/features/report/statuses.jsx +0 -0
R app/javascript/mastodon/features/report/thanks.js => app/javascript/mastodon/features/report/thanks.jsx +0 -0
R app/javascript/mastodon/features/standalone/compose/index.js => app/javascript/mastodon/features/standalone/compose/index.jsx +0 -0
R app/javascript/mastodon/features/status/components/action_bar.js => app/javascript/mastodon/features/status/components/action_bar.jsx +0 -0
R app/javascript/mastodon/features/status/components/card.js => app/javascript/mastodon/features/status/components/card.jsx +0 -0
R app/javascript/mastodon/features/status/components/detailed_status.js => app/javascript/mastodon/features/status/components/detailed_status.jsx +0 -0
R app/javascript/mastodon/features/status/index.js => app/javascript/mastodon/features/status/index.jsx +0 -0
R app/javascript/mastodon/features/subscribed_languages_modal/index.js => app/javascript/mastodon/features/subscribed_languages_modal/index.jsx +0 -0
R app/javascript/mastodon/features/ui/components/__tests__/column-test.js => app/javascript/mastodon/features/ui/components/__tests__/column-test.jsx +0 -0
R app/javascript/mastodon/features/ui/components/actions_modal.js => app/javascript/mastodon/features/ui/components/actions_modal.jsx +0 -0
R app/javascript/mastodon/features/ui/components/audio_modal.js => app/javascript/mastodon/features/ui/components/audio_modal.jsx +0 -0
R app/javascript/mastodon/features/ui/components/block_modal.js => app/javascript/mastodon/features/ui/components/block_modal.jsx +0 -0
R app/javascript/mastodon/features/ui/components/boost_modal.js => app/javascript/mastodon/features/ui/components/boost_modal.jsx +0 -0
R app/javascript/mastodon/features/ui/components/bundle.js => app/javascript/mastodon/features/ui/components/bundle.jsx +0 -0
R app/javascript/mastodon/features/ui/components/bundle_column_error.js => app/javascript/mastodon/features/ui/components/bundle_column_error.jsx +0 -0
R app/javascript/mastodon/features/ui/components/bundle_modal_error.js => app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx +0 -0
R app/javascript/mastodon/features/ui/components/column.js => app/javascript/mastodon/features/ui/components/column.jsx +0 -0
R app/javascript/mastodon/features/ui/components/column_header.js => app/javascript/mastodon/features/ui/components/column_header.jsx +0 -0
R app/javascript/mastodon/features/ui/components/column_link.js => app/javascript/mastodon/features/ui/components/column_link.jsx +0 -0
R app/javascript/mastodon/features/ui/components/column_loading.js => app/javascript/mastodon/features/ui/components/column_loading.jsx +0 -0
R app/javascript/mastodon/features/ui/components/column_subheading.js => app/javascript/mastodon/features/ui/components/column_subheading.jsx +0 -0
R app/javascript/mastodon/features/ui/components/columns_area.js => app/javascript/mastodon/features/ui/components/columns_area.jsx +0 -0
R app/javascript/mastodon/features/ui/components/compare_history_modal.js => app/javascript/mastodon/features/ui/components/compare_history_modal.jsx +0 -0
R app/javascript/mastodon/features/ui/components/compose_panel.js => app/javascript/mastodon/features/ui/components/compose_panel.jsx +0 -0
R app/javascript/mastodon/features/ui/components/confirmation_modal.js => app/javascript/mastodon/features/ui/components/confirmation_modal.jsx +0 -0
R app/javascript/mastodon/features/ui/components/disabled_account_banner.js => app/javascript/mastodon/features/ui/components/disabled_account_banner.jsx +0 -0
R app/javascript/mastodon/features/ui/components/drawer_loading.js => app/javascript/mastodon/features/ui/components/drawer_loading.jsx +0 -0
R app/javascript/mastodon/features/ui/components/embed_modal.js => app/javascript/mastodon/features/ui/components/embed_modal.jsx +0 -0
R app/javascript/mastodon/features/ui/components/filter_modal.js => app/javascript/mastodon/features/ui/components/filter_modal.jsx +0 -0
R app/javascript/mastodon/features/ui/components/focal_point_modal.js => app/javascript/mastodon/features/ui/components/focal_point_modal.jsx +0 -0
R app/javascript/mastodon/features/ui/components/follow_requests_column_link.js => app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx +0 -0
R => +0 -0
R app/javascript/mastodon/features/ui/components/image_loader.js => app/javascript/mastodon/features/ui/components/image_loader.jsx +0 -0
R app/javascript/mastodon/features/ui/components/image_modal.js => app/javascript/mastodon/features/ui/components/image_modal.jsx +0 -0
R => +0 -0
R app/javascript/mastodon/features/ui/components/list_panel.js => app/javascript/mastodon/features/ui/components/list_panel.jsx +0 -0
R app/javascript/mastodon/features/ui/components/media_modal.js => app/javascript/mastodon/features/ui/components/media_modal.jsx +0 -0
R app/javascript/mastodon/features/ui/components/modal_loading.js => app/javascript/mastodon/features/ui/components/modal_loading.jsx +0 -0
R app/javascript/mastodon/features/ui/components/modal_root.js => app/javascript/mastodon/features/ui/components/modal_root.jsx +0 -0
R app/javascript/mastodon/features/ui/components/mute_modal.js => app/javascript/mastodon/features/ui/components/mute_modal.jsx +0 -0
R app/javascript/mastodon/features/ui/components/navigation_panel.js => app/javascript/mastodon/features/ui/components/navigation_panel.jsx +0 -0
R app/javascript/mastodon/features/ui/components/report_modal.js => app/javascript/mastodon/features/ui/components/report_modal.jsx +0 -0
R app/javascript/mastodon/features/ui/components/sign_in_banner.js => app/javascript/mastodon/features/ui/components/sign_in_banner.jsx +0 -0
R app/javascript/mastodon/features/ui/components/upload_area.js => app/javascript/mastodon/features/ui/components/upload_area.jsx +0 -0
R app/javascript/mastodon/features/ui/components/video_modal.js => app/javascript/mastodon/features/ui/components/video_modal.jsx +0 -0
R app/javascript/mastodon/features/ui/components/zoomable_image.js => app/javascript/mastodon/features/ui/components/zoomable_image.jsx +0 -0
R app/javascript/mastodon/features/ui/index.js => app/javascript/mastodon/features/ui/index.jsx +0 -0
R app/javascript/mastodon/features/ui/util/react_router_helpers.js => app/javascript/mastodon/features/ui/util/react_router_helpers.jsx +0 -0
R app/javascript/mastodon/features/ui/util/reduced_motion.js => app/javascript/mastodon/features/ui/util/reduced_motion.jsx +0 -0
R app/javascript/mastodon/features/video/index.js => app/javascript/mastodon/features/video/index.jsx +0 -0
R app/javascript/mastodon/main.js => app/javascript/mastodon/main.jsx +0 -0
R app/javascript/mastodon/utils/icons.js => app/javascript/mastodon/utils/icons.jsx +0 -0
R app/javascript/packs/admin.js => app/javascript/packs/admin.jsx +0 -0
R app/javascript/packs/public.js => app/javascript/packs/public.jsx +0 -0
R app/javascript/packs/share.js => app/javascript/packs/share.jsx +0 -0
M config/webpacker.yml => config/webpacker.yml +1 -0
@@ 35,6 35,7 @@ default: &default
extensions:
- .mjs
- .js
+ - .jsx
- .sass
- .scss
- .css
M package.json => package.json +1 -1
@@ 12,7 12,7 @@
"start": "node ./streaming/index.js",
"test": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:jest",
"test:lint": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:lint:sass",
- "test:lint:js": "eslint --ext=js . --cache --report-unused-disable-directives",
+ "test:lint:js": "eslint --ext=.js,.jsx . --cache --report-unused-disable-directives",
"test:lint:sass": "stylelint \"**/*.{css,scss}\" && prettier --check \"**/*.{css,scss}\"",
"test:jest": "cross-env NODE_ENV=test jest",
"format": "prettier --write .",