supports-color 5.0.1 → 5.4.0

package/index.js

@@ -4,6 +4,21 @@ const hasFlag = require('has-flag');
 
 const env = process.env;
 
+let forceColor;
+if (hasFlag('no-color') ||
+	hasFlag('no-colors') ||
+	hasFlag('color=false')) {
+	forceColor = false;
+} else if (hasFlag('color') ||
+	hasFlag('colors') ||
+	hasFlag('color=true') ||
+	hasFlag('color=always')) {
+	forceColor = true;
+}
+if ('FORCE_COLOR' in env) {
+	forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
+}
+
 function translateLevel(level) {
 	if (level === 0) {
 		return false;
@@ -18,9 +33,7 @@ function translateLevel(level) {
 }
 
 function supportsColor(stream) {
-	if (hasFlag('no-color') ||
-		hasFlag('no-colors') ||
-		hasFlag('color=false')) {
+	if (forceColor === false) {
 		return 0;
 	}
 
@@ -34,30 +47,26 @@ function supportsColor(stream) {
 		return 2;
 	}
 
-	if (hasFlag('color') ||
-		hasFlag('colors') ||
-		hasFlag('color=true') ||
-		hasFlag('color=always')) {
-		return 1;
-	}
-
-	if (stream && !stream.isTTY) {
+	if (stream && !stream.isTTY && forceColor !== true) {
 		return 0;
 	}
 
+	const min = forceColor ? 1 : 0;
+
 	if (process.platform === 'win32') {
 		// Node.js 7.5.0 is the first version of Node.js to include a patch to
 		// libuv that enables 256 color output on Windows. Anything earlier and it
 		// won't work. However, here we target Node.js 8 at minimum as it is an LTS
 		// release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows
-		// release that supports 256 colors.
+		// release that supports 256 colors. Windows 10 build 14931 is the first release
+		// that supports 16m/TrueColor.
 		const osRelease = os.release().split('.');
 		if (
 			Number(process.versions.node.split('.')[0]) >= 8 &&
 			Number(osRelease[0]) >= 10 &&
 			Number(osRelease[2]) >= 10586
 		) {
-			return 2;
+			return Number(osRelease[2]) >= 14931 ? 3 : 2;
 		}
 
 		return 1;
@@ -68,21 +77,23 @@ function supportsColor(stream) {
 			return 1;
 		}
 
-		return 0;
+		return min;
 	}
 
 	if ('TEAMCITY_VERSION' in env) {
 		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
 	}
 
+	if (env.COLORTERM === 'truecolor') {
+		return 3;
+	}
+
 	if ('TERM_PROGRAM' in env) {
 		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
 
 		switch (env.TERM_PROGRAM) {
 			case 'iTerm.app':
 				return version >= 3 ? 3 : 2;
-			case 'Hyper':
-				return 3;
 			case 'Apple_Terminal':
 				return 2;
 			// No default
@@ -102,19 +113,14 @@ function supportsColor(stream) {
 	}
 
 	if (env.TERM === 'dumb') {
-		return 0;
+		return min;
 	}
 
-	return 0;
+	return min;
 }
 
 function getSupportLevel(stream) {
-	let level = supportsColor(stream);
-
-	if ('FORCE_COLOR' in env) {
-		level = (env.FORCE_COLOR.length > 0 && parseInt(env.FORCE_COLOR, 10) === 0) ? 0 : (level || 1);
-	}
-
+	const level = supportsColor(stream);
 	return translateLevel(level);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supports-color",
-  "version": "5.0.1",
+  "version": "5.4.0",
   "description": "Detect whether a terminal supports color",
   "license": "MIT",
   "repository": "chalk/supports-color",
@@ -42,7 +42,7 @@
     "16m"
   ],
   "dependencies": {
-    "has-flag": "^2.0.0"
+    "has-flag": "^3.0.0"
   },
   "devDependencies": {
     "ava": "*",