fix(types/jsx): move JSX DOM types back to @vue/runtime-dom (#7979)

vuejs · Mar 29, 2023 · ffe679c · ffe679c
1 parent ff60b93
commit ffe679c
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 35 deletions.
diff --git 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 → packages/runtime-dom/src/jsx.ts b/packages/vue/jsx-runtime/dom.d.ts → 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
@@ -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
@@ -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
@@ -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
@@ -88,18 +88,35 @@ 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 (
  (node.type === 'TSTypeAliasDeclaration' ||
  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)