supports-color 8.1.0 → 9.0.2

package/browser.js

@@ -1,24 +1,17 @@
 /* eslint-env browser */
-'use strict';
 
-function getChromeVersion() {
-	const matches = /(Chrome|Chromium)\/(?<chromeVersion>\d+)\./.exec(navigator.userAgent);
+const isBlinkBasedBrowser = /\b(Chrome|Chromium)\//.test(navigator.userAgent);
 
-	if (!matches) {
-		return;
-	}
-
-	return Number.parseInt(matches.groups.chromeVersion, 10);
-}
-
-const colorSupport = getChromeVersion() >= 69 ? {
+const colorSupport = isBlinkBasedBrowser ? {
 	level: 1,
 	hasBasic: true,
 	has256: false,
 	has16m: false
 } : false;
 
-module.exports = {
+const supportsColor = {
 	stdout: colorSupport,
 	stderr: colorSupport
 };
+
+export default supportsColor;

package/index.js

@@ -1,7 +1,7 @@
-'use strict';
-const os = require('os');
-const tty = require('tty');
-const hasFlag = require('has-flag');
+import process from 'process'; // eslint-disable-line node/prefer-global/process
+import os from 'os';
+import tty from 'tty';
+import hasFlag from 'has-flag';
 
 const {env} = process;
 
@@ -18,17 +18,18 @@ if (hasFlag('no-color') ||
 	flagForceColor = 1;
 }
 
-let noFlagForceColor;
-if ('FORCE_COLOR' in env) {
-	if (env.FORCE_COLOR === 'true') {
-		noFlagForceColor = 1;
-	} else if (env.FORCE_COLOR === 'false') {
-		noFlagForceColor = 0;
-	} else {
-		noFlagForceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(Number.parseInt(env.FORCE_COLOR, 10), 3);
-	}
+function envForceColor() {
+	if ('FORCE_COLOR' in env) {
+		if (env.FORCE_COLOR === 'true') {
+			return 1;
+		}
+
+		if (env.FORCE_COLOR === 'false') {
+			return 0;
+		}
 
-	flagForceColor = noFlagForceColor;
+		return env.FORCE_COLOR.length === 0 ? 1 : Math.min(Number.parseInt(env.FORCE_COLOR, 10), 3);
+	}
 }
 
 function translateLevel(level) {
@@ -44,7 +45,12 @@ function translateLevel(level) {
 	};
 }
 
-function supportsColor(haveStream, {streamIsTTY, sniffFlags = true} = {}) {
+function _supportsColor(haveStream, {streamIsTTY, sniffFlags = true} = {}) {
+	const noFlagForceColor = envForceColor();
+	if (noFlagForceColor !== undefined) {
+		flagForceColor = noFlagForceColor;
+	}
+
 	const forceColor = sniffFlags ? flagForceColor : noFlagForceColor;
 
 	if (forceColor === 0) {
@@ -130,8 +136,8 @@ function supportsColor(haveStream, {streamIsTTY, sniffFlags = true} = {}) {
 	return min;
 }
 
-function getSupportLevel(stream, options = {}) {
-	const level = supportsColor(stream, {
+export function createSupportsColor(stream, options = {}) {
+	const level = _supportsColor(stream, {
 		streamIsTTY: stream && stream.isTTY,
 		...options
 	});
@@ -139,8 +145,9 @@ function getSupportLevel(stream, options = {}) {
 	return translateLevel(level);
 }
 
-module.exports = {
-	supportsColor: getSupportLevel,
-	stdout: getSupportLevel({isTTY: tty.isatty(1)}),
-	stderr: getSupportLevel({isTTY: tty.isatty(2)})
+const supportsColor = {
+	stdout: createSupportsColor({isTTY: tty.isatty(1)}),
+	stderr: createSupportsColor({isTTY: tty.isatty(2)})
 };
+
+export default supportsColor;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "supports-color",
-	"version": "8.1.0",
+	"version": "9.0.2",
 	"description": "Detect whether a terminal supports color",
 	"license": "MIT",
 	"repository": "chalk/supports-color",
@@ -10,20 +10,22 @@
 		"email": "sindresorhus@gmail.com",
 		"url": "https://sindresorhus.com"
 	},
+	"type": "module",
+	"exports": {
+		"node": "./index.js",
+		"default": "./browser.js"
+	},
 	"engines": {
-		"node": ">=10"
+		"node": ">=12"
 	},
 	"scripts": {
-		"test": "xo && ava"
+		"//test": "xo && ava",
+		"test": "xo"
 	},
 	"files": [
 		"index.js",
 		"browser.js"
 	],
-	"exports": {
-		"node": "./index.js",
-		"default": "./browser.js"
-	},
 	"keywords": [
 		"color",
 		"colour",
@@ -47,12 +49,11 @@
 		"16m"
 	],
 	"dependencies": {
-		"has-flag": "^4.0.0"
+		"has-flag": "^5.0.0"
 	},
 	"devDependencies": {
-		"ava": "^2.4.0",
-		"import-fresh": "^3.2.2",
-		"xo": "^0.35.0"
-	},
-	"browser": "browser.js"
+		"ava": "^3.15.0",
+		"import-fresh": "^3.3.0",
+		"xo": "^0.38.2"
+	}
 }

package/readme.md

@@ -11,7 +11,7 @@ $ npm install supports-color
 ## Usage
 
 ```js
-const supportsColor = require('supports-color');
+import supportsColor from 'supports-color';
 
 if (supportsColor.stdout) {
 	console.log('Terminal stdout supports color');
@@ -28,7 +28,7 @@ if (supportsColor.stderr.has16m) {
 
 ## API
 
-Returns an `Object` with a `stdout` and `stderr` property for testing either streams. Each property is an `Object`, or `false` if color is not supported.
+Returns an `object` with a `stdout` and `stderr` property for testing either streams. Each property is an `Object`, or `false` if color is not supported.
 
 The `stdout`/`stderr` objects specifies a level of support for color through a `.level` property and a corresponding flag:
 
@@ -36,13 +36,23 @@ The `stdout`/`stderr` objects specifies a level of support for color through a `
 - `.level = 2` and `.has256 = true`: 256 color support
 - `.level = 3` and `.has16m = true`: Truecolor support (16 million colors)
 
-### `require('supports-color').supportsColor(stream, options?)`
+### Custom instance
 
-Additionally, `supports-color` exposes the `.supportsColor()` function that takes an arbitrary write stream (e.g. `process.stdout`) and an optional options object to (re-)evaluate color support for an arbitrary stream.
+The package also exposes the named export `createSupportColor` function that takes an arbitrary write stream (for example, `process.stdout`) and an optional options object to (re-)evaluate color support for an arbitrary stream.
 
-For example, `require('supports-color').stdout` is the equivalent of `require('supports-color').supportsColor(process.stdout)`.
+```js
+import {createSupportsColor} from 'supports-color';
+
+const stdoutSupportsColor = createSupportsColor(process.stdout);
+
+if (stdoutSupportsColor) {
+	console.log('Terminal stdout supports color');
+}
+
+// `stdoutSupportsColor` is the same as `supportsColor.stdout`
+```
 
-The options object supports a single boolean property `sniffFlags`. By default it is `true`, which instructs `supportsColor()` to sniff `process.argv` for the multitude of `--color` flags (see _Info_ below). If `false`, then `process.argv` is not considered when determining color support.
+The options object supports a single boolean property `sniffFlags`. By default it is `true`, which instructs the detection to sniff `process.argv` for the multitude of `--color` flags (see _Info_ below). If `false`, then `process.argv` is not considered when determining color support.
 
 ## Info
 
@@ -56,6 +66,8 @@ Explicit 256/Truecolor mode can be enabled using the `--color=256` and `--color=
 
 - [supports-color-cli](https://github.com/chalk/supports-color-cli) - CLI for this module
 - [chalk](https://github.com/chalk/chalk) - Terminal string styling done right
+- [is-unicode-supported](https://github.com/sindresorhus/is-unicode-supported) - Detect whether the terminal supports Unicode
+- [is-interactive](https://github.com/sindresorhus/is-interactive) - Check if stdout or stderr is interactive
 
 ## Maintainers