From ed13e22b6c654bfa20bc4572fa9b29cf1639aa8c Mon Sep 17 00:00:00 2001
From: Jeff Fairley <jfairley@gmail.com>
Date: Mon, 6 Jul 2020 13:48:29 -0400
Subject: [PATCH] fix(presets): include '@typescript-eslint' with eslint preset
(#6687)
* fix(presets): include '@typescript-eslint' with eslint preset
This updates the eslint package preset to include the @typescript-eslint monorepo. This is a suite of plugins and configs that enables eslint to support typescript.
* test(presets): update eslint test snapshots and expectations
---
lib/config/presets/__snapshots__/index.spec.ts.snap | 5 +++++
lib/config/presets/index.spec.ts | 6 +++---
lib/config/presets/internal/packages.ts | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/lib/config/presets/__snapshots__/index.spec.ts.snap b/lib/config/presets/__snapshots__/index.spec.ts.snap
index cdc6389980..2156450ef0 100644
--- a/lib/config/presets/__snapshots__/index.spec.ts.snap
+++ b/lib/config/presets/__snapshots__/index.spec.ts.snap
@@ -318,6 +318,7 @@ Object {
"babel-eslint",
],
"packagePatterns": Array [
+ "^@typescript-eslint/",
"^eslint",
"^stylelint",
],
@@ -406,6 +407,7 @@ Object {
"babel-eslint",
],
"packagePatterns": Array [
+ "^@typescript-eslint/",
"^eslint",
],
}
@@ -422,6 +424,7 @@ Object {
"remark-lint",
],
"packagePatterns": Array [
+ "^@typescript-eslint/",
"^eslint",
"^stylelint",
"\\\\btslint\\\\b",
@@ -446,6 +449,7 @@ Object {
"remark-lint",
],
"packagePatterns": Array [
+ "^@typescript-eslint/",
"^eslint",
"^stylelint",
"\\\\btslint\\\\b",
@@ -464,6 +468,7 @@ Object {
"babel-eslint",
],
"packagePatterns": Array [
+ "^@typescript-eslint/",
"^eslint",
],
},
diff --git a/lib/config/presets/index.spec.ts b/lib/config/presets/index.spec.ts
index 74fcd7cfef..eff63344cd 100644
--- a/lib/config/presets/index.spec.ts
+++ b/lib/config/presets/index.spec.ts
@@ -143,14 +143,14 @@ describe('config/presets', () => {
config.extends = ['packages:eslint'];
const res = await presets.resolveConfigPresets(config);
expect(res).toMatchSnapshot();
- expect(res.packagePatterns).toHaveLength(1);
+ expect(res.packagePatterns).toHaveLength(2);
});
it('resolves linters', async () => {
config.extends = ['packages:linters'];
const res = await presets.resolveConfigPresets(config);
expect(res).toMatchSnapshot();
expect(res.packageNames).toHaveLength(3);
- expect(res.packagePatterns).toHaveLength(3);
+ expect(res.packagePatterns).toHaveLength(4);
});
it('resolves nested groups', async () => {
config.extends = [':automergeLinters'];
@@ -159,7 +159,7 @@ describe('config/presets', () => {
const rule = res.packageRules[0];
expect(rule.automerge).toBe(true);
expect(rule.packageNames).toHaveLength(3);
- expect(rule.packagePatterns).toHaveLength(3);
+ expect(rule.packagePatterns).toHaveLength(4);
});
it('migrates automerge in presets', async () => {
config.extends = ['ikatyang:library'];
diff --git a/lib/config/presets/internal/packages.ts b/lib/config/presets/internal/packages.ts
index af8b8dd897..2e75677c01 100644
--- a/lib/config/presets/internal/packages.ts
+++ b/lib/config/presets/internal/packages.ts
@@ -21,7 +21,7 @@ export const presets: Record<string, Preset> = {
eslint: {
description: 'All eslint packages',
packageNames: ['babel-eslint'],
- packagePatterns: ['^eslint'],
+ packagePatterns: ['^@typescript-eslint/', '^eslint'],
},
stylelint: {
description: 'All stylelint packages',
--
GitLab