Skip to content

Commit 1518e4b

Browse files
committed
sync fork and merge with original master
2 parents 372f3d9 + 6a1c063 commit 1518e4b

File tree

5 files changed

+11132
-14
lines changed

5 files changed

+11132
-14
lines changed

.eslintrc.js

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
module.exports = {
2-
extends: "airbnb",
3-
parser: "babel-eslint",
2+
extends: ['airbnb', 'prettier'],
3+
parser: 'babel-eslint',
4+
plugins: ['prettier'],
45
env: {
56
browser: true,
67
es6: true,
78
jest: true
89
},
910
rules: {
10-
"import/no-extraneous-dependencies": ["error", { devDependencies: true }],
11-
"react/jsx-filename-extension": [1, { extensions: [".js", ".jsx"] }],
12-
"jsx-a11y/label-has-associated-control": [ "error", {
13-
"required": {
14-
"some": [ "nesting", "id" ]
11+
'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
12+
'react/jsx-filename-extension': [1, { extensions: ['.js', '.jsx'] }],
13+
'jsx-a11y/label-has-associated-control': [
14+
'error',
15+
{
16+
required: {
17+
some: ['nesting', 'id']
18+
}
1519
}
16-
}],
17-
"jsx-a11y/label-has-associated-control": ["error", { assert: "either" } ],
18-
"jsx-a11y/label-has-for": 'off'
20+
],
21+
'jsx-a11y/label-has-associated-control': ['error', { assert: 'either' }],
22+
'jsx-a11y/label-has-for': 'off',
23+
'prettier/prettier': 'error'
1924
}
20-
}
25+
};

.prettierrc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"arrowParens": "avoid",
3+
"bracketSpacing": true,
4+
"htmlWhitespaceSensitivity": "css",
5+
"insertPragma": false,
6+
"jsxBracketSameLine": false,
7+
"jsxSingleQuote": true,
8+
"printWidth": 80,
9+
"proseWrap": "preserve",
10+
"quoteProps": "as-needed",
11+
"requirePragma": false,
12+
"semi": true,
13+
"singleQuote": true,
14+
"tabWidth": 2,
15+
"trailingComma": "none",
16+
"useTabs": false
17+
}

package-lock.json

Lines changed: 44 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,15 @@
6262
"cross-env": "^6.0.3",
6363
"eslint": "^5.16.0",
6464
"eslint-config-airbnb": "^17.1.1",
65+
"eslint-config-prettier": "^6.0.0",
6566
"eslint-plugin-import": "^2.18.2",
6667
"eslint-plugin-jsx-a11y": "^6.2.3",
6768
"eslint-plugin-react": "^7.15.1",
6869
"husky": "^3.0.8",
6970
"jest": "^24.9.0",
7071
"jest-styled-components": "^6.3.3",
7172
"lint-staged": "^9.4.1",
73+
"prettier": "^1.18.2",
7274
"prop-types": "^15.7.2",
7375
"react": "^16.10.1",
7476
"react-dom": "^16.10.1",
@@ -90,6 +92,7 @@
9092
"lint-staged": {
9193
"*.js": [
9294
"eslint --fix",
95+
"prettier --write",
9396
"git add"
9497
]
9598
}

0 commit comments

Comments
 (0)