1
0
mirror of https://github.com/videojs/video.js.git synced 2025-02-04 11:43:27 +02:00

chore: fix lint on pre-commit with lint-staged, use npm-merge-driver (#5591)

run vjsstandard --fix on pre-commit on staged files via lint-staged.
Install npm-merge-driver to fix package-lock issues during merges and rebases.
This commit is contained in:
Brandon Casey 2018-11-16 00:04:11 -05:00 committed by Gary Katsevman
parent 2162239497
commit be9e9a93db
2 changed files with 1056 additions and 1 deletions

1047
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -114,11 +114,13 @@
"karma": "^3.0.0", "karma": "^3.0.0",
"karma-browserify": "^5.3.0", "karma-browserify": "^5.3.0",
"klaw-sync": "^6.0.0", "klaw-sync": "^6.0.0",
"lint-staged": "^8.0.4",
"load-grunt-tasks": "^4.0.0", "load-grunt-tasks": "^4.0.0",
"markdown-table": "^1.0.0", "markdown-table": "^1.0.0",
"maxmin": "^2.1.0", "maxmin": "^2.1.0",
"minimist": "^1.2.0", "minimist": "^1.2.0",
"node-sass": "^4.10.0", "node-sass": "^4.10.0",
"npm-merge-driver-install": "^1.1.1",
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"postcss-cli": "^6.0.0", "postcss-cli": "^6.0.0",
"proxyquireify": "^3.0.0", "proxyquireify": "^3.0.0",
@ -176,7 +178,13 @@
}, },
"husky": { "husky": {
"hooks": { "hooks": {
"pre-push": "npm run lint -- --errors" "pre-commit": "lint-staged"
} }
},
"lint-staged": {
"*.js": [
"vjsstandard --fix",
"git add"
]
} }
} }