refactor: merge packages/global into packages/cli

Merge the global CLI package (vite-plus-cli) into the local CLI package
(vite-plus), consolidating two npm packages into one.

Key changes:
- Move global source files into packages/cli/src/ with renames to avoid
  conflicts (global-entry.ts, global-utils/, global-types/)
- Merge NAPI binding crates (migration.rs, package_manager.rs,
  global_utils.rs) into packages/cli/binding/
- Update rolldown config to bundle global entry with code splitting
- Update Rust binary to reference global-entry.js instead of index.js
- Update install scripts and wrapper.js for vite-plus package names
- Update publish-native-addons.ts to include Rust vp binary
- Remove packages/global/ entirely
- Update CI workflows and root scripts to remove global-specific steps
- Add snap-test-global script for running global CLI snap tests

Author: fengmk2

.github/actions/build-upstream/action.yml

@@ -21,7 +21,7 @@ runs:
       id: cache-key
       shell: bash
       run: |
-        echo "key=napi-binding-v2-${{ inputs.target }}-${{ env.RELEASE_BUILD }}-${{ env.DEBUG }}-${{ env.VERSION }}-${{ env.NPM_TAG }}-${{ hashFiles('packages/tools/.upstream-versions.json', 'Cargo.lock', 'crates/**/*.rs', 'crates/*/Cargo.toml', 'packages/*/binding/**/*.rs', 'packages/*/binding/Cargo.toml', 'Cargo.toml', '.cargo/config.toml', 'packages/cli/package.json', 'packages/cli/build.ts', 'packages/global/package.json', 'packages/global/build.ts') }}" >> $GITHUB_OUTPUT
+        echo "key=napi-binding-v3-${{ inputs.target }}-${{ env.RELEASE_BUILD }}-${{ env.DEBUG }}-${{ env.VERSION }}-${{ env.NPM_TAG }}-${{ hashFiles('packages/tools/.upstream-versions.json', 'Cargo.lock', 'crates/**/*.rs', 'crates/*/Cargo.toml', 'packages/cli/binding/**/*.rs', 'packages/cli/binding/Cargo.toml', 'Cargo.toml', '.cargo/config.toml', 'packages/cli/package.json', 'packages/cli/build.ts') }}" >> $GITHUB_OUTPUT
 
     # Cache NAPI bindings and Rust CLI binary (the slow parts, especially on Windows)
     - name: Restore NAPI binding cache
@@ -34,9 +34,6 @@ runs:
           packages/cli/binding/index.d.ts
           packages/cli/binding/index.cjs
           packages/cli/binding/index.d.cts
