Skip to content

Commit 33da0f5

Browse files
committed
Use eslint-plugin-prettier; upgrade eslint
1 parent 527fe6f commit 33da0f5

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ language: node_js
22
node_js:
33
- stable
44
- 4.5
5+
script: npm run ci

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ install:
1616
test_script:
1717
- node --version
1818
- npm --version
19-
- cmd: "npm test"
19+
- cmd: "npm run ci"

package.json

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,35 @@
2525
},
2626
"devDependencies": {
2727
"ava": "^0.22.0",
28-
"eslint": "^3.19.0",
28+
"eslint": "^4.5.0",
2929
"eslint-config-i-am-meticulous": "^6.0.1",
3030
"eslint-plugin-import": "^2.2.0",
31+
"eslint-plugin-prettier": "^2.2.0",
3132
"npmpub": "^3.0.1",
3233
"postcss-scss": "^1.0.0",
3334
"prettier": "^1.3.1",
34-
"prettier-eslint-cli": "^4.0.0",
3535
"sugarss": "^1.0.0"
3636
},
3737
"scripts": {
38-
"lint": "prettier-eslint \"**/*.js\" --write --semi false --trailing-comma es5",
38+
"ci": "eslint . && ava",
39+
"lint": "eslint . --fix",
3940
"pretest": "npm run lint",
4041
"test": "ava",
4142
"release": "npmpub"
4243
},
4344
"eslintConfig": {
44-
"extends": "eslint-config-i-am-meticulous"
45+
"extends": "eslint-config-i-am-meticulous",
46+
"plugins": [
47+
"prettier"
48+
],
49+
"rules": {
50+
"prettier/prettier": [
51+
"error",
52+
{
53+
"semi": false,
54+
"trailingComma": "es5"
55+
}
56+
]
57+
}
4558
}
4659
}

0 commit comments

Comments
 (0)