From f1eb7f4d70cc06e8714e25a72ea769f6354613ac Mon Sep 17 00:00:00 2001 From: PiEgg Date: Sun, 1 Aug 2021 14:50:25 +0800 Subject: [PATCH] :bug: Fix: gallery db bug --- package.json | 4 +- public/wsl.sh | 18 +++++++++ src/main/apis/app/system/index.ts | 2 +- src/main/apis/app/uploader/apis.ts | 4 +- src/main/apis/core/datastore/dbChecker.ts | 2 + src/main/apis/gui/index.ts | 46 ++++++++++++++++++++++- src/main/events/ipcList.ts | 2 +- src/main/events/picgoCoreIPC.ts | 8 ++-- src/main/lifeCycle/index.ts | 7 ++-- src/main/migrate/index.ts | 5 ++- src/main/server/index.ts | 1 + src/main/utils/beforeOpen.ts | 24 +++++++----- src/renderer/pages/Gallery.vue | 23 +++++++----- src/renderer/pages/TrayPage.vue | 9 +++-- src/renderer/utils/db.ts | 6 +-- src/universal/types/extra-vue.d.ts | 4 +- src/universal/utils/pasteTemplate.ts | 7 ++-- yarn.lock | 29 ++++++++++---- 18 files changed, 145 insertions(+), 56 deletions(-) create mode 100644 public/wsl.sh diff --git a/package.json b/package.json index d1d5ef63..593cae01 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ ] }, "dependencies": { - "@picgo/store": "^1.0.0-alpha.3", + "@picgo/store": "^1.0.3", "axios": "^0.19.0", "core-js": "^3.3.2", "element-ui": "^2.13.0", @@ -43,7 +43,7 @@ "keycode": "^2.2.0", "lodash-id": "^0.14.0", "lowdb": "^1.0.0", - "picgo": "^1.4.21", + "picgo": "^1.4.23", "qrcode.vue": "^1.7.0", "uuidv4": "^6.2.11", "vue": "^2.6.10", diff --git a/public/wsl.sh b/public/wsl.sh new file mode 100644 index 00000000..7adb05de --- /dev/null +++ b/public/wsl.sh @@ -0,0 +1,18 @@ +#!/bin/sh +# grab the paths +scriptPath=$(echo $0 | awk '{ print substr( $0, 1, length($0)-6 ) }')"windows10.ps1" +imagePath=$(echo $1 | awk '{ print substr( $0, 1, length($0)-18 ) }') +imageName=$(echo $1 | awk '{ print substr( $0, length($0)-17, length($0) ) }') + +# run the powershell script +res=$(powershell.exe -noprofile -noninteractive -nologo -sta -executionpolicy unrestricted -file $(wslpath -w $scriptPath) $(wslpath -w $imagePath)"\\"$imageName) + +# note that there is a return symbol in powershell result +noImage=$(echo "no image\r") + +# check whether image exists +if [ "$res" = "$noImage" ] ;then + echo "no image" +else + echo $(wslpath -u $res) +fi diff --git a/src/main/apis/app/system/index.ts b/src/main/apis/app/system/index.ts index 449732e1..099be6b0 100644 --- a/src/main/apis/app/system/index.ts +++ b/src/main/apis/app/system/index.ts @@ -212,7 +212,7 @@ export function createTray () { if (imgs !== false) { const pasteText: string[] = [] for (let i = 0; i < imgs.length; i++) { - pasteText.push(pasteTemplate(pasteStyle, imgs[i])) + pasteText.push(pasteTemplate(pasteStyle, imgs[i], db.get('settings.customLink'))) const notification = new Notification({ title: '上传成功', body: imgs[i].imgUrl!, diff --git a/src/main/apis/app/uploader/apis.ts b/src/main/apis/app/uploader/apis.ts index 228d246d..83acdcf0 100644 --- a/src/main/apis/app/uploader/apis.ts +++ b/src/main/apis/app/uploader/apis.ts @@ -16,7 +16,7 @@ export const uploadClipboardFiles = async (): Promise => { if (img.length > 0) { const trayWindow = windowManager.get(IWindowList.TRAY_WINDOW) const pasteStyle = db.get('settings.pasteStyle') || 'markdown' - handleCopyUrl(pasteTemplate(pasteStyle, img[0])) + handleCopyUrl(pasteTemplate(pasteStyle, img[0], db.get('settings.customLink'))) const notification = new Notification({ title: '上传成功', body: img[0].imgUrl!, @@ -52,7 +52,7 @@ export const uploadChoosedFiles = async (webContents: WebContents, files: IFileW const pasteStyle = db.get('settings.pasteStyle') || 'markdown' const pasteText: string[] = [] for (let i = 0; i < imgs.length; i++) { - pasteText.push(pasteTemplate(pasteStyle, imgs[i])) + pasteText.push(pasteTemplate(pasteStyle, imgs[i], db.get('settings.customLink'))) const notification = new Notification({ title: '上传成功', body: imgs[i].imgUrl!, diff --git a/src/main/apis/core/datastore/dbChecker.ts b/src/main/apis/core/datastore/dbChecker.ts index d94d633e..d6bd89c3 100644 --- a/src/main/apis/core/datastore/dbChecker.ts +++ b/src/main/apis/core/datastore/dbChecker.ts @@ -81,6 +81,8 @@ function dbPathChecker (): string { return defaultConfigPath } +export const defaultConfigPath = configFilePath + export { dbChecker, dbPathChecker diff --git a/src/main/apis/gui/index.ts b/src/main/apis/gui/index.ts index dd59ab58..c32e06bf 100644 --- a/src/main/apis/gui/index.ts +++ b/src/main/apis/gui/index.ts @@ -4,7 +4,9 @@ import { Notification, ipcMain } from 'electron' -import db, { GalleryDB } from '~/main/apis/core/datastore' +import path from 'path' +import db, { GalleryDB } from 'apis/core/datastore' +import { dbPathChecker, defaultConfigPath } from 'apis/core/datastore/dbChecker' import uploader from 'apis/app/uploader' import pasteTemplate from '#/utils/pasteTemplate' import { handleCopyUrl } from '~/main/utils/common' @@ -15,6 +17,8 @@ import { import { SHOW_INPUT_BOX } from '~/universal/events/constants' +import { DBStore } from '@picgo/store' +type PromiseResType = T extends Promise ? R : T // Cross-process support may be required in the future class GuiApi implements IGuiApi { @@ -79,7 +83,7 @@ class GuiApi implements IGuiApi { const pasteStyle = db.get('settings.pasteStyle') || 'markdown' const pasteText: string[] = [] for (let i = 0; i < imgs.length; i++) { - pasteText.push(pasteTemplate(pasteStyle, imgs[i])) + pasteText.push(pasteTemplate(pasteStyle, imgs[i], db.get('settings.customLink'))) const notification = new Notification({ title: '上传成功', body: imgs[i].imgUrl as string, @@ -128,6 +132,44 @@ class GuiApi implements IGuiApi { }) }) } + + /** + * get picgo config/data path + */ + async getConfigPath () { + const currentConfigPath = dbPathChecker() + const galleryDBPath = path.join(path.dirname(currentConfigPath), 'picgo.db') + return { + defaultConfigPath, + currentConfigPath, + galleryDBPath + } + } + + get galleryDB (): DBStore { + return new Proxy(GalleryDB.getInstance(), { + get (target, prop: keyof DBStore) { + if (prop === 'removeById') { + return new Promise((resolve) => { + const guiApi = GuiApi.getInstance() + guiApi.showMessageBox({ + title: '警告', + message: '有插件正在试图删除一些相册文件，是否继续', + type: 'info', + buttons: ['Yes', 'No'] + }).then(res => { + if (res.result === 0) { + resolve(Reflect.get(target, prop)) + } else { + resolve(() => {}) + } + }) + }) + } + return Reflect.get(target, prop) + } + }) + } } export default GuiApi diff --git a/src/main/events/ipcList.ts b/src/main/events/ipcList.ts index ebee889d..8deea573 100644 --- a/src/main/events/ipcList.ts +++ b/src/main/events/ipcList.ts @@ -32,7 +32,7 @@ export default { const img = await uploader.setWebContents(trayWindow.webContents).upload() if (img !== false) { const pasteStyle = db.get('settings.pasteStyle') || 'markdown' - handleCopyUrl(pasteTemplate(pasteStyle, img[0])) + handleCopyUrl(pasteTemplate(pasteStyle, img[0], db.get('settings.customLink'))) const notification = new Notification({ title: '上传成功', body: img[0].imgUrl!, diff --git a/src/main/events/picgoCoreIPC.ts b/src/main/events/picgoCoreIPC.ts index c1189062..43607c07 100644 --- a/src/main/events/picgoCoreIPC.ts +++ b/src/main/events/picgoCoreIPC.ts @@ -28,7 +28,7 @@ import { } from '#/events/constants' import { GalleryDB } from 'apis/core/datastore' -import { IObject } from '@picgo/store/dist/types' +import { IObject, IFilter } from '@picgo/store/dist/types' // eslint-disable-next-line const requireFunc = typeof __webpack_require__ === 'function' ? __non_webpack_require__ : require @@ -283,10 +283,10 @@ const handleImportLocalPlugin = () => { } const handlePicGoGalleryDB = () => { - ipcMain.on(PICGO_GET_DB, async (event: IpcMainEvent, callbackId: string) => { + ipcMain.on(PICGO_GET_DB, async (event: IpcMainEvent, filter: IFilter, callbackId: string) => { const dbStore = GalleryDB.getInstance() - const res = await dbStore.get() - event.sender.send(PICGO_GET_CONFIG, res, callbackId) + const res = await dbStore.get(filter) + event.sender.send(PICGO_GET_DB, res, callbackId) }) ipcMain.on(PICGO_INSERT_DB, async (event: IpcMainEvent, value: IObject, callbackId: string) => { diff --git a/src/main/lifeCycle/index.ts b/src/main/lifeCycle/index.ts index 4fa488ed..f7e36076 100644 --- a/src/main/lifeCycle/index.ts +++ b/src/main/lifeCycle/index.ts @@ -55,7 +55,7 @@ const handleStartUpFiles = (argv: string[], cwd: string) => { } class LifeCycle { - private async beforeReady () { + private beforeReady () { protocol.registerSchemesAsPrivileged([{ scheme: 'picgo', privileges: { secure: true, standard: true } }]) // fix the $PATH in macOS fixPath() @@ -63,10 +63,11 @@ class LifeCycle { ipcList.listen() busEventList.listen() updateShortKeyFromVersion212(db, db.get('settings.shortKey')) - await migrateGalleryFromVersion230(db, GalleryDB.getInstance()) } private onReady () { app.on('ready', async () => { + console.log('on ready') + await migrateGalleryFromVersion230(db, GalleryDB.getInstance()) createProtocol('picgo') if (isDevelopment && !process.env.IS_TEST) { // Install Vue Devtools @@ -169,7 +170,7 @@ class LifeCycle { if (!gotTheLock) { app.quit() } else { - await this.beforeReady() + this.beforeReady() this.onReady() this.onRunning() this.onQuit() diff --git a/src/main/migrate/index.ts b/src/main/migrate/index.ts index dc8ee084..05bec2ab 100644 --- a/src/main/migrate/index.ts +++ b/src/main/migrate/index.ts @@ -38,10 +38,11 @@ const migrateGalleryFromVersion230 = async (configDB: typeof ConfigStore, galler if (fse.existsSync(configBakPath)) { return } - fse.copyFileSync(configPath, configBakPath) // migrate gallery from config to gallery db - if (originGallery && originGallery.length > 0) { + if (originGallery && originGallery?.length > 0) { + fse.copyFileSync(configPath, configBakPath) await galleryDB.insertMany(originGallery) + configDB.set('uploaded', []) } } diff --git a/src/main/server/index.ts b/src/main/server/index.ts index 11611504..daec1f24 100644 --- a/src/main/server/index.ts +++ b/src/main/server/index.ts @@ -103,6 +103,7 @@ class Server { }) } startup () { + console.log('startup', this.config.enable) if (this.config.enable) { this.listen(this.config.port) } diff --git a/src/main/utils/beforeOpen.ts b/src/main/utils/beforeOpen.ts index 6f30b347..db84d32e 100644 --- a/src/main/utils/beforeOpen.ts +++ b/src/main/utils/beforeOpen.ts @@ -1,11 +1,11 @@ import fs from 'fs-extra' import path from 'path' import os from 'os' -import { remote, app } from 'electron' import pkg from 'root/package.json' +import { dbPathChecker } from 'apis/core/datastore/dbChecker' -const APP = process.type === 'renderer' ? remote.app : app -const STORE_PATH = APP.getPath('userData') +const configPath = dbPathChecker() +const CONFIG_DIR = path.dirname(configPath) function injectPicGoVersion () { global.PICGO_GUI_VERSION = pkg.version @@ -41,7 +41,7 @@ function resolveMacWorkFlow () { */ function resolveClipboardImageGenerator () { let clipboardFiles = getClipboardFiles() - if (!fs.pathExistsSync(path.join(STORE_PATH, 'windows10.ps1'))) { + if (!fs.pathExistsSync(path.join(CONFIG_DIR, 'windows10.ps1'))) { clipboardFiles.forEach(item => { fs.copyFileSync(item.origin, item.dest) }) @@ -52,10 +52,15 @@ function resolveClipboardImageGenerator () { } function diffFilesAndUpdate (filePath1: string, filePath2: string) { - let file1 = fs.readFileSync(filePath1) - let file2 = fs.readFileSync(filePath2) + try { + let file1 = fs.existsSync(filePath1) && fs.readFileSync(filePath1) + let file2 = fs.existsSync(filePath1) && fs.readFileSync(filePath2) - if (!file1.equals(file2)) { + if (!file1 || !file2 || !file1.equals(file2)) { + fs.copyFileSync(filePath1, filePath2) + } + } catch (e) { + console.error(e) fs.copyFileSync(filePath1, filePath2) } } @@ -65,13 +70,14 @@ function resolveClipboardImageGenerator () { '/linux.sh', '/mac.applescript', '/windows.ps1', - '/windows10.ps1' + '/windows10.ps1', + '/wsl.sh' ] return files.map(item => { return { origin: path.join(__static, item), - dest: path.join(STORE_PATH, item) + dest: path.join(CONFIG_DIR, item) } }) } diff --git a/src/renderer/pages/Gallery.vue b/src/renderer/pages/Gallery.vue index 378eb82e..95ecbe87 100644 --- a/src/renderer/pages/Gallery.vue +++ b/src/renderer/pages/Gallery.vue @@ -71,12 +71,12 @@ - +
{ this.$nextTick(async () => { - this.images = await this.$$db.get() + this.updateGallery() }) }) ipcRenderer.send('getPicBeds') ipcRenderer.on('getPicBeds', this.getPicBeds) - this.images = await this.$$db.get() + this.updateGallery() } mounted () { document.addEventListener('keydown', this.handleDetectShiftKey) @@ -212,6 +212,9 @@ export default class extends Vue { return this.images } } + async updateGallery () { + this.images = (await this.$$db.get({ orderBy: 'desc' })).data + } @Watch('filterList') handleFilterListChange () { @@ -257,7 +260,8 @@ export default class extends Vue { } async copy (item: ImgInfo) { const style = await this.getConfig('settings.pasteStyle') || IPasteStyle.MARKDOWN - const copyLink = pasteStyle(style, item) + const customLink = await this.getConfig('settings.customLink') + const copyLink = pasteStyle(style, item, customLink) const obj = { title: '复制链接成功', body: copyLink, @@ -286,7 +290,7 @@ export default class extends Vue { myNotification.onclick = () => { return true } - this.getGallery() + this.updateGallery() }).catch((e) => { console.log(e) return true @@ -311,7 +315,7 @@ export default class extends Vue { return true } this.dialogVisible = false - this.getGallery() + this.updateGallery() } choosePicBed (type: string) { let idx = this.choosedPicBed.indexOf(type) @@ -356,7 +360,6 @@ export default class extends Vue { } this.clearChoosedList() this.choosedList = {} // 只有删除才能将这个置空 - this.getGallery() const obj = { title: '操作结果', body: '删除成功' @@ -366,6 +369,7 @@ export default class extends Vue { myNotification.onclick = () => { return true } + this.updateGallery() }).catch(() => { return true }) @@ -375,6 +379,7 @@ export default class extends Vue { if (Object.values(this.choosedList).some(item => item)) { const copyString: string[] = [] const style = await this.getConfig('settings.pasteStyle') || IPasteStyle.MARKDOWN + const customLink = await this.getConfig('settings.customLink') // choosedList -> { [id]: true or false }; true means choosed. false means not choosed. const imageIDList = Object.keys(this.choosedList) for (let i = 0; i < imageIDList.length; i++) { @@ -382,7 +387,7 @@ export default class extends Vue { if (this.choosedList[key]) { const item = await this.$$db.getById(key) if (item) { - copyString.push(pasteStyle(style, item)) + copyString.push(pasteStyle(style, item, customLink)) this.choosedList[key] = false } } diff --git a/src/renderer/pages/TrayPage.vue b/src/renderer/pages/TrayPage.vue index 4b0102bd..4561d11d 100644 --- a/src/renderer/pages/TrayPage.vue +++ b/src/renderer/pages/TrayPage.vue @@ -50,14 +50,15 @@ export default class extends Vue { return this.files.slice().reverse() } async getData () { - this.files = (await this.$$db.get()).slice().reverse().slice(0, 5) + this.files = (await this.$$db.get({ orderBy: 'desc', limit: 5 })).data } async copyTheLink (item: ImgInfo) { this.notification.body = item.imgUrl! this.notification.icon = item.imgUrl! const myNotification = new Notification(this.notification.title, this.notification) const pasteStyle = await this.getConfig('settings.pasteStyle') || IPasteStyle.MARKDOWN - clipboard.writeText(pasteTemplate(pasteStyle, item)) + const customLink = await this.getConfig('settings.customLink') + clipboard.writeText(pasteTemplate(pasteStyle, item, customLink)) myNotification.onclick = () => { return true } @@ -90,13 +91,13 @@ export default class extends Vue { const item = files[i] await this.$$db.insert(item) } - this.files = (await this.$$db.get()).slice().reverse().slice(0, 5) + this.files = (await this.$$db.get({ orderBy: 'desc', limit: 5 })).data }) ipcRenderer.on('clipboardFiles', (event: Event, files: ImgInfo[]) => { this.clipboardFiles = files }) ipcRenderer.on('uploadFiles', async (event: Event) => { - this.files = (await this.$$db.get()).slice().reverse().slice(0, 5) + this.files = (await this.$$db.get({ orderBy: 'desc', limit: 5 })).data console.log(this.files) this.uploadFlag = false }) diff --git a/src/renderer/utils/db.ts b/src/renderer/utils/db.ts index 0772bf22..d0fc4f5b 100644 --- a/src/renderer/utils/db.ts +++ b/src/renderer/utils/db.ts @@ -1,4 +1,4 @@ -import { IObject, IResult } from '@picgo/store/dist/types' +import { IObject, IResult, IGetResult, IFilter } from '@picgo/store/dist/types' import { ipcRenderer, IpcRendererEvent } from 'electron' import { uuid } from 'uuidv4' import { @@ -11,8 +11,8 @@ import { } from '#/events/constants' import { IGalleryDB } from '#/types/extra-vue' export class GalleryDB implements IGalleryDB { - async get (): Promise[]> { - const res = await this.msgHandler[]>(PICGO_GET_DB) + async get (filter?: IFilter): Promise> { + const res = await this.msgHandler>(PICGO_GET_DB, filter) return res } async insert (value: T): Promise> { diff --git a/src/universal/types/extra-vue.d.ts b/src/universal/types/extra-vue.d.ts index ad1d4abf..6acfb3df 100644 --- a/src/universal/types/extra-vue.d.ts +++ b/src/universal/types/extra-vue.d.ts @@ -1,9 +1,9 @@ import VueRouter, { Route } from 'vue-router' import axios from 'axios' -import { IObject, IResult } from '@picgo/store/dist/types' +import { IObject, IResult, IGetResult, IFilter } from '@picgo/store/dist/types' interface IGalleryDB { - get(): Promise[]> + get(filter?: IFilter): Promise> insert (value: T): Promise> insertMany (value: T[]): Promise[]> updateById (id: string, value: IObject): Promise diff --git a/src/universal/utils/pasteTemplate.ts b/src/universal/utils/pasteTemplate.ts index 3d01bb72..0e270ba0 100644 --- a/src/universal/utils/pasteTemplate.ts +++ b/src/universal/utils/pasteTemplate.ts @@ -1,4 +1,3 @@ -import db from '~/main/apis/core/datastore' import { IPasteStyle } from '#/types/enum' import { handleUrlEncode } from './common' @@ -19,15 +18,15 @@ const formatCustomLink = (customLink: string, item: ImgInfo) => { return customLink } -export default (style: IPasteStyle, item: ImgInfo) => { +export default (style: IPasteStyle, item: ImgInfo, customLink: string | undefined) => { const url = handleUrlEncode(item.url || item.imgUrl) - const customLink = db.get('settings.customLink') || '$url' + const _customLink = customLink || '$url' const tpl = { 'markdown': `![](${url})`, 'HTML': ``, 'URL': url, 'UBB': `[IMG]${url}[/IMG]`, - 'Custom': formatCustomLink(customLink, item) + 'Custom': formatCustomLink(_customLink, item) } return tpl[style] } diff --git a/yarn.lock b/yarn.lock index 23f7f936..7d5b133b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -918,10 +918,10 @@ dependencies: ora "^3.4.0" -"@picgo/store@^1.0.0-alpha.3": - version "1.0.0-alpha.3" - resolved "https://registry.yarnpkg.com/@picgo/store/-/store-1.0.0-alpha.3.tgz#b0f4f12c471cf370a95dcab93ed2b6291760d887" - integrity sha512-BUj/lZiAWDu7gZRwRtPIfw7LwV55PD/dUkAjPsscjn/EmckiC3LEek97/wr4j6vQc45C7LEJfgpzeEYSU76vUA== +"@picgo/store@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@picgo/store/-/store-1.0.3.tgz#cfe346ad30c80f378e0bc81311e7468df436bc1f" + integrity sha512-quyu56yuUsFFJGQ88suTwUSEzKosZPzR1M52eyqzyQ2HZWZVn0pa/eBBsh7OYefS0V13YLR5llnIkQaL8y11Ww== dependencies: "@types/bson" "^4.0.1" "@types/graceful-fs" "^4.1.3" @@ -6430,6 +6430,11 @@ is-directory@^0.3.1: resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= +is-docker@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== + is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -6641,6 +6646,13 @@ is-wsl@^1.1.0: resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= +is-wsl@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + is-yarn-global@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" @@ -8378,10 +8390,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.21: - version "1.4.21" - resolved "https://registry.yarnpkg.com/picgo/-/picgo-1.4.21.tgz#5ebbacda85200d63f5f83128b1c1b37c10cd80f3" - integrity sha512-WxPVNbWa2LPFfPftRvdFqf1fwUn6TrBn2vm12hSMHUjhdU+7nK3uysBfL5R9/vOAk+OPt3bU74zRHYi6gME+Dw== +picgo@^1.4.23: + version "1.4.23" + resolved "https://registry.yarnpkg.com/picgo/-/picgo-1.4.23.tgz#01232185a3c4cbf4972d9924a5968dd0f9726d04" + integrity sha512-/QCbiye7Trw+hXGU67YYb2tOiBy/BoGn7bI2vOHejHlwRFQuKQxLXYHK97sRSlSCWubTFSv9QNrvXz6/jTr69A== dependencies: chalk "^2.4.1" commander "^2.17.0" @@ -8394,6 +8406,7 @@ picgo@^1.4.21: globby "^8.0.2" image-size "^0.8.3" inquirer "^6.0.0" + is-wsl "^2.2.0" lodash-id "^0.14.0" lowdb "^1.0.0" md5 "^2.2.1"