chore: add RenderReturn

Author: zhiyuanzmj

packages-private/dts-test/tsx.test-d.tsx

@@ -1,15 +1,15 @@
 // TSX w/ defineComponent is tested in defineComponent.test-d.tsx
 import {
-  type Block,
   Fragment,
   KeepAlive,
+  type RenderReturn,
   Suspense,
   Teleport,
   type VNode,
 } from 'vue'
 import { expectType } from './utils'
 
-expectType<VNode | Block>(<div />)
+expectType<RenderReturn>(<div />)
 expectType<JSX.Element>(<div />)
 expectType<JSX.Element>(<div id="foo" />)
 expectType<JSX.Element>(<div>hello</div>)

packages/runtime-vapor/src/apiDefineComponent.ts

@@ -32,6 +32,9 @@ export type VaporPublicProps = ReservedProps &
   AllowedComponentProps &
   ComponentCustomProps
 
+export type RenderReturn = VNode | Block | ArrayRenderReturn
+type ArrayRenderReturn = Array<RenderReturn>
+
 export type DefineVaporComponent<
   RuntimePropsOptions = {},
   RuntimePropsKeys extends string = string,
@@ -100,7 +103,7 @@ export function defineVaporComponent<
       attrs: Record<string, any>
       expose: (exposed: Exposed) => void
     },
-  ) => Block | VNode,
+  ) => RenderReturn,
   extraOptions?: ObjectVaporComponent<
     (keyof Props)[],
     Emits,
@@ -125,7 +128,7 @@ export function defineVaporComponent<
       attrs: Record<string, any>
       expose: (exposed: Exposed) => void
     },
-  ) => Block | VNode,
+  ) => RenderReturn,
   extraOptions?: ObjectVaporComponent<
     ComponentObjectPropsOptions<Props>,
     Emits,

packages/runtime-vapor/src/component.ts

@@ -14,7 +14,6 @@ import {
   type ObjectEmitsOptions,
   type ShallowUnwrapRef,
   type SuspenseBoundary,
-  type VNode,
   callWithErrorHandling,
   currentInstance,
   endMeasure,
@@ -67,7 +66,7 @@ import {
   insertionParent,
   resetInsertionState,
 } from './insertionState'
-import type { DefineVaporComponent } from './apiDefineComponent'
+import type { DefineVaporComponent, RenderReturn } from './apiDefineComponent'
 
 export { currentInstance } from '@vue/runtime-dom'
 
@@ -118,7 +117,7 @@ export interface ObjectVaporComponent<
     emit: EmitFn<Emits>,
     attrs: any,
     slots: StaticSlots,
-  ): Block | VNode | void
+  ): RenderReturn
 
   name?: string
   vapor?: boolean

packages/vue/jsx.d.ts

@@ -2,11 +2,11 @@
 // global JSX namespace registration
 // somehow we have to copy=pase the jsx-runtime types here to make TypeScript happy
 import type { NativeElements, ReservedProps, VNode } from '@vue/runtime-dom'
-import type { Block } from '@vue/runtime-vapor'
+import type { RenderReturn } from '@vue/runtime-vapor'
 
 declare global {
   namespace JSX {
-    export type Element = VNode | Block | Element[]
+    export type Element = RenderReturn
     export interface IntrinsicElements extends NativeElements {
       // allow arbitrary elements
       // @ts-ignore suppress ts:2374 = Duplicate string index signature.