From c67de43ff3221ae5554398095261d684b6d41dda Mon Sep 17 00:00:00 2001 From: Yoshiya Hinosawa Date: Wed, 15 Nov 2023 14:10:12 +0900 Subject: fix(runtime): fix Deno.noColor when stdout is not tty (#21208) --- runtime/js/99_main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'runtime/js') diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js index 06a7d605d..76a279bbd 100644 --- a/runtime/js/99_main.js +++ b/runtime/js/99_main.js @@ -241,7 +241,7 @@ function opMainModule() { const opArgs = memoizeLazy(() => ops.op_bootstrap_args()); const opPid = memoizeLazy(() => ops.op_bootstrap_pid()); const opPpid = memoizeLazy(() => ops.op_ppid()); -setNoColorFn(() => ops.op_bootstrap_no_color()); +setNoColorFn(() => ops.op_bootstrap_no_color() || !ops.op_bootstrap_is_tty()); function formatException(error) { if (ObjectPrototypeIsPrototypeOf(ErrorPrototype, error)) { @@ -530,7 +530,7 @@ function bootstrapMainRuntime(runtimeOptions) { ObjectDefineProperties(finalDenoNs, { pid: util.getterOnly(opPid), ppid: util.getterOnly(opPpid), - noColor: util.getterOnly(getNoColor), + noColor: util.getterOnly(() => ops.op_bootstrap_no_color()), args: util.getterOnly(opArgs), mainModule: util.getterOnly(opMainModule), }); @@ -666,7 +666,7 @@ function bootstrapWorkerRuntime( } ObjectDefineProperties(finalDenoNs, { pid: util.getterOnly(opPid), - noColor: util.getterOnly(getNoColor), + noColor: util.getterOnly(() => ops.op_bootstrap_no_color()), args: util.getterOnly(opArgs), }); // Setup `Deno` global - we're actually overriding already -- cgit v1.2.3