Skip to content

Commit a89a2c1

Browse files
authored
fix: Don't extend from removed ESLint configs (#1397)
Since version `8.0.0` of `eslint-config-prettier`, all configs have merged into `prettier` and supplying the extraneous configs results in error
1 parent 2ddcffa commit a89a2c1

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

Diff for: src/converters/lintConfigs/reporting/reportConfigConversionResults.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { createEmptyConfigConversionResults } from "../configConversionResults.s
66
import { ESLintRuleOptions } from "../rules/types";
77
import { reportConfigConversionResults } from "./reportConfigConversionResults";
88

9-
const basicExtends = ["prettier", "prettier/@typescript-eslint"];
9+
const basicExtends = ["prettier"];
1010

1111
describe("reportConfigConversionResults", () => {
1212
it("logs a successful conversion without notices when there is one converted rule without notices", async () => {

Diff for: src/converters/lintConfigs/summarization/retrieveExtendsValues.ts

-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ const builtInExtensions = new Map([
2020

2121
const pluginExtensions = new Map([
2222
["eslint-plugin-prettier", "node_modules/eslint-config-prettier/index.js"],
23-
[
24-
"eslint-plugin-prettier/@typescript-eslint",
25-
"node_modules/eslint-config-prettier/@typescript-eslint.js",
26-
],
2723
[
2824
"plugin:@typescript-eslint/all",
2925
"node_modules/@typescript-eslint/eslint-plugin/dist/configs/all.json",

Diff for: src/converters/lintConfigs/summarization/summarizePackageRules.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ describe("summarizePackageRules", () => {
7575
expect(summarizedResults).toEqual({
7676
...ruleConversionResults,
7777
converted: new Map(),
78-
extends: ["prettier", "prettier/@typescript-eslint"],
78+
extends: ["prettier"],
7979
});
8080
});
8181

Diff for: src/converters/lintConfigs/summarization/summarizePackageRules.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export const summarizePackageRules = async (
3535

3636
// 3a. If no output rules conflict with `eslint-config-prettier`, it's added in
3737
if (dependencies.checkPrettierExtension(ruleConversionResults, prettierRequested)) {
38-
allExtensions.push("prettier", "prettier/@typescript-eslint");
38+
allExtensions.push("prettier");
3939
}
4040

4141
if (allExtensions.length === 0) {

0 commit comments

Comments
 (0)