allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hei...@apache.org
Subject [48/50] allura git commit: [#8035] Update default eslint rules to xo/browser
Date Wed, 27 Jan 2016 20:23:02 GMT
[#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/03f02e77
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/03f02e77
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/03f02e77

Branch: refs/heads/hs/8035
Commit: 03f02e77b74307f6bc9843b81ad510a5186a26fd
Parents: 817d26f
Author: Heith Seewald <heiths@gmail.com>
Authored: Tue Jan 26 15:06:56 2016 -0500
Committer: Heith Seewald <heiths@gmail.com>
Committed: Wed Jan 27 15:21:33 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/03f02e77/.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/03f02e77/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/03f02e77/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"


Mime
View raw message