chore: Merge branch 'minor' into pr/3399

# Conflicts: # packages/dts-test/appUse.test-d.ts # packages/dts-test/defineComponent.test-d.tsx # packages/runtime-core/src/apiCreateApp.ts # packages/runtime-core/src/apiDefineComponent.ts # packages/runtime-core/src/componentOptions.ts # packages/runtime-core/src/componentPublicInstance.ts # packages/runtime-core/src/directives.ts # packages/runtime-core/src/index.ts # packages/runtime-dom/src/directives/vModel.ts # packages/runtime-dom/src/directives/vOn.ts # packages/runtime-dom/src/index.ts
vuejs · yyx990803 · Apr 25, 2024 · Mar 9, 2021 · Mar 9, 2021 · Mar 9, 2021
commit 3b5b8f2bc3e80e6a5a74c0f6a72419c34578d72f
diff --git a/packages/dts-test/appUse.test-d.ts b/packages/dts-test/appUse.test-d.ts
@@ -1,4 +1,4 @@
-import { createApp, App, Plugin, defineComponent } from 'vue'
+import { type App, type Plugin, createApp, defineComponent } from 'vue'
 
 const app = createApp({})
 
@@ -102,6 +102,6 @@ app.component(
   defineComponent({
     ...aliases[key],
     name: key,
-    aliasName: aliases[key].name
-  })
+    aliasName: aliases[key].name,
+  }),
 )
diff --git a/packages/dts-test/componentTypeExtensions.test-d.tsx b/packages/dts-test/componentTypeExtensions.test-d.tsx
@@ -1,4 +1,4 @@
-import { DefineComponent, Directive, defineComponent } from 'vue'
+import { type DefineComponent, type Directive, defineComponent } from 'vue'
 import { expectType } from './utils'
 
 declare module 'vue' {

diff --git a/packages/dts-test/defineComponent.test-d.tsx b/packages/dts-test/defineComponent.test-d.tsx
@@ -10,13 +10,10 @@ import {
   createApp,
   defineComponent,
   h,
-  SlotsType,
-  Slots,
-  VNode,
-  KeepAliveProps,
-  TransitionProps,
-  Directive,
-  vShow
+  reactive,
+  ref,
+  withKeys,
+  withModifiers,
 } from 'vue'
 import { type IsUnion, describe, expectType } from './utils'
 
@@ -1502,58 +1499,65 @@ describe('should work when props type is incompatible with setup returned type '
   expectType<SizeType>(CompA.$props.size)
 })
 
+describe('withKeys and withModifiers as pro', () => {
+  const onKeydown = withKeys(e => {}, [''])
+  // @ts-expect-error invalid modifiers
+  const onClick = withModifiers(e => {}, [''])
+  ;<input onKeydown={onKeydown} onClick={onClick} />
+})
+
 // #3367 expose components types
 describe('expose component types', () => {
   const child = defineComponent({
     props: {
-      a: String
-    }
+      a: String,
+    },
   })
 
   const parent = defineComponent({
     components: {
       child,
       child2: {
-        template: `<div></div>`
-      }
-    }
+        template: `<div></div>`,
+      },
+        },
   })
 
   expectType<typeof child>(parent.components!.child)
   expectType<Component>(parent.components!.child2)
 
   // global components
   expectType<Readonly<KeepAliveProps>>(
-    new parent.components!.KeepAlive().$props
+    new parent.components!.KeepAlive().$props,
   )
   expectType<Readonly<KeepAliveProps>>(new child.components!.KeepAlive().$props)
 
   // runtime-dom components
   expectType<Readonly<TransitionProps>>(
-    new parent.components!.Transition().$props
+    new parent.components!.Transition().$props,
   )
   expectType<Readonly<TransitionProps>>(
-    new child.components!.Transition().$props
+    new child.components!.Transition().$props,
   )
 })
 
 describe('directive typing', () => {
   const customDirective: Directive = {
-    created(_) {}
+    created(_) {},
   }
 
   const comp = defineComponent({
     props: {
-      a: String
+      a: String,
     },
     directives: {
       customDirective,
       localDirective: {
         created(_, { arg }) {
           expectType<string | undefined>(arg)
-        }
-      }
-    }
+        },
+      },
+    },
   })
 
   expectType<typeof customDirective>(comp.directives!.customDirective)
