Merge branch 'main' into master

HaasStefan · web-flow · commit c3a651d74522 · 2026-04-01T15:35:14.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ defaults:
 
 jobs:
   detect-changes:
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-linux-x64-default
     permissions:
       contents: read
       pull-requests: read
@@ -43,7 +43,7 @@ jobs:
     needs: detect-changes
     if: needs.detect-changes.outputs.code-changed == 'true'
     name: Clippy
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-linux-x64-default
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -57,7 +57,10 @@ jobs:
           components: clippy
 
       - run: rustup target add x86_64-unknown-linux-musl
-      - run: pip install cargo-zigbuild
+      - run: pipx install cargo-zigbuild
+      # pipx isolates cargo-zigbuild in its own venv, so its ziglang dependency
+      # (which bundles zig) isn't on PATH. Install zig separately.
+      - uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2
 
       # --locked: verify Cargo.lock is up to date (replaces the removed `cargo check --locked`)
       - run: cargo clippy --locked --all-targets --all-features -- -D warnings
@@ -70,14 +73,22 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+          - os: namespace-profile-linux-x64-default
             target: x86_64-unknown-linux-gnu
+            cargo_cmd: cargo-zigbuild
+            build_target: x86_64-unknown-linux-gnu.2.17
           - os: windows-latest
             target: x86_64-pc-windows-msvc
-          - os: macos-latest
+            cargo_cmd: cargo
+            build_target: x86_64-pc-windows-msvc
+          - os: namespace-profile-mac-default
             target: aarch64-apple-darwin
-          - os: macos-latest
+            cargo_cmd: cargo
+            build_target: aarch64-apple-darwin
+          - os: namespace-profile-mac-default
             target: x86_64-apple-darwin
+            cargo_cmd: cargo
+            build_target: x86_64-apple-darwin
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -102,10 +113,15 @@ jobs:
       - run: rustup target add ${{ matrix.target }}
 
       - run: rustup target add x86_64-unknown-linux-musl
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.target == 'x86_64-unknown-linux-gnu' }}
 
-      - run: pip install cargo-zigbuild
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+      - run: pipx install cargo-zigbuild
+        if: ${{ matrix.target == 'x86_64-unknown-linux-gnu' }}
+
+      # pipx isolates cargo-zigbuild in its own venv, so its ziglang dependency
+      # (which bundles zig) isn't on PATH. Install zig separately.
+      - uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2
+        if: ${{ matrix.target == 'x86_64-unknown-linux-gnu' }}
 
       # For x86_64-apple-darwin on arm64 runner, install x64 node so fspy preload dylib
       # (compiled for x86_64) can be injected into node processes running under Rosetta.
@@ -128,26 +144,16 @@ jobs:
       - run: pnpm install
 
       - name: Build tests
-        run: cargo test --no-run --target ${{ matrix.target }}
-        if: ${{ matrix.os != 'ubuntu-latest' }}
-
-      - name: Build tests
-        run: cargo-zigbuild test --no-run --target x86_64-unknown-linux-gnu.2.17
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-
-      - name: Run tests
-        run: cargo test --target ${{ matrix.target }}
-        if: ${{ matrix.os != 'ubuntu-latest' }}
+        run: ${{ matrix.cargo_cmd }} test --no-run --target ${{ matrix.build_target }}
 
       - name: Run tests
-        run: cargo-zigbuild test --target x86_64-unknown-linux-gnu.2.17
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+        run: ${{ matrix.cargo_cmd }} test --target ${{ matrix.build_target }}
 
   test-musl:
     needs: detect-changes
     if: needs.detect-changes.outputs.code-changed == 'true'
     name: Test (musl)
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-linux-x64-default
     container:
       image: node:22-alpine3.21
       options: --shm-size=256m # shm_io tests need bigger shared memory
@@ -193,7 +199,7 @@ jobs:
 
   fmt:
     name: Format and Check Deps
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-linux-x64-default
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -221,7 +227,7 @@ jobs:
         run: pnpm dedupe --check
 
   done:
-    runs-on: ubuntu-latest
+    runs-on: namespace-profile-linux-x64-default
     if: always()
     needs:
       - clippy
