From 43d2a8e5c8b0eafad7352c253f406e42c99cbe1e Mon Sep 17 00:00:00 2001
From: PiEgg <marksz@teamsz.xyz>
Date: Sat, 8 Jan 2022 15:44:09 +0800
Subject: [PATCH] :package: Chore: types change

---
 package.json                              |  2 +-
 src/main/apis/app/system/index.ts         |  2 +-
 src/main/apis/app/uploader/apis.ts        |  2 +-
 src/main/apis/app/uploader/index.ts       |  8 ++++----
 src/main/apis/app/window/constants.ts     |  7 -------
 src/main/apis/app/window/windowList.ts    |  3 +--
 src/main/apis/app/window/windowManager.ts |  5 +----
 src/main/apis/core/picgo/index.ts         |  7 ++-----
 src/main/events/busEventList.ts           |  2 +-
 src/main/events/ipcList.ts                |  2 +-
 src/main/events/picgoCoreIPC.ts           | 11 +++++------
 src/main/events/remotes/menu.ts           |  4 ++--
 src/main/lifeCycle/index.ts               |  2 +-
 src/main/migrate/index.ts                 |  2 +-
 src/main/utils/handleArgv.ts              |  2 +-
 src/renderer/pages/PicGoSetting.vue       |  2 +-
 src/renderer/utils/ConfirmButtonMixin.ts  |  2 +-
 src/universal/types/electron.d.ts         | 16 +++-------------
 src/universal/types/enum.ts               |  7 +++++++
 src/universal/types/global.d.ts           |  5 +++++
 src/universal/types/picgo.d.ts            |  2 --
 src/universal/types/types.d.ts            |  2 +-
 22 files changed, 41 insertions(+), 56 deletions(-)
 create mode 100644 src/universal/types/global.d.ts
 delete mode 100644 src/universal/types/picgo.d.ts

diff --git a/package.json b/package.json
index fc8e215..da391ee 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "keycode": "^2.2.0",
     "lodash-id": "^0.14.0",
     "lowdb": "^1.0.0",
-    "picgo": "^1.4.24",
+    "picgo": "^1.5.0-alpha.0",
     "qrcode.vue": "^1.7.0",
     "uuidv4": "^6.2.11",
     "vue": "^2.6.10",
diff --git a/src/main/apis/app/system/index.ts b/src/main/apis/app/system/index.ts
index 048d519..effe175 100644
--- a/src/main/apis/app/system/index.ts
+++ b/src/main/apis/app/system/index.ts
@@ -11,7 +11,7 @@ import uploader from 'apis/app/uploader'
 import getPicBeds from '~/main/utils/getPicBeds'
 import db, { GalleryDB } from '~/main/apis/core/datastore'
 import windowManager from 'apis/app/window/windowManager'
-import { IWindowList } from 'apis/app/window/constants'
+import { IWindowList } from '#/types/enum'
 import picgo from '@core/picgo'
 import pasteTemplate from '~/main/utils/pasteTemplate'
 import pkg from 'root/package.json'
diff --git a/src/main/apis/app/uploader/apis.ts b/src/main/apis/app/uploader/apis.ts
index 49ab14f..4269043 100644
--- a/src/main/apis/app/uploader/apis.ts
+++ b/src/main/apis/app/uploader/apis.ts
@@ -3,7 +3,7 @@ import {
   WebContents
 } from 'electron'
 import windowManager from 'apis/app/window/windowManager'
-import { IWindowList } from 'apis/app/window/constants'
+import { IWindowList } from '#/types/enum'
 import uploader from '.'
 import pasteTemplate from '~/main/utils/pasteTemplate'
 import db, { GalleryDB } from '~/main/apis/core/datastore'
