.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,28 @@
+<!--
+
+DO NOT SUBMIT ISSUES ASKING TO REMOVE ES6.
+
+IT WILL BE CLOSED.
+IT WILL BE LOCKED.
+
+We use ES2015+ for a reason. Modern best
+practices dictate the use of tooling like
+Babel and @babel/preset-env in order to
+target the browsers that make sense for
+your project.
+
+For more information, please see:
+https://github.com/sindresorhus/ama/issues/446#issuecomment-281014491
+
+Please keep in mind that `debug` is downloaded,
+installed, transpiled and used millions of times
+*per day*. If you have an error with `debug`, it's
+most likely your own configuration (e.g. with Babel,
+Webpack, etc).
+
+Unless you post ample evidence you have tried
+to fix this yourself, it will most likely
+be determined that your issue is localized
+to your project - not `debug`.
+
+-->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,17 @@
+<!--
+
+DO NOT SUBMIT PULL REQUESTS REMOVING ES6.
+
+IT WILL BE CLOSED.
+IT WILL NOT BE MERGED.
+
+We use ES2015+ for a reason. Modern best
+practices dictate the use of tooling like
+Babel and @babel/preset-env in order to
+target the browsers that make sense for
+your project.
+
+For more information, please see:
+https://github.com/sindresorhus/ama/issues/446#issuecomment-281014491
+
+-->

.travis.yml

@@ -6,10 +6,12 @@ node_js:
   - "6"
   - "8"
   - "10"
+  - "11"
 
 install:
   - npm install
 
 script:
   - npm run lint
   - npm test
+  - npm run test:coverage

karma.conf.js

@@ -1,32 +1,16 @@
-// Karma configuration
-// Generated on Fri Dec 16 2016 13:09:51 GMT+0000 (UTC)
-
 module.exports = function (config) {
 	config.set({
-
-		// Base path that will be used to resolve all patterns (eg. files, exclude)
-		basePath: '',
-
 		// Frameworks to use
 		// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-		frameworks: ['mocha', 'chai'],
+		frameworks: ['browserify', 'mocha'],
 
 		// List of files / patterns to load in the browser
 		files: [
-			'dist/debug.js',
-			'dist/test.js'
-		],
-
-		// List of files to exclude
-		exclude: [
-			'src/node.js'
+			'src/browser.js',
+			'src/common.js',
+			'test.js'
 		],
 
-		// Preprocess matching files before serving them to the browser
-		// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-		preprocessors: {
-		},
-
 		// Test results reporter to use
 		// possible values: 'dots', 'progress'
 		// available reporters: https://npmjs.org/browse/keyword/karma-reporter
@@ -40,21 +24,34 @@ module.exports = function (config) {
 
 		// Level of logging
 		// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
-		logLevel: config.LOG_INFO,
-
-		// Enable / disable watching file and executing tests whenever any file changes
-		autoWatch: true,
+		logLevel: config.LOG_DEBUG,
 
 		// Start these browsers
 		// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-		browsers: ['PhantomJS'],
+		browsers: ['HeadlessChrome'],
+		customLaunchers: {
+			HeadlessChrome: {
+				base: 'ChromeHeadless',
+				flags: ['--no-sandbox']
+			}
+		},
+
+		preprocessors: {
+			// *Sigh* what a glob, folks!
+			'{{!(node_modules),*.js},!(node_modules)/**/*.js}': ['browserify']
+		},
+
+		browserify: {
+			debug: true,
+			transform: ['brfs']
+		},
 
 		// Continuous Integration mode
 		// if true, Karma captures browsers, runs the tests and exits
-		singleRun: false,
+		singleRun: true,
 
 		// Concurrency level
 		// how many browser should be started simultaneous
-		concurrency: Infinity
+		concurrency: 1
 	});
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "debug",
-  "version": "4.1.0",
+  "version": "4.3.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/visionmedia/debug.git"
@@ -13,51 +13,47 @@
   ],
   "files": [
     "src",
-    "dist/debug.js",
     "LICENSE",
     "README.md"
   ],
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "contributors": [
     "Nathan Rajlich <nathan@tootallnate.net> (http://n8.io)",
-    "Andrew Rhyne <rhyneandrew@gmail.com>"
+    "Andrew Rhyne <rhyneandrew@gmail.com>",
+    "Josh Junon <josh@junon.me>"
   ],
   "license": "MIT",
   "scripts": {
     "lint": "xo",
-    "test": "npm run test:node && npm run test:browser",
+    "test": "npm run test:node && npm run test:browser && npm run lint",
     "test:node": "istanbul cover _mocha -- test.js",
-    "posttest:node": "cat ./coverage/lcov.info | coveralls",
-    "pretest:browser": "npm run build",
     "test:browser": "karma start --single-run",
-    "prebuild:debug": "mkdir -p dist && browserify --standalone debug -o dist/debug.es6.js .",
-    "build:debug": "babel -o dist/debug.js dist/debug.es6.js > dist/debug.js",
-    "build:test": "babel -d dist test.js",
-    "build": "npm run build:debug && npm run build:test",
-    "clean": "rimraf dist coverage"
+    "test:coverage": "cat ./coverage/lcov.info | coveralls"
   },
   "dependencies": {
-    "ms": "^2.1.1"
+    "ms": "2.1.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.0.0",
-    "@babel/core": "^7.0.0",
-    "@babel/preset-env": "^7.0.0",
-    "browserify": "14.4.0",
-    "chai": "^3.5.0",
-    "concurrently": "^3.1.0",
+    "brfs": "^2.0.1",
+    "browserify": "^16.2.3",
     "coveralls": "^3.0.2",
     "istanbul": "^0.4.5",
-    "karma": "^3.0.0",
-    "karma-chai": "^0.1.0",
+    "karma": "^3.1.4",
+    "karma-browserify": "^6.0.0",
+    "karma-chrome-launcher": "^2.2.0",
     "karma-mocha": "^1.3.0",
-    "karma-phantomjs-launcher": "^1.0.2",
     "mocha": "^5.2.0",
     "mocha-lcov-reporter": "^1.2.0",
-    "rimraf": "^2.5.4",
     "xo": "^0.23.0"
   },
