From 637aa09bc5ecd725410308e408b5ffbc8b48868d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=81=8F=E5=8F=B3?= Date: Mon, 8 Jun 2020 18:01:50 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E2=9C=85=20fix=20some=20eslint=20prob?= =?UTF-8?q?lems=20(#24836)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * :lipstick: fix lint * :lipstick: fix lint --- .eslintrc.js | 40 ++++++++++----------- components/_util/easings.ts | 1 + components/_util/reactNode.ts | 2 +- components/affix/index.tsx | 1 + components/anchor/__tests__/Anchor.test.tsx | 9 +++-- components/auto-complete/index.tsx | 2 +- components/avatar/index.tsx | 13 +++++-- components/calendar/locale/ar_EG.tsx | 4 +-- components/calendar/locale/az_AZ.tsx | 4 +-- components/calendar/locale/bg_BG.tsx | 4 +-- components/calendar/locale/ca_ES.tsx | 4 +-- components/calendar/locale/cs_CZ.tsx | 4 +-- components/calendar/locale/da_DK.tsx | 4 +-- components/calendar/locale/de_DE.tsx | 4 +-- components/calendar/locale/el_GR.tsx | 4 +-- components/calendar/locale/en_GB.tsx | 4 +-- components/calendar/locale/en_US.tsx | 4 +-- components/calendar/locale/es_ES.tsx | 4 +-- components/calendar/locale/et_EE.tsx | 4 +-- components/calendar/locale/fa_IR.tsx | 4 +-- components/calendar/locale/fi_FI.tsx | 4 +-- components/calendar/locale/fr_BE.tsx | 4 +-- components/calendar/locale/fr_FR.tsx | 4 +-- components/calendar/locale/ga_IE.tsx | 4 +-- components/calendar/locale/he_IL.tsx | 4 +-- components/calendar/locale/hi_IN.tsx | 4 +-- components/calendar/locale/hr_HR.tsx | 4 +-- components/calendar/locale/hu_HU.tsx | 4 +-- components/calendar/locale/id_ID.tsx | 4 +-- components/calendar/locale/is_IS.tsx | 4 +-- components/calendar/locale/it_IT.tsx | 4 +-- components/calendar/locale/ja_JP.tsx | 4 +-- components/calendar/locale/kn_IN.tsx | 4 +-- components/calendar/locale/ko_KR.tsx | 4 +-- components/calendar/locale/ku_IQ.tsx | 4 +-- components/calendar/locale/lv_LV.tsx | 4 +-- components/calendar/locale/mk_MK.tsx | 4 +-- components/calendar/locale/mn_MN.tsx | 4 +-- components/calendar/locale/ms_MY.tsx | 4 +-- components/calendar/locale/nb_NO.tsx | 4 +-- components/calendar/locale/nl_BE.tsx | 4 +-- components/calendar/locale/nl_NL.tsx | 4 +-- components/calendar/locale/pl_PL.tsx | 4 +-- components/calendar/locale/pt_BR.tsx | 4 +-- components/calendar/locale/pt_PT.tsx | 4 +-- components/calendar/locale/ro_RO.tsx | 4 +-- components/calendar/locale/ru_RU.tsx | 4 +-- components/calendar/locale/sk_SK.tsx | 4 +-- components/calendar/locale/sl_SI.tsx | 4 +-- components/calendar/locale/sr_RS.tsx | 4 +-- components/calendar/locale/sv_SE.tsx | 4 +-- components/calendar/locale/ta_IN.tsx | 4 +-- components/calendar/locale/th_TH.tsx | 4 +-- components/calendar/locale/tr_TR.tsx | 4 +-- components/calendar/locale/uk_UA.tsx | 4 +-- components/calendar/locale/vi_VN.tsx | 4 +-- components/calendar/locale/zh_CN.tsx | 4 +-- components/calendar/locale/zh_TW.tsx | 4 +-- components/input/demo/align.md | 12 +++---- components/modal/Modal.tsx | 4 ++- components/result/index.tsx | 3 ++ components/tag/demo/animation.md | 4 ++- components/tag/demo/control.md | 8 +++-- components/transfer/index.tsx | 2 +- package.json | 2 +- scripts/azure-github-comment.js | 2 +- scripts/print-changelog.js | 4 +-- site/theme/template/Content/Demo/index.jsx | 2 +- site/theme/template/Resources/AffixTabs.tsx | 2 +- site/theme/template/Resources/index.tsx | 1 + webpack.config.js | 2 +- 71 files changed, 170 insertions(+), 150 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 1028b67970..7f1b06e122 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -50,19 +50,29 @@ module.exports = { 'react/no-multi-comp': 0, 'jsx-a11y/href-no-hash': 0, 'import/no-extraneous-dependencies': 0, - 'import/no-unresolved': 0, 'jsx-a11y/control-has-associated-label': 0, }, }, ], rules: { - camelcase: 0, 'react/jsx-one-expression-per-line': 0, 'react/prop-types': 0, 'react/forbid-prop-types': 0, 'react/jsx-indent': 0, 'react/jsx-wrap-multilines': ['error', { declaration: false, assignment: false }], + 'react/jsx-filename-extension': 0, + 'react/state-in-constructor': 0, + 'react/jsx-props-no-spreading': 0, + 'react/destructuring-assignment': 0, // TODO: remove later + 'react/require-default-props': 0, + 'react/sort-comp': 0, + 'react/display-name': 0, + 'react/static-property-placement': 0, + 'react/no-find-dom-node': 0, + 'react-hooks/rules-of-hooks': 2, // Checks rules of Hooks + 'import/extensions': 0, + 'import/no-cycle': 0, 'import/no-extraneous-dependencies': [ 'error', { @@ -82,38 +92,26 @@ module.exports = { 'jsx-a11y/click-events-have-key-events': 0, 'jsx-a11y/anchor-is-valid': 0, 'jsx-a11y/no-noninteractive-element-interactions': 0, - 'comma-dangle': ['error', 'always-multiline'], - 'react/jsx-filename-extension': 0, - 'react/state-in-constructor': 0, - 'react/jsx-props-no-spreading': 0, - 'prefer-destructuring': 0, // TODO: remove later - 'consistent-return': 0, // TODO: remove later - 'no-return-assign': 0, // TODO: remove later - 'no-param-reassign': 0, // TODO: remove later - 'react/destructuring-assignment': 0, // TODO: remove later - 'react/no-did-update-set-state': 0, // TODO: remove later - 'react/require-default-props': 0, - 'react/default-props-match-prop-types': 0, - 'import/no-cycle': 0, - 'react/no-find-dom-node': 0, - 'no-underscore-dangle': 0, - 'react/sort-comp': 0, // label-has-for has been deprecated // https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/label-has-for.md 'jsx-a11y/label-has-for': 0, + + 'comma-dangle': ['error', 'always-multiline'], + 'consistent-return': 0, // TODO: remove later + 'no-param-reassign': 0, // TODO: remove later + 'no-underscore-dangle': 0, // for (let i = 0; i < len; i++) 'no-plusplus': 0, // https://eslint.org/docs/rules/no-continue // labeledLoop is conflicted with `eslint . --fix` 'no-continue': 0, - 'react/display-name': 0, // ban this for Number.isNaN needs polyfill 'no-restricted-globals': 0, 'max-classes-per-file': 0, - 'react/static-property-placement': 0, + 'jest/no-test-callback': 0, 'jest/expect-expect': 0, - 'react-hooks/rules-of-hooks': 2, // Checks rules of Hooks + 'unicorn/better-regex': 2, 'unicorn/prefer-trim-start-end': 2, 'unicorn/expiring-todo-comments': 2, diff --git a/components/_util/easings.ts b/components/_util/easings.ts index 45f574a49f..594758ac8a 100644 --- a/components/_util/easings.ts +++ b/components/_util/easings.ts @@ -5,5 +5,6 @@ export function easeInOutCubic(t: number, b: number, c: number, d: number) { if (t < 1) { return (cc / 2) * t * t * t + b; } + // eslint-disable-next-line no-return-assign return (cc / 2) * ((t -= 2) * t * t + 2) + b; } diff --git a/components/_util/reactNode.ts b/components/_util/reactNode.ts index a9c671ff69..ac7c97e1a6 100644 --- a/components/_util/reactNode.ts +++ b/components/_util/reactNode.ts @@ -1,6 +1,6 @@ import * as React from 'react'; -export const isValidElement = React.isValidElement; +export const { isValidElement } = React; export function replaceElement( element: React.ReactNode, diff --git a/components/affix/index.tsx b/components/affix/index.tsx index 95a62510c5..a964e1ec99 100644 --- a/components/affix/index.tsx +++ b/components/affix/index.tsx @@ -107,6 +107,7 @@ class Affix extends React.Component { this.updatePosition(); } + // eslint-disable-next-line react/no-did-update-set-state this.setState({ prevTarget: newTarget }); } diff --git a/components/anchor/__tests__/Anchor.test.tsx b/components/anchor/__tests__/Anchor.test.tsx index f8835a7f40..ad54eb82b3 100644 --- a/components/anchor/__tests__/Anchor.test.tsx +++ b/components/anchor/__tests__/Anchor.test.tsx @@ -307,7 +307,8 @@ describe('Anchor Render', () => { let start = 0; const handler = () => { - return (start += 1000); + start += 1000; + return start; }; return jest.spyOn(Date, 'now').mockImplementation(handler); @@ -384,7 +385,8 @@ describe('Anchor Render', () => { let start = 0; const handler = () => { - return (start += 1000); + start += 1000; + return start; }; return jest.spyOn(Date, 'now').mockImplementation(handler); @@ -432,7 +434,8 @@ describe('Anchor Render', () => { let start = 0; const handler = () => { - return (start += 1000); + start += 1000; + return start; }; return jest.spyOn(Date, 'now').mockImplementation(handler); diff --git a/components/auto-complete/index.tsx b/components/auto-complete/index.tsx index e670497268..0061cb4fe1 100755 --- a/components/auto-complete/index.tsx +++ b/components/auto-complete/index.tsx @@ -53,7 +53,7 @@ const AutoComplete: React.RefForwardingComponent = (p isValidElement(childNodes[0]) && !isSelectOptionOrSelectOptGroup(childNodes[0]) ) { - customizeInput = childNodes[0]; + [customizeInput] = childNodes; } const getInputElement = (): React.ReactElement => customizeInput; diff --git a/components/avatar/index.tsx b/components/avatar/index.tsx index 911c1e057c..1efba66b63 100644 --- a/components/avatar/index.tsx +++ b/components/avatar/index.tsx @@ -63,6 +63,7 @@ export default class Avatar extends React.Component { componentDidUpdate(prevProps: AvatarProps) { if (prevProps.src !== this.props.src) { + // eslint-disable-next-line react/no-did-update-set-state this.setState({ isImgExist: true, scale: 1 }); } if (prevProps.children !== this.props.children || prevProps.gap !== this.props.gap) { @@ -179,7 +180,9 @@ export default class Avatar extends React.Component { children = ( (this.avatarChildren = node)} + ref={(node: HTMLElement) => { + this.avatarChildren = node; + }} style={{ ...sizeChildrenStyle, ...childrenStyle }} > {children} @@ -195,7 +198,9 @@ export default class Avatar extends React.Component { (this.avatarChildren = node)} + ref={(node: HTMLElement) => { + this.avatarChildren = node; + }} > {children} @@ -213,7 +218,9 @@ export default class Avatar extends React.Component { {...others} style={{ ...sizeStyle, ...others.style }} className={classString} - ref={(node: HTMLElement) => (this.avatarNode = node)} + ref={(node: HTMLElement) => { + this.avatarNode = node; + }} > {children} diff --git a/components/calendar/locale/ar_EG.tsx b/components/calendar/locale/ar_EG.tsx index 4d413b4202..8eeec95e6f 100644 --- a/components/calendar/locale/ar_EG.tsx +++ b/components/calendar/locale/ar_EG.tsx @@ -1,3 +1,3 @@ -import ar_EG from '../../date-picker/locale/ar_EG'; +import arEG from '../../date-picker/locale/ar_EG'; -export default ar_EG; +export default arEG; diff --git a/components/calendar/locale/az_AZ.tsx b/components/calendar/locale/az_AZ.tsx index 8355756cf6..32463c68fb 100644 --- a/components/calendar/locale/az_AZ.tsx +++ b/components/calendar/locale/az_AZ.tsx @@ -1,3 +1,3 @@ -import az_AZ from '../../date-picker/locale/az_AZ'; +import azAZ from '../../date-picker/locale/az_AZ'; -export default az_AZ; +export default azAZ; diff --git a/components/calendar/locale/bg_BG.tsx b/components/calendar/locale/bg_BG.tsx index 79ded5e479..25365c42bd 100644 --- a/components/calendar/locale/bg_BG.tsx +++ b/components/calendar/locale/bg_BG.tsx @@ -1,3 +1,3 @@ -import bg_BG from '../../date-picker/locale/bg_BG'; +import bgBG from '../../date-picker/locale/bg_BG'; -export default bg_BG; +export default bgBG; diff --git a/components/calendar/locale/ca_ES.tsx b/components/calendar/locale/ca_ES.tsx index a0e79a5229..9110541acf 100644 --- a/components/calendar/locale/ca_ES.tsx +++ b/components/calendar/locale/ca_ES.tsx @@ -1,3 +1,3 @@ -import ca_ES from '../../date-picker/locale/ca_ES'; +import caES from '../../date-picker/locale/ca_ES'; -export default ca_ES; +export default caES; diff --git a/components/calendar/locale/cs_CZ.tsx b/components/calendar/locale/cs_CZ.tsx index 6bb7c3fdd9..fc609b9584 100644 --- a/components/calendar/locale/cs_CZ.tsx +++ b/components/calendar/locale/cs_CZ.tsx @@ -1,3 +1,3 @@ -import cs_CZ from '../../date-picker/locale/cs_CZ'; +import csCZ from '../../date-picker/locale/cs_CZ'; -export default cs_CZ; +export default csCZ; diff --git a/components/calendar/locale/da_DK.tsx b/components/calendar/locale/da_DK.tsx index 03a86944c5..56baf76f7a 100644 --- a/components/calendar/locale/da_DK.tsx +++ b/components/calendar/locale/da_DK.tsx @@ -1,3 +1,3 @@ -import da_DK from '../../date-picker/locale/da_DK'; +import daDK from '../../date-picker/locale/da_DK'; -export default da_DK; +export default daDK; diff --git a/components/calendar/locale/de_DE.tsx b/components/calendar/locale/de_DE.tsx index 5fb008ea6a..bbd3f3224c 100644 --- a/components/calendar/locale/de_DE.tsx +++ b/components/calendar/locale/de_DE.tsx @@ -1,3 +1,3 @@ -import de_DE from '../../date-picker/locale/de_DE'; +import deDE from '../../date-picker/locale/de_DE'; -export default de_DE; +export default deDE; diff --git a/components/calendar/locale/el_GR.tsx b/components/calendar/locale/el_GR.tsx index fc3f00c59d..631631198e 100644 --- a/components/calendar/locale/el_GR.tsx +++ b/components/calendar/locale/el_GR.tsx @@ -1,3 +1,3 @@ -import el_GR from '../../date-picker/locale/el_GR'; +import elGR from '../../date-picker/locale/el_GR'; -export default el_GR; +export default elGR; diff --git a/components/calendar/locale/en_GB.tsx b/components/calendar/locale/en_GB.tsx index fef0c3e98b..e65d7ad14a 100644 --- a/components/calendar/locale/en_GB.tsx +++ b/components/calendar/locale/en_GB.tsx @@ -1,3 +1,3 @@ -import en_GB from '../../date-picker/locale/en_GB'; +import enGB from '../../date-picker/locale/en_GB'; -export default en_GB; +export default enGB; diff --git a/components/calendar/locale/en_US.tsx b/components/calendar/locale/en_US.tsx index e0c8c2ea67..6772cec708 100644 --- a/components/calendar/locale/en_US.tsx +++ b/components/calendar/locale/en_US.tsx @@ -1,3 +1,3 @@ -import en_US from '../../date-picker/locale/en_US'; +import enUS from '../../date-picker/locale/en_US'; -export default en_US; +export default enUS; diff --git a/components/calendar/locale/es_ES.tsx b/components/calendar/locale/es_ES.tsx index 4ca5af1b92..597965960d 100644 --- a/components/calendar/locale/es_ES.tsx +++ b/components/calendar/locale/es_ES.tsx @@ -1,3 +1,3 @@ -import es_ES from '../../date-picker/locale/es_ES'; +import esES from '../../date-picker/locale/es_ES'; -export default es_ES; +export default esES; diff --git a/components/calendar/locale/et_EE.tsx b/components/calendar/locale/et_EE.tsx index d707338553..0be6422b46 100644 --- a/components/calendar/locale/et_EE.tsx +++ b/components/calendar/locale/et_EE.tsx @@ -1,3 +1,3 @@ -import et_EE from '../../date-picker/locale/et_EE'; +import etEE from '../../date-picker/locale/et_EE'; -export default et_EE; +export default etEE; diff --git a/components/calendar/locale/fa_IR.tsx b/components/calendar/locale/fa_IR.tsx index c69249c3ce..8492d4d0a4 100644 --- a/components/calendar/locale/fa_IR.tsx +++ b/components/calendar/locale/fa_IR.tsx @@ -1,3 +1,3 @@ -import fa_IR from '../../date-picker/locale/fa_IR'; +import faIR from '../../date-picker/locale/fa_IR'; -export default fa_IR; +export default faIR; diff --git a/components/calendar/locale/fi_FI.tsx b/components/calendar/locale/fi_FI.tsx index 5f729816e4..efbf028eff 100644 --- a/components/calendar/locale/fi_FI.tsx +++ b/components/calendar/locale/fi_FI.tsx @@ -1,3 +1,3 @@ -import fi_FI from '../../date-picker/locale/fi_FI'; +import fiFI from '../../date-picker/locale/fi_FI'; -export default fi_FI; +export default fiFI; diff --git a/components/calendar/locale/fr_BE.tsx b/components/calendar/locale/fr_BE.tsx index 02d279ae36..d0e9f82d26 100644 --- a/components/calendar/locale/fr_BE.tsx +++ b/components/calendar/locale/fr_BE.tsx @@ -1,3 +1,3 @@ -import fr_BE from '../../date-picker/locale/fr_BE'; +import frBE from '../../date-picker/locale/fr_BE'; -export default fr_BE; +export default frBE; diff --git a/components/calendar/locale/fr_FR.tsx b/components/calendar/locale/fr_FR.tsx index a85c0892e1..19a1b853a4 100644 --- a/components/calendar/locale/fr_FR.tsx +++ b/components/calendar/locale/fr_FR.tsx @@ -1,3 +1,3 @@ -import fr_FR from '../../date-picker/locale/fr_FR'; +import frFR from '../../date-picker/locale/fr_FR'; -export default fr_FR; +export default frFR; diff --git a/components/calendar/locale/ga_IE.tsx b/components/calendar/locale/ga_IE.tsx index fe10dd1deb..8d1f76d1df 100644 --- a/components/calendar/locale/ga_IE.tsx +++ b/components/calendar/locale/ga_IE.tsx @@ -1,3 +1,3 @@ -import ga_IE from '../../date-picker/locale/ga_IE'; +import gaIE from '../../date-picker/locale/ga_IE'; -export default ga_IE; +export default gaIE; diff --git a/components/calendar/locale/he_IL.tsx b/components/calendar/locale/he_IL.tsx index bb3a66b453..2394acf8b0 100644 --- a/components/calendar/locale/he_IL.tsx +++ b/components/calendar/locale/he_IL.tsx @@ -1,3 +1,3 @@ -import he_IL from '../../date-picker/locale/he_IL'; +import heIL from '../../date-picker/locale/he_IL'; -export default he_IL; +export default heIL; diff --git a/components/calendar/locale/hi_IN.tsx b/components/calendar/locale/hi_IN.tsx index 6a47da6338..95f1190f62 100644 --- a/components/calendar/locale/hi_IN.tsx +++ b/components/calendar/locale/hi_IN.tsx @@ -1,3 +1,3 @@ -import hi_IN from '../../date-picker/locale/hi_IN'; +import hiIN from '../../date-picker/locale/hi_IN'; -export default hi_IN; +export default hiIN; diff --git a/components/calendar/locale/hr_HR.tsx b/components/calendar/locale/hr_HR.tsx index 74f31c7471..62e5c6845b 100644 --- a/components/calendar/locale/hr_HR.tsx +++ b/components/calendar/locale/hr_HR.tsx @@ -1,3 +1,3 @@ -import hr_HR from '../../date-picker/locale/hr_HR'; +import hrHR from '../../date-picker/locale/hr_HR'; -export default hr_HR; +export default hrHR; diff --git a/components/calendar/locale/hu_HU.tsx b/components/calendar/locale/hu_HU.tsx index 0c94ec6a4c..8efd5af188 100644 --- a/components/calendar/locale/hu_HU.tsx +++ b/components/calendar/locale/hu_HU.tsx @@ -1,3 +1,3 @@ -import hu_HU from '../../date-picker/locale/hu_HU'; +import huHU from '../../date-picker/locale/hu_HU'; -export default hu_HU; +export default huHU; diff --git a/components/calendar/locale/id_ID.tsx b/components/calendar/locale/id_ID.tsx index 86c254dc6a..fd07285d81 100644 --- a/components/calendar/locale/id_ID.tsx +++ b/components/calendar/locale/id_ID.tsx @@ -1,3 +1,3 @@ -import id_ID from '../../date-picker/locale/id_ID'; +import idID from '../../date-picker/locale/id_ID'; -export default id_ID; +export default idID; diff --git a/components/calendar/locale/is_IS.tsx b/components/calendar/locale/is_IS.tsx index e1c2fb1689..577f17f9ed 100644 --- a/components/calendar/locale/is_IS.tsx +++ b/components/calendar/locale/is_IS.tsx @@ -1,3 +1,3 @@ -import is_IS from '../../date-picker/locale/is_IS'; +import isIS from '../../date-picker/locale/is_IS'; -export default is_IS; +export default isIS; diff --git a/components/calendar/locale/it_IT.tsx b/components/calendar/locale/it_IT.tsx index 26d8ac9601..70772595c4 100644 --- a/components/calendar/locale/it_IT.tsx +++ b/components/calendar/locale/it_IT.tsx @@ -1,3 +1,3 @@ -import it_IT from '../../date-picker/locale/it_IT'; +import itIT from '../../date-picker/locale/it_IT'; -export default it_IT; +export default itIT; diff --git a/components/calendar/locale/ja_JP.tsx b/components/calendar/locale/ja_JP.tsx index 9136243b90..c072279352 100644 --- a/components/calendar/locale/ja_JP.tsx +++ b/components/calendar/locale/ja_JP.tsx @@ -1,3 +1,3 @@ -import ja_JP from '../../date-picker/locale/ja_JP'; +import jaJP from '../../date-picker/locale/ja_JP'; -export default ja_JP; +export default jaJP; diff --git a/components/calendar/locale/kn_IN.tsx b/components/calendar/locale/kn_IN.tsx index 4baefb1512..8a3edf6a90 100644 --- a/components/calendar/locale/kn_IN.tsx +++ b/components/calendar/locale/kn_IN.tsx @@ -1,3 +1,3 @@ -import kn_IN from '../../date-picker/locale/kn_IN'; +import knIN from '../../date-picker/locale/kn_IN'; -export default kn_IN; +export default knIN; diff --git a/components/calendar/locale/ko_KR.tsx b/components/calendar/locale/ko_KR.tsx index 4cbab03f4f..547cd09b1e 100644 --- a/components/calendar/locale/ko_KR.tsx +++ b/components/calendar/locale/ko_KR.tsx @@ -1,3 +1,3 @@ -import ko_KR from '../../date-picker/locale/ko_KR'; +import koKR from '../../date-picker/locale/ko_KR'; -export default ko_KR; +export default koKR; diff --git a/components/calendar/locale/ku_IQ.tsx b/components/calendar/locale/ku_IQ.tsx index 9d6325791b..085baf924a 100755 --- a/components/calendar/locale/ku_IQ.tsx +++ b/components/calendar/locale/ku_IQ.tsx @@ -1,3 +1,3 @@ -import ku_IQ from '../../date-picker/locale/ku_IQ'; +import kuIQ from '../../date-picker/locale/ku_IQ'; -export default ku_IQ; +export default kuIQ; diff --git a/components/calendar/locale/lv_LV.tsx b/components/calendar/locale/lv_LV.tsx index dcec393623..10548b1e97 100644 --- a/components/calendar/locale/lv_LV.tsx +++ b/components/calendar/locale/lv_LV.tsx @@ -1,3 +1,3 @@ -import lv_LV from '../../date-picker/locale/lv_LV'; +import lvLV from '../../date-picker/locale/lv_LV'; -export default lv_LV; +export default lvLV; diff --git a/components/calendar/locale/mk_MK.tsx b/components/calendar/locale/mk_MK.tsx index d8881c8049..002db77902 100644 --- a/components/calendar/locale/mk_MK.tsx +++ b/components/calendar/locale/mk_MK.tsx @@ -1,3 +1,3 @@ -import mk_MK from '../../date-picker/locale/mk_MK'; +import mkMK from '../../date-picker/locale/mk_MK'; -export default mk_MK; +export default mkMK; diff --git a/components/calendar/locale/mn_MN.tsx b/components/calendar/locale/mn_MN.tsx index b03b0bbc2e..7003e2100e 100644 --- a/components/calendar/locale/mn_MN.tsx +++ b/components/calendar/locale/mn_MN.tsx @@ -1,3 +1,3 @@ -import mn_MN from '../../date-picker/locale/mn_MN'; +import mnMN from '../../date-picker/locale/mn_MN'; -export default mn_MN; +export default mnMN; diff --git a/components/calendar/locale/ms_MY.tsx b/components/calendar/locale/ms_MY.tsx index f8f2487925..f5a72389c8 100644 --- a/components/calendar/locale/ms_MY.tsx +++ b/components/calendar/locale/ms_MY.tsx @@ -1,3 +1,3 @@ -import ms_MY from '../../date-picker/locale/ms_MY'; +import msMY from '../../date-picker/locale/ms_MY'; -export default ms_MY; +export default msMY; diff --git a/components/calendar/locale/nb_NO.tsx b/components/calendar/locale/nb_NO.tsx index b964d89f0a..633b0a3294 100644 --- a/components/calendar/locale/nb_NO.tsx +++ b/components/calendar/locale/nb_NO.tsx @@ -1,3 +1,3 @@ -import nb_NO from '../../date-picker/locale/nb_NO'; +import nbNO from '../../date-picker/locale/nb_NO'; -export default nb_NO; +export default nbNO; diff --git a/components/calendar/locale/nl_BE.tsx b/components/calendar/locale/nl_BE.tsx index 38317b5baa..d1090f4d2f 100644 --- a/components/calendar/locale/nl_BE.tsx +++ b/components/calendar/locale/nl_BE.tsx @@ -1,3 +1,3 @@ -import nl_BE from '../../date-picker/locale/nl_BE'; +import nlBE from '../../date-picker/locale/nl_BE'; -export default nl_BE; +export default nlBE; diff --git a/components/calendar/locale/nl_NL.tsx b/components/calendar/locale/nl_NL.tsx index 5361ea600b..29969dcbe0 100644 --- a/components/calendar/locale/nl_NL.tsx +++ b/components/calendar/locale/nl_NL.tsx @@ -1,3 +1,3 @@ -import nl_NL from '../../date-picker/locale/nl_NL'; +import nlNL from '../../date-picker/locale/nl_NL'; -export default nl_NL; +export default nlNL; diff --git a/components/calendar/locale/pl_PL.tsx b/components/calendar/locale/pl_PL.tsx index 65fa692894..421d087c59 100644 --- a/components/calendar/locale/pl_PL.tsx +++ b/components/calendar/locale/pl_PL.tsx @@ -1,3 +1,3 @@ -import pl_PL from '../../date-picker/locale/pl_PL'; +import plPL from '../../date-picker/locale/pl_PL'; -export default pl_PL; +export default plPL; diff --git a/components/calendar/locale/pt_BR.tsx b/components/calendar/locale/pt_BR.tsx index cdef750fdc..3d1c1c20d9 100644 --- a/components/calendar/locale/pt_BR.tsx +++ b/components/calendar/locale/pt_BR.tsx @@ -1,3 +1,3 @@ -import pt_BR from '../../date-picker/locale/pt_BR'; +import ptBR from '../../date-picker/locale/pt_BR'; -export default pt_BR; +export default ptBR; diff --git a/components/calendar/locale/pt_PT.tsx b/components/calendar/locale/pt_PT.tsx index 875c71306f..31aacbdc5d 100644 --- a/components/calendar/locale/pt_PT.tsx +++ b/components/calendar/locale/pt_PT.tsx @@ -1,3 +1,3 @@ -import pt_PT from '../../date-picker/locale/pt_PT'; +import ptPT from '../../date-picker/locale/pt_PT'; -export default pt_PT; +export default ptPT; diff --git a/components/calendar/locale/ro_RO.tsx b/components/calendar/locale/ro_RO.tsx index e4e9ec0c3f..b399e36ddd 100644 --- a/components/calendar/locale/ro_RO.tsx +++ b/components/calendar/locale/ro_RO.tsx @@ -1,3 +1,3 @@ -import ro_RO from '../../date-picker/locale/ro_RO'; +import roRO from '../../date-picker/locale/ro_RO'; -export default ro_RO; +export default roRO; diff --git a/components/calendar/locale/ru_RU.tsx b/components/calendar/locale/ru_RU.tsx index 89c86111e7..31023b72ed 100644 --- a/components/calendar/locale/ru_RU.tsx +++ b/components/calendar/locale/ru_RU.tsx @@ -1,3 +1,3 @@ -import ru_RU from '../../date-picker/locale/ru_RU'; +import ruRU from '../../date-picker/locale/ru_RU'; -export default ru_RU; +export default ruRU; diff --git a/components/calendar/locale/sk_SK.tsx b/components/calendar/locale/sk_SK.tsx index 57aa24d1ce..0427815a2e 100644 --- a/components/calendar/locale/sk_SK.tsx +++ b/components/calendar/locale/sk_SK.tsx @@ -1,3 +1,3 @@ -import sk_SK from '../../date-picker/locale/sk_SK'; +import skSK from '../../date-picker/locale/sk_SK'; -export default sk_SK; +export default skSK; diff --git a/components/calendar/locale/sl_SI.tsx b/components/calendar/locale/sl_SI.tsx index 9cc5921145..e516937795 100644 --- a/components/calendar/locale/sl_SI.tsx +++ b/components/calendar/locale/sl_SI.tsx @@ -1,3 +1,3 @@ -import sl_SI from '../../date-picker/locale/sl_SI'; +import slSI from '../../date-picker/locale/sl_SI'; -export default sl_SI; +export default slSI; diff --git a/components/calendar/locale/sr_RS.tsx b/components/calendar/locale/sr_RS.tsx index fb5620b48b..73978d3a9c 100644 --- a/components/calendar/locale/sr_RS.tsx +++ b/components/calendar/locale/sr_RS.tsx @@ -1,3 +1,3 @@ -import sr_RS from '../../date-picker/locale/sr_RS'; +import srRS from '../../date-picker/locale/sr_RS'; -export default sr_RS; +export default srRS; diff --git a/components/calendar/locale/sv_SE.tsx b/components/calendar/locale/sv_SE.tsx index 9499d4188a..20d753709d 100644 --- a/components/calendar/locale/sv_SE.tsx +++ b/components/calendar/locale/sv_SE.tsx @@ -1,3 +1,3 @@ -import sv_SE from '../../date-picker/locale/sv_SE'; +import svSE from '../../date-picker/locale/sv_SE'; -export default sv_SE; +export default svSE; diff --git a/components/calendar/locale/ta_IN.tsx b/components/calendar/locale/ta_IN.tsx index 560961645c..aea0fabf2b 100644 --- a/components/calendar/locale/ta_IN.tsx +++ b/components/calendar/locale/ta_IN.tsx @@ -1,3 +1,3 @@ -import ta_IN from '../../date-picker/locale/ta_IN'; +import taIN from '../../date-picker/locale/ta_IN'; -export default ta_IN; +export default taIN; diff --git a/components/calendar/locale/th_TH.tsx b/components/calendar/locale/th_TH.tsx index c7e36c9505..0277ec701a 100644 --- a/components/calendar/locale/th_TH.tsx +++ b/components/calendar/locale/th_TH.tsx @@ -1,3 +1,3 @@ -import th_TH from '../../date-picker/locale/th_TH'; +import thTH from '../../date-picker/locale/th_TH'; -export default th_TH; +export default thTH; diff --git a/components/calendar/locale/tr_TR.tsx b/components/calendar/locale/tr_TR.tsx index 67a546c128..06277224df 100644 --- a/components/calendar/locale/tr_TR.tsx +++ b/components/calendar/locale/tr_TR.tsx @@ -1,3 +1,3 @@ -import tr_TR from '../../date-picker/locale/tr_TR'; +import trTR from '../../date-picker/locale/tr_TR'; -export default tr_TR; +export default trTR; diff --git a/components/calendar/locale/uk_UA.tsx b/components/calendar/locale/uk_UA.tsx index 8173406ed1..3b72ee47c3 100644 --- a/components/calendar/locale/uk_UA.tsx +++ b/components/calendar/locale/uk_UA.tsx @@ -1,3 +1,3 @@ -import uk_UA from '../../date-picker/locale/uk_UA'; +import ukUA from '../../date-picker/locale/uk_UA'; -export default uk_UA; +export default ukUA; diff --git a/components/calendar/locale/vi_VN.tsx b/components/calendar/locale/vi_VN.tsx index 163ef5bd39..4043ea8b9c 100644 --- a/components/calendar/locale/vi_VN.tsx +++ b/components/calendar/locale/vi_VN.tsx @@ -1,3 +1,3 @@ -import vi_VN from '../../date-picker/locale/vi_VN'; +import viVN from '../../date-picker/locale/vi_VN'; -export default vi_VN; +export default viVN; diff --git a/components/calendar/locale/zh_CN.tsx b/components/calendar/locale/zh_CN.tsx index 238c420e18..d185efc2f3 100644 --- a/components/calendar/locale/zh_CN.tsx +++ b/components/calendar/locale/zh_CN.tsx @@ -1,3 +1,3 @@ -import zh_CN from '../../date-picker/locale/zh_CN'; +import zhCN from '../../date-picker/locale/zh_CN'; -export default zh_CN; +export default zhCN; diff --git a/components/calendar/locale/zh_TW.tsx b/components/calendar/locale/zh_TW.tsx index 639f60a0c9..1fa8867a9c 100644 --- a/components/calendar/locale/zh_TW.tsx +++ b/components/calendar/locale/zh_TW.tsx @@ -1,3 +1,3 @@ -import zh_TW from '../../date-picker/locale/zh_TW'; +import zhTW from '../../date-picker/locale/zh_TW'; -export default zh_TW; +export default zhTW; diff --git a/components/input/demo/align.md b/components/input/demo/align.md index 7008c09457..816a23f8ac 100644 --- a/components/input/demo/align.md +++ b/components/input/demo/align.md @@ -23,9 +23,7 @@ import { } from 'antd'; const { Text } = Typography; -const RadioButton = Radio.Button; -const RadioGroup = Radio.Group; -const Option = Select.Option; +const { Option } = Select; const { MonthPicker, RangePicker } = DatePicker; const narrowStyle = { @@ -91,10 +89,10 @@ ReactDOM.render( - - Hangzhou - Shanghai - + + Hangzhou + Shanghai +
diff --git a/components/modal/Modal.tsx b/components/modal/Modal.tsx index b98998ab7f..36be0bdd98 100644 --- a/components/modal/Modal.tsx +++ b/components/modal/Modal.tsx @@ -23,7 +23,9 @@ const getClickPosition = (e: MouseEvent) => { // 100ms 内发生过点击事件，则从点击位置动画展示 // 否则直接 zoom 展示 // 这样可以兼容非点击方式展开 - setTimeout(() => (mousePosition = null), 100); + setTimeout(() => { + mousePosition = null; + }, 100); }; // 只有点击事件支持从鼠标位置动画展开 diff --git a/components/result/index.tsx b/components/result/index.tsx index 1473fe45ea..151058fd25 100644 --- a/components/result/index.tsx +++ b/components/result/index.tsx @@ -116,8 +116,11 @@ Result.defaultProps = { status: 'info', }; +// eslint-disable-next-line prefer-destructuring Result.PRESENTED_IMAGE_403 = ExceptionMap[403]; +// eslint-disable-next-line prefer-destructuring Result.PRESENTED_IMAGE_404 = ExceptionMap[404]; +// eslint-disable-next-line prefer-destructuring Result.PRESENTED_IMAGE_500 = ExceptionMap[500]; export default Result; diff --git a/components/tag/demo/animation.md b/components/tag/demo/animation.md index bffbcd66be..21f82218cd 100644 --- a/components/tag/demo/animation.md +++ b/components/tag/demo/animation.md @@ -53,7 +53,9 @@ class EditableTagGroup extends React.Component { }); }; - saveInputRef = input => (this.input = input); + saveInputRef = input => { + this.input = input; + }; forMap = tag => { const tagElem = ( diff --git a/components/tag/demo/control.md b/components/tag/demo/control.md index f5a32ea8da..33fd8498be 100644 --- a/components/tag/demo/control.md +++ b/components/tag/demo/control.md @@ -71,9 +71,13 @@ class EditableTagGroup extends React.Component { }); }; - saveInputRef = input => (this.input = input); + saveInputRef = input => { + this.input = input; + }; - saveEditInputRef = input => (this.editInput = input); + saveEditInputRef = input => { + this.editInput = input; + }; render() { const { tags, inputVisible, inputValue, editInputIndex, editInputValue } = this.state; diff --git a/components/transfer/index.tsx b/components/transfer/index.tsx index db605df71c..9bbb3ceba9 100644 --- a/components/transfer/index.tsx +++ b/components/transfer/index.tsx @@ -222,7 +222,7 @@ class Transfer extends React.Component { handleFilter = (direction: TransferDirection, e: React.ChangeEvent) => { const { onSearch } = this.props; - const value = e.target.value; + const { value } = e.target; if (onSearch) { onSearch(direction, value); } diff --git a/package.json b/package.json index 3f8ef944f5..1b05f9d0a7 100644 --- a/package.json +++ b/package.json @@ -195,7 +195,7 @@ "eslint-config-airbnb": "^18.0.0", "eslint-config-prettier": "^6.0.0", "eslint-plugin-babel": "^5.3.0", - "eslint-plugin-import": "~2.20.0", + "eslint-plugin-import": "^2.21.1", "eslint-plugin-jest": "^23.0.2", "eslint-plugin-jsx-a11y": "^6.2.1", "eslint-plugin-markdown": "^1.0.0", diff --git a/scripts/azure-github-comment.js b/scripts/azure-github-comment.js index c76e121b06..030924d2e3 100644 --- a/scripts/azure-github-comment.js +++ b/scripts/azure-github-comment.js @@ -4,7 +4,7 @@ const REPO = process.env.ACCESS_REPO; const TOKEN = process.env.ACCESS_TOKEN; const PR = process.env.SYSTEM_PULLREQUEST_PULLREQUESTNUMBER; -const argv = process.argv; +const { argv } = process; const comment = argv[argv.length - 1]; const isUiTest = argv.includes('-ui'); diff --git a/scripts/print-changelog.js b/scripts/print-changelog.js index 4c5585f97e..e53234ac2d 100644 --- a/scripts/print-changelog.js +++ b/scripts/print-changelog.js @@ -79,7 +79,7 @@ async function printLog() { let prList = []; for (let i = 0; i < logs.all.length; i += 1) { - const { message, body, hash, author_name } = logs.all[i]; + const { message, body, hash, author_name: author } = logs.all[i]; const text = `${message} ${body}`; @@ -147,7 +147,7 @@ async function printLog() { prList.push({ hash, title: message, - author: author_name, + author, english: message, chinese: message, }); diff --git a/site/theme/template/Content/Demo/index.jsx b/site/theme/template/Content/Demo/index.jsx index 85c6d5cdf6..f6e6ad4c0a 100644 --- a/site/theme/template/Content/Demo/index.jsx +++ b/site/theme/template/Content/Demo/index.jsx @@ -238,7 +238,7 @@ class Demo extends React.Component { const importReactReg = /import(\D*)from 'react';/; const matchImportReact = parsedSourceCode.match(importReactReg); if (matchImportReact) { - importReactContent = matchImportReact[0]; + [importReactContent] = matchImportReact; parsedSourceCode = parsedSourceCode.replace(importReactReg, '').trim(); } diff --git a/site/theme/template/Resources/AffixTabs.tsx b/site/theme/template/Resources/AffixTabs.tsx index f464b9c44c..49f7c42858 100644 --- a/site/theme/template/Resources/AffixTabs.tsx +++ b/site/theme/template/Resources/AffixTabs.tsx @@ -35,7 +35,7 @@ export default () => { const onSyncAffix = React.useMemo(() => { function doSync() { - const scrollY = window.scrollY; + const { scrollY } = window; const containerHeight = containerRef.current!.offsetHeight; for (let i = idsRef.current.length - 1; i >= 0; i -= 1) { diff --git a/site/theme/template/Resources/index.tsx b/site/theme/template/Resources/index.tsx index 785afa180e..7e5efeb480 100644 --- a/site/theme/template/Resources/index.tsx +++ b/site/theme/template/Resources/index.tsx @@ -62,6 +62,7 @@ function toList([, ...items]: ContentUnit[]): ContentUnit[] { const titleMatch = titleStr.match(/(.*)(#[\dA-Fa-f]{6})/); if (titleMatch) { titleStr = titleMatch[1].trim(); + // eslint-disable-next-line prefer-destructuring coverColor = titleMatch[2]; } diff --git a/webpack.config.js b/webpack.config.js index eae836782d..e657940aab 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -2,7 +2,7 @@ // This config is for building dist files const getWebpackConfig = require('@ant-design/tools/lib/getWebpackConfig'); const IgnoreEmitPlugin = require('ignore-emit-webpack-plugin'); -const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; +const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer'); const BundleAnalyzerPluginCom = require('@bundle-analyzer/webpack-plugin'); const EsbuildPlugin = require('esbuild-webpack-plugin').default; const darkVars = require('./scripts/dark-vars');