-          packages/global/binding/*.node
-          packages/global/binding/index.js
-          packages/global/binding/index.d.ts
           target/${{ inputs.target }}/release/vp
           target/${{ inputs.target }}/release/vp.exe
         key: ${{ steps.cache-key.outputs.key }}
@@ -51,7 +48,6 @@ runs:
         pnpm --filter=@voidzero-dev/vite-plus-core build
         pnpm --filter=@voidzero-dev/vite-plus-test build
         pnpm --filter=vite-plus build-ts
-        pnpm --filter=vite-plus-cli build-ts
 
     # NAPI builds - only run on cache miss (slow, especially on Windows)
     # Must run before vite-plus/vite-plus-cli TypeScript builds which depend on the bindings
@@ -60,7 +56,6 @@ runs:
       if: steps.cache-restore.outputs.cache-hit != 'true' && inputs.target == 'x86_64-unknown-linux-gnu'
       run: |
         pnpm --filter=vite-plus build-native --target ${{ inputs.target }} --use-napi-cross
-        pnpm --filter=vite-plus-cli build-native --target ${{ inputs.target }} --use-napi-cross
       env:
         TARGET_CC: clang
         DEBUG: napi:*
@@ -70,7 +65,6 @@ runs:
       if: steps.cache-restore.outputs.cache-hit != 'true' && inputs.target == 'aarch64-unknown-linux-gnu'
       run: |
         pnpm --filter=vite-plus build-native --target ${{ inputs.target }} --use-napi-cross
-        pnpm --filter=vite-plus-cli build-native --target ${{ inputs.target }} --use-napi-cross
       env:
         TARGET_CC: clang
         TARGET_CFLAGS: '-D_BSD_SOURCE'
@@ -81,7 +75,6 @@ runs:
       if: steps.cache-restore.outputs.cache-hit != 'true' && !contains(inputs.target, 'linux')
       run: |
         pnpm --filter=vite-plus build-native --target ${{ inputs.target }}
-        pnpm --filter=vite-plus-cli build-native --target ${{ inputs.target }}
       env:
         DEBUG: napi:*
 
@@ -119,29 +112,26 @@ runs:
           packages/cli/binding/index.d.ts
           packages/cli/binding/index.cjs
           packages/cli/binding/index.d.cts
-          packages/global/binding/*.node
-          packages/global/binding/index.js
-          packages/global/binding/index.d.ts
           target/${{ inputs.target }}/release/vp
           target/${{ inputs.target }}/release/vp.exe
         key: ${{ steps.cache-key.outputs.key }}
 
-    # Copy Rust CLI binary to packages/global/bin/ (runs on both cache hit and miss)
+    # Copy Rust CLI binary to packages/cli/vp-binary/ (runs on both cache hit and miss)
     - name: Copy Rust CLI binary
       shell: bash
       run: |
+        mkdir -p packages/cli/vp-binary
         if [[ "${{ inputs.target }}" == *"windows"* ]]; then
-          cp target/${{ inputs.target }}/release/vp.exe packages/global/bin/vp.exe
+          cp target/${{ inputs.target }}/release/vp.exe packages/cli/vp-binary/vp.exe
         else
-          cp target/${{ inputs.target }}/release/vp packages/global/bin/vp
+          cp target/${{ inputs.target }}/release/vp packages/cli/vp-binary/vp
         fi
 
     # Build vite-plus TypeScript after native bindings are ready
     - name: Build vite-plus TypeScript packages
       shell: bash
       run: |
         pnpm --filter=vite-plus build-ts
-        pnpm --filter=vite-plus-cli build-ts
 
     - name: Print output after build
       shell: bash

.github/workflows/release.yml

@@ -77,7 +77,6 @@ jobs:
       - name: Set binding version
         run: |
           pnpm exec tool replace-file-content packages/cli/binding/Cargo.toml 'version = "0.0.0"' 'version = "${{ env.VERSION }}"'
-          pnpm exec tool replace-file-content packages/global/binding/Cargo.toml 'version = "0.0.0"' 'version = "${{ env.VERSION }}"'
           pnpm exec tool replace-file-content crates/vite_global_cli/Cargo.toml 'version = "0.0.0"' 'version = "${{ env.VERSION }}"'
 
       - name: Configure Git for access to vite-task
@@ -95,13 +94,6 @@ jobs:
           path: ./packages/cli/binding/*.node
           if-no-files-found: error
 
-      - name: Upload Vite+ global binding artifact
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: vite-plus-cli-native-${{ matrix.settings.target }}
-          path: ./packages/global/binding/*.node
-          if-no-files-found: error
-
       - name: Upload Rust CLI binary artifact
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
@@ -132,14 +124,6 @@ jobs:
           path: ./packages/cli/dist
           if-no-files-found: error
 
-      - name: Upload global dist
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        if: ${{ matrix.settings.target == 'x86_64-unknown-linux-gnu' }}
-        with:
-          name: global
-          path: ./packages/global/dist
-          if-no-files-found: error
-
   Release:
     runs-on: ubuntu-latest
     needs: [prepare, build-rust]
@@ -194,19 +178,6 @@ jobs:
           target: x86_64-unknown-linux-gnu
           upload: 'false'
 
-      - name: Download global dist
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        with:
-          path: packages/global/dist
-          pattern: global
-          merge-multiple: true
-
-      - name: Download global binding to artifacts
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        with:
-          path: packages/global/artifacts
-          pattern: vite-plus-cli-native-*
-
       - name: Download Rust CLI binaries
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
@@ -242,7 +213,6 @@ jobs:
           sed -i 's/"version": "0.0.0"/"version": "${{ env.VERSION }}"/' packages/core/package.json
           sed -i 's/"version": "0.0.0"/"version": "${{ env.VERSION }}"/' packages/test/package.json
           sed -i 's/"version": "0.0.0"/"version": "${{ env.VERSION }}"/' packages/cli/package.json
-          sed -i 's/"version": "0.0.0"/"version": "${{ env.VERSION }}"/' packages/global/package.json
 
       - name: Build test
         run: pnpm --filter=@voidzero-dev/vite-plus-test build
@@ -254,14 +224,12 @@ jobs:
       - name: Publish native addons
         run: |
           node ./packages/cli/publish-native-addons.ts
-          node ./packages/global/publish-native-addons.ts
 
       - name: Publish
         run: |
           pnpm publish --filter=./packages/core --tag ${{ inputs.npm_tag }} --access public --no-git-checks
           pnpm publish --filter=./packages/test --tag ${{ inputs.npm_tag }} --access public --no-git-checks
           pnpm publish --filter=./packages/cli --tag ${{ inputs.npm_tag }} --access public --no-git-checks
-          pnpm publish --filter=./packages/global --tag ${{ inputs.npm_tag }} --access public --no-git-checks
 
       - name: Create release body
         run: |
@@ -282,7 +250,6 @@ jobs:
           - \`@voidzero-dev/vite-plus-core@${{ env.VERSION }}\`
           - \`@voidzero-dev/vite-plus-test@${{ env.VERSION }}\`
           - \`vite-plus@${{ env.VERSION }}\`
-          - \`vite-plus-cli@${{ env.VERSION }}\`
 
           ### Installation
 
@@ -324,7 +291,6 @@ jobs:
             • @voidzero-dev/vite-plus-core@${{ env.VERSION }}
             • @voidzero-dev/vite-plus-test@${{ env.VERSION }}
             • vite-plus@${{ env.VERSION }}
-            • vite-plus-cli@${{ env.VERSION }}
 
             **Install:**
             • macOS/Linux: `curl -fsSL https://staging.viteplus.dev/install.sh | bash`

Cargo.lock

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "3"
-members = ["bench", "crates/*", "packages/cli/binding", "packages/global/binding"]
+members = ["bench", "crates/*", "packages/cli/binding"]
 
 [workspace.package]
 authors = ["Vite+ Authors"]

Cargo.toml

@@ -12,7 +12,7 @@ pub async fn execute(cwd: AbsolutePathBuf, args: &[String]) -> Result<ExitStatus
 
     // Execute the bundled JS script with the "create" command
     // The JS script handles all argument parsing, template discovery, and execution
-    executor.execute_cli_script("index.js", "create", args, &cwd).await
+    executor.execute_cli_script("global-entry.js", "create", args, &cwd).await
 }
 
 #[cfg(test)]

crates/vite_global_cli/src/commands/create.rs

@@ -12,7 +12,7 @@ pub async fn execute(cwd: AbsolutePathBuf, args: &[String]) -> Result<ExitStatus
 
     // Execute the bundled JS script with the "migrate" command
     // The JS script handles all migration logic
-    executor.execute_cli_script("index.js", "migrate", args, &cwd).await
+    executor.execute_cli_script("global-entry.js", "migrate", args, &cwd).await
 }
 
 #[cfg(test)]

crates/vite_global_cli/src/commands/migrate.rs

@@ -36,7 +36,7 @@ pub struct ResolvedVersion {
     pub platform_integrity: String,
 }
 
-const MAIN_PACKAGE_NAME: &str = "vite-plus-cli";
+const MAIN_PACKAGE_NAME: &str = "vite-plus";
 const PLATFORM_PACKAGE_SCOPE: &str = "@voidzero-dev";
 
 /// Resolve a version from the npm registry.
@@ -105,7 +105,7 @@ mod tests {
     fn test_package_name_construction() {
         let suffix = "darwin-arm64";
         let name = format!("{PLATFORM_PACKAGE_SCOPE}/{MAIN_PACKAGE_NAME}-{suffix}");
-        assert_eq!(name, "@voidzero-dev/vite-plus-cli-darwin-arm64");
+        assert_eq!(name, "@voidzero-dev/vite-plus-darwin-arm64");
     }
 
     #[test]

crates/vite_global_cli/src/commands/upgrade/registry.rs

@@ -9,7 +9,7 @@ use crate::{error::Error, js_executor::JsExecutor};
 /// Execute the `--version` command by delegating to the bundled JavaScript implementation.
 pub async fn execute(cwd: AbsolutePathBuf) -> Result<ExitStatus, Error> {
     let mut executor = JsExecutor::new(None);
-    executor.execute_cli_script("index.js", "--version", &[], &cwd).await
+    executor.execute_cli_script("global-entry.js", "--version", &[], &cwd).await
 }
 
 #[cfg(test)]

crates/vite_global_cli/src/commands/version.rs

@@ -55,8 +55,8 @@ impl JsExecutor {
         }
 
         // 3. Auto-detect from binary location
-        // JS scripts are at ../dist relative to bin/
-        // e.g., packages/global/bin/vp -> packages/global/dist/
+        // JS scripts are at ../dist relative to the binary directory
+        // e.g., packages/cli/vp-binary/vp -> packages/cli/dist/
         let exe_path = std::env::current_exe().map_err(|_| Error::JsScriptsDirNotFound)?;
         // Resolve symlinks to get the real binary path (Unix only)
         // Skip on Windows to avoid path resolution issues
@@ -111,7 +111,7 @@ impl JsExecutor {
     /// from `devEngines.runtime` in the CLI's package.json.
     fn get_cli_package_dir(&self) -> Result<AbsolutePathBuf, Error> {
         let scripts_dir = self.get_scripts_dir()?;
-        // scripts_dir is typically packages/global/dist, so parent is packages/global
+        // scripts_dir is typically packages/cli/dist, so parent is packages/cli
         scripts_dir
             .parent()
             .map(vite_path::AbsolutePath::to_absolute_path_buf)
@@ -222,7 +222,7 @@ impl JsExecutor {
 
         // Get the JS entry point (dist/index.js)
         let scripts_dir = self.get_scripts_dir()?;
-        let entry_point = scripts_dir.join("index.js");
+        let entry_point = scripts_dir.join("global-entry.js");
 
         tracing::debug!("Delegating to local CLI via JS entry point: {:?} {:?}", entry_point, args);
 

crates/vite_global_cli/src/js_executor.rs

@@ -4,12 +4,11 @@
   "license": "BUSL-1.1",
   "type": "module",
   "scripts": {
-    "build": "pnpm -F @voidzero-dev/* -F vite-plus build && pnpm -F vite-plus-cli build",
+    "build": "pnpm -F @voidzero-dev/* -F vite-plus build",
     "bootstrap-cli": "pnpm build && cargo build -p vite_global_cli --release && pnpm copy-vp-binary && pnpm install-global-cli",
     "bootstrap-cli:ci": "pnpm install-global-cli",
-    "copy-vp-binary": "rm -f packages/global/bin/vp packages/global/bin/vp.exe && (cp target/release/vp packages/global/bin/vp || cp target/release/vp.exe packages/global/bin/vp.exe)",
-    "copy-cli-binding": "pnpm --filter=vite-plus-cli copy-binding",
-    "install-global-cli": "pnpm copy-cli-binding && tool install-global-cli",
+    "copy-vp-binary": "mkdir -p packages/cli/vp-binary && rm -f packages/cli/vp-binary/vp packages/cli/vp-binary/vp.exe && (cp target/release/vp packages/cli/vp-binary/vp || cp target/release/vp.exe packages/cli/vp-binary/vp.exe)",
+    "install-global-cli": "tool install-global-cli",
     "tsgo": "tsgo -b tsconfig.json",
     "lint": "vp lint --type-aware --threads 4",
     "test": "vp test run && pnpm -r snap-test",