Skip to content

Commit addd676

Browse files
authored
Merge pull request #137 from hexojs/dependabot/npm_and_yarn/eslint-tw-6.1.0
Update eslint requirement from ^5.6.1 to ^6.1.0
2 parents 0d0ac32 + 0a25e0d commit addd676

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lib/deployer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ module.exports = function(args) {
102102

103103
if (typeof ignorePattern === 'string') {
104104
opts.ignorePattern = new RegExp(ignorePattern);
105-
} else if (typeof ignorePattern === 'object' && ignorePattern.hasOwnProperty('public')) {
105+
} else if (typeof ignorePattern === 'object' && Reflect.apply(Object.prototype.hasOwnProperty, ignorePattern, ['public'])) {
106106
opts.ignorePattern = new RegExp(ignorePattern.public);
107107
}
108108

@@ -131,7 +131,7 @@ module.exports = function(args) {
131131

132132
if (typeof ignorePattern === 'string') {
133133
opts.ignorePattern = new RegExp(ignorePattern);
134-
} else if (typeof ignorePattern === 'object' && ignorePattern.hasOwnProperty(dir)) {
134+
} else if (typeof ignorePattern === 'object' && Reflect.apply(Object.prototype.hasOwnProperty, ignorePattern, [dir])) {
135135
opts.ignorePattern = new RegExp(ignorePattern[dir]);
136136
}
137137

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"devDependencies": {
3232
"babel-eslint": "^10.0.1",
3333
"chai": "^4.2.0",
34-
"eslint": "^5.6.1",
34+
"eslint": "^6.1.0",
3535
"eslint-config-hexo": "^3.0.0",
3636
"mocha": "^6.0.2",
3737
"nyc": "^14.1.1"

0 commit comments

Comments
 (0)