Merge remote-tracking branch 'upstream/main'

diff --cc package.json
Simple merge

diff --cc packages-private/sfc-playground/src/App.vue
Simple merge

diff --cc packages/compiler-core/package.json
Simple merge

diff --cc packages/compiler-dom/package.json
Simple merge

diff --cc packages/compiler-sfc/package.json
Simple merge

diff --cc packages/compiler-ssr/package.json
Simple merge

diff --cc packages/reactivity/package.json
Simple merge

diff --cc packages/runtime-core/package.json
Simple merge

diff --cc packages/runtime-core/src/componentProps.ts
Simple merge

diff --cc packages/runtime-dom/package.json
Simple merge

diff --cc packages/server-renderer/package.json
Simple merge

diff --cc packages/shared/package.json
Simple merge

diff --cc packages/vue-compat/package.json
Simple merge

diff --cc packages/vue/package.json
Simple merge