+  "peerDependenciesMeta": {
+    "supports-color": {
+      "optional": true
+    }
+  },
   "main": "./src/index.js",
   "browser": "./src/browser.js",
-  "unpkg": "./dist/debug.js"
+  "engines": {
+    "node": ">=6.0"
+  }
 }

src/browser.js

@@ -4,12 +4,21 @@
  * This is the web browser implementation of `debug()`.
  */
 
-exports.log = log;
 exports.formatArgs = formatArgs;
 exports.save = save;
 exports.load = load;
 exports.useColors = useColors;
 exports.storage = localstorage();
+exports.destroy = (() => {
+	let warned = false;
+
+	return () => {
+		if (!warned) {
+			warned = true;
+			console.warn('Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`.');
+		}
+	};
+})();
 
 /**
  * Colors.
@@ -170,18 +179,14 @@ function formatArgs(args) {
 }
 
 /**
- * Invokes `console.log()` when available.
- * No-op when `console.log` is not a "function".
+ * Invokes `console.debug()` when available.
+ * No-op when `console.debug` is not a "function".
+ * If `console.debug` is not available, falls back
+ * to `console.log`.
  *
  * @api public
  */
-function log(...args) {
-	// This hackery is required for IE8/9, where
-	// the `console.log` function doesn't have 'apply'
-	return typeof console === 'object' &&
-		console.log &&
-		console.log(...args);
-}
+exports.log = console.debug || console.log || (() => {});
 
 /**
  * Save `namespaces`.

src/common.js

@@ -12,16 +12,12 @@ function setup(env) {
 	createDebug.enable = enable;
 	createDebug.enabled = enabled;
 	createDebug.humanize = require('ms');
+	createDebug.destroy = destroy;
 
 	Object.keys(env).forEach(key => {
 		createDebug[key] = env[key];
 	});
 
-	/**
-	* Active `debug` instances.
-	*/
-	createDebug.instances = [];
-
 	/**
 	* The currently active debug mode names, and names to skip.
 	*/
