Merge branch 'develop' into patch-4

This commit is contained in:
paladox 2018-02-14 00:28:13 +00:00 committed by GitHub
commit 93dd9c7730
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 8 deletions

4
.npmignore Normal file
View File

@ -0,0 +1,4 @@
# Development files
/tests/
/.travis.yml
/screenshots

View File

@ -1,8 +1,12 @@
language: node_js language: node_js
node_js: node_js:
- "9"
- "8"
- "7"
- "6"
- "5"
- "4" - "4"
- "0.12" - "0.12"
- "0.11" - "0.11"
- "0.10" - "0.10"
- "0.8" - "0.8"
- "0.6"

View File

@ -1,4 +1,8 @@
# colors.js [![Build Status](https://travis-ci.org/Marak/colors.js.svg?branch=master)](https://travis-ci.org/Marak/colors.js) # colors.js
[![Build Status](https://travis-ci.org/Marak/colors.js.svg?branch=master)](https://travis-ci.org/Marak/colors.js)
[![version](https://img.shields.io/npm/v/colors.svg)](https://www.npmjs.org/package/colors)
[![dependencies](https://david-dm.org/Marak/colors.js.svg)](https://david-dm.org/Marak/colors.js)
[![devDependencies](https://david-dm.org/Marak/colors.js/dev-status.svg)](https://david-dm.org/Marak/colors.js#info=devDependencies)
## get color and style in your node.js console ## get color and style in your node.js console

View File

@ -67,7 +67,7 @@ module['exports'] = function () {
var stringPrototypeBlacklist = [ var stringPrototypeBlacklist = [
'__defineGetter__', '__defineSetter__', '__lookupGetter__', '__lookupSetter__', 'charAt', 'constructor', '__defineGetter__', '__defineSetter__', '__lookupGetter__', '__lookupSetter__', 'charAt', 'constructor',
'hasOwnProperty', 'isPrototypeOf', 'propertyIsEnumerable', 'toLocaleString', 'toString', 'valueOf', 'charCodeAt', 'hasOwnProperty', 'isPrototypeOf', 'propertyIsEnumerable', 'toLocaleString', 'toString', 'valueOf', 'charCodeAt',
'indexOf', 'lastIndexof', 'length', 'localeCompare', 'match', 'replace', 'search', 'slice', 'split', 'substring', 'indexOf', 'lastIndexof', 'length', 'localeCompare', 'match', 'repeat', 'replace', 'search', 'slice', 'split', 'substring',
'toLocaleLowerCase', 'toLocaleUpperCase', 'toLowerCase', 'toUpperCase', 'trim', 'trimLeft', 'trimRight' 'toLocaleLowerCase', 'toLocaleUpperCase', 'toLowerCase', 'toUpperCase', 'trim', 'trimLeft', 'trimRight'
]; ];
@ -110,4 +110,4 @@ module['exports'] = function () {
} }
}; };
}; };

View File

@ -1,7 +1,7 @@
{ {
"name": "colors", "name": "colors",
"description": "get colors in your node.js console", "description": "get colors in your node.js console",
"version": "1.1.2", "version": "1.2.0",
"author": "Marak Squires", "author": "Marak Squires",
"homepage": "https://github.com/Marak/colors.js", "homepage": "https://github.com/Marak/colors.js",
"bugs": "https://github.com/Marak/colors.js/issues", "bugs": "https://github.com/Marak/colors.js/issues",
@ -17,7 +17,7 @@
"engines": { "engines": {
"node": ">=0.1.90" "node": ">=0.1.90"
}, },
"main": "lib", "main": "lib/index.js",
"dependencies": { "dependencies": {
"has-flag": "^3.0.0" "has-flag": "^3.0.0"
}, },

View File

@ -1,9 +1,9 @@
// //
// Remark: Requiring this file will use the "safe" colors API which will not touch String.prototype // Remark: Requiring this file will use the "safe" colors API which will not touch String.prototype
// //
// var colors = require('colors/safe); // var colors = require('colors/safe');
// colors.red("foo") // colors.red("foo")
// //
// //
var colors = require('./lib/colors'); var colors = require('./lib/colors');
module['exports'] = colors; module['exports'] = colors;