Skip to content

Commit 13751e6

Browse files
kazuponSysix
andauthored
fix: handle oxlint ignorePatterns as an ESLint global ignore (#564)
resolve #563 --------- Co-authored-by: Sysix <sysix@sysix-coding.de>
1 parent 0286e49 commit 13751e6

File tree

2 files changed

+24
-7
lines changed

2 files changed

+24
-7
lines changed

src/build-from-oxlint-config.spec.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,20 @@ describe('nursery rules', () => {
232232
});
233233
});
234234

235+
describe('ignorePatterns handling', () => {
236+
it('should create ignore config as eslint global ignores', () => {
237+
const config = {
238+
ignorePatterns: ['**/*.test.ts', '**/*.spec.ts'],
239+
rules: { eqeqeq: 'off' },
240+
};
241+
const configs = buildFromOxlintConfig(config);
242+
243+
expect(configs.length).toBeGreaterThanOrEqual(2);
244+
expect(configs[0].rules).toBeUndefined();
245+
expect(configs[0].ignores).toStrictEqual(['**/*.test.ts', '**/*.spec.ts']);
246+
});
247+
});
248+
235249
const createConfigFileAndBuildFromIt = (
236250
filename: string,
237251
content: string

src/build-from-oxlint-config/index.ts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@ export const buildFromOxlintConfig = (
6565
rules,
6666
};
6767

68-
const ignorePatterns = readIgnorePatternsFromConfig(config);
69-
70-
if (ignorePatterns !== undefined) {
71-
handleIgnorePatternsScope(ignorePatterns, baseConfig);
72-
}
73-
7468
const overrides = readOverridesFromConfig(config);
7569
const configs = splitDisabledRulesForVueAndSvelteFiles(
7670
baseConfig
@@ -80,7 +74,16 @@ export const buildFromOxlintConfig = (
8074
handleOverridesScope(overrides, configs, categories, options);
8175
}
8276

83-
return configs;
77+
const ignorePatterns = readIgnorePatternsFromConfig(config);
78+
if (ignorePatterns === undefined) {
79+
return configs;
80+
} else {
81+
const ignoreConfig: EslintPluginOxlintConfig = {
82+
name: 'oxlint/oxlint-config-ignore-patterns',
83+
};
84+
handleIgnorePatternsScope(ignorePatterns, ignoreConfig);
85+
return [ignoreConfig, ...configs];
86+
}
8487
};
8588

8689
/**

0 commit comments

Comments
 (0)