Skip to content

Commit

Permalink
[Dev Deps] update tape, jscs, eslint, @ljharb/eslint-config
Browse files Browse the repository at this point in the history
  • Loading branch information
ljharb committed Sep 6, 2016
1 parent 2d76c60 commit e209428
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 11 deletions.
2 changes: 2 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
"rules": {
"complexity": [2, 16],
"eqeqeq": [2, "allow-null"],
"indent": [2, 2],
"max-depth": [2, 5],
"max-statements": [2, 29],
"no-continue": [1],
"no-restricted-syntax": [2, "BreakStatement", "DebuggerStatement", "LabeledStatement", "WithStatement"],
"sort-keys": 0,
"spaced-comment": [1, "always", { "markers": ["*"] }]
}
}
54 changes: 49 additions & 5 deletions .jscs.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,17 @@

"disallowIdentifierNames": [],

"requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
"requireCurlyBraces": {
"allExcept": [],
"keywords": ["if", "else", "for", "while", "do", "try", "catch"]
},

"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch", "function"],

"disallowSpaceAfterKeywords": [],

"disallowSpaceBeforeComma": true,
"disallowSpaceAfterComma": false,
"disallowSpaceBeforeSemicolon": true,

"disallowNodeTypes": [
Expand All @@ -26,7 +30,7 @@
"WithStatement"
],

"requireObjectKeysOnNewLine": true,
"requireObjectKeysOnNewLine": { "allExcept": ["sameLine"] },

"requireSpacesInAnonymousFunctionExpression": { "beforeOpeningRoundBrace": true, "beforeOpeningCurlyBrace": true },
"requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true },
Expand All @@ -40,7 +44,7 @@

"disallowSpacesInsideArrayBrackets": true,

"disallowQuotedKeysInObjects": "allButReserved",
"disallowQuotedKeysInObjects": { "allExcept": ["reserved"] },

"disallowSpaceAfterObjectKeys": true,

Expand Down Expand Up @@ -75,7 +79,7 @@

"disallowMultipleLineStrings": true,

"requireDotNotation": true,
"requireDotNotation": { "allExcept": ["keywords"] },

"requireParenthesesAroundIIFE": true,

Expand Down Expand Up @@ -126,6 +130,46 @@

"disallowNestedTernaries": { "maxLevel": 1 },

"requireSpaceAfterComma": true
"requireSpaceAfterComma": { "allExcept": ["trailing"] },
"requireAlignedMultilineParams": false,

"requireSpacesInGenerator": {
"afterStar": true
},

"disallowSpacesInGenerator": {
"beforeStar": true
},

"disallowVar": false,

"requireArrayDestructuring": false,

"requireEnhancedObjectLiterals": false,

"requireObjectDestructuring": false,

"requireEarlyReturn": false,

"requireCapitalizedConstructorsNew": {
"allExcept": ["Function", "String", "Object", "Symbol", "Number", "Date", "RegExp", "Error", "Boolean", "Array"]
},

"requireImportAlphabetized": false,

"requireSpaceBeforeObjectValues": true,
"requireSpaceBeforeDestructuredValues": true,

"disallowSpacesInsideTemplateStringPlaceholders": true,

"disallowArrayDestructuringReturn": false,

"requireNewlineBeforeSingleStatementsInIf": false,

"disallowUnusedVariables": true,

"requireSpacesInsideImportedObjectBraces": true,

"requireUseStrict": true
}

2 changes: 1 addition & 1 deletion lib/extend.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var extend = function extend() {
options = arguments[i];
if (options != null) {
if (typeof options === 'string') {
options = options.split('');
options = options.split('');
}
// Extend the base object
for (name in options) {
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
"is": "^3.1.0"
},
"devDependencies": {
"tape": "^4.2.1",
"tape": "^4.6.0",
"covert": "^1.1.0",
"jscs": "^2.3.4",
"eslint": "^1.7.1",
"@ljharb/eslint-config": "^1.4.1"
"jscs": "^3.0.7",
"eslint": "^3.4.0",
"@ljharb/eslint-config": "^8.0.0"
},
"repository": {
"type": "git",
Expand Down
4 changes: 3 additions & 1 deletion test/.eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"rules": {
"no-magic-numbers": 0
"max-lines": 0,
"no-magic-numbers": 0,
"object-curly-newline": 0
}
}

0 comments on commit e209428

Please sign in to comment.