dan/pngjs
1
0
Fork 0
mirror of https://github.com/danbulant/pngjs synced 2026-06-04 15:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #42 from lukeapage/greenkeeper-eslint-2.1.0

Browse source 
Update eslint to version 2.1.0 🚀
This commit is contained in:
Luke Page 2016-02-16 06:52:44 +01:00
commit c7d7cbc305
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.eslintrc → .eslintrc.json
View file

@ -22,7 +22,6 @@
"no-else-return": 1, "no-else-return": 1,
"no-empty": 2, "no-empty": 2,
"no-empty-character-class": 2, "no-empty-character-class": 2,
"no-empty-label": 1,
"no-eq-null": 0, "no-eq-null": 0,
"no-eval": 2, "no-eval": 2,
"no-ex-assign": 2, "no-ex-assign": 2,
@ -133,7 +132,8 @@
"indent": [1, 2, {"SwitchCase": 1}], "indent": [1, 2, {"SwitchCase": 1}],
"init-declarations": 0, "init-declarations": 0,
"key-spacing": [1, { "beforeColon": false, "afterColon": true }], "key-spacing": [1, { "beforeColon": false, "afterColon": true }],
"lines-around-comment": 0, "keyword-spacing": 1,
"lines-around-comment": 0,
"max-depth": [1, 4], "max-depth": [1, 4],
"max-len": [1, 160, 2], "max-len": [1, 160, 2],
"max-nested-callbacks": [1, 2], "max-nested-callbacks": [1, 2],
@ -161,12 +161,10 @@
"semi": [1, "always"], "semi": [1, "always"],
"semi-spacing": [1, {"before": false, "after": true}], "semi-spacing": [1, {"before": false, "after": true}],
"sort-vars": 0, "sort-vars": 0,
"space-after-keywords": [1, "always"],
"space-before-blocks": [1, "always"], "space-before-blocks": [1, "always"],
"space-before-function-paren": [1, "never"], "space-before-function-paren": [1, "never"],
"space-in-parens": [1, "never"], "space-in-parens": [1, "never"],
"space-infix-ops": 1, "space-infix-ops": 1,
"space-return-throw-case": 1,
"space-unary-ops": [1, { "words": true, "nonwords": false }], "space-unary-ops": [1, { "words": true, "nonwords": false }],
"spaced-comment": 0, "spaced-comment": 0,
"strict": [2, "global"], "strict": [2, "global"],
@ -179,6 +177,7 @@
"yoda": [0, "never"] "yoda": [0, "never"]
}, },
"env": { "env": {
"node": true "node": true,
"es6": true
} }
} }

4
package.json
View file

@ -52,9 +52,9 @@
"devDependencies": { "devDependencies": {
"buffer-equal": "1.0.0", "buffer-equal": "1.0.0",
"connect": "^3.4.0", "connect": "^3.4.0",
"eslint": "^1.0.0", "eslint": "^2.1.0",
"istanbul": "^0.4.1", "istanbul": "^0.4.1",
"phantomjs": "^2.1.3", "phantomjs-prebuilt": "^2.1.3",
"serve-static": "^1.10.0", "serve-static": "^1.10.0",
"tap-dot": "^1.0.0", "tap-dot": "^1.0.0",
"tape": "^4.0.2" "tape": "^4.0.2"

2
test/run-compare.js
View file

@ -2,7 +2,7 @@ require("./http-server");
var path = require('path'); var path = require('path');
var childProcess = require('child_process'); var childProcess = require('child_process');
var phantomjs = require('phantomjs'); var phantomjs = require('phantomjs-prebuilt');
var binPath = phantomjs.path; var binPath = phantomjs.path;
var childArgs = [ var childArgs = [