From bffdd8ce33fce6add8b516cc04e27cbf0cde593f Mon Sep 17 00:00:00 2001 From: Kevin van Zonneveld Date: Fri, 1 Apr 2016 13:18:50 +0200 Subject: [PATCH] Switch to eslint --- .eslintrc | 7 +++++++ .jscsrc | 5 ----- .jshintrc | 15 --------------- LICENSE.txt | 2 +- Makefile | 2 +- package.json | 11 +++++++---- 6 files changed, 16 insertions(+), 26 deletions(-) create mode 100644 .eslintrc delete mode 100644 .jscsrc delete mode 100644 .jshintrc diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000000..a71172f0fc --- /dev/null +++ b/.eslintrc @@ -0,0 +1,7 @@ +{ + "extends": "standard", + "env": { + "browser": true, + "node": true + } +} diff --git a/.jscsrc b/.jscsrc deleted file mode 100644 index 4bc8d0d809..0000000000 --- a/.jscsrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "preset": "node-style-guide", - "requireAlignedObjectValues": "all", - "disallowSpaceAfterObjectKeys": "ignoreSingleLine" -} diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index 219ea40f26..0000000000 --- a/.jshintrc +++ /dev/null @@ -1,15 +0,0 @@ -{ - "camelcase": true, - "curly": true, - "eqeqeq": true, - "freeze": true, - "indent": 2, - "newcap": true, - "quotmark": "single", - "maxdepth": 3, - "maxstatements": 15, - "maxlen": 80, - "eqnull": true, - "funcscope": true, - "node": true -} diff --git a/LICENSE.txt b/LICENSE.txt index b8bed6f53e..50a700dcea 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2013 Kevin van Zonneveld (http://kvz.io) +Copyright (c) 2007 Kevin van Zonneveld (http://kvz.io) and Contributors (http://phpjs.org/authors) Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/Makefile b/Makefile index 10468288b4..512df09a78 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ test: .PHONY: cleanup cleanup: node bin/phpjs.js --action cleanup - @./node_modules/.bin/jscs --fix functions/ || true + npm run fix || true @$(MAKE) test .PHONY: serve diff --git a/package.json b/package.json index 379ac9730e..3739b96eb1 100644 --- a/package.json +++ b/package.json @@ -8,16 +8,17 @@ "engines": { "node": ">= 0.8.0" }, - "dependencies": { + "devDependencies": { "cli": "0.11.0", "deep-equal": "1.0.1", "deep-equal-with-difflet": "0.1.2", "glob": "5.0.15", - "js-beautify": "1.5.10", - "jscs": "2.6.0", "mocha": "2.3.3", "npm-check-updates": "2.2.4", "send": "0.13.0", + "eslint": "2.4.0", + "eslint-config-standard": "5.1.0", + "eslint-plugin-standard": "1.3.2", "underscore": "1.8.3" }, "keywords": [ @@ -34,7 +35,9 @@ }, "readmeFilename": "README.md", "scripts": { - "test": "make test" + "test": "make test", + "fix": "eslint functions --fix", + "lint": "eslint functions" }, "bin": "bin/phpjs.js" }