release: vue-class-setup@1.2.8

lzxb · lzxb · commit dfbcd426fc9c · 2022-09-07T12:53:48.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.8
+
+-   fix: `$vm` return Vue instance on Vue2
+
 ## 1.2.7
 
 -   chore: Update keywords
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vue-class-setup",
-    "version": "1.2.7",
+    "version": "1.2.8",
     "main": "dist/index.cjs.js",
     "module": "dist/index.es.js",
     "types": "dist/index.d.ts",
diff --git a/src/vue.ts b/src/vue.ts
@@ -3,9 +3,19 @@ import { getCurrentInstance as get, version } from 'vue';
 export const isVue2 = /^2\./.test(version);
 export const isVue3 = /^3\./.test(version);
 
-export function getCurrentInstance() {
+export function getCurrentInstance(): VueInstance {
     const vm = get();
-    return vm && vm.proxy;
+    if (vm && vm.proxy) {
+        return vm.proxy as VueInstance;
+    }
+    throw new Error(`'getCurrentInstance' use in setup`);
 }
 
-export type VueInstance = NonNullable<ReturnType<typeof getCurrentInstance>>;
+type Instance = NonNullable<NonNullable<ReturnType<typeof get>>['proxy']>;
+
+type VueModule = typeof import('vue');
+type Vue = VueModule extends { default: unknown }
+    ? VueModule['default']
+    : never;
+
+export type VueInstance = Vue extends never ? Instance : InstanceType<Vue>;
