@@ -13,7 +13,6 @@ var path = require("path");
13
13
var fs = require ( "fs" ) ;
14
14
var bsc_exe = require ( "./scripts/bin_path" ) . bsc_exe ;
15
15
var rescript_exe = require ( "./scripts/bin_path" ) . rescript_exe ;
16
- var bsconfig = "bsconfig.json" ;
17
16
18
17
var LAST_BUILD_START = 0 ;
19
18
var LAST_FIRED_EVENT = 0 ;
@@ -28,12 +27,19 @@ var lockFileName = path.join(cwd, ".bsb.lock");
28
27
process . env . BSB_PROJECT_ROOT = cwd ;
29
28
// console.log('BSB_PROJECT_ROOT:', process.env.BSB_PROJECT_ROOT)
30
29
30
+ var bsConfig = "bsconfig.json"
31
+ var resConfig = "rescript.json" ;
32
+ var resConfigFile = path . join ( cwd , resConfig ) ;
33
+ if ( ! fs . existsSync ( resConfigFile ) ) {
34
+ resConfig = bsConfig ;
35
+ resConfigFile = path . join ( cwd , bsConfig ) ;
36
+ }
37
+
31
38
// If the project uses gentype and uses custom file extension
32
39
// via generatedFileExtension, ignore them in watch mode
33
- var bsConfigFile = path . join ( cwd , bsconfig ) ;
34
40
var genTypeFileExtension = undefined ;
35
41
36
- if ( fs . existsSync ( bsConfigFile ) ) {
42
+ if ( fs . existsSync ( resConfigFile ) ) {
37
43
var genTypeConfig = require ( bsConfigFile ) . gentypeconfig
38
44
if ( genTypeConfig ) {
39
45
genTypeFileExtension = genTypeConfig . generatedFileExtension
373
379
watch_generated = watch_config . generated ;
374
380
// close and remove all unused watchers
375
381
watchers = watchers . filter ( function ( watcher ) {
376
- if ( watcher . dir === bsconfig ) {
382
+ if ( watcher . dir === resConfig ) {
377
383
return true ;
378
384
} else if ( watch_files . indexOf ( watcher . dir ) < 0 ) {
379
385
dlog ( `${ watcher . dir } is no longer watched` ) ;
583
589
}
584
590
}
585
591
586
- watchers . push ( { watcher : fs . watch ( bsconfig , on_change ) , dir : bsconfig } ) ;
592
+ watchers . push ( { watcher : fs . watch ( resConfig , on_change ) , dir : resConfig } ) ;
587
593
build ( 0 ) ;
588
594
}
589
595
}
0 commit comments