summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Wu2017-02-17 01:17:01 +0800
committerGitHub2017-02-17 01:17:01 +0800
commit91949be65148477b21dbb1fe45e2062dbea0a5e8 (patch)
treef76fd8ff38285c2558beafc6e5ec8f6a270d0e7b
parente19712321fc9358429d5f2a67fb1e5556d08bbba (diff)
parent40dfffd4f47a72549fb52d39a25c630551e761fc (diff)
Merge pull request #359 from bananaappletw/master
Add travis ci
-rw-r--r--.eslintignore1
-rw-r--r--.travis.yml13
-rw-r--r--README.md10
-rw-r--r--package.json5
4 files changed, 26 insertions, 3 deletions
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/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..ed8ab42f
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: node_js
+node_js:
+ - 6
+ - 7
+ - stable
+env:
+ - CXX=g++-4.8
+addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - g++-4.8
diff --git a/README.md b/README.md
index 7991117b..2afeba26 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
HackMD
===
-[![Join the chat at https://gitter.im/hackmdio/hackmd](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hackmdio/hackmd?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://gitter.im/hackmdio/hackmd][gitter-image]][gitter-url]
+[![build status][travis-image]][travis-url]
+
HackMD lets you create realtime collaborative markdown notes on all platforms.
Inspired by Hackpad, with more focus on speed and flexibility.
@@ -48,7 +50,7 @@ Browsers Requirement
Prerequisite
---
-- Node.js 4.x or up (test up to 6.7.0)
+- Node.js 6.x or up (test up to 7.5.0)
- Database (PostgreSQL, MySQL, MariaDB, SQLite, MSSQL) use charset `utf8`
- npm (and its dependencies, especially [uWebSockets](https://github.com/uWebSockets/uWebSockets#nodejs-developers), [node-gyp](https://github.com/nodejs/node-gyp#installation))
@@ -222,3 +224,7 @@ Additionally, now can show other clients' selections.
See more at [http://operational-transformation.github.io/](http://operational-transformation.github.io/)
**License under MIT.**
+[gitter-image]: https://badges.gitter.im/Join%20Chat.svg
+[gitter-url]: https://gitter.im/hackmdio/hackmd?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+[travis-image]: https://travis-ci.org/hackmdio/hackmd.svg?branch=master
+[travis-url]: https://travis-ci.org/hackmdio/hackmd
diff --git a/package.json b/package.json
index d5e8e55c..a179d93e 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,8 @@
"main": "app.js",
"license": "MIT",
"scripts": {
+ "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",
@@ -120,7 +122,7 @@
"xss": "^0.3.3"
},
"engines": {
- "node": ">=4.x"
+ "node": ">=6.x"
},
"bugs": "https://github.com/hackmdio/hackmd/issues",
"keywords": [
@@ -150,6 +152,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",