From cd0e4b1acfbd4cc393f6cfcab718d66e25193fbd Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sat, 21 May 2016 15:21:15 +0200 Subject: [PATCH] Move livereload to an external script and remove from express. Developers have to use the livereload plugin in their web browser now. --- package.json | 4 ++-- scripts/dev.sh | 1 - scripts/watch/client/livereload.sh | 3 +++ scripts/watch/client/sass.sh | 2 +- server.js | 5 ----- 5 files changed, 6 insertions(+), 9 deletions(-) create mode 100755 scripts/watch/client/livereload.sh diff --git a/package.json b/package.json index f72aec9f0..a6c4d0e57 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "clean:client:tsc": "scripty", "clean:server:test": "scripty", "watch:client": "SCRIPTY_PARALLEL=true scripty", + "watch:client:livereload": "scripty", "watch:client:sass": "scripty", "watch:client:tsc": "scripty", "danger:clean:server": "scripty", @@ -45,7 +46,6 @@ "body-parser": "^1.12.4", "concurrently": "^2.0.0", "config": "^1.14.0", - "connect-livereload": "^0.5.3", "debug": "^2.2.0", "dezalgo": "^1.0.3", "electron-spawn": "https://github.com/Chocobozzz/electron-spawn", @@ -73,8 +73,8 @@ }, "devDependencies": { "chai": "^3.3.0", + "livereload": "^0.4.1", "mocha": "^2.3.3", - "node-livereload": "^0.6.0", "node-sass": "^3.4.2", "scripty": "^1.5.0", "standard": "^7.0.1", diff --git a/scripts/dev.sh b/scripts/dev.sh index d617cd511..ddb5b8d33 100755 --- a/scripts/dev.sh +++ b/scripts/dev.sh @@ -2,6 +2,5 @@ npm run build NODE_ENV=test concurrently \ - "npm run livereload" \ "npm run watch:client" \ "npm start" diff --git a/scripts/watch/client/livereload.sh b/scripts/watch/client/livereload.sh new file mode 100755 index 000000000..a4acc439c --- /dev/null +++ b/scripts/watch/client/livereload.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env sh + +livereload client/angular -e scss diff --git a/scripts/watch/client/sass.sh b/scripts/watch/client/sass.sh index 7d716cb7c..22c536e38 100755 --- a/scripts/watch/client/sass.sh +++ b/scripts/watch/client/sass.sh @@ -3,5 +3,5 @@ cd client || exit -1 concurrently \ - "node-sass -w --include-path node_modules/bootstrap-sass/assets/stylesheets/ stylesheets/application.scss stylesheets/index.css client/angular/**/ client/angular/**/**" \ + "node-sass -w --include-path node_modules/bootstrap-sass/assets/stylesheets/ stylesheets/application.scss stylesheets/index.css" \ "node-sass -w angular/ --output angular/" diff --git a/server.js b/server.js index 989c60477..024ce10f8 100644 --- a/server.js +++ b/server.js @@ -56,11 +56,6 @@ app.use(expressValidator({ // ----------- Views, routes and static files ----------- -// Livereload -app.use(require('connect-livereload')({ - port: 35729 -})) - // Catch sefaults require('segfault-handler').registerHandler() -- 2.25.1