foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 09:31:22 -05:00
Code Issues Packages 1 Wiki Activity

fix(ext/console): don't depend on globalThis present (#13387)

Browse source
This commit is contained in:
Bartek Iwańczuk 2022-01-17 23:23:49 +01:00 • committed by GitHub
parent 1ab5dea367
commit bc666e42a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cli/tests/integration/run_tests.rs
View file

@ -2479,3 +2479,8 @@ itest!(import_assertions_type_check {
output: "import_assertions/type_check.out",
exit_code: 1,
});
itest!(colors_without_global_this {
args: "run colors_without_globalThis.js",
output_str: Some("true\n"),
});

1
cli/tests/testdata/colors_without_globalThis.js vendored Normal file
View file

@ -0,0 +1 @@
console.log(delete globalThis.globalThis);

14
ext/console/01_colors.js
View file

@ -11,6 +11,16 @@
ArrayPrototypeJoin,
} = window.__bootstrap.primordials;
let noColor = false;
function setNoColor(value) {
noColor = value;
}
function getNoColor() {
return noColor;
}
function code(open, close) {
return {
open: `\x1b[${open}m`,
@ -79,7 +89,7 @@
}
function maybeColor(fn) {
return !(globalThis.Deno?.noColor ?? false) ? fn : (s) => s;
return !noColor ? fn : (s) => s;
}
window.__bootstrap.colors = {
@ -95,5 +105,7 @@
magenta,
stripColor,
maybeColor,
setNoColor,
getNoColor,
};
})(this);

4
ext/console/02_console.js
View file

@ -1650,7 +1650,7 @@
}
function inspectArgs(args, inspectOptions = {}) {
const noColor = globalThis.Deno?.noColor ?? true;
const noColor = colors.getNoColor();
const rInspectOptions = { ...DEFAULT_INSPECT_OPTIONS, ...inspectOptions };
const first = args[0];
let a = 0;
@ -1759,7 +1759,7 @@
function getConsoleInspectOptions() {
return {
...DEFAULT_INSPECT_OPTIONS,
colors: !(globalThis.Deno?.noColor ?? false),
colors: !colors.getNoColor(),
};
}

3
runtime/js/99_main.js
View file

@ -35,6 +35,7 @@ delete Object.prototype.__proto__;
const timers = window.__bootstrap.timers;
const base64 = window.__bootstrap.base64;
const encoding = window.__bootstrap.encoding;
const colors = window.__bootstrap.colors;
const Console = window.__bootstrap.console.Console;
const worker = window.__bootstrap.worker;
const internals = window.__bootstrap.internals;
@ -574,6 +575,7 @@ delete Object.prototype.__proto__;
cpuCount,
} = runtimeOptions;
colors.setNoColor(noColor);
if (locationHref != null) {
location.setLocationHref(locationHref);
}
@ -664,6 +666,7 @@ delete Object.prototype.__proto__;
cpuCount,
} = runtimeOptions;
colors.setNoColor(noColor);
location.setLocationHref(locationHref);
numCpus = cpuCount;
registerErrors();