migrate FileWatcher to separate repo

skunk-cli/Cargo.toml

@@ -31,6 +31,9 @@ features = ["trigger"]
 #version = "0.1.0"
 git = "https://github.com/FeraeLabs/byst.git"
 
+[dependencies.notify-async]
+git = "https://github.com/FeraeLabs/notify-async.git"
+
 [dependencies]
 axum = { version = "0.7.5", features = ["ws", "macros"] }
 chrono = "0.4.38"

skunk-cli/src/env/config.rs

@@ -8,6 +8,10 @@ use std::{
     time::Duration,
 };
 
+use notify_async::{
+    WatchFiles,
+    WatchModified,
+};
 use serde::{
     de::IntoDeserializer,
     Deserialize,
@@ -21,10 +25,6 @@ use super::{
     FileHash,
     DEFAULT_CONFIG,
 };
-use crate::util::watch::{
-    FileWatcher,
-    WatchModified,
-};
 
 #[derive(Clone, Debug)]
 pub struct ConfigFile {
@@ -125,19 +125,21 @@ fn open(path: &Path) -> Result<Loader, Error> {
         toml = Some(DEFAULT_CONFIG.into());
     }
 
-    let watcher = FileWatcher::new().map_err(|error| {
+    let watcher = WatchFiles::new().map_err(|error| {
         Error::WatchFile {
             error,
             path: path.to_owned(),
         }
     })?;
 
-    let watch = WatchModified::new(watcher, ConfigFile::DEBOUNCE).map_err(|error| {
-        Error::WatchFile {
-            error,
-            path: path.to_owned(),
-        }
-    })?;
+    let watch = WatchModified::new(watcher)
+        .map_err(|error| {
+            Error::WatchFile {
+                error,
+                path: path.to_owned(),
+            }
+        })?
+        .with_debounce(ConfigFile::DEBOUNCE);
 
     let toml = if let Some(toml) = toml {
         toml
@@ -184,7 +186,7 @@ struct WatchConfig {
 
 impl WatchConfig {
     async fn run(mut self) {
-        while let Ok(()) = self.watch.wait().await {
+        while let Ok(()) = self.watch.modified().await {
             match self.reload() {
                 Ok(None) => {}
                 Ok(Some(_document)) => todo!(),

skunk-cli/src/util/mod.rs

@@ -1,3 +1,2 @@
 pub mod serve_ui;
 pub mod shutdown;
-pub mod watch;

skunk-cli/src/util/serve_ui.rs

@@ -14,6 +14,7 @@ use axum::{
     body::Body,
     http::Request,
 };
+use notify_async::watch_modified;
 use skunk_util::trigger;
 use tower_http::services::{
     ServeDir,
@@ -28,7 +29,6 @@ use crate::{
         Environment,
         Error,
     },
-    util::watch::watch_modified,
 };
 
 #[derive(Clone, Debug)]
@@ -44,7 +44,7 @@ impl ServeUi {
             let mut watch = watch_modified(path, Duration::from_secs(2))
                 .expect("Failed to watch for file changes");
             tokio::spawn(async move {
-                while let Ok(()) = watch.wait().await {
+                while let Ok(()) = watch.modified().await {
                     tracing::info!("UI modified. Triggering reload");
                     reload_ui.trigger();
                 }