fix: `this.resolve` skipSelf should not skip for different `id` or `import`#18903

sapphi-red merged 2 commits intovitejs:mainvitejs/vite:mainfrom

sapphi-red:fix/this-resolve-skip-self-compatsapphi-red/vite:fix/this-resolve-skip-self-compatCopy head branch name to clipboard