Merge branch 'main' of github.com:voidzero-dev/vite-plus into feat/publish-support

Author: ubugeeei

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

@@ -27,6 +27,12 @@ runs:
       run: |
         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
 
+    # Resolve the Rust target directory (CARGO_TARGET_DIR from setup-rust, or default "target")
+    - name: Resolve Rust target directory
+      id: rust-target
+      shell: bash
+      run: echo "dir=${CARGO_TARGET_DIR:-target}" >> $GITHUB_OUTPUT
+
     # Cache NAPI bindings and Rust CLI binary (the slow parts, especially on Windows)
     - name: Restore NAPI binding cache
       id: cache-restore
@@ -38,9 +44,9 @@ runs:
           packages/cli/binding/index.d.ts
           packages/cli/binding/index.cjs
           packages/cli/binding/index.d.cts
-          target/${{ inputs.target }}/release/vp
-          target/${{ inputs.target }}/release/vp.exe
-          target/${{ inputs.target }}/release/vp-shim.exe
+          ${{ steps.rust-target.outputs.dir }}/${{ inputs.target }}/release/vp
+          ${{ steps.rust-target.outputs.dir }}/${{ inputs.target }}/release/vp.exe
+          ${{ steps.rust-target.outputs.dir }}/${{ inputs.target }}/release/vp-shim.exe
         key: ${{ steps.cache-key.outputs.key }}
 
     # Apply Vite+ branding patches to vite source (CI checks out
@@ -147,9 +153,9 @@ runs:
           packages/cli/binding/index.d.ts
           packages/cli/binding/index.cjs
           packages/cli/binding/index.d.cts
-          target/${{ inputs.target }}/release/vp
-          target/${{ inputs.target }}/release/vp.exe
-          target/${{ inputs.target }}/release/vp-shim.exe
+          ${{ steps.rust-target.outputs.dir }}/${{ inputs.target }}/release/vp
+          ${{ steps.rust-target.outputs.dir }}/${{ inputs.target }}/release/vp.exe
+          ${{ steps.rust-target.outputs.dir }}/${{ inputs.target }}/release/vp-shim.exe
         key: ${{ steps.cache-key.outputs.key }}
 
     # Build vite-plus TypeScript after native bindings are ready

.github/actions/clone/action.yml

@@ -31,13 +31,13 @@ runs:
         node -e "console.log('ECOSYSTEM_CI_PROJECT_REPOSITORY=' + require('./ecosystem-ci/repo.json')['${{ inputs.ecosystem-ci-project }}'].repository.replace('https://github.com/', '').replace('.git', ''))" >> $GITHUB_OUTPUT
         echo "ECOSYSTEM_CI_PROJECT_PATH=${{ runner.temp }}/vite-plus-ecosystem-ci/${{ inputs.ecosystem-ci-project }}" >> $GITHUB_OUTPUT
 
-    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
         repository: rolldown/rolldown
         path: rolldown
         ref: ${{ steps.upstream-versions.outputs.ROLLDOWN_HASH }}
 
-    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
         repository: vitejs/vite
         path: vite

.github/scripts/retry-failed-snap-tests.sh

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Retry only the snap test cases whose snap.txt changed, up to max_retries times.
+# Usage: retry-failed-snap-tests.sh [max_retries]
+set -euo pipefail
+
+max_retries=${1:-2}
+
+for retry in $(seq 1 "$max_retries"); do
+  changed=$(git diff --name-only -- 'packages/cli/snap-tests*/*/snap.txt')
+  if [ -z "$changed" ]; then
+    exit 0
+  fi
+
+  echo "::warning::Snapshot diff detected, retry $retry/$max_retries for failed cases..."
+  git diff --stat -- 'packages/cli/snap-tests*/*/snap.txt'
+
+  failed_local=$(echo "$changed" | grep -v 'snap-tests-global/' | sed -E 's|packages/cli/snap-tests/([^/]+)/.*|\1|' | sort -u || true)
+  failed_global=$(echo "$changed" | grep 'snap-tests-global/' | sed -E 's|packages/cli/snap-tests-global/([^/]+)/.*|\1|' | sort -u || true)
+
+  echo "$changed" | xargs git checkout --
+
+  for name in $failed_local; do
+    echo "Retrying local snap test: $name"
+    RUST_BACKTRACE=1 pnpm -F ./packages/cli snap-test-local "$name"
+  done
+  for name in $failed_global; do
+    echo "Retrying global snap test: $name"
+    RUST_BACKTRACE=1 pnpm -F ./packages/cli snap-test-global "$name"
+  done
+done
+
+# Final check after all retries
+if ! git diff --quiet -- 'packages/cli/snap-tests*/*/snap.txt'; then
+  echo "::error::Snapshot diff detected after $max_retries retries. Run 'pnpm -F vite-plus snap-test' locally and commit the updated snap.txt files."
+  git diff --stat
+  git diff
+  exit 1
+fi