Skip to content

Commit

Permalink
Merge pull request #16810 from snitin315/fix/progress-length
Browse files Browse the repository at this point in the history
fix: limit progress bar length to 40 when no columns provided
  • Loading branch information
TheLarkInn committed Mar 21, 2023
2 parents f58ff9b + 94f8804 commit eadbd7d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 2 additions & 4 deletions lib/node/nodeConsole.js
Expand Up @@ -38,10 +38,8 @@ module.exports = ({ colors, appendOnly, stream }) => {

const writeStatusMessage = () => {
if (!currentStatusMessage) return;
const l = stream.columns;
const args = l
? truncateArgs(currentStatusMessage, l - 1)
: currentStatusMessage;
const l = stream.columns || 40;
const args = truncateArgs(currentStatusMessage, l - 1);
const str = args.join(" ");
const coloredStr = `\u001b[1m${str}\u001b[39m\u001b[22m`;
stream.write(`\x1b[2K\r${coloredStr}`);
Expand Down
4 changes: 3 additions & 1 deletion test/ProgressPlugin.test.js
Expand Up @@ -218,7 +218,7 @@ describe("ProgressPlugin", function () {
const logs = getLogs(stderr.toString());

expect(logs.length).toBeGreaterThan(20);
expect(_.maxBy(logs, "length").length).toBeGreaterThan(50);
expect(_.maxBy(logs, "length").length).not.toBeGreaterThan(40);
});
});

Expand All @@ -242,6 +242,7 @@ describe("ProgressPlugin", function () {
activeModules: true
});

process.stderr.columns = 70;
return RunCompilerAsync(compiler).then(() => {
const logs = stderr.toString();

Expand All @@ -255,6 +256,7 @@ describe("ProgressPlugin", function () {
it("should get the custom handler text from the log", () => {
const compiler = createSimpleCompilerWithCustomHandler();

process.stderr.columns = 70;
return RunCompilerAsync(compiler).then(() => {
const logs = stderr.toString();
expect(logs).toEqual(
Expand Down

0 comments on commit eadbd7d

Please sign in to comment.