refactor(plugin-eslint): update to renamed config types

code-pushup · Dec 17, 2024 · 03f5e61 · 03f5e61
1 parent 2e7ca9c
commit 03f5e61
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/e2e/plugin-eslint-e2e/mocks/fixtures/flat-config/eslint.config.cjs b/e2e/plugin-eslint-e2e/mocks/fixtures/flat-config/eslint.config.cjs
@@ -1,4 +1,4 @@
-/** @type {import('eslint').Linter.FlatConfig[]} */
+/** @type {import('eslint').Linter.Config[]} */
 module.exports = [
   {
     ignores: ['code-pushup.config.ts'],

diff --git a/packages/plugin-eslint/src/lib/meta/versions/flat.integration.test.ts b/packages/plugin-eslint/src/lib/meta/versions/flat.integration.test.ts
@@ -22,7 +22,7 @@ describe('loadRulesForFlatConfig', () => {
   });
 
   it('should load built-in rules from implicit flat config location', async () => {
-    const config: Linter.FlatConfig = {
+    const config: Linter.Config = {
       rules: {
         'no-unused-vars': 'error',
         'prefer-const': 'warn',
@@ -78,7 +78,7 @@ describe('loadRulesForFlatConfig', () => {
         } as Rule.RuleModule,
       },
     } as ESLint.Plugin;
-    const config: Linter.FlatConfig[] = [
+    const config: Linter.Config[] = [
       {
         plugins: {
           '@typescript-eslint': tseslint,
@@ -143,7 +143,7 @@ describe('loadRulesForFlatConfig', () => {
   });
 
   it('should load custom rule options', async () => {
-    const config: Linter.FlatConfig[] = [
+    const config: Linter.Config[] = [
       {
         rules: {
           complexity: ['warn', 30],
@@ -171,7 +171,7 @@ describe('loadRulesForFlatConfig', () => {
   });
 
   it('should create multiple rule instances when different options used', async () => {
-    const config: Linter.FlatConfig[] = [
+    const config: Linter.Config[] = [
       {
         rules: {
           'max-lines': ['warn', { max: 300 }],

diff --git a/packages/plugin-eslint/src/lib/meta/versions/flat.ts b/packages/plugin-eslint/src/lib/meta/versions/flat.ts
@@ -33,7 +33,7 @@ export async function loadRulesForFlatConfig({
     .filter(exists);
 }
 
-type FlatConfig = Linter.FlatConfig | Linter.FlatConfig[];
+type FlatConfig = Linter.Config | Linter.Config[];
 
 async function loadConfigByDefaultLocation(): Promise<FlatConfig> {
   const flatConfigFileNames = [
@@ -63,7 +63,7 @@ async function loadConfigByPath(configPath: string): Promise<FlatConfig> {
 }
 
 function findEnabledRulesWithOptions(
-  configs: Linter.FlatConfig[],
+  configs: Linter.Config[],
 ): Omit<RuleData, 'meta'>[] {
   const enabledRules = configs
     .flatMap(({ rules }) => Object.entries(rules ?? {}))
@@ -83,7 +83,7 @@ function findEnabledRulesWithOptions(
 
 function findRuleMeta(
   ruleId: string,
-  configs: Linter.FlatConfig[],
+  configs: Linter.Config[],
 ): Rule.RuleMetaData | undefined {
   const { plugin, name } = parseRuleId(ruleId);
   if (!plugin) {
@@ -100,7 +100,7 @@ function findBuiltinRuleMeta(name: string): Rule.RuleMetaData | undefined {
 function findPluginRuleMeta(
   plugin: string,
   name: string,
-  configs: Linter.FlatConfig[],
+  configs: Linter.Config[],
 ): Rule.RuleMetaData | undefined {
   const config = configs.find(({ plugins = {} }) => plugin in plugins);
   const rule = config?.plugins?.[plugin]?.rules?.[name];

diff --git a/packages/plugin-eslint/src/lib/meta/versions/legacy.ts b/packages/plugin-eslint/src/lib/meta/versions/legacy.ts
@@ -13,9 +13,9 @@ export async function loadRulesForLegacyConfig({
   const configs = await toArray(patterns).reduce(
     async (acc, pattern) => [
       ...(await acc),
-      (await eslint.calculateConfigForFile(pattern)) as Linter.Config,
+      (await eslint.calculateConfigForFile(pattern)) as Linter.LegacyConfig,
     ],
-    Promise.resolve<Linter.Config[]>([]),
+    Promise.resolve<Linter.LegacyConfig[]>([]),
   );
 
   const rulesIds = distinct(