From c6cb702a2d878b42e10fb93bdd03791029a25eb4 Mon Sep 17 00:00:00 2001 From: Kirk Waiblinger <53019676+kirkwaiblinger@users.noreply.github.com> Date: Mon, 14 Apr 2025 13:38:49 -0600 Subject: [PATCH] fix eslintrc config generation --- packages/eslint-plugin/src/configs/eslintrc/all.ts | 2 +- .../src/configs/eslintrc/recommended-type-checked-only.ts | 2 +- .../src/configs/eslintrc/recommended-type-checked.ts | 2 +- packages/eslint-plugin/src/configs/eslintrc/recommended.ts | 2 +- .../src/configs/eslintrc/strict-type-checked-only.ts | 2 +- .../eslint-plugin/src/configs/eslintrc/strict-type-checked.ts | 2 +- packages/eslint-plugin/src/configs/eslintrc/strict.ts | 2 +- .../src/configs/eslintrc/stylistic-type-checked-only.ts | 2 +- .../src/configs/eslintrc/stylistic-type-checked.ts | 2 +- packages/eslint-plugin/src/configs/eslintrc/stylistic.ts | 2 +- tools/scripts/generate-configs.mts | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/eslint-plugin/src/configs/eslintrc/all.ts b/packages/eslint-plugin/src/configs/eslintrc/all.ts index 6febc52e3977..4a5b15ea9f43 100644 --- a/packages/eslint-plugin/src/configs/eslintrc/all.ts +++ b/packages/eslint-plugin/src/configs/eslintrc/all.ts @@ -8,7 +8,7 @@ import type { ClassicConfig } from '@typescript-eslint/utils/ts-eslint'; export = { - extends: ['./configs/base', './configs/eslint-recommended'], + extends: ['./configs/eslintrc/base', './configs/eslintrc/eslint-recommended'], rules: { '@typescript-eslint/adjacent-overload-signatures': 'error', '@typescript-eslint/array-type': 'error', diff --git a/packages/eslint-plugin/src/configs/eslintrc/recommended-type-checked-only.ts b/packages/eslint-plugin/src/configs/eslintrc/recommended-type-checked-only.ts index c9c0f5cb4368..0936657b5d23 100644 --- a/packages/eslint-plugin/src/configs/eslintrc/recommended-type-checked-only.ts +++ b/packages/eslint-plugin/src/configs/eslintrc/recommended-type-checked-only.ts @@ -8,7 +8,7 @@ import type { ClassicConfig } from '@typescript-eslint/utils/ts-eslint'; export = { - extends: ['./configs/base', './configs/eslint-recommended'], + extends: ['./configs/eslintrc/base', './configs/eslintrc/eslint-recommended'], rules: { '@typescript-eslint/await-thenable': 'error', '@typescript-eslint/no-array-delete': 'error', diff --git a/packages/eslint-plugin/src/configs/eslintrc/recommended-type-checked.ts b/packages/eslint-plugin/src/configs/eslintrc/recommended-type-checked.ts index e8e10a7071a5..73eda5db7b43 100644 --- a/packages/eslint-plugin/src/configs/eslintrc/recommended-type-checked.ts +++ b/packages/eslint-plugin/src/configs/eslintrc/recommended-type-checked.ts @@ -8,7 +8,7 @@ import type { ClassicConfig } from '@typescript-eslint/utils/ts-eslint'; export = { - extends: ['./configs/base', './configs/eslint-recommended'], + extends: ['./configs/eslintrc/base', './configs/eslintrc/eslint-recommended'], rules: { '@typescript-eslint/await-thenable': 'error', '@typescript-eslint/ban-ts-comment': 'error', diff --git a/packages/eslint-plugin/src/configs/eslintrc/recommended.ts b/packages/eslint-plugin/src/configs/eslintrc/recommended.ts index 487935ee1f23..c5476c5ec6e0 100644 --- a/packages/eslint-plugin/src/configs/eslintrc/recommended.ts +++ b/packages/eslint-plugin/src/configs/eslintrc/recommended.ts @@ -8,7 +8,7 @@ import type { ClassicConfig } from '@typescript-eslint/utils/ts-eslint'; export = { - extends: ['./configs/base', './configs/eslint-recommended'], + extends: ['./configs/eslintrc/base', './configs/eslintrc/eslint-recommended'], rules: { '@typescript-eslint/ban-ts-comment': 'error', 'no-array-constructor': 'off', diff --git a/packages/eslint-plugin/src/configs/eslintrc/strict-type-checked-only.ts b/packages/eslint-plugin/src/configs/eslintrc/strict-type-checked-only.ts index bdbfa931472f..00e4ca12f8a4 100644 --- a/packages/eslint-plugin/src/configs/eslintrc/strict-type-checked-only.ts +++ b/packages/eslint-plugin/src/configs/eslintrc/strict-type-checked-only.ts @@ -8,7 +8,7 @@ import type { ClassicConfig } from '@typescript-eslint/utils/ts-eslint'; export = { - extends: ['./configs/base', './configs/eslint-recommended'], + extends: ['./configs/eslintrc/base', './configs/eslintrc/eslint-recommended'], rules: { '@typescript-eslint/await-thenable': 'error', '@typescript-eslint/no-array-delete': 'error', diff --git a/packages/eslint-plugin/src/configs/eslintrc/strict-type-checked.ts b/packages/eslint-plugin/src/configs/eslintrc/strict-type-checked.ts index 7e0e06046a43..43d1df44b53b 100644 --- a/packages/eslint-plugin/src/configs/eslintrc/strict-type-checked.ts +++ b/packages/eslint-plugin/src/configs/eslintrc/strict-type-checked.ts @@ -8,7 +8,7 @@ import type { ClassicConfig } from '@typescript-eslint/utils/ts-eslint'; export = { - extends: ['./configs/base', './configs/eslint-recommended'], + extends: ['./configs/eslintrc/base', './configs/eslintrc/eslint-recommended'], rules: { '@typescript-eslint/await-thenable': 'error', '@typescript-eslint/ban-ts-comment': [ diff --git a/packages/eslint-plugin/src/configs/eslintrc/strict.ts b/packages/eslint-plugin/src/configs/eslintrc/strict.ts index 0e655d1464ca..1677fdabffb6 100644 --- a/packages/eslint-plugin/src/configs/eslintrc/strict.ts +++ b/packages/eslint-plugin/src/configs/eslintrc/strict.ts @@ -8,7 +8,7 @@ import type { ClassicConfig } from '@typescript-eslint/utils/ts-eslint'; export = { - extends: ['./configs/base', './configs/eslint-recommended'], + extends: ['./configs/eslintrc/base', './configs/eslintrc/eslint-recommended'], rules: { '@typescript-eslint/ban-ts-comment': [ 'error', diff --git a/packages/eslint-plugin/src/configs/eslintrc/stylistic-type-checked-only.ts b/packages/eslint-plugin/src/configs/eslintrc/stylistic-type-checked-only.ts index 03428e419be5..d3cbbfc3ea9a 100644 --- a/packages/eslint-plugin/src/configs/eslintrc/stylistic-type-checked-only.ts +++ b/packages/eslint-plugin/src/configs/eslintrc/stylistic-type-checked-only.ts @@ -8,7 +8,7 @@ import type { ClassicConfig } from '@typescript-eslint/utils/ts-eslint'; export = { - extends: ['./configs/base', './configs/eslint-recommended'], + extends: ['./configs/eslintrc/base', './configs/eslintrc/eslint-recommended'], rules: { 'dot-notation': 'off', '@typescript-eslint/dot-notation': 'error', diff --git a/packages/eslint-plugin/src/configs/eslintrc/stylistic-type-checked.ts b/packages/eslint-plugin/src/configs/eslintrc/stylistic-type-checked.ts index f2512877aebe..b77f94794f2f 100644 --- a/packages/eslint-plugin/src/configs/eslintrc/stylistic-type-checked.ts +++ b/packages/eslint-plugin/src/configs/eslintrc/stylistic-type-checked.ts @@ -8,7 +8,7 @@ import type { ClassicConfig } from '@typescript-eslint/utils/ts-eslint'; export = { - extends: ['./configs/base', './configs/eslint-recommended'], + extends: ['./configs/eslintrc/base', './configs/eslintrc/eslint-recommended'], rules: { '@typescript-eslint/adjacent-overload-signatures': 'error', '@typescript-eslint/array-type': 'error', diff --git a/packages/eslint-plugin/src/configs/eslintrc/stylistic.ts b/packages/eslint-plugin/src/configs/eslintrc/stylistic.ts index 02705c56c034..fe4a00ffe7c1 100644 --- a/packages/eslint-plugin/src/configs/eslintrc/stylistic.ts +++ b/packages/eslint-plugin/src/configs/eslintrc/stylistic.ts @@ -8,7 +8,7 @@ import type { ClassicConfig } from '@typescript-eslint/utils/ts-eslint'; export = { - extends: ['./configs/base', './configs/eslint-recommended'], + extends: ['./configs/eslintrc/base', './configs/eslintrc/eslint-recommended'], rules: { '@typescript-eslint/adjacent-overload-signatures': 'error', '@typescript-eslint/array-type': 'error', diff --git a/tools/scripts/generate-configs.mts b/tools/scripts/generate-configs.mts index 6b8f55d28ab3..6b0971a7104d 100644 --- a/tools/scripts/generate-configs.mts +++ b/tools/scripts/generate-configs.mts @@ -36,12 +36,12 @@ const EXTENDS_MODULES = [ { moduleRelativePath: './base', name: 'baseConfig', - packageRelativePath: './configs/base', + packageRelativePath: './configs/eslintrc/base', }, { moduleRelativePath: './eslint-recommended', name: 'eslintRecommendedConfig', - packageRelativePath: './configs/eslint-recommended', + packageRelativePath: './configs/eslintrc/eslint-recommended', }, ] as const; const CLASSIC_EXTENDS: readonly string[] = EXTENDS_MODULES.map(