Skip to content

Commit c1e55df

Browse files
chore: update ESLint dependencies to v20 (#4946)
1 parent 2ebe61d commit c1e55df

File tree

63 files changed

+547
-677
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+547
-677
lines changed

modules/component-store/eslint.config.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const compat = new FlatCompat({
1111

1212
export default [
1313
{
14-
ignores: ['**/dist', '**/jest.config.ts', '**/schematics-core/test-setup.ts', '**/schematics-core/utility/standalone.ts'],
14+
ignores: ['**/dist', '**/jest.config.ts', '**/schematics-core/**/*.ts'],
1515
},
1616
...baseConfig,
1717
...compat
@@ -30,6 +30,7 @@ export default [
3030
'@angular-eslint/directive-selector': 'off',
3131
'@angular-eslint/component-selector': 'off',
3232
'@angular-eslint/prefer-standalone': 'off',
33+
'@angular-eslint/prefer-inject': 'off',
3334
},
3435
languageOptions: {
3536
parserOptions: {

modules/component/eslint.config.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const compat = new FlatCompat({
1111

1212
export default [
1313
{
14-
ignores: ['**/dist', '**/jest.config.ts', '**/schematics-core/test-setup.ts', '**/schematics-core/utility/standalone.ts'],
14+
ignores: ['**/dist', '**/jest.config.ts', '**/schematics-core/**/*.ts'],
1515
},
1616
...baseConfig,
1717
...compat
@@ -31,6 +31,7 @@ export default [
3131
'@angular-eslint/component-selector': 'off',
3232
'@angular-eslint/no-input-rename': 'off',
3333
'@angular-eslint/prefer-standalone': 'off',
34+
'@angular-eslint/prefer-inject': 'off',
3435
},
3536
languageOptions: {
3637
parserOptions: {

modules/data/eslint.config.mjs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const compat = new FlatCompat({
1111

1212
export default [
1313
{
14-
ignores: ['**/dist', '**/jest.config.ts', '**/schematics-core/test-setup.ts'],
14+
ignores: ['**/dist', '**/jest.config.ts', '**/schematics-core/**/*.ts'],
1515
},
1616
...baseConfig,
1717
...compat
@@ -32,6 +32,7 @@ export default [
3232
'@angular-eslint/component-selector': 'off',
3333
'no-case-declarations': 'off',
3434
'@angular-eslint/prefer-standalone': 'off',
35+
'@angular-eslint/prefer-inject': 'off',
3536
},
3637
languageOptions: {
3738
parserOptions: {
@@ -50,7 +51,4 @@ export default [
5051
...config.rules,
5152
},
5253
})),
53-
{
54-
ignores: ['schematics-core'],
55-
},
5654
];

modules/effects/eslint.config.mjs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default [
1414
ignores: [
1515
'**/dist',
1616
'**/jest.config.ts',
17-
'**/schematics-core/test-setup.ts',
17+
'**/schematics-core/**/*.ts',
1818
],
1919
},
2020
...baseConfig,
@@ -35,6 +35,7 @@ export default [
3535
'@angular-eslint/component-selector': 'off',
3636
'@angular-eslint/prefer-standalone': 'off',
3737
'@nx/enforce-module-boundaries': 'off',
38+
'@angular-eslint/prefer-inject': 'off',
3839
},
3940
languageOptions: {
4041
parserOptions: {
@@ -74,7 +75,4 @@ export default [
7475
...config.rules,
7576
},
7677
})),
77-
{
78-
ignores: ['schematics-core'],
79-
},
8078
];

modules/entity/eslint.config.mjs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const compat = new FlatCompat({
1111

1212
export default [
1313
{
14-
ignores: ['**/dist', '**/jest.config.ts', '**/schematics-core/test-setup.ts', '**/schematics-core/utility/standalone.ts'],
14+
ignores: ['**/dist', '**/jest.config.ts', '**/schematics-core/**/*.ts'],
1515
},
1616
...baseConfig,
1717
...compat
@@ -30,6 +30,7 @@ export default [
3030
'@angular-eslint/directive-selector': 'off',
3131
'@angular-eslint/component-selector': 'off',
3232
'@angular-eslint/prefer-standalone': 'off',
33+
'@angular-eslint/prefer-inject': 'off',
3334
},
3435
languageOptions: {
3536
parserOptions: {
@@ -48,7 +49,4 @@ export default [
4849
...config.rules,
4950
},
5051
})),
51-
{
52-
ignores: ['schematics-core'],
53-
},
5452
];

modules/eslint-plugin/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
},
4343
"sideEffects": false,
4444
"dependencies": {
45-
"semver": "^7.3.5",
4645
"strip-json-comments": "3.1.1"
4746
},
4847
"peerDependencies": {

modules/eslint-plugin/scripts/generate-config.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import { writeFileSync } from 'fs';
22
import { join } from 'path';
33
import { format, resolveConfig } from 'prettier';
4-
import type { NgRxRuleModule } from '../src/rule-creator';
54
import { rulesForGenerate } from '../src/utils/helper-functions/rules';
5+
import { NgRxRule } from '../src/rule-creator';
66

77
const prettierConfig = resolveConfig.sync(__dirname);
88

99
const RULE_MODULE = '@ngrx';
1010
const CONFIG_DIRECTORY = './modules/eslint-plugin/src/configs/';
1111

1212
writeConfig('all', (_rule) => true);
13-
writeConfig('store', (rule) => rule.meta.ngrxModule === 'store');
14-
writeConfig('effects', (rule) => rule.meta.ngrxModule === 'effects');
13+
writeConfig('store', (rule) => rule.meta.docs?.ngrxModule === 'store');
14+
writeConfig('effects', (rule) => rule.meta.docs?.ngrxModule === 'effects');
1515
writeConfig(
1616
'component-store',
17-
(rule) => rule.meta.ngrxModule === 'component-store'
17+
(rule) => rule.meta.docs?.ngrxModule === 'component-store'
1818
);
19-
writeConfig('operators', (rule) => rule.meta.ngrxModule === 'operators');
20-
writeConfig('signals', (rule) => rule.meta.ngrxModule === 'signals');
19+
writeConfig('operators', (rule) => rule.meta.docs?.ngrxModule === 'operators');
20+
writeConfig('signals', (rule) => rule.meta.docs?.ngrxModule === 'signals');
2121

2222
function writeConfig(
2323
configName:
@@ -27,7 +27,7 @@ function writeConfig(
2727
| 'component-store'
2828
| 'operators'
2929
| 'signals',
30-
predicate: (rule: NgRxRuleModule<[], string>) => boolean
30+
predicate: (rule: NgRxRule) => boolean
3131
) {
3232
const rulesForConfig = Object.entries(rulesForGenerate).filter(([_, rule]) =>
3333
predicate(rule)

modules/eslint-plugin/scripts/generate-docs.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ for (const rules of RULES_PATHS) {
2323
const newDoc = format(
2424
`# ${ruleName}
2525
26-
${meta.version ? '> Required NgRx Version Range: ${meta.version}' : ''}
27-
2826
${meta.docs?.description}
2927
3028
- **Type**: ${meta.type}

modules/eslint-plugin/scripts/generate-overview.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ function generateRules() {
1818
const moduleRules = Object.entries(rulesForGenerate).reduce<
1919
Record<string, string[][]>
2020
>((all, [ruleName, { meta }]) => {
21-
all[meta.ngrxModule] = (all[meta.ngrxModule] ?? []).concat([
21+
if (!meta.docs) {
22+
throw new Error(`Rule ${ruleName} is missing meta.docs information`);
23+
}
24+
25+
all[meta.docs.ngrxModule] = (all[meta.docs.ngrxModule] ?? []).concat([
2226
[
2327
`[@ngrx/${ruleName}]${
2428
meta.docs?.url

modules/eslint-plugin/spec/utils/rule-tester.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
1-
import { clearCache, setNgrxVersion } from '../../src/utils';
21
import { RuleTester } from '@typescript-eslint/rule-tester';
32
import { resolve } from 'path';
43

5-
export function ruleTester(environment?: {
6-
ngrxModule: string;
7-
version: string;
8-
}) {
9-
clearCache();
10-
11-
if (environment) {
12-
setNgrxVersion(environment.ngrxModule, environment.version);
13-
}
14-
4+
export function ruleTester() {
155
return new RuleTester({
166
languageOptions: {
177
parserOptions: {

0 commit comments

Comments
 (0)