Skip to content

Package refresh #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 2, 2020
Merged

Package refresh #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dc03053
Remove unusued config files
AdrieanKhisbe Dec 8, 2019
9405f76
Test also on travis 12
AdrieanKhisbe Dec 8, 2019
b5dd830
Bump eslint to v6
AdrieanKhisbe Dec 8, 2019
fcf273d
Update all dependencies (dev and prod)
AdrieanKhisbe Dec 8, 2019
77523cf
Upgrade istanbul to nyc
AdrieanKhisbe Dec 8, 2019
be60fd3
Remove deprecated bithound badge
AdrieanKhisbe Dec 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ yarn.lock

# build task results for ci
coverage/
.nyc_output/
103 changes: 0 additions & 103 deletions .jscsrc
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ language: node_js
node_js:
- '8'
- '10'
- '12'
- "lts/*" # Active LTS release
- "node" # Latest stable release
after_success:
Expand Down
3 changes: 0 additions & 3 deletions .yo-rc.json
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ YARN := yarn
NPM := npm
COVERALLS := $(NODE_BIN)/coveralls
ESLINT := $(NODE_BIN)/eslint
ISTANBUL := $(NODE_BIN)/istanbul
ISTANBUL := $(NODE_BIN)/nyc
MOCHA := $(NODE_BIN)/mocha
_MOCHA := $(NODE_BIN)/_mocha
UNLEASH := $(NODE_BIN)/unleash
Expand Down Expand Up @@ -100,12 +100,12 @@ test: $(NODE_MODULES) ## Run unit tests

.PHONY: coverage
coverage: $(NODE_MODULES) clean-coverage ## Generate test coverage
@$(ISTANBUL) cover $(_MOCHA) --report lcovonly -- -R spec
@$(ISTANBUL) --report lcovonly $(_MOCHA) -R spec


.PHONY: report-coverage
report-coverage: $(NODE_MODULES) coverage ## Report test coverage to Coveralls
@cat $(LCOV) | $(COVERALLS)
$(ISTANBUL) report --reporter=text-lcov | $(COVERALLS)


.PHONY: clean-coverage
Expand Down
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
[![Coverage Status](https://coveralls.io/repos/restify/errors/badge.svg?branch=master)](https://coveralls.io/r/restify/errors?branch=master)
[![Dependency Status](https://david-dm.org/restify/errors.svg)](https://david-dm.org/restify/errors)
[![devDependency Status](https://david-dm.org/restify/errors/dev-status.svg)](https://david-dm.org/restify/errors#info=devDependencies)
[![bitHound Score](https://www.bithound.io/github/restify/errors/badges/score.svg)](https://www.bithound.io/github/restify/errors/master)

> A collection of HTTP and REST Error constructors.

Expand Down
4 changes: 2 additions & 2 deletions lib/baseClasses/HttpError.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function HttpError() {
* @property
* @type {Function}
*/
if (opts.hasOwnProperty('toJSON')) {
if (Object.prototype.hasOwnProperty.call(opts, 'toJSON')) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the conversion to .call?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is the autofix of following eslint rule no-prototype-builtins, that got added into eslint:recommended config

self.toJSON = opts.toJSON;
}

Expand All @@ -100,7 +100,7 @@ function HttpError() {
* @property
* @type {Function}
*/
if (opts.hasOwnProperty('toString')) {
if (Object.prototype.hasOwnProperty.call(opts, 'toString')) {
self.toString = opts.toString;
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function parseVErrorArgs(ctorArgs) {
if (_.isPlainObject(args[0])) {
// split restify-errors options from verror options
_.forOwn(args[0], function(val, key) {
if (INTERNAL_OPTS_KEYS.hasOwnProperty(key)) {
if (Object.prototype.hasOwnProperty.call(INTERNAL_OPTS_KEYS, key)) {
internalOpts[key] = val;
} else {
verrorOpts[key] = val;
Expand Down
22 changes: 11 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,24 @@
"test": "make test"
},
"devDependencies": {
"bunyan": "^1.8.10",
"bunyan": "^1.8.12",
"chai": "^4.2.0",
"conventional-changelog-angular": "^5.0.0",
"conventional-recommended-bump": "^4.0.0",
"coveralls": "^3.0.3",
"eslint": "^5.16.0",
"istanbul": "^0.4.5",
"conventional-changelog-angular": "^5.0.6",
"conventional-recommended-bump": "^6.0.5",
"coveralls": "^3.0.9",
"eslint": "^6.7.2",
"mkdirp": "^0.5.1",
"mocha": "^6.1.4",
"restify": "^8.3.1",
"restify-clients": "^2.6.4",
"mocha": "^6.2.2",
"nyc": "^14.1.1",
"restify": "^8.5.0",
"restify-clients": "^2.6.7",
"unleash": "^2.0.1"
},
"optionalDependencies": {
"safe-json-stringify": "^1.0.4"
"safe-json-stringify": "^1.2.0"
},
"dependencies": {
"@netflix/nerror": "^1.0.0",
"@netflix/nerror": "^1.1.3",
"assert-plus": "^1.0.0",
"lodash": "^4.17.15"
}
Expand Down