refactor: merge packages/global into packages/cli (#607)

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 }}
@@ -48,19 +45,16 @@ runs:
         pnpm --filter @rolldown/pluginutils build
         pnpm --filter rolldown build-node
         pnpm --filter vite build-types
-        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
+        pnpm --filter "@voidzero-dev/*" build
+        pnpm --filter vite-plus 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
+    # Must run before vite-plus TypeScript builds which depend on the bindings
     - name: Build NAPI bindings (x86_64-linux)
       shell: bash
       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 +64,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 +74,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,37 +111,23 @@ 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)
-    - name: Copy Rust CLI binary
-      shell: bash
-      run: |
-        if [[ "${{ inputs.target }}" == *"windows"* ]]; then
-          cp target/${{ inputs.target }}/release/vp.exe packages/global/bin/vp.exe
-        else
-          cp target/${{ inputs.target }}/release/vp packages/global/bin/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
       if: inputs.print-after-build == 'true'
       run: |
-        pnpm vite -h
-        pnpm vite run -h
-        pnpm vite lint -h
-        pnpm vite test -h
-        pnpm vite build -h
-        pnpm vite fmt -h
+        pnpm vp -h
+        pnpm vp run -h
+        pnpm vp lint -h
+        pnpm vp test -h
+        pnpm vp build -h
+        pnpm vp fmt -h

.github/workflows/ci.yml

@@ -210,13 +210,6 @@ jobs:
           vp --version
           vp -h
 
-      - name: Check CLI JS execution on Windows rust binary
-        if: ${{ matrix.os == 'windows-latest' }}
-        run: |
-          ls -al packages/global/bin
-          VITE_LOG=trace ./packages/global/bin/vp.exe -V
-          VITE_LOG=trace ./packages/global/bin/vp.exe pm cache dir
-
       - name: Run CLI fmt
         run: vp fmt --check
 
@@ -368,7 +361,7 @@ jobs:
         run: |
           # Helper to read the installed CLI version from package.json
           get_cli_version() {
-            node -p "require(require('path').resolve(process.env.USERPROFILE || process.env.HOME, '.vite-plus', 'current', 'package.json')).version"
+            node -p "require(require('path').resolve(process.env.USERPROFILE || process.env.HOME, '.vite-plus', 'current', 'node_modules', 'vite-plus', 'package.json')).version"
           }
 
           # Save initial (dev build) version
@@ -414,7 +407,7 @@ jobs:
 
           # Helper to read the installed CLI version from package.json
           function Get-CliVersion {
-            node -p "require(require('path').resolve(process.env.USERPROFILE, '.vite-plus', 'current', 'package.json')).version"
+            node -p "require(require('path').resolve(process.env.USERPROFILE, '.vite-plus', 'current', 'node_modules', 'vite-plus', 'package.json')).version"
           }
 
           # Save initial (dev build) version
@@ -457,7 +450,7 @@ jobs:
         shell: cmd
         run: |
           REM Save initial (dev build) version
-          for /f "usebackq delims=" %%v in (`node -p "require(require('path').resolve(process.env.USERPROFILE, '.vite-plus', 'current', 'package.json')).version"`) do set INITIAL_VERSION=%%v
+          for /f "usebackq delims=" %%v in (`node -p "require(require('path').resolve(process.env.USERPROFILE, '.vite-plus', 'current', 'node_modules', 'vite-plus', 'package.json')).version"`) do set INITIAL_VERSION=%%v
           echo Initial version: %INITIAL_VERSION%
 
           REM --check queries npm registry and prints update status
@@ -471,7 +464,7 @@ jobs:
           dir "%USERPROFILE%\.vite-plus\"
 
           REM Verify version changed after update
