logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: b00f4a0cf3966dd4d16ba7bb357577c6034b3954
parent: a0ed88a99b736cc786b048126580a7e73c68b07e
Author: Mingye Wang <arthur200126@gmail.com>
Date:   Fri, 21 Apr 2017 10:43:57 -0400

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)

Diffstat:

R.eslintrc -> .eslintrc.json0
Mpackage.json2+-
2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc b/.eslintrc.json diff --git 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": {