From df43b0e149ab6696aaea4cf0d313b9b5368b7168 Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Thu, 26 Mar 2026 12:31:11 +0100
Subject: [PATCH] fix(eslint-plugin): fix TypeScript 6.0 type errors in
 no-mixed-plugin-imports

TypeScript 6.0 no longer applies bivariant checking to method-shorthand
functions that don't reference `this`. This causes the `fix` callbacks in
suggestion descriptors to fail type checking when they return `void`
instead of a valid `Fix | null` value.

- Return `null` from non-fixable suggestion `fix` handlers
- Add explicit `SuggestionReportDescriptor[]` type annotation to `suggest`
- Remove redundant `@param` JSDoc annotations now covered by the array type

Signed-off-by: Jon Koops <jonkoops@gmail.com>
---
 .changeset/ts6-eslint-plugin.md                   |  5 +++++
 .../rules/no-mixed-plugin-imports.js              | 15 ++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/ts6-eslint-plugin.md

diff --git a/.changeset/ts6-eslint-plugin.md b/.changeset/ts6-eslint-plugin.md
new file mode 100644
index 0000000000..fa603a7c19
--- /dev/null
+++ b/.changeset/ts6-eslint-plugin.md
@@ -0,0 +1,5 @@
+---
+'@backstage/eslint-plugin': patch
+---
+
+Fixed `no-mixed-plugin-imports` rule to return `null` from non-fixable suggestion handlers and added an explicit `SuggestionReportDescriptor[]` type annotation, matching the stricter type checking in TypeScript 6.0.
diff --git a/packages/eslint-plugin/rules/no-mixed-plugin-imports.js b/packages/eslint-plugin/rules/no-mixed-plugin-imports.js
index 9f00d38014..ecc9605d79 100644
--- a/packages/eslint-plugin/rules/no-mixed-plugin-imports.js
+++ b/packages/eslint-plugin/rules/no-mixed-plugin-imports.js
@@ -173,6 +173,7 @@ module.exports = {
             !ignoreTargetPackages.includes(targetName),
         )
       ) {
+        /** @type {import('eslint').Rule.SuggestionReportDescriptor[]} */
         const suggest = [];
 
         if (
@@ -187,9 +188,9 @@ module.exports = {
               sourcePackage: sourceName,
               sourceRole: sourceRole,
             },
-            /** @param {import('eslint').Rule.RuleFixer} _fixer */
-            fix(_fixer) {
+            fix() {
               // Not a fixable case, just give a suggestion to change plugin id
+              return null;
             },
           });
           suggest.push({
@@ -197,7 +198,6 @@ module.exports = {
             data: {
               targetPackage: targetName,
             },
-            /** @param {import('eslint').Rule.RuleFixer} fixer */
             fix(fixer) {
               const source = context.sourceCode;
               const nodeSource = source.getText(imp.node);
@@ -210,7 +210,6 @@ module.exports = {
             data: {
               targetPackage: targetName,
             },
-            /** @param {import('eslint').Rule.RuleFixer} fixer */
             fix(fixer) {
               const source = context.sourceCode;
               const nodeSource = source.getText(imp.node);
@@ -228,7 +227,6 @@ module.exports = {
             data: {
               targetPackage: targetName,
             },
-            /** @param {import('eslint').Rule.RuleFixer} fixer */
             fix(fixer) {
               const source = context.sourceCode;
               const nodeSource = source.getText(imp.node);
@@ -241,7 +239,6 @@ module.exports = {
             data: {
               targetPackage: targetName,
             },
-            /** @param {import('eslint').Rule.RuleFixer} fixer */
             fix(fixer) {
               const source = context.sourceCode;
               const nodeSource = source.getText(imp.node);
@@ -252,9 +249,9 @@ module.exports = {
         } else {
           suggest.push({
             messageId: 'removeImport',
-            /** @param {import('eslint').Rule.RuleFixer} _fixer */
-            fix(_fixer) {
-              // Not a fixable case, just give a suggestion to remove the import
+            fix() {
+              // Not a fixable case, just give a suggestion to change plugin id
+              return null;
             },
           });
         }