diff --git a/Cargo.lock b/Cargo.lock index d4bf4f50a53..8544d16f453 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3703,7 +3703,7 @@ dependencies = [ [[package]] name = "moon_common" -version = "0.0.10" +version = "0.0.11" dependencies = [ "compact_str", "dirs 6.0.0", @@ -3719,7 +3719,7 @@ dependencies = [ [[package]] name = "moon_config" -version = "0.0.12" +version = "0.0.13" dependencies = [ "httpmock", "indexmap 2.7.1", @@ -3736,7 +3736,7 @@ dependencies = [ "semver", "serde", "serde_json", - "serde_yaml", + "serde_yml", "serial_test", "starbase_sandbox", "tracing", @@ -3965,7 +3965,7 @@ dependencies = [ "rustc-hash", "serde", "serde_json", - "serde_yaml", + "serde_yml", "starbase_styles", "starbase_utils", "tracing", @@ -4043,7 +4043,7 @@ dependencies = [ [[package]] name = "moon_pdk" -version = "0.0.12" +version = "0.0.13" dependencies = [ "clap", "extism-pdk", @@ -4054,7 +4054,7 @@ dependencies = [ [[package]] name = "moon_pdk_api" -version = "0.0.12" +version = "0.0.13" dependencies = [ "moon_common", "moon_config", @@ -4066,7 +4066,7 @@ dependencies = [ [[package]] name = "moon_pdk_test_utils" -version = "0.0.13" +version = "0.0.14" dependencies = [ "extism", "moon_pdk_api", @@ -4408,7 +4408,7 @@ dependencies = [ [[package]] name = "moon_target" -version = "0.0.9" +version = "0.0.10" dependencies = [ "compact_str", "miette 7.4.0", @@ -4570,7 +4570,7 @@ dependencies = [ "predicates", "pretty_assertions", "rustc-hash", - "serde_yaml", + "serde_yml", "starbase_utils", ] @@ -6102,7 +6102,7 @@ dependencies = [ "serde", "serde_json", "serde_path_to_error", - "serde_yaml", + "serde_yml", "starbase_styles", "thiserror 2.0.11", "toml", @@ -6133,7 +6133,7 @@ dependencies = [ "semver", "serde", "serde_json", - "serde_yaml", + "serde_yml", "toml", "url", ] @@ -6256,19 +6256,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_yaml" -version = "0.9.34+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" -dependencies = [ - "indexmap 2.7.1", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - [[package]] name = "serde_yml" version = "0.0.12" @@ -7498,12 +7485,6 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" -[[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" - [[package]] name = "untrusted" version = "0.9.0" diff --git a/Cargo.toml b/Cargo.toml index cc8699fcf25..76f2fd7329e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -62,7 +62,7 @@ serial_test = "3.2.0" semver = "1.0.25" serde = { version = "1.0.215", features = ["derive"] } serde_json = "1.0.137" -serde_yaml = "0.9.34" +serde_yml = "0.0.12" sha2 = "0.10.8" starbase = { version = "0.9.9" } starbase_archive = { version = "0.9.4", default-features = false, features = [ diff --git a/crates/app/Cargo.toml b/crates/app/Cargo.toml index 9d72c6bd58a..0efffe40fad 100644 --- a/crates/app/Cargo.toml +++ b/crates/app/Cargo.toml @@ -64,7 +64,7 @@ starbase = { workspace = true } starbase_events = { workspace = true } starbase_shell = { workspace = true } starbase_styles = { workspace = true } -starbase_utils = { workspace = true } +starbase_utils = { workspace = true, features = ["editor-config"] } system_env = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true } diff --git a/crates/cli/tests/run_test.rs b/crates/cli/tests/run_test.rs index 8bc3cea5bdc..cc010749165 100644 --- a/crates/cli/tests/run_test.rs +++ b/crates/cli/tests/run_test.rs @@ -710,11 +710,11 @@ mod hashing { // Hashes change because `.moon/workspace.yml` is different from `walk_strategy` assert_eq!( hash_vcs, - "3b3d2d556cfc82c7834975dbed40741e27541a30244dfdc4835edd9503539d55" + "2b8160e1fae996d3fcd1cf4ce888a7888a0e08d7b6d9d9f2adfecc356e86040b" ); assert_eq!( hash_glob, - "59ec46f239f4ad40e2bea9fb0cb26f69b55b985b027845e40f41db087e842f38" + "78edc25dadbeae8b2d41073611c686ead7f1c3690b887c45822faa4310cfb573" ); } } diff --git a/crates/cli/tests/snapshots/run_test__dependencies__changes_primary_hash_if_deps_hash_changes.snap b/crates/cli/tests/snapshots/run_test__dependencies__changes_primary_hash_if_deps_hash_changes.snap index 2547e5064a2..37ee59cb07a 100644 --- a/crates/cli/tests/snapshots/run_test__dependencies__changes_primary_hash_if_deps_hash_changes.snap +++ b/crates/cli/tests/snapshots/run_test__dependencies__changes_primary_hash_if_deps_hash_changes.snap @@ -3,8 +3,8 @@ source: crates/cli/tests/run_test.rs expression: "[h1, h2, extract_hash_from_run(sandbox.path(), \"outputs:asDep\"),\nextract_hash_from_run(sandbox.path(), \"outputs:withDeps\")]" --- [ - "81670f2e4bc28898288815ee075a8653bb264bf8dcf7fa0246f87e50054c950f", - "1034518a27b7197ff81b5393a98270ca94283e26cdaf61ec370ccbcd5f92112c", - "c2f65dfed7824b8da4986ed97bf2c6c6ce1914b387da407da66c19f7c61571d8", - "e672d267073a26f1d9cf14eaa1136a02c3c588e93ba3792f8f7dc47c49b0cf24", + "9b83821644418128b97f4ca80ea38d073f7531d5704c09dc4ddf0118e3df8cbf", + "1e0aa381a5657c612d921b945b4ada7c2176b62ef9f336e4f7d9cab121a270f9", + "f01e61ef51d40759363813b476a8b3b53d8ecdbe3f575708388d50cbfc390d1b", + "b888471e3a4d5ebfd469efe4a77ab0d8dfe0655efc3f0743b94c3f8738cda5f7", ] diff --git a/crates/cli/tests/snapshots/run_test__dependencies__generates_unique_hashes_for_each_target.snap b/crates/cli/tests/snapshots/run_test__dependencies__generates_unique_hashes_for_each_target.snap index 1d7997818a9..9cece849814 100644 --- a/crates/cli/tests/snapshots/run_test__dependencies__generates_unique_hashes_for_each_target.snap +++ b/crates/cli/tests/snapshots/run_test__dependencies__generates_unique_hashes_for_each_target.snap @@ -3,6 +3,6 @@ source: crates/cli/tests/run_test.rs expression: "[extract_hash_from_run(sandbox.path(), \"outputs:asDep\"),\nextract_hash_from_run(sandbox.path(), \"outputs:withDeps\")]" --- [ - "81670f2e4bc28898288815ee075a8653bb264bf8dcf7fa0246f87e50054c950f", - "1034518a27b7197ff81b5393a98270ca94283e26cdaf61ec370ccbcd5f92112c", + "9b83821644418128b97f4ca80ea38d073f7531d5704c09dc4ddf0118e3df8cbf", + "1e0aa381a5657c612d921b945b4ada7c2176b62ef9f336e4f7d9cab121a270f9", ] diff --git a/crates/cli/tests/snapshots/run_test__output_styles__hash.snap b/crates/cli/tests/snapshots/run_test__output_styles__hash.snap index 3424ec02abb..ef335f12f8b 100644 --- a/crates/cli/tests/snapshots/run_test__output_styles__hash.snap +++ b/crates/cli/tests/snapshots/run_test__output_styles__hash.snap @@ -10,4 +10,4 @@ expression: assert.output() Tasks: 2 completed Time: 100ms -f75fedb1391ec68b3bc9dcc5cd1908bb4ee36793de49fe538185fc077cd38149 +091875657f8b955944c45803b2e13d536f257648e04cca859a0c38700b94764f diff --git a/crates/codegen/Cargo.toml b/crates/codegen/Cargo.toml index 1858f9ba421..443f5b9d023 100644 --- a/crates/codegen/Cargo.toml +++ b/crates/codegen/Cargo.toml @@ -22,6 +22,7 @@ regex = { workspace = true } rustc-hash = { workspace = true } starbase_archive = { workspace = true } starbase_utils = { workspace = true, features = [ + "editor-config", "glob", "json", "net", diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml index 60f33795347..75646302fe3 100644 --- a/crates/common/Cargo.toml +++ b/crates/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "moon_common" -version = "0.0.10" +version = "0.0.11" edition = "2021" license = "MIT" description = "Common utilities." diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index 8491f5bacb6..d0dbc390905 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "moon_config" -version = "0.0.12" +version = "0.0.13" edition = "2021" license = "MIT" description = "Core workspace, project, and moon configuration." @@ -12,8 +12,8 @@ publish = true features = ["loader"] [dependencies] -moon_common = { version = "0.0.10", path = "../common" } -moon_target = { version = "0.0.9", path = "../target" } +moon_common = { version = "0.0.11", path = "../common" } +moon_target = { version = "0.0.10", path = "../target" } indexmap = { workspace = true } miette = { workspace = true } once_cell = { workspace = true } @@ -31,12 +31,12 @@ schematic = { workspace = true, features = [ "type_semver", "validate", "validate_url", - "yaml", + "yml", ] } semver = { workspace = true, features = ["serde"] } serde = { workspace = true } serde_json = { workspace = true } -serde_yaml = { workspace = true } +serde_yml = { workspace = true } version_spec = { workspace = true, features = ["schematic"] } warpgate_api = { workspace = true, features = ["schematic"] } diff --git a/crates/file-group/Cargo.toml b/crates/file-group/Cargo.toml index 341f7ecc570..10cb554541a 100644 --- a/crates/file-group/Cargo.toml +++ b/crates/file-group/Cargo.toml @@ -9,8 +9,8 @@ repository = "https://github.com/moonrepo/moon" publish = true [dependencies] -moon_common = { version = "0.0.10", path = "../common" } -moon_config = { version = "0.0.12", path = "../config" } +moon_common = { version = "0.0.11", path = "../common" } +moon_config = { version = "0.0.13", path = "../config" } common-path = "1.0.0" miette = { workspace = true } once_cell = { workspace = true } diff --git a/crates/pdk-api/Cargo.toml b/crates/pdk-api/Cargo.toml index a2c18e4a260..e6c7d78ddc2 100644 --- a/crates/pdk-api/Cargo.toml +++ b/crates/pdk-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "moon_pdk_api" -version = "0.0.12" +version = "0.0.13" edition = "2021" license = "MIT" description = "Core APIs for creating moon WASM plugins." @@ -9,8 +9,8 @@ repository = "https://github.com/moonrepo/moon" publish = true [dependencies] -moon_common = { version = "0.0.10", path = "../common" } -moon_config = { version = "0.0.12", path = "../config" } +moon_common = { version = "0.0.11", path = "../common" } +moon_config = { version = "0.0.13", path = "../config" } rustc-hash = { workspace = true } schematic = { workspace = true, features = ["schema_serde"] } serde = { workspace = true } diff --git a/crates/pdk-test-utils/Cargo.toml b/crates/pdk-test-utils/Cargo.toml index dfb1b163e40..46cc94c9b84 100644 --- a/crates/pdk-test-utils/Cargo.toml +++ b/crates/pdk-test-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "moon_pdk_test_utils" -version = "0.0.13" +version = "0.0.14" edition = "2021" license = "MIT" description = "Utilities for testing moon WASM plugins." @@ -9,7 +9,7 @@ repository = "https://github.com/moonrepo/moon" publish = true [dependencies] -moon_pdk_api = { version = "0.0.12", path = "../pdk-api" } +moon_pdk_api = { version = "0.0.13", path = "../pdk-api" } warpgate = { workspace = true } extism = { workspace = true } serde = { workspace = true } diff --git a/crates/pdk/Cargo.toml b/crates/pdk/Cargo.toml index 5116cd6f550..4c9d0629852 100644 --- a/crates/pdk/Cargo.toml +++ b/crates/pdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "moon_pdk" -version = "0.0.12" +version = "0.0.13" edition = "2021" license = "MIT" description = "A plugin development kit for creating moon WASM plugins." @@ -9,7 +9,7 @@ repository = "https://github.com/moonrepo/moon" publish = true [dependencies] -moon_pdk_api = { version = "0.0.12", path = "../pdk-api" } +moon_pdk_api = { version = "0.0.13", path = "../pdk-api" } clap = { workspace = true, features = ["derive"] } extism-pdk = { workspace = true } serde = { workspace = true } diff --git a/crates/plugin/Cargo.toml b/crates/plugin/Cargo.toml index 2e10648e4a9..c02b1f9920b 100644 --- a/crates/plugin/Cargo.toml +++ b/crates/plugin/Cargo.toml @@ -11,7 +11,7 @@ publish = false [dependencies] moon_common = { path = "../common" } moon_env = { path = "../env" } -moon_pdk_api = { version = "0.0.12", path = "../pdk-api" } +moon_pdk_api = { version = "0.0.13", path = "../pdk-api" } moon_target = { path = "../target" } moon_workspace_graph = { path = "../workspace-graph" } async-trait = { workspace = true } diff --git a/crates/project/Cargo.toml b/crates/project/Cargo.toml index 73e2cc5cbed..a40e8ca936b 100644 --- a/crates/project/Cargo.toml +++ b/crates/project/Cargo.toml @@ -9,8 +9,8 @@ repository = "https://github.com/moonrepo/moon" publish = true [dependencies] -moon_common = { version = "0.0.10", path = "../common" } -moon_config = { version = "0.0.12", path = "../config" } +moon_common = { version = "0.0.11", path = "../common" } +moon_config = { version = "0.0.13", path = "../config" } moon_file_group = { version = "0.0.3", path = "../file-group" } moon_task = { version = "0.0.3", path = "../task" } miette = { workspace = true } diff --git a/crates/target/Cargo.toml b/crates/target/Cargo.toml index 415f6a97a22..d4e6442702e 100644 --- a/crates/target/Cargo.toml +++ b/crates/target/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "moon_target" -version = "0.0.9" +version = "0.0.10" edition = "2021" license = "MIT" description = "Project + task target identifier." @@ -9,7 +9,7 @@ repository = "https://github.com/moonrepo/moon" publish = true [dependencies] -moon_common = { version = "0.0.10", path = "../common" } +moon_common = { version = "0.0.11", path = "../common" } compact_str = { workspace = true } miette = { workspace = true } once_cell = { workspace = true } diff --git a/crates/task/Cargo.toml b/crates/task/Cargo.toml index 2fb9619bf40..da1dbdc3d3e 100644 --- a/crates/task/Cargo.toml +++ b/crates/task/Cargo.toml @@ -9,9 +9,9 @@ repository = "https://github.com/moonrepo/moon" publish = true [dependencies] -moon_common = { version = "0.0.10", path = "../common" } -moon_config = { version = "0.0.12", path = "../config" } -moon_target = { version = "0.0.9", path = "../target" } +moon_common = { version = "0.0.11", path = "../common" } +moon_config = { version = "0.0.13", path = "../config" } +moon_target = { version = "0.0.10", path = "../target" } miette = { workspace = true } rustc-hash = { workspace = true } serde = { workspace = true } diff --git a/legacy/core/test-utils/Cargo.toml b/legacy/core/test-utils/Cargo.toml index 001ca84fca4..7cd8ad6f575 100644 --- a/legacy/core/test-utils/Cargo.toml +++ b/legacy/core/test-utils/Cargo.toml @@ -14,7 +14,7 @@ insta = "1.41.1" predicates = "3.1.3" pretty_assertions = "1.4.1" rustc-hash = { workspace = true } -serde_yaml = { workspace = true } +serde_yml = { workspace = true } starbase_utils = { workspace = true, features = ["glob"] } [lints] diff --git a/legacy/core/test-utils/src/sandbox.rs b/legacy/core/test-utils/src/sandbox.rs index 512cc24c316..f5d63eaff90 100644 --- a/legacy/core/test-utils/src/sandbox.rs +++ b/legacy/core/test-utils/src/sandbox.rs @@ -133,16 +133,16 @@ pub fn create_sandbox_with_config>( sandbox.create_file( ".moon/workspace.yml", - serde_yaml::to_string(&workspace_config.unwrap_or_default()).unwrap(), + serde_yml::to_string(&workspace_config.unwrap_or_default()).unwrap(), ); sandbox.create_file( ".moon/toolchain.yml", - serde_yaml::to_string(&toolchain_config.unwrap_or_default()).unwrap(), + serde_yml::to_string(&toolchain_config.unwrap_or_default()).unwrap(), ); if let Some(config) = tasks_config { - sandbox.create_file(".moon/tasks.yml", serde_yaml::to_string(&config).unwrap()); + sandbox.create_file(".moon/tasks.yml", serde_yml::to_string(&config).unwrap()); } sandbox diff --git a/legacy/deno/lang/Cargo.toml b/legacy/deno/lang/Cargo.toml index 643a1c118db..f3dc6981937 100644 --- a/legacy/deno/lang/Cargo.toml +++ b/legacy/deno/lang/Cargo.toml @@ -13,7 +13,7 @@ miette = { workspace = true } rustc-hash = { workspace = true } serde = { workspace = true } starbase_styles = { workspace = true } -starbase_utils = { workspace = true, features = ["json"] } +starbase_utils = { workspace = true, features = ["editor-config", "json"] } [lints] workspace = true diff --git a/legacy/node/lang/Cargo.toml b/legacy/node/lang/Cargo.toml index efbefa44828..71230d74e58 100644 --- a/legacy/node/lang/Cargo.toml +++ b/legacy/node/lang/Cargo.toml @@ -16,9 +16,13 @@ package-lock-json-parser = "0.4.0" rustc-hash = { workspace = true } serde = { workspace = true } serde_json = { workspace = true, features = ["preserve_order"] } -serde_yaml = { workspace = true } +serde_yml = { workspace = true } starbase_styles = { workspace = true } -starbase_utils = { workspace = true, features = ["json", "yaml"] } +starbase_utils = { workspace = true, features = [ + "editor-config", + "json", + "yaml", +] } tracing = { workspace = true } yarn-lock-parser = "0.10.0" diff --git a/legacy/node/lang/src/pnpm/mod.rs b/legacy/node/lang/src/pnpm/mod.rs index 14a3054900f..b9932fa2aa3 100644 --- a/legacy/node/lang/src/pnpm/mod.rs +++ b/legacy/node/lang/src/pnpm/mod.rs @@ -8,7 +8,7 @@ use dependency_path::PnpmDependencyPath; use moon_lang::{config_cache, LockfileDependencyVersions}; use rustc_hash::FxHashMap; use serde::{Deserialize, Serialize}; -use serde_yaml::Value; +use serde_yml::Value; use starbase_utils::yaml::read_file as read_yaml; use std::path::{Path, PathBuf}; @@ -91,7 +91,7 @@ mod tests { use super::*; use moon_test_utils::{assert_fs::prelude::*, create_temp_dir, pretty_assertions::assert_eq}; use moon_utils::string_vec; - use serde_yaml::{Mapping, Number}; + use serde_yml::{Mapping, Number}; #[test] fn parses_lockfile() { @@ -243,11 +243,11 @@ packages: .text() .unwrap(); - let _: PnpmLock = serde_yaml::from_str(&content).unwrap(); + let _: PnpmLock = serde_yml::from_str(&content).unwrap(); } #[test] fn parses_empty_lockfile() { - let _: PnpmLock = serde_yaml::from_str("lockfileVersion: '6.0'").unwrap(); + let _: PnpmLock = serde_yml::from_str("lockfileVersion: '6.0'").unwrap(); } } diff --git a/legacy/typescript/lang/Cargo.toml b/legacy/typescript/lang/Cargo.toml index a85b34d4b89..48730aa9a33 100644 --- a/legacy/typescript/lang/Cargo.toml +++ b/legacy/typescript/lang/Cargo.toml @@ -12,7 +12,7 @@ cached = { workspace = true } miette = { workspace = true } serde_json = { workspace = true, features = ["preserve_order"] } starbase_styles = { workspace = true } -starbase_utils = { workspace = true, features = ["json"] } +starbase_utils = { workspace = true, features = ["editor-config", "json"] } typescript_tsconfig_json = { version = "0.4.0", features = ["serialize"] } [dev-dependencies]