fix: Ensure \r chars do not break progress output

medikoo · Oct 2, 2023 · 888af14 · 888af14
1 parent 48bc757
commit 888af14
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/private/cli-progress-footer/update-progress-props.js b/lib/private/cli-progress-footer/update-progress-props.js
@@ -4,10 +4,12 @@ const d                  = require("d")
     , strip              = require("cli-color/strip")
     , resolveLinesLength = require("./resolve-lines-length");
 
+const newLineRe = /[\n\r]/u;
+
 module.exports = {
 	updateProgress: d(function (progressRows) {
 		if (!Array.isArray(progressRows)) {
-			progressRows = progressRows ? progressRows.split("\n") : [];
+			progressRows = progressRows ? progressRows.split(newLineRe) : [];
 		}
 		if (this._isDisabled) {
 			this._disabledProgressRows = progressRows;

diff --git a/test/_fixtures/test-write.js b/test/_fixtures/test-write.js
@@ -14,7 +14,7 @@ module.exports = cliProgressFooter => {
 	expectedOut += "sample 2\n";
 
 	cliProgressFooter.updateProgress(
-		`${ [1, 2, 3, 4].map(item => `# item ${ item }`).join("\n") }`
+		`${ [1, 2, 3, 4].map(item => `# item ${ item }`).join("\r") }`
 	);
 	expectedOut += `\n${ [1, 2, 3, 4].map(item => `# item ${ item }`).join("\n") }\n`;