Skip to content

Update husky and let lint-staged fix ESLint issues #3370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rejas merged 2 commits into from
Jan 28, 2024
Merged

Update husky and let lint-staged fix ESLint issues #3370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a49fdf
Update husky and let lint-staged fix ESLint issues
KristjanESPERANTO Jan 27, 2024
98e8d12
[lint-staged] Also fix css
KristjanESPERANTO Jan 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .husky/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/sh

[ -f "$(dirname "$0")/_/husky.sh" ] && . "$(dirname "$0")/_/husky.sh"

if command -v npm &> /dev/null; then
npm run lint:staged
fi
1 change: 1 addition & 0 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*.js
.eslintignore
.husky/pre-commit
.prettierignore
/config
/coverage
Expand Down
5 changes: 3 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ _This release is scheduled to be released on 2024-04-01._

### Added

- Output of system information to the console for troubleshooting (#3328 and #3337), ignore errors under aarch64
- [chore] Add `eslint-plugin-package-json` to lint the `package.json` files
- Output of system information to the console for troubleshooting (#3328 and #3337), ignore errors under aarch64 (#3349)
- [chore] Add `eslint-plugin-package-json` to lint the `package.json` files (#3368)

### Updated

Expand All @@ -22,6 +22,7 @@ _This release is scheduled to be released on 2024-04-01._
- Rework logging colors (#3350)
- Update electron to v28 and update other dependencies (#3357)
- Update pm2 to v5.3.1 with no allow-ghsas (#3364)
- [chore] Update husky and let lint-staged fix ESLint issues

### Fixed

Expand Down
12 changes: 6 additions & 6 deletions package-lock.json
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"lint:js": "eslint . --fix",
"lint:css": "stylelint 'css/main.css' 'fonts/*.css' 'modules/default/**/*.css' 'vendor/*.css' --config .stylelintrc.json --fix",
"lint:staged": "lint-staged",
"prepare": "[ -f node_modules/.bin/husky ] && husky install || echo no husky installed."
"prepare": "[ -f node_modules/.bin/husky ] && husky || echo no husky installed."
},
"repository": "MagicMirrorOrg/MagicMirror",
"keywords": [
Expand All @@ -53,7 +53,7 @@
"eslint-plugin-package-json": "^0.10.1",
"eslint-plugin-unicorn": "^50.0.1",
"express-basic-auth": "^1.2.1",
"husky": "^8.0.3",
"husky": "^9.0.6",
"jest": "^29.7.0",
"jsdom": "^23.2.0",
"lint-staged": "^15.2.0",
Expand Down Expand Up @@ -88,8 +88,8 @@
},
"lint-staged": {
"*": "prettier --write",
"*.js": "eslint",
"*.css": "stylelint"
"*.js": "eslint --fix",
"*.css": "stylelint --fix"
},
"_moduleAliases": {
"node_helper": "js/node_helper.js",
Expand Down