diff --git a/README.md b/README.md
@@ -13,6 +13,10 @@ vp run -t @my/app#build   # run in a package and its transitive dependencies
 vp run --cache build      # run with caching enabled
 ```
 
+## Sponsors
+
+Thanks to [namespace.so](https://namespace.so) for powering our CI/CD pipelines with fast, free macOS and Linux runners.
+
 ## License
 
 [MIT](LICENSE)
diff --git a/crates/pty_terminal/tests/terminal.rs b/crates/pty_terminal/tests/terminal.rs
@@ -140,7 +140,10 @@ fn write_interactive_prompt() {
     let cmd = CommandBuilder::from(command_for_fn!((), |(): ()| {
         use std::io::{Write, stdin, stdout};
         let mut stdout = stdout();
-        print!("Name: ");
+        // Use "Name:\n" instead of "Name: " so the test can synchronize with
+        // `read_until(b'\n')`.  On Windows ConPTY, `read_until(b' ')` on the
+        // raw PTY stream can hang.
+        println!("Name:");
         stdout.flush().unwrap();
 
         let mut input = std::string::String::new();
@@ -152,12 +155,12 @@ fn write_interactive_prompt() {
     let Terminal { mut pty_reader, mut pty_writer, child_handle, .. } =
         Terminal::spawn(ScreenSize { rows: 80, cols: 80 }, cmd).unwrap();
 
-    // Wait for prompt "Name: " (read until the space after colon)
+    // Wait for the "Name:" prompt line.
     {
         let mut buf_reader = BufReader::new(&mut pty_reader);
-        let mut buf = Vec::new();
-        buf_reader.read_until(b' ', &mut buf).unwrap();
-        assert!(String::from_utf8_lossy(&buf).contains("Name:"));
+        let mut line = Vec::new();
+        buf_reader.read_until(b'\n', &mut line).unwrap();
+        assert!(String::from_utf8_lossy(&line).contains("Name:"));
     }
 
     // Send response
@@ -168,7 +171,7 @@ fn write_interactive_prompt() {
     let _ = child_handle.wait().unwrap();
 
     let output = pty_reader.screen_contents();
-    assert_eq!(output.trim(), "Name: Alice\nHello, Alice");
+    assert_eq!(output.trim(), "Name:\nAlice\nHello, Alice");
 }
 
 #[test]
diff --git a/crates/vite_workspace/src/lib.rs b/crates/vite_workspace/src/lib.rs
@@ -33,17 +33,41 @@ struct PnpmWorkspace {
     packages: Vec<Str>,
 }
 
-/// The workspace configuration for npm/yarn.
+/// The `workspaces` field in package.json can be either an array of glob patterns
+/// or an object with a `packages` field (used by Bun catalogs and Yarn classic nohoist).
+///
+/// Array form: `"workspaces": ["packages/*", "apps/*"]`
+/// Object form: `"workspaces": {"packages": ["packages/*", "apps/*"], "catalog": {...}}`
+///
+/// Bun: <https://bun.sh/docs/pm/workspaces>
+/// Yarn classic: <https://classic.yarnpkg.com/en/docs/workspaces/>
+#[derive(Debug, Deserialize)]
+#[serde(untagged)]
+enum NpmWorkspaces {
+    /// Array of glob patterns (npm, yarn, bun).
+    Array(Vec<Str>),
+    /// Object form with a `packages` field (Bun catalogs, Yarn classic nohoist).
+    Object { packages: Vec<Str> },
+}
+
+impl NpmWorkspaces {
+    fn into_packages(self) -> Vec<Str> {
+        match self {
+            Self::Array(packages) | Self::Object { packages } => packages,
+        }
+    }
+}
+
+/// The workspace configuration for npm/yarn/bun.
 ///
 /// npm: <https://docs.npmjs.com/cli/v11/using-npm/workspaces>
 /// yarn: <https://yarnpkg.com/features/workspaces>
+/// bun: <https://bun.sh/docs/pm/workspaces>
 #[derive(Debug, Deserialize)]
 struct NpmWorkspace {
-    /// Array of folder glob patterns referencing the workspaces of the project.
-    ///
-    /// <https://docs.npmjs.com/cli/v11/configuring-npm/package-json#workspaces>
-    /// <https://yarnpkg.com/configuration/manifest#workspaces>
-    workspaces: Vec<Str>,
+    /// Glob patterns referencing the workspaces of the project.
+    /// Accepts both array form and object form (with `packages` key).
+    workspaces: NpmWorkspaces,
 }
 
 #[derive(Debug)]
@@ -237,7 +261,7 @@ pub fn load_package_graph(
                     file_path: Arc::clone(file_with_path.path()),
                     serde_json_error: e,
                 })?;
-            workspace.workspaces
+            workspace.workspaces.into_packages()
         }
         WorkspaceFile::NonWorkspacePackage(file_with_path) => {
             // For non-workspace packages, add the package.json to the graph as a root package
@@ -1096,4 +1120,115 @@ mod tests {
         // External dependencies should not create edges
         assert_eq!(graph.edge_count(), 1, "Should only have one edge for workspace dependency");
     }
+
+    #[test]
+    fn test_get_package_graph_npm_workspace_object_form() {
+        let temp_dir = TempDir::new().unwrap();
+        let temp_dir_path = AbsolutePath::new(temp_dir.path()).unwrap();
+
+        // Create package.json with object-form workspaces (Bun/Yarn classic style)
+        let root_package = serde_json::json!({
+            "name": "bun-monorepo",
+            "private": true,
+            "workspaces": {
+                "packages": ["packages/*", "apps/*"]
+            }
+        });
+        fs::write(temp_dir_path.join("package.json"), root_package.to_string()).unwrap();
+
+        // Create packages directory structure
+        fs::create_dir_all(temp_dir_path.join("packages")).unwrap();
+        fs::create_dir_all(temp_dir_path.join("apps")).unwrap();
+
+        // Create shared library package
+        fs::create_dir_all(temp_dir_path.join("packages/shared")).unwrap();
+        let shared_pkg = serde_json::json!({
+            "name": "@myorg/shared",
+            "version": "1.0.0"
+        });
+        fs::write(temp_dir_path.join("packages/shared/package.json"), shared_pkg.to_string())
+            .unwrap();
+
+        // Create app that depends on shared
+        fs::create_dir_all(temp_dir_path.join("apps/web")).unwrap();
+        let web_app = serde_json::json!({
+            "name": "web-app",
+            "version": "0.1.0",
+            "dependencies": {
+                "@myorg/shared": "workspace:*"
+            }
+        });
+        fs::write(temp_dir_path.join("apps/web/package.json"), web_app.to_string()).unwrap();
+
+        let graph = discover_package_graph(temp_dir_path).unwrap();
+
+        // Should have 3 nodes: root + shared + web-app
+        assert_eq!(graph.node_count(), 3);
+
+        // Verify packages were found
+        let mut packages_found = FxHashSet::<Str>::default();
+        for node in graph.node_weights() {
+            packages_found.insert(node.package_json.name.clone());
+        }
+        assert!(packages_found.contains("bun-monorepo"));
+        assert!(packages_found.contains("@myorg/shared"));
+        assert!(packages_found.contains("web-app"));
+
+        // Verify dependency edge
+        let mut found_web_to_shared = false;
+        for edge_ref in graph.edge_references() {
+            let source = &graph[edge_ref.source()];
+            let target = &graph[edge_ref.target()];
+            if source.package_json.name == "web-app" && target.package_json.name == "@myorg/shared"
+            {
+                found_web_to_shared = true;
+            }
+        }
+        assert!(found_web_to_shared, "Web app should depend on shared");
+    }
+
+    #[test]
+    fn test_get_package_graph_bun_workspace_with_catalog() {
+        let temp_dir = TempDir::new().unwrap();
+        let temp_dir_path = AbsolutePath::new(temp_dir.path()).unwrap();
+
+        // Create package.json with Bun catalog in object-form workspaces
+        let root_package = serde_json::json!({
+            "name": "bun-catalog-monorepo",
+            "private": true,
+            "workspaces": {
+                "packages": ["packages/*"],
+                "catalog": {
+                    "react": "^19.0.0",
+                    "vite": "npm:@voidzero-dev/vite-plus-core@latest"
+                }
+            }
+        });
+        fs::write(temp_dir_path.join("package.json"), root_package.to_string()).unwrap();
+
+        // Create packages directory
+        fs::create_dir_all(temp_dir_path.join("packages")).unwrap();
+
+        // Create a package
+        fs::create_dir_all(temp_dir_path.join("packages/app")).unwrap();
+        let app_pkg = serde_json::json!({
+            "name": "my-app",
+            "dependencies": {
+                "react": "catalog:"
+            }
+        });
+        fs::write(temp_dir_path.join("packages/app/package.json"), app_pkg.to_string()).unwrap();
+
+        let graph = discover_package_graph(temp_dir_path).unwrap();
+
+        // Should have 2 nodes: root + app (catalog field is silently ignored)
+        assert_eq!(graph.node_count(), 2);
+
+        let mut packages_found = FxHashSet::<Str>::default();
+        for node in graph.node_weights() {
+            packages_found.insert(node.package_json.name.clone());
+        }
+        assert!(packages_found.contains("bun-catalog-monorepo"));
+        assert!(packages_found.contains("my-app"));
+    }
 }