@@ -63,6 +59,7 @@ function setup(env) {
 	*/
 	function createDebug(namespace) {
 		let prevTime;
+		let enableOverride = null;
 
 		function debug(...args) {
 			// Disabled?
@@ -92,7 +89,7 @@ function setup(env) {
 			args[0] = args[0].replace(/%([a-zA-Z%])/g, (match, format) => {
 				// If we encounter an escaped % then don't increase the array index
 				if (match === '%%') {
-					return match;
+					return '%';
 				}
 				index++;
 				const formatter = createDebug.formatters[format];
@@ -115,35 +112,32 @@ function setup(env) {
 		}
 
 		debug.namespace = namespace;
-		debug.enabled = createDebug.enabled(namespace);
 		debug.useColors = createDebug.useColors();
-		debug.color = selectColor(namespace);
-		debug.destroy = destroy;
+		debug.color = createDebug.selectColor(namespace);
 		debug.extend = extend;
-		// Debug.formatArgs = formatArgs;
-		// debug.rawLog = rawLog;
+		debug.destroy = createDebug.destroy; // XXX Temporary. Will be removed in the next major release.
+
+		Object.defineProperty(debug, 'enabled', {
+			enumerable: true,
+			configurable: false,
+			get: () => enableOverride === null ? createDebug.enabled(namespace) : enableOverride,
+			set: v => {
+				enableOverride = v;
+			}
+		});
 
-		// env-specific initialization logic for debug instances
+		// Env-specific initialization logic for debug instances
 		if (typeof createDebug.init === 'function') {
 			createDebug.init(debug);
 		}
 
-		createDebug.instances.push(debug);
-
 		return debug;
 	}
 
-	function destroy() {
-		const index = createDebug.instances.indexOf(this);
-		if (index !== -1) {
-			createDebug.instances.splice(index, 1);
-			return true;
-		}
-		return false;
-	}
-
 	function extend(namespace, delimiter) {
-		return createDebug(this.namespace + (typeof delimiter === 'undefined' ? ':' : delimiter) + namespace);
+		const newDebug = createDebug(this.namespace + (typeof delimiter === 'undefined' ? ':' : delimiter) + namespace);
+		newDebug.log = this.log;
+		return newDebug;
 	}
 
 	/**
@@ -177,11 +171,6 @@ function setup(env) {
 				createDebug.names.push(new RegExp('^' + namespaces + '$'));
 			}
 		}
-
-		for (i = 0; i < createDebug.instances.length; i++) {
-			const instance = createDebug.instances[i];
-			instance.enabled = createDebug.enabled(instance.namespace);
-		}
 	}
 
 	/**
@@ -256,6 +245,14 @@ function setup(env) {
 		return val;
 	}
 
+	/**
+	* XXX DO NOT USE. This is a temporary stub function.
+	* XXX It WILL be removed in the next major release.
+	*/
+	function destroy() {
+		console.warn('Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`.');
+	}
+
 	createDebug.enable(createDebug.load());
 
 	return createDebug;

src/node.js

@@ -15,6 +15,10 @@ exports.formatArgs = formatArgs;
 exports.save = save;
 exports.load = load;
 exports.useColors = useColors;
+exports.destroy = util.deprecate(
+	() => {},
+	'Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`.'
+);
 
 /**
  * Colors.
@@ -244,7 +248,9 @@ const {formatters} = module.exports;
 formatters.o = function (v) {
 	this.inspectOpts.colors = this.useColors;
 	return util.inspect(v, this.inspectOpts)
-		.replace(/\s*\n\s*/g, ' ');
+		.split('\n')
+		.map(str => str.trim())
+		.join(' ');
 };
 
 /**

test.js

@@ -1,42 +1,32 @@
 /* eslint-env mocha */
-'use strict';
 
-let chai;
-
-let expect;
-
-let debug;
-
-if (typeof module !== 'undefined') {
-	chai = require('chai');
-	expect = chai.expect;
-	debug = require('./src');
-}
+const assert = require('assert');
+const debug = require('./src');
 
 describe('debug', () => {
 	it('passes a basic sanity check', () => {
 		const log = debug('test');
 		log.enabled = true;
 		log.log = () => {};
 
-		expect(() => log('hello world')).to.not.throw();
+		assert.doesNotThrow(() => log('hello world'));
 	});
 
 	it('allows namespaces to be a non-string value', () => {
 		const log = debug('test');
 		log.enabled = true;
 		log.log = () => {};
 
-		expect(() => debug.enable(true)).to.not.throw();
+		assert.doesNotThrow(() => debug.enable(true));
 	});
 
 	it('honors global debug namespace enable calls', () => {
-		expect(debug('test:12345').enabled).to.equal(false);
-		expect(debug('test:67890').enabled).to.equal(false);
+		assert.deepStrictEqual(debug('test:12345').enabled, false);
+		assert.deepStrictEqual(debug('test:67890').enabled, false);
 
 		debug.enable('test:12345');
-		expect(debug('test:12345').enabled).to.equal(true);
-		expect(debug('test:67890').enabled).to.equal(false);
+		assert.deepStrictEqual(debug('test:12345').enabled, true);
+		assert.deepStrictEqual(debug('test:67890').enabled, false);
 	});
 
 	it('uses custom log function', () => {
@@ -50,7 +40,7 @@ describe('debug', () => {
 		log('using custom log function again');
 		log('%O', 12345);
 
-		expect(messages.length).to.equal(3);
+		assert.deepStrictEqual(messages.length, 3);
 	});
 
 	describe('extend namespace', () => {
@@ -60,7 +50,7 @@ describe('debug', () => {
 			log.log = () => {};
 
 			const logBar = log.extend('bar');
-			expect(logBar.namespace).to.be.equal('foo:bar');
+			assert.deepStrictEqual(logBar.namespace, 'foo:bar');
 		});
 
 		it('should extend namespace with custom delimiter', () => {
@@ -69,7 +59,7 @@ describe('debug', () => {
 			log.log = () => {};
 
 			const logBar = log.extend('bar', '--');
-			expect(logBar.namespace).to.be.equal('foo--bar');
+			assert.deepStrictEqual(logBar.namespace, 'foo--bar');
 		});
 
 		it('should extend namespace with empty delimiter', () => {
@@ -78,46 +68,73 @@ describe('debug', () => {
 			log.log = () => {};
 
 			const logBar = log.extend('bar', '');
-			expect(logBar.namespace).to.be.equal('foobar');
+			assert.deepStrictEqual(logBar.namespace, 'foobar');
+		});
+
+		it('should keep the log function between extensions', () => {
+			const log = debug('foo');
+			log.log = () => {};
+
+			const logBar = log.extend('bar');
+			assert.deepStrictEqual(log.log, logBar.log);
 		});
 	});
 
 	describe('rebuild namespaces string (disable)', () => {
 		it('handle names, skips, and wildcards', () => {
 			debug.enable('test,abc*,-abc');
 			const namespaces = debug.disable();
-			expect(namespaces).to.equal('test,abc*,-abc');
+			assert.deepStrictEqual(namespaces, 'test,abc*,-abc');
 		});
 
 		it('handles empty', () => {
 			debug.enable('');
 			const namespaces = debug.disable();
-			expect(namespaces).to.equal('');
-			expect(debug.names).to.deep.equal([]);
-			expect(debug.skips).to.deep.equal([]);
+			assert.deepStrictEqual(namespaces, '');
+			assert.deepStrictEqual(debug.names, []);
+			assert.deepStrictEqual(debug.skips, []);
 		});
 
 		it('handles all', () => {
 			debug.enable('*');
 			const namespaces = debug.disable();
-			expect(namespaces).to.equal('*');
+			assert.deepStrictEqual(namespaces, '*');
 		});
 
 		it('handles skip all', () => {
 			debug.enable('-*');
 			const namespaces = debug.disable();
-			expect(namespaces).to.equal('-*');
+			assert.deepStrictEqual(namespaces, '-*');
 		});
 
 		it('names+skips same with new string', () => {
 			debug.enable('test,abc*,-abc');
 			const oldNames = [...debug.names];
 			const oldSkips = [...debug.skips];
 			const namespaces = debug.disable();
-			expect(namespaces).to.equal('test,abc*,-abc');
+			assert.deepStrictEqual(namespaces, 'test,abc*,-abc');
 			debug.enable(namespaces);
-			expect(oldNames.map(String)).to.deep.equal(debug.names.map(String));
-			expect(oldSkips.map(String)).to.deep.equal(debug.skips.map(String));
+			assert.deepStrictEqual(oldNames.map(String), debug.names.map(String));
+			assert.deepStrictEqual(oldSkips.map(String), debug.skips.map(String));
+		});
+
+		it('handles re-enabling existing instances', () => {
+			debug.disable('*');
+			const inst = debug('foo');
+			const messages = [];
+			inst.log = msg => messages.push(msg.replace(/^[^@]*@([^@]+)@.*$/, '$1'));
+
+			inst('@test@');
+			assert.deepStrictEqual(messages, []);
+			debug.enable('foo');
+			assert.deepStrictEqual(messages, []);
+			inst('@test2@');
+			assert.deepStrictEqual(messages, ['test2']);
+			inst('@test3@');
+			assert.deepStrictEqual(messages, ['test2', 'test3']);
+			debug.disable('*');
+			inst('@test4@');
+			assert.deepStrictEqual(messages, ['test2', 'test3']);
 		});
 	});
 });