From: Johnson Chu Date: Wed, 4 Sep 2024 12:34:36 +0000 (+0800) Subject: fix(types): avoid using intersection type in `Readonly<...>` to fix JSDoc emit (... X-Git-Tag: v3.5.1~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7518bc19dc73ba46dcf1eef6e23f9e6e75552675;p=thirdparty%2Fvuejs%2Fcore.git fix(types): avoid using intersection type in `Readonly<...>` to fix JSDoc emit (#11799) --- diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts index 24a483358b..0a58954526 100644 --- a/packages/runtime-core/src/apiDefineComponent.ts +++ b/packages/runtime-core/src/apiDefineComponent.ts @@ -210,7 +210,8 @@ export function defineComponent< : ExtractPropTypes : { [key in RuntimePropsKeys]?: any } : TypeProps, - ResolvedProps = Readonly>, + ResolvedProps = Readonly & + Readonly>, TypeRefs extends Record = {}, >( options: { diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts index 2a39f45b68..f864f39e41 100644 --- a/packages/runtime-core/src/componentOptions.ts +++ b/packages/runtime-core/src/componentOptions.ts @@ -1279,7 +1279,9 @@ export type ComponentOptionsWithObjectProps< Directives extends Record = {}, Exposed extends string = string, Provide extends ComponentProvideOptions = ComponentProvideOptions, - Props = Prettify & EmitsToProps>>, + Props = Prettify< + Readonly> & Readonly> + >, Defaults = ExtractDefaultPropTypes, > = ComponentOptionsBase< Props,