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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/index.js +8 -15
  2. package/package.json +2 -2
package/index.js CHANGED
@@ -1,18 +1,10 @@
1
- import baseConfig from 'eslint-config-entva-base';
1
+ import { ignoreRule, mainRule, testRule } from 'eslint-config-entva-base';
2
2
  import importPlugin from 'eslint-plugin-import';
3
3
  import globals from 'globals';
4
4
  import typescriptEslint from '@typescript-eslint/eslint-plugin';
5
5
  import tsParser from '@typescript-eslint/parser';
6
6
  import stylisticTs from '@stylistic/eslint-plugin-ts';
7
7
 
8
- const baseConfigRules = baseConfig.reduce((acc, config) => {
9
- if (!config.files || !config.rules) return acc;
10
- const isTest = config.files.some((pattern) => pattern.includes('.test.'));
11
- const key = isTest ? 'test' : 'base';
12
- acc[key] = { ...acc[key], ...config.rules };
13
- return acc;
14
- }, { base: {}, test: {} });
15
-
16
8
  // Many TS rules mirror JS rules, we need to disable JS rule and apply config for the TS replacement
17
9
  const getOverrides = (base, rules, overridePrefix) => rules.reduce((acc, rule) => {
18
10
  acc[rule] = ['off'];
@@ -21,7 +13,8 @@ const getOverrides = (base, rules, overridePrefix) => rules.reduce((acc, rule) =
21
13
  }, {});
22
14
 
23
15
  export default [
24
- ...baseConfig,
16
+ ignoreRule,
17
+ mainRule,
25
18
  {
26
19
  files: ['**/*.{ts,tsx}'],
27
20
  plugins: {
@@ -77,9 +70,9 @@ export default [
77
70
  },
78
71
 
79
72
  rules: {
80
- ...baseConfigRules.base,
73
+ ...mainRule.rules,
81
74
  ...getOverrides(
82
- baseConfigRules.base,
75
+ mainRule.rules,
83
76
  [
84
77
  'no-array-constructor',
85
78
  'no-useless-constructor',
@@ -94,7 +87,7 @@ export default [
94
87
  '@typescript-eslint',
95
88
  ),
96
89
  ...getOverrides(
97
- baseConfigRules.base,
90
+ mainRule.rules,
98
91
  [
99
92
  'space-before-function-paren',
100
93
  'lines-between-class-members',
@@ -187,6 +180,7 @@ export default [
187
180
  }],
188
181
  },
189
182
  },
183
+ testRule,
190
184
  {
191
185
  files: [
192
186
  '**/*.test.ts',
@@ -201,9 +195,8 @@ export default [
201
195
  },
202
196
  },
203
197
  rules: {
204
- ...baseConfigRules.test,
205
198
  ...getOverrides(
206
- baseConfigRules.test,
199
+ testRule.rules,
207
200
  [
208
201
  'no-unused-vars',
209
202
  ],
package/package.json CHANGED
@@ -9,7 +9,7 @@
9
9
  "url": "https://github.com/entva/styleguide"
10
10
  },
11
11
  "bugs": "https://github.com/entva/styleguide/issues",
12
- "version": "2.17.0",
12
+ "version": "2.18.0",
13
13
  "keywords": [
14
14
  "linter",
15
15
  "config",
@@ -31,7 +31,7 @@
31
31
  "@stylistic/eslint-plugin-ts": "^2.12.1",
32
32
  "@typescript-eslint/eslint-plugin": "^8.19.0",
33
33
  "@typescript-eslint/parser": "^8.19.0",
34
- "eslint-config-entva-base": "^2.17.0",
34
+ "eslint-config-entva-base": "^2.18.0",
35
35
  "eslint-plugin-import": "^2.31.0",
36
36
  "globals": "^15.14.0"
37
37
  },