feat(turbopack): apply utoo patches to canary

Author: xusd320

Cargo.lock

@@ -301,6 +301,7 @@ napi-derive = "2"
 napi-build = "2"
 nohash-hasher = "0.2.0"
 notify = "8.1.0"
+notify-types = "2.0.0"
 once_cell = "1.21.3"
 owo-colors = "4.2.2"
 parcel_selectors = "0.28.2"
@@ -315,6 +316,7 @@ qstring = "0.7.2"
 quick_cache = { version = "0.6.14" }
 quote = "1.0.23"
 rand = "0.10.0"
+getrandom = "0.3"
 rayon = "1.10.0"
 regex = "1.10.6"
 regress = "0.10.4"
@@ -345,8 +347,8 @@ tempfile = "3.20.0"
 terminal_size = "0.3.0"
 thiserror = "1.0.48"
 thread_local = "1.1.8"
-tokio = "~1.47.3"
-tokio-util = { version = "0.7.13", features = ["io", "rt"] }
+tokio = "1.51.0"
+tokio-util = { version = "=0.7.16", features = ["io", "rt"] }
 tracing = "0.1.37"
 tracing-subscriber = "0.3.16"
 triomphe = { git = "https://github.com/sokra/triomphe", branch = "sokra/unstable" }
@@ -367,3 +369,5 @@ virtue = { git = "https://github.com/bgw/virtue.git", branch = "bgw/fix-generic-
 mdxjs = { git = "https://github.com/vercel-labs/mdxjs-rs-turbopack.git", branch = "turbopack" }
 # Doesn't compile on recent nightly versions because of https://github.com/Michael-F-Bryan/include_dir/pull/117
 include_dir = { git = "https://github.com/vercel-labs/include_dir", branch = "turbopack" }
+tokio = { git = "https://github.com/utooland/tokio.git", package = "tokio" }
+tokio-util = { git = "https://github.com/utooland/tokio.git", package = "tokio-util" }

Cargo.toml

@@ -25,7 +25,7 @@ memmap2 = "0.9.5"
 nohash-hasher = { workspace = true }
 parking_lot = { workspace = true }
 # See https://github.com/vercel/next.js/issues/91708 for why we need the legacy_x86_64_support feature
-qfilter = { version = "0.3.0-alpha.3", features = ["serde", "legacy_x86_64_support"] }
+qfilter = { version = "0.3.0-alpha.4", features = ["serde", "legacy_x86_64_support"] }
 postcard = { workspace = true, features = ["alloc", "use-std"] }
 zerocopy = { version = "0.8", features = ["derive"] }
 quick_cache = { workspace = true }

turbopack/crates/turbo-persistence/Cargo.toml

@@ -947,8 +947,10 @@ impl<E: Entry> StreamingSstWriter<E> {
         // Hashes are already sorted by key_hash (SST invariant), but fingerprints
         // (truncated hashes) may not be sorted, so we sort by `fingerprint & mask`.
         let actual_count = self.collected_fingerprints.len() as u64;
-        let mut builder = qfilter::Builder::new(actual_count.max(1), AMQF_FALSE_POSITIVE_RATE)
-            .expect("Filter can't be constructed");
+        let mut builder = qfilter::Builder::new(
+            qfilter::Filter::new(actual_count.max(1), AMQF_FALSE_POSITIVE_RATE)
+                .expect("Filter can't be constructed"),
+        );
         let fp_size = builder.fingerprint_size();
         assert!(fp_size < 32, "fp_size {fp_size} exceeds u32");
         let fp_mask = (1u32 << fp_size) - 1;

turbopack/crates/turbo-persistence/src/static_sorted_file_builder.rs

@@ -54,12 +54,14 @@ smallvec = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
 turbo-bincode = { workspace = true }
-turbo-persistence = { workspace = true }
 turbo-rcstr = { workspace = true }
 turbo-tasks = { workspace = true }
 turbo-tasks-hash = { workspace = true }
 thread_local = { workspace = true }
 
+[target.'cfg(not(all(target_family = "wasm", target_os = "unknown")))'.dependencies]
+turbo-persistence = { workspace = true }
+
 [dev-dependencies]
 criterion = { workspace = true, features = ["async_tokio"] }
 futures = { workspace = true }

turbopack/crates/turbo-tasks-backend/Cargo.toml

@@ -7,7 +7,7 @@ use std::{
     ops::{ControlFlow, Deref},
     sync::Arc,
     thread::yield_now,
-    time::{Duration, Instant},
+    time::Duration,
 };
 
 use anyhow::Result;
@@ -16,6 +16,7 @@ use indexmap::map::Entry;
 use ringmap::RingSet;
 use rustc_hash::{FxBuildHasher, FxHashMap};
 use smallvec::{SmallVec, smallvec};
+use tokio::time::Instant;
 #[cfg(feature = "trace_aggregation_update_queue")]
 use tracing::span::Span;
 #[cfg(any(

turbopack/crates/turbo-tasks-backend/src/backend/operation/aggregation_update.rs

@@ -239,13 +239,33 @@ impl<'e, B: BackingStorage> ExecuteContextImpl<'e, B> {
             StorageWriteGuard<'e>,
         ),
     ) {
+        // Fast path: no backing storage (e.g. WASM/NoopKvDb) — process inline,
+        // skip the Vec allocation needed for batch DB restoration.
+        #[cfg(all(target_family = "wasm", target_os = "unknown"))]
+        if !self.backend.should_restore() {
+            for (id, category) in task_ids {
+                let mut task = self.backend.storage.access_mut(id);
+                if !task.flags.is_restored(category) {
+                    task.flags.set_restored(category);
+                }
+                if id.is_transient() {
+                    if call_prepared_task_callback_for_transient_tasks {
+                        prepared_task_callback(self, id, category, task);
+                    }
+                } else {
+                    prepared_task_callback(self, id, category, task);
+                }
+            }
+            return;
+        }
         let span = trace_span!(
             "prepare_tasks_with_callback",
             reason,
             requested_data = tracing::field::Empty,
             requested_meta = tracing::field::Empty,
         );
         let _guard = span.enter();
+
         let mut data_count = 0;
         let mut meta_count = 0;
         let mut all_count = 0;

turbopack/crates/turbo-tasks-backend/src/backend/operation/mod.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
 use smallvec::SmallVec;
+#[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
 use turbo_persistence::{FamilyConfig, FamilyKind};
 
 use crate::database::write_batch::ConcurrentWriteBatch;
@@ -11,6 +12,8 @@ pub enum KeySpace {
     TaskData = 2,
     TaskCache = 3,
 }
+
+#[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
 impl KeySpace {
     /// Constructs a [`KeySpace`] from its numeric index (i.e., the `usize` discriminant).
     ///

turbopack/crates/turbo-tasks-backend/src/database/key_value_database.rs

@@ -2,5 +2,6 @@ pub mod db_invalidation;
 pub mod db_versioning;
 pub mod key_value_database;
 pub mod noop_kv;
+#[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
 pub mod turbo;
 pub mod write_batch;

turbopack/crates/turbo-tasks-backend/src/database/mod.rs

@@ -12,12 +12,14 @@ mod utils;
 use std::path::Path;
 
 use anyhow::Result;
+#[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
 use turbo_persistence::{CompactConfig, TurboPersistence};
 
-use crate::database::{
-    noop_kv::NoopKvDb,
-    turbo::{self, TurboKeyValueDatabase},
-};
+use crate::database::noop_kv::NoopKvDb;
+#[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
+use crate::database::turbo::TurboKeyValueDatabase;
+#[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
+use crate::database::turbo::{self};
 pub use crate::{
     backend::{BackendOptions, StorageMode, TurboTasksBackend},
     backing_storage::BackingStorage,
@@ -29,11 +31,16 @@ pub use crate::{
     kv_backing_storage::KeyValueDatabaseBackingStorage,
 };
 
+#[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
 pub type TurboBackingStorage = KeyValueDatabaseBackingStorage<TurboKeyValueDatabase>;
 
 /// Creates a `BackingStorage` to be passed to [`TurboTasksBackend::new`].
 ///
 /// Information about the state of the on-disk cache is returned using [`StartupCacheState`].
+///
+/// This is the fastest most-tested implementation of `BackingStorage`, and is normally returned by
+/// [`default_backing_storage`].
+#[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
 pub fn turbo_backing_storage(
     base_path: &Path,
     version_info: &GitVersionInfo,
@@ -62,6 +69,7 @@ pub fn noop_backing_storage() -> NoopBackingStorage {
 ///
 /// The parallel scheduler requires a Tokio runtime. If one is already active (e.g. when called
 /// from a NAPI async function), it is reused. Otherwise a new multi-threaded runtime is created.
+#[cfg(not(all(target_family = "wasm", target_os = "unknown")))]
 pub fn compact_database(
     base_path: &Path,
     version_info: &GitVersionInfo,