From 0a103c774977cda29e5c02e697b4632f98bcc621 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Thu, 18 Jan 2018 00:57:15 +0900 Subject: [PATCH] Upgrade ESLint to version 4.x (#6276) --- .codeclimate.yml | 1 + .eslintrc.yml | 19 +- .../mastodon/components/attachment_list.js | 4 +- .../mastodon/components/collapsable.js | 4 +- .../mastodon/components/icon_button.js | 4 +- app/javascript/mastodon/components/status.js | 18 +- .../features/account/components/header.js | 4 +- .../features/account_gallery/index.js | 4 +- .../compose/components/privacy_dropdown.js | 4 +- .../compose/components/search_results.js | 4 +- .../mastodon/features/compose/index.js | 4 +- .../features/compose/util/url_regex.js | 192 +++---- .../features/emoji/__tests__/emoji-test.js | 4 +- .../mastodon/features/list_editor/index.js | 4 +- .../features/ui/components/column_header.js | 2 +- .../features/ui/components/modal_root.js | 12 +- .../features/ui/components/upload_area.js | 4 +- package.json | 10 +- yarn.lock | 501 +++++++++--------- 19 files changed, 411 insertions(+), 388 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index 47e3e6ab9db..21e6b33bf01 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -27,6 +27,7 @@ plugins: enabled: true eslint: enabled: true + channel: eslint-4 rubocop: enabled: true scss-lint: diff --git a/.eslintrc.yml b/.eslintrc.yml index 7c6da9d57a0..cf276a16fd3 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -17,11 +17,9 @@ plugins: parserOptions: sourceType: module ecmaFeatures: - arrowFunctions: true + experimentalObjectRestSpread: true jsx: true - destructuring: true - modules: true - spread: true + ecmaVersion: 2018 settings: import/extensions: @@ -109,6 +107,7 @@ rules: react/self-closing-comp: error jsx-a11y/accessible-emoji: warn + jsx-a11y/alt-text: warn jsx-a11y/anchor-has-content: warn jsx-a11y/aria-activedescendant-has-tabindex: warn jsx-a11y/aria-props: warn @@ -119,16 +118,22 @@ rules: jsx-a11y/href-no-hash: warn jsx-a11y/html-has-lang: warn jsx-a11y/iframe-has-title: warn - jsx-a11y/img-has-alt: warn jsx-a11y/img-redundant-alt: warn + jsx-a11y/interactive-supports-focus: warn jsx-a11y/label-has-for: off jsx-a11y/mouse-events-have-key-events: warn jsx-a11y/no-access-key: warn jsx-a11y/no-distracting-elements: warn + jsx-a11y/no-noninteractive-element-interactions: + - warn + - handlers: + - onClick jsx-a11y/no-onchange: warn jsx-a11y/no-redundant-roles: warn - jsx-a11y/onclick-has-focus: warn - jsx-a11y/onclick-has-role: warn + jsx-a11y/no-static-element-interactions: + - warn + - handlers: + - onClick jsx-a11y/role-has-required-aria-props: warn jsx-a11y/role-supports-aria-props: off jsx-a11y/scope: warn diff --git a/app/javascript/mastodon/components/attachment_list.js b/app/javascript/mastodon/components/attachment_list.js index b3d00b33573..9f2d46ddd76 100644 --- a/app/javascript/mastodon/components/attachment_list.js +++ b/app/javascript/mastodon/components/attachment_list.js @@ -20,11 +20,11 @@ export default class AttachmentList extends ImmutablePureComponent { ); diff --git a/app/javascript/mastodon/components/collapsable.js b/app/javascript/mastodon/components/collapsable.js index 42ea37ec229..d5d43118648 100644 --- a/app/javascript/mastodon/components/collapsable.js +++ b/app/javascript/mastodon/components/collapsable.js @@ -5,11 +5,11 @@ import PropTypes from 'prop-types'; const Collapsable = ({ fullHeight, isVisible, children }) => ( - {({ opacity, height }) => + {({ opacity, height }) => (
{children}
- } + )}
); diff --git a/app/javascript/mastodon/components/icon_button.js b/app/javascript/mastodon/components/icon_button.js index 06f53841d23..b96e48fd099 100644 --- a/app/javascript/mastodon/components/icon_button.js +++ b/app/javascript/mastodon/components/icon_button.js @@ -93,7 +93,7 @@ export default class IconButton extends React.PureComponent { return ( - {({ rotate }) => + {({ rotate }) => (