eslint-config-entva-typescript-base 2.15.0 → 2.17.0

package/index.js

@@ -5,12 +5,18 @@ import typescriptEslint from '@typescript-eslint/eslint-plugin';
 import tsParser from '@typescript-eslint/parser';
 import stylisticTs from '@stylistic/eslint-plugin-ts';
 
-const baseRules = baseConfig.reduce((acc, config) => ({ ...acc, ...config.rules }), {});
+const baseConfigRules = baseConfig.reduce((acc, config) => {
+  if (!config.files || !config.rules) return acc;
+  const isTest = config.files.some((pattern) => pattern.includes('.test.'));
+  const key = isTest ? 'test' : 'base';
+  acc[key] = { ...acc[key], ...config.rules };
+  return acc;
+}, { base: {}, test: {} });
 
 // Many TS rules mirror JS rules, we need to disable JS rule and apply config for the TS replacement
-const getOverrides = (rules, overridePrefix) => rules.reduce((acc, rule) => {
+const getOverrides = (base, rules, overridePrefix) => rules.reduce((acc, rule) => {
   acc[rule] = ['off'];
-  acc[`${overridePrefix}/${rule}`] = baseRules[rule];
+  acc[`${overridePrefix}/${rule}`] = base[rule];
   return acc;
 }, {});
 
@@ -71,8 +77,9 @@ export default [
     },
 
     rules: {
-      ...baseRules,
+      ...baseConfigRules.base,
       ...getOverrides(
+        baseConfigRules.base,
         [
           'no-array-constructor',
           'no-useless-constructor',
@@ -82,10 +89,12 @@ export default [
           'dot-notation',
           'naming-convention',
           'no-shadow',
+          'no-unused-vars',
         ],
         '@typescript-eslint',
       ),
       ...getOverrides(
+        baseConfigRules.base,
         [
           'space-before-function-paren',
           'lines-between-class-members',
@@ -102,16 +111,6 @@ export default [
         '@stylistic/ts',
       ),
 
-      // Glitchy because of the test rules
-      'import/first': ['error'],
-      'no-unused-vars': ['off'],
-      '@typescript-eslint/no-unused-vars': ['error', {
-        vars: 'all',
-        args: 'after-used',
-        ignoreRestSiblings: true,
-        caughtErrors: 'none',
-      }],
-
       '@typescript-eslint/no-implied-eval': ['error'],
       '@typescript-eslint/no-loss-of-precision': ['error'],
       '@typescript-eslint/no-loop-func': ['error'],
@@ -190,14 +189,6 @@ export default [
   },
   {
     files: [
-      '**/*.test.js',
-      '**/*.test.cjs',
-      '**/*.test.mjs',
-      '**/*.test.jsx',
-      '**/*.spec.js',
-      '**/*.spec.cjs',
-      '**/*.spec.mjs',
-      '**/*.spec.jsx',
       '**/*.test.ts',
       '**/*.test.tsx',
       '**/*.spec.ts',
@@ -210,9 +201,14 @@ export default [
       },
     },
     rules: {
-      'import/first': ['off'],
-      'no-unused-vars': ['off'],
-      '@typescript-eslint/no-unused-vars': ['off'],
+      ...baseConfigRules.test,
+      ...getOverrides(
+        baseConfigRules.test,
+        [
+          'no-unused-vars',
+        ],
+        '@typescript-eslint',
+      ),
     },
   },
 ];

package/package.json

@@ -9,7 +9,7 @@
     "url": "https://github.com/entva/styleguide"
   },
   "bugs": "https://github.com/entva/styleguide/issues",
-  "version": "2.15.0",
+  "version": "2.17.0",
   "keywords": [
     "linter",
     "config",
@@ -29,9 +29,9 @@
   },
   "dependencies": {
     "@stylistic/eslint-plugin-ts": "^2.12.1",
-    "@typescript-eslint/eslint-plugin": "^8.18.2",
-    "@typescript-eslint/parser": "^8.18.2",
-    "eslint-config-entva-base": "^2.15.0",
+    "@typescript-eslint/eslint-plugin": "^8.19.0",
+    "@typescript-eslint/parser": "^8.19.0",
+    "eslint-config-entva-base": "^2.17.0",
     "eslint-plugin-import": "^2.31.0",
     "globals": "^15.14.0"
   },