From ffe679c490986b69956daec7166f1ab6d9f23073 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Wed, 29 Mar 2023 20:22:29 +0800
Subject: [PATCH] fix(types/jsx): move JSX DOM types back to `@vue/runtime-dom`
 (#7979)

---
 packages/runtime-dom/src/index.ts             |  2 ++
 .../dom.d.ts => runtime-dom/src/jsx.ts}       | 14 +++++++++++
 packages/vue/jsx-runtime/index.d.ts           | 20 +++++-----------
 packages/vue/jsx.d.ts                         | 22 +++++-------------
 packages/vue/types/jsx-register.d.ts          |  2 --
 rollup.dts.config.js                          | 23 ++++++++++++++++---
 6 files changed, 48 insertions(+), 35 deletions(-)
 rename packages/{vue/jsx-runtime/dom.d.ts => runtime-dom/src/jsx.ts} (99%)

diff --git a/packages/runtime-dom/src/index.ts b/packages/runtime-dom/src/index.ts
index 19b2ce51abe..354cc4c5bf5 100644
--- a/packages/runtime-dom/src/index.ts
+++ b/packages/runtime-dom/src/index.ts
@@ -252,3 +252,5 @@ export const initDirectivesForSSR = __SSR__
 // re-export everything from core
 // h, Component, reactivity API, nextTick, flags & types
 export * from '@vue/runtime-core'
+
+export * from './jsx'
diff --git a/packages/vue/jsx-runtime/dom.d.ts b/packages/runtime-dom/src/jsx.ts
similarity index 99%
rename from packages/vue/jsx-runtime/dom.d.ts
rename to packages/runtime-dom/src/jsx.ts
index c4da2cdd08a..d103278c6e6 100644
--- a/packages/vue/jsx-runtime/dom.d.ts
+++ b/packages/runtime-dom/src/jsx.ts
@@ -1319,3 +1319,17 @@ type EventHandlers<E> = {
     ? E[K]
     : (payload: E[K]) => void
 }
+
+import { VNodeRef } from '@vue/runtime-core'
+
+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
+}
diff --git a/packages/vue/jsx-runtime/index.d.ts b/packages/vue/jsx-runtime/index.d.ts
index a05a7293da0..a44382cfbb1 100644
--- a/packages/vue/jsx-runtime/index.d.ts
+++ b/packages/vue/jsx-runtime/index.d.ts
@@ -1,17 +1,9 @@
-import { VNode, VNodeRef } from '@vue/runtime-dom'
-import { IntrinsicElementAttributes } from './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
-}
+import type {
+  VNode,
+  IntrinsicElementAttributes,
+  ReservedProps,
+  NativeElements
+} from '@vue/runtime-dom'
 
 /**
  * JSX namespace for usage with @jsxImportsSource directive
diff --git a/packages/vue/jsx.d.ts b/packages/vue/jsx.d.ts
index 947a9904419..afc1039e46d 100644
--- a/packages/vue/jsx.d.ts
+++ b/packages/vue/jsx.d.ts
@@ -1,21 +1,11 @@
 // global JSX namespace registration
 // 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
-}
+import type {
+  VNode,
+  IntrinsicElementAttributes,
+  ReservedProps,
+  NativeElements
+} from '@vue/runtime-dom'
 
 declare global {
   namespace JSX {
diff --git a/packages/vue/types/jsx-register.d.ts b/packages/vue/types/jsx-register.d.ts
index af5d5f29023..a626f798c2a 100644
--- a/packages/vue/types/jsx-register.d.ts
+++ b/packages/vue/types/jsx-register.d.ts
@@ -2,5 +2,3 @@
 // imports the global JSX namespace registration for compat.
 // TODO: remove in 3.4
 import '../jsx'
-
-export * from '../jsx-runtime/dom'
diff --git a/rollup.dts.config.js b/rollup.dts.config.js
index 84a6138b44b..ca811d349d5 100644
--- a/rollup.dts.config.js
+++ b/rollup.dts.config.js
@@ -88,7 +88,21 @@ function patchTypes(pkg) {
         return false
       }
 
+      const isExported = new Set()
       const shouldRemoveExport = new Set()
+
+      // pass 0: check all exported types
+      for (const node of ast.program.body) {
+        if (node.type === 'ExportNamedDeclaration' && !node.source) {
+          for (let i = 0; i < node.specifiers.length; i++) {
+            const spec = node.specifiers[i]
+            if (spec.type === 'ExportSpecifier') {
+              isExported.add(spec.local.name)
+            }
+          }
+        }
+      }
+
       // pass 1: remove internals + add exports
       for (const node of ast.program.body) {
         if (
@@ -96,10 +110,13 @@ function patchTypes(pkg) {
             node.type === 'TSInterfaceDeclaration') &&
           !node.id.name.startsWith(`_`)
         ) {
-          shouldRemoveExport.add(node.id.name)
+          const name = node.id.name
+          shouldRemoveExport.add(name)
           if (!removeInternal(node)) {
-            // @ts-ignore
-            s.prependLeft(node.start, `export `)
+            if (isExported.has(name)) {
+              // @ts-ignore
+              s.prependLeft(node.start, `export `)
+            }
             // traverse further for internal properties
             if (node.type === 'TSInterfaceDeclaration') {
               node.body.body.forEach(removeInternal)