downstream rescript changes

Author: jfrolich

src/build.rs

@@ -73,7 +73,7 @@ pub fn get_compiler_args(
         rescript_version
     } else {
         let bsc_path = match bsc_path {
-            Some(bsc_path) => bsc_path,
+            Some(bsc_path) => helpers::get_abs_path(&bsc_path),
             None => helpers::get_bsc(&package_root, workspace_root.to_owned()),
         };
         helpers::get_rescript_version(&bsc_path)

src/build/clean.rs

@@ -344,7 +344,7 @@ pub fn clean(path: &str, show_progress: bool, bsc_path: Option<String>) -> Resul
     let packages = packages::make(&None, &project_root, &workspace_root, show_progress)?;
     let root_config_name = packages::read_package_name(&project_root)?;
     let bsc_path = match bsc_path {
-        Some(bsc_path) => bsc_path,
+        Some(bsc_path) => helpers::get_abs_path(&bsc_path),
         None => helpers::get_bsc(&project_root, workspace_root.to_owned()),
     };
 

src/main.rs

@@ -149,6 +149,7 @@ fn main() -> Result<()> {
                     args.after_build,
                     args.create_sourcedirs,
                     args.dev,
+                    args.bsc_path,
                 );
 
                 Ok(())

src/watcher.rs

@@ -54,9 +54,10 @@ async fn async_watch(
     after_build: Option<String>,
     create_sourcedirs: bool,
     build_dev_deps: bool,
+    bsc_path: Option<String>,
 ) -> notify::Result<()> {
-    let mut build_state =
-        build::initialize_build(None, filter, show_progress, path, None).expect("Can't initialize build");
+    let mut build_state = build::initialize_build(None, filter, show_progress, path, bsc_path.clone())
+        .expect("Can't initialize build");
     let mut needs_compile_type = CompileType::Incremental;
     // create a mutex to capture if ctrl-c was pressed
     let ctrlc_pressed = Arc::new(Mutex::new(false));
@@ -91,6 +92,20 @@ async fn async_watch(
         }
 
         for event in events {
+            // if there is a file named rewatch.lock in the events path, we can quit the watcher
+            if let Some(_) = event.paths.iter().find(|path| path.ends_with("rewatch.lock")) {
+                match event.kind {
+                    EventKind::Remove(_) => {
+                        if show_progress {
+                            println!("\nExiting... (lockfile removed)");
+                        }
+                        clean::cleanup_after_build(&build_state);
+                        return Ok(());
+                    }
+                    _ => (),
+                }
+            }
+
             let paths = event
                 .paths
                 .iter()
@@ -214,7 +229,7 @@ async fn async_watch(
             }
             CompileType::Full => {
                 let timing_total = Instant::now();
-                build_state = build::initialize_build(None, filter, show_progress, path, None)
+                build_state = build::initialize_build(None, filter, show_progress, path, bsc_path.clone())
                     .expect("Can't initialize build");
                 let _ = build::incremental_build(
                     &mut build_state,
@@ -259,6 +274,7 @@ pub fn start(
     after_build: Option<String>,
     create_sourcedirs: bool,
     build_dev_deps: bool,
+    bsc_path: Option<String>,
 ) {
     futures::executor::block_on(async {
         let queue = Arc::new(FifoQueue::<Result<Event, Error>>::new());
@@ -279,6 +295,7 @@ pub fn start(
             after_build,
             create_sourcedirs,
             build_dev_deps,
+            bsc_path,
         )
         .await
         {

testrepo/package.json

@@ -9,6 +9,9 @@
       "packages/new-namespace"
     ]
   },
+  "dependencies": {
+    "rescript": "11.1.4"
+  },
   "scripts": {
     "build": "../target/release/rewatch build .",
     "build:rescript": "rescript build -with-deps",

testrepo/packages/dep01/package.json

@@ -12,7 +12,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@testrepo/dep02": "*",
-    "rescript": "*"
+    "@testrepo/dep02": "*"
   }
 }

testrepo/packages/dep02/package.json

@@ -10,8 +10,5 @@
     "rescript"
   ],
   "author": "",
-  "license": "MIT",
-  "dependencies": {
-    "rescript": "*"
-  }
+  "license": "MIT"
 }

testrepo/packages/main/package.json

@@ -12,7 +12,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@testrepo/dep01": "*",
-    "rescript": "*"
+    "@testrepo/dep01": "*"
   }
 }

testrepo/packages/new-namespace/package.json

@@ -5,8 +5,5 @@
     "rescript"
   ],
   "author": "",
-  "license": "MIT",
-  "dependencies": {
-    "rescript": "*"
-  }
+  "license": "MIT"
 }

testrepo/yarn.lock

@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-rescript@*:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/rescript/-/rescript-11.0.0.tgz#9a0b6fc998c360543c459aba49b77a572a0306cd"
-  integrity sha512-uIUwDZZmDUb7ymGkBiiGioxMg8hXh1mze/2k/qhYQcZGgi7PrLHQIW9AksM7gb9WnpjCAvFsA8U2VgC0nA468w==
+rescript@11.1.4:
+  version "11.1.4"
+  resolved "https://registry.yarnpkg.com/rescript/-/rescript-11.1.4.tgz#9a42ebc4fc5363707e39cef5b3188160b63bee42"
+  integrity sha512-0bGU0bocihjSC6MsE3TMjHjY0EUpchyrREquLS8VsZ3ohSMD+VHUEwimEfB3kpBI1vYkw3UFZ3WD8R28guz/Vw==