From 68f226fc413aeaf7ca9541b50c328899225e5780 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Sun, 30 Jun 2019 21:32:31 -0400 Subject: [PATCH] Always included typescript-eslint plugin in ESLint plugins Fixes #46. --- src/creation/writeConversionResults.test.ts | 3 ++- src/creation/writeConversionResults.ts | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/creation/writeConversionResults.test.ts b/src/creation/writeConversionResults.test.ts index 64deb3596..6f02a2a7b 100644 --- a/src/creation/writeConversionResults.test.ts +++ b/src/creation/writeConversionResults.test.ts @@ -33,6 +33,7 @@ describe("writeConversionResults", () => { parserOptions: { project: "tsconfig.json", }, + plugins: ["@typescript-eslint"], rules: {}, }, undefined, @@ -72,7 +73,7 @@ describe("writeConversionResults", () => { parserOptions: { project: "tsconfig.json", }, - plugins: ["@typescript-eslint/tslint"], + plugins: ["@typescript-eslint", "@typescript-eslint/tslint"], rules: { "@typescript-eslint/tslint/config": [ "error", diff --git a/src/creation/writeConversionResults.ts b/src/creation/writeConversionResults.ts index 378b680ed..c512603f9 100644 --- a/src/creation/writeConversionResults.ts +++ b/src/creation/writeConversionResults.ts @@ -13,15 +13,18 @@ export const writeConversionResults = async ( ruleConversionResults: RuleConversionResults, originalConfigurations: OriginalConfigurations, ) => { + const plugins = ["@typescript-eslint"]; + + if (ruleConversionResults.missing.length !== 0) { + plugins.push("@typescript-eslint/tslint"); + } const output = { env: createEnv(originalConfigurations), parser: "@typescript-eslint/parser", parserOptions: { project: "tsconfig.json", }, - ...(ruleConversionResults.missing.length && { - plugins: ["@typescript-eslint/tslint"], - }), + plugins, rules: formatConvertedRules(ruleConversionResults, originalConfigurations.tslint), };