Skip to content
This repository was archived by the owner on Sep 17, 2018. It is now read-only.

Commit 8b781c2

Browse files
committed
Merge pull request #33 from twbs/lint
Remove JSHint and JSCS.
2 parents e309e7f + 56e54ca commit 8b781c2

6 files changed

Lines changed: 57 additions & 78 deletions

File tree

.eslintrc

Lines changed: 55 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,55 +7,103 @@
77
"block-scoped-var": 2,
88
"brace-style": [2, "stroustrup"],
99
"camelcase": 2,
10-
"comma-spacing": [2, {"before": false, "after": true}],
10+
"comma-dangle": 2,
11+
"comma-spacing": [2, { "before": false, "after": true }],
1112
"comma-style": [2, "last"],
13+
"consistent-return": 2,
1214
"consistent-this": [2, "self"],
1315
"curly": 2,
1416
"eol-last": 2,
1517
"eqeqeq": 2,
18+
"func-names": 0,
19+
"func-style": [0, "expression"],
20+
"guard-for-in": 2,
21+
"handle-callback-err": 2,
1622
"indent": [2, 2],
17-
"key-spacing": [2, {"beforeColon": false, "afterColon": true}],
23+
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
1824
"keyword-spacing": 2,
1925
"new-cap": 2,
26+
"newline-after-var": [0, "always"],
2027
"new-parens": 2,
2128
"no-array-constructor": 2,
2229
"no-bitwise": 2,
30+
"no-cond-assign": 2,
2331
"no-constant-condition": 0,
32+
"no-control-regex": 2,
33+
"no-debugger": 2,
34+
"no-delete-var": 2,
2435
"no-dupe-args": 2,
36+
"no-dupe-keys": 2,
2537
"no-duplicate-case": 2,
38+
"no-else-return": 2,
39+
"no-empty": 2,
40+
"no-empty-character-class": 2,
41+
"no-eq-null": 2,
2642
"no-eval": 2,
27-
"no-extra-strict": 0,
43+
"no-ex-assign": 2,
44+
"no-extra-boolean-cast": 2,
45+
"no-extra-parens": 2,
46+
"no-extra-semi": 2,
47+
"no-fallthrough": 2,
2848
"no-floating-decimal": 2,
49+
"no-func-assign": 2,
50+
"no-implicit-coercion": 2,
2951
"no-implied-eval": 2,
3052
"no-inline-comments": 0,
53+
"no-inner-declarations": 2,
54+
"no-invalid-regexp": 2,
3155
"no-irregular-whitespace": 2,
56+
"no-lone-blocks": 2,
57+
"no-lonely-if": 2,
58+
"no-loop-func": 2,
59+
"no-mixed-requires": 2,
3260
"no-mixed-spaces-and-tabs": 2,
33-
"no-multiple-empty-lines": 0,
61+
"no-multiple-empty-lines": 2,
3462
"no-multi-spaces": 2,
63+
"no-multi-str": 2,
64+
"no-negated-in-lhs": 2,
3565
"no-new-object": 2,
66+
"no-obj-calls": 2,
67+
"no-octal": 2,
3668
"no-param-reassign": 0,
69+
"no-path-concat": 2,
3770
"no-process-env": 2,
71+
"no-redeclare": 2,
72+
"no-regex-spaces": 2,
3873
"no-reserved-keys": 0,
74+
"no-return-assign": 2,
3975
"no-self-compare": 2,
76+
"no-sequences": 2,
4077
"no-spaced-func": 2,
78+
"no-sparse-arrays": 2,
4179
"no-throw-literal": 2,
4280
"no-trailing-spaces": 2,
81+
"no-undef": 2,
4382
"no-underscore-dangle": 0,
83+
"no-unexpected-multiline": 2,
84+
"no-unreachable": 2,
85+
"no-unused-expressions": 2,
86+
"no-unused-vars": 2,
87+
"no-useless-call": 2,
88+
"no-useless-concat": 2,
4489
"no-void": 2,
4590
"object-curly-spacing": [2, "never"],
4691
"one-var": [2, "never"],
4792
"operator-assignment": [2, "always"],
4893
"padded-blocks": 0,
49-
"quotes": 0,
94+
"quote-props": [2, "as-needed"],
95+
"quotes": [2, "single"],
5096
"radix": 2,
5197
"semi": [2, "always"],
52-
"semi-spacing": [2, {"before": false, "after": true}],
98+
"semi-spacing": [2, { "before": false, "after": true }],
5399
"space-before-blocks": [2, "always"],
54100
"spaced-comment": [2, "always"],
55101
"space-in-parens": [2, "never"],
56-
"space-unary-ops": [2, {"words": true, "nonwords": false}],
102+
"space-unary-ops": [2, { "words": true, "nonwords": false }],
57103
"strict": [2, "global"],
104+
"use-isnan": 2,
58105
"vars-on-top": 0,
106+
"valid-typeof": 2,
59107
"wrap-iife": [2, "inside"],
60108
"yoda": [2, "never"]
61109
}

.jscsrc

Lines changed: 0 additions & 28 deletions
This file was deleted.

.jshintrc

Lines changed: 0 additions & 17 deletions
This file was deleted.

Gruntfile.js

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,6 @@ module.exports = function (grunt) {
1212

1313
// Project configuration.
1414
grunt.initConfig({
15-
jshint: {
16-
options: {
17-
jshintrc: '.jshintrc'
18-
},
19-
all: [
20-
'Gruntfile.js',
21-
'tasks/*.js',
22-
'<%= nodeunit.tests %>'
23-
]
24-
},
25-
2615
eslint: {
2716
options: {
2817
config: '.eslintrc'
@@ -34,17 +23,6 @@ module.exports = function (grunt) {
3423
]
3524
},
3625

37-
jscs: {
38-
options: {
39-
config: '.jscsrc'
40-
},
41-
all: [
42-
'Gruntfile.js',
43-
'tasks/*.js',
44-
'<%= nodeunit.tests %>'
45-
]
46-
},
47-
4826
// Before generating any new files, remove any previously-created files.
4927
clean: {
5028
tests: ['tmp']
@@ -81,7 +59,7 @@ module.exports = function (grunt) {
8159
// These plugins provide necessary tasks.
8260
require('load-grunt-tasks')(grunt, {scope: 'devDependencies'});
8361

84-
grunt.registerTask('lint', ['jshint', 'eslint', 'jscs']);
62+
grunt.registerTask('lint', ['eslint']);
8563

8664
// Whenever the "test" task is run, first clean the "tmp" dir, then run this
8765
// plugin's task(s), then test the result.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ grunt.initConfig({
106106
```
107107

108108
## Contributing
109-
The project's coding style is laid out in the JSHint and JSCS configurations. Add unit tests for any new or changed functionality. Lint and test your code using [Grunt](http://gruntjs.com/).
109+
The project's coding style is laid out in the ESLint configuration. Add unit tests for any new or changed functionality. Lint and test your code using [Grunt](http://gruntjs.com/).
110110

111111
## License and copyright
112112

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525
"devDependencies": {
2626
"grunt": "^0.4.5",
2727
"grunt-contrib-clean": "^1.0.0",
28-
"grunt-contrib-jshint": "^1.0.0",
2928
"grunt-contrib-nodeunit": "^1.0.0",
3029
"grunt-eslint": "^18.0.0",
31-
"grunt-jscs": "^2.7.0",
3230
"load-grunt-tasks": "^3.1.0"
3331
},
3432
"peerDependencies": {

0 commit comments

Comments
 (0)