Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Commit

Permalink
fix(build): fix prettier/eslint config
Browse files Browse the repository at this point in the history
missing tests from precommit hook to be able to commit changes

fix #1782
  • Loading branch information
ocBruno committed Feb 2, 2020
1 parent b2ae025 commit e041e22
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ module.exports = {
'prettier',
'prettier/@typescript-eslint',
'plugin:prettier/recommended',
'eslint-config-prettier'
],
globals: {
Atomics: 'readonly',
Expand All @@ -31,6 +32,7 @@ module.exports = {
},
plugins: ['react', '@typescript-eslint', 'prettier', 'jest'],
rules: {
"prettier/prettier": "error",
'@typescript-eslint/member-delimiter-style': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/no-explicit-any': 'off',
Expand Down
5 changes: 3 additions & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"trailingComma": "all",
"bracketSpacing": true,
"jsxBracketSameLine": false,
"arrowParens": "always"
}
"arrowParens": "always",
"endOfLine": "auto"
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
},
"husky": {
"hooks": {
"pre-commit": "lint-staged && yarn test:ci ",
"pre-commit": "lint-staged",
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
}
},
Expand All @@ -131,8 +131,8 @@
},
"lint-staged": {
"*.{js,jsx,ts,tsx}": [
"eslint --fix"
"eslint"
],
"*.js": "eslint --cache --fix"
"*.js": "eslint --cache"
}
}
2 changes: 0 additions & 2 deletions src/components/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { useTranslation } from 'react-i18next'
const Navbar = () => {
const { t } = useTranslation()
const history = useHistory()

return (
<HospitalRunNavbar
brand={{
Expand Down Expand Up @@ -70,5 +69,4 @@ const Navbar = () => {
/>
)
}

export default Navbar

0 comments on commit e041e22

Please sign in to comment.