@o3r/eslint-config 13.2.0-prerelease.20 → 13.2.0-prerelease.24
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.
- package/package.json +7 -7
- package/src/rules/typescript.cjs +28 -19
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/eslint-config",
|
|
3
|
-
"version": "13.2.0-prerelease.
|
|
3
|
+
"version": "13.2.0-prerelease.24",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@o3r/schematics": "^13.2.0-prerelease.
|
|
40
|
+
"@o3r/schematics": "^13.2.0-prerelease.24"
|
|
41
41
|
},
|
|
42
42
|
"peerDependencies": {
|
|
43
43
|
"@angular-devkit/core": "^20.0.0",
|
|
@@ -46,8 +46,8 @@
|
|
|
46
46
|
"@angular/compiler": "^20.0.0",
|
|
47
47
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
48
48
|
"@eslint/js": "^8.57.0 || ^9.22.0",
|
|
49
|
-
"@o3r/eslint-plugin": "^13.2.0-prerelease.
|
|
50
|
-
"@o3r/schematics": "^13.2.0-prerelease.
|
|
49
|
+
"@o3r/eslint-plugin": "^13.2.0-prerelease.24",
|
|
50
|
+
"@o3r/schematics": "^13.2.0-prerelease.24",
|
|
51
51
|
"@schematics/angular": "^20.0.0",
|
|
52
52
|
"@stylistic/eslint-plugin": "~5.3.0",
|
|
53
53
|
"@typescript-eslint/parser": "^8.15.0",
|
|
@@ -81,9 +81,9 @@
|
|
|
81
81
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
82
82
|
"@eslint/js": "~9.35.0",
|
|
83
83
|
"@nx/eslint-plugin": "~21.5.0",
|
|
84
|
-
"@o3r/build-helpers": "^13.2.0-prerelease.
|
|
85
|
-
"@o3r/eslint-plugin": "^13.2.0-prerelease.
|
|
86
|
-
"@o3r/test-helpers": "^13.2.0-prerelease.
|
|
84
|
+
"@o3r/build-helpers": "^13.2.0-prerelease.24",
|
|
85
|
+
"@o3r/eslint-plugin": "^13.2.0-prerelease.24",
|
|
86
|
+
"@o3r/test-helpers": "^13.2.0-prerelease.24",
|
|
87
87
|
"@schematics/angular": "~20.2.0",
|
|
88
88
|
"@stylistic/eslint-plugin": "~5.3.0",
|
|
89
89
|
"@types/jest": "~29.5.2",
|
package/src/rules/typescript.cjs
CHANGED
|
@@ -7,6 +7,7 @@ const angular = require('angular-eslint');
|
|
|
7
7
|
const importPlugin = require('eslint-plugin-import');
|
|
8
8
|
const jsdoc = require('eslint-plugin-jsdoc');
|
|
9
9
|
const unicorn = require('eslint-plugin-unicorn');
|
|
10
|
+
const globals = require('globals');
|
|
10
11
|
const typescript = require('typescript-eslint');
|
|
11
12
|
const commentsConfigOverrides = require('./typescript/comments.cjs');
|
|
12
13
|
const angularConfigOverrides = require('./typescript/eslint-angular.cjs');
|
|
@@ -23,28 +24,15 @@ const stylisticConfig = require('./typescript/stylistic.cjs');
|
|
|
23
24
|
const unicornConfig = require('./typescript/unicorn.cjs');
|
|
24
25
|
const unusedImportsConfig = require('./typescript/unused-imports.cjs');
|
|
25
26
|
|
|
26
|
-
|
|
27
|
-
* Get the jest config if dependency is present
|
|
28
|
-
* @param {'recommended' | 'overrides'} type
|
|
29
|
-
* @returns {import('@typescript-eslint/utils').TSESLint.FlatConfig.ConfigArray} config
|
|
30
|
-
*/
|
|
31
|
-
const getJestConfig = (type) => {
|
|
27
|
+
const checkJestDependency = () => {
|
|
32
28
|
try {
|
|
33
29
|
require.resolve('jest');
|
|
34
|
-
return type === 'overrides'
|
|
35
|
-
? require('./typescript/jest.cjs')
|
|
36
|
-
: [{
|
|
37
|
-
// Name added for debugging purpose with @eslint/config-inspector
|
|
38
|
-
name: 'jest/flat-recommended',
|
|
39
|
-
files: [
|
|
40
|
-
'**/*.{c,m,}{t,j}s'
|
|
41
|
-
],
|
|
42
|
-
...require('eslint-plugin-jest').configs['flat/recommended']
|
|
43
|
-
}];
|
|
44
30
|
} catch {
|
|
45
|
-
return
|
|
31
|
+
return false;
|
|
46
32
|
}
|
|
33
|
+
return true;
|
|
47
34
|
};
|
|
35
|
+
const hasJestDependency = checkJestDependency();
|
|
48
36
|
|
|
49
37
|
/**
|
|
50
38
|
* @type {import('@typescript-eslint/utils').TSESLint.FlatConfig.ConfigArray}
|
|
@@ -87,7 +75,17 @@ const configArray = [
|
|
|
87
75
|
],
|
|
88
76
|
...unicorn.default.configs.recommended
|
|
89
77
|
},
|
|
90
|
-
...(
|
|
78
|
+
...(hasJestDependency
|
|
79
|
+
? [{
|
|
80
|
+
// Name added for debugging purpose with @eslint/config-inspector
|
|
81
|
+
name: 'jest/flat-recommended',
|
|
82
|
+
files: [
|
|
83
|
+
'**/*.{c,m,}{t,j}s'
|
|
84
|
+
],
|
|
85
|
+
...require('eslint-plugin-jest').configs['flat/recommended']
|
|
86
|
+
}]
|
|
87
|
+
: []
|
|
88
|
+
),
|
|
91
89
|
{
|
|
92
90
|
// Name added for debugging purpose with @eslint/config-inspector
|
|
93
91
|
name: 'import/recommended',
|
|
@@ -107,7 +105,18 @@ const configArray = [
|
|
|
107
105
|
...typescriptConfigOverrides,
|
|
108
106
|
...angularConfigOverrides,
|
|
109
107
|
...jsdocConfigOverrides,
|
|
110
|
-
...(
|
|
108
|
+
...(hasJestDependency
|
|
109
|
+
? require('./typescript/jest.cjs')
|
|
110
|
+
: [{
|
|
111
|
+
name: '@o3r/eslint-config/typescript/jasmine-globals',
|
|
112
|
+
files: ['**/*.{c,m,}ts'],
|
|
113
|
+
languageOptions: {
|
|
114
|
+
globals: {
|
|
115
|
+
...globals.jasmine
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
}]
|
|
119
|
+
),
|
|
111
120
|
...preferArrowConfig,
|
|
112
121
|
...stylisticConfig,
|
|
113
122
|
...unicornConfig,
|