Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
eaviles committed Apr 6, 2021
2 parents 0eef0ab + e9bc956 commit e9a638f
Show file tree
Hide file tree
Showing 4 changed files with 424 additions and 271 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

### v2.0.3 (2021-04-06)

- [`#342`](https://github.com/lifion/eslint-config-lifion/pull/342): Bump eslint-plugin-jest from 24.3.2 to 24.3.4
- [`#336`](https://github.com/lifion/eslint-config-lifion/pull/336): Bump eslint-config-prettier from 7.2.0 to 8.1.0
- [`#338`](https://github.com/lifion/eslint-config-lifion/pull/338): Bump eslint-plugin-no-secrets from 0.6.8 to 0.8.9
- [`#335`](https://github.com/lifion/eslint-config-lifion/pull/335): Add dependabot
- [`c57012a`](https://github.com/lifion/eslint-config-lifion/commit/c57012a2390dbd293067202cb60a599060d4d3a8): Resolve the conflict between […arr] and Array.from(arr)
- [`276bcc3`](https://github.com/lifion/eslint-config-lifion/commit/276bcc33c047916464d3ca54427cdb9800d7b9a8): Upgrade dependencies
- [`85bef09`](https://github.com/lifion/eslint-config-lifion/commit/85bef09d37cb52dca664f2159480bbf82958f7d2): Replace renovate with dependabot
- [`10d4c53`](https://github.com/lifion/eslint-config-lifion/commit/10d4c53f48bd8a31f6dcf3f5591e26062c8360ab): Change any explicit use of prettier to prettier/recommended

### v2.0.2 (2021-02-19)

- [`#328`](https://github.com/lifion/eslint-config-lifion/pull/328): Add exception for cognitive complexity for tests
Expand Down
5 changes: 4 additions & 1 deletion lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,15 @@ module.exports = {
'newlines-between': 'always'
}
],
'jest/no-deprecated-functions': 'off',
'jsdoc/check-tag-names': ['error', { definedTags: ['fulfil', 'reject', 'typicalname'] }],
'jsdoc/require-hyphen-before-param-description': 'warn',
'jsdoc/require-jsdoc': 'off',
'jsdoc/require-returns-description': 'off',
'no-await-in-loop': 'off',
'no-constructor-bind/no-constructor-bind': 'error',
'no-constructor-bind/no-constructor-state': 'error',
'no-continue': 'off',
'no-restricted-syntax': [
'error',
{
Expand All @@ -118,7 +120,7 @@ module.exports = {
// 'no-secrets/no-secrets': 'error',
'no-use-extend-native/no-use-extend-native': 'error',
'promise/no-callback-in-promise': 'off',
'radar/cognitive-complexity': ['error', 32],
'radar/cognitive-complexity': ['error', 128],
'security/detect-object-injection': 'off',
'simple-import-sort/imports': 'off',
'sort-destructure-keys/sort-destructure-keys': 'error',
Expand All @@ -130,6 +132,7 @@ module.exports = {
'unicorn/no-null': 'off',
'unicorn/no-useless-undefined': 'off',
'unicorn/prefer-flat-map': 'off',
'unicorn/prefer-spread': 'off',
'unicorn/prevent-abbreviations': 'off'
},
settings: {
Expand Down
Loading

0 comments on commit e9a638f

Please sign in to comment.