Skip to content

Commit

Permalink
Switch to eslint
Browse files Browse the repository at this point in the history
  • Loading branch information
kvz committed Apr 1, 2016
1 parent 2d3ec11 commit bffdd8c
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 26 deletions.
7 changes: 7 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"extends": "standard",
"env": {
"browser": true,
"node": true
}
}
5 changes: 0 additions & 5 deletions .jscsrc

This file was deleted.

15 changes: 0 additions & 15 deletions .jshintrc

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 7 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -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"
}

0 comments on commit bffdd8c

Please sign in to comment.