Merge branch 'main' into eslint-v9-eslint-classes

typescript-eslint · Apr 7, 2024 · e6f03b6 · e6f03b6
2 parents 84abbfc + 566b29a
commit e6f03b6
Show file tree

Hide file tree

Showing 19 changed files with 354 additions and 319 deletions.
diff --git a/packages/eslint-plugin/docs/rules/prefer-optional-chain.mdx b/packages/eslint-plugin/docs/rules/prefer-optional-chain.mdx
@@ -102,8 +102,7 @@ thing && thing.toString();
 ```
 
 </TabItem>
-<TabItem value="✅ Correct">
- for `checkAny: false`
+<TabItem value="✅ Correct for `checkAny: false`">
 
 ```ts option='{ "checkAny": false }'
 declare const thing: any;
@@ -129,8 +128,7 @@ thing && thing.toString();
 ```
 
 </TabItem>
-<TabItem value="✅ Correct">
- for `checkUnknown: false`
+<TabItem value="✅ Correct for `checkUnknown: false`">
 
 ```ts option='{ "checkUnknown": false }'
 declare const thing: unknown;
@@ -156,8 +154,7 @@ thing && thing.toString();
 ```
 
 </TabItem>
-<TabItem value="✅ Correct">
- for `checkString: false`
+<TabItem value="✅ Correct for `checkString: false`">
 
 ```ts option='{ "checkString": false }'
 declare const thing: string;
@@ -183,8 +180,7 @@ thing && thing.toString();
 ```
 
 </TabItem>
-<TabItem value="✅ Correct">
- for `checkNumber: false`
+<TabItem value="✅ Correct for `checkNumber: false`">
 
 ```ts option='{ "checkNumber": false }'
 declare const thing: number;
@@ -224,8 +220,7 @@ thing && thing.toString();
 ```
 
 </TabItem>
-<TabItem value="✅ Correct">
- for `checkBoolean: false`
+<TabItem value="✅ Correct for `checkBoolean: false`">
 
 ```ts option='{ "checkBoolean": false }'
 declare const thing: true;
@@ -251,8 +246,7 @@ thing && thing.toString();
 ```
 
 </TabItem>
-<TabItem value="✅ Correct">
- for `checkBigInt: false`
+<TabItem value="✅ Correct for `checkBigInt: false`">
 
 ```ts option='{ "checkBigInt": false }'
 declare const thing: bigint;
@@ -277,8 +271,7 @@ thing1 && thing1.toString();
 ```
 
 </TabItem>
-<TabItem value="✅ Correct">
- for `requireNullish: true`
+<TabItem value="✅ Correct for `requireNullish: true`">
 
 ```ts option='{ "requireNullish": true }'
 declare const thing1: string | null;

diff --git a/packages/integration-tests/tests/__snapshots__/flat-config-types.test.ts.snap b/packages/integration-tests/tests/__snapshots__/flat-config-types.test.ts.snap
@@ -112,16 +112,7 @@ function _otherCases() {
 }
 ",
     "suppressedMessages": [],
-    "usedDeprecatedRules": [
-      {
-        "replacedBy": [],
-        "ruleId": "no-extra-semi",
-      },
-      {
-        "replacedBy": [],
-        "ruleId": "no-mixed-spaces-and-tabs",
-      },
-    ],
+    "usedDeprecatedRules": [],
     "warningCount": 0,
   },
 ]

