diff --git a/packages/runtime-vapor/src/component.ts b/packages/runtime-vapor/src/component.ts index 9d1beb7fb..548babebf 100644 --- a/packages/runtime-vapor/src/component.ts +++ b/packages/runtime-vapor/src/component.ts @@ -182,14 +182,6 @@ export function createComponent( 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__) { pushWarningContext(instance) startMeasure(instance, `init`) @@ -229,6 +221,14 @@ export function createComponent( // TODO make the proxy warn non-existent property access during dev instance.setupState = proxyRefs(setupResult) devRender(instance) + + // HMR + if (component.__hmrId) { + registerHMR(instance) + instance.isSingleRoot = isSingleRoot + instance.hmrRerender = hmrRerender.bind(null, instance) + instance.hmrReload = hmrReload.bind(null, instance) + } } } else { // component has a render function but no setup function @@ -283,33 +283,18 @@ export let isApplyingFallthroughProps = false */ export function devRender(instance: VaporComponentInstance): void { instance.block = - (instance.type.render - ? callWithErrorHandling( - instance.type.render, - instance, - ErrorCodes.RENDER_FUNCTION, - [ - instance.setupState, - instance.props, - instance.emit, - 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, - }, - ], - )) || [] + callWithErrorHandling( + instance.type.render!, + instance, + ErrorCodes.RENDER_FUNCTION, + [ + instance.setupState, + instance.props, + instance.emit, + instance.attrs, + instance.slots, + ], + ) || [] } const emptyContext: GenericAppContext = {