From a5476e523f80fde717e445ebe69a06ce55ca3d73 Mon Sep 17 00:00:00 2001 From: Alexander Ryzhikov Date: Sun, 15 Dec 2019 08:29:26 +0200 Subject: [PATCH 1/7] watch symlinked packages dirs --- lib/bsb | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/lib/bsb b/lib/bsb index 0a9f739066..343d911675 100755 --- a/lib/bsb +++ b/lib/bsb @@ -249,8 +249,37 @@ if (watch_mode) { var sourcedirs = path.join('lib', 'bs', '.sourcedirs.json') var watch_generated = [] + function getDirsForRelativeSymlinkedPackages (pkgs) { + pkgs = pkgs.slice() + var watched_dirs = [] + var visited = {} + var pkg + var cwd = process.cwd() + //noinspection JSAssignmentUsedAsCondition + while (pkg = pkgs.shift()) { + var pkg_dir = pkg[1] + var stats = fs.lstatSync(pkg_dir) + if (!stats.isSymbolicLink()) continue + pkg_dir = fs.realpathSync(pkg[1]) + if (visited[pkg_dir]) continue + if (pkg_dir.indexOf(cwd) !== 0) continue + visited[pkg_dir] = true + var pkg_sourcedirs = path.join(pkg_dir, sourcedirs) + var watch_files = getWatchFiles(pkg_sourcedirs) + var dirs = watch_files.dirs + for (var i = 0; i < dirs.length; i++) { + var dir = path.join(pkg_dir, dirs[i]) + if (fs.existsSync(dir)) { + watched_dirs.push(dir) + } + } + pkgs.push.apply(pkgs, watch_files.pkgs) + } + return watched_dirs + } + function watch_build(watch_config) { - var watch_files = watch_config.dirs + var watch_files = watch_config.dirs.concat(getDirsForRelativeSymlinkedPackages(watch_config.pkgs)) watch_generated = watch_config.generated // close and remove all unused watchers watchers = watchers.filter(function (watcher) { @@ -411,7 +440,7 @@ if (watch_mode) { if (fs.existsSync(file)) { return JSON.parse(fs.readFileSync(file, 'utf8')) } else { - return { dirs: [], generated: [] } + return { dirs: [], pkgs: [], generated: [] } } } From 07f958f5dcf59d75677c1405905603b588983600 Mon Sep 17 00:00:00 2001 From: Alexander Ryzhikov Date: Sun, 15 Dec 2019 08:56:33 +0200 Subject: [PATCH 2/7] remote relative cwd check and add -make-world to rebuild arguments --- lib/bsb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/bsb b/lib/bsb index 343d911675..d55346cb15 100755 --- a/lib/bsb +++ b/lib/bsb @@ -262,7 +262,6 @@ if (watch_mode) { if (!stats.isSymbolicLink()) continue pkg_dir = fs.realpathSync(pkg[1]) if (visited[pkg_dir]) continue - if (pkg_dir.indexOf(cwd) !== 0) continue visited[pkg_dir] = true var pkg_sourcedirs = path.join(pkg_dir, sourcedirs) var watch_files = getWatchFiles(pkg_sourcedirs) @@ -411,7 +410,7 @@ if (watch_mode) { } reasons_to_rebuild = []; var p = child_process - .spawn(bsb_exe, [], { stdio: ['inherit', 'inherit', 'pipe'] }); + .spawn(bsb_exe, ['-make-world'], { stdio: ['inherit', 'inherit', 'pipe'] }); p.on('exit', build_finished_callback) p.stderr .setEncoding('utf8') From f8e233db32dd0c49737e8ebddb0bec228ef49456 Mon Sep 17 00:00:00 2001 From: Alexander Ryzhikov Date: Sun, 15 Dec 2019 09:05:18 +0200 Subject: [PATCH 3/7] use delegate_args for rebuild args --- lib/bsb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bsb b/lib/bsb index d55346cb15..31c506eaef 100755 --- a/lib/bsb +++ b/lib/bsb @@ -410,7 +410,7 @@ if (watch_mode) { } reasons_to_rebuild = []; var p = child_process - .spawn(bsb_exe, ['-make-world'], { stdio: ['inherit', 'inherit', 'pipe'] }); + .spawn(bsb_exe, delegate_args, { stdio: ['inherit', 'inherit', 'pipe'] }); p.on('exit', build_finished_callback) p.stderr .setEncoding('utf8') From 115bd273b74b1a3306f07993609107327282283f Mon Sep 17 00:00:00 2001 From: Alexander Ryzhikov Date: Sun, 15 Dec 2019 09:15:48 +0200 Subject: [PATCH 4/7] use watch_mode_delegate_args for rebuild args --- lib/bsb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/bsb b/lib/bsb index 31c506eaef..a32c7c72c4 100755 --- a/lib/bsb +++ b/lib/bsb @@ -102,6 +102,7 @@ function setUpWebSocket() { * @type {string[]} */ var delegate_args = [] +var watch_mode_delegate_args = [] var process_argv = process.argv for (var i = 2; i < process_argv.length; ++i) { var current = process_argv[i] @@ -123,7 +124,9 @@ for (var i = 2; i < process_argv.length; ++i) { watch_mode = true } else if (current === "-verbose") { verbose = true - + watch_mode_delegate_args.push(current); + } else { + watch_mode_delegate_args.push(current); } } } @@ -410,7 +413,7 @@ if (watch_mode) { } reasons_to_rebuild = []; var p = child_process - .spawn(bsb_exe, delegate_args, { stdio: ['inherit', 'inherit', 'pipe'] }); + .spawn(bsb_exe, watch_mode_delegate_args, { stdio: ['inherit', 'inherit', 'pipe'] }); p.on('exit', build_finished_callback) p.stderr .setEncoding('utf8') From 01938df9b7c4eb3314b664d28913ae41ed2e32d4 Mon Sep 17 00:00:00 2001 From: Alexander Ryzhikov Date: Sun, 15 Dec 2019 09:24:20 +0200 Subject: [PATCH 5/7] use setImmediate for rebuilding in on_change callback Some editors are using temporary files to store edits. This results in two sync change events: change + rename and two sync builds. Using setImmediate will ensure that only one build done. --- lib/bsb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/bsb b/lib/bsb index a32c7c72c4..82ce7d21a5 100755 --- a/lib/bsb +++ b/lib/bsb @@ -431,10 +431,12 @@ if (watch_mode) { if (validEvent(event, reason)) { dlog(`Event ${event} ${reason}`); reasons_to_rebuild.push([event, reason]) - if (needRebuild()) { - if (process.env.BS_WATCH_CLEAR && console.clear) {console.clear()} - build() - } + setImmediate(() => { + if (needRebuild()) { + if (process.env.BS_WATCH_CLEAR && console.clear) {console.clear()} + build() + } + }) } } From dca0bb164653eb719b00a6b975ce07d7b5b0c3cb Mon Sep 17 00:00:00 2001 From: Alexander Ryzhikov Date: Sun, 15 Dec 2019 09:25:23 +0200 Subject: [PATCH 6/7] add comment about setImmediate usage reason --- lib/bsb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/bsb b/lib/bsb index 82ce7d21a5..334b5dc6a4 100755 --- a/lib/bsb +++ b/lib/bsb @@ -431,6 +431,9 @@ if (watch_mode) { if (validEvent(event, reason)) { dlog(`Event ${event} ${reason}`); reasons_to_rebuild.push([event, reason]) + // Some editors are using temporary files to store edits. + // This results in two sync change events: change + rename and two sync builds. + // Using setImmediate will ensure that only one build done. setImmediate(() => { if (needRebuild()) { if (process.env.BS_WATCH_CLEAR && console.clear) {console.clear()} From cc13e071ccb41a1835fe0b5a68c4e3a2f7a5d9a3 Mon Sep 17 00:00:00 2001 From: Alexander Ryzhikov Date: Sun, 15 Dec 2019 09:26:55 +0200 Subject: [PATCH 7/7] cleanup --- lib/bsb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bsb b/lib/bsb index 334b5dc6a4..6b642d54de 100755 --- a/lib/bsb +++ b/lib/bsb @@ -124,9 +124,9 @@ for (var i = 2; i < process_argv.length; ++i) { watch_mode = true } else if (current === "-verbose") { verbose = true - watch_mode_delegate_args.push(current); + watch_mode_delegate_args.push(current) } else { - watch_mode_delegate_args.push(current); + watch_mode_delegate_args.push(current) } } }