Skip to content

Commit

Permalink
add prettier back
Browse files Browse the repository at this point in the history
  • Loading branch information
JimLiu committed Jun 20, 2019
1 parent 525e17b commit f4ab23d
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["airbnb"],
"extends": ["airbnb", "prettier"],
"globals": {
"document": true,
"window": true
Expand Down
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"prettier.eslintIntegration": true,
"eslint.autoFixOnSave": true,
"javascript.validate.enable": false,
"editor.rulers": [
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,20 @@
"create-minor": "sh ./scripts/release minor",
"create-patch": "sh ./scripts/release patch",
"publish-release": "npm test && sh ./scripts/publish",
"lint": "eslint src"
"lint": "eslint src",
"format": "prettier --config .prettierrc.js --write \"src/**/*.{js,json,md}\" \"docs/**/*.{js,json,md}\" \"*.{js,json,md}\""
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": "npm run lint",
"lint-staged": {
"**/*.{js,css,md}": [
"npm run format",
"git add"
]
},
"repository": {
"type": "git",
"url": "git+https://github.com/video-react/video-react.git"
Expand Down Expand Up @@ -103,6 +109,7 @@
"enzyme-adapter-react-16": "^1.14.0",
"eslint": "^5.16.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-prettier": "^4.3.0",
"eslint-plugin-import": "^2.17.3",
"eslint-plugin-jsx-a11y": "^6.2.1",
"eslint-plugin-react": "^7.13.0",
Expand All @@ -116,6 +123,7 @@
"lint-staged": "^8.2.0",
"mini-css-extract-plugin": "^0.5.0",
"node-sass": "^4.12.0",
"prettier": "^1.18.2",
"raw-loader": "^1.0.0",
"react": "^16.8.6",
"react-dom": "^16.8.6",
Expand Down

0 comments on commit f4ab23d

Please sign in to comment.