Skip to content

Commit 8253530

Browse files
committed
fix: TypeScript rules
1 parent f712206 commit 8253530

File tree

3 files changed

+48
-11
lines changed

3 files changed

+48
-11
lines changed

configs/typescript.js

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,34 @@
33
* https://github.com/WordPress/gutenberg/blob/%40wordpress/eslint-plugin%4014.1.0/packages/eslint-plugin/configs/recommended.js
44
*/
55

6-
const TsEsLintPlugin = require( '@typescript-eslint/eslint-plugin' );
76
const TsEsLintParser = require( '@typescript-eslint/parser' );
87
const JsDoc = require( 'eslint-plugin-jsdoc' );
8+
const tseslint = require( 'typescript-eslint' );
9+
10+
const files = [ '**/*.ts', '**/*.tsx', '**/*.mts', '**/*.cts' ];
11+
12+
/**
13+
* @param {import('eslint').Linter.Config} config
14+
* @returns {import('eslint').Linter.Config}
15+
*/
16+
const addFiles = config => {
17+
if ( ! config.files ) {
18+
config.files = files;
19+
}
20+
21+
return config;
22+
};
23+
24+
const tsEslintTypeChecked = tseslint.configs.recommendedTypeChecked.map( addFiles );
25+
const tsEslintStrict = tseslint.configs.strict.map( addFiles ); // Already includes `recommended`
926

1027
/** @type import('eslint').Linter.Config[] */
1128
module.exports = [
29+
...tsEslintTypeChecked,
30+
...tsEslintStrict,
1231
{
1332
ignores: [ '**/*.d.ts', '**/*.d.cts', '**/*.d.mts' ],
14-
files: [ '**/*.ts', '**/*.tsx', '**/*.cts', '**/*.mts' ],
33+
files,
1534
languageOptions: {
1635
parser: TsEsLintParser,
1736
parserOptions: {
@@ -20,14 +39,9 @@ module.exports = [
2039
},
2140
plugins: {
2241
'@automattic/wpvip': require( '../plugin' ),
23-
'@typescript-eslint': TsEsLintPlugin,
2442
jsdoc: JsDoc,
2543
},
2644
rules: {
27-
...TsEsLintPlugin.configs[ 'eslint-recommended' ].rules,
28-
...TsEsLintPlugin.configs[ 'recommended-requiring-type-checking' ].rules,
29-
...TsEsLintPlugin.configs.strict.rules,
30-
3145
// Ensures NestJS route prefixes are correctly formatted.
3246
'@automattic/wpvip/nestjs-route-prefix': 'error',
3347

package-lock.json

Lines changed: 25 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"homepage": "https://github.com/Automattic/eslint-config-wpvip#readme",
3434
"dependencies": {
3535
"@babel/eslint-parser": "~7.28.5",
36-
"@typescript-eslint/eslint-plugin": "~8.48.0",
3736
"@typescript-eslint/parser": "~8.48.0",
3837
"eslint-config-prettier": "9.1.0",
3938
"eslint-import-resolver-typescript": "3.7.0",
@@ -49,7 +48,8 @@
4948
"eslint-plugin-security": "3.0.1",
5049
"eslint-plugin-unused-imports": "4.3.0",
5150
"find-package-json": "1.2.0",
52-
"globals": "16.5.0"
51+
"globals": "16.5.0",
52+
"typescript-eslint": "^8.48.0"
5353
},
5454
"peerDependencies": {
5555
"eslint": "^9.7.0"

0 commit comments

Comments
 (0)