diff --git a/src/main/apis/app/uploader/index.ts b/src/main/apis/app/uploader/index.ts
index 7412b02..9619ab8 100644
--- a/src/main/apis/app/uploader/index.ts
+++ b/src/main/apis/app/uploader/index.ts
@@ -8,9 +8,9 @@ import dayjs from 'dayjs'
 import picgo from '@core/picgo'
 import db from '~/main/apis/core/datastore'
 import windowManager from 'apis/app/window/windowManager'
-import { IWindowList } from 'apis/app/window/constants'
+import { IWindowList } from '#/types/enum'
 import util from 'util'
-import { IPicGo } from 'picgo/dist/src/types'
+import { IPicGo } from 'picgo'
 import { showNotification, calcDurationRange } from '~/main/utils/common'
 import { TALKING_DATA_EVENT } from '~/universal/events/constants'
 import logger from '@core/picgo/logger'
@@ -60,12 +60,12 @@ class Uploader {
   }
 
   init () {
-    picgo.on('notification', message => {
+    picgo.on('notification', (message: Electron.NotificationConstructorOptions | undefined) => {
       const notification = new Notification(message)
       notification.show()
     })
 
-    picgo.on('uploadProgress', progress => {
+    picgo.on('uploadProgress', (progress: any) => {
       this.webContents?.send('uploadProgress', progress)
     })
     picgo.on('beforeTransform', () => {
diff --git a/src/main/apis/app/window/constants.ts b/src/main/apis/app/window/constants.ts
index f8c2965..1c3a2e5 100644
--- a/src/main/apis/app/window/constants.ts
+++ b/src/main/apis/app/window/constants.ts
@@ -1,10 +1,3 @@
-export enum IWindowList {
-  SETTING_WINDOW = 'SETTING_WINDOW',
-  TRAY_WINDOW = 'TRAY_WINDOW',
-  MINI_WINDOW = 'MINI_WINDOW',
-  RENAME_WINDOW = 'RENAME_WINDOW'
-}
-
 const isDevelopment = process.env.NODE_ENV !== 'production'
 
 export const TRAY_WINDOW_URL = isDevelopment
diff --git a/src/main/apis/app/window/windowList.ts b/src/main/apis/app/window/windowList.ts
index f01cbb8..f0ff282 100644
--- a/src/main/apis/app/window/windowList.ts
+++ b/src/main/apis/app/window/windowList.ts
@@ -1,11 +1,10 @@
 import {
-  IWindowList,
   SETTING_WINDOW_URL,
   TRAY_WINDOW_URL,
   MINI_WINDOW_URL,
   RENAME_WINDOW_URL
 } from './constants'
-import { IWindowListItem } from '#/types/electron'
+import { IWindowList } from '#/types/enum'
 import bus from '@core/bus'
 import { CREATE_APP_MENU } from '@core/bus/constants'
 import db from '~/main/apis/core/datastore'
diff --git a/src/main/apis/app/window/windowManager.ts b/src/main/apis/app/window/windowManager.ts
index 867b5e4..5aa38a2 100644
--- a/src/main/apis/app/window/windowManager.ts
+++ b/src/main/apis/app/window/windowManager.ts
@@ -1,11 +1,8 @@
 import {
   BrowserWindow
 } from 'electron'
-import { IWindowManager, IWindowListItem } from '#/types/electron'
 import windowList from './windowList'
-import {
-  IWindowList
-} from './constants'
+import { IWindowList } from '#/types/enum'
 
 class WindowManager implements IWindowManager {
   private windowMap: Map<IWindowList | string, BrowserWindow> = new Map()
diff --git a/src/main/apis/core/picgo/index.ts b/src/main/apis/core/picgo/index.ts
index 08b6860..11cbe71 100644
--- a/src/main/apis/core/picgo/index.ts
+++ b/src/main/apis/core/picgo/index.ts
@@ -1,9 +1,6 @@
-import PicGoCore from '~/universal/types/picgo'
 import { dbChecker, dbPathChecker } from 'apis/core/datastore/dbChecker'
 import pkg from 'root/package.json'
-// eslint-disable-next-line
-const requireFunc = typeof __webpack_require__ === 'function' ? __non_webpack_require__ : require
-const PicGo = requireFunc('picgo') as typeof PicGoCore
+import { PicGo } from 'picgo'
 
 const CONFIG_PATH = dbPathChecker()
 
@@ -18,4 +15,4 @@ picgo.saveConfig({
 global.PICGO_GUI_VERSION = pkg.version
 picgo.GUI_VERSION = global.PICGO_GUI_VERSION
 
-export default picgo! as PicGoCore
+export default picgo
diff --git a/src/main/events/busEventList.ts b/src/main/events/busEventList.ts
index bc0b0e5..5eccd63 100644
--- a/src/main/events/busEventList.ts
+++ b/src/main/events/busEventList.ts
@@ -6,7 +6,7 @@ import {
 import {
   createMenu
 } from 'apis/app/system'
-import { IWindowList } from 'apis/app/window/constants'
+import { IWindowList } from '#/types/enum'
 import windowManager from 'apis/app/window/windowManager'
 import {
   UPLOAD_WITH_FILES,
diff --git a/src/main/events/ipcList.ts b/src/main/events/ipcList.ts
index baa28b4..a3ef7dd 100644
--- a/src/main/events/ipcList.ts
+++ b/src/main/events/ipcList.ts
@@ -7,7 +7,7 @@ import {
   BrowserWindow
 } from 'electron'
 import windowManager from 'apis/app/window/windowManager'
-import { IWindowList } from 'apis/app/window/constants'
+import { IWindowList } from '#/types/enum'
 import uploader from 'apis/app/uploader'
 import pasteTemplate from '~/main/utils/pasteTemplate'
 import db, { GalleryDB } from '~/main/apis/core/datastore'
diff --git a/src/main/events/picgoCoreIPC.ts b/src/main/events/picgoCoreIPC.ts
index 951eab7..b684cbe 100644
--- a/src/main/events/picgoCoreIPC.ts
+++ b/src/main/events/picgoCoreIPC.ts
@@ -7,14 +7,12 @@ import {
   ipcMain,
   clipboard
 } from 'electron'
-import PicGoCore from '~/universal/types/picgo'
-import { IPasteStyle, IPicGoHelperType } from '#/types/enum'
+import { IPasteStyle, IPicGoHelperType, IWindowList } from '#/types/enum'
 import shortKeyHandler from 'apis/app/shortKey/shortKeyHandler'
 import picgo from '@core/picgo'
 import { handleStreamlinePluginName } from '~/universal/utils/common'
-import { IGuiMenuItem } from 'picgo/dist/src/types'
+import { IGuiMenuItem, PicGo as PicGoCore } from 'picgo'
 import windowManager from 'apis/app/window/windowManager'
-import { IWindowList } from 'apis/app/window/constants'
 import { showNotification } from '~/main/utils/common'
 import { dbPathChecker } from 'apis/core/datastore/dbChecker'
 import {
@@ -36,7 +34,7 @@ import pasteTemplate from '../utils/pasteTemplate'
 
 // eslint-disable-next-line
 const requireFunc = typeof __webpack_require__ === 'function' ? __non_webpack_require__ : require
-// const PluginHandler = requireFunc('picgo/dist/lib/PluginHandler').default
+// const PluginHandler = requireFunc('picgo/lib/PluginHandler').default
 const STORE_PATH = path.dirname(dbPathChecker())
 // const CONFIG_PATH = path.join(STORE_PATH, '/data.json')
 
@@ -209,7 +207,8 @@ const handleGetPicBedConfig = () => {
   ipcMain.on('getPicBedConfig', (event: IpcMainEvent, type: string) => {
     const name = picgo.helper.uploader.get(type)?.name || type
     if (picgo.helper.uploader.get(type)?.config) {
-      const config = handleConfigWithFunction(picgo.helper.uploader.get(type)!.config(picgo))
+      const _config = picgo.helper.uploader.get(type)!.config!(picgo)
+      const config = handleConfigWithFunction(_config)
       event.sender.send('getPicBedConfig', config, name)
     } else {
       event.sender.send('getPicBedConfig', [], name)
diff --git a/src/main/events/remotes/menu.ts b/src/main/events/remotes/menu.ts
index f425d01..2e57309 100644
--- a/src/main/events/remotes/menu.ts
+++ b/src/main/events/remotes/menu.ts
@@ -1,5 +1,5 @@
 import windowManager from 'apis/app/window/windowManager'
-import { IWindowList } from 'apis/app/window/constants'
+import { IWindowList } from '#/types/enum'
 import { Menu, BrowserWindow, app, dialog } from 'electron'
 import getPicBeds from '~/main/utils/getPicBeds'
 import picgo from '@core/picgo'
@@ -9,9 +9,9 @@ import {
 import { privacyManager } from '~/main/utils/privacyManager'
 import pkg from 'root/package.json'
 import GuiApi from 'apis/gui'
-import PicGoCore from '~/universal/types/picgo'
 import { PICGO_CONFIG_PLUGIN, PICGO_HANDLE_PLUGIN_ING, PICGO_TOGGLE_PLUGIN } from '~/universal/events/constants'
 import picgoCoreIPC from '~/main/events/picgoCoreIPC'
+import { PicGo as PicGoCore } from 'picgo'
 
 interface GuiMenuItem {
   label: string
diff --git a/src/main/lifeCycle/index.ts b/src/main/lifeCycle/index.ts
index 0302762..81dc3fb 100644
--- a/src/main/lifeCycle/index.ts
+++ b/src/main/lifeCycle/index.ts
@@ -13,7 +13,7 @@ import beforeOpen from '~/main/utils/beforeOpen'
 import fixPath from 'fix-path'
 import ipcList from '~/main/events/ipcList'
 import busEventList from '~/main/events/busEventList'
-import { IWindowList } from 'apis/app/window/constants'
+import { IWindowList } from '#/types/enum'
 import windowManager from 'apis/app/window/windowManager'
 import {
   updateShortKeyFromVersion212,
diff --git a/src/main/migrate/index.ts b/src/main/migrate/index.ts
index b5e8d58..ce07eb4 100644
--- a/src/main/migrate/index.ts
+++ b/src/main/migrate/index.ts
@@ -2,7 +2,7 @@ import { DBStore } from '@picgo/store'
 import ConfigStore from '~/main/apis/core/datastore'
 import path from 'path'
 import fse from 'fs-extra'
-import PicGoCore from '#/types/picgo'
+import { PicGo as PicGoCore } from 'picgo'
 // from v2.1.2
 const updateShortKeyFromVersion212 = (db: typeof ConfigStore, shortKeyConfig: IShortKeyConfigs | IOldShortKeyConfigs) => {
   // #557 极端情况可能会出现配置不存在，需要重新写入
diff --git a/src/main/utils/handleArgv.ts b/src/main/utils/handleArgv.ts
index 8293152..3dc7814 100644
--- a/src/main/utils/handleArgv.ts
+++ b/src/main/utils/handleArgv.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 import fs from 'fs-extra'
-import Logger from 'picgo/dist/src/lib/Logger'
+import { Logger } from 'picgo'
 interface IResultFileObject {
   path: string
 }
diff --git a/src/renderer/pages/PicGoSetting.vue b/src/renderer/pages/PicGoSetting.vue
index aa831b3..b6adbb6 100644
--- a/src/renderer/pages/PicGoSetting.vue
+++ b/src/renderer/pages/PicGoSetting.vue
@@ -338,7 +338,7 @@
 <script lang="ts">
 import keyDetect from '@/utils/key-binding'
 import pkg from 'root/package.json'
-import { IConfig } from 'picgo/dist/src/types/index'
+import { IConfig } from 'picgo'
 import { PICGO_OPEN_FILE, OPEN_URL } from '#/events/constants'
 import {
   ipcRenderer
diff --git a/src/renderer/utils/ConfirmButtonMixin.ts b/src/renderer/utils/ConfirmButtonMixin.ts
index fdc95d1..ea10ae7 100644
--- a/src/renderer/utils/ConfirmButtonMixin.ts
+++ b/src/renderer/utils/ConfirmButtonMixin.ts
@@ -1,5 +1,5 @@
 import { Component, Vue } from 'vue-property-decorator'
-import { IConfig } from 'picgo/dist/src/types'
+import { IConfig } from 'picgo'
 @Component
 export default class extends Vue {
   defaultPicBed = 'smms'
diff --git a/src/universal/types/electron.d.ts b/src/universal/types/electron.d.ts
index ef62206..aebceee 100644
--- a/src/universal/types/electron.d.ts
+++ b/src/universal/types/electron.d.ts
@@ -1,9 +1,6 @@
-import {
-  BrowserWindow
-} from 'electron'
-import {
-  IWindowList
-} from 'apis/app/window/constants'
+// https://stackoverflow.com/questions/45420448/how-to-import-external-type-into-global-d-ts-file
+declare type BrowserWindow = import('electron').BrowserWindow
+declare type IWindowList = import('./enum').IWindowList
 
 declare interface IWindowListItem {
   isValid: boolean
@@ -20,10 +17,3 @@ declare interface IWindowManager {
   deleteById: (id: number) => void
   getAvailableWindow: () => BrowserWindow
 }
-
-// https://stackoverflow.com/questions/35074713/extending-typescript-global-object-in-node-js/44387594#44387594
-declare global {
-  var PICGO_GUI_VERSION: string
-  var PICGO_CORE_VERSION: string
-  var notificationList: IAppNotification[]
-}
diff --git a/src/universal/types/enum.ts b/src/universal/types/enum.ts
index 6e2fb3b..dc897e7 100644
--- a/src/universal/types/enum.ts
+++ b/src/universal/types/enum.ts
@@ -20,3 +20,10 @@ export enum IPasteStyle {
   UBB = 'UBB',
   CUSTOM = 'Custom'
 }
+
+export enum IWindowList {
+  SETTING_WINDOW = 'SETTING_WINDOW',
+  TRAY_WINDOW = 'TRAY_WINDOW',
+  MINI_WINDOW = 'MINI_WINDOW',
+  RENAME_WINDOW = 'RENAME_WINDOW'
+}
diff --git a/src/universal/types/global.d.ts b/src/universal/types/global.d.ts
new file mode 100644
index 0000000..d8b55ad
--- /dev/null
+++ b/src/universal/types/global.d.ts
@@ -0,0 +1,5 @@
+
+// https://stackoverflow.com/questions/35074713/extending-typescript-global-object-in-node-js/44387594#44387594
+declare var PICGO_GUI_VERSION: string
+declare var PICGO_CORE_VERSION: string
+declare var notificationList: IAppNotification[]
\ No newline at end of file
diff --git a/src/universal/types/picgo.d.ts b/src/universal/types/picgo.d.ts
deleted file mode 100644
index 28766b6..0000000
--- a/src/universal/types/picgo.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import PicGoCore from 'picgo'
-export default PicGoCore
diff --git a/src/universal/types/types.d.ts b/src/universal/types/types.d.ts
index 8488556..451349c 100644
--- a/src/universal/types/types.d.ts
+++ b/src/universal/types/types.d.ts
@@ -122,7 +122,7 @@ interface IBounds {
 }
 
 // PicGo Types
-type ICtx = import('picgo')
+type ICtx = import('picgo').PicGo
 interface IPicGoPlugin {
   name: string
   fullName: string