From 15a4a81878fe5611c80110ddc4cf648e200c0ed8 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 17 Nov 2021 15:59:29 +0100 Subject: [PATCH 1/3] Improve typing for vueApp --- packages/bridge/src/runtime/app.ts | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/packages/bridge/src/runtime/app.ts b/packages/bridge/src/runtime/app.ts index 007c1ba63f6..f260bf8bc8d 100644 --- a/packages/bridge/src/runtime/app.ts +++ b/packages/bridge/src/runtime/app.ts @@ -1,6 +1,5 @@ import type { Hookable } from 'hookable' -// @ts-ignore -import type { Vue } from 'vue/types/vue' +import type { VueConstructor } from 'vue' import type { ComponentOptions } from 'vue' import { defineComponent, getCurrentInstance } from './composables' @@ -11,26 +10,11 @@ export const defineNuxtComponent = defineComponent export interface RuntimeNuxtHooks { } -export interface VueAppCompat { - component: Vue['component'], - config: { - globalProperties: any - [key: string]: any - }, - directive: Vue['directive'], - mixin: Vue['mixin'], - mount: Vue['mount'], - provide: (name: string, value: any) => void, - unmount: Vue['unmount'], - use: Vue['use'] - version: string -} - export interface NuxtAppCompat { nuxt2Context: Vue vue2App: ComponentOptions - vueApp: VueAppCompat + vueApp: VueConstructor globalName: string From e42422119520b3cc22b532b95ee31d35a1e14645 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 17 Nov 2021 16:01:16 +0100 Subject: [PATCH 2/3] Combine imports --- packages/bridge/src/runtime/app.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/bridge/src/runtime/app.ts b/packages/bridge/src/runtime/app.ts index f260bf8bc8d..018a77e6d9f 100644 --- a/packages/bridge/src/runtime/app.ts +++ b/packages/bridge/src/runtime/app.ts @@ -1,6 +1,5 @@ import type { Hookable } from 'hookable' -import type { VueConstructor } from 'vue' -import type { ComponentOptions } from 'vue' +import type { VueConstructor, ComponentOptions } from 'vue' import { defineComponent, getCurrentInstance } from './composables' export const isVue2 = true From 52dfb21fa692524f2258ba4b6f02271174ffa14d Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Wed, 17 Nov 2021 16:01:47 +0100 Subject: [PATCH 3/3] And don't delete Vue --- packages/bridge/src/runtime/app.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bridge/src/runtime/app.ts b/packages/bridge/src/runtime/app.ts index 018a77e6d9f..ab810d0657c 100644 --- a/packages/bridge/src/runtime/app.ts +++ b/packages/bridge/src/runtime/app.ts @@ -1,5 +1,5 @@ import type { Hookable } from 'hookable' -import type { VueConstructor, ComponentOptions } from 'vue' +import type { Vue, VueConstructor, ComponentOptions } from 'vue' import { defineComponent, getCurrentInstance } from './composables' export const isVue2 = true