From 96e5075032df912d1b399ad4ae86b47626b9ec15 Mon Sep 17 00:00:00 2001
From: ci010 <cijhn@hotmail.com>
Date: Sun, 19 Jul 2020 18:19:22 +0800
Subject: [PATCH] refactor: clean typing and struct

---
 src/main/service/LaunchService.ts                           | 4 ++--
 src/renderer/hooks/useInstance.ts                           | 2 +-
 src/renderer/hooks/useMissingMods.ts                        | 3 +--
 src/renderer/vue.ts                                         | 1 -
 src/renderer/windows/main/components/SearchBar.vue          | 2 +-
 .../windows/main/pages/UserPageUserServiceStepper.vue       | 2 +-
 types/vue.d.ts                                              | 6 +++---
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/service/LaunchService.ts b/src/main/service/LaunchService.ts
index e59091034..ce4461d0b 100644
--- a/src/main/service/LaunchService.ts
+++ b/src/main/service/LaunchService.ts
@@ -13,11 +13,11 @@ export default class LaunchService extends Service {
     @Inject('ExternalAuthSkinService')
     private externalAuthSkinService!: ExternalAuthSkinService;
 
-    private launchedProcess: ChildProcess | undefined;
-
     @Inject('InstanceResourceService')
     private instanceResourceService!: InstanceResourceService;
 
+    private launchedProcess: ChildProcess | undefined;
+
     /**
      * Launch the current selected instance. This will return a boolean promise indeicate whether launch is success.
      * @param force 
diff --git a/src/renderer/hooks/useInstance.ts b/src/renderer/hooks/useInstance.ts
index be59fa97d..9d4a2dd71 100644
--- a/src/renderer/hooks/useInstance.ts
+++ b/src/renderer/hooks/useInstance.ts
@@ -1,4 +1,4 @@
-import { computed, onMounted, reactive, toRefs } from '@/vue';
+import { computed, onMounted, reactive, toRefs } from '@vue/composition-api';
 import { CloneSaveOptions, DeleteSaveOptions, ImportSaveOptions } from '@main/service/InstanceSavesService';
 import { CreateOption } from '@main/service/InstanceService';
 import { InstanceConfig } from '@universal/store/modules/instance';
diff --git a/src/renderer/hooks/useMissingMods.ts b/src/renderer/hooks/useMissingMods.ts
index 3ad32e90d..4c8a1ba6d 100644
--- a/src/renderer/hooks/useMissingMods.ts
+++ b/src/renderer/hooks/useMissingMods.ts
@@ -1,7 +1,6 @@
-import { computed, Ref, ref, nextTick } from '@/vue';
+import { computed, Ref, ref, nextTick } from '@vue/composition-api';
 import { Forge } from '@xmcl/mod-parser';
 import { useStore } from './useStore';
-import { useService } from './useService';
 
 export type ModStatus = 'existed' | 'absent' | 'founded' | 'not-found' | 'loading' | 'downloading' | 'unknown';
 
diff --git a/src/renderer/vue.ts b/src/renderer/vue.ts
index 93f316e75..bfaf5d0e4 100644
--- a/src/renderer/vue.ts
+++ b/src/renderer/vue.ts
@@ -4,7 +4,6 @@ import VueCompositionApi, { h } from '@vue/composition-api';
 Vue.use(VueCompositionApi);
 
 export * from '@vue/composition-api';
-export const nextTick = Vue.nextTick;
 
 export const remove = Vue.delete;
 export const set = Vue.set;
diff --git a/src/renderer/windows/main/components/SearchBar.vue b/src/renderer/windows/main/components/SearchBar.vue
index 1802e215f..fbc2b5f7a 100644
--- a/src/renderer/windows/main/components/SearchBar.vue
+++ b/src/renderer/windows/main/components/SearchBar.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script lang=ts>
-import { defineComponent, inject, ref, onMounted, onUnmounted, Ref, nextTick } from '@/vue';
+import { defineComponent, inject, ref, onMounted, onUnmounted, Ref, nextTick } from '@vue/composition-api';
 import { useSearch, useSearchToggle } from '../hooks';
 
 export default defineComponent({
diff --git a/src/renderer/windows/main/pages/UserPageUserServiceStepper.vue b/src/renderer/windows/main/pages/UserPageUserServiceStepper.vue
index 2ebb88603..72c9db474 100644
--- a/src/renderer/windows/main/pages/UserPageUserServiceStepper.vue
+++ b/src/renderer/windows/main/pages/UserPageUserServiceStepper.vue
@@ -136,7 +136,7 @@
 </template>
 
 <script lang=ts>
-import { defineComponent, reactive, toRefs, onMounted, watch, nextTick } from '@/vue';
+import { defineComponent, reactive, toRefs, onMounted, watch, nextTick } from '@vue/composition-api';
 import { useStore, useI18n } from '@/hooks';
 
 const HTTP_EXP = /(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*)/;
diff --git a/types/vue.d.ts b/types/vue.d.ts
index 0a7507dcd..2a160ae16 100644
--- a/types/vue.d.ts
+++ b/types/vue.d.ts
@@ -2,8 +2,8 @@
 /* eslint-disable */
 
 
-import { ComponentInstance } from '@vue/composition-api/dist/component/component';
+// import { ComponentInstance } from '@vue/composition-api/dist/component/component';
 
-declare module '@vue/composition-api' {
-}
+// declare module '@vue/composition-api' {
+// }