From 44d110c0db8da42b593676c1a26c2cc095ebc38f Mon Sep 17 00:00:00 2001 From: orzyyyy Date: Tue, 6 Aug 2019 15:09:07 +0800 Subject: [PATCH] feat: add extend from prettier/react --- .eslintrc.js | 1 + components/button/button.tsx | 2 +- components/modal/confirm.tsx | 1 + site/theme/template/Home/index.jsx | 2 +- site/theme/template/Layout/index.jsx | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 57aad8877f..b1ec7be375 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -5,6 +5,7 @@ const eslintrc = { 'plugin:jest/recommended', 'plugin:react/recommended', 'plugin:import/typescript', + 'prettier/react', ], env: { browser: true, diff --git a/components/button/button.tsx b/components/button/button.tsx index 20071065b9..58b4823a55 100644 --- a/components/button/button.tsx +++ b/components/button/button.tsx @@ -170,7 +170,7 @@ class Button extends React.Component { if (loading && typeof loading !== 'boolean' && loading.delay) { this.delayTimeout = window.setTimeout(() => this.setState({ loading }), loading.delay); } else if (prevProps.loading !== this.props.loading) { - // eslint-disable-next-line react/no-did-update-set-state */ + // eslint-disable-next-line react/no-did-update-set-state this.setState({ loading }); } } diff --git a/components/modal/confirm.tsx b/components/modal/confirm.tsx index 9b1955e83f..89801b11e7 100644 --- a/components/modal/confirm.tsx +++ b/components/modal/confirm.tsx @@ -137,6 +137,7 @@ export default function confirm(config: ModalFuncProps) { } for (let i = 0; i < destroyFns.length; i++) { const fn = destroyFns[i]; + // eslint-disable-next-line no-use-before-define if (fn === close) { destroyFns.splice(i, 1); break; diff --git a/site/theme/template/Home/index.jsx b/site/theme/template/Home/index.jsx index 8259edf403..442f0acebb 100644 --- a/site/theme/template/Home/index.jsx +++ b/site/theme/template/Home/index.jsx @@ -58,7 +58,7 @@ function getStyle() { `; } -// eslint-disable-next-line react/prefer-stateless-function */ +// eslint-disable-next-line react/prefer-stateless-function class Home extends React.Component { static contextTypes = { intl: PropTypes.object.isRequired, diff --git a/site/theme/template/Layout/index.jsx b/site/theme/template/Layout/index.jsx index ca5f272fe4..b4b22df965 100644 --- a/site/theme/template/Layout/index.jsx +++ b/site/theme/template/Layout/index.jsx @@ -27,8 +27,8 @@ if (typeof window !== 'undefined') { // Expose to iframe window.react = React; window['react-dom'] = ReactDOM; + // eslint-disable-next-line global-require window.antd = require('antd'); - /* eslint-enable global-require */ // Error log statistic window.addEventListener('error', function onError(e) {