diff --git a/src/creation/simplification/retrieveExtendsValues.ts b/src/creation/simplification/retrieveExtendsValues.ts index c6ed31aba..9d3a10e93 100644 --- a/src/creation/simplification/retrieveExtendsValues.ts +++ b/src/creation/simplification/retrieveExtendsValues.ts @@ -18,7 +18,12 @@ const builtInExtensions = new Map([ ["eslint:recommended", "eslint/conf/eslint-recommended"], ]); -const typescriptPluginExtensions = 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", @@ -54,10 +59,10 @@ export const retrieveExtendsValues = async ( return; } - const typescriptPluginExtension = typescriptPluginExtensions.get(extensionName); - if (typescriptPluginExtension !== undefined) { + const pluginExtension = pluginExtensions.get(extensionName); + if (pluginExtension !== undefined) { const importedTypeScriptPlugin = (await dependencies.importer( - typescriptPluginExtension, + pluginExtension, )) as ESLintConfiguration; importedExtensions.push({ rules: importedTypeScriptPlugin.rules, diff --git a/src/creation/simplification/simplifyPackageRules.test.ts b/src/creation/simplification/simplifyPackageRules.test.ts index 07266dea9..5bde76411 100644 --- a/src/creation/simplification/simplifyPackageRules.test.ts +++ b/src/creation/simplification/simplifyPackageRules.test.ts @@ -68,10 +68,7 @@ describe("simplifyPackageRules", () => { expect(simplifiedResults).toEqual({ ...ruleConversionResults, converted: undefined, - extends: [ - "plugin:eslint-config-prettier", - "plugin:eslint-config-prettier/@typescript-eslint", - ], + extends: ["prettier", "prettier/@typescript-eslint"], }); }); diff --git a/src/creation/simplification/simplifyPackageRules.ts b/src/creation/simplification/simplifyPackageRules.ts index 3de99f5b0..b7df6f39e 100644 --- a/src/creation/simplification/simplifyPackageRules.ts +++ b/src/creation/simplification/simplifyPackageRules.ts @@ -36,10 +36,7 @@ export const simplifyPackageRules = async ( // 3a. If no output rules conflict with `eslint-config-prettier`, it's added in if (await dependencies.addPrettierExtensions(ruleConversionResults, prettierRequested)) { - allExtensions.push( - "plugin:eslint-config-prettier", - "plugin:eslint-config-prettier/@typescript-eslint", - ); + allExtensions.push("prettier", "prettier/@typescript-eslint"); } if (allExtensions.length === 0) { @@ -58,7 +55,7 @@ export const simplifyPackageRules = async ( return { ...ruleConversionResults, converted, - extends: allExtensions, + extends: uniqueFromSources(allExtensions), failed: [...ruleConversionResults.failed, ...configurationErrors], }; }; diff --git a/src/reporting/packages/logMissingPackages.test.ts b/src/reporting/packages/logMissingPackages.test.ts index ac1a6fb72..a0c3c2117 100644 --- a/src/reporting/packages/logMissingPackages.test.ts +++ b/src/reporting/packages/logMissingPackages.test.ts @@ -71,7 +71,7 @@ describe("logMissingPackages", () => { // Arrange const { choosePackageManager, logger } = createStubDependencies(); const ruleConversionResults = createEmptyConversionResults({ - extends: ["plugin:eslint-config-prettier"], + extends: ["prettier"], }); // Act diff --git a/src/reporting/packages/logMissingPackages.ts b/src/reporting/packages/logMissingPackages.ts index fc7a9e5e5..504650b8f 100644 --- a/src/reporting/packages/logMissingPackages.ts +++ b/src/reporting/packages/logMissingPackages.ts @@ -29,8 +29,7 @@ export const logMissingPackages = async ( const requiredPackageNames = [ "@typescript-eslint/eslint-plugin", "@typescript-eslint/parser", - ruleConversionResults.extends?.join("").includes("eslint-config-prettier") && - "eslint-config-prettier", + ruleConversionResults.extends?.join("").includes("prettier") && "eslint-config-prettier", ruleConversionResults.missing.length !== 0 && "@typescript-eslint/eslint-plugin-tslint", "eslint", ...Array.from(ruleConversionResults.plugins), diff --git a/src/reporting/reportConversionResults.test.ts b/src/reporting/reportConversionResults.test.ts index 383276f29..75c6da81f 100644 --- a/src/reporting/reportConversionResults.test.ts +++ b/src/reporting/reportConversionResults.test.ts @@ -5,10 +5,7 @@ import { createEmptyConversionResults } from "../conversion/conversionResults.st import { ESLintRuleOptions } from "../rules/types"; import { reportConversionResults } from "./reportConversionResults"; -const basicExtends = [ - "plugin:eslint-config-prettier", - "plugin:eslint-config-prettier/@typescript-eslint", -]; +const basicExtends = ["prettier", "prettier/@typescript-eslint"]; describe("reportConversionResults", () => { it("logs a successful conversion without notices when there is one converted rule without notices", async () => { diff --git a/src/reporting/reportConversionResults.ts b/src/reporting/reportConversionResults.ts index 1ec01c24b..d3949eb77 100644 --- a/src/reporting/reportConversionResults.ts +++ b/src/reporting/reportConversionResults.ts @@ -42,7 +42,7 @@ export const reportConversionResults = async ( ); } - if (!ruleConversionResults.extends?.join("").includes("eslint-config-prettier")) { + if (!ruleConversionResults.extends?.join("").includes("prettier")) { logPrettierExtension(dependencies.logger); } }; diff --git a/src/reporting/reportOutputs.ts b/src/reporting/reportOutputs.ts index 3fbe7e50d..520045045 100644 --- a/src/reporting/reportOutputs.ts +++ b/src/reporting/reportOutputs.ts @@ -13,7 +13,7 @@ export const logSuccessfulConversions = ( converted: Map, logger: Logger, ) => { - logger.stdout.write(chalk.greenBright(`${EOL} ✨ ${converted.size}`)); + logger.stdout.write(chalk.greenBright(`${EOL}✨ ${converted.size}`)); logger.stdout.write( converted.size === 1 ? chalk.green(` ${conversionTypeName} replaced with its ESLint equivalent.`)