Skip to content

Commit

Permalink
run update, lint
Browse files Browse the repository at this point in the history
  • Loading branch information
jonschlinkert committed Jul 22, 2017
1 parent 8ea6391 commit 754cc73
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 55 deletions.
9 changes: 5 additions & 4 deletions .editorconfig
@@ -1,13 +1,14 @@
# http://editorconfig.org/
root = true

[*]
indent_style = space
end_of_line = lf
charset = utf-8
end_of_line = lf
indent_size = 2
trim_trailing_whitespace = true
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[{**/{actual,fixtures,expected,templates}/**,*.md}]
trim_trailing_whitespace = false
insert_final_newline = false
insert_final_newline = false
5 changes: 0 additions & 5 deletions .eslintrc.json
@@ -1,9 +1,4 @@
{
"ecmaFeatures": {
"modules": true,
"experimentalObjectRestSpread": true
},

"env": {
"browser": false,
"es6": true,
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -25,3 +25,4 @@ vendor
temp
tmp
TODO.md
package-lock.json
8 changes: 3 additions & 5 deletions .travis.yml
Expand Up @@ -5,12 +5,10 @@ os:
language: node_js
node_js:
- node
- '8'
- '7'
- '6'
- '5'
- '4'
- '0.12'
- '0.10'
matrix:
allow_failures:
- node_js: '4'
- node_js: '0.12'
- node_js: '0.10'
4 changes: 2 additions & 2 deletions LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015, 2017, Jon Schlinkert
Copyright (c) 2015-2017, Jon Schlinkert.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.
6 changes: 3 additions & 3 deletions README.md
@@ -1,4 +1,4 @@
# is-descriptor [![NPM version](https://img.shields.io/npm/v/is-descriptor.svg?style=flat)](https://www.npmjs.com/package/is-descriptor) [![NPM monthly downloads](https://img.shields.io/npm/dm/is-descriptor.svg?style=flat)](https://npmjs.org/package/is-descriptor) [![NPM total downloads](https://img.shields.io/npm/dt/is-descriptor.svg?style=flat)](https://npmjs.org/package/is-descriptor) [![Linux Build Status](https://img.shields.io/travis/jonschlinkert/is-descriptor.svg?style=flat&label=Travis)](https://travis-ci.org/jonschlinkert/is-descriptor)
# is-descriptor [![NPM version](https://img.shields.io/npm/v/is-descriptor.svg?style=flat)](https://www.npmjs.com/package/is-descriptor) [![NPM monthly downloads](https://img.shields.io/npm/dm/is-descriptor.svg?style=flat)](https://npmjs.org/package/is-descriptor) [![NPM total downloads](https://img.shields.io/npm/dt/is-descriptor.svg?style=flat)](https://npmjs.org/package/is-descriptor) [![Linux Build Status](https://img.shields.io/travis/jonschlinkert/is-descriptor.svg?style=flat&label=Travis)](https://travis-ci.org/jonschlinkert/is-descriptor)

> Returns true if a value has the characteristics of a valid JavaScript descriptor. Works for data descriptors and accessor descriptors.
Expand Down Expand Up @@ -154,7 +154,7 @@ Pull requests and stars are always welcome. For bugs and feature requests, [plea

| **Commits** | **Contributor** |
| --- | --- |
| 20 | [jonschlinkert](https://github.com/jonschlinkert) |
| 24 | [jonschlinkert](https://github.com/jonschlinkert) |
| 1 | [doowb](https://github.com/doowb) |
| 1 | [wtgtybhertgeghgtwtg](https://github.com/wtgtybhertgeghgtwtg) |

Expand Down Expand Up @@ -190,4 +190,4 @@ Released under the [MIT License](LICENSE).

***

_This file was generated by [verb-generate-readme](https://github.com/verbose/verb-generate-readme), v0.4.2, on February 25, 2017._
_This file was generated by [verb-generate-readme](https://github.com/verbose/verb-generate-readme), v0.6.0, on July 22, 2017._
12 changes: 7 additions & 5 deletions index.js
@@ -1,20 +1,22 @@
/*!
* is-descriptor <https://github.com/jonschlinkert/is-descriptor>
*
* Copyright (c) 2015, 2017, Jon Schlinkert.
* Copyright (c) 2015-2017, Jon Schlinkert.
* Released under the MIT License.
*/

'use strict';

var utils = require('./utils');
var typeOf = require('kind-of');
var isAccessor = require('is-accessor-descriptor');
var isData = require('is-data-descriptor');

module.exports = function isDescriptor(obj, key) {
if (utils.typeOf(obj) !== 'object') {
if (typeOf(obj) !== 'object') {
return false;
}
if ('get' in obj) {
return utils.isAccessor(obj, key);
return isAccessor(obj, key);
}
return utils.isData(obj, key);
return isData(obj, key);
};
12 changes: 5 additions & 7 deletions package.json
Expand Up @@ -5,18 +5,17 @@
"homepage": "https://github.com/jonschlinkert/is-descriptor",
"author": "Jon Schlinkert (https://github.com/jonschlinkert)",
"contributors": [
"<wtgtybhertgeghgtwtg@gmail.com> (https://github.com/wtgtybhertgeghgtwtg)",
"Brian Woodward <brian.woodward@gmail.com> (https://github.com/doowb)",
"Jon Schlinkert <jon.schlinkert@sellside.com> (http://twitter.com/jonschlinkert)"
"Brian Woodward (https://twitter.com/doowb)",
"Jon Schlinkert (http://twitter.com/jonschlinkert)",
"(https://github.com/wtgtybhertgeghgtwtg)"
],
"repository": "jonschlinkert/is-descriptor",
"bugs": {
"url": "https://github.com/jonschlinkert/is-descriptor/issues"
},
"license": "MIT",
"files": [
"index.js",
"utils.js"
"index.js"
],
"main": "index.js",
"engines": {
Expand All @@ -28,8 +27,7 @@
"dependencies": {
"is-accessor-descriptor": "^0.1.6",
"is-data-descriptor": "^0.1.4",
"kind-of": "^3.0.2",
"lazy-cache": "^2.0.2"
"kind-of": "^3.0.2"
},
"devDependencies": {
"gulp-format-md": "^0.1.11",
Expand Down
24 changes: 0 additions & 24 deletions utils.js

This file was deleted.

0 comments on commit 754cc73

Please sign in to comment.