Merge branch 'master' into migrate-from-remote-to-ipc

This commit is contained in:
Araxeus
2022-05-01 23:09:13 +03:00
committed by GitHub
31 changed files with 664 additions and 177 deletions

View File

@ -92,13 +92,14 @@
"npm": "Please use yarn and not npm"
},
"dependencies": {
"@cliqz/adblocker-electron": "^1.23.5",
"@cliqz/adblocker-electron": "^1.23.7",
"@ffmpeg/core": "^0.10.0",
"@ffmpeg/ffmpeg": "^0.10.1",
"Simple-YouTube-Age-Restriction-Bypass": "https://gitpkg.now.sh/zerodytrash/Simple-YouTube-Age-Restriction-Bypass/dist?v2.4.6",
"async-mutex": "^0.3.2",
"browser-id3-writer": "^4.4.0",
"chokidar": "^3.5.3",
"custom-electron-prompt": "^1.4.1",
"custom-electron-prompt": "^1.4.2",
"custom-electron-titlebar": "^4.1.0",
"discord-rpc": "^4.0.1",
"electron-better-web-request": "^1.0.1",
@ -110,6 +111,7 @@
"electron-updater": "^4.6.3",
"filenamify": "^4.3.0",
"hark": "^1.2.3",
"html-to-text": "^8.2.0",
"md5": "^2.3.0",
"mpris-service": "^2.1.2",
"node-fetch": "^2.6.7",
@ -120,7 +122,7 @@
"devDependencies": {
"auto-changelog": "^2.4.0",
"electron": "^18.2.0",
"electron-builder": "^22.14.5",
"electron-builder": "^23.0.3",
"electron-devtools-installer": "^3.1.1",
"electron-icon-maker": "0.0.5",
"jest": "^27.3.1",
@ -130,7 +132,7 @@
},
"resolutions": {
"glob-parent": "5.1.2",
"minimist": "1.2.5",
"minimist": "1.2.6",
"yargs-parser": "18.1.3"
},
"auto-changelog": {