diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-11-10 10:17:27 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-11-10 10:17:27 -0500 |
| commit | 0980859042784082062c375a48e31b2465cf342e (patch) | |
| tree | 6daabf05e09daaee316bc06e3f23c8111fb2e41e | |
| parent | f95c6e9e818f71bc27226c522749a11641ae9291 (diff) | |
| parent | 46754509e818ad08e88206f94e72188ba256bc68 (diff) | |
| download | chat-0980859042784082062c375a48e31b2465cf342e.tar.gz chat-0980859042784082062c375a48e31b2465cf342e.tar.bz2 chat-0980859042784082062c375a48e31b2465cf342e.zip | |
Merge pull request #1365 from hmhealey/eslintbabel
Switched eslint to use babel-eslint parser
| -rw-r--r-- | web/react/.eslintrc | 1 | ||||
| -rw-r--r-- | web/react/package.json | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/web/react/.eslintrc b/web/react/.eslintrc index d78068882..7c98a2f0b 100644 --- a/web/react/.eslintrc +++ b/web/react/.eslintrc @@ -8,6 +8,7 @@ "arrowFunctions": true, "defaultParams": true, }, + "parser": "babel-eslint", "plugins": [ "react" ], diff --git a/web/react/package.json b/web/react/package.json index 9af6f5880..de59b48ac 100644 --- a/web/react/package.json +++ b/web/react/package.json @@ -18,7 +18,8 @@ "uglify-js": "2.4.24", "watchify": "3.4.0", "eslint": "1.6.0", - "eslint-plugin-react": "3.5.1" + "eslint-plugin-react": "3.5.1", + "babel-eslint": "4.1.4" }, "scripts": { "check": "", |