Merge branch 'main' into develop

lifion · Apr 5, 2022 · e769a01 · e769a01
2 parents 96ac7f6 + 0e7c952
commit e769a01
Show file tree

Hide file tree

Showing 4 changed files with 450 additions and 511 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### v3.0.1 (2022-04-05)
+
+- [`1e87fcf`](https://github.com/lifion/eslint-config-lifion/commit/1e87fcf0d00a83d4137c57f1a8e449fbef2acd70): Resolve conflict on hex numbers and Prettier
+- [`70e4ca4`](https://github.com/lifion/eslint-config-lifion/commit/70e4ca49afb6e0f588d2eeaef19a06b123c93a18): Correct the CHANGELOG
+
 ### v3.0.0 (2022-02-10)
 
 - [`#429`](https://github.com/lifion/eslint-config-lifion/pull/429): Bump eslint-plugin-jest from 25.2.2 to 25.2.4
@@ -30,7 +35,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 ### v2.2.1 (2021-09-30)
 
 - [`60d99b8`](https://github.com/lifion/eslint-config-lifion/commit/60d99b87104c0da057902d9a6856ef3e84a4589f): Fix unit tests
-- [`1b11ac7`](https://github.com/lifion/eslint-config-lifion/commit/1b11ac7957f745730a898ff2df370a0d59f3b04e): Support nested **mocks** folders
+- [`1b11ac7`](https://github.com/lifion/eslint-config-lifion/commit/1b11ac7957f745730a898ff2df370a0d59f3b04e): Support nested __mocks__ folders
 
 ### v2.2.0 (2021-09-30)
 

diff --git a/lib/index.js b/lib/index.js
@@ -150,6 +150,7 @@ module.exports = {
     'unicorn/no-for-loop': 'off',
     'unicorn/no-null': 'off',
     'unicorn/no-useless-undefined': 'off',
+    'unicorn/number-literal-case': 'off',
     'unicorn/numeric-separators-style': 'off',
     'unicorn/prefer-flat-map': 'off',
     'unicorn/prefer-module': 'off',