diff --git a/Cargo.lock b/Cargo.lock index ac4b7b5c92..24fb252ba6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -399,9 +399,9 @@ dependencies = [ [[package]] name = "ctor" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" +checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" dependencies = [ "quote", "syn 2.0.53", @@ -1292,9 +1292,9 @@ dependencies = [ [[package]] name = "napi" -version = "2.16.0" +version = "2.16.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a63d0570e4c3e0daf7a8d380563610e159f538e20448d6c911337246f40e84" +checksum = "55740c4ae1d8696773c78fdafd5d0e5fe9bc9f1b071c7ba493ba5c413a9184f3" dependencies = [ "anyhow", "bitflags 2.6.0", @@ -1313,9 +1313,9 @@ checksum = "e1c0f5d67ee408a4685b61f5ab7e58605c8ae3f2b4189f0127d804ff13d5560a" [[package]] name = "napi-derive" -version = "2.16.0" +version = "2.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05bb7c37e3c1dda9312fdbe4a9fc7507fca72288ba154ec093e2d49114e727ce" +checksum = "7cbe2585d8ac223f7d34f13701434b9d5f4eb9c332cccce8dee57ea18ab8ab0c" dependencies = [ "cfg-if", "convert_case", @@ -1327,9 +1327,9 @@ dependencies = [ [[package]] name = "napi-derive-backend" -version = "1.0.62" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f785a8b8d7b83e925f5aa6d2ae3c159d17fe137ac368dc185bef410e7acdaeb4" +checksum = "1639aaa9eeb76e91c6ae66da8ce3e89e921cd3885e99ec85f4abacae72fc91bf" dependencies = [ "convert_case", "once_cell", @@ -1342,9 +1342,9 @@ dependencies = [ [[package]] name = "napi-sys" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b" +checksum = "427802e8ec3a734331fec1035594a210ce1ff4dc5bc1950530920ab717964ea3" dependencies = [ "libloading", ] diff --git a/packages/nx/src/native/mod.rs b/packages/nx/src/native/mod.rs index 1b21111a05..ddcbd9ec78 100644 --- a/packages/nx/src/native/mod.rs +++ b/packages/nx/src/native/mod.rs @@ -2,19 +2,19 @@ pub mod cache; pub mod glob; pub mod hasher; mod logger; +mod machine_id; pub mod metadata; pub mod plugins; pub mod project_graph; pub mod tasks; mod types; -mod utils; +pub mod utils; mod walker; pub mod workspace; -mod machine_id; +#[cfg(not(target_arch = "wasm32"))] +pub mod db; #[cfg(not(target_arch = "wasm32"))] pub mod pseudo_terminal; #[cfg(not(target_arch = "wasm32"))] pub mod watch; -#[cfg(not(target_arch = "wasm32"))] -pub mod db; diff --git a/packages/nx/src/native/tasks/hash_planner.rs b/packages/nx/src/native/tasks/hash_planner.rs index e23ddf0860..a270a831ad 100644 --- a/packages/nx/src/native/tasks/hash_planner.rs +++ b/packages/nx/src/native/tasks/hash_planner.rs @@ -9,7 +9,6 @@ use crate::native::{ tasks::{inputs::SplitInputs, types::Task}, }; use napi::bindgen_prelude::External; -use napi::{Env, JsExternal}; use rayon::prelude::*; use std::collections::HashMap; use tracing::trace; @@ -102,13 +101,11 @@ impl HashPlanner { #[napi] pub fn get_plans_reference( &self, - env: Env, task_ids: Vec<&str>, task_graph: TaskGraph, - ) -> anyhow::Result { + ) -> anyhow::Result>>> { let plans = self.get_plans_internal(task_ids, task_graph)?; - env.create_external(plans, None) - .map_err(anyhow::Error::from) + Ok(External::new(plans)) } fn target_input<'a>(