From 4198d0d56060117e0806389f26eed4e65c4d37a6 Mon Sep 17 00:00:00 2001
From: bananaappletw
Date: Wed, 15 Feb 2017 18:14:58 +0800
Subject: Add travis ci

---
 package.json | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'package.json')

diff --git a/package.json b/package.json
index d5e8e55c..ad629d1a 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
   "main": "app.js",
   "license": "MIT",
   "scripts": {
+    "test": "make lint",
     "dev": "webpack --config webpack.config.js --progress --colors --watch",
     "build": "webpack --config webpack.production.js --progress --colors",
     "postinstall": "bin/heroku",
@@ -150,6 +151,7 @@
     "copy-webpack-plugin": "^4.0.1",
     "css-loader": "^0.26.1",
     "ejs-loader": "^0.3.0",
+    "eslint": "^3.15.0",
     "exports-loader": "^0.6.3",
     "expose-loader": "^0.7.1",
     "extract-text-webpack-plugin": "^1.0.1",
-- 
cgit v1.2.3


From af783b2746c86c33558604654403bfc31798b273 Mon Sep 17 00:00:00 2001
From: bananaappletw
Date: Wed, 15 Feb 2017 19:17:51 +0800
Subject: Update node dependency up to 6.x in package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index ad629d1a..2a40bf05 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "xss": "^0.3.3"
   },
   "engines": {
-    "node": ">=4.x"
+    "node": ">=6.x"
   },
   "bugs": "https://github.com/hackmdio/hackmd/issues",
   "keywords": [
-- 
cgit v1.2.3


From 40dfffd4f47a72549fb52d39a25c630551e761fc Mon Sep 17 00:00:00 2001
From: bananaappletw
Date: Thu, 16 Feb 2017 12:27:17 +0800
Subject: Using package.json to test lint instead

Exclude *.min.js from eslint
---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'package.json')

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",
-- 
cgit v1.2.3