Skip to content

Commit 7e513c1

Browse files
committed
Update covert, jscs, eslint, semver
1 parent 93379a4 commit 7e513c1

3 files changed

Lines changed: 49 additions & 8 deletions

File tree

.eslintrc

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
},
99

1010
"rules": {
11+
"accessor-pairs": [2, { getWithoutSet: false, setWithoutGet: true }],
1112
"block-scoped-var": [0],
1213
"brace-style": [2, "1tbs", { "allowSingleLine": true }],
1314
"camelcase": [2],
@@ -29,6 +30,8 @@
2930
"guard-for-in": [0],
3031
"handle-callback-err": [0],
3132
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
33+
"linebreak-style": [2, "unix"],
34+
"lines-around-comment": [2, { "beforeBlockComment": false, "afterBlockComment": false, "beforeLineComment": false, "beforeLineComment": false }],
3235
"quotes": [2, "single", "avoid-escape"],
3336
"max-depth": [0, 4],
3437
"max-len": [0, 80, 4],
@@ -56,7 +59,7 @@
5659
"no-duplicate-case": [2],
5760
"no-else-return": [0],
5861
"no-empty": [2],
59-
"no-empty-class": [2],
62+
"no-empty-character-class": [2],
6063
"no-empty-label": [2],
6164
"no-eq-null": [0],
6265
"no-eval": [2],
@@ -119,11 +122,12 @@
119122
"no-sync": [0],
120123
"no-ternary": [0],
121124
"no-throw-literal": [2],
122-
"no-trailing-spaces": [2],
125+
"no-trailing-spaces": [2, { "skipBlankLines": false }],
123126
"no-undef": [2],
124127
"no-undef-init": [2],
125128
"no-undefined": [0],
126129
"no-underscore-dangle": [2],
130+
"no-unneeded-ternary": [2],
127131
"no-unreachable": [2],
128132
"no-unused-expressions": [2],
129133
"no-unused-vars": [2, { "vars": "all", "args": "after-used" }],
@@ -132,10 +136,11 @@
132136
"no-warning-comments": [0, { "terms": ["todo", "fixme", "xxx"], "location": "start" }],
133137
"no-with": [2],
134138
"no-wrap-func": [2],
139+
"object-curly-spacing": [2, "always"],
135140
"object-shorthand": [2, "never"],
136141
"one-var": [0],
137142
"operator-assignment": [0, "always"],
138-
"operator-linebreak": [2, "after"],
143+
"operator-linebreak": [2, "none"],
139144
"padded-blocks": [0],
140145
"quote-props": [0],
141146
"radix": [0],

.jscs.json

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
{
22
"additionalRules": [],
33

4+
"requireSemicolons": true,
5+
6+
"disallowMultipleSpaces": true,
7+
8+
"disallowIdentifierNames": [],
9+
410
"requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
511

612
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch", "function"],
@@ -63,6 +69,36 @@
6369
"validateQuoteMarks": {
6470
"escape": true,
6571
"mark": "'"
66-
}
72+
},
73+
74+
"disallowOperatorBeforeLineBreak": [],
75+
76+
"requireSpaceBeforeKeywords": [
77+
"do",
78+
"for",
79+
"if",
80+
"else",
81+
"switch",
82+
"case",
83+
"try",
84+
"catch",
85+
"finally",
86+
"while",
87+
"with",
88+
"return"
89+
],
90+
91+
"validateAlignedFunctionParameters": {
92+
"lineBreakAfterOpeningBraces": true,
93+
"lineBreakBeforeClosingBraces": true
94+
},
95+
96+
"requirePaddingNewLinesBeforeExport": true,
97+
98+
"validateNewlineAfterArrayElements": {
99+
"maximum": 1
100+
},
101+
102+
"requirePaddingNewLinesAfterUseStrict": true
67103
}
68104

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
"is": "^3.0.1",
3636
"tape": "^4.0.0",
3737
"indexof": "^0.0.1",
38-
"covert": "^1.0.1",
39-
"jscs": "^1.12.0",
38+
"covert": "^1.1.0",
39+
"jscs": "^1.13.1",
4040
"editorconfig-tools": "^0.1.1",
4141
"nsp": "^1.0.1",
42-
"eslint": "^0.20.0",
43-
"semver": "^4.3.3",
42+
"eslint": "^0.22.1",
43+
"semver": "^4.3.6",
4444
"replace": "^0.3.0"
4545
},
4646
"testling": {

0 commit comments

Comments
 (0)