Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Solve breaking changes after update to ESLint 2.0.0 #71

Merged
merged 4 commits into from
Mar 4, 2016
Merged

Solve breaking changes after update to ESLint 2.0.0 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6856aae
Remove no-empty-label rule
lkrnac Feb 13, 2016
4571484
Correctly replace no-empty-labes rule
lkrnac Feb 13, 2016
2e3cf14
Update ESLint version
lkrnac Feb 13, 2016
4a520be
Migrate removed rules to keyword-spacing
lkrnac Feb 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

"devDependencies" : {
"babel-eslint": "4.1.8",
"eslint": "^1.10.3",
"eslint": "^2.0.0",
"eslint-plugin-filenames": "0.2.0",
"eslint-plugin-react": "3.12.0"
},
Expand Down
4 changes: 1 addition & 3 deletions rules/eslint/best-practices/airbnb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ module.exports = {
"no-div-regex": 0,
// disallow else after a return in an if
"no-else-return": 2,
// disallow use of labels for anything other then loops and switches
"no-empty-label": 2,
// disallow use of empty destructuring patterns
"no-empty-pattern": 0,
// disallow comparisons to null without a type-checking operator
Expand All @@ -57,7 +55,7 @@ module.exports = {
// disallow usage of __iterator__ property
"no-iterator": 2,
// disallow use of labeled statements
"no-labels": 2,
"no-labels": [2, {"allowLoop": true, "allowSwitch": true}],
// disallow unnecessary nested blocks
"no-lone-blocks": 2,
// disallow creation of functions within loops
Expand Down
2 changes: 0 additions & 2 deletions rules/eslint/best-practices/eslint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ module.exports = {
"no-div-regex": 0,
// disallow else after a return in an if
"no-else-return": 0,
// disallow use of labels for anything other then loops and switches
"no-empty-label": 0,
// disallow use of empty destructuring patterns
"no-empty-pattern": 0,
// disallow comparisons to null without a type-checking operator
Expand Down
2 changes: 0 additions & 2 deletions rules/eslint/best-practices/google.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ module.exports = {
"no-div-regex": 0,
// disallow else after a return in an if
"no-else-return": 0,
// disallow use of labels for anything other then loops and switches
"no-empty-label": 0,
// disallow use of empty destructuring patterns
"no-empty-pattern": 0,
// disallow comparisons to null without a type-checking operator
Expand Down
2 changes: 0 additions & 2 deletions rules/eslint/best-practices/gulp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ module.exports = {
"no-div-regex": 0,
// disallow else after a return in an if
"no-else-return": 0,
// disallow use of labels for anything other then loops and switches
"no-empty-label": 0,
// disallow use of empty destructuring patterns
"no-empty-pattern": 0,
// disallow comparisons to null without a type-checking operator
Expand Down
2 changes: 0 additions & 2 deletions rules/eslint/best-practices/node-runtime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ module.exports = {
"no-div-regex": 0,
// disallow else after a return in an if
"no-else-return": 0,
// disallow use of labels for anything other then loops and switches
"no-empty-label": 0,
// disallow use of empty destructuring patterns
"no-empty-pattern": 0,
// disallow comparisons to null without a type-checking operator
Expand Down
2 changes: 0 additions & 2 deletions rules/eslint/best-practices/off.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ module.exports = {
"no-div-regex": 0,
// disallow else after a return in an if
"no-else-return": 0,
// disallow use of labels for anything other then loops and switches
"no-empty-label": 0,
// disallow use of empty destructuring patterns
"no-empty-pattern": 0,
// disallow comparisons to null without a type-checking operator
Expand Down
4 changes: 1 addition & 3 deletions rules/eslint/best-practices/walmart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ module.exports = {
"no-div-regex": 0,
// disallow else after a return in an if
"no-else-return": 0,
// disallow use of labels for anything other then loops and switches
"no-empty-label": 2,
// disallow use of empty destructuring patterns
"no-empty-pattern": 2,
// disallow comparisons to null without a type-checking operator
Expand All @@ -57,7 +55,7 @@ module.exports = {
// disallow usage of __iterator__ property
"no-iterator": 2,
// disallow use of labeled statements
"no-labels": 2,
"no-labels": [2, {"allowLoop": true, "allowSwitch": true}],
// disallow unnecessary nested blocks
"no-lone-blocks": 2,
// disallow creation of functions within loops
Expand Down
8 changes: 2 additions & 6 deletions rules/eslint/style/airbnb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,20 +113,16 @@ module.exports = {
"semi": [2, "always"],
// sort variables within the same declaration block
"sort-vars": 0,
// require a space after certain keywords
"space-after-keywords": [2, "always"],
// require a space before/after certain keywords
"keyword-spacing": [2, {"before": false, "after": true}],
// require or disallow space before blocks
"space-before-blocks": 2,
// require or disallow space before function opening parenthesis
"space-before-function-paren": [2, { "anonymous": "always", "named": "never" }],
// require a space before certain keywords (fixable)
"space-before-keywords": 0,
// require or disallow spaces inside parentheses
"space-in-parens": [2, "never"],
// require spaces around operators
"space-infix-ops": 2,
// require a space after return, throw, and case
"space-return-throw-case": 2,
// Require or disallow spaces before/after unary operators
"space-unary-ops": 0,
// require or disallow a space immediately following the // or /* in a comment
Expand Down
8 changes: 2 additions & 6 deletions rules/eslint/style/eslint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,16 @@ module.exports = {
"semi": 0,
// sort variables within the same declaration block
"sort-vars": 0,
// require a space after certain keywords
"space-after-keywords": [0, "always"],
// require a space before/after certain keywords
"keyword-spacing": 0,
// require or disallow space before blocks
"space-before-blocks": [0, "always"],
// require or disallow space before function opening parenthesis
"space-before-function-paren": [0, "always"],
// require a space before certain keywords (fixable)
"space-before-keywords": 0,
// require or disallow spaces inside parentheses
"space-in-parens": [0, "never"],
// require spaces around operators
"space-infix-ops": 0,
// require a space after return, throw, and case
"space-return-throw-case": 0,
// Require or disallow spaces before/after unary operators
"space-unary-ops": [0, { "words": true, "nonwords": false }],
// require or disallow a space immediately following the // or /* in a comment
Expand Down
8 changes: 2 additions & 6 deletions rules/eslint/style/google.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,16 @@ module.exports = {
"semi": 2,
// sort variables within the same declaration block
"sort-vars": 0,
// require a space after certain keywords
"space-after-keywords": 0,
// require a space before/after certain keywords
"keyword-spacing": 0,
// require or disallow space before blocks
"space-before-blocks": [2, "always"],
// require or disallow space before function opening parenthesis
"space-before-function-paren": [2, "never"],
// require a space before certain keywords (fixable)
"space-before-keywords": 0,
// require or disallow spaces inside parentheses
"space-in-parens": [2, "never"],
// require spaces around operators
"space-infix-ops": 2,
// require a space after return, throw, and case
"space-return-throw-case": 0,
// Require or disallow spaces before/after unary operators
"space-unary-ops": 0,
// require or disallow a space immediately following the // or /* in a comment
Expand Down
8 changes: 2 additions & 6 deletions rules/eslint/style/gulp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,16 @@ module.exports = {
"semi": [2, "always"],
// sort variables within the same declaration block
"sort-vars": 0,
// require a space after certain keywords
"space-after-keywords": [2, "always"],
// require a space before/after certain keywords
"keyword-spacing": [2, {"before": false, "after": true}],
// require or disallow space before blocks
"space-before-blocks": 0,
// require or disallow space before function opening parenthesis
"space-before-function-paren": 0,
// require a space before certain keywords (fixable)
"space-before-keywords": 0,
// require or disallow spaces inside parentheses
"space-in-parens": 0,
// require spaces around operators
"space-infix-ops": 0,
// require a space after return, throw, and case
"space-return-throw-case": 0,
// Require or disallow spaces before/after unary operators
"space-unary-ops": 2,
// require or disallow a space immediately following the // or /* in a comment
Expand Down
8 changes: 2 additions & 6 deletions rules/eslint/style/node-runtime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,16 @@ module.exports = {
"semi": 2,
// sort variables within the same declaration block
"sort-vars": 0,
// require a space after certain keywords
"space-after-keywords": 2,
// require a space before/after certain keywords
"keyword-spacing": [2, {"before": false, "after": true}],
// require or disallow space before blocks
"space-before-blocks": [2, "always"],
// require or disallow space before function opening parenthesis
"space-before-function-paren": [2, "never"],
// require a space before certain keywords (fixable)
"space-before-keywords": 0,
// require or disallow spaces inside parentheses
"space-in-parens": [2, "never"],
// require spaces around operators
"space-infix-ops": 2,
// require a space after return, throw, and case
"space-return-throw-case": 2,
// Require or disallow spaces before/after unary operators
"space-unary-ops": 2,
// require or disallow a space immediately following the // or /* in a comment
Expand Down
8 changes: 2 additions & 6 deletions rules/eslint/style/off.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,16 @@ module.exports = {
"semi": 0,
// sort variables within the same declaration block
"sort-vars": 0,
// require a space after certain keywords
"space-after-keywords": 0,
// require a space before/after certain keywords
"keyword-spacing": 0,
// require or disallow space before blocks
"space-before-blocks": 0,
// require or disallow space before function opening parenthesis
"space-before-function-paren": 0,
// require a space before certain keywords (fixable)
"space-before-keywords": 0,
// require or disallow spaces inside parentheses
"space-in-parens": 0,
// require spaces around operators
"space-infix-ops": 0,
// require a space after return, throw, and case
"space-return-throw-case": 0,
// Require or disallow spaces before/after unary operators
"space-unary-ops": 0,
// require or disallow a space immediately following the // or /* in a comment
Expand Down
8 changes: 2 additions & 6 deletions rules/eslint/style/walmart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,16 @@ module.exports = {
"semi": 2,
// sort variables within the same declaration block
"sort-vars": 0,
// require a space after certain keywords
"space-after-keywords": [2, "always"],
// require a space before/after certain keywords
"keyword-spacing": [2, {"before": true, "after": true}],
// require or disallow space before blocks
"space-before-blocks": [2, "always"],
// require or disallow space before function opening parenthesis
"space-before-function-paren": [2, {"anonymous": "always", "named": "never" }],
// require a space before certain keywords (fixable)
"space-before-keywords": [2, "always"],
// require or disallow spaces inside parentheses
"space-in-parens": [2, "never"],
// require spaces around operators
"space-infix-ops": 2,
// require a space after return, throw, and case
"space-return-throw-case": 2,
// Require or disallow spaces before/after unary operators
"space-unary-ops": [2, { "words": true, "nonwords": false }],
// require or disallow a space immediately following the // or /* in a comment
Expand Down