Skip to content

Commit

Permalink
Turn off eslint rules inconsistent with prettier settings and run pre…
Browse files Browse the repository at this point in the history
…ttier through eslint (#136)
  • Loading branch information
Andarist authored and ForsakenHarmony committed May 28, 2018
1 parent 3afc4f4 commit 4d5ff56
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 11 deletions.
15 changes: 15 additions & 0 deletions .eslintrc
@@ -0,0 +1,15 @@
{
"extends": [
"eslint-config-developit",
"prettier",
"plugin:prettier/recommended"
],
"plugins": [
"prettier"
],
"rules": {
"brace-style": "off",
"comma-dangle": ["warn", "always-multiline"],
"indent": "off"
}
}
5 changes: 1 addition & 4 deletions lint-staged.config.js
@@ -1,9 +1,6 @@
module.exports = {
linters: {
'{src,test}/**/*.js': [
'prettier --use-tabs --single-quote --trailing-comma=all --write',
'git add',
],
'{src,test}/**/*.js': ['eslint --fix', 'git add'],
'*.md': ['prettier --write', 'git add'],
},
ignore: ['**/dist/**/*.js'],
Expand Down
15 changes: 8 additions & 7 deletions package.json
Expand Up @@ -17,17 +17,16 @@
"release": "npm run -s prepare && npm test && git commit -am $npm_package_version && git tag $npm_package_version && git push && git push --tags && npm publish"
},
"repository": "developit/microbundle",
"eslintConfig": {
"extends": "eslint-config-developit",
"rules": {
"comma-dangle": ["warn", "always-multiline"]
}
},
"babel": {
"presets": [
"env"
]
},
"prettier": {
"singleQuote": true,
"trailingComma": "all",
"useTabs": true
},
"keywords": [
"bundle",
"rollup",
Expand Down Expand Up @@ -76,11 +75,13 @@
"directory-tree": "^2.1.0",
"eslint": "^4.19.1",
"eslint-config-developit": "^1.1.1",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-prettier": "^2.6.0",
"fs-extra": "^5.0.0",
"husky": "^0.14.3",
"jest": "^22.4.3",
"lint-staged": "^7.1.0",
"prettier": "^1.12.1",
"prettier": "^1.13.0",
"rimraf": "^2.6.2",
"shell-quote": "^1.6.1",
"strip-ansi": "^4.0.0"
Expand Down

0 comments on commit 4d5ff56

Please sign in to comment.