Merge branch 'master' into 256-truecolor

.editorconfig

@@ -7,6 +7,6 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[{package.json,*.yml}]
+[*.yml]
 indent_style = space
 indent_size = 2

.gitattributes

@@ -1 +1,2 @@
 * text=auto
+*.js text eol=lf

example.js

@@ -1,7 +1,7 @@
 'use strict';
-const chalk = require('./');
+const chalk = require('.');
 
-// generates screenshot
+// Generates screenshot
 for (const key of Object.keys(chalk.styles)) {
 	let ret = key;
 

index.js

@@ -79,8 +79,19 @@ function build(_styles, key) {
 		return applyStyle.apply(builder, arguments);
 	};
 
+	var self = this;
+
 	builder._styles = _styles;
-	builder.level = this.level;
+  
+	Object.defineProperty(builder, 'level', {
+		enumerable: true,
+		get: function () {
+			return self.level;
+		},
+		set: function (level) {
+			self.level = level;
+		}
+	});
 
 	// see below for fix regarding invisible grey/dim combination on windows.
 	builder.hasGrey = this.hasGrey || key === 'gray' || key === 'grey';

package.json

@@ -10,7 +10,7 @@
     "JD Ballard <i.am.qix@gmail.com> (github.com/qix-)"
   ],
   "engines": {
-    "node": ">=0.10.0"
+    "node": ">=4"
   },
   "scripts": {
     "test": "xo && nyc mocha",
@@ -50,11 +50,11 @@
   },
   "devDependencies": {
     "coveralls": "^2.11.2",
+    "import-fresh": "^2.0.0",
     "matcha": "^0.7.0",
     "mocha": "*",
-    "nyc": "^6.1.1",
+    "nyc": "^10.3.2",
-    "require-uncached": "^1.0.2",
+    "resolve-from": "^3.0.0",
-    "resolve-from": "^2.0.0",
     "semver": "^5.1.0",
     "xo": "^0.16.0"
   },

readme.md

@@ -27,7 +27,7 @@
 - Clean and focused
 - Auto-detects color support
 - Actively maintained
-- [Used by ~10,000 modules](https://www.npmjs.com/browse/depended/chalk) as of August 2nd, 2016
+- [Used by ~16,000 modules](https://www.npmjs.com/browse/depended/chalk) as of May 31st, 2017
 
 
 ## Install

test.js

@@ -1,9 +1,9 @@
 'use strict';
 var assert = require('assert');
-var requireUncached = require('require-uncached');
+var importFresh = require('import-fresh');
 var resolveFrom = require('resolve-from');
 var semver = require('semver');
-var chalk = require('./');
+var chalk = require('.');
 
 describe('chalk', function () {
 	it('should style string', function () {
@@ -123,31 +123,31 @@ describe('chalk on windows', function () {
 
 	it('should replace blue foreground color in cmd.exe', function () {
 		process.env.TERM = 'dumb';
-		var chalkCtx = requireUncached('./');
+		var chalkCtx = importFresh('.');
 		assert.equal(chalkCtx.blue('foo'), '\u001b[94mfoo\u001b[39m');
 	});
 
 	it('shouldn\'t replace blue foreground color in xterm based terminals', function () {
 		process.env.TERM = 'xterm-256color';
-		var chalkCtx = requireUncached('./');
+		var chalkCtx = importFresh('.');
 		assert.equal(chalkCtx.blue('foo'), '\u001b[34mfoo\u001b[39m');
 	});
 
 	it('should not apply dimmed styling on gray strings, see https://github.com/chalk/chalk/issues/58', function () {
 		process.env.TERM = 'dumb';
-		var chalkCtx = requireUncached('./');
+		var chalkCtx = importFresh('.');
 		assert.equal(chalkCtx.gray.dim('foo'), '\u001b[90mfoo\u001b[22m\u001b[39m');
 	});
 
 	it('should apply dimmed styling on xterm compatible terminals', function () {
 		process.env.TERM = 'xterm';
-		var chalkCtx = requireUncached('./');
+		var chalkCtx = importFresh('.');
 		assert.equal(chalkCtx.gray.dim('foo'), '\u001b[90m\u001b[2mfoo\u001b[22m\u001b[39m');
 	});
 
 	it('should apply dimmed styling on strings of other colors', function () {
 		process.env.TERM = 'dumb';
-		var chalkCtx = requireUncached('./');
+		var chalkCtx = importFresh('.');
 		assert.equal(chalkCtx.blue.dim('foo'), '\u001b[94m\u001b[2mfoo\u001b[22m\u001b[39m');
 	});
 });
@@ -159,6 +159,28 @@ describe('chalk.level', function () {
 		assert.equal(chalk.red('foo'), 'foo');
 		chalk.level = oldLevel;
 	});
+
+	it('should enable/disable colors based on overall chalk enabled property, not individual instances', function () {
+		chalk.enabled = true;
+		var red = chalk.red;
+		assert.equal(red.enabled, true);
+		chalk.enabled = false;
+		assert.equal(red.enabled, chalk.enabled);
+		chalk.enabled = true;
+	});
+
+	it('should propagate enable/disable changes from child colors', function () {
+		chalk.enabled = true;
+		var red = chalk.red;
+		assert.equal(red.enabled, true);
+		assert.equal(chalk.enabled, true);
+		red.enabled = false;
+		assert.equal(red.enabled, false);
+		assert.equal(chalk.enabled, false);
+		chalk.enabled = true;
+		assert.equal(red.enabled, true);
+		assert.equal(chalk.enabled, true);
+	});
 });
 
 describe('chalk.constructor', function () {