diff --git a/package.json b/package.json index 6125d36..c4bb761 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "keycode": "^2.2.0", "lodash-id": "^0.14.0", "lowdb": "^1.0.0", - "picgo": "^1.4.7", + "picgo": "^1.4.10", "vue": "^2.6.10", "vue-gallery": "^2.0.1", "vue-lazyload": "^1.2.6", diff --git a/src/main/apis/core/picgo/index.ts b/src/main/apis/core/picgo/index.ts index a0a003a..a4703d7 100644 --- a/src/main/apis/core/picgo/index.ts +++ b/src/main/apis/core/picgo/index.ts @@ -16,4 +16,4 @@ picgo.saveConfig({ PICGO_ENV: 'GUI' }) -export default picgo as PicGoCore +export default picgo! as PicGoCore diff --git a/src/main/events/picgoCoreIPC.ts b/src/main/events/picgoCoreIPC.ts index 17998f0..63eb200 100644 --- a/src/main/events/picgoCoreIPC.ts +++ b/src/main/events/picgoCoreIPC.ts @@ -182,9 +182,9 @@ const handleNPMError = (): IDispose => { 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 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)) event.sender.send('getPicBedConfig', config, name) } else { event.sender.send('getPicBedConfig', [], name) diff --git a/src/main/server/index.ts b/src/main/server/index.ts index 7963dbd..d2ff378 100644 --- a/src/main/server/index.ts +++ b/src/main/server/index.ts @@ -12,7 +12,7 @@ class Server { private httpServer: http.Server private config: IServerConfig constructor () { - let config = picgo.getConfig('settings.server') + let config = picgo.getConfig('settings.server') const result = this.checkIfConfigIsValid(config) if (result) { this.config = config diff --git a/src/main/utils/getPicBeds.ts b/src/main/utils/getPicBeds.ts index 953f74d..f9a9113 100644 --- a/src/main/utils/getPicBeds.ts +++ b/src/main/utils/getPicBeds.ts @@ -2,12 +2,12 @@ import picgo from '@core/picgo' const getPicBeds = () => { const picBedTypes = picgo.helper.uploader.getIdList() - const picBedFromDB = picgo.getConfig('picBed.list') || [] + const picBedFromDB = picgo.getConfig('picBed.list') || [] const picBeds = picBedTypes.map((item: string) => { const visible = picBedFromDB.find((i: IPicBedType) => i.type === item) // object or undefined return { type: item, - name: picgo.helper.uploader.get(item).name || item, + name: picgo.helper.uploader.get(item)!.name || item, visible: visible ? visible.visible : true } }) as IPicBedType[] diff --git a/yarn.lock b/yarn.lock index a80db22..1bdc6b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3659,7 +3659,7 @@ de-indent@^1.0.2: resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0= -debug@2, debug@2.6.9, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: +debug@2.6.9, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -3797,11 +3797,6 @@ deepmerge@^1.2.0, deepmerge@^1.5.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753" integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ== -deepmerge@^4.0.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" - integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== - deepmerge@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.0.1.tgz#25c1c24f110fb914f80001b925264dd77f3f4312" @@ -5999,6 +5994,13 @@ ignore@^5.0.2: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== +image-size@^0.8.3: + version "0.8.3" + resolved "https://registry.npmjs.org/image-size/-/image-size-0.8.3.tgz#f0b568857e034f29baffd37013587f2c0cad8b46" + integrity sha512-SMtq1AJ+aqHB45c3FsB4ERK0UCiA2d3H1uq8s+8T0Pf8A3W4teyBQyaFaktH6xvZqh+npwlKU7i4fJo0r7TYTg== + dependencies: + queue "6.0.1" + immediate@~3.0.5: version "3.0.6" resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" @@ -7581,11 +7583,6 @@ neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== -next-tick@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" - integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= - nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" @@ -8292,10 +8289,10 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -picgo@^1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/picgo/-/picgo-1.4.7.tgz#ef9bea9e765ef9d77daa32f8a14c84c345677ece" - integrity sha512-r2j/cxfKdeHn/HnN/1XwbSM/xakO8XrAM0todTAbCDd4r+zIwDcl1pms5S+8YVDqQRAd/qNE4t9XESIIjhSVtA== +picgo@^1.4.10: + version "1.4.10" + resolved "https://registry.npmjs.org/picgo/-/picgo-1.4.10.tgz#460b311663521e90c680c1ec1cf1edf1bcc7a294" + integrity sha512-mDFr1d4gh0BIhLAkCVKZFMzDLz2KwM0grbgqTCtLhZYXiOYihv8hOTArUlrffOiTD5vuB2P+a1LN6a7WNDVSeA== dependencies: chalk "^2.4.1" commander "^2.17.0" @@ -8306,12 +8303,12 @@ picgo@^1.4.7: ejs "^2.6.1" fs-extra "^6.0.1" globby "^8.0.2" + image-size "^0.8.3" inquirer "^6.0.0" lodash-id "^0.14.0" lowdb "^1.0.0" md5 "^2.2.1" minimatch "^3.0.4" - probe-image-size "^4.0.0" qiniu "^7.2.1" request "^2.87.0" request-promise-native "^1.0.5" @@ -8785,18 +8782,6 @@ private@^0.1.6: resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== -probe-image-size@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/probe-image-size/-/probe-image-size-4.1.1.tgz#c836c53154b6dd04dbcf66af2bbd50087b15e1dc" - integrity sha512-42LqKZqTLxH/UvAZ2/cKhAsR4G/Y6B7i7fI2qtQu9hRBK4YjS6gqO+QRtwTjvojUx4+/+JuOMzLoFyRecT9qRw== - dependencies: - any-promise "^1.3.0" - deepmerge "^4.0.0" - inherits "^2.0.3" - next-tick "^1.0.0" - request "^2.83.0" - stream-parser "~0.3.1" - process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -8961,6 +8946,13 @@ querystringify@^2.1.1: resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e" integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA== +queue@6.0.1: + version "6.0.1" + resolved "https://registry.npmjs.org/queue/-/queue-6.0.1.tgz#abd5a5b0376912f070a25729e0b6a7d565683791" + integrity sha512-AJBQabRCCNr9ANq8v77RJEv73DPbn55cdTb+Giq4X0AVnNVZvMHlYp7XlQiN+1npCZj1DuSmaA2hYVUUDgxFDg== + dependencies: + inherits "~2.0.3" + quick-lru@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8" @@ -10109,13 +10101,6 @@ stream-http@^2.7.2: to-arraybuffer "^1.0.0" xtend "^4.0.0" -stream-parser@~0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/stream-parser/-/stream-parser-0.3.1.tgz#1618548694420021a1182ff0af1911c129761773" - integrity sha1-FhhUhpRCACGhGC/wrxkRwSl2F3M= - dependencies: - debug "2" - stream-shift@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"