@tuomashatakka/eslint-config 2.2.0 → 2.2.2

package/eslint.config.mjs

@@ -3,6 +3,7 @@ import stylistic from '@stylistic/eslint-plugin'
 import tsplugin from '@typescript-eslint/eslint-plugin'
 import importPlugin from 'eslint-plugin-import'
 import react from 'eslint-plugin-react'
+import globals from 'globals'
 import tseslint from 'typescript-eslint'
 
 import rules from './rules.mjs'
@@ -27,9 +28,14 @@ const config = tseslint.config(
           jsx: true,
         },
       },
+      globals: {
+        ...globals.browser,
+        ...globals.node,
+      }
     },
     settings: {
-      'import/resolver': {
+      'import/internal-regex': '^@/(.+)',
+      'import/resolver':       {
         node: {
           extensions: [ '.js', '.jsx', '.ts', '.tsx', '.mjs', '.cjs' ],
         },

package/index.mjs

@@ -1,3 +1,4 @@
+import globals from 'globals'
 import tseslint from 'typescript-eslint'
 
 import config from './eslint.config.mjs'
@@ -9,7 +10,23 @@ const configType = tseslint.configs.base
  * @name config
  * @type {typeof configType}
  */
-export default config
+export default [
+  ...config,
+  {
+    files:           [ '**/*.{js,jsx,mjs,cjs,ts,tsx}' ],
+    languageOptions: {
+      ecmaVersion:   'latest',
+      sourceType:    'module',
+      parserOptions: {
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+      globals: {
+        ...globals.browser,
+      },
+    }
+  }]
 
 export {
   config,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuomashatakka/eslint-config",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Default eslint configuration",
   "type": "module",
   "main": "index.mjs",

package/rules.mjs

@@ -2,6 +2,7 @@
  * @exports {import("eslint/rules").ESLintRules} rules
  * @type {import("@eslint/core").RulesConfig}
  */
+
 export const rules = {
 
   // '@next/next/no-styled-jsx-in-document':    [ 'error' ],
@@ -26,22 +27,18 @@ export const rules = {
   'import/prefer-default-export':           [ 'error' ],
   'import/no-mutable-exports':              [ 'error' ],
   'import/order':                           [ 'warn', {
-    'groups':                  [ 'builtin', 'type', 'external', [ 'parent', 'sibling', 'index' ], 'internal', 'object' ],
+    'groups':                  [ 'builtin', 'type', 'external', [ 'parent', 'sibling', 'index' ], [ 'internal', 'object' ]],
     'alphabetize':             { order: 'asc', caseInsensitive: true },
     'distinctGroup':           true,
     'warnOnUnassignedImports': true,
     'newlines-between':        'always',
     'pathGroups':              [
-      { group: 'internal', pattern: '**/*.css', position: 'after' },
-      { group: 'object', pattern: '**/*.scss' },
-      { group: 'parent', pattern: '@/**' },
-      { group: 'parent', pattern: '../**' },
-      { group: 'sibling', pattern: './**' }]}],
+      { group: 'internal', pattern: '**/*.s?css' }
+    ]}
+  ],
 
   // Typescript
-  '@typescript-eslint/ban-ts-comment':  [ 'off', 'allow-single-line' ],
-  '@typescript-eslint/no-unused-vars':  [ 'warn' ],
-  '@typescript-eslint/no-explicit-any': [ 'warn' ],
+  '@stylistic/ban-ts-comment': [ 'off', 'allow-single-line' ],
 
   // Enforced practices (enforce functional and orthogonal code)
   'complexity':           [ 'warn', { max: 11 }],
@@ -122,7 +119,6 @@ export const rules = {
   '@stylistic/jsx-newline':                  [ 'warn', { prevent: true, allowMultilines: true }],
   '@stylistic/jsx-props-no-multi-spaces':    [ 'warn' ],
   '@stylistic/jsx-equals-spacing':           [ 'warn', 'never' ],
-  '@stylistic/jsx-indent-props':             [ 'warn', 2 ],
   '@stylistic/jsx-max-props-per-line':       [ 'warn', { maximum: 1, when: 'multiline' }],
   '@stylistic/jsx-self-closing-comp':        [ 'warn', { component: true, html: true }],
   '@stylistic/jsx-one-expression-per-line':  [ 'warn', { allow: 'single-child' }],
@@ -141,8 +137,6 @@ export const rules = {
   'react/jsx-closing-tag-location':          [ 'warn', 'line-aligned' ],
   'react/jsx-equals-spacing':                [ 'warn', 'never' ],
   'react/jsx-first-prop-new-line':           [ 'warn', 'multiline' ],
-  'react/jsx-indent':                        [ 'warn', 2, { checkAttributes: true, indentLogicalExpressions: true }],
-  'react/jsx-indent-props':                  [ 'warn', 2 ],
   'react/jsx-max-props-per-line':            [ 'warn', { maximum: 1, when: 'multiline' }],
   'react/jsx-no-constructed-context-values': [ 'warn' ],
   'react/jsx-no-script-url':                 [ 'warn' ],
@@ -154,6 +148,10 @@ export const rules = {
   'react/jsx-curly-spacing':                 [ 'warn', { when: 'never', children: true }],
   'react/display-name':                      [ 'warn', { checkContextObjects: true }],
 
+  'import/prefer-default-export': 'off',
+  '@stylistic/jsx-indent-props':  [ 'warn', { indentMode: 2, ignoreTernaryOperator: true }],
+  '@stylistic/indent':            [ 'warn', 2, { offsetTernaryExpressions: false, flatTernaryExpressions: true }],
+
   // Block padding
   '@stylistic/no-multi-spaces':                  [ 'warn', { exceptions: { Property: true, TSTypeAnnotation: true, VariableDeclarator: true, ObjectExpression: false }}],
   '@stylistic/spaced-comment':                   [ 'warn', 'always', { markers: [ '/' ]}],
@@ -183,6 +181,16 @@ export const rules = {
     { blankLine: 'any',
       prev:      [ 'multiline-expression', 'function', 'block-like', 'block' ],
       next:      [ 'multiline-expression', 'function', 'block-like', 'block' ]}],
+
+  '@stylistic/jsx-closing-bracket-location': [ 0 ],
+  '@stylistic/jsx-one-expression-per-line':  [ 'warn', { allow: 'non-jsx' }],
+  'react/jsx-one-expression-per-line':       [ 'warn', { allow: 'non-jsx' }],
+  'react/jsx-closing-bracket-location':      [ 0 ],
+  'react/jsx-curly-spacing':                 [ 0 ],
+  '@stylistic/jsx-curly-spacing':            [ 'warn', { spacing: { objectLiterals: 'always' }}],
+  '@stylistic/implicit-arrow-linebreak':     [ 0 ],
+  '@stylistic/arrow-parens':                 [ 1, 'as-needed', { requireForBlockBody: true }],
+  '@stylistic/space-before-function-paren':  [ 1, 'always' ]
 }
 
 export default rules