couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject [2/5] fauxton commit: updated refs/heads/master to 5be2610
Date Tue, 28 Jun 2016 14:46:11 GMT
upgrade eslint @ 2.x

PR: #734
PR-URL: https://github.com/apache/couchdb-fauxton/pull/734
Reviewed-By: garren smith <garren.smith@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/ad2cbecf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/ad2cbecf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/ad2cbecf

Branch: refs/heads/master
Commit: ad2cbecf5c9de9d0a7f7bfdcd287cd98a25229df
Parents: 968f714
Author: Robert Kowalski <rok@kowalski.gd>
Authored: Tue Jun 21 15:34:35 2016 +0200
Committer: Robert Kowalski <robertkowalski@apache.org>
Committed: Tue Jun 28 16:45:08 2016 +0200

----------------------------------------------------------------------
 .eslintrc    | 19 +++++++++++--------
 package.json |  3 ++-
 2 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ad2cbecf/.eslintrc
----------------------------------------------------------------------
diff --git a/.eslintrc b/.eslintrc
index d94a612..c344a00 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,10 +1,9 @@
 {
   "root": true,
 
-  "ecmaFeatures": {
-    "jsx": true,
-    "modules": true
-  },
+  "plugins": [
+    "react"
+  ],
 
   "rules-todo": {
     "space-in-parens": 2,
@@ -15,11 +14,8 @@
   "rules": {
     "semi": [2, "always"],
     "no-undef": 2,
-    "space-after-keywords": 2,
-    "space-before-keywords": 2,
-    "space-before-function-paren": 2,
+    "keyword-spacing": 2,
     "space-infix-ops": 2,
-    "space-return-throw-case": 2,
     "space-before-blocks": 2,
     "array-bracket-spacing": [2, "never"],
     "brace-style": [2, "1tbs", { "allowSingleLine": true }],
@@ -32,6 +28,13 @@
     "no-empty": 2
   },
 
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "jsx": true
+    }
+  },
+
   "env": {
     "browser": true,
     "node": true,

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ad2cbecf/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 661f18f..1fba1e0 100644
--- a/package.json
+++ b/package.json
@@ -42,8 +42,9 @@
     "couchapp": "~0.11.0",
     "css-loader": "^0.23.1",
     "d3": "^3.4.11",
-    "eslint": "^1.6.0",
+    "eslint": "^2.0.0",
     "eslint-loader": "^1.3.0",
+    "eslint-plugin-react": "^5.2.2",
     "exports-loader": "^0.6.2",
     "expose-loader": "^0.7.1",
     "express": "^4.13.4",


Mime
View raw message