From e7eb362ad4d2ece46d134fb9956d13cbb9a03242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Chalk?= Date: Mon, 15 Dec 2025 13:21:06 +0100 Subject: [PATCH 1/3] refactor(plugin-coverage): avoid implementation in index.ts file --- packages/plugin-coverage/src/lib/coverage-plugin.ts | 2 +- packages/plugin-coverage/src/lib/runner/runner.int.test.ts | 2 +- packages/plugin-coverage/src/lib/runner/{index.ts => runner.ts} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename packages/plugin-coverage/src/lib/runner/{index.ts => runner.ts} (100%) diff --git a/packages/plugin-coverage/src/lib/coverage-plugin.ts b/packages/plugin-coverage/src/lib/coverage-plugin.ts index f8f727749..329373575 100644 --- a/packages/plugin-coverage/src/lib/coverage-plugin.ts +++ b/packages/plugin-coverage/src/lib/coverage-plugin.ts @@ -11,7 +11,7 @@ import { type CoverageType, coveragePluginConfigSchema, } from './config.js'; -import { createRunnerFunction } from './runner/index.js'; +import { createRunnerFunction } from './runner/runner.js'; import { coverageDescription, coverageTypeWeightMapper } from './utils.js'; /** diff --git a/packages/plugin-coverage/src/lib/runner/runner.int.test.ts b/packages/plugin-coverage/src/lib/runner/runner.int.test.ts index 4d135a992..bea671b5b 100644 --- a/packages/plugin-coverage/src/lib/runner/runner.int.test.ts +++ b/packages/plugin-coverage/src/lib/runner/runner.int.test.ts @@ -2,7 +2,7 @@ import path from 'node:path'; import { fileURLToPath } from 'node:url'; import { expect } from 'vitest'; import { type AuditOutputs, DEFAULT_PERSIST_CONFIG } from '@code-pushup/models'; -import { createRunnerFunction } from './index.js'; +import { createRunnerFunction } from './runner.js'; describe('createRunnerFunction', () => { it('should successfully execute runner', async () => { diff --git a/packages/plugin-coverage/src/lib/runner/index.ts b/packages/plugin-coverage/src/lib/runner/runner.ts similarity index 100% rename from packages/plugin-coverage/src/lib/runner/index.ts rename to packages/plugin-coverage/src/lib/runner/runner.ts From ee95f54e9a50afa919fceebb0945898a4690432b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Chalk?= Date: Mon, 15 Dec 2025 13:34:55 +0100 Subject: [PATCH 2/3] refactor(plugin-eslint): avoid implementation in index.ts files --- packages/plugin-eslint/src/index.ts | 2 +- packages/plugin-eslint/src/lib/eslint-plugin.ts | 4 ++-- packages/plugin-eslint/src/lib/eslint-plugin.unit.test.ts | 2 +- packages/plugin-eslint/src/lib/meta/{index.ts => list.ts} | 0 packages/plugin-eslint/src/lib/{ => nx}/nx.int.test.ts | 8 ++++---- packages/plugin-eslint/src/lib/nx/{index.ts => nx.ts} | 0 packages/plugin-eslint/src/lib/nx/projects-to-config.ts | 2 +- packages/plugin-eslint/src/lib/nx/utils.ts | 2 +- .../{ => runner}/__snapshots__/runner.int.test.ts.snap | 0 .../plugin-eslint/src/lib/{ => runner}/runner.int.test.ts | 8 ++++---- .../plugin-eslint/src/lib/runner/{index.ts => runner.ts} | 0 .../runner/{index.unit.test.ts => runner.unit.test.ts} | 2 +- packages/plugin-eslint/src/lib/runner/transform.ts | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) rename packages/plugin-eslint/src/lib/meta/{index.ts => list.ts} (100%) rename packages/plugin-eslint/src/lib/{ => nx}/nx.int.test.ts (95%) rename packages/plugin-eslint/src/lib/nx/{index.ts => nx.ts} (100%) rename packages/plugin-eslint/src/lib/{ => runner}/__snapshots__/runner.int.test.ts.snap (100%) rename packages/plugin-eslint/src/lib/{ => runner}/runner.int.test.ts (92%) rename packages/plugin-eslint/src/lib/runner/{index.ts => runner.ts} (100%) rename packages/plugin-eslint/src/lib/runner/{index.unit.test.ts => runner.unit.test.ts} (98%) diff --git a/packages/plugin-eslint/src/index.ts b/packages/plugin-eslint/src/index.ts index c10a009ea..3d2ca810d 100644 --- a/packages/plugin-eslint/src/index.ts +++ b/packages/plugin-eslint/src/index.ts @@ -10,4 +10,4 @@ export { eslintConfigFromNxProject, eslintConfigFromNxProjectAndDeps, eslintConfigFromNxProjects, -} from './lib/nx/index.js'; +} from './lib/nx/nx.js'; diff --git a/packages/plugin-eslint/src/lib/eslint-plugin.ts b/packages/plugin-eslint/src/lib/eslint-plugin.ts index 14f480e75..97756a8e7 100644 --- a/packages/plugin-eslint/src/lib/eslint-plugin.ts +++ b/packages/plugin-eslint/src/lib/eslint-plugin.ts @@ -7,8 +7,8 @@ import { eslintPluginOptionsSchema, } from './config.js'; import { ESLINT_PLUGIN_SLUG, ESLINT_PLUGIN_TITLE } from './constants.js'; -import { listAuditsAndGroups } from './meta/index.js'; -import { createRunnerFunction } from './runner/index.js'; +import { listAuditsAndGroups } from './meta/list.js'; +import { createRunnerFunction } from './runner/runner.js'; /** * Instantiates Code PushUp ESLint plugin for use in core config. diff --git a/packages/plugin-eslint/src/lib/eslint-plugin.unit.test.ts b/packages/plugin-eslint/src/lib/eslint-plugin.unit.test.ts index 4d8386dfd..9de34c9e2 100644 --- a/packages/plugin-eslint/src/lib/eslint-plugin.unit.test.ts +++ b/packages/plugin-eslint/src/lib/eslint-plugin.unit.test.ts @@ -1,6 +1,6 @@ import { pluginConfigSchema } from '@code-pushup/models'; import { eslintPlugin } from './eslint-plugin.js'; -import * as metaModule from './meta/index.js'; +import * as metaModule from './meta/list.js'; describe('eslintPlugin', () => { const listAuditsAndGroupsSpy = vi.spyOn(metaModule, 'listAuditsAndGroups'); diff --git a/packages/plugin-eslint/src/lib/meta/index.ts b/packages/plugin-eslint/src/lib/meta/list.ts similarity index 100% rename from packages/plugin-eslint/src/lib/meta/index.ts rename to packages/plugin-eslint/src/lib/meta/list.ts diff --git a/packages/plugin-eslint/src/lib/nx.int.test.ts b/packages/plugin-eslint/src/lib/nx/nx.int.test.ts similarity index 95% rename from packages/plugin-eslint/src/lib/nx.int.test.ts rename to packages/plugin-eslint/src/lib/nx/nx.int.test.ts index efa8db941..22617269c 100644 --- a/packages/plugin-eslint/src/lib/nx.int.test.ts +++ b/packages/plugin-eslint/src/lib/nx/nx.int.test.ts @@ -8,19 +8,19 @@ import { teardownTestFolder, } from '@code-pushup/test-utils'; import { executeProcess } from '@code-pushup/utils'; -import type { ESLintTarget } from './config.js'; -import { eslintConfigFromNxProject } from './nx/find-project-without-deps.js'; +import type { ESLintTarget } from '../config.js'; import { eslintConfigFromAllNxProjects, + eslintConfigFromNxProject, eslintConfigFromNxProjectAndDeps, -} from './nx/index.js'; +} from './nx.js'; type Project = 'cli' | 'core' | 'nx-plugin' | 'utils'; // skipping tests on Windows due to a problem with createProjectGraphAsync that hangs forever, issue seems to be connected to nested git or some other Nx graph related problem https://github.com/nrwl/nx/issues/27494#issuecomment-2633836688 describe.skipIf(process.platform === 'win32')('Nx helpers', () => { const thisDir = fileURLToPath(path.dirname(import.meta.url)); - const fixturesDir = path.join(thisDir, '..', '..', 'mocks', 'fixtures'); + const fixturesDir = path.join(thisDir, '..', '..', '..', 'mocks', 'fixtures'); const tmpDir = path.join(process.cwd(), 'tmp', 'int', 'plugin-eslint'); let cwdSpy: MockInstance<[], string>; diff --git a/packages/plugin-eslint/src/lib/nx/index.ts b/packages/plugin-eslint/src/lib/nx/nx.ts similarity index 100% rename from packages/plugin-eslint/src/lib/nx/index.ts rename to packages/plugin-eslint/src/lib/nx/nx.ts diff --git a/packages/plugin-eslint/src/lib/nx/projects-to-config.ts b/packages/plugin-eslint/src/lib/nx/projects-to-config.ts index 54180d7f8..07aee1d81 100644 --- a/packages/plugin-eslint/src/lib/nx/projects-to-config.ts +++ b/packages/plugin-eslint/src/lib/nx/projects-to-config.ts @@ -1,6 +1,6 @@ import type { ProjectConfiguration, ProjectGraph } from '@nx/devkit'; import type { ESLintTarget } from '../config.js'; -import { detectConfigVersion } from '../meta/index.js'; +import { detectConfigVersion } from '../meta/list.js'; import { findCodePushupEslintConfig, findEslintConfig, diff --git a/packages/plugin-eslint/src/lib/nx/utils.ts b/packages/plugin-eslint/src/lib/nx/utils.ts index 17564f2b6..b3a792563 100644 --- a/packages/plugin-eslint/src/lib/nx/utils.ts +++ b/packages/plugin-eslint/src/lib/nx/utils.ts @@ -1,7 +1,7 @@ import type { ProjectConfiguration } from '@nx/devkit'; import path from 'node:path'; import { fileExists, toArray } from '@code-pushup/utils'; -import type { ConfigFormat } from '../meta/index.js'; +import type { ConfigFormat } from '../meta/list.js'; const ESLINT_CONFIG_EXTENSIONS: Record = { // https://eslint.org/docs/latest/use/configure/configuration-files#configuration-file-formats diff --git a/packages/plugin-eslint/src/lib/__snapshots__/runner.int.test.ts.snap b/packages/plugin-eslint/src/lib/runner/__snapshots__/runner.int.test.ts.snap similarity index 100% rename from packages/plugin-eslint/src/lib/__snapshots__/runner.int.test.ts.snap rename to packages/plugin-eslint/src/lib/runner/__snapshots__/runner.int.test.ts.snap diff --git a/packages/plugin-eslint/src/lib/runner.int.test.ts b/packages/plugin-eslint/src/lib/runner/runner.int.test.ts similarity index 92% rename from packages/plugin-eslint/src/lib/runner.int.test.ts rename to packages/plugin-eslint/src/lib/runner/runner.int.test.ts index a8c3f4a25..ae5fcdf63 100644 --- a/packages/plugin-eslint/src/lib/runner.int.test.ts +++ b/packages/plugin-eslint/src/lib/runner/runner.int.test.ts @@ -16,9 +16,9 @@ import { restoreNxIgnoredFiles, teardownTestFolder, } from '@code-pushup/test-utils'; -import type { ESLintTarget } from './config.js'; -import { listAuditsAndGroups } from './meta/index.js'; -import { createRunnerFunction } from './runner/index.js'; +import type { ESLintTarget } from '../config.js'; +import { listAuditsAndGroups } from '../meta/list.js'; +import { createRunnerFunction } from './runner.js'; describe('executeRunner', () => { let cwdSpy: MockInstance<[], string>; @@ -34,7 +34,7 @@ describe('executeRunner', () => { }; const thisDir = fileURLToPath(path.dirname(import.meta.url)); - const fixturesDir = path.join(thisDir, '..', '..', 'mocks', 'fixtures'); + const fixturesDir = path.join(thisDir, '..', '..', '..', 'mocks', 'fixtures'); const tmpDir = path.join(process.cwd(), 'tmp', 'int', 'plugin-eslint'); const appDir = path.join(tmpDir, 'todos-app'); diff --git a/packages/plugin-eslint/src/lib/runner/index.ts b/packages/plugin-eslint/src/lib/runner/runner.ts similarity index 100% rename from packages/plugin-eslint/src/lib/runner/index.ts rename to packages/plugin-eslint/src/lib/runner/runner.ts diff --git a/packages/plugin-eslint/src/lib/runner/index.unit.test.ts b/packages/plugin-eslint/src/lib/runner/runner.unit.test.ts similarity index 98% rename from packages/plugin-eslint/src/lib/runner/index.unit.test.ts rename to packages/plugin-eslint/src/lib/runner/runner.unit.test.ts index 3ecf1f5ad..f500a6509 100644 --- a/packages/plugin-eslint/src/lib/runner/index.unit.test.ts +++ b/packages/plugin-eslint/src/lib/runner/runner.unit.test.ts @@ -8,8 +8,8 @@ import { } from '@code-pushup/models'; import { logger } from '@code-pushup/utils'; import type { ESLintTarget } from '../config.js'; -import { createRunnerFunction } from './index.js'; import * as lintModule from './lint.js'; +import { createRunnerFunction } from './runner.js'; import type { LinterOutput } from './types.js'; import * as utilsFileModule from './utils.js'; diff --git a/packages/plugin-eslint/src/lib/runner/transform.ts b/packages/plugin-eslint/src/lib/runner/transform.ts index 67e273fe7..6438e58cf 100644 --- a/packages/plugin-eslint/src/lib/runner/transform.ts +++ b/packages/plugin-eslint/src/lib/runner/transform.ts @@ -5,7 +5,7 @@ import { logger, truncateIssueMessage, } from '@code-pushup/utils'; -import { ruleIdToSlug } from '../meta/index.js'; +import { ruleIdToSlug } from '../meta/list.js'; import type { LinterOutput } from './types.js'; type LintIssue = Linter.LintMessage & { From 0854d3996241030b5d466909af9521b67d69f048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Chalk?= Date: Mon, 15 Dec 2025 14:01:16 +0100 Subject: [PATCH 3/3] refactor(plugin-js-packages): avoid implementation in index.ts file --- packages/plugin-js-packages/src/lib/js-packages-plugin.ts | 2 +- .../plugin-js-packages/src/lib/runner/{index.ts => runner.ts} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/plugin-js-packages/src/lib/runner/{index.ts => runner.ts} (100%) diff --git a/packages/plugin-js-packages/src/lib/js-packages-plugin.ts b/packages/plugin-js-packages/src/lib/js-packages-plugin.ts index d2754e30b..a66216617 100644 --- a/packages/plugin-js-packages/src/lib/js-packages-plugin.ts +++ b/packages/plugin-js-packages/src/lib/js-packages-plugin.ts @@ -9,7 +9,7 @@ import { } from './config.js'; import { dependencyDocs, dependencyGroupWeights } from './constants.js'; import { packageManagers } from './package-managers/package-managers.js'; -import { createRunnerFunction } from './runner/index.js'; +import { createRunnerFunction } from './runner/runner.js'; import { normalizeConfig } from './utils.js'; /** diff --git a/packages/plugin-js-packages/src/lib/runner/index.ts b/packages/plugin-js-packages/src/lib/runner/runner.ts similarity index 100% rename from packages/plugin-js-packages/src/lib/runner/index.ts rename to packages/plugin-js-packages/src/lib/runner/runner.ts