@@ -1567,11 +1571,11 @@ describe('expose typing', () => {
   const Comp = defineComponent({
     expose: ['a', 'b'],
     props: {
-      some: String
+      some: String,
     },
     data() {
       return { a: 1, b: '2', c: 1 }
-    }
+    },
   })
 
   expectType<Array<'a' | 'b'>>(Comp.expose!)
@@ -1587,18 +1591,18 @@ describe('expose typing', () => {
   vm.c
 })
 
-import {
-  DefineComponent,
-  ComponentOptionsMixin,
-  EmitsOptions,
-  VNodeProps,
+import type {
   AllowedComponentProps,
   ComponentCustomProps,
   ComponentOptionsMixin,
   DefineComponent,
+  Directive,
   EmitsOptions,
   ExtractPropTypes,
+  KeepAliveProps,
+  TransitionProps,
   VNodeProps,
+  vShow,
 } from 'vue'
 
 // code generated by tsc / vue-tsc, make sure this continues to work

diff --git a/packages/dts-test/directives.test-d.ts b/packages/dts-test/directives.test-d.ts
@@ -1,24 +1,24 @@
-import { ObjectDirective, Directive, vModelText } from 'vue'
-import { expectType, describe } from './utils'
+import { type Directive, type ObjectDirective, vModelText } from 'vue'
+import { describe, expectType } from './utils'
 
 type ExtractBinding<T> = T extends (
   el: any,
   binding: infer B,
   vnode: any,
-  prev: any
+  prev: any,
 ) => any
   ? B
   : never
 
 declare function testDirective<
   Value,
   Modifiers extends string = string,
-  Arg extends string = string
+  Arg extends string = string,
 >(): ExtractBinding<Directive<any, Value, Modifiers, Arg>>
 
 describe('vmodel', () => {
   expectType<ObjectDirective<any, any, 'trim' | 'number' | 'lazy', string>>(
-    vModelText
+    vModelText,
   )
   // @ts-expect-error
   expectType<ObjectDirective<any, any, 'not-valid', string>>(vModelText)

diff --git a/packages/runtime-core/src/apiCreateApp.ts b/packages/runtime-core/src/apiCreateApp.ts
@@ -25,9 +25,9 @@ import { devtoolsInitApp, devtoolsUnmountApp } from './devtools'
 import { NO, extend, isFunction, isObject } from '@vue/shared'
 import { version } from '.'
 import { installAppCompatProperties } from './compat/global'
-import { NormalizedPropsOptions } from './componentProps'
-import { ObjectEmitsOptions } from './componentEmits'
-import { DefineComponent } from './apiDefineComponent'
+import type { NormalizedPropsOptions } from './componentProps'
+import type { ObjectEmitsOptions } from './componentEmits'
+import type { DefineComponent } from './apiDefineComponent'
 
 export interface App<HostElement = any> {
   version: string
@@ -42,8 +42,8 @@ export interface App<HostElement = any> {
   mixin(mixin: ComponentOptions): this
   component(name: string): Component | undefined
   component(name: string, component: Component | DefineComponent): this
-  directive(name: string): Directive | undefined
-  directive(name: string, directive: Directive): this
+  directive<T = any, V = any>(name: string): Directive<T, V> | undefined
+  directive<T = any, V = any>(name: string, directive: Directive<T, V>): this
   mount(
     rootContainer: HostElement | string,
     isHydrate?: boolean,

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
@@ -6,20 +6,18 @@ import type {
   ComponentOptionsWithArrayProps,
   ComponentOptionsWithObjectProps,
   ComponentOptionsWithoutProps,
+  ComponentProvideOptions,
   ComputedOptions,
   MethodOptions,
   RenderFunction,
-  ComponentOptionsBase,
-  ComponentInjectOptions,
-  ComponentOptions,
-  ComponentProvideOptions
 } from './componentOptions'
 import type {
   AllowedComponentProps,
-  ComponentCustomProps,
   Component,
+  ComponentCustomProps,
   GlobalComponents,
-  GlobalDirectives
+  GlobalDirectives,
+  SetupContext,
 } from './component'
 import type {
   ComponentObjectPropsOptions,
@@ -34,8 +32,8 @@ import type {
   ComponentPublicInstanceConstructor,
   CreateComponentPublicInstance,
 } from './componentPublicInstance'
-import { SlotsType } from './componentSlots'
-import { Directive } from './directives'
+import type { SlotsType } from './componentSlots'
+import type { Directive } from './directives'
 
 export type PublicProps = VNodeProps &
   AllowedComponentProps &
@@ -65,7 +63,7 @@ export type DefineComponent<
   LC extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
-  Provide extends ComponentProvideOptions = ComponentProvideOptions
+  Provide extends ComponentProvideOptions = ComponentProvideOptions,
 > = ComponentPublicInstanceConstructor<
   CreateComponentPublicInstance<
     Props,
@@ -166,7 +164,7 @@ export function defineComponent<
   LC extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
-  Provide extends ComponentProvideOptions = ComponentProvideOptions
+  Provide extends ComponentProvideOptions = ComponentProvideOptions,
 >(
   options: ComponentOptionsWithoutProps<
     Props,
@@ -185,7 +183,7 @@ export function defineComponent<
     Directives,
     Exposed,
     Provide
-  >
+  >,
 ): DefineComponent<
   Props,
   RawBindings,
@@ -226,7 +224,7 @@ export function defineComponent<
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
-  Props = Readonly<{ [key in PropNames]?: any }>
+  Props = Readonly<{ [key in PropNames]?: any }>,
 >(
   options: ComponentOptionsWithArrayProps<
     PropNames,
@@ -245,7 +243,7 @@ export function defineComponent<
     Directives,
     Exposed,
     Provide
-  >
+  >,
 ): DefineComponent<
   Props,
   RawBindings,
@@ -286,7 +284,7 @@ export function defineComponent<
   LC extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
-  Provide extends ComponentProvideOptions = ComponentProvideOptions
+  Provide extends ComponentProvideOptions = ComponentProvideOptions,
 >(
   options: ComponentOptionsWithObjectProps<
     PropsOptions,
@@ -305,7 +303,7 @@ export function defineComponent<
     Directives,
     Exposed,
     Provide
-  >
+  >,
 ): DefineComponent<
   PropsOptions,
   RawBindings,

diff --git a/packages/runtime-core/src/component.ts b/packages/runtime-core/src/component.ts
@@ -87,11 +87,11 @@ import type { SchedulerJob } from './scheduler'
 import type { LifecycleHooks } from './enums'
 
 // Augment GlobalComponents
-import { TeleportProps } from './components/Teleport'
-import { SuspenseProps } from './components/Suspense'
-import { KeepAliveProps } from './components/KeepAlive'
-import { BaseTransitionProps } from './components/BaseTransition'
-import { DefineComponent } from './apiDefineComponent'
+import type { TeleportProps } from './components/Teleport'
+import type { SuspenseProps } from './components/Suspense'
+import type { KeepAliveProps } from './components/KeepAlive'
+import type { BaseTransitionProps } from './components/BaseTransition'
+import type { DefineComponent } from './apiDefineComponent'
 
 export type Data = Record<string, unknown>
 

diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
@@ -115,7 +115,7 @@ export interface ComponentOptionsBase<
   LC extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
-  Provide extends ComponentProvideOptions = ComponentProvideOptions
+  Provide extends ComponentProvideOptions = ComponentProvideOptions,
 > extends LegacyOptions<Props, D, C, M, Mixin, Extends, I, II, Provide>,
     ComponentInternalOptions,
     ComponentCustomOptions {
@@ -235,7 +235,7 @@ export type ComponentOptionsWithoutProps<
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
-  PE = Props & EmitsToProps<E>
+  PE = Props & EmitsToProps<E>,
 > = ComponentOptionsBase<
   PE,
   RawBindings,
@@ -294,7 +294,7 @@ export type ComponentOptionsWithArrayProps<
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
-  Props = Prettify<Readonly<{ [key in PropNames]?: any } & EmitsToProps<E>>>
+  Props = Prettify<Readonly<{ [key in PropNames]?: any } & EmitsToProps<E>>>,
 > = ComponentOptionsBase<
   Props,
   RawBindings,
@@ -412,7 +412,7 @@ export type ComponentOptions<
   LC extends Record<string, Component> = {},
   Directives extends Record<string, Directive> = {},
   Exposed extends string = string,
-  Provide extends ComponentProvideOptions = ComponentProvideOptions
+  Provide extends ComponentProvideOptions = ComponentProvideOptions,
 > = ComponentOptionsBase<
   Props,
   RawBindings,
@@ -530,7 +530,7 @@ interface LegacyOptions<
   Extends extends ComponentOptionsMixin,
   I extends ComponentInjectOptions,
   II extends string,
-  Provide extends ComponentProvideOptions = ComponentProvideOptions
+  Provide extends ComponentProvideOptions = ComponentProvideOptions,
 > {
   compatConfig?: CompatConfig