fix(types): fix instance type inference for setup() with no return value

fix #12568
vuejs · Jun 22, 2022 · 65531f5 · 65531f5
1 parent a122bd2
commit 65531f5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/types/test/v3/setup-test.ts b/types/test/v3/setup-test.ts
@@ -93,3 +93,11 @@ defineComponent({
     res?.charAt(1)
   }
 })
+
+// #12568
+const vm = new Vue({
+  setup() {},
+  render: h => h({})
+})
+
+vm.$mount('#app')
diff --git a/types/vue.d.ts b/types/vue.d.ts
@@ -85,7 +85,12 @@ export type CombinedVueInstance<
   Computed,
   Props,
   SetupBindings
-> = Data & Methods & Computed & Props & Instance & SetupBindings
+> = Data &
+  Methods &
+  Computed &
+  Props &
+  Instance &
+  (SetupBindings extends void ? {} : SetupBindings)
 
 export type ExtendedVue<
   Instance extends Vue,