feat(serve): server reload handled by dedicated dependency

42Zavattas · Apr 22, 2015 · f985e92 · f985e92
1 parent 85b34de
commit f985e92
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 32 deletions.
diff --git a/app/templates/_.gitignore b/app/templates/_.gitignore
@@ -3,6 +3,5 @@ client/bower_components/
 client/styles/css
 .idea/
 dist/
-.sass-cache/
-.bangular-refresh<% if (filters.hasDocs) { %>
+.sass-cache/<% if (filters.hasDocs) { %>
 docs/<% } %>
diff --git a/app/templates/package.json b/app/templates/package.json
@@ -62,7 +62,8 @@
     "morgan": "^1.5.1"<% if (filters.auth) { %>,
     "passport": "^0.2.1",
     "passport-local": "^1.0.0"<% } %><% if (filters.backend === 'restock') { %>,
-    "request": "^2.51.1"<% } %><% if (filters.sockets) { %>,
+    "request": "^2.51.1"<% } %>,
+    "ripe": "^0.1.1"<% if (filters.sockets) { %>,
     "socket.io": "^1.3.5"<% } %>
   },
   "scripts": {

diff --git a/app/templates/server/server.js b/app/templates/server/server.js
@@ -28,7 +28,7 @@ server.listen(config.port, config.ip, function () {
   );
 
   if (config.env === 'development') {
-    require('fs').writeFileSync('.bangular-refresh', 'done');
+    require('ripe').ready();
   }
 
 });

diff --git a/app/templates/tasks/serve.js b/app/templates/tasks/serve.js
@@ -5,7 +5,7 @@
  */
 
 var gulp       = require('gulp');
-var fs         = require('fs');
+var ripe       = require('ripe');
 var nodemon    = require('gulp-nodemon');
 var open       = require('gulp-open');<% if (filters.reload === 'livereload') { %>
 var livereload = require('gulp-livereload');<% } else { %>
@@ -18,29 +18,6 @@ var openOpts = {
   already: false
 };
 
-function waitForExpress (cb) {
-  var id;
-
-  id = setInterval(function () {
-    fs.readFile('.bangular-refresh', 'utf-8', function (err, status) {
-      if (err) {
-        if (err.code === 'ENOENT') {
-          clearTimeout(id);
-          return fs.writeFileSync('.bangular-refresh', 'waiting');
-        }
-        throw err;
-      }
-      if (status === 'done') {
-        fs.unlink('.bangular-refresh', function (err) {
-          if (err) { throw err; }
-          clearTimeout(id);
-          cb();
-        });
-      }
-    });
-  }, 100);
-}
-
 module.exports = {
 
   nodemon: function (<% if (filters.reload === 'browsersync') { %>cb<% } %>) {
@@ -50,16 +27,14 @@ module.exports = {
         ignore: ['client', 'dist', 'node_modules', 'gulpfile.js']
       })
       .on('start', function () {
-        fs.writeFileSync('.bangular-refresh', 'waiting');
-
         if (!openOpts.already) {
           openOpts.already = true;
-          waitForExpress(<% if (filters.reload === 'livereload') { %>function () {
+          ripe.wait(<% if (filters.reload === 'livereload') { %>function () {
             gulp.src('client/index.html')
               .pipe(open('', openOpts));
           }<% } else { %>cb<% } %>);
         } else {
-          waitForExpress(function () {<% if (filters.reload === 'livereload') { %>
+          ripe.wait(function () {<% if (filters.reload === 'livereload') { %>
             livereload.changed('/');<% } else { %>
             bsync.reload({ stream: false });<% } %>
           });