fixes

Author: max-degterev

javascript/packages/eslint-base/index.js

@@ -17,9 +17,11 @@ export default [
       '**/*.test.js',
       '**/*.test.cjs',
       '**/*.test.mjs',
+      '**/*.test.jsx',
       '**/*.spec.js',
       '**/*.spec.cjs',
       '**/*.spec.mjs',
+      '**/*.spec.jsx',
       '**/__tests__/**',
     ],
     languageOptions: {
@@ -29,6 +31,7 @@ export default [
     },
   },
   {
+    files: ['**/*.{js,mjs,cjs,jsx}'],
     plugins: {
       import: importPlugin,
     },
@@ -53,11 +56,11 @@ export default [
     settings: {
       'import/resolver': {
         node: {
-          extensions: ['.mjs', '.js', '.json'],
+          extensions: ['.js', '.mjs', '.cjs', '.jsx', '.json'],
         },
       },
 
-      'import/extensions': ['.mjs', '.js', '.json'],
+      'import/extensions': ['.js', '.mjs', '.cjs', '.jsx', '.json'],
       'import/core-modules': [],
       'import/ignore': ['node_modules', '\\.(coffee|scss|css|less|hbs|svg|json)$'],
     },

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.7.0",
+  "version": "2.8.0",
   "keywords": [
     "linter",
     "config",

javascript/packages/eslint-react/index.js

@@ -8,18 +8,7 @@ import globals from 'globals';
 export default [
   ...baseConfig,
   {
-    files: [
-      '**/*.test.jsx',
-      '**/*.spec.jsx',
-    ],
-    languageOptions: {
-      globals: {
-        ...globals.jest,
-      },
-    },
-  },
-  {
-    files: ['**/*.{js,mjs,cjs,jsx}'],
+    files: ['**/*.jsx'],
     plugins: {
       react,
       'jsx-a11y': jsxA11Y,
@@ -48,11 +37,11 @@ export default [
     settings: {
       'import/resolver': {
         node: {
-          extensions: ['.mjs', '.js', '.json', '.jsx'],
+          extensions: ['.js', '.mjs', '.cjs', '.jsx', '.json'],
         },
       },
 
-      'import/extensions': ['.mjs', '.js', '.json', '.jsx'],
+      'import/extensions': ['.js', '.mjs', '.cjs', '.jsx', '.json'],
       'import/core-modules': [],
       'import/ignore': ['node_modules', '\\.(coffee|scss|css|less|hbs|svg|json)$'],
 

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

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