Browse Source

chore: 🦄 Add eslint-plugin-unicorn (#22883)

* 🦄 Add eslint-plugin-unicorn

* fix eslint errors

* fix eslint errors

* fix lint demo

* fix lint demo
pull/22888/head
偏右 5 years ago
committed by GitHub
parent
commit
b369717181
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      .antd-tools.config.js
  2. 6
      .eslintrc.js
  3. 4
      components/_util/wave.tsx
  4. 3
      components/alert/__tests__/index.test.js
  5. 2
      components/button/__tests__/index.test.js
  6. 2
      components/calendar/__tests__/index.test.js
  7. 2
      components/dropdown/__tests__/dropdown-button.test.js
  8. 2
      components/form/FormItemLabel.tsx
  9. 2
      components/form/__tests__/index.test.js
  10. 2
      components/input/demo/tooltip.md
  11. 1
      components/message/__tests__/index.test.js
  12. 2
      components/statistic/utils.tsx
  13. 2
      components/transfer/index.tsx
  14. 2
      components/typography/Editable.tsx
  15. 2
      components/typography/__tests__/index.test.js
  16. 2
      components/upload/Upload.tsx
  17. 2
      components/upload/__tests__/upload.test.js
  18. 1
      package.json
  19. 2
      scripts/check-site.js
  20. 10
      site/bisheng.config.js
  21. 1
      site/theme/template/Color/ColorPaletteTool.jsx
  22. 1
      site/theme/template/Color/ColorPaletteToolDark.jsx
  23. 1
      site/theme/template/Content/Article.tsx
  24. 14
      site/theme/template/Content/Demo/index.jsx
  25. 12
      site/theme/template/Content/MainContent.jsx
  26. 2
      site/theme/template/Home/index.tsx
  27. 7
      site/theme/template/Layout/Header/index.tsx
  28. 1
      site/theme/template/utils.tsx
  29. 2
      tests/dekko/dist.test.js
  30. 2
      tests/dekko/lib.test.js
  31. 6
      tests/index.test.js

10
.antd-tools.config.js

@ -19,7 +19,7 @@ function finalizeCompile() {
`{ version: '${packageInfo.version}' }`,
),
);
// eslint-disable-next-line
// eslint-disable-next-line no-console
console.log('Wrote version into lib/version/index.js');
// Build package.json version to lib/version/index.d.ts
@ -29,7 +29,7 @@ function finalizeCompile() {
versionDefPath,
`declare var _default: "${packageInfo.version}";\nexport default _default;\n`,
);
// eslint-disable-next-line
// eslint-disable-next-line no-console
console.log('Wrote version into lib/version/index.d.ts');
// Build a entry less file to dist/antd.less
@ -57,7 +57,7 @@ function buildThemeFile(theme, vars) {
`@import "../lib/style/${theme}.less";\n@import "../lib/style/components.less";`,
);
// eslint-disable-next-line
// eslint-disable-next-line no-console
console.log(`Built a entry less file to dist/antd.${theme}.less`);
// Build ${theme}.js: dist/${theme}-theme.js, for less-loader
@ -67,7 +67,7 @@ function buildThemeFile(theme, vars) {
`module.exports = ${JSON.stringify(vars, null, 2)};`,
);
// eslint-disable-next-line
// eslint-disable-next-line no-console
console.log(`Built a ${theme} theme js file to dist/${theme}-theme.js`);
}
@ -78,7 +78,7 @@ function finalizeDist() {
path.join(process.cwd(), 'dist', 'antd.less'),
'@import "../lib/style/index.less";\n@import "../lib/style/components.less";',
);
// eslint-disable-next-line
// eslint-disable-next-line no-console
console.log('Built a entry less file to dist/antd.less');
buildThemeFile('dark', darkVars);
buildThemeFile('compact', compactVars);

6
.eslintrc.js

