root
/
vue3-core
mirror of https://github.com/vuejs/core.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge f264ceb892 into bb4ae25793

This commit is contained in:
zhiyuanzmj 2025-06-26 16:10:58 +08:00 committed by GitHub
parent bb4ae25793 f264ceb892
commit ba644f0f7f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
packages/runtime-vapor/src/component.ts
View File

@ -188,6 +188,14 @@ export function createComponent(
appContext, appContext,
) )
// HMR
if (__DEV__ && component.__hmrId) {
registerHMR(instance)
instance.isSingleRoot = isSingleRoot
instance.hmrRerender = hmrRerender.bind(null, instance)
instance.hmrReload = hmrReload.bind(null, instance)
}
if (__DEV__) { if (__DEV__) {
pushWarningContext(instance) pushWarningContext(instance)
startMeasure(instance, `init`) startMeasure(instance, `init`)
@ -227,14 +235,6 @@ export function createComponent(
// TODO make the proxy warn non-existent property access during dev // TODO make the proxy warn non-existent property access during dev
instance.setupState = proxyRefs(setupResult) instance.setupState = proxyRefs(setupResult)
devRender(instance) devRender(instance)
// HMR
if (component.__hmrId) {
registerHMR(instance)
instance.isSingleRoot = isSingleRoot
instance.hmrRerender = hmrRerender.bind(null, instance)
instance.hmrReload = hmrReload.bind(null, instance)
}
} }
} else { } else {
// component has a render function but no setup function // component has a render function but no setup function
@ -291,18 +291,33 @@ export let isApplyingFallthroughProps = false
*/ */
export function devRender(instance: VaporComponentInstance): void { export function devRender(instance: VaporComponentInstance): void {
instance.block = instance.block =
callWithErrorHandling( (instance.type.render
instance.type.render!, ? callWithErrorHandling(
instance, instance.type.render,
ErrorCodes.RENDER_FUNCTION, instance,
[ ErrorCodes.RENDER_FUNCTION,
instance.setupState, [
instance.props, instance.setupState,
instance.emit, instance.props,
instance.attrs, instance.emit,
instance.slots, instance.attrs,
], instance.slots,
) || [] ],
)
: callWithErrorHandling(
isFunction(instance.type) ? instance.type : instance.type.setup!,
instance,
ErrorCodes.SETUP_FUNCTION,
[
instance.props,
{
slots: instance.slots,
attrs: instance.attrs,
emit: instance.emit,
expose: instance.expose,
},
],
)) || []
} }
const emptyContext: GenericAppContext = { const emptyContext: GenericAppContext = {