-          for /f "usebackq delims=" %%v in (`node -p "require(require('path').resolve(process.env.USERPROFILE, '.vite-plus', 'current', 'package.json')).version"`) do set UPDATED_VERSION=%%v
+          for /f "usebackq delims=" %%v in (`node -p "require(require('path').resolve(process.env.USERPROFILE, '.vite-plus', 'current', 'node_modules', 'vite-plus', 'package.json')).version"`) do set UPDATED_VERSION=%%v
           echo Updated version: %UPDATED_VERSION%
           if "%UPDATED_VERSION%"=="%INITIAL_VERSION%" (
             echo Error: version should have changed after upgrade, still %INITIAL_VERSION%
@@ -484,7 +477,7 @@ jobs:
           vp env doctor
 
           REM Verify version restored after rollback
-          for /f "usebackq delims=" %%v in (`node -p "require(require('path').resolve(process.env.USERPROFILE, '.vite-plus', 'current', 'package.json')).version"`) do set ROLLBACK_VERSION=%%v
+          for /f "usebackq delims=" %%v in (`node -p "require(require('path').resolve(process.env.USERPROFILE, '.vite-plus', 'current', 'node_modules', 'vite-plus', 'package.json')).version"`) do set ROLLBACK_VERSION=%%v
           echo Rollback version: %ROLLBACK_VERSION%
           if not "%ROLLBACK_VERSION%"=="%INITIAL_VERSION%" (
             echo Error: version should have been restored after rollback, expected %INITIAL_VERSION%, got %ROLLBACK_VERSION%
@@ -533,7 +526,7 @@ jobs:
       - name: Run local CLI `vite install`
         run: |
           export PATH=$PWD/node_modules/.bin:$PATH
-          vite -h
+          vp -h
           # Test vite install on various repositories with different package managers
           repos=(
             # pnpm workspace
@@ -556,9 +549,9 @@ jobs:
             fi
             git clone --depth 1 "https://github.com/$repo.git" "$RUNNER_TEMP/$dir_name"
             cd "$RUNNER_TEMP/$dir_name"
-            vite install
+            vp install
             # run again to show install cache increase by time
-            time vite install
+            time vp install
             echo "✓ Successfully installed dependencies for $repo"
             echo ""
           done

.github/workflows/e2e-test.yml

@@ -103,19 +103,19 @@ jobs:
 
       - name: Pack packages into tgz
         run: |
-          pnpm copy-cli-binding
           mkdir -p tmp/tgz
           cd packages/core && pnpm pack --pack-destination ../../tmp/tgz && cd ../..
           cd packages/test && pnpm pack --pack-destination ../../tmp/tgz && cd ../..
           cd packages/cli && pnpm pack --pack-destination ../../tmp/tgz && cd ../..
-          cd packages/global && pnpm pack --pack-destination ../../tmp/tgz && cd ../..
+          # Copy vp binary for e2e-test job (findVpBinary expects it in target/)
+          cp target/${{ matrix.target }}/release/vp tmp/tgz/vp 2>/dev/null || cp target/${{ matrix.target }}/release/vp.exe tmp/tgz/vp.exe 2>/dev/null || true
           ls -la tmp/tgz
 
       - name: Upload tgz artifacts
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: vite-plus-packages-${{ matrix.os }}
-          path: tmp/tgz/*.tgz
+          path: tmp/tgz/
           retention-days: 1
 
   e2e-test:
@@ -266,7 +266,11 @@ jobs:
       - name: Install vp CLI
         shell: bash
         run: |
-          node $GITHUB_WORKSPACE/packages/tools/src/install-global-cli.ts --tgz $GITHUB_WORKSPACE/tmp/tgz/vite-plus-cli-0.0.0.tgz
+          # Place vp binary where install-global-cli.ts expects it (target/release/)
+          mkdir -p target/release
+          cp tmp/tgz/vp target/release/vp 2>/dev/null || cp tmp/tgz/vp.exe target/release/vp.exe 2>/dev/null || true
+          chmod +x target/release/vp 2>/dev/null || true
+          node $GITHUB_WORKSPACE/packages/tools/src/install-global-cli.ts --tgz $GITHUB_WORKSPACE/tmp/tgz/vite-plus-0.0.0.tgz
           echo "$HOME/.vite-plus/bin" >> $GITHUB_PATH
 
       - name: Migrate in ${{ matrix.project.name }}

.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`