@ -20,7 +20,7 @@ const eslintrc = {
},
},
parser: '@typescript-eslint/parser',
plugins: ['markdown', 'react', 'babel', 'jest', '@typescript-eslint', 'react-hooks'],
plugins: ['markdown', 'react', 'babel', 'jest', '@typescript-eslint', 'react-hooks', 'unicorn'],
// https://github.com/typescript-eslint/typescript-eslint/issues/46#issuecomment-470486034
overrides: [
{
@ -91,6 +91,10 @@ const eslintrc = {
'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,
"unicorn/no-abusive-eslint-disable": 2,
},
globals: {
gtag: true,

4
components/_util/wave.tsx

@ -16,7 +16,7 @@ function isHidden(element: HTMLElement) {
function isNotGrey(color: string) {
// eslint-disable-next-line no-useless-escape
const match = (color || '').match(/rgba?\((\d*), (\d*), (\d*)(, [\.\d]*)?\)/);
const match = (color || '').match(/rgba?\((\d*), (\d*), (\d*)(, [\d.]*)?\)/);
if (match && match[1] && match[2] && match[3]) {
return !(match[1] === match[2] && match[2] === match[3]);
}
@ -76,7 +76,7 @@ export default class Wave extends React.Component<{ insertExtraNode?: boolean }>
waveColor !== '#ffffff' &&
waveColor !== 'rgb(255, 255, 255)' &&
isNotGrey(waveColor) &&
!/rgba\(\d*, \d*, \d*, 0\)/.test(waveColor) && // any transparent rgba color
!/rgba\((?:\d*, ){3}0\)/.test(waveColor) && // any transparent rgba color
waveColor !== 'transparent'
) {
// Add nonce if CSP exist

3
components/alert/__tests__/index.test.js

@ -60,7 +60,8 @@ describe('Alert', () => {
const testIt = process.env.REACT === '15' ? it.skip : it;
testIt('ErrorBoundary', () => {
const ThrowError = () => <NotExisted />; // eslint-disable-line
// eslint-disable-next-line react/jsx-no-undef
const ThrowError = () => <NotExisted />;
const wrapper = mount(
<ErrorBoundary>
<ThrowError />

2
components/button/__tests__/index.test.js

@ -107,7 +107,6 @@ describe('Button', () => {
it('have static property for type detecting', () => {
const wrapper = mount(<Button>Button Text</Button>);
// eslint-disable-next-line
expect(wrapper.type().__ANT_BUTTON).toBe(true);
});
@ -136,7 +135,6 @@ describe('Button', () => {
});
it('should change loading state with delay', () => {
// eslint-disable-next-line
class DefaultButton extends Component {
state = {
loading: false,

2
components/calendar/__tests__/index.test.js

@ -156,7 +156,7 @@ describe('Calendar', () => {
it('Calendar should support locale', () => {
MockDate.set(Moment('2018-10-19'));
// eslint-disable-next-line
// eslint-disable-next-line global-require
const zhCN = require('../locale/zh_CN').default;
const wrapper = mount(<Calendar locale={zhCN} />);
expect(wrapper.render()).toMatchSnapshot();

2
components/dropdown/__tests__/dropdown-button.test.js

@ -40,7 +40,7 @@ describe('DropdownButton', () => {
const dropdownProps = wrapper.find(Dropdown).props();
Object.keys(props).forEach(key => {
expect(dropdownProps[key]).toBe(props[key]); // eslint-disable-line
expect(dropdownProps[key]).toBe(props[key]);
});
});

2
components/form/FormItemLabel.tsx

@ -48,7 +48,7 @@ const FormItemLabel: React.FC<FormItemLabelProps & { required?: boolean; prefixC
const haveColon = computedColon && !vertical;
// Remove duplicated user input colon
if (haveColon && typeof label === 'string' && (label as string).trim() !== '') {
labelChildren = (label as string).replace(/[:|:]\s*$/, '');
labelChildren = (label as string).replace(/[:|:]\s*$/, '');
}
const labelClassName = classNames({

2
components/form/__tests__/index.test.js

@ -522,7 +522,7 @@ describe('Form', () => {
// https://github.com/ant-design/ant-design/issues/21415
it('Component.props.onChange is null', () => {
// eslint-disable-next-line
// eslint-disable-next-line react/prefer-stateless-function
class CustomComponent extends Component {
static defaultProps = {
onChange: null,

2
components/input/demo/tooltip.md

@ -35,7 +35,7 @@ function formatNumber(value) {
class NumericInput extends React.Component {
onChange = e => {
const { value } = e.target;
const reg = /^-?[0-9]*(\.[0-9]*)?$/;
const reg = /^-?\d*(\.\d*)?$/;
if ((!isNaN(value) && reg.test(value)) || value === '' || value === '-') {
this.props.onChange(value);
}

1
components/message/__tests__/index.test.js

@ -98,7 +98,6 @@ describe('message', () => {
// https://github.com/ant-design/ant-design/issues/8201
it('should destroy messages correctly', () => {
// eslint-disable-next-line
class Test extends React.Component {
componentDidMount() {
message.loading('Action in progress1..', 0);

2
components/statistic/utils.tsx

@ -36,7 +36,7 @@ const timeUnits: [string, number][] = [
export function formatTimeStr(duration: number, format: string) {
let leftDuration: number = duration;
const escapeRegex = /\[[^\]]*\]/g;
const escapeRegex = /\[[^\]]*]/g;
const keepList: string[] = (format.match(escapeRegex) || []).map(str => str.slice(1, -1));
const templateText = format.replace(escapeRegex, '[]');

2
components/transfer/index.tsx

@ -115,7 +115,7 @@ class Transfer extends React.Component<TransferProps, any> {
};
}
// eslint-disable-next-line
// eslint-disable-next-line class-methods-use-this
getSelectedKeysName(direction: TransferDirection) {
return direction === 'left' ? 'sourceSelectedKeys' : 'targetSelectedKeys';
}

2
components/typography/Editable.tsx

@ -55,7 +55,7 @@ class Editable extends React.Component<EditableProps, EditableState> {
}
onChange: React.ChangeEventHandler<HTMLTextAreaElement> = ({ target: { value } }) => {
this.setState({ current: value.replace(/[\r\n]/g, '') });
this.setState({ current: value.replace(/[\n\r]/g, '') });
};
onCompositionStart = () => {

2
components/typography/__tests__/index.test.js

@ -276,7 +276,7 @@ describe('Typography', () => {
wrapper.find('TextArea').simulate('keyUp', { keyCode: KeyCode.ESC });
},
onChange => {
// eslint-disable-next-line
// eslint-disable-next-line jest/no-standalone-expect
expect(onChange).not.toHaveBeenCalled();
},
);

2
components/upload/Upload.tsx

@ -165,7 +165,7 @@ class Upload extends React.Component<UploadProps, UploadState> {
const removedFileList = removeFileItem(file, fileList);
if (removedFileList) {
file.status = 'removed'; // eslint-disable-line
file.status = 'removed';
if (this.upload) {
this.upload.abort(file);

2
components/upload/__tests__/upload.test.js

@ -199,7 +199,6 @@ describe('Upload', () => {
// https://github.com/ant-design/ant-design/issues/14298
it('should not have id if upload children is null, avoid being triggered by label', () => {
// eslint-disable-next-line
const Demo = ({ children }) => (
<Form>
<Form.Item name="upload" label="Upload" valuePropName="fileList">
@ -221,7 +220,6 @@ describe('Upload', () => {
// https://github.com/ant-design/ant-design/issues/16478
it('should not have id if upload is disabled, avoid being triggered by label', () => {
// eslint-disable-next-line
const Demo = ({ disabled }) => (
<Form>
<Form.Item name="upload" label="Upload" valuePropName="fileList">

1
package.json

@ -190,6 +190,7 @@
"eslint-plugin-markdown": "^1.0.0",
"eslint-plugin-react": "^7.14.2",
"eslint-plugin-react-hooks": "^3.0.0",
"eslint-plugin-unicorn": "^18.0.1",
"eslint-tinker": "^0.5.0",
"fetch-jsonp": "^1.1.3",
"full-icu": "^1.3.0",

2
scripts/check-site.js

@ -16,7 +16,7 @@ const components = uniq(
cwd: join(process.cwd()),
dot: false,
})
.map(path => path.replace(/(\/index)?((\.zh-CN)|(\.en-US))?\.md$/i, '')),
.map(path => path.replace(/(\/index)?((\.zh-cn)|(\.en-us))?\.md$/i, '')),
);
describe('site test', () => {

10
site/bisheng.config.js

@ -14,7 +14,6 @@ function alertBabelConfig(rules) {
if (rule.options.plugins.indexOf(replaceLib) === -1) {
rule.options.plugins.push(replaceLib);
}
// eslint-disable-next-line
rule.options.plugins = rule.options.plugins.filter(
plugin => !plugin.indexOf || plugin.indexOf('babel-plugin-add-module-exports') === -1,
);
@ -106,7 +105,6 @@ module.exports = {
javascriptEnabled: true,
},
webpackConfig(config) {
// eslint-disable-next-line
config.resolve.alias = {
'antd/lib': path.join(process.cwd(), 'components'),
'antd/es': path.join(process.cwd(), 'components'),
@ -116,23 +114,21 @@ module.exports = {
'react-intl': 'react-intl/dist',
};
// eslint-disable-next-line
config.externals = {
'react-router-dom': 'ReactRouterDOM',
};
if (usePreact) {
// eslint-disable-next-line
config.resolve.alias = Object.assign({}, config.resolve.alias, {
config.resolve.alias = {
...config.resolve.alias,
react: 'preact-compat',
'react-dom': 'preact-compat',
'create-react-class': 'preact-compat/lib/create-react-class',
'react-router': 'react-router',
});
};
}
if (isDev) {
// eslint-disable-next-line
config.devtool = 'source-map';
// Resolve use react hook fail when yarn link or npm link

1
site/theme/template/Color/ColorPaletteTool.jsx

@ -6,7 +6,6 @@ import ColorPatterns from './ColorPatterns';
const primaryMinSaturation = 70; //
const primaryMinBrightness = 70; //
// eslint-disable-next-line
export default class ColorPaletteTool extends Component {
state = {
primaryColor: '#1890ff',

1
site/theme/template/Color/ColorPaletteToolDark.jsx

@ -7,7 +7,6 @@ import ColorPatterns from './ColorPatterns';
const primaryMinSaturation = 70; //
const primaryMinBrightness = 70; //
// eslint-disable-next-line
export default class ColorPaletteTool extends Component {
state = {
primaryColor: '#1890ff',

1
site/theme/template/Content/Article.tsx

@ -109,7 +109,6 @@ class Article extends React.Component<ArticleProps> {
const metaDesc = helmetDesc || contentChild;
return (
/* eslint-disable-next-line */
<article className="markdown" onClick={this.onResourceClick}>
<Helmet encodeSpecialCharacters={false}>
{helmetTitle && <title>{helmetTitle}</title>}

14
site/theme/template/Content/Demo/index.jsx

@ -92,7 +92,7 @@ class Demo extends React.Component {
});
};
// eslint-disable-next-line
// eslint-disable-next-line class-methods-use-this
track({ type, demo }) {
if (!window.gtag) {
return;
@ -180,18 +180,18 @@ class Demo extends React.Component {
title: `${localizedTitle} - Ant Design Demo`,
html,
js: sourceCode
.replace(/import\s+\{(\s+[^}]*\s+)\}\s+from\s+'antd';/, 'const { $1 } = antd;')
.replace(/import\s+{(\s+[^}]*\s+)}\s+from\s+'antd';/, 'const { $1 } = antd;')
.replace(
/import\s+\{(\s+[^}]*\s+)\}\s+from\s+'@ant-design\/icons';/,
/import\s+{(\s+[^}]*\s+)}\s+from\s+'@ant-design\/icons';/,
'const { $1 } = icons;',
)
.replace("import moment from 'moment';", '')
.replace(/import\s+\{\s+(.*)\s+\}\s+from\s+'react-router';/, 'const { $1 } = ReactRouter;')
.replace(/import\s+{\s+(.*)\s+}\s+from\s+'react-router';/, 'const { $1 } = ReactRouter;')
.replace(
/import\s+\{\s+(.*)\s+\}\s+from\s+'react-router-dom';/,
/import\s+{\s+(.*)\s+}\s+from\s+'react-router-dom';/,
'const { $1 } = ReactRouterDOM;',
)
.replace(/([a-zA-Z]*)\s+as\s+([a-zA-Z]*)/, '$1:$2'),
.replace(/([A-Za-z]*)\s+as\s+([A-Za-z]*)/, '$1:$2'),
css: prefillStyle,
editors: '001',
// eslint-disable-next-line no-undef
@ -300,7 +300,7 @@ ${parsedSourceCode.replace('mountNode', "document.getElementById('container')")}
<section className="code-box-demo">
<ErrorBoundary>{this.liveDemo}</ErrorBoundary>
{style ? (
<style dangerouslySetInnerHTML={{ __html: style }} /> // eslint-disable-line
<style dangerouslySetInnerHTML={{ __html: style }} />
) : null}
</section>
<section className="code-box-meta markdown">

12
site/theme/template/Content/MainContent.jsx

@ -43,7 +43,7 @@ function getModuleData(props) {
}
function fileNameToPath(filename) {
const snippets = filename.replace(/(\/index)?((\.zh-CN)|(\.en-US))?\.md$/i, '').split('/');
const snippets = filename.replace(/(\/index)?((\.zh-cn)|(\.en-us))?\.md$/i, '').split('/');
return snippets[snippets.length - 1];
}
@ -195,8 +195,10 @@ class MainContent extends Component {
if (!document.querySelector('.markdown > h2, .code-box')) {
return;
}
require('intersection-observer'); // eslint-disable-line
const scrollama = require('scrollama'); // eslint-disable-line
// eslint-disable-next-line global-require
require('intersection-observer');
// eslint-disable-next-line global-require
const scrollama = require('scrollama');
this.scroller = scrollama();
this.scroller
.setup({
@ -205,7 +207,7 @@ class MainContent extends Component {
})
.onStepEnter(({ element }) => {
[].forEach.call(document.querySelectorAll('.toc-affix li a'), node => {
node.className = ''; // eslint-disable-line
node.className = '';
});
const currentNode = document.querySelectorAll(`.toc-affix li a[href="#${element.id}"]`)[0];
if (currentNode) {
@ -232,7 +234,7 @@ class MainContent extends Component {
</span>,
];
const { disabled } = item;
const url = item.filename.replace(/(\/index)?((\.zh-CN)|(\.en-US))?\.md$/i, '').toLowerCase();
const url = item.filename.replace(/(\/index)?((\.zh-cn)|(\.en-us))?\.md$/i, '').toLowerCase();
const child = !item.link ? (
<Link
to={utils.getLocalizedPathname(

2
site/theme/template/Home/index.tsx

@ -48,7 +48,7 @@ export default function Home() {
return (
<div className="home-container">
<style dangerouslySetInnerHTML={{ __html: getStyle() }} /> {/* eslint-disable-line */}
<style dangerouslySetInnerHTML={{ __html: getStyle() }} />
<Banner />
<div style={{ maxWidth: 1256, margin: '0 auto' }}>
<BlockContent title={<FormattedMessage id="app.home.recommend" />}>

7
site/theme/template/Layout/Header/index.tsx

@ -23,7 +23,8 @@ const { Option } = Select;
let docsearch: any;
if (typeof window !== 'undefined') {
docsearch = require('docsearch.js'); // eslint-disable-line
// eslint-disable-next-line global-require
docsearch = require('docsearch.js');
}
function initDocSearch(locale: string) {
@ -38,8 +39,8 @@ function initDocSearch(locale: string) {
algoliaOptions: { facetFilters: [`tags:${lang}`] },
transformData(hits: { url: string }[]) {
hits.forEach(hit => {
hit.url = hit.url.replace('ant.design', window.location.host); // eslint-disable-line
hit.url = hit.url.replace('https:', window.location.protocol); // eslint-disable-line
hit.url = hit.url.replace('ant.design', window.location.host);
hit.url = hit.url.replace('https:', window.location.protocol)
});
return hits;
},

1
site/theme/template/utils.tsx

@ -144,7 +144,6 @@ export function getLocalizedPathname(
}
export function ping(callback: (status: string) => void) {
// eslint-disable-next-line
const url =
'https://private-a' +
'lipay' +

2
tests/dekko/dist.test.js

@ -16,5 +16,5 @@ $('dist')
.hasFile('antd.compact.css')
.hasFile('dark-theme.js');
// eslint-disable-next-line
// eslint-disable-next-line no-console
console.log(chalk.green('✨ `dist` directory is valid.'));

2
tests/dekko/lib.test.js

@ -56,5 +56,5 @@ function compare(originFiles, targetFiles, targetPath) {
compare(localeFiles, localeProviderFiles, '/locale-provider');
compare(localeProviderFiles, localeFiles, '/locale');
// eslint-disable-next-line
// eslint-disable-next-line no-console
console.log(chalk.green('✨ `lib` directory is valid.'));

6
tests/index.test.js

@ -6,7 +6,8 @@ describe('antd dist files', () => {
// https://github.com/ant-design/ant-design/issues/1638
// https://github.com/ant-design/ant-design/issues/1968
it('exports modules correctly', () => {
const antd = testDist ? require('../dist/antd') : require('../components'); // eslint-disable-line
// eslint-disable-next-line global-require,import/no-unresolved
const antd = testDist ? require('../dist/antd') : require('../components');
expect(Object.keys(antd)).toMatchSnapshot();
});
@ -14,7 +15,8 @@ describe('antd dist files', () => {
// https://github.com/ant-design/ant-design/issues/1804
if (testDist) {
it('should have antd.version', () => {
const antd = require('../dist/antd'); // eslint-disable-line
// eslint-disable-next-line global-require,import/no-unresolved
const antd = require('../dist/antd');
expect(antd.version).toBe(pkg.version);
});
}

Loading…
Cancel
Save