Update supports-color dependency (#579)

idranme · web-flow · commit 7443e9faa05b · 2022-12-08T19:43:43.000+01:00
diff --git a/source/vendor/supports-color/browser.js b/source/vendor/supports-color/browser.js
@@ -1,15 +1,26 @@
 /* eslint-env browser */
 
-const isBlinkBasedBrowser = navigator.userAgentData
-	? navigator.userAgentData.brands.some(({brand}) => brand === 'Chromium')
-	: /\b(Chrome|Chromium)\//.test(navigator.userAgent);
+const level = (() => {
+	if (navigator.userAgentData) {
+		const brand = navigator.userAgentData.brands.find(({brand}) => brand === 'Chromium');
+		if (brand && brand.version > 93) {
+			return 3;
+		}
+	}
 
-const colorSupport = isBlinkBasedBrowser ? {
-	level: 1,
+	if (/\b(Chrome|Chromium)\//.test(navigator.userAgent)) {
+		return 1;
+	}
+
+	return 0;
+})();
+
+const colorSupport = level !== 0 && {
+	level,
 	hasBasic: true,
-	has256: false,
-	has16m: false,
-} : false;
+	has256: level >= 2,
+	has16m: level >= 3,
+};
 
 const supportsColor = {
 	stdout: colorSupport,
diff --git a/source/vendor/supports-color/index.d.ts b/source/vendor/supports-color/index.d.ts
@@ -1,13 +1,13 @@
-import {WriteStream} from 'node:tty';
+import type {WriteStream} from 'node:tty';
 
-export interface Options {
+export type Options = {
 	/**
 	Whether `process.argv` should be sniffed for `--color` and `--no-color` flags.
 
 	@default true
 	*/
 	readonly sniffFlags?: boolean;
-}
+};
 
 /**
 Levels:
@@ -21,7 +21,7 @@ export type ColorSupportLevel = 0 | 1 | 2 | 3;
 /**
 Detect whether the terminal supports color.
 */
-export interface ColorSupport {
+export type ColorSupport = {
 	/**
 	The color level.
 	*/
@@ -41,11 +41,11 @@ export interface ColorSupport {
 	Whether Truecolor 16 million colors are supported.
 	*/
 	has16m: boolean;
-}
+};
 
 export type ColorInfo = ColorSupport | false;
 
-export function createSupportsColor(stream: WriteStream, options?: Options): ColorInfo;
+export function createSupportsColor(stream?: WriteStream, options?: Options): ColorInfo;
 
 declare const supportsColor: {
 	stdout: ColorInfo;
diff --git a/source/vendor/supports-color/index.js b/source/vendor/supports-color/index.js
@@ -3,7 +3,7 @@ import os from 'node:os';
 import tty from 'node:tty';
 
 // From: https://github.com/sindresorhus/has-flag/blob/main/index.js
-function hasFlag(flag, argv = process.argv) {
+function hasFlag(flag, argv = globalThis.Deno ? globalThis.Deno.args : process.argv) {
 	const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
 	const position = argv.indexOf(prefix + flag);
 	const terminatorPosition = argv.indexOf('--');
@@ -80,6 +80,12 @@ function _supportsColor(haveStream, {streamIsTTY, sniffFlags = true} = {}) {
 		}
 	}
 
+	// Check for Azure DevOps pipelines.
+	// Has to be above the `!streamIsTTY` check.
+	if ('TF_BUILD' in env && 'AGENT_NAME' in env) {
+		return 1;
+	}
+
 	if (haveStream && !streamIsTTY && forceColor === undefined) {
 		return 0;
 	}
@@ -105,7 +111,11 @@ function _supportsColor(haveStream, {streamIsTTY, sniffFlags = true} = {}) {
 	}
 
 	if ('CI' in env) {
-		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI', 'GITHUB_ACTIONS', 'BUILDKITE', 'DRONE'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+		if ('GITHUB_ACTIONS' in env) {
+			return 3;
+		}
+
+		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI', 'BUILDKITE', 'DRONE'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
 			return 1;
 		}
 
@@ -116,12 +126,11 @@ function _supportsColor(haveStream, {streamIsTTY, sniffFlags = true} = {}) {
 		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
 	}
 
-	// Check for Azure DevOps pipelines
-	if ('TF_BUILD' in env && 'AGENT_NAME' in env) {
-		return 1;
+	if (env.COLORTERM === 'truecolor') {
+		return 3;
 	}
 
-	if (env.COLORTERM === 'truecolor') {
+	if (env.TERM === 'xterm-kitty') {
 		return 3;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import os from 'node:os';`
`3`	`3`	`import tty from 'node:tty';`
`4`	`4`
`5`	`5`	`// From: https://github.com/sindresorhus/has-flag/blob/main/index.js`
`6`		`-function hasFlag(flag, argv = process.argv) {`
	`6`	`+function hasFlag(flag, argv = globalThis.Deno ? globalThis.Deno.args : process.argv) {`
`7`	`7`	`const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');`
`8`	`8`	`const position = argv.indexOf(prefix + flag);`
`9`	`9`	`const terminatorPosition = argv.indexOf('--');`
`@@ -80,6 +80,12 @@ function _supportsColor(haveStream, {streamIsTTY, sniffFlags = true} = {}) {`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
	`83`	`+ // Check for Azure DevOps pipelines.`
	`84`	+ // Has to be above the `!streamIsTTY` check.
	`85`	`+ if ('TF_BUILD' in env && 'AGENT_NAME' in env) {`
	`86`	`+ return 1;`
	`87`	`+ }`
	`88`	`+`
`83`	`89`	`if (haveStream && !streamIsTTY && forceColor === undefined) {`
`84`	`90`	`return 0;`
`85`	`91`	`}`
`@@ -105,7 +111,11 @@ function _supportsColor(haveStream, {streamIsTTY, sniffFlags = true} = {}) {`
`105`	`111`	`}`
`106`	`112`
`107`	`113`	`if ('CI' in env) {`
`108`		`- if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI', 'GITHUB_ACTIONS', 'BUILDKITE', 'DRONE'].some(sign => sign in env) \|\| env.CI_NAME === 'codeship') {`
	`114`	`+ if ('GITHUB_ACTIONS' in env) {`
	`115`	`+ return 3;`
	`116`	`+ }`
	`117`	`+`
	`118`	`+ if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI', 'BUILDKITE', 'DRONE'].some(sign => sign in env) \|\| env.CI_NAME === 'codeship') {`
`109`	`119`	`return 1;`
`110`	`120`	`}`
`111`	`121`
`@@ -116,12 +126,11 @@ function _supportsColor(haveStream, {streamIsTTY, sniffFlags = true} = {}) {`
`116`	`126`	`return /^(9\.(0[1-9]\d)\.\|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;`
`117`	`127`	`}`
`118`	`128`
`119`		`- // Check for Azure DevOps pipelines`
`120`		`- if ('TF_BUILD' in env && 'AGENT_NAME' in env) {`
`121`		`- return 1;`
	`129`	`+ if (env.COLORTERM === 'truecolor') {`
	`130`	`+ return 3;`
`122`	`131`	`}`
`123`	`132`
`124`		`- if (env.COLORTERM === 'truecolor') {`
	`133`	`+ if (env.TERM === 'xterm-kitty') {`
`125`	`134`	`return 3;`
`126`	`135`	`}`
`127`	`136`