You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/02/05 21:42:19 UTC
[24/30] allura git commit: [#8035] Update default eslint rules to
xo/browser
[#8035] Update default eslint rules to xo/browser
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/0b41f838
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/0b41f838
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/0b41f838
Branch: refs/heads/master
Commit: 0b41f838d76052888e6caec1596430125b75e462
Parents: db42480
Author: Heith Seewald <he...@gmail.com>
Authored: Tue Jan 26 15:06:56 2016 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Feb 5 14:37:21 2016 -0500
----------------------------------------------------------------------
.eslintrc-es6 | 7 +++++--
Allura/allura/public/nf/js/navbar.es6.js | 1 -
package.json | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/0b41f838/.eslintrc-es6
----------------------------------------------------------------------
diff --git a/.eslintrc-es6 b/.eslintrc-es6
index b91ed8f..4427a53 100644
--- a/.eslintrc-es6
+++ b/.eslintrc-es6
@@ -4,6 +4,7 @@
"indent": [2, 4],
"jsx-quotes": [0],
"quotes": [0],
+ "space-before-function-paren": [2, "never"],
"operator-linebreak": [2, "before", { "overrides": { "?": "after", "&&": "after" } }],
"require-jsdoc": [2, {"require": {
"FunctionDeclaration": true,
@@ -29,11 +30,13 @@
"env": {
"es6": true,
"jquery": true,
- "browser": true
+ "browser": true,
+ "node": false
},
- "extends": "google",
+ "extends": "xo/browser",
"ecmaFeatures": {
"jsx": true,
+ "modules": false,
"forOf": true,
"blockBindings": true,
"arrowFunctions": true,
http://git-wip-us.apache.org/repos/asf/allura/blob/0b41f838/Allura/allura/public/nf/js/navbar.es6.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/navbar.es6.js b/Allura/allura/public/nf/js/navbar.es6.js
index ab7bbb5..d52ccec 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -17,7 +17,6 @@
under the License.
*/
/* eslint camelcase: 0 */
-/* eslint no-unused-vars: [2, {"args": "none", "varsIgnorePattern": "Main"}] */
'use strict';
/**
http://git-wip-us.apache.org/repos/asf/allura/blob/0b41f838/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 3ae1bc9..8b238b0 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
"broccoli-timepiece": "^0.3.0",
"broccoli-uglify-js": "^0.1.3",
"eslint": "^1.10.3",
- "eslint-config-google": "^0.3.0",
+ "eslint-config-xo": "^0.9.2",
"eslint-plugin-html": "^1.2.0",
"eslint-plugin-react": "^3.15.0",
"esprima-fb": "^15001.1001.0-dev-harmony-fb"