Skip to content

feat(runtime-vapor): support setup fn and render fn co-usage for defineVaporComponent #14179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhiyuanzmj wants to merge 5 commits into
base: minor
Choose a base branch
from
+19 −8
Open

feat(runtime-vapor): support setup fn and render fn co-usage for defineVaporComponent #14179

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1385e4a
feat(runtime-vapor): support setup fn and render fn co-usage
zhiyuanzmj Dec 8, 2025
5929f33
Update packages/runtime-vapor/src/component.ts
zhiyuanzmj Dec 8, 2025
f8be210
Update packages/runtime-vapor/src/component.ts
zhiyuanzmj Dec 8, 2025
3e6130e
chore: Merge branch 'minor' into setup-render
zhiyuanzmj Dec 8, 2025
7a85f92
Merge branch 'minor' into setup-render
zhiyuanzmj Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions packages/runtime-vapor/src/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,14 +1027,25 @@ function handleSetupResult(
devRender(instance)
}
} else {
// component has a render function but no setup function
// (typically components with only a template and no state)
if (setupResult === EMPTY_OBJ && component.render) {
instance.block = callWithErrorHandling(
component.render,
instance,
ErrorCodes.RENDER_FUNCTION,
)
// component has a render function with either:
// - no setup function (components with only a template)
// - setup returning non-block state for use in render
// support setup fn and render fn co-usage for expose
if (!isBlock(setupResult) && component.render) {
Copy link

Copilot AI Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing devtoolsRawSetupState assignment for production devtools support.

The dev-only path at lines 965-966 sets instance.devtoolsRawSetupState when __DEV__ || __FEATURE_PROD_DEVTOOLS__ is true. This production code path should have the same assignment to ensure devtools work correctly in production builds with devtools enabled.

Suggestion: Add before line 979:

if (__DEV__ || __FEATURE_PROD_DEVTOOLS__) {
  instance.devtoolsRawSetupState = setupResult
}
Suggested change
if (!isBlock(setupResult) && component.render) {
if (!isBlock(setupResult) && component.render) {
if (__DEV__ || __FEATURE_PROD_DEVTOOLS__) {
instance.devtoolsRawSetupState = setupResult
}

Copilot uses AI. Check for mistakes.
instance.setupState = proxyRefs(setupResult)
instance.block =
callWithErrorHandling(
component.render,
instance,
ErrorCodes.RENDER_FUNCTION,
[
instance.setupState,
instance.props,
instance.emit,
instance.attrs,
instance.slots,
],
) || []
} else {
// in prod result can only be block
instance.block = setupResult as Block
Expand Down
Loading