kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 20:22:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2567 from khassel/fix_husky

Browse Source
This commit is contained in:
Michael Teeuw 2021-05-27 07:14:56 +02:00 committed by GitHub
commit a68019293f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.husky/pre-commit Normal file → Executable file
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
. "$(dirname "$0")/_/husky.sh" . "$(dirname "$0")/_/husky.sh"
pretty-quick --staged npm run lint:staged

2
CHANGELOG.md
View File

@ -29,7 +29,7 @@ Special thanks to the following contributors: @B1gG, @codac, @ezeholz, @khassel,
- Use node v16 in github workflow (replacing node v10) - Use node v16 in github workflow (replacing node v10)
- Moved some files into better suited directories - Moved some files into better suited directories
- Update dependencies in package.json, require node >= v12, remove `rrule-alt` and `rrule` - Update dependencies in package.json, require node >= v12, remove `rrule-alt` and `rrule`
- Update dependencies in package.json and migrate husky to v6 - Update dependencies in package.json and migrate husky to v6, fix husky setup in prod environment
- Cleaned up error handling in newsfeed and calendar modules - Cleaned up error handling in newsfeed and calendar modules
### Removed ### Removed

3
package.json
View File

@ -22,7 +22,8 @@
"lint:prettier": "prettier --write **/*.{js,css,json,md,yml}", "lint:prettier": "prettier --write **/*.{js,css,json,md,yml}",
"lint:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --fix", "lint:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --fix",
"lint:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json --fix", "lint:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json --fix",
"prepare": "husky install" "lint:staged": "pretty-quick --staged",
"prepare": "[ -f node_modules/.bin/husky ] && husky install || echo no husky installed."
}, },
"repository": { "repository": {
"type": "git", "type": "git",