Check for CLICOLOR and CLICOLOR_FORCE. Fixes chalk#31 and chalk#32.

jhasse · Jan 5, 2016 · db40abd · db40abd
1 parent 711d47f
commit db40abd
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -38,6 +38,14 @@ var supportLevel = (function () {
 		return 1;
 	}
 
+	if (process.env.CLICOLOR === '0') {
+		return 0;
+	}
+
+	if ('CLICOLOR' in process.env && process.stdout && process.stdout.isTTY) {
+		return 1;
+	}
+
 	if (process.stdout && !process.stdout.isTTY) {
 		return 0;
 	}
@@ -65,7 +73,8 @@ var supportLevel = (function () {
 	return 0;
 })();
 
-if (supportLevel === 0 && 'FORCE_COLOR' in process.env) {
+if (supportLevel === 0 && ('FORCE_COLOR' in process.env ||
+    ('CLICOLOR_FORCE' in process.env && process.env.CLICOLOR_FORCE !== '0'))) {
 	supportLevel = 1;
 }
 

diff --git a/test.js b/test.js
@@ -15,6 +15,27 @@ it('should return true if `FORCE_COLOR` is in env', function () {
 	assert.equal(result.level, 1);
 });
 
+it('should return true if `CLICOLOR_FORCE` is != 0', function () {
+	process.env.CLICOLOR_FORCE = '1';
+	process.stdout.isTTY = false;
+	var result = requireUncached('./');
+	assert.equal(Boolean(result), true);
+	assert.equal(result.level, 1);
+});
+
+it('should return false if `CLICOLOR` is 0', function () {
+	process.env.CLICOLOR = '0';
+	var result = requireUncached('./');
+	assert.equal(Boolean(result), false);
+});
+
+it('should return true if `CLICOLOR` is != 0', function () {
+	process.env.CLICOLOR = '1';
+	var result = requireUncached('./');
+	assert.equal(Boolean(result), true);
+	assert.equal(result.level, 1);
+});
+
 it('should return false if not TTY', function () {
 	process.stdout.isTTY = false;
 	var result = requireUncached('./');