From ba633d8efaf16fa1f9135d63b34b5063f91c1d77 Mon Sep 17 00:00:00 2001
From: Josh Goldberg <josh@fullscreenmario.com>
Date: Mon, 24 Jun 2019 21:05:06 -0500
Subject: [PATCH] Always included typescript-eslint parser

Fixes #12.
---
 src/creation/createNewConfiguration.test.ts | 16 +++++++++++++---
 src/creation/createNewConfiguration.ts      |  8 ++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/creation/createNewConfiguration.test.ts b/src/creation/createNewConfiguration.test.ts
index c6843057d..1813313e9 100644
--- a/src/creation/createNewConfiguration.test.ts
+++ b/src/creation/createNewConfiguration.test.ts
@@ -3,7 +3,7 @@ import { createNewConfiguration } from "./createNewConfiguration";
 import { ConfigConversionResults } from "../rules/convertRules";
 
 describe("createNewConfiguration", () => {
-    it("writes only formatted rules when there are no missing rules", async () => {
+    it("excludes the tslint plugin when there are no missing rules", async () => {
         // Arrange
         const conversionResults: ConfigConversionResults = {
             ...emptyConversionResults,
@@ -17,7 +17,17 @@ describe("createNewConfiguration", () => {
         // Assert
         expect(writeFile).toHaveBeenLastCalledWith(
             ".eslintrc.json",
-            JSON.stringify({ rules: {} }, undefined, 4),
+            JSON.stringify(
+                {
+                    parser: "@typescript-eslint/parser",
+                    parserOptions: {
+                        project: "tsconfig.json",
+                    },
+                    rules: {},
+                },
+                undefined,
+                4,
+            ),
         );
     });
 
@@ -44,11 +54,11 @@ describe("createNewConfiguration", () => {
             ".eslintrc.json",
             JSON.stringify(
                 {
-                    plugins: ["@typescript-eslint/tslint"],
                     parser: "@typescript-eslint/parser",
                     parserOptions: {
                         project: "tsconfig.json",
                     },
+                    plugins: ["@typescript-eslint/tslint"],
                     rules: {
                         "@typescript-eslint/tslint/config": [
                             "error",
diff --git a/src/creation/createNewConfiguration.ts b/src/creation/createNewConfiguration.ts
index e637dcefc..c02cfa26c 100644
--- a/src/creation/createNewConfiguration.ts
+++ b/src/creation/createNewConfiguration.ts
@@ -8,12 +8,12 @@ export const createNewConfiguration = async (
     writeFile: WriteFile,
 ) => {
     const output = {
+        parser: "@typescript-eslint/parser",
+        parserOptions: {
+            project: "tsconfig.json",
+        },
         ...(conversionResults.missing.length && {
             plugins: ["@typescript-eslint/tslint"],
-            parser: "@typescript-eslint/parser",
-            parserOptions: {
-                project: "tsconfig.json",
-            },
         }),
         rules: formatConvertedRules(conversionResults),
     };