Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(core): fix terminal message alignment on errors #22189

Merged
merged 2 commits into from Mar 7, 2024
Merged

fix(core): fix terminal message alignment on errors #22189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
927a6dd
fix(core): fix terminal message alignment on errors
meeroslav Mar 6, 2024
25a8c05
Merge branch 'master' into fix-alignment
meeroslav Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 18 additions & 13 deletions packages/nx/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.ts
View file
Open in desktop
Expand Up @@ -10,8 +10,9 @@ import { prettyTime } from './pretty-time';
import { formatFlags, formatTargetsAndProjects } from './formatting-utils';
import { viewLogsFooterRows } from './view-logs-utils';

const LEFT_PAD = ` `;
const EXTENDED_LEFT_PAD = ` `;
const LEFT_PAD = ` `;
const SPACER = ` `;
const EXTENDED_LEFT_PAD = ` `;

/**
* The following function is responsible for creating a life cycle with dynamic
Expand Down Expand Up @@ -122,7 +123,7 @@ export async function createRunManyDynamicOutputRenderer({
writeCompletedTaskResultLine(
`${
output.colors.green(figures.tick) +
' ' +
SPACER +
output.formatCommand(task.id)
} ${output.dim('[local cache]')}`
);
Expand All @@ -134,7 +135,7 @@ export async function createRunManyDynamicOutputRenderer({
writeCompletedTaskResultLine(
`${
output.colors.green(figures.tick) +
' ' +
SPACER +
output.formatCommand(task.id)
} ${output.dim('[existing outputs match the cache, left as is]')}`
);
Expand All @@ -146,7 +147,7 @@ export async function createRunManyDynamicOutputRenderer({
writeCompletedTaskResultLine(
`${
output.colors.green(figures.tick) +
' ' +
SPACER +
output.formatCommand(task.id)
} ${output.dim('[remote cache]')}`
);
Expand All @@ -160,7 +161,7 @@ export async function createRunManyDynamicOutputRenderer({
);
writeCompletedTaskResultLine(
output.colors.green(figures.tick) +
' ' +
SPACER +
output.formatCommand(task.id) +
output.dim(` (${timeTakenText})`)
);
Expand All @@ -170,10 +171,11 @@ export async function createRunManyDynamicOutputRenderer({
break;
}
case 'failure':
output.addNewline();
output.addNewline();
writeCompletedTaskResultLine(
output.colors.red(figures.cross) +
' ' +
SPACER +
output.formatCommand(output.colors.red(task.id))
);
writeCommandOutputBlock(tasksToTerminalOutputs[task.id]);
Expand All @@ -197,7 +199,9 @@ export async function createRunManyDynamicOutputRenderer({
if (runningTasks.length > 0) {
additionalFooterRows.push(
output.dim(
`${LEFT_PAD}${output.colors.cyan(figures.arrowRight)} Executing ${
`${LEFT_PAD}${output.colors.cyan(
figures.arrowRight
)}${SPACER}Executing ${
runningTasks.length
}/${remainingTasks} remaining tasks${
runningTasks.length > 1 ? ' in parallel' : ''
Expand All @@ -209,7 +213,7 @@ export async function createRunManyDynamicOutputRenderer({
additionalFooterRows.push(
`${LEFT_PAD}${output.dim.cyan(
dots.frames[currentFrame]
)} ${output.formatCommand(runningTask.task.id)}`
)}${SPACER}${output.formatCommand(runningTask.task.id)}`
);
}
/**
Expand Down Expand Up @@ -241,7 +245,7 @@ export async function createRunManyDynamicOutputRenderer({
additionalFooterRows.push(
`${LEFT_PAD}${output.colors.green(
figures.tick
)} ${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output.dim(
)}${SPACER}${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output.dim(
`[${totalCachedTasks} read from cache]`
)}`
);
Expand All @@ -251,7 +255,7 @@ export async function createRunManyDynamicOutputRenderer({
additionalFooterRows.push(
`${LEFT_PAD}${output.colors.red(
figures.cross
)} ${totalFailedTasks}${`/${totalCompletedTasks}`} failed`
)}${SPACER}${totalFailedTasks}${`/${totalCompletedTasks}`} failed`
);
}

Expand Down Expand Up @@ -385,14 +389,15 @@ export async function createRunManyDynamicOutputRenderer({
output.dim(
`${LEFT_PAD}${output.dim(
figures.tick
)} ${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output.dim(
)}${SPACER}${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output.dim(
`[${totalCachedTasks} read from cache]`
)}`
),
'',
`${LEFT_PAD}${output.colors.red(
figures.cross
)} ${totalFailedTasks}${`/${totalCompletedTasks}`} targets failed, including the following:`,
)}${SPACER}${totalFailedTasks}${`/${totalCompletedTasks}`} targets failed, including the following:`,
'',
`${failedTasksForPrinting
.map(
(t) =>
Expand Down
15 changes: 8 additions & 7 deletions packages/nx/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.ts
View file
Open in desktop
Expand Up @@ -9,8 +9,9 @@ import { Task } from '../../config/task-graph';
import { formatFlags, formatTargetsAndProjects } from './formatting-utils';
import { viewLogsFooterRows } from './view-logs-utils';

const LEFT_PAD = ` `;
const EXTENDED_LEFT_PAD = ` `;
const LEFT_PAD = ` `;
const SPACER = ` `;
const EXTENDED_LEFT_PAD = ` `;

/**
* As tasks are completed the overall state moves from:
Expand Down Expand Up @@ -138,7 +139,7 @@ export async function createRunOneDynamicOutputRenderer({
linesToRender.push(
`${LEFT_PAD}${output.colors.cyan(
dots.frames[dependentTargetsCurrentFrame]
)} ${output.dim(
)}${SPACER}${output.dim(
`Nx is waiting on ${remainingDependentTasksNotFromInitiatingProject} dependent project tasks before running tasks from`
)} ${initiatingProject}${output.dim('...')}`
);
Expand All @@ -154,7 +155,7 @@ export async function createRunOneDynamicOutputRenderer({
output.colors.red.dim(
`${LEFT_PAD}${output.colors.red(
figures.cross
)} ${totalFailedTasks}${`/${totalCompletedTasks}`} dependent project tasks failed (see below)`
)}${SPACER}${totalFailedTasks}${`/${totalCompletedTasks}`} dependent project tasks failed (see below)`
)
);
}
Expand All @@ -164,7 +165,7 @@ export async function createRunOneDynamicOutputRenderer({
output.dim(
`${LEFT_PAD}${output.dim(
figures.tick
)} ${totalSuccessfulTasks}${`/${totalCompletedTasks}`} dependent project tasks succeeded ${output.dim(
)}${SPACER}${totalSuccessfulTasks}${`/${totalCompletedTasks}`} dependent project tasks succeeded ${output.dim(
`[${totalCachedTasks} read from cache]`
)}`
)
Expand Down Expand Up @@ -344,10 +345,10 @@ export async function createRunOneDynamicOutputRenderer({
'',
`${LEFT_PAD}${output.colors.red(
figures.cross
)} ${totalFailedTasks}${`/${totalCompletedTasks}`} failed`,
)}${SPACER}${totalFailedTasks}${`/${totalCompletedTasks}`} failed`,
`${LEFT_PAD}${output.dim(
figures.tick
)} ${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output.dim(
)}${SPACER}${totalSuccessfulTasks}${`/${totalCompletedTasks}`} succeeded ${output.dim(
`[${totalCachedTasks} read from cache]`
)}`,
...viewLogs,
Expand Down