new: Update deps. Support Turbo v2. (#5)

Cargo.toml

@@ -3,18 +3,18 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.dependencies]
-extism-pdk = "1.1.0"
-moon_common = "0.0.4"
-moon_config = "0.0.5"
-moon_pdk = "0.0.5"
-moon_pdk_test_utils = "0.0.6"
-moon_target = "0.0.3"
+extism-pdk = "1.2.0"
+moon_common = "0.0.6"
+moon_config = "0.0.8"
+moon_pdk = "0.0.7"
+moon_pdk_test_utils = "0.0.8"
+moon_target = "0.0.5"
 rustc-hash = "1.1.0"
-serde = { version = "1.0.197", features = ["derive"] }
-serde_json = "1.0.115"
-serde_yaml = "0.9.33"
-starbase_utils = { version = "0.6.1", default-features = false }
-starbase_sandbox = "0.5.0"
+serde = { version = "1.0.203", features = ["derive"] }
+serde_json = "1.0.117"
+serde_yaml = "0.9.34"
+starbase_utils = { version = "0.7.4", default-features = false }
+starbase_sandbox = "0.6.2"
 
 # moon_common = { path = "../moon/nextgen/common" }
 # moon_config = { path = "../moon/nextgen/config" }

crates/common/src/lib.rs

@@ -10,7 +10,9 @@ pub fn format_virtual_path(path: &VirtualPath) -> Cow<'_, str> {
         Cow::Owned(real.to_string_lossy().into_owned())
     } else if let Some(rel) = path.without_prefix() {
         rel.to_string_lossy()
+    } else if let Some(virt) = path.virtual_path() {
+        Cow::Owned(virt.to_string_lossy().into_owned())
     } else {
-        path.virtual_path().to_string_lossy()
+        path.to_string_lossy()
     }
 }

crates/download/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Unreleased
+
+#### 🚀 Updates
+
+- Updated dependencies.
+
 ## 0.0.3
 
 #### 🚀 Updates

crates/download/tests/download_test.rs

@@ -66,7 +66,7 @@ mod download {
         let file = sandbox.path().join("README.md");
 
         assert!(file.exists());
-        assert_eq!(fs::metadata(file).unwrap().len(), 4013);
+        assert_eq!(fs::metadata(file).unwrap().len(), 3891);
     }
 
     #[test]

crates/migrate-nx/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Unreleased
+
+#### 🚀 Updates
+
+- Updated dependencies.
+
 ## 0.0.3
 
 #### 🐞 Fixes

crates/migrate-nx/tests/snapshots/migrate_nx_test__migrate_nx__nx_json__converts_named_inputs.snap

@@ -10,6 +10,6 @@ fileGroups:
   - '!**/*'
   - /**/*
   - '!/**/*'
-  - ./src/file.ts
-  - ./src/file.*
-  - ./src
+  - src/file.ts
+  - src/file.*
+  - src

crates/migrate-nx/tests/snapshots/migrate_nx_test__migrate_nx__projects__converts_named_inputs.snap

@@ -10,8 +10,8 @@ fileGroups:
   - '!**/*'
   - /**/*
   - '!/**/*'
-  - ./src/file.ts
-  - ./src/file.*
-  - ./src
+  - src/file.ts
+  - src/file.*
+  - src
 language: javascript
 platform: node

crates/migrate-turborepo/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Unreleased
+
+#### 🚀 Updates
+
+- Added support for Turborepo v2.
+- Updated dependencies.
+
 ## 0.1.0
 
 #### 🚀 Updates

crates/migrate-turborepo/src/turbo_json.rs

@@ -17,23 +17,29 @@ pub enum TurboOutputMode {
 pub struct TurboTask {
     pub cache: Option<bool>,
     pub depends_on: Option<Vec<String>>,
-    pub dot_env: Option<Vec<String>>,
     pub env: Option<Vec<String>>,
     pub inputs: Option<Vec<String>>,
-    pub output_mode: Option<TurboOutputMode>,
     pub outputs: Option<Vec<String>>,
     pub pass_through_env: Option<Vec<String>>,
     pub persistent: Option<bool>,
+    // v2
+    pub output_logs: Option<TurboOutputMode>,
+    // v1 (removed)
+    pub dot_env: Option<Vec<String>>,
+    pub output_mode: Option<TurboOutputMode>,
 }
 
 #[derive(Default, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TurboJson {
     pub extends: Option<Vec<String>>,
     pub global_dependencies: Option<Vec<String>>,
-    pub global_dot_env: Option<Vec<String>>,
     pub global_env: Option<Vec<String>>,
     pub global_pass_through_env: Option<Vec<String>>,
+    // v2
+    pub tasks: Option<FxHashMap<String, TurboTask>>,
+    // v1 (removed)
+    pub global_dot_env: Option<Vec<String>>,
     pub pipeline: Option<FxHashMap<String, TurboTask>>,
 }
 

crates/migrate-turborepo/src/turbo_migrator.rs

@@ -146,7 +146,7 @@ impl TurboMigrator {
         turbo_json: TurboJson,
         from_source: Option<&str>,
     ) -> AnyResult<()> {
-        let Some(pipeline) = turbo_json.pipeline else {
+        let Some(pipeline) = turbo_json.tasks.or_else(|| turbo_json.pipeline) else {
             return Ok(());
         };
 
@@ -312,7 +312,7 @@ impl TurboMigrator {
             });
         }
 
-        if let Some(output_mode) = &turbo_task.output_mode {
+        if let Some(output_mode) = &turbo_task.output_logs.or_else(|| turbo_task.output_mode) {
             let output_style = match output_mode {
                 TurboOutputMode::HashOnly => Some(TaskOutputStyle::Hash),
                 TurboOutputMode::NewOnly => Some(TaskOutputStyle::Buffer),

crates/migrate-turborepo/tests/__fixtures__/error-missing-project/turbo.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://turbo.build/schema.json",
-  "pipeline": {
+  "tasks": {
     "client#build": {
       "dependsOn": ["^build"]
     }

crates/migrate-turborepo/tests/__fixtures__/root-merge-existing/turbo.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://turbo.build/schema.json",
-  "pipeline": {
+  "tasks": {
     "build": {
       "dependsOn": ["^build"],
       "outputs": ["dist/**"]

crates/migrate-turborepo/tests/__fixtures__/root-only/turbo.json

@@ -9,7 +9,7 @@
     "test": {
       "dependsOn": ["build"],
       "inputs": ["src/**/*.tsx", "src/**/*.ts", "test/**/*.ts"],
-      "outputMode": "full"
+      "outputLogs": "full"
     },
     "dev": {
       "cache": false,

crates/unpack/Cargo.toml

@@ -17,7 +17,7 @@ pre-release-replacements = [
 moon_extension_common = { path = "../common" }
 extism-pdk = { workspace = true }
 moon_pdk = { workspace = true }
-starbase_archive = { version = "0.6.0", default-features = false, features = [
+starbase_archive = { version = "0.7.3", default-features = false, features = [
 	"tar-gz",
 	"zip",
 ] }

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
 profile = "default"
-channel = "1.77.0"
+channel = "1.78.0"