Skip to content

Commit d081f09

Browse files
authored
chore: update prettier config in eslint (#4280)
1 parent e7695ac commit d081f09

43 files changed

Lines changed: 216 additions & 181 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ temp*
1414
static/
1515
packages/common
1616
packages/ai-core
17+
site/engineering/static

.eslintrc.js

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module.exports = {
22
extends: [
33
'airbnb-base',
4-
'prettier', // eslint-config-prettier 处理冲突
54
'plugin:react/recommended',
65
'plugin:@typescript-eslint/recommended',
6+
'plugin:prettier/recommended',
77
],
88
parser: '@typescript-eslint/parser',
9-
plugins: ['@typescript-eslint', 'react-hooks', 'simple-import-sort'],
9+
plugins: ['@typescript-eslint', 'react-hooks', 'simple-import-sort', 'prettier'],
1010
env: {
1111
browser: true,
1212
node: true,
@@ -69,7 +69,25 @@ module.exports = {
6969
],
7070
'max-len': 'off',
7171
'no-shadow': 'off',
72-
72+
'prettier/prettier': [
73+
'error',
74+
{
75+
printWidth: 120,
76+
tabWidth: 2,
77+
useTabs: false,
78+
semi: true,
79+
singleQuote: true,
80+
quoteProps: 'as-needed',
81+
jsxSingleQuote: false,
82+
trailingComma: 'all',
83+
bracketSpacing: true,
84+
jsxBracketSameLine: false,
85+
arrowParens: 'always',
86+
proseWrap: 'preserve',
87+
htmlWhitespaceSensitivity: 'css',
88+
endOfLine: 'lf',
89+
},
90+
],
7391
// import config
7492
'import/order': 'off',
7593
'import/extensions': 'off',
@@ -103,7 +121,6 @@ module.exports = {
103121
},
104122
],
105123
'simple-import-sort/exports': 'error',
106-
107124
// typescript config
108125
'@typescript-eslint/explicit-module-boundary-types': 'off',
109126
'@typescript-eslint/ban-types': 'off',
@@ -125,7 +142,6 @@ module.exports = {
125142
disallowTypeAnnotations: false,
126143
},
127144
],
128-
129145
// react config
130146
'react/display-name': 'off',
131147
'react-hooks/exhaustive-deps': 'warn',

.prettierignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.prettierrc.js

Lines changed: 0 additions & 39 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
"eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
44
"[html]": {
55
"editor.formatOnSave": true,
6-
"editor.defaultFormatter": "esbenp.prettier-vscode"
6+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
77
},
88
"[typescriptreact]": {
99
"editor.formatOnSave": true,
10-
"editor.defaultFormatter": "esbenp.prettier-vscode"
10+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
1111
},
1212
"[javascriptreact]": {
1313
"editor.formatOnSave": true,
14-
"editor.defaultFormatter": "esbenp.prettier-vscode"
14+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
1515
},
1616
"[typescript]": {
1717
"editor.formatOnSave": true,
18-
"editor.defaultFormatter": "esbenp.prettier-vscode"
18+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
1919
},
2020
"[javascript]": {
2121
"editor.formatOnSave": true,
22-
"editor.defaultFormatter": "esbenp.prettier-vscode"
22+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
2323
},
2424
"editor.codeActionsOnSave": {
2525
"source.fixAll.eslint": "explicit"

packages/components/auto-complete/AutoComplete.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ import type { OptionsListProps } from './OptionList';
1717
import type { AutoCompleteOption, TdAutoCompleteProps } from './type';
1818

1919
export interface AutoCompleteProps<T extends AutoCompleteOption = AutoCompleteOption>
20-
extends TdAutoCompleteProps<T>,
21-
StyledProps {}
20+
extends TdAutoCompleteProps<T>, StyledProps {}
2221

2322
export interface AutoCompleteRef {
2423
inputRef: InputRef;

packages/components/badge/_example/color.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useState } from 'react';
1+
import React, { useState } from 'react';
22
import { Badge, Checkbox } from 'tdesign-react';
33

44
const colors = [

packages/components/button/Button.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ import { buttonDefaultProps } from './defaultProps';
1212
import type { TdButtonProps } from './type';
1313

1414
export interface ButtonProps
15-
extends TdButtonProps,
16-
Omit<React.AllHTMLAttributes<HTMLElement>, 'content' | 'shape' | 'size' | 'type'> {}
15+
extends TdButtonProps, Omit<React.AllHTMLAttributes<HTMLElement>, 'content' | 'shape' | 'size' | 'type'> {}
1716

1817
const Button = forwardRef((originProps: ButtonProps, ref: React.RefObject<HTMLElement>) => {
1918
const props = useDefaultProps(originProps, buttonDefaultProps);

packages/components/cascader/components/Panel.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import type { CascaderContextType, TreeNode } from '../interface';
1313
import type { TdCascaderProps } from '../type';
1414

1515
export interface CascaderPanelProps
16-
extends StyledProps,
17-
Pick<TdCascaderProps, 'trigger' | 'empty' | 'onChange' | 'loading' | 'loadingText' | 'option'> {
16+
extends StyledProps, Pick<TdCascaderProps, 'trigger' | 'empty' | 'onChange' | 'loading' | 'loadingText' | 'option'> {
1817
cascaderContext: CascaderContextType;
1918
}
2019

packages/components/cascader/interface.ts

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,23 @@ import type { TdSelectInputProps } from '../select-input/type';
55
import type { CascaderChangeSource, CascaderValue, TdCascaderProps } from './type';
66

77
export * from './type';
8-
export interface CascaderContextType
9-
extends Pick<
10-
TdCascaderProps,
11-
| 'size'
12-
| 'disabled'
13-
| 'checkStrictly'
14-
| 'lazy'
15-
| 'multiple'
16-
| 'filterable'
17-
| 'filter'
18-
| 'clearable'
19-
| 'checkProps'
20-
| 'showAllLevels'
21-
| 'max'
22-
| 'value'
23-
| 'minCollapsedNum'
24-
| 'valueType'
25-
> {
8+
export interface CascaderContextType extends Pick<
9+
TdCascaderProps,
10+
| 'size'
11+
| 'disabled'
12+
| 'checkStrictly'
13+
| 'lazy'
14+
| 'multiple'
15+
| 'filterable'
16+
| 'filter'
17+
| 'clearable'
18+
| 'checkProps'
19+
| 'showAllLevels'
20+
| 'max'
21+
| 'value'
22+
| 'minCollapsedNum'
23+
| 'valueType'
24+
> {
2625
treeStore: TreeStore;
2726
setValue: (val: CascaderValue, source: CascaderChangeSource, node?: TreeNodeModel) => void;
2827
visible: boolean;

0 commit comments

Comments
 (0)