fix: hasBothRollupOptionsAndRolldownOptions should return false for proxy case#22043

sapphi-red merged 2 commits into

vitejs:mainvitejs/vite:mainfrom

cyphercodes:fix-mergeconfig-warningcyphercodes/vite:fix-mergeconfig-warningCopy head branch name to clipboard