From 6ad9c2b95d31b1a46d5d763482f51e20eba80972 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Mon, 25 May 2015 21:25:02 -0700 Subject: [PATCH] Update `covert`, `jscs`, `eslint`, `semver` --- .eslintrc | 8 +++++--- .jscs.json | 2 -- index.js | 4 ++-- package.json | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.eslintrc b/.eslintrc index 7f96df6..59a446f 100644 --- a/.eslintrc +++ b/.eslintrc @@ -19,7 +19,7 @@ "consistent-this": [0, "that"], "curly": [2, "all"], "default-case": [2], - "dot-notation": [2, { "allowKeywords": false, "allowPattern": "^__proto__$" }], + "dot-notation": [2, { "allowKeywords": true }], "eol-last": [2], "eqeqeq": [2], "func-names": [0], @@ -29,6 +29,7 @@ "guard-for-in": [0], "handle-callback-err": [0], "key-spacing": [2, { "beforeColon": false, "afterColon": true }], + "linebreak-style": [2, "unix"], "quotes": [2, "single", "avoid-escape"], "max-depth": [0, 4], "max-len": [0, 80, 4], @@ -119,11 +120,12 @@ "no-sync": [0], "no-ternary": [0], "no-throw-literal": [2], - "no-trailing-spaces": [2], + "no-trailing-spaces": [2, { "skipBlankLines": false }], "no-undef": [2], "no-undef-init": [2], "no-undefined": [0], "no-underscore-dangle": [2], + "no-unneeded-ternary": [2], "no-unreachable": [2], "no-unused-expressions": [2], "no-unused-vars": [2, { "vars": "all", "args": "after-used" }], @@ -135,7 +137,7 @@ "object-shorthand": [2, "never"], "one-var": [0], "operator-assignment": [0, "always"], - "operator-linebreak": [2, "after"], + "operator-linebreak": [2, "none"], "padded-blocks": [0], "quote-props": [0], "radix": [0], diff --git a/.jscs.json b/.jscs.json index 0ae174e..a655879 100644 --- a/.jscs.json +++ b/.jscs.json @@ -7,8 +7,6 @@ "disallowIdentifierNames": [], - "requirePaddingNewLinesBeforeLineComments": true, - "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"], "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch", "function"], diff --git a/index.js b/index.js index 7b8a30d..9566c4b 100644 --- a/index.js +++ b/index.js @@ -14,9 +14,9 @@ var isCallable = require('is-callable'); var getPrototypeOf = Object.getPrototypeOf; if (!getPrototypeOf) { /* eslint-disable no-proto */ - if (typeof 'test'['__proto__'] === 'object') { + if (typeof 'test'.__proto__ === 'object') { getPrototypeOf = function (obj) { - return obj['__proto__']; + return obj.__proto__; }; } else { getPrototypeOf = function (obj) { diff --git a/package.json b/package.json index 18cd2d6..08bf403 100644 --- a/package.json +++ b/package.json @@ -40,13 +40,13 @@ }, "devDependencies": { "tape": "^4.0.0", - "covert": "^1.0.1", - "jscs": "^1.13.0", + "covert": "^1.1.0", + "jscs": "^1.13.1", "foreach": "^2.0.5", "make-arrow-function": "^1.0.0", "make-generator-function": "^1.1.0", - "semver": "^4.3.3", - "eslint": "^0.20.0", + "semver": "^4.3.4", + "eslint": "^0.21.2", "nsp": "^1.0.1" }, "testling": {