fix: backport #18112 and #18115 to v3#18121

patak-dev merged 5 commits intov3vitejs/vite:v3from

backport/18112-18115-to-v3vitejs/vite:backport/18112-18115-to-v3Copy head branch name to clipboard