diff --git a/packages/repo-tools/src/generate-configs.mts b/packages/repo-tools/src/generate-configs.mts
@@ -215,6 +215,7 @@ async function main(): Promise<void> {
     ];
     const flatExtends: string[] = [];
     const flatConfig: FlatConfig.Config = {
+      name: `typescript-eslint/${name}`,
       rules: config.rules,
     };
     if (config.extends) {

diff --git a/packages/typescript-eslint/src/configs/all.ts b/packages/typescript-eslint/src/configs/all.ts
@@ -17,6 +17,7 @@ export default (
   baseConfig(plugin, parser),
   eslintRecommendedConfig(plugin, parser),
   {
+    name: 'typescript-eslint/all',
     rules: {
       '@typescript-eslint/adjacent-overload-signatures': 'error',
       '@typescript-eslint/array-type': 'error',

diff --git a/packages/typescript-eslint/src/configs/base.ts b/packages/typescript-eslint/src/configs/base.ts
@@ -4,6 +4,7 @@ export default (
   plugin: FlatConfig.Plugin,
   parser: FlatConfig.Parser,
 ): FlatConfig.Config => ({
+  name: 'typescript-eslint/base',
   languageOptions: {
     parser,
     sourceType: 'module',

diff --git a/packages/typescript-eslint/src/configs/disable-type-checked.ts b/packages/typescript-eslint/src/configs/disable-type-checked.ts
@@ -11,6 +11,7 @@ export default (
   _plugin: FlatConfig.Plugin,
   _parser: FlatConfig.Parser,
 ): FlatConfig.Config => ({
+  name: 'typescript-eslint/disable-type-checked',
   rules: {
     '@typescript-eslint/await-thenable': 'off',
     '@typescript-eslint/consistent-return': 'off',

diff --git a/packages/typescript-eslint/src/configs/eslint-recommended.ts b/packages/typescript-eslint/src/configs/eslint-recommended.ts
@@ -9,4 +9,7 @@ import type { FlatConfig } from '@typescript-eslint/utils/ts-eslint';
 export default (
   _plugin: FlatConfig.Plugin,
   _parser: FlatConfig.Parser,
-): FlatConfig.Config => config('minimatch');
+): FlatConfig.Config => ({
+  ...config('minimatch'),
+  name: 'typescript-eslint/eslint-recommended',
+});
diff --git a/packages/typescript-eslint/src/configs/recommended-type-checked-only.ts b/packages/typescript-eslint/src/configs/recommended-type-checked-only.ts
@@ -17,6 +17,7 @@ export default (
   baseConfig(plugin, parser),
   eslintRecommendedConfig(plugin, parser),
   {
+    name: 'typescript-eslint/recommended-type-checked-only',
     rules: {
       '@typescript-eslint/await-thenable': 'error',
       '@typescript-eslint/no-base-to-string': 'error',

diff --git a/packages/typescript-eslint/src/configs/recommended-type-checked.ts b/packages/typescript-eslint/src/configs/recommended-type-checked.ts
@@ -17,6 +17,7 @@ export default (
   baseConfig(plugin, parser),
   eslintRecommendedConfig(plugin, parser),
   {
+    name: 'typescript-eslint/recommended-type-checked',
     rules: {
       '@typescript-eslint/await-thenable': 'error',
       '@typescript-eslint/ban-ts-comment': 'error',

diff --git a/packages/typescript-eslint/src/configs/recommended.ts b/packages/typescript-eslint/src/configs/recommended.ts
@@ -17,6 +17,7 @@ export default (
   baseConfig(plugin, parser),
   eslintRecommendedConfig(plugin, parser),
   {
+    name: 'typescript-eslint/recommended',
     rules: {
       '@typescript-eslint/ban-ts-comment': 'error',
       '@typescript-eslint/ban-types': 'error',

diff --git a/packages/typescript-eslint/src/configs/strict-type-checked-only.ts b/packages/typescript-eslint/src/configs/strict-type-checked-only.ts
@@ -17,6 +17,7 @@ export default (
   baseConfig(plugin, parser),
   eslintRecommendedConfig(plugin, parser),
   {
+    name: 'typescript-eslint/strict-type-checked-only',
     rules: {
       '@typescript-eslint/await-thenable': 'error',
       '@typescript-eslint/no-array-delete': 'error',

diff --git a/packages/typescript-eslint/src/configs/strict-type-checked.ts b/packages/typescript-eslint/src/configs/strict-type-checked.ts
@@ -17,6 +17,7 @@ export default (
   baseConfig(plugin, parser),
   eslintRecommendedConfig(plugin, parser),
   {
+    name: 'typescript-eslint/strict-type-checked',
     rules: {
       '@typescript-eslint/await-thenable': 'error',
       '@typescript-eslint/ban-ts-comment': [

diff --git a/packages/typescript-eslint/src/configs/strict.ts b/packages/typescript-eslint/src/configs/strict.ts
@@ -17,6 +17,7 @@ export default (
   baseConfig(plugin, parser),
   eslintRecommendedConfig(plugin, parser),
   {
+    name: 'typescript-eslint/strict',
     rules: {
       '@typescript-eslint/ban-ts-comment': [
         'error',

diff --git a/packages/typescript-eslint/src/configs/stylistic-type-checked-only.ts b/packages/typescript-eslint/src/configs/stylistic-type-checked-only.ts
@@ -17,6 +17,7 @@ export default (
   baseConfig(plugin, parser),
   eslintRecommendedConfig(plugin, parser),
   {
+    name: 'typescript-eslint/stylistic-type-checked-only',
     rules: {
       'dot-notation': 'off',
       '@typescript-eslint/dot-notation': 'error',

diff --git a/packages/typescript-eslint/src/configs/stylistic-type-checked.ts b/packages/typescript-eslint/src/configs/stylistic-type-checked.ts
@@ -17,6 +17,7 @@ export default (
   baseConfig(plugin, parser),
   eslintRecommendedConfig(plugin, parser),
   {
+    name: 'typescript-eslint/stylistic-type-checked',
     rules: {
       '@typescript-eslint/adjacent-overload-signatures': 'error',
       '@typescript-eslint/array-type': 'error',

diff --git a/packages/typescript-eslint/src/configs/stylistic.ts b/packages/typescript-eslint/src/configs/stylistic.ts
@@ -17,6 +17,7 @@ export default (
   baseConfig(plugin, parser),
   eslintRecommendedConfig(plugin, parser),
   {
+    name: 'typescript-eslint/stylistic',
     rules: {
       '@typescript-eslint/adjacent-overload-signatures': 'error',
       '@typescript-eslint/array-type': 'error',

diff --git a/packages/utils/src/ts-eslint/Config.ts b/packages/utils/src/ts-eslint/Config.ts
@@ -245,6 +245,10 @@ export namespace FlatConfig {
   // it's not a json schema so it's nowhere near as nice to read and convert...
   // https://github.com/eslint/eslint/blob/v8.45.0/lib/config/flat-config-schema.js
   export interface Config {
+    /**
+     * An string to identify the configuration object. Used in error messages and inspection tools.
+     */
+    name?: string;
     /**
      * An array of glob patterns indicating the files that the configuration object should apply to.
      * If not specified, the configuration object applies to all files matched by any other configuration object.

diff --git a/packages/website/package.json b/packages/website/package.json
@@ -52,7 +52,7 @@
     "@typescript-eslint/eslint-plugin": "7.5.0",
     "@typescript-eslint/rule-schema-to-typescript-types": "7.5.0",
     "@typescript-eslint/types": "7.5.0",
-    "copy-webpack-plugin": "^11.0.0",
+    "copy-webpack-plugin": "^12.0.0",
     "cross-fetch": "*",
     "globby": "^11.1.0",
     "make-dir": "*",