fix: backport #18112 and #18115 to v5#18116

patak-dev merged 2 commits intov5vitejs/vite:v5from

backport/18112-18115-to-v5vitejs/vite:backport/18112-18115-to-v5Copy head branch name to clipboard