summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbananaappletw2017-02-16 12:27:17 +0800
committerbananaappletw2017-02-16 13:05:46 +0800
commit40dfffd4f47a72549fb52d39a25c630551e761fc (patch)
treef76fd8ff38285c2558beafc6e5ec8f6a270d0e7b
parentc48ba0ad48d5daa3663aeb929967fa9fc0e8c4dc (diff)
Using package.json to test lint instead
Exclude *.min.js from eslint
-rw-r--r--.editorconfig2
-rw-r--r--.eslintignore1
-rw-r--r--Makefile3
-rw-r--r--package.json3
4 files changed, 3 insertions, 6 deletions
diff --git a/.editorconfig b/.editorconfig
index ff999c4d..619c178d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,5 +13,3 @@ trim_trailing_whitespace = false
[{.travis.yml,npm-shrinkwrap.json,package.json}]
indent_style = space
indent_size = 2
-[Makefile]
-indent_style = tab
diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 00000000..121531af
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+*.min.js
diff --git a/Makefile b/Makefile
deleted file mode 100644
index b9afabe9..00000000
--- a/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-lint:
- @./node_modules/.bin/eslint .
-.PHONY: lint
diff --git a/package.json b/package.json
index 2a40bf05..a179d93e 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,8 @@
"main": "app.js",
"license": "MIT",
"scripts": {
- "test": "make lint",
+ "test": "npm run-script lint",
+ "lint": "eslint .",
"dev": "webpack --config webpack.config.js --progress --colors --watch",
"build": "webpack --config webpack.production.js --progress --colors",
"postinstall": "bin/heroku",