Skip to content

Commit dfc1171

Browse files
committed
fix: revert changes
1 parent 1a320c7 commit dfc1171

File tree

7 files changed

+30
-40
lines changed

7 files changed

+30
-40
lines changed

code-pushup.config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'dotenv/config';
2-
import { z } from 'zod';
32
import {
43
coverageCoreConfigNx,
54
eslintCoreConfigNx,

code-pushup.preset.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,14 +205,12 @@ export const jsDocsCoreConfig = (
205205

206206
export const eslintCoreConfigNx = async (
207207
projectName?: string,
208-
opt?: { cwd?: string },
209208
): Promise<CoreConfig> => ({
210209
plugins: [
211210
await eslintPlugin(
212211
await (projectName
213212
? eslintConfigFromNxProject(projectName)
214213
: eslintConfigFromAllNxProjects()),
215-
opt,
216214
),
217215
],
218216
categories: eslintCategories,

packages/plugin-coverage/src/lib/nx/coverage-paths.unit.test.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,16 @@ describe('getCoveragePathForTarget', () => {
135135
},
136136
'test',
137137
),
138-
).resolves.toBe(
139-
path.join('packages', 'core', 'coverage', 'core', 'lcov.info'),
140-
);
138+
).resolves.toStrictEqual({
139+
pathToProject: path.join('packages', 'core'),
140+
resultsPath: path.join(
141+
'packages',
142+
'core',
143+
'coverage',
144+
'core',
145+
'lcov.info',
146+
),
147+
});
141148
});
142149

143150
it('should throw for unsupported executor (only vitest and jest are supported)', async () => {

packages/plugin-eslint/src/bin.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ import process from 'node:process';
22
import { Parser } from 'yargs/helpers';
33
import { executeRunner } from './lib/runner/index.js';
44

5-
const { runnerConfigPath, runnerOutputPath, cwd } = Parser(process.argv);
5+
const { runnerConfigPath, runnerOutputPath } = Parser(process.argv);
66

7-
await executeRunner({ runnerConfigPath, runnerOutputPath }, { cwd });
7+
await executeRunner({ runnerConfigPath, runnerOutputPath });

packages/plugin-eslint/src/lib/eslint-plugin.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ export async function eslintPlugin(
4141
schemaType: 'ESLint plugin config',
4242
});
4343

44-
const cwd = options?.cwd || process.cwd();
4544
const customGroups = options
4645
? parseSchema(eslintPluginOptionsSchema, options, {
4746
schemaType: 'ESLint plugin options',
@@ -72,8 +71,6 @@ export async function eslintPlugin(
7271
audits,
7372
groups,
7473

75-
runner: await createRunnerConfig(runnerScriptPath, audits, targets, {
76-
cwd,
77-
}),
74+
runner: await createRunnerConfig(runnerScriptPath, audits, targets),
7875
};
7976
}

packages/plugin-eslint/src/lib/runner/index.ts

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,16 @@ import type { ESLintPluginRunnerConfig, ESLintTarget } from '../config.js';
1919
import { lint } from './lint.js';
2020
import { lintResultsToAudits, mergeLinterOutputs } from './transform.js';
2121

22-
export async function executeRunner(
23-
{ runnerConfigPath, runnerOutputPath }: RunnerFilesPaths,
24-
opt?: { cwd?: string },
25-
): Promise<void> {
26-
const { cwd = process.cwd() } = opt || {};
22+
export async function executeRunner({
23+
runnerConfigPath,
24+
runnerOutputPath,
25+
}: RunnerFilesPaths): Promise<void> {
2726
const { slugs, targets } =
2827
await readJsonFile<ESLintPluginRunnerConfig>(runnerConfigPath);
2928

30-
ui().logger.log(
31-
`ESLint plugin executing ${targets.length} lint targets with cwd: ${cwd}`,
32-
);
29+
ui().logger.log(`ESLint plugin executing ${targets.length} lint targets`);
3330

34-
const linterOutputs = await asyncSequential(targets, cfg => lint(cfg, opt));
31+
const linterOutputs = await asyncSequential(targets, lint);
3532
const lintResults = mergeLinterOutputs(linterOutputs);
3633
const failedAudits = lintResultsToAudits(lintResults);
3734

@@ -54,7 +51,6 @@ export async function createRunnerConfig(
5451
scriptPath: string,
5552
audits: Audit[],
5653
targets: ESLintTarget[],
57-
opt?: { cwd?: string },
5854
): Promise<RunnerConfig> {
5955
const config: ESLintPluginRunnerConfig = {
6056
targets,
@@ -69,11 +65,7 @@ export async function createRunnerConfig(
6965
command: 'node',
7066
args: [
7167
filePathToCliArg(scriptPath),
72-
...objectToCliArgs({
73-
runnerConfigPath,
74-
runnerOutputPath,
75-
...(opt?.cwd ? { cwd: opt.cwd } : {}),
76-
}),
68+
...objectToCliArgs({ runnerConfigPath, runnerOutputPath }),
7769
],
7870
configFile: runnerConfigPath,
7971
outputFile: runnerOutputPath,

packages/plugin-eslint/src/lib/runner/lint.ts

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import type { ESLint, Linter } from 'eslint';
22
import { platform } from 'node:os';
3-
import { join } from 'node:path';
43
import {
54
distinct,
65
executeProcess,
@@ -11,21 +10,20 @@ import type { ESLintTarget } from '../config.js';
1110
import { setupESLint } from '../setup.js';
1211
import type { LinterOutput, RuleOptionsPerFile } from './types.js';
1312

14-
export async function lint(
15-
{ eslintrc, patterns }: ESLintTarget,
16-
opt?: { cwd?: string },
17-
): Promise<LinterOutput> {
18-
const results = await executeLint({ eslintrc, patterns }, opt);
13+
export async function lint({
14+
eslintrc,
15+
patterns,
16+
}: ESLintTarget): Promise<LinterOutput> {
17+
const results = await executeLint({ eslintrc, patterns });
1918
const eslint = await setupESLint(eslintrc);
2019
const ruleOptionsPerFile = await loadRuleOptionsPerFile(eslint, results);
2120
return { results, ruleOptionsPerFile };
2221
}
2322

24-
async function executeLint(
25-
{ eslintrc, patterns }: ESLintTarget,
26-
opt?: { cwd?: string },
27-
): Promise<ESLint.LintResult[]> {
28-
const { cwd = process.cwd() } = opt ?? {};
23+
async function executeLint({
24+
eslintrc,
25+
patterns,
26+
}: ESLintTarget): Promise<ESLint.LintResult[]> {
2927
// running as CLI because ESLint#lintFiles() runs out of memory
3028
const { stdout } = await executeProcess({
3129
command: 'npx',
@@ -35,14 +33,13 @@ async function executeLint(
3533
...(typeof eslintrc === 'object' ? ['--no-eslintrc'] : []),
3634
'--no-error-on-unmatched-pattern',
3735
'--format=json',
38-
`--output-file=${join(cwd, '.eslint-results.json')}`,
3936
...toArray(patterns).map(pattern =>
4037
// globs need to be escaped on Unix
4138
platform() === 'win32' ? pattern : `'${pattern}'`,
4239
),
4340
],
4441
ignoreExitCode: true,
45-
cwd,
42+
cwd: process.cwd(),
4643
});
4744

4845
return JSON.parse(stdout) as ESLint.LintResult[];

0 commit comments

Comments
 (0)