Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

types(defineComponent): fix on* props incorrect type #6216

Merged
merged 4 commits into from Jul 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -93,7 +93,7 @@
"todomvc-app-css": "^2.3.0",
"ts-jest": "^27.0.5",
"tslib": "^2.4.0",
"typescript": "^4.6.4",
"typescript": "^4.7.4",
"vite": "^2.9.8",
"vue": "workspace:*",
"yorkie": "^2.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/reactivity/src/computed.ts
Expand Up @@ -30,7 +30,7 @@ export class ComputedRefImpl<T> {
public readonly effect: ReactiveEffect<T>

public readonly __v_isRef = true
public readonly [ReactiveFlags.IS_READONLY]: boolean
public readonly [ReactiveFlags.IS_READONLY]: boolean = false

public _dirty = true
public _cacheable: boolean
Expand Down
6 changes: 3 additions & 3 deletions packages/runtime-core/src/apiDefineComponent.ts
Expand Up @@ -103,7 +103,7 @@ export function defineComponent<
M extends MethodOptions = {},
Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
E extends EmitsOptions = EmitsOptions,
E extends EmitsOptions = {},
EE extends string = string
>(
options: ComponentOptionsWithoutProps<
Expand All @@ -130,7 +130,7 @@ export function defineComponent<
M extends MethodOptions = {},
Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
E extends EmitsOptions = Record<string, any>,
E extends EmitsOptions = {},
EE extends string = string
>(
options: ComponentOptionsWithArrayProps<
Expand Down Expand Up @@ -168,7 +168,7 @@ export function defineComponent<
M extends MethodOptions = {},
Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
E extends EmitsOptions = Record<string, any>,
E extends EmitsOptions = {},
EE extends string = string
>(
options: ComponentOptionsWithObjectProps<
Expand Down
1 change: 1 addition & 0 deletions packages/runtime-core/src/component.ts
Expand Up @@ -814,6 +814,7 @@ export function finishComponentSetup(
// pass runtime compat config into the compiler
finalCompilerOptions.compatConfig = Object.create(globalCompatConfig)
if (Component.compatConfig) {
// @ts-expect-error types are not compatible
extend(finalCompilerOptions.compatConfig, Component.compatConfig)
}
}
Expand Down
16 changes: 7 additions & 9 deletions packages/server-renderer/__tests__/render.spec.ts
Expand Up @@ -128,14 +128,14 @@ function testRender(type: string, render: typeof renderToString) {
await render(
createApp(
defineComponent({
extends: {
extends: defineComponent({
data() {
return { msg: 'hello' }
},
render(this: any) {
render() {
return h('div', this.msg)
}
}
})
})
)
)
Expand All @@ -148,14 +148,14 @@ function testRender(type: string, render: typeof renderToString) {
createApp(
defineComponent({
mixins: [
{
defineComponent({
data() {
return { msg: 'hello' }
},
render(this: any) {
render() {
return h('div', this.msg)
}
}
})
]
})
)
Expand Down Expand Up @@ -675,9 +675,7 @@ function testRender(type: string, render: typeof renderToString) {
const MyComp = {
render: () => h('p', 'hello')
}
expect(await render(h(KeepAlive, () => h(MyComp)))).toBe(
`<p>hello</p>`
)
expect(await render(h(KeepAlive, () => h(MyComp)))).toBe(`<p>hello</p>`)
})

test('Transition', async () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/server-renderer/src/renderToString.ts
Expand Up @@ -77,7 +77,7 @@ export async function resolveTeleports(context: SSRContext) {
// note: it's OK to await sequentially here because the Promises were
// created eagerly in parallel.
context.teleports[key] = await unrollBuffer(
(await Promise.all(context.__teleportBuffers[key])) as SSRBuffer
await Promise.all([context.__teleportBuffers[key]])
)
}
}
Expand Down
74 changes: 38 additions & 36 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.