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

Commit

Permalink
Merge pull request #1780 from ocBruno/fix/lint-config
Browse files Browse the repository at this point in the history
fix(build): fix precommit lint hook issue
  • Loading branch information
matteovivona authored Feb 7, 2020
2 parents c68a40c + 639f122 commit db8b247
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 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": "lf"
}
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@
"prepublishOnly": "npm run build",
"test": "react-scripts test --detectOpenHandles",
"test:ci": "cross-env CI=true react-scripts test",
"lint": "eslint \"src/**/*.{js,jsx,ts,tsx}\" --fix",
"lint": "eslint \"src/**/*.{js,jsx,ts,tsx}\"",
"lint:fix": "eslint \"src/**/*.{js,jsx,ts,tsx}\" --fix",
"coveralls": "npm run test:ci -- --coverage --watchAll=false && cat ./coverage/lcov.info | coveralls",
"semantic-release": "semantic-release"
},
Expand All @@ -121,6 +122,7 @@
},
"husky": {
"hooks": {
"pre-commit": "lint-staged",
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
}
},
Expand All @@ -131,7 +133,7 @@
},
"lint-staged": {
"**/*.{js,jsx,ts,tsx}": [
"npm run lint",
"npm run lint:fix",
"npm run test:ci",
"git add ."
]
Expand Down
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
bg="dark"
Expand Down Expand Up @@ -84,5 +83,4 @@ const Navbar = () => {
/>
)
}

export default Navbar

1 comment on commit db8b247

@vercel
Copy link

@vercel vercel bot commented on db8b247 Feb 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.