Merge branch 'release/4.3.1'

ravorona · Apr 7, 2024 · 9ed2f94 · 9ed2f94
2 parents f268043 + aa37059
commit 9ed2f94
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [4.3.1](https://github.com/ravorona/eslint-config/compare/4.3.0...4.3.1) (2024-04-07)
+
+
+### Bug Fixes
+
+* Eslint configuratio ([7842b0f](https://github.com/ravorona/eslint-config/commit/7842b0f2290453c930397d04bcd6c363491ac62c))
+* Module import ([f5c0637](https://github.com/ravorona/eslint-config/commit/f5c063729c7b392b1d830b496fb70fc7c7af1514))
+
 ## [4.3.0](https://github.com/ravorona/eslint-config/compare/4.2.2...4.3.0) (2024-04-07)
 
 

diff --git a/README.md b/README.md
@@ -29,13 +29,13 @@ npm i --save-dev \
 Set the shared configurations inside your [ESLint configuration](https://eslint.org/docs/user-guide/configuring)
 
 ```js
-import { configs } from '@ravorona/eslint'
+import ravorona from '@ravorona/eslint-config'
 
 export default [
-    configs.all,
+    ...ravorona.configs.all,
     {
         rules: {
-            "no-unused-vars": "warn"
+            'no-unused-vars': 'warn'
         }
     }
 ]

diff --git a/eslint.config.js b/eslint.config.js
@@ -19,19 +19,22 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { configs } from '@eslint/js'
+import js from '@eslint/js'
 
 const jsRules = {
-    'block-spacing': [ 'error', 'always' ],
-    'camelcase': [ 'error', { 'properties': 'never' } ],
+    'block-spacing': ['error', 'always'],
+    'camelcase': ['error', { properties: 'never' }],
     'constructor-super': 'error',
-    'dot-location': [ 'error', 'property' ],
-    'eqeqeq': [ 'error', 'always', { 'null': 'ignore' } ],
-    'handle-callback-err': [ 'error', '^(err|error)$' ],
-    'new-cap': [ 'error', {
-        'newIsCap': true,
-        'capIsNew': false
-    } ],
+    'dot-location': ['error', 'property'],
+    'eqeqeq': ['error', 'always', { null: 'ignore' }],
+    'handle-callback-err': ['error', '^(err|error)$'],
+    'new-cap': [
+        'error',
+        {
+            newIsCap: true,
+            capIsNew: false
+        }
+    ],
     'new-parens': 'error',
     'newline-before-return': 'error',
     'no-array-constructor': 'error',
@@ -50,10 +53,13 @@ const jsRules = {
     'no-implied-eval': 'error',
     'no-irregular-whitespace': 'error',
     'no-iterator': 'error',
-    'no-magic-numbers': [ 'error', {
-        'ignoreArrayIndexes': true,
-        'ignoreDefaultValues': true
-    } ],
+    'no-magic-numbers': [
+        'error',
+        {
+            ignoreArrayIndexes: true,
+            ignoreDefaultValues: true
+        }
+    ],
     'no-new-object': 'error',
     'no-new-require': 'error',
     'no-new-wrappers': 'error',
@@ -66,47 +72,49 @@ const jsRules = {
     'no-undef': 'error',
     'no-undef-init': 'error',
     'no-unmodified-loop-condition': 'error',
-    'no-unneeded-ternary': [ 'error', { 'defaultAssignment': false } ],
+    'no-unneeded-ternary': ['error', { defaultAssignment: false }],
     'no-unreachable': 'error',
-    'no-unused-vars': [ 'error', {
-        'vars': 'all',
-        'args': 'after-used',
-        'ignoreRestSiblings': false
-    } ],
+    'no-unused-vars': [
+        'error',
+        {
+            vars: 'all',
+            args: 'after-used',
+            ignoreRestSiblings: false
+        }
+    ],
     'no-useless-call': 'error',
     'no-useless-computed-key': 'error',
     'no-useless-constructor': 'warn',
     'no-useless-rename': 'error',
     'no-var': 'error',
-    'object-curly-newline': [ 'error', { 'consistent': true } ],
-    'object-property-newline': [ 'error', { 'allowAllPropertiesOnSameLine': false } ],
-    'one-var': [ 'error', { 'initialized': 'never' } ],
-    'one-var-declaration-per-line': [ 'error', 'always' ],
-    'spaced-comment': [ 'error', 'always', {
-        'line': { 'markers': [ '*package', '!', ',' ] },
-        'block': {
-            'balanced': true,
-            'markers': [ '*package', '!', ',' ],
-            'exceptions': [ '*' ]
+    'object-curly-newline': ['error', { consistent: true }],
+    'object-property-newline': ['error', { allowAllPropertiesOnSameLine: false }],
+    'one-var': ['error', { initialized: 'never' }],
+    'one-var-declaration-per-line': ['error', 'always'],
+    'spaced-comment': [
+        'error',
+        'always',
+        {
+            line: { markers: ['*package', '!', ','] },
+            block: {
+                balanced: true,
+                markers: ['*package', '!', ','],
+                exceptions: ['*']
+            }
         }
-    } ],
-    'unicode-bom': [ 'error', 'never' ],
+    ],
+    'unicode-bom': ['error', 'never'],
     'use-isnan': 'error',
     'valid-typeof': 'error',
-    'wrap-iife': [ 'error', 'any', { 'functionPrototypeMethods': true } ],
-    'yield-star-spacing': [ 'error', 'both' ],
-    'yoda': [ 'error', 'never' ]
+    'wrap-iife': ['error', 'any', { functionPrototypeMethods: true }],
+    'yield-star-spacing': ['error', 'both'],
+    'yoda': ['error', 'never']
 }
 
 const jsConfig = [
-    configs.recommended,
+    js.configs.recommended,
     {
-        ignores: [
-            'node_modules',
-            'vendor',
-            'public',
-            'dist'
-        ]
+        ignores: ['node_modules', 'vendor', 'public', 'dist']
     },
     {
         languageOptions: {
@@ -118,7 +126,7 @@ const jsConfig = [
         linterOptions: {
             reportUnusedDisableDirectives: 'warn'
         },
-        jsRules
+        rules: jsRules
     }
 ]
 

diff --git a/package.json b/package.json
@@ -1,11 +1,12 @@
 {
   "name": "@ravorona/eslint-config",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "description": "ESLint configuration",
   "main": "eslint.config.js",
   "repository": "[email protected]:ravorona/eslint-config.git",
   "author": "яαvoroηα <[email protected]>",
   "license": "MIT",
+  "type": "module",
   "keywords": [
     "ravorona",
     "eslint"
@@ -16,5 +17,8 @@
   "peerDependencies": {
     "@eslint/js": "^9.0.0",
     "eslint": "^9.0.0"
+  },
+  "devDependencies": {
+    "prettier": "^3.2.5"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -2,3 +2,7 @@
 # yarn lockfile v1
 
 
+prettier@^3.2.5:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368"
+  integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==