about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMingye Wang <arthur200126@gmail.com>2017-04-21 10:43:57 -0400
committerEugen <eugen@zeonfederated.com>2017-04-21 16:43:57 +0200
commitb00f4a0cf3966dd4d16ba7bb357577c6034b3954 (patch)
treefd966d7354dae61992fba323fd92b7dee50e84b9
parenta0ed88a99b736cc786b048126580a7e73c68b07e (diff)
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)
-rw-r--r--.eslintrc.json (renamed from .eslintrc)0
-rw-r--r--package.json2
2 files changed, 1 insertions, 1 deletions
diff --git a/.eslintrc b/.eslintrc.json
index a3640b265..a3640b265 100644
--- a/.eslintrc
+++ b/.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": {