Skip to content

Commit f985e92

Browse files
committed
feat(serve): server reload handled by dedicated dependency
1 parent 85b34de commit f985e92

File tree

4 files changed

+7
-32
lines changed

4 files changed

+7
-32
lines changed

app/templates/_.gitignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ client/bower_components/
33
client/styles/css
44
.idea/
55
dist/
6-
.sass-cache/
7-
.bangular-refresh<% if (filters.hasDocs) { %>
6+
.sass-cache/<% if (filters.hasDocs) { %>
87
docs/<% } %>

app/templates/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@
6262
"morgan": "^1.5.1"<% if (filters.auth) { %>,
6363
"passport": "^0.2.1",
6464
"passport-local": "^1.0.0"<% } %><% if (filters.backend === 'restock') { %>,
65-
"request": "^2.51.1"<% } %><% if (filters.sockets) { %>,
65+
"request": "^2.51.1"<% } %>,
66+
"ripe": "^0.1.1"<% if (filters.sockets) { %>,
6667
"socket.io": "^1.3.5"<% } %>
6768
},
6869
"scripts": {

app/templates/server/server.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ server.listen(config.port, config.ip, function () {
2828
);
2929

3030
if (config.env === 'development') {
31-
require('fs').writeFileSync('.bangular-refresh', 'done');
31+
require('ripe').ready();
3232
}
3333

3434
});

app/templates/tasks/serve.js

+3-28
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
var gulp = require('gulp');
8-
var fs = require('fs');
8+
var ripe = require('ripe');
99
var nodemon = require('gulp-nodemon');
1010
var open = require('gulp-open');<% if (filters.reload === 'livereload') { %>
1111
var livereload = require('gulp-livereload');<% } else { %>
@@ -18,29 +18,6 @@ var openOpts = {
1818
already: false
1919
};
2020

21-
function waitForExpress (cb) {
22-
var id;
23-
24-
id = setInterval(function () {
25-
fs.readFile('.bangular-refresh', 'utf-8', function (err, status) {
26-
if (err) {
27-
if (err.code === 'ENOENT') {
28-
clearTimeout(id);
29-
return fs.writeFileSync('.bangular-refresh', 'waiting');
30-
}
31-
throw err;
32-
}
33-
if (status === 'done') {
34-
fs.unlink('.bangular-refresh', function (err) {
35-
if (err) { throw err; }
36-
clearTimeout(id);
37-
cb();
38-
});
39-
}
40-
});
41-
}, 100);
42-
}
43-
4421
module.exports = {
4522

4623
nodemon: function (<% if (filters.reload === 'browsersync') { %>cb<% } %>) {
@@ -50,16 +27,14 @@ module.exports = {
5027
ignore: ['client', 'dist', 'node_modules', 'gulpfile.js']
5128
})
5229
.on('start', function () {
53-
fs.writeFileSync('.bangular-refresh', 'waiting');
54-
5530
if (!openOpts.already) {
5631
openOpts.already = true;
57-
waitForExpress(<% if (filters.reload === 'livereload') { %>function () {
32+
ripe.wait(<% if (filters.reload === 'livereload') { %>function () {
5833
gulp.src('client/index.html')
5934
.pipe(open('', openOpts));
6035
}<% } else { %>cb<% } %>);
6136
} else {
62-
waitForExpress(function () {<% if (filters.reload === 'livereload') { %>
37+
ripe.wait(function () {<% if (filters.reload === 'livereload') { %>
6338
livereload.changed('/');<% } else { %>
6439
bsync.reload({ stream: false });<% } %>
6540
});

0 commit comments

Comments
 (0)