fix(wasm): bump deps & gate turbo-tasks no-restore fast path behind wasm cfg (#2699)

Author: xusd320

Cargo.lock

@@ -58,7 +58,7 @@ simd-json                         = "0.17.0"
 tempfile                          = "3"
 thiserror                         = "1.0"
 tokio                             = { version = "1.47.1" }
-tokio-fs-ext                      = "0.7.7"
+tokio-fs-ext                      = "0.7.8"
 toml                              = "0.8"
 tracing                           = "0.1.41"
 tracing-subscriber                = { version = "0.3.19", features = ["env-filter", "fmt"] }

Cargo.toml

@@ -16,7 +16,7 @@ flate2                   = "1.1.5"
 futures                  = { workspace = true }
 js-sys                   = "0.3.83"
 oneshot                  = "0.1.11"
-opfs-project             = "0.2.4"
+opfs-project             = "0.2.5"
 petgraph                 = "0.6"
 reqwest                  = { version = "0.12.22", default-features = false, features = ["json"] }
 rustc-hash               = { workspace = true }

crates/utoo-wasm/Cargo.toml

@@ -11,7 +11,7 @@ use utoo_ruborist::service::Glob;
 use wasm_bindgen::prelude::*;
 
 use crate::errors::to_js_error;
-use crate::project::OPFS_PROJECT;
+use crate::pm::OPFS_PROJECT;
 use crate::tokio_runtime::runtime;
 
 /// OPFS-backed glob implementation.

crates/utoo-wasm/src/fs.rs

@@ -1,7 +1,7 @@
 use std::{io, path::Path};
 use tokio_fs_ext::{offload, watch, Metadata, ReadDir};
 
-use crate::project::{with_project, OPFS_PROJECT};
+use crate::pm::{with_project, OPFS_PROJECT};
 
 pub struct OpfsOffload;
 
@@ -51,7 +51,11 @@ impl offload::FsOffload for OpfsOffload {
     }
 
     async fn metadata(&self, path: impl AsRef<Path>) -> io::Result<Metadata> {
-        tokio_fs_ext::metadata(path).await
+        let guard = OPFS_PROJECT.read();
+        let project = guard
+            .as_ref()
+            .ok_or_else(|| io::Error::other("OpfsProject not initialised"))?;
+        project.metadata(path).await
     }
 
     async fn watch_dir(

crates/utoo-wasm/src/opfs_offload.rs

@@ -242,7 +242,7 @@ pub async fn init_pack_project(dev: bool) -> Result<()> {
     // Drop the old project
     GLOBAL_PACK_PROJECT.write().take();
 
-    let cwd = crate::project::with_project(|p| p.cwd().to_string_lossy().to_string());
+    let cwd = crate::pm::with_project(|p| p.cwd().to_string_lossy().to_string());
     let project_root = if cwd.starts_with('/') {
         cwd
     } else {
@@ -276,6 +276,7 @@ pub async fn init_pack_project(dev: bool) -> Result<()> {
         build_id: project_path.clone(),
         watch: WatchOptions {
             enable: true,
+            ignored: vec![],
             ..Default::default()
         },
         dev,

crates/utoo-wasm/src/pack.rs

@@ -5,15 +5,39 @@
 //! - Gzip archive creation
 //! - Dependency resolution
 //! - Package installation
+//! - Global OpfsProject instance management
 
 use anyhow::{anyhow, Result};
 use opfs_project::archive::PackFile;
+use parking_lot::RwLock;
 use std::path::Path;
 use wasm_bindgen::JsCast;
 
-use crate::project::{with_project, OPFS_PROJECT};
 use crate::tokio_runtime::{runtime, TOKIO_RUNTIME};
 
+/// Global OpfsProject instance, initialised the first time `Project::init` is called.
+pub(crate) static OPFS_PROJECT: RwLock<Option<opfs_project::OpfsProject>> = RwLock::new(None);
+
+/// Get a reference to the global OpfsProject for reading.
+///
+/// Panics if the project has not been initialised via `Project::init`.
+pub(crate) fn with_project<R>(f: impl FnOnce(&opfs_project::OpfsProject) -> R) -> R {
+    let guard = OPFS_PROJECT.read();
+    let project = guard
+        .as_ref()
+        .expect("OpfsProject not initialised — call Project.init() first");
+    f(project)
+}
+
+/// Get a mutable reference to the global OpfsProject.
+pub(crate) fn with_project_mut<R>(f: impl FnOnce(&mut opfs_project::OpfsProject) -> R) -> R {
+    let mut guard = OPFS_PROJECT.write();
+    let project = guard
+        .as_mut()
+        .expect("OpfsProject not initialised — call Project.init() first");
+    f(project)
+}
+
 /// Calculate MD5 hash of byte content
 pub async fn sig_md5(content: Vec<u8>) -> Result<String> {
     let result = runtime()
@@ -59,6 +83,7 @@ pub async fn gzip(files: wasm_bindgen::JsValue) -> Result<Vec<u8>> {
 /// Generate package-lock.json by resolving dependencies
 pub async fn deps(registry: Option<&str>, concurrency: Option<usize>) -> Result<String> {
     let cwd = with_project(|p| p.cwd().to_path_buf());
+
     let package_lock =
         crate::deps::build_deps_from_file(Path::new(&cwd), registry, concurrency).await?;
 

crates/utoo-wasm/src/pm.rs

@@ -9,37 +9,14 @@ use parking_lot::RwLock;
 use wasm_bindgen::prelude::*;
 
 use crate::errors::to_js_error;
-use crate::pm;
+use crate::pm::{self, with_project, OPFS_PROJECT};
 use crate::tokio_runtime::init_tokio_runtime;
 
 #[cfg(feature = "utoopack")]
 use crate::pack::{self, RootTask};
 
 static GLOBAL_THREAD_URL: RwLock<Option<String>> = RwLock::new(None);
 
-/// Global OpfsProject instance, initialised the first time `Project::init` is called.
-pub(crate) static OPFS_PROJECT: RwLock<Option<opfs_project::OpfsProject>> = RwLock::new(None);
-
-/// Get a reference to the global OpfsProject for reading.
-///
-/// Panics if the project has not been initialised via `Project::init`.
-pub(crate) fn with_project<R>(f: impl FnOnce(&opfs_project::OpfsProject) -> R) -> R {
-    let guard = OPFS_PROJECT.read();
-    let project = guard
-        .as_ref()
-        .expect("OpfsProject not initialised — call Project.init() first");
-    f(project)
-}
-
-/// Get a mutable reference to the global OpfsProject.
-pub(crate) fn with_project_mut<R>(f: impl FnOnce(&mut opfs_project::OpfsProject) -> R) -> R {
-    let mut guard = OPFS_PROJECT.write();
-    let project = guard
-        .as_mut()
-        .expect("OpfsProject not initialised — call Project.init() first");
-    f(project)
-}
-
 #[wasm_bindgen]
 pub struct Project;
 

crates/utoo-wasm/src/project.rs

@@ -194,18 +194,13 @@ export function workerCreated(worker_id: number): void;
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
 
 export interface InitOutput {
-    readonly ERR_ABORT: () => [number, number];
-    readonly ERR_INVALID_STATE: () => [number, number];
-    readonly ERR_KEY_ALREADY_EXISTS: () => [number, number];
-    readonly ERR_NOT_ALLOWED: () => [number, number];
-    readonly ERR_NOT_FOUND: () => [number, number];
-    readonly ERR_NO_MODIFICATION_ALLOWED: () => [number, number];
-    readonly ERR_QUOTA_EXCEEDED: () => [number, number];
-    readonly ERR_TYPE_MISMATCH: () => [number, number];
-    readonly getWasmMemory: () => any;
-    readonly getWasmModule: () => any;
     readonly initLogFilter: (a: number, b: number) => void;
     readonly init_pack: () => void;
+    readonly getWasmMemory: () => any;
+    readonly getWasmModule: () => any;
+    readonly __wbg_roottask_free: (a: number, b: number) => void;
+    readonly registerWorkerScheduler: (a: any, b: any) => void;
+    readonly workerCreated: (a: number) => void;
     readonly __wbg_project_free: (a: number, b: number) => void;
     readonly project_build: () => any;
     readonly project_cwd: () => [number, number];
@@ -219,6 +214,14 @@ export interface InitOutput {
     readonly project_sigMd5: (a: any) => any;
     readonly project_updateInfoSubscribe: (a: number, b: any) => void;
     readonly project_writeAllToDisk: (a: any) => void;
+    readonly ERR_ABORT: () => [number, number];
+    readonly ERR_INVALID_STATE: () => [number, number];
+    readonly ERR_KEY_ALREADY_EXISTS: () => [number, number];
+    readonly ERR_NOT_ALLOWED: () => [number, number];
+    readonly ERR_NOT_FOUND: () => [number, number];
+    readonly ERR_NO_MODIFICATION_ALLOWED: () => [number, number];
+    readonly ERR_QUOTA_EXCEEDED: () => [number, number];
+    readonly ERR_TYPE_MISMATCH: () => [number, number];
     readonly __wbg_direntry_free: (a: number, b: number) => void;
     readonly __wbg_fs_free: (a: number, b: number) => void;
     readonly __wbg_get_direntry_name: (a: number) => [number, number];
@@ -250,9 +253,6 @@ export interface InitOutput {
     readonly fs_write: (a: number, b: number, c: any) => any;
     readonly fs_writeString: (a: number, b: number, c: number, d: number) => any;
     readonly fs_writeSync: (a: number, b: number, c: any) => [number, number];
-    readonly __wbg_roottask_free: (a: number, b: number) => void;
-    readonly registerWorkerScheduler: (a: any, b: any) => void;
-    readonly workerCreated: (a: number) => void;
     readonly rust_mi_get_default_heap: () => number;
     readonly rust_mi_get_thread_id: () => number;
     readonly rust_mi_set_default_heap: (a: number) => void;
@@ -278,16 +278,16 @@ export interface InitOutput {
     readonly __wbg_createsyncaccesshandleoptions_free: (a: number, b: number) => void;
     readonly wasm_thread_entry_point: (a: number) => void;
     readonly wasm_bindgen_f95c71b28f29bc9d___closure__destroy___dyn_core_e1885f5e8fe25124___ops__function__FnMut_____Output_______: (a: number, b: number) => void;
-    readonly wasm_bindgen_f95c71b28f29bc9d___closure__destroy___dyn_core_e1885f5e8fe25124___ops__function__Fn__js_sys_d20acbc549183cf6___Array____Output_______: (a: number, b: number) => void;
     readonly wasm_bindgen_f95c71b28f29bc9d___closure__destroy___dyn_core_e1885f5e8fe25124___ops__function__FnMut__wasm_bindgen_f95c71b28f29bc9d___JsValue____Output_______: (a: number, b: number) => void;
     readonly wasm_bindgen_f95c71b28f29bc9d___closure__destroy___dyn_core_e1885f5e8fe25124___ops__function__FnMut__web_sys_27d1e2f4b4c95162___features__gen_MessageEvent__MessageEvent____Output_______: (a: number, b: number) => void;
     readonly wasm_bindgen_f95c71b28f29bc9d___closure__destroy___dyn_core_e1885f5e8fe25124___ops__function__FnMut_____Output________1_: (a: number, b: number) => void;
     readonly wasm_bindgen_f95c71b28f29bc9d___closure__destroy___dyn_for__a__core_e1885f5e8fe25124___ops__function__FnMut____a_web_sys_27d1e2f4b4c95162___features__gen_MessageEvent__MessageEvent____Output_______: (a: number, b: number) => void;
+    readonly wasm_bindgen_f95c71b28f29bc9d___closure__destroy___dyn_core_e1885f5e8fe25124___ops__function__Fn__js_sys_d20acbc549183cf6___Array____Output_______: (a: number, b: number) => void;
     readonly wasm_bindgen_f95c71b28f29bc9d___convert__closures_____invoke___js_sys_d20acbc549183cf6___Function__js_sys_d20acbc549183cf6___Function_____: (a: number, b: number, c: any, d: any) => void;
-    readonly wasm_bindgen_f95c71b28f29bc9d___convert__closures_____invoke___js_sys_d20acbc549183cf6___Array_____: (a: number, b: number, c: any) => void;
     readonly wasm_bindgen_f95c71b28f29bc9d___convert__closures_____invoke___wasm_bindgen_f95c71b28f29bc9d___JsValue_____: (a: number, b: number, c: any) => void;
     readonly wasm_bindgen_f95c71b28f29bc9d___convert__closures_____invoke___web_sys_27d1e2f4b4c95162___features__gen_MessageEvent__MessageEvent_____: (a: number, b: number, c: any) => void;
     readonly wasm_bindgen_f95c71b28f29bc9d___convert__closures________invoke___web_sys_27d1e2f4b4c95162___features__gen_MessageEvent__MessageEvent_____: (a: number, b: number, c: any) => void;
+    readonly wasm_bindgen_f95c71b28f29bc9d___convert__closures_____invoke___js_sys_d20acbc549183cf6___Array_____: (a: number, b: number, c: any) => void;
     readonly wasm_bindgen_f95c71b28f29bc9d___convert__closures_____invoke______: (a: number, b: number) => void;
     readonly wasm_bindgen_f95c71b28f29bc9d___convert__closures_____invoke_______1_: (a: number, b: number) => void;
     readonly memory: WebAssembly.Memory;