Move livereload to an external script and remove from express.

Developers have to use the livereload plugin in their web browser now.

diff --git a/package.json b/package.json
index f72aec9f01d6dd92d8acc6a5d440b16cd62ee936..a6c4d0e57cd58a42a6e3c4bab1f9e88e6ec16bbd 100644 (file)
--- 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 d617cd511d89b685aa81890e608cefff557fff55..ddb5b8d33c65e85048a507ea7c3a1ff2c4de51a4 100755 (executable)
--- 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 (executable)
index 0000000..a4acc43
--- /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 7d716cb7cbc9bff48841586a7c0a507460a313ba..22c536e383f3ddba85057c00767ea6988d509d1c 100755 (executable)
--- 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 989c60477d14ea38b5f7ba025b7155b39052ca3f..024ce10f86c87246b97a9e5d875ce859a652d729 100644 (file)
--- 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()