From 651d31d0e90ff38fe40f6b240011d41d114fd8b9 Mon Sep 17 00:00:00 2001 From: Morlay Date: Mon, 25 Nov 2024 15:07:48 +0800 Subject: [PATCH] fix(vue-jsx-runtime): type fix for ts@4.7 --- nodepkg/vue-jsx-runtime/package.json | 2 +- nodepkg/vue-jsx-runtime/src/jsx-runtime.ts | 24 ++++++++++------------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/nodepkg/vue-jsx-runtime/package.json b/nodepkg/vue-jsx-runtime/package.json index b14165e9..698f5cb1 100644 --- a/nodepkg/vue-jsx-runtime/package.json +++ b/nodepkg/vue-jsx-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@innoai-tech/vue-jsx-runtime", - "version": "0.3.5", + "version": "0.3.6", "monobundle": { "exports": { "./jsx-runtime": "./src/jsx-runtime.ts", diff --git a/nodepkg/vue-jsx-runtime/src/jsx-runtime.ts b/nodepkg/vue-jsx-runtime/src/jsx-runtime.ts index 2949a1da..c6c4fe77 100644 --- a/nodepkg/vue-jsx-runtime/src/jsx-runtime.ts +++ b/nodepkg/vue-jsx-runtime/src/jsx-runtime.ts @@ -1,12 +1,4 @@ -import { - Fragment, - type NativeElements, - type ReservedProps, - type VNode, - type VNodeChild, - h, - isVNode, -} from "vue"; +import { Fragment, h, isVNode, type NativeElements, type ReservedProps, type VNode, type VNodeChild } from "vue"; export { Fragment }; @@ -53,7 +45,7 @@ const wrapSlot = (children: any) => { const pickPropsWithoutSlots = ( rawProps: Record, - key?: string, + key?: string ): [any, any] => { const { children, ...otherProps } = rawProps; @@ -122,7 +114,8 @@ declare module "vue" { declare global { namespace JSX { - export interface Element extends VNode {} + export interface Element extends VNode { + } export interface ElementClass { $props: {}; @@ -138,11 +131,16 @@ declare global { [name: string]: any; } - export interface IntrinsicAttributes extends ReservedProps {} - // infer children type export interface ElementChildrenAttribute { $default: {}; } + + export interface IntrinsicAttributes extends ReservedPropsWithElementChildren { + } + + type ReservedPropsWithElementChildren = ReservedProps & { + $default?: VNodeChild | {}; + } } }