Skip to content

Commit 28dad88

Browse files
committed
Merge branch 'release/2.0.1'
2 parents 11cdfaf + eaf5c69 commit 28dad88

File tree

4 files changed

+609
-47
lines changed

4 files changed

+609
-47
lines changed

.eslintrc.js

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,32 @@
11
module.exports = {
2-
"extends": "airbnb",
3-
"rules": {
4-
"import/no-extraneous-dependencies": ["error", { "devDependencies": true, "optionalDependencies": false, "peerDependencies": false }],
5-
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
6-
"no-use-before-define": ["error", { "functions": false, "classes": false, "variables": false }],
7-
"class-methods-use-this": 0,
8-
"global-require": 0,
9-
"react/prop-types": 0,
10-
"no-return-assign": 0,
11-
"no-sequences": 0,
12-
"func-names": 0,
13-
"max-len": ["error", { "code": 200 }],
14-
"no-param-reassign": ["error", { "props": false }],
15-
"react/sort-comp": [2, {
16-
order: [
17-
'static-methods',
18-
'lifecycle',
19-
'everything-else',
20-
'render',
21-
],
22-
}]
23-
}
24-
};
2+
extends: ['airbnb', 'prettier'],
3+
rules: {
4+
'import/no-extraneous-dependencies': [
5+
'error',
6+
{
7+
devDependencies: true,
8+
optionalDependencies: false,
9+
peerDependencies: false
10+
}
11+
],
12+
'react/jsx-filename-extension': [1, { extensions: ['.js', '.jsx'] }],
13+
'no-use-before-define': [
14+
'error',
15+
{ functions: false, classes: false, variables: false }
16+
],
17+
'class-methods-use-this': 0,
18+
'global-require': 0,
19+
'react/prop-types': 0,
20+
'no-return-assign': 0,
21+
'no-sequences': 0,
22+
'func-names': 0,
23+
'max-len': ['error', { code: 200 }],
24+
'no-param-reassign': ['error', { props: false }],
25+
'react/sort-comp': [
26+
2,
27+
{
28+
order: ['static-methods', 'lifecycle', 'everything-else', 'render']
29+
}
30+
]
31+
}
32+
};

0 commit comments

Comments
 (0)