Skip to content

Commit

Permalink
Merge pull request #9 from gius/master
Browse files Browse the repository at this point in the history
Dependencies updated
  • Loading branch information
gius authored Oct 30, 2021
2 parents 838b29d + 0e1e0c6 commit 5baef09
Show file tree
Hide file tree
Showing 4 changed files with 832 additions and 30 deletions.
5 changes: 4 additions & 1 deletion eslint-default.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ module.exports = {
"plugin:@typescript-eslint/recommended-requiring-type-checking",
"plugin:react/recommended",
"plugin:sonarjs/recommended",
"prettier/@typescript-eslint", // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
"plugin:eslint-comments/recommended",
"prettier", // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
"plugin:prettier/recommended", // Enables eslint-plugin-prettier and displays prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array.
],
rules: {
Expand All @@ -27,6 +28,8 @@ module.exports = {
"react/prop-types": "off",
"react/display-name": "off",
"react/jsx-curly-brace-presence": ["error", "never"],
"eslint-comments/no-unused-disable": "error",
"eslint-comments/disable-enable-pair": ["error", {"allowWholeFile": true}],

"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/interface-name-prefix": "off",
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@emanprague/eslint-config",
"version": "2.2.0",
"version": "2.4.0",
"description": "ESlint and prettier configurations",
"main": "eslint-config.js",
"repository": "https://github.com/eManPrague/eslint-config.git",
Expand All @@ -18,17 +18,17 @@
],
"author": "Augustin Sulc <[email protected]>",
"license": "MIT",
"peerDependencies": {
"@typescript-eslint/eslint-plugin": "^4.9.1",
"@typescript-eslint/parser": "^4.9.1",
"eslint": "^7.15.0",
"eslint-config-prettier": "^7.0.0",
"eslint-plugin-prettier": "^3.2.0",
"dependencies": {
"@typescript-eslint/eslint-plugin": "^5.2.0",
"@typescript-eslint/parser": "^5.2.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.21.5",
"eslint-plugin-sonarjs": "^0.5.0",
"typescript": "4"
"eslint-plugin-sonarjs": "^0.10.0",
"typescript": "^4.4.4"
},
"devDependencies": {
"@types/eslint": "^7.2.6"
"peerDependencies": {
"eslint": "^7.15.0"
}
}
2 changes: 1 addition & 1 deletion prettier-config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
trailingComma: "es5",
jsxBracketSameLine: true,
bracketSameLine: true,
endOfLine: "auto",
printWidth: 130,
arrowParens: "avoid",
Expand Down
Loading

0 comments on commit 5baef09

Please sign in to comment.