Skip to content

Commit 37bcc84

Browse files
committed
Support typescript rules in .svelte files
1 parent d0a8710 commit 37bcc84

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

src/configs/javascript.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,18 @@ import {
1111
COMMONJS_FILE_PATTERNS,
1212
CONFIG_FILE_PATTERNS,
1313
GENERATED_FILE_PATTERNS,
14-
JS_TS_JSON_FILE_PATTERNS,
14+
JAVASCRIPT_EXTENDED_FILE_PATTERNS,
1515
JSON_FILE_PATTERNS,
1616
MOCKS_FILE_PATTERNS,
1717
SVELTE_FILE_PATTERNS,
1818
TEST_FILE_PATTERNS,
1919
TYPESCRIPT_DECLARATION_FILE_PATTERNS,
20-
VUE_FILE_PATTERNS,
2120
} from '../lib/patterns.js';
2221
import { convertErrorsToWarnings } from '../lib/utils.js';
2322

2423
export default tseslint.config(
2524
{
26-
files: [...JS_TS_JSON_FILE_PATTERNS, ...VUE_FILE_PATTERNS],
25+
files: JAVASCRIPT_EXTENDED_FILE_PATTERNS,
2726
extends: [
2827
eslint.configs.recommended,
2928
...tseslint.configs.recommended,

src/configs/typescript.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import {
77
negatePatterns,
88
STORYBOOK_FILE_PATTERNS,
99
TEST_FILE_PATTERNS,
10-
TYPESCRIPT_FILE_PATTERNS,
11-
VUE_FILE_PATTERNS,
10+
TYPESCRIPT_EXTENDED_FILE_PATTERNS,
1211
} from '../lib/patterns.js';
1312
import {
1413
IMMUTABLE_DATA_OPTIONS,
@@ -20,7 +19,7 @@ import javascript from './javascript.js';
2019
export default tseslint.config(
2120
...javascript,
2221
{
23-
files: [...TYPESCRIPT_FILE_PATTERNS, ...VUE_FILE_PATTERNS],
22+
files: TYPESCRIPT_EXTENDED_FILE_PATTERNS,
2423
extends: [
2524
...tseslint.configs.recommendedTypeChecked,
2625
...tseslint.configs.strictTypeChecked,
@@ -93,7 +92,7 @@ export default tseslint.config(
9392
},
9493
{
9594
files: TEST_FILE_PATTERNS,
96-
ignores: negatePatterns(TYPESCRIPT_FILE_PATTERNS),
95+
ignores: negatePatterns(TYPESCRIPT_EXTENDED_FILE_PATTERNS),
9796
extends: [
9897
{
9998
name: 'code-pushup/typescript/tests/disabled',
@@ -145,7 +144,7 @@ export default tseslint.config(
145144
{
146145
name: 'code-pushup/typescript/storybook/customized',
147146
files: STORYBOOK_FILE_PATTERNS,
148-
ignores: negatePatterns(TYPESCRIPT_FILE_PATTERNS),
147+
ignores: negatePatterns(TYPESCRIPT_EXTENDED_FILE_PATTERNS),
149148
rules: {
150149
'@typescript-eslint/naming-convention': [
151150
'warn',
@@ -154,7 +153,7 @@ export default tseslint.config(
154153
},
155154
},
156155
{
157-
files: negatePatterns([...TYPESCRIPT_FILE_PATTERNS, ...VUE_FILE_PATTERNS]),
156+
files: negatePatterns(TYPESCRIPT_EXTENDED_FILE_PATTERNS),
158157
...tseslint.configs.disableTypeChecked,
159158
},
160159
);

src/lib/patterns.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,17 @@ export const COMMONJS_FILE_PATTERNS = ['**/*.cjs', '**/*.cts'];
101101

102102
export const SVELTE_FILE_PATTERNS = ['**/*.svelte'];
103103

104+
export const JAVASCRIPT_EXTENDED_FILE_PATTERNS = [
105+
...JS_TS_JSON_FILE_PATTERNS,
106+
...VUE_FILE_PATTERNS,
107+
...SVELTE_FILE_PATTERNS,
108+
];
109+
export const TYPESCRIPT_EXTENDED_FILE_PATTERNS = [
110+
...TYPESCRIPT_FILE_PATTERNS,
111+
...VUE_FILE_PATTERNS,
112+
...SVELTE_FILE_PATTERNS,
113+
];
114+
104115
/** @param {string[]} patterns */
105116
export function negatePatterns(patterns) {
106117
return patterns.map(pattern => `!${pattern}`);

0 commit comments

Comments
 (0)