From 5920242a8764d9ff6df9cc56e0d20f99fe8c1555 Mon Sep 17 00:00:00 2001
From: Edwin Kofler <edwin@kofler.dev>
Date: Tue, 1 Mar 2022 13:23:30 -0800
Subject: [PATCH] fix: Don't extend from removed ESLint configs

Since version `8.0.0` of `eslint-config-prettier`,
all configs have merged into `prettier` and
supplying the extraneous configs results in error
---
 .../reporting/reportConfigConversionResults.test.ts           | 2 +-
 .../lintConfigs/summarization/retrieveExtendsValues.ts        | 4 ----
 .../lintConfigs/summarization/summarizePackageRules.test.ts   | 2 +-
 .../lintConfigs/summarization/summarizePackageRules.ts        | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/converters/lintConfigs/reporting/reportConfigConversionResults.test.ts b/src/converters/lintConfigs/reporting/reportConfigConversionResults.test.ts
index 842f68ac9..089730344 100644
--- a/src/converters/lintConfigs/reporting/reportConfigConversionResults.test.ts
+++ b/src/converters/lintConfigs/reporting/reportConfigConversionResults.test.ts
@@ -6,7 +6,7 @@ import { createEmptyConfigConversionResults } from "../configConversionResults.s
 import { ESLintRuleOptions } from "../rules/types";
 import { reportConfigConversionResults } from "./reportConfigConversionResults";
 
-const basicExtends = ["prettier", "prettier/@typescript-eslint"];
+const basicExtends = ["prettier"];
 
 describe("reportConfigConversionResults", () => {
     it("logs a successful conversion without notices when there is one converted rule without notices", async () => {
diff --git a/src/converters/lintConfigs/summarization/retrieveExtendsValues.ts b/src/converters/lintConfigs/summarization/retrieveExtendsValues.ts
index bd5f5ac6b..54ff08960 100644
--- a/src/converters/lintConfigs/summarization/retrieveExtendsValues.ts
+++ b/src/converters/lintConfigs/summarization/retrieveExtendsValues.ts
@@ -20,10 +20,6 @@ const builtInExtensions = new Map([
 
 const pluginExtensions = new Map([
     ["eslint-plugin-prettier", "node_modules/eslint-config-prettier/index.js"],
-    [
-        "eslint-plugin-prettier/@typescript-eslint",
-        "node_modules/eslint-config-prettier/@typescript-eslint.js",
-    ],
     [
         "plugin:@typescript-eslint/all",
         "node_modules/@typescript-eslint/eslint-plugin/dist/configs/all.json",
diff --git a/src/converters/lintConfigs/summarization/summarizePackageRules.test.ts b/src/converters/lintConfigs/summarization/summarizePackageRules.test.ts
index 23fcd6a89..b325b6f06 100644
--- a/src/converters/lintConfigs/summarization/summarizePackageRules.test.ts
+++ b/src/converters/lintConfigs/summarization/summarizePackageRules.test.ts
@@ -75,7 +75,7 @@ describe("summarizePackageRules", () => {
         expect(summarizedResults).toEqual({
             ...ruleConversionResults,
             converted: new Map(),
-            extends: ["prettier", "prettier/@typescript-eslint"],
+            extends: ["prettier"],
         });
     });
 
diff --git a/src/converters/lintConfigs/summarization/summarizePackageRules.ts b/src/converters/lintConfigs/summarization/summarizePackageRules.ts
index 891b6d44b..a8db8bb2d 100644
--- a/src/converters/lintConfigs/summarization/summarizePackageRules.ts
+++ b/src/converters/lintConfigs/summarization/summarizePackageRules.ts
@@ -35,7 +35,7 @@ export const summarizePackageRules = async (
 
     // 3a. If no output rules conflict with `eslint-config-prettier`, it's added in
     if (dependencies.checkPrettierExtension(ruleConversionResults, prettierRequested)) {
-        allExtensions.push("prettier", "prettier/@typescript-eslint");
+        allExtensions.push("prettier");
     }
 
     if (allExtensions.length === 0) {