Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/creation/createNewConfiguration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
),
);
});

Expand All @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions src/creation/createNewConfiguration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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),
};
Expand Down