From 0f73f394dafd709298bd8c71107a323bf322a1d2 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Wed, 29 Mar 2023 16:15:08 +0800
Subject: [PATCH] fix(types/jsx): jsx-runtime types for global JSX namespace
 registration (#7978)

---
 packages/vue/jsx.d.ts                | 39 +++++++++++++++++++++-------
 packages/vue/types/jsx-register.d.ts |  2 ++
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/packages/vue/jsx.d.ts b/packages/vue/jsx.d.ts
index 4057d6afc9c..947a9904419 100644
--- a/packages/vue/jsx.d.ts
+++ b/packages/vue/jsx.d.ts
@@ -1,15 +1,36 @@
 // global JSX namespace registration
-import { JSX as JSXInternal } from './jsx-runtime'
+// somehow we have to copy=pase the jsx-runtime types here to make TypeScript happy
+import { VNode, VNodeRef } from '@vue/runtime-dom'
+import { IntrinsicElementAttributes } from './jsx-runtime/dom'
+
+export * from './jsx-runtime/dom'
+
+export type ReservedProps = {
+  key?: string | number | symbol
+  ref?: VNodeRef
+  ref_for?: boolean
+  ref_key?: string
+}
+
+export type NativeElements = {
+  [K in keyof IntrinsicElementAttributes]: IntrinsicElementAttributes[K] &
+    ReservedProps
+}
 
 declare global {
   namespace JSX {
-    interface Element extends JSXInternal.Element {}
-    interface ElementClass extends JSXInternal.ElementClass {}
-    interface ElementAttributesProperty
-      extends JSXInternal.ElementAttributesProperty {}
-    interface IntrinsicElements extends JSXInternal.IntrinsicElements {}
-    interface IntrinsicAttributes extends JSXInternal.IntrinsicAttributes {}
+    export interface Element extends VNode {}
+    export interface ElementClass {
+      $props: {}
+    }
+    export interface ElementAttributesProperty {
+      $props: {}
+    }
+    export interface IntrinsicElements extends NativeElements {
+      // allow arbitrary elements
+      // @ts-ignore suppress ts:2374 = Duplicate string index signature.
+      [name: string]: any
+    }
+    export interface IntrinsicAttributes extends ReservedProps {}
   }
 }
-
-export {}
diff --git a/packages/vue/types/jsx-register.d.ts b/packages/vue/types/jsx-register.d.ts
index a626f798c2a..af5d5f29023 100644
--- a/packages/vue/types/jsx-register.d.ts
+++ b/packages/vue/types/jsx-register.d.ts
@@ -2,3 +2,5 @@
 // imports the global JSX namespace registration for compat.
 // TODO: remove in 3.4
 import '../jsx'
+
+export * from '../jsx-runtime/dom'