feat(wasm): enable utoopack watch build (#2166)

Author: xusd320

Cargo.lock

@@ -240,18 +240,14 @@ impl ProjectContainer {
         let project_fs = project_fs_operation(project)
             .read_strongly_consistent()
             .await?;
-        #[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
-        {
-            if watch.enable {
-                #[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
-                project_fs
-                    .start_watching_with_invalidation_reason(watch.poll_interval)
-                    .await?;
-            } else {
-                project_fs.invalidate_with_reason(|path| invalidation::Initialize {
-                    path: RcStr::from(path),
-                });
-            }
+        if watch.enable {
+            project_fs
+                .start_watching_with_invalidation_reason(watch.poll_interval)
+                .await?;
+        } else {
+            project_fs.invalidate_with_reason(|path| invalidation::Initialize {
+                path: RcStr::from(path),
+            });
         }
         let output_fs = output_fs_operation(project)
             .read_strongly_consistent()
@@ -262,7 +258,6 @@ impl ProjectContainer {
         Ok(())
     }
 
-    #[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
     #[tracing::instrument(level = "info", name = "update project", skip_all)]
     pub async fn update(self: Vc<Self>, options: PartialProjectOptions) -> Result<()> {
         let PartialProjectOptions {

crates/pack-api/src/project.rs

@@ -38,10 +38,9 @@ tokio = { workspace = true, features = ["rt", "time", "rt-multi-thread"] }
 tracing-subscriber = { workspace = true }
 tracing-web = "0.1.3"
 rustc-hash = { workspace = true }
-tokio-fs-ext = { version = "0.5.6", features = ["wasm_offload"] }
+tokio-fs-ext = { version = "0.6.0", features = ["opfs_offload", "opfs_watch"] }
 console_error_panic_hook = { version = "0.1.7" }
-opfs-project = "0.1.4"
-lazy_static = "1.4"
+opfs-project = "0.1.5"
 
 ## turbpack specific - conditional on utoo-pack feature
 turbo-rcstr = { workspace = true, optional = true }

crates/utoo-wasm/Cargo.toml

@@ -1,5 +1,5 @@
 use std::{io, path::Path};
-use tokio_fs_ext::{offload, Metadata, ReadDir};
+use tokio_fs_ext::{offload, watch, Metadata, ReadDir};
 
 pub struct OpfsOffload;
 
@@ -43,4 +43,13 @@ impl offload::FsOffload for OpfsOffload {
     async fn metadata(&self, path: impl AsRef<Path>) -> io::Result<Metadata> {
         opfs_project::metadata(path).await
     }
+
+    async fn watch_dir(
+        &self,
+        path: impl AsRef<Path>,
+        recursive: bool,
+        cb: impl Fn(watch::event::Event) + Send + Sync + 'static,
+    ) -> io::Result<()> {
+        watch::watch_dir(path, recursive, cb).await
+    }
 }

crates/utoo-wasm/src/opfs_offload.rs

@@ -4,6 +4,7 @@ use std::str::FromStr;
 use std::sync::Arc;
 
 use anyhow::Context;
+use pack_api::project::WatchOptions;
 use serde_wasm_bindgen::to_value;
 use tokio_fs_ext::{DirEntry as RawDirEntry, Metadata as RawMetadata};
 use wasm_bindgen::prelude::*;
@@ -108,6 +109,10 @@ impl Project {
                 project_path: project_path.clone(),
                 config,
                 build_id: project_path.clone(),
+                watch: WatchOptions {
+                    enable: true,
+                    ..Default::default()
+                },
                 ..Default::default()
             };
 

crates/utoo-wasm/src/project.rs

@@ -110,7 +110,11 @@ export class Project implements ProjectEndpoint {
     }
   }
 
-  public async install(packageLock: string): Promise<void> {
+  public async init() {
+    return await this.#tunnel;
+  }
+
+  public async install(packageLock: string) {
     await this.#tunnel;
     return await this.remote.install(packageLock);
   }