diff --git a/lib/index.iife.js b/lib/index.iife.js index 60dc9cb..2179268 100644 --- a/lib/index.iife.js +++ b/lib/index.iife.js @@ -19,6 +19,7 @@ var VueDemi = (function (VueDemi, Vue, VueCompositionAPI) { VueDemi.Vue2 = Vue VueDemi.version = Vue.version VueDemi.warn = Vue.util.warn + VueDemi.hasInjectionContext = () => !!VueDemi.getCurrentInstance() function createApp(rootComponent, rootProps) { var vm var provide = {} @@ -71,6 +72,7 @@ var VueDemi = (function (VueDemi, Vue, VueCompositionAPI) { VueDemi.Vue = Vue VueDemi.Vue2 = Vue VueDemi.version = Vue.version + VueDemi.hasInjectionContext = () => !!VueDemi.getCurrentInstance() } else { console.error('[vue-demi] no VueCompositionAPI instance found, please be sure to import `@vue/composition-api` before `vue-demi`.') } diff --git a/lib/v2.7/index.cjs b/lib/v2.7/index.cjs index 9813c17..1dce010 100644 --- a/lib/v2.7/index.cjs +++ b/lib/v2.7/index.cjs @@ -55,4 +55,4 @@ Object.keys(VueModule).forEach(function (key) { }) // Not implemented https://github.com/vuejs/core/pull/8111, falls back to getCurrentInstance() -exports.hasInjectionContext = () => !!VueCompositionAPI.getCurrentInstance() +exports.hasInjectionContext = () => !!VueModule.getCurrentInstance() diff --git a/lib/v2.7/index.mjs b/lib/v2.7/index.mjs index 80eb810..e575059 100644 --- a/lib/v2.7/index.mjs +++ b/lib/v2.7/index.mjs @@ -1,4 +1,5 @@ import Vue from 'vue' +import { getCurrentInstance } from 'vue' var isVue2 = true var isVue3 = false @@ -75,5 +76,5 @@ export * from 'vue' // Not implemented https://github.com/vuejs/core/pull/8111, falls back to getCurrentInstance() export function hasInjectionContext() { - return !!VueCompositionAPI.getCurrentInstance() + return !!getCurrentInstance() } diff --git a/lib/v2/index.mjs b/lib/v2/index.mjs index fc2e12a..2c18122 100644 --- a/lib/v2/index.mjs +++ b/lib/v2/index.mjs @@ -1,5 +1,5 @@ import Vue from 'vue' -import VueCompositionAPI from '@vue/composition-api/dist/vue-composition-api.mjs' +import VueCompositionAPI, { getCurrentInstance } from '@vue/composition-api/dist/vue-composition-api.mjs' function install(_vue) { _vue = _vue || Vue @@ -45,5 +45,5 @@ export var KeepAlive = /*#__PURE__*/ createMockComponent('KeepAlive') // Not implemented https://github.com/vuejs/core/pull/8111, falls back to getCurrentInstance() export function hasInjectionContext() { - return !!VueCompositionAPI.getCurrentInstance() + return !!getCurrentInstance() } diff --git a/package.json b/package.json index e67cb0b..9bc1866 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-demi", - "version": "0.14.1", + "version": "0.14.5", "engines": { "node": ">=12" },