From: Mingye Wang <arthur200126@gmail.com>
Date: Fri, 21 Apr 2017 14:43:57 +0000 (-0400)
Subject: Use new ESLint filename (.json) (#2248)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b00f4a0cf3966dd4d16ba7bb357577c6034b3954;p=mastodon.git

Use new ESLint filename (.json) (#2248)

* Use new ESLint filename (.json)

Codeclimate's ESLint 3 is complaining about the old filename. Let me try changing it.

* point eslint to new rc

(squash this)
---

diff --git a/.eslintrc b/.eslintrc.json
similarity index 100%
rename from .eslintrc
rename to .eslintrc.json
diff --git a/package.json b/package.json
index 120c620d7..c1dbc6e6c 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "start": "babel-node ./streaming/index.js --presets es2015,stage-2",
     "storybook": "start-storybook -p 9001 -c storybook",
     "test": "npm run test:lint && npm run test:mocha",
-    "test:lint": "eslint -c .eslintrc --ext=js --ext=jsx app/assets/javascripts/",
+    "test:lint": "eslint -c .eslintrc.json --ext=js --ext=jsx app/assets/javascripts/",
     "test:mocha": "mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.jsx"
   },
   "dependencies": {