trim striped ansi messages

bameyrick · Oct 3, 2024 · 4e29790 · 4e29790
1 parent 83ed8a2
commit 4e29790
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/src/concurrently.ts b/src/concurrently.ts
@@ -1,9 +1,9 @@
 import * as chalk from 'chalk';
+import stripAnsi from 'strip-ansi';
 import { ConcurrentCommand } from './command';
 import { getName } from './get-name';
 import { logError } from './log-error';
 import { runCommand } from './run-command';
-import { stripAnsiAndChalk } from './strip-ansi-and-chalk';
 import { WaitCondition } from './wait-condition';
 
 /**
@@ -46,7 +46,7 @@ export function concurrently(commands: ConcurrentCommand[], index = 0): void {
         }
         case WaitCondition.Includes: {
           runCommand(command.command, index, name, command.longestName, message => {
-            if (!conditionMet && stripAnsiAndChalk(message).toLowerCase().includes(command.value!.toLowerCase())) {
+            if (!conditionMet && stripAnsi(message).trim().toLowerCase().includes(command.value!.toLowerCase())) {
               conditionMet = true;
 
               concurrently(commands, nextIndex);
@@ -64,7 +64,7 @@ export function concurrently(commands: ConcurrentCommand[], index = 0): void {
         }
         case WaitCondition.Matches: {
           runCommand(command.command, index, name, command.longestName, message => {
-            if (!conditionMet && stripAnsiAndChalk(message) === command.value) {
+            if (!conditionMet && stripAnsi(message).trim() === command.value?.trim()) {
               conditionMet = true;
 
               concurrently(commands, nextIndex);

diff --git a/src/strip-ansi-and-chalk.ts b/src/strip-ansi-and-chalk.ts
diff --git a/src/strip-ansi.ts b/src/strip-ansi.ts