Skip to content
This repository was archived by the owner on Mar 23, 2024. It is now read-only.

Commit 6a9ad23

Browse files
committed
Revert "Preset: JSCS"
This reverts commit b336c65. Patch backed outso that a patch release could be made. Refs ch-1015
1 parent 585fdbd commit 6a9ad23

File tree

6 files changed

+17
-26
lines changed

6 files changed

+17
-26
lines changed

.jscsrc

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
{
2-
"preset": "jscs",
2+
"preset": "google",
33
"fileExtensions": [ ".js", "jscs" ],
4+
5+
"requireParenthesesAroundIIFE": true,
6+
"maximumLineLength": 120,
7+
"validateLineBreaks": "LF",
8+
"validateIndentation": 4,
9+
10+
"disallowKeywords": ["with"],
11+
"disallowSpacesInsideObjectBrackets": null,
12+
"disallowImplicitTypeConversion": ["string"],
13+
14+
"safeContextKeyword": "_this",
15+
416
"excludeFiles": [
517
"test/data/**"
618
]
7-
}
19+
}

OVERVIEW.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
* [MDCS](https://github.com/jscs-dev/node-jscs/blob/master/presets/mdcs.json)[https://github.com/mrdoob/three.js/wiki/Mr.doob's-Code-Style™](https://github.com/mrdoob/three.js/wiki/Mr.doob's-Code-Style%E2%84%A2)
1111
* [Wikimedia](https://github.com/jscs-dev/node-jscs/blob/master/presets/wikimedia.json)https://www.mediawiki.org/wiki/Manual:Coding_conventions/JavaScript
1212
* [Yandex](https://github.com/jscs-dev/node-jscs/blob/master/presets/yandex.json)https://github.com/yandex/codestyle/blob/master/javascript.md
13-
* [JSCS](https://github.com/jscs-dev/node-jscs/blob/master/presets/jscs.json)
1413

1514
## Friendly packages
1615

lib/config/configuration.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -678,8 +678,6 @@ Configuration.prototype.registerDefaultPresets = function() {
678678

679679
// https://github.com/yandex/codestyle/blob/master/javascript.md
680680
this.registerPreset('yandex', require('../../presets/yandex.json'));
681-
682-
this.registerPreset('jscs', require('../../presets/jscs.json'));
683681
};
684682

685683
module.exports = Configuration;

presets/jscs.json

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

test/config/configuration.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ describe('modules/config/configuration', function() {
211211
assert(configuration.hasPreset('wikimedia'));
212212
assert(configuration.hasPreset('yandex'));
213213
assert(configuration.hasPreset('grunt'));
214-
assert(configuration.hasPreset('jscs'));
215214
});
216215
});
217216

test/string-checker.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ describe('modules/string-checker', function() {
331331
testPreset('mdcs');
332332
testPreset('wikimedia');
333333
testPreset('yandex');
334-
testPreset('jscs', __filename);
335334

336335
/**
337336
* Helper to test a given preset's configuration against its test file
@@ -341,19 +340,17 @@ describe('modules/string-checker', function() {
341340
*
342341
* @example testPreset('google')
343342
* @param {String} presetName
344-
* @param {String} [fixturePath]
345343
*/
346-
function testPreset(presetName, fixturePath) {
344+
function testPreset(presetName) {
347345
it('preset ' + presetName + ' should not report any errors from the sample file', function() {
348-
fixturePath = fixturePath || './test/data/options/preset/' + presetName + '.js';
349-
350346
var checker = new Checker();
347+
351348
checker.registerDefaultRules();
352349
checker.configure({
353350
preset: presetName
354351
});
355352

356-
return checker.checkFile(fixturePath).then(function(errors) {
353+
return checker.checkFile('./test/data/options/preset/' + presetName + '.js').then(function(errors) {
357354
assert(errors.isEmpty());
358355
});
359356
});

0 commit comments

Comments
 (0)