From 4198d0d56060117e0806389f26eed4e65c4d37a6 Mon Sep 17 00:00:00 2001 From: bananaappletw Date: Wed, 15 Feb 2017 18:14:58 +0800 Subject: [PATCH 1/5] Add travis ci --- .travis.yml | 13 +++++++++++++ Makefile | 3 +++ README.md | 10 ++++++++-- package.json | 2 ++ 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 .travis.yml create mode 100644 Makefile diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..ed8ab42 --- /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/Makefile b/Makefile new file mode 100644 index 0000000..b9afabe --- /dev/null +++ b/Makefile @@ -0,0 +1,3 @@ +lint: + @./node_modules/.bin/eslint . +.PHONY: lint diff --git a/README.md b/README.md index 7991117..05b13f8 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 6.7.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 d5e8e55..ad629d1 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", From 327ab411ac93a34459e025f30b7792f5d886554a Mon Sep 17 00:00:00 2001 From: bananaappletw Date: Wed, 15 Feb 2017 19:16:36 +0800 Subject: [PATCH 2/5] Add Makefile .editorconfig --- .editorconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.editorconfig b/.editorconfig index 619c178..ff999c4 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,3 +13,5 @@ trim_trailing_whitespace = false [{.travis.yml,npm-shrinkwrap.json,package.json}] indent_style = space indent_size = 2 +[Makefile] +indent_style = tab From af783b2746c86c33558604654403bfc31798b273 Mon Sep 17 00:00:00 2001 From: bananaappletw Date: Wed, 15 Feb 2017 19:17:51 +0800 Subject: [PATCH 3/5] Update node dependency up to 6.x in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ad629d1..2a40bf0 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": [ From c48ba0ad48d5daa3663aeb929967fa9fc0e8c4dc Mon Sep 17 00:00:00 2001 From: bananaappletw Date: Wed, 15 Feb 2017 22:09:09 +0800 Subject: [PATCH 4/5] Test up to 7.5.0 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 05b13f8..2afeba2 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Browsers Requirement Prerequisite --- -- Node.js 6.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)) From 40dfffd4f47a72549fb52d39a25c630551e761fc Mon Sep 17 00:00:00 2001 From: bananaappletw Date: Thu, 16 Feb 2017 12:27:17 +0800 Subject: [PATCH 5/5] Using package.json to test lint instead Exclude *.min.js from eslint --- .editorconfig | 2 -- .eslintignore | 1 + Makefile | 3 --- package.json | 3 ++- 4 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 .eslintignore delete mode 100644 Makefile diff --git a/.editorconfig b/.editorconfig index ff999c4..619c178 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 0000000..121531a --- /dev/null +++ b/.eslintignore @@ -0,0 +1 @@ +*.min.js diff --git a/Makefile b/Makefile deleted file mode 100644 index b9afabe..0000000 --- a/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -lint: - @./node_modules/.bin/eslint . -.PHONY: lint diff --git a/package.json b/package.json index 2a40bf0..a179d93 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",