fixes

Author: max-degterev

javascript/packages/eslint-base/index.js

@@ -182,6 +182,7 @@ export default [
           '**/protractor.conf.*.js',
           '**/karma.conf.js',
           '**/.eslintrc.js',
+          '**/.eslint.config.js',
         ],
 
         optionalDependencies: false,

javascript/packages/eslint-base/package-lock.json

@@ -9,7 +9,7 @@
     "url": "https://github.com/entva/styleguide"
   },
   "bugs": "https://github.com/entva/styleguide/issues",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "keywords": [
     "linter",
     "config",

javascript/packages/eslint-base/package.json

@@ -9,7 +9,7 @@
     "url": "https://github.com/entva/styleguide"
   },
   "bugs": "https://github.com/entva/styleguide/issues",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "keywords": [
     "linter",
     "config",
@@ -29,7 +29,7 @@
     "react": "^19.0.0"
   },
   "dependencies": {
-    "eslint-config-entva-base": "^2.4.0",
+    "eslint-config-entva-base": "^2.5.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-react": "^7.37.2",

javascript/packages/eslint-react/package-lock.json

@@ -11,6 +11,7 @@
   "scripts": {
     "preinstall": "scripts/for-each-package npm install",
     "test": "scripts/for-each-package npm run test",
+    "public": "scripts/for-each-package npm public --access public",
     "check": "npm run test"
   }
 }

javascript/packages/eslint-react/package.json

@@ -1,5 +1,5 @@
 #!/bin/sh
-PACKAGES=`find . -iname packages -not -path "*/node_modules/*"  -exec find {} -maxdepth 1 -mindepth 1  \;`
+PACKAGES=`find . -iname packages -not -path "*/node_modules/*" -exec find {} -maxdepth 1 -mindepth 1 \;`
 EXIT_STATUS=0
 
 for PACKAGE in $PACKAGES

package.json

@@ -9,7 +9,7 @@
     "url": "https://github.com/entva/styleguide"
   },
   "bugs": "https://github.com/entva/styleguide/issues",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "keywords": [
     "linter",
     "config",
@@ -31,7 +31,7 @@
     "@stylistic/eslint-plugin-ts": "^2.12.1",
     "@typescript-eslint/eslint-plugin": "^8.18.0",
     "@typescript-eslint/parser": "^8.18.0",
-    "eslint-config-entva-base": "^2.4.0",
+    "eslint-config-entva-base": "^2.5.0",
     "eslint-plugin-import": "^2.31.0",
     "globals": "^15.13.0"
   },

scripts/for-each-package

@@ -1,8 +1,25 @@
 import baseConfig from 'eslint-config-entva';
 import tsConfig from 'eslint-config-entva-typescript-base';
-import tsParser from '@typescript-eslint/parser';
+import react from 'eslint-plugin-react';
+import jsxA11Y from 'eslint-plugin-jsx-a11y';
+import reactHooks from 'eslint-plugin-react-hooks';
 import importPlugin from 'eslint-plugin-import';
 import globals from 'globals';
+import typescriptEslint from '@typescript-eslint/eslint-plugin';
+import tsParser from '@typescript-eslint/parser';
+import stylisticTs from '@stylistic/eslint-plugin-ts';
+
+// ESLint 9 is shit at merging config rules so we have to do it by hand.
+// Thanks ESLint <3
+const baseRules = [...baseConfig, ...tsConfig].reduce((acc, config) => {
+  if (config.rules) {
+    Object.keys(config.rules).forEach((rule) => {
+      acc[rule] = config.rules[rule];
+    });
+  }
+
+  return acc;
+}, {});
 
 export default [
   ...baseConfig,
@@ -20,8 +37,19 @@ export default [
   },
   {
     files: ['**/*.{js,mjs,cjs,ts,tsx}'],
+    ignores: [
+      '**/node_modules/',
+      '**/public/',
+      '**/coverage/',
+      '**/.*',
+    ],
     plugins: {
+      react,
+      'jsx-a11y': jsxA11Y,
+      'react-hooks': reactHooks,
       import: importPlugin,
+      '@typescript-eslint': typescriptEslint,
+      '@stylistic/ts': stylisticTs,
     },
 
     languageOptions: {
@@ -47,16 +75,16 @@ export default [
     },
 
     settings: {
+      'import/parsers': {
+        '@typescript-eslint/parser': ['.ts', '.tsx', '.d.ts'],
+      },
+
       'import/resolver': {
         node: {
           extensions: ['.mjs', '.js', '.json', '.jsx', '.ts', '.tsx', '.d.ts'],
         },
       },
 
-      'import/parsers': {
-        '@typescript-eslint/parser': ['.ts', '.tsx', '.d.ts'],
-      },
-
       'import/extensions': ['.mjs', '.js', '.json', '.jsx', '.ts', '.tsx', '.d.ts'],
       'import/external-module-folders': ['node_modules', 'node_modules/@types'],
       'import/core-modules': [],
@@ -70,6 +98,11 @@ export default [
       propWrapperFunctions: ['forbidExtraProps', 'exact', 'Object.freeze'],
     },
 
-    rules: {},
+    rules: {
+      ...baseRules,
+      'react/jsx-filename-extension': ['error', {
+        extensions: ['.jsx', '.tsx'],
+      }],
+    },
   },
 ];