Skip to content

Commit d1c2614

Browse files
committed
fix(exit): Don't exit the process when .exit() is called.
Bump emitter-steward to allow use of it's `.destroy()` method Bump Browsersync ui to inherit fixes re: setInterval Move server.close() from the cleanup function to instead sit beside `.listen()` is called
1 parent e07996e commit d1c2614

6 files changed

Lines changed: 8 additions & 10 deletions

File tree

lib/browser-sync.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -699,12 +699,6 @@ BrowserSync.prototype.cleanup = function (cb) {
699699
return;
700700
}
701701

702-
// Close any servers
703-
if (bs.server) {
704-
bs.debug("Closing server...");
705-
bs.server.close();
706-
}
707-
708702
// Remove all event listeners
709703
if (bs.events) {
710704
bs.debug("Removing event listeners...");

lib/file-watcher.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ module.exports.plugin = function (bs) {
3737
var jsItem = glob.toJS();
3838

3939
if (jsItem.globs.length) {
40+
var watcher = watch(jsItem.globs, defaultWatchOptions, fn);
4041
map[namespace] = {
41-
watchers: [watch(jsItem.globs, defaultWatchOptions, fn)]
42+
watchers: [watcher]
4243
};
4344
}
4445

lib/public/exit.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ module.exports = function (browserSync) {
1111
browserSync.events.emit("service:exit");
1212
browserSync.cleanup();
1313
}
14-
process.exit();
1514
}
1615

1716
process.on("SIGINT", exit);

lib/server/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ module.exports.plugin = function (bs, scripts) {
2222

2323
if (bsServer) {
2424
bsServer.server.listen(bs.options.get("port"));
25+
bs.registerCleanupTask(function () {
26+
bsServer.server.close();
27+
});
2528
}
2629

2730
debug("Running mode: %s", type.toUpperCase());

lib/sockets.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ module.exports.init = function (server, clientEvents, bs) {
4444
io.set("heartbeat interval", socketConfig.clients.heartbeatTimeout);
4545

4646
var steward = new Steward(emitter);
47+
bs.registerCleanupTask(steward.destroy.bind(steward));
4748

4849
/**
4950
* Listen for new connections

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
"anymatch": "^1.3.0",
3434
"async-each-series": "^0.1.1",
3535
"browser-sync-client": "^2.3.0",
36-
"browser-sync-ui": "^0.5.15",
36+
"browser-sync-ui": "^0.5.16",
3737
"chokidar": "^1.0.5",
3838
"connect": "^3.4.0",
3939
"dev-ip": "^1.0.1",
4040
"easy-extender": "^2.3.1",
4141
"eazy-logger": "^2.1.2",
42-
"emitter-steward": "^0.0.1",
42+
"emitter-steward": "^1.0.0",
4343
"foxy": "^11.1.2",
4444
"immutable": "^3.7.4",
4545
"localtunnel": "^1.7.0",

0 commit comments

Comments
 (0)