From 290aea38899fa7348ce0f27b7ecdf772dc4d6adf Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Fri, 3 May 2024 09:14:55 +0200 Subject: [PATCH] feat(presets): add eslint-stylistic monorepo and add to eslint group (#28812) --- lib/config/presets/__snapshots__/index.spec.ts.snap | 3 +++ lib/config/presets/index.spec.ts | 8 +++++--- lib/config/presets/internal/monorepo.ts | 1 + lib/config/presets/internal/packages.ts | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/config/presets/__snapshots__/index.spec.ts.snap b/lib/config/presets/__snapshots__/index.spec.ts.snap index 465f4aa032ac36..b3fac71cdca566 100644 --- a/lib/config/presets/__snapshots__/index.spec.ts.snap +++ b/lib/config/presets/__snapshots__/index.spec.ts.snap @@ -123,6 +123,7 @@ exports[`config/presets/index resolvePreset resolves eslint 1`] = ` ], "matchPackagePrefixes": [ "@eslint/", + "@stylistic/eslint-plugin", "@types/eslint__", "@typescript-eslint/", "eslint", @@ -154,6 +155,7 @@ exports[`config/presets/index resolvePreset resolves linters 1`] = ` "matchPackagePrefixes": [ "ember-template-lint", "@eslint/", + "@stylistic/eslint-plugin", "@types/eslint__", "@typescript-eslint/", "eslint", @@ -192,6 +194,7 @@ exports[`config/presets/index resolvePreset resolves nested groups 1`] = ` "matchPackagePrefixes": [ "ember-template-lint", "@eslint/", + "@stylistic/eslint-plugin", "@types/eslint__", "@typescript-eslint/", "eslint", diff --git a/lib/config/presets/index.spec.ts b/lib/config/presets/index.spec.ts index 4edd8554de9a65..443cdc5d0a19cd 100644 --- a/lib/config/presets/index.spec.ts +++ b/lib/config/presets/index.spec.ts @@ -241,6 +241,7 @@ describe('config/presets/index', () => { ], matchPackagePrefixes: [ '@eslint/', + '@stylistic/eslint-plugin', '@types/eslint__', '@typescript-eslint/', 'eslint', @@ -268,6 +269,7 @@ describe('config/presets/index', () => { ], matchPackagePrefixes: [ '@eslint/', + '@stylistic/eslint-plugin', '@types/eslint__', '@typescript-eslint/', 'eslint', @@ -281,7 +283,7 @@ describe('config/presets/index', () => { config.extends = ['packages:eslint']; const res = await presets.resolveConfigPresets(config); expect(res).toMatchSnapshot(); - expect(res.matchPackagePrefixes).toHaveLength(4); + expect(res.matchPackagePrefixes).toHaveLength(5); }); it('resolves linters', async () => { @@ -290,7 +292,7 @@ describe('config/presets/index', () => { expect(res).toMatchSnapshot(); expect(res.matchPackageNames).toHaveLength(11); expect(res.matchPackagePatterns).toHaveLength(1); - expect(res.matchPackagePrefixes).toHaveLength(6); + expect(res.matchPackagePrefixes).toHaveLength(7); }); it('resolves nested groups', async () => { @@ -301,7 +303,7 @@ describe('config/presets/index', () => { expect(rule.automerge).toBeTrue(); expect(rule.matchPackageNames).toHaveLength(11); expect(rule.matchPackagePatterns).toHaveLength(1); - expect(rule.matchPackagePrefixes).toHaveLength(6); + expect(rule.matchPackagePrefixes).toHaveLength(7); }); it('migrates automerge in presets', async () => { diff --git a/lib/config/presets/internal/monorepo.ts b/lib/config/presets/internal/monorepo.ts index ccaadb73e3160f..2c2dbd9412ce79 100644 --- a/lib/config/presets/internal/monorepo.ts +++ b/lib/config/presets/internal/monorepo.ts @@ -279,6 +279,7 @@ const repoGroups = { emotion: 'https://github.com/emotion-js/emotion', 'eslint-config-globex': 'https://github.com/GlobexDesignsInc/eslint-config-globex', + 'eslint-stylistic': 'https://github.com/eslint-stylistic/eslint-stylistic', expo: 'https://github.com/expo/expo', 'fabric-chaincode-node': 'https://github.com/hyperledger/fabric-chaincode-node', diff --git a/lib/config/presets/internal/packages.ts b/lib/config/presets/internal/packages.ts index 64db951281c1fa..daac49f540fa31 100644 --- a/lib/config/presets/internal/packages.ts +++ b/lib/config/presets/internal/packages.ts @@ -29,6 +29,7 @@ export const presets: Record = { ], matchPackagePrefixes: [ '@eslint/', + '@stylistic/eslint-plugin', '@types/eslint__', '@typescript-eslint/', 'eslint',